X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Froomops.c;h=cf0b370bb43db8734a57716ce67bb8afe66d917a;hb=a9e34f4f21db2a290905929e6221eb5aa79f0192;hp=b6fdaa8df8113f5154a3bddd45c2e60050fcb920;hpb=dbebe0b18421f635c0cded24c7194be47b03bc9d;p=citadel.git

diff --git a/webcit/roomops.c b/webcit/roomops.c
index b6fdaa8df..cf0b370bb 100644
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -1,21 +1,15 @@
 /*
  * 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"
@@ -73,7 +67,7 @@ void _DBG_QR(long QR)
 		i = i << 1;
 		j++;
 	}
-	syslog(9, "DBG: QR-Vec [%ld] [%s]\n", QR, ChrPtr(QRVec));
+	syslog(LOG_DEBUG, "DBG: QR-Vec [%ld] [%s]\n", QR, ChrPtr(QRVec));
 	FreeStrBuf(&QRVec);
 }
 
@@ -96,7 +90,7 @@ void _DBG_QR2(long QR2)
 		i = i << 1;
 		j++;
 	}
-	syslog(9, "DBG: QR2-Vec [%ld] [%s]\n", QR2, ChrPtr(QR2Vec));
+	syslog(LOG_DEBUG, "DBG: QR2-Vec [%ld] [%s]\n", QR2, ChrPtr(QR2Vec));
 	FreeStrBuf(&QR2Vec);
 }
 
@@ -133,8 +127,10 @@ void dotgoto(void) {
  * goto next room
  */
 void smart_goto(const StrBuf *next_room) {
-	gotoroom(next_room);
-	readloop(readnew, eUseDefault);
+	if (gotoroom(next_room) == 2)
+		readloop(readnew, eUseDefault);
+	else
+		do_404();
 }
 
 /*
@@ -188,6 +184,10 @@ long gotoroom(const StrBuf *gname)
 	long err = 0;
 	int room_name_supplied = 0;
 	int is_baseroom = 0;
+	int failvisibly;
+
+	/* on fail, should we fallback to _BASEROOM_? */
+	failvisibly = ibstr("failvisibly");
 
 	/* store ungoto information */
 	if (StrLength(gname) > 0) {
@@ -212,6 +212,10 @@ long gotoroom(const StrBuf *gname)
 	}
 	StrBuf_ServGetln(Buf);
 	if  (GetServerStatus(Buf, &err) != 2) {
+		if (failvisibly) {
+			FreeStrBuf(&Buf);
+			return err;
+		}
 		serv_puts("GOTO _BASEROOM_");
 		StrBuf_ServGetln(Buf);
 		/* 
@@ -354,20 +358,30 @@ void ParseGoto(folder *room, StrBuf *Line)
  */
 void delete_room(void)
 {
-	StrBuf *Line;
+	StrBuf *Line = NewStrBuf();
+	const StrBuf *GoBstr;
 	
-	serv_puts("KILL 1");
-	StrBuf_ServGetln(Line);
-	if (GetServerStatusMsg(Line, NULL, 1, 2) != 2) {
-		display_main_menu();
-	} else {
-		StrBuf *Buf;
-		
-		FlushRoomlist ();
-		Buf = NewStrBufPlain(HKEY("_BASEROOM_"));
-		smart_goto(Buf);
-		FreeStrBuf(&Buf);
+	GoBstr = sbstr("go");
+
+	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);
 }
 
@@ -683,8 +697,10 @@ void toggle_self_service(void) {
 		WCC->CurRoom.QRFlags2 = WCC->CurRoom.QRFlags2 & ~QR2_SMTP_PUBLIC;
 
 	SetCurrentRoomFlags (&WCC->CurRoom);
-	
-	http_transmit_thing(ChrPtr(do_template("room_edit")), 0);
+
+	output_headers(1, 1, 1, 0, 0, 0);	
+	do_template("room_edit");
+	wDumpContent(1);
 }
 
 
@@ -700,114 +716,109 @@ void editroom(void)
 	const StrBuf *er_password;
 	const StrBuf *er_dirname;
 	const StrBuf *er_roomaide;
-	unsigned er_flags;
-	unsigned er_flags2;
 	int succ1, succ2;
 
 	if (!havebstr("ok_button")) {
 		AppendImportantMessage(_("Cancelled.  Changes were not saved."), -1);
-		http_transmit_thing(ChrPtr(do_template("room_edit")), 0);
+		output_headers(1, 1, 1, 0, 0, 0);	
+		do_template("room_edit");
+		wDumpContent(1);
 		return;
 	}
+
 	if (GetCurrentRoomFlags (&WCC->CurRoom, 1) == 0) {
-		http_transmit_thing(ChrPtr(do_template("room_edit")), 0);
+		output_headers(1, 1, 1, 0, 0, 0);	
+		do_template("room_edit");
+		wDumpContent(1);
 		return;
 	}
 
 	LoadRoomAide();
-
-	er_flags = WCC->CurRoom.QRFlags;
-	er_flags &= !(QR_PRIVATE | QR_PASSWORDED | QR_GUESSNAME);
-
-	er_flags2 = WCC->CurRoom.QRFlags2;
+	WCC->CurRoom.QRFlags &= !(QR_PRIVATE | QR_PASSWORDED | QR_GUESSNAME);
 
 	Ptr = sbstr("type");
 	if (!strcmp(ChrPtr(Ptr), "invonly")) {
-		er_flags |= (QR_PRIVATE);
+		WCC->CurRoom.QRFlags |= (QR_PRIVATE);
 	}
 	if (!strcmp(ChrPtr(Ptr), "hidden")) {
-		er_flags |= (QR_PRIVATE | QR_GUESSNAME);
+		WCC->CurRoom.QRFlags |= (QR_PRIVATE | QR_GUESSNAME);
 	}
 	if (!strcmp(ChrPtr(Ptr), "passworded")) {
-		er_flags |= (QR_PRIVATE | QR_PASSWORDED);
+		WCC->CurRoom.QRFlags |= (QR_PRIVATE | QR_PASSWORDED);
 	}
 	if (!strcmp(ChrPtr(Ptr), "personal")) {
-		er_flags |= QR_MAILBOX;
+		WCC->CurRoom.QRFlags |= QR_MAILBOX;
 	} else {
-		er_flags &= ~QR_MAILBOX;
+		WCC->CurRoom.QRFlags &= ~QR_MAILBOX;
 	}
 
-
-	
 	if (yesbstr("prefonly")) {
-		er_flags |= QR_PREFONLY;
+		WCC->CurRoom.QRFlags |= QR_PREFONLY;
 	} else {
-		er_flags &= ~QR_PREFONLY;
+		WCC->CurRoom.QRFlags &= ~QR_PREFONLY;
 	}
 
 	if (yesbstr("readonly")) {
-		er_flags |= QR_READONLY;
+		WCC->CurRoom.QRFlags |= QR_READONLY;
 	} else {
-		er_flags &= ~QR_READONLY;
+		WCC->CurRoom.QRFlags &= ~QR_READONLY;
 	}
 
-	
 	if (yesbstr("collabdel")) {
-		er_flags2 |= QR2_COLLABDEL;
+		WCC->CurRoom.QRFlags2 |= QR2_COLLABDEL;
 	} else {
-		er_flags2 &= ~QR2_COLLABDEL;
+		WCC->CurRoom.QRFlags2 &= ~QR2_COLLABDEL;
 	}
 
 	if (yesbstr("permanent")) {
-		er_flags |= QR_PERMANENT;
+		WCC->CurRoom.QRFlags |= QR_PERMANENT;
 	} else {
-		er_flags &= ~QR_PERMANENT;
+		WCC->CurRoom.QRFlags &= ~QR_PERMANENT;
 	}
 
 	if (yesbstr("subjectreq")) {
-		er_flags2 |= QR2_SUBJECTREQ;
+		WCC->CurRoom.QRFlags2 |= QR2_SUBJECTREQ;
 	} else {
-		er_flags2 &= ~QR2_SUBJECTREQ;
+		WCC->CurRoom.QRFlags2 &= ~QR2_SUBJECTREQ;
 	}
 
 	if (yesbstr("network")) {
-		er_flags |= QR_NETWORK;
+		WCC->CurRoom.QRFlags |= QR_NETWORK;
 	} else {
-		er_flags &= ~QR_NETWORK;
+		WCC->CurRoom.QRFlags &= ~QR_NETWORK;
 	}
 
 	if (yesbstr("directory")) {
-		er_flags |= QR_DIRECTORY;
+		WCC->CurRoom.QRFlags |= QR_DIRECTORY;
 	} else {
-		er_flags &= ~QR_DIRECTORY;
+		WCC->CurRoom.QRFlags &= ~QR_DIRECTORY;
 	}
 
 	if (yesbstr("ulallowed")) {
-		er_flags |= QR_UPLOAD;
+		WCC->CurRoom.QRFlags |= QR_UPLOAD;
 	} else {
-		er_flags &= ~QR_UPLOAD;
+		WCC->CurRoom.QRFlags &= ~QR_UPLOAD;
 	}
 
 	if (yesbstr("dlallowed")) {
-		er_flags |= QR_DOWNLOAD;
+		WCC->CurRoom.QRFlags |= QR_DOWNLOAD;
 	} else {
-		er_flags &= ~QR_DOWNLOAD;
+		WCC->CurRoom.QRFlags &= ~QR_DOWNLOAD;
 	}
 
 	if (yesbstr("visdir")) {
-		er_flags |= QR_VISDIR;
+		WCC->CurRoom.QRFlags |= QR_VISDIR;
 	} else {
-		er_flags &= ~QR_VISDIR;
+		WCC->CurRoom.QRFlags &= ~QR_VISDIR;
 	}
 
-
 	Ptr = sbstr("anon");
 
-	er_flags &= ~(QR_ANONONLY | QR_ANONOPT);
+	WCC->CurRoom.QRFlags &= ~(QR_ANONONLY | QR_ANONOPT);
 	if (!strcmp(ChrPtr(Ptr), "anononly"))
-		er_flags |= QR_ANONONLY;
+		WCC->CurRoom.QRFlags |= QR_ANONONLY;
 	if (!strcmp(ChrPtr(Ptr), "anon2"))
-		er_flags |= QR_ANONOPT;
+		WCC->CurRoom.QRFlags |= QR_ANONOPT;
 
 	er_name     = sbstr("er_name");
 	er_dirname  = sbstr("er_dirname");
@@ -834,9 +845,12 @@ void editroom(void)
 
 	succ2 = SaveRoomAide (&WCC->CurRoom);
 	
-	if (succ1 + succ2 == 0)
+	if (succ1 + succ2 == 0) {
 		AppendImportantMessage (_("Your changes have been saved."), -1);
-	http_transmit_thing(ChrPtr(do_template("room_edit")), 0);
+	}
+	output_headers(1, 1, 1, 0, 0, 0);	
+	do_template("room_edit");
+	wDumpContent(1);
 	return;
 }
 
