]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/mode.cpp
m_override is now fixed, replaced AC_GENERAL_MODE OnAccessCheck event
[user/henk/code/inspircd.git] / src / mode.cpp
index 990c6e591d997f35ccb4348a516d4a26b5049fe7..290933ab64bd9566f47d9321ac00cf9a14c473c2 100644 (file)
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
+ *                      E-mail:
+ *             <brain@chatspike.net>
+ *               <Craig@chatspike.net>
  *     
  * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ *         the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include "inspircd.h"
-#include "inspircd_io.h"
-#include "inspircd_util.h"
-#include "inspircd_config.h"
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/errno.h>
-#include <sys/ioctl.h>
-#include <sys/utsname.h>
-#include <cstdio>
-#include <time.h>
-#include <string>
-#ifdef GCC3
-#include <ext/hash_map>
-#else
-#include <hash_map>
-#endif
-#include <map>
-#include <sstream>
-#include <vector>
-#include <errno.h>
-#include <deque>
-#include <errno.h>
-#include <unistd.h>
-#include <sched.h>
-#include "connection.h"
 #include "users.h"
-#include "servers.h"
-#include "ctables.h"
-#include "globals.h"
 #include "modules.h"
-#include "dynamic.h"
-#include "wildcard.h"
-#include "message.h"
-#include "commands.h"
-#include "xline.h"
 #include "inspstring.h"
-#include "helperfuncs.h"
+#include "mode.h"
+
+/* +s (secret) */
+#include "modes/cmode_s.h"
+/* +p (private) */
+#include "modes/cmode_p.h"
+/* +b (bans) */
+#include "modes/cmode_b.h"
+/* +m (moderated) */
+#include "modes/cmode_m.h"
+/* +t (only (half) ops can change topic) */
+#include "modes/cmode_t.h"
+/* +n (no external messages) */
+#include "modes/cmode_n.h"
+/* +i (invite only) */
+#include "modes/cmode_i.h"
+/* +k (keyed channel) */
+#include "modes/cmode_k.h"
+/* +l (channel user limit) */
+#include "modes/cmode_l.h"
+/* +o (channel op) */
+#include "modes/cmode_o.h"
+/* +h (channel halfop) */
+#include "modes/cmode_h.h"
+/* +v (channel voice) */
+#include "modes/cmode_v.h"
+/* +s (server notices) */
+#include "modes/umode_s.h"
+/* +w (see wallops) */
+#include "modes/umode_w.h"
+/* +i (invisible) */
+#include "modes/umode_i.h"
+/* +o (operator) */
+#include "modes/umode_o.h"
+/* +n (notice mask - our implementation of snomasks) */
+#include "modes/umode_n.h"
+
+ModeHandler::ModeHandler(InspIRCd* Instance, char modeletter, int parameters_on, int parameters_off, bool listmode, ModeType type, bool operonly, char mprefix)
+       : ServerInstance(Instance), mode(modeletter), n_params_on(parameters_on), n_params_off(parameters_off), list(listmode), m_type(type), oper(operonly), prefix(mprefix)
+{
+}
 
-using namespace std;
+ModeHandler::~ModeHandler()
+{
+}
 
-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 time_t TIME;
-
-char* give_ops(userrec *user,char *dest,chanrec *chan,int status)
+bool ModeHandler::IsListMode()
 {
-       userrec *d;
-       
-       if ((!user) || (!dest) || (!chan))
-       {
-               log(DEFAULT,"*** BUG *** give_ops was given an invalid parameter");
-               return NULL;
-       }
+       return list;
+}
 
-       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);
-               return NULL;
-       }
-       d = Find(dest);
-       if (!d)
-       {
-               log(DEFAULT,"the target nickname given to give_ops couldnt be found");
-               WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, dest);
-               return NULL;
-       }
-       else
-       {
+unsigned int ModeHandler::GetPrefixRank()
+{
+       return 0;
+}
 
-               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 ((status < STATUS_OP) && (!is_uline(user->server)))
-                       {
-                               log(DEBUG,"%s cant give ops to %s because they nave status %d and needs %d",user->nick,dest,status,STATUS_OP);
-                               WriteServ(user->fd,"482 %s %s :You're not a channel operator",user->nick, chan->name);
-                               return NULL;
-                       }
-               }
+ModeType ModeHandler::GetModeType()
+{
+       return m_type;
+}
 
+bool ModeHandler::NeedsOper()
+{
+       return oper;
+}
 
-               for (int i = 0; i != MAXCHANS; i++)
-               {
-                       if ((d->chans[i].channel != NULL) && (chan != NULL))
-                       if (!strcasecmp(d->chans[i].channel->name,chan->name))
-                       {
-                       if (d->chans[i].uc_modes & UCMODE_OP)
-                               {
-                                       /* mode already set on user, dont allow multiple */
-                                       log(DEFAULT,"The target user given to give_ops was already opped on the channel");
-                                       return NULL;
-                               }
-                               d->chans[i].uc_modes = d->chans[i].uc_modes | UCMODE_OP;
-                               log(DEBUG,"gave ops: %s %s",d->chans[i].channel->name,d->nick);
-                               return d->nick;
-                       }
-               }
-               log(DEFAULT,"The target channel given to give_ops was not in the users mode list");
-       }
-       return NULL;
+char ModeHandler::GetPrefix()
+{
+       return prefix;
 }
 
-char* give_hops(userrec *user,char *dest,chanrec *chan,int status)
+int ModeHandler::GetNumParams(bool adding)
 {
-       userrec *d;
-       
-       if ((!user) || (!dest) || (!chan))
-       {
-               log(DEFAULT,"*** BUG *** give_hops was given an invalid parameter");
-               return NULL;
-       }
+       return adding ? n_params_on : n_params_off;
+}
 
-       d = Find(dest);
-       if (!isnick(dest))
-       {
-               WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, dest);
-               return NULL;
-       }
-       if (!d)
+char ModeHandler::GetModeChar()
+{
+       return mode;
+}
+
+ModeAction ModeHandler::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+{
+       return MODEACTION_DENY;
+}
+
+ModePair ModeHandler::ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
+{
+       if (dest)
        {
-               WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, dest);
-               return NULL;
+               return std::make_pair(dest->IsModeSet(this->mode), "");
        }
        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 ((status < STATUS_OP) && (!is_uline(user->server)))
-                       {
-                               WriteServ(user->fd,"482 %s %s :You're not a channel operator",user->nick, chan->name);
-                               return NULL;
-                       }
-               }
-
-               for (int i = 0; i != MAXCHANS; i++)
-               {
-                       if ((d->chans[i].channel != NULL) && (chan != NULL))
-                       if (!strcasecmp(d->chans[i].channel->name,chan->name))
-                       {
-                               if (d->chans[i].uc_modes & UCMODE_HOP)
-                               {
-                                       /* mode already set on user, dont allow multiple */
-                                       return NULL;
-                               }
-                               d->chans[i].uc_modes = d->chans[i].uc_modes | UCMODE_HOP;
-                               log(DEBUG,"gave h-ops: %s %s",d->chans[i].channel->name,d->nick);
-                               return d->nick;
-                       }
-               }
+               return std::make_pair(channel->IsModeSet(this->mode), "");
        }
-       return NULL;
 }
 
-char* give_voice(userrec *user,char *dest,chanrec *chan,int status)
+void ModeHandler::DisplayList(userrec* user, chanrec* channel)
 {
-       userrec *d;
-       
-       if ((!user) || (!dest) || (!chan))
-       {
-               log(DEFAULT,"*** BUG *** give_voice was given an invalid parameter");
-               return NULL;
-       }
+}
 
-       d = Find(dest);
-       if (!isnick(dest))
-       {
-               WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, dest);
-               return NULL;
-       }
-       if (!d)
-       {
-               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_VOICE));
-               
-               if (MOD_RESULT == ACR_DENY)
-                       return NULL;
-               if (MOD_RESULT == ACR_DEFAULT)
-               {
-                       if ((status < STATUS_HOP) && (!is_uline(user->server)))
-                       {
-                               WriteServ(user->fd,"482 %s %s :You must be at least a half-operator to change modes on this channel",user->nick, chan->name);
-                               return NULL;
-                       }
-               }
+bool ModeHandler::CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, chanrec* channel)
+{
+       return (ours < theirs);
+}
 
-               for (int i = 0; i != MAXCHANS; i++)
-               {
-                       if ((d->chans[i].channel != NULL) && (chan != NULL))
-                       if (!strcasecmp(d->chans[i].channel->name,chan->name))
-                       {
-                               if (d->chans[i].uc_modes & UCMODE_VOICE)
-                               {
-                                       /* mode already set on user, dont allow multiple */
-                                       return NULL;
-                               }
-                               d->chans[i].uc_modes = d->chans[i].uc_modes | UCMODE_VOICE;
-                               log(DEBUG,"gave voice: %s %s",d->chans[i].channel->name,d->nick);
-                               return d->nick;
-                       }
-               }
-       }
-       return NULL;
+ModeWatcher::ModeWatcher(InspIRCd* Instance, char modeletter, ModeType type) : ServerInstance(Instance), mode(modeletter), m_type(type)
+{
 }
 
-char* take_ops(userrec *user,char *dest,chanrec *chan,int status)
+ModeWatcher::~ModeWatcher()
 {
-       userrec *d;
-       
-       if ((!user) || (!dest) || (!chan))
-       {
-               log(DEFAULT,"*** BUG *** take_ops was given an invalid parameter");
-               return NULL;
-       }
+}
 
-       d = Find(dest);
-       if (!isnick(dest))
-       {
-               log(DEBUG,"take_ops was given an invalid target nickname of %s",dest);
-               WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, dest);
-               return NULL;
-       }
-       if (!d)
-       {
-               log(DEBUG,"take_ops couldnt resolve the target nickname: %s",dest);
-               WriteServ(user->fd,"401 %s %s :No 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 ((status < STATUS_OP) && (!is_uline(user->server)))
-                       {
-                               WriteServ(user->fd,"482 %s %s :You are not a channel operator",user->nick, chan->name);
-                               return NULL;
-                       }
-               }
+char ModeWatcher::GetModeChar()
+{
+       return mode;
+}
 
-               for (int i = 0; i != MAXCHANS; i++)
-               {
-                       if ((d->chans[i].channel != NULL) && (chan != NULL))
-                       if (!strcasecmp(d->chans[i].channel->name,chan->name))
-                       {
-                               if ((d->chans[i].uc_modes & UCMODE_OP) == 0)
-                               {
-                                       /* mode already set on user, dont allow multiple */
-                                       return NULL;
-                               }
-                               d->chans[i].uc_modes ^= UCMODE_OP;
-                               log(DEBUG,"took ops: %s %s",d->chans[i].channel->name,d->nick);
-                               return d->nick;
-                       }
-               }
-               log(DEBUG,"take_ops couldnt locate the target channel in the target users list");
-       }
-       return NULL;
+ModeType ModeWatcher::GetModeType()
+{
+       return m_type;
 }
 
