Renderers cleanup part 1

[citadel.git] / webcit / roomops.c

diff --git a/webcit/roomops.c b/webcit/roomops.c
index 2c4477657271e736e814749511d459a08decbfc3..2dc7865b8763b5ae4201dd0ce9824554956a7f35 100644 (file)
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -1,7 +1,7 @@
 /*
  * Lots of different room-related operations.
  *
- * Copyright (c) 1996-2012 by the citadel.org team
+ * Copyright (c) 1996-2016 by the citadel.org team
  *
  * This program is open source software.  You can redistribute it and/or
  * modify it under the terms of the GNU General Public License, version 3.
@@ -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("")}, 
@@ -67,7 +67,7 @@ void _DBG_QR(long QR)
                i = i << 1;
                j++;
        }
-       syslog(9, "DBG: QR-Vec [%ld] [%s]\n", QR, ChrPtr(QRVec));
+       syslog(LOG_DEBUG, "DBG: QR-Vec [%ld] [%s]\n", QR, ChrPtr(QRVec));
        FreeStrBuf(&QRVec);
 }
 
@@ -90,7 +90,7 @@ void _DBG_QR2(long QR2)
                i = i << 1;
                j++;
        }
-       syslog(9, "DBG: QR2-Vec [%ld] [%s]\n", QR2, ChrPtr(QR2Vec));
+       syslog(LOG_DEBUG, "DBG: QR2-Vec [%ld] [%s]\n", QR2, ChrPtr(QR2Vec));
        FreeStrBuf(&QR2Vec);
 }
 
@@ -117,7 +117,8 @@ void dotgoto(void) {
                readloop(readnew, eUseDefault);
                return;
        }
-       if (WC->CurRoom.view != VIEW_MAILBOX) { /* dotgoto acts like dotskip when we're in a mailbox view */
+       if (WC->CurRoom.view != VIEW_MAILBOX) {
+               /* dotgoto acts like dotskip when we're in a mailbox view */
                slrp_highest();
        }
        smart_goto(sbstr("room"));
@@ -127,8 +128,10 @@ void dotgoto(void) {
  * goto next room
  */
 void smart_goto(const StrBuf *next_room) {
-       gotoroom(next_room);
-       readloop(readnew, eUseDefault);
+       if (gotoroom(next_room) / 100 == 2)
+               readloop(readnew, eUseDefault);
+       else
+               do_404();
 }
 
 /*
@@ -182,6 +185,10 @@ long gotoroom(const StrBuf *gname)
        long err = 0;
        int room_name_supplied = 0;
        int is_baseroom = 0;
+       int failvisibly;
+
+       /* on fail, should we fallback to _BASEROOM_? */
+       failvisibly = ibstr("failvisibly");
 
        /* store ungoto information */
        if (StrLength(gname) > 0) {
@@ -206,6 +213,10 @@ long gotoroom(const StrBuf *gname)
        }
        StrBuf_ServGetln(Buf);
        if  (GetServerStatus(Buf, &err) != 2) {
+               if (failvisibly) {
+                       FreeStrBuf(&Buf);
+                       return err;
+               }
                serv_puts("GOTO _BASEROOM_");
                StrBuf_ServGetln(Buf);
                /* 
@@ -577,22 +588,24 @@ void LoadXRoomPic(void)
 {
        wcsession *WCC = WC;
        StrBuf *Buf;
+       off_t bytes;
        
-       if (WCC->CurRoom.XHaveRoomPicLoaded)
+       if (WCC->CurRoom.XHaveRoomPicLoaded) {
                return;
+       }
 
        WCC->CurRoom.XHaveRoomPicLoaded = 1;
        Buf = NewStrBuf();
-       serv_puts("OIMG _roompic_");
+       serv_puts("DLRI");
        StrBuf_ServGetln(Buf);
-       if (GetServerStatus(Buf, NULL) != 2) {
-               WCC->CurRoom.XHaveRoomPic = 0;
-       } else {
+       if (GetServerStatus(Buf, NULL) == 6) {
+               StrBufCutLeft(Buf, 4);
+               bytes = StrBufExtract_long(Buf, 0, '|');
                WCC->CurRoom.XHaveRoomPic = 1;
+               StrBuf_ServGetBLOBBuffered(Buf, bytes);         // discard the data
+       } else {
+               WCC->CurRoom.XHaveRoomPic = 0;
        }
-       serv_puts("CLOS");
-       StrBuf_ServGetln(Buf);
-       GetServerStatus(Buf, NULL);
        FreeStrBuf (&Buf);
 }
 
@@ -706,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;
        }
 
@@ -796,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 {
@@ -836,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;
 }
 
@@ -924,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");
@@ -961,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 */
@@ -973,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);
@@ -1200,6 +1272,14 @@ void netedit(void) {
        }
 
        serv_puts("000");
+       serv_puts("NOOP");
+       StrBuf_ServGetln(Line);
+       if  (GetServerStatus(Line, NULL) != 2) { /* WHOOOPS? ERROR? */
+               AppendImportantMessage(SRV_STATUS_MSG(Line));   
+               StrBuf_ServGetln(Line); /* resync... */
+       }
+
+
        FlushIgnetCfgs(&WC->CurRoom);
        FreeStrBuf(&Line);
 
@@ -1409,6 +1489,7 @@ InitModule_ROOMOPS
        REGISTERTokenParamDefine(QR2_SUBJECTREQ);
        REGISTERTokenParamDefine(QR2_SMTP_PUBLIC);
        REGISTERTokenParamDefine(QR2_MODERATED);
+       REGISTERTokenParamDefine(QR2_NOUPLMSG);
 
        REGISTERTokenParamDefine(UA_KNOWN);
        REGISTERTokenParamDefine(UA_GOTOALLOWED);
@@ -1446,6 +1527,7 @@ InitModule_ROOMOPS
        REGISTERTokenParamDefine(VIEW_JOURNAL);
        REGISTERTokenParamDefine(VIEW_BLOG);
        REGISTERTokenParamDefine(VIEW_QUEUE);
+       REGISTERTokenParamDefine(VIEW_WIKIMD);          
 
        /* GNET types: */
        /* server internal, we need to know but ignore them. */