don't issue slrp_highest if we're viewing users mailboxes.

[citadel.git] / webcit / roomops.c

diff --git a/webcit/roomops.c b/webcit/roomops.c
index bee589e4e2b98e6d0a3e10b7996384e6641e7d2b..2ea692862e01c572c76ffe6b0be416b7db1d8f83 100644 (file)
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -39,7 +39,7 @@ ConstStr QR2FlagList[] = {
        {HKEY(strof(QR2_SUBJECTREQ))},
        {HKEY(strof(QR2_SMTP_PUBLIC))},
        {HKEY(strof(QR2_MODERATED))},
-       {HKEY("")}, 
+       {HKEY(strof(QR2_NOUPLMSG))}, 
        {HKEY("")}, 
        {HKEY("")}, 
        {HKEY("")}, 
@@ -113,11 +113,14 @@ void dotskip(void) {
 }
 
 void dotgoto(void) {
+       wcsession *WCC = WC;
        if (!havebstr("room")) {
                readloop(readnew, eUseDefault);
                return;
        }
-       if (WC->CurRoom.view != VIEW_MAILBOX) { /* dotgoto acts like dotskip when we're in a mailbox view */
+       if ((WCC->CurRoom.view != VIEW_MAILBOX)  &&
+           (WCC->CurRoom.view != WCC->CurRoom.view)) {
+               /* dotgoto acts like dotskip when we're in a mailbox view */
                slrp_highest();
        }
        smart_goto(sbstr("room"));
@@ -716,20 +719,38 @@ void editroom(void)
        const StrBuf *er_password;
        const StrBuf *er_dirname;
        const StrBuf *er_roomaide;
+       const StrBuf *templ;
        int succ1, succ2;
 
+       templ = sbstr("template");
        if (!havebstr("ok_button")) {
+               putlbstr("success", 0);
                AppendImportantMessage(_("Cancelled.  Changes were not saved."), -1);
-               output_headers(1, 1, 1, 0, 0, 0);       
-               do_template("room_edit");
-               wDumpContent(1);
+               if (templ != NULL) {
+                       output_headers(1, 0, 0, 0, 0, 0);       
+                       DoTemplate(SKEY(templ), NULL, &NoCtx);
+                       end_burst();
+               }
+               else {
+                       output_headers(1, 1, 1, 0, 0, 0);       
+                       do_template("room_edit");
+                       wDumpContent(1);
+               }
                return;
        }
 
        if (GetCurrentRoomFlags (&WCC->CurRoom, 1) == 0) {
-               output_headers(1, 1, 1, 0, 0, 0);       
-               do_template("room_edit");
-               wDumpContent(1);
+               putlbstr("success", 0);
+               if (templ != NULL) {
+                       output_headers(1, 0, 0, 0, 0, 0);       
+                       DoTemplate(SKEY(templ), NULL, &NoCtx);
+                       end_burst();
+               }
+               else {
+                       output_headers(1, 1, 1, 0, 0, 0);       
+                       do_template("room_edit");
+                       wDumpContent(1);
+               }
                return;
        }
 
@@ -806,6 +827,12 @@ void editroom(void)
                WCC->CurRoom.QRFlags &= ~QR_DOWNLOAD;
        }
 
+       if (yesbstr("ulmsg")) {
+               WCC->CurRoom.QRFlags2 |= QR2_NOUPLMSG;
+       } else {
+               WCC->CurRoom.QRFlags2 &= ~QR2_NOUPLMSG;
+       }
+
        if (yesbstr("visdir")) {
                WCC->CurRoom.QRFlags |= QR_VISDIR;
        } else {
@@ -846,11 +873,22 @@ void editroom(void)
        succ2 = SaveRoomAide (&WCC->CurRoom);
        
        if (succ1 + succ2 == 0) {
+               putlbstr("success", 1);
                AppendImportantMessage (_("Your changes have been saved."), -1);
        }
-       output_headers(1, 1, 1, 0, 0, 0);       
-       do_template("room_edit");
-       wDumpContent(1);
+       else {
+               putlbstr("success", 0);
+       }
+       if (templ != NULL) {
+               output_headers(1, 0, 0, 0, 0, 0);       
+               DoTemplate(SKEY(templ), NULL, &NoCtx);
+               end_burst();
+       }
+       else {
+               output_headers(1, 1, 1, 0, 0, 0);       
+               do_template("room_edit");
+               wDumpContent(1);
+       }
        return;
 }
 
@@ -934,14 +972,24 @@ void entroom(void)
        const StrBuf *er_name;
        const StrBuf *er_type;
        const StrBuf *er_password;
+       const StrBuf *template;
        int er_floor;
        int er_num_type;
        int er_view;
        wcsession *WCC = WC;
 
-       if (!havebstr("ok_button")) {
+       template = sbstr("template");
+       if ((WCC == NULL) || !havebstr("ok_button")) {
+               putlbstr("success", 0);
                AppendImportantMessage(_("Cancelled.  No new room was created."), -1);
-               display_main_menu();
+               if (template != NULL) {
+                       output_headers(1, 0, 0, 0, 0, 0);       
+                       DoTemplate(SKEY(template), NULL, &NoCtx);
+                       end_burst();
+               }
+               else {
+                       display_main_menu();
+               }
                return;
        }
        er_name = sbstr("er_name");
@@ -971,8 +1019,16 @@ void entroom(void)
        Line = NewStrBuf();
        StrBuf_ServGetln(Line);
        if (GetServerStatusMsg(Line, NULL, 1, 2) != 2) {
+               putlbstr("success", 0);
                FreeStrBuf(&Line);
-               display_main_menu();
+               if (template != NULL) {
+                       output_headers(1, 0, 0, 0, 0, 0);       
+                       DoTemplate(SKEY(template), NULL, &NoCtx);
+                       end_burst();
+               }
+               else {
+                       display_main_menu();
+               }
                return;
        }
        /** TODO: Room created, now update the left hand icon bar for this user */
@@ -983,7 +1039,13 @@ void entroom(void)
        FreeStrBuf(&Line); /* TODO: should we care about errors? */
        WCC->CurRoom.view = er_view;
 
-       if ( (WCC != NULL) && ( (WCC->CurRoom.RAFlags & UA_ADMINALLOWED) != 0) )  {
+       putlbstr("success", 1);
+       if (template != NULL) {
+               output_headers(1, 0, 0, 0, 0, 0);       
+               DoTemplate(SKEY(template), NULL, &NoCtx);
+               end_burst();
+       }
+       else if ( (WCC->CurRoom.RAFlags & UA_ADMINALLOWED) != 0) {
                output_headers(1, 1, 1, 0, 0, 0);       
                do_template("room_edit");
                wDumpContent(1);
@@ -1427,6 +1489,7 @@ InitModule_ROOMOPS
        REGISTERTokenParamDefine(QR2_SUBJECTREQ);
        REGISTERTokenParamDefine(QR2_SMTP_PUBLIC);
        REGISTERTokenParamDefine(QR2_MODERATED);
+       REGISTERTokenParamDefine(QR2_NOUPLMSG);
 
        REGISTERTokenParamDefine(UA_KNOWN);
        REGISTERTokenParamDefine(UA_GOTOALLOWED);