From d72549cb90b0473f1d7a99e796ede80dac1b1ec3 Mon Sep 17 00:00:00 2001 From: pdontthink Date: Wed, 6 Nov 2013 16:47:55 +0000 Subject: [PATCH] Add full date and time as "title" (mouseover) text for dates shown on the message list screen git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@14398 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- doc/ChangeLog | 2 ++ functions/date.php | 20 +++++++++++++++++--- functions/mailbox_display.php | 4 +++- templates/default/message_list.tpl | 5 +++-- 4 files changed, 25 insertions(+), 6 deletions(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index 330eec1f..9628707a 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -381,6 +381,8 @@ Version 1.5.2 - SVN - Added option to use blank spacer instead of security image ("This image has been removed for security reasons.") for replacing unsafe images. + - Full date and time is used as "title" (mouseover) text for dates + shown on the message list screen Version 1.5.1 (branched on 2006-02-12) -------------------------------------- diff --git a/functions/date.php b/functions/date.php index 63f79b92..e61b7337 100644 --- a/functions/date.php +++ b/functions/date.php @@ -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. * - * @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 */ -function getDateString( $stamp ) { +function getDateString( $stamp, $return_full_date_and_time=FALSE ) { 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); - if (!empty($custom_date_format)) { + + if ($return_full_date_and_time) { + if ( $hour_format == SMPREF_TIME_12HR ) { + $date_format = _("D, M j, Y g:i a"); + } else { + $date_format = _("D, M 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"); diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php index 0ebe484b..41a277a9 100644 --- a/functions/mailbox_display.php +++ b/functions/mailbox_display.php @@ -618,7 +618,9 @@ function prepareMessageList(&$aMailbox, $aProps) { break; case SQM_COL_DATE: case SQM_COL_INT_DATE: - $value = getDateString(getTimeStamp(explode(' ',trim($value)))); + $value = getTimeStamp(explode(' ',trim($value))); + $title = getDateString($value, TRUE); + $value = getDateString($value); break; case SQM_COL_FLAGS: $aFlagColumn = array('seen' => false, diff --git a/templates/default/message_list.tpl b/templates/default/message_list.tpl index 8d9548c3..b09079bc 100644 --- a/templates/default/message_list.tpl +++ b/templates/default/message_list.tpl @@ -514,8 +514,9 @@ if ($non_clicked_class != 'even' && $non_clicked_class != 'odd' break; case SQM_COL_INT_DATE: case SQM_COL_DATE: - $sText = " " - . $value. "\n"; + $sText = " \n"; echo $sText; break; default: -- 2.25.1