Changeset 665 for trunk/lib

Timestamp:

Feb 10, 2019 9:48:46 PM (5 years ago)

Author:

anonymous

Message:

Add $app->isCLI() to replace $app->cli

Location:

trunk/lib

Files:

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

trunk/lib/App.inc.php

@@ -594 +594 @@
     }
 
+    /*
+    * @access   public
+    * @return   bool    True if running in the context of a CLI script.
+    * @author   Quinn Comendant <quinn@strangecode.com>
+    * @since    10 Feb 2019 12:31:59
+    */
+    public function isCLI()
+    {
+        return $this->cli;
+    }
 
     /**

trunk/lib/DB.inc.php

@@ -261 +261 @@
 
         if ($this->getParam('db_die_on_failure')) {
-            if (!$app->cli) {
+            if (!$app->isCLI()) {
                 // For http requests, send a Service Unavailable header.
                 header(' ', true, 503);
@@ -357 +357 @@
             $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 (!$app->cli) {
+                if (!$app->isCLI()) {
                     echo '<pre style="padding:2em; background:#ddd; font:9px monaco;">' . wordwrap(mysql_error($this->dbh)) . '<hr>' . htmlspecialchars($debugqry) . '</pre>';
                 }

trunk/lib/FormValidator.inc.php

@@ -364 +364 @@
     * @param  string $form_name the name of the incoming form variable
     * @param  string $msg       the message to display on error
+    * @param  bool   $negative_ok   Set to true if negative numbers will be allowed.
     * @param  const  $type  A LOG_* constant (see App->logMsg())
     * @param  const  $file  Filename to log (usually __FILE__)

trunk/lib/Prefs.inc.php

@@ -178 +178 @@
 
         // CLI scripts can't use prefs stored in HTTP-based protocols.
-        if ($app->cli
+        if ($app->isCLI()
         && isset($params['storagetype'])
         && in_array($params['storagetype'], array('cookie', 'session'))) {
-            $app->logMsg(sprintf('Storage type %s not available for CLI', $params['storagetype']), LOG_NOTICE, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Storage type %s not available for CLI', $params['storagetype']), LOG_DEBUG, __FILE__, __LINE__);
         }
 
@@ -503 +503 @@
         // Skip this method if not using the db.
         if ('database' != $this->getParam('storagetype')) {
-            $app->logMsg('Prefs->load() does nothing unless using a database storagetype.', LOG_NOTICE, __FILE__, __LINE__);
+            $app->logMsg('Prefs->load() does nothing unless using a database storagetype.', LOG_DEBUG, __FILE__, __LINE__);
             return true;
         }
@@ -559 +559 @@
     {
         if ('database' != $this->getParam('storagetype')) {
-            $app->logMsg('Prefs->_isLoaded() does nothing unless using a database storagetype.', LOG_NOTICE, __FILE__, __LINE__);
+            $app->logMsg('Prefs->_isLoaded() does nothing unless using a database storagetype.', LOG_DEBUG, __FILE__, __LINE__);
             return true;
         }

trunk/lib/Utilities.inc.php

@@ -42 +42 @@
     $app =& App::getInstance();
 
-    if ($app->cli) {
+    if ($app->isCLI()) {
         echo "DUMP FROM: $file $line\n";
     } else {
@@ -76 +76 @@
     }
 
-    if ($app->cli) {
+    if ($app->isCLI()) {
         echo "\n";
     } else {