From f8e0b6373c12a56bc0998db7973951f10f6ddecf Mon Sep 17 00:00:00 2001
From: =?utf8?q?Wilfried=20G=C3=B6esgens?= <willi@citadel.org>
Date: Sat, 31 Jul 2010 18:49:34 +0000
Subject: [PATCH]  * add defines for IGNET parts  * shared_room_add needs to
 iterate over the available configured remote nodes, as
 display_ignetconf/aide_ignetconf_section do  * shared_room_add: add ID to the
 table column, so we can later find it  * shared_room_removal: here I need
 some help, some little js code to hide the matching column in the add-table.

---
 libcitadel/lib/libcitadel.h                       |  6 +++++-
 webcit/roomops.c                                  |  4 ++++
 webcit/static/t/room/edit/shared_room_add.html    |  6 +++---
 .../static/t/room/edit/shared_room_removal.html   | 15 ++++++++++++---
 webcit/static/t/room/edit/tab_share.html          |  2 +-
 5 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/libcitadel/lib/libcitadel.h b/libcitadel/lib/libcitadel.h
index 998a76d26..3949e8752 100644
--- a/libcitadel/lib/libcitadel.h
+++ b/libcitadel/lib/libcitadel.h
@@ -68,7 +68,7 @@ enum RoomNetCfg {
 	maxRoomNetCfg
 };
 
-enum GNET_POP3_PARTS { /* pop3client split into these columns: */
+enum GNET_POP3_PARTS { /* pop3client splits into these columns: */
 	GNET_POP3_HOST = 1,
 	GNET_POP3_USER = 2,
 	GNET_POP3_PASS = 4,
@@ -76,6 +76,10 @@ enum GNET_POP3_PARTS { /* pop3client split into these columns: */
 	GNET_POP3_INTERVAL = 5
 };
 
+enum GNET_PUSH_SHARE { /* ignet_push_share splits into these columns: */
+	GNET_IGNET_NODE = 1,
+	GNET_IGNET_ROOM = 2
+};
 
 typedef enum __GPEXWhichPolicy {
 	roompolicy,
diff --git a/webcit/roomops.c b/webcit/roomops.c
index b8c6d1e07..6305ea00d 100644
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -3535,6 +3535,10 @@ InitModule_ROOMOPS
 
 	/* GNET types: */
 	REGISTERTokenParamDefine(ignet_push_share);
+	{ /* these are the parts of an IGNET push config */
+		REGISTERTokenParamDefine(GNET_IGNET_NODE);
+		REGISTERTokenParamDefine(GNET_IGNET_ROOM);
+	}
 	REGISTERTokenParamDefine(listrecp);
 	REGISTERTokenParamDefine(digestrecp);
 	REGISTERTokenParamDefine(pop3client);
diff --git a/webcit/static/t/room/edit/shared_room_add.html b/webcit/static/t/room/edit/shared_room_add.html
index a9e5a8b38..1d5a6d6ba 100644
--- a/webcit/static/t/room/edit/shared_room_add.html
+++ b/webcit/static/t/room/edit/shared_room_add.html
@@ -1,10 +1,10 @@
 <form method="post" action="netedit">
 	<input type="hidden" name="nonce" value="<?NONCE>" />
-	<tr>   
-		<td><?CONTEXTARR(#"NODE","X")></td>
+	<tr id="ignet_share_node_add__<?CFG:IGNET:NODE("U")>">
+		<td><?CFG:IGNET:NODE("X")></td>
 		<td><input type="input" name="suffix" maxlength="128" /></td>
 		<td>
-			<input type="hidden" name="line" value="ignet_push_share|<?CONTEXTARR(#"NODE","U")>|" /> 
+			<input type="hidden" name="line" value="ignet_push_share|<?CFG:IGNET:NODE("U")>|" /> 
 			<input type="hidden" name="tab" value="sharing" />
 			<input type="hidden" name="cmd" value="add" />
 			<input type="submit" name="add_button" value="<?_("Share")>" />
diff --git a/webcit/static/t/room/edit/shared_room_removal.html b/webcit/static/t/room/edit/shared_room_removal.html
index 2b207e55a..5dd132c09 100644
--- a/webcit/static/t/room/edit/shared_room_removal.html
+++ b/webcit/static/t/room/edit/shared_room_removal.html
@@ -1,10 +1,19 @@
+<script type="text/javascript">
+/*
+TODO: hide from the other table the column with this ID:
+ignet_share_node_add__<?CONTEXTARR(#"GNET_IGNET_NODE", "U")>
+*/
+</script>
 <form method="post" action="netedit">
 	<input type="hidden" name="nonce" value="<?NONCE>" />
 	<tr>
-		<td><?CONTEXTARR(#"CFG:IGNET:NODE")></td>
-		<td><?CONTEXTARR(#"REMOTE_ROOM")></td>
+		<td><?CONTEXTARR(#"GNET_IGNET_NODE")></td>
+		<td><?CONTEXTARR(#"GNET_IGNET_ROOM")></td>
 		<td>
-			<input type="hidden" name="line" value="ignet_push_share|<?CONTEXTARR(#"NODE", "U")>|<?CONTEXTARR(#"REMOTE_ROOM", "U")> />
+			<input type="hidden" 
+			       name="line" 
+			       value="ignet_push_share|<?CONTEXTARR(#"GNET_IGNET_ROOM", "U")>|<?CONTEXTARR(#"GNET_IGNET_ROOM", "U")>"
+			/>
 			<input type="hidden" name="tab" value="sharing" />
 			<input type="hidden" name="cmd" value="remove" />
 			<input type="submit" name="unshare_button" value="<?_("Unshare")>" />
diff --git a/webcit/static/t/room/edit/tab_share.html b/webcit/static/t/room/edit/tab_share.html
index c74662ce3..5568c02ec 100644
--- a/webcit/static/t/room/edit/tab_share.html
+++ b/webcit/static/t/room/edit/tab_share.html
@@ -22,7 +22,7 @@
 						<td><?_("Remote room name")></td>
 						<td><?_("Actions")></td>
 					</tr>
-					<?ITERATE("ITERATE:THISROOM:GNET", ="room_edit_shared_room_add", 0, 0, -1, #"ignet_push_share")>
+					<?ITERATE("NODECONFIG", ="room_edit_shared_room_add")>
 				</table>
 			</td>
 		</tr>
-- 
2.30.2