Changeset 1680

Timestamp:

02/16/10 19:58:18 (7 months ago)

Author:

tjfontaine

Message:

show the channels a group is on the access list for

Location:

trunk

Files:

• include/dbm.h (modified) (1 diff)
• languages/groupserv.en.lang (modified) (1 diff)
• modules/groupserv.c (modified) (2 diffs)
• modules/pgsql.c (modified) (1 diff)
• src/group.c (modified) (3 diffs)

trunk/include/dbm.h

@@ -203 +203 @@
   GET_GROUPS_OPER,
   GET_GROUPS,
+  GET_GROUP_CHAN_INFO,
   QUERY_COUNT
 };

trunk/languages/groupserv.en.lang

@@ -168 +168 @@
 GS_INFO_REGTIME_UNKNOWN
           Time registered: Unknown
+GS_INFO_CHANS
+        This group is on the following channel access lists:
+GS_INFO_CHAN
+            %s: %s
 GS_LIST_INVALID_OPTION
         Invalid LIST option %s.

trunk/modules/groupserv.c

@@ -292 +292 @@
   }
 
+  reply_user(service, service, client, GS_INFO_OPTION, "PRIVATE",
+      group_get_priv(group) ? "ON" : "OFF");
+
   if(group_masters_list(group_get_id(group), &list))
   {
@@ -310 +313 @@
   reply_user(service, service, client, GS_INFO_MASTERS, buf);
 
-  reply_user(service, service, client, GS_INFO_OPTION, "PRIVATE",
-      group_get_priv(group) ? "ON" : "OFF");
+  if(IsOper(client) || (access != NULL && access->level >= GRPMEMBER_FLAG))
+  {
+    if(group_chan_list(group_get_id(group), &list))
+    {
+      struct InfoChanList *chan;
+      reply_user(service, service, client, GS_INFO_CHANS);
+
+      DLINK_FOREACH(ptr, list.head)
+      {
+        chan = (struct InfoChanList *)ptr->data;
+        reply_user(service, service, client, GS_INFO_CHAN, chan->channel,
+          chan->level);
+      }
+      group_chan_list_free(&list);
+    }
+  }
 
   if(access != NULL)

trunk/modules/pgsql.c

@@ -317 +317 @@
   { GET_GROUPS, "SELECT name FROM \"group\" WHERE flag_private='f' ORDER BY lower(name) DESC",
     QUERY },
+  { GET_GROUP_CHAN_INFO, "SELECT channel.id, channel, level FROM "
+    "channel, channel_access WHERE "
+    "channel.id=channel_access.channel_id AND channel_access.group_id=$1 "
+    "ORDER BY lower(channel.channel)", QUERY },
 };
 

trunk/src/group.c

@@ -630 +630 @@
   db_string_list_free(list);
 }
+#endif
 
 static struct InfoChanList *
@@ -691 +692 @@
   struct InfoChanList *chan;
 
-  ilog(L_DEBUG, "Freeing string list %p of length %lu", list,
+  ilog(L_DEBUG, "Freeing group chan list %p of length %lu", list,
     dlink_list_length(list));
 
@@ -704 +705 @@
 }
 
-
+#if 0
 inline void
 group_list_all_free(dlink_list *list)