projects
/
Pman.Core
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c911c86
)
DataObjects/Core_person.php
author
Alan Knowles
<alan@roojs.com>
Mon, 15 Oct 2018 05:28:38 +0000
(13:28 +0800)
committer
Alan Knowles
<alan@roojs.com>
Mon, 15 Oct 2018 05:28:38 +0000
(13:28 +0800)
DataObjects/Core_person.php
patch
|
blob
|
history
diff --git
a/DataObjects/Core_person.php
b/DataObjects/Core_person.php
index
471a180
..
85de3f7
100644
(file)
--- a/
DataObjects/Core_person.php
+++ b/
DataObjects/Core_person.php
@@
-275,21
+275,6
@@
class Pman_Core_DataObjects_Core_person extends DB_DataObject
unset($_SESSION[get_class($this)][$sesPrefix .'-timeout']);
setcookie('Pman.timeout', -1, time() + (30*60), '/');
return false;
unset($_SESSION[get_class($this)][$sesPrefix .'-timeout']);
setcookie('Pman.timeout', -1, time() + (30*60), '/');
return false;
-
-
- if (!empty($_SESSION[get_class($this)][$sesPrefix .'-auth'])) {
- // in session...
- $a = unserialize($_SESSION[get_class($this)][$sesPrefix .'-auth']);
-
- $u = DB_DataObject::factory($this->tableName());
- if ($a->id && $u->get($a->id)) { //&& strlen($u->passwd)) {
-
- return $u->verifyAuth(); // got authentication...
-
-
- }
-
-
}
// http basic auth..
}
// http basic auth..
@@
-303,7
+288,10
@@
class Pman_Core_DataObjects_Core_person extends DB_DataObject
&&
$u->checkPassword($_SERVER['PHP_AUTH_PW'])
) {
&&
$u->checkPassword($_SERVER['PHP_AUTH_PW'])
) {
+ // logged in via http auth
+
$_SESSION[get_class($this)][$sesPrefix .'-auth'] = serialize($u);
$_SESSION[get_class($this)][$sesPrefix .'-auth'] = serialize($u);
+ self::$authUser = $u;
return true;
}
//die("test init");
return true;
}
//die("test init");