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

diff --git a/functions/date.php b/functions/date.php
index 9d153baf..6cb4b68c 100644
--- a/functions/date.php
+++ b/functions/date.php
@@ -11,35 +11,9 @@
 
    $date_php = true;
 
-   function getMinutes($hour) {
-      $date = $hour;
-
-      if (($hour == 0) || ($hour == "00"))
-         $date = "00";
-      else if (($hour == 1) || ($hour == "01"))
-         $date = "01";
-      else if (($hour == 2) || ($hour == "02"))
-         $date = "02";
-      else if (($hour == 3) || ($hour == "03"))
-         $date = "03";
-      else if (($hour == 4) || ($hour == "04"))
-         $date = "04";
-      else if (($hour == 5) || ($hour == "05"))
-         $date = "05";
-      else if (($hour == 6) || ($hour == "06"))
-         $date = "06";
-      else if (($hour == 7) || ($hour == "07"))
-         $date = "07";
-      else if (($hour == 8) || ($hour == "08"))
-         $date = "08";
-      else if (($hour == 9) || ($hour == "09"))
-         $date = "09";
-
-      return $date;
-   }
-
    // 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"))
@@ -66,7 +40,7 @@
          $gmt = "+0100";
       else if ($gmt == "MET DST" || $gmt == "METDST")
          $gmt = "+0200";
-
+      
       if (substr($gmt, 0, 1) == "-") {
          $neg = true;
          $gmt = substr($gmt, 1, strlen($gmt));
@@ -85,127 +59,29 @@
 
       /** 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 getHour($hour) {
-      $time = explode(":", $hour);
-      return $time[0];
-   }
-
-   function getMinute($min) {
-      $time = explode(":", $min);
-      return $time[1];
-   }
-
-   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 getLongDateString($stamp) {
       return date("D, F j, Y g:i a", $stamp);
    }
 
    function getDateString($stamp) {
+      global $invert_time;
       $now = time();
-      $midnight = $now - ($now % 86400) + 14400;
+      $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 - 604800 < $stamp) {
+      } else if ($midnight - (60 * 60 * 24 * 6) < $stamp) {
          // This week
          return date("D, g:i a", $stamp);
       } else {
@@ -243,23 +119,11 @@
       //    getHour, getMinute, and getSecond.
       //
       if (intval(trim($dateParts[0])) > 0) {
-         $time = explode(":", $dateParts[3]);
-         $d[0] = $time[0];
-         $d[1] = $time[1];
-         $d[2] = $time[2];
-         $d[3] = getMonthNum(trim($dateParts[1]));
-         $d[4] = getDayOfMonth(trim($dateParts[0]));
-         $d[5] = getYear(trim($dateParts[2]));
-         return getGMTSeconds(mktime($d[0], $d[1], $d[2], $d[3], $d[4], $d[5]), $dateParts[4]);
+         $string = $dateParts[0] . " " . $dateParts[1] . " " . $dateParts[2] . " " . $dateParts[3];
+         return getGMTSeconds(strtotime($string), $dateParts[4]);
       }
-      $time = explode(":", $dateParts[4]);
-      $d[0] = $time[0];
-      $d[1] = $time[1];
-      $d[2] = $time[2];
-      $d[3] = getMonthNum(trim($dateParts[2]));
-      $d[4] = getDayOfMonth(trim($dateParts[1]));
-      $d[5] = getYear(trim($dateParts[3]));
-      return getGMTSeconds(mktime($d[0], $d[1], $d[2], $d[3], $d[4], $d[5]), $dateParts[5]);
+      $string = $dateParts[0] . " " . $dateParts[1] . " " . $dateParts[2] . " " . $dateParts[3] . " " . $dateParts[4];
+      return getGMTSeconds(strtotime($string), $dateParts[5]);
    }
 
    // I use this function for profiling. Should never be called in