]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/mode.cpp
m_dccallow Add config option to control max entries on a list
[user/henk/code/inspircd.git] / src / mode.cpp
index 5b5523dfe4829d5ae1a402f3b8d5af293c8899ea..89ff37fa1e7fd0b709bd411c220abdf15cf6b1f4 100644 (file)
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  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.
+ *   Copyright (C) 2012 Shawn Smith <shawn@inspircd.org>
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007, 2009 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006-2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
+ *   Copyright (C) 2004-2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2006 Oliver Lupton <oliverlupton@gmail.com>
  *
- * ---------------------------------------------------
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-using namespace std;
 
-#include "inspircd_config.h"
 #include "inspircd.h"
-#include "inspircd_io.h"
-#include <unistd.h>
-#include <sys/errno.h>
-#include <time.h>
-#include <string>
-#ifdef GCC3
-#include <ext/hash_map>
-#else
-#include <hash_map>
-#endif
-#include <map>
-#include <sstream>
-#include <vector>
-#include <deque>
-#include "connection.h"
-#include "users.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"
-
-extern int MODCOUNT;
-extern std::vector<Module*> modules;
-extern std::vector<ircd_module*> factory;
-extern InspIRCd* ServerInstance;
-extern ServerConfig* Config;
-
-extern time_t TIME;
-
-userrec* ModeParser::SanityChecks(userrec *user,char *dest,chanrec *chan,int status)
+
+/* +s (secret) */
+/* +p (private) */
+/* +m (moderated) */
+/* +t (only (half) ops can change topic) */
+/* +n (no external messages) */
+/* +i (invite only) */
+/* +w (see wallops) */
+/* +i (invisible) */
+#include "modes/simplemodes.h"
+/* +b (bans) */
+#include "modes/cmode_b.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"
+/* +v (channel voice) */
+#include "modes/cmode_v.h"
+/* +o (operator) */
+#include "modes/umode_o.h"
+/* +s (server notice masks) */
+#include "modes/umode_s.h"
+
+ModeHandler::ModeHandler(Module* Creator, const std::string& Name, char modeletter, ParamSpec Params, ModeType type)
+       : ServiceProvider(Creator, Name, SERVICE_MODE), m_paramtype(TR_TEXT),
+       parameters_taken(Params), mode(modeletter), prefix(0), oper(false),
+       list(false), m_type(type), levelrequired(HALFOP_VALUE)
+{
+}
+
+CullResult ModeHandler::cull()
+{
+       if (ServerInstance->Modes)
+               ServerInstance->Modes->DelMode(this);
+       return classbase::cull();
+}
+
+ModeHandler::~ModeHandler()
+{
+}
+
+bool ModeHandler::IsListMode()
+{
+       return list;
+}
+
+unsigned int ModeHandler::GetPrefixRank()
+{
+       return 0;
+}
+
+int ModeHandler::GetNumParams(bool adding)
+{
+       switch (parameters_taken)
+       {
+               case PARAM_ALWAYS:
+                       return 1;
+               case PARAM_SETONLY:
+                       return adding ? 1 : 0;
+               case PARAM_NONE:
+                       break;
+       }
+       return 0;
+}
+
+std::string ModeHandler::GetUserParameter(User* user)
+{
+       return "";
+}
+
+ModResult ModeHandler::AccessCheck(User*, Channel*, std::string &, bool)
+{
+       return MOD_RES_PASSTHRU;
+}
+
+ModeAction ModeHandler::OnModeChange(User*, User*, Channel*, std::string&, bool)
+{
+       return MODEACTION_DENY;
+}
+
+void ModeHandler::DisplayList(User*, Channel*)
+{
+}
+
+void ModeHandler::DisplayEmptyList(User*, Channel*)
+{
+}
+
+void ModeHandler::OnParameterMissing(User* user, User* dest, Channel* channel)
+{
+}
+
+bool ModeHandler::ResolveModeConflict(std::string& theirs, const std::string& ours, Channel*)
+{
+       return (theirs < ours);
+}
+
+ModeAction SimpleUserModeHandler::OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
+{
+       /* We're either trying to add a mode we already have or
+               remove a mode we don't have, deny. */
+       if (dest->IsModeSet(this->GetModeChar()) == adding)
+               return MODEACTION_DENY;
+
+       /* adding will be either true or false, depending on if we
+               are adding or removing the mode, since we already checked
+               to make sure we aren't adding a mode we have or that we
+               aren't removing a mode we don't have, we don't have to do any
+               other checks here to see if it's true or false, just add or
+               remove the mode */
+       dest->SetMode(this->GetModeChar(), adding);
+
+       return MODEACTION_ALLOW;
+}
+
+
+ModeAction SimpleChannelModeHandler::OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
+{
+       /* We're either trying to add a mode we already have or
+               remove a mode we don't have, deny. */
+       if (channel->IsModeSet(this->GetModeChar()) == adding)
+               return MODEACTION_DENY;
+
+       /* adding will be either true or false, depending on if we
+               are adding or removing the mode, since we already checked
+               to make sure we aren't adding a mode we have or that we
+               aren't removing a mode we don't have, we don't have to do any
+               other checks here to see if it's true or false, just add or
+               remove the mode */
+       channel->SetMode(this->GetModeChar(), adding);
+
+       return MODEACTION_ALLOW;
+}
+
+ModeAction ParamChannelModeHandler::OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
+{
+       if (adding && !ParamValidate(parameter))
+               return MODEACTION_DENY;
+       std::string now = channel->GetModeParameter(this);
+       if (parameter == now)
+               return MODEACTION_DENY;
+       if (adding)
+               channel->SetModeParam(this, parameter);
+       else
+               channel->SetModeParam(this, "");
+       return MODEACTION_ALLOW;
+}
+
+bool ParamChannelModeHandler::ParamValidate(std::string& parameter)
+{
+       return true;
+}
+
+ModeWatcher::ModeWatcher(Module* Creator, char modeletter, ModeType type)
+       : mode(modeletter), m_type(type), creator(Creator)
+{
+}
+
+ModeWatcher::~ModeWatcher()
+{
+}
+
+char ModeWatcher::GetModeChar()
+{
+       return mode;
+}
+
+ModeType ModeWatcher::GetModeType()
+{
+       return m_type;
+}
+
+bool ModeWatcher::BeforeMode(User*, User*, Channel*, std::string&, bool, ModeType)
+{
+       return true;
+}
+
+void ModeWatcher::AfterMode(User*, User*, Channel*, const std::string&, bool, ModeType)
+{
+}
+
+User* ModeParser::SanityChecks(User *user, const char *dest, Channel *chan, int)
 {
-       userrec *d;
+       User *d;
        if ((!user) || (!dest) || (!chan) || (!*dest))
        {
                return NULL;
        }
-       d = Find(dest);
+       d = ServerInstance->FindNick(dest);
        if (!d)
        {
-               WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, dest);
+               user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel",user->nick.c_str(), dest);
                return NULL;
        }
        return d;
 }
 
-char* ModeParser::Grant(userrec *d,chanrec *chan,int MASK)
+void ModeParser::DisplayCurrentModes(User *user, User* targetuser, Channel* targetchannel, const char* text)
 {
-       for (unsigned int i = 0; i < d->chans.size(); i++)
+       if (targetchannel)
        {
-               if ((d->chans[i].channel != NULL) && (chan != NULL))
-               if (d->chans[i].channel == chan)
-               {
-                       if (d->chans[i].uc_modes & MASK)
-                       {
-                               return NULL;
-                       }
-                       d->chans[i].uc_modes = d->chans[i].uc_modes | MASK;
-                       switch (MASK)
-                       {
-                               case UCMODE_OP:
-                                       d->chans[i].channel->AddOppedUser(d);
-                               break;
-                               case UCMODE_HOP:
-                                       d->chans[i].channel->AddHalfoppedUser(d);
-                               break;
-                               case UCMODE_VOICE:
-                                       d->chans[i].channel->AddVoicedUser(d);
-                               break;
-                       }
-                       log(DEBUG,"grant: %s %s",d->chans[i].channel->name,d->nick);
-                       return d->nick;
-               }
+               /* Display channel's current mode string */
+               user->WriteNumeric(RPL_CHANNELMODEIS, "%s %s +%s",user->nick.c_str(), targetchannel->name.c_str(), targetchannel->ChanModes(targetchannel->HasUser(user)));
+               user->WriteNumeric(RPL_CHANNELCREATED, "%s %s %lu", user->nick.c_str(), targetchannel->name.c_str(), (unsigned long)targetchannel->age);
+               return;
        }
-       return NULL;
-}
-
-char* ModeParser::Revoke(userrec *d,chanrec *chan,int MASK)
-{
-       for (unsigned int i = 0; i < d->chans.size(); i++)
+       else
        {
-               if ((d->chans[i].channel != NULL) && (chan != NULL))
-               if (d->chans[i].channel == chan)
+               if (targetuser == user || user->HasPrivPermission("users/auspex"))
                {
-                       if ((d->chans[i].uc_modes & MASK) == 0)
-                       {
-                               return NULL;
-                       }
-                       d->chans[i].uc_modes ^= MASK;
-                       switch (MASK)
-                       {
-                               case UCMODE_OP:
-                                       d->chans[i].channel->DelOppedUser(d);
-                               break;
-                               case UCMODE_HOP:
-                                       d->chans[i].channel->DelHalfoppedUser(d);
-                               break;
-                               case UCMODE_VOICE:
-                                       d->chans[i].channel->DelVoicedUser(d);
-                               break;
-                       }
-                       log(DEBUG,"revoke: %s %s",d->chans[i].channel->name,d->nick);
-                       return d->nick;
+                       /* Display user's current mode string */
+                       user->WriteNumeric(RPL_UMODEIS, "%s :+%s",targetuser->nick.c_str(),targetuser->FormatModes());
+                       if (IS_OPER(targetuser))
+                               user->WriteNumeric(RPL_SNOMASKIS, "%s +%s :Server notice mask", targetuser->nick.c_str(), targetuser->FormatNoticeMasks());
+                       return;
+               }
+               else
+               {
+                       user->WriteNumeric(ERR_USERSDONTMATCH, "%s :Can't view modes for other users", user->nick.c_str());
+                       return;
                }
        }
-       return NULL;
 }
 
