wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Re added NICKNAME_FMT constant to router.php."

Browse Source 
This reverts commit 9f15febf88.

Issues with remote OMB. Will revisit and fix correctly
This commit is contained in:
Eric Helgeson 2009-11-19 14:58:32 -05:00
parent 7a37b71a87
commit b96b5e9a07
1 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
lib/router.php
View File

@ -125,7 +125,7 @@ class Router
// exceptional // exceptional
$m->connect('main/remote', array('action' => 'remotesubscribe')); $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) { foreach (Router::$bare as $action) {
$m->connect('index.php?action=' . $action, array('action' => $action)); $m->connect('index.php?action=' . $action, array('action' => $action));
@ -169,10 +169,10 @@ class Router
$m->connect('notice/new', array('action' => 'newnotice')); $m->connect('notice/new', array('action' => 'newnotice'));
$m->connect('notice/new?replyto=:replyto', $m->connect('notice/new?replyto=:replyto',
array('action' => 'newnotice'), array('action' => 'newnotice'),
array('replyto' => '['.NICKNAME_FMT.']+')); array('replyto' => '[A-Za-z0-9_-]+'));
$m->connect('notice/new?replyto=:replyto&inreplyto=:inreplyto', $m->connect('notice/new?replyto=:replyto&inreplyto=:inreplyto',
array('action' => 'newnotice'), array('action' => 'newnotice'),
array('replyto' => '['.NICKNAME_FMT.']+'), array('replyto' => '[A-Za-z0-9_-]+'),
array('inreplyto' => '[0-9]+')); array('inreplyto' => '[0-9]+'));
$m->connect('notice/:notice/file', $m->connect('notice/:notice/file',
@ -196,7 +196,7 @@ class Router
array('id' => '[0-9]+')); array('id' => '[0-9]+'));
$m->connect('message/new', array('action' => 'newmessage')); $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', $m->connect('message/:message',
array('action' => 'showmessage'), array('action' => 'showmessage'),
array('message' => '[0-9]+')); array('message' => '[0-9]+'));
@ -280,7 +280,7 @@ class Router
$m->connect('api/statuses/friends_timeline/:id.:format', $m->connect('api/statuses/friends_timeline/:id.:format',
array('action' => 'ApiTimelineFriends', array('action' => 'ApiTimelineFriends',
'id' => '['.NICKNAME_FMT.']+', 'id' => '[a-zA-Z0-9]+',
'format' => '(xml|json|rss|atom)')); 'format' => '(xml|json|rss|atom)'));
$m->connect('api/statuses/home_timeline.:format', $m->connect('api/statuses/home_timeline.:format',
array('action' => 'ApiTimelineFriends', array('action' => 'ApiTimelineFriends',
@ -288,7 +288,7 @@ class Router
$m->connect('api/statuses/home_timeline/:id.:format', $m->connect('api/statuses/home_timeline/:id.:format',
array('action' => 'ApiTimelineFriends', array('action' => 'ApiTimelineFriends',
'id' => '['.NICKNAME_FMT.']+', 'id' => '[a-zA-Z0-9]+',
'format' => '(xml|json|rss|atom)')); 'format' => '(xml|json|rss|atom)'));
$m->connect('api/statuses/user_timeline.:format', $m->connect('api/statuses/user_timeline.:format',
@ -297,7 +297,7 @@ class Router
$m->connect('api/statuses/user_timeline/:id.:format', $m->connect('api/statuses/user_timeline/:id.:format',
array('action' => 'ApiTimelineUser', array('action' => 'ApiTimelineUser',
'id' => '['.NICKNAME_FMT.']+', 'id' => '[a-zA-Z0-9]+',
'format' => '(xml|json|rss|atom)')); 'format' => '(xml|json|rss|atom)'));
$m->connect('api/statuses/mentions.:format', $m->connect('api/statuses/mentions.:format',
@ -306,7 +306,7 @@ class Router
$m->connect('api/statuses/mentions/:id.:format', $m->connect('api/statuses/mentions/:id.:format',
array('action' => 'ApiTimelineMentions', array('action' => 'ApiTimelineMentions',
'id' => '['.NICKNAME_FMT.']+', 'id' => '[a-zA-Z0-9]+',
'format' => '(xml|json|rss|atom)')); 'format' => '(xml|json|rss|atom)'));
$m->connect('api/statuses/replies.:format', $m->connect('api/statuses/replies.:format',
@ -315,7 +315,7 @@ class Router
$m->connect('api/statuses/replies/:id.:format', $m->connect('api/statuses/replies/:id.:format',
array('action' => 'ApiTimelineMentions', array('action' => 'ApiTimelineMentions',
'id' => '['.NICKNAME_FMT.']+', 'id' => '[a-zA-Z0-9]+',
'format' => '(xml|json|rss|atom)')); 'format' => '(xml|json|rss|atom)'));
$m->connect('api/statuses/friends.:format', $m->connect('api/statuses/friends.:format',
@ -324,7 +324,7 @@ class Router
$m->connect('api/statuses/friends/:id.:format', $m->connect('api/statuses/friends/:id.:format',
array('action' => 'ApiUserFriends', array('action' => 'ApiUserFriends',
'id' => '['.NICKNAME_FMT.']+', 'id' => '[a-zA-Z0-9]+',
'format' => '(xml|json)')); 'format' => '(xml|json)'));
$m->connect('api/statuses/followers.:format', $m->connect('api/statuses/followers.:format',
@ -333,7 +333,7 @@ class Router
$m->connect('api/statuses/followers/:id.:format', $m->connect('api/statuses/followers/:id.:format',
array('action' => 'ApiUserFollowers', array('action' => 'ApiUserFollowers',
'id' => '['.NICKNAME_FMT.']+', 'id' => '[a-zA-Z0-9]+',
'format' => '(xml|json)')); 'format' => '(xml|json)'));
$m->connect('api/statuses/show.:format', $m->connect('api/statuses/show.:format',
@ -362,7 +362,7 @@ class Router
$m->connect('api/users/show/:id.:format', $m->connect('api/users/show/:id.:format',
array('action' => 'ApiUserShow', array('action' => 'ApiUserShow',
'id' => '['.NICKNAME_FMT.']+', 'id' => '[a-zA-Z0-9]+',
'format' => '(xml|json)')); 'format' => '(xml|json)'));
// direct messages // direct messages
@ -400,12 +400,12 @@ class Router
$m->connect('api/friendships/create/:id.:format', $m->connect('api/friendships/create/:id.:format',
array('action' => 'ApiFriendshipsCreate', array('action' => 'ApiFriendshipsCreate',
'id' => '['.NICKNAME_FMT.']+', 'id' => '[a-zA-Z0-9]+',
'format' => '(xml|json)')); 'format' => '(xml|json)'));
$m->connect('api/friendships/destroy/:id.:format', $m->connect('api/friendships/destroy/:id.:format',
array('action' => 'ApiFriendshipsDestroy', array('action' => 'ApiFriendshipsDestroy',
'id' => '['.NICKNAME_FMT.']+', 'id' => '[a-zA-Z0-9]+',
'format' => '(xml|json)')); 'format' => '(xml|json)'));
// Social graph // Social graph
@ -462,28 +462,28 @@ class Router
$m->connect('api/favorites/:id.:format', $m->connect('api/favorites/:id.:format',
array('action' => 'ApiTimelineFavorites', array('action' => 'ApiTimelineFavorites',
'id' => '['.NICKNAME_FMT.']+', 'id' => '[a-zA-Z0-9]+',
'format' => '(xmljson|rss|atom)')); 'format' => '(xmljson|rss|atom)'));
$m->connect('api/favorites/create/:id.:format', $m->connect('api/favorites/create/:id.:format',
array('action' => 'ApiFavoriteCreate', array('action' => 'ApiFavoriteCreate',
'id' => '['.NICKNAME_FMT.']+', 'id' => '[a-zA-Z0-9]+',
'format' => '(xml|json)')); 'format' => '(xml|json)'));
$m->connect('api/favorites/destroy/:id.:format', $m->connect('api/favorites/destroy/:id.:format',
array('action' => 'ApiFavoriteDestroy', array('action' => 'ApiFavoriteDestroy',
'id' => '['.NICKNAME_FMT.']+', 'id' => '[a-zA-Z0-9]+',
'format' => '(xml|json)')); 'format' => '(xml|json)'));
// blocks // blocks
$m->connect('api/blocks/create/:id.:format', $m->connect('api/blocks/create/:id.:format',
array('action' => 'ApiBlockCreate', array('action' => 'ApiBlockCreate',
'id' => '['.NICKNAME_FMT.']+', 'id' => '[a-zA-Z0-9]+',
'format' => '(xml|json)')); 'format' => '(xml|json)'));
$m->connect('api/blocks/destroy/:id.:format', $m->connect('api/blocks/destroy/:id.:format',
array('action' => 'ApiBlockDestroy', array('action' => 'ApiBlockDestroy',
'id' => '['.NICKNAME_FMT.']+', 'id' => '[a-zA-Z0-9]+',
'format' => '(xml|json)')); 'format' => '(xml|json)'));
// help // help
@ -604,14 +604,14 @@ class Router
'replies', 'inbox', 'outbox', 'microsummary') as $a) { 'replies', 'inbox', 'outbox', 'microsummary') as $a) {
$m->connect(':nickname/'.$a, $m->connect(':nickname/'.$a,
array('action' => $a), array('action' => $a),
array('nickname' => '['.NICKNAME_FMT.']{1,64}')); array('nickname' => '[a-zA-Z0-9]{1,64}'));
} }
foreach (array('subscriptions', 'subscribers') as $a) { foreach (array('subscriptions', 'subscribers') as $a) {
$m->connect(':nickname/'.$a.'/:tag', $m->connect(':nickname/'.$a.'/:tag',
array('action' => $a), array('action' => $a),
array('tag' => '[a-zA-Z0-9]+', array('tag' => '[a-zA-Z0-9]+',
'nickname' => '['.NICKNAME_FMT.']{1,64}')); 'nickname' => '[a-zA-Z0-9]{1,64}'));
} }
foreach (array('rss', 'groups') as $a) { foreach (array('rss', 'groups') as $a) {
@ -623,31 +623,31 @@ class Router
foreach (array('all', 'replies', 'favorites') as $a) { foreach (array('all', 'replies', 'favorites') as $a) {
$m->connect(':nickname/'.$a.'/rss', $m->connect(':nickname/'.$a.'/rss',
array('action' => $a.'rss'), array('action' => $a.'rss'),
array('nickname' => '['.NICKNAME_FMT.']{1,64}')); array('nickname' => '[a-zA-Z0-9]{1,64}'));
} }
$m->connect(':nickname/favorites', $m->connect(':nickname/favorites',
array('action' => 'showfavorites'), array('action' => 'showfavorites'),
array('nickname' => '['.NICKNAME_FMT.']{1,64}')); array('nickname' => '[a-zA-Z0-9]{1,64}'));
$m->connect(':nickname/avatar/:size', $m->connect(':nickname/avatar/:size',
array('action' => 'avatarbynickname'), array('action' => 'avatarbynickname'),
array('size' => '(original|96|48|24)', array('size' => '(original|96|48|24)',
'nickname' => '['.NICKNAME_FMT.']{1,64}')); 'nickname' => '[a-zA-Z0-9]{1,64}'));
$m->connect(':nickname/tag/:tag/rss', $m->connect(':nickname/tag/:tag/rss',
array('action' => 'userrss'), array('action' => 'userrss'),
array('nickname' => '['.NICKNAME_FMT.']{1,64}'), array('nickname' => '[a-zA-Z0-9]{1,64}'),
array('tag' => '[a-zA-Z0-9]+')); array('tag' => '[a-zA-Z0-9]+'));
$m->connect(':nickname/tag/:tag', $m->connect(':nickname/tag/:tag',
array('action' => 'showstream'), array('action' => 'showstream'),
array('nickname' => '['.NICKNAME_FMT.']{1,64}'), array('nickname' => '[a-zA-Z0-9]{1,64}'),
array('tag' => '[a-zA-Z0-9]+')); array('tag' => '[a-zA-Z0-9]+'));
$m->connect(':nickname', $m->connect(':nickname',
array('action' => 'showstream'), array('action' => 'showstream'),
array('nickname' => '['.NICKNAME_FMT.']{1,64}')); array('nickname' => '[a-zA-Z0-9]{1,64}'));
Event::handle('RouterInitialized', array($m)); Event::handle('RouterInitialized', array($m));
} }