]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/mode.cpp
Added support for 472 numeric (Unknown mode char) - typobox43
[user/henk/code/inspircd.git] / src / mode.cpp
index c5f179f24b49e8e9ccb9ecf10959160ac45e5841..604111e6f8c179ffeb8a7d9254383871f91ef88a 100644 (file)
@@ -1,3 +1,19 @@
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
+ *                       E-mail:
+ *                <brain@chatspike.net>
+ *               <Craig@chatspike.net>
+ *     
+ * Written by Craig Edwards, Craig McLure, and others.
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
 #include "inspircd.h"
 #include "inspircd_io.h"
 #include "inspircd_util.h"
@@ -40,6 +56,8 @@ using namespace std;
 extern int MODCOUNT;
 extern vector<Module*> modules;
 extern vector<ircd_module*> factory;
+extern std::vector<std::string> module_names;
+
 
 extern int LogLevel;
 extern char ServerName[MAXBUF];
@@ -71,47 +89,56 @@ char* give_ops(userrec *user,char *dest,chanrec *chan,int status)
                log(DEFAULT,"*** BUG *** give_ops was given an invalid parameter");
                return NULL;
        }
-       if ((status < STATUS_OP) && (!is_uline(user->server)))
+
+       if (!isnick(dest))
        {
-               log(DEBUG,"%s cant give ops to %s because they nave status %d and needs %d",user->nick,dest,status,STATUS_OP);
-               WriteServ(user->fd,"482 %s %s :You're not a channel operator",user->nick, chan->name);
+               log(DEFAULT,"the target nickname given to give_ops was invalid");
+               WriteServ(user->fd,"401 %s %s :No suck nick/channel",user->nick, dest);
+               return NULL;
+       }
+       d = Find(dest);
+       if (!d)
+       {
+               log(DEFAULT,"the target nickname given to give_ops couldnt be found");
+               WriteServ(user->fd,"401 %s %s :No suck nick/channel",user->nick, dest);
                return NULL;
        }
        else
        {
-               if (!isnick(dest))
-               {
-                       log(DEFAULT,"the target nickname given to give_ops was invalid");
-                       WriteServ(user->fd,"401 %s %s :No suck nick/channel",user->nick, dest);
+
+               int MOD_RESULT = 0;
+               FOREACH_RESULT(OnAccessCheck(user,d,chan,AC_OP));
+               
+               if (MOD_RESULT == ACR_DENY)
                        return NULL;
-               }
-               d = Find(dest);
-               if (!d)
+               if (MOD_RESULT == ACR_DEFAULT)
                {
-                       log(DEFAULT,"the target nickname given to give_ops couldnt be found");
-                       WriteServ(user->fd,"401 %s %s :No suck nick/channel",user->nick, dest);
-                       return NULL;
+                       if ((status < STATUS_OP) && (!is_uline(user->server)))
+                       {
+                               log(DEBUG,"%s cant give ops to %s because they nave status %d and needs %d",user->nick,dest,status,STATUS_OP);
+                               WriteServ(user->fd,"482 %s %s :You're not a channel operator",user->nick, chan->name);
+                               return NULL;
+                       }
                }
-               else
+
+
+               for (int i = 0; i != MAXCHANS; i++)
                {
-                       for (int i = 0; i != MAXCHANS; i++)
+                       if ((d->chans[i].channel != NULL) && (chan != NULL))
+                       if (!strcasecmp(d->chans[i].channel->name,chan->name))
                        {
-                               if ((d->chans[i].channel != NULL) && (chan != NULL))
-                               if (!strcasecmp(d->chans[i].channel->name,chan->name))
+                       if (d->chans[i].uc_modes & UCMODE_OP)
                                {
-                                       if (d->chans[i].uc_modes & UCMODE_OP)
-                                       {
-                                               /* mode already set on user, dont allow multiple */
-                                               log(DEFAULT,"The target user given to give_ops was already opped on the channel");
-                                               return NULL;
-                                       }
-                                       d->chans[i].uc_modes = d->chans[i].uc_modes | UCMODE_OP;
-                                       log(DEBUG,"gave ops: %s %s",d->chans[i].channel->name,d->nick);
-                                       return d->nick;
+                                       /* mode already set on user, dont allow multiple */
+                                       log(DEFAULT,"The target user given to give_ops was already opped on the channel");
+                                       return NULL;
                                }
+                               d->chans[i].uc_modes = d->chans[i].uc_modes | UCMODE_OP;
+                               log(DEBUG,"gave ops: %s %s",d->chans[i].channel->name,d->nick);
+                               return d->nick;
                        }
-                       log(DEFAULT,"The target channel given to give_ops was not in the users mode list");
                }
+               log(DEFAULT,"The target channel given to give_ops was not in the users mode list");
        }
        return NULL;
 }
