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

move more routes around from most specific to least

Browse Source
This commit is contained in:
Evan Prodromou 2011-09-19 19:21:59 -04:00
parent 319639a232
commit a5518ce35e
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
lib/router.php
View File

@ -124,6 +124,20 @@ class Router
array('user_id' => '[0-9]+', array('user_id' => '[0-9]+',
'token' => '.+')); '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 stuff is repetitive
$main = array('login', 'logout', 'register', 'subscribe', $main = array('login', 'logout', 'register', 'subscribe',
@ -148,18 +162,11 @@ class Router
$m->connect('main/'.$a, array('action' => $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'), $m->connect('main/tagprofile/:id', array('action' => 'tagprofile'),
array('id' => '[0-9]+')); array('id' => '[0-9]+'));
$m->connect('main/tagprofile', array('action' => 'tagprofile'));
$m->connect('main/oembed', $m->connect('main/oembed',
array('action' => 'oembed')); array('action' => 'oembed'));
@ -170,12 +177,6 @@ class Router
$m->connect('main/xrd', $m->connect('main/xrd',
array('action' => 'userxrd')); array('action' => 'userxrd'));
// these take a code
foreach (array('register', 'confirmaddress', 'recoverpassword') as $c) {
$m->connect('main/'.$c.'/:code', array('action' => $c));
}
// settings // settings
foreach (array('profile', 'avatar', 'password', 'im', 'oauthconnections', foreach (array('profile', 'avatar', 'password', 'im', 'oauthconnections',
@ -202,18 +203,18 @@ class Router
// search // search
foreach (array('group', 'people', 'notice') as $s) { foreach (array('group', 'people', 'notice') as $s) {
$m->connect('search/'.$s, array('action' => $s.'search'));
$m->connect('search/'.$s.'?q=:q', $m->connect('search/'.$s.'?q=:q',
array('action' => $s.'search'), array('action' => $s.'search'),
array('q' => '.+')); array('q' => '.+'));
$m->connect('search/'.$s, array('action' => $s.'search'));
} }
// The second of these is needed to make the link work correctly // The second of these is needed to make the link work correctly
// when inserted into the page. The first is needed to match the // 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 Net_URL_Mapper bug to me.
$m->connect('search/notice/rss', array('action' => 'noticesearchrss'));
$m->connect('search/notice/rss?q=:q', array('action' => 'noticesearchrss'), $m->connect('search/notice/rss?q=:q', array('action' => 'noticesearchrss'),
array('q' => '.+')); array('q' => '.+'));
$m->connect('search/notice/rss', array('action' => 'noticesearchrss'));
$m->connect('attachment/:attachment', $m->connect('attachment/:attachment',
array('action' => 'attachment'), array('action' => 'attachment'),