]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/mode.cpp
select not case
[user/henk/code/inspircd.git] / src / mode.cpp
index 9b7d29e94b189cec579dc64162ca2685bbc108cb..bb9bd3c517755895d5107b81fc025a0d6ff195bc 100644 (file)
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *                       E-mail:
  *                <brain@chatspike.net>
  *               <Craig@chatspike.net>
  * ---------------------------------------------------
  */
 
+using namespace std;
+
+#include "inspircd_config.h"
 #include "inspircd.h"
 #include "inspircd_io.h"
-#include "inspircd_util.h"
-#include "inspircd_config.h"
 #include <unistd.h>
-#include <fcntl.h>
 #include <sys/errno.h>
-#include <sys/ioctl.h>
-#include <sys/utsname.h>
-#include <cstdio>
 #include <time.h>
 #include <string>
 #ifdef GCC3
 #include <map>
 #include <sstream>
 #include <vector>
-#include <errno.h>
 #include <deque>
-#include <errno.h>
-#include <unistd.h>
-#include <sched.h>
 #include "connection.h"
 #include "users.h"
-#include "servers.h"
 #include "ctables.h"
 #include "globals.h"
 #include "modules.h"
 #include "message.h"
 #include "commands.h"
 #include "xline.h"
-
-using namespace std;
+#include "inspstring.h"
+#include "helperfuncs.h"
+#include "mode.h"
 
 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];
-extern char Network[MAXBUF];
-extern char ServerDesc[MAXBUF];
-extern char AdminName[MAXBUF];
-extern char AdminEmail[MAXBUF];
-extern char AdminNick[MAXBUF];
-extern char diepass[MAXBUF];
-extern char restartpass[MAXBUF];
-extern char motd[MAXBUF];
-extern char rules[MAXBUF];
-extern char list[MAXBUF];
-extern char PrefixQuit[MAXBUF];
-extern char DieValue[MAXBUF];
-
-extern bool AllowHalfop;
-extern bool AllowProtect;
-extern bool AllowFounder;
-
-
-char* give_ops(userrec *user,char *dest,chanrec *chan,int status)
+extern std::vector<Module*> modules;
+extern std::vector<ircd_module*> factory;
+extern InspIRCd* ServerInstance;
+extern ServerConfig* Config;
+
+extern time_t TIME;
+
+userrec* ModeParser::SanityChecks(userrec *user,char *dest,chanrec *chan,int status)
 {
        userrec *d;
-       int i;
-       
-       if ((!user) || (!dest) || (!chan))
-       {
-               log(DEFAULT,"*** BUG *** give_ops was given an invalid parameter");
-               return NULL;
-       }
-
-       if (!isnick(dest))
+       if ((!user) || (!dest) || (!chan) || (!*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);
                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);
+               WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, dest);
                return NULL;
        }
-       else
-       {
+       return d;
+}
 
-               int MOD_RESULT = 0;
-               FOREACH_RESULT(OnAccessCheck(user,d,chan,AC_OP));
-               
-               if (MOD_RESULT == ACR_DENY)
-                       return NULL;
-               if (MOD_RESULT == ACR_DEFAULT)
+char* ModeParser::Grant(userrec *d,chanrec *chan,int MASK)
+{
+       for (unsigned int i = 0; i < d->chans.size(); i++)
+       {
+               if ((d->chans[i].channel != NULL) && (chan != NULL))
+               if (d->chans[i].channel == chan)
                {
-                       if ((status < STATUS_OP) && (!is_uline(user->server)))
+                       if (d->chans[i].uc_modes & MASK)
                        {
-                               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;
                        }
-               }
-
-
-               for (int i = 0; i != MAXCHANS; i++)
-               {
-                       if ((d->chans[i].channel != NULL) && (chan != NULL))
-                       if (!strcasecmp(d->chans[i].channel->name,chan->name))
+                       d->chans[i].uc_modes = d->chans[i].uc_modes | MASK;
+                       switch (MASK)
                        {
-                       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;
+                               case UCMODE_OP:
+                                       d->chans[i].channel->AddOppedUser((char*)d);
+                               break;
+                               case UCMODE_HOP:
+                                       d->chans[i].channel->AddHalfoppedUser((char*)d);
+                               break;
+                               case UCMODE_VOICE:
+                                       d->chans[i].channel->AddVoicedUser((char*)d);
+                               break;
                        }
+                       log(DEBUG,"grant: %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");
        }
        return NULL;
 }
 
-char* give_hops(userrec *user,char *dest,chanrec *chan,int status)
+char* ModeParser::Revoke(userrec *d,chanrec *chan,int MASK)
 {
-       userrec *d;
-       int i;
-       
-       if ((!user) || (!dest) || (!chan))
-       {
-               log(DEFAULT,"*** BUG *** give_hops was given an invalid parameter");
-               return NULL;
-       }
-
-       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,"401 %s %s :No suck nick/channel",user->nick, dest);
-               return NULL;
-       }
-       else
+       for (unsigned int i = 0; i < d->chans.size(); i++)
        {
-               int MOD_RESULT = 0;
-               FOREACH_RESULT(OnAccessCheck(user,d,chan,AC_HALFOP));
-               
-               if (MOD_RESULT == ACR_DENY)
-                       return NULL;
-               if (MOD_RESULT == ACR_DEFAULT)
+               if ((d->chans[i].channel != NULL) && (chan != NULL))
+               if (d->chans[i].channel == chan)
                {
-                       if ((status < STATUS_OP) && (!is_uline(user->server)))
+                       if ((d->chans[i].uc_modes & MASK) == 0)
                        {
-                               WriteServ(user->fd,"482 %s %s :You're not a channel operator",user->nick, chan->name);
                                return NULL;
                        }
+                       d->chans[i].uc_modes ^= MASK;
+                       switch (MASK)
+                       {
+                               case UCMODE_OP:
+                                       d->chans[i].channel->DelOppedUser((char*)d);
+                               break;
+                               case UCMODE_HOP:
+                                       d->chans[i].channel->DelHalfoppedUser((char*)d);
+                               break;
+                               case UCMODE_VOICE:
+                                       d->chans[i].channel->DelVoicedUser((char*)d);
+                               break;
+                       }
+                       log(DEBUG,"revoke: %s %s",d->chans[i].channel->name,d->nick);
+                       return d->nick;
                }
+       }
+       return NULL;
+}
 
-               for (int i = 0; i != MAXCHANS; i++)
+char* ModeParser::GiveOps(userrec *user,char *dest,chanrec *chan,int status)
+{
+       userrec *d = this->SanityChecks(user,dest,chan,status);
+       
+       if (d)
+       {
+               if (IS_LOCAL(user))
                {
-                       if ((d->chans[i].channel != NULL) && (chan != NULL))
-                       if (!strcasecmp(d->chans[i].channel->name,chan->name))
+                       int MOD_RESULT = 0;
+                       FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_OP));
+                       
+                       if (MOD_RESULT == ACR_DENY)
+                               return NULL;
+                       if (MOD_RESULT == ACR_DEFAULT)
                        {
-                               if (d->chans[i].uc_modes & UCMODE_HOP)
+                               if ((status < STATUS_OP) && (!is_uline(user->server)))
                                {
-                                       /* mode already set on user, dont allow multiple */
+                                       WriteServ(user->fd,"482 %s %s :You're not a channel operator",user->nick, chan->name);
                                        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;
                        }
                }
+
+               return this->Grant(d,chan,UCMODE_OP);
        }
        return NULL;
 }
 
-char* give_voice(userrec *user,char *dest,chanrec *chan,int status)
+char* ModeParser::GiveHops(userrec *user,char *dest,chanrec *chan,int status)
 {
-       userrec *d;
-       int i;
+       userrec *d = this->SanityChecks(user,dest,chan,status);
        
-       if ((!user) || (!dest) || (!chan))
-       {
-               log(DEFAULT,"*** BUG *** give_voice was given an invalid parameter");
-               return NULL;
-       }
-
-       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,"401 %s %s :No suck nick/channel",user->nick, dest);
-               return NULL;
-       }
-       else
+       if (d)
        {
-               int MOD_RESULT = 0;
-               FOREACH_RESULT(OnAccessCheck(user,d,chan,AC_VOICE));
-               
-               if (MOD_RESULT == ACR_DENY)
-                       return NULL;
-               if (MOD_RESULT == ACR_DEFAULT)
+               if (IS_LOCAL(user))
                {
-                       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);
+                       int MOD_RESULT = 0;
+                       FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_HALFOP));
+               
+                       if (MOD_RESULT == ACR_DENY)
                                return NULL;
-                       }
-               }
-
-               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 (MOD_RESULT == ACR_DEFAULT)
                        {
-                               if (d->chans[i].uc_modes & UCMODE_VOICE)
+                               if ((status < STATUS_OP) && (!is_uline(user->server)))
                                {
-                                       /* mode already set on user, dont allow multiple */
+                                       WriteServ(user->fd,"482 %s %s :You're not a channel operator",user->nick, chan->name);
                                        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;
                        }
                }
+
+               return this->Grant(d,chan,UCMODE_HOP);
        }
        return NULL;
 }
 
-char* take_ops(userrec *user,char *dest,chanrec *chan,int status)
+char* ModeParser::GiveVoice(userrec *user,char *dest,chanrec *chan,int status)
 {
-       userrec *d;
-       int i;
+       userrec *d = this->SanityChecks(user,dest,chan,status);
        
-       if ((!user) || (!dest) || (!chan))
-       {
-               log(DEFAULT,"*** BUG *** take_ops was given an invalid parameter");
-               return NULL;
-       }
-
-       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);
-               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
+       if (d)
        {
-               int MOD_RESULT = 0;
-               FOREACH_RESULT(OnAccessCheck(user,d,chan,AC_DEOP));
-               
-               if (MOD_RESULT == ACR_DENY)
-                       return NULL;
-               if (MOD_RESULT == ACR_DEFAULT)
+               if (IS_LOCAL(user))
                {
-                       if ((status < STATUS_OP) && (!is_uline(user->server)))
-                       {
-                               WriteServ(user->fd,"482 %s %s :You are not a channel operator",user->nick, chan->name);
+                       int MOD_RESULT = 0;
+                       FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_VOICE));
+                       
+                       if (MOD_RESULT == ACR_DENY)
                                return NULL;
-                       }
-               }
-
-               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 (MOD_RESULT == ACR_DEFAULT)
                        {
-                               if ((d->chans[i].uc_modes & UCMODE_OP) == 0)
+                               if ((status < STATUS_HOP) && (!is_uline(user->server)))
                                {
-                                       /* mode already set on user, dont allow multiple */
+                                       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;
                                }
-                               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");
+
+               return this->Grant(d,chan,UCMODE_VOICE);
        }
        return NULL;
 }
 
