X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Froomviews.c;h=18563000db4ebc8062d6d7c76d42627c2d4319d2;hb=HEAD;hp=6364049c8905e021b7694856e418fc56dec1b19c;hpb=c6aec42f213ec284e34648f3d69bcf927dccddb1;p=citadel.git

diff --git a/webcit/roomviews.c b/webcit/roomviews.c
index 6364049c8..d16b70530 100644
--- a/webcit/roomviews.c
+++ b/webcit/roomviews.c
@@ -1,10 +1,9 @@
-
 /*
  * Lots of different room-related operations.
  */
 
 #include "webcit.h"
-#include "webserver.h"
+
 
 char *viewdefs[VIEW_MAX];
 
@@ -13,18 +12,18 @@ char *viewdefs[VIEW_MAX];
  * default view for a room at the time of its creation.
  */
 int allowed_default_views[VIEW_MAX] = {
-	1,			/* VIEW_BBS          Bulletin board */
-	1,			/* VIEW_MAILBOX      Mailbox summary */
-	1,			/* VIEW_ADDRESSBOOK  Address book */
-	1,			/* VIEW_CALENDAR     Calendar */
-	1,			/* VIEW_TASKS        Tasks */
-	1,			/* VIEW_NOTES        Notes */
-	1,			/* VIEW_WIKI         Wiki */
-	0,			/* VIEW_CALBRIEF     Brief Calendar */
-	0,			/* VIEW_JOURNAL      Journal */
-	0,			/* VIEW_DRAFTS       Drafts */
-	1,			/* VIEW_BLOG         Blog */
-	0			/* VIEW_QUEUE        Mail Queue */
+	1, /* VIEW_BBS		Bulletin board */
+	1, /* VIEW_MAILBOX	Mailbox summary */
+	1, /* VIEW_ADDRESSBOOK	Address book */
+	1, /* VIEW_CALENDAR	Calendar */
+	1, /* VIEW_TASKS	Tasks */
+	1, /* VIEW_NOTES	Notes */
+	1, /* VIEW_WIKI		Wiki */
+	0, /* VIEW_CALBRIEF	Brief Calendar */
+	0, /* VIEW_JOURNAL	Journal */
+	0, /* VIEW_DRAFTS	Drafts */
+	1, /* VIEW_BLOG		Blog */
+	0  /* VIEW_QUEUE        Mail Queue */
 };
 
 /*
@@ -49,24 +48,25 @@ ROOM_VIEWS exchangeable_views[VIEW_MAX][VIEW_MAX] = {
  * Initialize the viewdefs with localized strings
  */
 void initialize_viewdefs(void) {
-	viewdefs[VIEW_BBS] = _("Bulletin Board");
-	viewdefs[VIEW_MAILBOX] = _("Mail Folder");
-	viewdefs[VIEW_ADDRESSBOOK] = _("Address Book");
-	viewdefs[VIEW_CALENDAR] = _("Calendar");
-	viewdefs[VIEW_TASKS] = _("Task List");
-	viewdefs[VIEW_NOTES] = _("Notes List");
-	viewdefs[VIEW_WIKI] = _("Wiki");
-	viewdefs[VIEW_CALBRIEF] = _("Calendar List");
-	viewdefs[VIEW_JOURNAL] = _("Journal");
-	viewdefs[VIEW_DRAFTS] = _("Drafts");
-	viewdefs[VIEW_BLOG] = _("Blog");
+	viewdefs[VIEW_BBS]		= _("Bulletin Board");
+	viewdefs[VIEW_MAILBOX]		= _("Mail Folder");
+	viewdefs[VIEW_ADDRESSBOOK]	= _("Address Book");
+	viewdefs[VIEW_CALENDAR]		= _("Calendar");
+	viewdefs[VIEW_TASKS]		= _("Task List");
+	viewdefs[VIEW_NOTES]		= _("Notes List");
+	viewdefs[VIEW_WIKI]		= _("Wiki");
+	viewdefs[VIEW_CALBRIEF]		= _("Calendar List");
+	viewdefs[VIEW_JOURNAL]		= _("Journal");
+	viewdefs[VIEW_DRAFTS]		= _("Drafts");
+	viewdefs[VIEW_BLOG]		= _("Blog");
 }
 
 
