Show media namespaces in ACL manager

Ignore-this: b46799f7d65081eaa364ecaab8a2c7f9

Namespaces that only exist within the media directory are now merged with the
page namespaces in tree explorer of the namespace manager

darcs-hash:20090807094607-7ad00-3ce30cffc528e7e20a4b19d8f30d1f3725806162.gz

2 files changed, 46 insertions, 8 deletions

diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php
index 5014c282c..977bfc883 100644
--- a/lib/plugins/acl/admin.php
+++ b/lib/plugins/acl/admin.php
@@ -31,8 +31,8 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
         return array(
             'author' => 'Andreas Gohr',
             'email'  => 'andi@splitbrain.org',
-            'date'   => '2008-12-16',
-            'name'   => 'ACL',
+            'date'   => '2009-08-07',
+            'name'   => 'ACL Manager',
             'desc'   => 'Manage Page Access Control Lists',
             'url'    => 'http://dokuwiki.org/plugin:acl',
         );
@@ -221,10 +221,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
         }
         $ns  = utf8_encodeFN(str_replace(':','/',$ns));
 
-
-        $data = array();
-        search($data,$conf['datadir'],'search_index',array('ns' => $ns));
-
+        $data = $this->_get_tree($ns);
 
         // wrap a list with the root level around the other namespaces
         $item = array( 'level' => 0, 'id' => '*', 'type' => 'd',
@@ -244,6 +241,48 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
     }
 
     /**
+     * get a combined list of media and page files
+     *
+     * @param string $folder an already converted filesystem folder of the current namespace
+     * @param string $limit  limit the search to this folder
+     */
+    function _get_tree($folder,$limit=''){
+        global $conf;
+
+        // read tree structure from pages and media
+        $data = array();
+        search($data,$conf['datadir'],'search_index',array('ns' => $folder),$limit);
+        $media = array();
+        search($media,$conf['mediadir'],'search_index',array('ns' => $folder, 'nofiles' => true),$limit);
+        $data = array_merge($data,$media);
+        unset($media);
+
+        // combine by sorting and removing duplicates
+        usort($data,array($this,'_tree_sort'));
+        $count = count($data);
+        if($count>0) for($i=1; $i<$count; $i++){
+            if($data[$i]['type'] == 'f') break; // namespaces come first, we're done
+            if($data[$i-1]['id'] == $data[$i]['id']) unset($data[$i]);
+        }
+        return $data;
+    }
+
+    /**
+     * usort callback
+     *
+     * Sorts the combined trees of media and page files
+     */
+    function _tree_sort($a,$b){
+        if($a['type'] == 'd' && $b['type'] == 'f'){
+            return -1;
+        }elseif($a['type'] == 'f' && $b['type'] == 'd'){
+            return 1;
+        }else{
+            return strcmp($a['id'],$b['id']);
+        }
+    }
+
+    /**
      * Display the current ACL for selected where/who combination with
      * selectors and modification form
      *
diff --git a/lib/plugins/acl/ajax.php b/lib/plugins/acl/ajax.php
index daed03306..54eaa8dc7 100644
--- a/lib/plugins/acl/ajax.php
+++ b/lib/plugins/acl/ajax.php
@@ -45,8 +45,7 @@ if($ajax == 'info'){
     $lvl = count(explode(':',$ns));
     $ns  = utf8_encodeFN(str_replace(':','/',$ns));
 
-    $data = array();
-    search($data,$conf['datadir'],'search_index',array('ns' => $ns),$ns);
+    $data = $acl->_get_tree($ns,$ns);
 
     foreach($data as $item){
         $item['level'] = $lvl+1;