DataObjects/Core_person.php

[Pman.Core] / DataObjects / Core_person.php

diff --git a/DataObjects/Core_person.php b/DataObjects/Core_person.php
index 0bca6db..4dbdab2 100644 (file)
--- a/DataObjects/Core_person.php
+++ b/DataObjects/Core_person.php
@@ -291,10 +291,22 @@ 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 and login
+                $_SERVER['PATH_INFO'] != '/Login'
+            ) &&  // auto-auth is disabled for home page
             (!empty($_SERVER['SERVER_ADDR'])) &&
             (
                 (
@@ -306,6 +318,7 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
                     $_SERVER['SERVER_ADDR'] == '::1' &&
                     $_SERVER['REMOTE_ADDR'] == '::1'
                 )
+                
             )
         ) {
             $group = DB_DataObject::factory('core_group');
@@ -329,7 +342,8 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
         $u = DB_DataObject::factory($this->tableName());
         $ff = HTML_FlexyFramework::get();
         
-        if (!empty($ff->Pman['local_autoauth']) && 
+        if (!empty($ff->Pman['local_autoauth']) &&
+            ($ff->Pman['local_autoauth'] === true) &&
             (!empty($_SERVER['SERVER_ADDR'])) &&
             (
                 (
@@ -520,6 +534,8 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
     
     function checkTwoFactorAuthentication($val)
     {
+        
+        
         // also used in login
         require_once 'System.php';