Peter M. Groen / knowledgetree

Commit c5146fda1ffdf7fc0b79d50bd593c8502499d9aa

Authored by nbm
1 parent af4fcf58

Rename $_adminAlwaysAvailable to $_bAdminAlwaysAvailable to fit style. 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@4728 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 2 changed files with 4 additions and 4 deletions
lib/actions/folderaction.inc.php
  View file @c5146fd
@@ -12,7 +12,7 @@ class KTFolderAction extends KTStandardDispatcher { @@ -12,7 +12,7 @@ class KTFolderAction extends KTStandardDispatcher {
12 var $_sShowPermission; 12 var $_sShowPermission;
13 var $_sDisablePermission; 13 var $_sDisablePermission;
14 14
15 - var $_adminAlwaysAvailable = false; 15 + var $_bAdminAlwaysAvailable = false;
16 16
17 var $_bDisabled; 17 var $_bDisabled;
18 var $_sDisabledText = null; 18 var $_sDisabledText = null;
@@ -46,7 +46,7 @@ class KTFolderAction extends KTStandardDispatcher { @@ -46,7 +46,7 @@ class KTFolderAction extends KTStandardDispatcher {
46 if (PEAR::isError($oPermission)) { 46 if (PEAR::isError($oPermission)) {
47 return true; 47 return true;
48 } 48 }
49 - return (KTPermissionUtil::userHasPermissionOnItem($this->oUser, $oPermission, $this->oFolder) || (($this->_adminAlwaysAvailable) && (Permission::userIsSystemAdministrator($this->oUser->getId())))); 49 + return (KTPermissionUtil::userHasPermissionOnItem($this->oUser, $oPermission, $this->oFolder) || (($this->_bAdminAlwaysAvailable) && (Permission::userIsSystemAdministrator($this->oUser->getId()))));
50 } 50 }
51 51
52 function _disable() { 52 function _disable() {
@@ -119,7 +119,7 @@ class KTFolderAction extends KTStandardDispatcher { @@ -119,7 +119,7 @@ class KTFolderAction extends KTStandardDispatcher {
119 if (!is_null($this->_sShowPermission)) { 119 if (!is_null($this->_sShowPermission)) {
120 $oPermission =& KTPermission::getByName($this->_sShowPermission); 120 $oPermission =& KTPermission::getByName($this->_sShowPermission);
121 if (!PEAR::isError($oPermission)) { 121 if (!PEAR::isError($oPermission)) {
122 - $res = (KTPermissionUtil::userHasPermissionOnItem($this->oUser, $oPermission, $this->oFolder) || (($this->_adminAlwaysAvailable) && (Permission::userIsSystemAdministrator($this->oUser->getId())))); 122 + $res = (KTPermissionUtil::userHasPermissionOnItem($this->oUser, $oPermission, $this->oFolder) || (($this->_bAdminAlwaysAvailable) && (Permission::userIsSystemAdministrator($this->oUser->getId()))));
123 if (!$res) { 123 if (!$res) {
124 return false; 124 return false;
125 } 125 }
plugins/ktcore/KTFolderActions.php
  View file @c5146fd
@@ -58,7 +58,7 @@ class KTFolderPermissionsAction extends KTFolderAction { @@ -58,7 +58,7 @@ class KTFolderPermissionsAction extends KTFolderAction {
58 var $sName = 'ktcore.actions.folder.permissions'; 58 var $sName = 'ktcore.actions.folder.permissions';
59 59
60 var $_sShowPermission = "ktcore.permissions.write"; 60 var $_sShowPermission = "ktcore.permissions.write";
61 - var $_adminAlwaysAvailable = true; 61 + var $_bAdminAlwaysAvailable = true;
62 var $bAutomaticTransaction = true; 62 var $bAutomaticTransaction = true;
63 63
64 function do_main() { 64 function do_main() {