@@ -126,40 +153,47 @@ char* give_hops(userrec *user,char *dest,chanrec *chan,int status)
                log(DEFAULT,"*** BUG *** give_hops was given an invalid parameter");
                return NULL;
        }
-       if ((status < STATUS_OP) && (!is_uline(user->server)))
+
+       d = Find(dest);
+       if (!isnick(dest))
        {
-               WriteServ(user->fd,"482 %s %s :You're not a channel operator",user->nick, chan->name);
+               WriteServ(user->fd,"401 %s %s :No suck nick/channel",user->nick, dest);
+               return NULL;
+       }
+       if (!d)
+       {
+               WriteServ(user->fd,"401 %s %s :No suck nick/channel",user->nick, dest);
                return NULL;
        }
        else
        {
-               d = Find(dest);
-               if (!isnick(dest))
-               {
-                       WriteServ(user->fd,"401 %s %s :No suck nick/channel",user->nick, dest);
+               int MOD_RESULT = 0;
+               FOREACH_RESULT(OnAccessCheck(user,d,chan,AC_HALFOP));
+               
+               if (MOD_RESULT == ACR_DENY)
                        return NULL;
-               }
-               if (!d)
+               if (MOD_RESULT == ACR_DEFAULT)
                {
-                       WriteServ(user->fd,"401 %s %s :No suck nick/channel",user->nick, dest);
-                       return NULL;
+                       if ((status < STATUS_OP) && (!is_uline(user->server)))
+                       {
+                               WriteServ(user->fd,"482 %s %s :You're not a channel operator",user->nick, chan->name);
+                               return NULL;
+                       }
                }
-               else
+
+               for (int i = 0; i != MAXCHANS; i++)
                {
-                       for (int i = 0; i != MAXCHANS; i++)
+                       if ((d->chans[i].channel != NULL) && (chan != NULL))
+                       if (!strcasecmp(d->chans[i].channel->name,chan->name))
                        {
-                               if ((d->chans[i].channel != NULL) && (chan != NULL))
-                               if (!strcasecmp(d->chans[i].channel->name,chan->name))
+                               if (d->chans[i].uc_modes & UCMODE_HOP)
                                {
-                                       if (d->chans[i].uc_modes & UCMODE_HOP)
-                                       {
-                                               /* mode already set on user, dont allow multiple */
-                                               return NULL;
-                                       }
-                                       d->chans[i].uc_modes = d->chans[i].uc_modes | UCMODE_HOP;
-                                       log(DEBUG,"gave h-ops: %s %s",d->chans[i].channel->name,d->nick);
-                                       return d->nick;
+                                       /* mode already set on user, dont allow multiple */
+                                       return NULL;
                                }
+                               d->chans[i].uc_modes = d->chans[i].uc_modes | UCMODE_HOP;
+                               log(DEBUG,"gave h-ops: %s %s",d->chans[i].channel->name,d->nick);
+                               return d->nick;
                        }
                }
        }
