From: Alan Knowles Date: Mon, 22 Oct 2018 06:47:10 +0000 (+0800) Subject: DataObjects/Core_person.php X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=commitdiff_plain;h=4cccc7b5f10010a43778777a250020acf30f5d67 DataObjects/Core_person.php --- diff --git a/DataObjects/Core_person.php b/DataObjects/Core_person.php index 3ee20c6d..aa23725f 100644 --- a/DataObjects/Core_person.php +++ b/DataObjects/Core_person.php @@ -306,7 +306,8 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject if (!empty($ff->Pman['local_autoauth']) && $ff->Pman['local_autoauth'] === true) { $auto_auth_allow = true; } - if ( + if ( !empty($ff->Pman['local_autoauth']) + && (!empty($_SERVER['SERVER_ADDR'])) && ( $_SERVER['SERVER_ADDR'] == '127.0.0.1' && @@ -353,7 +354,7 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject $u->autoJoin(); $ff = HTML_FlexyFramework::get(); - if ($auto_auth_allow && + if ($auto_auth_allow && ($default_admin || $u->get('email', $ff->Pman['local_autoauth'])) ) {