Don't check Link header if not set

[quix0rs-gnu-social.git] / plugins / Directory / DirectoryPlugin.php

diff --git a/plugins/Directory/DirectoryPlugin.php b/plugins/Directory/DirectoryPlugin.php
index e061b89e467ea61215af4b70a4eeca880db0de76..e06c1c7271c5b64a1cd42d510d77b2d9faf8722e 100644 (file)
--- a/plugins/Directory/DirectoryPlugin.php
+++ b/plugins/Directory/DirectoryPlugin.php
@@ -71,19 +71,48 @@ class DirectoryPlugin extends Plugin
     /**
      * Map URLs to actions
      *
-     * @param Net_URL_Mapper $m path-to-action mapper
+     * @param URLMapper $m path-to-action mapper
      *
      * @return boolean hook value; true means continue processing,
      *         false means stop.
      */
-    function onRouterInitialized($m)
+    public function onRouterInitialized(URLMapper $m)
     {
 
+        $m->connect(
+            'directory/users/:filter/sort_by/:sort/reverse/:reverse',
+            array('action' => 'userdirectory'),
+            array('filter' => '[0-9a-zA-Z]|(0-9)'),            
+            array('sort' => '[a-z]+'),
+            array('reverse' => '[0-9]')                        
+        );
+
+        $m->connect(
+            'directory/users/:filter/sort_by/:sort',
+            array('action' => 'userdirectory'),
+            array('filter' => '[0-9a-zA-Z]|(0-9)'),            
+            array('sort' => '[a-z]+')            
+        );  
+
+
         $m->connect(
             'directory/users/:filter',
             array('action' => 'userdirectory'),
             array('filter' => '[0-9a-zA-Z]|(0-9)')
         );
+        
+        $m->connect(
+            'directory/users/sort_by/:sort/reverse/:reverse',
+            array('action' => 'userdirectory'),
+            array('sort' => '[a-z]+'),
+            array('reverse' => '[0-9]')                        
+        );
+
+        $m->connect(
+            'directory/users/sort_by/:sort',
+            array('action' => 'userdirectory'),
+            array('sort' => '[a-z]+')            
+        );        
 
         $m->connect(
             'directory/users',
@@ -101,6 +130,12 @@ class DirectoryPlugin extends Plugin
             array('action' => 'groupdirectory')
         );
 
+        $m->connect(
+            'groups/all',
+            array('action' => 'groupdirectory')
+        );
+
+
         return true;
     }
 
@@ -203,9 +238,9 @@ class DirectoryPlugin extends Plugin
         $nav->out->menuItem(
             common_local_url('userdirectory'),
             // TRANS: Menu item text for user directory.
-            _m('MENU','Directory'),
+            _m('MENU','People'),
             // TRANS: Menu item title for user directory.
-            _m('User Directory.'),
+            _m('People.'),
             $actionName == 'userdirectory',
             'nav_directory'
         );
@@ -216,7 +251,7 @@ class DirectoryPlugin extends Plugin
     /*
      * Version info
      */
-    function onPluginVersion(&$versions)
+    function onPluginVersion(array &$versions)
     {
         $versions[] = array(
             'name' => 'Directory',