@@ -176,40 +210,47 @@ char* give_voice(userrec *user,char *dest,chanrec *chan,int status)
                log(DEFAULT,"*** BUG *** give_voice was given an invalid parameter");
                return NULL;
        }
-       if ((status < STATUS_HOP) && (!is_uline(user->server)))
+
+       d = Find(dest);
+       if (!isnick(dest))
+       {
+               WriteServ(user->fd,"401 %s %s :No suck nick/channel",user->nick, dest);
+               return NULL;
+       }
+       if (!d)
        {
-               WriteServ(user->fd,"482 %s %s :You must be at least a half-operator to change modes on this channel",user->nick, chan->name);
+               WriteServ(user->fd,"401 %s %s :No suck nick/channel",user->nick, dest);
                return NULL;
        }
        else
        {
-               d = Find(dest);
-               if (!isnick(dest))
-               {
-                       WriteServ(user->fd,"401 %s %s :No suck nick/channel",user->nick, dest);
+               int MOD_RESULT = 0;
+               FOREACH_RESULT(OnAccessCheck(user,d,chan,AC_VOICE));
+               
+               if (MOD_RESULT == ACR_DENY)
                        return NULL;
-               }
-               if (!d)
+               if (MOD_RESULT == ACR_DEFAULT)
                {
-                       WriteServ(user->fd,"401 %s %s :No suck nick/channel",user->nick, dest);
-                       return NULL;
+                       if ((status < STATUS_HOP) && (!is_uline(user->server)))
+                       {
+                               WriteServ(user->fd,"482 %s %s :You must be at least a half-operator to change modes on this channel",user->nick, chan->name);
+                               return NULL;
+                       }
                }
-               else
+
+               for (int i = 0; i != MAXCHANS; i++)
                {
-                       for (int i = 0; i != MAXCHANS; i++)
+                       if ((d->chans[i].channel != NULL) && (chan != NULL))
+                       if (!strcasecmp(d->chans[i].channel->name,chan->name))
                        {
-                               if ((d->chans[i].channel != NULL) && (chan != NULL))
-                               if (!strcasecmp(d->chans[i].channel->name,chan->name))
+                               if (d->chans[i].uc_modes & UCMODE_VOICE)
                                {
-                                       if (d->chans[i].uc_modes & UCMODE_VOICE)
-                                       {
-                                               /* mode already set on user, dont allow multiple */
-                                               return NULL;
-                                       }
-                                       d->chans[i].uc_modes = d->chans[i].uc_modes | UCMODE_VOICE;
-                                       log(DEBUG,"gave voice: %s %s",d->chans[i].channel->name,d->nick);
-                                       return d->nick;
+                                       /* mode already set on user, dont allow multiple */
+                                       return NULL;
                                }
+                               d->chans[i].uc_modes = d->chans[i].uc_modes | UCMODE_VOICE;
+                               log(DEBUG,"gave voice: %s %s",d->chans[i].channel->name,d->nick);
+                               return d->nick;
                        }
                }
        }
@@ -226,46 +267,52 @@ char* take_ops(userrec *user,char *dest,chanrec *chan,int status)
                log(DEFAULT,"*** BUG *** take_ops was given an invalid parameter");
                return NULL;
        }
