X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Frouter.php;h=4a3f27819e53f78c7077535d28d9fcc649edc7e5;hb=c6b1b3e5e3ad1c47c7bd25b5bcfb0a8cb1cb2bb5;hp=54683e986e67977aff5a3e72fed935df4e122571;hpb=db7cc7fa7553e0be302d518360648940756f131c;p=quix0rs-gnu-social.git

diff --git a/lib/router.php b/lib/router.php
index 54683e986e..4a3f27819e 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -163,6 +163,9 @@ 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]+'));
 
@@ -249,12 +252,6 @@ class Router
                         array('action' => 'conversation'),
                         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'),
                         array('id' => '[0-9]+'));
@@ -337,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,
@@ -507,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',
@@ -912,8 +899,7 @@ class Router
                                   'nickname' => $nickname));
 
                 $m->connect('',
-                            array('action' => 'showstream',
-                                  'nickname' => $nickname));
+                            array('action' => 'startpage'));
 
                 // peopletags
 
@@ -965,128 +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('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'),
+            $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));
+            // people tags
 
-                $m->connect(':nickname/peopletags/public',
-                                array('action' => 'peopletagsbyuser',
-                                      'nickname' => Nickname::DISPLAY_FMT,
-                                      'public' => 1));
+            $m->connect(':nickname/peopletags',
+                            array('action' => 'peopletagsbyuser',
+                                  'nickname' => Nickname::DISPLAY_FMT));
 
-                $m->connect(':nickname/othertags',
-                                array('action' => 'peopletagsforuser',
-                                      'nickname' => Nickname::DISPLAY_FMT));
+            $m->connect(':nickname/peopletags/private',
+                            array('action' => 'peopletagsbyuser',
+                                  'nickname' => Nickname::DISPLAY_FMT,
+                                  'private' => 1));
 
-                $m->connect(':nickname/peopletagsubscriptions',
-                                array('action' => 'peopletagsubscriptions',
-                                      'nickname' => Nickname::DISPLAY_FMT));
+            $m->connect(':nickname/peopletags/public',
+                            array('action' => 'peopletagsbyuser',
+                                  'nickname' => Nickname::DISPLAY_FMT,
+                                  'public' => 1));
 
-                $m->connect(':tagger/all/:tag/subscribers',
-                                array('action' => 'peopletagsubscribers',
-                                      'tagger' => Nickname::DISPLAY_FMT,
-                                      'tag' => self::REGEX_TAG));
+            $m->connect(':nickname/othertags',
+                            array('action' => 'peopletagsforuser',
+                                  'nickname' => Nickname::DISPLAY_FMT));
 
-                $m->connect(':tagger/all/:tag/tagged',
-                                array('action' => 'peopletagged',
-                                      'tagger' => Nickname::DISPLAY_FMT,
-                                      'tag' => self::REGEX_TAG));
+            $m->connect(':nickname/peopletagsubscriptions',
+                            array('action' => 'peopletagsubscriptions',
+                                  'nickname' => Nickname::DISPLAY_FMT));
 
-                $m->connect(':tagger/all/:tag/edit',
-                                array('action' => 'editpeopletag',
-                                      'tagger' => Nickname::DISPLAY_FMT,
-                                      'tag' => self::REGEX_TAG));
+            $m->connect(':tagger/all/:tag/subscribers',
+                            array('action' => 'peopletagsubscribers',
+                                  'tagger' => Nickname::DISPLAY_FMT,
+                                  'tag' => self::REGEX_TAG));
 
-                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/tagged',
+                            array('action' => 'peopletagged',
+                                  '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/edit',
+                            array('action' => 'editpeopletag',
+                                  '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));
-                }
+            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('rss', 'groups') as $a) {
-                    $m->connect(':nickname/'.$a,
-                                array('action' => 'user'.$a),
-                                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));
+            }
 
-                foreach (array('all', 'replies') as $a) {
-                    $m->connect(':nickname/'.$a.'/rss',
-                                array('action' => $a.'rss'),
-                                array('nickname' => Nickname::DISPLAY_FMT));
-                }
+            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