GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Use Nickname::DISPLAY_FMT instead of manual regex fragments in router setup for nickname parameters.

Browse Source
This commit is contained in:
Brion Vibber 2010-11-29 16:02:35 -08:00
parent 8d3577da34
commit e03d2584aa
1 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
lib/router.php
View File

@ -223,10 +223,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' => '[A-Za-z0-9_-]+')); array('replyto' => Nickname::DISPLAY_FMT));
$m->connect('notice/new?replyto=:replyto&inreplyto=:inreplyto', $m->connect('notice/new?replyto=:replyto&inreplyto=:inreplyto',
array('action' => 'newnotice'), array('action' => 'newnotice'),
array('replyto' => '[A-Za-z0-9_-]+'), array('replyto' => Nickname::DISPLAY_FMT),
array('inreplyto' => '[0-9]+')); array('inreplyto' => '[0-9]+'));
$m->connect('notice/:notice/file', $m->connect('notice/:notice/file',
@ -250,7 +250,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' => '[A-Za-z0-9_-]+')); $m->connect('message/new?to=:to', array('action' => 'newmessage'), array('to' => Nickname::DISPLAY_FMT));
$m->connect('message/:message', $m->connect('message/:message',
array('action' => 'showmessage'), array('action' => 'showmessage'),
array('message' => '[0-9]+')); array('message' => '[0-9]+'));
@ -281,7 +281,7 @@ class Router
foreach (array('edit', 'join', 'leave', 'delete') as $v) { foreach (array('edit', 'join', 'leave', 'delete') as $v) {
$m->connect('group/:nickname/'.$v, $m->connect('group/:nickname/'.$v,
array('action' => $v.'group'), array('action' => $v.'group'),
array('nickname' => '[a-zA-Z0-9]+')); array('nickname' => Nickname::DISPLAY_FMT));
$m->connect('group/:id/id/'.$v, $m->connect('group/:id/id/'.$v,
array('action' => $v.'group'), array('action' => $v.'group'),
array('id' => '[0-9]+')); array('id' => '[0-9]+'));
@ -290,20 +290,20 @@ class Router
foreach (array('members', 'logo', 'rss', 'designsettings') as $n) { foreach (array('members', 'logo', 'rss', 'designsettings') as $n) {
$m->connect('group/:nickname/'.$n, $m->connect('group/:nickname/'.$n,
array('action' => 'group'.$n), array('action' => 'group'.$n),
array('nickname' => '[a-zA-Z0-9]+')); array('nickname' => Nickname::DISPLAY_FMT));
} }
$m->connect('group/:nickname/foaf', $m->connect('group/:nickname/foaf',
array('action' => 'foafgroup'), array('action' => 'foafgroup'),
array('nickname' => '[a-zA-Z0-9]+')); array('nickname' => Nickname::DISPLAY_FMT));
$m->connect('group/:nickname/blocked', $m->connect('group/:nickname/blocked',
array('action' => 'blockedfromgroup'), array('action' => 'blockedfromgroup'),
array('nickname' => '[a-zA-Z0-9]+')); array('nickname' => Nickname::DISPLAY_FMT));
$m->connect('group/:nickname/makeadmin', $m->connect('group/:nickname/makeadmin',
array('action' => 'makeadmin'), array('action' => 'makeadmin'),
array('nickname' => '[a-zA-Z0-9]+')); array('nickname' => Nickname::DISPLAY_FMT));
$m->connect('group/:id/id', $m->connect('group/:id/id',
array('action' => 'groupbyid'), array('action' => 'groupbyid'),
@ -311,7 +311,7 @@ class Router
$m->connect('group/:nickname', $m->connect('group/:nickname',
array('action' => 'showgroup'), array('action' => 'showgroup'),
array('nickname' => '[a-zA-Z0-9]+')); array('nickname' => Nickname::DISPLAY_FMT));
$m->connect('group/', array('action' => 'groups')); $m->connect('group/', array('action' => 'groups'));
$m->connect('group', array('action' => 'groups')); $m->connect('group', array('action' => 'groups'));
@ -332,7 +332,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' => '[a-zA-Z0-9]+', 'id' => Nickname::DISPLAY_FMT,
'format' => '(xml|json|rss|atom)')); 'format' => '(xml|json|rss|atom)'));
$m->connect('api/statuses/home_timeline.:format', $m->connect('api/statuses/home_timeline.:format',
@ -341,7 +341,7 @@ class Router
$m->connect('api/statuses/home_timeline/:id.:format', $m->connect('api/statuses/home_timeline/:id.:format',
array('action' => 'ApiTimelineHome', array('action' => 'ApiTimelineHome',
'id' => '[a-zA-Z0-9]+', 'id' => Nickname::DISPLAY_FMT,
'format' => '(xml|json|rss|atom)')); 'format' => '(xml|json|rss|atom)'));
$m->connect('api/statuses/user_timeline.:format', $m->connect('api/statuses/user_timeline.:format',
@ -350,7 +350,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' => '[a-zA-Z0-9]+', 'id' => Nickname::DISPLAY_FMT,
'format' => '(xml|json|rss|atom)')); 'format' => '(xml|json|rss|atom)'));
$m->connect('api/statuses/mentions.:format', $m->connect('api/statuses/mentions.:format',
@ -359,7 +359,7 @@ class Router
$m->connect('api/statuses/mentions/:id.:format', $m->connect('api/statuses/mentions/:id.:format',
array('action' => 'ApiTimelineMentions', array('action' => 'ApiTimelineMentions',
'id' => '[a-zA-Z0-9]+', 'id' => Nickname::DISPLAY_FMT,
'format' => '(xml|json|rss|atom)')); 'format' => '(xml|json|rss|atom)'));
$m->connect('api/statuses/replies.:format', $m->connect('api/statuses/replies.:format',
@ -368,7 +368,7 @@ class Router
$m->connect('api/statuses/replies/:id.:format', $m->connect('api/statuses/replies/:id.:format',
array('action' => 'ApiTimelineMentions', array('action' => 'ApiTimelineMentions',
'id' => '[a-zA-Z0-9]+', 'id' => Nickname::DISPLAY_FMT,
'format' => '(xml|json|rss|atom)')); 'format' => '(xml|json|rss|atom)'));
$m->connect('api/statuses/retweeted_by_me.:format', $m->connect('api/statuses/retweeted_by_me.:format',
@ -389,7 +389,7 @@ class Router
$m->connect('api/statuses/friends/:id.:format', $m->connect('api/statuses/friends/:id.:format',
array('action' => 'ApiUserFriends', array('action' => 'ApiUserFriends',
'id' => '[a-zA-Z0-9]+', 'id' => Nickname::DISPLAY_FMT,
'format' => '(xml|json)')); 'format' => '(xml|json)'));
$m->connect('api/statuses/followers.:format', $m->connect('api/statuses/followers.:format',
@ -398,7 +398,7 @@ class Router
$m->connect('api/statuses/followers/:id.:format', $m->connect('api/statuses/followers/:id.:format',
array('action' => 'ApiUserFollowers', array('action' => 'ApiUserFollowers',
'id' => '[a-zA-Z0-9]+', 'id' => Nickname::DISPLAY_FMT,
'format' => '(xml|json)')); 'format' => '(xml|json)'));
$m->connect('api/statuses/show.:format', $m->connect('api/statuses/show.:format',
@ -441,7 +441,7 @@ class Router
$m->connect('api/users/show/:id.:format', $m->connect('api/users/show/:id.:format',
array('action' => 'ApiUserShow', array('action' => 'ApiUserShow',
'id' => '[a-zA-Z0-9]+', 'id' => Nickname::DISPLAY_FMT,
'format' => '(xml|json)')); 'format' => '(xml|json)'));
// direct messages // direct messages
@ -479,12 +479,12 @@ class Router
$m->connect('api/friendships/create/:id.:format', $m->connect('api/friendships/create/:id.:format',
array('action' => 'ApiFriendshipsCreate', array('action' => 'ApiFriendshipsCreate',
'id' => '[a-zA-Z0-9]+', 'id' => Nickname::DISPLAY_FMT,
'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' => '[a-zA-Z0-9]+', 'id' => Nickname::DISPLAY_FMT,
'format' => '(xml|json)')); 'format' => '(xml|json)'));
// Social graph // Social graph
@ -541,17 +541,17 @@ class Router
$m->connect('api/favorites/:id.:format', $m->connect('api/favorites/:id.:format',
array('action' => 'ApiTimelineFavorites', array('action' => 'ApiTimelineFavorites',
'id' => '[a-zA-Z0-9]+', 'id' => Nickname::DISPLAY_FMT,
'format' => '(xml|json|rss|atom)')); 'format' => '(xml|json|rss|atom)'));
$m->connect('api/favorites/create/:id.:format', $m->connect('api/favorites/create/:id.:format',
array('action' => 'ApiFavoriteCreate', array('action' => 'ApiFavoriteCreate',
'id' => '[a-zA-Z0-9]+', 'id' => Nickname::DISPLAY_FMT,
'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' => '[a-zA-Z0-9]+', 'id' => Nickname::DISPLAY_FMT,
'format' => '(xml|json)')); 'format' => '(xml|json)'));
// blocks // blocks
@ -561,7 +561,7 @@ class Router
$m->connect('api/blocks/create/:id.:format', $m->connect('api/blocks/create/:id.:format',
array('action' => 'ApiBlockCreate', array('action' => 'ApiBlockCreate',
'id' => '[a-zA-Z0-9]+', 'id' => Nickname::DISPLAY_FMT,
'format' => '(xml|json)')); 'format' => '(xml|json)'));
$m->connect('api/blocks/destroy.:format', $m->connect('api/blocks/destroy.:format',
@ -570,7 +570,7 @@ class Router
$m->connect('api/blocks/destroy/:id.:format', $m->connect('api/blocks/destroy/:id.:format',
array('action' => 'ApiBlockDestroy', array('action' => 'ApiBlockDestroy',
'id' => '[a-zA-Z0-9]+', 'id' => Nickname::DISPLAY_FMT,
'format' => '(xml|json)')); 'format' => '(xml|json)'));
// help // help
@ -606,7 +606,7 @@ class Router
$m->connect('api/statusnet/groups/timeline/:id.:format', $m->connect('api/statusnet/groups/timeline/:id.:format',
array('action' => 'ApiTimelineGroup', array('action' => 'ApiTimelineGroup',
'id' => '[a-zA-Z0-9]+', 'id' => Nickname::DISPLAY_FMT,
'format' => '(xml|json|rss|atom)')); 'format' => '(xml|json|rss|atom)'));
$m->connect('api/statusnet/groups/show.:format', $m->connect('api/statusnet/groups/show.:format',
@ -615,12 +615,12 @@ class Router
$m->connect('api/statusnet/groups/show/:id.:format', $m->connect('api/statusnet/groups/show/:id.:format',
array('action' => 'ApiGroupShow', array('action' => 'ApiGroupShow',
'id' => '[a-zA-Z0-9]+', 'id' => Nickname::DISPLAY_FMT,
'format' => '(xml|json)')); 'format' => '(xml|json)'));
$m->connect('api/statusnet/groups/join.:format', $m->connect('api/statusnet/groups/join.:format',
array('action' => 'ApiGroupJoin', array('action' => 'ApiGroupJoin',
'id' => '[a-zA-Z0-9]+', 'id' => Nickname::DISPLAY_FMT,
'format' => '(xml|json)')); 'format' => '(xml|json)'));
$m->connect('api/statusnet/groups/join/:id.:format', $m->connect('api/statusnet/groups/join/:id.:format',
@ -629,7 +629,7 @@ class Router
$m->connect('api/statusnet/groups/leave.:format', $m->connect('api/statusnet/groups/leave.:format',
array('action' => 'ApiGroupLeave', array('action' => 'ApiGroupLeave',
'id' => '[a-zA-Z0-9]+', 'id' => Nickname::DISPLAY_FMT,
'format' => '(xml|json)')); 'format' => '(xml|json)'));
$m->connect('api/statusnet/groups/leave/:id.:format', $m->connect('api/statusnet/groups/leave/:id.:format',
@ -646,7 +646,7 @@ class Router
$m->connect('api/statusnet/groups/list/:id.:format', $m->connect('api/statusnet/groups/list/:id.:format',
array('action' => 'ApiGroupList', array('action' => 'ApiGroupList',
'id' => '[a-zA-Z0-9]+', 'id' => Nickname::DISPLAY_FMT,
'format' => '(xml|json|rss|atom)')); 'format' => '(xml|json|rss|atom)'));
$m->connect('api/statusnet/groups/list_all.:format', $m->connect('api/statusnet/groups/list_all.:format',
@ -659,7 +659,7 @@ class Router
$m->connect('api/statusnet/groups/membership/:id.:format', $m->connect('api/statusnet/groups/membership/:id.:format',
array('action' => 'ApiGroupMembership', array('action' => 'ApiGroupMembership',
'id' => '[a-zA-Z0-9]+', 'id' => Nickname::DISPLAY_FMT,
'format' => '(xml|json)')); 'format' => '(xml|json)'));
$m->connect('api/statusnet/groups/create.:format', $m->connect('api/statusnet/groups/create.:format',
@ -692,7 +692,7 @@ class Router
$m->connect('api/statusnet/app/service/:id.xml', $m->connect('api/statusnet/app/service/:id.xml',
array('action' => 'ApiAtomService', array('action' => 'ApiAtomService',
'id' => '[a-zA-Z0-9]+')); 'id' => Nickname::DISPLAY_FMT));
$m->connect('api/statusnet/app/service.xml', $m->connect('api/statusnet/app/service.xml',
array('action' => 'ApiAtomService')); array('action' => 'ApiAtomService'));
@ -789,54 +789,54 @@ class Router
'replies', 'inbox', 'outbox', 'microsummary', 'hcard') as $a) { 'replies', 'inbox', 'outbox', 'microsummary', 'hcard') as $a) {
$m->connect(':nickname/'.$a, $m->connect(':nickname/'.$a,
array('action' => $a), array('action' => $a),
array('nickname' => '[a-zA-Z0-9]{1,64}')); array('nickname' => Nickname::DISPLAY_FMT));
} }
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' => '[a-zA-Z0-9]{1,64}')); 'nickname' => Nickname::DISPLAY_FMT));
} }
foreach (array('rss', 'groups') as $a) { foreach (array('rss', 'groups') as $a) {
$m->connect(':nickname/'.$a, $m->connect(':nickname/'.$a,
array('action' => 'user'.$a), array('action' => 'user'.$a),
array('nickname' => '[a-zA-Z0-9]{1,64}')); array('nickname' => Nickname::DISPLAY_FMT));
} }
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' => '[a-zA-Z0-9]{1,64}')); array('nickname' => Nickname::DISPLAY_FMT));
} }
$m->connect(':nickname/favorites', $m->connect(':nickname/favorites',
array('action' => 'showfavorites'), array('action' => 'showfavorites'),
array('nickname' => '[a-zA-Z0-9]{1,64}')); array('nickname' => Nickname::DISPLAY_FMT));
$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' => '[a-zA-Z0-9]{1,64}')); 'nickname' => Nickname::DISPLAY_FMT));
$m->connect(':nickname/tag/:tag/rss', $m->connect(':nickname/tag/:tag/rss',
array('action' => 'userrss'), array('action' => 'userrss'),
array('nickname' => '[a-zA-Z0-9]{1,64}'), array('nickname' => Nickname::DISPLAY_FMT),
array('tag' => '[\pL\pN_\-\.]{1,64}')); array('tag' => '[\pL\pN_\-\.]{1,64}'));
$m->connect(':nickname/tag/:tag', $m->connect(':nickname/tag/:tag',
array('action' => 'showstream'), array('action' => 'showstream'),
array('nickname' => '[a-zA-Z0-9]{1,64}'), array('nickname' => Nickname::DISPLAY_FMT),
array('tag' => '[\pL\pN_\-\.]{1,64}')); array('tag' => '[\pL\pN_\-\.]{1,64}'));
$m->connect(':nickname/rsd.xml', $m->connect(':nickname/rsd.xml',
array('action' => 'rsd'), array('action' => 'rsd'),
array('nickname' => '[a-zA-Z0-9]{1,64}')); array('nickname' => Nickname::DISPLAY_FMT));
$m->connect(':nickname', $m->connect(':nickname',
array('action' => 'showstream'), array('action' => 'showstream'),
array('nickname' => '[a-zA-Z0-9]{1,64}')); array('nickname' => Nickname::DISPLAY_FMT));
} }
// user stuff // user stuff