]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/mode.cpp
Decide that it wasn't quite appropriate :(
[user/henk/code/inspircd.git] / src / mode.cpp
index 9f7073615629d1c9a3a3610ab746a7e0543b0a64..40ef66f0db76e75bb9a146cf0b5a3e3e0363aeec 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>
@@ -19,7 +19,6 @@ using namespace std;
 #include "inspircd_config.h"
 #include "inspircd.h"
 #include "inspircd_io.h"
-#include "inspircd_util.h"
 #include <unistd.h>
 #include <sys/errno.h>
 #include <time.h>
@@ -35,7 +34,6 @@ using namespace std;
 #include <deque>
 #include "connection.h"
 #include "users.h"
-#include "servers.h"
 #include "ctables.h"
 #include "globals.h"
 #include "modules.h"
@@ -46,113 +44,85 @@ using namespace std;
 #include "xline.h"
 #include "inspstring.h"
 #include "helperfuncs.h"
+#include "mode.h"
 
 extern int MODCOUNT;
 extern std::vector<Module*> modules;
 extern std::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;
+extern InspIRCd* ServerInstance;
+extern ServerConfig* Config;
 
 extern time_t TIME;
 
-char* give_ops(userrec *user,char *dest,chanrec *chan,int status)
+char* ModeParser::GiveOps(userrec *user,char *dest,chanrec *chan,int status)
 {
        userrec *d;
        
-       if ((!user) || (!dest) || (!chan))
+       if ((!user) || (!dest) || (!chan) || (!*dest))
        {
-               log(DEFAULT,"*** BUG *** give_ops was given an invalid parameter");
-               return NULL;
-       }
-
-       if (!isnick(dest))
-       {
-               log(DEFAULT,"the target nickname given to give_ops was invalid");
-               WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, dest);
+               log(DEFAULT,"*** BUG *** GiveOps was given an invalid parameter");
                return NULL;
        }
        d = Find(dest);
        if (!d)
        {
-               log(DEFAULT,"the target nickname given to give_ops couldnt be found");
+               log(DEFAULT,"the target nickname given to GiveOps couldnt be found");
                WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, dest);
                return NULL;
        }
        else
        {
-
-               int MOD_RESULT = 0;
-               FOREACH_RESULT(OnAccessCheck(user,d,chan,AC_OP));
-               
-               if (MOD_RESULT == ACR_DENY)
-                       return NULL;
-               if (MOD_RESULT == ACR_DEFAULT)
+               if (user->server == d->server)
                {
-                       if ((status < STATUS_OP) && (!is_uline(user->server)))
-                       {
-                               log(DEBUG,"%s cant give ops to %s because they nave status %d and needs %d",user->nick,dest,status,STATUS_OP);
-                               WriteServ(user->fd,"482 %s %s :You're not a channel operator",user->nick, chan->name);
+                       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 ((status < STATUS_OP) && (!is_uline(user->server)) && (IS_LOCAL(user)))
+                               {
+                                       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++)
+               for (unsigned int i = 0; i < d->chans.size(); i++)
                {
                        if ((d->chans[i].channel != NULL) && (chan != NULL))
                        if (!strcasecmp(d->chans[i].channel->name,chan->name))
                        {
-                       if (d->chans[i].uc_modes & UCMODE_OP)
+                               if (d->chans[i].uc_modes & UCMODE_OP)
                                {
                                        /* mode already set on user, dont allow multiple */
-                                       log(DEFAULT,"The target user given to give_ops was already opped on the channel");
                                        return NULL;
                                }
                                d->chans[i].uc_modes = d->chans[i].uc_modes | UCMODE_OP;
+                               d->chans[i].channel->AddOppedUser((char*)d);
                                log(DEBUG,"gave ops: %s %s",d->chans[i].channel->name,d->nick);
                                return d->nick;
                        }
                }
-               log(DEFAULT,"The target channel given to give_ops was not in the users mode list");
+               log(DEFAULT,"The target channel given to GiveOps was not in the users mode list");
        }
        return NULL;
 }
 
-char* give_hops(userrec *user,char *dest,chanrec *chan,int status)
+char* ModeParser::GiveHops(userrec *user,char *dest,chanrec *chan,int status)
 {
        userrec *d;
        
-       if ((!user) || (!dest) || (!chan))
+       if ((!user) || (!dest) || (!chan) || (!*dest))
        {
-               log(DEFAULT,"*** BUG *** give_hops was given an invalid parameter");
+               log(DEFAULT,"*** BUG *** GiveHops was given an invalid parameter");
                return NULL;
        }
 
        d = Find(dest);
-       if (!isnick(dest))
-       {
-               WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, dest);
-               return NULL;
-       }
        if (!d)
        {
                WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, dest);
@@ -160,21 +130,24 @@ char* give_hops(userrec *user,char *dest,chanrec *chan,int status)
        }
        else
        {
-               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 (user->server == d->server)
                {
-                       if ((status < STATUS_OP) && (!is_uline(user->server)))
-                       {
-                               WriteServ(user->fd,"482 %s %s :You're not a channel operator",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;
+                       if (MOD_RESULT == ACR_DEFAULT)
+                       {
+                               if ((status < STATUS_OP) && (!is_uline(user->server)) && (IS_LOCAL(user)))
+                               {
+                                       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++)
+               for (unsigned int i = 0; i < d->chans.size(); i++)
                {
                        if ((d->chans[i].channel != NULL) && (chan != NULL))
                        if (!strcasecmp(d->chans[i].channel->name,chan->name))
@@ -185,6 +158,7 @@ char* give_hops(userrec *user,char *dest,chanrec *chan,int status)
                                        return NULL;
                                }
                                d->chans[i].uc_modes = d->chans[i].uc_modes | UCMODE_HOP;
+                               d->chans[i].channel->AddHalfoppedUser((char*)d);
                                log(DEBUG,"gave h-ops: %s %s",d->chans[i].channel->name,d->nick);
                                return d->nick;
                        }
@@ -193,22 +167,17 @@ char* give_hops(userrec *user,char *dest,chanrec *chan,int status)
        return NULL;
 }
 
-char* give_voice(userrec *user,char *dest,chanrec *chan,int status)
+char* ModeParser::GiveVoice(userrec *user,char *dest,chanrec *chan,int status)
 {
        userrec *d;
        
-       if ((!user) || (!dest) || (!chan))
+       if ((!user) || (!dest) || (!chan) || (!*dest))
        {
-               log(DEFAULT,"*** BUG *** give_voice was given an invalid parameter");
+               log(DEFAULT,"*** BUG *** GiveVoice was given an invalid parameter");
                return NULL;
        }
 
        d = Find(dest);
-       if (!isnick(dest))
-       {
-               WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, dest);
-               return NULL;
-       }
        if (!d)
        {
                WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, dest);
@@ -216,21 +185,24 @@ char* give_voice(userrec *user,char *dest,chanrec *chan,int status)
        }
        else
        {
-               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 (user->server == d->server)
                {
-                       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_VOICE));
+                       
+                       if (MOD_RESULT == ACR_DENY)
                                return NULL;
+                       if (MOD_RESULT == ACR_DEFAULT)
+                       {
+                               if ((status < STATUS_HOP) && (!is_uline(user->server)) && (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, chan->name);
+                                       return NULL;
+                               }
                        }
                }
 
-               for (int i = 0; i != MAXCHANS; i++)
+               for (unsigned int i = 0; i < d->chans.size(); i++)
                {
                        if ((d->chans[i].channel != NULL) && (chan != NULL))
                        if (!strcasecmp(d->chans[i].channel->name,chan->name))
@@ -241,6 +213,7 @@ char* give_voice(userrec *user,char *dest,chanrec *chan,int status)
                                        return NULL;
                                }
                                d->chans[i].uc_modes = d->chans[i].uc_modes | UCMODE_VOICE;
+                               d->chans[i].channel->AddVoicedUser((char*)d);
                                log(DEBUG,"gave voice: %s %s",d->chans[i].channel->name,d->nick);
                                return d->nick;
                        }
