X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Frouter.php;h=03765b39ddae8b8050d9c961fbf70d51a8085627;hb=84b5480007d30280cc9c829fe1316db0f853f64c;hp=b143cd53790e6ca86483b39745740b57d7c21868;hpb=bcb0447eda21cc997fd447b2be3343cb1454bb33;p=quix0rs-gnu-social.git

diff --git a/lib/router.php b/lib/router.php
index b143cd5379..03765b39dd 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -73,12 +73,6 @@ class Router
 
         if (Event::handle('StartInitializeRouter', array(&$m))) {
 
-            // In the "root"
-
-            $m->connect('', array('action' => 'public'));
-            $m->connect('rss', array('action' => 'publicrss'));
-            $m->connect('featuredrss', array('action' => 'featuredrss'));
-            $m->connect('favoritedrss', array('action' => 'favoritedrss'));
             $m->connect('opensearch/people', array('action' => 'opensearch',
                                                    'type' => 'people'));
             $m->connect('opensearch/notice', array('action' => 'opensearch',
@@ -88,7 +82,10 @@ 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'=>'.+'));
+            $m->connect('main/otp/:user_id/:token',
+                        array('action' => 'otp'),
+                        array('user_id' => '[0-9]+',
+                              'token' => '.+'));
 
             // main stuff is repetitive
 
@@ -96,7 +93,14 @@ class Router
                           '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));
@@ -122,7 +126,7 @@ class Router
             // exceptional
 
             $m->connect('main/remote', array('action' => 'remotesubscribe'));
-            $m->connect('main/remote?nickname=:nickname', array('action' => 'remotesubscribe'), array('nickname' => '['.NICKNAME_FMT.']+'));
+            $m->connect('main/remote?nickname=:nickname', array('action' => 'remotesubscribe'), array('nickname' => '[A-Za-z0-9_-]+'));
 
             foreach (Router::$bare as $action) {
                 $m->connect('index.php?action=' . $action, array('action' => $action));
@@ -130,11 +134,23 @@ class Router
 
             // settings
 
-            foreach (array('profile', 'avatar', 'password', 'im',
-                           'email', 'sms', 'userdesign', 'other') as $s) {
+            foreach (array('profile', 'avatar', 'password', 'im', 'oauthconnections',
+                           'oauthapps', 'email', 'sms', 'userdesign', 'other') as $s) {
                 $m->connect('settings/'.$s, array('action' => $s.'settings'));
             }
 
+            $m->connect('settings/oauthapps/show/:id',
+                array('action' => 'showapplication'),
+                array('id' => '[0-9]+')
+            );
+            $m->connect('settings/oauthapps/new',
+                array('action' => 'newapplication')
+            );
+            $m->connect('settings/oauthapps/edit/:id',
+                array('action' => 'editapplication'),
+                array('id' => '[0-9]+')
+            );
+
             // search
 
             foreach (array('group', 'people', 'notice') as $s) {
@@ -166,10 +182,10 @@ class Router
             $m->connect('notice/new', array('action' => 'newnotice'));
             $m->connect('notice/new?replyto=:replyto',
                         array('action' => 'newnotice'),
-                        array('replyto' => '['.NICKNAME_FMT.']+'));
+                        array('replyto' => '[A-Za-z0-9_-]+'));
             $m->connect('notice/new?replyto=:replyto&inreplyto=:inreplyto',
                         array('action' => 'newnotice'),
-                        array('replyto' => '['.NICKNAME_FMT.']+'),
+                        array('replyto' => '[A-Za-z0-9_-]+'),
                         array('inreplyto' => '[0-9]+'));
 
             $m->connect('notice/:notice/file',
@@ -193,7 +209,7 @@ class Router
                         array('id' => '[0-9]+'));
 
             $m->connect('message/new', array('action' => 'newmessage'));
-            $m->connect('message/new?to=:to', array('action' => 'newmessage'), array('to' => '['.NICKNAME_FMT.']+'));
+            $m->connect('message/new?to=:to', array('action' => 'newmessage'), array('to' => '[A-Za-z0-9_-]+'));
             $m->connect('message/:message',
                         array('action' => 'showmessage'),
                         array('message' => '[0-9]+'));
@@ -217,11 +233,6 @@ class Router
                         array('action' => 'peopletag'),
                         array('tag' => '[a-zA-Z0-9]+'));
 
-            $m->connect('featured/', array('action' => 'featured'));
-            $m->connect('featured', array('action' => 'featured'));
-            $m->connect('favorited/', array('action' => 'favorited'));
-            $m->connect('favorited', array('action' => 'favorited'));
-
             // groups
 
             $m->connect('group/new', array('action' => 'newgroup'));
@@ -277,15 +288,16 @@ class Router
 
             $m->connect('api/statuses/friends_timeline/:id.:format',
                         array('action' => 'ApiTimelineFriends',
-                              'id' => '['.NICKNAME_FMT.']+',
+                              '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',
-                              'id' => '['.NICKNAME_FMT.']+',
+                        array('action' => 'ApiTimelineHome',
+                              'id' => '[a-zA-Z0-9]+',
                               'format' => '(xml|json|rss|atom)'));
 
             $m->connect('api/statuses/user_timeline.:format',
@@ -294,7 +306,7 @@ class Router
 
             $m->connect('api/statuses/user_timeline/:id.:format',
                         array('action' => 'ApiTimelineUser',
-                              'id' => '['.NICKNAME_FMT.']+',
+                              'id' => '[a-zA-Z0-9]+',
                               'format' => '(xml|json|rss|atom)'));
 
             $m->connect('api/statuses/mentions.:format',
@@ -303,7 +315,7 @@ class Router
 
             $m->connect('api/statuses/mentions/:id.:format',
                         array('action' => 'ApiTimelineMentions',
-                              'id' => '['.NICKNAME_FMT.']+',
+                              'id' => '[a-zA-Z0-9]+',
                               'format' => '(xml|json|rss|atom)'));
 
             $m->connect('api/statuses/replies.:format',
@@ -312,16 +324,28 @@ class Router
 
             $m->connect('api/statuses/replies/:id.:format',
                         array('action' => 'ApiTimelineMentions',
-                              'id' => '['.NICKNAME_FMT.']+',
+                              '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)'));
 
             $m->connect('api/statuses/friends/:id.:format',
                         array('action' => 'ApiUserFriends',
-                              'id' => '['.NICKNAME_FMT.']+',
+                              'id' => '[a-zA-Z0-9]+',
                               'format' => '(xml|json)'));
 
             $m->connect('api/statuses/followers.:format',
@@ -330,7 +354,7 @@ class Router
 
             $m->connect('api/statuses/followers/:id.:format',
                         array('action' => 'ApiUserFollowers',
-                              'id' => '['.NICKNAME_FMT.']+',
+                              'id' => '[a-zA-Z0-9]+',
                               'format' => '(xml|json)'));
 
             $m->connect('api/statuses/show.:format',
@@ -355,11 +379,25 @@ 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' => '['.NICKNAME_FMT.']+',
+                              'id' => '[a-zA-Z0-9]+',
                               'format' => '(xml|json)'));
 
             // direct messages
@@ -397,30 +435,30 @@ class Router
 
             $m->connect('api/friendships/create/:id.:format',
                         array('action' => 'ApiFriendshipsCreate',
-                              'id' => '['.NICKNAME_FMT.']+',
+                              'id' => '[a-zA-Z0-9]+',
                               'format' => '(xml|json)'));
 
             $m->connect('api/friendships/destroy/:id.:format',
                         array('action' => 'ApiFriendshipsDestroy',
-                              'id' => '['.NICKNAME_FMT.']+',
+                              'id' => '[a-zA-Z0-9]+',
                               'format' => '(xml|json)'));
 
             // 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
@@ -459,28 +497,28 @@ class Router
 
             $m->connect('api/favorites/:id.:format',
                         array('action' => 'ApiTimelineFavorites',
-                              'id' => '['.NICKNAME_FMT.']+',
+                              'id' => '[a-zA-Z0-9]+',
                               'format' => '(xmljson|rss|atom)'));
 
             $m->connect('api/favorites/create/:id.:format',
                         array('action' => 'ApiFavoriteCreate',
-                              'id' => '['.NICKNAME_FMT.']+',
+                              'id' => '[a-zA-Z0-9]+',
                               'format' => '(xml|json)'));
 
             $m->connect('api/favorites/destroy/:id.:format',
                         array('action' => 'ApiFavoriteDestroy',
-                              'id' => '['.NICKNAME_FMT.']+',
+                              'id' => '[a-zA-Z0-9]+',
                               'format' => '(xml|json)'));
             // blocks
 
             $m->connect('api/blocks/create/:id.:format',
                         array('action' => 'ApiBlockCreate',
-                              'id' => '['.NICKNAME_FMT.']+',
+                              'id' => '[a-zA-Z0-9]+',
                               'format' => '(xml|json)'));
 
             $m->connect('api/blocks/destroy/:id.:format',
                         array('action' => 'ApiBlockDestroy',
-                              'id' => '['.NICKNAME_FMT.']+',
+                              'id' => '[a-zA-Z0-9]+',
                               'format' => '(xml|json)'));
             // help
 
@@ -585,64 +623,146 @@ class Router
             $m->connect('api/search.json', array('action' => 'twitapisearchjson'));
             $m->connect('api/trends.json', array('action' => 'twitapitrends'));
 
+            $m->connect('api/oauth/request_token',
+                        array('action' => 'apioauthrequesttoken'));
+
+            $m->connect('api/oauth/access_token',
+                        array('action' => 'apioauthaccesstoken'));
+
+            $m->connect('api/oauth/authorize',
+                        array('action' => 'apioauthauthorize'));
+
+            // Admin
+
             $m->connect('admin/site', array('action' => 'siteadminpanel'));
             $m->connect('admin/design', array('action' => 'designadminpanel'));
+            $m->connect('admin/user', array('action' => 'useradminpanel'));
+	    $m->connect('admin/access', array('action' => 'accessadminpanel'));
+            $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',
-                           'nudge', 'all', 'foaf', 'xrds',
-                           'replies', 'inbox', 'outbox', 'microsummary') as $a) {
-                $m->connect(':nickname/'.$a,
-                            array('action' => $a),
-                            array('nickname' => '['.NICKNAME_FMT.']{1,64}'));
-            }
-
-            foreach (array('subscriptions', 'subscribers') as $a) {
-                $m->connect(':nickname/'.$a.'/:tag',
-                            array('action' => $a),
-                            array('tag' => '[a-zA-Z0-9]+',
-                                  'nickname' => '['.NICKNAME_FMT.']{1,64}'));
-            }
+            // In the "root"
 
-            foreach (array('rss', 'groups') as $a) {
-                $m->connect(':nickname/'.$a,
-                            array('action' => 'user'.$a),
+            if (common_config('singleuser', 'enabled')) {
+
+                $nickname = common_config('singleuser', 'nickname');
+
+                foreach (array('subscriptions', 'subscribers',
+                               'all', 'foaf', 'xrds',
+                               'replies', 'microsummary') as $a) {
+                    $m->connect($a,
+                                array('action' => $a,
+                                      'nickname' => $nickname));
+                }
+
+                foreach (array('subscriptions', 'subscribers') as $a) {
+                    $m->connect($a.'/:tag',
+                                array('action' => $a,
+                                      'nickname' => $nickname),
+                                array('tag' => '[a-zA-Z0-9]+'));
+                }
+
+                foreach (array('rss', 'groups') as $a) {
+                    $m->connect($a,
+                                array('action' => 'user'.$a,
+                                      'nickname' => $nickname));
+                }
+
+                foreach (array('all', 'replies', 'favorites') as $a) {
+                    $m->connect($a.'/rss',
+                                array('action' => $a.'rss',
+                                      'nickname' => $nickname));
+                }
+
+                $m->connect('favorites',
+                            array('action' => 'showfavorites',
+                                  'nickname' => $nickname));
+
+                $m->connect('avatar/:size',
+                            array('action' => 'avatarbynickname',
+                                  'nickname' => $nickname),
+                            array('size' => '(original|96|48|24)'));
+
+                $m->connect('tag/:tag/rss',
+                            array('action' => 'userrss',
+                                  'nickname' => $nickname),
+                            array('tag' => '[a-zA-Z0-9]+'));
+
+                $m->connect('tag/:tag',
+                            array('action' => 'showstream',
+                                  'nickname' => $nickname),
+                            array('tag' => '[a-zA-Z0-9]+'));
+
+                $m->connect('',
+                            array('action' => 'showstream',
+                                  'nickname' => $nickname));
+
+            } else {
+
+                $m->connect('', array('action' => 'public'));
+                $m->connect('rss', array('action' => 'publicrss'));
+                $m->connect('featuredrss', array('action' => 'featuredrss'));
+                $m->connect('favoritedrss', array('action' => 'favoritedrss'));
+                $m->connect('featured/', array('action' => 'featured'));
+                $m->connect('featured', array('action' => 'featured'));
+                $m->connect('favorited/', array('action' => 'favorited'));
+                $m->connect('favorited', array('action' => 'favorited'));
+
+                foreach (array('subscriptions', 'subscribers',
+                               'nudge', 'all', 'foaf', 'xrds',
+                               'replies', 'inbox', 'outbox', 'microsummary') as $a) {
+                    $m->connect(':nickname/'.$a,
+                                array('action' => $a),
+                                array('nickname' => '[a-zA-Z0-9]{1,64}'));
+                }
+
+                foreach (array('subscriptions', 'subscribers') as $a) {
+                    $m->connect(':nickname/'.$a.'/:tag',
+                                array('action' => $a),
+                                array('tag' => '[a-zA-Z0-9]+',
+                                      'nickname' => '[a-zA-Z0-9]{1,64}'));
+                }
+
+                foreach (array('rss', 'groups') as $a) {
+                    $m->connect(':nickname/'.$a,
+                                array('action' => 'user'.$a),
+                                array('nickname' => '[a-zA-Z0-9]{1,64}'));
+                }
+
+                foreach (array('all', 'replies', 'favorites') as $a) {
+                    $m->connect(':nickname/'.$a.'/rss',
+                                array('action' => $a.'rss'),
+                                array('nickname' => '[a-zA-Z0-9]{1,64}'));
+                }
+
+                $m->connect(':nickname/favorites',
+                            array('action' => 'showfavorites'),
                             array('nickname' => '[a-zA-Z0-9]{1,64}'));
-            }
 
-            foreach (array('all', 'replies', 'favorites') as $a) {
-                $m->connect(':nickname/'.$a.'/rss',
-                            array('action' => $a.'rss'),
-                            array('nickname' => '['.NICKNAME_FMT.']{1,64}'));
-            }
+                $m->connect(':nickname/avatar/:size',
+                            array('action' => 'avatarbynickname'),
+                            array('size' => '(original|96|48|24)',
+                                  'nickname' => '[a-zA-Z0-9]{1,64}'));
 
-            $m->connect(':nickname/favorites',
-                        array('action' => 'showfavorites'),
-                        array('nickname' => '['.NICKNAME_FMT.']{1,64}'));
+                $m->connect(':nickname/tag/:tag/rss',
+                            array('action' => 'userrss'),
+                            array('nickname' => '[a-zA-Z0-9]{1,64}'),
+                            array('tag' => '[a-zA-Z0-9]+'));
 
-            $m->connect(':nickname/avatar/:size',
-                        array('action' => 'avatarbynickname'),
-                        array('size' => '(original|96|48|24)',
-                              'nickname' => '['.NICKNAME_FMT.']{1,64}'));
+                $m->connect(':nickname/tag/:tag',
+                            array('action' => 'showstream'),
+                            array('nickname' => '[a-zA-Z0-9]{1,64}'),
+                            array('tag' => '[a-zA-Z0-9]+'));
 
-            $m->connect(':nickname/tag/:tag/rss',
-                        array('action' => 'userrss'),
-                        array('nickname' => '['.NICKNAME_FMT.']{1,64}'),
-                        array('tag' => '[a-zA-Z0-9]+'));
-
-            $m->connect(':nickname/tag/:tag',
-                        array('action' => 'showstream'),
-                        array('nickname' => '['.NICKNAME_FMT.']{1,64}'),
-                        array('tag' => '[a-zA-Z0-9]+'));
+                $m->connect(':nickname',
+                            array('action' => 'showstream'),
+                            array('nickname' => '[a-zA-Z0-9]{1,64}'));
+            }
 
-            $m->connect(':nickname',
-                        array('action' => 'showstream'),
-                        array('nickname' => '['.NICKNAME_FMT.']{1,64}'));
+            // user stuff
 
             Event::handle('RouterInitialized', array($m));
         }