-char* take_hops(userrec *user,char *dest,chanrec *chan,int status)
+bool ModeWatcher::BeforeMode(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding, ModeType type)
 {
-       userrec *d;
-       
-       if ((!user) || (!dest) || (!chan))
-       {
-               log(DEFAULT,"*** BUG *** take_hops was given an invalid parameter");
-               return NULL;
-       }
+       return true;
+}
+
+void ModeWatcher::AfterMode(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter, bool adding, ModeType type)
+{
+}
 
-       d = Find(dest);
-       if (!isnick(dest))
+userrec* ModeParser::SanityChecks(userrec *user,const char *dest,chanrec *chan,int status)
+{
+       userrec *d;
+       if ((!user) || (!dest) || (!chan) || (!*dest))
        {
-               WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, dest);
                return NULL;
        }
+       d = ServerInstance->FindNick(dest);
        if (!d)
        {
-               WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, dest);
+               user->WriteServ("401 %s %s :No such nick/channel",user->nick, dest);
                return NULL;
        }
-       else
+       return d;
+}
+
+const char* ModeParser::Grant(userrec *d,chanrec *chan,int MASK)
+{
+       if (!chan)
+               return "";
+
+       for (std::vector<ucrec*>::const_iterator i = d->chans.begin(); i != d->chans.end(); i++)
        {
-               int MOD_RESULT = 0;
-               FOREACH_RESULT(OnAccessCheck(user,d,chan,AC_DEHALFOP));
-               
-               if (MOD_RESULT == ACR_DENY)
-                       return NULL;
-               if (MOD_RESULT == ACR_DEFAULT)
+               ucrec* n = (ucrec*)(*i);
+               if (n->channel == chan)
                {
-                       if ((status < STATUS_OP) && (!is_uline(user->server)))
+                       if (n->uc_modes & MASK)
                        {
-                               WriteServ(user->fd,"482 %s %s :You are not a channel operator",user->nick, chan->name);
-                               return NULL;
+                               return "";
                        }
-               }
-
-               for (int i = 0; i != MAXCHANS; i++)
-               {
-                       if ((d->chans[i].channel != NULL) && (chan != NULL))
-                       if (!strcasecmp(d->chans[i].channel->name,chan->name))
+                       n->uc_modes = n->uc_modes | MASK;
+                       switch (MASK)
                        {
-                               if ((d->chans[i].uc_modes & UCMODE_HOP) == 0)
-                               {
-                                       /* mode already set on user, dont allow multiple */
-                                       return NULL;
-                               }
-                               d->chans[i].uc_modes ^= UCMODE_HOP;
-                               log(DEBUG,"took h-ops: %s %s",d->chans[i].channel->name,d->nick);
-                               return d->nick;
+                               case UCMODE_OP:
+                                       n->channel->AddOppedUser(d);
+                               break;
+                               case UCMODE_HOP:
+                                       n->channel->AddHalfoppedUser(d);
+                               break;
+                               case UCMODE_VOICE:
+                                       n->channel->AddVoicedUser(d);
+                               break;
                        }
+                       ServerInstance->Log(DEBUG,"grant: %s %s",n->channel->name,d->nick);
+                       return d->nick;
                }
        }
-       return NULL;
+       return "";
 }
 
-char* take_voice(userrec *user,char *dest,chanrec *chan,int status)
+const char* ModeParser::Revoke(userrec *d,chanrec *chan,int MASK)
 {
-       userrec *d;
-       
-       if ((!user) || (!dest) || (!chan))
-       {
-               log(DEFAULT,"*** BUG *** take_voice was given an invalid parameter");
-               return NULL;
-       }
+       if (!chan)
+               return "";
 
-       d = Find(dest);
-       if (!isnick(dest))
-       {
-               WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, dest);
-               return NULL;
-       }
-       if (!d)
+       for (std::vector<ucrec*>::const_iterator i = d->chans.begin(); i != d->chans.end(); i++)
        {
-               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_DEVOICE));
-               
-               if (MOD_RESULT == ACR_DENY)
-                       return NULL;
-               if (MOD_RESULT == ACR_DEFAULT)
+               ucrec* n = (ucrec*)(*i);
+               if (n->channel == chan)
                {
-                       if ((status < STATUS_HOP) && (!is_uline(user->server)))
+                       if ((n->uc_modes & MASK) == 0)
                        {
-                               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;
+                               return "";
                        }
-               }
-
-               for (int i = 0; i != MAXCHANS; i++)
-               {
-                       if ((d->chans[i].channel != NULL) && (chan != NULL))
-                       if (!strcasecmp(d->chans[i].channel->name,chan->name))
+                       n->uc_modes ^= MASK;
+                       switch (MASK)
                        {
-                               if ((d->chans[i].uc_modes & UCMODE_VOICE) == 0)
-                               {
-                                       /* mode already set on user, dont allow multiple */
-                                       return NULL;
-                               }
-                               d->chans[i].uc_modes ^= UCMODE_VOICE;
-                               log(DEBUG,"took voice: %s %s",d->chans[i].channel->name,d->nick);
-                               return d->nick;
+                               case UCMODE_OP:
+                                       n->channel->DelOppedUser(d);
+                               break;
+                               case UCMODE_HOP:
+                                       n->channel->DelHalfoppedUser(d);
+                               break;
+                               case UCMODE_VOICE:
+                                       n->channel->DelVoicedUser(d);
+                               break;
                        }
+                       ServerInstance->Log(DEBUG,"revoke: %s %s",n->channel->name,d->nick);
+                       return d->nick;
                }
        }
-       return NULL;
+       return "";
 }
 
-char* add_ban(userrec *user,char *dest,chanrec *chan,int status)
+void ModeParser::DisplayCurrentModes(userrec *user, userrec* targetuser, chanrec* targetchannel, const char* text)
 {
-       if ((!user) || (!dest) || (!chan)) {
-               log(DEFAULT,"*** BUG *** add_ban 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)
-                       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)
-               return NULL;
-
-       long maxbans = GetMaxBans(chan->name);
-       if (chan->bans.size() > maxbans)
+       if (targetchannel)
        {
-               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;
+               /* Display channel's current mode string */
+               user->WriteServ("324 %s %s +%s",user->nick, targetchannel->name, targetchannel->ChanModes(targetchannel->HasUser(user)));
+               user->WriteServ("329 %s %s %d", user->nick, targetchannel->name, targetchannel->created);
+               return;
        }
-
-       log(DEBUG,"add_ban: %s %s",chan->name,user->nick);
-
-       int MOD_RESULT = 0;
-       FOREACH_RESULT(OnAddBan(user,chan,dest));
-       if (MOD_RESULT)
-               return NULL;
-
-       TidyBan(dest);
-       for (BanList::iterator i = chan->bans.begin(); i != chan->bans.end(); i++)
+       else if (targetuser)
        {
-               if (!strcasecmp(i->data,dest))
-               {
-                       // dont allow a user to set the same ban twice
-                       return NULL;
-               }
+               /* Display user's current mode string */
+               user->WriteServ("221 %s :+%s",targetuser->nick,targetuser->FormatModes());
+               if (*targetuser->oper)
+                       user->WriteServ("008 %s +%s :Server notice mask", targetuser->nick, targetuser->FormatNoticeMasks());
+               return;
        }
 
-       b.set_time = TIME;
-       strncpy(b.data,dest,MAXBUF);
-       strncpy(b.set_by,user->nick,NICKMAX);
-       chan->bans.push_back(b);
-       return dest;
+       /* No such nick/channel */
+       user->WriteServ("401 %s %s :No such nick/channel",user->nick, text);
+       return;
 }
 
-char* take_ban(userrec *user,char *dest,chanrec *chan,int status)
+void ModeParser::Process(const char** parameters, int pcnt, userrec *user, bool servermode)
 {
-       if ((!user) || (!dest) || (!chan)) {
-               log(DEFAULT,"*** BUG *** take_ban was given an invalid parameter");
-               return 0;
+       std::string target = parameters[0];
+       ModeType type = MODETYPE_USER;
+       unsigned char mask = 0;
+       chanrec* targetchannel = ServerInstance->FindChan(parameters[0]);
+       userrec* targetuser  = ServerInstance->FindNick(parameters[0]);
+
+       ServerInstance->Log(DEBUG,"ModeParser::Process start");
+
+       /* Special case for displaying the list for listmodes,
+        * e.g. MODE #chan b, or MODE #chan +b without a parameter
+        */
+       if ((targetchannel) && (pcnt == 2))
+       {
+               ServerInstance->Log(DEBUG,"Spool list");
+               const char* mode = parameters[1];
+               if (*mode == '+')
+                       mode++;
+               unsigned char handler_id = ((*mode) - 65) | MASK_CHANNEL;
+               ModeHandler* mh = modehandlers[handler_id];
+               if ((mh) && (mh->IsListMode()))
+               {
+                       mh->DisplayList(user, targetchannel);
+                       return;
+               }
        }
 
-       log(DEBUG,"del_ban: %s %s",chan->name,user->nick);
-       for (BanList::iterator i = chan->bans.begin(); i != chan->bans.end(); i++)
+       if (pcnt == 1)
        {
-               if (!strcasecmp(i->data,dest))
-               {
-                       int MOD_RESULT = 0;
-                       FOREACH_RESULT(OnDelBan(user,chan,dest));
-                       if (MOD_RESULT)
-                               return NULL;
-                       chan->bans.erase(i);
-                       return dest;
-               }
+               ServerInstance->Log(DEBUG,"Mode list request");
+               this->DisplayCurrentModes(user, targetuser, targetchannel, parameters[0]);
        }
-       return NULL;
-}
-
-// 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)
-{
-       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++)
+       else if (pcnt > 1)
        {
-               if ((modes[i] == '+') || (modes[i] == '-'))
-                       continue;
-               if (channelmodes)
+               ServerInstance->Log(DEBUG,"More than one parameter");
+
+               if (targetchannel)
                {
-                       if ((strchr("itnmsp",modes[i])) || ((ModeDefined(modes[i],MT_CHANNEL)) && (ModeDefinedOn(modes[i],MT_CHANNEL)==0) && (ModeDefinedOff(modes[i],MT_CHANNEL)==0)))
+                       type = MODETYPE_CHANNEL;
+                       mask = MASK_CHANNEL;
+
+                       /* Extra security checks on channel modes
+                        * (e.g. are they a (half)op?
+                        */
+
+                       if ((IS_LOCAL(user)) && (targetchannel->GetStatus(user) < STATUS_HOP))
                        {
-                               log(DEBUG,"Tidy mode %c",modes[i]);
-                               counts[(unsigned int)modes[i]]++;
-                               active[(unsigned int)modes[i]] = true;
+                               /* We don't have halfop */
+                               ServerInstance->Log(DEBUG,"The user is not a halfop or above, checking other reasons for being able to set the modes");
+
+                               int MOD_RESULT = 0;
+                               FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user, NULL, targetchannel, AC_GENERAL_MODE));
+                               if (MOD_RESULT == ACR_DENY)
+                                       return;
+
+                               if (MOD_RESULT == ACR_DEFAULT)
+                               {
+                                       /* Are we a uline or is it a servermode? */
+                                       if ((!ServerInstance->ULine(user->server)) && (!servermode))
+                                       {
+                                               /* Not enough permission:
+                                                * NOT a uline and NOT a servermode,
+                                                * OR, NOT halfop or above.
+                                                */
+                                               user->WriteServ("482 %s %s :You're not a channel (half)operator",user->nick, targetchannel->name);
+                                               return;
+                                       }
+                               }
                        }
                }
-               else
+               else if (targetuser)
                {
-                       log(DEBUG,"Tidy mode %c",modes[i]);
-                       counts[(unsigned int)modes[i]]++;
-                       active[(unsigned int)modes[i]] = true;
+                       type = MODETYPE_USER;
+                       mask = MASK_USER;
                }
-       }
-       for (int j = 65; j < 127; j++)
-       {
-               if ((counts[j] > 1) && (active[j] == true))
+               else
                {
-                       static char v[2];
-                       v[0] = (unsigned char)j;
-                       v[1] = '\0';
-                       std::string mode_str = v;
-                       std::string::size_type pos = modes.find(mode_str);
-                       if (pos != std::string::npos)
-                       {
-                               log(DEBUG,"all occurances of mode %c to be deleted...",(unsigned char)j);
-                               while (modes.find(mode_str) != std::string::npos)
-                                       modes.erase(modes.find(mode_str),1);
-                               log(DEBUG,"New mode line: %s",modes.c_str());
-                       }
+                       /* No such nick/channel */
+                       user->WriteServ("401 %s %s :No such nick/channel",user->nick, parameters[0]);
+                       return;
                }
-       }
-       return modes;
-}
-
-void process_modes(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");
-               return;
-       }
-
-       char modelist[MAXBUF];
-       char outlist[MAXBUF];
-       char outstr[MAXBUF];
-       char outpars[32][MAXBUF];
-       int param = 2;
-       int pc = 0;
-       int ptr = 0;
-       int mdir = 1;
-       char* r = NULL;
-       bool k_set = false, l_set = false, previously_set_l = false, previously_unset_l = false, previously_set_k = false, previously_unset_k = false;
-
-       if (pcnt < 2)
-       {
-               return;
-       }
-
-       int MOD_RESULT = 0;
-       FOREACH_RESULT(OnAccessCheck(user,NULL,chan,AC_GENERAL_MODE));
-       
-       if (MOD_RESULT == ACR_DENY)
-               return;
 
