Applied dtx's patch which adds the option to flag spam
[citadel.git] / webcit / siteconfig.c
index a68a6c7464a38f7707556adee384fdb1f85d2f30..27271e334cc8d5aea21b38a0cff75ba23283da71 100644 (file)
@@ -8,6 +8,35 @@
 #include "webcit.h"
 #include "webserver.h"
 
+
+HashList *ZoneHash = NULL;
+
+
+
+void LoadZoneFiles(void)
+{
+       icalarray *zones;
+       int z;
+       long len;
+       const char *this_zone;
+       StrBuf *ZName;
+       
+       ZoneHash = NewHash(1, NULL);
+       ZName = NewStrBufPlain(HKEY("UTC"));
+       Put(ZoneHash, HKEY("UTC"), ZName, HFreeStrBuf);
+       zones = icaltimezone_get_builtin_timezones();
+       for (z = 0; z < zones->num_elements; ++z) {
+               this_zone = icaltimezone_get_location(icalarray_element_at(zones, z));
+               len = strlen(this_zone);
+               ZName = NewStrBufPlain(this_zone, len);
+               Put(ZoneHash, this_zone, len, ZName, HFreeStrBuf);
+       }
+       SortByHashKey(ZoneHash, 0);
+}
+
+
+
+
 /*
  * \brief display all configuration items
  */
@@ -15,6 +44,8 @@ void display_siteconfig(void)
 {
        char buf[SIZ];
        int i, j;
+       struct wcsession *WCC = WC;
+       const char *VCZname;
 
        char general[65536];
        char access[SIZ];
@@ -64,7 +95,7 @@ void display_siteconfig(void)
                _("Auto-purger"),
                _("Indexing/Journaling"),
                _("Push Email"),
-               _("Pop3 Fetching")
+               _("Pop3")
        };
 
        sprintf(general, "<center><h1>%s</h1><table border=\"0\">",
@@ -109,11 +140,11 @@ void display_siteconfig(void)
                );
 
        sprintf(pop3, "<center><h1>%s</h1><table border=\"0\">",
-               _("POP3 Mail Fetching")
+               _("POP3")
                );
                
        wprintf("<form method=\"post\" action=\"siteconfig\">\n");
-       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WCC->nonce);
        
        sprintf(&general[strlen(general)], "<tr><td><a href=\"display_edithello\"> %s </a></td>",           _("Change Login Logo"));
        sprintf(&general[strlen(general)],     "<td><a href=\"display_editgoodbuye\"> %s </a></td></tr>\n", _("Change Logout Logo"));
@@ -294,11 +325,11 @@ void display_siteconfig(void)
                        sprintf(&tuning[strlen(tuning)], "</td></tr>\n");
                        break;
                case 23:
-                       sprintf(&network[strlen(network)], "<tr><td>");
-                       sprintf(&network[strlen(network)], _("POP3 listener port (-1 to disable)"));
-                       sprintf(&network[strlen(network)], "</td><td>");
-                       sprintf(&network[strlen(network)], "<input type=\"text\" name=\"c_pop3_port\" maxlength=\"5\" value=\"%s\">", buf);
-                       sprintf(&network[strlen(network)], "</TD></TR>\n");
+                       sprintf(&pop3[strlen(pop3)], "<tr><td>");
+                       sprintf(&pop3[strlen(pop3)], _("POP3 listener port (-1 to disable)"));
+                       sprintf(&pop3[strlen(pop3)], "</td><td>");
+                       sprintf(&pop3[strlen(pop3)], "<input type=\"text\" name=\"c_pop3_port\" maxlength=\"5\" value=\"%s\">", buf);
+                       sprintf(&pop3[strlen(pop3)], "</TD></TR>\n");
                        break;
                case 24:
                        sprintf(&network[strlen(network)], "<TR><TD>");
@@ -419,11 +450,11 @@ void display_siteconfig(void)
                        sprintf(&network[strlen(network)], "</TD></TR>\n");
                        break;
                case 40:
-                       sprintf(&network[strlen(network)], "<TR><TD>");
-                       sprintf(&network[strlen(network)], _("POP3 over SSL port (-1 to disable)"));
-                       sprintf(&network[strlen(network)], "</TD><TD>");
-                       sprintf(&network[strlen(network)], "<input type=\"text\" NAME=\"c_pop3s_port\" MAXLENGTH=\"5\" VALUE=\"%s\">", buf);
-                       sprintf(&network[strlen(network)], "</TD></TR>\n");
+                       sprintf(&pop3[strlen(pop3)], "<TR><TD>");
+                       sprintf(&pop3[strlen(pop3)], _("POP3 over SSL port (-1 to disable)"));
+                       sprintf(&pop3[strlen(pop3)], "</TD><TD>");
+                       sprintf(&pop3[strlen(pop3)], "<input type=\"text\" NAME=\"c_pop3s_port\" MAXLENGTH=\"5\" VALUE=\"%s\">", buf);
+                       sprintf(&pop3[strlen(pop3)], "</TD></TR>\n");
                        break;
                case 41:
                        sprintf(&network[strlen(network)], "<TR><TD>");
@@ -500,11 +531,12 @@ void display_siteconfig(void)
                        int z;
                        long len;
                        char this_zone[128];
-                       char *ZName, *ZNamee;
+                       char *ZName;
+                       void *ZNamee;
                        HashList *List;
                        HashPos  *it;
 
-                       List = NewHash();
+                       List = NewHash(1, NULL);
                        len = sizeof("UTC") + 1;
                        ZName = malloc(len + 1);
                        memcpy(ZName, "UTC", len + 1);
@@ -517,11 +549,11 @@ void display_siteconfig(void)
                                memcpy(ZName, this_zone, len + 1);
                                Put(List, ZName, len, ZName, NULL);
                        }
-                       SortByHashKey(List);
+                       SortByHashKey(List, 0);
                        it = GetNewHashPos();
-                       while (GetNextHashPos(List, it, &len, &ZName, (void**)&ZNamee)) {
+                       while (GetNextHashPos(List, it, &len, &VCZname, &ZNamee)) {
                                sprintf(&general[strlen(general)], "<option %s value=\"%s\">%s</option>\n",
-                                       (!strcasecmp(ZName, buf) ? "selected" : ""),
+                                       (!strcasecmp((char*)ZName, buf) ? "selected" : ""),
                                        ZName, ZName
                                );
                        }
@@ -576,7 +608,7 @@ void display_siteconfig(void)
                        break;
                case 56:
                        sprintf(&funambol[strlen(funambol)], "<TR><TD>");
-                       sprintf(&funambol[strlen(funambol)], _("Funambol auth details (user:pass in Base64)"));
+                       sprintf(&funambol[strlen(funambol)], _("Funambol auth details (user:pass)"));
                        sprintf(&funambol[strlen(funambol)], "</TD><TD>");
                        sprintf(&funambol[strlen(funambol)], "<input type=\"text\" NAME=\"c_funambol_auth\" MAXLENGTH=\"255\" VALUE=\"%s\">", buf);
                        sprintf(&funambol[strlen(funambol)], "</TD></TR>\n");
@@ -647,6 +679,14 @@ void display_siteconfig(void)
                        sprintf(&pop3[strlen(pop3)], "<input type=\"text\" name=\"c_pop3_fastest\" MAXLENGTH=\"5\" value=\"%s\">\n", buf);
                        sprintf(&pop3[strlen(pop3)], "</TD></TR>\n");
                        break;
+               case 66: /* Flag spam */
+                       sprintf(&network[strlen(network)], "<TR><TD>");
+                       sprintf(&network[strlen(network)], _("Flag message as spam, instead of rejecting it"));
+                       sprintf(&network[strlen(network)], "</TD><TD>");
+                       sprintf(&network[strlen(network)], "<input type=\"checkbox\" NAME=\"c_spam_flag_only\" VALUE=\"yes\" %s>",
+                               (atoi(buf) ? "CHECKED" : ""));
+                       sprintf(&network[strlen(network)], "</TD></TR>\n");
+                       break;
                        
                }
        
@@ -728,29 +768,185 @@ void display_siteconfig(void)
 
        tabbed_dialog(9, tabnames);
 
