projects
/
squirrelmail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Happy New Year
[squirrelmail.git]
/
functions
/
date.php
diff --git
a/functions/date.php
b/functions/date.php
index 63f79b92687682b3aa577675a04cfb7c2a206147..4f7217b183b17dc8d978c8cd26f3aec2f5e2eb79 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
*
* <Tue,> 29 Jun 1999 09:52:11 -0500 (EDT)
* (as specified in RFC 822) -- 'Tue' is optional
*
- * @copyright 1999-201
3
The SquirrelMail Project Team
+ * @copyright 1999-201
8
The SquirrelMail Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @package squirrelmail
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @package squirrelmail
@@
-334,10
+334,17
@@
function getLongDateString( $stamp, $fallback = '' ) {
* of the form: "14:23" or "Jun 14, 2003" depending
* on whether the stamp is "today" or not.
*
* of the form: "14:23" or "Jun 14, 2003" depending
* on whether the stamp is "today" or not.
*
- * @param int stamp the timestamp
+ * @param int $stamp The timestamp
+ * @param boolean $return_full_date_and_time When TRUE,
+ * ignore all
+ * user settings
+ * and use full
+ * date and time
+ * (OPTIONAL;
+ * default FALSE)
* @return string the date string
*/
* @return string the date string
*/
-function getDateString( $stamp ) {
+function getDateString( $stamp
, $return_full_date_and_time=FALSE
) {
global $invert_time, $hour_format, $show_full_date, $custom_date_format;
global $invert_time, $hour_format, $show_full_date, $custom_date_format;
@@
-366,7
+373,14
@@
function getDateString( $stamp ) {
$nextmid = $midnight + 86400;
$custom_date_format = trim($custom_date_format);
$nextmid = $midnight + 86400;
$custom_date_format = trim($custom_date_format);
- if (!empty($custom_date_format)) {
+
+ if ($return_full_date_and_time) {
+ if ( $hour_format == SMPREF_TIME_12HR ) {
+ $date_format = _("D, F j, Y g:i a");
+ } else {
+ $date_format = _("D, F j, Y H:i");
+ }
+ } else if (!empty($custom_date_format)) {
$date_format = $custom_date_format;
} else if ($show_full_date == 1 || $nextmid < $stamp) {
$date_format = _("M j, Y");
$date_format = $custom_date_format;
} else if ($show_full_date == 1 || $nextmid < $stamp) {
$date_format = _("M j, Y");