-char* ModeParser::GiveOps(userrec *user,char *dest,chanrec *chan,int status)
+ModeAction ModeParser::TryMode(User* user, User* targetuser, Channel* chan, bool adding, const unsigned char modechar,
+               std::string &parameter, bool SkipACL)
 {
-       userrec *d = this->SanityChecks(user,dest,chan,status);
-       
-       if (d)
+       ModeType type = chan ? MODETYPE_CHANNEL : MODETYPE_USER;
+       unsigned char mask = chan ? MASK_CHANNEL : MASK_USER;
+
+       ModeHandler *mh = FindMode(modechar, type);
+       int pcnt = mh->GetNumParams(adding);
+
+       // crop mode parameter size to 250 characters
+       if (parameter.length() > 250 && adding)
+               parameter = parameter.substr(0, 250);
+
+       ModResult MOD_RESULT;
+       FIRST_MOD_RESULT(OnRawMode, MOD_RESULT, (user, chan, modechar, parameter, adding, pcnt));
+
+       if (IS_LOCAL(user) && (MOD_RESULT == MOD_RES_DENY))
+               return MODEACTION_DENY;
+
+       if (chan && !SkipACL && (MOD_RESULT != MOD_RES_ALLOW))
        {
-               if (IS_LOCAL(user))
+               MOD_RESULT = mh->AccessCheck(user, chan, parameter, adding);
+
+               if (MOD_RESULT == MOD_RES_DENY)
+                       return MODEACTION_DENY;
+               if (MOD_RESULT == MOD_RES_PASSTHRU)
                {
-                       int MOD_RESULT = 0;
-                       FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_OP));
-                       
-                       if (MOD_RESULT == ACR_DENY)
-                               return NULL;
-                       if (MOD_RESULT == ACR_DEFAULT)
+                       unsigned int neededrank = mh->GetLevelRequired();
+                       /* Compare our rank on the channel against the rank of the required prefix,
+                        * allow if >= ours. Because mIRC and xchat throw a tizz if the modes shown
+                        * in NAMES(X) are not in rank order, we know the most powerful mode is listed
+                        * first, so we don't need to iterate, we just look up the first instead.
+                        */
+                       unsigned int ourrank = chan->GetPrefixValue(user);
+                       if (ourrank < neededrank)
                        {
-                               if ((status < STATUS_OP) && (!is_uline(user->server)))
+                               ModeHandler* neededmh = NULL;
+                               for(char c='A'; c <= 'z'; c++)
                                {
-                                       WriteServ(user->fd,"482 %s %s :You're not a channel operator",user->nick, chan->name);
-                                       return NULL;
+                                       ModeHandler *privmh = FindMode(c, MODETYPE_CHANNEL);
+                                       if (privmh && privmh->GetPrefixRank() >= neededrank)
+                                       {
+                                               // this mode is sufficient to allow this action
+                                               if (!neededmh || privmh->GetPrefixRank() < neededmh->GetPrefixRank())
+                                                       neededmh = privmh;
+                                       }
                                }
+                               if (neededmh)
+                                       user->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :You must have channel %s access or above to %sset channel mode %c",
+                                               user->nick.c_str(), chan->name.c_str(), neededmh->name.c_str(), adding ? "" : "un", modechar);
+                               else
+                                       user->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :You cannot %sset channel mode %c",
+                                               user->nick.c_str(), chan->name.c_str(), adding ? "" : "un", modechar);
+                               return MODEACTION_DENY;
                        }
                }
+       }
 
-               return this->Grant(d,chan,UCMODE_OP);
+       unsigned char handler_id = (modechar - 'A') | mask;
+
+       for (ModeWatchIter watchers = modewatchers[handler_id].begin(); watchers != modewatchers[handler_id].end(); watchers++)
+       {
+               if ((*watchers)->BeforeMode(user, targetuser, chan, parameter, adding, type) == false)
+                       return MODEACTION_DENY;
+               /* A module whacked the parameter completely, and there was one. abort. */
+               if (pcnt && parameter.empty())
+                       return MODEACTION_DENY;
        }
-       return NULL;
-}
 
-char* ModeParser::GiveHops(userrec *user,char *dest,chanrec *chan,int status)
-{
-       userrec *d = this->SanityChecks(user,dest,chan,status);
-       
-       if (d)
+       if (IS_LOCAL(user) && !IS_OPER(user))
        {
-               if (IS_LOCAL(user))
+               char* disabled = (type == MODETYPE_CHANNEL) ? ServerInstance->Config->DisabledCModes : ServerInstance->Config->DisabledUModes;
+               if (disabled[modechar - 'A'])
                {
-                       int MOD_RESULT = 0;
-                       FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_HALFOP));
-               
-                       if (MOD_RESULT == ACR_DENY)
-                               return NULL;
-                       if (MOD_RESULT == ACR_DEFAULT)
-                       {
-                               if ((status < STATUS_OP) && (!is_uline(user->server)))
-                               {
-                                       WriteServ(user->fd,"482 %s %s :You're not a channel operator",user->nick, chan->name);
-                                       return NULL;
-                               }
-                       }
+                       user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Permission Denied - %s mode %c has been locked by the administrator",
+                               user->nick.c_str(), type == MODETYPE_CHANNEL ? "channel" : "user", modechar);
+                       return MODEACTION_DENY;
                }
-
-               return this->Grant(d,chan,UCMODE_HOP);
        }
-       return NULL;
-}
 
-char* ModeParser::GiveVoice(userrec *user,char *dest,chanrec *chan,int status)
-{
-       userrec *d = this->SanityChecks(user,dest,chan,status);
-       
-       if (d)
+       if (adding && IS_LOCAL(user) && mh->NeedsOper() && !user->HasModePermission(modechar, type))
        {
-               if (IS_LOCAL(user))
+               /* It's an oper only mode, and they don't have access to it. */
+               if (IS_OPER(user))
                {
-                       int MOD_RESULT = 0;
-                       FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_VOICE));
-                       
-                       if (MOD_RESULT == ACR_DENY)
-                               return NULL;
-                       if (MOD_RESULT == ACR_DEFAULT)
-                       {
-                               if ((status < STATUS_HOP) && (!is_uline(user->server)))
-                               {
-                                       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;
-                               }
-                       }
+                       user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Permission Denied - Oper type %s does not have access to set %s mode %c",
+                                       user->nick.c_str(), user->oper->NameStr(), type == MODETYPE_CHANNEL ? "channel" : "user", modechar);
                }
-
-               return this->Grant(d,chan,UCMODE_VOICE);
+               else
+               {
+                       user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Permission Denied - Only operators may set %s mode %c",
+                                       user->nick.c_str(), type == MODETYPE_CHANNEL ? "channel" : "user", modechar);
+               }
+               return MODEACTION_DENY;
        }
-       return NULL;
-}
 
-char* ModeParser::TakeOps(userrec *user,char *dest,chanrec *chan,int status)
-{
-       userrec *d = this->SanityChecks(user,dest,chan,status);
-       
-       if (d)
+       if (mh->GetTranslateType() == TR_NICK)
        {
+               User* prefixtarget;
                if (IS_LOCAL(user))
+                       prefixtarget = ServerInstance->FindNickOnly(parameter);
+               else
+                       prefixtarget = ServerInstance->FindNick(parameter);
+
+               if (!prefixtarget)
                {
-                       int MOD_RESULT = 0;
-                       FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_DEOP));
-                       
-                       if (MOD_RESULT == ACR_DENY)
-                               return NULL;
-                       if (MOD_RESULT == ACR_DEFAULT)
-                       {
-                               if ((status < STATUS_OP) && (!is_uline(user->server)) && (IS_LOCAL(user)))
-                               {
-                                       WriteServ(user->fd,"482 %s %s :You are not a channel operator",user->nick, chan->name);
-                                       return NULL;
-                               }
-                       }
+                       user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel", user->nick.c_str(), parameter.c_str());
+                       return MODEACTION_DENY;
                }
+       }
 
-               return this->Revoke(d,chan,UCMODE_OP);
+       if (mh->GetPrefixRank() && chan)
+       {
+               User* user_to_prefix = ServerInstance->FindNick(parameter);
+               if (!user_to_prefix)
+                       return MODEACTION_DENY;
+               if (!chan->SetPrefix(user_to_prefix, modechar, adding))
+                       return MODEACTION_DENY;
        }
-       return NULL;
+
+       /* Call the handler for the mode */
+       ModeAction ma = mh->OnModeChange(user, targetuser, chan, parameter, adding);
+
+       if (pcnt && parameter.empty())
+               return MODEACTION_DENY;
+
+       if (ma != MODEACTION_ALLOW)
+               return ma;
+
+       for (ModeWatchIter watchers = modewatchers[handler_id].begin(); watchers != modewatchers[handler_id].end(); watchers++)
+               (*watchers)->AfterMode(user, targetuser, chan, parameter, adding, type);
+
+       return MODEACTION_ALLOW;
 }
 
