[SM-CVS] SF.net SVN: squirrelmail:[14398] trunk/squirrelmail

[<pdo...@us...>]

Revision: 14398
          http://sourceforge.net/p/squirrelmail/code/14398
Author:   pdontthink
Date:     2013-11-06 16:47:55 +0000 (Wed, 06 Nov 2013)
Log Message:
-----------
Add full date and time as "title" (mouseover) text for dates shown on the message list screen

Modified Paths:
--------------
    trunk/squirrelmail/doc/ChangeLog
    trunk/squirrelmail/functions/date.php
    trunk/squirrelmail/functions/mailbox_display.php
    trunk/squirrelmail/templates/default/message_list.tpl

Modified: trunk/squirrelmail/doc/ChangeLog
===================================================================
--- trunk/squirrelmail/doc/ChangeLog	2013-11-06 16:46:03 UTC (rev 14397)
+++ trunk/squirrelmail/doc/ChangeLog	2013-11-06 16:47:55 UTC (rev 14398)
@@ -381,6 +381,8 @@
   - 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)
 --------------------------------------

Modified: trunk/squirrelmail/functions/date.php
===================================================================
--- trunk/squirrelmail/functions/date.php	2013-11-06 16:46:03 UTC (rev 14397)
+++ trunk/squirrelmail/functions/date.php	2013-11-06 16:47:55 UTC (rev 14398)
@@ -334,10 +334,17 @@
  * 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 @@
     $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");

Modified: trunk/squirrelmail/functions/mailbox_display.php
===================================================================
--- trunk/squirrelmail/functions/mailbox_display.php	2013-11-06 16:46:03 UTC (rev 14397)
+++ trunk/squirrelmail/functions/mailbox_display.php	2013-11-06 16:47:55 UTC (rev 14398)
@@ -618,7 +618,9 @@
                     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,

Modified: trunk/squirrelmail/templates/default/message_list.tpl
===================================================================
--- trunk/squirrelmail/templates/default/message_list.tpl	2013-11-06 16:46:03 UTC (rev 14397)
+++ trunk/squirrelmail/templates/default/message_list.tpl	2013-11-06 16:47:55 UTC (rev 14398)
@@ -514,8 +514,9 @@
             break;
           case SQM_COL_INT_DATE:
           case SQM_COL_DATE:
-            $sText = "    <td class=\"col_date\" $javascript_auto_click>"
-                   . $value. "</td>\n";
+            $sText = "    <td class=\"col_date\" $javascript_auto_click";
+            if ($title) {$sText .= " title=\"$title\"";}
+            $sText .= ">" . $value. "</td>\n";
             echo $sText;
             break;
           default:

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.