@@ -905,7 +919,9 @@ void do_invt_kick(void)
                 }
         }
 
-	http_transmit_thing(ChrPtr(do_template("room_edit")), 0);
+	output_headers(1, 1, 1, 0, 0, 0);	
+	do_template("room_edit");
+	wDumpContent(1);
 }
 
 
@@ -968,7 +984,9 @@ 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")), 0);
+		output_headers(1, 1, 1, 0, 0, 0);	
+		do_template("room_edit");
+		wDumpContent(1);
 	} else {
 		smart_goto(WCC->CurRoom.name);
 	}
@@ -1003,22 +1021,28 @@ void set_room_policy(void) {
 
 	if (!havebstr("ok_button")) {
 		AppendImportantMessage(_("Cancelled.  Changes were not saved."), -1);
-		http_transmit_thing(ChrPtr(do_template("room_edit")), 0);
+		output_headers(1, 1, 1, 0, 0, 0);	
+		do_template("room_edit");
+		wDumpContent(1);
 		return;
 	}
+
 	Line = NewStrBuf();
 
-	serv_printf("SPEX roompolicy|%d|%d", ibstr("roompolicy"), ibstr("roomvalue"));
+	serv_printf("SPEX room|%d|%d", ibstr("roompolicy"), ibstr("roomvalue"));
 	StrBuf_ServGetln(Line);
 	GetServerStatusMsg(Line, NULL, 1, 0);
 	if (WC->axlevel >= 6) {
-		serv_printf("SPEX floorpolicy|%d|%d", ibstr("floorpolicy"), ibstr("floorvalue"));
+		serv_printf("SPEX floor|%d|%d", ibstr("floorpolicy"), ibstr("floorvalue"));
 		StrBuf_ServGetln(Line);
 		GetServerStatusMsg(Line, NULL, 1, 0);
 	}
 	FreeStrBuf(&Line);
 	ReloadCurrentRoom();
-	http_transmit_thing(ChrPtr(do_template("room_edit")), 0);
+
+	output_headers(1, 1, 1, 0, 0, 0);	
+	do_template("room_edit");
+	wDumpContent(1);
 }
 
 