-char* ModeParser::TakeHops(userrec *user,char *dest,chanrec *chan,int status)
+void ModeParser::Process(const std::vector<std::string>& parameters, User *user, bool merge)
 {
-       userrec *d = this->SanityChecks(user,dest,chan,status);
-       
-       if (d)
+       const std::string& target = parameters[0];
+       Channel* targetchannel = ServerInstance->FindChan(target);
+       User* targetuser = NULL;
+       if (!targetchannel)
        {
                if (IS_LOCAL(user))
-               {
-                       int MOD_RESULT = 0;
-                       FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_DEHALFOP));
-                       
-                       if (MOD_RESULT == ACR_DENY)
-                               return NULL;
-                       if (MOD_RESULT == ACR_DEFAULT)
-                       {
-                               /* Tweak by Brain suggested by w00t, allow a halfop to dehalfop themselves */
-                               if ((user != d) && ((status < STATUS_OP) && (!is_uline(user->server))))
-                               {
-                                       WriteServ(user->fd,"482 %s %s :You are not a channel operator",user->nick, chan->name);
-                                       return NULL;
-                               }
-                       }
-               }
-
-               return this->Revoke(d,chan,UCMODE_HOP);
+                       targetuser = ServerInstance->FindNickOnly(target);
+               else
+                       targetuser = ServerInstance->FindNick(target);
        }
-       return NULL;
-}
+       ModeType type = targetchannel ? MODETYPE_CHANNEL : MODETYPE_USER;
 
-char* ModeParser::TakeVoice(userrec *user,char *dest,chanrec *chan,int status)
-{
-       userrec *d = this->SanityChecks(user,dest,chan,status);
+       LastParse.clear();
+       LastParseParams.clear();
+       LastParseTranslate.clear();
 
-       if (d)  
+       if ((!targetchannel) && ((!targetuser) || (IS_SERVER(targetuser))))
        {
-               if (IS_LOCAL(user))
-               {
-                       int MOD_RESULT = 0;
-                       FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_DEVOICE));
-                       
-                       if (MOD_RESULT == ACR_DENY)
-                               return NULL;
-                       if (MOD_RESULT == ACR_DEFAULT)
-                       {
-                               if ((status < STATUS_HOP) && (!is_uline(user->server)))
-                               {
-                                       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 this->Revoke(d,chan,UCMODE_VOICE);
+               user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel",user->nick.c_str(),target.c_str());
+               return;
+       }
+       if (parameters.size() == 1)
+       {
+               this->DisplayCurrentModes(user, targetuser, targetchannel, target.c_str());
+               return;
        }
-       return NULL;
-}
 
-char* ModeParser::AddBan(userrec *user,char *dest,chanrec *chan,int status)
-{
-       BanItem b;
-       int toomanyexclamation = 0;
-       int toomanyat = 0;
+       ModResult MOD_RESULT;
+       FIRST_MOD_RESULT(OnPreMode, MOD_RESULT, (user, targetuser, targetchannel, parameters));
 
-       if ((!user) || (!dest) || (!chan) || (!*dest))
+       bool SkipAccessChecks = false;
+
+       if (!IS_LOCAL(user) || ServerInstance->ULine(user->server) || MOD_RESULT == MOD_RES_ALLOW)
+               SkipAccessChecks = true;
+       else if (MOD_RESULT == MOD_RES_DENY)
+               return;
+
+       if (targetuser && !SkipAccessChecks && user != targetuser)
        {
-               log(DEFAULT,"*** BUG *** AddBan was given an invalid parameter");
-               return NULL;
+               user->WriteNumeric(ERR_USERSDONTMATCH, "%s :Can't change mode for other users", user->nick.c_str());
+               return;
        }
 
-       for (char* i = dest; *i; i++)
+       std::string mode_sequence = parameters[1];
+
+       std::string output_mode;
+       std::ostringstream output_parameters;
+       LastParseParams.push_back(output_mode);
+       LastParseTranslate.push_back(TR_TEXT);
+
+       bool adding = true;
+       char output_pm = '\0'; // current output state, '+' or '-'
+       unsigned int param_at = 2;
+
+       for (std::string::const_iterator letter = mode_sequence.begin(); letter != mode_sequence.end(); letter++)
        {
-               if ((*i < 32) || (*i > 126))
+               unsigned char modechar = *letter;
+               if (modechar == '+' || modechar == '-')
                {
-                       return NULL;
+                       adding = (modechar == '+');
+                       continue;
                }
-               else if (*i == '!')
+
+               ModeHandler *mh = this->FindMode(modechar, type);
+               if (!mh)
                {
-                       toomanyexclamation++;
+                       /* No mode handler? Unknown mode character then. */
+                       user->WriteServ("%d %s %c :is unknown mode char to me", type == MODETYPE_CHANNEL ? 472 : 501, user->nick.c_str(), modechar);
+                       continue;
                }
-               else if (*i == '@')
+
+               std::string parameter;
+               int pcnt = mh->GetNumParams(adding);
+               if (pcnt && param_at == parameters.size())
                {
-                       toomanyat++;
+                       /* No parameter, continue to the next mode */
+                       mh->OnParameterMissing(user, targetuser, targetchannel);
+                       continue;
+               }
+               else if (pcnt)
+               {
+                       parameter = parameters[param_at++];
+                       /* Make sure the user isn't trying to slip in an invalid parameter */
+                       if ((parameter.empty()) || (parameter.find(':') == 0) || (parameter.rfind(' ') != std::string::npos))
+                               continue;
+                       if (merge && targetchannel && targetchannel->IsModeSet(modechar) && !mh->IsListMode())
+                       {
+                               std::string ours = targetchannel->GetModeParameter(modechar);
+                               if (!mh->ResolveModeConflict(parameter, ours, targetchannel))
+                                       /* we won the mode merge, don't apply this mode */
+                                       continue;
+                       }
                }
-       }
 
-       if (toomanyexclamation != 1 || toomanyat != 1)
-               /*
-                * this stops sillyness like n!u!u!u@h, though note that most
-                * ircds don't actually verify banmask validity. --w00t
-                */
-               return NULL;
+               ModeAction ma = TryMode(user, targetuser, targetchannel, adding, modechar, parameter, SkipAccessChecks);
 
-       long maxbans = GetMaxBans(chan->name);
-       if ((unsigned)chan->bans.size() > (unsigned)maxbans)
-       {
-               WriteServ(user->fd,"478 %s %s :Channel ban list for %s is full (maximum entries for this channel is %d)",user->nick, chan->name,chan->name,maxbans);
-               return NULL;
-       }
+               if (ma != MODEACTION_ALLOW)
+                       continue;
 
-       log(DEBUG,"AddBan: %s %s",chan->name,user->nick);
+               char needed_pm = adding ? '+' : '-';
+               if (needed_pm != output_pm)
+               {
+                       output_pm = needed_pm;
+                       output_mode.append(1, output_pm);
+               }
+               output_mode.append(1, modechar);
 
-       int MOD_RESULT = 0;
-       FOREACH_RESULT(I_OnAddBan,OnAddBan(user,chan,dest));
-       if (MOD_RESULT)
-               return NULL;
+               if (pcnt)
+               {
+                       TranslateType tt = mh->GetTranslateType();
+                       if (tt == TR_NICK)
+                       {
+                               User* u = ServerInstance->FindNick(parameter);
+                               if (u)
+                                       parameter = u->nick;
+                       }
+                       output_parameters << " " << parameter;
+                       LastParseParams.push_back(parameter);
+                       LastParseTranslate.push_back(tt);
+               }
 
-       TidyBan(dest);
-       for (BanList::iterator i = chan->bans.begin(); i != chan->bans.end(); i++)
-       {
-               if (!strcasecmp(i->data,dest))
+               if ( (output_mode.length() + output_parameters.str().length() > 450)
+                               || (output_mode.length() > 100)
+                               || (LastParseParams.size() > ServerInstance->Config->Limits.MaxModes))
                {
-                       // dont allow a user to set the same ban twice
-                       return NULL;
+                       /* mode sequence is getting too long */
+                       break;
                }
        }
 
-       b.set_time = TIME;
-       strlcpy(b.data,dest,MAXBUF);
-       if (*user->nick)
+       LastParseParams[0] = output_mode;
+
+       if (!output_mode.empty())
        {
-               strlcpy(b.set_by,user->nick,NICKMAX-1);
+               LastParse = targetchannel ? targetchannel->name : targetuser->nick;
+               LastParse.append(" ");
+               LastParse.append(output_mode);
+               LastParse.append(output_parameters.str());
+
+               if (targetchannel)
+               {
+                       targetchannel->WriteChannel(user, "MODE %s", LastParse.c_str());
+                       FOREACH_MOD(I_OnMode,OnMode(user, targetchannel, TYPE_CHANNEL, LastParseParams, LastParseTranslate));
+               }
+               else
+               {
+                       targetuser->WriteFrom(user, "MODE %s", LastParse.c_str());
+                       FOREACH_MOD(I_OnMode,OnMode(user, targetuser, TYPE_USER, LastParseParams, LastParseTranslate));
+               }
        }
-       else
+       else if (targetchannel && parameters.size() == 2)
        {
-               strlcpy(b.set_by,Config->ServerName,NICKMAX-1);
+               /* Special case for displaying the list for listmodes,
+                * e.g. MODE #chan b, or MODE #chan +b without a parameter
+                */
+               this->DisplayListModes(user, targetchannel, mode_sequence);
        }
-       chan->bans.push_back(b);
-       return dest;
 }
 
-char* ModeParser::TakeBan(userrec *user,char *dest,chanrec *chan,int status)
+void ModeParser::DisplayListModes(User* user, Channel* chan, std::string &mode_sequence)
 {
-       if ((!user) || (!dest) || (!chan) || (!*dest)) {
-               log(DEFAULT,"*** BUG *** TakeBan was given an invalid parameter");
-               return 0;
-       }
+       seq++;
 
-       log(DEBUG,"del_ban: %s %s",chan->name,user->nick);
-       for (BanList::iterator i = chan->bans.begin(); i != chan->bans.end(); i++)
+       for (std::string::const_iterator letter = mode_sequence.begin(); letter != mode_sequence.end(); letter++)
        {
-               if (!strcasecmp(i->data,dest))
-               {
-                       int MOD_RESULT = 0;
-                       FOREACH_RESULT(I_OnDelBan,OnDelBan(user,chan,dest));
-                       if (MOD_RESULT)
-                               return NULL;
-                       chan->bans.erase(i);
-                       return dest;
-               }
-       }
-       return NULL;
-}
+               unsigned char mletter = *letter;
+               if (mletter == '+')
+                       continue;
 
+               /* Ensure the user doesnt request the same mode twice,
+                * so they cant flood themselves off out of idiocy.
+                */
+               if (sent[mletter] == seq)
+                       continue;
 
-/** ModeParser::CompressModes()
- * Tidies up redundant modes,
- * e.g. +nt-nt+i becomes +-+i
- * A section further down the chain tidies up the +-+- crap.
- */
-std::string ModeParser::CompressModes(std::string modes,bool channelmodes)
-{
-       /*
-        * OK, iterate over the mode string and count how many times a certain mode appears in it.
-        * Then, erase all instances of any character that appears more than once.
-        * This only operates on modes with no parameters, you can still +v-v+v-v+v-v to your heart's content.
-        */
-       
-       /* Do we really need an int here? Can you fit enough modes in a line to overflow a short? */
-       short counts[127];
-       bool active[127];
-       memset(counts, 0, sizeof(counts));
-       memset(active, 0, sizeof(active));
-       
-       for(unsigned char* i = (unsigned char*)modes.c_str(); *i; i++)
-       {
-               if((*i == '+') || (*i == '-'))
+               sent[mletter] = seq;
+
+               ModeHandler *mh = this->FindMode(mletter, MODETYPE_CHANNEL);
+
+               if (!mh || !mh->IsListMode())
+                       return;
+
+               ModResult MOD_RESULT;
+               FIRST_MOD_RESULT(OnRawMode, MOD_RESULT, (user, chan, mletter, "", true, 0));
+               if (MOD_RESULT == MOD_RES_DENY)
                        continue;
 
-               if(!channelmodes || (channelmodes && (strchr("itnmsp", *i) || (ModeDefined(*i, MT_CHANNEL) && !ModeDefinedOn(*i,MT_CHANNEL) && !ModeDefinedOff(*i,MT_CHANNEL)))))
+               bool display = true;
+               if (!user->HasPrivPermission("channels/auspex") && ServerInstance->Config->HideModeLists[mletter] && (chan->GetPrefixValue(user) < HALFOP_VALUE))
                {
-                       log(DEBUG,"Tidy mode %c", *i);
-                       counts[*i]++;
-                       active[*i] = true;
+                       user->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :You do not have access to view the +%c list",
+                               user->nick.c_str(), chan->name.c_str(), mletter);
+                       display = false;
                }
-       }
-       
-       for(unsigned char j = 65; j < 127; j++)
-       {
-               if ((counts[j] > 1) && (active[j] == true))
+
+               unsigned char handler_id = (mletter - 'A') | MASK_CHANNEL;
+
+               for(ModeWatchIter watchers = modewatchers[handler_id].begin(); watchers != modewatchers[handler_id].end(); watchers++)
                {
-                       std::string::size_type pos;
+                       std::string dummyparam;
 
-                       while((pos = modes.find(j)) != std::string::npos)
-                       {
-                               log(DEBUG, "Deleting occurence of mode %c...", j);
-                               modes.erase(pos, 1);
-                               log(DEBUG,"New mode line: %s", modes.c_str());
-                       }
+                       if (!((*watchers)->BeforeMode(user, NULL, chan, dummyparam, true, MODETYPE_CHANNEL)))
+                               display = false;
                }
+               if (display)
+                       mh->DisplayList(user, chan);
+               else
+                       mh->DisplayEmptyList(user, chan);
        }
-       
-       return modes;
 }
 
