* reflect new mailinglist flags in room-admin-interface

diff --git a/webcit/.svnignore b/webcit/.svnignore
index 0354034be67411ce0441eeebad85f9c6400ff278..b9cb88b3ab0202daaaa1de2d3c5428f4bdd5eef9 100644 (file)
--- a/webcit/.svnignore
+++ b/webcit/.svnignore
@@ -1 +1,3 @@
 aclocal.m4
+*.d
+

diff --git a/webcit/roomops.c b/webcit/roomops.c
index 9f568585ff7700c069cfb51c4085a470c91bc783..a37388ac0e96b4e16daa513ce71539f5c404b45a 100644 (file)
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -959,6 +959,16 @@ void ungoto(void)
        smart_goto(buf);
 }
 
+typedef struct __room_states {
+       char password[SIZ];
+       char dirname[SIZ];
+       char name[SIZ];
+       int flags;
+       int floor;
+       int order;
+       int view;
+       int flags2;
+}room_states;
 
 
 
@@ -977,7 +987,7 @@ int self_service(int newval) {
        char name[SIZ];
        char password[SIZ];
        char dirname[SIZ];
-       int flags, floor, order, view, flags2;
+        int flags, floor, order, view, flags2;
 
        serv_puts("GETR");
        serv_getln(buf, sizeof buf);
@@ -1020,6 +1030,67 @@ int self_service(int newval) {
 
 }
 
+int
+is_selflist(room_states *RoomFlags)
+{
+       return ((RoomFlags->flags2 & QR2_SELFLIST) != 0);
+}
+
+int
+is_publiclist(room_states *RoomFlags)
+{
+       return ((RoomFlags->flags2 & QR2_SUBSONLY) != 0);
+}
+
+int
+is_moderatedlist(room_states *RoomFlags)
+{
+       return ((RoomFlags->flags2 & QR2_MODERATED) != 0);
+}
+
+/**
+ * \brief Set/clear/read the "self-service list subscribe" flag for a room
+ * 
+ * \param newval set to 0 to clear, 1 to set, any other value to leave unchanged.
+ * \return return the new value.
+ */
+
+int get_roomflags(room_states *RoomOps) 
+{
+       char buf[SIZ];
+       
+       serv_puts("GETR");
+       serv_getln(buf, sizeof buf);
+       if (buf[0] != '2') return(0);
+
+       extract_token(RoomOps->name, &buf[4], 0, '|', sizeof RoomOps->name);
+       extract_token(RoomOps->password, &buf[4], 1, '|', sizeof RoomOps->password);
+       extract_token(RoomOps->dirname, &buf[4], 2, '|', sizeof RoomOps->dirname);
+       RoomOps->flags = extract_int(&buf[4], 3);
+       RoomOps->floor = extract_int(&buf[4], 4);
+       RoomOps->order = extract_int(&buf[4], 5);
+       RoomOps->view = extract_int(&buf[4], 6);
+       RoomOps->flags2 = extract_int(&buf[4], 7);
+       return (1);
+}
+
+int set_roomflags(room_states *RoomOps)
+{
+       char buf[SIZ];
+
+       serv_printf("SETR %s|%s|%s|%d|0|%d|%d|%d|%d",
+                   RoomOps->name, 
+                   RoomOps->password, 
+                   RoomOps->dirname, 
+                   RoomOps->flags,
+                   RoomOps->floor, 
+                   RoomOps->order, 
+                   RoomOps->view, 
+                   RoomOps->flags2);
+       serv_getln(buf, sizeof buf);
+       return (1);
+}
+
 
 
 
@@ -1570,6 +1641,7 @@ void display_editroom(void)
 
        /** Mailing list management */
        if (!strcmp(tab, "listserv")) {
+               room_states RoomFlags;
                wprintf("<div class=\"tabcontent\">");
 
                wprintf("<br /><center>"
@@ -1651,28 +1723,38 @@ void display_editroom(void)
                );
                /** Pop open an address book -- end **/
 
-               wprintf("<hr />");
-               if (self_service(999) == 1) {
-                       wprintf(_("This room is configured to allow "
-                               "self-service subscribe/unsubscribe requests."));
-                       wprintf("<a href=\"toggle_self_service?newval=0&tab=listserv\">");
-                       wprintf(_("Click to disable."));
-                       wprintf("</A><br />\n");
-                       wprintf(_("The URL for subscribe/unsubscribe is: "));
-                       wprintf("<TT>%s://%s/listsub</TT><br />\n",
-                               (is_https ? "https" : "http"),
-                               WC->http_host);
-               }
-               else {
-                       wprintf(_("This room is <i>not</i> configured to allow "
-                               "self-service subscribe/unsubscribe requests."));
-                       wprintf(" <a href=\"toggle_self_service?newval=1&"
-                               "tab=listserv\">");
-                       wprintf(_("Click to enable."));
-                       wprintf("</A><br />\n");
-               }
+               wprintf("<br />\n<form method=\"GET\" action=\"toggle_self_service\">\n");
+
+               get_roomflags (&RoomFlags);
+               
+               /* Self Service subscription? */
+               wprintf("<table><tr><td>\n");
+               wprintf(_("Allow self-service subscribe/unsubscribe requests."));
+               wprintf("</td><td><input type=\"checkbox\" name=\"QR2_SelfList\" value=\"yes\" %s></td></tr>\n"
+                       " <tr><td colspan=\"2\">\n",
+                       (is_selflist(&RoomFlags))?"checked":"");
+               wprintf(_("The URL for subscribe/unsubscribe is: "));
+               wprintf("<TT>%s://%s/listsub</TT></td></tr>\n",
+                       (is_https ? "https" : "http"),
+                       WC->http_host);
+               /* Public posting? */
+               wprintf("<tr><td>");
+               wprintf(_("Allow public postings to this room."));
+               wprintf("</td><td><input type=\"checkbox\" name=\"QR2_SubsOnly\" value=\"yes\" %s></td></tr>\n",
+                       (is_publiclist(&RoomFlags))?"checked":"");
+               
+               /* Moderated List? */
+               wprintf("<tr><td>");
+               wprintf(_("Room post publication needs Aide permission."));
+               wprintf("</td><td><input type=\"checkbox\" name=\"QR2_Moderated\" value=\"yes\" %s></td></tr>\n",
+                       (is_moderatedlist(&RoomFlags))?"checked":"");
 
 
+               wprintf("<tr><td colspan=\"2\" align=\"center\">"
+                       "<input type=\"submit\" NAME=\"add_button\" VALUE=\"%s\"></td></tr>", _("Save changes"));
+               wprintf("</table></form>");
+                       
+
                wprintf("</CENTER>\n");
                wprintf("</div>");
        }
@@ -1933,10 +2015,24 @@ void display_editroom(void)
  * \brief Toggle self-service list subscription
  */
 void toggle_self_service(void) {
-       int newval = 0;
+//     int newval = 0;
+       room_states RoomFlags;
+
+       get_roomflags (&RoomFlags);
 
-       newval = atoi(bstr("newval"));
-       self_service(newval);
+       // Yank out the bits we want to change
+       RoomFlags.flags2 = RoomFlags.flags2 &   
+               !(QR2_SELFLIST|QR2_SUBSONLY|QR2_MODERATED);
+
+       if (!strcmp(bstr("QR2_SelfList"), "yes")) 
+               RoomFlags.flags2 = RoomFlags.flags2 | QR2_SELFLIST;
+       if (!strcmp(bstr("QR2_SubsOnly"), "yes")) 
+               RoomFlags.flags2 = RoomFlags.flags2 | QR2_SUBSONLY;
+       if (!strcmp(bstr("QR2_Moderated"), "yes")) 
+               RoomFlags.flags2 = RoomFlags.flags2 | QR2_MODERATED;
+
+       set_roomflags (&RoomFlags);
+       
        display_editroom();
 }
 

diff --git a/webcit/webcit.h b/webcit/webcit.h
index d918d71b3e7dda49b29192b11d23e712b293d312..2f743b34d07b696d250f23ce9705d78ec4969a4d 100644 (file)
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -167,6 +167,8 @@ extern locale_t wc_locales[];
 #define QR2_SELFLIST   2               /**< Self-service mailing list mgmt     */
 #define QR2_COLLABDEL  4               /**< Anyone who can post can also delete*/
 #define QR2_SUBJECTREQ   8   /**< Subject strongly recommended */
+#define QR2_SUBSONLY   16              /* Listservice Subscribers may post */
+#define QR2_MODERATED  32              /* Listservice aide has to permit posts  */
 
 /**
  * user/room access