@@ -1036,8 +1060,15 @@ void netedit(void) {
 	int i, num_addrs;
 	StrBuf *Line;
 	StrBuf *TmpBuf;
+	int malias = 0;
+	int malias_set_default = 0;
+	char sepchar = '|';
 	int Done;
 
+	line[0] = '\0';
+        if (havebstr("force_room")) {
+                gotoroom(sbstr("force_room"));
+	}
 	/*/ TODO: do line dynamic! */
 	if (havebstr("line_pop3host")) {
 		strcpy(line, bstr("prefix"));
@@ -1057,26 +1088,57 @@ void netedit(void) {
 		strcat(line, bstr("line"));
 		strcat(line, bstr("suffix"));
 	}
+	else if (havebstr("alias")) {
+		const char *domain;
+		domain = bstr("aliasdomain");
+		if ((domain == NULL) || IsEmptyStr(domain))
+		{
+			malias_set_default = 1;
+			strcpy(line, bstr("prefix"));
+			strcat(line, bstr("default_aliasdomain"));
+		}
+		else
+		{
+			malias = 1;
+			sepchar = ',';
+			strcat(line, bstr("prefix"));
+			if (!IsEmptyStr(domain))
+			{
+				strcat(line, "@");
+				strcat(line, domain);
+			}
+			strcat(line, ",");
+			strcat(line, "room_");
+			strcat(line, ChrPtr(WC->CurRoom.name));
+		}
+	}
 	else {
-		http_transmit_thing(ChrPtr(do_template("room_edit")), 0);
+		output_headers(1, 1, 1, 0, 0, 0);	
+		do_template("room_edit");
+		wDumpContent(1);
 		return;
 	}
 
 	Line = NewStrBuf();
 	TmpBuf = NewStrBuf();
-	serv_puts("GNET");
+	if (malias)
+		serv_puts("GNET "FILE_MAILALIAS);
+	else
+		serv_puts("GNET");
 	StrBuf_ServGetln(Line);
 	if  (GetServerStatus(Line, NULL) != 1) {
 		AppendImportantMessage(SRV_STATUS_MSG(Line));	
 		FreeStrBuf(&Line);
-		http_transmit_thing(ChrPtr(do_template("room_edit")), 0);
+		output_headers(1, 1, 1, 0, 0, 0);	
+		do_template("room_edit");
+		wDumpContent(1);
 		return;
 	}
 
 	/** This loop works for add *or* remove.  Spiffy, eh? */
 	Done = 0;
-	extract_token(cmpb0, line, 0, '|', sizeof cmpb0);
-	extract_token(cmpb1, line, 1, '|', sizeof cmpb1);
+	extract_token(cmpb0, line, 0, sepchar, sizeof cmpb0);
+	extract_token(cmpb1, line, 1, sepchar, sizeof cmpb1);
 	while (!Done && StrBuf_ServGetln(Line)>=0) {
 		if ( (StrLength(Line)==3) && 
 		     !strcmp(ChrPtr(Line), "000")) 
@@ -1085,22 +1147,41 @@ void netedit(void) {
 		}
 		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);
-				StrBufAppendBuf(TmpBuf, Line, 0);
+			if (StrLength(Line) == 0)
+				continue;
+
+			if (malias_set_default)
+			{
+				if (strncasecmp(ChrPtr(Line), HKEY("roommailalias|")) != 0)
+				{
+					StrBufAppendBufPlain(Line, HKEY("\n"), 0);
+					StrBufAppendBuf(TmpBuf, Line, 0);
+				}
+			}
+			else
+			{
+				extract_token(cmpa0, ChrPtr(Line), 0, sepchar, sizeof cmpa0);
+				extract_token(cmpa1, ChrPtr(Line), 1, sepchar, sizeof cmpa1);
+				if ( (strcasecmp(cmpa0, cmpb0)) || (strcasecmp(cmpa1, cmpb1)) )
+				{
+					StrBufAppendBufPlain(Line, HKEY("\n"), 0);
+					StrBufAppendBuf(TmpBuf, Line, 0);
+				}
 			}
 		}
 	}
 
