private $__mods;
private $__hooks;
+ protected $https;
+
public $ns;
public $path;
public $argv;
array_unshift($modules, 'core');
foreach ($modules as $module) {
+ $module = strtolower($module);
$this->__mods[$module] = $m = PLModule::factory($module);
$this->__hooks += $m->handlers();
}
+
+ global $globals;
+ if ($globals->mode == '') {
+ pl_redirect('index.html');
+ }
}
public function pl_self($n = null)
return null;
}
+ $this->https = ($hook['type'] & NO_HTTPS) ? false : true;
$this->argv = explode('/', substr($this->path, strlen($p)));
$this->argv[0] = $p;
continue;
}
$lev = levenshtein($key, $k);
- if ((!isset($val) || $lev < $val) && $lev <= (strlen($k)*2)/3) {
+
+ if ((!isset($val) || $lev < $val)
+ && ($lev <= strlen($k)/2 || strpos($k, $key) !== false || strpos($key, $k) !== false)) {
$val = $lev;
$best = $k;
}
}
if (!isset($best) && $has_end) {
return "#final#";
- } else {
+ } else if (isset($best)) {
return $best;
}
return null;
public function near_hook()
{
$hooks = array();
+ $leafs = array();
foreach ($this->__hooks as $hook=>$handler) {
- if (!empty($handler['perms']) && $handler['perms'] != S::v('perms')) {
+ if (!$this->check_perms($handler['perms'])) {
continue;
}
$parts = split('/', $hook);
if (!isset($place[$part])) {
$place[$part] = array();
}
- $place =& $place[$part];
+ $place =& $place[$part];
+ }
+ $leaf = $parts[count($parts)-1];
+ if (!isset($leafs[$leaf])) {
+ $leafs[$leaf] = $hook;
+ } else if (is_array($leafs[$leaf])) {
+ $leafs[$leaf][] = $hook;
+ } else {
+ $leafs[$leaf] = array($hook, $leafs[$leaf]);
}
$place["#final#"] = array();
}
+ // search for the nearest full path
$p = split('/', $this->path);
$place =& $hooks;
$link = '';
}
if ($key == "#final#") {
if (!array_key_exists($link, $this->__hooks)) {
- return null;
+ $link = '';
+ break;
}
$key = $k;
$ended = true;
$link .= $key;
$place =& $place[$key];
} else {
- return null;
+ $link = '';
+ break;
}
}
- if ($link != $this->path) {
+ if ($link == $this->path) {
+ $link = '';
+ }
+ if ($link && levenshtein($link, $this->path) < strlen($link)/3) {
return $link;
}
- return null;
+
+ // search for missing namespace (the given name is a leaf)
+ $leaf = array_shift($p);
+ $args = count($p) ? '/' . implode('/', $p) : '';
+ if (isset($leafs[$leaf]) && !is_array($leafs[$leaf]) && $leafs[$leaf] != $this->path) {
+ return $leafs[$leaf] . $args;
+ }
+ unset($val);
+ $best = null;
+ foreach ($leafs as $k=>&$path) {
+ if (is_array($path)) {
+ continue;
+ }
+ $lev = levenshtein($leaf, $k);
+
+ if ((!isset($val) || $lev < $val)
+ && ($lev <= strlen($k)/2 || strpos($k, $leaf) !== false || strpos($leaf, $k) !== false)) {
+ $val = $lev;
+ $best = $path;
+ }
+ }
+ return $best == null ? ( $link ? $link : null ) : $best . $args;
}
protected function check_perms($perms)
return true;
}
$s_perms = S::v('perms');
-
- // hook perms syntax is
- $perms = explode(',', $perms);
- foreach ($perms as $perm)
- {
- $ok = true;
- $rights = explode(':', $perm);
- foreach ($rights as $right) {
- if (($right{0} == '!' && $s_perms->hasFlag(substr($right, 1))) || !$s_perms->hasFlag($right)) {
- $ok = false;
- }
- }
- if ($ok) {
- return true;
- }
- }
- return false;
+ return $s_perms->hasFlagCombination($perms);
}
private function call_hook(PlatalPage &$page)
if (empty($hook)) {
return PL_NOT_FOUND;
}
+ global $globals;
+ if ($this->https && !$_SERVER['HTTPS'] && $globals->core->secure_domain) {
+ http_redirect('https://' . $globals->core->secure_domain . $_SERVER['REQUEST_URI']);
+ }
- $args = $this->argv;
- $args[0] = &$page;
+ $args = $this->argv;
+ $args[0] =& $page;
if ($hook['auth'] > S::v('auth', AUTH_PUBLIC)) {
- if ($hook['type'] == DO_AUTH) {
- global $globals;
-
+ if ($hook['type'] & DO_AUTH) {
if (!call_user_func(array($globals->session, 'doAuth'))) {
$this->force_login($page);
}
}
$val = call_user_func_array($hook['hook'], $args);
- if ($val == PL_DO_AUTH) {
- global $globals;
+ if ($val & PL_DO_AUTH) {
// The handler need a better auth with the current args
if (!call_user_func(array($globals->session, 'doAuth'))) {
$this->force_login($page);
return $val;
}
- protected function force_login(PlatalPage &$page)
+ public function force_login(PlatalPage &$page)
{
+ header($_SERVER['SERVER_PROTOCOL'] . ' 403 Forbidden');
if (S::logged()) {
$page->changeTpl('core/password_prompt_logged.tpl');
$page->addJsLink('do_challenge_response_logged.js');
$page->run();
}
- private function on_subscribe($forlife, $uid, $promo, $pass)
+ public function on_subscribe($forlife, $uid, $promo, $pass)
{
$args = func_get_args();
foreach ($this->__mods as $mod) {