-       log(DEBUG,"process_modes: start: parameters=%d",pcnt);
+               std::string mode_sequence = parameters[1];
+               std::string parameter = "";
+               std::ostringstream parameter_list;
+               std::string output_sequence = "";
+               bool adding = true, state_change = false;
+               unsigned char handler_id = 0;
+               int parameter_counter = 2; /* Index of first parameter */
 
-       strlcpy(modelist,parameters[1],MAXBUF); /* mode list, e.g. +oo-o *
-                                                * parameters[2] onwards are parameters for
-                                                * modes that require them :) */
-       strlcpy(outlist,"+",MAXBUF);
-       mdir = 1;
-
-       log(DEBUG,"process_modes: modelist: %s",modelist);
-
-       std::string tidied = compress_modes(modelist,true);
-       strlcpy(modelist,tidied.c_str(),MAXBUF);
-
-       int len = strlen(modelist);
-       while (modelist[len-1] == ' ')
-               modelist[--len] = '\0';
-       for (ptr = 0; ptr < len; ptr++)
-       {
-               r = NULL;
+               /* A mode sequence that doesnt start with + or -. Assume +. - Thanks for the suggestion spike (bug#132) */
+               if ((*mode_sequence.begin() != '+') && (*mode_sequence.begin() != '-'))
+                       mode_sequence.insert(0, "+");
 
+               for (std::string::const_iterator letter = mode_sequence.begin(); letter != mode_sequence.end(); letter++)
                {
-                       log(DEBUG,"process_modes: modechar: %c",modelist[ptr]);
+                       unsigned char modechar = *letter;
 
-                       char modechar = modelist[ptr];
-                       switch (modelist[ptr])
+                       ServerInstance->Log(DEBUG,"Process letter %c", modechar);
+
+                       switch (modechar)
                        {
+                               /* NB:
+                                * For + and - mode characters, we don't just stick the character into the output sequence.
+                                * This is because the user may do something dumb, like: +-+ooo or +oo-+. To prevent this
+                                * appearing in the output sequence, we store a flag which says there was a state change,
+                                * which is set on any + or -, however, the + or - that we finish on is only appended to
+                                * the output stream in the event it is followed by a non "+ or -" character, such as o or v.
+                                */
+                               case '+':
+                                       /* The following expression prevents: +o+o nick nick, compressing it to +oo nick nick,
+                                        * however, will allow the + if it is the first item in the sequence, regardless.
+                                        */
+                                       if ((!adding) || (!output_sequence.length()))
+                                               state_change = true;
+                                       adding = true;
+                                       continue;
+                               break;
                                case '-':
-                                       if (mdir != 0)
-                                       {
-                                               int t = strlen(outlist)-1;
-                                               if ((outlist[t] == '+') || (outlist[t] == '-'))
-                                               {
-                                                       outlist[t] = '-';
-                                               }
-                                               else
-                                               {
-                                                       strcat(outlist,"-");
-                                               }
-                                       }
-                                       mdir = 0;
-                                       
-                               break;                  
+                                       if ((adding) || (!output_sequence.length()))
+                                               state_change = true;
+                                       adding = false;
+                                       continue;
+                               break;
+                               default:
 
-                               case '+':
-                                       if (mdir != 1)
+                                       /**
+                                        * Watch carefully for the sleight of hand trick.
+                                        * 65 is the ascii value of 'A'. We take this from
+                                        * the char we're looking at to get a number between
+                                        * 1 and 127. We then logic-or it to get the hashed
+                                        * position, dependent on wether its a channel or
+                                        * a user mode. This is a little stranger, but a lot
+                                        * faster, than using a map of pairs.
+                                        */
+                                       handler_id = (modechar - 65) | mask;
+
+                                       if (modehandlers[handler_id])
                                        {
-                                               int t = strlen(outlist)-1;
-                                               if ((outlist[t] == '+') || (outlist[t] == '-'))
+                                               bool abort = false;
+
+                                               for (ModeWatchIter watchers = modewatchers[handler_id].begin(); watchers != modewatchers[handler_id].end(); watchers++)
                                                {
-                                                       outlist[t] = '+';
+                                                       if ((*watchers)->BeforeMode(user, targetuser, targetchannel, parameter, adding, type) == MODEACTION_DENY)
+                                                               abort = true;
                                                }
-                                               else
+                                               if ((modehandlers[handler_id]->GetModeType() == type) && (!abort))
                                                {
-                                                       strcat(outlist,"+");
-                                               }
-                                       }
-                                       mdir = 1;
-                               break;
+                                                       if (modehandlers[handler_id]->GetNumParams(adding))
+                                                       {
+                                                               /* This mode expects a parameter, do we have any parameters left in our list to use? */
+                                                               if (parameter_counter < pcnt)
+                                                               {
+                                                                       parameter = parameters[parameter_counter++];
 
-                               case 'o':
-                                       log(DEBUG,"Ops");
-                                       if ((param >= pcnt)) break;
-                                       log(DEBUG,"Enough parameters left");
-                                       if (mdir == 1)
-                                       {
-                                               MOD_RESULT = 0;
-                                               FOREACH_RESULT(OnRawMode(user, chan, 'o', parameters[param], true, 1));
-                                               if (!MOD_RESULT)
-                                               {
-                                                       log(DEBUG,"calling give_ops");
-                                                       r = give_ops(user,parameters[param++],chan,status);
-                                               }
-                                               else param++;
-                                       }
-                                       else
-                                       {
-                                                MOD_RESULT = 0;
-                                                FOREACH_RESULT(OnRawMode(user, chan, 'o', parameters[param], false, 1));
-                                                if (!MOD_RESULT)
-                                                {
-                                                       log(DEBUG,"calling take_ops");
-                                                       r = take_ops(user,parameters[param++],chan,status);
-                                               }
-                                               else param++;
-                                       }
-                                       if (r)
-                                       {
-                                               strlcat(outlist,"o",MAXBUF);
-                                               strlcpy(outpars[pc++],r,MAXBUF);
-                                       }
-                               break;
-                       
-                               case 'h':
-                                       if (((param >= pcnt)) || (!AllowHalfop)) break;
-                                       if (mdir == 1)
-                                       {
-                                                MOD_RESULT = 0;
-                                                FOREACH_RESULT(OnRawMode(user, chan, 'h', parameters[param], true, 1));
-                                                if (!MOD_RESULT)
-                                                {
-                                                       r = give_hops(user,parameters[param++],chan,status);
-                                               }
-                                               else param++;
-                                       }
-                                       else
-                                       {
-                                                MOD_RESULT = 0;
-                                                FOREACH_RESULT(OnRawMode(user, chan, 'h', parameters[param], false, 1));
-                                                if (!MOD_RESULT)
-                                                {
-                                                       r = take_hops(user,parameters[param++],chan,status);
-                                               }
-                                               else param++;
-                                       }
-                                       if (r)
-                                       {
-                                               strlcat(outlist,"h",MAXBUF);
-                                               strlcpy(outpars[pc++],r,MAXBUF);
-                                       }
-                               break;
-                       
-                               
-                               case 'v':
-                                       if ((param >= pcnt)) break;
-                                       if (mdir == 1)
-                                       {
-                                                MOD_RESULT = 0;
-                                                FOREACH_RESULT(OnRawMode(user, chan, 'v', parameters[param], true, 1));
-                                                if (!MOD_RESULT)
-                                                {
-                                                       r = give_voice(user,parameters[param++],chan,status);
-                                               }
-                                               else param++;
-                                       }
-                                       else
-                                       {
-                                                MOD_RESULT = 0;
-                                                FOREACH_RESULT(OnRawMode(user, chan, 'v', parameters[param], false, 1));
-                                                if (!MOD_RESULT)
-                                                {
-                                                       r = take_voice(user,parameters[param++],chan,status);
-                                               }
-                                               else param++;
-                                       }
-                                       if (r)
-                                       {
-                                               strlcat(outlist,"v",MAXBUF);
-                                               strlcpy(outpars[pc++],r,MAXBUF);
-                                       }
-                               break;
-                               
-                               case 'b':
-                                       if ((param >= pcnt)) break;
-                                       if (mdir == 1)
-                                       {
-                                                MOD_RESULT = 0;
-                                                FOREACH_RESULT(OnRawMode(user, chan, 'b', parameters[param], true, 1));
-                                                if (!MOD_RESULT)
-                                                {
-                                                       r = add_ban(user,parameters[param++],chan,status);
-                                               }
-                                               else param++;
-                                       }
-                                       else
-                                       {
-                                                MOD_RESULT = 0;
-                                                FOREACH_RESULT(OnRawMode(user, chan, 'b', parameters[param], false, 1));
-                                                if (!MOD_RESULT)
-                                                {
-                                                       r = take_ban(user,parameters[param++],chan,status);
-                                               }
-                                               else param++;
-                                       }
-                                       if (r)
-                                       {
-                                               strlcat(outlist,"b",MAXBUF);
-                                               strlcpy(outpars[pc++],parameters[param-1],MAXBUF);
-                                       }
-                               break;
-
-
-                               case 'k':
-                                       if ((param >= pcnt))
-                                               break;
-
-                                       if (mdir == 1)
-                                       {
-                                               if (k_set)
-                                                       break;
-
-                                               if (previously_unset_k)
-                                                       break;
-                                               previously_set_k = true;
-                                               
-                                               if (!strcmp(chan->key,""))
-                                               {
-                                                       MOD_RESULT = 0;
-                                                       FOREACH_RESULT(OnRawMode(user, chan, 'k', parameters[param], true, 1));
-                                                       if (!MOD_RESULT)
-                                                       {
-                                                               strcat(outlist,"k");
-                                                               char key[MAXBUF];
-                                                               strlcpy(key,parameters[param++],32);
-                                                               strlcpy(outpars[pc++],key,MAXBUF);
-                                                               strlcpy(chan->key,key,MAXBUF);
-                                                               k_set = true;
-                                                       }
-                                                       else param++;
-                                               }
-                                       }
-                                       else
-                                       {
-                                               /* checks on -k are case sensitive and only accurate to the
-                                                  first 32 characters */
-                                               if (previously_set_k)
-                                                       break;
-                                               previously_unset_k = true;
-
-                                               char key[MAXBUF];
-                                               MOD_RESULT = 0;
-                                               FOREACH_RESULT(OnRawMode(user, chan, 'k', parameters[param], false, 1));
-                                               if (!MOD_RESULT)
-                                               {
-                                                       strlcpy(key,parameters[param++],32);
-                                                       /* only allow -k if correct key given */
-                                                       if (!strcmp(chan->key,key))
-                                                       {
-                                                               strlcat(outlist,"k",MAXBUF);
-                                                               strlcpy(chan->key,"",MAXBUF);
-                                                               strlcpy(outpars[pc++],key,MAXBUF);
-                                                       }
-                                               }
-                                               else param++;
-                                       }
-                               break;
-                               
-                               case 'l':
-                                       if (mdir == 0)
-                                       {
-                                               if (previously_set_l)
-                                                       break;
-                                               previously_unset_l = true;
-                                                MOD_RESULT = 0;
-                                                FOREACH_RESULT(OnRawMode(user, chan, 'l', "", false, 0));
-                                                if (!MOD_RESULT)
-                                                {
-                                                       if (chan->limit)
-                                                       {
-                                                               strcat(outlist,"l");
-                                                               chan->limit = 0;
-                                                       }
-                                               }
-                                       }
-                                       
-                                       if ((param >= pcnt)) break;
-                                       if (mdir == 1)
-                                       {
-                                               if (l_set)
-                                                       break;
-                                               if (previously_unset_l)
-                                                       break;
-                                               previously_set_l = true;
-                                               bool invalid = false;
-                                               for (int i = 0; i < strlen(parameters[param]); i++)
-                                               {
-                                                       if ((parameters[param][i] < '0') || (parameters[param][i] > '9'))
-                                                       {
-                                                               invalid = true;
-                                                       }
-                                               }
-                                               if (atoi(parameters[param]) < 1)
-                                               {
-                                                       invalid = true;
-                                               }
-
-                                               if (invalid)
-                                                       break;
-
-                                                MOD_RESULT = 0;
-                                                FOREACH_RESULT(OnRawMode(user, chan, 'l', parameters[param], true, 1));
-                                                if (!MOD_RESULT)
-                                                {
-       
-                                                       chan->limit = atoi(parameters[param]);
-                                                       
-                                                       // reported by mech: large values cause underflow
-                                                       if (chan->limit < 0)
-                                                               chan->limit = 0x7FFF;
-                                               }
-                                                       
-                                               if (chan->limit)
-                                               {
-                                                       strlcat(outlist,"l",MAXBUF);
-                                                       strlcpy(outpars[pc++],parameters[param++],MAXBUF);
-                                                       l_set = true;
-                                               }
-                                       }
-                               break;
-                               
-                               case 'i':
-                                        MOD_RESULT = 0;
-                                        FOREACH_RESULT(OnRawMode(user, chan, 'i', "", mdir, 0));
-                                        if (!MOD_RESULT)
-                                        {
-                                               if (mdir)
-                                               {
-                                                       if (!(chan->binarymodes & CM_INVITEONLY)) strlcat(outlist,"i",MAXBUF);
-                                                       chan->binarymodes |= CM_INVITEONLY;
-                                               }
-                                               else
-                                               {
-                                                       if (chan->binarymodes & CM_INVITEONLY) strlcat(outlist,"i",MAXBUF);
-                                                       chan->binarymodes &= ~CM_INVITEONLY;
-                                               }
-                                       }
-                               break;
-                               
-                               case 't':
-                                        MOD_RESULT = 0;
-                                        FOREACH_RESULT(OnRawMode(user, chan, 't', "", mdir, 0));
-                                        if (!MOD_RESULT)
-                                        {
-                                               if (mdir)
-                                                {
-                                                       if (!(chan->binarymodes & CM_TOPICLOCK)) strlcat(outlist,"t",MAXBUF);
-                                                        chan->binarymodes |= CM_TOPICLOCK;
-                                                }
-                                                else
-                                                {
-                                                       if (chan->binarymodes & CM_NOEXTERNAL) strlcat(outlist,"t",MAXBUF);
-                                                        chan->binarymodes &= ~CM_TOPICLOCK;
-                                                }
-                                       }
-                               break;
-                               
-                               case 'n':
-                                        MOD_RESULT = 0;
-                                        FOREACH_RESULT(OnRawMode(user, chan, 'n', "", mdir, 0));
-                                        if (!MOD_RESULT)
-                                        {
-                                                if (mdir)
-                                                {
-                                                       if (!(chan->binarymodes & CM_NOEXTERNAL)) strlcat(outlist,"n",MAXBUF);
-                                                        chan->binarymodes |= CM_NOEXTERNAL;
-                                                }
-                                                else
-                                                {
-                                                       if (chan->binarymodes & CM_NOEXTERNAL) strlcat(outlist,"n",MAXBUF);
-                                                        chan->binarymodes &= ~CM_NOEXTERNAL;
-                                                }
-                                       }
-                               break;
-                               
-                               case 'm':
-                                        MOD_RESULT = 0;
-                                        FOREACH_RESULT(OnRawMode(user, chan, 'm', "", mdir, 0));
-                                        if (!MOD_RESULT)
-                                        {
-                                                if (mdir)
-                                                {
-                                                        if (!(chan->binarymodes & CM_MODERATED)) strlcat(outlist,"m",MAXBUF);
-                                                        chan->binarymodes |= CM_MODERATED;
-                                                }
-                                                else
-                                                {
-                                                        if (chan->binarymodes & CM_MODERATED) strlcat(outlist,"m",MAXBUF);
-                                                        chan->binarymodes &= ~CM_MODERATED;
-                                                }
-                                       }
-                               break;
-                               
-                               case 's':
-                                        MOD_RESULT = 0;
-                                        FOREACH_RESULT(OnRawMode(user, chan, 's', "", mdir, 0));
-                                        if (!MOD_RESULT)
-                                        {
-                                                if (mdir)
-                                                {
-                                                        if (!(chan->binarymodes & CM_SECRET)) strlcat(outlist,"s",MAXBUF);
-                                                        chan->binarymodes |= CM_SECRET;
-                                                        if (chan->binarymodes & CM_PRIVATE)
-                                                        {
-                                                                chan->binarymodes &= ~CM_PRIVATE;
-                                                                if (mdir)
-                                                                {
-                                                                        strlcat(outlist,"-p+",MAXBUF);
-                                                                }
-                                                        }
-                                                }
-                                                else
-                                                {
-                                                        if (chan->binarymodes & CM_SECRET) strlcat(outlist,"s",MAXBUF);
-                                                        chan->binarymodes &= ~CM_SECRET;
-                                                }
-                                       }
-                               break;
-                               
-                               case 'p':
-                                        MOD_RESULT = 0;
-                                        FOREACH_RESULT(OnRawMode(user, chan, 'p', "", mdir, 0));
-                                        if (!MOD_RESULT)
-                                        {
-                                                if (mdir)
-                                                {
-                                                        if (!(chan->binarymodes & CM_PRIVATE)) strlcat(outlist,"p",MAXBUF);
-                                                        chan->binarymodes |= CM_PRIVATE;
-                                                        if (chan->binarymodes & CM_SECRET)
-                                                        {
-                                                                chan->binarymodes &= ~CM_SECRET;
-                                                                if (mdir)
-                                                                {
-                                                                        strlcat(outlist,"-s+",MAXBUF);
-                                                                }
-                                                        }
-                                                }
-                                                else
-                                                {
-                                                        if (chan->binarymodes & CM_PRIVATE) strlcat(outlist,"p",MAXBUF);
-                                                        chan->binarymodes &= ~CM_PRIVATE;
-                                                }
-                                       }
-                               break;
-                               
-                               default:
-                                       log(DEBUG,"Preprocessing custom mode %c: modelist: %s",modechar,chan->custom_modes);
-                                       string_list p;
-                                       p.clear();
-                                       if (((!strchr(chan->custom_modes,modechar)) && (!mdir)) || ((strchr(chan->custom_modes,modechar)) && (mdir)))
-                                       {
-                                               if (!ModeIsListMode(modechar,MT_CHANNEL))
-                                               {
-                                                       log(DEBUG,"Mode %c isnt set on %s but trying to remove!",modechar,chan->name);
-                                                       break;
-                                               }
-                                       }
-                                       if (ModeDefined(modechar,MT_CHANNEL))
-                                       {
-                                               log(DEBUG,"A module has claimed this mode");
-                                               if (param<pcnt)
-                                               {
-                                                       if ((ModeDefinedOn(modechar,MT_CHANNEL)>0) && (mdir))
-                                                       {
-                                                               p.push_back(parameters[param]);
-                                                       }
-                                                       if ((ModeDefinedOff(modechar,MT_CHANNEL)>0) && (!mdir))
-                                                       {
-                                                               p.push_back(parameters[param]);
-                                                       }
-                                               }
-                                               bool handled = false;
-                                               if (param>=pcnt)
-                                               {
-                                                       // we're supposed to have a parameter, but none was given... so dont handle the mode.
-                                                       if (((ModeDefinedOn(modechar,MT_CHANNEL)>0) && (mdir)) || ((ModeDefinedOff(modechar,MT_CHANNEL)>0) && (!mdir))) 
-                                                       {
-                                                               log(DEBUG,"Not enough parameters for module-mode %c",modechar);
-                                                               handled = true;
-                                                               param++;
-                                                       }
-                                               }
-
-                                               // BIG ASS IDIOTIC CODER WARNING!
-                                               // Using OnRawMode on another modules mode's behavour 
-                                               // will confuse the crap out of admins! just because you CAN
-                                               // do it, doesnt mean you SHOULD!
-                                               MOD_RESULT = 0;
-                                               std::string para = "";
-                                               if (p.size())
-                                                       para = p[0];
-                                               FOREACH_RESULT(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);
-                                                                       if (t != 0)
-                                                                       {
-                                                                               log(DEBUG,"OnExtendedMode returned nonzero for a module");
-                                                                               char app[] = {modechar, 0};
-                                                                               if (ModeIsListMode(modechar,MT_CHANNEL))
-                                                                               {
-                                                                                       if (t == -1)
-                                                                                       {
-                                                                                               //pc++;
-                                                                                               param++;
-                                                                                       }
-                                                                                       else
-                                                                                       {
-                                                                                               if (ptr>0)
-                                                                                               {
-                                                                                                       strlcat(outlist, app,MAXBUF);
-                                                                                               }
-                                                                                               strlcpy(outpars[pc++],parameters[param++],MAXBUF);
-                                                                                       }
-                                                                               }
-                                                                               else
-                                                                               {
-                                                                                       if (ptr>0)
-                                                                                       {
-                                                                                               if ((modelist[ptr-1] == '+') || (modelist[ptr-1] == '-'))
-                                                                                               {
-                                                                                                       strlcat(outlist, app,MAXBUF);
-                                                                                               }
-                                                                                               else if (!strchr(outlist,modechar))
-                                                                                               {
-                                                                                                       strlcat(outlist, app,MAXBUF);
-                                                                                               }
-                                                                                       }
-                                                                                       chan->SetCustomMode(modechar,mdir);
-                                                                                       // include parameters in output if mode has them
-                                                                                       if ((ModeDefinedOn(modechar,MT_CHANNEL)>0) && (mdir))
-                                                                                       {
-                                                                                               chan->SetCustomModeParam(modelist[ptr],parameters[param],mdir);
-                                                                                               strlcpy(outpars[pc++],parameters[param++],MAXBUF);
-                                                                                       }
-                                                                               }
-                                                                               // break, because only one module can handle the mode.
-                                                                               handled = true;
-                                                                               }
-                                                                       }
-                                                       }
-                                               }
-                                       }
-                                       else
-                                       {
-                                               WriteServ(user->fd,"472 %s %c :is unknown mode char to me",user->nick,modechar);
-                                       }
-                               break;
-                               
-                       }
-               }
-       }
-
-       /* this ensures only the *valid* modes are sent out onto the network */
-       int xt = strlen(outlist)-1;
-       while ((outlist[xt] == '-') || (outlist[xt] == '+'))
-       {
-               outlist[xt] = '\0';
-               xt = strlen(outlist)-1;
-       }
-       if (outlist[0])
-       {
-               strlcpy(outstr,outlist,MAXBUF);
-               for (ptr = 0; ptr < pc; ptr++)
-               {
-                       strlcat(outstr," ",MAXBUF);
-                       strlcat(outstr,outpars[ptr],MAXBUF);
-               }
-               if (local)
-               {
-                       log(DEBUG,"Local mode change");
-                       WriteChannelLocal(chan, user, "MODE %s %s",chan->name,outstr);
-               }
-               else
-               {
-                       if (servermode)
-                       {
-                               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);
-                               }
-                                       
-                       }
-                       else
-                       {
-                               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);
-                               }
-                       }
-               }
-       }
-}
-
-// 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)
-{
-       log(DEBUG,"Allowed_umode: %c %s",umode,sourcemodes);
-       // RFC1459 specified modes
-       if ((umode == 'w') || (umode == 's') || (umode == 'i'))
-       {
-               log(DEBUG,"umode %c allowed by RFC1459 scemantics",umode);
-               return true;
-       }
-       
-       // user may not +o themselves or others, but an oper may de-oper other opers or themselves
-       if ((strchr(sourcemodes,'o')) && (!adding))
-       {
-               log(DEBUG,"umode %c allowed by RFC1459 scemantics",umode);
-               return true;
-       }
-       else if (umode == 'o')
-       {
-               log(DEBUG,"umode %c allowed by RFC1459 scemantics",umode);
-               return false;
-       }
-       
-       // process any module-defined modes that need oper
-       if ((ModeDefinedOper(umode,MT_CLIENT)) && (strchr(sourcemodes,'o')))
-       {
-               log(DEBUG,"umode %c allowed by module handler (oper only mode)",umode);
-               return true;
-       }
-       else
-       if (ModeDefined(umode,MT_CLIENT))
-       {
-               // process any module-defined modes that don't need oper
-               log(DEBUG,"umode %c allowed by module handler (non-oper mode)",umode);
-               if ((ModeDefinedOper(umode,MT_CLIENT)) && (!strchr(sourcemodes,'o')))
-               {
-                       // no, this mode needs oper, and this user 'aint got what it takes!
-                       return false;
-               }
-               return true;
-       }
-
-       // anything else - return false.
-       log(DEBUG,"umode %c not known by any ruleset",umode);
-       return false;
-}
-
-bool process_module_umode(char umode, userrec* source, void* dest, bool adding)
-{
-       userrec* s2;
-       bool faked = false;
-       if (!source)
-       {
-               s2 = new userrec;
-               strlcpy(s2->nick,ServerName,NICKMAX);
-               strcpy(s2->modes,"o");
-               s2->fd = -1;
-               source = s2;
-               faked = true;
-       }
-       string_list p;
-       p.clear();
-       if (ModeDefined(umode,MT_CLIENT))
-       {
-               for (int i = 0; i <= MODCOUNT; i++)
-               {
-                       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);
-                               return true;
-                       }
-               }
-               log(DEBUG,"No module claims umode %c",umode);
-               if (faked)
-               {
-                       delete s2;
-                       source = NULL;
-               }
-               return false;
-       }
-       else
-       {
-               if (faked)
-               {
-                       delete s2;
-                       source = NULL;
-               }
-               return false;
-       }
-}
-
-void handle_mode(char **parameters, int pcnt, userrec *user)
-{
-       chanrec* Ptr;
-       userrec* dest;
-       int can_change;
-       int direction = 1;
-       char outpars[MAXBUF];
-
-       dest = Find(parameters[0]);
-
-       if (!user)
-       {
-               return;
-       }
-
-       if ((dest) && (pcnt == 1))
-       {
-               WriteServ(user->fd,"221 %s :+%s",dest->nick,dest->modes);
-               return;
-       }
-
-       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,MAXBUF);
-               log(DEBUG,"pulled up dest user modes: %s",dmodes);
-
-               can_change = 0;
-               if (user != dest)
-               {
-                       if (strchr(user->modes,'o'))
-                       {
-                               can_change = 1;
-                       }
-               }
-               else
-               {
-                       can_change = 1;
-               }
-               if (!can_change)
-               {
-                       WriteServ(user->fd,"482 %s :Can't change mode for other users",user->nick);
-                       return;
-               }
-               
-               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
-                       {
-                               can_change = 0;
-                               if (strchr(user->modes,'o'))
-                               {
-                                       can_change = 1;
-                               }
-                               else
-                               {
-                                       if ((parameters[1][i] == 'i') || (parameters[1][i] == 'w') || (parameters[1][i] == 's') || (allowed_umode(parameters[1][i],user->modes,direction)))
-                                       {
-                                               can_change = 1;
-                                       }
-                               }
-                               if (can_change)
-                               {
-                                       if (direction == 1)
-                                       {
-                                               if ((!strchr(dmodes,parameters[1][i])) && (allowed_umode(parameters[1][i],user->modes,true)))
-                                               {
-                                                       char umode = parameters[1][i];
-                                                       if ((process_module_umode(umode, user, dest, direction)) || (umode == 'i') || (umode == 's') || (umode == 'w') || (umode == 'o'))
-                                                       {
-                                                               int q = strlen(dmodes);
-                                                               int r = strlen(outpars);
-                                                               dmodes[q+1]='\0';
-                                                               dmodes[q] = parameters[1][i];
-                                                               outpars[r+1]='\0';
-                                                               outpars[r] = parameters[1][i];
-                                                               if (parameters[1][i] == 'o')
-                                                               {
-                                                                       FOREACH_MOD OnGlobalOper(dest);
+                                                                       /* Yerk, invalid! */
+                                                                       if ((parameter.find(':') == 0) || (parameter.rfind(' ') != std::string::npos))
+                                                                               parameter = "";
                                                                }
-                                                       }
-                                               }
-                                       }
-                                       else
-                                       {
-                                               if ((allowed_umode(parameters[1][i],user->modes,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'))
-                                                       {
-                                                               int q = 0;
-                                                               char temp[MAXBUF];      
-                                                               char moo[MAXBUF];       
-
-                                                               int r = strlen(outpars);
-                                                               outpars[r+1]='\0';
-                                                               outpars[r] = parameters[1][i];
-                                                       
-                                                               strcpy(temp,"");
-                                                               for (q = 0; q < strlen(dmodes); q++)
+                                                               else
                                                                {
-                                                                       if (dmodes[q] != parameters[1][i])
-                                                                       {
-                                                                               moo[0] = dmodes[q];
-                                                                               moo[1] = '\0';
-                                                                               strlcat(temp,moo,MAXBUF);
-                                                                       }
+                                                                       /* No parameter, continue to the next mode */
+                                                                       continue;
                                                                }
-                                                               strlcpy(dmodes,temp,MAXBUF);
-
-                                                               if (umode == 'o')
-                                                                       DeleteOper(dest);
                                                        }
-                                               }
-                                       }
-                               }
-                       }
-               }
-               if (outpars[0])
-               {
-                       char b[MAXBUF];
-                       strlcpy(b,"",MAXBUF);
-                       int z = 0;
-                       int i = 0;
-                       while (i < strlen (outpars))
-                       {
-                               b[z++] = outpars[i++];
-                               b[z] = '\0';
-                               if (i<strlen(outpars)-1)
-                               {
-                                       if (((outpars[i] == '-') || (outpars[i] == '+')) && ((outpars[i+1] == '-') || (outpars[i+1] == '+')))
-                                       {
-                                               // someones playing silly buggers and trying
-                                               // to put a +- or -+ into the line...
-                                               i++;
-                                       }
-                               }
-                               if (i == strlen(outpars)-1)
-                               {
-                                       if ((outpars[i] == '-') || (outpars[i] == '+'))
-                                       {
-                                               i++;
-                                       }
-                               }
-                       }
-
-                       z = strlen(b)-1;
-                       if ((b[z] == '-') || (b[z] == '+'))
-                               b[z] = '\0';
-
-                       if ((!b[0]) || (!strcmp(b,"+")) || (!strcmp(b,"-")))
-                               return;
-
-                       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);
-                       }
-
-                       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)
-       {
-               if (pcnt == 1)
-               {
-                       /* just /modes #channel */
-                       WriteServ(user->fd,"324 %s %s +%s",user->nick, Ptr->name, chanmodes(Ptr));
-                        WriteServ(user->fd,"329 %s %s %d", user->nick, Ptr->name, Ptr->created);
-                       return;
-               }
-               else
-               if (pcnt == 2)
-               {
-                       char* mode = parameters[1];
-                       if (*mode == '+')
-                               mode++;
-                       int MOD_RESULT = 0;
-                        FOREACH_RESULT(OnRawMode(user, Ptr, *mode, "", false, 0));
-                        if (!MOD_RESULT)
-                        {
-                               if (*mode == 'b')
-                               {
-
-                                       for (BanList::iterator i = Ptr->bans.begin(); i != Ptr->bans.end(); i++)
-                                       {
-                                               WriteServ(user->fd,"367 %s %s %s %s %d",user->nick, Ptr->name, i->data, i->set_by, i->set_time);
-                                       }
-                                       WriteServ(user->fd,"368 %s %s :End of channel ban list",user->nick, Ptr->name);
-                                       return;
-                               }
-                               if ((ModeDefined(*mode,MT_CHANNEL)) && (ModeIsListMode(*mode,MT_CHANNEL)))
-                               {
-                                       // list of items for an extmode
-                                       log(DEBUG,"Calling OnSendList for all modules, list output for mode %c",*mode);
-                                       FOREACH_MOD OnSendList(user,Ptr,*mode);
-                                       return;
-                               }
-                       }
-               }
-
-                if ((Ptr) && (!has_channel(user,Ptr)))
-                {
-                        WriteServ(user->fd,"442 %s %s :You're not on that channel!",user->nick, Ptr->name);
-                        return;
-                }
-
-               if (Ptr)
-               {
-                       int MOD_RESULT = 0;
-                       FOREACH_RESULT(OnAccessCheck(user,NULL,Ptr,AC_GENERAL_MODE));
-                       
-                       if (MOD_RESULT == ACR_DENY)
-                               return;
-                       if (MOD_RESULT == ACR_DEFAULT)
-                       {
-                               if (cstatus(user,Ptr) < STATUS_HOP)
-                               {
-                                       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);
-               }
-       }
-       else
-       {
-               WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, parameters[0]);
-       }
-}
-
-
-
-
-void server_mode(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,"server_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,MAXBUF);
-
-               strcpy(outpars,"+");
-               direction = 1;
-
-               if ((parameters[1][0] != '+') && (parameters[1][0] != '-'))
-                       return;
-
-               for (int i = 0; i < strlen(parameters[1]); i++)
-               {
-                        if (parameters[1][i] == ' ')
-                                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, user, dest, direction)) || (umode == 'i') || (umode == 's') || (umode == 'w') || (umode == 'o'))
+
+                                                       /* It's an oper only mode, check if theyre an oper. If they arent,
+                                                        * eat any parameter that  came with the mode, and continue to next
+                                                        */
+                                                       if ((IS_LOCAL(user)) && (modehandlers[handler_id]->NeedsOper()) && (!*user->oper))
                                                        {
-                                                               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];
+                                                               user->WriteServ("481 %s :Permission Denied- Only IRC operators may %sset %s mode %c", user->nick,
+                                                                               adding ? "" : "un", type == MODETYPE_CHANNEL ? "channel" : "user",
+                                                                               modehandlers[handler_id]->GetModeChar());
+                                                               continue;
                                                        }