-char* take_hops(userrec *user,char *dest,chanrec *chan,int status)
+char* ModeParser::TakeOps(userrec *user,char *dest,chanrec *chan,int status)
 {
-       userrec *d;
-       int i;
+       userrec *d = this->SanityChecks(user,dest,chan,status);
        
-       if ((!user) || (!dest) || (!chan))
-       {
-               log(DEFAULT,"*** BUG *** take_hops was given an invalid parameter");
-               return NULL;
-       }
-
-       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,"401 %s %s :No suck nick/channel",user->nick, dest);
-               return NULL;
-       }
-       else
+       if (d)
        {
-               int MOD_RESULT = 0;
-               FOREACH_RESULT(OnAccessCheck(user,d,chan,AC_DEHALFOP));
-               
-               if (MOD_RESULT == ACR_DENY)
-                       return NULL;
-               if (MOD_RESULT == ACR_DEFAULT)
+               if (IS_LOCAL(user))
                {
-                       if ((status < STATUS_OP) && (!is_uline(user->server)))
-                       {
-                               WriteServ(user->fd,"482 %s %s :You are not a channel operator",user->nick, chan->name);
+                       int MOD_RESULT = 0;
+                       FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_DEOP));
+                       
+                       if (MOD_RESULT == ACR_DENY)
                                return NULL;
-                       }
-               }
-
-               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 (MOD_RESULT == ACR_DEFAULT)
                        {
-                               if ((d->chans[i].uc_modes & UCMODE_HOP) == 0)
+                               if ((status < STATUS_OP) && (!is_uline(user->server)) && (IS_LOCAL(user)))
                                {
-                                       /* mode already set on user, dont allow multiple */
+                                       WriteServ(user->fd,"482 %s %s :You are not a channel operator",user->nick, chan->name);
                                        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;
                        }
                }
+
+               return this->Revoke(d,chan,UCMODE_OP);
        }
        return NULL;
 }
 
-char* take_voice(userrec *user,char *dest,chanrec *chan,int status)
+char* ModeParser::TakeHops(userrec *user,char *dest,chanrec *chan,int status)
 {
-       userrec *d;
-       int i;
+       userrec *d = this->SanityChecks(user,dest,chan,status);
        
-       if ((!user) || (!dest) || (!chan))
-       {
-               log(DEFAULT,"*** BUG *** take_voice was given an invalid parameter");
-               return NULL;
-       }
-
-       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,"401 %s %s :No suck nick/channel",user->nick, dest);
-               return NULL;
-       }
-       else
+       if (d)
        {
-               int MOD_RESULT = 0;
-               FOREACH_RESULT(OnAccessCheck(user,d,chan,AC_DEVOICE));
-               
-               if (MOD_RESULT == ACR_DENY)
-                       return NULL;
-               if (MOD_RESULT == ACR_DEFAULT)
+               if (IS_LOCAL(user))
                {
-                       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);
+                       int MOD_RESULT = 0;
+                       FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_DEHALFOP));
+                       
+                       if (MOD_RESULT == ACR_DENY)
                                return NULL;
+                       if (MOD_RESULT == ACR_DEFAULT)
+                       {
+                               /* Tweak by Brain suggested by w00t, allow a halfop to dehalfop themselves */
+                               if ((user != d) && ((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;
+                               }
                        }
                }
 
-               for (int i = 0; i != MAXCHANS; i++)
+               return this->Revoke(d,chan,UCMODE_HOP);
+       }
+       return NULL;
+}
+
+char* ModeParser::TakeVoice(userrec *user,char *dest,chanrec *chan,int status)
+{
+       userrec *d = this->SanityChecks(user,dest,chan,status);
+
+       if (d)  
+       {
+               if (IS_LOCAL(user))
                {
-                       if ((d->chans[i].channel != NULL) && (chan != NULL))
-                       if (!strcasecmp(d->chans[i].channel->name,chan->name))
+                       int MOD_RESULT = 0;
+                       FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_DEVOICE));
+                       
+                       if (MOD_RESULT == ACR_DENY)
+                               return NULL;
+                       if (MOD_RESULT == ACR_DEFAULT)
                        {
-                               if ((d->chans[i].uc_modes & UCMODE_VOICE) == 0)
+                               if ((status < STATUS_HOP) && (!is_uline(user->server)))
                                {
-                                       /* mode already set on user, dont allow multiple */
+                                       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;
                                }
-                               d->chans[i].uc_modes ^= UCMODE_VOICE;
-                               log(DEBUG,"took voice: %s %s",d->chans[i].channel->name,d->nick);
-                               return d->nick;
                        }
                }
+
+               return this->Revoke(d,chan,UCMODE_VOICE);
        }
        return NULL;
 }
 
-char* add_ban(userrec *user,char *dest,chanrec *chan,int status)
+char* ModeParser::AddBan(userrec *user,char *dest,chanrec *chan,int status)
 {
-       if ((!user) || (!dest) || (!chan)) {
-               log(DEFAULT,"*** BUG *** add_ban was given an invalid parameter");
+       BanItem b;
+       int toomanyexclamation = 0;
+       int toomanyat = 0;
+
+       if ((!user) || (!dest) || (!chan) || (!*dest))
+       {
+               log(DEFAULT,"*** BUG *** AddBan was given an invalid parameter");
                return NULL;
        }
 
-       BanItem b;
-       if ((!user) || (!dest) || (!chan))
-               return NULL;
-       if (strchr(dest,'!')==0)
-               return NULL;
-       if (strchr(dest,'@')==0)
-               return NULL;
-       for (int i = 0; i < strlen(dest); i++)
-               if (dest[i] < 32)
-                       return NULL;
-       for (int i = 0; i < strlen(dest); i++)
-               if (dest[i] > 126)
+       for (char* i = dest; *i; i++)
+       {
+               if ((*i < 32) || (*i > 126))
+               {
                        return NULL;
-       int c = 0;
-       for (int i = 0; i < strlen(dest); i++)
-               if (dest[i] == '!')
-                       c++;
-       if (c>1)
+               }
+               else if (*i == '!')
+               {
+                       toomanyexclamation++;
+               }
+               else if (*i == '@')
+               {
+                       toomanyat++;
+               }
+       }
+
+       if (toomanyexclamation != 1 || toomanyat != 1)
+               /*
+                * this stops sillyness like n!u!u!u@h, though note that most
+                * ircds don't actually verify banmask validity. --w00t
+                */
+               return NULL;
+
+       long maxbans = GetMaxBans(chan->name);
+       if ((unsigned)chan->bans.size() > (unsigned)maxbans)
+       {
+               WriteServ(user->fd,"478 %s %s :Channel ban list for %s is full (maximum entries for this channel is %d)",user->nick, chan->name,chan->name,maxbans);
                return NULL;
-       c = 0;
-       for (int i = 0; i < strlen(dest); i++)
-               if (dest[i] == '@')
-                       c++;
-       if (c>1)
+       }
+
+       log(DEBUG,"AddBan: %s %s",chan->name,user->nick);
+
+       int MOD_RESULT = 0;
+       FOREACH_RESULT(I_OnAddBan,OnAddBan(user,chan,dest));
+       if (MOD_RESULT)
                return NULL;
-       log(DEBUG,"add_ban: %s %s",chan->name,user->nick);
 
        TidyBan(dest);
        for (BanList::iterator i = chan->bans.begin(); i != chan->bans.end(); i++)
@@ -475,17 +360,24 @@ char* add_ban(userrec *user,char *dest,chanrec *chan,int status)
                }
        }
 
-       b.set_time = time(NULL);
-       strncpy(b.data,dest,MAXBUF);
-       strncpy(b.set_by,user->nick,NICKMAX);
+       b.set_time = TIME;
+       strlcpy(b.data,dest,MAXBUF);
+       if (*user->nick)
+       {
+               strlcpy(b.set_by,user->nick,NICKMAX-1);
+       }
+       else
+       {
+               strlcpy(b.set_by,Config->ServerName,NICKMAX-1);
+       }
        chan->bans.push_back(b);
        return dest;
 }
 
