X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Froomops.c;h=09534742eeaae5ba09b01b4222c68ef64487d60d;hb=536d754a8941976b3797a2775998ae7de89c19ec;hp=5c076b0c9c1a7e4969f0e95f7eda2c11f41cb4cf;hpb=6183d89e37d04ae76099a16f0ea812c867adb719;p=citadel.git

diff --git a/webcit/roomops.c b/webcit/roomops.c
index 5c076b0c9..09534742e 100644
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -1,21 +1,21 @@
 /*
  * Lots of different room-related operations.
  *
- * Copyright (c) 1996-2011 by the citadel.org team
+ * Copyright (c) 1996-2012 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 as
- * published by the Free Software Foundation; either version 3 of the
- * License, or (at your option) any later version.
+ * modify it under the terms of the GNU General Public License, version 3.
+ * 
+ * 
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * 
+ * 
+ * 
  */
 
 #include "webcit.h"
@@ -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,33 +349,40 @@ void ParseGoto(folder *room, StrBuf *Line)
 	room->Floor = (const Floor*) vFloor;
 }
 
-/**
- * \brief Delete the current room
+/*
+ * Delete the current room
  */
 void delete_room(void)
 {
-	char buf[SIZ];
-
+	StrBuf *Line = NewStrBuf();
+	const StrBuf *GoBstr;
 	
-	serv_puts("KILL 1");
-	serv_getln(buf, sizeof buf);
+	GoBstr = sbstr("go");
 
-	if (buf[0] != '2') {
-		strcpy(WC->ImportantMessage, &buf[4]);
-		display_main_menu();
-		return;
-	} else {
-		StrBuf *Buf;
-		
-		FlushRoomlist ();
-		Buf = NewStrBufPlain(HKEY("_BASEROOM_"));
-		smart_goto(Buf);
-		FreeStrBuf(&Buf);
+	if (GoBstr != NULL)
+	{
+		if (gotoroom(GoBstr) == 200)
+		{
+			serv_puts("KILL 1");
+			StrBuf_ServGetln(Line);
+			if (GetServerStatusMsg(Line, NULL, 1, 2) == 2) {
+				StrBuf *Buf;
+				
+				FlushRoomlist ();
+				Buf = NewStrBufPlain(HKEY("_BASEROOM_"));
+				smart_goto(Buf);
+				FreeStrBuf(&Buf);
+				FreeStrBuf(&Line);
+				return;
+			}
+		}
 	}
+	display_main_menu();
+	FreeStrBuf(&Line);
 }
 
-/**
- * \brief zap a room
+/*
+ * zap a room
  */
 void zap(void)
 {
@@ -467,7 +491,7 @@ int SaveRoomAide(folder *Room)
 }
 
 
-int GetCurrentRoomFlags(folder *Room)
+int GetCurrentRoomFlags(folder *Room, int CareForStatusMessage)
 {
 	StrBuf *Buf;
 
@@ -478,8 +502,10 @@ int GetCurrentRoomFlags(folder *Room)
 		FlushStrBuf(Room->XAPass);
 		FlushStrBuf(Room->Directory);
 		StrBufCutLeft(Buf, 4);
-		AppendImportantMessage (SKEY(Buf));
+		if (CareForStatusMessage)
+			AppendImportantMessage (SKEY(Buf));
 		FreeStrBuf(&Buf);
+		Room->XALoaded = 2;
 		return 0;
 	} else {
 		const char *Pos;
@@ -546,10 +572,10 @@ void LoadRoomXA (void)
 {
 	wcsession *WCC = WC;
 		
-	if (WCC->CurRoom.XALoaded)
+	if (WCC->CurRoom.XALoaded > 0)
 		return;
 
-	GetCurrentRoomFlags(&WCC->CurRoom);
+	GetCurrentRoomFlags(&WCC->CurRoom, 0);
 }
 
 
@@ -644,7 +670,7 @@ void LoadXRoomXCountFiles(void)
 void toggle_self_service(void) {
 	wcsession *WCC = WC;
 
-	if (GetCurrentRoomFlags (&WCC->CurRoom) == 0)
+	if (GetCurrentRoomFlags (&WCC->CurRoom, 1) == 0)
 		return;
 
 	if (yesbstr("QR2_SelfList")) 
@@ -668,7 +694,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);
 }
 
 
@@ -689,13 +715,14 @@ void editroom(void)
 	int succ1, succ2;
 
 	if (!havebstr("ok_button")) {
-		strcpy(WC->ImportantMessage,
-		       _("Cancelled.  Changes were not saved."));
-		http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
+		AppendImportantMessage(_("Cancelled.  Changes were not saved."), -1);
+		http_transmit_thing(ChrPtr(do_template("room_edit")), 0);
 		return;
 	}
-	if (GetCurrentRoomFlags (&WCC->CurRoom) == 0)
+	if (GetCurrentRoomFlags (&WCC->CurRoom, 1) == 0) {
+		http_transmit_thing(ChrPtr(do_template("room_edit")), 0);
 		return;
+	}
 
 	LoadRoomAide();
 
@@ -819,7 +846,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;
 }
 
@@ -836,7 +863,7 @@ void do_invt_kick(void)
 	wcsession *WCC = WC;
 
 