@@ -249,46 +222,43 @@ char* give_voice(userrec *user,char *dest,chanrec *chan,int status)
        return NULL;
 }
 
-char* take_ops(userrec *user,char *dest,chanrec *chan,int status)
+char* ModeParser::TakeOps(userrec *user,char *dest,chanrec *chan,int status)
 {
        userrec *d;
        
-       if ((!user) || (!dest) || (!chan))
+       if ((!user) || (!dest) || (!chan) || (!*dest))
        {
-               log(DEFAULT,"*** BUG *** take_ops was given an invalid parameter");
+               log(DEFAULT,"*** BUG *** TakeOps 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 such nick/channel",user->nick, dest);
-               return NULL;
-       }
        if (!d)
        {
-               log(DEBUG,"take_ops couldnt resolve the target nickname: %s",dest);
+               log(DEBUG,"TakeOps couldnt resolve the target nickname: %s",dest);
                WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, dest);
                return NULL;
        }
        else
        {
-               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 (user->server == d->server)
                {
-                       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;
+                       if (MOD_RESULT == ACR_DEFAULT)
+                       {
+                               if ((status < STATUS_OP) && (!is_uline(user->server)) && (IS_LOCAL(user)) && (IS_LOCAL(user)))
+                               {
+                                       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++)
+               for (unsigned int i = 0; i < d->chans.size(); i++)
                {
                        if ((d->chans[i].channel != NULL) && (chan != NULL))
                        if (!strcasecmp(d->chans[i].channel->name,chan->name))
@@ -299,31 +269,27 @@ char* take_ops(userrec *user,char *dest,chanrec *chan,int status)
                                        return NULL;
                                }
                                d->chans[i].uc_modes ^= UCMODE_OP;
+                               d->chans[i].channel->DelOppedUser((char*)d);
                                log(DEBUG,"took ops: %s %s",d->chans[i].channel->name,d->nick);
                                return d->nick;
                        }
                }
-               log(DEBUG,"take_ops couldnt locate the target channel in the target users list");
+               log(DEBUG,"TakeOps couldnt locate the target channel in the target users list");
        }
        return NULL;
 }
 
-char* take_hops(userrec *user,char *dest,chanrec *chan,int status)
+char* ModeParser::TakeHops(userrec *user,char *dest,chanrec *chan,int status)
 {
        userrec *d;
        
-       if ((!user) || (!dest) || (!chan))
+       if ((!user) || (!dest) || (!chan) || (!*dest))
        {
-               log(DEFAULT,"*** BUG *** take_hops was given an invalid parameter");
+               log(DEFAULT,"*** BUG *** TakeHops was given an invalid parameter");
                return NULL;
        }
 
        d = Find(dest);
-       if (!isnick(dest))
-       {
-               WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, dest);
-               return NULL;
-       }
        if (!d)
        {
                WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, dest);
@@ -331,21 +297,25 @@ char* take_hops(userrec *user,char *dest,chanrec *chan,int status)
        }
        else
        {
-               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 (user->server == d->server)
                {
-                       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_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))) && (IS_LOCAL(user)))
+                               {
+                                       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++)
+               for (unsigned int i = 0; i < d->chans.size(); i++)
                {
                        if ((d->chans[i].channel != NULL) && (chan != NULL))
                        if (!strcasecmp(d->chans[i].channel->name,chan->name))
@@ -356,6 +326,7 @@ char* take_hops(userrec *user,char *dest,chanrec *chan,int status)
                                        return NULL;
                                }
                                d->chans[i].uc_modes ^= UCMODE_HOP;
+                               d->chans[i].channel->DelHalfoppedUser((char*)d);
                                log(DEBUG,"took h-ops: %s %s",d->chans[i].channel->name,d->nick);
                                return d->nick;
                        }
@@ -364,22 +335,17 @@ char* take_hops(userrec *user,char *dest,chanrec *chan,int status)
        return NULL;
 }
 
-char* take_voice(userrec *user,char *dest,chanrec *chan,int status)
+char* ModeParser::TakeVoice(userrec *user,char *dest,chanrec *chan,int status)
 {
        userrec *d;
        
-       if ((!user) || (!dest) || (!chan))
+       if ((!user) || (!dest) || (!chan) || (!*dest))
        {
-               log(DEFAULT,"*** BUG *** take_voice was given an invalid parameter");
+               log(DEFAULT,"*** BUG *** TakeVoice was given an invalid parameter");
                return NULL;
        }
 
        d = Find(dest);
-       if (!isnick(dest))
-       {
-               WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, dest);
-               return NULL;
-       }
        if (!d)
        {
                WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, dest);
@@ -387,21 +353,24 @@ char* take_voice(userrec *user,char *dest,chanrec *chan,int status)
        }
        else
        {
-               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 (user->server == d->server)
                {
-                       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_DEVOICE));
+                       
+                       if (MOD_RESULT == ACR_DENY)
                                return NULL;