-char* take_ban(userrec *user,char *dest,chanrec *chan,int status)
+char* ModeParser::TakeBan(userrec *user,char *dest,chanrec *chan,int status)
 {
-       if ((!user) || (!dest) || (!chan)) {
-               log(DEFAULT,"*** BUG *** take_ban was given an invalid parameter");
+       if ((!user) || (!dest) || (!chan) || (!*dest)) {
+               log(DEFAULT,"*** BUG *** TakeBan was given an invalid parameter");
                return 0;
        }
 
@@ -494,6 +386,10 @@ char* take_ban(userrec *user,char *dest,chanrec *chan,int status)
        {
                if (!strcasecmp(i->data,dest))
                {
+                       int MOD_RESULT = 0;
+                       FOREACH_RESULT(I_OnDelBan,OnDelBan(user,chan,dest));
+                       if (MOD_RESULT)
+                               return NULL;
                        chan->bans.erase(i);
                        return dest;
                }
@@ -501,434 +397,621 @@ char* take_ban(userrec *user,char *dest,chanrec *chan,int status)
        return NULL;
 }
 
-void process_modes(char **parameters,userrec* user,chanrec *chan,int status, int pcnt, bool servermode, bool silent, bool local)
+// tidies up redundant modes, e.g. +nt-nt+i becomes +-+i,
+// a section further down the chain tidies up the +-+- crap.
+std::string ModeParser::CompressModes(std::string modes,bool channelmodes)
+{
+       int counts[127];
+       bool active[127];
+       memset(counts,0,sizeof(counts));
+       memset(active,0,sizeof(active));
+       for (unsigned int i = 0; i < modes.length(); i++)
+       {
+               if ((modes[i] == '+') || (modes[i] == '-'))
+                       continue;
+               if (channelmodes)
+               {
+                       if ((strchr("itnmsp",modes[i])) || ((ModeDefined(modes[i],MT_CHANNEL)) && (ModeDefinedOn(modes[i],MT_CHANNEL)==0) && (ModeDefinedOff(modes[i],MT_CHANNEL)==0)))
+                       {
+                               log(DEBUG,"Tidy mode %c",modes[i]);
+                               counts[(unsigned int)modes[i]]++;
+                               active[(unsigned int)modes[i]] = true;
+                       }
+               }
+               else
+               {
+                       log(DEBUG,"Tidy mode %c",modes[i]);
+                       counts[(unsigned int)modes[i]]++;
+                       active[(unsigned int)modes[i]] = true;
+               }
+       }
+       for (int j = 65; j < 127; j++)
+       {
+               if ((counts[j] > 1) && (active[j] == true))
+               {
+                       static char v[2];
+                       v[0] = (unsigned char)j;
+                       v[1] = '\0';
+                       std::string mode_str = v;
+                       std::string::size_type pos = modes.find(mode_str);
+                       if (pos != std::string::npos)
+                       {
+                               log(DEBUG,"all occurances of mode %c to be deleted...",(unsigned char)j);
+                               while (modes.find(mode_str) != std::string::npos)
+                                       modes.erase(modes.find(mode_str),1);
+                               log(DEBUG,"New mode line: %s",modes.c_str());
+                       }
+               }
+       }
+       return modes;
+}
+
+void ModeParser::ProcessModes(char **parameters,userrec* user,chanrec *chan,int status, int pcnt, bool servermode, bool silent, bool local)
 {
-       if (!parameters) {
-               log(DEFAULT,"*** BUG *** process_modes was given an invalid parameter");
+       if ((!parameters) || (pcnt < 2)) {
                return;
        }
 
-       char modelist[MAXBUF];
        char outlist[MAXBUF];
-       char outstr[MAXBUF];
-       char outpars[32][MAXBUF];
+       char *outpars[32];
        int param = 2;
        int pc = 0;
        int ptr = 0;
        int mdir = 1;
        char* r = NULL;
-       bool k_set = false, l_set = false;
-
-       if (pcnt < 2)
-       {
-               return;
-       }
+       bool k_set = false, l_set = false, previously_set_l = false, previously_unset_l = false, previously_set_k = false, previously_unset_k = false;
 
        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);
+       if (IS_LOCAL(user))
+       {
+               FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,NULL,chan,AC_GENERAL_MODE));  
+               if (MOD_RESULT == ACR_DENY)
+                       return;
+       }
 
-       strlcpy(modelist,parameters[1],MAXBUF); /* mode list, e.g. +oo-o *
+       char* modelist = parameters[1];         /* mode list, e.g. +oo-o *
                                                 * parameters[2] onwards are parameters for
                                                 * modes that require them :) */
-       strlcpy(outlist,"+",MAXBUF);
-       mdir = 1;
+       *outlist = *modelist;
+       char* outl = outlist+1;
+
+       mdir = (*modelist == '+');
 
        log(DEBUG,"process_modes: modelist: %s",modelist);
 
-       for (ptr = 0; ptr < strlen(modelist); ptr++)
+       std::string tidied = this->CompressModes(modelist,true);
+       strlcpy(modelist,tidied.c_str(),MAXBUF);
+
+       int len = tidied.length();
+       while (modelist[len-1] == ' ')
+               modelist[--len] = '\0';
+
+       for (char* modechar = (modelist + 1); *modechar; ptr++, modechar++)
        {
                r = NULL;
 
-               {
-                       log(DEBUG,"process_modes: modechar: %c",modelist[ptr]);
-                       char modechar = modelist[ptr];
-                       switch (modelist[ptr])
-                       {
-                               case '-':
-                                       if (mdir != 0)
-                                       {
-                                               if ((outlist[strlen(outlist)-1] == '+') || (outlist[strlen(outlist)-1] == '-'))
-                                               {
-                                                       outlist[strlen(outlist)-1] = '-';
-                                               }
-                                               else
-                                               {
-                                                       strcat(outlist,"-");
-                                               }
-                                       }
-                                       mdir = 0;
-                                       
-                               break;                  
+               /* If we have more than MAXMODES changes in one line,
+                * drop all after the MAXMODES
+                */
+               if (pc > MAXMODES-1)
+                       break;
 
-                               case '+':
-                                       if (mdir != 1)
-                                       {
-                                               if ((outlist[strlen(outlist)-1] == '+') || (outlist[strlen(outlist)-1] == '-'))
-                                               {
-                                                       outlist[strlen(outlist)-1] = '+';
-                                               }
-                                               else
-                                               {
-                                                       strcat(outlist,"+");
-                                               }
-                                       }
-                                       mdir = 1;
-                               break;
 
-                               case 'o':
-                                       log(DEBUG,"Ops");
-                                       if ((param >= pcnt)) break;
-                                       log(DEBUG,"Enough parameters left");
-                                       if (mdir == 1)
+               
+               switch (*modechar)
+               {
+                       case '-':
+                               *outl++ = '-';
+                               mdir = 0;
+                       break;                  
+
+                       case '+':
+                               *outl++ = '+';
+                               mdir = 1;
+                       break;
+
+                       case 'o':
+                               log(DEBUG,"Ops");
+                               if ((param >= pcnt)) break;
+                               log(DEBUG,"Enough parameters left");
+                               r = NULL;
+                               if (mdir == 1)
+                               {
+                                       MOD_RESULT = 0;
+                                       FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'o', parameters[param], true, 1));
+                                       if (!MOD_RESULT)
                                        {
-                                               log(DEBUG,"calling give_ops");
-                                               r = give_ops(user,parameters[param++],chan,status);
+                                               r = GiveOps(user,parameters[param++],chan,status);
                                        }
-                                       else
-                                       {
-                                               log(DEBUG,"calling take_ops");
-                                               r = take_ops(user,parameters[param++],chan,status);
-                                       }
-                                       if (r)
-                                       {
-                                               strlcat(outlist,"o",MAXBUF);
-                                               strlcpy(outpars[pc++],r,MAXBUF);
+                                       else param++;
+                               }
+                               else
+                               {
+                                        MOD_RESULT = 0;
+                                        FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'o', parameters[param], false, 1));
+                                        if (!MOD_RESULT)
+                                        {
+                                               r = TakeOps(user,parameters[param++],chan,status);
                                        }
-                               break;
+                                       else param++;
+                               }
+                               if (r)
+                               {
+                                       *outl++ = 'o';
+                                       outpars[pc++] = r;
+                               }
+                       break;
                        
-                               case 'h':
-                                       if (((param >= pcnt)) || (!AllowHalfop)) break;
-                                       if (mdir == 1)
-                                       {
-                                               r = give_hops(user,parameters[param++],chan,status);
-                                       }
-                                       else
-                                       {
-                                               r = take_hops(user,parameters[param++],chan,status);
+                       case 'h':
+                               if (((param >= pcnt)) || (!Config->AllowHalfop)) break;
+                               r = NULL;
+                               if (mdir == 1)
+                               {
+                                        MOD_RESULT = 0;
+                                        FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'h', parameters[param], true, 1));
+                                        if (!MOD_RESULT)
+                                        {
+                                               r = GiveHops(user,parameters[param++],chan,status);
                                        }
-                                       if (r)
-                                       {
-                                               strlcat(outlist,"h",MAXBUF);
-                                               strlcpy(outpars[pc++],r,MAXBUF);
+                                       else param++;
+                               }
+                               else
+                               {
+                                        MOD_RESULT = 0;
+                                        FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'h', parameters[param], false, 1));
+                                        if (!MOD_RESULT)
+                                        {
+                                               r = TakeHops(user,parameters[param++],chan,status);
                                        }
-                               break;
+                                       else param++;
+                               }
+                               if (r)
+                               {
+                                       *outl++ = 'h';
+                                       outpars[pc++] = r;
+                               }
+                       break;
                        
                                
-                               case 'v':
+                       case 'v':
                                        if ((param >= pcnt)) break;
+                                       r = NULL;
                                        if (mdir == 1)
                                        {
-                                               r = give_voice(user,parameters[param++],chan,status);
+                                                MOD_RESULT = 0;
+                                                FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'v', parameters[param], true, 1));
+                                                if (!MOD_RESULT)
+                                                {
+                                                       r = GiveVoice(user,parameters[param++],chan,status);
+                                               }
+                                               else param++;
                                        }
                                        else
                                        {
-                                               r = take_voice(user,parameters[param++],chan,status);
+                                                MOD_RESULT = 0;
+                                                FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'v', parameters[param], false, 1));
+                                                if (!MOD_RESULT)
+                                                {
+                                                       r = TakeVoice(user,parameters[param++],chan,status);
+                                               }
+                                               else param++;
                                        }
                                        if (r)
                                        {
-                                               strlcat(outlist,"v",MAXBUF);
-                                               strlcpy(outpars[pc++],r,MAXBUF);
+                                               *outl++ = 'v';
+                                               outpars[pc++] = r;
                                        }
-                               break;
+                       break;
                                
-                               case 'b':
-                                       if ((param >= pcnt)) break;
-                                       if (mdir == 1)
-                                       {
-                                               r = add_ban(user,parameters[param++],chan,status);
-                                       }
-                                       else
-                                       {
-                                               r = take_ban(user,parameters[param++],chan,status);
+                       case 'b':
+                               if ((param >= pcnt)) break;
+                               r = NULL;
+                               if (mdir == 1)
+                               {
+                                        MOD_RESULT = 0;
+                                        FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'b', parameters[param], true, 1));
+                                        if (!MOD_RESULT)
+                                        {
+                                               r = AddBan(user,parameters[param++],chan,status);
                                        }
-                                       if (r)
-                                       {
-                                               strlcat(outlist,"b",MAXBUF);
-                                               strlcpy(outpars[pc++],parameters[param-1],MAXBUF);
+                                       else param++;
+                               }
+                               else
+                               {
+                                        MOD_RESULT = 0;
+                                        FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'b', parameters[param], false, 1));
+                                        if (!MOD_RESULT)
+                                        {
+                                               r = TakeBan(user,parameters[param++],chan,status);
                                        }
-                               break;
+                                       else param++;
+                               }
+                               if (r)
+                               {
+                                       *outl++ = 'b';
+                                       outpars[pc++] = parameters[param-1];
+                               }
+                       break;
 
 
-                               case 'k':
-                                       if ((param >= pcnt))
+                       case 'k':
+                               if ((param >= pcnt))
+                                       break;
+
+                               if (mdir == 1)
+                               {
+                                       if (k_set)
                                                break;
 
-                                       if (mdir == 1)
-                                       {
-                                               if (k_set)
-                                                       break;
+                                       if (previously_unset_k)
+                                               break;
+                                       previously_set_k = true;
                                                
-                                               if (!strcmp(chan->key,""))
+                                       if (!*chan->key)
+                                       {
+                                               MOD_RESULT = 0;
+                                               FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'k', parameters[param], true, 1));
+                                               if (!MOD_RESULT)
                                                {
-                                                       strcat(outlist,"k");
+                                                       *outl++ = 'k';
                                                        char key[MAXBUF];
-                                                       strlcpy(key,parameters[param++],MAXBUF);
-                                                       if (strlen(key)>32) {
-                                                               key[31] = '\0';
-                                                       }
-                                                       strlcpy(outpars[pc++],key,MAXBUF);
+                                                       strlcpy(key,parameters[param++],32);
+                                                       outpars[pc++] = key;
                                                        strlcpy(chan->key,key,MAXBUF);
                                                        k_set = true;
                                                }
+                                               else param++;
                                        }
-                                       else
+                               }
+                               else
+                               {
+                                       /* checks on -k are case sensitive and only accurate to the
+                                                  first 32 characters */
+                                       if (previously_set_k)
+                                               break;
+                                       previously_unset_k = true;
+
+                                       char key[MAXBUF];
+                                       MOD_RESULT = 0;
+                                       FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'k', parameters[param], false, 1));
+                                       if (!MOD_RESULT)
                                        {
-                                               /* checks on -k are case sensitive and only accurate to the
-                                                  first 32 characters */
-                                               char key[MAXBUF];
-                                               strlcpy(key,parameters[param++],MAXBUF);
-                                               if (strlen(key)>32) {
-                                                       key[31] = '\0';
-                                               }
+                                               strlcpy(key,parameters[param++],32);
                                                /* only allow -k if correct key given */
                                                if (!strcmp(chan->key,key))
                                                {
-                                                       strlcat(outlist,"k",MAXBUF);
-                                                       strlcpy(chan->key,"",MAXBUF);
-                                                       strlcpy(outpars[pc++],key,MAXBUF);
+                                                       *outl++ = 'k';
+                                                       *chan->key = 0;
+                                                       outpars[pc++] = key;
                                                }
                                        }
-                               break;
+                                       else param++;
+                               }
+                       break;
                                
-                               case 'l':
-                                       if (mdir == 0)
-                                       {
+                       case 'l':
+                               if (mdir == 0)
+                               {
+                                       if (previously_set_l)
+                                               break;
+                                       previously_unset_l = true;
+                                        MOD_RESULT = 0;
+                                        FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'l', "", false, 0));
+                                        if (!MOD_RESULT)
+                                        {
                                                if (chan->limit)
                                                {
-                                                       strcat(outlist,"l");
+                                                       *outl++ = 'l';
                                                        chan->limit = 0;
                                                }
                                        }
+                               }
                                        
