]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/mode.cpp
Partial fix for bug #441
[user/henk/code/inspircd.git] / src / mode.cpp
index 5d93eb161afa8c22ffb5f6e8374538124f5808a7..3406393cf1bfcfb914b2ea8b6bc71a28d86d852f 100644 (file)
  *       | Inspire 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.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
+/* $Core: libIRCDmode */
+/* $ExtraDeps: $(RELCPPFILES) */
+/* $ExtraObjects: modes/modeclasses.a */
+/* $ExtraBuild: ${MAKE} -C "modes" DIRNAME="src/modes" CC="$(CC)" $(MAKEARGS) CPPFILES="$(CPPFILES)" */
 
-#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;
+/* +s (secret) */
+#include "modes/cmode_s.h"
+/* +p (private) */
+#include "modes/cmode_p.h"
+/* +b (bans) */
+#include "modes/cmode_b.h"
+/* +m (moderated) */
+#include "modes/cmode_m.h"
+/* +t (only (half) ops can change topic) */
+#include "modes/cmode_t.h"
+/* +n (no external messages) */
+#include "modes/cmode_n.h"
+/* +i (invite only) */
+#include "modes/cmode_i.h"
+/* +k (keyed channel) */
+#include "modes/cmode_k.h"
+/* +l (channel user limit) */
+#include "modes/cmode_l.h"
+/* +o (channel op) */
+#include "modes/cmode_o.h"
+/* +h (channel halfop) */
+#include "modes/cmode_h.h"
+/* +v (channel voice) */
+#include "modes/cmode_v.h"
+/* +s (server notices) */
+#include "modes/umode_s.h"
+/* +w (see wallops) */
+#include "modes/umode_w.h"
+/* +i (invisible) */
+#include "modes/umode_i.h"
+/* +o (operator) */
+#include "modes/umode_o.h"
+/* +n (notice mask - our implementation of snomasks) */
+#include "modes/umode_n.h"
+
+ModeHandler::ModeHandler(InspIRCd* Instance, char modeletter, int parameters_on, int parameters_off, bool listmode, ModeType type, bool operonly, char mprefix)
+       : ServerInstance(Instance), mode(modeletter), n_params_on(parameters_on), n_params_off(parameters_off), list(listmode), m_type(type), oper(operonly), prefix(mprefix), count(0)
+{
+}
 
-extern time_t TIME;
+ModeHandler::~ModeHandler()
+{
+}
 
-userrec* ModeParser::SanityChecks(userrec *user,char *dest,chanrec *chan,int status)
+bool ModeHandler::IsListMode()
 {
-       userrec *d;
-       if ((!user) || (!dest) || (!chan) || (!*dest))
-       {
-               return NULL;
-       }
-       d = Find(dest);
-       if (!d)
-       {
-               WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, dest);
-               return NULL;
-       }
-       return d;
+       return list;
 }
 
-char* ModeParser::Grant(userrec *d,chanrec *chan,int MASK)
+unsigned int ModeHandler::GetPrefixRank()
 {
-       if (!chan)
-               return NULL;
+       return 0;
+}
 
-       for (std::vector<ucrec*>::const_iterator i = d->chans.begin(); i != d->chans.end(); i++)
-       {
-               if (((ucrec*)(*i))->channel == chan)
-               {
-                       if (((ucrec*)(*i))->uc_modes & MASK)
-                       {
-                               return NULL;
-                       }
-                       ((ucrec*)(*i))->uc_modes = ((ucrec*)(*i))->uc_modes | MASK;
-                       switch (MASK)
-                       {
-                               case UCMODE_OP:
-                                       ((ucrec*)(*i))->channel->AddOppedUser(d);
-                               break;
-                               case UCMODE_HOP:
-                                       ((ucrec*)(*i))->channel->AddHalfoppedUser(d);
-                               break;
-                               case UCMODE_VOICE:
-                                       ((ucrec*)(*i))->channel->AddVoicedUser(d);
-                               break;
-                       }
-                       log(DEBUG,"grant: %s %s",((ucrec*)(*i))->channel->name,d->nick);
-                       return d->nick;
-               }
-       }
-       return NULL;
+unsigned int ModeHandler::GetCount()
+{
+       return 0;
 }
 
-char* ModeParser::Revoke(userrec *d,chanrec *chan,int MASK)
+void ModeHandler::ChangeCount(int modifier)
 {
-       if (!chan)
-               return NULL;
+       count += modifier;
+       ServerInstance->Log(DEBUG,"Change count for mode %c is now %d", mode, count);
+}
 
-       for (std::vector<ucrec*>::const_iterator i = d->chans.begin(); i != d->chans.end(); i++)
-       {
-               if (((ucrec*)(*i))->channel == chan)
-               {
-                       if ((((ucrec*)(*i))->uc_modes & MASK) == 0)
-                       {
-                               return NULL;
-                       }
-                       ((ucrec*)(*i))->uc_modes ^= MASK;
-                       switch (MASK)
-                       {
-                               case UCMODE_OP:
-                                       ((ucrec*)(*i))->channel->DelOppedUser(d);
-                               break;
-                               case UCMODE_HOP:
-                                       ((ucrec*)(*i))->channel->DelHalfoppedUser(d);
-                               break;
-                               case UCMODE_VOICE:
-                                       ((ucrec*)(*i))->channel->DelVoicedUser(d);
-                               break;
-                       }
-                       log(DEBUG,"revoke: %s %s",((ucrec*)(*i))->channel->name,d->nick);
-                       return d->nick;
-               }
-       }
-       return NULL;
+ModeType ModeHandler::GetModeType()
+{
+       return m_type;
 }
 
-char* ModeParser::GiveOps(userrec *user,char *dest,chanrec *chan,int status)
+bool ModeHandler::NeedsOper()
 {
-       userrec *d = this->SanityChecks(user,dest,chan,status);
-       
-       if (d)
-       {
-               if (IS_LOCAL(user))
-               {
-                       int MOD_RESULT = 0;
-                       FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_OP));
-                       
-                       if (MOD_RESULT == ACR_DENY)
-                               return NULL;
-                       if (MOD_RESULT == ACR_DEFAULT)
-                       {
-                               if ((status < STATUS_OP) && (!is_uline(user->server)))
-                               {
-                                       WriteServ(user->fd,"482 %s %s :You're not a channel operator",user->nick, chan->name);
-                                       return NULL;
-                               }
-                       }
-               }
+       return oper;
+}
 
-               return this->Grant(d,chan,UCMODE_OP);
-       }
-       return NULL;
+char ModeHandler::GetPrefix()
+{
+       return prefix;
 }
 
-char* ModeParser::GiveHops(userrec *user,char *dest,chanrec *chan,int status)
+int ModeHandler::GetNumParams(bool adding)
 {
-       userrec *d = this->SanityChecks(user,dest,chan,status);
-       
-       if (d)
-       {
-               if (IS_LOCAL(user))
-               {
-                       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;
-                               }
-                       }
-               }
+       return adding ? n_params_on : n_params_off;
+}
 
-               return this->Grant(d,chan,UCMODE_HOP);
-       }
-       return NULL;
+char ModeHandler::GetModeChar()
+{
+       return mode;
 }
 
-char* ModeParser::GiveVoice(userrec *user,char *dest,chanrec *chan,int status)
+ModeAction ModeHandler::OnModeChange(User*, User*, Channel*, std::string&, bool)
 {
-       userrec *d = this->SanityChecks(user,dest,chan,status);
-       
-       if (d)
-       {
-               if (IS_LOCAL(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;
-                               }
-                       }
-               }
+       return MODEACTION_DENY;
+}
 
