* fmt_date.c: changes to "brief" mode. It now displays time only if the

[citadel.git] / webcit / fmt_date.c

diff --git a/webcit/fmt_date.c b/webcit/fmt_date.c
index da9c1d160806c6e62fe9364529e0e6771c4972ef..640db83c2f1a698e21e78848ef334674005966bb 100644 (file)
--- a/webcit/fmt_date.c
+++ b/webcit/fmt_date.c
@@ -48,6 +48,7 @@ void fmt_date(char *buf, time_t thetime, int brief)
 
        if (brief) {
 
+               /* If date == today, show only the time */
                if ((tm.tm_year == today_tm.tm_year)
                  &&(tm.tm_mon == today_tm.tm_mon)
                  &&(tm.tm_mday == today_tm.tm_mday)) {
@@ -63,6 +64,28 @@ void fmt_date(char *buf, time_t thetime, int brief)
                                );
                        }
                }
+
+               /* Otherwise, for messages up to 6 months old, show the
+                * month and day, and the time */
+               else if (today_timet - thetime < 15552000) {
+                       if (!strcasecmp(calhourformat, "24")) {
+                               sprintf(buf, "%s %d %2d:%02d",
+                                       ascmonths[tm.tm_mon],
+                                       tm.tm_mday,
+                                       tm.tm_hour, tm.tm_min
+                               );
+                       }
+                       else {
+                               sprintf(buf, "%s %d %2d:%02d%s",
+                                       ascmonths[tm.tm_mon],
+                                       tm.tm_mday,
+                                       hour, tm.tm_min,
+                                       ((tm.tm_hour >= 12) ? "pm" : "am")
+                               );
+                       }
+               }
+
+               /* older than 6 months, show only the date */
                else {
                        sprintf(buf, "%s %d %d",
                                ascmonths[tm.tm_mon],