Changeset 546 for trunk/lib

Timestamp:

Aug 27, 2015 2:35:55 AM (9 years ago)

Author:

anonymous

Message:

Detecting CLI also using php_sapi_name()

Location:

trunk/lib

Files:

• App.inc.php (modified) (5 diffs)
• DB.inc.php (modified) (3 diffs)
• Prefs.inc.php (modified) (1 diff)
• Utilities.inc.php (modified) (2 diffs)

trunk/lib/App.inc.php

@@ -351 +351 @@
             // DB credentials for CLI scripts stored in a JSON file with read rights given only to the user who will be executing the scripts: -r--------
             // But not if all DB credentials have been defined already by other means.
-            if (defined('_CLI') && (!$this->getParam('db_server') || !$this->getParam('db_name') || !$this->getParam('db_user') || !$this->getParam('db_pass'))) {
+            if (('cli' === php_sapi_name() || defined('_CLI')) && (!$this->getParam('db_server') || !$this->getParam('db_name') || !$this->getParam('db_user') || !$this->getParam('db_pass'))) {
                 if (false !== $db_auth_file = stream_resolve_include_path($this->getParam('db_auth_file'))) {
                     if (is_readable($db_auth_file)) {
@@ -386 +386 @@
 
         // Skip sessions if disabled or automatically skip if run in a CLI script.
-        if (true === $this->getParam('enable_session') && !defined('_CLI')) {
+        if (true === $this->getParam('enable_session') && !defined('_CLI') && 'cli' !== php_sapi_name()) {
 
             // Session parameters.
@@ -450 +450 @@
 
         // Character set. This should also be printed in the html header template.
-        if (!defined('_CLI')) {
+        if (!defined('_CLI') && 'cli' !== php_sapi_name()) {
             if (!headers_sent($h_file, $h_line)) {
                 header('Content-type: text/html; charset=' . $this->getParam('character_set'));
@@ -464 +464 @@
             $codebase_version = trim(file_get_contents($codebase_version_file));
             $this->setParam(array('codebase_version' => $codebase_version));
-            if (!defined('_CLI')) {
+            if (!defined('_CLI') && 'cli' !== php_sapi_name()) {
                 if (!headers_sent($h_file, $h_line)) {
                     header('X-Codebase-Version: ' . $codebase_version);
@@ -487 +487 @@
             $this->setParam(array('site_version' => $site_version));
         }
-        if (!defined('_CLI') && $this->getParam('site_version')) {
+        if (!defined('_CLI') && 'cli' !== php_sapi_name() && $this->getParam('site_version')) {
             if (!headers_sent($h_file, $h_line)) {
                 header('X-Site-Version: ' . $site_version);

trunk/lib/DB.inc.php

@@ -227 +227 @@
     {
         if ($this->getParam('db_die_on_failure')) {
-            if (!defined('_CLI')) {
+            if (!defined('_CLI') && 'cli' !== php_sapi_name()) {
                 // For http requests, send a Service Unavailable header.
                 header(' ', true, 503);
@@ -312 +312 @@
         // http://dev.mysql.com/doc/refman/5.0/en/gone-away.html
         if (!mysql_ping($this->dbh)) {
-            $app->logMsg(sprintf('MySQL ping failed; reconnecting
 ("%s")', truncate(trim($debugqry), 150)), LOG_NOTICE, __FILE__, __LINE__);
+            $app->logMsg(sprintf('MySQL ping failed; reconnecting
 ("%s")', truncate(trim($debugqry), 150)), LOG_DEBUG, __FILE__, __LINE__);
             $this->reconnect();
         }
@@ -323 +323 @@
             $app->logMsg(sprintf('MySQL error %s: %s in query: %s', mysql_errno($this->dbh), mysql_error($this->dbh), $debugqry), LOG_EMERG, __FILE__, __LINE__);
             if ($this->getParam('db_debug')) {
-                if (!defined('_CLI')) {
+                if (!defined('_CLI') && 'cli' !== php_sapi_name()) {
                     echo '<pre style="padding:2em; background:#ddd; font:9px monaco;">' . wordwrap(mysql_error($this->dbh)) . '<hr>' . htmlspecialchars($debugqry) . '</pre>';
                 }

trunk/lib/Prefs.inc.php

@@ -175 +175 @@
     {
         // CLI scripts can't use prefs stored in HTTP-based protocols.
-        if (defined('_CLI')
+        if ((defined('_CLI') || 'cli' === php_sapi_name())
         && isset($params['storagetype'])
         && in_array($params['storagetype'], array('cookie', 'session'))) {

trunk/lib/Utilities.inc.php

@@ -37 +37 @@
 function dump($var, $display=false, $var_dump=false, $file='', $line='')
 {
-    if (defined('_CLI')) {
+    if (defined('_CLI') || 'cli' === php_sapi_name()) {
         echo "DUMP FROM: $file $line\n";
     } else {
@@ -60 +60 @@
         }
     }
-    if (defined('_CLI')) {
+    if (defined('_CLI') || 'cli' === php_sapi_name()) {
         echo "\n";
     } else {