[Fusionforge-commits] r9795 - in trunk/gforge: common/docman common/forum common/frs common/include common/mail common/pm common/tracker plugins/blocks/www plugins/contribtracker/www plugins/mantis/www plugins/mediawiki/www plugins/projects_hierarchy/www plugins/quota_management/www plugins/scmccase/common plugins/scmcvs/www plugins/webcalendar/www plugins/wiki/www/lib/WikiUser www www/docman www/docman/admin www/docman/include www/forum/admin www/forum/include www/frs www/frs/admin www/frs/include www/frs/reporting www/include www/mail www/mail/admin www/my www/news www/pm www/pm/admin www/pm/include www/pm/msproject www/pm/reporting www/project/admin www/scm www/scm/include www/search/include/renderers www/survey www/survey/include www/tracker www/tracker/admin www/tracker/reporting
Roland Mas
lolando at libremir.placard.fr.eu.org
Fri May 21 09:46:43 CEST 2010
Author: lolando
Date: 2010-05-21 09:46:43 +0200 (Fri, 21 May 2010)
New Revision: 9795
Modified:
trunk/gforge/common/docman/Document.class.php
trunk/gforge/common/docman/DocumentFactory.class.php
trunk/gforge/common/docman/DocumentGroup.class.php
trunk/gforge/common/forum/Forum.class.php
trunk/gforge/common/forum/ForumFactory.class.php
trunk/gforge/common/forum/ForumMessage.class.php
trunk/gforge/common/frs/FRSFile.class.php
trunk/gforge/common/frs/FRSPackage.class.php
trunk/gforge/common/frs/FRSRelease.class.php
trunk/gforge/common/include/Group.class.php
trunk/gforge/common/include/GroupJoinRequest.class.php
trunk/gforge/common/include/Navigation.class.php
trunk/gforge/common/include/Permission.class.php
trunk/gforge/common/include/Role.class.php
trunk/gforge/common/include/RoleObserver.class.php
trunk/gforge/common/include/User.class.php
trunk/gforge/common/include/session.php
trunk/gforge/common/mail/MailingList.class.php
trunk/gforge/common/mail/MailingListFactory.class.php
trunk/gforge/common/pm/ProjectCategory.class.php
trunk/gforge/common/pm/ProjectGroup.class.php
trunk/gforge/common/pm/ProjectGroupFactory.class.php
trunk/gforge/common/tracker/ArtifactType.class.php
trunk/gforge/common/tracker/ArtifactTypeFactory.class.php
trunk/gforge/plugins/blocks/www/index.php
trunk/gforge/plugins/contribtracker/www/index.php
trunk/gforge/plugins/mantis/www/index.php
trunk/gforge/plugins/mediawiki/www/LocalSettings.php
trunk/gforge/plugins/projects_hierarchy/www/index.php
trunk/gforge/plugins/quota_management/www/index.php
trunk/gforge/plugins/scmccase/common/CCasePlugin.class.php
trunk/gforge/plugins/scmcvs/www/acl.php
trunk/gforge/plugins/webcalendar/www/index.php
trunk/gforge/plugins/wiki/www/lib/WikiUser/GForge.php
trunk/gforge/www/docman/admin/index.php
trunk/gforge/www/docman/include/doc_utils.php
trunk/gforge/www/docman/index.php
trunk/gforge/www/docman/new.php
trunk/gforge/www/docman/search.php
trunk/gforge/www/forum/admin/ForumAdmin.class.php
trunk/gforge/www/forum/admin/index.php
trunk/gforge/www/forum/include/ForumHTML.class.php
trunk/gforge/www/frs/admin/deletepackage.php
trunk/gforge/www/frs/admin/deleterelease.php
trunk/gforge/www/frs/admin/editrelease.php
trunk/gforge/www/frs/admin/index.php
trunk/gforge/www/frs/admin/qrs.php
trunk/gforge/www/frs/admin/showreleases.php
trunk/gforge/www/frs/include/frs_utils.php
trunk/gforge/www/frs/index.php
trunk/gforge/www/frs/reporting/downloads.php
trunk/gforge/www/include/project_home.php
trunk/gforge/www/mail/admin/deletelist.php
trunk/gforge/www/mail/admin/index.php
trunk/gforge/www/mail/mail_utils.php
trunk/gforge/www/my/rmproject.php
trunk/gforge/www/news/news_utils.php
trunk/gforge/www/pm/admin/index.php
trunk/gforge/www/pm/include/ProjectTaskHTML.class.php
trunk/gforge/www/pm/index.php
trunk/gforge/www/pm/msproject/msp.php
trunk/gforge/www/pm/reporting/index.php
trunk/gforge/www/project/admin/index.php
trunk/gforge/www/project/admin/project_admin_utils.php
trunk/gforge/www/project/admin/users.php
trunk/gforge/www/scm/include/scm_utils.php
trunk/gforge/www/scm/viewvc.php
trunk/gforge/www/search/include/renderers/HtmlGroupSearchRenderer.class.php
trunk/gforge/www/snapshots.php
trunk/gforge/www/survey/include/SurveyHTML.class.php
trunk/gforge/www/survey/survey_utils.php
trunk/gforge/www/tarballs.php
trunk/gforge/www/tracker/admin/ind.php
trunk/gforge/www/tracker/admin/index.php
trunk/gforge/www/tracker/ind.php
trunk/gforge/www/tracker/mod.php
trunk/gforge/www/tracker/reporting/index.php
Log:
Updated Permission invocations so they no longer pass a User
Modified: trunk/gforge/common/docman/Document.class.php
===================================================================
--- trunk/gforge/common/docman/Document.class.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/common/docman/Document.class.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -83,7 +83,7 @@
}
}
if (!$this->isPublic()) {
- $perm =& $this->Group->getPermission( session_get_user() );
+ $perm =& $this->Group->getPermission ();
if (!$perm || !is_object($perm) || !$perm->isMember()) {
$this->setPermissionDeniedError();
@@ -119,7 +119,7 @@
}
/*
- $perm =& $this->Group->getPermission( session_get_user() );
+ $perm =& $this->Group->getPermission ();
if (!$perm || !is_object($perm) || !$perm->isDocEditor()) {
$this->setPermissionDeniedError();
return false;
@@ -130,7 +130,7 @@
$doc_initstatus = '3';
// If Editor - uploaded Documents are ACTIVE
if ( session_loggedin() ) {
- $perm =& $this->Group->getPermission( session_get_user() );
+ $perm =& $this->Group->getPermission ();
if ($perm && is_object($perm) && $perm->isDocEditor()) {
$doc_initstatus = '1';
}
@@ -452,7 +452,7 @@
return false;
}
- $perm =& $this->Group->getPermission( session_get_user() );
+ $perm =& $this->Group->getPermission ();
if (!$perm || !is_object($perm) || !$perm->isDocEditor()) {
$this->setPermissionDeniedError();
@@ -533,7 +533,7 @@
}
function delete() {
- $perm =& $this->Group->getPermission( session_get_user() );
+ $perm =& $this->Group->getPermission ();
if (!$perm || !is_object($perm) || !$perm->isDocEditor()) {
$this->setPermissionDeniedError();
return false;
Modified: trunk/gforge/common/docman/DocumentFactory.class.php
===================================================================
--- trunk/gforge/common/docman/DocumentFactory.class.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/common/docman/DocumentFactory.class.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -142,7 +142,7 @@
if (!$this->stateid) {
if (session_loggedin()) {
- $perm =& $this->Group->getPermission( session_get_user() );
+ $perm =& $this->Group->getPermission ();
if (!$perm || !is_object($perm) || !$perm->isMember()) {
if ($doc->getStateID() != 1) { // non-active document?
$valid = false;
Modified: trunk/gforge/common/docman/DocumentGroup.class.php
===================================================================
--- trunk/gforge/common/docman/DocumentGroup.class.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/common/docman/DocumentGroup.class.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -111,7 +111,7 @@
$parent_doc_group = 0;
}
- $perm =& $this->Group->getPermission (session_get_user());
+ $perm =& $this->Group->getPermission ();
if (!$perm || !$perm->isDocEditor()) {
$this->setPermissionDeniedError();
return false;
@@ -155,7 +155,7 @@
* @return boolean
*/
function delete($doc_groupid,$project_group_id) {
- $perm =& $this->Group->getPermission (session_get_user());
+ $perm =& $this->Group->getPermission ();
if (!$perm || !$perm->isDocEditor()) {
$this->setPermissionDeniedError();
return false;
@@ -248,7 +248,7 @@
* @return boolean.
*/
function update($name,$parent_doc_group) {
- $perm =& $this->Group->getPermission (session_get_user());
+ $perm =& $this->Group->getPermission ();
if (!$perm || !$perm->isDocEditor()) {
$this->setPermissionDeniedError();
return false;
Modified: trunk/gforge/common/forum/Forum.class.php
===================================================================
--- trunk/gforge/common/forum/Forum.class.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/common/forum/Forum.class.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -160,7 +160,7 @@
} else {
// Current permissions check.
- $perm =& $this->Group->getPermission( session_get_user() );
+ $perm =& $this->Group->getPermission ();
if (!$perm || !is_object($perm) || !$perm->isForumAdmin()) {
$this->setPermissionDeniedError();
@@ -687,7 +687,7 @@
return true;//public forum, anonymous allowed, user not logged in
}
} else {
- $perm =& $this->Group->getPermission( session_get_user() );
+ $perm =& $this->Group->getPermission ();
if ( (!$perm->isMember() )) {
//the user isn't a member of the project
return true;
@@ -741,7 +741,7 @@
if (!session_loggedin()) {
return false;
} else {
- $perm =& $this->Group->getPermission( session_get_user() );
+ $perm =& $this->Group->getPermission ();
if (($this->getCurrentUserPerm() >= 2) || ($perm->isForumAdmin())) {
return true;
Modified: trunk/gforge/common/forum/ForumFactory.class.php
===================================================================
--- trunk/gforge/common/forum/ForumFactory.class.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/common/forum/ForumFactory.class.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -84,7 +84,7 @@
if (session_loggedin()) {
- $perm =& $this->Group->getPermission( session_get_user() );
+ $perm =& $this->Group->getPermission ();
if (!$perm || !is_object($perm) || !$perm->isMember()) {
$result = db_query_params ('SELECT * FROM forum_group_list_vw
WHERE group_id=$1
@@ -150,7 +150,7 @@
if (session_loggedin()) {
- $perm =& $this->Group->getPermission( session_get_user() );
+ $perm =& $this->Group->getPermission ();
if (!$perm || !is_object($perm) || !$perm->isForumAdmin()) {
$this->setError(_("You don't have a permission to access this page"));
$this->forums = false;
Modified: trunk/gforge/common/forum/ForumMessage.class.php
===================================================================
--- trunk/gforge/common/forum/ForumMessage.class.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/common/forum/ForumMessage.class.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -585,7 +585,7 @@
return false;
}
- /*$perm =& $this->Forum->Group->getPermission( session_get_user() );
+ /*$perm =& $this->Forum->Group->getPermission ();
if (!$perm || !is_object($perm) || !$perm->isForumAdmin()) {
$this->setPermissionDeniedError();
Modified: trunk/gforge/common/frs/FRSFile.class.php
===================================================================
--- trunk/gforge/common/frs/FRSFile.class.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/common/frs/FRSFile.class.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -108,7 +108,7 @@
return false;
}
- $perm =& $this->FRSRelease->FRSPackage->Group->getPermission( session_get_user() );
+ $perm =& $this->FRSRelease->FRSPackage->Group->getPermission ();
if (!$perm || !is_object($perm) || !$perm->isReleaseTechnician()) {
$this->setPermissionDeniedError();
@@ -320,7 +320,7 @@
* @return boolean success.
*/
function delete() {
- $perm =& $this->FRSRelease->FRSPackage->Group->getPermission( session_get_user() );
+ $perm =& $this->FRSRelease->FRSPackage->Group->getPermission ();
if (!$perm || !is_object($perm) || !$perm->isReleaseTechnician()) {
$this->setPermissionDeniedError();
@@ -358,7 +358,7 @@
* @return boolean success.
*/
function update($type_id,$processor_id,$release_time,$release_id=false) {
- $perm =& $this->FRSRelease->FRSPackage->Group->getPermission( session_get_user() );
+ $perm =& $this->FRSRelease->FRSPackage->Group->getPermission ();
if (!$perm || !is_object($perm) || !$perm->isReleaseTechnician()) {
$this->setPermissionDeniedError();
Modified: trunk/gforge/common/frs/FRSPackage.class.php
===================================================================
--- trunk/gforge/common/frs/FRSPackage.class.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/common/frs/FRSPackage.class.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -139,7 +139,7 @@
if (!util_is_valid_filename($name)) {
$this->setError(_('FRSPackage::Update: Package Name can only be alphanumeric or "-" "_" "+" "." "~"'));
}
- $perm =& $this->Group->getPermission( session_get_user() );
+ $perm =& $this->Group->getPermission ();
if (!$perm || !is_object($perm) || !$perm->isReleaseTechnician()) {
$this->setPermissionDeniedError();
@@ -370,7 +370,7 @@
return false;
}
- $perm =& $this->Group->getPermission( session_get_user() );
+ $perm =& $this->Group->getPermission ();
if (!$perm || !is_object($perm) || !$perm->isReleaseTechnician()) {
$this->setPermissionDeniedError();
@@ -453,7 +453,7 @@
$this->setMissingParamsError();
return false;
}
- $perm =& $this->Group->getPermission( session_get_user() );
+ $perm =& $this->Group->getPermission ();
if (!$perm || !is_object($perm) || !$perm->isReleaseTechnician()) {
$this->setPermissionDeniedError();
Modified: trunk/gforge/common/frs/FRSRelease.class.php
===================================================================
--- trunk/gforge/common/frs/FRSRelease.class.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/common/frs/FRSRelease.class.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -129,7 +129,7 @@
$preformatted = 0;
}
- $perm =& $this->FRSPackage->Group->getPermission( session_get_user() );
+ $perm =& $this->FRSPackage->Group->getPermission ();
if (!$perm || !is_object($perm) || !$perm->isReleaseTechnician()) {
$this->setPermissionDeniedError();
@@ -360,7 +360,7 @@
$this->setMissingParamsError();
return false;
}
- $perm =& $this->FRSPackage->Group->getPermission( session_get_user() );
+ $perm =& $this->FRSPackage->Group->getPermission ();
if (!$perm || !is_object($perm) || !$perm->isReleaseTechnician()) {
$this->setPermissionDeniedError();
@@ -408,7 +408,7 @@
return false;
}
- $perm =& $this->FRSPackage->Group->getPermission( session_get_user() );
+ $perm =& $this->FRSPackage->Group->getPermission ();
if (!$perm || !is_object($perm) || !$perm->isReleaseTechnician()) {
$this->setPermissionDeniedError();
Modified: trunk/gforge/common/include/Group.class.php
===================================================================
--- trunk/gforge/common/include/Group.class.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/common/include/Group.class.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -243,7 +243,7 @@
$systemGroups = array(GROUP_IS_NEWS, GROUP_IS_STATS, GROUP_IS_PEER_RATINGS);
if(!$this->isPublic() && !in_array($id, $systemGroups)) {
- $perm =& $this->getPermission(session_get_user());
+ $perm =& $this->getPermission ();
if (!$perm || !is_object($perm) || !$perm->isMember()) {
$this->setError(_('Permission denied'), ERROR__PERMISSION_DENIED_ERROR);
@@ -416,7 +416,7 @@
* @access public
*/
function updateAdmin(&$user, $is_public, $type_id, $unix_box, $http_domain) {
- $perm =& $this->getPermission($user);
+ $perm =& $this->getPermission ();
if (!$perm || !is_object($perm)) {
$this->setError(_('Could not get permission.'));
@@ -488,7 +488,7 @@
$new_doc_address,$send_all_docs,$logo_image_id,
$use_ftp,$use_tracker,$use_frs,$use_stats,$tags,$is_public) {
- $perm =& $this->getPermission($user);
+ $perm =& $this->getPermission ();
if (!$perm || !is_object($perm)) {
$this->setError(_('Could not get permission.'));
@@ -681,7 +681,7 @@
function setStatus(&$user, $status) {
global $SYS;
- $perm =& $this->getPermission($user);
+ $perm =& $this->getPermission ();
if (!$perm || !is_object($perm)) {
$this->setPermissionDeniedError();
return false;
@@ -1356,13 +1356,12 @@
}
/**
- * getPermission - Return a Permission for this Group and the specified User.
+ * getPermission - Return a Permission for this Group
*
- * @param object The user you wish to get permission for (usually the logged in user).
* @return object The Permission.
*/
- function &getPermission(&$_user) {
- return permission_get_object($this, $_user);
+ function &getPermission() {
+ return permission_get_object($this);
}
@@ -1372,7 +1371,7 @@
* @return boolean is_admin.
*/
function userIsAdmin() {
- $perm =& $this->getPermission( session_get_user() );
+ $perm =& $this->getPermission ();
if (!$perm || !is_object($perm)) {
return false;
} elseif ($perm->isError()) {
@@ -1393,7 +1392,7 @@
$this->setError(_('Cannot Delete System Group'));
return false;
}
- $perm =& $this->getPermission( session_get_user() );
+ $perm =& $this->getPermission ();
if (!$perm || !is_object($perm)) {
$this->setPermissionDeniedError();
return false;
@@ -1633,7 +1632,7 @@
Admins can add users to groups
*/
- $perm =& $this->getPermission( session_get_user() );
+ $perm =& $this->getPermission ();
if (!$perm || !is_object($perm) || !$perm->isAdmin()) {
$this->setPermissionDeniedError();
return false;
@@ -1806,7 +1805,7 @@
//users can remove themselves
//everyone else must be a project admin
} else {
- $perm =& $this->getPermission( session_get_user() );
+ $perm =& $this->getPermission ();
if (!$perm || !is_object($perm) || !$perm->isAdmin()) {
$this->setPermissionDeniedError();
@@ -1906,7 +1905,7 @@
function updateUser($user_id,$role_id) {
global $SYS;
- $perm =& $this->getPermission( session_get_user() );
+ $perm =& $this->getPermission ();
if (!$perm || !is_object($perm) || !$perm->isAdmin()) {
$this->setPermissionDeniedError();
return false;
Modified: trunk/gforge/common/include/GroupJoinRequest.class.php
===================================================================
--- trunk/gforge/common/include/GroupJoinRequest.class.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/common/include/GroupJoinRequest.class.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -281,7 +281,7 @@
$this->setError('Must be sure before deleting');
return false;
}
- $perm =& $this->Group->getPermission( session_get_user() );
+ $perm =& $this->Group->getPermission ();
if (!$perm || !is_object($perm)) {
$this->setPermissionDeniedError();
return false;
Modified: trunk/gforge/common/include/Navigation.class.php
===================================================================
--- trunk/gforge/common/include/Navigation.class.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/common/include/Navigation.class.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -285,8 +285,8 @@
if (session_loggedin()) {
$projectmaster =& group_get_object(GROUP_IS_MASTER);
$projectstats =& group_get_object(GROUP_IS_STATS);
- $permmaster =& $projectmaster->getPermission( session_get_user() );
- $permstats =& $projectstats->getPermission( session_get_user() );
+ $permmaster =& $projectmaster->getPermission ();
+ $permstats =& $projectstats->getPermission ();
if ($permmaster->isAdmin()) {
$user_is_super = true;
@@ -363,7 +363,7 @@
return;
}
- $perm =& $group->getPermission( session_get_user() );
+ $perm =& $group->getPermission ();
$selected = 0;
Modified: trunk/gforge/common/include/Permission.class.php
===================================================================
--- trunk/gforge/common/include/Permission.class.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/common/include/Permission.class.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -77,7 +77,7 @@
*
* @var int $group_id.
*/
- var $group_id
+ var $group_id;
/**
* Whether the user is an admin/super user of this project.
Modified: trunk/gforge/common/include/Role.class.php
===================================================================
--- trunk/gforge/common/include/Role.class.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/common/include/Role.class.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -298,7 +298,7 @@
* @return integer The id on success or false on failure.
*/
function create($role_name,$data) {
- $perm =& $this->Group->getPermission( session_get_user() );
+ $perm =& $this->Group->getPermission ();
if (!$perm || !is_object($perm) || $perm->isError() || !$perm->isAdmin()) {
$this->setPermissionDeniedError();
return false;
@@ -610,7 +610,7 @@
$this->setError('Cannot Update Default Role');
return false;
}
- $perm =& $this->Group->getPermission( session_get_user() );
+ $perm =& $this->Group->getPermission ();
if (!$perm || !is_object($perm) || $perm->isError() || !$perm->isAdmin()) {
$this->setPermissionDeniedError();
return false;
@@ -779,7 +779,7 @@
function setUser($user_id) {
global $SYS;
- $perm =& $this->Group->getPermission( session_get_user() );
+ $perm =& $this->Group->getPermission ();
if (!$perm || !is_object($perm) || $perm->isError() || !$perm->isAdmin()) {
$this->setPermissionDeniedError();
return false;
Modified: trunk/gforge/common/include/RoleObserver.class.php
===================================================================
--- trunk/gforge/common/include/RoleObserver.class.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/common/include/RoleObserver.class.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -182,7 +182,7 @@
* @return boolean True on success or false on failure.
*/
function update($data) {
- $perm =& $this->Group->getPermission( session_get_user() );
+ $perm =& $this->Group->getPermission ();
if (!$perm || !is_object($perm) || $perm->isError() || !$perm->isAdmin()) {
$this->setPermissionDeniedError();
return false;
Modified: trunk/gforge/common/include/User.class.php
===================================================================
--- trunk/gforge/common/include/User.class.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/common/include/User.class.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -1534,58 +1534,6 @@
return $role;
}
- function isMember($group_id, $type=0) {
- if (!session_loggedin()) {
- return false;
- }
-
- $project =& group_get_object($group_id);
-
- if (!$project || !is_object($project)) {
- exit_no_group();
- }
-
- $perm =& $project->getPermission( $this );
- if (!$perm || !is_object($perm) || !$perm->isMember()) {
- return false;
- }
-
- $type=strtoupper($type);
-
- switch ($type) {
- case 'P2' : {
- //pm admin
- return $perm->isPMAdmin();
- break;
- }
- case 'F2' : {
- //forum admin
- return $perm->isForumAdmin();
- break;
- }
- case '0' : {
- //just in this group
- return $perm->isMember();
- break;
- }
- case 'A' : {
- //admin for this group
- return $perm->isAdmin();
- break;
- }
- case 'D1' : {
- //document editor
- return $perm->isDocEditor();
- break;
- }
- default : {
- //fubar request
- return false;
- }
- }
- return false;
-
- }
}
/*
@@ -1623,7 +1571,7 @@
return false;
}
- $perm =& $project->getPermission( session_get_user() );
+ $perm =& $project->getPermission ();
if (!$perm || !is_object($perm) || !$perm->isMember()) {
return false;
}
Modified: trunk/gforge/common/include/session.php
===================================================================
--- trunk/gforge/common/include/session.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/common/include/session.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -366,7 +366,7 @@
exit_error('Error',$reason == '' ? $group->getErrorMessage() : $reason);
}
- $perm =& $group->getPermission( session_get_user() );
+ $perm =& $group->getPermission ();
if (!$perm || !is_object($perm) || $perm->isError()) {
exit_permission_denied($reason);
}
Modified: trunk/gforge/common/mail/MailingList.class.php
===================================================================
--- trunk/gforge/common/mail/MailingList.class.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/common/mail/MailingList.class.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -84,7 +84,7 @@
}
}
if (!$this->isPublic()) {
- $perm =& $this->Group->getPermission(session_get_user());
+ $perm =& $this->Group->getPermission ();
if (!$perm || !is_object($perm) || !$perm->isMember()) {
$this->setPermissionDeniedError();
@@ -402,7 +402,7 @@
* @return boolean true if the user can administrate mailing lists
*/
function userIsAdmin() {
- $perm = & $this->Group->getPermission(session_get_user());
+ $perm = & $this->Group->getPermission ();
if (!$perm || !is_object($perm)) {
return false;
} elseif ($perm->isAdmin()) {
Modified: trunk/gforge/common/mail/MailingListFactory.class.php
===================================================================
--- trunk/gforge/common/mail/MailingListFactory.class.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/common/mail/MailingListFactory.class.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -87,7 +87,7 @@
$public_flag = MAIL__MAILING_LIST_IS_PUBLIC;
- $perm = & $this->Group->getPermission(session_get_user());
+ $perm = & $this->Group->getPermission ();
if ($perm && is_object($perm) && $perm->isMember()) {
$public_flag = MAIL__MAILING_LIST_IS_PRIVATE.', '.MAIL__MAILING_LIST_IS_PUBLIC;
}
Modified: trunk/gforge/common/pm/ProjectCategory.class.php
===================================================================
--- trunk/gforge/common/pm/ProjectCategory.class.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/common/pm/ProjectCategory.class.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -96,7 +96,7 @@
return false;
}
- $perm =& $this->ProjectGroup->Group->getPermission (session_get_user());
+ $perm =& $this->ProjectGroup->Group->getPermission ();
if (!$perm || !$perm->isPMAdmin()) {
$this->setPermissionDeniedError();
return false;
@@ -175,7 +175,7 @@
* @return boolean success.
*/
function update($name) {
- $perm =& $this->ProjectGroup->Group->getPermission (session_get_user());
+ $perm =& $this->ProjectGroup->Group->getPermission ();
if (!$perm || !$perm->isPMAdmin()) {
$this->setPermissionDeniedError();
return false;
Modified: trunk/gforge/common/pm/ProjectGroup.class.php
===================================================================
--- trunk/gforge/common/pm/ProjectGroup.class.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/common/pm/ProjectGroup.class.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -144,7 +144,7 @@
}
}
- $perm =& $this->Group->getPermission( session_get_user() );
+ $perm =& $this->Group->getPermission ();
if (!$perm || !is_object($perm) || !$perm->isPMAdmin()) {
$this->setPermissionDeniedError();
@@ -585,7 +585,7 @@
if (!session_loggedin()) {
return false;
} else {
- $perm =& $this->Group->getPermission( session_get_user() );
+ $perm =& $this->Group->getPermission ();
if (($this->getCurrentUserPerm() >= 2) || ($perm->isPMAdmin())) {
return true;
@@ -604,7 +604,7 @@
if (!session_loggedin()) {
return false;
} else {
- $perm =& $this->Group->getPermission( session_get_user() );
+ $perm =& $this->Group->getPermission ();
if (($this->getCurrentUserPerm() >= 1) || ($perm->isPMAdmin())) {
return true;
Modified: trunk/gforge/common/pm/ProjectGroupFactory.class.php
===================================================================
--- trunk/gforge/common/pm/ProjectGroupFactory.class.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/common/pm/ProjectGroupFactory.class.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -83,7 +83,7 @@
return $this->projectGroups;
}
if (session_loggedin()) {
- $perm =& $this->Group->getPermission( session_get_user() );
+ $perm =& $this->Group->getPermission ();
if (!$perm || !is_object($perm) || !$perm->isMember()) {
$result = db_query_params ('SELECT * FROM project_group_list_vw WHERE group_id=$1 AND is_public=1 ORDER BY group_project_id',
array ($this->Group->getID())) ;
Modified: trunk/gforge/common/tracker/ArtifactType.class.php
===================================================================
--- trunk/gforge/common/tracker/ArtifactType.class.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/common/tracker/ArtifactType.class.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -202,7 +202,7 @@
function create($name,$description,$is_public,$allow_anon,$email_all,$email_address,
$due_period,$use_resolution,$submit_instructions,$browse_instructions,$datatype=0) {
- $perm =& $this->Group->getPermission( session_get_user() );
+ $perm =& $this->Group->getPermission ();
if (!$perm || !is_object($perm) || !$perm->isArtifactAdmin()) {
$this->setPermissionDeniedError();
@@ -1004,7 +1004,7 @@
if (!session_loggedin()) {
return false;
} else {
- $perm =& $this->Group->getPermission( session_get_user() );
+ $perm =& $this->Group->getPermission ();
if (($this->getCurrentUserPerm() >= 2) || ($perm->isArtifactAdmin())) {
return true;
@@ -1023,7 +1023,7 @@
if (!session_loggedin()) {
return false;
} else {
- $perm =& $this->Group->getPermission( session_get_user() );
+ $perm =& $this->Group->getPermission ();
if (($this->getCurrentUserPerm() >= 1) || ($perm->isArtifactAdmin())) {
return true;
Modified: trunk/gforge/common/tracker/ArtifactTypeFactory.class.php
===================================================================
--- trunk/gforge/common/tracker/ArtifactTypeFactory.class.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/common/tracker/ArtifactTypeFactory.class.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -89,7 +89,7 @@
return $this->ArtifactTypes;
}
if (session_loggedin()) {
- $perm =& $this->Group->getPermission( session_get_user() );
+ $perm =& $this->Group->getPermission ();
if (!$perm || !is_object($perm) || !$perm->isMember()) {
$result = db_query_params ('SELECT * FROM artifact_group_list_vw
WHERE group_id=$1
Modified: trunk/gforge/plugins/blocks/www/index.php
===================================================================
--- trunk/gforge/plugins/blocks/www/index.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/plugins/blocks/www/index.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -182,7 +182,7 @@
if ( ! ($group->usesPlugin ( $pluginname )) ) {//check if the group has the blocks plugin active
exit_error("Error", "First activate the $pluginname plugin through the Project's Admin Interface");
}
- $userperm = $group->getPermission($user);//we'll check if the user belongs to the group (optional)
+ $userperm = $group->getPermission ();//we'll check if the user belongs to the group (optional)
if ( !$userperm->IsMember()) {
exit_error("Access Denied", "You are not a member of this project");
}
@@ -199,7 +199,7 @@
if ( ! ($group->usesPlugin ( $pluginname )) ) {//check if the group has the blocks plugin active
exit_error("Error", "First activate the $pluginname plugin through the Project's Admin Interface");
}
- $userperm = $group->getPermission($user);//we'll check if the user belongs to the group
+ $userperm = $group->getPermission ();//we'll check if the user belongs to the group
if ( !$userperm->IsMember()) {
exit_error("Access Denied", "You are not a member of this project");
}
@@ -269,7 +269,7 @@
if ( ! ($group->usesPlugin ( $pluginname )) ) {//check if the group has the blocks plugin active
exit_error("Error", "First activate the $pluginname plugin through the Project's Admin Interface");
}
- $userperm = $group->getPermission($user);//we'll check if the user belongs to the group
+ $userperm = $group->getPermission ();//we'll check if the user belongs to the group
if ( !$userperm->IsMember()) {
exit_error("Access Denied", "You are not a member of this project");
}
@@ -324,7 +324,7 @@
if ( ! ($group->usesPlugin ( $pluginname )) ) {//check if the group has the blocks plugin active
exit_error("Error", "First activate the $pluginname plugin through the Project's Admin Interface");
}
- $userperm = $group->getPermission($user);//we'll check if the user belongs to the group
+ $userperm = $group->getPermission ();//we'll check if the user belongs to the group
if ( !$userperm->IsMember()) {
exit_error("Access Denied", "You are not a member of this project");
}
@@ -389,7 +389,7 @@
if ( ! ($group->usesPlugin ( $pluginname )) ) {//check if the group has the blocks plugin active
exit_error("Error", "First activate the $pluginname plugin through the Project's Admin Interface");
}
- $userperm = $group->getPermission($user);//we'll check if the user belongs to the group
+ $userperm = $group->getPermission ();//we'll check if the user belongs to the group
if ( !$userperm->IsMember()) {
exit_error("Access Denied", "You are not a member of this project");
}
Modified: trunk/gforge/plugins/contribtracker/www/index.php
===================================================================
--- trunk/gforge/plugins/contribtracker/www/index.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/plugins/contribtracker/www/index.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -61,7 +61,7 @@
exit_no_group () ;
}
if (!$group->isPublic()) {
- $perm =& $group->getPermission(session_get_user());
+ $perm =& $group->getPermission ();
if (!$perm || !is_object($perm) || !$perm->isMember()) {
exit_no_group () ;
Modified: trunk/gforge/plugins/mantis/www/index.php
===================================================================
--- trunk/gforge/plugins/mantis/www/index.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/plugins/mantis/www/index.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -56,7 +56,7 @@
if ( ! ($group->usesPlugin ( $pluginname )) ) {//check if the group has the HelloWorld plugin active
exit_error("Error", "First activate the $pluginname plugin through the Project's Admin Interface");
}
- $userperm = $group->getPermission($user);//we'll check if the user belongs to the group (optional)
+ $userperm = $group->getPermission ();//we'll check if the user belongs to the group (optional)
/**
if ( !$userperm->IsMember()) {
exit_error("Access Denied", "You are not a member of this project");
@@ -102,7 +102,7 @@
if ( ! ($group->usesPlugin ( $pluginname )) ) {//check if the group has the HelloWorld plugin active
exit_error("Error", "First activate the $pluginname plugin through the Project's Admin Interface");
}
- $userperm = $group->getPermission($user);//we'll check if the user belongs to the group
+ $userperm = $group->getPermission ();//we'll check if the user belongs to the group
if ( !$userperm->IsMember()) {
exit_error("Access Denied", "You are not a member of this project");
}
Modified: trunk/gforge/plugins/mediawiki/www/LocalSettings.php
===================================================================
--- trunk/gforge/plugins/mediawiki/www/LocalSettings.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/plugins/mediawiki/www/LocalSettings.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -132,7 +132,7 @@
if ($s) {
$u = user_get_object ($s);
$g = group_get_object_by_name ($fusionforgeproject) ;
- $perm =& $g->getPermission($u);
+ $perm =& $g->getPermission ();
$r =& $u->getRole($g) ;
$mwname = ucfirst($u->getUnixName ()) ;
Modified: trunk/gforge/plugins/projects_hierarchy/www/index.php
===================================================================
--- trunk/gforge/plugins/projects_hierarchy/www/index.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/plugins/projects_hierarchy/www/index.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -60,7 +60,7 @@
if ( ! ($group->usesPlugin ( $pluginname )) ) {//check if the group has the projects_hierarchy plugin active
exit_error("Error", "First activate the $pluginname plugin through the Project's Admin Interface");
}
- $userperm = $group->getPermission($user);//we'll check if the user belongs to the group (optional)
+ $userperm = $group->getPermission ();//we'll check if the user belongs to the group (optional)
if ( !$userperm->IsMember()) {
exit_error("Access Denied", "You are not a member of this project");
}
@@ -89,7 +89,7 @@
if ( ! ($group->usesPlugin ( $pluginname )) ) {//check if the group has the projects_hierarchy plugin active
exit_error("Error", "First activate the $pluginname plugin through the Project's Admin Interface");
}
- $userperm = $group->getPermission($user);//we'll check if the user belongs to the group
+ $userperm = $group->getPermission ();//we'll check if the user belongs to the group
if ( !$userperm->IsMember()) {
exit_error("Access Denied", "You are not a member of this project");
}
Modified: trunk/gforge/plugins/quota_management/www/index.php
===================================================================
--- trunk/gforge/plugins/quota_management/www/index.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/plugins/quota_management/www/index.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -57,7 +57,7 @@
if ( ! ($group->usesPlugin ( $pluginname )) ) {//check if the group has the quota_management plugin active
exit_error("Error", "First activate the $pluginname plugin through the Project's Admin Interface");
}
- $userperm = $group->getPermission($user);//we'll check if the user belongs to the group (optional)
+ $userperm = $group->getPermission ();//we'll check if the user belongs to the group (optional)
if ( !$userperm->IsMember()) {
exit_error("Access Denied", "You are not a member of this project");
}
@@ -86,7 +86,7 @@
if ( ! ($group->usesPlugin ( $pluginname )) ) {//check if the group has the quota_management plugin active
exit_error("Error", "First activate the $pluginname plugin through the Project's Admin Interface");
}
- $userperm = $group->getPermission($user);//we'll check if the user belongs to the group
+ $userperm = $group->getPermission ();//we'll check if the user belongs to the group
if ( !$userperm->IsMember()) {
exit_error("Access Denied", "You are not a member of this project");
}
Modified: trunk/gforge/plugins/scmccase/common/CCasePlugin.class.php
===================================================================
--- trunk/gforge/plugins/scmccase/common/CCasePlugin.class.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/plugins/scmccase/common/CCasePlugin.class.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -106,7 +106,7 @@
$anonymous = 1;
if (session_loggedin()) {
- $perm =& $project->getPermission(session_get_user());
+ $perm =& $project->getPermission ();
$anonymous = !$perm->isMember();
}
Modified: trunk/gforge/plugins/scmcvs/www/acl.php
===================================================================
--- trunk/gforge/plugins/scmcvs/www/acl.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/plugins/scmcvs/www/acl.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -58,8 +58,7 @@
exit_no_group();
}
- $perm =& permission_get_object($Group, $User);
- if (!$perm || !is_object($perm) || !$perm->isCVSWriter()) {
+ if (! forge_check_perm_for_user ($User, 'scm', $Group->getID(), 'write')) {
exit_permission_denied();
}
}
Modified: trunk/gforge/plugins/webcalendar/www/index.php
===================================================================
--- trunk/gforge/plugins/webcalendar/www/index.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/plugins/webcalendar/www/index.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -58,7 +58,7 @@
if ( ! ($group->usesPlugin ( $pluginname )) ) {//check if the group has the webcalendar plugin active
exit_error("Error", "First activate the $pluginname plugin through the Project's Admin Interface");
}
- $userperm = $group->getPermission($user);//we'll check if the user belongs to the group (optional)
+ $userperm = $group->getPermission ();//we'll check if the user belongs to the group (optional)
if ( !$userperm->IsMember()) {
exit_error("Access Denied", "You are not a member of this project");
}
@@ -87,7 +87,7 @@
if ( ! ($group->usesPlugin ( $pluginname )) ) {//check if the group has the webcalendar plugin active
exit_error("Error", "First activate the $pluginname plugin through the Project's Admin Interface");
}
- $userperm = $group->getPermission($user);//we'll check if the user belongs to the group
+ $userperm = $group->getPermission ();//we'll check if the user belongs to the group
if ( !$userperm->IsMember()) {
exit_error("Access Denied", "You are not a member of this project");
}
Modified: trunk/gforge/plugins/wiki/www/lib/WikiUser/GForge.php
===================================================================
--- trunk/gforge/plugins/wiki/www/lib/WikiUser/GForge.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/plugins/wiki/www/lib/WikiUser/GForge.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -46,7 +46,7 @@
$member = false ;
$user = session_get_user();
- $perm =& $project->getPermission($user);
+ $perm =& $project->getPermission ();
if (!$perm || !is_object($perm)) {
$this->_level = WIKIAUTH_ANON;
return false;
Modified: trunk/gforge/www/docman/admin/index.php
===================================================================
--- trunk/gforge/www/docman/admin/index.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/www/docman/admin/index.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -49,7 +49,7 @@
exit_no_group();
}
-$perm =& $g->getPermission( session_get_user() );
+$perm =& $g->getPermission ();
if (!$perm || $perm->isError() || !$perm->isDocEditor()) {
exit_permission_denied();
}
Modified: trunk/gforge/www/docman/include/doc_utils.php
===================================================================
--- trunk/gforge/www/docman/include/doc_utils.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/www/docman/include/doc_utils.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -80,7 +80,7 @@
if (session_loggedin()) {
- $perm =& $project->getPermission(session_get_user());
+ $perm =& $project->getPermission ();
if ($perm && is_object($perm) && !$perm->isError() && $perm->isDocEditor()) {
$menu_text[]=_('Admin');
$menu_links[]='/docman/admin/index.php?group_id='.$group_id;
@@ -99,7 +99,7 @@
$pub = array () ;
$pub[] = 1 ;
if (session_loggedin()) {
- $perm =& $g->getPermission( session_get_user() );
+ $perm =& $g->getPermission ();
if ($perm && is_object($perm) && $perm->isMember()) {
$pub[] = 4 ;
$pub[] = 5 ;
Modified: trunk/gforge/www/docman/index.php
===================================================================
--- trunk/gforge/www/docman/index.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/www/docman/index.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -99,7 +99,7 @@
}
// check if the user is docman's admin
-$perm =& $g->getPermission( session_get_user() );
+$perm =& $g->getPermission ();
if (!$perm || $perm->isError() || !$perm->isDocEditor()) {
$is_editor = false;
} else {
Modified: trunk/gforge/www/docman/new.php
===================================================================
--- trunk/gforge/www/docman/new.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/www/docman/new.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -110,7 +110,7 @@
setcookie ("gforgecurrentdocdata", "", time() - 3600);
}
// check if the user is docman's admin
- $perm =& $g->getPermission( session_get_user() );
+ $perm =& $g->getPermission ();
if (!$perm || $perm->isError() || !$perm->isDocEditor()) {
Header('Location: '.util_make_url('/docman/?group_id='.$group_id.'&feedback='._('Document submitted sucessfully : pending state (need validation)')));
exit;
Modified: trunk/gforge/www/docman/search.php
===================================================================
--- trunk/gforge/www/docman/search.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/www/docman/search.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -62,7 +62,7 @@
// check if the user is docman's admin
-$perm =& $g->getPermission( session_get_user() );
+$perm =& $g->getPermission ();
if (!$perm || $perm->isError() || !$perm->isDocEditor())
{
$is_editor = false;
Modified: trunk/gforge/www/forum/admin/ForumAdmin.class.php
===================================================================
--- trunk/gforge/www/forum/admin/ForumAdmin.class.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/www/forum/admin/ForumAdmin.class.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -42,7 +42,7 @@
if ($gid) {
$this->group_id = $group_id;
$this->g =& group_get_object($group_id);
- $this->p =& $this->g->getPermission( session_get_user() );
+ $this->p =& $this->g->getPermission ();
}
}
@@ -169,7 +169,7 @@
$this->setGroupIdError();
return false;
}
- $this->p =& $this->g->getPermission( session_get_user() );
+ $this->p =& $this->g->getPermission ();
if (!$this->p || !is_object($this->p) || $this->p->isError()) {
$this->setPermissionDeniedError();
return false;
Modified: trunk/gforge/www/forum/admin/index.php
===================================================================
--- trunk/gforge/www/forum/admin/index.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/www/forum/admin/index.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -45,7 +45,7 @@
exit_no_group();
}
- $p =& $g->getPermission( session_get_user() );
+ $p =& $g->getPermission ();
if (!$p || !is_object($p) || $p->isError()) {
exit_permission_denied();
}
Modified: trunk/gforge/www/forum/include/ForumHTML.class.php
===================================================================
--- trunk/gforge/www/forum/include/ForumHTML.class.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/www/forum/include/ForumHTML.class.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -118,7 +118,7 @@
}
} else {
$gg=&group_get_object($group_id);
- $perm =& $gg->getPermission( session_get_user() );
+ $perm =& $gg->getPermission ();
if ($perm->isForumAdmin()) {
$menu_text[]=_('Admin');
$menu_links[]='/forum/admin/?group_id='.$group_id;
Modified: trunk/gforge/www/frs/admin/deletepackage.php
===================================================================
--- trunk/gforge/www/frs/admin/deletepackage.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/www/frs/admin/deletepackage.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -39,7 +39,7 @@
if (!$project || $project->isError()) {
exit_error('Error',$project->getErrorMessage());
}
-$perm =& $project->getPermission(session_get_user());
+$perm =& $project->getPermission ();
if (!$perm->isReleaseTechnician()) {
exit_permission_denied();
}
Modified: trunk/gforge/www/frs/admin/deleterelease.php
===================================================================
--- trunk/gforge/www/frs/admin/deleterelease.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/www/frs/admin/deleterelease.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -42,7 +42,7 @@
exit_error('Error',$project->getErrorMessage());
}
-$perm =& $project->getPermission(session_get_user());
+$perm =& $project->getPermission ();
if (!$perm->isReleaseTechnician()) {
exit_permission_denied();
}
Modified: trunk/gforge/www/frs/admin/editrelease.php
===================================================================
--- trunk/gforge/www/frs/admin/editrelease.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/www/frs/admin/editrelease.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -46,7 +46,7 @@
if (!$g || $g->isError()) {
exit_error('Error',$g->getErrorMessage());
}
-$perm =& $g->getPermission(session_get_user());
+$perm =& $g->getPermission ();
if (!$perm->isReleaseTechnician()) {
exit_permission_denied();
}
Modified: trunk/gforge/www/frs/admin/index.php
===================================================================
--- trunk/gforge/www/frs/admin/index.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/www/frs/admin/index.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -40,7 +40,7 @@
if (!$project || $project->isError()) {
exit_error('Error',$project->getErrorMessage());
}
-$perm =& $project->getPermission(session_get_user());
+$perm =& $project->getPermission ();
if (!$perm->isReleaseTechnician()) {
exit_permission_denied();
}
Modified: trunk/gforge/www/frs/admin/qrs.php
===================================================================
--- trunk/gforge/www/frs/admin/qrs.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/www/frs/admin/qrs.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -28,7 +28,7 @@
// check the permissions and see if this user is a release manager.
// If so, he can create a release
-$perm =& $g->getPermission(session_get_user());
+$perm =& $g->getPermission ();
$can_post = $perm->isReleaseTechnician();
$packages = get_frs_packages($g);
Modified: trunk/gforge/www/frs/admin/showreleases.php
===================================================================
--- trunk/gforge/www/frs/admin/showreleases.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/www/frs/admin/showreleases.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -49,7 +49,7 @@
exit_error('Error',$project->getErrorMessage());
}
-$perm =& $project->getPermission(session_get_user());
+$perm =& $project->getPermission ();
if (!$perm->isReleaseTechnician()) {
exit_permission_denied();
}
Modified: trunk/gforge/www/frs/include/frs_utils.php
===================================================================
--- trunk/gforge/www/frs/include/frs_utils.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/www/frs/include/frs_utils.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -44,7 +44,7 @@
return;
}
- $perm =& $project->getPermission( session_get_user() );
+ $perm =& $project->getPermission ();
if (!$perm || !is_object($perm)) {
return;
}
@@ -83,7 +83,7 @@
site_project_header($params);
if (session_loggedin()) {
- $perm =& $project->getPermission(session_get_user());
+ $perm =& $project->getPermission ();
if ($perm && is_object($perm) && !$perm->isError() && $perm->isReleaseTechnician()) {
echo $HTML->subMenu(
array(
Modified: trunk/gforge/www/frs/index.php
===================================================================
--- trunk/gforge/www/frs/index.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/www/frs/index.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -82,7 +82,7 @@
// check the permissions and see if this user is a release manager.
// If so, offer the opportunity to create a release
- $perm =& $cur_group->getPermission(session_get_user());
+ $perm =& $cur_group->getPermission ();
if ($perm->isReleaseTechnician()) {
echo '<p><a href="admin/qrs.php?group_id='.$group_id.'">';
Modified: trunk/gforge/www/frs/reporting/downloads.php
===================================================================
--- trunk/gforge/www/frs/reporting/downloads.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/www/frs/reporting/downloads.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -61,7 +61,7 @@
if (!$g || $g->isError()) {
exit_error('Error',$g->getErrorMessage());
}
-$perm =& $g->getPermission(session_get_user());
+$perm =& $g->getPermission ();
if (!$perm->isReleaseTechnician()) {
exit_permission_denied();
}
Modified: trunk/gforge/www/include/project_home.php
===================================================================
--- trunk/gforge/www/include/project_home.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/www/include/project_home.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -93,7 +93,7 @@
}
else {
$project =& group_get_object($group_id);
- $perm =& $project->getPermission(session_get_user());
+ $perm =& $project->getPermission ();
if ($perm->isAdmin()) {
print '<p><a href="/project/admin/editgroupinfo.php?group_id=' . $group_id . '" >' . _('No tag defined for this project') . '</a>.</p>';
}
Modified: trunk/gforge/www/mail/admin/deletelist.php
===================================================================
--- trunk/gforge/www/mail/admin/deletelist.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/www/mail/admin/deletelist.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -27,7 +27,7 @@
exit_no_group();
}
-$perm =& $Group->getPermission(session_get_user());
+$perm =& $Group->getPermission ();
if (!$perm || !is_object($perm) || $perm->isError() || !$perm->isAdmin()) {
exit_permission_denied();
}
Modified: trunk/gforge/www/mail/admin/index.php
===================================================================
--- trunk/gforge/www/mail/admin/index.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/www/mail/admin/index.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -25,7 +25,7 @@
exit_no_group();
}
- $perm =& $Group->getPermission(session_get_user());
+ $perm =& $Group->getPermission ();
if (!$perm || !is_object($perm) || $perm->isError() || !$perm->isAdmin()) {
exit_permission_denied();
}
Modified: trunk/gforge/www/mail/mail_utils.php
===================================================================
--- trunk/gforge/www/mail/mail_utils.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/www/mail/mail_utils.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -27,7 +27,7 @@
site_project_header($params);
if (session_loggedin()) {
- $perm =& $project->getPermission(session_get_user());
+ $perm =& $project->getPermission ();
if ($perm && is_object($perm) && !$perm->isError() && $perm->isAdmin()) {
echo $HTML->subMenu(
array(
Modified: trunk/gforge/www/my/rmproject.php
===================================================================
--- trunk/gforge/www/my/rmproject.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/www/my/rmproject.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -56,7 +56,7 @@
Main code
*/
-$perm =& $group->getPermission(session_get_user());
+$perm =& $group->getPermission ();
if ( $perm->isAdmin() ) {
exit_error(
Modified: trunk/gforge/www/news/news_utils.php
===================================================================
--- trunk/gforge/www/news/news_utils.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/www/news/news_utils.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -54,7 +54,7 @@
if (session_loggedin()) {
$project =& group_get_object($params['group']);
if ($project && is_object($project) && !$project->isError()) {
- $perm =& $project->getPermission(session_get_user());
+ $perm =& $project->getPermission ();
if ($perm && is_object($perm) && !$perm->isError() && $perm->isAdmin()) {
$menu_texts[]=_('Admin');
$menu_links[]='/news/admin/?group_id='.$group_id;
Modified: trunk/gforge/www/pm/admin/index.php
===================================================================
--- trunk/gforge/www/pm/admin/index.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/www/pm/admin/index.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -39,7 +39,7 @@
exit_error('Error',$g->getErrorMessage());
}
-$perm =& $g->getPermission( session_get_user() );
+$perm =& $g->getPermission ();
$update_cat = getStringFromRequest('update_cat');
$add_cat = getStringFromRequest('add_cat');
Modified: trunk/gforge/www/pm/include/ProjectTaskHTML.class.php
===================================================================
--- trunk/gforge/www/pm/include/ProjectTaskHTML.class.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/www/pm/include/ProjectTaskHTML.class.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -78,7 +78,7 @@
$rows=db_numrows($res);
if ($rows > 0) {
- $perm =& $this->ProjectGroup->Group->getPermission( session_get_user() );
+ $perm =& $this->ProjectGroup->Group->getPermission ();
if (!$perm || !is_object($perm) || !$perm->isPMAdmin()) {
$is_admin=false;
Modified: trunk/gforge/www/pm/index.php
===================================================================
--- trunk/gforge/www/pm/index.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/www/pm/index.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -48,7 +48,7 @@
plugin_hook("blocks", "tasks index");
-$perm =& $g->getPermission( session_get_user() );
+$perm =& $g->getPermission ();
if ($perm->isPMAdmin()) {
$menu_text=array();
$menu_links=array();
Modified: trunk/gforge/www/pm/msproject/msp.php
===================================================================
--- trunk/gforge/www/pm/msproject/msp.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/www/pm/msproject/msp.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -231,7 +231,7 @@
$res['description']="No Such Group";
return $res;
} else {
- $perm =& $group->getPermission(session_get_user());
+ $perm =& $group->getPermission ();
if (!$perm || !is_object($perm)) {
$res['code']="error";
$res['description']="Could Not Get Perm Object";
Modified: trunk/gforge/www/pm/reporting/index.php
===================================================================
--- trunk/gforge/www/pm/reporting/index.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/www/pm/reporting/index.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -40,7 +40,7 @@
exit_error('Error',$g->getErrorMessage());
}
-$perm =& $g->getPermission( session_get_user() );
+$perm =& $g->getPermission ();
if (!$perm->isPMAdmin()) {
exit_permission_denied();
}
Modified: trunk/gforge/www/project/admin/index.php
===================================================================
--- trunk/gforge/www/project/admin/index.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/www/project/admin/index.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -44,7 +44,7 @@
exit_error('Error',$group->getErrorMessage());
}
-$perm =& $group->getPermission( session_get_user() );
+$perm =& $group->getPermission ();
if (!$perm || !is_object($perm)) {
exit_error('Error','Could Not Get Permission');
} elseif ($perm->isError()) {
Modified: trunk/gforge/www/project/admin/project_admin_utils.php
===================================================================
--- trunk/gforge/www/project/admin/project_admin_utils.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/www/project/admin/project_admin_utils.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -41,7 +41,7 @@
return;
}
- $perm =& $project->getPermission( session_get_user() );
+ $perm =& $project->getPermission ();
if (!$perm || !is_object($perm)) {
return;
}
Modified: trunk/gforge/www/project/admin/users.php
===================================================================
--- trunk/gforge/www/project/admin/users.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/www/project/admin/users.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -47,7 +47,7 @@
exit_error('Error',$group->getErrorMessage());
}
-$perm =& $group->getPermission( session_get_user() );
+$perm =& $group->getPermission ();
if (!$perm || !is_object($perm)) {
exit_error('Error','Could Not Get Permission');
} elseif ($perm->isError()) {
Modified: trunk/gforge/www/scm/include/scm_utils.php
===================================================================
--- trunk/gforge/www/scm/include/scm_utils.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/www/scm/include/scm_utils.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -45,7 +45,7 @@
Show horizontal links
*/
if (session_loggedin()) {
- $perm =& $project->getPermission(session_get_user());
+ $perm =& $project->getPermission ();
if ($perm && is_object($perm) && !$perm->isError() && $perm->isAdmin()) {
echo $HTML->subMenu(
array(
Modified: trunk/gforge/www/scm/viewvc.php
===================================================================
--- trunk/gforge/www/scm/viewvc.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/www/scm/viewvc.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -58,7 +58,7 @@
if (session_loggedin()) {
if (user_ismember($Group->getID())) {
- $perm = & $Group->getPermission(session_get_user());
+ $perm = & $Group->getPermission ();
if (!($perm && is_object($perm) && $perm->isCVSReader()) && !$Group->enableAnonSCM()) {
exit_permission_denied();
Modified: trunk/gforge/www/search/include/renderers/HtmlGroupSearchRenderer.class.php
===================================================================
--- trunk/gforge/www/search/include/renderers/HtmlGroupSearchRenderer.class.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/www/search/include/renderers/HtmlGroupSearchRenderer.class.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -80,7 +80,7 @@
function isGroupMember($groupId) {
$Group =& group_get_object($groupId);
if($Group && is_object($Group) && !$Group->isError() && session_loggedin()) {
- $perm =& $Group->getPermission(session_get_user());
+ $perm =& $Group->getPermission ();
if($perm && is_object($perm) && $perm->isMember()) {
return true;
}
Modified: trunk/gforge/www/snapshots.php
===================================================================
--- trunk/gforge/www/snapshots.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/www/snapshots.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -31,7 +31,7 @@
// logged in user belongs the group
$permission = $group->enableAnonSCM();
if(session_loggedin()) {
- $perm =& $group->getPermission(session_get_user());
+ $perm =& $group->getPermission ();
if ($perm && is_object($perm) && !$perm->isError() && $perm->isMember()) {
$permission = true;
}
Modified: trunk/gforge/www/survey/include/SurveyHTML.class.php
===================================================================
--- trunk/gforge/www/survey/include/SurveyHTML.class.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/www/survey/include/SurveyHTML.class.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -66,7 +66,7 @@
));
} else {
if (session_loggedin()) {
- $perm =& $project->getPermission(session_get_user());
+ $perm =& $project->getPermission ();
if ($perm && is_object($perm) && !$perm->isError() && $perm->isDocEditor()) {
echo ($HTML->subMenu(
Modified: trunk/gforge/www/survey/survey_utils.php
===================================================================
--- trunk/gforge/www/survey/survey_utils.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/www/survey/survey_utils.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -69,7 +69,7 @@
));
} else {
if (session_loggedin()) {
- $perm =& $project->getPermission(session_get_user());
+ $perm =& $project->getPermission ();
if ($perm && is_object($perm) && !$perm->isError() && $perm->isAdmin()) {
echo ($HTML->subMenu(
Modified: trunk/gforge/www/tarballs.php
===================================================================
--- trunk/gforge/www/tarballs.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/www/tarballs.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -28,7 +28,7 @@
$group->getErrorMessage());
}
-$perm =& $group->getPermission( session_get_user() );
+$perm =& $group->getPermission ();
if (!$perm || !is_object($perm)) {
exit_error(_('Error'),
_('Error creating permission'));
Modified: trunk/gforge/www/tracker/admin/ind.php
===================================================================
--- trunk/gforge/www/tracker/admin/ind.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/www/tracker/admin/ind.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -8,7 +8,7 @@
//
- $perm =& $group->getPermission( session_get_user() );
+ $perm =& $group->getPermission ();
if (getStringFromRequest('post_changes')) {
$name = getStringFromRequest('name');
Modified: trunk/gforge/www/tracker/admin/index.php
===================================================================
--- trunk/gforge/www/tracker/admin/index.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/www/tracker/admin/index.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -40,7 +40,7 @@
// UPDATING A PARTICULAR ARTIFACT TYPE
//
-/* $perm =& $group->getPermission( session_get_user() );
+/* $perm =& $group->getPermission ();
if (!$perm || !is_object($perm) || !$perm->isArtifactAdmin()) {
exit_permission_denied();
Modified: trunk/gforge/www/tracker/ind.php
===================================================================
--- trunk/gforge/www/tracker/ind.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/www/tracker/ind.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -20,7 +20,7 @@
echo site_project_header($params);
-$perm =& $group->getPermission( session_get_user() );
+$perm =& $group->getPermission ();
if ($perm->isArtifactAdmin()) {
$menu_text=array();
$menu_links=array();
Modified: trunk/gforge/www/tracker/mod.php
===================================================================
--- trunk/gforge/www/tracker/mod.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/www/tracker/mod.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -95,7 +95,7 @@
// kinda messy - but works for now
// need to get list of data types this person can admin
//
- $perm =& $group->getPermission(session_get_user());
+ $perm =& $group->getPermission ();
if ($perm->isArtifactAdmin()) {
$rsv = db_int_array_to_any_clause (array (0, 1, 2)) ;
} else {
Modified: trunk/gforge/www/tracker/reporting/index.php
===================================================================
--- trunk/gforge/www/tracker/reporting/index.php 2010-05-21 07:46:27 UTC (rev 9794)
+++ trunk/gforge/www/tracker/reporting/index.php 2010-05-21 07:46:43 UTC (rev 9795)
@@ -74,7 +74,7 @@
exit_not_logged_in();
}
-$perm =& $group->getPermission( session_get_user() );
+$perm =& $group->getPermission ();
if (!$perm || !is_object($perm)) {
exit_error('Error','Error - Could Not Get Perm');
} elseif ($perm->isError()) {
More information about the Fusionforge-commits
mailing list