-                                               }
-                                       }
-                                       else
-                                       {
-                                               // can only remove a mode they already have
-                                               log(DEBUG,"umode %c being removed",parameters[1][i]);
-                                               if ((allowed_umode(parameters[1][i],user->modes,false)) && (strchr(dmodes,parameters[1][i])))
-                                               {
-                                                       char umode = parameters[1][i];
-                                                       log(DEBUG,"umode %c is an allowed umode",umode);
-                                                       if ((process_module_umode(umode, user, dest, direction)) || (umode == 'i') || (umode == 's') || (umode == 'w') || (umode == 'o'))
+
+                                                       /* Call the handler for the mode */
+                                                       ModeAction ma = modehandlers[handler_id]->OnModeChange(user, targetuser, targetchannel, parameter, adding);
+
+                                                       if ((modehandlers[handler_id]->GetNumParams(adding)) && (parameter == ""))
                                                        {
-                                                               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++)
+                                                               /* The handler nuked the parameter and they are supposed to have one.
+                                                                * We CANT continue now, even if they actually returned MODEACTION_ALLOW,
+                                                                * so we bail to the next mode character.
+                                                                */
+                                                               continue;
+                                                       }
+
+                                                       if (ma == MODEACTION_ALLOW)
+                                                       {
+                                                               /* We're about to output a valid mode letter - was there previously a pending state-change? */
+                                                               if (state_change)
+                                                                       output_sequence.append(adding ? "+" : "-");
+                                                               
+                                                               /* Add the mode letter */
+                                                               output_sequence.push_back(modechar);
+
+                                                               /* Is there a valid parameter for this mode? If so add it to the parameter list */
+                                                               if ((modehandlers[handler_id]->GetNumParams(adding)) && (parameter != ""))
                                                                {
-                                                                       if (dmodes[q] != parameters[1][i])
+                                                                       parameter_list << " " << parameter;
+                                                                       /* Does this mode have a prefix? */
+                                                                       if (modehandlers[handler_id]->GetPrefix() && targetchannel)
                                                                        {
-                                                                               moo[0] = dmodes[q];
-                                                                               moo[1] = '\0';
-                                                                               strlcat(temp,moo,MAXBUF);
+                                                                               userrec* user_to_prefix = ServerInstance->FindNick(parameter);
+                                                                               if (user_to_prefix)
+                                                                                       targetchannel->SetPrefix(user_to_prefix, modehandlers[handler_id]->GetPrefix(),
+                                                                                                       modehandlers[handler_id]->GetPrefixRank(), adding);
                                                                        }
                                                                }
-                                                               strlcpy(dmodes,temp,MAXBUF);
+
+                                                               /* Call all the AfterMode events in the mode watchers for this mode */
+                                                               for (ModeWatchIter watchers = modewatchers[handler_id].begin(); watchers != modewatchers[handler_id].end(); watchers++)
+                                                                       (*watchers)->AfterMode(user, targetuser, targetchannel, parameter, adding, type);
+
+                                                               /* Reset the state change flag */
+                                                               state_change = false;
                                                        }
                                                }
                                        }
