Smoother navigation and restricted iconbar for guest mode

[citadel.git] / webcit / roomops.c

diff --git a/webcit/roomops.c b/webcit/roomops.c
index 9f8180c55e4d9fa9565de93d870681020cb23fad..ace2559624a4c346f1960ab00d8d395be7ff19bb 100644 (file)
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -1,5 +1,4 @@
 /*
- * $Id$
  * Lots of different room-related operations.
  */
 
@@ -42,7 +41,7 @@ ConstStr QR2FlagList[] = {
        {HKEY("")}
 };
 
-void DBG_QR(long QR)
+void _DBG_QR(long QR)
 {
        int i = 1;
        int j=0;
@@ -65,7 +64,7 @@ void DBG_QR(long QR)
 
 
 
-void DBG_QR2(long QR2)
+void _DBG_QR2(long QR2)
 {
        int i = 1;
        int j=0;
@@ -118,8 +117,8 @@ void smart_goto(const StrBuf *next_room) {
        readloop(readnew, eUseDefault);
 }
 
-/**
- * \brief goto a private room
+/*
+ * goto a private room
  */
 void goto_private(void)
 {
@@ -569,8 +568,9 @@ void LoadXRoomInfoText(void)
        StrBuf *Buf;
        int Done = 0;
        
-       if (WCC->CurRoom.XHaveInfoTextLoaded)
+       if (WCC->CurRoom.XHaveInfoTextLoaded) {
                return;
+       }
 
        WCC->CurRoom.XHaveInfoTextLoaded = 1;
        Buf = NewStrBuf();
@@ -590,7 +590,7 @@ void LoadXRoomInfoText(void)
                }
        }
 
-       FreeStrBuf (&Buf);
+       FreeStrBuf(&Buf);
 }
 
 
@@ -944,8 +944,8 @@ void entroom(void)
 
 
 
-/**
- * \brief Change the view for this room
+/*
+ * Change the view for this room
  */
 void change_view(void) {
        int newview;
@@ -1001,6 +1001,9 @@ void netedit(void) {
        char cmpb0[SIZ];
        char cmpb1[SIZ];
        int i, num_addrs;
+       StrBuf *Line;
+       int Done;
+
        /*/ TODO: do line dynamic! */
        if (havebstr("line_pop3host")) {
                strcpy(line, bstr("prefix"));
@@ -1032,32 +1035,47 @@ void netedit(void) {
                return;
        }
 
+       Line = NewStrBuf();
        serv_puts("GNET");
-       serv_getln(buf, sizeof buf);
-       if (buf[0] != '1') {
+       StrBuf_ServGetln(Line);
+       if  (GetServerStatus(Line, NULL) != 1) {
                fclose(fp);
+               AppendImportantMessage(SRV_STATUS_MSG(Line));   
+               FreeStrBuf(&Line);
                http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
                return;
        }
 
        /** This loop works for add *or* remove.  Spiffy, eh? */
-       while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
-               extract_token(cmpa0, buf, 0, '|', sizeof cmpa0);
-               extract_token(cmpa1, buf, 1, '|', sizeof cmpa1);
-               extract_token(cmpb0, line, 0, '|', sizeof cmpb0);
-               extract_token(cmpb1, line, 1, '|', sizeof cmpb1);
-               if ( (strcasecmp(cmpa0, cmpb0)) 
-                    || (strcasecmp(cmpa1, cmpb1)) ) {
-                       fprintf(fp, "%s\n", buf);
+       Done = 0;
+       extract_token(cmpb0, line, 0, '|', sizeof cmpb0);
+       extract_token(cmpb1, line, 1, '|', sizeof cmpb1);
+       while (!Done && StrBuf_ServGetln(Line)>=0) {
+               if ( (StrLength(Line)==3) && 
+                    !strcmp(ChrPtr(Line), "000")) 
+               {
+                       Done = 1;
+               }
+               else
+               {
+                       extract_token(cmpa0, ChrPtr(Line), 0, '|', sizeof cmpa0);
+                       extract_token(cmpa1, ChrPtr(Line), 1, '|', sizeof cmpa1);
+                       if ( (strcasecmp(cmpa0, cmpb0)) 
+                            || (strcasecmp(cmpa1, cmpb1)) ) {
+                               StrBufAppendBufPlain(Line, HKEY("\n"), 0);
+                               fwrite(SKEY(Line), 1, fp);
+                       }
                }
        }
 
        rewind(fp);
        serv_puts("SNET");
-       serv_getln(buf, sizeof buf);
-       if (buf[0] != '4') {
+       StrBuf_ServGetln(Line);
+       if  (GetServerStatus(Line, NULL) != 4) {
                fclose(fp);
+               AppendImportantMessage(SRV_STATUS_MSG(Line));   
                http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
+               FreeStrBuf(&Line);
                return;
        }
 
@@ -1088,6 +1106,7 @@ void netedit(void) {
        serv_puts("000");
        fclose(fp);
        FlushIgnetCfgs(&WC->CurRoom);
+       FreeStrBuf(&Line);
 
        http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
 }
@@ -1106,22 +1125,16 @@ void knrooms(void)
                set_preference("roomlistview", ListView, 1);
        }
        /** Sanitize the input so its safe */
-       if((get_preference("roomlistview", &ListView) != 0)||
-          ((strcasecmp(ChrPtr(ListView), "folders") != 0) &&
-           (strcasecmp(ChrPtr(ListView), "table") != 0))) 
+       if ((get_preference("roomlistview", &ListView) == 0)||
+           (
+                   (strcasecmp(ChrPtr(ListView), "folders") != 0) &&
+                   (strcasecmp(ChrPtr(ListView), "rooms") != 0)
+                   )
+               )
        {
-               if (ListView == NULL) {
-                       ListView = NewStrBufPlain(HKEY("rooms"));
-                       set_preference("roomlistview", ListView, 0);
-                       ListView = NULL;
-               }
-               else {
-                       ListView = NewStrBufPlain(HKEY("rooms"));
-                       set_preference("roomlistview", ListView, 0);
-                       ListView = NULL;
-               }
+               ListView = NewStrBufPlain(HKEY("rooms"));
+               set_preference("roomlistview", ListView, 0);
        }
-       FreeStrBuf(&ListView);
        url_do_template();
 }