X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=DataObjects%2FCore_person.php;h=629edd67d2f7f26db18b17ceea50eeac96a1b4b1;hp=4dbdab2765cfe95f8162c8a55a187fa467a49f88;hb=54fe24a4cd94d465ef1508219b477b02e58b2989;hpb=0b01bb5c99d366c8d0b08cd250f18dc20e03f2da

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');