* remove accidently committed test stuff

[citadel.git] / webcit / webserver.c

diff --git a/webcit/webserver.c b/webcit/webserver.c
index 05ba0517641b120952b981d89f85d51d1e130d1e..4bc12f512b21910bde982cc0dd1813031d559531 100644 (file)
--- a/webcit/webserver.c
+++ b/webcit/webserver.c
@@ -263,7 +263,7 @@ void begin_burst(void)
  */
 long end_burst(void)
 {
-       struct wcsession *WCC = WC;
+       wcsession *WCC = WC;
         const char *ptr, *eptr;
         long count;
        ssize_t res;
@@ -693,9 +693,10 @@ int main(int argc, char **argv)
        TemplateCache = NewHash(1, NULL);
        GlobalNS = NewHash(1, NULL);
        Iterators = NewHash(1, NULL);
-       Contitionals = NewHash(1, NULL);
+       Conditionals = NewHash(1, NULL);
        MsgHeaderHandler = NewHash(1, NULL);
        MimeRenderHandler = NewHash(1, NULL);
+       SortHash = NewHash(1, NULL);
 
        LoadZoneFiles();
 
@@ -790,7 +791,7 @@ int main(int argc, char **argv)
                                "[-i ip_addr] [-p http_port] "
                                "[-t tracefile] [-c] [-f] "
                                "[-T Templatedebuglevel] "
-                               "[-d] "
+                               "[-d] [-Z] "
 #ifdef HAVE_OPENSSL
                                "[-s] "
 #endif
@@ -876,12 +877,13 @@ int main(int argc, char **argv)
                perror("chdir");
        }
        LoadIconDir(static_icon_dir);
-       InitTemplateCache();
 
        initialise_modules();
        initialize_viewdefs();
        initialize_axdefs();
 
+       InitTemplateCache();
+
        if (!access("static.local/webcit.css", R_OK)) {
                csslocal = NewStrBufPlain(HKEY("<link href=\"static.local/webcit.css\" rel=\"stylesheet\" type=\"text/css\">"));
        }
@@ -889,6 +891,9 @@ int main(int argc, char **argv)
        /* Tell libical to return an error instead of aborting if it sees badly formed iCalendar data. */
        icalerror_errors_are_fatal = 0;
 
+       /* Use our own prefix on tzid's generated from system tzdata */
+       icaltimezone_set_tzid_prefix("/citadel.org/");
+
        /*
         * Set up a place to put thread-specific data.
         * We only need a single pointer per thread - it points to the
@@ -979,8 +984,9 @@ void ShutDownWebcit(void)
        DeleteHash(&LocalTemplateCache);
        DeleteHash(&Iterators);
        DeleteHash(&MimeRenderHandler);
-       DeleteHash(&Contitionals);
+       DeleteHash(&Conditionals);
        DeleteHash(&MsgHeaderHandler);
+       DeleteHash(&SortHash);
 #ifdef ENABLE_NLS
        ShutdownLocale();
 #endif