-                                       if ((param >= pcnt)) break;
-                                       if (mdir == 1)
+                               if ((param >= pcnt)) break;
+                               if (mdir == 1)
+                               {
+                                       if (l_set)
+                                               break;
+                                       if (previously_unset_l)
+                                               break;
+                                       previously_set_l = true;
+                                       bool invalid = false;
+                                       for (char* f = parameters[param]; *f; f++)
                                        {
-                                               if (l_set)
-                                                       break;
-                                               
-                                               bool invalid = false;
-                                               for (int i = 0; i < strlen(parameters[param]); i++)
-                                               {
-                                                       if ((parameters[param][i] < '0') || (parameters[param][i] > '9'))
-                                                       {
-                                                               invalid = true;
-                                                       }
-                                               }
-                                               if (atoi(parameters[param]) < 1)
+                                               if ((*f < '0') || (*f > '9'))
                                                {
                                                        invalid = true;
                                                }
+                                       }
+                                       /* If the limit is < 1, or the new limit is the current limit, dont allow */
+                                       if ((atoi(parameters[param]) < 1) || ((chan->limit > 0) && (atoi(parameters[param]) == chan->limit)))
+                                       {
+                                               invalid = true;
+                                       }
 
-                                               if (invalid)
-                                                       break;
-                                               
+                                       if (invalid)
+                                               break;
+
+                                        MOD_RESULT = 0;
+                                        FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'l', parameters[param], true, 1));
+                                        if (!MOD_RESULT)
+                                        {
+       
                                                chan->limit = atoi(parameters[param]);
-                                               
+                                                       
                                                // reported by mech: large values cause underflow
                                                if (chan->limit < 0)
-                                                       chan->limit = 0x7FFFFF;
-                                                       
-                                               if (chan->limit)
-                                               {
-                                                       strlcat(outlist,"l",MAXBUF);
-                                                       strlcpy(outpars[pc++],parameters[param++],MAXBUF);
-                                                       l_set = true;
-                                               }
+                                                       chan->limit = 0x7FFF;
                                        }
-                               break;
-                               
-                               case 'i':
-                                       if (chan->inviteonly != mdir)
+                                               
+                                       if (chan->limit)
                                        {
-                                               strlcat(outlist,"i",MAXBUF);
+                                               *outl++ = 'l';
+                                               outpars[pc++] = parameters[param++];
+                                               l_set = true;
                                        }
-                                       chan->inviteonly = mdir;
-                               break;
+                               }
+                       break;
                                
-                               case 't':
-                                       if (chan->topiclock != mdir)
+                       case 'i':
+                                MOD_RESULT = 0;
+                                FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'i', "", mdir, 0));
+                                if (!MOD_RESULT)
+                                {
+                                       if (mdir)
                                        {
-                                               strlcat(outlist,"t",MAXBUF);
+                                               if (!(chan->binarymodes & CM_INVITEONLY)) *outl++ = 'i';
+                                               chan->binarymodes |= CM_INVITEONLY;
                                        }
-                                       chan->topiclock = mdir;
-                               break;
-                               
-                               case 'n':
-                                       if (chan->noexternal != mdir)
+                                       else
                                        {
-                                               strlcat(outlist,"n",MAXBUF);
+                                               if (chan->binarymodes & CM_INVITEONLY) *outl++ = 'i';
+                                               chan->binarymodes &= ~CM_INVITEONLY;
                                        }
-                                       chan->noexternal = mdir;
-                               break;
+                               }
+                       break;
+                               
+                       case 't':
+                                MOD_RESULT = 0;
+                                FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 't', "", mdir, 0));
+                                if (!MOD_RESULT)
+                                {
+                                       if (mdir)
+                                        {
+                                               if (!(chan->binarymodes & CM_TOPICLOCK)) *outl++ = 't';
+                                                chan->binarymodes |= CM_TOPICLOCK;
+                                        }
+                                        else
+                                        {
+                                               if (chan->binarymodes & CM_TOPICLOCK) *outl++ = 't';
+                                                chan->binarymodes &= ~CM_TOPICLOCK;
+                                        }
+                               }
+                       break;
+                               
+                       case 'n':
+                                MOD_RESULT = 0;
+                                FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'n', "", mdir, 0));
+                                if (!MOD_RESULT)
+                                {
+                                        if (mdir)
+                                        {
+                                               if (!(chan->binarymodes & CM_NOEXTERNAL)) *outl++ = 'n';
+                                                chan->binarymodes |= CM_NOEXTERNAL;
+                                        }
+                                        else
+                                        {
+                                               if (chan->binarymodes & CM_NOEXTERNAL) *outl++ = 'n';
+                                                chan->binarymodes &= ~CM_NOEXTERNAL;
+                                        }
+                               }
+                       break;
+                               
+                       case 'm':
+                                MOD_RESULT = 0;
+                                FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'm', "", mdir, 0));
+                                if (!MOD_RESULT)
+                                {
+                                        if (mdir)
+                                        {
+                                                if (!(chan->binarymodes & CM_MODERATED)) *outl++ = 'm';
+                                                chan->binarymodes |= CM_MODERATED;
+                                        }
+                                        else
+                                        {
+                                                if (chan->binarymodes & CM_MODERATED) *outl++ = 'm';
+                                                chan->binarymodes &= ~CM_MODERATED;
+                                        }
+                               }
+                       break;
+                               
+                       case 's':
+                                MOD_RESULT = 0;
+                                FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 's', "", mdir, 0));
+                                if (!MOD_RESULT)
+                                {
+                                        if (mdir)
+                                        {
+                                                if (!(chan->binarymodes & CM_SECRET)) *outl++ = 's';
+                                                chan->binarymodes |= CM_SECRET;
+                                                if (chan->binarymodes & CM_PRIVATE)
+                                                {
+                                                        chan->binarymodes &= ~CM_PRIVATE;
+                                                        if (mdir)
+                                                        {
+                                                               *outl++ = '-'; *outl++ = 'p'; *outl++ = '+';
+                                                        }
+                                                }
+                                        }
+                                        else
+                                        {
+                                                if (chan->binarymodes & CM_SECRET) *outl++ = 's';
+                                                chan->binarymodes &= ~CM_SECRET;
+                                        }
+                               }
+                       break;
+                               
+                       case 'p':
+                                MOD_RESULT = 0;
+                                FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'p', "", mdir, 0));
+                                if (!MOD_RESULT)
+                                {
+                                        if (mdir)
+                                        {
+                                                if (!(chan->binarymodes & CM_PRIVATE)) *outl++ = 'p';
+                                                chan->binarymodes |= CM_PRIVATE;
+                                                if (chan->binarymodes & CM_SECRET)
+                                                {
+                                                        chan->binarymodes &= ~CM_SECRET;
+                                                        if (mdir)
+                                                        {
+                                                               *outl++ = '-'; *outl++ = 's'; *outl++ = '+';
+                                                        }
+                                                }
+                                        }
+                                        else
+                                        {
+                                                if (chan->binarymodes & CM_PRIVATE) *outl++ = 'p';
+                                                chan->binarymodes &= ~CM_PRIVATE;
+                                        }
+                               }
+                       break;
                                
-                               case 'm':
-                                       if (chan->moderated != mdir)
+                       default:
+                               string_list p;
+                               p.clear();
+                               bool x = strchr(chan->custom_modes,*modechar);
+                               if ((!x && !mdir) || (x && mdir))
+                               {
+                                       if (!ModeIsListMode(*modechar,MT_CHANNEL))
                                        {
-                                               strlcat(outlist,"m",MAXBUF);
+                                               log(DEBUG,"Mode %c isnt set on %s but trying to remove!",*modechar,chan->name);
+                                               break;
                                        }
-                                       chan->moderated = mdir;
-                               break;
-                               
-                               case 's':
-                                       if (chan->secret != mdir)
+                               }
+                               if (ModeDefined(*modechar,MT_CHANNEL))
+                               {
+                                       /* A module has claimed this mode */
+                                       if (param<pcnt)
                                        {
-                                               strcat(outlist,"s");
-                                               if (chan->c_private)
+                                               if ((ModeDefinedOn(*modechar,MT_CHANNEL)>0) && (mdir))
                                                {
-                                                       chan->c_private = 0;
-                                                       if (mdir)
-                                                       {
-                                                               strlcat(outlist,"-p+",MAXBUF);
-                                                       }
-                                                       else
-                                                       {
-                                                               strlcat(outlist,"+p-",MAXBUF);
-                                                       }
+                                                       p.push_back(parameters[param]);
                                                }
-                                       }
-                                       chan->secret = mdir;
-                               break;
-                               
-                               case 'p':
-                                       if (chan->c_private != mdir)
-                                       {
-                                               strlcat(outlist,"p",MAXBUF);
-                                               if (chan->secret)
+                                               if ((ModeDefinedOff(*modechar,MT_CHANNEL)>0) && (!mdir))
                                                {
-                                                       chan->secret = 0;
-                                                       if (mdir)
-                                                       {
-                                                               strlcat(outlist,"-s+",MAXBUF);
-                                                       }
-                                                       else
-                                                       {
-                                                               strlcat(outlist,"+s-",MAXBUF);
-                                                       }
+                                                       p.push_back(parameters[param]);
                                                }
                                        }
-                                       chan->c_private = mdir;
-                               break;
-                               
-                               default:
-                                       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)))
+                                       bool handled = false;
+                                       if (param>=pcnt)
                                        {
-                                               if (!ModeIsListMode(modechar,MT_CHANNEL))
+                                               // 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,"Mode %c isnt set on %s but trying to remove!",modechar,chan->name);
-                                                       break;
+                                                       log(DEBUG,"Not enough parameters for module-mode %c",*modechar);
+                                                       handled = true;
+                                                       param++;
                                                }
                                        }
-                                       if (ModeDefined(modechar,MT_CHANNEL))
-                                       {
-                                               log(DEBUG,"A module has claimed this mode");
-                                               if (param<pcnt)
-                                               {
-                                                       if ((ModeDefinedOn(modechar,MT_CHANNEL)>0) && (mdir))
-                                                       {
-                                                               p.push_back(parameters[param]);
-                                                       }
-                                                       if ((ModeDefinedOff(modechar,MT_CHANNEL)>0) && (!mdir))
-                                                       {
-                                                               p.push_back(parameters[param]);
-                                                       }
-                                               }
-                                               bool handled = false;
-                                               if (param>=pcnt)
-                                               {
-                                                       // 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++;
-                                                       }
-                                               }
-                                               for (int i = 0; i <= MODCOUNT; i++)
+                                       // BIG ASS IDIOTIC CODER WARNING!
+                                       // Using OnRawMode on another modules mode's behavour 
+                                       // will confuse the crap out of admins! just because you CAN
+                                       // do it, doesnt mean you SHOULD!
+                                        MOD_RESULT = 0;
+                                       std::string para = "";
+                                       if (p.size())
+                                               para = p[0];
+                                               FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, *modechar, para, mdir, pcnt));
+                                               if (!MOD_RESULT)
+                                               {
+                                                       for (int i = 0; i <= MODCOUNT; i++)
                                                {
                                                        if (!handled)
                                                        {
-                                                               int t = 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 (ModeIsListMode(modechar,MT_CHANNEL))
+                                                                       if (ModeIsListMode(*modechar,MT_CHANNEL))
                                                                        {
                                                                                if (t == -1)
                                                                                {
-                                                                                       pc++;
+                                                                                       //pc++;
+                                                                                       param++;
                                                                                }
                                                                                else
                                                                                {
-                                                                                       if (ptr>0)
+                                                                                       if (param < pcnt)
                                                                                        {
-                                                                                               strlcat(outlist, app,MAXBUF);
+                                                                                               *outl++ = *modechar;
                                                                                        }
-                                                                                       strlcpy(outpars[pc++],parameters[param++],MAXBUF);
+                                                                                       outpars[pc++] = parameters[param++];
                                                                                }
                                                                        }
                                                                        else
                                                                        {
-                                                                               if (ptr>0)
+                                                                               if (param < pcnt)
                                                                                {
-                                                                                       if ((modelist[ptr-1] == '+') || (modelist[ptr-1] == '-'))
+                                                                                       *outl++ = *modechar;
+                                                                                       chan->SetCustomMode(*modechar,mdir);
+                                                                                       // include parameters in output if mode has them
+                                                                                       if ((ModeDefinedOn(*modechar,MT_CHANNEL)>0) && (mdir))
                                                                                        {
-                                                                                               strlcat(outlist, app,MAXBUF);
+                                                                                               chan->SetCustomModeParam(modelist[ptr],parameters[param],mdir);
+                                                                                               outpars[pc++] = parameters[param++];
                                                                                        }
-                                                                                       else if (!strchr(outlist,modechar))
-                                                                                       {
-                                                                                               strlcat(outlist, app,MAXBUF);
-                                                                                       }
-                                                                               }
-                                                                               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);
-                                                                                       strlcpy(outpars[pc++],parameters[param++],MAXBUF);
                                                                                }
                                                                        }
                                                                        // break, because only one module can handle the mode.
                                                                        handled = true;
-                                                               }
-                                                       }
-                                               }
-                                       }
-                                       else
-                                       {
-                                               WriteServ(user->fd,"472 %s %c :is unknown mode char to me",user->nick,modechar);
+                                                               }
+                                                       }
+                                               }
                                        }
