fix switch of en/decode in mdn, thanks Masato HIGASHIYAMA (#1694687)

[squirrelmail.git] / functions / date.php

diff --git a/functions/date.php b/functions/date.php
index 50bb101a35524b5fa6b9003e8721e3bfd99560e4..a0e0f417c5859fae8321cba14c370759796d4706 100644 (file)
--- a/functions/date.php
+++ b/functions/date.php
@@ -8,7 +8,7 @@
  *       <Tue,> 29 Jun 1999 09:52:11 -0500 (EDT)
  * (as specified in RFC 822) -- 'Tue' is optional
  *
- * @copyright &copy; 1999-2006 The SquirrelMail Project Team
+ * @copyright &copy; 1999-2007 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package squirrelmail
@@ -69,6 +69,8 @@ function getGMTSeconds($stamp, $tzc) {
         case 'IST':
         case 'MET DST':
         case 'METDST':
+       case 'MEST':
+       case 'CEST':
             $tzc = '+0200';
             break;
         case 'HKT':
@@ -303,14 +305,15 @@ function date_intl( $date_format, $stamp ) {
  * and taking localization into accout.
  *
  * @param int stamp the timestamp
+ * @param string fallback string to use when stamp not valid
  * @return string the long date string
  */
-function getLongDateString( $stamp ) {
+function getLongDateString( $stamp, $fallback = '' ) {
 
     global $hour_format;
 
     if ($stamp == -1) {
-        return '';
+        return $fallback;
     }
 
     if ( $hour_format == SMPREF_TIME_12HR ) {
@@ -405,14 +408,9 @@ function getTimeStamp($dateParts) {
      *        and everything would be bumped up one.
      */
 
-    /*
-     * 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.
-     */
-     if (count($dateParts) <2) {
+    if (count($dateParts) <2) {
         return -1;
-     } else if (count($dateParts) ==3) {
+    } else if (count($dateParts) ==3) {
         if (substr_count($dateParts[0],'-') == 2 &&
             substr_count($dateParts[1],':') == 2) {
             //  dd-Month-yyyy 23:19:05 +0200
@@ -421,12 +419,24 @@ function getTimeStamp($dateParts) {
             $newDate = array($aDate[0],$aDate[1],$aDate[2],$dateParts[1],$dateParts[2]);
             $dateParts = $newDate;
         }
-     }
+    }
 
-    /* remove day of week */
+    /*
+     * 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.
+     */
     if (!is_numeric(trim($dateParts[0]))) {
-        $dataParts = array_shift($dateParts);
+        /* cope with broken mailers that send "Tue,23" without space */
+        if ( preg_match ('/^\w+,(\d{1,2})$/', $dateParts[0], $match) ) {
+            /* replace Tue,23 with 23 */
+            $dateParts[0] = $match[1];
+        } else {
+            /* just drop the day of week */
+            array_shift($dateParts);
+        }
     }
+
     /* calculate timestamp separated from the zone and obs-zone */
     $stamp = strtotime(implode (' ', array_splice ($dateParts,0,4)));
     if (!isset($dateParts[0])) {