more checks to remove session starting

diff --git a/DB/mysqli.php b/DB/mysqli.php
index 459856c..510df10 100644 (file)
--- a/DB/mysqli.php
+++ b/DB/mysqli.php
@@ -424,7 +424,7 @@ class DB_mysqli extends DB_common
         
         $isRunning = session_status() == PHP_SESSION_ACTIVE;
         
-        if(!$isRunning && empty($_SERVER['PHP_AUTH_USER'])) {
+        if(!$isRunning && empty($_SERVER['PHP_AUTH_USER']) &&  php_sapi_name() != "cli") {
             // only start session if we are not using httpauth
             @session_start();
         }
@@ -452,7 +452,7 @@ class DB_mysqli extends DB_common
         
         unset($_SESSION['MYSQLI_THREAD_ID'][array_search($thread_id, $_SESSION['MYSQLI_THREAD_ID'])]);
         
-        if(!$isRunning && empty($_SERVER['PHP_AUTH_USER'])) {
+        if(!$isRunning && empty($_SERVER['PHP_AUTH_USER']) &&  php_sapi_name() != "cli") {
             @session_write_close();
         }
         

diff --git a/HTML/FlexyFramework/Page.php b/HTML/FlexyFramework/Page.php
index 5cb4937..0e7fd2a 100644 (file)
--- a/HTML/FlexyFramework/Page.php
+++ b/HTML/FlexyFramework/Page.php
@@ -404,7 +404,7 @@ class HTML_FlexyFramework_Page  {
         static $ses_status = false;
         static $ini = false;
         
-        if (!empty($_SERVER['PHP_AUTH_USER'])) {
+        if (!empty($_SERVER['PHP_AUTH_USER']) ||  php_sapi_name() == "cli") {
             // do not do sessions if we are using http auth.
             return;
         }

diff --git a/HTML/FlexyFramework2/Page.php b/HTML/FlexyFramework2/Page.php
index a74e034..4775e51 100644 (file)
--- a/HTML/FlexyFramework2/Page.php
+++ b/HTML/FlexyFramework2/Page.php
@@ -341,7 +341,7 @@ class HTML_FlexyFramework2_Page  {
         static $ses_status = false;
         static $ini = false;
         
-        if (!empty($_SERVER['PHP_AUTH_USER'])) {
+        if (!empty($_SERVER['PHP_AUTH_USER']) ||  php_sapi_name() == "cli") {
             // do not do sessions if we are using http auth.
             return;
         }