-                               }
+                                       else
+                                       {
+                                               /* No mode handler? Unknown mode character then. */
+                                               user->WriteServ("472 %s %c :is unknown mode char to me",user->nick, modechar);
+                                       }
+                               break;
                        }
                }
-               if (outpars[0])
+               /* Was there at least one valid mode in the sequence? */
+               if (output_sequence != "")
                {
-                       char b[MAXBUF];
-                       strlcpy(b,"",MAXBUF);
-                       int z = 0;
-                       int i = 0;
-                       while (i < strlen (outpars))
+                       if (servermode)
                        {
-                               b[z++] = outpars[i++];
-                               b[z] = '\0';
-                               if (i<strlen(outpars)-1)
+                               if (type == MODETYPE_CHANNEL)
                                {
-                                       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++;
-                                       }
+                                       targetchannel->WriteChannelWithServ(ServerInstance->Config->ServerName, "MODE %s %s%s", targetchannel->name, output_sequence.c_str(), parameter_list.str().c_str());
                                }
-                               if (i == strlen(outpars)-1)
+                               else
                                {
-                                       if ((outpars[i] == '-') || (outpars[i] == '+'))
-                                       {
-                                               i++;
-                                       }
+                                       targetuser->WriteServ("MODE %s %s%s",targetuser->nick,output_sequence.c_str(), parameter_list.str().c_str());
                                }
                        }
