Changeset 547 for trunk/lib

Timestamp:

Aug 27, 2015 3:22:39 AM (9 years ago)

Author:

anonymous

Message:

Moved CLI flag to ->cli which can be forced off for tests

Location:

trunk/lib

Files:

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

trunk/lib/App.inc.php

@@ -64 +64 @@
     protected $_raised_msg_counter = array(MSG_NOTICE => 0, MSG_SUCCESS => 0, MSG_WARNING => 0, MSG_ERR => 0);
 
+    // We're running as CLI. Public becuase we must force this as false when testing sessions via CLI.
+    public $cli = false;
+
     // Dictionary of global application parameters.
     protected $_params = array();
@@ -206 +209 @@
         $this->timer = new ScriptTimer();
         $this->timer->start('_app');
+
+        // Are we running as a CLI?
+        $this->cli = ('cli' === php_sapi_name() || defined('_CLI'));
     }
 
@@ -351 +357 @@
             // 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 (('cli' === php_sapi_name() || defined('_CLI')) && (!$this->getParam('db_server') || !$this->getParam('db_name') || !$this->getParam('db_user') || !$this->getParam('db_pass'))) {
+            if ($this->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)) {
@@ -385 +391 @@
          */
 
-        // Skip sessions if disabled or automatically skip if run in a CLI script.
-        if (true === $this->getParam('enable_session') && !defined('_CLI') && 'cli' !== php_sapi_name()) {
+        // Use sessions if enabled and not a CLI script.
+        if (true === $this->getParam('enable_session') && !$this->cli) {
 
             // Session parameters.
@@ -450 +456 @@
 
         // Character set. This should also be printed in the html header template.
-        if (!defined('_CLI') && 'cli' !== php_sapi_name()) {
+        if (!$this->cli) {
             if (!headers_sent($h_file, $h_line)) {
                 header('Content-type: text/html; charset=' . $this->getParam('character_set'));
@@ -464 +470 @@
             $codebase_version = trim(file_get_contents($codebase_version_file));
             $this->setParam(array('codebase_version' => $codebase_version));
-            if (!defined('_CLI') && 'cli' !== php_sapi_name()) {
+            if (!$this->cli) {
                 if (!headers_sent($h_file, $h_line)) {
                     header('X-Codebase-Version: ' . $codebase_version);
@@ -487 +493 @@
             $this->setParam(array('site_version' => $site_version));
         }
-        if (!defined('_CLI') && 'cli' !== php_sapi_name() && $this->getParam('site_version')) {
+        if (!$this->cli && $this->getParam('site_version')) {
             if (!headers_sent($h_file, $h_line)) {
                 header('X-Site-Version: ' . $site_version);

trunk/lib/DB.inc.php

@@ -226 +226 @@
     protected function _fail()
     {
+        $app =& App::getInstance();
+
         if ($this->getParam('db_die_on_failure')) {
-            if (!defined('_CLI') && 'cli' !== php_sapi_name()) {
+            if (!$app->cli) {
                 // For http requests, send a Service Unavailable header.
                 header(' ', true, 503);
@@ -323 +325 @@
             $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') && 'cli' !== php_sapi_name()) {
+                if (!$app->cli) {
                     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') || 'cli' === php_sapi_name())
+        if ($app->cli
         && 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') || 'cli' === php_sapi_name()) {
+    if ($app->cli) {
         echo "DUMP FROM: $file $line\n";
     } else {
@@ -60 +60 @@
         }
     }
-    if (defined('_CLI') || 'cli' === php_sapi_name()) {
+    if ($app->cli) {
         echo "\n";
     } else {