diff options
| author | Zach Copley <zach@status.net> | 2009-11-13 19:02:18 -0800 |
|---|---|---|
| committer | Zach Copley <zach@status.net> | 2010-01-24 16:36:01 -0800 |
| commit | 9d958fd539ecb74356013c11a2fd2c4c8b6a0ed1 (patch) | |
| tree | c46950b8797f9cdb722c76ce111dcfa61aab9570 /lib/router.php | |
| parent | ae46bc5fff21120ef867fb8ab59833a8f26adf47 (diff) | |
Reorganized the OAuth app URLs and more work on the register app workflow
Diffstat (limited to 'lib/router.php')
| -rw-r--r-- | lib/router.php | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/lib/router.php b/lib/router.php index 9b2aa025e..7b65ae215 100644 --- a/lib/router.php +++ b/lib/router.php @@ -140,13 +140,11 @@ class Router // settings - foreach (array('profile', 'avatar', 'password', 'im', 'application', + foreach (array('profile', 'avatar', 'password', 'im', 'oauthconnections', 'email', 'sms', 'userdesign', 'other') as $s) { $m->connect('settings/'.$s, array('action' => $s.'settings')); } - - $m->connect('settings/oauthclients', array('action' => 'oauthclients')); - + // search foreach (array('group', 'people', 'notice') as $s) { @@ -636,12 +634,19 @@ class Router // user stuff foreach (array('subscriptions', 'subscribers', - 'nudge', 'all', 'foaf', 'xrds', + 'nudge', 'all', 'foaf', 'xrds', 'apps', 'replies', 'inbox', 'outbox', 'microsummary') as $a) { $m->connect(':nickname/'.$a, array('action' => $a), array('nickname' => '[a-zA-Z0-9]{1,64}')); } + + $m->connect('apps/new', array('action' => 'newapplication')); + + $m->connect(':nickname/apps/edit', + array('action' => 'editapplication'), + array('nickname' => '['.NICKNAME_FMT.']{1,64}') + ); foreach (array('subscriptions', 'subscribers') as $a) { $m->connect(':nickname/'.$a.'/:tag', |