X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_person.php;h=a76d975fca74366eb7386e35efd6d7c1f2d8245d;hb=d2cfff04c699ccae894eff96b59ebdc54ecb23e8;hp=629edd67d2f7f26db18b17ceea50eeac96a1b4b1;hpb=54fe24a4cd94d465ef1508219b477b02e58b2989;p=Pman.Core diff --git a/DataObjects/Core_person.php b/DataObjects/Core_person.php index 629edd67..a76d975f 100644 --- a/DataObjects/Core_person.php +++ b/DataObjects/Core_person.php @@ -50,6 +50,9 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject /* the code above is auto generated do not remove the tag below */ ###END_AUTOCODE + + static $authUser = false; + function owner() { @@ -315,7 +318,7 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject if (empty($_SERVER['PATH_INFO']) || $_SERVER['PATH_INFO'] == '/Login') { $auto_auth_allow = false; } - + //var_dump($auto_auth_allow); // local auth - $default_admin = false; if ($auto_auth_allow) { @@ -340,25 +343,14 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject $u = DB_DataObject::factory($this->tableName()); $ff = HTML_FlexyFramework::get(); - if (!empty($ff->Pman['local_autoauth']) && - ($ff->Pman['local_autoauth'] === true) && - (!empty($_SERVER['SERVER_ADDR'])) && - ( - ( - $_SERVER['SERVER_ADDR'] == '127.0.0.1' && - $_SERVER['REMOTE_ADDR'] == '127.0.0.1' - ) - || - ( - $_SERVER['SERVER_ADDR'] == '::1' && - $_SERVER['REMOTE_ADDR'] == '::1' - ) - ) && + if ($auto_auth_allow && ($default_admin || $u->get('email', $ff->Pman['local_autoauth'])) ) { $user = $default_admin ? $default_admin->toArray() : $u->toArray(); + // if we request other URLS.. then we get auto logged in.. + $_SESSION[get_class($this)][$sesPrefix .'-auth'] = serialize((object) $user); return true; } @@ -382,10 +374,9 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject } } if (!$n){ // authenticated as there are no users in the system... - return true; + return true; } - - return false; + return false; }