-
-                       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);
-                               // M token for a usermode must go to all servers
-                               char buffer[MAXBUF];
-                               snprintf(buffer,MAXBUF,"m %s %s %s",user->nick, dest->nick, b);
-                               NetSendToAll(buffer);
-                       }
-                       
-                       if (strlen(dmodes)>MAXMODES)
+                       else
                        {
-                               dmodes[MAXMODES-1] = '\0';
+                               if (type == MODETYPE_CHANNEL)
+                               {
+                                       ServerInstance->Log(DEBUG,"Write output sequence and parameters to channel: %s %s%s",targetchannel->name,output_sequence.c_str(),parameter_list.str().c_str());
+                                       targetchannel->WriteChannel(user,"MODE %s %s%s",targetchannel->name,output_sequence.c_str(),parameter_list.str().c_str());
+                                       FOREACH_MOD(I_OnMode,OnMode(user, targetchannel, TYPE_CHANNEL, output_sequence + parameter_list.str()));
+                               }
+                               else
+                               {
+                                       user->WriteTo(targetuser,"MODE %s %s%s",targetuser->nick,output_sequence.c_str(), parameter_list.str().c_str());
+                                       FOREACH_MOD(I_OnMode,OnMode(user, targetuser, TYPE_USER, output_sequence));
+                               }
                        }