+                       if (MOD_RESULT == ACR_DEFAULT)
+                       {
+                               if ((status < STATUS_HOP) && (!is_uline(user->server)) && (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, chan->name);
+                                       return NULL;
+                               }
                        }
                }
 
-               for (int i = 0; i != MAXCHANS; i++)
+               for (unsigned int i = 0; i < d->chans.size(); i++)
                {
                        if ((d->chans[i].channel != NULL) && (chan != NULL))
                        if (!strcasecmp(d->chans[i].channel->name,chan->name))
@@ -412,6 +381,7 @@ char* take_voice(userrec *user,char *dest,chanrec *chan,int status)
                                        return NULL;
                                }
                                d->chans[i].uc_modes ^= UCMODE_VOICE;
+                               d->chans[i].channel->DelVoicedUser((char*)d);
                                log(DEBUG,"took voice: %s %s",d->chans[i].channel->name,d->nick);
                                return d->nick;
                        }
@@ -420,51 +390,52 @@ char* take_voice(userrec *user,char *dest,chanrec *chan,int status)
        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;
-       int l = strlen(dest);
-       if (strchr(dest,'!')==0)
-               return NULL;
-       if (strchr(dest,'@')==0)
-               return NULL;
-       for (int i = 0; i < l; i++)
-               if (dest[i] < 32)
-                       return NULL;
-       for (int i = 0; i < l; 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 < l; i++)
-               if (dest[i] == '!')
-                       c++;
-       if (c>1)
-               return NULL;
-       c = 0;
-       for (int i = 0; i < l; 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 (chan->bans.size() > maxbans)
+       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;
        }
 
-       log(DEBUG,"add_ban: %s %s",chan->name,user->nick);
+       log(DEBUG,"AddBan: %s %s",chan->name,user->nick);
 
        int MOD_RESULT = 0;
-       FOREACH_RESULT(OnAddBan(user,chan,dest));
+       FOREACH_RESULT(I_OnAddBan,OnAddBan(user,chan,dest));
        if (MOD_RESULT)
                return NULL;
 
@@ -479,16 +450,23 @@ char* add_ban(userrec *user,char *dest,chanrec *chan,int status)
        }
 
        b.set_time = TIME;
-       strncpy(b.data,dest,MAXBUF);
-       strncpy(b.set_by,user->nick,NICKMAX);
+       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;
        }
 
@@ -498,7 +476,7 @@ char* take_ban(userrec *user,char *dest,chanrec *chan,int status)
                if (!strcasecmp(i->data,dest))
                {
                        int MOD_RESULT = 0;
-                       FOREACH_RESULT(OnDelBan(user,chan,dest));
+                       FOREACH_RESULT(I_OnDelBan,OnDelBan(user,chan,dest));
                        if (MOD_RESULT)
                                return NULL;
                        chan->bans.erase(i);
@@ -510,15 +488,13 @@ char* take_ban(userrec *user,char *dest,chanrec *chan,int status)
 
 // tidies up redundant modes, e.g. +nt-nt+i becomes +-+i,
 // a section further down the chain tidies up the +-+- crap.
-std::string compress_modes(std::string modes,bool channelmodes)
+std::string ModeParser::CompressModes(std::string modes,bool channelmodes)
 {
        int counts[127];
        bool active[127];
-       int delta = 1;
        memset(counts,0,sizeof(counts));
        memset(active,0,sizeof(active));
-       log(DEBUG,"compress_modes: %s",modes.c_str());
-       for (int i = 0; i < modes.length(); i++)
+       for (unsigned int i = 0; i < modes.length(); i++)
        {
                if ((modes[i] == '+') || (modes[i] == '-'))
                        continue;
@@ -559,7 +535,7 @@ std::string compress_modes(std::string modes,bool channelmodes)
        return modes;
 }
 
-void process_modes(char **parameters,userrec* user,chanrec *chan,int status, int pcnt, bool servermode, bool silent, bool local)
+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");
@@ -583,36 +559,44 @@ void process_modes(char **parameters,userrec* user,chanrec *chan,int status, int
        }
 
        int MOD_RESULT = 0;
-       FOREACH_RESULT(OnAccessCheck(user,NULL,chan,AC_GENERAL_MODE));
        
-       if (MOD_RESULT == ACR_DENY)
-               return;
+       if (IS_LOCAL(user))
+       {
+               FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,NULL,chan,AC_GENERAL_MODE));  
+               if (MOD_RESULT == ACR_DENY)
+                       return;
+       }
 
        log(DEBUG,"process_modes: start: parameters=%d",pcnt);
 
        strlcpy(modelist,parameters[1],MAXBUF); /* mode list, e.g. +oo-o *
                                                 * parameters[2] onwards are parameters for
                                                 * modes that require them :) */
-       strlcpy(outlist,"+",MAXBUF);
+       *outlist = '+';
+       *(outlist+1) = 0;
        mdir = 1;
 
        log(DEBUG,"process_modes: modelist: %s",modelist);
 
-       std::string tidied = compress_modes(modelist,true);
+       std::string tidied = this->CompressModes(modelist,true);
        strlcpy(modelist,tidied.c_str(),MAXBUF);
 
-       int len = strlen(modelist);
+       int len = tidied.length();
        while (modelist[len-1] == ' ')
                modelist[--len] = '\0';
