Changeset 180

Timestamp:

Jun 23, 2006 10:00:21 PM (18 years ago)

Author:

scdev

Message:

Q - set limit to the length of logged messages. Added timeElapsed to Utilities.inc.php.

Location:

trunk/lib

Files:

• App.inc.php (modified) (3 diffs)
• Utilities.inc.php (modified) (1 diff)

trunk/lib/App.inc.php

@@ -530 +530 @@
             'type'      => $this->logPriorityToString($priority),
             'file:line' => "$file : $line",
-            'url'       => (isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : ''),
+            'url'       => substr(isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '', 0, 128),
             'message'   => $message
         );
@@ -537 +537 @@
         if ($this->getParam('log_file_priority') && $priority <= $this->getParam('log_file_priority')) {
             $event_str = '[' . join('] [', $event) . ']';
-            error_log($event_str . "\n", 3, $this->getParam('log_directory') . '/' . $this->getParam('log_filename'));
+            error_log(substr($event_str, 0, 1024) . "\n", 3, $this->getParam('log_directory') . '/' . $this->getParam('log_filename'));
         }
 
@@ -554 +554 @@
         if ($this->getParam('log_sms_priority') && $priority <= $this->getParam('log_sms_priority')) {
             $subject = sprintf('[%s %s]', getenv('HTTP_HOST'), $priority);
-            $sms_msg = sprintf('%s [%s:%s]', $event['message'], basename($file), $line);
+            $sms_msg = sprintf('%s [%s:%s]', substr($event['message'], 0, 64), basename($file), $line);
             $headers = "From: codebase@strangecode.com";
             mail($this->getParam('log_to_sms_address'), $subject, $sms_msg, $headers, '-f codebase@strangecode.com');

trunk/lib/Utilities.inc.php

@@ -270 +270 @@
 
     return sprintf($format, $size, $units[$i]);
+}
+
+/*
+* Returns a human readable amount of time elapsed since the given unix timestamp.
+* 
+* 45 seconds
+* 12 minutes
+* 3.5 hours
+* 2 days
+* 1 week
+* 4 months
+* 
+* Months are calculated using the real number of days in a year: 365.2422 / 12.
+*
+* @access   public
+* @param    int $time Unix timestamp of date to find elapsed from.
+* @param    string $max_unit Key value from the $units array.
+* @param    string $format Sprintf formatting string.
+* @return   string Value of units elapsed.
+* @author   Quinn Comendant <quinn@strangecode.com>
+* @version  1.0
+* @since    23 Jun 2006 12:15:19
+*/
+function timeElapsed($time, $max_unit=null, $format='%01.1f')
+{
+    if ($time <= time()) {
+        $elapsed = $time_diff = time() - $time;
+    } else {
+        $elapsed = $time_diff = $time - time();
+    }
+    
+    // Units
+    $units = array(
+        'second' => array(1, _("second"), _("seconds")),
+        'minute' => array(60, _("minute"), _("minutes")),
+        'hour' => array(3600, _("hour"), _("hours")),
+        'day' => array(86400, _("day"), _("days")),
+        'week' => array(604800, _("week"), _("weeks")),
+        'month' => array(2629743.84, _("month"), _("months")),
+        'year' => array(31556926.08, _("year"), _("years")),
+        'decade' => array(315569260.8, _("decade"), _("decades")),
+    );
+    
+    // Max unit
+    $max_unit = isset($units[$max_unit]) ? $max_unit : 'decade';
+
+    foreach ($units as $k => $v) {
+        if ($max_unit != $k && $time_diff >= $v[0]) {
+            $elapsed = $time_diff / $v[0];
+            $last_unit = $k;
+        }
+    }
+    $elapsed = sprintf($format, $elapsed);
+    return sprintf('%s %s', $elapsed, (1 == $elapsed ? $units[$last_unit][1] : $units[$last_unit][2]));    
 }