]> git.mxchange.org Git - quix0rs-gnu-social.git/blobdiff - lib/router.php
projects / quix0rs-gnu-social.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Reorganized the OAuth app URLs and more work on the register app workflow
[quix0rs-gnu-social.git] / lib / router.php
diff --git a/lib/router.php b/lib/router.php
index d47828d1c12670a751ef6bf5800fb8d48d5dee8d..7b65ae215c85ce2ac02432d2cc2ca10d5d482160 100644 (file)
--- a/lib/router.php
+++ b/lib/router.php
@@ -88,7 +88,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 +99,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 +132,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 +140,11 @@ class Router
 
             // settings
 
-            foreach (array('profile', 'avatar', 'password', 'im',
+            foreach (array('profile', 'avatar', 'password', 'im', 'oauthconnections',
                            'email', 'sms', 'userdesign', 'other') as $s) {
                 $m->connect('settings/'.$s, array('action' => $s.'settings'));
             }
-
+        
             // search
 
             foreach (array('group', 'people', 'notice') as $s) {
@@ -166,10 +176,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 +203,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]+'));
@@ -277,15 +287,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 +305,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 +314,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 +323,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 +353,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 +378,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 +434,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
@@ -428,12 +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',
@@ -450,28 +496,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
 
@@ -576,6 +622,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._-]+'));
@@ -583,18 +634,25 @@ class Router
             // user stuff
 
             foreach (array('subscriptions', 'subscribers',
-                           'nudge', 'all', 'foaf', 'xrds',
+                           'nudge', 'all', 'foaf', 'xrds', 'apps',
                            'replies', 'inbox', 'outbox', 'microsummary') as $a) {
                 $m->connect(':nickname/'.$a,
                             array('action' => $a),
-                            array('nickname' => '['.NICKNAME_FMT.']{1,64}'));
+                            array('nickname' => '[a-zA-Z0-9]{1,64}'));
             }
+            
+            $m->connect('apps/new', array('action' => 'newapplication'));
+            
+            $m->connect(':nickname/apps/edit', 
+                array('action' => 'editapplication'),
+                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}'));
+                                  'nickname' => '[a-zA-Z0-9]{1,64}'));
             }
 
             foreach (array('rss', 'groups') as $a) {
@@ -606,31 +664,31 @@ class Router
             foreach (array('all', 'replies', 'favorites') as $a) {
                 $m->connect(':nickname/'.$a.'/rss',
                             array('action' => $a.'rss'),
-                            array('nickname' => '['.NICKNAME_FMT.']{1,64}'));
+                            array('nickname' => '[a-zA-Z0-9]{1,64}'));
             }
 
             $m->connect(':nickname/favorites',
                         array('action' => 'showfavorites'),
-                        array('nickname' => '['.NICKNAME_FMT.']{1,64}'));
+                        array('nickname' => '[a-zA-Z0-9]{1,64}'));
 
             $m->connect(':nickname/avatar/:size',
                         array('action' => 'avatarbynickname'),
                         array('size' => '(original|96|48|24)',
-                              'nickname' => '['.NICKNAME_FMT.']{1,64}'));
+                              'nickname' => '[a-zA-Z0-9]{1,64}'));
 
             $m->connect(':nickname/tag/:tag/rss',
                         array('action' => 'userrss'),
-                        array('nickname' => '['.NICKNAME_FMT.']{1,64}'),
+                        array('nickname' => '[a-zA-Z0-9]{1,64}'),
                         array('tag' => '[a-zA-Z0-9]+'));
 
             $m->connect(':nickname/tag/:tag',
                         array('action' => 'showstream'),
-                        array('nickname' => '['.NICKNAME_FMT.']{1,64}'),
+                        array('nickname' => '[a-zA-Z0-9]{1,64}'),
                         array('tag' => '[a-zA-Z0-9]+'));
 
             $m->connect(':nickname',
                         array('action' => 'showstream'),
-                        array('nickname' => '['.NICKNAME_FMT.']{1,64}'));
+                        array('nickname' => '[a-zA-Z0-9]{1,64}'));
 
             Event::handle('RouterInitialized', array($m));
         }
This is my personal clone from the wonderful software GNUSocial. I may fix or break things here, so use it on your own risk. :-)