From: Evan Prodromou Date: Mon, 19 Sep 2011 23:21:59 +0000 (-0400) Subject: move more routes around from most specific to least X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a5518ce35e0d6549d8b2c6a73631f1574ba73988;p=quix0rs-gnu-social.git move more routes around from most specific to least --- diff --git a/lib/router.php b/lib/router.php index fa34b17537..4020ba0e39 100644 --- a/lib/router.php +++ b/lib/router.php @@ -124,6 +124,20 @@ class Router 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', @@ -148,18 +162,11 @@ class Router $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')); @@ -170,12 +177,6 @@ class Router $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)); - } - // settings foreach (array('profile', 'avatar', 'password', 'im', 'oauthconnections', @@ -202,18 +203,18 @@ class Router // 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'),