From ac9f93410a8172fcb2b480e46907bc2e7a4150a0 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Wilfried=20G=C3=B6esgens?= <willi@citadel.org>
Date: Sat, 31 Jul 2010 18:06:29 +0000
Subject: [PATCH] * move GNET-pop3 enum to libcitadel * rename them to prefix
 GNET_ so its clear where they belong to * follow change in template

---
 libcitadel/lib/libcitadel.h                       | 8 ++++++++
 webcit/roomops.c                                  | 8 +++++++-
 webcit/roomops.h                                  | 1 +
 webcit/static/t/room/edit/pop3client_removal.html | 8 ++++----
 4 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/libcitadel/lib/libcitadel.h b/libcitadel/lib/libcitadel.h
index b15c8c91c..998a76d26 100644
--- a/libcitadel/lib/libcitadel.h
+++ b/libcitadel/lib/libcitadel.h
@@ -68,6 +68,14 @@ enum RoomNetCfg {
 	maxRoomNetCfg
 };
 
+enum GNET_POP3_PARTS { /* pop3client split into these columns: */
+	GNET_POP3_HOST = 1,
+	GNET_POP3_USER = 2,
+	GNET_POP3_PASS = 4,
+	GNET_POP3_DONT_DELETE_REMOTE = 4,
+	GNET_POP3_INTERVAL = 5
+};
+
 
 typedef enum __GPEXWhichPolicy {
 	roompolicy,
diff --git a/webcit/roomops.c b/webcit/roomops.c
index 91fa4bff7..b8c6d1e07 100644
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -3533,11 +3533,17 @@ InitModule_ROOMOPS
 	REGISTERTokenParamDefine(VIEW_JOURNAL);
 	REGISTERTokenParamDefine(VIEW_BLOG);
 
-
+	/* GNET types: */
 	REGISTERTokenParamDefine(ignet_push_share);
 	REGISTERTokenParamDefine(listrecp);
 	REGISTERTokenParamDefine(digestrecp);
 	REGISTERTokenParamDefine(pop3client);
+	{ /* These are the parts of a pop3 client line... */
+		REGISTERTokenParamDefine(GNET_POP3_HOST);
+		REGISTERTokenParamDefine(GNET_POP3_USER);
+		REGISTERTokenParamDefine(GNET_POP3_DONT_DELETE_REMOTE);
+		REGISTERTokenParamDefine(GNET_POP3_INTERVAL);
+	}
 	REGISTERTokenParamDefine(rssclient);
 	REGISTERTokenParamDefine(participate);
 
diff --git a/webcit/roomops.h b/webcit/roomops.h
index d5712ddc9..470220d40 100644
--- a/webcit/roomops.h
+++ b/webcit/roomops.h
@@ -122,3 +122,4 @@ int CompareRooms(const folder *room1, const folder *room2);
 #define REST_HAVE_SUB_ROOMS (1<<3)
 #define REST_GOT_LOCAL_PART (1<<4)
 #define REST_NONEXIST (1<<5)
+
diff --git a/webcit/static/t/room/edit/pop3client_removal.html b/webcit/static/t/room/edit/pop3client_removal.html
index 875c3f06a..932e6f692 100644
--- a/webcit/static/t/room/edit/pop3client_removal.html
+++ b/webcit/static/t/room/edit/pop3client_removal.html
@@ -1,9 +1,9 @@
 <tr class="<?ITERATE:ODDEVEN>">
-	<td><?CONTEXTSTRARR(#"POP3_HOST", "X")></td>
-	<td><?CONTEXTSTRARR(#"POP3_USER", "X")></td>
+	<td><?CONTEXTSTRARR(#"GNET_POP3_HOST", "X")></td>
+	<td><?CONTEXTSTRARR(#"GNET_POP3_USER", "X")></td>
 	<td>*****</td> <!-- Don't show the password -->
-	<td><?CONTEXTSTRARR(#"POP3_KEEP")></td> <!-- Keep on server. didnt come up with a better name... -->
-	<td><?CONTEXTSTRARR(#"POP3_INTERVAL")></td>
+	<td><?CONTEXTSTRARR(#"GNET_POP3_DONT_DELETE_REMOTE")></td> <!-- Keep on server. didnt come up with a better name... -->
+	<td><?CONTEXTSTRARR(#"GNET_POP3_INTERVAL")></td>
 	<td class="button_link">
 		<a href="netedit?cmd=remove?tab=feeds?line=pop3client|<?CONTEXTARR(#"POP3_HOST", "U")>">
 			<?_("(remove)")>
-- 
2.30.2