exit(1);
}
-require_once 'Net/URL/Mapper.php';
-
-class StatusNet_URL_Mapper extends Net_URL_Mapper
-{
- private static $_singleton = null;
- private $_actionToPath = array();
-
- private function __construct()
- {
- }
-
- public static function getInstance($id = '__default__')
- {
- if (empty(self::$_singleton)) {
- self::$_singleton = new StatusNet_URL_Mapper();
- }
- return self::$_singleton;
- }
-
- public function connect($path, $defaults = array(), $rules = array())
- {
- $result = null;
- if (Event::handle('StartConnectPath', array(&$path, &$defaults, &$rules, &$result))) {
- $result = parent::connect($path, $defaults, $rules);
- if (array_key_exists('action', $defaults)) {
- $action = $defaults['action'];
- } elseif (array_key_exists('action', $rules)) {
- $action = $rules['action'];
- } else {
- $action = null;
- }
- $this->_mapAction($action, $result);
- Event::handle('EndConnectPath', array($path, $defaults, $rules, $result));
- }
- return $result;
- }
-
- protected function _mapAction($action, $path)
- {
- if (!array_key_exists($action, $this->_actionToPath)) {
- $this->_actionToPath[$action] = array();
- }
- $this->_actionToPath[$action][] = $path;
- return;
- }
-
- public function generate($values = array(), $qstring = array(), $anchor = '')
- {
- if (!array_key_exists('action', $values)) {
- return parent::generate($values, $qstring, $anchor);
- }
-
- $action = $values['action'];
-
- if (!array_key_exists($action, $this->_actionToPath)) {
- return parent::generate($values, $qstring, $anchor);
- }
-
- $oldPaths = $this->paths;
- $this->paths = $this->_actionToPath[$action];
- $result = parent::generate($values, $qstring, $anchor);
- $this->paths = $oldPaths;
-
- return $result;
- }
-}
-
/**
* URL Router
*
{
var $m = null;
static $inst = null;
- static $bare = array('requesttoken', 'accesstoken', 'userauthorization',
- 'postnotice', 'updateprofile', 'finishremotesubscribe');
const REGEX_TAG = '[^\/]+'; // [\pL\pN_\-\.]{1,64} better if we can do unicode regexes
return Router::$inst;
}
+ /**
+ * Clear the global singleton instance for this class.
+ * Needed to ensure reset when switching site configurations.
+ */
+ static function clear()
+ {
+ Router::$inst = null;
+ }
+
function __construct()
{
if (empty($this->m)) {
- if (!common_config('router', 'cache')) {
- $this->m = $this->initialize();
- } else {
- $k = self::cacheKey();
- $c = Cache::instance();
- $m = $c->get($k);
- if (!empty($m)) {
- $this->m = $m;
- } else {
- $this->m = $this->initialize();
- $c->set($k, $this->m);
- }
- }
+ $this->m = $this->initialize();
}
}
* you're running and the plugins that are enabled. To avoid having bad routes
* get stuck in the cache, the key includes a list of plugins and the software
* version.
- *
- * There can still be problems with a) differences in versions of the plugins and
+ *
+ * There can still be problems with a) differences in versions of the plugins and
* b) people running code between official versions, but these tend to be more
* sophisticated users who can grok what's going on and clear their caches.
*
function initialize()
{
- $m = StatusNet_URL_Mapper::getInstance();
+ $m = new URLMapper();
if (Event::handle('StartInitializeRouter', array(&$m))) {
array('user_id' => '[0-9]+',
'token' => '.+'));
+ // these take a code; before the main part
+
+ foreach (array('register', 'confirmaddress', 'recoverpassword') as $c) {
+ $m->connect('main/'.$c.'/:code', array('action' => $c));
+ }
+
+ // Also need a block variant accepting ID on URL for mail links
+ $m->connect('main/block/:profileid',
+ array('action' => 'block'),
+ array('profileid' => '[0-9]+'));
+
+ $m->connect('main/sup/:seconds', array('action' => 'sup'),
+ array('seconds' => '[0-9]+'));
+
// main stuff is repetitive
$main = array('login', 'logout', 'register', 'subscribe',
'backupaccount',
'deleteaccount',
'restoreaccount',
+ 'top',
);
foreach ($main as $a) {
$m->connect('main/'.$a, array('action' => $a));
}
- // Also need a block variant accepting ID on URL for mail links
- $m->connect('main/block/:profileid',
- array('action' => 'block'),
- array('profileid' => '[0-9]+'));
-
- $m->connect('main/sup/:seconds', array('action' => 'sup'),
- array('seconds' => '[0-9]+'));
-
- $m->connect('main/tagprofile', array('action' => 'tagprofile'));
$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'));
- $m->connect('.well-known/host-meta',
- array('action' => 'hostmeta'));
- $m->connect('main/xrd',
- array('action' => 'userxrd'));
-
- // these take a code
-
- foreach (array('register', 'confirmaddress', 'recoverpassword') as $c) {
- $m->connect('main/'.$c.'/:code', array('action' => $c));
- }
-
- // exceptional
-
- $m->connect('main/remote', array('action' => 'remotesubscribe'));
- $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));
- }
// settings
foreach (array('profile', 'avatar', 'password', 'im', 'oauthconnections',
- 'oauthapps', 'email', 'sms', 'userdesign', 'url') as $s) {
+ 'oauthapps', 'email', 'sms', 'url') as $s) {
$m->connect('settings/'.$s, array('action' => $s.'settings'));
}
+ if (common_config('oldschool', 'enabled')) {
+ $m->connect('settings/oldschool', array('action' => 'oldschoolsettings'));
+ }
+
$m->connect('settings/oauthapps/show/:id',
array('action' => 'showapplication'),
array('id' => '[0-9]+')
// search
foreach (array('group', 'people', 'notice') as $s) {
- $m->connect('search/'.$s, array('action' => $s.'search'));
$m->connect('search/'.$s.'?q=:q',
array('action' => $s.'search'),
array('q' => '.+'));
+ $m->connect('search/'.$s, array('action' => $s.'search'));
}
// 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.
- $m->connect('search/notice/rss', array('action' => 'noticesearchrss'));
$m->connect('search/notice/rss?q=:q', array('action' => 'noticesearchrss'),
array('q' => '.+'));
+ $m->connect('search/notice/rss', array('action' => 'noticesearchrss'));
$m->connect('attachment/:attachment',
array('action' => 'attachment'),
array('action' => 'attachment_thumbnail'),
array('attachment' => '[0-9]+'));
- $m->connect('notice/new', array('action' => 'newnotice'));
- $m->connect('notice/new?replyto=:replyto',
- array('action' => 'newnotice'),
- array('replyto' => Nickname::DISPLAY_FMT));
$m->connect('notice/new?replyto=:replyto&inreplyto=:inreplyto',
array('action' => 'newnotice'),
array('replyto' => Nickname::DISPLAY_FMT),
array('inreplyto' => '[0-9]+'));
+ $m->connect('notice/new?replyto=:replyto',
+ array('action' => 'newnotice'),
+ array('replyto' => Nickname::DISPLAY_FMT));
+
+ $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]+'));
- $m->connect('notice/delete', array('action' => 'deletenotice'));
+
$m->connect('notice/delete/:notice',
array('action' => 'deletenotice'),
array('notice' => '[0-9]+'));
+ $m->connect('notice/delete', array('action' => 'deletenotice'));
+
$m->connect('bookmarklet/new', array('action' => 'bookmarklet'));
// conversation
array('action' => 'userbyid'),
array('id' => '[0-9]+'));
- $m->connect('tags/', array('action' => 'publictagcloud'));
- $m->connect('tag/', array('action' => 'publictagcloud'));
- $m->connect('tags', array('action' => 'publictagcloud'));
- $m->connect('tag', array('action' => 'publictagcloud'));
+ if (!common_config('performance', 'high')) {
+ $m->connect('tags/', array('action' => 'publictagcloud'));
+ $m->connect('tag/', array('action' => 'publictagcloud'));
+ $m->connect('tags', array('action' => 'publictagcloud'));
+ $m->connect('tag', array('action' => 'publictagcloud'));
+ }
$m->connect('tag/:tag/rss',
array('action' => 'tagrss'),
array('tag' => self::REGEX_TAG));
array('id' => '[0-9]+'));
}
- foreach (array('members', 'logo', 'rss', 'designsettings') as $n) {
+ foreach (array('members', 'logo', 'rss') as $n) {
$m->connect('group/:nickname/'.$n,
array('action' => 'group'.$n),
array('nickname' => Nickname::DISPLAY_FMT));
array('action' => 'showgroup'),
array('nickname' => Nickname::DISPLAY_FMT));
+ $m->connect('group/:nickname/',
+ array('action' => 'showgroup'),
+ array('nickname' => Nickname::DISPLAY_FMT));
+
$m->connect('group/', array('action' => 'groups'));
$m->connect('group', array('action' => 'groups'));
$m->connect('groups/', array('action' => 'groups'));
array('action' => 'ApiTimelinePublic',
'format' => '(xml|json|rss|atom|as)'));
- $m->connect('api/statuses/friends_timeline.:format',
- array('action' => 'ApiTimelineFriends',
- 'format' => '(xml|json|rss|atom|as)'));
-
$m->connect('api/statuses/friends_timeline/:id.:format',
array('action' => 'ApiTimelineFriends',
'id' => Nickname::INPUT_FMT,
'format' => '(xml|json|rss|atom|as)'));
- $m->connect('api/statuses/home_timeline.:format',
- array('action' => 'ApiTimelineHome',
+ $m->connect('api/statuses/friends_timeline.:format',
+ array('action' => 'ApiTimelineFriends',
'format' => '(xml|json|rss|atom|as)'));
$m->connect('api/statuses/home_timeline/:id.:format',
'id' => Nickname::INPUT_FMT,
'format' => '(xml|json|rss|atom|as)'));
- $m->connect('api/statuses/user_timeline.:format',
- array('action' => 'ApiTimelineUser',
+ $m->connect('api/statuses/home_timeline.:format',
+ array('action' => 'ApiTimelineHome',
'format' => '(xml|json|rss|atom|as)'));
$m->connect('api/statuses/user_timeline/:id.:format',
'id' => Nickname::INPUT_FMT,
'format' => '(xml|json|rss|atom|as)'));
- $m->connect('api/statuses/mentions.:format',
- array('action' => 'ApiTimelineMentions',
+ $m->connect('api/statuses/user_timeline.:format',
+ array('action' => 'ApiTimelineUser',
'format' => '(xml|json|rss|atom|as)'));
$m->connect('api/statuses/mentions/:id.:format',
'id' => Nickname::INPUT_FMT,
'format' => '(xml|json|rss|atom|as)'));
- $m->connect('api/statuses/replies.:format',
+ $m->connect('api/statuses/mentions.:format',
array('action' => 'ApiTimelineMentions',
'format' => '(xml|json|rss|atom|as)'));
'id' => Nickname::INPUT_FMT,
'format' => '(xml|json|rss|atom|as)'));
+ $m->connect('api/statuses/replies.:format',
+ array('action' => 'ApiTimelineMentions',
+ 'format' => '(xml|json|rss|atom|as)'));
+
$m->connect('api/statuses/retweeted_by_me.:format',
array('action' => 'ApiTimelineRetweetedByMe',
'format' => '(xml|json|atom|as)'));
array('action' => 'ApiTimelineRetweetsOfMe',
'format' => '(xml|json|atom|as)'));
- $m->connect('api/statuses/friends.:format',
- array('action' => 'ApiUserFriends',
- 'format' => '(xml|json)'));
-
$m->connect('api/statuses/friends/:id.:format',
array('action' => 'ApiUserFriends',
'id' => Nickname::INPUT_FMT,
'format' => '(xml|json)'));
- $m->connect('api/statuses/followers.:format',
- array('action' => 'ApiUserFollowers',
+ $m->connect('api/statuses/friends.:format',
+ array('action' => 'ApiUserFriends',
'format' => '(xml|json)'));
$m->connect('api/statuses/followers/:id.:format',
'id' => Nickname::INPUT_FMT,
'format' => '(xml|json)'));
- $m->connect('api/statuses/show.:format',
- array('action' => 'ApiStatusesShow',
- 'format' => '(xml|json|atom)'));
+ $m->connect('api/statuses/followers.:format',
+ array('action' => 'ApiUserFollowers',
+ 'format' => '(xml|json)'));
$m->connect('api/statuses/show/:id.:format',
array('action' => 'ApiStatusesShow',
'id' => '[0-9]+',
'format' => '(xml|json|atom)'));
+ $m->connect('api/statuses/show.:format',
+ array('action' => 'ApiStatusesShow',
+ 'format' => '(xml|json|atom)'));
+
$m->connect('api/statuses/update.:format',
array('action' => 'ApiStatusesUpdate',
'format' => '(xml|json)'));
- $m->connect('api/statuses/destroy.:format',
+ $m->connect('api/statuses/destroy/:id.:format',
array('action' => 'ApiStatusesDestroy',
+ 'id' => '[0-9]+',
'format' => '(xml|json)'));
- $m->connect('api/statuses/destroy/:id.:format',
+ $m->connect('api/statuses/destroy.:format',
array('action' => 'ApiStatusesDestroy',
- 'id' => '[0-9]+',
'format' => '(xml|json)'));
$m->connect('api/statuses/retweet/:id.:format',
'id' => '[0-9]+',
'format' => '(xml|json)'));
+ // START qvitter API additions
+
+ $m->connect('api/statuses/favs/:id.json',
+ array('action' => 'ApiStatusesFavs',
+ 'id' => '[0-9]+'));
+
+ $m->connect('api/attachment/:id.json',
+ array('action' => 'ApiAttachment',
+ 'id' => '[0-9]+'));
+
+ $m->connect('api/checkhub.json',
+ array('action' => 'ApiCheckHub'));
+
+ $m->connect('api/externalprofile/show.json',
+ array('action' => 'ApiExternalProfileShow'));
+
+ $m->connect('api/statusnet/groups/admins/:id.:format',
+ array('action' => 'ApiGroupAdmins',
+ 'id' => Nickname::INPUT_FMT,
+ 'format' => '(xml|json)'));
+
+ $m->connect('api/account/update_link_color.json',
+ array('action' => 'ApiAccountUpdateLinkColor'));
+
+ $m->connect('api/account/update_background_color.json',
+ array('action' => 'ApiAccountUpdateBackgroundColor'));
+
+ $m->connect('api/account/register.json',
+ array('action' => 'ApiAccountRegister'));
+
+ $m->connect('api/check_nickname.json',
+ array('action' => 'ApiCheckNickname'));
+
+ // END qvitter API additions
+
// users
- $m->connect('api/users/show.:format',
+ $m->connect('api/users/show/:id.:format',
array('action' => 'ApiUserShow',
+ 'id' => Nickname::INPUT_FMT,
'format' => '(xml|json)'));
- $m->connect('api/users/show/:id.:format',
+ $m->connect('api/users/show.:format',
array('action' => 'ApiUserShow',
- 'id' => Nickname::INPUT_FMT,
'format' => '(xml|json)'));
$m->connect('api/users/profile_image/:screen_name.:format',
array('action' => 'ApiFriendshipsExists',
'format' => '(xml|json)'));
- $m->connect('api/friendships/create.:format',
+ $m->connect('api/friendships/create/:id.:format',
array('action' => 'ApiFriendshipsCreate',
+ 'id' => Nickname::INPUT_FMT,
'format' => '(xml|json)'));
- $m->connect('api/friendships/destroy.:format',
- array('action' => 'ApiFriendshipsDestroy',
- 'format' => '(xml|json)'));
-
- $m->connect('api/friendships/create/:id.:format',
+ $m->connect('api/friendships/create.:format',
array('action' => 'ApiFriendshipsCreate',
- 'id' => Nickname::INPUT_FMT,
'format' => '(xml|json)'));
$m->connect('api/friendships/destroy/:id.:format',
'id' => Nickname::INPUT_FMT,
'format' => '(xml|json)'));
+ $m->connect('api/friendships/destroy.:format',
+ array('action' => 'ApiFriendshipsDestroy',
+ 'format' => '(xml|json)'));
+
// Social graph
$m->connect('api/friends/ids/:id.:format',
$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'));
// favorites
- $m->connect('api/favorites.:format',
+ $m->connect('api/favorites/:id.:format',
array('action' => 'ApiTimelineFavorites',
+ 'id' => Nickname::INPUT_FMT,
'format' => '(xml|json|rss|atom|as)'));
- $m->connect('api/favorites/:id.:format',
+ $m->connect('api/favorites.:format',
array('action' => 'ApiTimelineFavorites',
- 'id' => Nickname::INPUT_FMT,
'format' => '(xml|json|rss|atom|as)'));
$m->connect('api/favorites/create/:id.:format',
'format' => '(xml|json)'));
// blocks
- $m->connect('api/blocks/create.:format',
- array('action' => 'ApiBlockCreate',
- 'format' => '(xml|json)'));
-
$m->connect('api/blocks/create/:id.:format',
array('action' => 'ApiBlockCreate',
'id' => Nickname::INPUT_FMT,
'format' => '(xml|json)'));
- $m->connect('api/blocks/destroy.:format',
- array('action' => 'ApiBlockDestroy',
+ $m->connect('api/blocks/create.:format',
+ array('action' => 'ApiBlockCreate',
'format' => '(xml|json)'));
$m->connect('api/blocks/destroy/:id.:format',
array('action' => 'ApiBlockDestroy',
'id' => Nickname::INPUT_FMT,
'format' => '(xml|json)'));
+
+ $m->connect('api/blocks/destroy.:format',
+ array('action' => 'ApiBlockDestroy',
+ 'format' => '(xml|json)'));
+
// help
$m->connect('api/help/test.:format',
'id' => Nickname::INPUT_FMT,
'format' => '(xml|json|rss|atom|as)'));
- $m->connect('api/statusnet/groups/show.:format',
- array('action' => 'ApiGroupShow',
- 'format' => '(xml|json)'));
-
$m->connect('api/statusnet/groups/show/:id.:format',
array('action' => 'ApiGroupShow',
'id' => Nickname::INPUT_FMT,
'format' => '(xml|json)'));
- $m->connect('api/statusnet/groups/join.:format',
- array('action' => 'ApiGroupJoin',
- 'id' => Nickname::INPUT_FMT,
+ $m->connect('api/statusnet/groups/show.:format',
+ array('action' => 'ApiGroupShow',
'format' => '(xml|json)'));
$m->connect('api/statusnet/groups/join/:id.:format',
array('action' => 'ApiGroupJoin',
'format' => '(xml|json)'));
- $m->connect('api/statusnet/groups/leave.:format',
- array('action' => 'ApiGroupLeave',
+ $m->connect('api/statusnet/groups/join.:format',
+ array('action' => 'ApiGroupJoin',
'id' => Nickname::INPUT_FMT,
'format' => '(xml|json)'));
array('action' => 'ApiGroupLeave',
'format' => '(xml|json)'));
+ $m->connect('api/statusnet/groups/leave.:format',
+ array('action' => 'ApiGroupLeave',
+ 'id' => Nickname::INPUT_FMT,
+ 'format' => '(xml|json)'));
+
$m->connect('api/statusnet/groups/is_member.:format',
array('action' => 'ApiGroupIsMember',
'format' => '(xml|json)'));
- $m->connect('api/statusnet/groups/list.:format',
+ $m->connect('api/statusnet/groups/list/:id.:format',
array('action' => 'ApiGroupList',
+ 'id' => Nickname::INPUT_FMT,
'format' => '(xml|json|rss|atom)'));
- $m->connect('api/statusnet/groups/list/:id.:format',
+ $m->connect('api/statusnet/groups/list.:format',
array('action' => 'ApiGroupList',
- 'id' => Nickname::INPUT_FMT,
'format' => '(xml|json|rss|atom)'));
$m->connect('api/statusnet/groups/list_all.:format',
array('action' => 'ApiGroupListAll',
'format' => '(xml|json|rss|atom)'));
- $m->connect('api/statusnet/groups/membership.:format',
+ $m->connect('api/statusnet/groups/membership/:id.:format',
array('action' => 'ApiGroupMembership',
+ 'id' => Nickname::INPUT_FMT,
'format' => '(xml|json)'));
- $m->connect('api/statusnet/groups/membership/:id.:format',
+ $m->connect('api/statusnet/groups/membership.:format',
array('action' => 'ApiGroupMembership',
- 'id' => Nickname::INPUT_FMT,
'format' => '(xml|json)'));
$m->connect('api/statusnet/groups/create.:format',
array('action' => 'ApiGroupProfileUpdate',
'id' => '[a-zA-Z0-9]+',
'format' => '(xml|json)'));
+
+ $m->connect('api/statusnet/conversation/:id.:format',
+ array('action' => 'apiconversation',
+ 'id' => '[0-9]+',
+ 'format' => '(xml|json|rss|atom|as)'));
// Lists (people tags)
array('action' => 'ApiListSubscriptions',
'user' => '[a-zA-Z0-9]+',
'format' => '(xml|json)'));
+
$m->connect('api/lists.:format',
array('action' => 'ApiLists',
'format' => '(xml|json)'));
- $m->connect('api/:user/lists.:format',
- array('action' => 'ApiLists',
- 'user' => '[a-zA-Z0-9]+',
- 'format' => '(xml|json)'));
-
$m->connect('api/:user/lists/:id.:format',
array('action' => 'ApiList',
'user' => '[a-zA-Z0-9]+',
'id' => '[a-zA-Z0-9]+',
'format' => '(xml|json)'));
+ $m->connect('api/:user/lists.:format',
+ array('action' => 'ApiLists',
+ 'user' => '[a-zA-Z0-9]+',
+ 'format' => '(xml|json)'));
+
$m->connect('api/:user/lists/:id/statuses.:format',
array('action' => 'ApiTimelineList',
'user' => '[a-zA-Z0-9]+',
'id' => '[a-zA-Z0-9]+',
'format' => '(xml|json|rss|atom)'));
- $m->connect('api/:user/:list_id/members.:format',
- array('action' => 'ApiListMembers',
+ $m->connect('api/:user/:list_id/members/:id.:format',
+ array('action' => 'ApiListMember',
'user' => '[a-zA-Z0-9]+',
'list_id' => '[a-zA-Z0-9]+',
+ 'id' => '[a-zA-Z0-9]+',
'format' => '(xml|json)'));
- $m->connect('api/:user/:list_id/subscribers.:format',
- array('action' => 'ApiListSubscribers',
+ $m->connect('api/:user/:list_id/members.:format',
+ array('action' => 'ApiListMembers',
'user' => '[a-zA-Z0-9]+',
'list_id' => '[a-zA-Z0-9]+',
'format' => '(xml|json)'));
- $m->connect('api/:user/:list_id/members/:id.:format',
- array('action' => 'ApiListMember',
+ $m->connect('api/:user/:list_id/subscribers/:id.:format',
+ array('action' => 'ApiListSubscriber',
'user' => '[a-zA-Z0-9]+',
'list_id' => '[a-zA-Z0-9]+',
'id' => '[a-zA-Z0-9]+',
'format' => '(xml|json)'));
- $m->connect('api/:user/:list_id/subscribers/:id.:format',
- array('action' => 'ApiListSubscriber',
+ $m->connect('api/:user/:list_id/subscribers.:format',
+ array('action' => 'ApiListSubscribers',
'user' => '[a-zA-Z0-9]+',
'list_id' => '[a-zA-Z0-9]+',
- 'id' => '[a-zA-Z0-9]+',
'format' => '(xml|json)'));
// Tags
$m->connect('api/statusnet/tags/timeline/:tag.:format',
array('action' => 'ApiTimelineTag',
+ 'tag' => self::REGEX_TAG,
'format' => '(xml|json|rss|atom|as)'));
// media related
$m->connect('api/trends.json', array('action' => 'ApiTrends'));
$m->connect('api/oauth/request_token',
- array('action' => 'ApiOauthRequestToken'));
+ array('action' => 'ApiOAuthRequestToken'));
$m->connect('api/oauth/access_token',
- array('action' => 'ApiOauthAccessToken'));
+ array('action' => 'ApiOAuthAccessToken'));
$m->connect('api/oauth/authorize',
- array('action' => 'ApiOauthAuthorize'));
+ array('action' => 'ApiOAuthAuthorize'));
// Admin
$m->connect('panel/site', array('action' => 'siteadminpanel'));
- $m->connect('panel/design', array('action' => 'designadminpanel'));
$m->connect('panel/user', array('action' => 'useradminpanel'));
$m->connect('panel/access', array('action' => 'accessadminpanel'));
$m->connect('panel/paths', array('action' => 'pathsadminpanel'));
array('action' => 'getfile'),
array('filename' => '[A-Za-z0-9._-]+'));
+ // Common people-tag stuff
+
+ $m->connect('peopletag/:tag', array('action' => 'peopletag',
+ 'tag' => self::REGEX_TAG));
+
+ $m->connect('selftag/:tag', array('action' => 'selftag',
+ 'tag' => self::REGEX_TAG));
+
+ $m->connect('main/addpeopletag', array('action' => 'addpeopletag'));
+
+ $m->connect('main/removepeopletag', array('action' => 'removepeopletag'));
+
+ $m->connect('main/profilecompletion', array('action' => 'profilecompletion'));
+
+ $m->connect('main/peopletagautocomplete', array('action' => 'peopletagautocomplete'));
+
// In the "root"
if (common_config('singleuser', 'enabled')) {
$nickname = User::singleUserNickname();
foreach (array('subscriptions', 'subscribers',
- 'all', 'foaf', 'xrds',
- 'replies', 'microsummary', 'hcard') as $a) {
+ 'all', 'foaf', 'replies',
+ 'microsummary') as $a) {
$m->connect($a,
array('action' => $a,
'nickname' => $nickname));
array('action' => 'showfavorites',
'nickname' => $nickname));
+ $m->connect('avatar',
+ array('action' => 'avatarbynickname',
+ 'nickname' => $nickname));
$m->connect('avatar/:size',
array('action' => 'avatarbynickname',
'nickname' => $nickname),
- array('size' => '(original|96|48|24)'));
+ array('size' => '(|original|\d+)'));
$m->connect('tag/:tag/rss',
array('action' => 'userrss',
$m->connect('',
array('action' => 'showstream',
'nickname' => $nickname));
+
+ // peopletags
+
+ $m->connect('peopletags',
+ array('action' => 'peopletagsbyuser'));
+
+ $m->connect('peopletags/private',
+ array('action' => 'peopletagsbyuser',
+ 'private' => 1));
+
+ $m->connect('peopletags/public',
+ array('action' => 'peopletagsbyuser',
+ 'public' => 1));
+
+ $m->connect('othertags',
+ array('action' => 'peopletagsforuser'));
+
+ $m->connect('peopletagsubscriptions',
+ array('action' => 'peopletagsubscriptions'));
+
+ $m->connect('all/:tag/subscribers',
+ array('action' => 'peopletagsubscribers',
+ 'tag' => self::REGEX_TAG));
+
+ $m->connect('all/:tag/tagged',
+ array('action' => 'peopletagged',
+ 'tag' => self::REGEX_TAG));
+
+ $m->connect('all/:tag/edit',
+ array('action' => 'editpeopletag',
+ '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('all/:tag',
+ array('action' => 'showprofiletag',
+ 'tag' => self::REGEX_TAG));
+
+ foreach (array('subscriptions', 'subscribers') as $a) {
+ $m->connect($a.'/:tag',
+ array('action' => $a),
+ array('tag' => self::REGEX_TAG));
+ }
} else {
$m->connect('', array('action' => 'public'));
$m->connect('rss', array('action' => 'publicrss'));
$m->connect('rsd.xml', array('action' => 'rsd'));
foreach (array('subscriptions', 'subscribers',
- 'nudge', 'all', 'foaf', 'xrds',
- 'replies', 'inbox', 'outbox', 'microsummary', 'hcard') as $a) {
+ 'nudge', 'all', 'foaf', 'replies',
+ 'inbox', 'outbox', 'microsummary') as $a) {
$m->connect(':nickname/'.$a,
array('action' => $a),
array('nickname' => Nickname::DISPLAY_FMT));
// people tags
- $m->connect('peopletags', array('action' => 'publicpeopletagcloud'));
-
- $m->connect('peopletag/:tag', array('action' => 'peopletag',
- 'tag' => self::REGEX_TAG));
-
- $m->connect('selftag/:tag', array('action' => 'selftag',
- 'tag' => self::REGEX_TAG));
-
- $m->connect('main/addpeopletag', array('action' => 'addpeopletag'));
-
- $m->connect('main/removepeopletag', array('action' => 'removepeopletag'));
-
- $m->connect('main/profilecompletion', array('action' => 'profilecompletion'));
-
- $m->connect('main/peopletagautocomplete', array('action' => 'peopletagautocomplete'));
-
$m->connect(':nickname/peopletags',
array('action' => 'peopletagsbyuser',
'nickname' => Nickname::DISPLAY_FMT));
array('action' => 'showfavorites'),
array('nickname' => Nickname::DISPLAY_FMT));
+ $m->connect(':nickname/avatar',
+ array('action' => 'avatarbynickname'),
+ array('nickname' => Nickname::DISPLAY_FMT));
$m->connect(':nickname/avatar/:size',
array('action' => 'avatarbynickname'),
- array('size' => '(original|96|48|24)',
+ array('size' => '(|original|\d+)',
'nickname' => Nickname::DISPLAY_FMT));
$m->connect(':nickname/tag/:tag/rss',
$m->connect(':nickname',
array('action' => 'showstream'),
array('nickname' => Nickname::DISPLAY_FMT));
+
+ $m->connect(':nickname/',
+ array('action' => 'showstream'),
+ array('nickname' => Nickname::DISPLAY_FMT));
}
// AtomPub API
{
try {
$match = $this->m->match($path);
- } catch (Net_URL_Mapper_InvalidException $e) {
+ } catch (Exception $e) {
common_log(LOG_ERR, "Problem getting route for $path - " .
$e->getMessage());
// TRANS: Client error on action trying to visit a non-existing page.
}
$url = $this->m->generate($args, $params, $fragment);
-
// Due to a bug in the Net_URL_Mapper 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...
projects / quix0rs-gnu-social.git / blobdiff