-       for (ptr = 0; ptr < len; ptr++)
+
+       for (char* modechar = modelist; *modechar; ptr++, modechar++)
        {
                r = NULL;
 
-               {
-                       log(DEBUG,"process_modes: modechar: %c",modelist[ptr]);
+               /* If we have more than MAXMODES changes in one line,
+                * drop all after the MAXMODES
+                */
+               if (pc > MAXMODES-1)
+                       break;
 
-                       char modechar = modelist[ptr];
-                       switch (modelist[ptr])
+               {
+                       switch (*modechar)
                        {
                                case '-':
                                        if (mdir != 0)
@@ -651,25 +635,26 @@ void process_modes(char **parameters,userrec* user,chanrec *chan,int status, int
                                        log(DEBUG,"Ops");
                                        if ((param >= pcnt)) break;
                                        log(DEBUG,"Enough parameters left");
+                                       r = NULL;
                                        if (mdir == 1)
                                        {
                                                MOD_RESULT = 0;
-                                               FOREACH_RESULT(OnRawMode(user, chan, 'o', parameters[param], true, 1));
+                                               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);
+                                                       log(DEBUG,"calling GiveOps");
+                                                       r = GiveOps(user,parameters[param++],chan,status);
                                                }
                                                else param++;
                                        }
                                        else
                                        {
                                                 MOD_RESULT = 0;
-                                                FOREACH_RESULT(OnRawMode(user, chan, 'o', parameters[param], false, 1));
+                                                FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'o', parameters[param], false, 1));
                                                 if (!MOD_RESULT)
                                                 {
-                                                       log(DEBUG,"calling take_ops");
-                                                       r = take_ops(user,parameters[param++],chan,status);
+                                                       log(DEBUG,"calling TakeOps");
+                                                       r = TakeOps(user,parameters[param++],chan,status);
                                                }
                                                else param++;
                                        }
@@ -681,24 +666,25 @@ void process_modes(char **parameters,userrec* user,chanrec *chan,int status, int
                                break;
                        
                                case 'h':
-                                       if (((param >= pcnt)) || (!AllowHalfop)) break;
+                                       if (((param >= pcnt)) || (!Config->AllowHalfop)) break;
+                                       r = NULL;
                                        if (mdir == 1)
                                        {
                                                 MOD_RESULT = 0;
-                                                FOREACH_RESULT(OnRawMode(user, chan, 'h', parameters[param], true, 1));
+                                                FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'h', parameters[param], true, 1));
                                                 if (!MOD_RESULT)
                                                 {
-                                                       r = give_hops(user,parameters[param++],chan,status);
+                                                       r = GiveHops(user,parameters[param++],chan,status);
                                                }
                                                else param++;
                                        }
                                        else
                                        {
                                                 MOD_RESULT = 0;
-                                                FOREACH_RESULT(OnRawMode(user, chan, 'h', parameters[param], false, 1));
+                                                FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'h', parameters[param], false, 1));
                                                 if (!MOD_RESULT)
                                                 {
-                                                       r = take_hops(user,parameters[param++],chan,status);
+                                                       r = TakeHops(user,parameters[param++],chan,status);
                                                }
                                                else param++;
                                        }
@@ -712,23 +698,24 @@ void process_modes(char **parameters,userrec* user,chanrec *chan,int status, int
                                
                                case 'v':
                                        if ((param >= pcnt)) break;
+                                       r = NULL;
                                        if (mdir == 1)
                                        {
                                                 MOD_RESULT = 0;
-                                                FOREACH_RESULT(OnRawMode(user, chan, 'v', parameters[param], true, 1));
+                                                FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'v', parameters[param], true, 1));
                                                 if (!MOD_RESULT)
                                                 {
-                                                       r = give_voice(user,parameters[param++],chan,status);
+                                                       r = GiveVoice(user,parameters[param++],chan,status);
                                                }
                                                else param++;
                                        }
                                        else
                                        {
                                                 MOD_RESULT = 0;
-                                                FOREACH_RESULT(OnRawMode(user, chan, 'v', parameters[param], false, 1));
+                                                FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'v', parameters[param], false, 1));
                                                 if (!MOD_RESULT)
                                                 {
-                                                       r = take_voice(user,parameters[param++],chan,status);
+                                                       r = TakeVoice(user,parameters[param++],chan,status);
                                                }
                                                else param++;
                                        }
@@ -741,23 +728,24 @@ void process_modes(char **parameters,userrec* user,chanrec *chan,int status, int
                                
                                case 'b':
                                        if ((param >= pcnt)) break;
+                                       r = NULL;
                                        if (mdir == 1)
                                        {
                                                 MOD_RESULT = 0;
-                                                FOREACH_RESULT(OnRawMode(user, chan, 'b', parameters[param], true, 1));
+                                                FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'b', parameters[param], true, 1));
                                                 if (!MOD_RESULT)
                                                 {
-                                                       r = add_ban(user,parameters[param++],chan,status);
+                                                       r = AddBan(user,parameters[param++],chan,status);
                                                }
                                                else param++;
                                        }
                                        else
                                        {
                                                 MOD_RESULT = 0;
-                                                FOREACH_RESULT(OnRawMode(user, chan, 'b', parameters[param], false, 1));
+                                                FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'b', parameters[param], false, 1));
                                                 if (!MOD_RESULT)
                                                 {
-                                                       r = take_ban(user,parameters[param++],chan,status);
+                                                       r = TakeBan(user,parameters[param++],chan,status);
                                                }
                                                else param++;
                                        }
