From: Wilfried Göesgens <willi@citadel.org>
Date: Wed, 11 Aug 2010 11:15:27 +0000 (+0000)
Subject: * templatize zap room list
X-Git-Tag: v8.01~930
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=b059002a6a751837ca5af47b2d18e190a1fa6daf

* templatize zap room list
* GetRoomListHashLKRA(): if we send something to the server, we need to read the reply.
---

diff --git a/webcit/roomlist.c b/webcit/roomlist.c
index f4edff91b..05b08bcc2 100644
--- a/webcit/roomlist.c
+++ b/webcit/roomlist.c
@@ -125,12 +125,24 @@ HashList *GetRoomListHashLKRA(StrBuf *Target, WCTemplputParams *TP)
 
 	if (WCC->Floors == NULL)
 		GetFloorListHash(Target, TP);
-	serv_puts("LKRA");
 	if (WCC->Rooms == NULL) 
+	{
+		serv_puts("LKRA");
 		WCC->Rooms =  GetRoomListHash(Target, TP);
+	}
 	return WCC->Rooms;
 }
 
+HashList *GetZappedRoomListHash(StrBuf *Target, WCTemplputParams *TP) 
+{
+	wcsession *WCC = WC;
+
+	if (WCC->Floors == NULL)
+		GetFloorListHash(Target, TP);
+	serv_puts("LZRM -1");
+	return GetRoomListHash(Target, TP);
+}
+
 void FlushFolder(folder *room)
 {
 	int i;
@@ -843,6 +855,8 @@ InitModule_ROOMLIST
 	RegisterIterator("LFLR", 0, NULL, GetFloorListHash, NULL, NULL, CTX_FLOORS, CTX_NONE, IT_FLAG_DETECT_GROUPCHANGE);
 
 	RegisterIterator("LKRA", 0, NULL, GetRoomListHashLKRA, NULL, NULL, CTX_ROOMS, CTX_NONE, IT_FLAG_DETECT_GROUPCHANGE);
+	RegisterIterator("LZRM", 0, NULL, GetZappedRoomListHash, NULL, DeleteHash, CTX_ROOMS, CTX_NONE, IT_FLAG_DETECT_GROUPCHANGE);
+
 
 	RegisterNamespace("ROOM:INFO:FLOORID", 0, 1, tmplput_ROOM_FLOORID, NULL, CTX_ROOMS);
 	RegisterNamespace("ROOM:INFO:NAME", 0, 1, tmplput_ROOM_NAME, NULL, CTX_ROOMS);
diff --git a/webcit/static/t/menu/advanced_roomcommands.html b/webcit/static/t/menu/advanced_roomcommands.html
index 82e5ddf45..b33760ca1 100644
--- a/webcit/static/t/menu/advanced_roomcommands.html
+++ b/webcit/static/t/menu/advanced_roomcommands.html
@@ -6,5 +6,6 @@
 <li><a href="display_private"><?_("Go to a 'hidden' room")></a></li>
 <li><a href="display_entroom"><?_("Create a new room")></a></li>
 <li><a href="display_zap"><?_("Zap (forget) this room")></a></li>
-<li><a href="zapped_list"><?_("List all forgotten rooms")></a></li>
+<li><a href="do_template?template=room_zapped_list"><?_("List all forgotten rooms")></a></li>
+<li><a href="zapped_list">(old)<?_("List all forgotten rooms")></a></li>
 </ul>
diff --git a/webcit/static/t/room/zap_entry.html b/webcit/static/t/room/zap_entry.html
new file mode 100644
index 000000000..f4be9a6af
--- /dev/null
+++ b/webcit/static/t/room/zap_entry.html
@@ -0,0 +1,6 @@
+&nbsp;<a href="dotgoto?room=<?ROOM:INFO:NAME("U")>"><span class="<?%("COND:ROOM:FLAG:UA", 4, #"UA_HASNEWMSGS", 0, "roomlist_new", "roomlist_old")>">
+<?ROOM:INFO:LEVELNTIMES("&nbsp;&nbsp;&nbsp;")><?ROOM:INFO:BASENAME>
+<??("COND:THISROOM:FLAG:QR", 1, #"QR_DIRECTORY")><img src="/static/diskette_24.gif" alt="<?_("Has Files")>"><??("X", 1)>
+<??("COND:THISROOM:FLAG:QR", 2, #"QR_NETWORK")><img src="/static/rss_16x.gif" alt="<?_("Networked Room")>"><??("X", 2)>
+</span>
+</a><br />
diff --git a/webcit/static/t/room/zapped_list.html b/webcit/static/t/room/zapped_list.html
new file mode 100644
index 000000000..070569676
--- /dev/null
+++ b/webcit/static/t/room/zapped_list.html
@@ -0,0 +1,11 @@
+<?=("head")><?=("important_msg")><?%("COND:LOGGEDIN", 1, 1, 1, "", ="paging")>
+<div id="banner">
+<?=("roombanner")>
+</div>
+<div id="content" class="service fix_scrollbar_bug">
+
+<?=("beginbox_1")><?_("Zapped (forgotten) rooms")><?=("beginbox_2")>
+<?ITERATE("LZRM", ="room_zap_entry")>
+<?=("endbox")>
+</div>
+<?=("trailing")>