-       begin_tab(0, 9);        client_write(general, strlen(general));          end_tab(0, 9);
-       begin_tab(1, 9);        client_write(access, strlen(access));            end_tab(1, 9);
-       begin_tab(2, 9);        client_write(network, strlen(network));          end_tab(2, 9);
-       begin_tab(3, 9);        client_write(tuning, strlen(tuning));            end_tab(3, 9);
-       begin_tab(4, 9);        client_write(directory, strlen(directory));      end_tab(4, 9);
-       begin_tab(5, 9);        client_write(purger, strlen(purger));            end_tab(5, 9);
-       begin_tab(6, 9);        client_write(idxjnl, strlen(idxjnl));            end_tab(6, 9);
-       begin_tab(7, 9);        client_write(funambol, strlen(funambol));        end_tab(7, 9);
-       begin_tab(8, 9);        client_write(pop3, strlen(pop3));                end_tab(8, 9);
-       wprintf("<div class=\"tabcontent_submit\">");
+       begin_tab(0, 9);        StrBufAppendBufPlain(WCC->WBuf, general, strlen(general), 0);            end_tab(0, 9);
+       begin_tab(1, 9);        StrBufAppendBufPlain(WCC->WBuf, access, strlen(access), 0);              end_tab(1, 9);
+       begin_tab(2, 9);        StrBufAppendBufPlain(WCC->WBuf, network, strlen(network), 0);            end_tab(2, 9);
+       begin_tab(3, 9);        StrBufAppendBufPlain(WCC->WBuf, tuning, strlen(tuning), 0);              end_tab(3, 9);
+       begin_tab(4, 9);        StrBufAppendBufPlain(WCC->WBuf, directory, strlen(directory), 0);        end_tab(4, 9);
+       begin_tab(5, 9);        StrBufAppendBufPlain(WCC->WBuf, purger, strlen(purger), 0);              end_tab(5, 9);
+       begin_tab(6, 9);        StrBufAppendBufPlain(WCC->WBuf, idxjnl, strlen(idxjnl), 0);              end_tab(6, 9);
+       begin_tab(7, 9);        StrBufAppendBufPlain(WCC->WBuf, funambol, strlen(funambol), 0);  end_tab(7, 9);
+       begin_tab(8, 9);        StrBufAppendBufPlain(WCC->WBuf, pop3, strlen(pop3), 0);          end_tab(8, 9);
+
+       begin_tab(9, 9);
        wprintf("<input type=\"submit\" NAME=\"ok_button\" VALUE=\"%s\">", _("Save changes"));
        wprintf("&nbsp;");
        wprintf("<input type=\"submit\" NAME=\"cancel_button\" VALUE=\"%s\">\n", _("Cancel"));
-       wprintf("</div></FORM>\n");
+       end_tab(9, 9);
+
+       wprintf("</FORM>\n");
        wprintf("</td></tr></table>\n");
        wDumpContent(1);
 }
 
