* move GNET-pop3 enum to libcitadel

* rename them to prefix GNET_ so its clear where they belong to
* follow change in template

diff --git a/libcitadel/lib/libcitadel.h b/libcitadel/lib/libcitadel.h
index b15c8c91c1729c8be42f23e28a8c75d16b18b583..998a76d269474c33ca318fba0dcb6cd99610ec28 100644 (file)
--- 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 91fa4bff7bd13ffec590087fcd1cfc44c48f6286..b8c6d1e078ee2108315a40aed9b7888db9938ed3 100644 (file)
--- 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 d5712ddc9f2b3a8c0edce974f7c58fdc2b9eafa5..470220d4098c32ec7ca8e71523e4149c57addac3 100644 (file)
--- 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 875c3f06a9299ef3f2e27883f0f406046f85c483..932e6f69257f972cd58ecb8538c83574f1bda6c8 100644 (file)
--- 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)")>