Simplify

horde · Jul 31, 2014 · 682330d · 682330d
1 parent d02bd0e
commit 682330d
Showing 1 changed file with 9 additions and 12 deletions.
diff --git a/turba/lib/Api.php b/turba/lib/Api.php
@@ -190,7 +190,7 @@ public function getGalUid()
     public function browse($path = '',
                           $properties = array('name', 'icon', 'browseable'))
     {
-        global $injector, $session;
+        global $injector, $registry, $session;
 
         // Strip off the application name if present
         if (substr($path, 0, 5) == 'turba') {
@@ -269,17 +269,14 @@ public function browse($path = '',
                     // No backends are configured to provide shares
                     return array();
                 }
-                $addressbooks = $injector->getInstance('Turba_Shares')->listShares($parts[0], array(
-                    'attributes' => $parts[0],
-                    'perm' => Horde_Perms::READ
-                ));
-
-                /* The last check returns all addressbooks for the requested
-                 * user, but that does not mean the requesting user has access
-                 * to them.
-                 * Filter out those address books for which the requesting
-                 * user has no access. */
-                $addressbooks = Turba::permissionsFilter($addressbooks);
+                $addressbooks = $injector->getInstance('Turba_Shares')
+                    ->listShares(
+                        $registry->getAuth(),
+                        array(
+                            'attributes' => $parts[0],
+                            'perm' => Horde_Perms::READ
+                        )
+                    );
             }
 
             $curpath = 'turba/' . $parts[0] . '/';