-                       log(DEBUG,"Stripped mode line");
-                       log(DEBUG,"Line dest is now %s",dmodes);
-                       strlcpy(dest->modes,dmodes,MAXMODES);
-
                }
+       }
+}
 
-               return;
+void ModeParser::CleanMask(std::string &mask)
+{
+       std::string::size_type pos_of_pling = mask.find_first_of('!');
+       std::string::size_type pos_of_at = mask.find_first_of('@');
+       std::string::size_type pos_of_dot = mask.find_first_of('.');
+       std::string::size_type pos_of_colon = mask.find_first_of(':'); /* Because ipv6 addresses are colon delimited */
+
+       if ((pos_of_pling == std::string::npos) && (pos_of_at == std::string::npos))
+       {
+               /* Just a nick, or just a host */
+               if ((pos_of_dot == std::string::npos) && (pos_of_colon == std::string::npos))
+               {
+                       /* It has no '.' in it, it must be a nick. */
+                       mask.append("!*@*");
+               }
+               else
+               {
+                       /* Got a dot in it? Has to be a host */
+                       mask = "*!*@" + mask;
+               }
        }
-       
-       Ptr = FindChan(parameters[0]);
-       if (Ptr)
+       else if ((pos_of_pling == std::string::npos) && (pos_of_at != std::string::npos))
        {
-               process_modes(parameters,user,Ptr,STATUS_OP,pcnt,true,false,false);
+               /* Has an @ but no !, its a user@host */
+                mask = "*!" + mask;
        }
-       else
+       else if ((pos_of_pling != std::string::npos) && (pos_of_at == std::string::npos))
        {
-               WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, parameters[0]);
+               /* Has a ! but no @, it must be a nick!ident */
+               mask.append("@*");
        }
 }
 
+bool ModeParser::AddMode(ModeHandler* mh, unsigned const char modeletter)
+{
+       unsigned char mask = 0;
+       unsigned char pos = 0;
+
+       /* Yes, i know, this might let people declare modes like '_' or '^'.
+        * If they do that, thats their problem, and if i ever EVER see an
+        * official InspIRCd developer do that, i'll beat them with a paddle!
+        */
+       if ((mh->GetModeChar() < 'A') || (mh->GetModeChar() > 'z'))
+               return false;
 
+       /* A mode prefix of ',' is not acceptable, it would fuck up server to server.
+        * A mode prefix of ':' will fuck up both server to server, and client to server.
+        */
+       if ((mh->GetPrefix() == ',') || (mh->GetPrefix() == ':'))
+               return false;
 
-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);
-       }
+       mh->GetModeType() == MODETYPE_USER ? mask = MASK_USER : mask = MASK_CHANNEL;
+       pos = (mh->GetModeChar()-65) | mask;
 
-       if ((dest) && (pcnt > 1))
-       {
-                std::string tidied = compress_modes(parameters[1],false);
-                parameters[1] = (char*)tidied.c_str();
+       if (modehandlers[pos])
+               return false;
 
-               char dmodes[MAXBUF];
-               strlcpy(dmodes,dest->modes,MAXBUF);
+       modehandlers[pos] = mh;
+       ServerInstance->Log(DEBUG,"ModeParser::AddMode: added mode %c",mh->GetModeChar());
+       return true;
+}
 
-               strcpy(outpars,"+");
-               direction = 1;
+bool ModeParser::DelMode(ModeHandler* mh)
+{
+       unsigned char mask = 0;
+       unsigned char pos = 0;
 
-               if ((parameters[1][0] != '+') && (parameters[1][0] != '-'))
-                       return;
+       if ((mh->GetModeChar() < 'A') || (mh->GetModeChar() > 'z'))
+               return false;
 
-               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
+       mh->GetModeType() == MODETYPE_USER ? mask = MASK_USER : mask = MASK_CHANNEL;
+       pos = (mh->GetModeChar()-65) | mask;
+
+       if (!modehandlers[pos])
+               return false;
+
+       switch (mh->GetModeType())
+       {
+               case MODETYPE_USER:
+                       for (user_hash::iterator i = ServerInstance->clientlist.begin(); i != ServerInstance->clientlist.end(); i++)
                        {
-                               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,MAXBUF);
-                                                       }
-                                               }
-                                       }
-                               }
+                               mh->RemoveMode(i->second);
                        }
-               }
-               if (outpars[0])
-               {
-                       char b[MAXBUF];
-                       strcpy(b,"");
-                       int z = 0;
-                       int i = 0;
-                       while (i < strlen (outpars))
+               break;
+               case MODETYPE_CHANNEL:
+                       for (chan_hash::iterator i = ServerInstance->chanlist.begin(); i != ServerInstance->chanlist.end(); i++)
                        {
-                               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++;
-                                       }
-                               }
+                               mh->RemoveMode(i->second);
                        }
+               break;
+       }
 
-                       z = strlen(b)-1;
-                       if ((b[z] == '-') || (b[z] == '+'))
-                               b[z] = '\0';
+       modehandlers[pos] = NULL;
 
-                       if ((!strcmp(b,"+")) || (!strcmp(b,"-")))
-                               return;
+       return true;
+}
 
-                       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);
+ModeHandler* ModeParser::FindMode(unsigned const char modeletter, ModeType mt)
+{
+       unsigned char mask = 0;
+       unsigned char pos = 0;
 
-               }
+       if ((modeletter < 'A') || (modeletter > 'z'))
+               return NULL;
 
-               return;
-       }
-       
-       Ptr = FindChan(parameters[0]);
-       if (Ptr)
+       mt == MODETYPE_USER ? mask = MASK_USER : mask = MASK_CHANNEL;
+       pos = (modeletter-65) | mask;
+
+       return modehandlers[pos];
+}
+
+std::string ModeParser::UserModeList()
+{
+       char modestr[256];
+       int pointer = 0;
+
+       for (unsigned char mode = 'A'; mode <= 'z'; mode++)
        {
-               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);
+               unsigned char pos = (mode-65) | MASK_USER;
+
+               if (modehandlers[pos])
+                       modestr[pointer++] = mode;
        }
+       modestr[pointer++] = 0;
+       return modestr;
 }
 
-
-void merge_mode2(char **parameters, int pcnt, userrec* user)
+std::string ModeParser::ChannelModeList()
 {
-       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)
+       char modestr[256];
+       int pointer = 0;
+
+       for (unsigned char mode = 'A'; mode <= 'z'; mode++)
        {
-               log(DEBUG,"merge_mode2 on %s",dest->nick);
+               unsigned char pos = (mode-65) | MASK_CHANNEL;
+
+               if (modehandlers[pos])
+                       modestr[pointer++] = mode;
        }
+       modestr[pointer++] = 0;
+       return modestr;
+}
+
+std::string ModeParser::ParaModeList()
+{
+       char modestr[256];
+       int pointer = 0;
 
-       if ((dest) && (pcnt > 1))
+       for (unsigned char mode = 'A'; mode <= 'z'; mode++)
        {
-                std::string tidied = compress_modes(parameters[1],false);
-                parameters[1] = (char*)tidied.c_str();
+               unsigned char pos = (mode-65) | MASK_CHANNEL;
 
-               char dmodes[MAXBUF];
-               strlcpy(dmodes,dest->modes,MAXBUF);
+               if ((modehandlers[pos]) && (modehandlers[pos]->GetNumParams(true)))
+                       modestr[pointer++] = mode;
+       }
+       modestr[pointer++] = 0;
+       return modestr;
+}
 
