From: philippe_mingo Date: Fri, 21 Dec 2001 13:13:21 +0000 (+0000) Subject: [ squirrelmail-Bugs-488572 ] Clock is not 24-h aware X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=0e4ae91a1b0a5aad24330276d4aee0ee9866eb77;hp=4935919f85eaa48efcfec39107bb7c2c1583cd56;p=squirrelmail.git [ squirrelmail-Bugs-488572 ] Clock is not 24-h aware git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@1877 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- diff --git a/functions/constants.php b/functions/constants.php index 69e8ae7c..1dba41ca 100644 --- a/functions/constants.php +++ b/functions/constants.php @@ -13,57 +13,42 @@ * $Id$ */ -/*****************************************************************/ -/*** THIS FILE NEEDS TO HAVE ITS FORMATTING FIXED!!! ***/ -/*** PLEASE DO SO AND REMOVE THIS COMMENT SECTION. ***/ -/*** + Base level indent should begin at left margin, as ***/ -/*** the require_once below. ***/ -/*** + All identation should consist of four space blocks ***/ -/*** + Tab characters are evil. ***/ -/*** + all comments should use "slash-star ... star-slash" ***/ -/*** style -- no pound characters, no slash-slash style ***/ -/*** + FLOW CONTROL STATEMENTS (if, while, etc) SHOULD ***/ -/*** ALWAYS USE { AND } CHARACTERS!!! ***/ -/*** + Please use ' instead of ", when possible. Note " ***/ -/*** should always be used in _( ) function calls. ***/ -/*** Thank you for your help making the SM code more readable. ***/ -/*****************************************************************/ - require_once('../functions/plugin.php'); // Required for the hook /**************************************************************/ /* Set values for constants used by Squirrelmail preferences. */ /**************************************************************/ - /* Define basic, general purpose preference constants. */ - define('SMPREF_NO', 0); - define('SMPREF_OFF', 0); - define('SMPREF_YES', 1); - define('SMPREF_ON', 1); - define('SMPREF_NONE', 'none'); - - /* Define constants for location based preferences. */ - define('SMPREF_LOC_TOP', 'top'); - define('SMPREF_LOC_BETWEEN', 'between'); - define('SMPREF_LOC_BOTTOM', 'bottom'); - define('SMPREF_LOC_LEFT', ''); - define('SMPREF_LOC_RIGHT', 'right'); - - /* Define preferences for folder settings. */ - define('SMPREF_UNSEEN_NONE', 1); - define('SMPREF_UNSEEN_INBOX', 2); - define('SMPREF_UNSEEN_ALL', 3); - define('SMPREF_UNSEEN_ONLY', 1); - define('SMPREF_UNSEEN_TOTAL', 2); - - /* Define constants for time/date display preferences. */ - define('SMPREF_TIME_24HR', 1); - define('SMPREF_TIME_12HR', 2); - - /* Define constants for javascript preferences. */ - define('SMPREF_JS_OFF', 0); - define('SMPREF_JS_ON', 1); - define('SMPREF_JS_AUTODETECT', 2); - - do_hook('loading_constants'); -?> +/* Define basic, general purpose preference constants. */ +define('SMPREF_NO', 0); +define('SMPREF_OFF', 0); +define('SMPREF_YES', 1); +define('SMPREF_ON', 1); +define('SMPREF_NONE', 'none'); + +/* Define constants for location based preferences. */ +define('SMPREF_LOC_TOP', 'top'); +define('SMPREF_LOC_BETWEEN', 'between'); +define('SMPREF_LOC_BOTTOM', 'bottom'); +define('SMPREF_LOC_LEFT', ''); +define('SMPREF_LOC_RIGHT', 'right'); + +/* Define preferences for folder settings. */ +define('SMPREF_UNSEEN_NONE', 1); +define('SMPREF_UNSEEN_INBOX', 2); +define('SMPREF_UNSEEN_ALL', 3); +define('SMPREF_UNSEEN_ONLY', 1); +define('SMPREF_UNSEEN_TOTAL', 2); + +/* Define constants for time/date display preferences. */ +define('SMPREF_TIME_24HR', 1); +define('SMPREF_TIME_12HR', 2); + +/* Define constants for javascript preferences. */ +define('SMPREF_JS_OFF', 0); +define('SMPREF_JS_ON', 1); +define('SMPREF_JS_AUTODETECT', 2); + +do_hook('loading_constants'); + +?> \ No newline at end of file diff --git a/functions/date.php b/functions/date.php index 8fca991c..7276811a 100644 --- a/functions/date.php +++ b/functions/date.php @@ -14,252 +14,271 @@ * $Id$ */ -/*****************************************************************/ -/*** THIS FILE NEEDS TO HAVE ITS FORMATTING FIXED!!! ***/ -/*** PLEASE DO SO AND REMOVE THIS COMMENT SECTION. ***/ -/*** + Base level indent should begin at left margin, as ***/ -/*** the first line of the function definition below. ***/ -/*** + All identation should consist of four space blocks ***/ -/*** + Tab characters are evil. ***/ -/*** + all comments should use "slash-star ... star-slash" ***/ -/*** style -- no pound characters, no slash-slash style ***/ -/*** + FLOW CONTROL STATEMENTS (if, while, etc) SHOULD ***/ -/*** ALWAYS USE { AND } CHARACTERS!!! ***/ -/*** + Please use ' instead of ", when possible. Note " ***/ -/*** should always be used in _( ) function calls. ***/ -/*** Thank you for your help making the SM code more readable. ***/ -/*****************************************************************/ +require_once( '../functions/constants.php' ); // 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')) - $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'; - - if (substr($gmt, 0, 1) == '-') { - $neg = true; - $gmt = substr($gmt, 1, strlen($gmt)); - } else if (substr($gmt, 0, 1) == '+') { - $neg = false; - $gmt = substr($gmt, 1, strlen($gmt)); - } else - $neg = false; + 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'; + } + + if (substr($gmt, 0, 1) == '-') { + $neg = true; + $gmt = substr($gmt, 1, strlen($gmt)); + } else if (substr($gmt, 0, 1) == '+') { + $neg = false; + $gmt = substr($gmt, 1, strlen($gmt)); + } else { + $neg = false; + } + + $gmt = substr($gmt, 0, 2); + $gmt = $gmt * 3600; + if ($neg == true) { + $gmt = "-$gmt"; + } else { + $gmt = "+$gmt"; + } + + /** 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; +} - $gmt = substr($gmt, 0, 2); - $gmt = $gmt * 3600; - if ($neg == true) - $gmt = "-$gmt"; - else - $gmt = "+$gmt"; - - /** now find what the server is at **/ - $current = date('Z', time()); - if ($invert_time) - $current = - $current; - $stamp = (int)$stamp - (int)$gmt + (int)$current; +/** + Switch system has been intentionaly choosed for the + internationalization of month and day names. The reason + is to make sure that _("") strings will go into the + main po. +**/ - return $stamp; - } +function getDayName( $day_number ) { - /** - Switch system has been intentionaly choosed for the - internationalization of month and day names. The reason - is to make sure that _("") strings will go into the - main po. - **/ + switch( $day_number ) { + case 0: + $ret = _("Sunday"); + break; + case 1: + $ret = _("Monday"); + break; + case 2: + $ret = _("Tuesday"); + break; + case 3: + $ret = _("Wednesday"); + break; + case 4: + $ret = _("Thursday"); + break; + case 5: + $ret = _("Friday"); + break; + case 6: + $ret = _("Saturday"); + break; + default: + $ret = ''; + } + return( $ret ); +} - function getDayName( $day_number ) { - - switch( $day_number ) { - case 0: - $ret = _("Sunday"); - break; - case 1: - $ret = _("Monday"); - break; - case 2: - $ret = _("Tuesday"); - break; - case 3: - $ret = _("Wednesday"); - break; - case 4: - $ret = _("Thursday"); - break; - case 5: - $ret = _("Friday"); - break; - case 6: - $ret = _("Saturday"); - break; - default: - $ret = ''; - } - return( $ret ); - } +function getMonthName( $month_number ) { + switch( $month_number ) { + case '01': + $ret = _("January"); + break; + case '02': + $ret = _("February"); + break; + case '03': + $ret = _("March"); + break; + case '04': + $ret = _("April"); + break; + case '05': + $ret = _("May"); + break; + case '06': + $ret = _("June"); + break; + case '07': + $ret = _("July"); + break; + case '08': + $ret = _("August"); + break; + case '09': + $ret = _("September"); + break; + case '10': + $ret = _("October"); + break; + case '11': + $ret = _("November"); + break; + case '12': + $ret = _("December"); + break; + default: + $ret = ''; + } + return( $ret ); +} - function getMonthName( $month_number ) { - switch( $month_number ) { - case '01': - $ret = _("January"); - break; - case '02': - $ret = _("February"); - break; - case '03': - $ret = _("March"); - break; - case '04': - $ret = _("April"); - break; - case '05': - $ret = _("May"); - break; - case '06': - $ret = _("June"); - break; - case '07': - $ret = _("July"); - break; - case '08': - $ret = _("August"); - break; - case '09': - $ret = _("September"); - break; - case '10': - $ret = _("October"); - break; - case '11': - $ret = _("November"); - break; - case '12': - $ret = _("December"); - break; - default: - $ret = ''; - } - return( $ret ); - } +function date_intl( $date_format, $stamp ) { - function date_intl( $date_format, $stamp ) { + $ret = str_replace( 'D', '$1', $date_format ); + $ret = str_replace( 'F', '$2', $ret ); + $ret = date( '$3'. $ret . '$3', $stamp ); // Workaround for a PHP 4.0.4 problem + $ret = str_replace( '$1', substr( getDayName( date( 'w', $stamp ) ), 0, 3 ), $ret ); + $ret = str_replace( '$2', getMonthName( date( 'm', $stamp ) ), $ret ); + $ret = str_replace( '$3', '', $ret ); + + return( $ret ); +} - $ret = str_replace( 'D', '$1', $date_format ); - $ret = str_replace( 'F', '$2', $ret ); - $ret = date( '$3'. $ret . '$3', $stamp ); // Workaround for a PHP 4.0.4 problem - $ret = str_replace( '$1', substr( getDayName( date( 'w', $stamp ) ), 0, 3 ), $ret ); - $ret = str_replace( '$2', getMonthName( date( 'm', $stamp ) ), $ret ); - $ret = str_replace( '$3', '', $ret ); - - return( $ret ); - } +function getLongDateString( $stamp ) { - function getLongDateString( $stamp ) { - - return( date_intl( _("D, F j, Y g:i a"), $stamp ) ); - - } + global $hour_format; + + if ( $hour_format == SMPREF_TIME_12HR ) { + $date_format = _("D, F j, Y g:i a"); + } else { + $date_format = _("D, F j, Y G:i"); + } + + return( date_intl( $date_format, $stamp ) ); - function getDateString( $stamp ) { - - global $invert_time; +} - $now = time(); - - $dateZ = date('Z', $now ); - if ($invert_time) - $dateZ = - $dateZ; - $midnight = $now - ($now % 86400) - $dateZ; +function getDateString( $stamp ) { - if ($midnight < $stamp) { - // Today - $date_format = _("g:i a"); - } else if ($midnight - 518400 < $stamp) { - // This week - $date_format = _("D, g:i a"); - } else { - // before this week - $date_format = _("M j, Y"); - } - - return( date_intl( $date_format, $stamp ) ); - // return( date( $date_i, $stamp ) ); - } + global $invert_time, $hour_format; + + $now = time(); + + $dateZ = date('Z', $now ); + if ($invert_time) { + $dateZ = - $dateZ; + } + $midnight = $now - ($now % 86400) - $dateZ; + + if ($midnight < $stamp) { + /* Today */ + if ( $hour_format == SMPREF_TIME_12HR ) { + $date_format = _("g:i a"); + } else { + $date_format = _("G: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"); + } + } else { + /* before this week */ + $date_format = _("M j, Y"); + } + + return( date_intl( $date_format, $stamp ) ); +} - function getTimeStamp($dateParts) { - /** $dateParts[0] == Mon, Tue, Wed - ** $dateParts[1] == 23 - ** $dateParts[2] == Jan, Feb, Mar - ** $dateParts[3] == 1999 - ** $dateParts[4] ==