X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fdate.php;h=d664d2a5644fbf12a777ae43a202a03da8b6743e;hp=c776b787b3b41762dd7007c911219a096c48266b;hb=102b278b934255dc609eeb851b93f9ab7aac064c;hpb=26017e66070f34a84efa0b22b86bb47502e379dc

diff --git a/functions/date.php b/functions/date.php
index c776b787..d664d2a5 100644
--- 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
  *
- * @copyright &copy; 1999-2007 The SquirrelMail Project Team
+ * @copyright 1999-2015 The SquirrelMail Project Team
  * @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.
  *
- * @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, 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");