Detect screen dimensions _before_ attaching to the server.

[citadel.git] / webcit / siteconfig.c

diff --git a/webcit/siteconfig.c b/webcit/siteconfig.c
index f893b4833e9437fa037ab3e337a5304ec2035e49..a2b429806693a45a76487195317ae8c1f4077275 100644 (file)
--- a/webcit/siteconfig.c
+++ b/webcit/siteconfig.c
@@ -35,8 +35,7 @@ void LoadExpirePolicy(GPEXWhichPolicy which)
                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);
+               AppendImportantMessage(_("Higher access is required to access this function."), -1);
        FreeStrBuf(&Buf);
 }
 
@@ -54,8 +53,7 @@ void SaveExpirePolicyFromHTTP(GPEXWhichPolicy which)
        StrBuf_ServGetln(Buf);
        GetServerStatus(Buf, &State);
        if (State == 550)
-               StrBufAppendBufPlain(WC->ImportantMsg,
-                                    _("Higher access is required to access this function."), -1, 0);
+               AppendImportantMessage(_("Higher access is required to access this function."), -1);
        FreeStrBuf(&Buf);
 }
 
@@ -269,20 +267,23 @@ void siteconfig(void)
 {
        wcsession *WCC = WC;
        int i;
-       char buf[256];
+       StrBuf *Line;
 
        if (strlen(bstr("ok_button")) == 0) {
                display_aide_menu();
                return;
        }
+       Line = NewStrBuf();
        serv_printf("CONF set");
-       serv_getln(buf, sizeof buf);
-       if (buf[0] != '4') {
-               safestrncpy(WCC->ImportantMessage, &buf[4], sizeof WCC->ImportantMessage);
+       StrBuf_ServGetln(Line);
+       if (GetServerStatusMsg(Line, NULL, 1, 4) != 4) {
                display_aide_menu();
+               FreeStrBuf(&Line);
                return;
        }
 
+       FreeStrBuf(&Line);
+
        for (i=0; i < (sizeof(ServerConfig) / sizeof(CfgMapping)); i ++)
        {
                switch (ServerConfig[i].type) {
@@ -310,8 +311,7 @@ void siteconfig(void)
        FreeStrBuf(&WCC->serv_info->serv_default_cal_zone);
        WCC->serv_info->serv_default_cal_zone = NewStrBufDup(sbstr("c_default_cal_zone"));
 
-       safestrncpy(WCC->ImportantMessage, _("Your system configuration has been updated."),
-               sizeof WCC->ImportantMessage);
+       AppendImportantMessage(_("Your system configuration has been updated."), -1);
        DeleteHash(&WCC->ServCfg);
        display_aide_menu();
 }