-                               break;
-                               
-                       }
+                               }
+                               else
+                               {
+                                       WriteServ(user->fd,"472 %s %c :is unknown mode char to me",user->nick,*modechar);
+                               }
+                       break;
                }
        }
 
-       /* this ensures only the *valid* modes are sent out onto the network */
-       while ((outlist[strlen(outlist)-1] == '-') || (outlist[strlen(outlist)-1] == '+'))
-       {
-               outlist[strlen(outlist)-1] = '\0';
-       }
-       if (strcmp(outlist,""))
+       /* Null terminate it now we're done */
+       *outl = 0;
+
+
+       /************ Fast, but confusing string tidying ************/
+       outl = outlist;
+       while (*outl && (*outl < 'A'))
+               outl++;
+       /* outl now points to the first mode character after +'s and -'s */
+       outl--;
+       /* Now points at first mode-modifier + or - symbol */
+       char* trim = outl;
+       /* Now we tidy off any trailing -'s etc */
+       while (*trim++);
+       trim--;
+       while ((*--trim == '+') || (*trim == '-'))
+               *trim = 0;
+       /************ Done wih the string tidy functions ************/
+
+
+       /* The mode change must be at least two characters long (+ or - and at least one mode) */
+       if (((*outl == '+') || (*outl == '-')) && *(outl+1))
        {
-               strlcpy(outstr,outlist,MAXBUF);
                for (ptr = 0; ptr < pc; ptr++)
                {
-                       strlcat(outstr," ",MAXBUF);
-                       strlcat(outstr,outpars[ptr],MAXBUF);
+                       charlcat(outl,' ',MAXBUF);
+                       strlcat(outl,outpars[ptr],MAXBUF-1);
                }
                if (local)
                {
                        log(DEBUG,"Local mode change");
-                       WriteChannelLocal(chan, user, "MODE %s %s",chan->name,outstr);
+                       WriteChannelLocal(chan, user, "MODE %s %s",chan->name,outl);
+                       FOREACH_MOD(I_OnMode,OnMode(user, chan, TYPE_CHANNEL, outl));
                }
                else
                {
@@ -936,11 +1019,7 @@ void process_modes(char **parameters,userrec* user,chanrec *chan,int status, int
                        {
                                if (!silent)
                                {
-                                       WriteChannelWithServ(ServerName,chan,user,"MODE %s %s",chan->name,outstr);
-                                       // M token for a usermode must go to all servers
-                                       char buffer[MAXBUF];
-                                       snprintf(buffer,MAXBUF,"M %s %s",chan->name, outstr);
-                                       NetSendToAll(buffer);
+                                       WriteChannelWithServ(Config->ServerName,chan,"MODE %s %s",chan->name,outl);
                                }
                                        
                        }
@@ -948,11 +1027,8 @@ void process_modes(char **parameters,userrec* user,chanrec *chan,int status, int
                        {
                                if (!silent)
                                {
-                                       WriteChannel(chan,user,"MODE %s %s",chan->name,outstr);
-                                       // M token for a usermode must go to all servers
-                                       char buffer[MAXBUF];
-                                       snprintf(buffer,MAXBUF,"m %s %s %s",user->nick,chan->name, outstr);
-                                       NetSendToAll(buffer);
+                                       WriteChannel(chan,user,"MODE %s %s",chan->name,outl);
+                                       FOREACH_MOD(I_OnMode,OnMode(user, chan, TYPE_CHANNEL, outl));
                                }
                        }
                }
@@ -961,40 +1037,44 @@ void process_modes(char **parameters,userrec* user,chanrec *chan,int status, int
 
 // based on sourcemodes, return true or false to determine if umode is a valid mode a user may set on themselves or others.
 
-bool allowed_umode(char umode, char* sourcemodes,bool adding)
+bool ModeParser::AllowedUmode(char umode, char* sourcemodes,bool adding,bool serveroverride)
 {
+       bool sourceoper = (strchr(sourcemodes,'o') != NULL);
        log(DEBUG,"Allowed_umode: %c %s",umode,sourcemodes);
+       // Servers can +o and -o arbitrarily
+       if ((serveroverride == true) && (umode == 'o'))
+       {
+               return true;
+       }
        // RFC1459 specified modes
        if ((umode == 'w') || (umode == 's') || (umode == 'i'))
        {
-               log(DEBUG,"umode %c allowed by RFC1459 scemantics",umode);
+               /* umode allowed by RFC1459 scemantics */
                return true;
        }
        
-       // user may not +o themselves or others, but an oper may de-oper other opers or themselves
-       if ((strchr(sourcemodes,'o')) && (!adding))
+       /* user may not +o themselves or others, but an oper may de-oper other opers or themselves */
+       if (sourceoper && !adding)
        {
-               log(DEBUG,"umode %c allowed by RFC1459 scemantics",umode);
                return true;
        }
        else if (umode == 'o')
        {
-               log(DEBUG,"umode %c allowed by RFC1459 scemantics",umode);
+               /* Bad oper, bad bad! */
                return false;
        }
        
-       // process any module-defined modes that need oper
-       if ((ModeDefinedOper(umode,MT_CLIENT)) && (strchr(sourcemodes,'o')))
+       /* process any module-defined modes that need oper */
+       if ((ModeDefinedOper(umode,MT_CLIENT)) && (sourceoper))
        {
                log(DEBUG,"umode %c allowed by module handler (oper only mode)",umode);
                return true;
        }
-       else
-       if (ModeDefined(umode,MT_CLIENT))
+       else if (ModeDefined(umode,MT_CLIENT))
        {
                // process any module-defined modes that don't need oper
                log(DEBUG,"umode %c allowed by module handler (non-oper mode)",umode);
-               if ((ModeDefinedOper(umode,MT_CLIENT)) && (!strchr(sourcemodes,'o')))
+               if ((ModeDefinedOper(umode,MT_CLIENT)) && (!sourceoper))
                {
                        // no, this mode needs oper, and this user 'aint got what it takes!
                        return false;
@@ -1007,15 +1087,16 @@ bool allowed_umode(char umode, char* sourcemodes,bool adding)
        return false;
 }
 
-bool process_module_umode(char umode, userrec* source, void* dest, bool adding)
+bool ModeParser::ProcessModuleUmode(char umode, userrec* source, void* dest, bool adding)
 {
        userrec* s2;
        bool faked = false;
        if (!source)
        {
                s2 = new userrec;
-               strlcpy(s2->nick,ServerName,NICKMAX);
-               strcpy(s2->modes,"o");
+               strlcpy(s2->nick,Config->ServerName,NICKMAX-1);
+               *s2->modes = 'o';
+               *(s2->modes+1) = 0;
                s2->fd = -1;
                source = s2;
                faked = true;
@@ -1028,7 +1109,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 %s claims umode %c",module_names[i].c_str(),umode);
+                               log(DEBUG,"Module %s claims umode %c",Config->module_names[i].c_str(),umode);
                                return true;
                        }
                }
@@ -1051,37 +1132,36 @@ bool process_module_umode(char umode, userrec* source, void* dest, bool adding)
        }
 }
 
-void handle_mode(char **parameters, int pcnt, userrec *user)
+void cmd_mode::Handle (char **parameters, int pcnt, userrec *user)
 {
        chanrec* Ptr;
-       userrec* dest;
-       int can_change,i;
+       userrec* dest = Find(parameters[0]);
+       int can_change;
        int direction = 1;
        char outpars[MAXBUF];
-
-       dest = Find(parameters[0]);
+       bool next_ok = true;
 
        if (!user)
-       {
                return;
-       }
 
        if ((dest) && (pcnt == 1))
        {
                WriteServ(user->fd,"221 %s :+%s",dest->nick,dest->modes);
                return;
        }
-
-       if ((dest) && (pcnt > 1))
+       else if ((dest) && (pcnt > 1))
        {
+               std::string tidied = ServerInstance->ModeGrok->CompressModes(parameters[1],false);
+               parameters[1] = (char*)tidied.c_str();
+
                char dmodes[MAXBUF];
-               strlcpy(dmodes,dest->modes,MAXBUF);
+               strlcpy(dmodes,dest->modes,MAXMODES);
                log(DEBUG,"pulled up dest user modes: %s",dmodes);
-       
+
                can_change = 0;
                if (user != dest)
                {
-                       if (strchr(user->modes,'o'))
+                       if ((*user->oper) || (is_uline(user->server)))
                        {
                                can_change = 1;
                        }
@@ -1096,739 +1176,331 @@ void handle_mode(char **parameters, int pcnt, userrec *user)
                        return;
                }
                
-               strcpy(outpars,"+");
-               direction = 1;
+               outpars[0] = *parameters[1];
+               outpars[1] = 0;
+               direction = (*parameters[1] == '+');
 
-               if ((parameters[1][0] != '+') && (parameters[1][0] != '-'))
+               if ((*parameters[1] != '+') && (*parameters[1] != '-'))
                        return;
 
-               for (int i = 0; i < strlen(parameters[1]); i++)
+               for (char* i = parameters[1]; *i; i++)
                {
-                       if (parameters[1][i] == '+')
+                       if ((i != parameters[1]) && (*i != '+') && (*i != '-'))
+                               next_ok = true;
+
+                       switch (*i)
                        {
-                               if (direction != 1)
-                               {
-                                       if ((outpars[strlen(outpars)-1] == '+') || (outpars[strlen(outpars)-1] == '-'))
+                               case ' ':
+                               continue;
+
+                               case '+':
+                                       if ((direction != 1) && (next_ok))
                                        {
-                                               outpars[strlen(outpars)-1] = '+';
-                                       }
-                                       else
+                                               charlcat(outpars,'+',MAXBUF);
+                                               next_ok = false;
+                                       }       
+                                       direction = 1;
+                               break;
+
+                               case '-':
+                                       if ((direction != 0) && (next_ok))
                                        {
-                                               strcat(outpars,"+");
+                                               charlcat(outpars,'-',MAXBUF);
+                                               next_ok = false;
                                        }
-                               }
-                               direction = 1;
-                       }
-                       else
-                       if (parameters[1][i] == '-')
-                       {
-                               if (direction != 0)
-                               {
-                                       if ((outpars[strlen(outpars)-1] == '+') || (outpars[strlen(outpars)-1] == '-'))
+                                       direction = 0;
+                               break;
+
+                               default:
+                                       can_change = 0;
+                                       if (*user->oper)
                                        {
-                                               outpars[strlen(outpars)-1] = '-';
+                                               can_change = 1;
                                        }
                                        else
                                        {
-                                               strcat(outpars,"-");
-                                       }
-                               }
-                               direction = 0;
-                       }
-                       else
-                       {
-                               can_change = 0;
-                               if (strchr(user->modes,'o'))
-                               {
-                                       can_change = 1;
-                               }
-                               else
-                               {
-                                       if ((parameters[1][i] == 'i') || (parameters[1][i] == 'w') || (parameters[1][i] == 's') || (allowed_umode(parameters[1][i],user->modes,direction)))
-                                       {
-                                               can_change = 1;
+                                               if ((*i == 'i') || (*i == 'w') || (*i == 's') || (ServerInstance->ModeGrok->AllowedUmode(*i,user->modes,direction,false)))
+                                               {
+                                                       can_change = 1;
+                                               }
                                        }
-                               }
-                               if (can_change)
-                               {
-                                       if (direction == 1)
+                                       if (can_change)
                                        {
-                                               if ((!strchr(dmodes,parameters[1][i])) && (allowed_umode(parameters[1][i],user->modes,true)))
+                                               if (direction == 1)
                                                {
-                                                       char umode = parameters[1][i];
-                                                       if ((process_module_umode(umode, user, dest, direction)) || (umode == 'i') || (umode == 's') || (umode == 'w') || (umode == 'o'))
+                                                       if ((!strchr(dmodes,*i)) && (ServerInstance->ModeGrok->AllowedUmode(*i,user->modes,true,false)))
                                                        {
-                                                               dmodes[strlen(dmodes)+1]='\0';
-                                                               dmodes[strlen(dmodes)] = parameters[1][i];
-                                                               outpars[strlen(outpars)+1]='\0';
-                                                               outpars[strlen(outpars)] = parameters[1][i];
+                                                               if ((ServerInstance->ModeGrok->ProcessModuleUmode(*i, user, dest, direction)) || (*i == 'i') || (*i == 's') || (*i == 'w') || (*i == 'o'))
+                                                               {
+                                                                       charlcat(dmodes,*i,53);
+                                                                       charlcat(outpars,*i,MAXMODES);
+                                                                       if (*i == 'o')
+                                                                       {
+                                                                               FOREACH_MOD(I_OnGlobalOper,OnGlobalOper(dest));
+                                                                       }
+                                                               }
                                                        }
                                                }
-                                       }
-                                       else
-                                       {
-                                               if ((allowed_umode(parameters[1][i],user->modes,false)) && (strchr(dmodes,parameters[1][i])))
+                                               else
                                                {
-                                                       char umode = parameters[1][i];
-                                                       if ((process_module_umode(umode, user, dest, direction)) || (umode == 'i') || (umode == 's') || (umode == 'w') || (umode == 'o'))
+                                                       if ((ServerInstance->ModeGrok->AllowedUmode(*i,user->modes,false,false)) && (strchr(dmodes,*i)))
                                                        {
-                                                               int q = 0;
-                                                               char temp[MAXBUF];      
-                                                               char moo[MAXBUF];       
-
-                                                               outpars[strlen(outpars)+1]='\0';
-                                                               outpars[strlen(outpars)] = parameters[1][i];
-                                                       
-                                                               strcpy(temp,"");
-                                                               for (q = 0; q < strlen(dmodes); q++)
+                                                               if ((ServerInstance->ModeGrok->ProcessModuleUmode(*i, user, dest, direction)) || (*i == 'i') || (*i == 's') || (*i == 'w') || (*i == 'o'))
                                                                {
-                                                                       if (dmodes[q] != parameters[1][i])
+                                                                       charlcat(outpars,*i,MAXMODES);
+                                                                       charremove(dmodes,*i);
+                                                                       if (*i == 'o')
                                                                        {
-                                                                               moo[0] = dmodes[q];
-                                                                               moo[1] = '\0';
-                                                                               strlcat(temp,moo,MAXBUF);
+                                                                               *dest->oper = 0;
+                                                                               DeleteOper(dest);
                                                                        }
                                                                }
-                                                               strlcpy(dmodes,temp,MAXBUF);
                                                        }
                                                }
                                        }
-                               }
+                               break;
                        }
                }
-               if (strlen(outpars))
+               if (*outpars)
                {
                        char b[MAXBUF];
-                       strlcpy(b,"",MAXBUF);
-                       int z = 0;
-                       int i = 0;
-                       while (i < strlen (outpars))
+                       char* z = b;
+
+                       for (char* i = outpars; *i;)
                        {
-                               b[z++] = outpars[i++];
-                               b[z] = '\0';
-                               if (i<strlen(outpars)-1)
+                               *z++ = *i++;
+                               if (((*i == '-') || (*i == '+')) && ((*(i+1) == '-') || (*(i+1) == '+')))
                                {
-                                       if (((outpars[i] == '-') || (outpars[i] == '+')) && ((outpars[i+1] == '-') || (outpars[i+1] == '+')))
-                                       {
-                                               // someones playing silly buggers and trying
-                                               // to put a +- or -+ into the line...
-                                               i++;
-                                       }
+                                       // someones playing silly buggers and trying
+                                       // to put a +- or -+ into the line...
+                                       i++;
                                }
-                               if (i == strlen(outpars)-1)
+                               if (!*(i+1))
                                {
-                                       if ((outpars[i] == '-') || (outpars[i] == '+'))
+                                       // Someone's trying to make the last character in
+                                       // the line be a + or - symbol.
+                                       if ((*i == '-') || (*i == '+'))
                                        {
                                                i++;
                                        }
                                }
                        }
+                       *z = 0;
 
-                       z = strlen(b)-1;
-                       if ((b[z] == '-') || (b[z] == '+'))
-                               b[z] == '\0';
-
-                       if ((!strcmp(b,"+")) || (!strcmp(b,"-")))
-                               return;
-
-                       WriteTo(user, dest, "MODE %s :%s", dest->nick, b);
-
-                       // M token for a usermode must go to all servers
-                       char buffer[MAXBUF];
-                       snprintf(buffer,MAXBUF,"m %s %s %s",user->nick, dest->nick, b);
-                       NetSendToAll(buffer);
-
-                       if (strlen(dmodes)>MAXMODES)
+                       if ((*b) && (!IS_SINGLE(b,'+')) && (!IS_SINGLE(b,'-')))
                        {
-                               dmodes[MAXMODES-1] = '\0';
+                               WriteTo(user, dest, "MODE %s :%s", dest->nick, b);
+                               FOREACH_MOD(I_OnMode,OnMode(user, dest, TYPE_USER, b));
                        }
+
                        log(DEBUG,"Stripped mode line");
                        log(DEBUG,"Line dest is now %s",dmodes);
-                       strlcpy(dest->modes,dmodes,MAXMODES);
+                       strlcpy(dest->modes,dmodes,MAXMODES-1);
 
                }
 
                return;
        }
-       
-       Ptr = FindChan(parameters[0]);
-       if (Ptr)
+       else
        {
-               if (pcnt == 1)
-               {
-                       /* just /modes #channel */
-                       WriteServ(user->fd,"324 %s %s +%s",user->nick, Ptr->name, chanmodes(Ptr));
-                       WriteServ(user->fd,"329 %s %s %d", user->nick, Ptr->name, Ptr->created);
-                       return;
-               }
-               else
-               if (pcnt == 2)
+               Ptr = FindChan(parameters[0]);
+               if (Ptr)
                {
-                       if ((!strcmp(parameters[1],"+b")) || (!strcmp(parameters[1],"b")))
+                       if (pcnt == 1)
+                       {
+                               /* just /modes #channel */
+                               WriteServ(user->fd,"324 %s %s +%s",user->nick, Ptr->name, chanmodes(Ptr,has_channel(user,Ptr)));
+                               WriteServ(user->fd,"329 %s %s %d", user->nick, Ptr->name, Ptr->created);
+                               return;
+                       }
+                       else if (pcnt == 2)
                        {
+                               char* mode = parameters[1];
+                               if (*mode == '+')
+                                       mode++;
+                               int MOD_RESULT = 0;
+                               FOREACH_RESULT(I_OnRawMode,OnRawMode(user, Ptr, *mode, "", false, 0));
+                               if (!MOD_RESULT)
+                               {
+                                       if (*mode == 'b')
+                                       {
+                                               for (BanList::iterator i = Ptr->bans.begin(); i != Ptr->bans.end(); i++)
+                                               {
+                                                       WriteServ(user->fd,"367 %s %s %s %s %d",user->nick, Ptr->name, i->data, i->set_by, i->set_time);
+                                               }
+                                               WriteServ(user->fd,"368 %s %s :End of channel ban list",user->nick, Ptr->name);
+                                               return;
+                                       }
+                                       if ((ModeDefined(*mode,MT_CHANNEL)) && (ModeIsListMode(*mode,MT_CHANNEL)))
+                                       {
+                                               // list of items for an extmode
+                                               log(DEBUG,"Calling OnSendList for all modules, list output for mode %c",*mode);
+                                               FOREACH_MOD(I_OnSendList,OnSendList(user,Ptr,*mode));
+                                               return;
+                                       }
+                               }
+                       }
 
-                               for (BanList::iterator i = Ptr->bans.begin(); i != Ptr->bans.end(); i++)
+                       if (((Ptr) && (!has_channel(user,Ptr))) && (!is_uline(user->server)) && (IS_LOCAL(user)))
+                       {
+                               WriteServ(user->fd,"442 %s %s :You're not on that channel!",user->nick, Ptr->name);
+                               return;
+                       }
+       
+                       if (Ptr)
+                       {
+                               int MOD_RESULT = 0;
+                               FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,NULL,Ptr,AC_GENERAL_MODE));
+                               
+                               if (MOD_RESULT == ACR_DENY)
+                                       return;
+                               if (MOD_RESULT == ACR_DEFAULT)
                                {
-                                       WriteServ(user->fd,"367 %s %s %s %s %d",user->nick, Ptr->name, i->data, i->set_by, i->set_time);
+                                       if ((cstatus(user,Ptr) < STATUS_HOP) && (IS_LOCAL(user)))
+                                       {
+                                               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;
+                                       }
                                }
-                               WriteServ(user->fd,"368 %s %s :End of channel ban list",user->nick, Ptr->name);
-                               return;
+       
+                               ServerInstance->ModeGrok->ProcessModes(parameters,user,Ptr,cstatus(user,Ptr),pcnt,false,false,false);
                        }
                }
-
-               int MOD_RESULT = 0;
-               FOREACH_RESULT(OnAccessCheck(user,NULL,Ptr,AC_GENERAL_MODE));
-               
-               if (MOD_RESULT == ACR_DENY)
-                       return;
-               if (MOD_RESULT == ACR_DEFAULT)
+               else
                {
-                       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;
-                       }
+                       WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, parameters[0]);
                }
-
-               process_modes(parameters,user,Ptr,cstatus(user,Ptr),pcnt,false,false,false);
-       }
-       else
-       {
-               WriteServ(user->fd,"401 %s %s :No suck nick/channel",user->nick, parameters[0]);
        }
 }
 
 
 
 