-               return this->Grant(d,chan,UCMODE_VOICE);
+ModePair ModeHandler::ModeSet(User*, User* dest, Channel* channel, const std::string&)
+{
+       if (dest)
+       {
+               return std::make_pair(dest->IsModeSet(this->mode), "");
+       }
+       else
+       {
+               return std::make_pair(channel->IsModeSet(this->mode), "");
        }
-       return NULL;
 }
 
-char* ModeParser::TakeOps(userrec *user,char *dest,chanrec *chan,int status)
+void ModeHandler::DisplayList(User*, Channel*)
 {
-       userrec *d = this->SanityChecks(user,dest,chan,status);
-       
-       if (d)
-       {
-               if (IS_LOCAL(user))
-               {
-                       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;
-                               }
-                       }
-               }
+}
 
-               return this->Revoke(d,chan,UCMODE_OP);
-       }
-       return NULL;
+void ModeHandler::DisplayEmptyList(User*, Channel*)
+{
 }
 
-char* ModeParser::TakeHops(userrec *user,char *dest,chanrec *chan,int status)
+bool ModeHandler::CheckTimeStamp(time_t theirs, time_t ours, const std::string&, const std::string&, Channel*)
 {
-       userrec *d = this->SanityChecks(user,dest,chan,status);
-       
-       if (d)
-       {
-               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 (ours < theirs);
+}
 
-               return this->Revoke(d,chan,UCMODE_HOP);
-       }
-       return NULL;
+ModeWatcher::ModeWatcher(InspIRCd* Instance, char modeletter, ModeType type) : ServerInstance(Instance), mode(modeletter), m_type(type)
+{
 }
 
-char* ModeParser::TakeVoice(userrec *user,char *dest,chanrec *chan,int status)
+ModeWatcher::~ModeWatcher()
 {
-       userrec *d = this->SanityChecks(user,dest,chan,status);
+}
 
-       if (d)  
-       {
-               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;
-                               }
-                       }
-               }
+char ModeWatcher::GetModeChar()
+{
+       return mode;
+}
 
-               return this->Revoke(d,chan,UCMODE_VOICE);
-       }
-       return NULL;
+ModeType ModeWatcher::GetModeType()
+{
+       return m_type;
+}
+
+bool ModeWatcher::BeforeMode(User*, User*, Channel*, std::string&, bool, ModeType)
+{
+       return true;
 }
 
-char* ModeParser::AddBan(userrec *user,char *dest,chanrec *chan,int status)
+void ModeWatcher::AfterMode(User*, User*, Channel*, const std::string&, bool, ModeType)
 {
-       BanItem b;
-       int toomanyexclamation = 0;
-       int toomanyat = 0;
+}
 
+User* ModeParser::SanityChecks(User *user, const char *dest, Channel *chan, int)
+{
+       User *d;
        if ((!user) || (!dest) || (!chan) || (!*dest))
        {
-               log(DEFAULT,"*** BUG *** AddBan was given an invalid parameter");
                return NULL;
        }
-
-       for (char* i = dest; *i; i++)
-       {
-               if ((*i < 32) || (*i > 126))
-               {
-                       return NULL;
-               }
-               else if (*i == '!')
-               {
-                       toomanyexclamation++;
-               }
-               else if (*i == '@')
-               {
-                       toomanyat++;
-               }
-       }
-
-       if (toomanyexclamation != 1 || toomanyat != 1)
-               /*
-                * this stops sillyness like n!u!u!u@h, though note that most
-                * ircds don't actually verify banmask validity. --w00t
-                */
-               return NULL;
-
-       long maxbans = GetMaxBans(chan->name);
-       if ((unsigned)chan->bans.size() > (unsigned)maxbans)
+       d = ServerInstance->FindNick(dest);
+       if (!d)
        {
-               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);
+               user->WriteServ("401 %s %s :No such nick/channel",user->nick, dest);
                return NULL;
        }
+       return d;
+}
 
-       log(DEBUG,"AddBan: %s %s",chan->name,user->nick);
-
-       int MOD_RESULT = 0;
-       FOREACH_RESULT(I_OnAddBan,OnAddBan(user,chan,dest));
-       if (MOD_RESULT)
-               return NULL;
+const char* ModeParser::Grant(User *d,Channel *chan,int MASK)
+{
+       if (!chan)
+               return "";
 
-       TidyBan(dest);
-       for (BanList::iterator i = chan->bans.begin(); i != chan->bans.end(); i++)
+       UCListIter n = d->chans.find(chan);
+       if (n != d->chans.end())
        {
-               if (!strcasecmp(i->data,dest))
+               if (n->second & MASK)
                {
-                       // dont allow a user to set the same ban twice
-                       return NULL;
+                       return "";
                }
+               n->second = n->second | MASK;
+               switch (MASK)
+               {
+                       case UCMODE_OP:
+                               n->first->AddOppedUser(d);
+                       break;
+                       case UCMODE_HOP:
+                               n->first->AddHalfoppedUser(d);
+                       break;
+                       case UCMODE_VOICE:
+                               n->first->AddVoicedUser(d);
+                       break;
+               }
+               return d->nick;
        }
-
-       b.set_time = TIME;
-       strlcpy(b.data,dest,MAXBUF);
-       if (*user->nick)
-       {
-               strlcpy(b.set_by,user->nick,NICKMAX-1);
-       }
-       else
-       {
-               strlcpy(b.set_by,Config->ServerName,NICKMAX-1);
-       }
-       chan->bans.push_back(b);
-       return dest;
+       return "";
 }
 
-char* ModeParser::TakeBan(userrec *user,char *dest,chanrec *chan,int status)
+const char* ModeParser::Revoke(User *d,Channel *chan,int MASK)
 {
-       if ((!user) || (!dest) || (!chan) || (!*dest)) {
-               log(DEFAULT,"*** BUG *** TakeBan was given an invalid parameter");
-               return 0;
-       }
+       if (!chan)
+               return "";
 
-       log(DEBUG,"del_ban: %s %s",chan->name,user->nick);
-       for (BanList::iterator i = chan->bans.begin(); i != chan->bans.end(); i++)
+       UCListIter n = d->chans.find(chan);
+       if (n != d->chans.end())
        {
-               if (!strcasecmp(i->data,dest))
+               if ((n->second & MASK) == 0)
+               {
+                       return "";
+               }
+               n->second ^= MASK;
+               switch (MASK)
                {
-                       int MOD_RESULT = 0;
-                       FOREACH_RESULT(I_OnDelBan,OnDelBan(user,chan,dest));
-                       if (MOD_RESULT)
-                               return NULL;
-                       chan->bans.erase(i);
-                       return dest;
+                       case UCMODE_OP:
+                               n->first->DelOppedUser(d);
+                       break;
+                       case UCMODE_HOP:
+                               n->first->DelHalfoppedUser(d);
+                       break;
+                       case UCMODE_VOICE:
+                               n->first->DelVoicedUser(d);
+                       break;
                }
+               return d->nick;
        }
-       return NULL;
+       return "";
 }
 
