From: Art Cancro Date: Fri, 3 Sep 2021 03:45:00 +0000 (+0000) Subject: Moved the global email aliases editing screen to its own page to avoid having to... X-Git-Tag: v939~19 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=827024a4c5c69c847c55111c718e1c90c7a2a24c Moved the global email aliases editing screen to its own page to avoid having to mess with the multi tab form. --- diff --git a/webcit/siteconfig.c b/webcit/siteconfig.c index 2d5755b43..b82b0d2ab 100644 --- a/webcit/siteconfig.c +++ b/webcit/siteconfig.c @@ -36,8 +36,8 @@ ConstStr ExpirePolicyStrings[][2] = { { { CStrOf(mailboxespolicy)} , { strof(mailboxespolicy)"_value", sizeof(strof(mailboxespolicy)"_value") - 1 } } }; -void LoadExpirePolicy(GPEXWhichPolicy which) -{ + +void LoadExpirePolicy(GPEXWhichPolicy which) { StrBuf *Buf; long State; const char *Pos = NULL; @@ -55,8 +55,8 @@ void LoadExpirePolicy(GPEXWhichPolicy which) FreeStrBuf(&Buf); } -void SaveExpirePolicyFromHTTP(GPEXWhichPolicy which) -{ + +void SaveExpirePolicyFromHTTP(GPEXWhichPolicy which) { StrBuf *Buf; long State; @@ -73,8 +73,8 @@ void SaveExpirePolicyFromHTTP(GPEXWhichPolicy which) FreeStrBuf(&Buf); } -int ConditionalExpire(StrBuf *Target, WCTemplputParams *TP) -{ + +int ConditionalExpire(StrBuf *Target, WCTemplputParams *TP) { GPEXWhichPolicy which; int CompareWith; @@ -86,8 +86,8 @@ int ConditionalExpire(StrBuf *Target, WCTemplputParams *TP) return WC->Policy[which].expire_mode == CompareWith; } -void tmplput_ExpireValue(StrBuf *Target, WCTemplputParams *TP) -{ + +void tmplput_ExpireValue(StrBuf *Target, WCTemplputParams *TP) { GPEXWhichPolicy which; which = GetTemplateTokenNumber(Target, TP, 0, 0); @@ -96,8 +96,7 @@ void tmplput_ExpireValue(StrBuf *Target, WCTemplputParams *TP) } -void tmplput_ExpireMode(StrBuf *Target, WCTemplputParams *TP) -{ +void tmplput_ExpireMode(StrBuf *Target, WCTemplputParams *TP) { GPEXWhichPolicy which; which = GetTemplateTokenNumber(Target, TP, 2, 0); @@ -106,8 +105,7 @@ void tmplput_ExpireMode(StrBuf *Target, WCTemplputParams *TP) } -void LoadZoneFiles(void) -{ +void LoadZoneFiles(void) { icalarray *zones; int z; long len; @@ -222,12 +220,10 @@ CfgMapping ServerConfig[] = { }; - /* * display all configuration items */ -void load_siteconfig(void) -{ +void load_siteconfig(void) { StrBuf *Buf; HashList *Cfg; long len; @@ -279,12 +275,10 @@ void load_siteconfig(void) } - /* * parse siteconfig changes */ -void siteconfig(void) -{ +void siteconfig(void) { int i, value; StrBuf *Line; @@ -345,8 +339,7 @@ void siteconfig(void) // if WebCit Classic wasn't obsolete we would replace this with a "CONF GETVAL" type of thing -void tmplput_servcfg(StrBuf *Target, WCTemplputParams *TP) -{ +void tmplput_servcfg(StrBuf *Target, WCTemplputParams *TP) { void *vBuf; StrBuf *Buf; @@ -359,24 +352,8 @@ void tmplput_servcfg(StrBuf *Target, WCTemplputParams *TP) } } -// output the global alias table -void tmplput_servcfg_globalaliases(StrBuf *Target, WCTemplputParams *TP) { - TRACE; - StrBufAppendTemplate(Target, TP, "wow\n", 0); - TRACE; -} - - - - - - - - - -int ConditionalServCfg(StrBuf *Target, WCTemplputParams *TP) -{ +int ConditionalServCfg(StrBuf *Target, WCTemplputParams *TP) { void *vBuf; StrBuf *Buf; @@ -406,8 +383,7 @@ int ConditionalServCfg(StrBuf *Target, WCTemplputParams *TP) else return 0; } -int ConditionalServCfgCTXStrBuf(StrBuf *Target, WCTemplputParams *TP) -{ +int ConditionalServCfgCTXStrBuf(StrBuf *Target, WCTemplputParams *TP) { void *vBuf; StrBuf *Buf; StrBuf *ZoneToCheck = (StrBuf*) CTX(CTX_STRBUF); @@ -501,7 +477,6 @@ InitModule_SITECONFIG WebcitAddUrlHandler(HKEY("siteconfig"), "", 0, siteconfig, CTX_NONE); RegisterNamespace("SERV:CFG", 1, 2, tmplput_servcfg, NULL, CTX_NONE); - RegisterNamespace("SERV:GLOBALALIASES", 0, 1, tmplput_servcfg_globalaliases, NULL, CTX_NONE); RegisterConditional("COND:SERVCFG", 3, ConditionalServCfg, CTX_NONE); RegisterConditional("COND:SERVCFG:CTXSTRBUF", 4, ConditionalServCfgCTXStrBuf, CTX_STRBUF); RegisterIterator("PREF:ZONE", 0, ZoneHash, NULL, NULL, NULL, CTX_STRBUF, CTX_NONE, IT_NOFLAG); diff --git a/webcit/static/t/aide/display_aliases.html b/webcit/static/t/aide/display_aliases.html new file mode 100644 index 000000000..c5c6a3e91 --- /dev/null +++ b/webcit/static/t/aide/display_aliases.html @@ -0,0 +1,63 @@ + + +
+ + + +
+
+ + + + + + + +
+ + diff --git a/webcit/static/t/aide/display_sitewide_config.html b/webcit/static/t/aide/display_sitewide_config.html index 08ccf7a70..4d9a6d705 100644 --- a/webcit/static/t/aide/display_sitewide_config.html +++ b/webcit/static/t/aide/display_sitewide_config.html @@ -14,7 +14,6 @@ _("SMTP"), ="aide_siteconfig_tab_smtp", _("IMAP4"), ="aide_siteconfig_tab_imap", _("Pop3"), ="aide_siteconfig_tab_pop3", - _("Global email aliases"), ="aide_siteconfig_tab_aliases", _("Indexing/Journaling"), ="aide_siteconfig_tab_indexing", _("Access"), ="aide_siteconfig_tab_access", _("Directory"), ="aide_siteconfig_tab_directory", diff --git a/webcit/static/t/aide/global_config.html b/webcit/static/t/aide/global_config.html index 8ff8ba45f..80106a1cd 100644 --- a/webcit/static/t/aide/global_config.html +++ b/webcit/static/t/aide/global_config.html @@ -2,4 +2,5 @@
    • +
    • diff --git a/webcit/static/t/aide/siteconfig/tab_aliases.html b/webcit/static/t/aide/siteconfig/tab_aliases.html deleted file mode 100644 index 58bb16171..000000000 --- a/webcit/static/t/aide/siteconfig/tab_aliases.html +++ /dev/null @@ -1,53 +0,0 @@ -
    -↻ -
    -
    - -
    -
    - - - - - -load_aliases = async() => { - response = await fetch("ajax_servcmd?g_cmd=LIST"); - data = await(response.text()); - populate_aliases(data); -}; - -function delete_alias(rowid) { - var row = document.getElementById(rowid); - row.parentNode.removeChild(row); - repopulate_the_box(); -} - -function populate_aliases(data) { - var a = ""; - lines = data.split("\n"); - for (var i=1; i"; - } - a += "
    " + config_line[0] + "" + - config_line[1] + "" + - "" + - "✖
    "; - document.getElementById("wc_easterbunny77").innerHTML = a; - repopulate_the_box(); -} - -function repopulate_the_box() { - newbox = ""; - t = document.getElementById("killo9867"); - for (row of t.rows) { - newbox += row.cells[0].innerHTML + " - " + row.cells[1].innerHTML + "\n"; - } - document.getElementById("global_aliases").innerHTML = newbox; -} - -load_aliases(); - -