Changeset 550 for trunk/lib/App.inc.php

Timestamp:

Nov 24, 2015 5:38:54 PM (8 years ago)

Author:

anonymous

Message:

Escaped quotes from email from names.
Changed logMsg string truncation method and added version to email log msg.
Better variable testing in carry queries.
Spelling errors.
Added runtime cache to Currency.
Added logging to form validation.
More robust form validation.
Added json serialization methond to Version.

File:

• trunk/lib/App.inc.php (modified) (9 diffs)

trunk/lib/App.inc.php

@@ -42 +42 @@
 class App
 {
-
     // Minimum version of PHP required for this version of the Codebase.
     const CODEBASE_MIN_PHP_VERSION = '5.3.0';
@@ -753 +752 @@
 
         // Serialize multi-line messages.
-        $message = preg_replace('/\s+/m', ' ', $message);
+        $message = preg_replace('/\s+/m', ' ', trim($message));
 
         // Store this event under a unique key, counting each time it occurs so that it only gets reported a limited number of times.
@@ -807 +806 @@
             'file:line' => "$file : $line",
             'url'       => mb_substr(isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '', 0, 1024),
-            'message'   => $message
+            'message'   => mb_substr($message, 0, 1024),
         );
         // Here's a shortened version of event data.
@@ -819 +818 @@
         if (false !== $this->getParam('log_file_priority') && $priority <= $this->getParam('log_file_priority')) {
             $event_str = '[' . join('] [', $event_short) . ']';
-            error_log(mb_substr($event_str, 0, 1024) . "\n", 3, $this->getParam('log_directory') . '/' . $this->getParam('log_filename'));
+            error_log("$event_str\n", 3, $this->getParam('log_directory') . '/' . $this->getParam('log_filename'));
         }
 
@@ -826 +825 @@
             $hostname = (isset($_SERVER['HTTP_HOST']) && '' != $_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : php_uname('n');
             $subject = sprintf('[%s %s] %s', $hostname, $event['type'], mb_substr($event['message'], 0, 64));
-            $email_msg = sprintf("A %s log event occurred on %s\n\n", $event['type'], $hostname);
+            $email_msg = sprintf("A log event of type '%s' occurred on %s\n\n", $event['type'], $hostname);
             $headers = 'From: ' . $this->getParam('site_email');
             foreach ($event as $k=>$v) {
-                $email_msg .= sprintf("%-11s%s\n", $k, $v);
-            }
+                $email_msg .= sprintf("%-16s %s\n", $k, $v);
+            }
+            $email_msg .= sprintf("%-16s %s\n", 'codebase version', $this->getParam('codebase_version'));
+            $email_msg .= sprintf("%-16s %s\n", 'site version', $this->getParam('site_version'));
             mb_send_mail($this->getParam('log_to_email_address'), $subject, $email_msg, $headers);
         }
@@ -916 +917 @@
         foreach ($query_key as $k) {
             // If not already set, and there is a non-empty value provided in the request...
-            if (!isset($this->_carry_queries[$k]) && false !== getFormData($k, $default)) {
+            if (isset($k) && '' != $k && !isset($this->_carry_queries[$k]) && false !== getFormData($k, $default)) {
                 // Copy the value of the specified query argument into the _carry_queries array.
                 $this->_carry_queries[$k] = getFormData($k, $default);
@@ -990 +991 @@
         $one_time_carry_queries = array();
         if (!is_null($carry_args)) {
-            if (is_array($carry_args) && !empty($carry_args)) {
-                foreach ($carry_args as $key=>$arg) {
-                    // Get query from appropriate source.
-                    if (false === $arg) {
-                        $do_carry_queries = false;
-                    } else if (false !== getFormData($arg, false)) {
-                        $one_time_carry_queries[$arg] = getFormData($arg); // Set arg to form data if available.
-                    } else if (!is_numeric($key) && '' != $arg) {
-                        $one_time_carry_queries[$key] = getFormData($key, $arg); // Set to arg to default if specified (overwritten by form data).
+            if (is_array($carry_args)) {
+                if (!empty($carry_args)) {
+                    foreach ($carry_args as $key=>$arg) {
+                        // Get query from appropriate source.
+                        if (false === $arg) {
+                            $do_carry_queries = false;
+                        } else if (false !== getFormData($arg, false)) {
+                            $one_time_carry_queries[$arg] = getFormData($arg); // Set arg to form data if available.
+                        } else if (!is_numeric($key) && '' != $arg) {
+                            $one_time_carry_queries[$key] = getFormData($key, $arg); // Set to arg to default if specified (overwritten by form data).
+                        }
                     }
                 }
@@ -1110 +1113 @@
         $one_time_carry_queries = array();
         if (!is_null($carry_args)) {
-            if (is_array($carry_args) && !empty($carry_args)) {
-                foreach ($carry_args as $key=>$arg) {
-                    // Get query from appropriate source.
-                    if (false === $arg) {
-                        $do_carry_queries = false;
-                    } else if (false !== getFormData($arg, false)) {
-                        $one_time_carry_queries[$arg] = getFormData($arg); // Set arg to form data if available.
-                    } else if (!is_numeric($key) && '' != $arg) {
-                        $one_time_carry_queries[$key] = getFormData($key, $arg); // Set to arg to default if specified (overwritten by form data).
+            if (is_array($carry_args)) {
+                if (!empty($carry_args)) {
+                    foreach ($carry_args as $key=>$arg) {
+                        // Get query from appropriate source.
+                        if (false === $arg) {
+                            $do_carry_queries = false;
+                        } else if (false !== getFormData($arg, false)) {
+                            $one_time_carry_queries[$arg] = getFormData($arg); // Set arg to form data if available.
+                        } else if (!is_numeric($key) && '' != $arg) {
+                            $one_time_carry_queries[$key] = getFormData($key, $arg); // Set to arg to default if specified (overwritten by form data).
+                        }
                     }
                 }
@@ -1136 +1141 @@
                 if (is_array($val)) {
                     foreach ($val as $subval) {
-                        printf('<input type="hidden" name="%s[]" value="%s" />', $key, $subval);
+                        if ('' != $key && '' != $subval) {
+                            printf('<input type="hidden" name="%s[]" value="%s" />', $key, $subval);
+                        }
                     }
-                } else {
+                } else if ('' != $key && '' != $val) {
                     printf('<input type="hidden" name="%s" value="%s" />', $key, $val);
                 }