X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Frouter.php;h=6b87ed27f61bbabe099a19380ff3c840ae8143b2;hb=392bc728c795dd50e19a56cb097ab9a64f129573;hp=2fd255fe6ff6161ad0f486f09f58410cd180adaa;hpb=c0f8c0178a3cccead97fb0800a514b0ac9dbde64;p=quix0rs-gnu-social.git

diff --git a/lib/router.php b/lib/router.php
index 2fd255fe6f..6b87ed27f6 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -88,13 +88,25 @@ class Router
 
             $m->connect('doc/:title', array('action' => 'doc'));
 
+            $m->connect('main/otp/:user_id/:token',
+                        array('action' => 'otp'),
+                        array('user_id' => '[0-9]+',
+                              'token' => '.+'));
+
             // main stuff is repetitive
 
             $main = array('login', 'logout', 'register', 'subscribe',
                           'unsubscribe', 'confirmaddress', 'recoverpassword',
                           'invite', 'favor', 'disfavor', 'sup',
                           'block', 'unblock', 'subedit',
-                          'groupblock', 'groupunblock');
+                          'groupblock', 'groupunblock',
+                          'sandbox', 'unsandbox',
+                          'silence', 'unsilence',
+                          'repeat',
+                          'deleteuser',
+                          'geocode',
+                          'version',
+                          );
 
             foreach ($main as $a) {
                 $m->connect('main/'.$a, array('action' => $a));
@@ -108,6 +120,9 @@ class Router
             $m->connect('main/oembed',
                         array('action' => 'oembed'));
 
+            $m->connect('main/xrds',
+                        array('action' => 'publicxrds'));
+
             // these take a code
 
             foreach (array('register', 'confirmaddress', 'recoverpassword') as $c) {
@@ -274,12 +289,13 @@ class Router
                         array('action' => 'ApiTimelineFriends',
                               'id' => '[a-zA-Z0-9]+',
                               'format' => '(xml|json|rss|atom)'));
+
             $m->connect('api/statuses/home_timeline.:format',
-                        array('action' => 'ApiTimelineFriends',
+                        array('action' => 'ApiTimelineHome',
                               'format' => '(xml|json|rss|atom)'));
 
             $m->connect('api/statuses/home_timeline/:id.:format',
-                        array('action' => 'ApiTimelineFriends',
+                        array('action' => 'ApiTimelineHome',
                               'id' => '[a-zA-Z0-9]+',
                               'format' => '(xml|json|rss|atom)'));
 
@@ -310,6 +326,18 @@ class Router
                               'id' => '[a-zA-Z0-9]+',
                               'format' => '(xml|json|rss|atom)'));
 
+            $m->connect('api/statuses/retweeted_by_me.:format',
+                        array('action' => 'ApiTimelineRetweetedByMe',
+                              'format' => '(xml|json|atom)'));
+
+            $m->connect('api/statuses/retweeted_to_me.:format',
+                        array('action' => 'ApiTimelineRetweetedToMe',
+                              'format' => '(xml|json|atom)'));
+
+            $m->connect('api/statuses/retweets_of_me.:format',
+                        array('action' => 'ApiTimelineRetweetsOfMe',
+                              'format' => '(xml|json|atom)'));
+
             $m->connect('api/statuses/friends.:format',
                         array('action' => 'ApiUserFriends',
                               'format' => '(xml|json)'));
@@ -350,18 +378,27 @@ class Router
                               'id' => '[0-9]+',
                               'format' => '(xml|json)'));
 
+            $m->connect('api/statuses/retweet/:id.:format',
+                        array('action' => 'ApiStatusesRetweet',
+                              'id' => '[0-9]+',
+                              'format' => '(xml|json)'));
+
+            $m->connect('api/statuses/retweets/:id.:format',
+                        array('action' => 'ApiStatusesRetweets',
+                              'id' => '[0-9]+',
+                              'format' => '(xml|json)'));
+
             // users
 
+            $m->connect('api/users/show.:format',
+                        array('action' => 'ApiUserShow',
+                              'format' => '(xml|json)'));
+
             $m->connect('api/users/show/:id.:format',
                         array('action' => 'ApiUserShow',
                               'id' => '[a-zA-Z0-9]+',
                               'format' => '(xml|json)'));
 
-            $m->connect('api/users/:method',
-                        array('action' => 'api',
-                              'apiaction' => 'users'),
-                        array('method' => 'show(\.(xml|json))?'));
-
             // direct messages
 
             $m->connect('api/direct_messages.:format',
@@ -408,19 +445,19 @@ class Router
             // Social graph
 
             $m->connect('api/friends/ids/:id.:format',
-                        array('action' => 'apiFriends',
+                        array('action' => 'apiuserfriends',
                               'ids_only' => true));
 
             $m->connect('api/followers/ids/:id.:format',
-                        array('action' => 'apiFollowers',
+                        array('action' => 'apiuserfollowers',
                               'ids_only' => true));
 
             $m->connect('api/friends/ids.:format',
-                        array('action' => 'apiFriends',
+                        array('action' => 'apiuserfriends',
                               'ids_only' => true));
 
             $m->connect('api/followers/ids.:format',
-                        array('action' => 'apiFollowers',
+                        array('action' => 'apiuserfollowers',
                               'ids_only' => true));
 
             // account
@@ -428,6 +465,21 @@ class Router
             $m->connect('api/account/verify_credentials.:format',
                         array('action' => 'ApiAccountVerifyCredentials'));
 
+            $m->connect('api/account/update_profile.:format',
+                        array('action' => 'ApiAccountUpdateProfile'));
+
+            $m->connect('api/account/update_profile_image.:format',
+                        array('action' => 'ApiAccountUpdateProfileImage'));
+
+            $m->connect('api/account/update_profile_background_image.:format',
+                        array('action' => 'ApiAccountUpdateProfileBackgroundImage'));
+
+            $m->connect('api/account/update_profile_colors.:format',
+                        array('action' => 'ApiAccountUpdateProfileColors'));
+
+            $m->connect('api/account/update_delivery_device.:format',
+                        array('action' => 'ApiAccountUpdateDeliveryDevice'));
+
             // special case where verify_credentials is called w/out a format
 
             $m->connect('api/account/verify_credentials',
@@ -456,13 +508,6 @@ class Router
                         array('action' => 'ApiFavoriteDestroy',
                               'id' => '[a-zA-Z0-9]+',
                               'format' => '(xml|json)'));
-
-            // notifications
-
-            $m->connect('api/notifications/:method/:argument',
-                        array('action' => 'api',
-                              'apiaction' => 'favorites'));
-
             // blocks
 
             $m->connect('api/blocks/create/:id.:format',
@@ -577,6 +622,15 @@ class Router
             $m->connect('api/search.json', array('action' => 'twitapisearchjson'));
             $m->connect('api/trends.json', array('action' => 'twitapitrends'));
 
+            $m->connect('admin/site', array('action' => 'siteadminpanel'));
+            $m->connect('admin/design', array('action' => 'designadminpanel'));
+            $m->connect('admin/user', array('action' => 'useradminpanel'));
+            $m->connect('admin/paths', array('action' => 'pathsadminpanel'));
+
+            $m->connect('getfile/:filename',
+                        array('action' => 'getfile'),
+                        array('filename' => '[A-Za-z0-9._-]+'));
+
             // user stuff
 
             foreach (array('subscriptions', 'subscribers',