[jan] Allow to edit permissions of another user's rules if that user …

…assigned ownership.
horde · Jan 19, 2016 · 6b0aaf0 · 6b0aaf0
1 parent 153f0a5
commit 6b0aaf0
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/docs/CHANGES b/docs/CHANGES
@@ -2,6 +2,8 @@
 v3.2.8-git
 ----------
 
+[jan] Allow to edit permissions of another user's rules if that user assigned
+      ownership.
 [jan] Use access rules compatible with both Apache 2.2 and 2.4.
 [jan] Fix variable name in vacation_addresses hook example.
 [jan] Correctly save names of mailbox created from the rule form (Bug #14150).

diff --git a/lib/Application.php b/lib/Application.php
@@ -143,8 +143,14 @@ public function menu($menu)
             $menu->add(Ingo_Basic_Script::url(), _("_Script"), 'ingo-script', null, null, null, $vars->page == 'script' ? 'current' : '__noselection');
         }
 
-        if ($injector->getInstance('Ingo_Shares') &&
+        if (($shares = $injector->getInstance('Ingo_Shares')) &&
             empty($conf['share']['no_sharing'])) {
+            if ($shares->getShare($session->get('ingo', 'current_share'))->get('owner') == $registry->getAuth()) {
+                $share = $session->get('ingo', 'current_share');
+            } else {
+                $share = $session->get('ingo', 'backend/id')
+                    . ':' . $registry->getAuth();
+            }
             $menu->add(
                 '#',
                 _("_Permissions"),
@@ -160,8 +166,7 @@ public function menu($menu)
                     array(
                         'params' => array(
                             'app' => 'ingo',
-                            'share' => $session->get('ingo', 'backend/id')
-                                . ':' . $registry->getAuth()
+                            'share' => $share
                         ),
                         'urlencode' => true
                     )

diff --git a/package.xml b/package.xml
@@ -33,6 +33,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/apache">ASL</license>
  <notes>
+* [jan] Allow to edit permissions of another user&apos;s rules if that user assigned ownership.
 * [jan] Use access rules compatible with both Apache 2.2 and 2.4.
 * [jan] Fix variable name in vacation_addresses hook example.
 * [jan] Correctly save names of mailbox created from the rule form (Bug #14150).
@@ -1614,6 +1615,7 @@
    <date>2016-01-13</date>
    <license uri="http://www.horde.org/licenses/apache">ASL</license>
    <notes>
+* [jan] Allow to edit permissions of another user&apos;s rules if that user assigned ownership.
 * [jan] Use access rules compatible with both Apache 2.2 and 2.4.
 * [jan] Fix variable name in vacation_addresses hook example.
 * [jan] Correctly save names of mailbox created from the rule form (Bug #14150).