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 d4c69bf6c250506d534db938977b737c028cd839..d1f6634e3df5c1b16f8d4266ac305d583c8e2f36 100644 (file)
--- a/webcit/http_datestring.c
+++ b/webcit/http_datestring.c
@@ -1,15 +1,9 @@
-/*
- * $Id$
- */
-/**
- * \defgroup HTTPDateTime Function to generate HTTP-compliant textual time/date stamp
- * (This module was lifted directly from the Citadel server source)
- *
- * \ingroup WebcitHttpServer
- */
-/*@{*/
 #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",
@@ -64,25 +58,36 @@ void http_datestring(char *buf, size_t n, time_t xtime) {
 }
 
 
-void tmplput_nowstr(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
+void tmplput_nowstr(StrBuf *Target, WCTemplputParams *TP)
 {
+       char buf[64];
+       long bufused;
        time_t now;
+       
        now = time(NULL);
-       StrEscAppend(Target, NULL, asctime(localtime(&now)), 0, 0);
+#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, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
+void tmplput_nowno(StrBuf *Target, WCTemplputParams *TP)
 {
        time_t now;
        now = time(NULL);
-       StrBufAppendPrintf(Target, "%l", now);
+       StrBufAppendPrintf(Target, "%ld", now);
 }
 
 void 
 InitModule_DATE
 (void)
 {
-       RegisterNamespace("DATE:NOW:STR", 1, 2, tmplput_nowstr, CTX_NONE);
-       RegisterNamespace("DATE:NOW:NO", 1, 2, tmplput_nowno, CTX_NONE);
+       RegisterNamespace("DATE:NOW:STR", 0, 0, tmplput_nowstr, NULL, CTX_NONE);
+       RegisterNamespace("DATE:NOW:NO", 0, 0, tmplput_nowno, NULL, CTX_NONE);
 }
-
-/*@}*/