-void tmplput_ROOM_COLLECTIONTYPE(StrBuf * Target, WCTemplputParams * TP) {
-	folder *Folder = (folder *) CTX(CTX_ROOMS);
-
-	switch (Folder->view) {
+void tmplput_ROOM_COLLECTIONTYPE(StrBuf *Target, WCTemplputParams *TP) 
+{
+	folder *Folder = (folder *)CTX(CTX_ROOMS);
+	
+	switch(Folder->view) {
 	case VIEW_CALENDAR:
 		StrBufAppendBufPlain(Target, HKEY("vevent"), 0);
 		break;
@@ -90,37 +90,50 @@ void tmplput_ROOM_COLLECTIONTYPE(StrBuf * Target, WCTemplputParams * TP) {
 
 
 
-int ConditionalRoomHasGroupdavContent(StrBuf * Target, WCTemplputParams * TP) {
-	folder *Folder = (folder *) CTX(CTX_ROOMS);
+int ConditionalRoomHasGroupdavContent(StrBuf *Target, WCTemplputParams *TP)
+{
+	folder *Folder = (folder *)CTX(CTX_ROOMS);
 
 	syslog(LOG_DEBUG, "-> %s: %d\n", ChrPtr(Folder->name), Folder->view);
 
-	return ((Folder->view == VIEW_CALENDAR) ||
-		(Folder->view == VIEW_TASKS) ||
-		(Folder->view == VIEW_ADDRESSBOOK) || (Folder->view == VIEW_NOTES) || (Folder->view == VIEW_JOURNAL));
+	return ((Folder->view == VIEW_CALENDAR) || 
+		(Folder->view == VIEW_TASKS) || 
+		(Folder->view == VIEW_ADDRESSBOOK) ||
+		(Folder->view == VIEW_NOTES) ||
+		(Folder->view == VIEW_JOURNAL) );
 }
 
 
 
 
-int ConditionalIsRoomtype(StrBuf * Target, WCTemplputParams * TP) {
+int ConditionalIsRoomtype(StrBuf *Target, WCTemplputParams *TP)
+{
 	wcsession *WCC = WC;
 
-	if ((WCC == NULL) || (TP->Tokens->nParameters < 3)) {
-		return ((WCC->CurRoom.view < VIEW_BBS) || (WCC->CurRoom.view > VIEW_MAX));
+	if ((WCC == NULL) ||
+	    (TP->Tokens->nParameters < 3))
+	{
+		return ((WCC->CurRoom.view < VIEW_BBS) || 
+			(WCC->CurRoom.view > VIEW_MAX));
 	}
 
 	return WCC->CurRoom.view == GetTemplateTokenNumber(Target, TP, 2, VIEW_BBS);
 }
 
 
-void tmplput_CurrentRoomViewString(StrBuf * Target, WCTemplputParams * TP) {
+void tmplput_CurrentRoomViewString(StrBuf *Target, WCTemplputParams *TP) 
+{
 	wcsession *WCC = WC;
 	StrBuf *Buf;
 
-	if ((WCC == NULL) || (WCC->CurRoom.defview >= VIEW_MAX) || (WCC->CurRoom.defview < VIEW_BBS)) {
+	if ((WCC == NULL) ||
+	    (WCC->CurRoom.defview >= VIEW_MAX) || 
+	    (WCC->CurRoom.defview < VIEW_BBS))
+	{
 		LogTemplateError(Target, "Token", ERR_PARM2, TP,
-				 "Roomview [%ld] not valid\n", (WCC != NULL) ? WCC->CurRoom.defview : -1);
+				 "Roomview [%ld] not valid\n", 
+				 (WCC != NULL)? 
+				 WCC->CurRoom.defview : -1);
 		return;
 	}
 
@@ -129,13 +142,17 @@ void tmplput_CurrentRoomViewString(StrBuf * Target, WCTemplputParams * TP) {
 	FreeStrBuf(&Buf);
 }
 
-void tmplput_RoomViewString(StrBuf * Target, WCTemplputParams * TP) {
+void tmplput_RoomViewString(StrBuf *Target, WCTemplputParams *TP) 
+{
 	long CheckThis;
 	StrBuf *Buf;
 
 	CheckThis = GetTemplateTokenNumber(Target, TP, 0, 0);
-	if ((CheckThis >= VIEW_MAX) || (CheckThis < VIEW_BBS)) {
-		LogTemplateError(Target, "Token", ERR_PARM2, TP, "Roomview [%ld] not valid\n", CheckThis);
+	if ((CheckThis >= VIEW_MAX) || (CheckThis < VIEW_BBS))
+	{
+		LogTemplateError(Target, "Token", ERR_PARM2, TP,
+				 "Roomview [%ld] not valid\n", 
+				 CheckThis);
 		return;
 	}
 
@@ -146,23 +163,28 @@ void tmplput_RoomViewString(StrBuf * Target, WCTemplputParams * TP) {
 
 
 
-int ConditionalIsAllowedDefaultView(StrBuf * Target, WCTemplputParams * TP) {
+int ConditionalIsAllowedDefaultView(StrBuf *Target, WCTemplputParams *TP)
+{
 	wcsession *WCC = WC;
 	long CheckThis;
-
+	
 	if (WCC == NULL)
 		return 0;
 
 	CheckThis = GetTemplateTokenNumber(Target, TP, 2, 0);
-	if ((CheckThis >= VIEW_MAX) || (CheckThis < VIEW_BBS)) {
-		LogTemplateError(Target, "Conditional", ERR_PARM2, TP, "Roomview [%ld] not valid\n", CheckThis);
+	if ((CheckThis >= VIEW_MAX) || (CheckThis < VIEW_BBS))
+	{
+		LogTemplateError(Target, "Conditional", ERR_PARM2, TP,
+				 "Roomview [%ld] not valid\n", 
+				 CheckThis);
 		return 0;
 	}
 
 	return allowed_default_views[CheckThis] != 0;
 }
 
-int ConditionalThisRoomDefView(StrBuf * Target, WCTemplputParams * TP) {
+int ConditionalThisRoomDefView(StrBuf *Target, WCTemplputParams *TP)
+{
 	wcsession *WCC = WC;
 	long CheckThis;
 
@@ -173,7 +195,8 @@ int ConditionalThisRoomDefView(StrBuf * Target, WCTemplputParams * TP) {
 	return CheckThis == WCC->CurRoom.defview;
 }
 
-int ConditionalThisRoomCurrView(StrBuf * Target, WCTemplputParams * TP) {
+int ConditionalThisRoomCurrView(StrBuf *Target, WCTemplputParams *TP)
+{
 	wcsession *WCC = WC;
 	long CheckThis;
 
@@ -184,39 +207,49 @@ int ConditionalThisRoomCurrView(StrBuf * Target, WCTemplputParams * TP) {
 	return CheckThis == WCC->CurRoom.view;
 }
 
-int ConditionalThisRoomHaveView(StrBuf * Target, WCTemplputParams * TP) {
+int ConditionalThisRoomHaveView(StrBuf *Target, WCTemplputParams *TP)
+{
 	wcsession *WCC = WC;
 	long CheckThis;
-
+	
 	if (WCC == NULL)
 		return 0;
 
 	CheckThis = GetTemplateTokenNumber(Target, TP, 2, 0);
-	if ((CheckThis >= VIEW_MAX) || (CheckThis < VIEW_BBS)) {
-		LogTemplateError(Target, "Conditional", ERR_PARM2, TP, "Roomview [%ld] not valid\n", CheckThis);
+	if ((CheckThis >= VIEW_MAX) || (CheckThis < VIEW_BBS))
+	{
+		LogTemplateError(Target, "Conditional", ERR_PARM2, TP,
+				 "Roomview [%ld] not valid\n", 
+				 CheckThis);
 		return 0;
 	}
 
-	return exchangeable_views[WCC->CurRoom.defview][CheckThis];
+	return exchangeable_views [WCC->CurRoom.defview][CheckThis] ;
 }
 
-void tmplput_ROOM_VIEW(StrBuf * Target, WCTemplputParams * TP) {
-	folder *Folder = (folder *) CTX(CTX_ROOMS);
+void tmplput_ROOM_VIEW(StrBuf *Target, WCTemplputParams *TP) 
+{
+	folder *Folder = (folder *)CTX(CTX_ROOMS);
 	StrBufAppendPrintf(Target, "%d", Folder->view);
 }
-void tmplput_ROOM_DEFVIEW(StrBuf * Target, WCTemplputParams * TP) {
-	folder *Folder = (folder *) CTX(CTX_ROOMS);
+void tmplput_ROOM_DEFVIEW(StrBuf *Target, WCTemplputParams *TP) 
+{
+	folder *Folder = (folder *)CTX(CTX_ROOMS);
 	StrBufAppendPrintf(Target, "%d", Folder->defview);
 }
 
 
-void tmplput_CurrentRoomDefView(StrBuf * Target, WCTemplputParams * TP) {
+void tmplput_CurrentRoomDefView(StrBuf *Target, WCTemplputParams *TP) 
+{
 	wcsession *WCC = WC;
 
 	StrBufAppendPrintf(Target, "%d", WCC->CurRoom.defview);
 }
 
-void InitModule_ROOMVIEWS(void) {
+void 
+InitModule_ROOMVIEWS
+(void)
+{
 	/* we duplicate this, just to be shure its already done. */
 	RegisterCTX(CTX_ROOMS);
 	RegisterCTX(CTX_FLOORS);