Merge branch 'sessionidparam' into 0.9.x

Conflicts: lib/command.php
2010-01-11 00:45:26 -08:00
parent ad63a9518c 92deb35bc4
commit 8809e577b2
9 changed files with 298 additions and 96 deletions
--- a/lib/router.php
+++ b/lib/router.php
@@ -88,7 +88,10 @@ class Router

            $m->connect('doc/:title', array('action' => 'doc'));

-            $m->connect('main/login?user_id=:user_id&token=:token', array('action'=>'login'), array('user_id'=> '[0-9]+', 'token'=>'.+'));
+            $m->connect('main/otp/:user_id/:token',
+                        array('action' => 'otp'),
+                        array('user_id' => '[0-9]+',
+                              'token' => '.+'));

            // main stuff is repetitive