-
-/** 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)
+void ModeParser::DisplayCurrentModes(User *user, User* targetuser, Channel* targetchannel, const char* text)
 {
-       /*
-        * 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 (targetchannel)
        {
-               if((*i == '+') || (*i == '-'))
-                       continue;
-
-               if(!channelmodes || (channelmodes && (strchr("itnmsp", *i) || (ModeDefined(*i, MT_CHANNEL) && !ModeDefinedOn(*i,MT_CHANNEL) && !ModeDefinedOff(*i,MT_CHANNEL)))))
-               {
-                       log(DEBUG,"Tidy mode %c", *i);
-                       counts[*i]++;
-                       active[*i] = true;
-               }
+               /* Display channel's current mode string */
+               user->WriteServ("324 %s %s +%s",user->nick, targetchannel->name, targetchannel->ChanModes(targetchannel->HasUser(user)));
+               user->WriteServ("329 %s %s %lu", user->nick, targetchannel->name, (unsigned long)targetchannel->age);
+               return;
        }
-       
-       for(unsigned char j = 65; j < 127; j++)
+       else if (targetuser)
        {
-               if ((counts[j] > 1) && (active[j] == true))
+               if (targetuser->Visibility && !targetuser->Visibility->VisibleTo(user))
                {
-                       std::string::size_type pos;
+                       user->WriteServ("401 %s %s :No such nick/channel",user->nick, text);
+                       return;
+               }
 
-                       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 ((targetuser == user) || (IS_OPER(user)))
+               {
+                       /* Display user's current mode string */
+                       user->WriteServ("221 %s :+%s",targetuser->nick,targetuser->FormatModes());
+                       if (IS_OPER(targetuser))
+                               user->WriteServ("008 %s +%s :Server notice mask", targetuser->nick, targetuser->FormatNoticeMasks());
+                       return;
+               }
+               else
+               {
+                       user->WriteServ("502 %s :Can't change mode for other users", user->nick);
+                       return;
                }
        }
-       
-       return modes;
+
+       /* No such nick/channel */
+       user->WriteServ("401 %s %s :No such nick/channel",user->nick, text);
+       return;
 }
 
-void ModeParser::ProcessModes(char **parameters,userrec* user,chanrec *chan,int status, int pcnt, bool servermode, bool silent, bool local)
+void ModeParser::Process(const char** parameters, int pcnt, User *user, bool servermode)
 {
-       if ((!parameters) || (pcnt < 2)) {
-               return;
-       }
+       std::string target = parameters[0];
+       ModeType type = MODETYPE_USER;
+       unsigned char mask = 0;
+       Channel* targetchannel = ServerInstance->FindChan(parameters[0]);
+       User* targetuser  = ServerInstance->FindNick(parameters[0]);
 
-       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))
+       LastParse.clear();
+
+       /* Special case for displaying the list for listmodes,
+        * e.g. MODE #chan b, or MODE #chan +b without a parameter
+        */
+       if ((targetchannel) && (pcnt == 2))
        {
-               FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,NULL,chan,AC_GENERAL_MODE));  
-               if (MOD_RESULT == ACR_DENY)
-                       return;
-       }
+               const char* mode = parameters[1];
+               int nonlistmodes_found = 0;
+               bool sent[256];
+
+               mask = MASK_CHANNEL;
+
+               memset(&sent, 0, 256);
+               
+               while (mode && *mode)
+               {
+                       unsigned char mletter = *mode;
+
+                       if (*mode == '+')
+                       {
+                               mode++;
+                               continue;
+                       }
 
-       std::string tidied = this->CompressModes(parameters[1],true);
-       strlcpy(mlist,tidied.c_str(),MAXBUF);
-       char* modelist = mlist;
+                       /* Ensure the user doesnt request the same mode twice,
+                        * so they cant flood themselves off out of idiocy.
+                        */
+                       if (!sent[mletter])
+                       {
+                               sent[mletter] = true;
+                       }
+                       else
+                       {
+                               mode++;
+                               continue;
+                       }
 
-       *outlist = *modelist;
-       char* outl = outlist+1;
+                       ModeHandler *mh = this->FindMode(*mode, MODETYPE_CHANNEL);
+                       bool display = true;
 
-       mdir = (*modelist == '+');
+                       if ((mh) && (mh->IsListMode()))
+                       {
+                               if (ServerInstance->Config->HideModeLists[mletter] && (targetchannel->GetStatus(user) < STATUS_HOP))
+                               {
+                                       user->WriteServ("482 %s %s :Only half-operators and above may view the +%c list",user->nick, targetchannel->name, *mode++);
+                                       mh->DisplayEmptyList(user, targetchannel);
+                                       continue;
+                               }
 
-       log(DEBUG,"process_modes: modelist: %s",modelist);
+                               /** See below for a description of what craq this is :D
+                                */
+                               unsigned char handler_id = (*mode - 65) | mask;
 
-       int len = tidied.length();
-       while (modelist[len-1] == ' ')
-               modelist[--len] = '\0';
+                               for(ModeWatchIter watchers = modewatchers[handler_id].begin(); watchers != modewatchers[handler_id].end(); watchers++)
+                               {
+                                       std::string dummyparam;
+                                       
+                                       if (!((*watchers)->BeforeMode(user, NULL, targetchannel, dummyparam, true, MODETYPE_CHANNEL)))
+                                               display = false;
+                               }
 
-       for (char* modechar = (modelist + 1); *modechar; ptr++, modechar++)
-       {
-               r = NULL;
+                               if (display)
+                                       mh->DisplayList(user, targetchannel);
+                       }
+                       else
+                               nonlistmodes_found++;
 
-               /* If we have more than MAXMODES changes in one line,
-                * drop all after the MAXMODES
-                */
-               if (pc > MAXMODES-1)
-                       break;
+                       mode++;
+               }
 
+               /* We didnt have any modes that were non-list, we can return here */
+               if (!nonlistmodes_found)
+                       return;
+       }
 
-               
-               switch (*modechar)
+       if (pcnt == 1)
+       {
+               this->DisplayCurrentModes(user, targetuser, targetchannel, parameters[0]);
+       }
+       else if (pcnt > 1)
+       {
+               if (targetchannel)
                {
-                       case '-':
-                               *outl++ = '-';
-                               mdir = 0;
-                       break;                  
-
-                       case '+':
-                               *outl++ = '+';
-                               mdir = 1;
-                       break;
+                       type = MODETYPE_CHANNEL;
+                       mask = MASK_CHANNEL;
 
-                       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)
+                       /* Extra security checks on channel modes
+                        * (e.g. are they a (half)op?
+                        */
+
+                       if ((IS_LOCAL(user)) && (targetchannel->GetStatus(user) < STATUS_HOP))
+                       {
+                               /* We don't have halfop */
+                               int MOD_RESULT = 0;
+                               FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user, NULL, targetchannel, AC_GENERAL_MODE));
+                               if (MOD_RESULT == ACR_DENY)
+                                       return;
+
+                               if (MOD_RESULT == ACR_DEFAULT)
                                {
-                                       *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)
+                                       /* Are we a uline or is it a servermode? */
+                                       if ((!ServerInstance->ULine(user->server)) && (!servermode))
                                        {
-                                               *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);
+                                               /* Not enough permission:
+                                                * NOT a uline and NOT a servermode,
+                                                * OR, NOT halfop or above.
+                                                */
+                                               user->WriteServ("482 %s %s :You're not a channel %soperator",user->nick, targetchannel->name,
+                                                               ServerInstance->Config->AllowHalfop ? "(half)" : "");
+                                               return;
                                        }
-                                       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;
+                       }
+               }
+               else if (targetuser)
+               {
+                       type = MODETYPE_USER;
+                       mask = MASK_USER;
+                       if ((user != targetuser) && (!ServerInstance->ULine(user->server)))
+                       {
+                               user->WriteServ("502 %s :Can't change mode for other users", user->nick);
+                               return;
+                       }
+               }
+               else
+               {
+                       /* No such nick/channel */
+                       user->WriteServ("401 %s %s :No such nick/channel",user->nick, parameters[0]);
+                       return;
+               }
 