-void ModeParser::ProcessModes(char **parameters,userrec* user,chanrec *chan,int status, int pcnt, bool servermode, bool silent, bool local)
+const std::string& ModeParser::GetLastParse()
 {
-       if ((!parameters) || (pcnt < 2)) {
-               return;
-       }
-
-       char outlist[MAXBUF];
-       char mlist[MAXBUF];
-       char *outpars[32];
-       int param = 2;
-       int pc = 0;
-       int ptr = 0;
-       int mdir = 1;
-       char* r = NULL;
-       bool k_set = false, l_set = false, previously_set_l = false, previously_unset_l = false, previously_set_k = false, previously_unset_k = false;
-
-       int MOD_RESULT = 0;
-       
-       if (IS_LOCAL(user))
-       {
-               FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,NULL,chan,AC_GENERAL_MODE));  
-               if (MOD_RESULT == ACR_DENY)
-                       return;
-       }
-
-       std::string tidied = this->CompressModes(parameters[1],true);
-       strlcpy(mlist,tidied.c_str(),MAXBUF);
-       char* modelist = mlist;
-
-       *outlist = *modelist;
-       char* outl = outlist+1;
-
-       mdir = (*modelist == '+');
+       return LastParse;
+}
 
-       log(DEBUG,"process_modes: modelist: %s",modelist);
+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_colons = mask.find("::"); /* Because ipv6 addresses are colon delimited -- double so it treats extban as nick */
 
-       int len = tidied.length();
-       while (modelist[len-1] == ' ')
-               modelist[--len] = '\0';
+       if (mask.length() >= 2 && mask[1] == ':')
+               return; // if it's an extban, don't even try guess how it needs to be formed.
 
-       for (char* modechar = (modelist + 1); *modechar; ptr++, modechar++)
+       if ((pos_of_pling == std::string::npos) && (pos_of_at == std::string::npos))
        {
-               r = NULL;
-
-               /* If we have more than MAXMODES changes in one line,
-                * drop all after the MAXMODES
-                */
-               if (pc > MAXMODES-1)
-                       break;
+               /* Just a nick, or just a host - or clearly ipv6 (starting with :) */
+               if ((pos_of_dot == std::string::npos) && (pos_of_colons == std::string::npos) && mask[0] != ':')
+               {
+                       /* 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;
+               }
+       }
+       else if ((pos_of_pling == std::string::npos) && (pos_of_at != std::string::npos))
+       {
+               /* Has an @ but no !, its a user@host */
+                mask = "*!" + mask;
+       }
+       else if ((pos_of_pling != std::string::npos) && (pos_of_at == std::string::npos))
+       {
+               /* Has a ! but no @, it must be a nick!ident */
+               mask.append("@*");
+       }
+}
 
