From: Wilfried Göesgens <willi@citadel.org>
Date: Mon, 2 Aug 2010 20:40:53 +0000 (+0000)
Subject: * add THISROOM:FLOOR:NAME so tab_expire can show the current floor
X-Git-Tag: v8.01~969
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=cb51d773d6ea8d34dc7683f967bf0dd1bc1ecf99

* add THISROOM:FLOOR:NAME so tab_expire can show the current floor
* fix some more problems in tab_expire
---

diff --git a/webcit/roomops.c b/webcit/roomops.c
index 6305ea00d..15bed118a 100644
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -894,6 +894,9 @@ void ParseGoto(folder *room, StrBuf *Line)
 		
 	}
 	/* get a pointer to the floor we're on: */
+	if (WCC->Floors == NULL)
+		GetFloorListHash(NULL, NULL);
+
 	GetHash(WCC->Floors, IKEY(room->floorid), &vFloor);
 	room->Floor = (const Floor*) vFloor;
 }
@@ -926,6 +929,17 @@ void LoadRoomAide(void)
 	}
 	FreeStrBuf (&Buf);
 }
+void tmplput_CurrentRoomFloorName(StrBuf *Target, WCTemplputParams *TP) 
+{
+	wcsession *WCC = WC;
+	folder *Folder = &WCC->CurRoom;
+	const Floor *pFloor = Folder->Floor;
+
+	if (pFloor == NULL)
+		return;
+
+	StrBufAppendTemplate(Target, TP, pFloor->Name, 0);
+}
 
 void tmplput_CurrentRoomAide(StrBuf *Target, WCTemplputParams *TP) 
 {
@@ -3467,6 +3481,7 @@ InitModule_ROOMOPS
 	RegisterConditional(HKEY("COND:ROOM:FLAG:UA"), 0, ConditionalRoomHas_UAFlag, CTX_ROOMS);
 
 	RegisterIterator("ITERATE:THISROOM:WHO_KNOWS", 0, NULL, GetWhoKnowsHash, NULL, DeleteHash, CTX_STRBUF, CTX_NONE, IT_NOFLAG);
+	RegisterNamespace("THISROOM:FLOOR:NAME", 0, 1, tmplput_CurrentRoomFloorName, NULL, CTX_NONE);
 	RegisterNamespace("THISROOM:AIDE", 0, 1, tmplput_CurrentRoomAide, NULL, CTX_NONE);
 	RegisterNamespace("THISROOM:PASS", 0, 1, tmplput_CurrentRoomPass, NULL, CTX_NONE);
 	RegisterNamespace("THISROOM:DIRECTORY", 0, 1, tmplput_CurrentRoomDirectory, NULL, CTX_NONE);
@@ -3576,5 +3591,9 @@ SessionDestroyModule_ROOMOPS
 	
 	free_march_list(sess);
 	DeleteHash(&sess->Floors);
+	DeleteHash(&sess->Rooms);
+	DeleteHash(&sess->FloorsByName);
 }
+
+
 /*@}*/
diff --git a/webcit/static/t/room/edit/tab_expire.html b/webcit/static/t/room/edit/tab_expire.html
index b90362a3a..09f5e311d 100644
--- a/webcit/static/t/room/edit/tab_expire.html
+++ b/webcit/static/t/room/edit/tab_expire.html
@@ -35,10 +35,10 @@
 				<td>
 					<?_("Message expire policy for this floor")>
 					<br />
-					<?ROOM:INFO:FLOOR:NAME("X")>
+					<?THISROOM:FLOOR:NAME("X")>
 				</td>
 				<td>
-					<input type="radio" name="floorpolicy" value="0" <?%("COND:EXPIRE:MODE", 1, #"floorpolicy", #"EXPIRE_NEXTLEVEL" , 'checked="checked"',"")>>nbsp;
+					<input type="radio" name="floorpolicy" value="0" <?%("COND:EXPIRE:MODE", 1, #"floorpolicy", #"EXPIRE_NEXTLEVEL" , 'checked="checked"',"")>>&nbsp;
 					<?_("Use the system default")>
 					<br />
 					<input type="radio" name="floorpolicy" value="1" <?%("COND:EXPIRE:MODE", 1, #"floorpolicy", #"EXPIRE_MANUAL", 'checked="checked"',"")> />&nbsp;