+               std::string mode_sequence = parameters[1];
+               std::string parameter;
+               std::ostringstream parameter_list;
+               std::string output_sequence;
+               bool adding = true, state_change = false;
+               unsigned char handler_id = 0;
+               int parameter_counter = 2; /* Index of first parameter */
+               int parameter_count = 0;
+               bool last_successful_state_change = false;
+
+               /* A mode sequence that doesnt start with + or -. Assume +. - Thanks for the suggestion spike (bug#132) */
+               if ((*mode_sequence.begin() != '+') && (*mode_sequence.begin() != '-'))
+                       mode_sequence.insert(0, "+");
+
+               for (std::string::const_iterator letter = mode_sequence.begin(); letter != mode_sequence.end(); letter++)
+               {
+                       unsigned char modechar = *letter;
 
-                       case 'k':
-                               if ((param >= pcnt))
-                                       break;
+                       switch (modechar)
+                       {
+                               /* NB:
+                                * For + and - mode characters, we don't just stick the character into the output sequence.
+                                * This is because the user may do something dumb, like: +-+ooo or +oo-+. To prevent this
+                                * appearing in the output sequence, we store a flag which says there was a state change,
+                                * which is set on any + or -, however, the + or - that we finish on is only appended to
+                                * the output stream in the event it is followed by a non "+ or -" character, such as o or v.
+                                */
+                               case '+':
+                                       /* The following expression prevents: +o+o nick nick, compressing it to +oo nick nick,
+                                        * however, will allow the + if it is the first item in the sequence, regardless.
+                                        */
+                                       if ((!adding) || (!output_sequence.length()))
+                                               state_change = true;
+                                       adding = true;
+                                       if (!output_sequence.length())
+                                               last_successful_state_change = false;
+                                       continue;
+                               break;
+                               case '-':
+                                       if ((adding) || (!output_sequence.length()))
+                                               state_change = true;
+                                       adding = false;
+                                       if (!output_sequence.length())
+                                               last_successful_state_change = true;
+                                       continue;
+                               break;
+                               default:
 
-                               if (mdir == 1)
-                               {
-                                       if (k_set)
-                                               break;
-
-                                       if (previously_unset_k)
-                                               break;
-                                       previously_set_k = true;
-                                               
-                                       if (!chan->modes[CM_KEY])
+                                       /**
+                                        * Watch carefully for the sleight of hand trick.
+                                        * 65 is the ascii value of 'A'. We take this from
+                                        * the char we're looking at to get a number between
+                                        * 1 and 127. We then logic-or it to get the hashed
+                                        * position, dependent on wether its a channel or
+                                        * a user mode. This is a little stranger, but a lot
+                                        * faster, than using a map of pairs.
+                                        */
+                                       handler_id = (modechar - 65) | mask;
+
+                                       if (modehandlers[handler_id])
                                        {
-                                               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);
-                                                       chan->modes[CM_KEY] = 1;
-                                                       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;
-                                                       chan->modes[CM_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->modes[CM_LIMIT])
-                                               {
-                                                       *outl++ = 'l';
-                                                       chan->limit = 0;
-                                                       chan->modes[CM_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;
-                                       }
+                                               bool abort = 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';
-                                               chan->modes[CM_LIMIT] = 1;
-                                               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->modes[CM_INVITEONLY])) *outl++ = 'i';
-                                               chan->modes[CM_INVITEONLY] = 1;
-                                       }
-                                       else
-                                       {
-                                               if (chan->modes[CM_INVITEONLY]) *outl++ = 'i';
-                                               chan->modes[CM_INVITEONLY] = 0;
-                                       }
-                               }
-                       break;
-                               
-                       case 't':
-                                MOD_RESULT = 0;
-                                FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 't', "", mdir, 0));
-                                if (!MOD_RESULT)
-                                {
-                                       if (mdir)
-                                        {
-                                               if (!(chan->modes[CM_TOPICLOCK])) *outl++ = 't';
-                                                chan->modes[CM_TOPICLOCK] = 1;
-                                        }
-                                        else
-                                        {
-                                               if (chan->modes[CM_TOPICLOCK]) *outl++ = 't';
-                                                chan->modes[CM_TOPICLOCK] = 0;
-                                        }
-                               }
-                       break;
-                               
-                       case 'n':
-                                MOD_RESULT = 0;
-                                FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'n', "", mdir, 0));
-                                if (!MOD_RESULT)
-                                {
-                                        if (mdir)
-                                        {
-                                               if (!(chan->modes[CM_NOEXTERNAL])) *outl++ = 'n';
-                                                chan->modes[CM_NOEXTERNAL] = 1;
-                                        }
-                                        else
-                                        {
-                                               if (chan->modes[CM_NOEXTERNAL]) *outl++ = 'n';
-                                                chan->modes[CM_NOEXTERNAL] = 0;
-                                        }
-                               }
-                       break;
-                               
-                       case 'm':
-                                MOD_RESULT = 0;
-                                FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'm', "", mdir, 0));
-                                if (!MOD_RESULT)
-                                {
-                                        if (mdir)
-                                        {
-                                                if (!(chan->modes[CM_MODERATED])) *outl++ = 'm';
-                                                chan->modes[CM_MODERATED] = 1;
-                                        }
-                                        else
-                                        {
-                                                if (chan->modes[CM_MODERATED]) *outl++ = 'm';
-                                                chan->modes[CM_MODERATED] = 0;
-                                        }
-                               }
-                       break;
-                               
-                       case 's':
-                                MOD_RESULT = 0;
-                                FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 's', "", mdir, 0));
-                                if (!MOD_RESULT)
-                                {
-                                        if (mdir)
-                                        {
-                                                if (!(chan->modes[CM_SECRET])) *outl++ = 's';
-                                                chan->modes[CM_SECRET] = 1;
-                                                if (chan->modes[CM_PRIVATE])
-                                                {
-                                                        chan->modes[CM_PRIVATE] = 0;
-                                                        if (mdir)
-                                                        {
-                                                               *outl++ = '-'; *outl++ = 'p'; *outl++ = '+';
-                                                        }
-                                                }
-                                        }
-                                        else
-                                        {
-                                                if (chan->modes[CM_SECRET]) *outl++ = 's';
-                                                chan->modes[CM_SECRET] = 0;
-                                        }
-                               }
-                       break;
-                               
-                       case 'p':
-                               MOD_RESULT = 0;
-                               FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, 'p', "", mdir, 0));
-                               if(!MOD_RESULT)
-                               {
-                                       if(mdir)
-                                       {
-                                               if(!(chan->modes[CM_PRIVATE]))
-                                                       *outl++ = 'p';
-                                               
-                                               chan->modes[CM_PRIVATE] = 1;
-                                               
-                                               if(chan->modes[CM_SECRET])
-                                               {
-                                                       chan->modes[CM_SECRET] = 0;
-
-                                                       *outl++ = '-';
-                                                       *outl++ = 's';
-                                                       *outl++ = '+';
-                                               }
-                                       }
-                                       else
-                                       {
-                                               if(chan->modes[CM_PRIVATE])
-                                                       *outl++ = 'p';
-                                               
-                                               chan->modes[CM_PRIVATE] = 0;
-                                       }
-                               }
-                               break;
-                               
-                       default:
-                               string_list p;
-                               p.clear();
-                               bool x = chan->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 (modehandlers[handler_id]->GetModeType() == type)
                                                {
-                                                       if (!handled)
+                                                       if (modehandlers[handler_id]->GetNumParams(adding))
                                                        {
-                                                               int t = modules[i]->OnExtendedMode(user,chan,*modechar,MT_CHANNEL,mdir,p);
-                                                               if (t != 0)
+                                                               /* This mode expects a parameter, do we have any parameters left in our list to use? */
+                                                               if (parameter_counter < pcnt)
+                                                               {
+                                                                       parameter = parameters[parameter_counter++];
+
+                                                                       /* Yerk, invalid! */
+                                                                       if ((parameter.find(':') == 0) || (parameter.rfind(' ') != std::string::npos))
+                                                                               parameter.clear();
+                                                               }
+                                                               else
                                                                {
-                                                                       log(DEBUG,"OnExtendedMode returned nonzero for a module");
-                                                                       if (ModeIsListMode(*modechar,MT_CHANNEL))
+                                                                       /* No parameter, continue to the next mode */
+                                                                       continue;
+                                                               }
+
+                                                               bool had_parameter = !parameter.empty();
+                                                               
+                                                               for (ModeWatchIter watchers = modewatchers[handler_id].begin(); watchers != modewatchers[handler_id].end(); watchers++)
+                                                               {
+                                                                       if ((*watchers)->BeforeMode(user, targetuser, targetchannel, parameter, adding, type) == false)
                                                                        {
-                                                                               if (t == -1)
-                                                                               {
-                                                                                       //pc++;
-                                                                                       param++;
-                                                                               }
-                                                                               else
-                                                                               {
-                                                                                       if (param < pcnt)
-                                                                                       {
-                                                                                               *outl++ = *modechar;
-                                                                                       }
-                                                                                       outpars[pc++] = parameters[param++];
-                                                                               }
+                                                                               abort = true;
+                                                                               break;
                                                                        }
-                                                                       else
+                                                                       /* A module whacked the parameter completely, and there was one. abort. */
+                                                                       if ((had_parameter) && (parameter.empty()))
                                                                        {
-                                                                               *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++];
-                                                                                       }
-                                                                               }
+                                                                               abort = true;
+                                                                               break;
                                                                        }