-       if ((status < STATUS_OP) && (!is_uline(user->server)))
+
+       d = Find(dest);
+       if (!isnick(dest))
        {
-               log(DEBUG,"%s cant give ops to %s because they have status %d and needs %d",user->nick,dest,status,STATUS_OP);
-               WriteServ(user->fd,"482 %s %s :You're not a channel operator",user->nick, chan->name);
+               log(DEBUG,"take_ops was given an invalid target nickname of %s",dest);
+               WriteServ(user->fd,"401 %s %s :No suck nick/channel",user->nick, dest);
+               return NULL;
+       }
+       if (!d)
+       {
+               log(DEBUG,"take_ops couldnt resolve the target nickname: %s",dest);
+               WriteServ(user->fd,"401 %s %s :No suck nick/channel",user->nick, dest);
                return NULL;
        }
        else
        {
-               d = Find(dest);
-               if (!isnick(dest))
-               {
-                       log(DEBUG,"take_ops was given an invalid target nickname of %s",dest);
-                       WriteServ(user->fd,"401 %s %s :No suck nick/channel",user->nick, dest);
+               int MOD_RESULT = 0;
+               FOREACH_RESULT(OnAccessCheck(user,d,chan,AC_DEOP));
+               
+               if (MOD_RESULT == ACR_DENY)
                        return NULL;
-               }
-               if (!d)
+               if (MOD_RESULT == ACR_DEFAULT)
                {
-                       log(DEBUG,"take_ops couldnt resolve the target nickname: %s",dest);
-                       WriteServ(user->fd,"401 %s %s :No suck nick/channel",user->nick, dest);
-                       return NULL;
+                       if ((status < STATUS_OP) && (!is_uline(user->server)))
+                       {
+                               WriteServ(user->fd,"482 %s %s :You are not a channel operator",user->nick, chan->name);
+                               return NULL;
+                       }
                }
-               else
+
+               for (int i = 0; i != MAXCHANS; i++)
                {
-                       for (int i = 0; i != MAXCHANS; i++)
+                       if ((d->chans[i].channel != NULL) && (chan != NULL))
+                       if (!strcasecmp(d->chans[i].channel->name,chan->name))
                        {
-                               if ((d->chans[i].channel != NULL) && (chan != NULL))
-                               if (!strcasecmp(d->chans[i].channel->name,chan->name))
+                               if ((d->chans[i].uc_modes & UCMODE_OP) == 0)
                                {
-                                       if ((d->chans[i].uc_modes & UCMODE_OP) == 0)
-                                       {
-                                               /* mode already set on user, dont allow multiple */
-                                               return NULL;
-                                       }
-                                       d->chans[i].uc_modes ^= UCMODE_OP;
-                                       log(DEBUG,"took ops: %s %s",d->chans[i].channel->name,d->nick);
-                                       return d->nick;
+                                       /* mode already set on user, dont allow multiple */
+                                       return NULL;
                                }
+                               d->chans[i].uc_modes ^= UCMODE_OP;
+                               log(DEBUG,"took ops: %s %s",d->chans[i].channel->name,d->nick);
+                               return d->nick;
                        }
-                       log(DEBUG,"take_ops couldnt locate the target channel in the target users list");
                }
+               log(DEBUG,"take_ops couldnt locate the target channel in the target users list");
        }
        return NULL;
 }
@@ -280,40 +327,47 @@ char* take_hops(userrec *user,char *dest,chanrec *chan,int status)
                log(DEFAULT,"*** BUG *** take_hops was given an invalid parameter");
                return NULL;
        }