+bool ModeParser::AddMode(ModeHandler* mh)
+{
+       unsigned char mask = 0;
+       unsigned char pos = 0;
 
-               
-               switch (*modechar)
-               {
-                       case '-':
-                               *outl++ = '-';
-                               mdir = 0;
-                       break;                  
-
-                       case '+':
-                               *outl++ = '+';
-                               mdir = 1;
-                       break;
+       /* 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') || (mh->GetPrefix() > 126))
+               return false;
 
-                       case 'o':
-                               log(DEBUG,"Ops");
-                               if ((param >= pcnt)) break;
-                               log(DEBUG,"Enough parameters left");
-                               r = NULL;
-                               if (mdir == 1)
-                               {
-                                       MOD_RESULT = 0;
-                                       FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'o', parameters[param], true, 1));
-                                       if (!MOD_RESULT)
-                                       {
-                                               r = GiveOps(user,parameters[param++],chan,status);
-                                       }
-                                       else param++;
-                               }
-                               else
-                               {
-                                        MOD_RESULT = 0;
-                                        FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'o', parameters[param], false, 1));
-                                        if (!MOD_RESULT)
-                                        {
-                                               r = TakeOps(user,parameters[param++],chan,status);
-                                       }
-                                       else param++;
-                               }
-                               if (r)
-                               {
-                                       *outl++ = 'o';
-                                       outpars[pc++] = r;
-                               }
-                       break;
-                       
-                       case 'h':
-                               if (((param >= pcnt)) || (!Config->AllowHalfop)) break;
-                               r = NULL;
-                               if (mdir == 1)
-                               {
-                                        MOD_RESULT = 0;
-                                        FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'h', parameters[param], true, 1));
-                                        if (!MOD_RESULT)
-                                        {
-                                               r = GiveHops(user,parameters[param++],chan,status);
-                                       }
-                                       else param++;
-                               }
-                               else
-                               {
-                                        MOD_RESULT = 0;
-                                        FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'h', parameters[param], false, 1));
-                                        if (!MOD_RESULT)
-                                        {
-                                               r = TakeHops(user,parameters[param++],chan,status);
-                                       }
-                                       else param++;
-                               }
-                               if (r)
-                               {
-                                       *outl++ = 'h';
-                                       outpars[pc++] = r;
-                               }
-                       break;
-                       
-                               
-                       case 'v':
-                                       if ((param >= pcnt)) break;
-                                       r = NULL;
-                                       if (mdir == 1)
-                                       {
-                                                MOD_RESULT = 0;
-                                                FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'v', parameters[param], true, 1));
-                                                if (!MOD_RESULT)
-                                                {
-                                                       r = GiveVoice(user,parameters[param++],chan,status);
-                                               }
-                                               else param++;
-                                       }
-                                       else
-                                       {
-                                                MOD_RESULT = 0;
-                                                FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'v', parameters[param], false, 1));
-                                                if (!MOD_RESULT)
-                                                {
-                                                       r = TakeVoice(user,parameters[param++],chan,status);
-                                               }
-                                               else param++;
-                                       }
-                                       if (r)
-                                       {
-                                               *outl++ = 'v';
-                                               outpars[pc++] = r;
-                                       }
-                       break;
-                               
-                       case 'b':
-                               if ((param >= pcnt)) break;
-                               r = NULL;
-                               if (mdir == 1)
-                               {
-                                        MOD_RESULT = 0;
-                                        FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'b', parameters[param], true, 1));
-                                        if (!MOD_RESULT)
-                                        {
-                                               r = AddBan(user,parameters[param++],chan,status);
-                                       }
-                                       else param++;
-                               }
-                               else
-                               {
-                                        MOD_RESULT = 0;
-                                        FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'b', parameters[param], false, 1));
-                                        if (!MOD_RESULT)
-                                        {
-                                               r = TakeBan(user,parameters[param++],chan,status);
-                                       }
-                                       else param++;
-                               }
-                               if (r)
-                               {
-                                       *outl++ = 'b';
-                                       outpars[pc++] = parameters[param-1];
-                               }
-                       break;
+       /* 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.
+        * A mode prefix of '#' will mess up /whois and /privmsg
+        */
+       if ((mh->GetPrefix() == ',') || (mh->GetPrefix() == ':') || (mh->GetPrefix() == '#'))
+               return false;
 
+       if (mh->GetPrefix() && FindPrefix(mh->GetPrefix()))
+               return false;
 
-                       case 'k':
-                               if ((param >= pcnt))
-                                       break;
+       mh->GetModeType() == MODETYPE_USER ? mask = MASK_USER : mask = MASK_CHANNEL;
+       pos = (mh->GetModeChar()-65) | mask;
 
-                               if (mdir == 1)
-                               {
-                                       if (k_set)
-                                               break;
-
-                                       if (previously_unset_k)
-                                               break;
-                                       previously_set_k = true;
-                                               
-                                       if (!*chan->key)
-                                       {
-                                               MOD_RESULT = 0;
-                                               FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'k', parameters[param], true, 1));
-                                               if (!MOD_RESULT)
-                                               {
-                                                       *outl++ = 'k';
-                                                       char key[MAXBUF];
-                                                       strlcpy(key,parameters[param++],32);
-                                                       outpars[pc++] = key;
-                                                       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(I_OnRawMode,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))
-                                               {
-                                                       *outl++ = 'k';
-                                                       *chan->key = 0;
-                                                       outpars[pc++] = key;
-                                               }
-                                       }
-                                       else param++;
-                               }
-                       break;
-                               
-                       case 'l':
-                               if (mdir == 0)
-                               {
-                                       if (previously_set_l)
-                                               break;
-                                       previously_unset_l = true;
-                                        MOD_RESULT = 0;
-                                        FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'l', "", false, 0));
-                                        if (!MOD_RESULT)
-                                        {
-                                               if (chan->limit)
-                                               {
-                                                       *outl++ = '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 (char* f = parameters[param]; *f; f++)
-                                       {
-                                               if ((*f < '0') || (*f > '9'))
-                                               {
-                                                       invalid = true;
-                                               }
-                                       }
-                                       /* If the limit is < 1, or the new limit is the current limit, dont allow */
-                                       if ((atoi(parameters[param]) < 1) || ((chan->limit > 0) && (atoi(parameters[param]) == chan->limit)))
-                                       {
-                                               invalid = true;
-                                       }
+       if (modehandlers[pos])
+               return false;
 
-                                       if (invalid)
-                                               break;
-
-                                        MOD_RESULT = 0;
-                                        FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'l', parameters[param], true, 1));
-                                        if (!MOD_RESULT)
-                                        {
-       
-                                               chan->limit = atoi(parameters[param]);
-                                                       
-                                               // reported by mech: large values cause underflow
-                                               if (chan->limit < 0)
-                                                       chan->limit = 0x7FFF;
-                                       }
-                                               
-                                       if (chan->limit)
-                                       {
-                                               *outl++ = 'l';
-                                               outpars[pc++] = parameters[param++];
-                                               l_set = true;
-                                       }
-                               }
-                       break;
-                               
-                       case 'i':
-                                MOD_RESULT = 0;
-                                FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'i', "", mdir, 0));
-                                if (!MOD_RESULT)
-                                {
-                                       if (mdir)
-                                       {
-                                               if (!(chan->binarymodes & CM_INVITEONLY)) *outl++ = 'i';
-                                               chan->binarymodes |= CM_INVITEONLY;
-                                       }
-                                       else
-                                       {
-                                               if (chan->binarymodes & CM_INVITEONLY) *outl++ = 'i';
-                                               chan->binarymodes &= ~CM_INVITEONLY;
-                                       }
-                               }
-                       break;
-                               
-                       case 't':
-                                MOD_RESULT = 0;
-                                FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 't', "", mdir, 0));
-                                if (!MOD_RESULT)
-                                {
-                                       if (mdir)
-                                        {
-                                               if (!(chan->binarymodes & CM_TOPICLOCK)) *outl++ = 't';
-                                                chan->binarymodes |= CM_TOPICLOCK;
-                                        }
-                                        else
-                                        {
-                                               if (chan->binarymodes & CM_TOPICLOCK) *outl++ = 't';
-                                                chan->binarymodes &= ~CM_TOPICLOCK;
-                                        }
-                               }
-                       break;
-                               
-                       case 'n':
-                                MOD_RESULT = 0;
-                                FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'n', "", mdir, 0));
-                                if (!MOD_RESULT)
-                                {
-                                        if (mdir)
-                                        {
-                                               if (!(chan->binarymodes & CM_NOEXTERNAL)) *outl++ = 'n';
-                                                chan->binarymodes |= CM_NOEXTERNAL;
-                                        }
-                                        else
-                                        {
-                                               if (chan->binarymodes & CM_NOEXTERNAL) *outl++ = 'n';
-                                                chan->binarymodes &= ~CM_NOEXTERNAL;
-                                        }
-                               }
-                       break;
-                               
-                       case 'm':
-                                MOD_RESULT = 0;
-                                FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'm', "", mdir, 0));
-                                if (!MOD_RESULT)
-                                {
-                                        if (mdir)
-                                        {
-                                                if (!(chan->binarymodes & CM_MODERATED)) *outl++ = 'm';
-                                                chan->binarymodes |= CM_MODERATED;
-                                        }
-                                        else
-                                        {
-                                                if (chan->binarymodes & CM_MODERATED) *outl++ = 'm';
-                                                chan->binarymodes &= ~CM_MODERATED;
-                                        }
-                               }
-                       break;
-                               
-                       case 's':
-                                MOD_RESULT = 0;
-                                FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 's', "", mdir, 0));
-                                if (!MOD_RESULT)
-                                {
-                                        if (mdir)
-                                        {
-                                                if (!(chan->binarymodes & CM_SECRET)) *outl++ = 's';
-                                                chan->binarymodes |= CM_SECRET;
-                                                if (chan->binarymodes & CM_PRIVATE)
-                                                {
-                                                        chan->binarymodes &= ~CM_PRIVATE;
-                                                        if (mdir)
-                                                        {
-                                                               *outl++ = '-'; *outl++ = 'p'; *outl++ = '+';
-                                                        }
-                                                }
-                                        }
-                                        else
-                                        {
-                                                if (chan->binarymodes & CM_SECRET) *outl++ = 's';
-                                                chan->binarymodes &= ~CM_SECRET;
-                                        }
-                               }
-                       break;
-                               
-                       case 'p':
-                                MOD_RESULT = 0;
-                                FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'p', "", mdir, 0));
-                                if (!MOD_RESULT)
-                                {
-                                        if (mdir)
-                                        {
-                                                if (!(chan->binarymodes & CM_PRIVATE)) *outl++ = 'p';
-                                                chan->binarymodes |= CM_PRIVATE;
-                                                if (chan->binarymodes & CM_SECRET)
-                                                {
-                                                        chan->binarymodes &= ~CM_SECRET;
-                                                        if (mdir)
-                                                        {
-                                                               *outl++ = '-'; *outl++ = 's'; *outl++ = '+';
-                                                        }
-                                                }
-                                        }
-                                        else
-                                        {
-                                                if (chan->binarymodes & CM_PRIVATE) *outl++ = 'p';
-                                                chan->binarymodes &= ~CM_PRIVATE;
-                                        }
-                               }
-                       break;
-                               
-                       default:
-                               string_list p;
-                               p.clear();
-                               bool x = chan->custom_modes[*modechar-65];
-                               if ((!x && !mdir) || (x && 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))
-                               {
-                                       /* 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(I_OnRawMode,OnRawMode(user, chan, *modechar, para, mdir, pcnt));
-                                               if (!MOD_RESULT)
-                                               {
-                                                       for (int i = 0; i <= MODCOUNT; i++)
-                                               {
-                                                       if (!handled)
-                                                       {
-                                                               int t = modules[i]->OnExtendedMode(user,chan,*modechar,MT_CHANNEL,mdir,p);
-                                                               if (t != 0)
-                                                               {
-                                                                       log(DEBUG,"OnExtendedMode returned nonzero for a module");
-                                                                       if (ModeIsListMode(*modechar,MT_CHANNEL))
-                                                                       {
-                                                                               if (t == -1)
-                                                                               {
-                                                                                       //pc++;
-                                                                                       param++;
-                                                                               }
-                                                                               else
-                                                                               {
-                                                                                       if (param < pcnt)
-                                                                                       {
-                                                                                               *outl++ = *modechar;
-                                                                                       }
-                                                                                       outpars[pc++] = parameters[param++];
-                                                                               }
-                                                                       }
-                                                                       else
-                                                                       {
-                                                                               *outl++ = *modechar;
-                                                                               chan->SetCustomMode(*modechar,mdir);
-                                                                               // include parameters in output if mode has them
-                                                                               if ((ModeDefinedOn(*modechar,MT_CHANNEL)>0) && (mdir))
-                                                                               {
-                                                                                       if (param < pcnt)
-                                                                                       {
-                                                                                               chan->SetCustomModeParam(*modechar,parameters[param],mdir);
-                                                                                               outpars[pc++] = parameters[param++];
-                                                                                       }
-                                                                               }
-                                                                       }
-                                                                       // 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;
-               }
-       }
+       modehandlers[pos] = mh;
+       return true;
+}
 
-       /* Null terminate it now we're done */
-       *outl = 0;
+bool ModeParser::DelMode(ModeHandler* mh)
+{
+       unsigned char mask = 0;
+       unsigned char pos = 0;
 
+       if ((mh->GetModeChar() < 'A') || (mh->GetModeChar() > 'z'))
+               return false;
 
-       /************ Fast, but confusing string tidying ************/
-       outl = outlist;
-       while (*outl && (*outl < 'A'))
-               outl++;
-       /* outl now points to the first mode character after +'s and -'s */
-       outl--;
-       /* Now points at first mode-modifier + or - symbol */
-       char* trim = outl;
-       /* Now we tidy off any trailing -'s etc */
-       while (*trim++);
-       trim--;
-       while ((*--trim == '+') || (*trim == '-'))
-               *trim = 0;
-       /************ Done wih the string tidy functions ************/
+       mh->GetModeType() == MODETYPE_USER ? mask = MASK_USER : mask = MASK_CHANNEL;
+       pos = (mh->GetModeChar()-65) | mask;
 
+       if (modehandlers[pos] != mh)
+               return false;
 
-       /* The mode change must be at least two characters long (+ or - and at least one mode) */
-       if (((*outl == '+') || (*outl == '-')) && *(outl+1))
+       /* Note: We can't stack here, as we have modes potentially being removed across many different channels.
+        * To stack here we have to make the algorithm slower. Discuss.
+        */
+       switch (mh->GetModeType())
        {
-               for (ptr = 0; ptr < pc; ptr++)
-               {
-                       charlcat(outl,' ',MAXBUF);
-                       strlcat(outl,outpars[ptr],MAXBUF-1);
-               }
-               if (local)
-               {
-                       log(DEBUG,"Local mode change");
-                       WriteChannelLocal(chan, user, "MODE %s %s",chan->name,outl);
-                       FOREACH_MOD(I_OnMode,OnMode(user, chan, TYPE_CHANNEL, outl));
-               }
-               else
-               {
-                       if (servermode)
+               case MODETYPE_USER:
+                       for (user_hash::iterator i = ServerInstance->Users->clientlist->begin(); i != ServerInstance->Users->clientlist->end(); )
                        {
-                               if (!silent)
-                               {
-                                       WriteChannelWithServ(Config->ServerName,chan,"MODE %s %s",chan->name,outl);
-                               }
-                                       
+                               User* user = i->second;
+                               ++i;
+                               mh->RemoveMode(user);
                        }
-                       else
+               break;
+               case MODETYPE_CHANNEL:
+                       for (chan_hash::iterator i = ServerInstance->chanlist->begin(); i != ServerInstance->chanlist->end(); )
                        {
-                               if (!silent)
-                               {
-                                       WriteChannel(chan,user,"MODE %s %s",chan->name,outl);
-                                       FOREACH_MOD(I_OnMode,OnMode(user, chan, TYPE_CHANNEL, outl));
-                               }
+                               // The channel may not be in the hash after RemoveMode(), see m_permchannels
+                               Channel* chan = i->second;
+                               ++i;
+                               mh->RemoveMode(chan);
                        }
-               }
+               break;
        }
-}
 
-// based on sourcemodes, return true or false to determine if umode is a valid mode a user may set on themselves or others.
+       modehandlers[pos] = NULL;
 
-bool ModeParser::AllowedUmode(char umode, char* sourcemodes,bool adding,bool serveroverride)
+       return true;
+}
+
+ModeHandler* ModeParser::FindMode(unsigned const char modeletter, ModeType mt)
 {
-       bool sourceoper = (strchr(sourcemodes,'o') != NULL);
-       log(DEBUG,"Allowed_umode: %c %s",umode,sourcemodes);
-       // Servers can +o and -o arbitrarily
-       if ((serveroverride == true) && (umode == 'o'))
-       {
-               return true;
-       }
-       // RFC1459 specified modes
-       if ((umode == 'w') || (umode == 's') || (umode == 'i'))
-       {
-               /* umode allowed by RFC1459 scemantics */
-               return true;
-       }
-       
-       /* user may not +o themselves or others, but an oper may de-oper other opers or themselves */
-       if (sourceoper && !adding)
-       {
-               return true;
-       }
-       else if (umode == 'o')
-       {
-               /* Bad oper, bad bad! */
-               return false;
-       }
-       
-       /* process any module-defined modes that need oper */
-       if ((ModeDefinedOper(umode,MT_CLIENT)) && (sourceoper))
-       {
-               log(DEBUG,"umode %c allowed by module handler (oper only mode)",umode);
-               return true;
-       }
-       else if (ModeDefined(umode,MT_CLIENT))
-       {
-               // 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)) && (!sourceoper))
-               {
-                       // no, this mode needs oper, and this user 'aint got what it takes!
-                       return false;
-               }
-               return true;
-       }
+       unsigned char mask = 0;
+       unsigned char pos = 0;
+
+       if ((modeletter < 'A') || (modeletter > 'z'))
+               return NULL;
+
+       mt == MODETYPE_USER ? mask = MASK_USER : mask = MASK_CHANNEL;
+       pos = (modeletter-65) | mask;
 
-       // anything else - return false.
-       log(DEBUG,"umode %c not known by any ruleset",umode);
-       return false;
+       return modehandlers[pos];
 }
 
