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

diff --git a/DataObjects/Core_person.php b/DataObjects/Core_person.php
index 3c2e4e6a..4dbdab27 100644
--- a/DataObjects/Core_person.php
+++ b/DataObjects/Core_person.php
@@ -291,12 +291,20 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
         }
         
         
+        $auto_auth_allow = false;
+        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
+                !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'])) &&
@@ -313,7 +321,7 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
                 
             )
         ) {
-             $group = DB_DataObject::factory('core_group');
+            $group = DB_DataObject::factory('core_group');
             $group->get('name', 'Administrators');
             
             $member = DB_DataObject::factory('core_group_member');