Merge pull request #288 from edk0/umode-o-split

[solanum.git] / extensions / chm_sslonly.c

diff --git a/extensions/chm_sslonly.c b/extensions/chm_sslonly.c
index 197aac6992bc23aefe5c9ff6cf2efeb1499d8926..2cbc7a47ef9d9557e8d6f1a2bf7c027a6e2f7edf 100644 (file)
--- a/extensions/chm_sslonly.c
+++ b/extensions/chm_sslonly.c
@@ -10,6 +10,9 @@
 #include "numeric.h"
 #include "chmode.h"
 
+static const char chm_sslonly_desc[] =
+       "Adds channel mode +S that bans non-SSL users from joing a channel";
+
 static void h_can_join(hook_data_channel *);
 
 mapi_hfn_list_av1 sslonly_hfnlist[] = {
@@ -17,27 +20,25 @@ mapi_hfn_list_av1 sslonly_hfnlist[] = {
        { NULL, NULL }
 };
 
+static unsigned int mymode;
+
 static int
 _modinit(void)
 {
-       chmode_table['S'].mode_type = find_cflag_slot();
-       chmode_table['S'].set_func = chm_simple;
-
-       construct_noparam_modes();
+       mymode = cflag_add('S', chm_simple);
+       if (mymode == 0)
+               return -1;
 
        return 0;
 }
 
-
 static void
 _moddeinit(void)
 {
-       chmode_table['S'].mode_type = 0;
-
-       construct_noparam_modes();
+       cflag_orphan('S');
 }
 
-DECLARE_MODULE_AV1(chm_sslonly, _modinit, _moddeinit, NULL, NULL, sslonly_hfnlist, "$Revision$");
+DECLARE_MODULE_AV2(chm_sslonly, _modinit, _moddeinit, NULL, NULL, sslonly_hfnlist, NULL, NULL, chm_sslonly_desc);
 
 static void
 h_can_join(hook_data_channel *data)
@@ -45,8 +46,9 @@ h_can_join(hook_data_channel *data)
        struct Client *source_p = data->client;
        struct Channel *chptr = data->chptr;
 
-       if((chptr->mode.mode & chmode_flags['S']) && !IsSSLClient(source_p)) {
-               sendto_one_notice(source_p, ":Only users using SSL could join this channel!");
+       if((chptr->mode.mode & mymode) && !IsSSLClient(source_p)) {
+               /* XXX This is equal to ERR_THROTTLE */
+               sendto_one_numeric(source_p, 480, "%s :Cannot join channel (+S) - SSL/TLS required", chptr->chname);
                data->approved = ERR_CUSTOM;
        }
 }