-bool ModeParser::ProcessModuleUmode(char umode, userrec* source, void* dest, bool adding)
+std::string ModeParser::UserModeList()
 {
-       userrec* s2;
-       bool faked = false;
-       if (!source)
-       {
-               s2 = new userrec;
-               strlcpy(s2->nick,Config->ServerName,NICKMAX-1);
-               *s2->modes = 'o';
-               *(s2->modes+1) = 0;
-               s2->fd = -1;
-               source = s2;
-               faked = true;
-       }
-       string_list p;
-       p.clear();
-       if (ModeDefined(umode,MT_CLIENT))
+       char modestr[256];
+       int pointer = 0;
+
+       for (unsigned char mode = 'A'; mode <= 'z'; mode++)
        {
-               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",Config->module_names[i].c_str(),umode);
-                               return true;
-                       }
-               }
-               log(DEBUG,"No module claims umode %c",umode);
-               if (faked)
-               {
-                       delete s2;
-                       source = NULL;
-               }
-               return false;
+               unsigned char pos = (mode-65) | MASK_USER;
+
+               if (modehandlers[pos])
+                       modestr[pointer++] = mode;
        }
-       else
+       modestr[pointer++] = 0;
+       return modestr;
+}
+
+std::string ModeParser::ChannelModeList()
+{
+       char modestr[256];
+       int pointer = 0;
+
+       for (unsigned char mode = 'A'; mode <= 'z'; mode++)
        {
-               if (faked)
-               {
-                       delete s2;
-                       source = NULL;
-               }
-               return false;
+               unsigned char pos = (mode-65) | MASK_CHANNEL;
+
+               if (modehandlers[pos])
+                       modestr[pointer++] = mode;
        }
+       modestr[pointer++] = 0;
+       return modestr;
 }
 