-                                                                       // break, because only one module can handle the mode.
-                                                                       handled = true;
                                                                }
+
+                                                               if (abort)
+                                                                       continue;
                                                        }
-                                               }
-                                       }
-                               }
-                               else
-                               {
-                                       WriteServ(user->fd,"472 %s %c :is unknown mode char to me",user->nick,*modechar);
-                               }
-                       break;
-               }
-       }
+                                                       else
+                                                       {
+                                                               /* Fix by brain: mode watchers not being called for parameterless modes */
+                                                               for (ModeWatchIter watchers = modewatchers[handler_id].begin(); watchers != modewatchers[handler_id].end(); watchers++)
+                                                               {
+                                                                       if ((*watchers)->BeforeMode(user, targetuser, targetchannel, parameter, adding, type) == false)
+                                                                       {
+                                                                               abort = true;
+                                                                               break;
+                                                                       }
+                                                               }
 
-       /* Null terminate it now we're done */
-       *outl = 0;
+                                                               if (abort)
+                                                                       continue;
+                                                       }
 
+                                                       /* It's an oper only mode, check if theyre an oper. If they arent,
+                                                        * eat any parameter that  came with the mode, and continue to next
+                                                        */
+                                                       if ((IS_LOCAL(user)) && (modehandlers[handler_id]->NeedsOper()) && (!IS_OPER(user)))
+                                                       {
+                                                               user->WriteServ("481 %s :Permission Denied - Only IRC operators may %sset %s mode %c", user->nick,
+                                                                               adding ? "" : "un", type == MODETYPE_CHANNEL ? "channel" : "user",
+                                                                               modehandlers[handler_id]->GetModeChar());
+                                                               continue;
+                                                       }
 
-       /************ 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 ************/
+                                                       /* Call the handler for the mode */
+                                                       ModeAction ma = modehandlers[handler_id]->OnModeChange(user, targetuser, targetchannel, parameter, adding);
 
+                                                       if ((modehandlers[handler_id]->GetNumParams(adding)) && (parameter.empty()))
+                                                       {
+                                                               /* The handler nuked the parameter and they are supposed to have one.
+                                                                * We CANT continue now, even if they actually returned MODEACTION_ALLOW,
+                                                                * so we bail to the next mode character.
+                                                                */
+                                                               continue;
+                                                       }
 
-       /* The mode change must be at least two characters long (+ or - and at least one mode) */
-       if (((*outl == '+') || (*outl == '-')) && *(outl+1))
-       {
-               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));
+                                                       if (ma == MODEACTION_ALLOW)
+                                                       {
+                                                               /* We're about to output a valid mode letter - was there previously a pending state-change? */
+                                                               if (state_change)
+                                                               {
+                                                                       if (adding != last_successful_state_change)
+                                                                               output_sequence.append(adding ? "+" : "-");
+                                                                       last_successful_state_change = adding;
+                                                               }
+                                                               
+                                                               /* Add the mode letter */
+                                                               output_sequence.push_back(modechar);
+
+                                                               modehandlers[handler_id]->ChangeCount(adding ? 1 : -1);
+
+                                                               /* Is there a valid parameter for this mode? If so add it to the parameter list */
+                                                               if ((modehandlers[handler_id]->GetNumParams(adding)) && (!parameter.empty()))
+                                                               {
+                                                                       parameter_list << " " << parameter;
+                                                                       parameter_count++;
+                                                                       /* Does this mode have a prefix? */
+                                                                       if (modehandlers[handler_id]->GetPrefix() && targetchannel)
+                                                                       {
+                                                                               User* user_to_prefix = ServerInstance->FindNick(parameter);
+                                                                               if (user_to_prefix)
+                                                                                       targetchannel->SetPrefix(user_to_prefix, modehandlers[handler_id]->GetPrefix(),
+                                                                                                       modehandlers[handler_id]->GetPrefixRank(), adding);
+                                                                       }
+                                                               }
+
+                                                               /* Call all the AfterMode events in the mode watchers for this mode */
+                                                               for (ModeWatchIter watchers = modewatchers[handler_id].begin(); watchers != modewatchers[handler_id].end(); watchers++)
+                                                                       (*watchers)->AfterMode(user, targetuser, targetchannel, parameter, adding, type);
+
+                                                               /* Reset the state change flag */
+                                                               state_change = false;
+
+                                                               if ((output_sequence.length() + parameter_list.str().length() > 450) || (output_sequence.length() > 100)
+                                                                               || (parameter_count > MAXMODES))
+                                                               {
+                                                                       /* We cant have a mode sequence this long */
+                                                                       letter = mode_sequence.end() - 1;
+                                                                       continue;
+                                                               }
+                                                       }
+                                               }
+                                       }
+                                       else
+                                       {
+                                               /* 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, modechar);
+                                       }
+                               break;
+                       }
                }
-               else
+
+               /* Was there at least one valid mode in the sequence? */
+               if (!output_sequence.empty())
                {
                        if (servermode)
                        {
-                               if (!silent)
+                               if (type == MODETYPE_CHANNEL)
                                {
-                                       WriteChannelWithServ(Config->ServerName,chan,"MODE %s %s",chan->name,outl);
+                                       targetchannel->WriteChannelWithServ(ServerInstance->Config->ServerName, "MODE %s %s%s", targetchannel->name, output_sequence.c_str(), parameter_list.str().c_str());
+                                       this->LastParse = targetchannel->name;
+                               }
+                               else
+                               {
+                                       targetuser->WriteServ("MODE %s %s%s",targetuser->nick,output_sequence.c_str(), parameter_list.str().c_str());
+                                       this->LastParse = targetuser->nick;
                                }
-                                       
                        }
                        else
                        {
-                               if (!silent)
+                               if (type == MODETYPE_CHANNEL)
                                {
-                                       WriteChannel(chan,user,"MODE %s %s",chan->name,outl);
-                                       FOREACH_MOD(I_OnMode,OnMode(user, chan, TYPE_CHANNEL, outl));
+                                       targetchannel->WriteChannel(user,"MODE %s %s%s",targetchannel->name,output_sequence.c_str(),parameter_list.str().c_str());
+                                       FOREACH_MOD(I_OnMode,OnMode(user, targetchannel, TYPE_CHANNEL, output_sequence + parameter_list.str()));
+                                       this->LastParse = targetchannel->name;
+                               }
+                               else
+                               {
+                                       user->WriteTo(targetuser,"MODE %s %s%s",targetuser->nick,output_sequence.c_str(), parameter_list.str().c_str());
+                                       FOREACH_MOD(I_OnMode,OnMode(user, targetuser, TYPE_USER, output_sequence + parameter_list.str()));
+                                       this->LastParse = targetuser->nick;
                                }
                        }
+
+                       LastParse.append(" ");
+                       LastParse.append(output_sequence);
+                       LastParse.append(parameter_list.str());
                }
        }
 }
 