-	if (GetCurrentRoomFlags(&WCC->CurRoom) == 1)
+	if (GetCurrentRoomFlags(&WCC->CurRoom, 1) == 1)
 	{
 		const char *Pos;
 		UserNames = sbstr("username");
@@ -854,7 +881,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 +898,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 +915,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);
 }
 
 
@@ -895,7 +924,7 @@ void do_invt_kick(void)
  */
 void entroom(void)
 {
-	char buf[SIZ];
+	StrBuf *Line;
 	const StrBuf *er_name;
 	const StrBuf *er_type;
 	const StrBuf *er_password;
@@ -905,8 +934,7 @@ void entroom(void)
 	wcsession *WCC = WC;
 
 	if (!havebstr("ok_button")) {
-		strcpy(WC->ImportantMessage,
-		       _("Cancelled.  No new room was created."));
+		AppendImportantMessage(_("Cancelled.  No new room was created."), -1);
 		display_main_menu();
 		return;
 	}
@@ -934,9 +962,10 @@ void entroom(void)
 		    0, 
 		    er_view);
 
-	serv_getln(buf, sizeof buf);
-	if (buf[0] != '2') {
-		strcpy(WCC->ImportantMessage, &buf[4]);
+	Line = NewStrBuf();
+	StrBuf_ServGetln(Line);
+	if (GetServerStatusMsg(Line, NULL, 1, 2) != 2) {
+		FreeStrBuf(&Line);
 		display_main_menu();
 		return;
 	}
@@ -944,15 +973,16 @@ void entroom(void)
 	gotoroom(er_name);
 
 	serv_printf("VIEW %d", er_view);
-	serv_getln(buf, sizeof buf);
+	StrBuf_ServGetln(Line);
+	FreeStrBuf(&Line); /* TODO: should we care about errors? */
 	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);
 	}
-
+	FreeStrBuf(&Line);
 }
 
 
@@ -975,40 +1005,38 @@ 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];
+	StrBuf *Line;
 
 	if (!havebstr("ok_button")) {
-		strcpy(WC->ImportantMessage,
-		       _("Cancelled.  Changes were not saved."));
-		http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
+		AppendImportantMessage(_("Cancelled.  Changes were not saved."), -1);
+		http_transmit_thing(ChrPtr(do_template("room_edit")), 0);
 		return;
 	}
+	Line = NewStrBuf();
 
 	serv_printf("SPEX roompolicy|%d|%d", ibstr("roompolicy"), ibstr("roomvalue"));
-	serv_getln(buf, sizeof buf);
-	strcpy(WC->ImportantMessage, &buf[4]);
-
+	StrBuf_ServGetln(Line);
+	GetServerStatusMsg(Line, NULL, 1, 0);
 	if (WC->axlevel >= 6) {
-		strcat(WC->ImportantMessage, "<br>\n");
 		serv_printf("SPEX floorpolicy|%d|%d", ibstr("floorpolicy"), ibstr("floorvalue"));
-		serv_getln(buf, sizeof buf);
-		strcat(WC->ImportantMessage, &buf[4]);
+		StrBuf_ServGetln(Line);
+		GetServerStatusMsg(Line, NULL, 1, 0);
 	}
+	FreeStrBuf(&Line);
 	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;
 	char buf[SIZ];
 	char line[SIZ];
 	char cmpa0[SIZ];
@@ -1017,8 +1045,12 @@ void netedit(void) {
 	char cmpb1[SIZ];
 	int i, num_addrs;
 	StrBuf *Line;
+	StrBuf *TmpBuf;
 	int Done;
 
+        if (havebstr("force_room")) {
+                gotoroom(sbstr("force_room"));
+	}
 	/*/ TODO: do line dynamic! */
 	if (havebstr("line_pop3host")) {
 		strcpy(line, bstr("prefix"));
@@ -1039,25 +1071,18 @@ void netedit(void) {
 		strcat(line, bstr("suffix"));
 	}
 	else {
-		http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 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;
 	}
 
 	Line = NewStrBuf();
+	TmpBuf = NewStrBuf();
 	serv_puts("GNET");
 	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);
+		http_transmit_thing(ChrPtr(do_template("room_edit")), 0);
 		return;
 	}
 
@@ -1078,26 +1103,24 @@ void netedit(void) {
 			if ( (strcasecmp(cmpa0, cmpb0)) 
 			     || (strcasecmp(cmpa1, cmpb1)) ) {
 				StrBufAppendBufPlain(Line, HKEY("\n"), 0);
-				fwrite(SKEY(Line), 1, fp);
+				StrBufAppendBuf(TmpBuf, Line, 0);
 			}
 		}
 	}
 
-	rewind(fp);
 	serv_puts("SNET");
 	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);
+		http_transmit_thing(ChrPtr(do_template("room_edit")), 0);
 		FreeStrBuf(&Line);
+		FreeStrBuf(&TmpBuf);
 		return;
 	}
 
-	while (fgets(buf, sizeof buf, fp) != NULL) {
-		buf[strlen(buf)-1] = 0;
-		serv_puts(buf);
-	}
+	serv_putbuf(TmpBuf);
+	FreeStrBuf(&TmpBuf);
 
 	if (havebstr("add_button")) {
 		num_addrs = num_tokens(bstr("line"), ',');
@@ -1119,11 +1142,10 @@ void netedit(void) {
 	}
 
 	serv_puts("000");
-	fclose(fp);
 	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 +1155,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 +1205,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 +1228,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 +1248,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);
 }