X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fdate.php;h=6cb4b68ccc9b74cc57bf5bff2c0e62247cc1908c;hb=ec0b7dbda5eb9490db1a41c45f6d1d76b708fb7e;hp=c884c7180dcfee8cb90fee50bc1ff2b86cbbed86;hpb=9774bdefb84a93bc71218da6234b8410b1c0e786;p=squirrelmail.git

diff --git a/functions/date.php b/functions/date.php
index c884c718..6cb4b68c 100644
--- a/functions/date.php
+++ b/functions/date.php
@@ -1,4 +1,4 @@
-<?
+<?php
    /**
     **  date.php
     **
@@ -9,110 +9,88 @@
     **
     **/
 
-   function getHour($hour) {
-      $time = explode(":", $hour);
-      return $time[0];
+   $date_php = true;
+
+   // corrects a time stamp to be the local time
+   function getGMTSeconds($stamp, $gmt) {
+      global $invert_time;
+      if (($gmt == "Pacific") || ($gmt == "PST"))
+         $gmt = "-0800";
+      else if (($gmt == "EDT"))
+         $gmt = "-0400";
+      else if (($gmt == "Eastern") || ($gmt == "EST") || ($gmt == "CDT"))
+         $gmt = "-0500";
+      else if (($gmt == "Central") || ($gmt == "CST") || ($gmt == "MDT"))
+         $gmt = "-0600";
+      else if (($gmt == "Mountain") || ($gmt == "MST") || ($gmt == "PDT"))
+         $gmt = "-0700";
+      else if ($gmt == "BST")
+         $gmt = "+0100";
+      else if ($gmt == "EET")
+         $gmt = "+0200";
+      else if ($gmt == "GMT")
+         $gmt = "+0000";
+      else if ($gmt == "HKT")
+         $gmt = "+0800";
+      else if ($gmt == "IST")
+         $gmt = "+0200";
+      else if ($gmt == "JST")
+         $gmt = "+0900";
+      else if ($gmt == "MET")
+         $gmt = "+0100";
+      else if ($gmt == "MET DST" || $gmt == "METDST")
+         $gmt = "+0200";
+      
+      if (substr($gmt, 0, 1) == "-") {
+         $neg = true;
+         $gmt = substr($gmt, 1, strlen($gmt));
+      } else if (substr($gmt, 0, 1) == "+") {
+         $neg = false;
+         $gmt = substr($gmt, 1, strlen($gmt));
+      } else
+         $neg = false;
+
+      $gmt = substr($gmt, 0, 2);
+      $gmt = $gmt * 3600;
+      if ($neg == true)
+         $gmt = "-$gmt";
+      else
+         $gmt = "+$gmt";
+
+      /** now find what the server is at **/
+      $current = date("Z", time());
+      if ($invert_time)
+          $current = - $current;
+      $stamp = (int)$stamp - (int)$gmt + (int)$current;
+
+      return $stamp;
    }
 
-   function getMinute($min) {
-      $time = explode(":", $min);
-      return $time[1];
+   function getLongDateString($stamp) {
+      return date("D, F j, Y g:i a", $stamp);
    }
 
-   function getSecond($sec) {
-      $time = explode(":", $sec);
-      return $time[2];
-   }
-
-   function getMonthNum($month) {
-      if (eregi("jan|january", $month, $tmp))
-         $date = "01";
-      else if (eregi("feb|february|febuary", $month, $tmp))
-         $date = "02";
-      else if (eregi("mar|march", $month, $tmp))
-         $date = "03";
-      else if (eregi("apr|april", $month, $tmp))
-         $date = "04";
-      else if (eregi("may", $month, $tmp))
-         $date = "05";
-      else if (eregi("jun|june", $month, $tmp))
-         $date = "06";
-      else if (eregi("jul|july", $month, $tmp))
-         $date = "07";
-      else if (eregi("aug|august", $month, $tmp))
-         $date = "08";
-      else if (eregi("sep|sept|september", $month, $tmp))
-         $date = "09";
-      else if (eregi("oct|october", $month, $tmp))
-         $date = "10";
-      else if (eregi("nov|november", $month, $tmp))
-         $date = "11";
-      else if (eregi("dec|december", $month, $tmp))
-         $date = "12";
-
-      return $date;
-   }
-
-   function getDayOfWeek($day) {
-      $date = "{WEEKDAY}";
-
-      if (eregi("(mon|monday)", $day, $tmp))
-         $date = "Mon";
-      else if (eregi("(tue|tuesday)", $day, $tmp))
-         $date = "Tue";
-      else if (eregi("(wed|wednesday)", $day, $tmp))
-         $date = "Wed";
-      else if (eregi("(thurs|thu|thursday)", $day, $tmp))
-         $date = "Thu";
-      else if (eregi("(fri|friday)", $day, $tmp))
-         $date = "Fri";
-      else if (eregi("(sat|saturday)", $day, $tmp))
-         $date = "Sat";
-      else if (eregi("(sun|sunday)", $day, $tmp))
-         $date = "Sun";
-
-      return $date;
-   }
-
-   function getDayOfMonth($day) {
-      return ereg_replace("^0", "", $day); /* remove a preceeding 0 */
-   }
-
-   function getMonth($month) {
-      $date = "{MONTH}";
-      if (eregi("jan|january", $month, $tmp))
-         $date = "Jan";
-      else if (eregi("feb|february|febuary", $month, $tmp))
-         $date = "Feb";
-      else if (eregi("mar|march", $month, $tmp))
-         $date = "Mar";
-      else if (eregi("apr|april", $month, $tmp))
-         $date = "Apr";
-      else if (eregi("may", $month, $tmp))
-         $date = "May";
-      else if (eregi("jun|june", $month, $tmp))
-         $date = "Jun";
-      else if (eregi("jul|july", $month, $tmp))
-         $date = "Jul";
-      else if (eregi("aug|august", $month, $tmp))
-         $date = "Aug";
-      else if (eregi("sep|sept|september", $month, $tmp))
-         $date = "Sep";
-      else if (eregi("oct|october", $month, $tmp))
-         $date = "Oct";
-      else if (eregi("nov|november", $month, $tmp))
-         $date = "Nov";
-      else if (eregi("dec|december", $month, $tmp))
-         $date = "Dec";
-
-      return $date;
-   }
-
-   function getYear($year) {
-      return $year;
+   function getDateString($stamp) {
+      global $invert_time;
+      $now = time();
+      $dateZ = date("Z", $now);
+      if ($invert_time)
+          $dateZ = - $dateZ;
+      $midnight = $now - ($now % 86400) - $dateZ;
+
+      if ($midnight < $stamp) {
+         // Today
+         return date("g:i a", $stamp);
+      } else if ($midnight - (60 * 60 * 24 * 6) < $stamp) {
+         // This week
+         return date("D, g:i a", $stamp);
+      } else {
+         // before this week 
+         return date("M j, Y", $stamp);
+      }
    }
 
-   function getDateString($dateParts) {
+   function getTimeStamp($dateParts) {
       /** $dateParts[0] == <day of week>   Mon, Tue, Wed
        ** $dateParts[1] == <day of month>  23
        ** $dateParts[2] == <month>         Jan, Feb, Mar
@@ -126,64 +104,34 @@
        **        and everything would be bumped up one.
        **/
 
-      /* if the first part is a day */
-      if (eregi("mon|tue|wed|thu|fri|sat|sun", trim($dateParts[0]), $tmp)) {
-         $dateParts[0] = getDayOfWeek(trim($dateParts[0]));
-         $dateParts[1] = getDayOfMonth(trim($dateParts[1]));
-         $dateParts[2] = getMonth(trim($dateParts[2]));
-         $dateParts[3] = getYear(trim($dateParts[3]));
-         return "$dateParts[2] $dateParts[1], $dateParts[3]";
-      }
-      $dateParts[0] = getDayOfMonth(trim($dateParts[0]));
-      $dateParts[1] = getMonth(trim($dateParts[1]));
-      $dateParts[2] = getYear(trim($dateParts[2]));
-      return "$dateParts[1] $dateParts[0], $dateParts[2]";
-   }
-
-   function getTimeStamp($dateParts) {
-      if (eregi("mon|tue|wed|thu|fri|sat|sun", $dateParts[0], $tmp)) {
-         $d[0] = getHour(trim($dateParts[4]));
-         $d[1] = getMinute(trim($dateParts[4]));
-         $d[2] = getSecond(trim($dateParts[4]));
-         $d[3] = getMonthNum(trim($dateParts[2]));
-         $d[4] = getDayOfMonth(trim($dateParts[1]));
-         $d[5] = getYear(trim($dateParts[3]));
-         return mktime($d[0], $d[1], $d[2], $d[3], $d[4], $d[5]);
+      // Simply check to see if the first element in the dateParts
+      // array is an integer or not.
+      //    Since the day of week is optional, this check is needed.  
+      //    
+      //    The old code used eregi("mon|tue|wed|thu|fri|sat|sun",
+      //    $dateParts[0], $tmp) to find if the first element was the
+      //    day of week or day of month. This is an expensive call
+      //    (processing time) to have inside a loop. Doing it this way
+      //    saves quite a bit of time for large mailboxes.
+      //
+      //    It is also quicker to call explode only once rather than
+      //    the 3 times it was getting called by calling the functions
+      //    getHour, getMinute, and getSecond.
+      //
+      if (intval(trim($dateParts[0])) > 0) {
+         $string = $dateParts[0] . " " . $dateParts[1] . " " . $dateParts[2] . " " . $dateParts[3];
+         return getGMTSeconds(strtotime($string), $dateParts[4]);
       }
-      $d[0] = getHour(trim($dateParts[3]));
-      $d[1] = getMinute(trim($dateParts[3]));
-      $d[2] = getSecond(trim($dateParts[3]));
-      $d[3] = getMonthNum(trim($dateParts[1]));
-      $d[4] = getDayOfMonth(trim($dateParts[0]));
-      $d[5] = getYear(trim($dateParts[2]));
-      return mktime($d[0], $d[1], $d[2], $d[3], $d[4], $d[5]);
+      $string = $dateParts[0] . " " . $dateParts[1] . " " . $dateParts[2] . " " . $dateParts[3] . " " . $dateParts[4];
+      return getGMTSeconds(strtotime($string), $dateParts[5]);
    }
 
-   function getLongDateString($dateParts) {
-      if (eregi("mon|tue|wed|thu|fri|sat|sun", trim($dateParts[0]), $tmp)) {
-         $date[0] = getDayOfMonth(trim($dateParts[1]));
-         $date[1] = getMonth(trim($dateParts[2]));
-         $date[2] = getYear(trim($dateParts[3]));
-         $date[3] = getHour(trim($dateParts[4]));
-         $date[4] = getMinute(trim($dateParts[4]));
-      } else {
-         $date[0] = getDayOfMonth(trim($dateParts[0]));
-         $date[1] = getMonth(trim($dateParts[1]));
-         $date[2] = getYear(trim($dateParts[2]));
-         $date[3] = getHour(trim($dateParts[3]));
-         $date[4] = getMinute(trim($dateParts[4]));
-      }
-
-      if ($date[3] >= 12) {
-         $date[5] = "p.m.";
-         if ($date[3] >= 13)
-            $date[3] = $date[3] - 12;
-      } else {
-         $date[5] = "a.m.";
-         if ($date[3] < 1)
-            $date[3] = 12;
-      }
-
-      return "$date[1] $date[0], $date[2]&nbsp;&nbsp;&nbsp;$date[3]:$date[4] $date[5]";
+   // I use this function for profiling. Should never be called in
+   // actual versions of squirrelmail released to public.
+   function getmicrotime() {
+      $mtime = microtime();
+      $mtime = explode(" ",$mtime);
+      $mtime = $mtime[1] + $mtime[0];
+      return ($mtime);
    }
 ?>