explicitly show IP in SNO_BANNED snotes

[solanum.git] / extensions / chm_adminonly.c

diff --git a/extensions/chm_adminonly.c b/extensions/chm_adminonly.c
index 9380c3df7b9fa360c010378e7d92ed9eb1edd3f3..445a301426b62c1c9aeeade68fcdaffff978c807 100644 (file)
--- a/extensions/chm_adminonly.c
+++ b/extensions/chm_adminonly.c
@@ -10,20 +10,24 @@
 #include "numeric.h"
 #include "chmode.h"
 
-static void h_can_join(hook_data_channel *);
+static const char chm_adminonly_desc[] =
+       "Enables channel mode +A that blocks non-admins from joining a channel";
+
+static void h_can_join(void *);
 
 mapi_hfn_list_av1 adminonly_hfnlist[] = {
-       { "can_join", (hookfn) h_can_join },
+       { "can_join", h_can_join },
        { NULL, NULL }
 };
 
+static unsigned int mymode;
+
 static int
 _modinit(void)
 {
-       chmode_table['A'].mode_type = find_cflag_slot();
-       chmode_table['A'].set_func = chm_staff;
-
-       construct_noparam_modes();
+       mymode = cflag_add('A', chm_staff);
+       if (mymode == 0)
+               return -1;
 
        return 0;
 }
@@ -31,20 +35,19 @@ _modinit(void)
 static void
 _moddeinit(void)
 {
-       chmode_table['A'].mode_type = 0;
-
-       construct_noparam_modes();
+       cflag_orphan('A');
 }
 
-DECLARE_MODULE_AV1(chm_adminonly, _modinit, _moddeinit, NULL, NULL, adminonly_hfnlist, "$Revision$");
+DECLARE_MODULE_AV2(chm_adminonly, _modinit, _moddeinit, NULL, NULL, adminonly_hfnlist, NULL, NULL, chm_adminonly_desc);
 
 static void
-h_can_join(hook_data_channel *data)
+h_can_join(void *data_)
 {
+       hook_data_channel *data = data_;
        struct Client *source_p = data->client;
        struct Channel *chptr = data->chptr;
 
-       if((chptr->mode.mode & chmode_flags['A']) && !IsAdmin(source_p)) {
+       if((chptr->mode.mode & mymode) && !IsAdmin(source_p)) {
                sendto_one_numeric(source_p, 519, "%s :Cannot join channel (+A) - you are not an IRC server administrator", chptr->chname);
                data->approved = ERR_CUSTOM;
        }