fixed some bugs in url parsing, and in conf.pl

[squirrelmail.git] / functions / date.php

diff --git a/functions/date.php b/functions/date.php
index d8031c9f7336c585641152acd4603d9bd88a1b0a..bdc0ad586b64529bfdb5e9ebccf36b6a6fb4b355 100644 (file)
--- a/functions/date.php
+++ b/functions/date.php
@@ -1,4 +1,4 @@
-<?
+<?php
    /**
     **  date.php
     **
@@ -9,6 +9,8 @@
     **
     **/
 
+   $date_php = true;
+
    function getMinutes($hour) {
       $date = $hour;
 
@@ -38,14 +40,32 @@
 
    // corrects a time stamp to be the local time
    function getGMTSeconds($stamp, $gmt) {
-      if (($gmt == "Pacific") || ($gmt == "PST") || ($gmt == "PDT"))
+      if (($gmt == "Pacific") || ($gmt == "PST"))
          $gmt = "-0800";
-      if (($gmt == "Eastern") || ($gmt == "EST") || ($gmt == "EDT"))
+      else if (($gmt == "EDT"))
+         $gmt = "-0400";
+      else if (($gmt == "Eastern") || ($gmt == "EST") || ($gmt == "CDT"))
          $gmt = "-0500";
-      if (($gmt == "Central") || ($gmt == "CST") || ($gmt == "CDT"))
+      else if (($gmt == "Central") || ($gmt == "CST") || ($gmt == "MDT"))
          $gmt = "-0600";
-      if (($gmt == "Mountain") || ($gmt == "MST") || ($gmt == "MDT"))
+      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;
@@ -179,7 +199,19 @@
    }
 
    function getDateString($stamp) {
-      return date("M j, Y", $stamp);
+      $now = time();
+      $midnight = $now - ($now % 86400) - date("Z", $now);
+
+      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 getTimeStamp($dateParts) {
@@ -196,21 +228,46 @@
        **        and everything would be bumped up one.
        **/
 
-      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 getGMTSeconds(mktime($d[0], $d[1], $d[2], $d[3], $d[4], $d[5]), $dateParts[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) {
+         $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]);
       }
-      $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 getGMTSeconds(mktime($d[0], $d[1], $d[2], $d[3], $d[4], $d[5]), $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]);
+   }
+
+   // 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);
    }
 ?>