Trivial commit to test automated builds

diff --git a/citadel/modules/imap/imap_tools.c b/citadel/modules/imap/imap_tools.c
index f6839c9e81e23e2d6c2a24c5d3d8bbc787f0d217..7d7c0805cfebf6f8babc5d81a83e4a0b5c8d7877 100644 (file)
--- a/citadel/modules/imap/imap_tools.c
+++ b/citadel/modules/imap/imap_tools.c
@@ -368,7 +368,6 @@ static char* fromimap(char* destp, char* destend, const char* src)
 }
 
 /* Undoes the special character conversion. */
-
 static int cfrommap(int c)
 {
        switch (c)
@@ -380,10 +379,7 @@ static int cfrommap(int c)
 }
 
 
-
-
 /* Break a command down into tokens, unquoting any escaped characters. */
-
 void MakeStringOf(StrBuf *Buf, int skip)
 {
        int i;
@@ -551,7 +547,6 @@ int imap_parameterize(citimap_command *Cmd)
 
 
 /* Convert a struct ctdlroom to an IMAP-compatible mailbox name. */
-
 long imap_mailboxname(char *buf, int bufsize, struct ctdlroom *qrbuf)
 {
        char* bufend = buf+bufsize;
@@ -603,7 +598,6 @@ long imap_mailboxname(char *buf, int bufsize, struct ctdlroom *qrbuf)
  * including IR_MAILBOX if we're dealing with a personal room.
  *
  */
-
 int imap_roomname(char *rbuf, int bufsize, const char *foldername)
 {
        int levels;
@@ -815,7 +809,7 @@ star:
                                return WILDMAT_TRUE;
                        }
                        while (!IsEmptyStr(text) &&
-                              /* make shure texst - 1 isn't before lcase_p */
+                              /* make sure text - 1 isn't before lcase_p */
                               ((text == lcase_text) || (*(text - 1) != WILDMAT_DELIM)))
                        {
                                if ((matched = do_imap_match(text++, p))
@@ -832,7 +826,6 @@ star:
 }
 
 
-
 /*
  * Support function for mailbox pattern name matching in LIST and LSUB
  * Returns nonzero if the supplied mailbox name matches the supplied pattern.
@@ -902,9 +895,6 @@ int imap_datecmp(const char *datestr, time_t msgtime) {
 }
 
 
-
-
-
 void IAPrintf(const char *Format, ...)
 {
        va_list arg_ptr;
@@ -914,11 +904,13 @@ void IAPrintf(const char *Format, ...)
        va_end(arg_ptr);
 }
 
+
 void iaputs(const char *Str, long Len)
 {
        StrBufAppendBufPlain(IMAP->Reply, Str, Len, 0);
 }
 
+
 void ireply(const char *Msg, long len)
 {
        citimap *Imap = IMAP;
@@ -935,6 +927,7 @@ void ireply(const char *Msg, long len)
        
 }
 
+
 void IReplyPrintf(const char *Format, ...)
 {
        citimap *Imap = IMAP;
@@ -959,8 +952,6 @@ void IReplyPrintf(const char *Format, ...)
 
 /* Output a string to the IMAP client, either as a literal or quoted.
  * (We do a literal if it has any double-quotes or backslashes.) */
-
-
 void IPutStr(const char *Msg, long Len)
 {
        int i;

diff --git a/webcit/addressbook_popup.c b/webcit/addressbook_popup.c
index c119cc18ee0b206df714070fa64cfe5367e48dcf..afbf3a0c78d11aeec3e88628b38116ab017ead57 100644 (file)
--- a/webcit/addressbook_popup.c
+++ b/webcit/addressbook_popup.c
@@ -1,5 +1,5 @@
 /*
- * AJAX-powered auto-completion
+ * Dynamic HTML (formerly known as "AJAX") powered auto-completion
  *
  * Copyright (c) 1996-2012 by the citadel.org team
  *

diff --git a/webcit/siteconfig.c b/webcit/siteconfig.c
index fc8cd118170cc6359353a48054adb299d61d7c8e..2d5755b4305629c6af50cb145deca0bbfba5ed1a 100644 (file)
--- a/webcit/siteconfig.c
+++ b/webcit/siteconfig.c
@@ -359,6 +359,22 @@ 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)
 {
        void *vBuf;
@@ -430,6 +446,8 @@ void tmplput_servcfg_LogName(StrBuf *Target, WCTemplputParams *TP)
        StrBufAppendTemplate(Target, TP, Stat->Name, 1);
 }
 
+
+
 int ConditionalServCfgThisLogEnabled(StrBuf *Target, WCTemplputParams *TP)
 {
         LogStatusStruct *Stat = (LogStatusStruct*) CTX(CTX_SRVLOG);
@@ -483,6 +501,7 @@ 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);
@@ -505,7 +524,6 @@ InitModule_SITECONFIG
        RegisterConditional("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);
-
        RegisterConditional("COND:SERVCFG:THISLOGENABLE", 4, ConditionalServCfgThisLogEnabled, CTX_SRVLOG);
        RegisterIterator("SERVCFG:LOGENABLE", 0, NULL, iterate_GetSrvLogEnable, NULL, DeleteHash, CTX_SRVLOG, CTX_NONE, IT_NOFLAG);
        RegisterNamespace("SERVCFG:LOGNAME", 0, 1, tmplput_servcfg_LogName, NULL, CTX_SRVLOG);

diff --git a/webcit/static/t/aide/siteconfig/tab_aliases.html b/webcit/static/t/aide/siteconfig/tab_aliases.html
index 81cc065177253568baf375850fc602a380a86eac..58bb161718eb98f0498dba918672ebd59dcf177b 100644 (file)
--- a/webcit/static/t/aide/siteconfig/tab_aliases.html
+++ b/webcit/static/t/aide/siteconfig/tab_aliases.html
@@ -6,10 +6,10 @@
 <div id="wc_easterbunny77">
 </div>
 
-<textarea name="global_aliases" id="global_aliases">a
+<textarea name="global_aliases" id="global_aliases" VALUE="<?SERV:GLOBALALIASES>">
 </textarea>
 
-<script type="text/javascript">
+<fcript type="text/javascript">
 
 load_aliases = async() => {
        response = await fetch("ajax_servcmd?g_cmd=LIST");
@@ -50,4 +50,4 @@ function repopulate_the_box() {
 
 load_aliases();
 
-</script>
+</fcript>