git.shiar.nl
/
minimedit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
edit/head: optional admin stylesheet for editor overrides
[minimedit.git]
/
auth.inc.php
diff --git
a/auth.inc.php
b/auth.inc.php
index 3901609ac5317685563fc446aee404d121a442ad..b22ed5bf998aed0f7458ed3d727ac5606e391404 100644
(file)
--- a/
auth.inc.php
+++ b/
auth.inc.php
@@
-3,8
+3,13
@@
date_default_timezone_set('Europe/Amsterdam');
class User
{
class User
{
- function __construct($dir, $existing = TRUE)
+ public $dir, $login;
+
+ function __construct($dir = NULL, $existing = TRUE)
{
{
+ if (empty($dir)) {
+ return;
+ }
if (!file_exists($dir) and $existing) {
throw new Exception("Gebruiker niet gevonden in $dir");
}
if (!file_exists($dir) and $existing) {
throw new Exception("Gebruiker niet gevonden in $dir");
}
@@
-55,7
+60,7
@@
class User
}
return isset($this->admin[$permission]); # check level
}
}
return isset($this->admin[$permission]); # check level
}
- if (!@file_exists("{$this->dir}/.admin")) {
+ if (!
$this->dir or !
@file_exists("{$this->dir}/.admin")) {
return FALSE; # not an admin
}
return array_fill_keys(explode("\n", file_get_contents("{$this->dir}/.admin")), TRUE);
return FALSE; # not an admin
}
return array_fill_keys(explode("\n", file_get_contents("{$this->dir}/.admin")), TRUE);
@@
-122,8
+127,11
@@
function login($inuser, $inpass = NULL)
return $user;
}
return $user;
}
+global $User;
if (isset($_COOKIE['login'])) {
if (isset($_COOKIE['login'])) {
- global $User;
$User = login($_COOKIE['login']);
}
$User = login($_COOKIE['login']);
}
+if (!$User) {
+ $User = new User;
+}