-// based on sourcemodes, return true or false to determine if umode is a valid mode a user may set on themselves or others.
+const std::string& ModeParser::GetLastParse()
+{
+       return LastParse;
+}
 
-bool ModeParser::AllowedUmode(char umode, char* sourcemodes,bool adding,bool serveroverride)
+void ModeParser::CleanMask(std::string &mask)
 {
-       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'))
+       std::string::size_type pos_of_pling = mask.find_first_of('!');
+       std::string::size_type pos_of_at = mask.find_first_of('@');
+       std::string::size_type pos_of_dot = mask.find_first_of('.');
+       std::string::size_type pos_of_colon = mask.find_first_of(':'); /* Because ipv6 addresses are colon delimited */
+
+       if ((pos_of_pling == std::string::npos) && (pos_of_at == std::string::npos))
        {
-               return true;
+               /* Just a nick, or just a host */
+               if ((pos_of_dot == std::string::npos) && (pos_of_colon == std::string::npos))
+               {
+                       /* It has no '.' in it, it must be a nick. */
+                       mask.append("!*@*");
+               }
+               else
+               {
+                       /* Got a dot in it? Has to be a host */
+                       mask = "*!*@" + mask;
+               }
        }
-       // RFC1459 specified modes
-       if ((umode == 'w') || (umode == 's') || (umode == 'i'))
+       else if ((pos_of_pling == std::string::npos) && (pos_of_at != std::string::npos))
        {
-               /* umode allowed by RFC1459 scemantics */
-               return true;
+               /* Has an @ but no !, its a user@host */
+                mask = "*!" + mask;
        }
-       
-       /* user may not +o themselves or others, but an oper may de-oper other opers or themselves */
-       if (sourceoper && !adding)
+       else if ((pos_of_pling != std::string::npos) && (pos_of_at == std::string::npos))
        {
-               return true;
+               /* Has a ! but no @, it must be a nick!ident */
+               mask.append("@*");
        }
-       else if (umode == 'o')
-       {
-               /* Bad oper, bad bad! */
+}
+
+bool ModeParser::AddMode(ModeHandler* mh)
+{
+       unsigned char mask = 0;
+       unsigned char pos = 0;
+
+       /* Yes, i know, this might let people declare modes like '_' or '^'.
+        * If they do that, thats their problem, and if i ever EVER see an
+        * official InspIRCd developer do that, i'll beat them with a paddle!
+        */
+       if ((mh->GetModeChar() < 'A') || (mh->GetModeChar() > 'z') || (mh->GetPrefix() > 126))
+               return false;
+
+       /* A mode prefix of ',' is not acceptable, it would fuck up server to server.
+        * A mode prefix of ':' will fuck up both server to server, and client to server.
+        * A mode prefix of '#' will mess up /whois and /privmsg
+        */
+       if ((mh->GetPrefix() == ',') || (mh->GetPrefix() == ':') || (mh->GetPrefix() == '#'))
                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;
-       }
 
-       // anything else - return false.
-       log(DEBUG,"umode %c not known by any ruleset",umode);
-       return false;
+       mh->GetModeType() == MODETYPE_USER ? mask = MASK_USER : mask = MASK_CHANNEL;
+       pos = (mh->GetModeChar()-65) | mask;
+
+       if (modehandlers[pos])
+               return false;
+
+       modehandlers[pos] = mh;
+       return true;
 }
 
-bool ModeParser::ProcessModuleUmode(char umode, userrec* source, void* dest, bool adding)
+bool ModeParser::DelMode(ModeHandler* mh)
 {
-       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))
+       unsigned char mask = 0;
+       unsigned char pos = 0;
+
+       if ((mh->GetModeChar() < 'A') || (mh->GetModeChar() > 'z'))
+               return false;
+
+       mh->GetModeType() == MODETYPE_USER ? mask = MASK_USER : mask = MASK_CHANNEL;
+       pos = (mh->GetModeChar()-65) | mask;
+
+       if (!modehandlers[pos])
+               return false;
+
+       switch (mh->GetModeType())
        {
-               for (int i = 0; i <= MODCOUNT; i++)
-               {
-                       if (modules[i]->OnExtendedMode(source,(void*)dest,umode,MT_CLIENT,adding,p))
+               case MODETYPE_USER:
+                       for (user_hash::iterator i = ServerInstance->clientlist->begin(); i != ServerInstance->clientlist->end(); i++)
                        {
-                               log(DEBUG,"Module %s claims umode %c",Config->module_names[i].c_str(),umode);
-                               return true;
+                               mh->RemoveMode(i->second);
                        }
-               }
-               log(DEBUG,"No module claims umode %c",umode);
-               if (faked)
-               {
-                       delete s2;
-                       source = NULL;
-               }
-               return false;
-       }
-       else
-       {
-               if (faked)
-               {
-                       delete s2;
-                       source = NULL;
-               }
-               return false;
+               break;
+               case MODETYPE_CHANNEL:
+                       for (chan_hash::iterator i = ServerInstance->chanlist->begin(); i != ServerInstance->chanlist->end(); i++)
+                       {
+                               mh->RemoveMode(i->second);
+                       }
+               break;
        }
+
+       modehandlers[pos] = NULL;
+
+       return true;
 }
 
-void cmd_mode::Handle (char **parameters, int pcnt, userrec *user)
+ModeHandler* ModeParser::FindMode(unsigned const char modeletter, ModeType mt)
 {
-       chanrec* chan;
-       userrec* dest = Find(parameters[0]);
-       int MOD_RESULT;
-       int can_change;
-       int direction = 1;
-       char outpars[MAXBUF];
-       bool next_ok = true;
-
-       if (!user)
-               return;
+       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;
+
+       return modehandlers[pos];
+}
+
+std::string ModeParser::UserModeList()
+{
+       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_USER;
+
+               if (modehandlers[pos])
+                       modestr[pointer++] = mode;
        }