-void cmd_mode::Handle (char **parameters, int pcnt, userrec *user)
+std::string ModeParser::ParaModeList()
 {
-       chanrec* Ptr;
-       userrec* dest = Find(parameters[0]);
-       int can_change;
-       int direction = 1;
-       char outpars[MAXBUF];
-       bool next_ok = true;
-
-       if (!user)
-               return;
+       char modestr[256];
+       int pointer = 0;
 
-       if ((dest) && (pcnt == 1))
+       for (unsigned char mode = 'A'; mode <= 'z'; mode++)
        {
-               WriteServ(user->fd,"221 %s :+%s",dest->nick,dest->modes);
-               return;
+               unsigned char pos = (mode-65) | MASK_CHANNEL;
+
+               if ((modehandlers[pos]) && (modehandlers[pos]->GetNumParams(true)))
+                       modestr[pointer++] = mode;
        }
-       else if ((dest) && (pcnt > 1))
-       {
-               std::string tidied = ServerInstance->ModeGrok->CompressModes(parameters[1],false);
-               parameters[1] = (char*)tidied.c_str();
+       modestr[pointer++] = 0;
+       return modestr;
+}
 
-               char dmodes[MAXBUF];
-               strlcpy(dmodes,dest->modes,MAXMODES);
-               log(DEBUG,"pulled up dest user modes: %s",dmodes);
+ModeHandler* ModeParser::FindPrefix(unsigned const char pfxletter)
+{
+       for (unsigned char mode = 'A'; mode <= 'z'; mode++)
+       {
+               unsigned char pos = (mode-65) | MASK_CHANNEL;
 
-               can_change = 0;
-               if (user != dest)
+               if ((modehandlers[pos]) && (modehandlers[pos]->GetPrefix() == pfxletter))
                {
-                       if ((*user->oper) || (is_uline(user->server)))
-                       {
-                               can_change = 1;
-                       }
-               }
-               else
-               {
-                       can_change = 1;
+                       return modehandlers[pos];
                }
-               if (!can_change)
-               {
-                       WriteServ(user->fd,"482 %s :Can't change mode for other users",user->nick);
-                       return;
-               }
-               
-               outpars[0] = *parameters[1];
-               outpars[1] = 0;
-               direction = (*parameters[1] == '+');
+       }
+       return NULL;
+}
 
-               if ((*parameters[1] != '+') && (*parameters[1] != '-'))
-                       return;
+std::string ModeParser::GiveModeList(ModeMasks m)
+{
+       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 (char* i = parameters[1]; *i; i++)
+       for (unsigned char mode = 'A'; mode <= 'z'; mode++)
+       {
+               unsigned char pos = (mode-65) | m;
+                /* One parameter when adding */
+               if (modehandlers[pos])
                {
-                       if ((i != parameters[1]) && (*i != '+') && (*i != '-'))
-                               next_ok = true;
-
-                       switch (*i)
+                       if (modehandlers[pos]->GetNumParams(true))
                        {
-                               case ' ':
-                               continue;
-
-                               case '+':
-                                       if ((direction != 1) && (next_ok))
-                                       {
-                                               charlcat(outpars,'+',MAXBUF);
-                                               next_ok = false;
-                                       }       
-                                       direction = 1;
-                               break;
-
-                               case '-':
-                                       if ((direction != 0) && (next_ok))
-                                       {
-                                               charlcat(outpars,'-',MAXBUF);
-                                               next_ok = false;
-                                       }
-                                       direction = 0;
-                               break;
-
-                               default:
-                                       can_change = 0;
-                                       if (*user->oper)
-                                       {
-                                               can_change = 1;
-                                       }
-                                       else
-                                       {
-                                               if ((*i == 'i') || (*i == 'w') || (*i == 's') || (ServerInstance->ModeGrok->AllowedUmode(*i,user->modes,direction,false)))
-                                               {
-                                                       can_change = 1;
-                                               }
-                                       }
-                                       if (can_change)
+                               if ((modehandlers[pos]->IsListMode()) && (!modehandlers[pos]->GetPrefix()))
+                               {
+                                       type1 += modehandlers[pos]->GetModeChar();
+                               }
+                               else
+                               {
+                                       /* ... and one parameter when removing */
+                                       if (modehandlers[pos]->GetNumParams(false))
                                        {
-                                               if (direction == 1)
-                                               {
-                                                       if ((!strchr(dmodes,*i)) && (ServerInstance->ModeGrok->AllowedUmode(*i,user->modes,true,false)))
-                                                       {
-                                                               if ((ServerInstance->ModeGrok->ProcessModuleUmode(*i, user, dest, direction)) || (*i == 'i') || (*i == 's') || (*i == 'w') || (*i == 'o'))
-                                                               {
-                                                                       charlcat(dmodes,*i,53);
-                                                                       charlcat(outpars,*i,MAXMODES);
-                                                                       if (*i == 'o')
-                                                                       {
-                                                                               FOREACH_MOD(I_OnGlobalOper,OnGlobalOper(dest));
-                                                                       }
-                                                               }
-                                                       }
-                                               }
-                                               else
+                                               /* But not a list mode */
+                                               if (!modehandlers[pos]->GetPrefix())
                                                {
-                                                       if ((ServerInstance->ModeGrok->AllowedUmode(*i,user->modes,false,false)) && (strchr(dmodes,*i)))
-                                                       {
-                                                               if ((ServerInstance->ModeGrok->ProcessModuleUmode(*i, user, dest, direction)) || (*i == 'i') || (*i == 's') || (*i == 'w') || (*i == 'o'))
-                                                               {
-                                                                       charlcat(outpars,*i,MAXMODES);
-                                                                       charremove(dmodes,*i);
-                                                                       if (*i == 'o')
-                                                                       {
-                                                                               *dest->oper = 0;
-                                                                               DeleteOper(dest);
-                                                                       }
-                                                               }
-                                                       }
+                                                       type2 += modehandlers[pos]->GetModeChar();
                                                }
                                        }
-                               break;
-                       }
-               }
-               if (*outpars)
-               {
-                       char b[MAXBUF];
-                       char* z = b;
-
-                       for (char* i = outpars; *i;)
-                       {
-                               *z++ = *i++;
-                               if (((*i == '-') || (*i == '+')) && ((*(i+1) == '-') || (*(i+1) == '+')))
-                               {
-                                       // someones playing silly buggers and trying
-                                       // to put a +- or -+ into the line...
-                                       i++;
-                               }
-                               if (!*(i+1))
-                               {
-                                       // Someone's trying to make the last character in
-                                       // the line be a + or - symbol.
-                                       if ((*i == '-') || (*i == '+'))
+                                       else
                                        {
-                                               i++;
+                                               /* No parameters when removing */
+                                               type3 += modehandlers[pos]->GetModeChar();
                                        }
                                }
                        }
-                       *z = 0;
-
-                       if ((*b) && (!IS_SINGLE(b,'+')) && (!IS_SINGLE(b,'-')))
+                       else
                        {
-                               WriteTo(user, dest, "MODE %s :%s", dest->nick, b);
-                               FOREACH_MOD(I_OnMode,OnMode(user, dest, TYPE_USER, b));
+                               type4 += modehandlers[pos]->GetModeChar();
                        }
+               }
+       }
 
-                       log(DEBUG,"Stripped mode line");
-                       log(DEBUG,"Line dest is now %s",dmodes);
-                       strlcpy(dest->modes,dmodes,MAXMODES-1);
+       return type1 + "," + type2 + "," + type3 + "," + type4;
+}
 
-               }
+std::string ModeParser::BuildPrefixes(bool lettersAndModes)
+{
+       std::string mletters;
+       std::string mprefixes;
+       std::map<int,std::pair<char,char> > prefixes;
 
-               return;
-       }
-       else
+       for (unsigned char mode = 'A'; mode <= 'z'; mode++)
        {
-               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,Ptr->HasUser(user)));
-                               WriteServ(user->fd,"329 %s %s %d", user->nick, Ptr->name, Ptr->created);
-                               return;
-                       }
-                       else if (pcnt == 2)
-                       {
-                               char* mode = parameters[1];
-                               if (*mode == '+')
-                                       mode++;
-                               int MOD_RESULT = 0;
-                               FOREACH_RESULT(I_OnRawMode,OnRawMode(user, Ptr, *mode, "", false, 0));
-                               if (!MOD_RESULT)
-                               {
-                                       if (*mode == 'b')
-                                       {
-                                               for (BanList::iterator i = Ptr->bans.begin(); i != Ptr->bans.end(); i++)
-                                               {
-                                                       WriteServ(user->fd,"367 %s %s %s %s %d",user->nick, Ptr->name, i->data, i->set_by, i->set_time);
-                                               }
-                                               WriteServ(user->fd,"368 %s %s :End of channel ban list",user->nick, Ptr->name);
-                                               return;
-                                       }
-                                       if ((ModeDefined(*mode,MT_CHANNEL)) && (ModeIsListMode(*mode,MT_CHANNEL)))
-                                       {
-                                               // list of items for an extmode
-                                               log(DEBUG,"Calling OnSendList for all modules, list output for mode %c",*mode);
-                                               FOREACH_MOD(I_OnSendList,OnSendList(user,Ptr,*mode));
-                                               return;
-                                       }
-                               }
-                       }
+               unsigned char pos = (mode-65) | MASK_CHANNEL;
 
-                       if ((IS_LOCAL(user)) && (!is_uline(user->server)) && (!Ptr->HasUser(user)))
-                       {
-                               WriteServ(user->fd,"442 %s %s :You're not on that channel!",user->nick, Ptr->name);
-                               return;
-                       }
-       
-                       if (Ptr)
-                       {
-                               int MOD_RESULT = 0;
-                               FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,NULL,Ptr,AC_GENERAL_MODE));
-                               
-                               if (MOD_RESULT == ACR_DENY)
-                                       return;
-                               if (MOD_RESULT == ACR_DEFAULT)
-                               {
-                                       if ((IS_LOCAL(user)) && (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;
-                                       }
-                               }
-       
-                               ServerInstance->ModeGrok->ProcessModes(parameters,user,Ptr,cstatus(user,Ptr),pcnt,false,false,false);
-                       }
-               }
-               else
+               if ((modehandlers[pos]) && (modehandlers[pos]->GetPrefix()))
                {
-                       WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, parameters[0]);
+                       prefixes[modehandlers[pos]->GetPrefixRank()] = std::make_pair(
+                               modehandlers[pos]->GetPrefix(), modehandlers[pos]->GetModeChar());
                }
        }
