X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Frouter.php;h=1a090861e49b65583322e3fdace69a2d351a3449;hb=15a9c869794ea3948086afa5310696e1250d9a26;hp=eb931e5b071d8ebe74bec349fc4342b2ca99d561;hpb=066331bdf7496bed328ef545e409e121603da75b;p=quix0rs-gnu-social.git

diff --git a/lib/router.php b/lib/router.php
index eb931e5b07..1a090861e4 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -88,15 +88,16 @@ class Router
 
             $m->connect('doc/:title', array('action' => 'doc'));
 
-            $m->connect('main/login?user_id=:user_id&token=:token', array('action'=>'login'), 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',
+                          'deleteuser');
 
             foreach ($main as $a) {
                 $m->connect('main/'.$a, array('action' => $a));
@@ -357,6 +358,10 @@ class Router
 
             // 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]+',
@@ -428,9 +433,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',
@@ -573,6 +590,11 @@ 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._-]+'));