-void server_mode(char **parameters, int pcnt, userrec *user)
+void ModeParser::ServerMode(char **parameters, int pcnt, userrec *user)
 {
        chanrec* Ptr;
-       userrec* dest;
-       int can_change,i;
+       userrec* dest = Find(parameters[0]);
+       int can_change;
        int direction = 1;
        char outpars[MAXBUF];
-
-       dest = Find(parameters[0]);
-       
-       // fix: ChroNiCk found this - we cant use this as debug if its null!
-       if (dest)
-       {
-               log(DEBUG,"server_mode on %s",dest->nick);
-       }
+       bool next_ok = true;
 
        if ((dest) && (pcnt > 1))
        {
-               log(DEBUG,"params > 1");
+                std::string tidied = ServerInstance->ModeGrok->CompressModes(parameters[1],false);
+                parameters[1] = (char*)tidied.c_str();
 
                char dmodes[MAXBUF];
                strlcpy(dmodes,dest->modes,MAXBUF);
 
-               strcpy(outpars,"+");
-               direction = 1;
+               outpars[0] = *parameters[1];
+               outpars[1] = 0;
+               direction = (*parameters[1] == '+');
 
-               if ((parameters[1][0] != '+') && (parameters[1][0] != '-'))
+               if ((*parameters[1] != '+') && (*parameters[1] != '-'))
                        return;
 
-               for (int i = 0; i < strlen(parameters[1]); i++)
+               for (char* i = parameters[1]; *i; i++)
                {
-                       if (parameters[1][i] == '+')
-                       {
-                               if (direction != 1)
-                               {
-                                       if ((outpars[strlen(outpars)-1] == '+') || (outpars[strlen(outpars)-1] == '-'))
-                                       {
-                                               outpars[strlen(outpars)-1] = '+';
-                                       }
-                                       else
-                                       {
-                                               strcat(outpars,"+");
-                                       }
-                               }
-                               direction = 1;
-                       }
-                       else
-                       if (parameters[1][i] == '-')
-                       {
-                               if (direction != 0)
-                               {
-                                       if ((outpars[strlen(outpars)-1] == '+') || (outpars[strlen(outpars)-1] == '-'))
-                                       {
-                                               outpars[strlen(outpars)-1] = '-';
-                                       }
-                                       else
-                                       {
-                                               strcat(outpars,"-");
-                                       }
-                               }
-                               direction = 0;
-                       }
-                       else
-                       {
-                               log(DEBUG,"begin mode processing entry");
-                               can_change = 1;
-                               if (can_change)
-                               {
-                                       if (direction == 1)
-                                       {
-                                               log(DEBUG,"umode %c being added",parameters[1][i]);
-                                               if ((!strchr(dmodes,parameters[1][i])) && (allowed_umode(parameters[1][i],user->modes,true)))
-                                               {
-                                                       char umode = parameters[1][i];
-                                                       log(DEBUG,"umode %c is an allowed umode",umode);
-                                                       if ((process_module_umode(umode, user, dest, direction)) || (umode == 'i') || (umode == 's') || (umode == 'w') || (umode == 'o'))
-                                                       {
-                                                               dmodes[strlen(dmodes)+1]='\0';
-                                                               dmodes[strlen(dmodes)] = parameters[1][i];
-                                                               outpars[strlen(outpars)+1]='\0';
-                                                               outpars[strlen(outpars)] = parameters[1][i];
-                                                       }
-                                               }
-                                       }
-                                       else
-                                       {
-                                               // can only remove a mode they already have
-                                               log(DEBUG,"umode %c being removed",parameters[1][i]);
-                                               if ((allowed_umode(parameters[1][i],user->modes,false)) && (strchr(dmodes,parameters[1][i])))
-                                               {
-                                                       char umode = parameters[1][i];
-                                                       log(DEBUG,"umode %c is an allowed umode",umode);
-                                                       if ((process_module_umode(umode, user, dest, direction)) || (umode == 'i') || (umode == 's') || (umode == 'w') || (umode == 'o'))
-                                                       {
-                                                               int q = 0;
-                                                               char temp[MAXBUF];
-                                                               char moo[MAXBUF];       
-
-                                                               outpars[strlen(outpars)+1]='\0';
-                                                               outpars[strlen(outpars)] = parameters[1][i];
-                                                       
-                                                               strcpy(temp,"");
-                                                               for (q = 0; q < strlen(dmodes); q++)
-                                                               {
-                                                                       if (dmodes[q] != parameters[1][i])
-                                                                       {
-                                                                               moo[0] = dmodes[q];
-                                                                               moo[1] = '\0';
-                                                                               strlcat(temp,moo,MAXBUF);
-                                                                       }
-                                                               }
-                                                               strlcpy(dmodes,temp,MAXBUF);
-                                                       }
-                                               }
-                                       }
-                               }
-                       }
-               }
-               if (strlen(outpars))
-               {
-                       char b[MAXBUF];
-                       strlcpy(b,"",MAXBUF);
-                       int z = 0;
-                       int i = 0;
-                       while (i < strlen (outpars))
-                       {
-                               b[z++] = outpars[i++];
-                               b[z] = '\0';
-                               if (i<strlen(outpars)-1)
-                               {
-                                       if (((outpars[i] == '-') || (outpars[i] == '+')) && ((outpars[i+1] == '-') || (outpars[i+1] == '+')))
-                                       {
-                                               // someones playing silly buggers and trying
-                                               // to put a +- or -+ into the line...
-                                               i++;
-                                       }
-                               }
-                               if (i == strlen(outpars)-1)
-                               {
-                                       if ((outpars[i] == '-') || (outpars[i] == '+'))
-                                       {
-                                               i++;
-                                       }
-                               }
-                       }
-
-                       z = strlen(b)-1;
-                       if ((b[z] == '-') || (b[z] == '+'))
-                               b[z] == '\0';
+                       if ((i != parameters[1]) && (*i != '+') && (*i != '-'))
+                               next_ok = true;
 
-                       if ((!strcmp(b,"+")) || (!strcmp(b,"-")))
-                               return;
-
-                       WriteTo(user, dest, "MODE %s :%s", dest->nick, b);
-
-                       // M token for a usermode must go to all servers
-                       char buffer[MAXBUF];
-                       snprintf(buffer,MAXBUF,"m %s %s %s",user->nick, dest->nick, b);
-                       NetSendToAll(buffer);
-                       
-                       if (strlen(dmodes)>MAXMODES)
+                       switch (*i)
                        {
-                               dmodes[MAXMODES-1] = '\0';
-                       }
-                       log(DEBUG,"Stripped mode line");
-                       log(DEBUG,"Line dest is now %s",dmodes);
-                       strlcpy(dest->modes,dmodes,MAXMODES);
-
-               }
-
-               return;
-       }
-       
-       Ptr = FindChan(parameters[0]);
-       if (Ptr)
-       {
-               process_modes(parameters,user,Ptr,STATUS_OP,pcnt,true,false,false);
-       }
-       else
-       {
-               WriteServ(user->fd,"401 %s %s :No suck nick/channel",user->nick, parameters[0]);
-       }
-}
-
-
-
-void merge_mode(char **parameters, int pcnt)
-{
-       chanrec* Ptr;
-       userrec* dest;
-       int can_change,i;
-       int direction = 1;
-       char outpars[MAXBUF];
-
-       dest = Find(parameters[0]);
-       
-       // fix: ChroNiCk found this - we cant use this as debug if its null!
-       if (dest)
-       {
-               log(DEBUG,"merge_mode on %s",dest->nick);
-       }
+                               case ' ':
+                                continue;
 
-       if ((dest) && (pcnt > 1))
-       {
-               log(DEBUG,"params > 1");
-
-               char dmodes[MAXBUF];
-               strlcpy(dmodes,dest->modes,MAXBUF);
-
-               strcpy(outpars,"+");
-               direction = 1;
-
-               if ((parameters[1][0] != '+') && (parameters[1][0] != '-'))
-                       return;
-
-               for (int i = 0; i < strlen(parameters[1]); i++)
-               {
-                       if (parameters[1][i] == '+')
-                       {
-                               if (direction != 1)
-                               {
-                                       if ((outpars[strlen(outpars)-1] == '+') || (outpars[strlen(outpars)-1] == '-'))
-                                       {
-                                               outpars[strlen(outpars)-1] = '+';
-                                       }
-                                       else
-                                       {
-                                               strcat(outpars,"+");
-                                       }
-                               }
-                               direction = 1;
-                       }
-                       else
-                       if (parameters[1][i] == '-')
-                       {
-                               if (direction != 0)
-                               {
-                                       if ((outpars[strlen(outpars)-1] == '+') || (outpars[strlen(outpars)-1] == '-'))
-                                       {
-                                               outpars[strlen(outpars)-1] = '-';
-                                       }
-                                       else
-                                       {
-                                               strcat(outpars,"-");
-                                       }
-                               }
-                               direction = 0;
-                       }
-                       else
-                       {
-                               log(DEBUG,"begin mode processing entry");
-                               can_change = 1;
-                               if (can_change)
-                               {
-                                       if (direction == 1)
+                               case '+':
+                                       if ((direction != 1) && (next_ok))
                                        {
-                                               log(DEBUG,"umode %c being added",parameters[1][i]);
-                                               if ((!strchr(dmodes,parameters[1][i])) && (allowed_umode(parameters[1][i],"o",true)))
-                                               {
-                                                       char umode = parameters[1][i];
-                                                       log(DEBUG,"umode %c is an allowed umode",umode);
-                                                       if ((process_module_umode(umode, NULL, dest, direction)) || (umode == 'i') || (umode == 's') || (umode == 'w') || (umode == 'o'))
-                                                       {
-                                                               dmodes[strlen(dmodes)+1]='\0';
-                                                               dmodes[strlen(dmodes)] = parameters[1][i];
-                                                               outpars[strlen(outpars)+1]='\0';
-                                                               outpars[strlen(outpars)] = parameters[1][i];
-                                                       }
-                                               }
+                                               next_ok = false;
+                                               charlcat(outpars,'+',MAXBUF);
                                        }
-                                       else
-                                       {
-                                               // can only remove a mode they already have
-                                               log(DEBUG,"umode %c being removed",parameters[1][i]);
-                                               if ((allowed_umode(parameters[1][i],"o",false)) && (strchr(dmodes,parameters[1][i])))
-                                               {
-                                                       char umode = parameters[1][i];
-                                                       log(DEBUG,"umode %c is an allowed umode",umode);
-                                                       if ((process_module_umode(umode, NULL, dest, direction)) || (umode == 'i') || (umode == 's') || (umode == 'w') || (umode == 'o'))
-                                                       {
-                                                               int q = 0;
-                                                               char temp[MAXBUF];
-                                                               char moo[MAXBUF];       
+                                       direction = 1;
+                               break;
 
-                                                               outpars[strlen(outpars)+1]='\0';
-                                                               outpars[strlen(outpars)] = parameters[1][i];
-                                                       
-                                                               strcpy(temp,"");
-                                                               for (q = 0; q < strlen(dmodes); q++)
-                                                               {
-                                                                       if (dmodes[q] != parameters[1][i])
-                                                                       {
-                                                                               moo[0] = dmodes[q];
-                                                                               moo[1] = '\0';
-                                                                               strlcat(temp,moo,MAXBUF);
-                                                                       }
-                                                               }
-                                                               strlcpy(dmodes,temp,MAXBUF);
-                                                       }
-                                               }
-                                       }
-                               }
-                       }
-               }
-               if (strlen(outpars))
-               {
-                       char b[MAXBUF];
-                       strcpy(b,"");
-                       int z = 0;
-                       int i = 0;
-                       while (i < strlen (outpars))
-                       {
-                               b[z++] = outpars[i++];
-                               b[z] = '\0';
-                               if (i<strlen(outpars)-1)
-                               {
-                                       if (((outpars[i] == '-') || (outpars[i] == '+')) && ((outpars[i+1] == '-') || (outpars[i+1] == '+')))
-                                       {
-                                               // someones playing silly buggers and trying
-                                               // to put a +- or -+ into the line...
-                                               i++;
-                                       }
-                               }
-                               if (i == strlen(outpars)-1)
-                               {
-                                       if ((outpars[i] == '-') || (outpars[i] == '+'))
+                               case '-':
+                                       if ((direction != 0) && (next_ok))
                                        {
-                                               i++;
+                                               next_ok = false;
+                                               charlcat(outpars,'-',MAXBUF);
                                        }
-                               }
-                       }
-
-                       z = strlen(b)-1;
-                       if ((b[z] == '-') || (b[z] == '+'))
-                               b[z] == '\0';
-
-                       if ((!strcmp(b,"+")) || (!strcmp(b,"-")))
-                               return;
-
-                       if (strlen(dmodes)>MAXMODES)
-                       {
-                               dmodes[MAXMODES-1] = '\0';
-                       }
-                       log(DEBUG,"Stripped mode line");
-                       log(DEBUG,"Line dest is now %s",dmodes);
-                       strlcpy(dest->modes,dmodes,MAXMODES);
-
-               }
-
-               return;
-       }
-       
-       Ptr = FindChan(parameters[0]);
-       if (Ptr)
-       {
-               userrec s2;
-               strlcpy(s2.nick,ServerName,NICKMAX);
-               strcpy(s2.modes,"o");
-               s2.fd = -1;
-               process_modes(parameters,&s2,Ptr,STATUS_OP,pcnt,true,true,false);
-       }
-}
-
-
-void merge_mode2(char **parameters, int pcnt, userrec* user)
-{
-       chanrec* Ptr;
-       userrec* dest;
-       int can_change,i;
-       int direction = 1;
-       char outpars[MAXBUF];
-
-       dest = Find(parameters[0]);
-       
-       // fix: ChroNiCk found this - we cant use this as debug if its null!
-       if (dest)
-       {
-               log(DEBUG,"merge_mode on %s",dest->nick);
-       }
-
-       if ((dest) && (pcnt > 1))
-       {
-               log(DEBUG,"params > 1");
-
-               char dmodes[MAXBUF];
-               strlcpy(dmodes,dest->modes,MAXBUF);
-
-               strcpy(outpars,"+");
-               direction = 1;
-
-               if ((parameters[1][0] != '+') && (parameters[1][0] != '-'))
-                       return;
+                                       direction = 0;
+                               break;
 
-               for (int i = 0; i < strlen(parameters[1]); i++)
-               {
-                       if (parameters[1][i] == '+')
-                       {
-                               if (direction != 1)
-                               {
-                                       if ((outpars[strlen(outpars)-1] == '+') || (outpars[strlen(outpars)-1] == '-'))
-                                       {
-                                               outpars[strlen(outpars)-1] = '+';
-                                       }
-                                       else
-                                       {
-                                               strcat(outpars,"+");
-                                       }
-                               }
-                               direction = 1;
-                       }
-                       else
-                       if (parameters[1][i] == '-')
-                       {
-                               if (direction != 0)
-                               {
-                                       if ((outpars[strlen(outpars)-1] == '+') || (outpars[strlen(outpars)-1] == '-'))
-                                       {
-                                               outpars[strlen(outpars)-1] = '-';
-                                       }
-                                       else
-                                       {
-                                               strcat(outpars,"-");
-                                       }
-                               }
-                               direction = 0;
-                       }
-                       else
-                       {
-                               log(DEBUG,"begin mode processing entry");
-                               can_change = 1;
-                               if (can_change)
-                               {
-                                       if (direction == 1)
+                               default:
+                                       log(DEBUG,"begin mode processing entry");
+                                       can_change = 1;
+                                       if (can_change)
                                        {
-                                               log(DEBUG,"umode %c being added",parameters[1][i]);
-                                               if ((!strchr(dmodes,parameters[1][i])) && (allowed_umode(parameters[1][i],user->modes,true)))
+                                               if (direction == 1)
                                                {
-                                                       char umode = parameters[1][i];
-                                                       log(DEBUG,"umode %c is an allowed umode",umode);
-                                                       if ((process_module_umode(umode, NULL, dest, direction)) || (umode == 'i') || (umode == 's') || (umode == 'w') || (umode == 'o'))
+                                                       log(DEBUG,"umode %c being added",*i);
+                                                       if ((!strchr(dmodes,*i)) && (ServerInstance->ModeGrok->AllowedUmode(*i,user->modes,true,true)))
                                                        {
-                                                               dmodes[strlen(dmodes)+1]='\0';
-                                                               dmodes[strlen(dmodes)] = parameters[1][i];
-                                                               outpars[strlen(outpars)+1]='\0';
-                                                               outpars[strlen(outpars)] = parameters[1][i];
+                                                               log(DEBUG,"umode %c is an allowed umode",*i);
+                                                               if ((*i == 'i') || (*i == 's') || (*i == 'w') || (*i == 'o') || (ServerInstance->ModeGrok->ProcessModuleUmode(*i, user, dest, direction)))
+                                                               {
+                                                                       charlcat(dmodes,*i,MAXBUF);
+                                                                       charlcat(outpars,*i,53);
+                                                               }
                                                        }
                                                }
-                                       }
-                                       else
-                                       {
-                                               // can only remove a mode they already have
-                                               log(DEBUG,"umode %c being removed",parameters[1][i]);
-                                               if ((allowed_umode(parameters[1][i],user->modes,false)) && (strchr(dmodes,parameters[1][i])))
+                                               else
                                                {
-                                                       char umode = parameters[1][i];
-                                                       log(DEBUG,"umode %c is an allowed umode",umode);
-                                                       if ((process_module_umode(umode, NULL, dest, direction)) || (umode == 'i') || (umode == 's') || (umode == 'w') || (umode == 'o'))
+                                                       // can only remove a mode they already have
+                                                       log(DEBUG,"umode %c being removed",*i);
+                                                       if ((ServerInstance->ModeGrok->AllowedUmode(*i,user->modes,false,true)) && (strchr(dmodes,*i)))
                                                        {
-                                                               int q = 0;
-                                                               char temp[MAXBUF];
-                                                               char moo[MAXBUF];       
-
-                                                               outpars[strlen(outpars)+1]='\0';
-                                                               outpars[strlen(outpars)] = parameters[1][i];
-                                                       
-                                                               strcpy(temp,"");
-                                                               for (q = 0; q < strlen(dmodes); q++)
+                                                               log(DEBUG,"umode %c is an allowed umode",*i);
+                                                               if ((*i == 'i') || (*i == 's') || (*i == 'w') || (*i == 'o') || (ServerInstance->ModeGrok->ProcessModuleUmode(*i, user, dest, direction)))
                                                                {
-                                                                       if (dmodes[q] != parameters[1][i])
-                                                                       {
-                                                                               moo[0] = dmodes[q];
-                                                                               moo[1] = '\0';
-                                                                               strlcat(temp,moo,MAXBUF);
-                                                                       }
+                                                                       charlcat(outpars,*i,MAXBUF);
+                                                                       charremove(dmodes,*i);
                                                                }
-                                                               strlcpy(dmodes,temp,MAXBUF);
                                                        }
                                                }
                                        }
-                               }
-                       }
-               }
-               if (strlen(outpars))
-               {
-                       char b[MAXBUF];
-                       strcpy(b,"");
-                       int z = 0;
-                       int i = 0;
-                       while (i < strlen (outpars))
-                       {
-                               b[z++] = outpars[i++];
-                               b[z] = '\0';
-                               if (i<strlen(outpars)-1)
-                               {
-                                       if (((outpars[i] == '-') || (outpars[i] == '+')) && ((outpars[i+1] == '-') || (outpars[i+1] == '+')))
-                                       {
-                                               // someones playing silly buggers and trying
-                                               // to put a +- or -+ into the line...
-                                               i++;
-                                       }
-                               }
-                               if (i == strlen(outpars)-1)
-                               {
-                                       if ((outpars[i] == '-') || (outpars[i] == '+'))
-                                       {
-                                               i++;
-                                       }
-                               }
-                       }
-
-                       z = strlen(b)-1;
-                       if ((b[z] == '-') || (b[z] == '+'))
-                               b[z] == '\0';
-
-                       if ((!strcmp(b,"+")) || (!strcmp(b,"-")))
-                               return;
-
-                       WriteTo(user,dest,"MODE :%s",b);
-
-                       if (strlen(dmodes)>MAXMODES)
-                       {
-                               dmodes[MAXMODES-1] = '\0';
+                               break;
                        }
-                       log(DEBUG,"Stripped mode line");
-                       log(DEBUG,"Line dest is now %s",dmodes);
-                       strlcpy(dest->modes,dmodes,MAXMODES);
-
                }
+                if (*outpars)
+                {
+                        char b[MAXBUF];
+                        char* z = b;
+
+                        for (char* i = outpars; *i;)
+                        {
+                                *z++ = *i++;
+                                if (((*i == '-') || (*i == '+')) && ((*(i+1) == '-') || (*(i+1) == '+')))
+                                {
+                                        // someones playing silly buggers and trying
+                                        // to put a +- or -+ into the line...
+                                        i++;
+                                }
+                                if (!*(i+1))
+                                {
+                                        // Someone's trying to make the last character in
+                                        // the line be a + or - symbol.
+                                        if ((*i == '-') || (*i == '+'))
+                                        {
+                                                i++;
+                                        }
+                                }
+                        }
+                        *z = 0;
+
+                        if ((*b) && (!IS_SINGLE(b,'+')) && (!IS_SINGLE(b,'-')))
+                        {
+                                WriteTo(user, dest, "MODE %s :%s", dest->nick, b);
+                                FOREACH_MOD(I_OnMode,OnMode(user, dest, TYPE_USER, b));
+                        }
+
+                        log(DEBUG,"Stripped mode line");
+                        log(DEBUG,"Line dest is now %s",dmodes);
+                        strlcpy(dest->modes,dmodes,MAXMODES-1);
+                                         
+                }
 
                return;
        }
@@ -1836,16 +1508,10 @@ void merge_mode2(char **parameters, int pcnt, userrec* user)
        Ptr = FindChan(parameters[0]);
        if (Ptr)
        {
-               log(DEBUG,"merge_mode2: found channel %s",Ptr->name);
-               if (Ptr)
-               {
-                       if ((cstatus(user,Ptr) < STATUS_HOP) && (!is_uline(user->server)))
-                       {
-                               return;
-                       }
-                       process_modes(parameters,user,Ptr,cstatus(user,Ptr),pcnt,false,false,true);
-               }
+               ServerInstance->ModeGrok->ProcessModes(parameters,user,Ptr,STATUS_OP,pcnt,true,false,false);
+       }
+       else
+       {
+               WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, parameters[0]);
        }
 }
-
-