function find_nearest_key($key, &$array)
{
- $keys = array_keys($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 (strpos($key, $k) !== false || strpos($k, $key) !== false) {
- return $k;
+ if ($k == "#final#") {
+ continue;
+ }
+ $lev = levenshtein($key, $k);
+ if ((!isset($val) || $lev < $val) && $lev <= (strlen($k)*2)/3) {
+ $val = $lev;
+ $best = $k;
}
}
- if (in_array("#final#", $keys)) {
+ if (!isset($best) && $has_end) {
return "#final#";
+ } else {
+ return $best;
}
return null;
}
{
$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) {
$p = split('/', $this->path);
$place =& $hooks;
$link = '';
- $ended = false;
foreach ($p as $k) {
- if (!$ended) {
+ if (!isset($ended)) {
$key = $this->find_nearest_key($k, $place);
} else {
$key = $k;
}
if ($key == "#final#") {
- $key = $k;
- $ended = true;
if (!array_key_exists($link, $this->__hooks)) {
return null;
}
+ $key = $k;
+ $ended = true;
}
if (!is_null($key)) {
if (!empty($link)) {
return null;
}
}
- return $link;
+ if ($link != $this->path) {
+ return $link;
+ }
+ return null;
}
function call_hook(&$page)
$args = $this->argv;
$args[0] = &$page;
- if (strlen($hook['perms']) && $hook['perms'] != Session::v('perms')) {
+ if (!empty($hook['perms']) && $hook['perms'] != S::v('perms')) {
return PL_FORBIDDEN;
}
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();
{
global $page;
- new_skinned_page('index.tpl');
+ new_skinned_page('platal/index.tpl');
if (empty($this->path)) {
$this->path = 'index';