Return an error upon trying to set orphaned cmode, rather than just silently ignoring...

[irc/rqf/shadowircd.git] / extensions / chm_operonly.c

diff --git a/extensions/chm_operonly.c b/extensions/chm_operonly.c
index 1ba7aafa3d23a41974000e2ceb73c532628acd6c..5cb87ab31be2ab5d53590eb1b85d02b71cc8f6c7 100644 (file)
--- a/extensions/chm_operonly.c
+++ b/extensions/chm_operonly.c
@@ -10,8 +10,6 @@
 #include "numeric.h"
 #include "chmode.h"
 
-/* gcc -fPIC -DPIC -shared  -I. -I../include -I../libratbox/include   -O0 -Wall -std=gnu99 -g  -DIRCD_PREFIX=\"/home/dwr/build/charybdis\" chm_operonly.c -o chm_operonly.so */
-
 static void h_can_join(hook_data_channel *);
 
 mapi_hfn_list_av1 operonly_hfnlist[] = {
@@ -19,7 +17,7 @@ mapi_hfn_list_av1 operonly_hfnlist[] = {
        { NULL, NULL }
 };
 
-
+static unsigned int mymode;
 
 /* This is a simple example of how to use dynamic channel modes.
  * Not tested enough yet, use at own risk.
@@ -28,27 +26,18 @@ mapi_hfn_list_av1 operonly_hfnlist[] = {
 static int
 _modinit(void)
 {
-       /* add the channel mode to the available slot */
-       chmode_table['O'].mode_type = find_cflag_slot();
-       chmode_table['O'].set_func = chm_simple;
-
-       construct_noparam_modes();
+       mymode = cflag_add('O', chm_staff);
+       if (mymode == 0)
+               return -1;
 
        return 0;
 }
 
 
-/* Well, the first ugly thing is that we changle chmode_table in _modinit
- * and chmode_flags in _moddeinit (different arrays) - must be fixed.
- * -- dwr
- */
 static void
 _moddeinit(void)
 {
-       /* disable the channel mode and remove it from the available list */
-       chmode_table['O'].mode_type = 0;
-
-       construct_noparam_modes();
+       cflag_orphan('O');
 }
 
 DECLARE_MODULE_AV1(chm_operonly, _modinit, _moddeinit, NULL, NULL, operonly_hfnlist, "$Revision$");
@@ -59,8 +48,8 @@ h_can_join(hook_data_channel *data)
        struct Client *source_p = data->client;
        struct Channel *chptr = data->chptr;
 
-       if((chptr->mode.mode & chmode_flags['O']) && !IsOper(source_p)) {
-               sendto_one_notice(source_p, ":Only IRC Operators could join this channel!");
+       if((chptr->mode.mode & mymode) && !IsOper(source_p)) {
+               sendto_one_numeric(source_p, 520, "%s :Cannot join channel (+O) - you are not an IRC operator", chptr->chname);
                data->approved = ERR_CUSTOM;
        }
 }