@@ -782,10 +770,10 @@ void process_modes(char **parameters,userrec* user,chanrec *chan,int status, int
                                                        break;
                                                previously_set_k = true;
                                                
-                                               if (!strcmp(chan->key,""))
+                                               if (!*chan->key)
                                                {
                                                        MOD_RESULT = 0;
-                                                       FOREACH_RESULT(OnRawMode(user, chan, 'k', parameters[param], true, 1));
+                                                       FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'k', parameters[param], true, 1));
                                                        if (!MOD_RESULT)
                                                        {
                                                                strcat(outlist,"k");
@@ -808,7 +796,7 @@ void process_modes(char **parameters,userrec* user,chanrec *chan,int status, int
 
                                                char key[MAXBUF];
                                                MOD_RESULT = 0;
-                                               FOREACH_RESULT(OnRawMode(user, chan, 'k', parameters[param], false, 1));
+                                               FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'k', parameters[param], false, 1));
                                                if (!MOD_RESULT)
                                                {
                                                        strlcpy(key,parameters[param++],32);
@@ -831,7 +819,7 @@ void process_modes(char **parameters,userrec* user,chanrec *chan,int status, int
                                                        break;
                                                previously_unset_l = true;
                                                 MOD_RESULT = 0;
-                                                FOREACH_RESULT(OnRawMode(user, chan, 'l', "", false, 0));
+                                                FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'l', "", false, 0));
                                                 if (!MOD_RESULT)
                                                 {
                                                        if (chan->limit)
@@ -851,14 +839,15 @@ void process_modes(char **parameters,userrec* user,chanrec *chan,int status, int
                                                        break;
                                                previously_set_l = true;
                                                bool invalid = false;
-                                               for (int i = 0; i < strlen(parameters[param]); i++)
+                                               for (char* f = parameters[param]; *f; f++)
                                                {
-                                                       if ((parameters[param][i] < '0') || (parameters[param][i] > '9'))
+                                                       if ((*f < '0') || (*f > '9'))
                                                        {
                                                                invalid = true;
                                                        }
                                                }
-                                               if (atoi(parameters[param]) < 1)
+                                               /* 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;
                                                }
@@ -867,7 +856,7 @@ void process_modes(char **parameters,userrec* user,chanrec *chan,int status, int
                                                        break;
 
                                                 MOD_RESULT = 0;
-                                                FOREACH_RESULT(OnRawMode(user, chan, 'l', parameters[param], true, 1));
+                                                FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'l', parameters[param], true, 1));
                                                 if (!MOD_RESULT)
                                                 {
        
@@ -889,7 +878,7 @@ void process_modes(char **parameters,userrec* user,chanrec *chan,int status, int
                                
                                case 'i':
                                         MOD_RESULT = 0;
-                                        FOREACH_RESULT(OnRawMode(user, chan, 'i', "", mdir, 0));
+                                        FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'i', "", mdir, 0));
                                         if (!MOD_RESULT)
                                         {
                                                if (mdir)
@@ -907,7 +896,7 @@ void process_modes(char **parameters,userrec* user,chanrec *chan,int status, int
                                
                                case 't':
                                         MOD_RESULT = 0;
-                                        FOREACH_RESULT(OnRawMode(user, chan, 't', "", mdir, 0));
+                                        FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 't', "", mdir, 0));
                                         if (!MOD_RESULT)
                                         {
                                                if (mdir)
@@ -917,7 +906,7 @@ void process_modes(char **parameters,userrec* user,chanrec *chan,int status, int
                                                 }
                                                 else
                                                 {
-                                                       if (chan->binarymodes & CM_NOEXTERNAL) strlcat(outlist,"t",MAXBUF);
+                                                       if (chan->binarymodes & CM_TOPICLOCK) strlcat(outlist,"t",MAXBUF);
                                                         chan->binarymodes &= ~CM_TOPICLOCK;
                                                 }
                                        }
@@ -925,7 +914,7 @@ void process_modes(char **parameters,userrec* user,chanrec *chan,int status, int
                                
                                case 'n':
                                         MOD_RESULT = 0;
-                                        FOREACH_RESULT(OnRawMode(user, chan, 'n', "", mdir, 0));
+                                        FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'n', "", mdir, 0));
                                         if (!MOD_RESULT)
                                         {
                                                 if (mdir)
@@ -943,7 +932,7 @@ void process_modes(char **parameters,userrec* user,chanrec *chan,int status, int
                                
                                case 'm':
                                         MOD_RESULT = 0;
-                                        FOREACH_RESULT(OnRawMode(user, chan, 'm', "", mdir, 0));
+                                        FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'm', "", mdir, 0));
                                         if (!MOD_RESULT)
                                         {
                                                 if (mdir)
@@ -961,7 +950,7 @@ void process_modes(char **parameters,userrec* user,chanrec *chan,int status, int
                                
                                case 's':
                                         MOD_RESULT = 0;
-                                        FOREACH_RESULT(OnRawMode(user, chan, 's', "", mdir, 0));
+                                        FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 's', "", mdir, 0));
                                         if (!MOD_RESULT)
                                         {
                                                 if (mdir)
@@ -987,7 +976,7 @@ void process_modes(char **parameters,userrec* user,chanrec *chan,int status, int
                                
                                case 'p':
                                         MOD_RESULT = 0;
-                                        FOREACH_RESULT(OnRawMode(user, chan, 'p', "", mdir, 0));
+                                        FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'p', "", mdir, 0));
                                         if (!MOD_RESULT)
                                         {
                                                 if (mdir)
@@ -1012,27 +1001,27 @@ void process_modes(char **parameters,userrec* user,chanrec *chan,int status, int
                                break;
                                
                                default:
-                                       log(DEBUG,"Preprocessing custom mode %c: modelist: %s",modechar,chan->custom_modes);
+                                       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)))
+                                       if (((!strchr(chan->custom_modes,*modechar)) && (!mdir)) || ((strchr(chan->custom_modes,*modechar)) && (mdir)))
                                        {
-                                               if (!ModeIsListMode(modechar,MT_CHANNEL))
+                                               if (!ModeIsListMode(*modechar,MT_CHANNEL))
                                                {
-                                                       log(DEBUG,"Mode %c isnt set on %s but trying to remove!",modechar,chan->name);
+                                                       log(DEBUG,"Mode %c isnt set on %s but trying to remove!",*modechar,chan->name);
                                                        break;
                                                }
                                        }
-                                       if (ModeDefined(modechar,MT_CHANNEL))
+                                       if (ModeDefined(*modechar,MT_CHANNEL))
                                        {
                                                log(DEBUG,"A module has claimed this mode");
                                                if (param<pcnt)
                                                {
-                                                       if ((ModeDefinedOn(modechar,MT_CHANNEL)>0) && (mdir))
+                                                       if ((ModeDefinedOn(*modechar,MT_CHANNEL)>0) && (mdir))
                                                        {
                                                                p.push_back(parameters[param]);
                                                        }
-                                                       if ((ModeDefinedOff(modechar,MT_CHANNEL)>0) && (!mdir))
+                                                       if ((ModeDefinedOff(*modechar,MT_CHANNEL)>0) && (!mdir))
                                                        {
                                                                p.push_back(parameters[param]);
                                                        }
@@ -1041,9 +1030,9 @@ void process_modes(char **parameters,userrec* user,chanrec *chan,int status, int
                                                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))) 
+                                                       if (((ModeDefinedOn(*modechar,MT_CHANNEL)>0) && (mdir)) || ((ModeDefinedOff(*modechar,MT_CHANNEL)>0) && (!mdir)))       
                                                        {
-                                                               log(DEBUG,"Not enough parameters for module-mode %c",modechar);
+                                                               log(DEBUG,"Not enough parameters for module-mode %c",*modechar);
                                                                handled = true;
                                                                param++;
                                                        }
@@ -1057,19 +1046,19 @@ void process_modes(char **parameters,userrec* user,chanrec *chan,int status, int
                                                std::string para = "";
                                                if (p.size())
                                                        para = p[0];
-                                               FOREACH_RESULT(OnRawMode(user, chan, modechar, para, mdir, pcnt));
+                                               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))
+                                                                               char app[] = {*modechar, 0};
+                                                                               if (ModeIsListMode(*modechar,MT_CHANNEL))
                                                                                {
                                                                                        if (t == -1)
                                                                                        {
@@ -1093,14 +1082,14 @@ void process_modes(char **parameters,userrec* user,chanrec *chan,int status, int
                                                                                                {
                                                                                                        strlcat(outlist, app,MAXBUF);
                                                                                                }
-                                                                                               else if (!strchr(outlist,modechar))
+                                                                                               else if (!strchr(outlist,*modechar))
                                                                                                {
                                                                                                        strlcat(outlist, app,MAXBUF);
                                                                                                }
                                                                                        }
-                                                                                       chan->SetCustomMode(modechar,mdir);
+                                                                                       chan->SetCustomMode(*modechar,mdir);
                                                                                        // include parameters in output if mode has them
-                                                                                       if ((ModeDefinedOn(modechar,MT_CHANNEL)>0) && (mdir))
+                                                                                       if ((ModeDefinedOn(*modechar,MT_CHANNEL)>0) && (mdir))
                                                                                        {
                                                                                                chan->SetCustomModeParam(modelist[ptr],parameters[param],mdir);
                                                                                                strlcpy(outpars[pc++],parameters[param++],MAXBUF);
@@ -1115,7 +1104,7 @@ void process_modes(char **parameters,userrec* user,chanrec *chan,int status, int
                                        }
                                        else
                                        {
-                                               WriteServ(user->fd,"472 %s %c :is unknown mode char to me",user->nick,modechar);
+                                               WriteServ(user->fd,"472 %s %c :is unknown mode char to me",user->nick,*modechar);
                                        }
                                break;
                                
@@ -1142,6 +1131,7 @@ void process_modes(char **parameters,userrec* user,chanrec *chan,int status, int
                {
                        log(DEBUG,"Local mode change");
                        WriteChannelLocal(chan, user, "MODE %s %s",chan->name,outstr);
+                       FOREACH_MOD(I_OnMode,OnMode(user, chan, TYPE_CHANNEL, outstr));
                }
                else
                {
@@ -1149,11 +1139,7 @@ void process_modes(char **parameters,userrec* user,chanrec *chan,int status, int
                        {
                                if (!silent)
                                {
-                                       WriteChannelWithServ(ServerName,chan,"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,outstr);
                                }
                                        
                        }
@@ -1162,10 +1148,7 @@ 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);
+                                       FOREACH_MOD(I_OnMode,OnMode(user, chan, TYPE_CHANNEL, outstr));
                                }
                        }
                }
@@ -1174,9 +1157,14 @@ 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)
 {
        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'))
        {
@@ -1220,14 +1208,14 @@ 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);
+               strlcpy(s2->nick,Config->ServerName,NICKMAX-1);
                strlcpy(s2->modes,"o",52);
                s2->fd = -1;
                source = s2;
@@ -1241,7 +1229,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;
                        }
                }
@@ -1264,7 +1252,7 @@ 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;
@@ -1287,7 +1275,7 @@ void handle_mode(char **parameters, int pcnt, userrec *user)
 
        if ((dest) && (pcnt > 1))
        {
-               std::string tidied = compress_modes(parameters[1],false);
+               std::string tidied = ServerInstance->ModeGrok->CompressModes(parameters[1],false);
                parameters[1] = (char*)tidied.c_str();
 
                char dmodes[MAXBUF];
@@ -1297,7 +1285,7 @@ void handle_mode(char **parameters, int pcnt, userrec *user)
                can_change = 0;
                if (user != dest)
                {
-                       if (strchr(user->modes,'o'))
+                       if ((strchr(user->modes,'o')) || (is_uline(user->server)))
                        {
                                can_change = 1;
                        }
@@ -1312,13 +1300,14 @@ void handle_mode(char **parameters, int pcnt, userrec *user)
                        return;
                }
                
-               strcpy(outpars,"+");
+               outpars[0] = '+';
+               outpars[1] = 0;
                direction = 1;
 
                if ((parameters[1][0] != '+') && (parameters[1][0] != '-'))
                        return;
 
-               for (int i = 0; i < strlen(parameters[1]); i++)
+               for (unsigned int i = 0; i < strlen(parameters[1]); i++)
                {
                        if (parameters[1][i] == ' ')
                                continue;
@@ -1364,7 +1353,7 @@ void handle_mode(char **parameters, int pcnt, userrec *user)
                                }
                                else
                                {
-                                       if ((parameters[1][i] == 'i') || (parameters[1][i] == 'w') || (parameters[1][i] == 's') || (allowed_umode(parameters[1][i],user->modes,direction)))
+                                       if ((parameters[1][i] == 'i') || (parameters[1][i] == 'w') || (parameters[1][i] == 's') || (ServerInstance->ModeGrok->AllowedUmode(parameters[1][i],user->modes,direction,false)))
                                        {
                                                can_change = 1;
                                        }
@@ -1373,10 +1362,10 @@ void handle_mode(char **parameters, int pcnt, userrec *user)
                                {
                                        if (direction == 1)
                                        {
-                                               if ((!strchr(dmodes,parameters[1][i])) && (allowed_umode(parameters[1][i],user->modes,true)))
+                                               if ((!strchr(dmodes,parameters[1][i])) && (ServerInstance->ModeGrok->AllowedUmode(parameters[1][i],user->modes,true,false)))
                                                {
                                                        char umode = parameters[1][i];
-                                                       if ((process_module_umode(umode, user, dest, direction)) || (umode == 'i') || (umode == 's') || (umode == 'w') || (umode == 'o'))
+                                                       if ((ServerInstance->ModeGrok->ProcessModuleUmode(umode, user, dest, direction)) || (umode == 'i') || (umode == 's') || (umode == 'w') || (umode == 'o'))
                                                        {
                                                                int q = strlen(dmodes);
                                                                int r = strlen(outpars);
@@ -1386,27 +1375,27 @@ void handle_mode(char **parameters, int pcnt, userrec *user)
                                                                outpars[r] = parameters[1][i];
                                                                if (parameters[1][i] == 'o')
                                                                {
-                                                                       FOREACH_MOD OnGlobalOper(dest);
+                                                                       FOREACH_MOD(I_OnGlobalOper,OnGlobalOper(dest));
                                                                }
                                                        }
                                                }
                                        }
                                        else
                                        {
-                                               if ((allowed_umode(parameters[1][i],user->modes,false)) && (strchr(dmodes,parameters[1][i])))
+                                               if ((ServerInstance->ModeGrok->AllowedUmode(parameters[1][i],user->modes,false,false)) && (strchr(dmodes,parameters[1][i])))
                                                {
                                                        char umode = parameters[1][i];
-                                                       if ((process_module_umode(umode, user, dest, direction)) || (umode == 'i') || (umode == 's') || (umode == 'w') || (umode == 'o'))
+                                                       if ((ServerInstance->ModeGrok->ProcessModuleUmode(umode, user, dest, direction)) || (umode == 'i') || (umode == 's') || (umode == 'w') || (umode == 'o'))
                                                        {
-                                                               int q = 0;
+                                                               unsigned int q = 0;
                                                                char temp[MAXBUF];      
                                                                char moo[MAXBUF];       
 
-                                                               int r = strlen(outpars);
+                                                               unsigned int r = strlen(outpars);
                                                                outpars[r+1]='\0';
                                                                outpars[r] = parameters[1][i];
                                                        
-                                                               strcpy(temp,"");
+                                                               *temp = 0;
                                                                for (q = 0; q < strlen(dmodes); q++)
                                                                {
                                                                        if (dmodes[q] != parameters[1][i])
@@ -1419,7 +1408,10 @@ void handle_mode(char **parameters, int pcnt, userrec *user)
                                                                strlcpy(dmodes,temp,52);
 
                                                                if (umode == 'o')
+                                                               {
+                                                                       *dest->oper = 0;
                                                                        DeleteOper(dest);
+                                                               }
                                                        }
                                                }
                                        }
@@ -1430,8 +1422,8 @@ void handle_mode(char **parameters, int pcnt, userrec *user)
                {
                        char b[MAXBUF];
                        strlcpy(b,"",MAXBUF);
-                       int z = 0;
-                       int i = 0;
+                       unsigned int z = 0;
+                       unsigned int i = 0;
                        while (i < strlen (outpars))
                        {
                                b[z++] = outpars[i++];
@@ -1464,10 +1456,7 @@ void handle_mode(char **parameters, int pcnt, userrec *user)
                        if (strcmp(b,""))
                        {
                                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);
+                               FOREACH_MOD(I_OnMode,OnMode(user, dest, TYPE_USER, b));
                        }
 
                        if (strlen(dmodes)>MAXMODES)
@@ -1489,7 +1478,7 @@ void handle_mode(char **parameters, int pcnt, userrec *user)
                if (pcnt == 1)
                {
                        /* just /modes #channel */
-                       WriteServ(user->fd,"324 %s %s +%s",user->nick, Ptr->name, chanmodes(Ptr));
+                       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;
                }
@@ -1500,7 +1489,7 @@ void handle_mode(char **parameters, int pcnt, userrec *user)
                        if (*mode == '+')
                                mode++;
                        int MOD_RESULT = 0;
-                        FOREACH_RESULT(OnRawMode(user, Ptr, *mode, "", false, 0));
+                        FOREACH_RESULT(I_OnRawMode,OnRawMode(user, Ptr, *mode, "", false, 0));
                         if (!MOD_RESULT)
                         {
                                if (*mode == 'b')
@@ -1517,13 +1506,13 @@ void handle_mode(char **parameters, int pcnt, userrec *user)
                                {
                                        // list of items for an extmode
                                        log(DEBUG,"Calling OnSendList for all modules, list output for mode %c",*mode);
-                                       FOREACH_MOD OnSendList(user,Ptr,*mode);
+                                       FOREACH_MOD(I_OnSendList,OnSendList(user,Ptr,*mode));
                                        return;
                                }
                        }
                }
 
