X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Frouter.php;h=cab98022b320a9dba678ae6daee0006f0c1d525c;hb=4f454abf7bc5d4a0e30a71e5ce5f73e71d40fff2;hp=1cbbffd4dfd9ea18f99d8d91aaae0b72ea236a2c;hpb=1d8b19fe545e62370dc7c1810478021473d5357f;p=quix0rs-gnu-social.git

diff --git a/lib/router.php b/lib/router.php
index 1cbbffd4df..cab98022b3 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -34,7 +34,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
 /**
  * URL Router
  *
- * Cheap wrapper around Net_URL_Mapper
+ * Cheap wrapper around URLMapper
  *
  * @category URL
  * @package  StatusNet
@@ -143,7 +143,7 @@ class Router
             $main = array('login', 'logout', 'register', 'subscribe',
                           'unsubscribe', 'cancelsubscription', 'approvesub',
                           'confirmaddress', 'recoverpassword',
-                          'invite', 'favor', 'disfavor', 'sup',
+                          'invite', 'sup',
                           'block', 'unblock', 'subedit',
                           'groupblock', 'groupunblock',
                           'sandbox', 'unsandbox',
@@ -163,14 +163,14 @@ class Router
                 $m->connect('main/'.$a, array('action' => $a));
             }
 
+            $m->connect('main/public', array('action' => 'public'));
+            $m->connect('main/all', array('action' => 'networkpublic'));
+
             $m->connect('main/tagprofile/:id', array('action' => 'tagprofile'),
                                                array('id' => '[0-9]+'));
 
             $m->connect('main/tagprofile', array('action' => 'tagprofile'));
 
-            $m->connect('main/oembed',
-                        array('action' => 'oembed'));
-
             $m->connect('main/xrds',
                         array('action' => 'publicxrds'));
 
@@ -212,7 +212,7 @@ class Router
 
             // The second of these is needed to make the link work correctly
             // when inserted into the page. The first is needed to match the
-            // route on the way in. Seems to be another Net_URL_Mapper bug to me.
+            // route on the way in. Seems to be another URLMapper bug to me.
             $m->connect('search/notice/rss?q=:q', array('action' => 'noticesearchrss'),
                         array('q' => '.+'));
             $m->connect('search/notice/rss', array('action' => 'noticesearchrss'));
@@ -221,10 +221,6 @@ class Router
                         array('action' => 'attachment'),
                         array('attachment' => '[0-9]+'));
 
-            $m->connect('attachment/:attachment/ajax',
-                        array('action' => 'attachment_ajax'),
-                        array('attachment' => '[0-9]+'));
-
             $m->connect('attachment/:attachment/thumbnail',
                         array('action' => 'attachment_thumbnail'),
                         array('attachment' => '[0-9]+'));
@@ -240,10 +236,6 @@ class Router
 
             $m->connect('notice/new', array('action' => 'newnotice'));
 
-            $m->connect('notice/:notice/file',
-                        array('action' => 'file'),
-                        array('notice' => '[0-9]+'));
-
             $m->connect('notice/:notice',
                         array('action' => 'shownotice'),
                         array('notice' => '[0-9]+'));
@@ -254,22 +246,11 @@ class Router
 
             $m->connect('notice/delete', array('action' => 'deletenotice'));
 
-            $m->connect('bookmarklet/new', array('action' => 'bookmarklet'));
-
             // conversation
 
             $m->connect('conversation/:id',
                         array('action' => 'conversation'),
                         array('id' => '[0-9]+'));
-            $m->connect('conversation/:id/replies',
-                        array('action' => 'conversationreplies'),
-                        array('id' => '[0-9]+'));
-
-            $m->connect('message/new', array('action' => 'newmessage'));
-            $m->connect('message/new?to=:to', array('action' => 'newmessage'), array('to' => Nickname::DISPLAY_FMT));
-            $m->connect('message/:message',
-                        array('action' => 'showmessage'),
-                        array('message' => '[0-9]+'));
 
             $m->connect('user/:id',
                         array('action' => 'userbyid'),
@@ -353,6 +334,11 @@ class Router
                         array('action' => 'ApiTimelinePublic',
                               'format' => '(xml|json|rss|atom|as)'));
 
+            // this is not part of the Twitter API. Also may require authentication depending on server config!
+            $m->connect('api/statuses/networkpublic_timeline.:format',
+                        array('action' => 'ApiTimelineNetworkPublic',
+                              'format' => '(xml|json|rss|atom|as)'));
+
             $m->connect('api/statuses/friends_timeline/:id.:format',
                         array('action' => 'ApiTimelineFriends',
                               'id' => Nickname::INPUT_FMT,
@@ -397,6 +383,15 @@ class Router
             $m->connect('api/statuses/replies.:format',
                         array('action' => 'ApiTimelineMentions',
                               'format' => '(xml|json|rss|atom|as)'));
+ 
+            $m->connect('api/statuses/mentions_timeline/:id.:format',
+                        array('action' => 'ApiTimelineMentions',
+                              'id' => Nickname::INPUT_FMT,
+                              'format' => '(xml|json|rss|atom|as)'));
+
+            $m->connect('api/statuses/mentions_timeline.:format',
+                        array('action' => 'ApiTimelineMentions',
+                              'format' => '(xml|json|rss|atom|as)'));
 
             $m->connect('api/statuses/retweeted_by_me.:format',
                         array('action' => 'ApiTimelineRetweetedByMe',
@@ -461,11 +456,6 @@ class Router
                               'format' => '(xml|json)'));
 
             // START qvitter API additions
-
-            $m->connect('api/statuses/favs/:id.:format',
-                        array('action' => 'ApiStatusesFavs',
-                              'id' => '[0-9]+',
-                              'format' => '(xml|json)'));
             
             $m->connect('api/attachment/:id.:format',
                         array('action' => 'ApiAttachment',
@@ -519,21 +509,6 @@ class Router
                               'screen_name' => Nickname::DISPLAY_FMT,
                               'format' => '(xml|json)'));
 
-            // direct messages
-
-            $m->connect('api/direct_messages.:format',
-                        array('action' => 'ApiDirectMessage',
-                              'format' => '(xml|json|rss|atom)'));
-
-            $m->connect('api/direct_messages/sent.:format',
-                        array('action' => 'ApiDirectMessage',
-                              'format' => '(xml|json|rss|atom)',
-                              'sent' => true));
-
-            $m->connect('api/direct_messages/new.:format',
-                        array('action' => 'ApiDirectMessageNew',
-                              'format' => '(xml|json)'));
-
             // friendships
 
             $m->connect('api/friendships/show.:format',
@@ -602,26 +577,6 @@ class Router
             $m->connect('api/account/rate_limit_status.:format',
                         array('action' => 'ApiAccountRateLimitStatus'));
 
-            // favorites
-
-            $m->connect('api/favorites/:id.:format',
-                        array('action' => 'ApiTimelineFavorites',
-                              'id' => Nickname::INPUT_FMT,
-                              'format' => '(xml|json|rss|atom|as)'));
-
-            $m->connect('api/favorites.:format',
-                        array('action' => 'ApiTimelineFavorites',
-                              'format' => '(xml|json|rss|atom|as)'));
-
-            $m->connect('api/favorites/create/:id.:format',
-                        array('action' => 'ApiFavoriteCreate',
-                              'id' => '[0-9]+',
-                              'format' => '(xml|json)'));
-
-            $m->connect('api/favorites/destroy/:id.:format',
-                        array('action' => 'ApiFavoriteDestroy',
-                              'id' => '[0-9]+',
-                              'format' => '(xml|json)'));
             // blocks
 
             $m->connect('api/blocks/create/:id.:format',
@@ -651,21 +606,21 @@ class Router
             // statusnet
 
             $m->connect('api/statusnet/version.:format',
-                        array('action' => 'ApiStatusnetVersion',
+                        array('action' => 'ApiGNUsocialVersion',
                               'format' => '(xml|json)'));
 
             $m->connect('api/statusnet/config.:format',
-                        array('action' => 'ApiStatusnetConfig',
+                        array('action' => 'ApiGNUsocialConfig',
                               'format' => '(xml|json)'));
 
-            // For older methods, we provide "laconica" base action
+            // For our current software name, we provide "gnusocial" base action
 
-            $m->connect('api/laconica/version.:format',
-                        array('action' => 'ApiStatusnetVersion',
+            $m->connect('api/gnusocial/version.:format',
+                        array('action' => 'ApiGNUsocialVersion',
                               'format' => '(xml|json)'));
 
-            $m->connect('api/laconica/config.:format',
-                        array('action' => 'ApiStatusnetConfig',
+            $m->connect('api/gnusocial/config.:format',
+                        array('action' => 'ApiGNUsocialConfig',
                               'format' => '(xml|json)'));
 
             // Groups and tags are newer than 0.8.1 so no backward-compatibility
@@ -690,11 +645,11 @@ class Router
 
             $m->connect('api/statusnet/groups/join/:id.:format',
                         array('action' => 'ApiGroupJoin',
+                              'id' => Nickname::INPUT_FMT,
                               'format' => '(xml|json)'));
 
             $m->connect('api/statusnet/groups/join.:format',
                         array('action' => 'ApiGroupJoin',
-                              'id' => Nickname::INPUT_FMT,
                               'format' => '(xml|json)'));
 
             $m->connect('api/statusnet/groups/leave/:id.:format',
@@ -747,6 +702,9 @@ class Router
                               'format' => '(xml|json|rss|atom|as)'));
 
             // Lists (people tags)
+            $m->connect('api/lists/list.:format',
+                        array('action' => 'ApiListSubscriptions',
+                              'format' => '(xml|json)'));
 
             $m->connect('api/lists/memberships.:format',
                         array('action' => 'ApiListMemberships',
@@ -824,6 +782,10 @@ class Router
                 'api/statusnet/media/upload',
                 array('action' => 'ApiMediaUpload')
             );
+            $m->connect(
+                'api/statuses/update_with_media.json',
+                array('action' => 'ApiMediaUpload')
+            );
 
             // search
             $m->connect('api/search.atom', array('action' => 'ApiSearchAtom'));
@@ -843,11 +805,10 @@ class Router
 
             $m->connect('panel/site', array('action' => 'siteadminpanel'));
             $m->connect('panel/user', array('action' => 'useradminpanel'));
-	        $m->connect('panel/access', array('action' => 'accessadminpanel'));
+            $m->connect('panel/access', array('action' => 'accessadminpanel'));
             $m->connect('panel/paths', array('action' => 'pathsadminpanel'));
             $m->connect('panel/sessions', array('action' => 'sessionsadminpanel'));
             $m->connect('panel/sitenotice', array('action' => 'sitenoticeadminpanel'));
-            $m->connect('panel/snapshot', array('action' => 'snapshotadminpanel'));
             $m->connect('panel/license', array('action' => 'licenseadminpanel'));
 
             $m->connect('panel/plugins', array('action' => 'pluginsadminpanel'));
@@ -909,16 +870,12 @@ class Router
                                       'nickname' => $nickname));
                 }
 
-                foreach (array('all', 'replies', 'favorites') as $a) {
+                foreach (array('all', 'replies') as $a) {
                     $m->connect($a.'/rss',
                                 array('action' => $a.'rss',
                                       'nickname' => $nickname));
                 }
 
-                $m->connect('favorites',
-                            array('action' => 'showfavorites',
-                                  'nickname' => $nickname));
-
                 $m->connect('avatar',
                             array('action' => 'avatarbynickname',
                                   'nickname' => $nickname));
@@ -942,8 +899,7 @@ class Router
                                   'nickname' => $nickname));
 
                 $m->connect('',
-                            array('action' => 'showstream',
-                                  'nickname' => $nickname));
+                            array('action' => 'startpage'));
 
                 // peopletags
 
@@ -995,135 +951,130 @@ class Router
                                 array('action' => $a),
                                 array('tag' => self::REGEX_TAG));
                 }
-            } 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'));
-                $m->connect('rsd.xml', array('action' => 'rsd'));
+            }
 
-                foreach (array('subscriptions', 'subscribers',
-                               'nudge', 'all', 'foaf', 'replies',
-                               'inbox', 'outbox', 'microsummary') as $a) {
-                    $m->connect(':nickname/'.$a,
-                                array('action' => $a),
-                                array('nickname' => Nickname::DISPLAY_FMT));
-                }
-                $m->connect(':nickname/subscribers/pending',
-                            array('action' => 'subqueue'),
+            $m->connect('', array('action' => 'startpage'));
+            $m->connect('main/public', array('action' => 'public'));
+            $m->connect('main/all', array('action' => 'networkpublic'));
+            $m->connect('rss', array('action' => 'publicrss'));
+            $m->connect('featuredrss', array('action' => 'featuredrss'));
+            $m->connect('featured/', array('action' => 'featured'));
+            $m->connect('featured', array('action' => 'featured'));
+            $m->connect('rsd.xml', array('action' => 'rsd'));
+
+            foreach (array('subscriptions', 'subscribers',
+                           'nudge', 'all', 'foaf', 'replies',
+                           'inbox', 'outbox', 'microsummary') as $a) {
+                $m->connect(':nickname/'.$a,
+                            array('action' => $a),
                             array('nickname' => Nickname::DISPLAY_FMT));
+            }
+            $m->connect(':nickname/subscribers/pending',
+                        array('action' => 'subqueue'),
+                        array('nickname' => Nickname::DISPLAY_FMT));
 
-                // people tags
-
-                $m->connect(':nickname/peopletags',
-                                array('action' => 'peopletagsbyuser',
-                                      'nickname' => Nickname::DISPLAY_FMT));
-
-                $m->connect(':nickname/peopletags/private',
-                                array('action' => 'peopletagsbyuser',
-                                      'nickname' => Nickname::DISPLAY_FMT,
-                                      'private' => 1));
-
-                $m->connect(':nickname/peopletags/public',
-                                array('action' => 'peopletagsbyuser',
-                                      'nickname' => Nickname::DISPLAY_FMT,
-                                      'public' => 1));
+            // people tags
 
-                $m->connect(':nickname/othertags',
-                                array('action' => 'peopletagsforuser',
-                                      'nickname' => Nickname::DISPLAY_FMT));
+            $m->connect(':nickname/peopletags',
+                            array('action' => 'peopletagsbyuser',
+                                  'nickname' => Nickname::DISPLAY_FMT));
 
-                $m->connect(':nickname/peopletagsubscriptions',
-                                array('action' => 'peopletagsubscriptions',
-                                      'nickname' => Nickname::DISPLAY_FMT));
+            $m->connect(':nickname/peopletags/private',
+                            array('action' => 'peopletagsbyuser',
+                                  'nickname' => Nickname::DISPLAY_FMT,
+                                  'private' => 1));
 
-                $m->connect(':tagger/all/:tag/subscribers',
-                                array('action' => 'peopletagsubscribers',
-                                      'tagger' => Nickname::DISPLAY_FMT,
-                                      'tag' => self::REGEX_TAG));
+            $m->connect(':nickname/peopletags/public',
+                            array('action' => 'peopletagsbyuser',
+                                  'nickname' => Nickname::DISPLAY_FMT,
+                                  'public' => 1));
 
-                $m->connect(':tagger/all/:tag/tagged',
-                                array('action' => 'peopletagged',
-                                      'tagger' => Nickname::DISPLAY_FMT,
-                                      'tag' => self::REGEX_TAG));
+            $m->connect(':nickname/othertags',
+                            array('action' => 'peopletagsforuser',
+                                  'nickname' => Nickname::DISPLAY_FMT));
 
-                $m->connect(':tagger/all/:tag/edit',
-                                array('action' => 'editpeopletag',
-                                      'tagger' => Nickname::DISPLAY_FMT,
-                                      'tag' => self::REGEX_TAG));
+            $m->connect(':nickname/peopletagsubscriptions',
+                            array('action' => 'peopletagsubscriptions',
+                                  'nickname' => Nickname::DISPLAY_FMT));
 
-                foreach(array('subscribe', 'unsubscribe') as $v) {
-                    $m->connect('peopletag/:id/'.$v,
-                                    array('action' => $v.'peopletag',
-                                          'id' => '[0-9]{1,64}'));
-                }
-                $m->connect('user/:tagger_id/profiletag/:id/id',
-                                array('action' => 'profiletagbyid',
-                                      'tagger_id' => '[0-9]+',
-                                      'id' => '[0-9]+'));
+            $m->connect(':tagger/all/:tag/subscribers',
+                            array('action' => 'peopletagsubscribers',
+                                  'tagger' => Nickname::DISPLAY_FMT,
+                                  'tag' => self::REGEX_TAG));
 
-                $m->connect(':tagger/all/:tag',
-                                array('action' => 'showprofiletag',
-                                      'tagger' => Nickname::DISPLAY_FMT,
-                                      'tag' => self::REGEX_TAG));
+            $m->connect(':tagger/all/:tag/tagged',
+                            array('action' => 'peopletagged',
+                                  'tagger' => Nickname::DISPLAY_FMT,
+                                  'tag' => self::REGEX_TAG));
 
-                foreach (array('subscriptions', 'subscribers') as $a) {
-                    $m->connect(':nickname/'.$a.'/:tag',
-                                array('action' => $a),
-                                array('tag' => self::REGEX_TAG,
-                                      'nickname' => Nickname::DISPLAY_FMT));
-                }
+            $m->connect(':tagger/all/:tag/edit',
+                            array('action' => 'editpeopletag',
+                                  'tagger' => Nickname::DISPLAY_FMT,
+                                  'tag' => self::REGEX_TAG));
 
-                foreach (array('rss', 'groups') as $a) {
-                    $m->connect(':nickname/'.$a,
-                                array('action' => 'user'.$a),
-                                array('nickname' => Nickname::DISPLAY_FMT));
-                }
+            foreach(array('subscribe', 'unsubscribe') as $v) {
+                $m->connect('peopletag/:id/'.$v,
+                                array('action' => $v.'peopletag',
+                                      'id' => '[0-9]{1,64}'));
+            }
+            $m->connect('user/:tagger_id/profiletag/:id/id',
+                            array('action' => 'profiletagbyid',
+                                  'tagger_id' => '[0-9]+',
+                                  'id' => '[0-9]+'));
+
+            $m->connect(':tagger/all/:tag',
+                            array('action' => 'showprofiletag',
+                                  'tagger' => Nickname::DISPLAY_FMT,
+                                  'tag' => self::REGEX_TAG));
 
-                foreach (array('all', 'replies', 'favorites') as $a) {
-                    $m->connect(':nickname/'.$a.'/rss',
-                                array('action' => $a.'rss'),
-                                array('nickname' => Nickname::DISPLAY_FMT));
-                }
+            foreach (array('subscriptions', 'subscribers') as $a) {
+                $m->connect(':nickname/'.$a.'/:tag',
+                            array('action' => $a),
+                            array('tag' => self::REGEX_TAG,
+                                  'nickname' => Nickname::DISPLAY_FMT));
+            }
 
-                $m->connect(':nickname/favorites',
-                            array('action' => 'showfavorites'),
+            foreach (array('rss', 'groups') as $a) {
+                $m->connect(':nickname/'.$a,
+                            array('action' => 'user'.$a),
                             array('nickname' => Nickname::DISPLAY_FMT));
+            }
 
-                $m->connect(':nickname/avatar',
-                            array('action' => 'avatarbynickname'),
+            foreach (array('all', 'replies') as $a) {
+                $m->connect(':nickname/'.$a.'/rss',
+                            array('action' => $a.'rss'),
                             array('nickname' => Nickname::DISPLAY_FMT));
-                $m->connect(':nickname/avatar/:size',
-                            array('action' => 'avatarbynickname'),
-                            array('size' => '(|original|\d+)',
-                                  'nickname' => Nickname::DISPLAY_FMT));
+            }
 
-                $m->connect(':nickname/tag/:tag/rss',
-                            array('action' => 'userrss'),
-                            array('nickname' => Nickname::DISPLAY_FMT),
-                            array('tag' => self::REGEX_TAG));
+            $m->connect(':nickname/avatar',
+                        array('action' => 'avatarbynickname'),
+                        array('nickname' => Nickname::DISPLAY_FMT));
+            $m->connect(':nickname/avatar/:size',
+                        array('action' => 'avatarbynickname'),
+                        array('size' => '(|original|\d+)',
+                              'nickname' => Nickname::DISPLAY_FMT));
+
+            $m->connect(':nickname/tag/:tag/rss',
+                        array('action' => 'userrss'),
+                        array('nickname' => Nickname::DISPLAY_FMT),
+                        array('tag' => self::REGEX_TAG));
 
-                $m->connect(':nickname/tag/:tag',
-                            array('action' => 'showstream'),
-                            array('nickname' => Nickname::DISPLAY_FMT),
-                            array('tag' => self::REGEX_TAG));
+            $m->connect(':nickname/tag/:tag',
+                        array('action' => 'showstream'),
+                        array('nickname' => Nickname::DISPLAY_FMT),
+                        array('tag' => self::REGEX_TAG));
 
-                $m->connect(':nickname/rsd.xml',
-                            array('action' => 'rsd'),
-                            array('nickname' => Nickname::DISPLAY_FMT));
+            $m->connect(':nickname/rsd.xml',
+                        array('action' => 'rsd'),
+                        array('nickname' => Nickname::DISPLAY_FMT));
 
-                $m->connect(':nickname',
-                            array('action' => 'showstream'),
-                            array('nickname' => Nickname::DISPLAY_FMT));
+            $m->connect(':nickname',
+                        array('action' => 'showstream'),
+                        array('nickname' => Nickname::DISPLAY_FMT));
 
-                $m->connect(':nickname/',
-                            array('action' => 'showstream'),
-                            array('nickname' => Nickname::DISPLAY_FMT));
-            }
+            $m->connect(':nickname/',
+                        array('action' => 'showstream'),
+                        array('nickname' => Nickname::DISPLAY_FMT));
 
             // AtomPub API
 
@@ -1143,15 +1094,6 @@ class Router
                         array('action' => 'AtomPubSubscriptionFeed'),
                         array('subscriber' => '[0-9]+'));
 
-            $m->connect('api/statusnet/app/favorites/:profile/:notice.atom',
-                        array('action' => 'AtomPubShowFavorite'),
-                        array('profile' => '[0-9]+',
-                              'notice' => '[0-9]+'));
-
-            $m->connect('api/statusnet/app/favorites/:profile.atom',
-                        array('action' => 'AtomPubFavoriteFeed'),
-                        array('profile' => '[0-9]+'));
-
             $m->connect('api/statusnet/app/memberships/:profile/:group.atom',
                         array('action' => 'AtomPubShowMembership'),
                         array('profile' => '[0-9]+',
@@ -1201,7 +1143,7 @@ class Router
         }
 
         $url = $this->m->generate($args, $params, $fragment);
-        // Due to a bug in the Net_URL_Mapper code, the returned URL may
+        // Due to a bug in the URLMapper code, the returned URL may
         // contain a malformed query of the form ?p1=v1?p2=v2?p3=v3. We
         // repair that here rather than modifying the upstream code...