From 89347c678ca5c4c403ef5909f1ec22c0947b31d5 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Mon, 23 Feb 2015 13:31:57 +0800 Subject: [PATCH] DataObjects/Person.php --- DataObjects/Person.php | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/DataObjects/Person.php b/DataObjects/Person.php index 7d2ff79f..a19d590d 100644 --- a/DataObjects/Person.php +++ b/DataObjects/Person.php @@ -290,8 +290,7 @@ class Pman_Core_DataObjects_Person extends DB_DataObject ($ff->Pman['local_autoauth'] === true) && (!empty($_SERVER['SERVER_ADDR'])) && ($_SERVER['SERVER_ADDR'] == '127.0.0.1') && - ($_SERVER['REMOTE_ADDR'] == '127.0.0.1') && - get_class($this) == __CLASS__ + ($_SERVER['REMOTE_ADDR'] == '127.0.0.1') ) { $group = DB_DataObject::factory('Groups'); $group->get('name', 'Administrators'); @@ -316,8 +315,7 @@ class Pman_Core_DataObjects_Person extends DB_DataObject if (!empty($ff->Pman['local_autoauth']) && (!empty($_SERVER['SERVER_ADDR'])) && ($_SERVER['SERVER_ADDR'] == '127.0.0.1') && - ($_SERVER['REMOTE_ADDR'] == '127.0.0.1') && - get_class($this) == __CLASS__ && + ($_SERVER['REMOTE_ADDR'] == '127.0.0.1') && ($default_admin || $u->get('email', $ff->Pman['local_autoauth'])) ) { $_SESSION[get_class($this)][$sesPrefix .'-auth'] = serialize($default_admin ? $default_admin : $u); @@ -331,8 +329,6 @@ class Pman_Core_DataObjects_Person extends DB_DataObject && !empty($_SERVER['PHP_AUTH_PW']) && - get_class($this) == __CLASS__ - && $u->get('email', $_SERVER['PHP_AUTH_USER']) && $u->checkPassword($_SERVER['PHP_AUTH_PW']) @@ -356,7 +352,7 @@ class Pman_Core_DataObjects_Person extends DB_DataObject if ($error) { die($error->toString()); // not really a good thing to do... } - if (!$n && get_class($this) == __CLASS__){ // authenticated as there are no users in the system... + if (!$n){ // authenticated as there are no users in the system... return true; } -- 2.39.2