X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fsiteconfig.c;h=f0e8b4937080c4e7258438b5c97cf5f9bb1d07f1;hb=a13d1d34c6f9bb9b2ffd448e177200151ce42e79;hp=ce72e86dd3be9cb54117161eb6d242c879bbea6c;hpb=5ca665a43f013b861384e6a91a29c3062fafe977;p=citadel.git
diff --git a/webcit/siteconfig.c b/webcit/siteconfig.c
index ce72e86dd..f0e8b4937 100644
--- a/webcit/siteconfig.c
+++ b/webcit/siteconfig.c
@@ -1,799 +1,431 @@
/*
- * $Id$
- *
* Administrative screen for site-wide configuration
- *
*/
#include "webcit.h"
+#include "webserver.h"
-void display_siteconfig(void)
+HashList *ZoneHash = NULL;
+
+ConstStr ExpirePolicyString = {CStrOf(roompolicy) };
+
+ConstStr ExpirePolicyStrings[][2] = {
+ { { CStrOf(roompolicy) } , { strof(roompolicy) "_value", sizeof(strof(roompolicy) "_value") - 1 } },
+ { { CStrOf(floorpolicy) } , { strof(floorpolicy) "_value", sizeof(strof(floorpolicy) "_value") - 1 } },
+ { { CStrOf(sitepolicy) } , { strof(sitepolicy) "_value", sizeof(strof(sitepolicy) "_value") - 1 } },
+ { { CStrOf(mailboxespolicy)} , { strof(mailboxespolicy)"_value", sizeof(strof(mailboxespolicy)"_value") - 1 } }
+};
+
+void LoadExpirePolicy(GPEXWhichPolicy which)
{
- char buf[SIZ];
- char *whichmenu;
- int i, j;
-
- /* expire policy settings */
- int sitepolicy = 0;
- int sitevalue = 0;
- int mboxpolicy = 0;
- int mboxvalue = 0;
-
- output_headers(1, 1, 2, 0, 0, 0, 0);
- wprintf("
\n"
- );
-
- wprintf("
"
- "
");
-
- whichmenu = bstr("whichmenu");
-
- if (!strcmp(whichmenu, "")) {
- wprintf("\n");
-
- wprintf(""
- ""
- ""
- " | "
- ""
- "%s "
- "%s"
- " | \n",
- _("General"),
- _("General site configuration items")
- );
-
- wprintf(""
- ""
- ""
- " | "
- ""
- "%s "
- "%s"
- " | \n",
- _("Access"),
- _("Access controls and site policy settings")
- );
-
- wprintf(""
- ""
- ""
- " | "
- ""
- "%s "
- "%s"
- " | \n",
- _("Network"),
- _("Network services")
- );
-
- wprintf(""
- ""
- ""
- " | "
- ""
- "%s "
- "%s"
- " | \n",
- _("Tuning"),
- _("Advanced server fine-tuning controls")
- );
-
- wprintf(""
- ""
- ""
- " | "
- ""
- "%s "
- "%s"
- " | \n",
- _("Directory"),
- _("Configure the LDAP connector for Citadel")
- );
-
- wprintf(""
- ""
- ""
- " | "
- ""
- "%s "
- "%s"
- " | \n",
- _("Auto-purger"),
- _("Configure automatic expiry of old messages")
- );
-
- wprintf(" ");
- wprintf(" |
\n");
- wDumpContent(1);
- return;
+ StrBuf *Buf;
+ wcsession *WCC = WC;
+ long State;
+ const char *Pos = NULL;
+
+ serv_printf("GPEX %s", ExpirePolicyStrings[which][0].Key);
+ Buf = NewStrBuf();
+ StrBuf_ServGetln(Buf);
+ WCC->Policy[which].loaded = 1;
+ if (GetServerStatus(Buf, &State) == 2) {
+ Pos = ChrPtr(Buf) + 4;
+ WCC->Policy[which].expire_mode = StrBufExtractNext_long(Buf, &Pos, '|');
+ WCC->Policy[which].expire_value = StrBufExtractNext_long(Buf, &Pos, '|');
}
+ else if (State == 550)
+ StrBufAppendBufPlain(WCC->ImportantMsg,
+ _("Higher access is required to access this function."), -1, 0);
+ FreeStrBuf(&Buf);
+}
- if (!strcasecmp(whichmenu, "general")) {
- wprintf("
");
- wprintf(_("General site configuration items"));
- wprintf("
\n");
- }
+void SaveExpirePolicyFromHTTP(GPEXWhichPolicy which)
+{
+ StrBuf *Buf;
+ long State;
+
+ serv_printf("SPEX %s|%d|%d",
+ ExpirePolicyStrings[which][0].Key,
+ ibcstr( ExpirePolicyStrings[which][1] ),
+ ibcstr( ExpirePolicyStrings[which][1] ) );
+
+ Buf = NewStrBuf();
+ StrBuf_ServGetln(Buf);
+ GetServerStatus(Buf, &State);
+ if (State == 550)
+ StrBufAppendBufPlain(WC->ImportantMsg,
+ _("Higher access is required to access this function."), -1, 0);
+ FreeStrBuf(&Buf);
+}
- if (!strcasecmp(whichmenu, "access")) {
- wprintf("
");
- wprintf(_("Access controls and site policy settings"));
- wprintf("
\n");
- }
+int ConditionalExpire(StrBuf *Target, WCTemplputParams *TP)
+{
+ wcsession *WCC = WC;
+ GPEXWhichPolicy which;
+ int CompareWith;
- if (!strcasecmp(whichmenu, "network")) {
- wprintf("
");
- wprintf(_("Network services"));
- wprintf("
");
- wprintf(_("Changes made on this screen will not take effect "
- "until you restart the Citadel server."));
- wprintf("\n");
- }
+ which = GetTemplateTokenNumber(Target, TP, 2, 0);
+ CompareWith = GetTemplateTokenNumber(Target, TP, 3, 0);
- if (!strcasecmp(whichmenu, "tuning")) {
- wprintf("
");
- wprintf(_("Advanced server fine-tuning controls"));
- wprintf("
\n");
- }
+ if (WCC->Policy[which].loaded == 0) LoadExpirePolicy(which);
+
+ return WCC->Policy[which].expire_mode == CompareWith;
+}
- if (!strcasecmp(whichmenu, "ldap")) {
- wprintf("
");
- wprintf(_("Citadel LDAP connector configuration"));
- wprintf("
");
- wprintf(_("Changes made on this screen will not take effect "
- "until you restart the Citadel server."));
- wprintf("\n");
- }
+void tmplput_ExpireValue(StrBuf *Target, WCTemplputParams *TP)
+{
+ GPEXWhichPolicy which;
+ wcsession *WCC = WC;
+
+ which = GetTemplateTokenNumber(Target, TP, 0, 0);
+ if (WCC->Policy[which].loaded == 0) LoadExpirePolicy(which);
+ StrBufAppendPrintf(Target, "%d", WCC->Policy[which].expire_value);
+}
- if (!strcasecmp(whichmenu, "purger")) {
- wprintf("
");
- wprintf(_("Message auto-purger settings"));
- wprintf("
");
- wprintf(_("These settings may be overridden on a per-floor or per-room basis."));
- wprintf("\n");
+
+void tmplput_ExpireMode(StrBuf *Target, WCTemplputParams *TP)
+{
+ GPEXWhichPolicy which;
+ wcsession *WCC = WC;
+
+ which = GetTemplateTokenNumber(Target, TP, 2, 0);
+ if (WCC->Policy[which].loaded == 0) LoadExpirePolicy(which);
+ StrBufAppendPrintf(Target, "%d", WCC->Policy[which].expire_mode);
+}
+
+
+
+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) {
+ /* syslog(9, "Location: %-40s tzid: %s\n",
+ icaltimezone_get_location(icalarray_element_at(zones, z)),
+ icaltimezone_get_tzid(icalarray_element_at(zones, 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);
+}
+
+
+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")},
+ {CFG_YES , HKEY("c_guest_logins")}
+};
+
+
+/*
+ * display all configuration items
+ */
+void load_siteconfig(void)
+{
+ wcsession *WCC = WC;
+ StrBuf *Buf;
+ HashList *Cfg;
+ long len;
+ int i;
+
+ if (WCC->ServCfg == NULL)
+ WCC->ServCfg = NewHash(1, NULL);
+ Cfg = WCC->ServCfg;
+
+ Buf = NewStrBuf();
serv_printf("CONF get");
- serv_getln(buf, sizeof buf);
- if (buf[0] != '1') {
- wprintf("
");
- wprintf("");
- wprintf(_("Error"));
- wprintf("\n");
- wprintf(" |
\n");
- wprintf("%s
\n", &buf[4]);
- do_template("endbox");
- wDumpContent(1);
+ StrBuf_ServGetln(Buf);
+ if (GetServerStatus(Buf, NULL) != 1) {
+ StrBufCutLeft(Buf, 4);
+ AppendImportantMessage(SKEY(Buf));
+ return;
+
+ }
+ i = 0;
+ while (len = StrBuf_ServGetln(Buf),
+ (i <= (sizeof(ServerConfig) / sizeof(CfgMapping))) &&
+ ((len != 3) || (strcmp(ChrPtr(Buf), "000")!= 0))
+ )
+ {
+ Put(Cfg,
+ ServerConfig[i].Key,
+ ServerConfig[i].len,
+ Buf,
+ HFreeStrBuf);
+ i++;
+ if (i <= sizeof(ServerConfig) / sizeof(CfgMapping))
+ Buf = NewStrBuf();
+ else
+ Buf = NULL;
+ }
+ if (strcmp(ChrPtr(Buf), "000")!=0)
+ {
+ /* WHOOOOPSI??? burn the lines we don't understand */
+ while ((len = StrBuf_ServGetln(Buf),
+ strcmp(ChrPtr(Buf), "000"))) {}
+ AppendImportantMessage(_("WARNING: Failed to parse Server Config; do you run a to new citserver?"), -1);
return;
}
+ FreeStrBuf(&Buf);
- wprintf("
\n");
- wprintf("
\n");
- wDumpContent(1);
+void
+InitModule_SITECONFIG
+(void)
+{
+ WebcitAddUrlHandler(HKEY("siteconfig"), "", 0, siteconfig, CTX_NONE);
+
+ RegisterNamespace("SERV:CFG", 1, 2, tmplput_servcfg, NULL, CTX_NONE);
+ RegisterConditional(HKEY("COND:SERVCFG"), 3, ConditionalServCfg, CTX_NONE);
+ RegisterConditional(HKEY("COND:SERVCFG:CTXSTRBUF"), 4, ConditionalServCfgCTXStrBuf, CTX_STRBUF);
+ RegisterIterator("PREF:ZONE", 0, ZoneHash, NULL, NULL, NULL, CTX_STRBUF, CTX_NONE, IT_NOFLAG);
+
+ REGISTERTokenParamDefine(roompolicy);
+ REGISTERTokenParamDefine(floorpolicy);
+ REGISTERTokenParamDefine(sitepolicy);
+ REGISTERTokenParamDefine(mailboxespolicy);
+
+ REGISTERTokenParamDefine(EXPIRE_NEXTLEVEL);
+ REGISTERTokenParamDefine(EXPIRE_MANUAL);
+ REGISTERTokenParamDefine(EXPIRE_NUMMSGS);
+ REGISTERTokenParamDefine(EXPIRE_AGE);
+
+ RegisterConditional(HKEY("COND:EXPIRE:MODE"), 2, ConditionalExpire, CTX_NONE);
+ RegisterNamespace("EXPIRE:VALUE", 1, 2, tmplput_ExpireValue, NULL, CTX_NONE);
+ RegisterNamespace("EXPIRE:MODE", 1, 2, tmplput_ExpireMode, NULL, CTX_NONE);
}
+void
+ServerStartModule_SITECONFIG
+(void)
+{
+ LoadZoneFiles();
+}
-void siteconfig(void)
+void
+ServerShutdownModule_SITECONFIG
+(void)
{
- char buf[SIZ];
+ DeleteHash(&ZoneHash);
+}
- if (strcasecmp(bstr("sc"), "OK")) {
- display_siteconfig();
- return;
- }
- serv_printf("CONF set");
- serv_getln(buf, sizeof buf);
- if (buf[0] != '4') {
- safestrncpy(WC->ImportantMessage, &buf[4], sizeof WC->ImportantMessage);
- display_siteconfig();
- 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(""); /* networking password -- deprecated */
- 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(""); /* moderation filter level -- not yet implemented */
- 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");
- 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("000");
-
- serv_printf("SPEX site|%d|%d", atoi(bstr("sitepolicy")), atoi(bstr("sitevalue")));
- serv_getln(buf, sizeof buf);
- serv_printf("SPEX mailboxes|%d|%d", atoi(bstr("mboxpolicy")), atoi(bstr("mboxvalue")));
- serv_getln(buf, sizeof buf);
- safestrncpy(WC->ImportantMessage, "System configuration has been updated.",
- sizeof WC->ImportantMessage);
- display_siteconfig();
+void
+SessionDestroyModule_SITECONFIG
+(wcsession *sess)
+{
+ DeleteHash(&sess->ServCfg);
}