Reorder directory router connections / fix regex

This commit is contained in:
Zach Copley 2011-09-18 13:35:09 -07:00
parent fc827af94f
commit a394f79539

View File

@ -115,21 +115,20 @@ class DirectoryPlugin extends Plugin
{ {
$m->connect( $m->connect(
'directory/users', 'directory/users/:filter',
array('action' => 'userdirectory'), array('action' => 'userdirectory'),
array('filter' => 'all') array('filter' => '[0-9a-zA-Z]|(0-9)')
); );
$m->connect( $m->connect(
'directory/users/:filter', 'directory/users',
array('action' => 'userdirectory'), array('action' => 'userdirectory')
array('filter' => '([0-9a-zA-Z_]{1,64}|0-9)')
); );
$m->connect( $m->connect(
'groups/:filter', 'groups/:filter',
array('action' => 'groupdirectory'), array('action' => 'groupdirectory'),
array('filter' => '([0-9a-zA-Z_]{1,64}|0-9)') array('filter' => '[0-9a-zA-Z]|(0-9)')
); );
$m->connect( $m->connect(