-               strcpy(outpars,"+");
-               direction = 1;
+ModeHandler* ModeParser::FindPrefix(unsigned const char pfxletter)
+{
+       for (unsigned char mode = 'A'; mode <= 'z'; mode++)
+       {
+               unsigned char pos = (mode-65) | MASK_CHANNEL;
 
-               if ((parameters[1][0] == ':') && (strlen(parameters[1])>1))
+               if ((modehandlers[pos]) && (modehandlers[pos]->GetPrefix() == pfxletter))
                {
-                       // 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]);
+                       return modehandlers[pos];
                }
-               if ((parameters[1][0] != '+') && (parameters[1][0] != '-'))
-               return;
+       }
+       return NULL;
+}
+
+std::string ModeParser::ModeString(userrec* user, chanrec* channel)
+{
+       std::string types;
+       std::string pars;
 
-               for (int i = 0; i < strlen(parameters[1]); i++)
+       for (unsigned char mode = 'A'; mode <= 'z'; mode++)
+       {
+               unsigned char pos = (mode-65) | MASK_CHANNEL;
+               ModeHandler* mh = modehandlers[pos];
+               if ((mh) && (mh->GetNumParams(true)) && (mh->GetNumParams(false)))
                {
-                        if (parameters[1][i] == ' ')
-                                continue;
-                       if (parameters[1][i] == '+')
+                       ModePair ret;
+                       ret = mh->ModeSet(NULL, user, channel, user->nick);
+                       if (ret.first)
                        {
-                               if (direction != 1)
-                               {
-                                       int t = strlen(outpars)-1;
-                                       if ((outpars[t] == '+') || (outpars[t] == '-'))
-                                       {
-                                               outpars[t] = '+';
-                                       }
-                                       else
-                                       {
-                                               strcat(outpars,"+");
-                                       }
-                               }
-                               direction = 1;
+                               pars.append(" ");
+                               pars.append(user->nick);
+                               types.push_back(mh->GetModeChar());
                        }
-                       else
-                       if (parameters[1][i] == '-')
+               }
+       }
+
+       return types+pars;
+}
+
+std::string ModeParser::ChanModes()
+{
+       std::string type1;      /* Listmodes EXCEPT those with a prefix */
+       std::string type2;      /* Modes that take a param when adding or removing */
+       std::string type3;      /* Modes that only take a param when adding */
+       std::string type4;      /* Modes that dont take a param */
+
+       for (unsigned char mode = 'A'; mode <= 'z'; mode++)
+       {
+               unsigned char pos = (mode-65) | MASK_CHANNEL;
+                /* One parameter when adding */
+               if (modehandlers[pos])
+               {       
+                       if (modehandlers[pos]->GetNumParams(true))
                        {
-                               if (direction != 0)
+                               if ((modehandlers[pos]->IsListMode()) && (!modehandlers[pos]->GetPrefix()))
                                {
-                                       int t = strlen(outpars)-1;
-                                       if ((outpars[t] == '+') || (outpars[t] == '-'))
-                                       {
-                                               outpars[t] = '-';
-                                       }
-                                       else
-                                       {
-                                               strcat(outpars,"-");
-                                       }
+                                       type1 += modehandlers[pos]->GetModeChar();
                                }
-                               direction = 0;
-                       }
-                       else
-                       {
-                               log(DEBUG,"begin mode processing entry");
-                               can_change = 1;
-                               if (can_change)
+                               else
                                {
-                                       if (direction == 1)
+                                       /* ... and one parameter when removing */
+                                       if (modehandlers[pos]->GetNumParams(false))
                                        {
-                                               log(DEBUG,"umode %c being added",parameters[1][i]);
-                                               if ((!strchr(dmodes,parameters[1][i])) && (allowed_umode(parameters[1][i],user->modes,true)))
+                                               /* But not a list mode */
+                                               if (!modehandlers[pos]->GetPrefix())
                                                {
-                                                       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);
-                                                       }
+                                                       type2 += modehandlers[pos]->GetModeChar();
                                                }
                                        }
                                        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,MAXBUF);
-                                                       }
-                                               }
+                                               /* No parameters when removing */
+                                               type3 += modehandlers[pos]->GetModeChar();
                                        }
                                }
                        }
-               }
-               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))
+                       else
                        {
-                               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++;
-                                       }
-                               }
+                               type4 += modehandlers[pos]->GetModeChar();
                        }
+               }
+                        
+       }
 
-                       z = strlen(b)-1;
-                       if ((b[z] == '-') || (b[z] == '+'))
-                               b[z] = '\0';
+       return type1 + "," + type2 + "," + type3 + "," + type4;
+}
 
+bool ModeParser::PrefixComparison(const prefixtype one, const prefixtype two)
+{       
+       return one.second > two.second;
+}
 
-                        if ((!b[0]) || (!strcmp(b,"+")) || (!strcmp(b,"-")))
-                                return;
+std::string ModeParser::BuildPrefixes()
+{
+       std::string mletters = "";
+       std::string mprefixes = "";
+       pfxcontainer pfx;
+       std::map<char,char> prefix_to_mode;
 
-                        if (strcmp(b,""))
-                        {
-                               WriteTo(user,dest,"MODE %s :%s",dest->nick,b);
-                               log(DEBUG,"Sent: :%s MODE %s",user->nick,b);
-                       }
+       for (unsigned char mode = 'A'; mode <= 'z'; mode++)
+       {
+               unsigned char pos = (mode-65) | MASK_CHANNEL;
 
-                       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);
+               if ((modehandlers[pos]) && (modehandlers[pos]->GetPrefix()))
+               {
+                       pfx.push_back(std::make_pair<char,unsigned int>(modehandlers[pos]->GetPrefix(), modehandlers[pos]->GetPrefixRank()));
+                       prefix_to_mode[modehandlers[pos]->GetPrefix()] = modehandlers[pos]->GetModeChar();
                }
+       }
 
-               return;
+       sort(pfx.begin(), pfx.end(), ModeParser::PrefixComparison);
+
+       for (pfxcontainer::iterator n = pfx.begin(); n != pfx.end(); n++)
+       {
+               mletters = mletters + n->first;
+               mprefixes = mprefixes + prefix_to_mode.find(n->first)->second;
+       }
+
+       return "(" + mprefixes + ")" + mletters;
+}
+
+bool ModeParser::AddModeWatcher(ModeWatcher* mw)
+{
+       unsigned char mask = 0;
+       unsigned char pos = 0;
+
+       if (!mw)
+               return false;
+
+       if ((mw->GetModeChar() < 'A') || (mw->GetModeChar() > 'z'))
+               return false;
+
+       mw->GetModeType() == MODETYPE_USER ? mask = MASK_USER : mask = MASK_CHANNEL;
+       pos = (mw->GetModeChar()-65) | mask;
+
+       modewatchers[pos].push_back(mw);
+       ServerInstance->Log(DEBUG,"ModeParser::AddModeWatcher: watching mode %c",mw->GetModeChar());
+
+       return true;
+}
+
+bool ModeParser::DelModeWatcher(ModeWatcher* mw)
+{
+       unsigned char mask = 0;
+       unsigned char pos = 0;
+
+       if (!mw)
+               return false;
+
+       if ((mw->GetModeType() < 'A') || (mw->GetModeType() > 'z'))
+               return false;
+
+       mw->GetModeType() == MODETYPE_USER ? mask = MASK_USER : mask = MASK_CHANNEL;
+       pos = (mw->GetModeChar()-65) | mask;
+
+       ModeWatchIter a = find(modewatchers[pos].begin(),modewatchers[pos].end(),mw);
+
+       if (a == modewatchers[pos].end())
+               return false;
+
+       modewatchers[pos].erase(a);
+       ServerInstance->Log(DEBUG,"ModeParser::DelModeWatcher: stopped watching mode %c",mw->GetModeChar());
+
+       return true;
+}
+
+/** This default implementation can remove simple user modes
+ */
+void ModeHandler::RemoveMode(userrec* user)
+{
+       char moderemove[MAXBUF];
+       const char* parameters[] = { user->nick, moderemove };
+
+       if (user->IsModeSet(this->GetModeChar()))
+       {
+               userrec* n = new userrec(ServerInstance);
+
+               sprintf(moderemove,"-%c",this->GetModeChar());
+               n->SetFd(FD_MAGIC_NUMBER);
+
+               ServerInstance->SendMode(parameters, 2, n);
+
+               delete n;
        }
-       
-       Ptr = FindChan(parameters[0]);
-       if (Ptr)
+}
+
+/** This default implementation can remove simple channel modes
+ * (no parameters)
+ */
+void ModeHandler::RemoveMode(chanrec* channel)
+{
+       char moderemove[MAXBUF];
+       const char* parameters[] = { channel->name, moderemove };
+
+       if (channel->IsModeSet(this->GetModeChar()))
        {
-               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);
-               }
+               userrec* n = new userrec(ServerInstance);
+
+               sprintf(moderemove,"-%c",this->GetModeChar());
+               n->SetFd(FD_MAGIC_NUMBER);
+
+               ServerInstance->SendMode(parameters, 2, n);
+
+               delete n;
        }
 }
 
+ModeParser::ModeParser(InspIRCd* Instance) : ServerInstance(Instance)
+{
+       /* Clear mode list */
+       memset(modehandlers, 0, sizeof(modehandlers));
+       memset(modewatchers, 0, sizeof(modewatchers));
+
+       /* Initialise the RFC mode letters */
+
+       /* Start with channel simple modes, no params */
+       this->AddMode(new ModeChannelSecret(Instance), 's');
+       this->AddMode(new ModeChannelPrivate(Instance), 'p');
+       this->AddMode(new ModeChannelModerated(Instance), 'm');
+       this->AddMode(new ModeChannelTopicOps(Instance), 't');
+       this->AddMode(new ModeChannelNoExternal(Instance), 'n');
+       this->AddMode(new ModeChannelInviteOnly(Instance), 'i');
+
+       /* Cannel modes with params */
+       this->AddMode(new ModeChannelKey(Instance), 'k');
+       this->AddMode(new ModeChannelLimit(Instance), 'l');
+
+       /* Channel listmodes */
+       this->AddMode(new ModeChannelBan(Instance), 'b');
+       this->AddMode(new ModeChannelOp(Instance), 'o');
+       this->AddMode(new ModeChannelHalfOp(Instance), 'h');
+       this->AddMode(new ModeChannelVoice(Instance), 'v');
+
+       /* Now for usermodes */
+       this->AddMode(new ModeUserServerNotice(Instance), 's');
+       this->AddMode(new ModeUserWallops(Instance), 'w');
+       this->AddMode(new ModeUserInvisible(Instance), 'i');
+       this->AddMode(new ModeUserOperator(Instance), 'o');
+       this->AddMode(new ModeUserServerNoticeMask(Instance), 'n');
+}