-       if ((status < STATUS_OP) && (!is_uline(user->server)))
+
+       d = Find(dest);
+       if (!isnick(dest))
+       {
+               WriteServ(user->fd,"401 %s %s :No suck nick/channel",user->nick, dest);
+               return NULL;
+       }
+       if (!d)
        {
-               WriteServ(user->fd,"482 %s %s :You're not a channel operator",user->nick, chan->name);
+               WriteServ(user->fd,"401 %s %s :No suck nick/channel",user->nick, dest);
                return NULL;
        }
        else
        {
-               d = Find(dest);
-               if (!isnick(dest))
-               {
-                       WriteServ(user->fd,"401 %s %s :No suck nick/channel",user->nick, dest);
+               int MOD_RESULT = 0;
+               FOREACH_RESULT(OnAccessCheck(user,d,chan,AC_DEHALFOP));
+               
+               if (MOD_RESULT == ACR_DENY)
                        return NULL;
-               }
-               if (!d)
+               if (MOD_RESULT == ACR_DEFAULT)
                {
-                       WriteServ(user->fd,"401 %s %s :No suck nick/channel",user->nick, dest);
-                       return NULL;
+                       if ((status < STATUS_OP) && (!is_uline(user->server)))
+                       {
+                               WriteServ(user->fd,"482 %s %s :You are not a channel operator",user->nick, chan->name);
+                               return NULL;
+                       }
                }
-               else
+
+               for (int i = 0; i != MAXCHANS; i++)
                {
-                       for (int i = 0; i != MAXCHANS; i++)
+                       if ((d->chans[i].channel != NULL) && (chan != NULL))
+                       if (!strcasecmp(d->chans[i].channel->name,chan->name))
                        {
-                               if ((d->chans[i].channel != NULL) && (chan != NULL))
-                               if (!strcasecmp(d->chans[i].channel->name,chan->name))
+                               if ((d->chans[i].uc_modes & UCMODE_HOP) == 0)
                                {
-                                       if ((d->chans[i].uc_modes & UCMODE_HOP) == 0)
-                                       {
-                                               /* mode already set on user, dont allow multiple */
-                                               return NULL;
-                                       }
-                                       d->chans[i].uc_modes ^= UCMODE_HOP;
-                                       log(DEBUG,"took h-ops: %s %s",d->chans[i].channel->name,d->nick);
-                                       return d->nick;
+                                       /* mode already set on user, dont allow multiple */
+                                       return NULL;
                                }
+                               d->chans[i].uc_modes ^= UCMODE_HOP;
+                               log(DEBUG,"took h-ops: %s %s",d->chans[i].channel->name,d->nick);
+                               return d->nick;
                        }
                }
        }
@@ -330,40 +384,47 @@ char* take_voice(userrec *user,char *dest,chanrec *chan,int status)
                log(DEFAULT,"*** BUG *** take_voice was given an invalid parameter");
                return NULL;
        }
-       if ((status < STATUS_HOP) && (!is_uline(user->server)))
+
+       d = Find(dest);
+       if (!isnick(dest))
        {
-               WriteServ(user->fd,"482 %s %s :You must be at least a half-operator to change modes on this channel",user->nick, chan->name);
+               WriteServ(user->fd,"401 %s %s :No suck nick/channel",user->nick, dest);
+               return NULL;
+       }
+       if (!d)
+       {
+               WriteServ(user->fd,"401 %s %s :No suck nick/channel",user->nick, dest);
                return NULL;
        }
        else
        {
-               d = Find(dest);
-               if (!isnick(dest))
-               {
-                       WriteServ(user->fd,"401 %s %s :No suck nick/channel",user->nick, dest);
+               int MOD_RESULT = 0;
+               FOREACH_RESULT(OnAccessCheck(user,d,chan,AC_DEVOICE));
+               
+               if (MOD_RESULT == ACR_DENY)
                        return NULL;
-               }
-               if (!d)
+               if (MOD_RESULT == ACR_DEFAULT)
                {
-                       WriteServ(user->fd,"401 %s %s :No suck nick/channel",user->nick, dest);
-                       return NULL;
+                       if ((status < STATUS_HOP) && (!is_uline(user->server)))
+                       {
+                               WriteServ(user->fd,"482 %s %s :You must be at least a half-operator to change modes on this channel",user->nick, chan->name);
+                               return NULL;
+                       }
                }
-               else
+
+               for (int i = 0; i != MAXCHANS; i++)
                {
-                       for (int i = 0; i != MAXCHANS; i++)
+                       if ((d->chans[i].channel != NULL) && (chan != NULL))
+                       if (!strcasecmp(d->chans[i].channel->name,chan->name))
                        {
-                               if ((d->chans[i].channel != NULL) && (chan != NULL))
-                               if (!strcasecmp(d->chans[i].channel->name,chan->name))
+                               if ((d->chans[i].uc_modes & UCMODE_VOICE) == 0)
                                {
-                                       if ((d->chans[i].uc_modes & UCMODE_VOICE) == 0)
-                                       {
-                                               /* mode already set on user, dont allow multiple */
-                                               return NULL;
-                                       }
-                                       d->chans[i].uc_modes ^= UCMODE_VOICE;
-                                       log(DEBUG,"took voice: %s %s",d->chans[i].channel->name,d->nick);
-                                       return d->nick;
+                                       /* mode already set on user, dont allow multiple */
+                                       return NULL;
                                }
+                               d->chans[i].uc_modes ^= UCMODE_VOICE;
+                               log(DEBUG,"took voice: %s %s",d->chans[i].channel->name,d->nick);
+                               return d->nick;
                        }
                }
        }