-	serv_puts("SNET");
+	if (malias)
+		serv_puts("SNET "FILE_MAILALIAS);
+	else
+		serv_puts("SNET");
 	StrBuf_ServGetln(Line);
 	if  (GetServerStatus(Line, NULL) != 4) {
 
 		AppendImportantMessage(SRV_STATUS_MSG(Line));	
-		http_transmit_thing(ChrPtr(do_template("room_edit")), 0);
+		output_headers(1, 1, 1, 0, 0, 0);	
+		do_template("room_edit");
+		wDumpContent(1);
 		FreeStrBuf(&Line);
 		FreeStrBuf(&TmpBuf);
 		return;
@@ -1132,7 +1213,9 @@ void netedit(void) {
 	FlushIgnetCfgs(&WC->CurRoom);
 	FreeStrBuf(&Line);
 
-	http_transmit_thing(ChrPtr(do_template("room_edit")), 0);
+	output_headers(1, 1, 1, 0, 0, 0);	
+	do_template("room_edit");
+	wDumpContent(1);
 }
 
 /*
@@ -1292,7 +1375,6 @@ InitModule_ROOMOPS
                            NULL);
         RegisterPreference("emptyfloors", _("Show empty floors"), PRF_YESNO, NULL);
 
-	
 	WebcitAddUrlHandler(HKEY("json_roomflr"), "", 0, jsonRoomFlr, 0);
 
 	WebcitAddUrlHandler(HKEY("delete_floor"), "", 0, delete_floor, 0);
@@ -1345,6 +1427,7 @@ InitModule_ROOMOPS
 	REGISTERTokenParamDefine(UA_POSTALLOWED);
 	REGISTERTokenParamDefine(UA_ADMINALLOWED);
 	REGISTERTokenParamDefine(UA_DELETEALLOWED);
+	REGISTERTokenParamDefine(UA_REPLYALLOWED);
 	REGISTERTokenParamDefine(UA_ISTRASH);
 
 	REGISTERTokenParamDefine(US_NEEDVALID);
@@ -1372,6 +1455,8 @@ InitModule_ROOMOPS
 	REGISTERTokenParamDefine(VIEW_CALBRIEF);
 	REGISTERTokenParamDefine(VIEW_JOURNAL);
 	REGISTERTokenParamDefine(VIEW_BLOG);
+	REGISTERTokenParamDefine(VIEW_QUEUE);
+	REGISTERTokenParamDefine(VIEW_WIKIMD);		
 
 	/* GNET types: */
 	/* server internal, we need to know but ignore them. */
@@ -1395,6 +1480,7 @@ InitModule_ROOMOPS
 	}
 	REGISTERTokenParamDefine(rssclient);
 	REGISTERTokenParamDefine(participate);
+	REGISTERTokenParamDefine(roommailalias);