-                if ((Ptr) && (!has_channel(user,Ptr)))
+                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;
@@ -1532,20 +1521,20 @@ void handle_mode(char **parameters, int pcnt, userrec *user)
                if (Ptr)
                {
                        int MOD_RESULT = 0;
-                       FOREACH_RESULT(OnAccessCheck(user,NULL,Ptr,AC_GENERAL_MODE));
+                       FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,NULL,Ptr,AC_GENERAL_MODE));
                        
                        if (MOD_RESULT == ACR_DENY)
                                return;
                        if (MOD_RESULT == ACR_DEFAULT)
                        {
-                               if (cstatus(user,Ptr) < STATUS_HOP)
+                               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;
                                }
                        }
 
-                       process_modes(parameters,user,Ptr,cstatus(user,Ptr),pcnt,false,false,false);
+                       ServerInstance->ModeGrok->ProcessModes(parameters,user,Ptr,cstatus(user,Ptr),pcnt,false,false,false);
                }
        }
        else
@@ -1557,7 +1546,7 @@ void handle_mode(char **parameters, int pcnt, userrec *user)
 
 
 
-void server_mode(char **parameters, int pcnt, userrec *user)
+void ModeParser::ServerMode(char **parameters, int pcnt, userrec *user)
 {
        chanrec* Ptr;
        userrec* dest;
@@ -1575,19 +1564,20 @@ void server_mode(char **parameters, int pcnt, userrec *user)
 
        if ((dest) && (pcnt > 1))
        {
-                std::string tidied = compress_modes(parameters[1],false);
+                std::string tidied = ServerInstance->ModeGrok->CompressModes(parameters[1],false);
                 parameters[1] = (char*)tidied.c_str();
 
                char dmodes[MAXBUF];
                strlcpy(dmodes,dest->modes,52);
 
-               strcpy(outpars,"+");
+               outpars[0] = '+';
+               outpars[1] = 0;
                direction = 1;
 
                if ((parameters[1][0] != '+') && (parameters[1][0] != '-'))
                        return;
 
-               for (int i = 0; i < strlen(parameters[1]); i++)
+               for (unsigned int i = 0; i < strlen(parameters[1]); i++)
                {
                         if (parameters[1][i] == ' ')
                                 continue;
@@ -1633,11 +1623,11 @@ void server_mode(char **parameters, int pcnt, userrec *user)
                                        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)))