-}
-
 
+       for(std::map<int,std::pair<char,char> >::reverse_iterator n = prefixes.rbegin(); n != prefixes.rend(); n++)
+       {
+               mletters = mletters + n->second.first;
+               mprefixes = mprefixes + n->second.second;
+       }
 
+       return lettersAndModes ? "(" + mprefixes + ")" + mletters : mletters;
+}
 
-void ModeParser::ServerMode(char **parameters, int pcnt, userrec *user)
+bool ModeParser::AddModeWatcher(ModeWatcher* mw)
 {
-       chanrec* Ptr;
-       userrec* dest = Find(parameters[0]);
-       int can_change;
-       int direction = 1;
-       char outpars[MAXBUF];
-       bool next_ok = true;
-
-       if ((dest) && (pcnt > 1))
-       {
-                std::string tidied = ServerInstance->ModeGrok->CompressModes(parameters[1],false);
-                parameters[1] = (char*)tidied.c_str();
+       unsigned char mask = 0;
+       unsigned char pos = 0;
 
-               char dmodes[MAXBUF];
-               strlcpy(dmodes,dest->modes,MAXBUF);
+       if (!mw)
+               return false;
 
-               outpars[0] = *parameters[1];
-               outpars[1] = 0;
-               direction = (*parameters[1] == '+');
+       if ((mw->GetModeChar() < 'A') || (mw->GetModeChar() > 'z'))
+               return false;
 
-               if ((*parameters[1] != '+') && (*parameters[1] != '-'))
-                       return;
+       mw->GetModeType() == MODETYPE_USER ? mask = MASK_USER : mask = MASK_CHANNEL;
+       pos = (mw->GetModeChar()-65) | mask;
 
-               for (char* i = parameters[1]; *i; i++)
-               {
-                       if ((i != parameters[1]) && (*i != '+') && (*i != '-'))
-                               next_ok = true;
+       modewatchers[pos].push_back(mw);
 
-                       switch (*i)
-                       {
-                               case ' ':
-                                continue;
+       return true;
+}
 
-                               case '+':
-                                       if ((direction != 1) && (next_ok))
-                                       {
-                                               next_ok = false;
-                                               charlcat(outpars,'+',MAXBUF);
-                                       }
-                                       direction = 1;
-                               break;
+bool ModeParser::DelModeWatcher(ModeWatcher* mw)
+{
+       unsigned char mask = 0;
+       unsigned char pos = 0;
 
-                               case '-':
-                                       if ((direction != 0) && (next_ok))
-                                       {
-                                               next_ok = false;
-                                               charlcat(outpars,'-',MAXBUF);
-                                       }
-                                       direction = 0;
-                               break;
+       if (!mw)
+               return false;
 
-                               default:
-                                       log(DEBUG,"begin mode processing entry");
-                                       can_change = 1;
-                                       if (can_change)
-                                       {
-                                               if (direction == 1)
-                                               {
-                                                       log(DEBUG,"umode %c being added",*i);
-                                                       if ((!strchr(dmodes,*i)) && (ServerInstance->ModeGrok->AllowedUmode(*i,user->modes,true,true)))
-                                                       {
-                                                               log(DEBUG,"umode %c is an allowed umode",*i);
-                                                               if ((*i == 'i') || (*i == 's') || (*i == 'w') || (*i == 'o') || (ServerInstance->ModeGrok->ProcessModuleUmode(*i, user, dest, direction)))
-                                                               {
-                                                                       charlcat(dmodes,*i,MAXBUF);
-                                                                       charlcat(outpars,*i,53);
-                                                               }
-                                                       }
-                                               }
-                                               else
-                                               {
-                                                       // can only remove a mode they already have
-                                                       log(DEBUG,"umode %c being removed",*i);
-                                                       if ((ServerInstance->ModeGrok->AllowedUmode(*i,user->modes,false,true)) && (strchr(dmodes,*i)))
-                                                       {
-                                                               log(DEBUG,"umode %c is an allowed umode",*i);
-                                                               if ((*i == 'i') || (*i == 's') || (*i == 'w') || (*i == 'o') || (ServerInstance->ModeGrok->ProcessModuleUmode(*i, user, dest, direction)))
-                                                               {
-                                                                       charlcat(outpars,*i,MAXBUF);
-                                                                       charremove(dmodes,*i);
-                                                               }
-                                                       }
-                                               }
-                                       }
-                               break;
-                       }
-               }
-                if (*outpars)
-                {
-                        char b[MAXBUF];
-                        char* z = b;
-
-                        for (char* i = outpars; *i;)
-                        {
-                                *z++ = *i++;
-                                if (((*i == '-') || (*i == '+')) && ((*(i+1) == '-') || (*(i+1) == '+')))
-                                {
-                                        // someones playing silly buggers and trying
-                                        // to put a +- or -+ into the line...
-                                        i++;
-                                }
-                                if (!*(i+1))
-                                {
-                                        // Someone's trying to make the last character in
-                                        // the line be a + or - symbol.
-                                        if ((*i == '-') || (*i == '+'))
-                                        {
-                                                i++;
-                                        }
-                                }
-                        }
-                        *z = 0;
-
-                        if ((*b) && (!IS_SINGLE(b,'+')) && (!IS_SINGLE(b,'-')))
-                        {
-                                WriteTo(user, dest, "MODE %s :%s", dest->nick, b);
-                                FOREACH_MOD(I_OnMode,OnMode(user, dest, TYPE_USER, b));
-                        }
-
-                        log(DEBUG,"Stripped mode line");
-                        log(DEBUG,"Line dest is now %s",dmodes);
-                        strlcpy(dest->modes,dmodes,MAXMODES-1);
-                                         
-                }
+       if ((mw->GetModeChar() < 'A') || (mw->GetModeChar() > 'z'))
+               return false;
 
-               return;
+       mw->GetModeType() == MODETYPE_USER ? mask = MASK_USER : mask = MASK_CHANNEL;
+       pos = (mw->GetModeChar()-65) | mask;
+
+       ModeWatchIter a = std::find(modewatchers[pos].begin(),modewatchers[pos].end(),mw);
+
+       if (a == modewatchers[pos].end())
+       {
+               return false;
        }
-       
-       Ptr = FindChan(parameters[0]);
-       if (Ptr)
+
+       modewatchers[pos].erase(a);
+
+       return true;
+}
+
+/** This default implementation can remove simple user modes
+ */
+void ModeHandler::RemoveMode(User* user, irc::modestacker* stack)
+{
+       if (user->IsModeSet(this->GetModeChar()))
        {
-               ServerInstance->ModeGrok->ProcessModes(parameters,user,Ptr,STATUS_OP,pcnt,true,false,false);
+               if (stack)
+               {
+                       stack->Push(this->GetModeChar());
+               }
+               else
+               {
+                       std::vector<std::string> parameters;
+                       parameters.push_back(user->nick);
+                       parameters.push_back("-");
+                       parameters[1].push_back(this->GetModeChar());
+                       ServerInstance->Modes->Process(parameters, ServerInstance->FakeClient);
+               }
        }
-       else
+}
+
+/** This default implementation can remove simple channel modes
+ * (no parameters)
+ */
+void ModeHandler::RemoveMode(Channel* channel, irc::modestacker* stack)
+{
+       if (channel->IsModeSet(this->GetModeChar()))
        {
-               WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, parameters[0]);
+               if (stack)
+               {
+                       stack->Push(this->GetModeChar());
+               }
+               else
+               {
+                       std::vector<std::string> parameters;
+                       parameters.push_back(channel->name);
+                       parameters.push_back("-");
+                       parameters[1].push_back(this->GetModeChar());
+                       ServerInstance->SendMode(parameters, ServerInstance->FakeClient);
+               }
        }
 }
+
+struct builtin_modes
+{
+       ModeChannelSecret s;
+       ModeChannelPrivate p;
+       ModeChannelModerated m;
+       ModeChannelTopicOps t;
+
+       ModeChannelNoExternal n;
+       ModeChannelInviteOnly i;
+       ModeChannelKey k;
+       ModeChannelLimit l;
+
+       ModeChannelBan b;
+       ModeChannelOp o;
+       ModeChannelVoice v;
+
+       ModeUserWallops uw;
+       ModeUserInvisible ui;
+       ModeUserOperator uo;
+       ModeUserServerNoticeMask us;
+
+       void init(ModeParser* modes)
+       {
+               modes->AddMode(&s);
+               modes->AddMode(&p);
+               modes->AddMode(&m);
+               modes->AddMode(&t);
+               modes->AddMode(&n);
+               modes->AddMode(&i);
+               modes->AddMode(&k);
+               modes->AddMode(&l);
+               modes->AddMode(&b);
+               modes->AddMode(&o);
+               modes->AddMode(&v);
+               modes->AddMode(&uw);
+               modes->AddMode(&ui);
+               modes->AddMode(&uo);
+               modes->AddMode(&us);
+       }
+};
+
+static builtin_modes static_modes;
+
+ModeParser::ModeParser()
+{
+       /* Clear mode handler list */
+       memset(modehandlers, 0, sizeof(modehandlers));
+
+       /* Last parse string */
+       LastParse.clear();
+
+       seq = 0;
+       memset(&sent, 0, sizeof(sent));
+
+       static_modes.init(this);
+}
+
+ModeParser::~ModeParser()
+{
+}