X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=DataObjects%2FCore_person.php;fp=DataObjects%2FCore_person.php;h=8799d542223c252e399b80dcc078b16e2f9759d7;hp=160a058049ac235ec9adc0a649f1b9a20a7ea8a4;hb=90d4031765e4ad31a05a3a23cfbc81416ecadac6;hpb=52b198a6657c62282056db33022a7d09f9a56412

diff --git a/DataObjects/Core_person.php b/DataObjects/Core_person.php
index 160a0580..8799d542 100644
--- a/DataObjects/Core_person.php
+++ b/DataObjects/Core_person.php
@@ -256,16 +256,12 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
         // do not start a session if we are using http auth...
         // we have a situation where the app is behind a http access and is also login
         // need to work out a way to handle that.
-        
-        $session_started = false;
-        if (php_sapi_name() != "cli" && empty($_SERVER['PHP_AUTH_USER']) && empty($_COOKIE['PHPSESSID'])) {
-            $session_started = false;
-            @session_start();
+ 
+        if (php_sapi_name() != "cli" && empty($_SERVER['PHP_AUTH_USER']) && !empty($ff->disable_http_auth))  {
+             @session_start();
         }
         
-        
-       
-        $ff= HTML_FlexyFramework::get();
+         
        
         $sesPrefix = $this->sesPrefix();
         
@@ -312,9 +308,7 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
         }
         
         // at this point all http auth stuff is done, so we can init session
-       if (php_sapi_name() != "cli" && !$session_started) {
-            @session_start();
-        }
+        
         
         //die("test init");
         if (!$this->canInitializeSystem()) {