Peter M. Groen / knowledgetree

Commit 67ca731318bb2bd6227c52fcc8761760b23120e8

Authored by nbm
1 parent 6ec60e60

Use new ktcore.permissions.addFolder permission to see if a user can add 

a folder.


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@3514 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 8 additions and 2 deletions
presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderBL.php
  View file @67ca731
... ... @@ -65,7 +65,14 @@ require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/fo
65 65 require_once("$default->fileSystemRoot/presentation/Html.inc");
66 66 require_once("addFolderUI.inc");
67 67  
68   -if (!Permission::userHasFolderWritePermission($oFolder)) {
  68 +require_once(KT_LIB_DIR . '/permissions/permission.inc.php');
  69 +require_once(KT_LIB_DIR . '/permissions/permissionutil.inc.php');
  70 +
  71 +// if (!Permission::userHasFolderWritePermission($oFolder)) {
  72 +$oPermission = KTPermission::getByName('ktcore.permissions.addFolder');
  73 +$oUser =& User::get($_SESSION['userID']);
  74 +KTPermissionUtil::userHasPermissionOnItem($oUser, $oPermission, $oFolder);
  75 +if (KTPermissionUtil::userHasPermissionOnItem($oUser, $oPermission, $oFolder) !== true) {
69 76 //if the user doesn't have write permission for this folder,
70 77 //give them only browse facilities
71 78 require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
... ... @@ -77,7 +84,6 @@ if (!Permission::userHasFolderWritePermission($oFolder)) {
77 84 exit(0);
78 85 }
79 86  
80   -
81 87 if (!isset($fFolderName)) {
82 88 require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
83 89  
... ...