X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2FPlatal.php;h=c34d34d0e7d3e915f8d8c48743e8a94c6a145fc0;hb=c99ef281118de7ab4b45de299701925ad5ebb26c;hp=750680f8028dca6e9015620283e3fa9ffb5c691b;hpb=298d4d1e0ebb25f6eb296a719b875c4e507c4071;p=platal.git

diff --git a/classes/Platal.php b/classes/Platal.php
index 750680f..c34d34d 100644
--- a/classes/Platal.php
+++ b/classes/Platal.php
@@ -19,8 +19,6 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
-define('PL_OK', 0);
-define('PL_NEEDLOGIN', 1);
 define('PL_FORBIDDEN', 403);
 define('PL_NOT_FOUND', 404);
 
@@ -36,18 +34,32 @@ class Platal
     function Platal()
     {
         $modules    = func_get_args();
-        $this->path = trim(Get::_get('p', null), '/');
+        $this->path = trim(Get::_get('n', null), '/');
 
         $this->__mods  = array();
         $this->__hooks = array();
 
         array_unshift($modules, 'core');
         foreach ($modules as $module) {
-            $this->__mods[$module] = $m = PLModule::factory($this, $module);
+            $this->__mods[$module] = $m = PLModule::factory($module);
             $this->__hooks += $m->handlers();
         }
     }
 
+    function pl_self($n = null)
+    {
+        if (is_null($n))
+            return $this->path;
+
+        if ($n >= 0)
+            return join('/', array_slice($this->argv, 0, $n + 1));
+
+        if ($n <= -count($this->argv))
+            return $this->argv[0];
+
+        return join('/', array_slice($this->argv, 0, $n));
+    }
+
     function find_hook()
     {
         $p = $this->path;
@@ -86,18 +98,33 @@ class Platal
         $args    = $this->argv;
         $args[0] = &$page;
 
-        if ($hook['auth'] > Session::get('auth', AUTH_PUBLIC)) {
-            $_SESSION['session']->doAuth($page);
+        if ($hook['auth'] > S::v('auth', AUTH_PUBLIC)) {
+            // FIXME: don't use 'session' object anymore
+            if (!$_SESSION['session']->doAuth()) {
+                $this->force_login($page);
+            }
         }
 
         return call_user_func_array($hook['hook'], $args);
     }
 
+    function force_login(&$page)
+    {
+        if (S::logged() and !$new_name) {
+            $page->changeTpl('password_prompt_logged.tpl');
+            $page->addJsLink('do_challenge_response_logged.js');
+        } else {
+            $page->changeTpl('password_prompt.tpl');
+            $page->addJsLink('do_challenge_response.js');
+    	}
+        $page->run();
+    }
+
     function run()
     {
         global $page;
 
-        new_skinned_page('index.tpl', AUTH_PUBLIC);
+        new_skinned_page('index.tpl');
 
         if (empty($this->path)) {
             $this->path = 'index';
@@ -115,6 +142,16 @@ class Platal
         $page->assign_by_ref('platal', $this);
         $page->run();
     }
+
+    function on_subscribe($forlife, $uid, $promo, $pass)
+    {
+        $args = func_get_args();
+        foreach ($this->__mods as $mod) {
+            if (!is_callable($mod, 'on_subscribe'))
+                continue;
+            call_user_func_array(array($mod, 'on_subscribe'), $args);
+        }
+    }
 }
 
 ?>