@@ -463,6 +524,12 @@ void process_modes(char **parameters,userrec* user,chanrec *chan,int status, int
                return;
        }
 
+       int MOD_RESULT = 0;
+       FOREACH_RESULT(OnAccessCheck(user,NULL,chan,AC_GENERAL_MODE));
+       
+       if (MOD_RESULT == ACR_DENY)
+               return;
+
        log(DEBUG,"process_modes: start: parameters=%d",pcnt);
 
        strcpy(modelist,parameters[1]); /* mode list, e.g. +oo-o */
@@ -748,13 +815,16 @@ void process_modes(char **parameters,userrec* user,chanrec *chan,int status, int
                                break;
                                
                                default:
-                                       log(DEBUG,"Preprocessing custom mode %c",modechar);
+                                       log(DEBUG,"Preprocessing custom mode %c: modelist: %s",modechar,chan->custom_modes);
                                        string_list p;
                                        p.clear();
                                        if (((!strchr(chan->custom_modes,modechar)) && (!mdir)) || ((strchr(chan->custom_modes,modechar)) && (mdir)))
                                        {
-                                               log(DEBUG,"Mode %c isnt set on %s but trying to remove!",modechar,chan->name);
-                                               break;
+                                               if (!ModeIsListMode(modechar,MT_CHANNEL))
+                                               {
+                                                       log(DEBUG,"Mode %c isnt set on %s but trying to remove!",modechar,chan->name);
+                                                       break;
+                                               }
                                        }
                                        if (ModeDefined(modechar,MT_CHANNEL))
                                        {
@@ -773,10 +843,10 @@ void process_modes(char **parameters,userrec* user,chanrec *chan,int status, int
                                                bool handled = false;
                                                if (param>=pcnt)
                                                {
-                                                       log(DEBUG,"Not enough parameters for module-mode %c",modechar);
                                                        // we're supposed to have a parameter, but none was given... so dont handle the mode.
                                                        if (((ModeDefinedOn(modechar,MT_CHANNEL)>0) && (mdir)) || ((ModeDefinedOff(modechar,MT_CHANNEL)>0) && (!mdir))) 
                                                        {
+                                                               log(DEBUG,"Not enough parameters for module-mode %c",modechar);
                                                                handled = true;
                                                                param++;
                                                        }
@@ -785,27 +855,46 @@ void process_modes(char **parameters,userrec* user,chanrec *chan,int status, int
                                                {
                                                        if (!handled)
                                                        {
-                                                               if (modules[i]->OnExtendedMode(user,chan,modechar,MT_CHANNEL,mdir,p))
+                                                               int t = modules[i]->OnExtendedMode(user,chan,modechar,MT_CHANNEL,mdir,p);
+                                                               if (t != 0)
                                                                {
                                                                        log(DEBUG,"OnExtendedMode returned nonzero for a module");
                                                                        char app[] = {modechar, 0};
-                                                                       if (ptr>0)
+                                                                       if (ModeIsListMode(modechar,MT_CHANNEL))
                                                                        {
-                                                                               if ((modelist[ptr-1] == '+') || (modelist[ptr-1] == '-'))
+                                                                               if (t == -1)
                                                                                {
-                                                                                       strcat(outlist, app);
+                                                                                       pc++;
                                                                                }
-                                                                               else if (!strchr(outlist,modechar))
+                                                                               else
                                                                                {
-                                                                                       strcat(outlist, app);
+                                                                                       if (ptr>0)
+                                                                                       {
+                                                                                               strcat(outlist, app);
+                                                                                       }
+                                                                                       strcpy(outpars[pc++],parameters[param++]);
                                                                                }
                                                                        }
-                                                                       chan->SetCustomMode(modechar,mdir);
-                                                                       // include parameters in output if mode has them
-                                                                       if ((ModeDefinedOn(modechar,MT_CHANNEL)>0) && (mdir))
+                                                                       else
                                                                        {
-                                                                               chan->SetCustomModeParam(modelist[ptr],parameters[param],mdir);
-                                                                               strcpy(outpars[pc++],parameters[param++]);
+                                                                               if (ptr>0)
+                                                                               {
+                                                                                       if ((modelist[ptr-1] == '+') || (modelist[ptr-1] == '-'))
+                                                                                       {
+                                                                                               strcat(outlist, app);
+                                                                                       }
+                                                                                       else if (!strchr(outlist,modechar))
+                                                                                       {
+                                                                                               strcat(outlist, app);
+                                                                                       }
+                                                                               }
+                                                                               chan->SetCustomMode(modechar,mdir);
+                                                                               // include parameters in output if mode has them
+                                                                               if ((ModeDefinedOn(modechar,MT_CHANNEL)>0) && (mdir))
+                                                                               {
+                                                                                       chan->SetCustomModeParam(modelist[ptr],parameters[param],mdir);
+                                                                                       strcpy(outpars[pc++],parameters[param++]);
+                                                                               }
                                                                        }
                                                                        // break, because only one module can handle the mode.
                                                                        handled = true;
@@ -813,6 +902,10 @@ void process_modes(char **parameters,userrec* user,chanrec *chan,int status, int
                                                        }
                                                }
                                        }
+                                       else
+                                       {
+                                               WriteServ(user->fd,"472 %s %c :is unknown mode char to me",user->nick,modechar);
+                                       }
                                break;
                                
                        }
@@ -935,7 +1028,7 @@ bool process_module_umode(char umode, userrec* source, void* dest, bool adding)
                {
                        if (modules[i]->OnExtendedMode(source,(void*)dest,umode,MT_CLIENT,adding,p))
                        {
-                               log(DEBUG,"Module claims umode %c",umode);
+                               log(DEBUG,"Module %s claims umode %c",module_names[i].c_str(),umode);
                                return true;
                        }
                }
@@ -975,7 +1068,7 @@ void handle_mode(char **parameters, int pcnt, userrec *user)
 
        if ((dest) && (pcnt == 1))
        {
-               WriteServ(user->fd,"221 %s :+%s",user->nick,user->modes);
+               WriteServ(user->fd,"221 %s :+%s",dest->nick,dest->modes);
                return;
        }
 
@@ -1183,10 +1276,18 @@ void handle_mode(char **parameters, int pcnt, userrec *user)
                        }
                }
 
-               if ((cstatus(user,Ptr) < STATUS_HOP) && (Ptr))
-               {
-                       WriteServ(user->fd,"482 %s %s :You must be at least a half-operator to change modes on this channel",user->nick, Ptr->name);
+               int MOD_RESULT = 0;
+               FOREACH_RESULT(OnAccessCheck(user,NULL,Ptr,AC_GENERAL_MODE));
+               
+               if (MOD_RESULT == ACR_DENY)
                        return;
+               if (MOD_RESULT == ACR_DEFAULT)
+               {
+                       if ((cstatus(user,Ptr) < STATUS_HOP) && (Ptr))
+                       {
+                               WriteServ(user->fd,"482 %s %s :You must be at least a half-operator to change modes on this channel",user->nick, Ptr->name);
+                               return;
+                       }
                }
 
                process_modes(parameters,user,Ptr,cstatus(user,Ptr),pcnt,false,false,false);