+typedef struct _CfgMapping {
+       int type;
+       const char *Key;
+       long len;
+}CfgMapping;
+
+#define CFG_STR 1
+#define CFG_YES 2
+#define CFG_NO 3
+
+CfgMapping ServerConfig[] = {
+       {CFG_STR, HKEY("c_nodename")},
+       {CFG_STR, HKEY("c_fqdn")},
+       {CFG_STR, HKEY("c_humannode")},
+       {CFG_STR, HKEY("c_phonenum")},
+       {CFG_YES, HKEY("c_creataide")},
+       {CFG_STR, HKEY("c_sleeping")},
+       {CFG_STR, HKEY("c_initax")},
+       {CFG_YES, HKEY("c_regiscall")},
+       {CFG_YES, HKEY("c_twitdetect")},
+       {CFG_STR, HKEY("c_twitroom")},
+       {CFG_STR, HKEY("c_moreprompt")},
+       {CFG_YES, HKEY("c_restrict")},
+       {CFG_STR, HKEY("c_bbs_city")},
+       {CFG_STR, HKEY("c_sysadm")},
+       {CFG_STR, HKEY("c_maxsessions")},
+       {CFG_STR, HKEY("reserved1")},
+       {CFG_STR, HKEY("c_userpurge")},
+       {CFG_STR, HKEY("c_roompurge")},
+       {CFG_STR, HKEY("c_logpages")},
+       {CFG_STR, HKEY("c_createax")},
+       {CFG_STR, HKEY("c_maxmsglen")},
+       {CFG_STR, HKEY("c_min_workers")},
+       {CFG_STR, HKEY("c_max_workers")},
+       {CFG_STR, HKEY("c_pop3_port")},
+       {CFG_STR, HKEY("c_smtp_port")},
+       {CFG_NO , HKEY("c_rfc822_strict_from")},        /* note: reverse bool */
+       {CFG_YES, HKEY("c_aide_zap")},
+       {CFG_STR, HKEY("c_imap_port")},
+       {CFG_STR, HKEY("c_net_freq")},
+       {CFG_YES, HKEY("c_disable_newu")},
+       {CFG_STR, HKEY("reserved2")},
+       {CFG_STR, HKEY("c_purge_hour")},
+       {CFG_STR, HKEY("c_ldap_host")},
+       {CFG_STR, HKEY("c_ldap_port")},
+       {CFG_STR, HKEY("c_ldap_base_dn")},
+       {CFG_STR, HKEY("c_ldap_bind_dn")},
+       {CFG_STR, HKEY("c_ldap_bind_pw")},
+       {CFG_STR, HKEY("c_ip_addr")},
+       {CFG_STR, HKEY("c_msa_port")},
+       {CFG_STR, HKEY("c_imaps_port")},
+       {CFG_STR, HKEY("c_pop3s_port")},
+       {CFG_STR, HKEY("c_smtps_port")},
+       {CFG_YES, HKEY("c_enable_fulltext")},
+       {CFG_YES, HKEY("c_auto_cull")},
+       {CFG_YES, HKEY("c_instant_expunge")},
+       {CFG_YES, HKEY("c_allow_spoofing")},
+       {CFG_YES, HKEY("c_journal_email")},
+       {CFG_YES, HKEY("c_journal_pubmsgs")},
+       {CFG_STR, HKEY("c_journal_dest")},
+       {CFG_STR, HKEY("c_default_cal_zone")},
+       {CFG_STR, HKEY("c_pftcpdict_port")},
+       {CFG_STR, HKEY("c_mgesve_port")},
+       {CFG_STR, HKEY("c_auth_mode")},
+       {CFG_STR, HKEY("c_funambol_host")},
+       {CFG_STR, HKEY("c_funambol_port")},
+       {CFG_STR, HKEY("c_funambol_source")},
+       {CFG_STR, HKEY("c_funambol_auth")},
+       {CFG_YES, HKEY("c_rbl_at_greeting")},
+       {CFG_STR, HKEY("c_master_user")},
+       {CFG_STR, HKEY("c_master_pass")},
+       {CFG_STR, HKEY("c_pager_program")},
+       {CFG_YES, HKEY("c_imap_keep_from")},
+       {CFG_STR, HKEY("c_xmpp_c2s_port")},
+       {CFG_STR, HKEY("c_xmpp_s2s_port")},
+       {CFG_STR, HKEY("c_pop3_fetch")},
+       {CFG_STR, HKEY("c_pop3_fastest")},
+       {CFG_YES , HKEY("c_spam_flag_only")}
+};
+
+
+/*
+ * \brief display all configuration items
+ */
+void load_siteconfig(void)
+{
+       struct wcsession *WCC = WC;
+       StrBuf *Buf, *Token;
+       HashList *Cfg;
+       char buf[SIZ];
+       long len;
+       int i;
+       
+       if (WCC->ServCfg == NULL)
+               WCC->ServCfg = NewHash(1, NULL);
+       Cfg = WCC->ServCfg;
+
+       serv_printf("CONF get");
+       serv_getln(buf, sizeof buf);
+       i = 0;
+       Buf = NewStrBuf();
+       while ((sizeof(ServerConfig) / sizeof(CfgMapping)) &&
+              (len = StrBuf_ServGetln(Buf),
+               strcmp(ChrPtr(Buf), "000")) && 
+              (i <= sizeof(ServerConfig))) 
+       {
+               Put(Cfg,
+                   ServerConfig[i].Key, 
+                   ServerConfig[i].len, 
+                   Buf, 
+                   HFreeStrBuf);
+               i++;
+               if (i <= sizeof(ServerConfig) / sizeof(CfgMapping))
+                       Buf = NewStrBuf();
+               else
+                       Buf = NULL;                     
+       }
+       FreeStrBuf(&Buf);
+
+       serv_puts("GPEX site");
+       Buf = NewStrBuf();
+       Token = NULL;
+       StrBuf_ServGetln(Buf);
+       if (ChrPtr(Buf)[0] == '2') {
+               StrBufCutLeft(Buf, 4);
+
+               Token = NewStrBuf();
+               StrBufExtract_token(Token, Buf, 0, '|');
+               Put(Cfg, HKEY("sitepolicy"), Token, HFreeStrBuf);
+
+               Token = NewStrBuf();
+               StrBufExtract_token(Token, Buf, 1, '|');
+               Put(Cfg, HKEY("sitevalue"), Token, HFreeStrBuf);
+       }
+
+       serv_puts("GPEX mailboxes");
+       serv_getln(buf, sizeof buf);
+       if (buf[0] == '2') {
+               StrBufCutLeft(Buf, 4);
+
+               Token = NewStrBuf();
+               StrBufExtract_token(Token, Buf, 0, '|');
+               Put(Cfg, HKEY("mboxpolicy"), Token, HFreeStrBuf);
+
+               Token = NewStrBuf();
+               StrBufExtract_token(Token, Buf, 1, '|');
+               Put(Cfg, HKEY("mboxvalue"), Token, HFreeStrBuf);
+       }
+}
+
+
 /**
  * parse siteconfig changes 
  */
 void siteconfig(void)
 {
+       struct wcsession *WCC = WC;
+       int i;
        char buf[256];
 
        if (strlen(bstr("ok_button")) == 0) {
@@ -760,89 +956,118 @@ void siteconfig(void)
        serv_printf("CONF set");
        serv_getln(buf, sizeof buf);
        if (buf[0] != '4') {
-               safestrncpy(WC->ImportantMessage, &buf[4], sizeof WC->ImportantMessage);
+               safestrncpy(WCC->ImportantMessage, &buf[4], sizeof WCC->ImportantMessage);
                display_aide_menu();
                return;
        }
-       serv_printf("%s", bstr("c_nodename"));
-       serv_printf("%s", bstr("c_fqdn"));
-       serv_printf("%s", bstr("c_humannode"));
-       serv_printf("%s", bstr("c_phonenum"));
-       serv_printf("%s", ((!strcasecmp(bstr("c_creataide"), "yes") ? "1" : "0")));
-       serv_printf("%s", bstr("c_sleeping"));
-       serv_printf("%s", bstr("c_initax"));
-       serv_printf("%s", ((!strcasecmp(bstr("c_regiscall"), "yes") ? "1" : "0")));
-       serv_printf("%s", ((!strcasecmp(bstr("c_twitdetect"), "yes") ? "1" : "0")));
-       serv_printf("%s", bstr("c_twitroom"));
-       serv_printf("%s", bstr("c_moreprompt"));
-       serv_printf("%s", ((!strcasecmp(bstr("c_restrict"), "yes") ? "1" : "0")));
-       serv_printf("%s", bstr("c_bbs_city"));
-       serv_printf("%s", bstr("c_sysadm"));
-       serv_printf("%s", bstr("c_maxsessions"));
-       serv_printf("");  /* placeholder - this field is not in use */
-       serv_printf("%s", bstr("c_userpurge"));
-       serv_printf("%s", bstr("c_roompurge"));
-       serv_printf("%s", bstr("c_logpages"));
-       serv_printf("%s", bstr("c_createax"));
-       serv_printf("%s", bstr("c_maxmsglen"));
-       serv_printf("%s", bstr("c_min_workers"));
-       serv_printf("%s", bstr("c_max_workers"));
-       serv_printf("%s", bstr("c_pop3_port"));
-       serv_printf("%s", bstr("c_smtp_port"));
-       serv_printf("%s", ((!strcasecmp(bstr("c_rfc822_strict_from"), "yes") ? "0" : "1"))); /* note: reverse bool */
-       serv_printf("%s", ((!strcasecmp(bstr("c_aide_zap"), "yes") ? "1" : "0")));
-       serv_printf("%s", bstr("c_imap_port"));
-       serv_printf("%s", bstr("c_net_freq"));
-       serv_printf("%s", ((!strcasecmp(bstr("c_disable_newu"), "yes") ? "1" : "0")));
-       serv_printf("1"); /* placeholder - this field is not in use */
-       serv_printf("%s", bstr("c_purge_hour"));
-       serv_printf("%s", bstr("c_ldap_host"));
-       serv_printf("%s", bstr("c_ldap_port"));
-       serv_printf("%s", bstr("c_ldap_base_dn"));
-       serv_printf("%s", bstr("c_ldap_bind_dn"));
-       serv_printf("%s", bstr("c_ldap_bind_pw"));
-       serv_printf("%s", bstr("c_ip_addr"));
-       serv_printf("%s", bstr("c_msa_port"));
-       serv_printf("%s", bstr("c_imaps_port"));
-       serv_printf("%s", bstr("c_pop3s_port"));
-       serv_printf("%s", bstr("c_smtps_port"));
-       serv_printf("%s", ((!strcasecmp(bstr("c_enable_fulltext"), "yes") ? "1" : "0")));
-       serv_printf("%s", ((!strcasecmp(bstr("c_auto_cull"), "yes") ? "1" : "0")));
-       serv_printf("%s", ((!strcasecmp(bstr("c_instant_expunge"), "yes") ? "1" : "0")));
-       serv_printf("%s", ((!strcasecmp(bstr("c_allow_spoofing"), "yes") ? "1" : "0")));
-       serv_printf("%s", ((!strcasecmp(bstr("c_journal_email"), "yes") ? "1" : "0")));
-       serv_printf("%s", ((!strcasecmp(bstr("c_journal_pubmsgs"), "yes") ? "1" : "0")));
-       serv_printf("%s", bstr("c_journal_dest"));
-       serv_printf("%s", bstr("c_default_cal_zone"));
-       serv_printf("%s", bstr("c_pftcpdict_port"));
-       serv_printf("%s", bstr("c_mgesve_port"));
-       serv_printf("%s", bstr("c_auth_mode"));
-       serv_printf("%s", bstr("c_funambol_host"));
-       serv_printf("%s", bstr("c_funambol_port"));
-       serv_printf("%s", bstr("c_funambol_source"));
-       serv_printf("%s", bstr("c_funambol_auth"));
-       serv_printf("%s", ((!strcasecmp(bstr("c_rbl_at_greeting"), "yes") ? "1" : "0")));
-       serv_printf("%s", bstr("c_master_user"));
-       serv_printf("%s", bstr("c_master_pass"));
-       serv_printf("%s", bstr("c_pager_program"));
-       serv_printf("%s", ((!strcasecmp(bstr("c_imap_keep_from"), "yes") ? "1" : "0")));
-       serv_printf("%s", bstr("c_xmpp_c2s_port"));
-       serv_printf("%s", bstr("c_xmpp_s2s_port"));
-       serv_printf("%s", bstr("c_pop3_fetch"));
-       serv_printf("%s", bstr("c_pop3_fastest"));
-       serv_printf("000");
-
-       serv_printf("SPEX site|%d|%d", atoi(bstr("sitepolicy")), atoi(bstr("sitevalue")));
+
+       for (i=0; i < (sizeof(ServerConfig) / sizeof(CfgMapping)); i ++)
+       {
+               switch (ServerConfig[i].type) {
+               default:
+               case CFG_STR:
+                       serv_putbuf(SBstr(ServerConfig[i].Key, ServerConfig[i].len));
+                       break;
+               case CFG_YES:
+                       serv_puts(YesBstr(ServerConfig[i].Key, 
+                                         ServerConfig[i].len) ?
+                                 "1" : "0");
+                       break;
+               case CFG_NO:
+                       serv_puts(YesBstr(ServerConfig[i].Key, 
+                                         ServerConfig[i].len) ?
+                                 "0" : "1");
+                       break;
+               }
+       }
+        serv_puts("000");
+
+       serv_printf("SPEX site|%d|%d", ibstr("sitepolicy"), ibstr("sitevalue"));
        serv_getln(buf, sizeof buf);
-       serv_printf("SPEX mailboxes|%d|%d", atoi(bstr("mboxpolicy")), atoi(bstr("mboxvalue")));
+       serv_printf("SPEX mailboxes|%d|%d", ibstr("mboxpolicy"), ibstr("mboxvalue"));
        serv_getln(buf, sizeof buf);
 
        strcpy(serv_info.serv_default_cal_zone, bstr("c_default_cal_zone"));
 
-       safestrncpy(WC->ImportantMessage, _("Your system configuration has been updated."),
-               sizeof WC->ImportantMessage);
+       safestrncpy(WCC->ImportantMessage, _("Your system configuration has been updated."),
+               sizeof WCC->ImportantMessage);
+       DeleteHash(&WCC->ServCfg);
        display_aide_menu();
 }
 
+void tmplput_servcfg(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
+{
+       struct wcsession *WCC = WC;
+       void *vBuf;
+       StrBuf *Buf;
+
+       if (WCC->is_aide) {
+               if (WCC->ServCfg == NULL)
+                       load_siteconfig();
+               GetHash(WCC->ServCfg, 
+                       Tokens->Params[0]->Start,
+                       Tokens->Params[0]->len, 
+                       &vBuf);
+               Buf = (StrBuf*) vBuf;
+               StrBufAppendBuf(Target, Buf, 0);
+       }
+}
+
+int ConditionalServCfg(WCTemplateToken *Tokens, void *Context, int ContextType)
+{
+       struct wcsession *WCC = WC;
+       void *vBuf;
+       StrBuf *Buf;
+
+       if (WCC->is_aide) {
+               if (WCC->ServCfg == NULL)
+                       load_siteconfig();
+               GetHash(WCC->ServCfg, 
+                       Tokens->Params[2]->Start,
+                       Tokens->Params[2]->len, 
+                       &vBuf);
+               if (vBuf == NULL) return 0;
+               Buf = (StrBuf*) vBuf;
+               if (Tokens->nParameters == 3) {
+                       return 1;
+               }
+               else if (Tokens->Params[3]->Type == TYPE_STR)
+                       return (strcmp(Tokens->Params[3]->Start, ChrPtr(Buf)) == 0);
+               else return (StrTol(Buf) == Tokens->Params[3]->lvalue);
+       }
+       else return 0;
+}
+
+int ConditionalServCfgSubst(WCTemplateToken *Tokens, void *Context, int ContextType)
+{
+       struct wcsession *WCC = WC;
+       void *vBuf;
+       StrBuf *Buf;
+
+       if (WCC->is_aide) {
+               if (WCC->ServCfg == NULL)
+                       load_siteconfig();
+               GetHash(WCC->ServCfg, 
+                       Tokens->Params[2]->Start,
+                       Tokens->Params[2]->len, 
+                       &vBuf);
+               if (vBuf == NULL) return 0;
+               Buf = (StrBuf*) vBuf;
+
+               return CompareSubstToStrBuf(Buf, Tokens->Params[3]);
+       }
+       else return 0;
+}
+
+void 
+InitModule_SITECONFIG
+(void)
+{
+       WebcitAddUrlHandler(HKEY("display_siteconfig"), display_siteconfig, CTX_NONE);
+       WebcitAddUrlHandler(HKEY("siteconfig"), siteconfig, CTX_NONE);
 
+       RegisterNamespace("SERV:CFG", 1, 1, tmplput_servcfg, CTX_NONE);
+       RegisterConditional(HKEY("COND:SERVCFG"), 3, ConditionalServCfg, CTX_NONE);
+       RegisterConditional(HKEY("COND:SERVCFG:SUBST"), 4, ConditionalServCfgSubst, CTX_NONE);
+}
 /*@}*/