-       else if ((dest) && (pcnt > 1))
+       modestr[pointer++] = 0;
+       return modestr;
+}
+
+std::string ModeParser::ChannelModeList()
+{
+       char modestr[256];
+       int pointer = 0;
+
+       for (unsigned char mode = 'A'; mode <= 'z'; mode++)
        {
-               std::string tidied = ServerInstance->ModeGrok->CompressModes(parameters[1],false);
-               parameters[1] = (char*)tidied.c_str();
+               if ((!ServerInstance->Config->AllowHalfop) && (mode == 'h'))
+                       continue;
 
-               char dmodes[MAXBUF];
-               strlcpy(dmodes,dest->modes,MAXMODES);
-               log(DEBUG,"pulled up dest user modes: %s",dmodes);
+               unsigned char pos = (mode-65) | MASK_CHANNEL;
 
-               can_change = 0;
-               if (user != dest)
-               {
-                       if ((*user->oper) || (is_uline(user->server)))
-                       {
-                               can_change = 1;
-                       }
-               }
-               else
-               {
-                       can_change = 1;
-               }
-               if (!can_change)
-               {
-                       WriteServ(user->fd,"482 %s :Can't change mode for other users",user->nick);
-                       return;
-               }
-               
-               outpars[0] = *parameters[1];
-               outpars[1] = 0;
-               direction = (*parameters[1] == '+');
+               if (modehandlers[pos])
+                       modestr[pointer++] = mode;
+       }
+       modestr[pointer++] = 0;
+       return modestr;
+}
 
-               if ((*parameters[1] != '+') && (*parameters[1] != '-'))
-                       return;
+std::string ModeParser::ParaModeList()
+{
+       char modestr[256];
+       int pointer = 0;
 
-               for (char* i = parameters[1]; *i; i++)
-               {
-                       if ((i != parameters[1]) && (*i != '+') && (*i != '-'))
-                               next_ok = true;
+       for (unsigned char mode = 'A'; mode <= 'z'; mode++)
+       {
+               if ((!ServerInstance->Config->AllowHalfop) && (mode == 'h'))
+                       continue;
 
-                       switch (*i)
-                       {
-                               case ' ':
-                               continue;
+               unsigned char pos = (mode-65) | MASK_CHANNEL;
 
-                               case '+':
-                                       if ((direction != 1) && (next_ok))
-                                       {
-                                               charlcat(outpars,'+',MAXBUF);
-                                               next_ok = false;
-                                       }       
-                                       direction = 1;
-                               break;
+               if ((modehandlers[pos]) && (modehandlers[pos]->GetNumParams(true)))
+                       modestr[pointer++] = mode;
+       }
+       modestr[pointer++] = 0;
+       return modestr;
+}
 
-                               case '-':
-                                       if ((direction != 0) && (next_ok))
-                                       {
-                                               charlcat(outpars,'-',MAXBUF);
-                                               next_ok = false;
-                                       }
-                                       direction = 0;
-                               break;
+ModeHandler* ModeParser::FindPrefix(unsigned const char pfxletter)
+{
+       for (unsigned char mode = 'A'; mode <= 'z'; mode++)
+       {
+               unsigned char pos = (mode-65) | MASK_CHANNEL;
 
-                               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 (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);
-                                                                       switch (*i)
-                                                                       {
-                                                                               case 'o':
-                                                                                       FOREACH_MOD(I_OnGlobalOper,OnGlobalOper(dest));
-                                                                               break;
-                                                                               case 'i':
-                                                                                       dest->modebits |= UM_INVISIBLE;
-                                                                               break;
-                                                                               case 's':
-                                                                                       dest->modebits |= UM_SERVERNOTICE;
-                                                                               break;
-                                                                               case 'w':
-                                                                                       dest->modebits |= UM_WALLOPS;
-                                                                               break;
-                                                                               default:
-                                                                               break;
-                                                                       }
-                                                               }
-                                                       }
-                                               }
-                                               else
-                                               {
-                                                       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);
-                                                                       switch (*i)
-                                                                       {
-                                                                               case 'o':
-                                                                                       *dest->oper = 0;
-                                                                                       DeleteOper(dest);
-                                                                               break;
-                                                                               case 'i':
-                                                                                       dest->modebits &= ~UM_INVISIBLE;
-                                                                               break;
-                                                                               case 's':
-                                                                                       dest->modebits &= ~UM_SERVERNOTICE;
-                                                                               break;
-                                                                               case 'w':
-                                                                                       dest->modebits &= ~UM_WALLOPS;
-                                                                               break;
-                                                                               default:
-                                                                               break;
-                                                                       }
-                                                               }
-                                                       }
-                                               }
-                                       }
-                               break;
-                       }
-               }
-               if (*outpars)
+               if ((modehandlers[pos]) && (modehandlers[pos]->GetPrefix() == pfxletter))
                {
-                       char b[MAXBUF];
-                       char* z = b;
+                       return modehandlers[pos];
+               }
+       }
+       return NULL;
+}
 
-                       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;
+std::string ModeParser::ModeString(User* user, Channel* channel)
+{
+       std::string types;
+       std::string pars;
+
+       if (!channel || !user)
+               return "";
 
-                       if ((*b) && (!IS_SINGLE(b,'+')) && (!IS_SINGLE(b,'-')))
+       for (unsigned char mode = 'A'; mode <= 'z'; mode++)
+       {
+               unsigned char pos = (mode-65) | MASK_CHANNEL;
+               ModeHandler* mh = modehandlers[pos];
+               if ((mh) && (mh->GetNumParams(true)) && (mh->GetNumParams(false)))
+               {
+                       ModePair ret;
+                       ret = mh->ModeSet(NULL, user, channel, user->nick);
+                       if ((ret.first) && (ret.second == user->nick))
                        {
-                               WriteTo(user, dest, "MODE %s :%s", dest->nick, b);
-                               FOREACH_MOD(I_OnMode,OnMode(user, dest, TYPE_USER, b));
+                               pars.append(" ");
+                               pars.append(user->nick);
+                               types.push_back(mh->GetModeChar());
                        }
+               }
+       }
 
-                       log(DEBUG,"Stripped mode line");
-                       log(DEBUG,"Line dest is now %s",dmodes);
-                       strlcpy(dest->modes,dmodes,MAXMODES-1);
+       return types+pars;
+}
 
