X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Froomops.c;h=874aba189a4a6a00fbfa52ddd860770c7a486386;hb=b180f5cc1832e880d160f72e272bb9debe224f55;hp=099fabd9fb061693a06d6c21f73f58208b88dfa1;hpb=938d37582253fe448b0c5cc21b6e9ce3faf85048;p=citadel.git

diff --git a/webcit/roomops.c b/webcit/roomops.c
index 099fabd9f..874aba189 100644
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -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("")}, 
@@ -716,20 +716,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;
 	}
 
@@ -806,6 +824,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 {
@@ -846,11 +870,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;
 }
 
@@ -934,14 +969,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");
@@ -971,8 +1016,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 */
@@ -983,7 +1036,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);
@@ -1210,6 +1269,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);
 
@@ -1419,6 +1486,7 @@ InitModule_ROOMOPS
 	REGISTERTokenParamDefine(QR2_SUBJECTREQ);
 	REGISTERTokenParamDefine(QR2_SMTP_PUBLIC);
 	REGISTERTokenParamDefine(QR2_MODERATED);
+	REGISTERTokenParamDefine(QR2_NOUPLMSG);
 
 	REGISTERTokenParamDefine(UA_KNOWN);
 	REGISTERTokenParamDefine(UA_GOTOALLOWED);