Minor improvements

[platal.git] / classes / platal.php

diff --git a/classes/platal.php b/classes/platal.php
index 7bd94ff..cdae5e9 100644 (file)
--- a/classes/platal.php
+++ b/classes/platal.php
@@ -87,22 +87,113 @@ class Platal
         return $hook;
     }
 
+    function find_nearest_key($key, &$array)
+    {
+        $keys    = array_keys($array);
+        if (in_array($key, $keys)) {
+            return $key;
+        }
+
+        if (($pos = strpos($key, '.php')) !== false) {
+            $key = substr($key, 0, $pos);
+        }
+
+        $has_end = in_array("#final#", $keys);
+        if (strlen($key) > 24 && $has_end) {
+            return "#final#";
+        }
+
+        foreach ($keys as $k) {
+            if ($k == "#final#") {
+                continue;
+            }
+            $lev = levenshtein($key, $k);
+            if ((!isset($val) || $lev < $val) && $lev <= (strlen($k)*2)/3) {
+                $val  = $lev;
+                $best = $k;
+            }
+        }
+        if (!isset($best) && $has_end) {
+            return "#final#";
+        } else {
+            return $best;
+        }
+        return null;
+    }
+
+    function near_hook()
+    {
+        $hooks = array();
+        foreach ($this->__hooks as $hook=>$handler) {
+            if (!empty($handler['perms']) && $handler['perms'] != S::v('perms')) {
+                continue;
+            }
+            $parts = split('/', $hook);
+            $place =& $hooks;
+            foreach ($parts as $part) {
+                if (!isset($place[$part])) {
+                    $place[$part] = array();
+                }
+                $place =& $place[$part]; 
+            }
+            $place["#final#"] = array();
+        }
+
+        $p = split('/', $this->path);
+        $place =& $hooks;
+        $link  = '';
+        foreach ($p as $k) {
+            if (!isset($ended)) {
+                $key = $this->find_nearest_key($k, $place);
+            } else {
+                $key = $k;
+            }
+            if ($key == "#final#") {
+                if (!array_key_exists($link, $this->__hooks)) {
+                    return null;
+                }
+                $key = $k;
+                $ended = true;
+            }
+            if (!is_null($key)) {
+                if (!empty($link)) {
+                    $link .= '/';
+                }
+                $link .= $key;
+                $place =& $place[$key];
+            } else {
+                return null;
+            }
+        }
+        if ($link != $this->path) {
+            return $link;
+        }
+        return null;
+    }
+
     function call_hook(&$page)
     {
         $hook = $this->find_hook();
-
-        if (is_null($hook)) {
+        if (empty($hook)) {
             return PL_NOT_FOUND;
         }
 
         $args    = $this->argv;
         $args[0] = &$page;
 
-        if ($hook['auth'] > S::v('auth', AUTH_PUBLIC)) {
-            global $globals;
+        if (!empty($hook['perms']) && $hook['perms'] != S::v('perms')) {
+            return PL_FORBIDDEN;
+        }
 
-            if (!call_user_func(array($globals->session, 'doAuth'))) {
-                $this->force_login($page);
+        if ($hook['auth'] > S::v('auth', AUTH_PUBLIC)) {
+            if ($hook['type'] == DO_AUTH) {
+                global $globals;
+    
+                if (!call_user_func(array($globals->session, 'doAuth'))) {
+                    $this->force_login($page);
+                }
+            } else {
+                return PL_FORBIDDEN;
             }
         }
 
@@ -112,10 +203,10 @@ class Platal
     function force_login(&$page)
     {
         if (S::logged()) {
-            $page->changeTpl('password_prompt_logged.tpl');
+            $page->changeTpl('core/password_prompt_logged.tpl');
             $page->addJsLink('do_challenge_response_logged.js');
         } else {
-            $page->changeTpl('password_prompt.tpl');
+            $page->changeTpl('core/password_prompt.tpl');
             $page->addJsLink('do_challenge_response.js');
        }
         $page->run();
@@ -125,13 +216,13 @@ class Platal
     {
         global $page;
 
-        new_skinned_page('index.tpl');
+        new_skinned_page('platal/index.tpl');
 
         if (empty($this->path)) {
             $this->path = 'index';
         }
 
-        $page->assign_by_ref('platal', $this);
+        $page->assign('platal', $this);
         switch ($this->call_hook($page)) {
           case PL_FORBIDDEN:
             $this->__mods['core']->handler_403($page);
@@ -141,6 +232,8 @@ class Platal
             $this->__mods['core']->handler_404($page);
             break;
         }
+
+        $page->assign('platal', $this);
         $page->run();
     }