+                                               if ((!strchr(dmodes,parameters[1][i])) && (ServerInstance->ModeGrok->AllowedUmode(parameters[1][i],user->modes,true,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'))
+                                                       if ((ServerInstance->ModeGrok->ProcessModuleUmode(umode, user, dest, direction)) || (umode == 'i') || (umode == 's') || (umode == 'w') || (umode == 'o'))
                                                        {
                                                                int v1 = strlen(dmodes);
                                                                int v2 = strlen(outpars);
@@ -1652,21 +1642,20 @@ void server_mode(char **parameters, int pcnt, userrec *user)
                                        {
                                                // 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])))
+                                               if ((ServerInstance->ModeGrok->AllowedUmode(parameters[1][i],user->modes,false,true)) && (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'))
+                                                       if ((ServerInstance->ModeGrok->ProcessModuleUmode(umode, user, dest, direction)) || (umode == 'i') || (umode == 's') || (umode == 'w') || (umode == 'o'))
                                                        {
-                                                               int q = 0;
+                                                               unsigned int q = 0;
                                                                char temp[MAXBUF];
                                                                char moo[MAXBUF];       
 
-                                                               int v1 = strlen(outpars);
+                                                               unsigned int v1 = strlen(outpars);
                                                                outpars[v1+1]='\0';
                                                                outpars[v1] = parameters[1][i];
-                                                       
-                                                               strcpy(temp,"");
+                                                               *temp = 0;
                                                                for (q = 0; q < strlen(dmodes); q++)
                                                                {
                                                                        if (dmodes[q] != parameters[1][i])
@@ -1687,8 +1676,8 @@ void server_mode(char **parameters, int pcnt, userrec *user)
                {
                        char b[MAXBUF];
                        strlcpy(b,"",MAXBUF);
-                       int z = 0;
-                       int i = 0;
+                       unsigned int z = 0;
+                       unsigned int i = 0;
                        while (i < strlen (outpars))
                        {
                                b[z++] = outpars[i++];
@@ -1721,10 +1710,7 @@ void server_mode(char **parameters, int pcnt, userrec *user)
                        if (strcmp(b,""))
                        {
                                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);
+                               FOREACH_MOD(I_OnMode,OnMode(user, dest, TYPE_USER, b));
                        }
                        
                        if (strlen(dmodes)>MAXMODES)
@@ -1743,402 +1729,10 @@ void server_mode(char **parameters, int pcnt, userrec *user)
        Ptr = FindChan(parameters[0]);
        if (Ptr)
        {
-               process_modes(parameters,user,Ptr,STATUS_OP,pcnt,true,false,false);
+               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]);
        }
 }
-
-
-
-void merge_mode(char **parameters, int pcnt)
-{
-       chanrec* Ptr;
-       userrec* dest;
-       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,"merge_mode on %s",dest->nick);
-       }
-
-       if ((dest) && (pcnt > 1))
-       {
-                std::string tidied = compress_modes(parameters[1],false);
-                parameters[1] = (char*)tidied.c_str();
-
-               char dmodes[MAXBUF];
-               strlcpy(dmodes,dest->modes,52);
-
-               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] == ' ')
-                                continue;
-                       if (parameters[1][i] == '+')
-                       {
-                               if (direction != 1)
-                               {
-                                       int t = strlen(outpars)-1;
-                                       if ((outpars[t] == '+') || (outpars[t] == '-'))
-                                       {
-                                               outpars[t] = '+';
-                                       }
-                                       else
-                                       {
-                                               strcat(outpars,"+");
-                                       }
-                               }
-                               direction = 1;
-                       }
-                       else
-                       if (parameters[1][i] == '-')
-                       {
-                               if (direction != 0)
-                               {
-                                       int t = strlen(outpars)-1;
-                                       if ((outpars[t] == '+') || (outpars[t] == '-'))
-                                       {
-                                               outpars[t] = '-';
-                                       }
-                                       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],"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'))
-                                                       {
-                                                               int v1 = strlen(dmodes);
-                                                               int v2 = strlen(outpars);
-                                                               dmodes[v1+1]='\0';
-                                                               dmodes[v1] = parameters[1][i];
-                                                               outpars[v2+1]='\0';
-                                                               outpars[v2] = 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],"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];       
-
-                                                               int v1 = strlen(outpars);
-                                                               outpars[v1+1]='\0';
-                                                               outpars[v1] = 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,52);
-                                                       }
-                                               }
-                                       }
-                               }
-                       }
-               }
-               if (outpars[0])
-               {
-                       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;
-
-                       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;
-       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_mode2 on %s",dest->nick);
-       }
-
-       if ((dest) && (pcnt > 1))
-       {
-                std::string tidied = compress_modes(parameters[1],false);
-                parameters[1] = (char*)tidied.c_str();
-
-               char dmodes[MAXBUF];
-               strlcpy(dmodes,dest->modes,52);
-
-               strcpy(outpars,"+");
-               direction = 1;
-
-               if ((parameters[1][0] == ':') && (strlen(parameters[1])>1))
-               {
-                       // some stupid 3rd party things (such as services packages) put a colon on the mode list...
-                       log(DEBUG,"Some muppet put a colon on the modelist! changed to '%s'",++parameters[1]);
-               }
-               if ((parameters[1][0] != '+') && (parameters[1][0] != '-'))
-               return;
-
-               for (int i = 0; i < strlen(parameters[1]); i++)
-               {
-                        if (parameters[1][i] == ' ')
-                                continue;
-                       if (parameters[1][i] == '+')
-                       {
-                               if (direction != 1)
-                               {
-                                       int t = strlen(outpars)-1;
-                                       if ((outpars[t] == '+') || (outpars[t] == '-'))
-                                       {
-                                               outpars[t] = '+';
-                                       }
-                                       else
-                                       {
-                                               strcat(outpars,"+");
-                                       }
-                               }
-                               direction = 1;
-                       }
-                       else
-                       if (parameters[1][i] == '-')
-                       {
-                               if (direction != 0)
-                               {
-                                       int t = strlen(outpars)-1;
-                                       if ((outpars[t] == '+') || (outpars[t] == '-'))
-                                       {
-                                               outpars[t] = '-';
-                                       }
-                                       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, NULL, dest, direction)) || (umode == 'i') || (umode == 's') || (umode == 'w') || (umode == 'o'))
-                                                       {
-                                                               int v1 = strlen(dmodes);
-                                                               int v2 = strlen(outpars);
-                                                               dmodes[v1+1]='\0';
-                                                               dmodes[v1] = parameters[1][i];
-                                                               outpars[v2+1]='\0';
-                                                               outpars[v2] = parameters[1][i];
-                                                               log(DEBUG,"OUTPARS='%s', DMODES='%s'",outpars,dmodes);
-                                                       }
-                                               }
-                                       }
-                                       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, NULL, dest, direction)) || (umode == 'i') || (umode == 's') || (umode == 'w') || (umode == 'o'))
-                                                       {
-                                                               int q = 0;
-                                                               char temp[MAXBUF];
-                                                               char moo[MAXBUF];       
-
-                                                               int v1 = strlen(outpars);
-                                                               outpars[v1+1]='\0';
-                                                               outpars[v1] = 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,52);
-                                                       }
-                                               }
-                                       }
-                               }
-                       }
-               }
-               log(DEBUG,"DONE! OUTPARS='%s', DMODES='%s'",outpars,dmodes);
-               if (outpars[0])
-               {
-                       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 ((!b[0]) || (!strcmp(b,"+")) || (!strcmp(b,"-")))
-                                return;
-
-                        if (strcmp(b,""))
-                        {
-                               WriteTo(user,dest,"MODE %s :%s",dest->nick,b);
-                               log(DEBUG,"Sent: :%s MODE %s",user->nick,b);
-                       }
-
-                       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)
-       {
-               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);
-               }
-       }
-}
-
-