Added the new pinghandler to the stopdaemons script and improved the behaviour and...

[quix0rs-gnu-social.git] / lib / router.php

diff --git a/lib/router.php b/lib/router.php
index d4a4d2ca9361d53c597cf3a0980ad11545721307..52051fdb50a8c05aa43f70d57fd9382a2f6e2675 100644 (file)
--- a/lib/router.php
+++ b/lib/router.php
@@ -49,6 +49,9 @@ class Router
 {
     var $m = null;
     static $inst = null;
+    static $bare = array('requesttoken', 'accesstoken', 'userauthorization',
+                         'postnotice', 'updateprofile', 'finishremotesubscribe',
+                         'finishopenidlogin', 'finishaddopenid');
 
     static function get()
     {
@@ -118,8 +121,7 @@ class Router
         $m->connect('main/remote', array('action' => 'remotesubscribe'));
         $m->connect('main/remote?nickname=:nickname', array('action' => 'remotesubscribe'), array('nickname' => '[A-Za-z0-9_-]+'));
 
-        foreach (array('requesttoken', 'accesstoken', 'userauthorization',
-                    'postnotice', 'updateprofile', 'finishremotesubscribe') as $action) {
+        foreach (Router::$bare as $action) {
             $m->connect('index.php?action=' . $action, array('action' => $action));
         }
 
@@ -228,14 +230,15 @@ class Router
 
         // users
 
-        $m->connect('api/users/show/:argument',
+        $m->connect('api/users/:method/:argument',
                     array('action' => 'api',
-                          'apiaction' => 'users'));
+                          'apiaction' => 'users'),
+                    array('method' => 'show(\.(xml|json))?'));
 
         $m->connect('api/users/:method',
                     array('action' => 'api',
                           'apiaction' => 'users'),
-                    array('method' => 'show(\.(xml|json|atom|rss))?'));
+                    array('method' => 'show(\.(xml|json))?'));
 
         // direct messages
 
@@ -276,21 +279,20 @@ class Router
                           'apiaction' => 'friendships'),
                     array('method' => 'exists(\.(xml|json|rss|atom))'));
 
-
         // Social graph
 
         $m->connect('api/friends/ids/:argument',
                     array('action' => 'api',
                           'apiaction' => 'statuses',
                           'method' => 'friendsIDs'));
-                                                   
+
         foreach (array('xml', 'json') as $e) {
             $m->connect('api/friends/ids.'.$e,
                         array('action' => 'api',
                               'apiaction' => 'statuses',
                               'method' => 'friendsIDs.'.$e));
         }
-                                                    
+
         $m->connect('api/followers/ids/:argument',
                     array('action' => 'api',
                           'apiaction' => 'statuses',
@@ -351,9 +353,14 @@ class Router
                     array('action' => 'api',
                           'apiaction' => 'laconica'));
 
+        // search
+        $m->connect('api/search.atom', array('action' => 'twitapisearchatom'));
+        $m->connect('api/search.json', array('action' => 'twitapisearchjson'));
+        $m->connect('api/trends.json', array('action' => 'twitapitrends'));
+
         // user stuff
 
-        foreach (array('subscriptions', 'subscribers',
+      foreach (array('subscriptions', 'subscribers',
                        'nudge', 'xrds', 'all', 'foaf',
                        'replies', 'inbox', 'outbox', 'microsummary') as $a) {
             $m->connect(':nickname/'.$a,