Bug: 13049 Honor resource_management perms.

horde · Aug 29, 2014 · ccbd210 · ccbd210
1 parent 93853e2
commit ccbd210
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/kronolith/lib/Ajax/Application/Handler.php b/kronolith/lib/Ajax/Application/Handler.php
@@ -1046,7 +1046,8 @@ public function saveCalendar()
             if (!$calendar_id) {
                 // New resource
                 // @TODO: Groups.
-                if (!$GLOBALS['registry']->isAdmin()) {
+                if (!$GLOBALS['registry']->isAdmin() &&
+                    !$GLOBALS['injector']->getInstance('Horde_Core_Perms')->hasAppPermission('resource_management')) {
                     $GLOBALS['notification']->push(_("You are not allowed to create new resources."), 'horde.error');
                     return $result;
                 }

diff --git a/kronolith/lib/Resource/Base.php b/kronolith/lib/Resource/Base.php
@@ -99,7 +99,8 @@ public function set($property, $value)
     public function hasPermission($user, $permission = Horde_Perms::READ, $restrict = null)
     {
         if (($permission & (Horde_Perms::EDIT | Horde_Perms::DELETE)) &&
-            !$GLOBALS['registry']->isAdmin()) {
+            !$GLOBALS['registry']->isAdmin() &&
+            !$GLOBALS['injector']->getInstance('Horde_Core_Perms')->hasAppPermission('resource_management')) {
             return false;
         }