Integrated the DKIM signer into serv_smtpclient, but disabled it

[citadel.git] / webcit / http_datestring.c

diff --git a/webcit/http_datestring.c b/webcit/http_datestring.c
index da79733ce4eea98389e5e72a4cff2f22f6cae957..d1f6634e3df5c1b16f8d4266ac305d583c8e2f36 100644 (file)
--- a/webcit/http_datestring.c
+++ b/webcit/http_datestring.c
@@ -1,29 +1,26 @@
-/*
- * $Id$
- *
- * Function to generate HTTP-compliant textual time/date stamp
- * (This module was lifted directly from the Citadel server source)
- *
- */
-
-#include <stdlib.h>
-#include <ctype.h>
-#include <stdio.h>
-#include <string.h>
-# include <time.h>
+#include "webcit.h"
 
+#ifdef __FreeBSD__
+/** I like to believe there is a better way to do this. */
+#define HAVE_STRUCT_TM_TM_GMTOFF
+#endif
+/** HTTP Months - do not translate - these are not for human consumption */
 static char *httpdate_months[] = {
        "Jan", "Feb", "Mar", "Apr", "May", "Jun",
        "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
 };
 
+/** HTTP Weekdays - do not translate - these are not for human consumption */
 static char *httpdate_weekdays[] = {
        "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
 };
 
 
-/*
- * Supplied with a unix timestamp, generate a textual time/date stamp
+/**
+ * \brief Supplied with a unix timestamp, generate a textual time/date stamp
+ * \param buf the return buffer
+ * \param n the size of the buffer
+ * \param xtime the time to format as string
  */
 void http_datestring(char *buf, size_t n, time_t xtime) {
        struct tm t;
@@ -33,7 +30,7 @@ void http_datestring(char *buf, size_t n, time_t xtime) {
 
        localtime_r(&xtime, &t);
 
-       /* Convert "seconds west of GMT" to "hours/minutes offset" */
+       /** Convert "seconds west of GMT" to "hours/minutes offset" */
 #ifdef HAVE_STRUCT_TM_TM_GMTOFF
        offset = t.tm_gmtoff;
 #else
@@ -60,3 +57,37 @@ void http_datestring(char *buf, size_t n, time_t xtime) {
        );
 }
 
+
+void tmplput_nowstr(StrBuf *Target, WCTemplputParams *TP)
+{
+       char buf[64];
+       long bufused;
+       time_t now;
+       
+       now = time(NULL);
+#ifdef HAVE_SOLARIS_LOCALTIME_R
+       asctime_r(localtime(&now), buf, sizeof(buf));
+#else
+       asctime_r(localtime(&now), buf);
+#endif
+       bufused = strlen(buf);
+       if ((bufused > 0) && (buf[bufused - 1] == '\n')) {
+               buf[bufused - 1] = '\0';
+               bufused --;
+       }
+       StrEscAppend(Target, NULL, buf, 0, 0);
+}
+void tmplput_nowno(StrBuf *Target, WCTemplputParams *TP)
+{
+       time_t now;
+       now = time(NULL);
+       StrBufAppendPrintf(Target, "%ld", now);
+}
+
+void 
+InitModule_DATE
+(void)
+{
+       RegisterNamespace("DATE:NOW:STR", 0, 0, tmplput_nowstr, NULL, CTX_NONE);
+       RegisterNamespace("DATE:NOW:NO", 0, 0, tmplput_nowno, NULL, CTX_NONE);
+}