Worked around issue where gotoroom() is called with WC->CurRoom.name and the contents...

[citadel.git] / webcit / roomops.c

diff --git a/webcit/roomops.c b/webcit/roomops.c
index 5c076b0c9c1a7e4969f0e95f7eda2c11f41cb4cf..b93a4910dae0f249182604160dc92974e39cc5bf 100644 (file)
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -113,6 +113,11 @@ void _DBG_QR2(long QR2)
 /*******************************************************************************
  ***************************** Goto Commands ***********************************
  ******************************************************************************/
+
+void dotskip(void) {
+       smart_goto(sbstr("room"));
+}
+
 void dotgoto(void) {
        if (!havebstr("room")) {
                readloop(readnew, eUseDefault);
@@ -181,18 +186,30 @@ long gotoroom(const StrBuf *gname)
        StrBuf *Buf;
        static long ls = (-1L);
        long err = 0;
+       int room_name_supplied = 0;
+       int is_baseroom = 0;
 
        /* store ungoto information */
-       if (StrLength(gname) > 0)
+       if (StrLength(gname) > 0) {
+               room_name_supplied = 1;
+       }
+       if (room_name_supplied) {
                strcpy(WCC->ugname, ChrPtr(WCC->CurRoom.name));
+               if (!strcasecmp(ChrPtr(gname), "_BASEROOM_")) {
+                       is_baseroom = 1;
+               }
+       }
        WCC->uglsn = ls;
        Buf = NewStrBuf();
 
        /* move to the new room */
-       if (StrLength(gname) > 0)
+       if (room_name_supplied) {
                serv_printf("GOTO %s", ChrPtr(gname));
-       else /* or just refresh the current state... */
+       }
+       else {
+               /* or just refresh the current state... */
                serv_printf("GOTO 00000000000000000000");
+       }
        StrBuf_ServGetln(Buf);
        if  (GetServerStatus(Buf, &err) != 2) {
                serv_puts("GOTO _BASEROOM_");
@@ -210,11 +227,11 @@ long gotoroom(const StrBuf *gname)
        FlushFolder(&WCC->CurRoom);
        ParseGoto(&WCC->CurRoom, Buf);
 
-       if (StrLength(gname) > 0)
-       {
+       if (room_name_supplied) {
                remove_march(WCC->CurRoom.name);
-               if (!strcasecmp(ChrPtr(gname), "_BASEROOM_"))
+               if (is_baseroom) {
                        remove_march(gname);
+               }
        }
        FreeStrBuf(&Buf);
 
@@ -255,7 +272,7 @@ void ParseGoto(folder *room, StrBuf *Line)
        memset(room, 0, sizeof(folder));
        room->name = pBuf;
 
-       StrBufExtract_NextToken(room->name, Line, &Pos, '|'); // WC->CurRoom->name
+       StrBufExtract_NextToken(room->name, Line, &Pos, '|');
 
        room->nNewMessages = StrBufExtractNext_long(Line, &Pos, '|'); 
        if (room->nNewMessages > 0)
@@ -265,14 +282,14 @@ void ParseGoto(folder *room, StrBuf *Line)
 
        room->ShowInfo =  StrBufExtractNext_long(Line, &Pos, '|');
        
-       room->QRFlags = StrBufExtractNext_long(Line, &Pos, '|'); //CurRoom->QRFlags
+       room->QRFlags = StrBufExtractNext_long(Line, &Pos, '|');
 
        DBG_QR(room->QRFlags);
 
        room->HighestRead = StrBufExtractNext_long(Line, &Pos, '|');
        room->LastMessageRead = StrBufExtractNext_long(Line, &Pos, '|');
 
-       room->is_inbox = StrBufExtractNext_long(Line, &Pos, '|'); // is_mailbox
+       room->is_inbox = StrBufExtractNext_long(Line, &Pos, '|');
 
        flag = StrBufExtractNext_long(Line, &Pos, '|');
        if (WCC->is_aide || flag) {
@@ -281,17 +298,17 @@ void ParseGoto(folder *room, StrBuf *Line)
 
        room->UsersNewMAilboxMessages = StrBufExtractNext_long(Line, &Pos, '|');
 
-       room->floorid = StrBufExtractNext_int(Line, &Pos, '|'); // wc_floor
+       room->floorid = StrBufExtractNext_int(Line, &Pos, '|');
 
-       room->view = StrBufExtractNext_long(Line, &Pos, '|'); // CurRoom->view
+       room->view = StrBufExtractNext_long(Line, &Pos, '|');
 
-       room->defview = StrBufExtractNext_long(Line, &Pos, '|'); // CurRoom->defview
+       room->defview = StrBufExtractNext_long(Line, &Pos, '|');
 
        flag = StrBufExtractNext_long(Line, &Pos, '|');
        if (flag)
-               room->RAFlags |= UA_ISTRASH; // wc_is_trash
+               room->RAFlags |= UA_ISTRASH;
 
-       room->QRFlags2 = StrBufExtractNext_long(Line, &Pos, '|'); // CurRoom->QRFlags2
+       room->QRFlags2 = StrBufExtractNext_long(Line, &Pos, '|');
        DBG_QR2(room->QRFlags2);
 
        /* find out, whether we are in a sub-room */
@@ -332,8 +349,8 @@ void ParseGoto(folder *room, StrBuf *Line)
        room->Floor = (const Floor*) vFloor;
 }
 
-/**
- * \brief Delete the current room
+/*
+ * Delete the current room
  */
 void delete_room(void)
 {
@@ -357,8 +374,8 @@ void delete_room(void)
        }
 }
 
-/**
- * \brief zap a room
+/*
+ * zap a room
  */
 void zap(void)
 {
@@ -668,7 +685,7 @@ void toggle_self_service(void) {
 
        SetCurrentRoomFlags (&WCC->CurRoom);
        
-       http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
+       http_transmit_thing(ChrPtr(do_template("room_edit")), 0);
 }
 
 
@@ -691,7 +708,7 @@ void editroom(void)
        if (!havebstr("ok_button")) {
                strcpy(WC->ImportantMessage,
                       _("Cancelled.  Changes were not saved."));
-               http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
+               http_transmit_thing(ChrPtr(do_template("room_edit")), 0);
                return;
        }
        if (GetCurrentRoomFlags (&WCC->CurRoom) == 0)
@@ -819,7 +836,7 @@ void editroom(void)
        
        if (succ1 + succ2 == 0)
                AppendImportantMessage (_("Your changes have been saved."), -1);
-       http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
+       http_transmit_thing(ChrPtr(do_template("room_edit")), 0);
        return;
 }
 
@@ -854,7 +871,8 @@ void do_invt_kick(void)
                        if ((StrLength(User) > 0) && (Kick))
                        {
                                serv_printf("KICK %s", ChrPtr(User));
-                               StrBuf_ServGetln(Buf);
+                               if (StrBuf_ServGetln(Buf) < 0)
+                                       break;
                                if (GetServerStatus(Buf, NULL) != 2) {
                                        StrBufCutLeft(Buf, 4);
                                        AppendImportantMessage(SKEY(Buf));
@@ -870,7 +888,8 @@ void do_invt_kick(void)
                        else if ((StrLength(User) > 0) && (Invite))
                        {
                                serv_printf("INVT %s", ChrPtr(User));
-                               StrBuf_ServGetln(Buf);
+                               if (StrBuf_ServGetln(Buf) < 0)
+                                       break;
                                if (GetServerStatus(Buf, NULL) != 2) {
                                        StrBufCutLeft(Buf, 4);
                                        AppendImportantMessage(SKEY(Buf));
@@ -886,7 +905,7 @@ void do_invt_kick(void)
                 }
         }
 
-       http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
+       http_transmit_thing(ChrPtr(do_template("room_edit")), 0);
 }
 
 
@@ -948,7 +967,7 @@ void entroom(void)
        WCC->CurRoom.view = er_view;
 
        if ( (WCC != NULL) && ( (WCC->CurRoom.RAFlags & UA_ADMINALLOWED) != 0) )  {
-               http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
+               http_transmit_thing(ChrPtr(do_template("room_edit")), 0);
        } else {
                smart_goto(WCC->CurRoom.name);
        }
@@ -975,8 +994,8 @@ void change_view(void) {
 
 
 
-/**
- * \brief Set the message expire policy for this room and/or floor
+/*
+ * Set the message expire policy for this room and/or floor
  */
 void set_room_policy(void) {
        char buf[SIZ];
@@ -984,7 +1003,7 @@ void set_room_policy(void) {
        if (!havebstr("ok_button")) {
                strcpy(WC->ImportantMessage,
                       _("Cancelled.  Changes were not saved."));
-               http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
+               http_transmit_thing(ChrPtr(do_template("room_edit")), 0);
                return;
        }
 
@@ -999,13 +1018,13 @@ void set_room_policy(void) {
                strcat(WC->ImportantMessage, &buf[4]);
        }
        ReloadCurrentRoom();
-       http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
+       http_transmit_thing(ChrPtr(do_template("room_edit")), 0);
 }
 
 
 
-/**
- * \brief Perform changes to a room's network configuration
+/*
+ * Perform changes to a room's network configuration
  */
 void netedit(void) {
        FILE *fp;
@@ -1039,14 +1058,14 @@ void netedit(void) {
                strcat(line, bstr("suffix"));
        }
        else {
-               http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
+               http_transmit_thing(ChrPtr(do_template("room_edit")), 0);
                return;
        }
 
 
        fp = tmpfile();
        if (fp == NULL) {
-               http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
+               http_transmit_thing(ChrPtr(do_template("room_edit")), 0);
                return;
        }
 
@@ -1057,7 +1076,7 @@ void netedit(void) {
                fclose(fp);
                AppendImportantMessage(SRV_STATUS_MSG(Line));   
                FreeStrBuf(&Line);
-               http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
+               http_transmit_thing(ChrPtr(do_template("room_edit")), 0);
                return;
        }
 
@@ -1089,7 +1108,7 @@ void netedit(void) {
        if  (GetServerStatus(Line, NULL) != 4) {
                fclose(fp);
                AppendImportantMessage(SRV_STATUS_MSG(Line));   
-               http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
+               http_transmit_thing(ChrPtr(do_template("room_edit")), 0);
                FreeStrBuf(&Line);
                return;
        }
@@ -1123,7 +1142,7 @@ void netedit(void) {
        FlushIgnetCfgs(&WC->CurRoom);
        FreeStrBuf(&Line);
 
-       http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
+       http_transmit_thing(ChrPtr(do_template("room_edit")), 0);
 }
 
 /*
@@ -1133,7 +1152,7 @@ void knrooms(void)
 {
        DeleteHash(&WC->Rooms);
        output_headers(1, 1, 1, 0, 0, 0); 
-       do_template("knrooms", NULL);
+       do_template("knrooms");
        wDumpContent(1);
 }
 
@@ -1183,7 +1202,7 @@ void delete_floor(void) {
        AppendImportantMessage (SKEY(Buf));
 
        FlushRoomlist();
-       http_transmit_thing(ChrPtr(do_template("floors", NULL)), 0);
+       http_transmit_thing(ChrPtr(do_template("floors")), 0);
        FreeStrBuf(&Buf);
 }
 
@@ -1206,7 +1225,7 @@ void create_floor(void) {
        }
        AppendImportantMessage (SKEY(Buf));
        FlushRoomlist();
-       http_transmit_thing(ChrPtr(do_template("floors", NULL)), 0);
+       http_transmit_thing(ChrPtr(do_template("floors")), 0);
        FreeStrBuf(&Buf);
 }
 
@@ -1226,7 +1245,7 @@ void rename_floor(void) {
        StrBufCutLeft(Buf, 4);
        AppendImportantMessage (SKEY(Buf));
 
-       http_transmit_thing(ChrPtr(do_template("floors", NULL)), 0);
+       http_transmit_thing(ChrPtr(do_template("floors")), 0);
        FreeStrBuf(&Buf);
 }