/**
* date.php
*
- * Copyright (c) 1999-2004 The SquirrelMail Project Team
- * Licensed under the GNU GPL. For full terms see the file COPYING.
- *
* 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
*
+ * @copyright © 1999-2007 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @package squirrelmail
* @subpackage date
*/
-/** Load up some useful constants */
-require_once(SM_PATH . 'functions/constants.php');
+/**
+ * dependency information
+ * - none
+ */
/**
* Corrects a time stamp to be the local time.
case 'IST':
case 'MET DST':
case 'METDST':
+ case 'MEST':
+ case 'CEST':
$tzc = '+0200';
break;
case 'HKT':
if ($neg) $iTzc = -1 * (int) $iTzc;
/* stamp in gmt */
$stamp -= $iTzc;
- /** now find what the server is at **/
+ /* now find what the server is at */
$current = date('Z', time());
/* stamp in local timezone */
$stamp += $current;
* 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 ) {
$date_format = _("D, F j, Y g:i a");
} else {
- $date_format = _("D, F j, Y G:i");
+ $date_format = _("D, F j, Y H:i");
}
return( date_intl( $date_format, $stamp ) );
if ($invert_time) {
$dateZ = - $dateZ;
}
+
+ // calculate when it was midnight and when it will be,
+ // in order to display dates differently if they're 'today'
$midnight = $now - ($now % 86400) - $dateZ;
- $nextmid = $midnight + 86400 - $dateZ;
+ // this is to correct if after calculations midnight is more than
+ // one whole day away.
+ if ($now - $midnight > 86400) {
+ $midnight += 86400;
+ }
+ $nextmid = $midnight + 86400;
if (($show_full_date == 1) || ($nextmid < $stamp)) {
$date_format = _("M j, Y");
if ( $hour_format == SMPREF_TIME_12HR ) {
$date_format = _("g:i a");
} else {
- $date_format = _("G:i");
+ $date_format = _("H:i");
}
} else if ($midnight - 518400 < $stamp) {
/* This week */
if ( $hour_format == SMPREF_TIME_12HR ) {
$date_format = _("D, g:i a");
} else {
- $date_format = _("D, G:i");
+ $date_format = _("D, H:i");
}
} else {
/* before this week */
* @return int the timestamp calculated from the header
*/
function getTimeStamp($dateParts) {
- /** $dateParts[0] == <day of week> Mon, Tue, Wed
- ** $dateParts[1] == <day of month> 23
- ** $dateParts[2] == <month> Jan, Feb, Mar
- ** $dateParts[3] == <year> 1999
- ** $dateParts[4] == <time> 18:54:23 (HH:MM:SS)
- ** $dateParts[5] == <from GMT> +0100
- ** $dateParts[6] == <zone> (EDT)
- **
- ** NOTE: In RFC 822, it states that <day of week> is optional.
- ** In that case, dateParts[0] would be the <day of month>
- ** and everything would be bumped up one.
- **/
+ /* $dateParts[0] == <day of week> Mon, Tue, Wed
+ * $dateParts[1] == <day of month> 23
+ * $dateParts[2] == <month> Jan, Feb, Mar
+ * $dateParts[3] == <year> 1999
+ * $dateParts[4] == <time> 18:54:23 (HH:MM:SS)
+ * $dateParts[5] == <from GMT> +0100
+ * $dateParts[6] == <zone> (EDT)
+ *
+ * NOTE: In RFC 822, it states that <day of week> is optional.
+ * In that case, dateParts[0] would be the <day of month>
+ * and everything would be bumped up one.
+ */
/*
* Simply check to see if the first element in the dateParts
return getGMTSeconds($stamp, $dateParts[0]);
}
}
-
-/* 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);
- }
-*/
-?>
\ No newline at end of file