X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=webcit%2Froomops.c;h=2dc7865b8763b5ae4201dd0ce9824554956a7f35;hp=ae101adb80031b246c2858a4c9c304323dee44c1;hb=c73091a2ae896b6be5aa94b911c1c89d76a85688;hpb=0d239d8372269d6567378f5c87f471d986ad3662

diff --git a/webcit/roomops.c b/webcit/roomops.c
index ae101adb8..2dc7865b8 100644
--- 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.
@@ -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"));
@@ -587,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);
 }
 
@@ -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;
 	}
 
@@ -852,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;
 }
 
@@ -940,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");
@@ -977,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 */
@@ -989,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);