-               }
+std::string ModeParser::ChanModes()
+{
+       std::string type1;      /* Listmodes EXCEPT those with a prefix */
+       std::string type2;      /* Modes that take a param when adding or removing */
+       std::string type3;      /* Modes that only take a param when adding */
+       std::string type4;      /* Modes that dont take a param */
 
-               return;
-       }
-       else
+       for (unsigned char mode = 'A'; mode <= 'z'; mode++)
        {
-               chan = FindChan(parameters[0]);
-               if(chan)
-               {
-                       if (pcnt == 1)
-                       {
-                               /* just /modes #channel */
-                               WriteServ(user->fd,"324 %s %s +%s",user->nick, chan->name, chanmodes(chan, chan->HasUser(user)));
-                               WriteServ(user->fd,"329 %s %s %d", user->nick, chan->name, chan->created);
-                               return;
-                       }
-                       else if (pcnt == 2)
+               if ((!ServerInstance->Config->AllowHalfop) && (mode == 'h'))
+                       continue;
+
+               unsigned char pos = (mode-65) | MASK_CHANNEL;
+                /* One parameter when adding */
+               if (modehandlers[pos])
+               {       
+                       if (modehandlers[pos]->GetNumParams(true))
                        {
-                               char* mode = parameters[1];
-                               
-                               MOD_RESULT = 0;
-                               
-                               if (*mode == '+')
-                                       mode++;
-
-                               FOREACH_RESULT(I_OnRawMode,OnRawMode(user, chan, *mode, "", false, 0));
-                               if(!MOD_RESULT)
+                               if ((modehandlers[pos]->IsListMode()) && (!modehandlers[pos]->GetPrefix()))
+                               {
+                                       type1 += modehandlers[pos]->GetModeChar();
+                               }
+                               else
                                {
-                                       if (*mode == 'b')
+                                       /* ... and one parameter when removing */
+                                       if (modehandlers[pos]->GetNumParams(false))
                                        {
-                                               for (BanList::iterator i = chan->bans.begin(); i != chan->bans.end(); i++)
+                                               /* But not a list mode */
+                                               if (!modehandlers[pos]->GetPrefix())
                                                {
-                                                       WriteServ(user->fd,"367 %s %s %s %s %d",user->nick, chan->name, i->data, i->set_by, i->set_time);
+                                                       type2 += modehandlers[pos]->GetModeChar();
                                                }
-                                               WriteServ(user->fd,"368 %s %s :End of channel ban list",user->nick, chan->name);
-                                               return;
                                        }
-                                       
-                                       if ((ModeDefined(*mode,MT_CHANNEL)) && (ModeIsListMode(*mode,MT_CHANNEL)))
+                                       else
                                        {
-                                               // 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,chan,*mode));
-                                               return;
+                                               /* No parameters when removing */
+                                               type3 += modehandlers[pos]->GetModeChar();
                                        }
                                }
                        }
-
-                       if ((IS_LOCAL(user)) && (!is_uline(user->server)) && (!chan->HasUser(user)))
-                       {
-                               WriteServ(user->fd,"442 %s %s :You're not on that channel!",user->nick, chan->name);
-                               return;
-                       }
-       
-                       MOD_RESULT = 0;
-                       FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user, NULL, chan, AC_GENERAL_MODE));
-                               
-                       if(MOD_RESULT == ACR_DENY)
-                               return;
-
-                       if(MOD_RESULT == ACR_DEFAULT)
+                       else
                        {
-                               if ((IS_LOCAL(user)) && (cstatus(user,chan) < STATUS_HOP))
-                               {
-                                       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;
-                               }
+                               type4 += modehandlers[pos]->GetModeChar();
                        }
-       
-                       ServerInstance->ModeGrok->ProcessModes(parameters,user,chan,cstatus(user,chan),pcnt,false,false,false);
                }
-               else
+                        
+       }
+
+       return type1 + "," + type2 + "," + type3 + "," + type4;
+}
+
+bool ModeParser::PrefixComparison(prefixtype one, prefixtype two)
+{       
+       return one.second > two.second;
+}
+
+std::string ModeParser::BuildPrefixes()
+{
+       std::string mletters;
+       std::string mprefixes;
+       pfxcontainer pfx;
+       std::map<char,char> prefix_to_mode;
+
+       for (unsigned char mode = 'A'; mode <= 'z'; mode++)
+       {
+               if ((!ServerInstance->Config->AllowHalfop) && (mode == 'h'))
+                       continue;
+
+               unsigned char pos = (mode-65) | MASK_CHANNEL;
+
+               if ((modehandlers[pos]) && (modehandlers[pos]->GetPrefix()))
                {
-                       WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, parameters[0]);
+                       pfx.push_back(std::make_pair<char,unsigned int>(modehandlers[pos]->GetPrefix(), modehandlers[pos]->GetPrefixRank()));
+                       prefix_to_mode[modehandlers[pos]->GetPrefix()] = modehandlers[pos]->GetModeChar();
                }
        }
-}
 
+       sort(pfx.begin(), pfx.end(), ModeParser::PrefixComparison);
 
+       for (pfxcontainer::iterator n = pfx.begin(); n != pfx.end(); n++)
+       {
+               mletters = mletters + n->first;
+               mprefixes = mprefixes + prefix_to_mode.find(n->first)->second;
+       }
 
+       return "(" + mprefixes + ")" + mletters;
+}
 
-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);
-                                                                        switch (*i)
-                                                                        {
-                                                                                case 'i':
-                                                                                        dest->modebits |= UM_INVISIBLE;
-                                                                                break;
-                                                                                case 's':
-                                                                                        dest->modebits |= UM_SERVERNOTICE;
-                                                                                break;
-                                                                                case 'w':
-                                                                                        dest->modebits |= UM_WALLOPS;
-                                                                                break;
-                                                                                default:
-                                                                                break;
-                                                                        }
-                                                               }
-                                                       }
-                                               }
-                                               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);
-                                                                        switch (*i)
-                                                                        {
-                                                                                case 'i':
-                                                                                        dest->modebits &= ~UM_INVISIBLE;
-                                                                                break;
-                                                                                case 's':
-                                                                                        dest->modebits &= ~UM_SERVERNOTICE;
-                                                                                break;
-                                                                                case 'w':
-                                                                                        dest->modebits &= ~UM_WALLOPS;
-                                                                                break;
-                                                                                default:
-                                                                                break;
-                                                                        }
-                                                               }
-                                                       }
-                                               }
-                                       }
-                               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 = 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)
+{
+       char moderemove[MAXBUF];
+       const char* parameters[] = { user->nick, moderemove };
+
+       if (user->IsModeSet(this->GetModeChar()))
        {
-               ServerInstance->ModeGrok->ProcessModes(parameters,user,Ptr,STATUS_OP,pcnt,true,false,false);
+               sprintf(moderemove,"-%c",this->GetModeChar());
+               ServerInstance->Parser->CallHandler("MODE", parameters, 2, user);
        }
-       else
+}
+
+/** This default implementation can remove simple channel modes
+ * (no parameters)
+ */
+void ModeHandler::RemoveMode(Channel* channel)
+{
+       char moderemove[MAXBUF];
+       const char* parameters[] = { channel->name, moderemove };
+
+       if (channel->IsModeSet(this->GetModeChar()))
        {
-               WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, parameters[0]);
+               sprintf(moderemove,"-%c",this->GetModeChar());
+               ServerInstance->SendMode(parameters, 2, ServerInstance->FakeClient);
        }
 }
+
+ModeParser::ModeParser(InspIRCd* Instance) : ServerInstance(Instance)
+{
+       ModeHandler* modes[] =
+       {
+               new ModeChannelSecret(Instance),
+               new ModeChannelPrivate(Instance),
+               new ModeChannelModerated(Instance),
+               new ModeChannelTopicOps(Instance),
+               new ModeChannelNoExternal(Instance),
+               new ModeChannelInviteOnly(Instance),
+               new ModeChannelKey(Instance),
+               new ModeChannelLimit(Instance),
+               new ModeChannelBan(Instance),
+               new ModeChannelOp(Instance),
+               new ModeChannelHalfOp(Instance),
+               new ModeChannelVoice(Instance),
+               new ModeUserServerNotice(Instance),
+               new ModeUserWallops(Instance),
+               new ModeUserInvisible(Instance),
+               new ModeUserOperator(Instance),
+               new ModeUserServerNoticeMask(Instance),
+               NULL
+       };
+
+       /* Clear mode list */
+       memset(modehandlers, 0, sizeof(modehandlers));
+       memset(modewatchers, 0, sizeof(modewatchers));
+
+       /* Last parse string */
+       LastParse.clear();
+
+       /* Initialise the RFC mode letters */
+       for (int index = 0; modes[index]; index++)
+               this->AddMode(modes[index]);
+}