From 54fe24a4cd94d465ef1508219b477b02e58b2989 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Mon, 15 Oct 2018 13:14:47 +0800 Subject: [PATCH] DataObjects/Core_person.php --- DataObjects/Core_person.php | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/DataObjects/Core_person.php b/DataObjects/Core_person.php index 4dbdab27..629edd67 100644 --- a/DataObjects/Core_person.php +++ b/DataObjects/Core_person.php @@ -295,20 +295,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 (empty($_SERVER['PATH_INFO']) || $_SERVER['PATH_INFO'] == '/Login') { - $auto_auth_allow = false; - } - - // local auth - - $default_admin = false; - if (!empty($ff->Pman['local_autoauth']) && - ($ff->Pman['local_autoauth'] === true) && - ( - !empty($_SERVER['PATH_INFO']) || // auto-auth is disabled for home page and login - $_SERVER['PATH_INFO'] != '/Login' - ) && // auto-auth is disabled for home page - (!empty($_SERVER['SERVER_ADDR'])) && - ( + if ( + (!empty($_SERVER['SERVER_ADDR'])) && ( $_SERVER['SERVER_ADDR'] == '127.0.0.1' && $_SERVER['REMOTE_ADDR'] == '127.0.0.1' @@ -319,8 +307,18 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject $_SERVER['REMOTE_ADDR'] == '::1' ) - ) - ) { + ){ + $auto_auth_allow = true; + } + + + if (empty($_SERVER['PATH_INFO']) || $_SERVER['PATH_INFO'] == '/Login') { + $auto_auth_allow = false; + } + + // local auth - + $default_admin = false; + if ($auto_auth_allow) { $group = DB_DataObject::factory('core_group'); $group->get('name', 'Administrators'); -- 2.39.2