X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fdate.php;h=59a10dca4e67860b32f84bf16c314e14789c5c2a;hb=0e8c1c9a1191a7dfae532c959e30a8a846a131e7;hp=6dfc4ba1b7c4af1a1f524f842d5ec8e0abf948e4;hpb=fde32e3fc4afc7038da1ccfc9bea91be85efdb17;p=squirrelmail.git

diff --git a/functions/date.php b/functions/date.php
index 6dfc4ba1..59a10dca 100644
--- a/functions/date.php
+++ b/functions/date.php
@@ -5,45 +5,51 @@
     **  Takes a date and parses it into a usable format.  The form that a
     **  date SHOULD arrive in is:
     **        <Tue,> 29 Jun 1999 09:52:11 -0500 (EDT)
-    **  (as specified in RFC 822) -- "Tue" is optional
+    **  (as specified in RFC 822) -- 'Tue' is optional
     **
+    **  $Id$
     **/
 
-   $date_php = true;
-
+   if (defined ('date_php'))
+      return; 
+   define ('date_php', true);
+   
    // corrects a time stamp to be the local time
    function getGMTSeconds($stamp, $gmt) {
-      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")
+      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 == 'KST')
          $gmt = "+0900";
-      else if ($gmt == "MET")
-         $gmt = "+0100";
-      else if ($gmt == "MET DST" || $gmt == "METDST")
-         $gmt = "+0200";
+      else if ($gmt == 'MET')
+         $gmt = '+0100';
+      else if ($gmt == 'MET DST' || $gmt == 'METDST')
+         $gmt = '+0200';
       
-      if (substr($gmt, 0, 1) == "-") {
+      if (substr($gmt, 0, 1) == '-') {
          $neg = true;
          $gmt = substr($gmt, 1, strlen($gmt));
-      } else if (substr($gmt, 0, 1) == "+") {
+      } else if (substr($gmt, 0, 1) == '+') {
          $neg = false;
          $gmt = substr($gmt, 1, strlen($gmt));
       } else
@@ -57,29 +63,35 @@
          $gmt = "+$gmt";
 
       /** now find what the server is at **/
-      $current = date("Z", time());
+      $current = date('Z', time());
+      if ($invert_time)
+          $current = - $current;
       $stamp = (int)$stamp - (int)$gmt + (int)$current;
 
       return $stamp;
    }
 
    function getLongDateString($stamp) {
-      return date("D, F j, Y g:i a", $stamp);
+      return date('D, F j, Y g:i a', $stamp);
    }
 
    function getDateString($stamp) {
+      global $invert_time;
       $now = time();
-      $midnight = $now - ($now % 86400) - 86400 - date("Z", $now);
+      $dateZ = date('Z', $now);
+      if ($invert_time)
+          $dateZ = - $dateZ;
+      $midnight = $now - ($now % 86400) - $dateZ;
 
       if ($midnight < $stamp) {
          // Today
-         return date("g:i a", $stamp);
+         return date('g:i a', $stamp);
       } else if ($midnight - (60 * 60 * 24 * 6) < $stamp) {
          // This week
-         return date("D, g:i a", $stamp);
+         return date('D, g:i a', $stamp);
       } else {
          // before this week 
-         return date("M j, Y", $stamp);
+         return date('M j, Y', $stamp);
       }
    }
 
@@ -101,7 +113,7 @@
       // 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",
+      //    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
@@ -112,18 +124,23 @@
       //    getHour, getMinute, and getSecond.
       //
       if (intval(trim($dateParts[0])) > 0) {
-         $string = $dateParts[0] . " " . $dateParts[1] . " " . $dateParts[2] . " " . $dateParts[3];
+         $string = $dateParts[0] . ' ' . $dateParts[1] . ' ' . 
+                   $dateParts[2] . ' ' . $dateParts[3];
          return getGMTSeconds(strtotime($string), $dateParts[4]);
       }
-      $string = $dateParts[0] . " " . $dateParts[1] . " " . $dateParts[2] . " " . $dateParts[3] . " " . $dateParts[4];
-      return getGMTSeconds(strtotime($string), $dateParts[5]);
+      $string = $dateParts[0] . ' ' . $dateParts[1] . ' ' .
+                $dateParts[2] . ' ' . $dateParts[3] . ' ' . $dateParts[4];
+	  if (isset($dateParts[5]))
+      	return getGMTSeconds(strtotime($string), $dateParts[5]);
+	  else 
+	  	return getGMTSeconds(strtotime($string), '');
    }
 
    // 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 = explode(' ',$mtime);
       $mtime = $mtime[1] + $mtime[0];
       return ($mtime);
    }