Changeset 743 for trunk/lib

Timestamp:

Apr 23, 2021 11:00:26 PM (3 years ago)

Author:

anonymous

Message:

Add SC_DUMP_JSON flag to dump(). Update comments.

Location:

trunk/lib

Files:

• App.inc.php (modified) (2 diffs)
• Email.inc.php (modified) (2 diffs)
• Utilities.inc.php (modified) (3 diffs)

trunk/lib/App.inc.php

@@ -115 +115 @@
 
         // Human-readable format used to display dates.
-        'date_format' => 'd M Y',
-        'time_format' => 'h:i A',
-        'lc_date_format' => '%e %b %Y', // Localized date for strftime() https://www.php.net/manual/en/function.strftime.php
+        'date_format' => 'd M Y', // Format accepted by DateTimeInterface::format() https://www.php.net/manual/en/datetime.format.php
+        'time_format' => 'h:i A', // Format accepted by DateTimeInterface::format() https://www.php.net/manual/en/datetime.format.php
+        'lc_date_format' => '%d %b %Y', // Localized date for strftime() https://www.php.net/manual/en/function.strftime.php
         'lc_time_format' => '%k:%M', // Localized time for strftime() https://www.php.net/manual/en/function.strftime.php
         'sql_date_format' => '%e %b %Y',
@@ -1880 +1880 @@
 
         try {
-            // Create a DateTime object and conver the timezone from server to user.
+            // Create a DateTime object and convert the timezone from server to user.
             $dt = $this->convertTZ($datetime, $this->getParam('php_timezone'), $this->getParam('user_timezone'));
         } catch (Exception $e) {

trunk/lib/Email.inc.php

@@ -294 +294 @@
         if (preg_match('/({[^}]+})/', $final_body, $unreplaced_match)) {
             unset($unreplaced_match[0]);
-            $app->logMsg(sprintf('Cannot get email body. Unreplaced variable %s in template %s', getDump($unreplaced_match)), LOG_ERR, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Cannot get email body. Unreplaced variable(s) "%s" in template "%s"', getDump($unreplaced_match), $this->_template_filename), LOG_ERR, __FILE__, __LINE__);
             return false;
         }
@@ -352 +352 @@
         if (preg_match('/({[^}]+})/', $final_body, $unreplaced_match)) {
             unset($unreplaced_match[0]);
-            $app->logMsg(sprintf('Unreplaced variable "%s" in template "%s"', getDump($unreplaced_match), $this->_template_filename), LOG_ERR, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Unreplaced variable(s) "%s" in template "%s"', getDump($unreplaced_match), $this->_template_filename), LOG_ERR, __FILE__, __LINE__);
+            return false;
         }
 

trunk/lib/Utilities.inc.php

@@ -38 +38 @@
 define('SC_DUMP_VAR_DUMP', 1);
 define('SC_DUMP_VAR_EXPORT', 2);
+define('SC_DUMP_JSON', 3);
 function dump($var, $display=false, $dump_method=SC_DUMP_PRINT_R, $file='', $line='')
 {
@@ -73 +74 @@
     case SC_DUMP_VAR_EXPORT:
         var_export($var);
+        break;
+
+    case SC_DUMP_JSON:
+        json_encode($var, JSON_PRETTY_PRINT);
         break;
     }
@@ -1543 +1548 @@
 *
 * @access   public
-* @param    string  $url    URL to a file.
-* @return   bool            True if the resource exists, false otherwise.
+* @param    string  $url     URL to a file.
+* @param    int     $timeout The maximum number of seconds to allow the HTTP query to execute.
+* @return   bool             True if the resource exists, false otherwise.
 * @author   Quinn Comendant <quinn@strangecode.com>
 * @version  2.0