]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/mode.cpp
Include explicit parameter list in ProtocolInterface::SendMode
[user/henk/code/inspircd.git] / src / mode.cpp
index e5efaffdf0251e5eea61bb78a0d02690cdd883aa..40bd7096371679ce3b95a884296f30ab757da0e5 100644 (file)
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -11,7 +11,7 @@
  * ---------------------------------------------------
  */
 
-/* $Core: libIRCDmode */
+/* $Core */
 /* $ExtraDeps: $(RELCPPFILES) */
 /* $ExtraObjects: modes/modeclasses.a */
 /* $ExtraBuild: @${MAKE} -C "modes" DIRNAME="src/modes" CC="$(CC)" $(MAKEARGS) CPPFILES="$(CPPFILES)" */
 #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"
+/* +s (server notice masks) */
+#include "modes/umode_s.h"
 
-ModeHandler::ModeHandler(InspIRCd* Instance, char modeletter, int parameters_on, int parameters_off, bool listmode, ModeType type, bool operonly, char mprefix, char prefixrequired)
-       : 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), prefixneeded(prefixrequired)
+ModeHandler::ModeHandler(InspIRCd* Instance, char modeletter, int parameters_on, int parameters_off, bool listmode, ModeType type, bool operonly, char mprefix, char prefixrequired, TranslateType translate)
+       : ServerInstance(Instance), mode(modeletter), n_params_on(parameters_on), n_params_off(parameters_off), list(listmode), m_type(type), m_paramtype(translate), oper(operonly), prefix(mprefix), count(0), prefixneeded(prefixrequired)
 {
 }
 
@@ -99,6 +97,11 @@ ModeType ModeHandler::GetModeType()
        return m_type;
 }
 
+TranslateType ModeHandler::GetTranslateType()
+{
+       return m_paramtype;
+}
+
 bool ModeHandler::NeedsOper()
 {
        return oper;
@@ -119,6 +122,11 @@ char ModeHandler::GetModeChar()
        return mode;
 }
 
+std::string ModeHandler::GetUserParameter(User* user)
+{
+       return "";
+}
+
 ModeAction ModeHandler::OnModeChange(User*, User*, Channel*, std::string&, bool, bool)
 {
        return MODEACTION_DENY;
@@ -144,11 +152,76 @@ void ModeHandler::DisplayEmptyList(User*, Channel*)
 {
 }
 
+void ModeHandler::OnParameterMissing(User* user, User* dest, Channel* channel)
+{
+}
+
 bool ModeHandler::CheckTimeStamp(time_t theirs, time_t ours, const std::string&, const std::string&, Channel*)
 {
        return (ours < theirs);
 }
 
+SimpleUserModeHandler::SimpleUserModeHandler(InspIRCd* Instance, char modeletter) : ModeHandler(Instance, modeletter, 0, 0, false, MODETYPE_USER, false)
+{
+}
+
+SimpleUserModeHandler::~SimpleUserModeHandler()
+{
+}
+
+SimpleChannelModeHandler::~SimpleChannelModeHandler()
+{
+}
+
+SimpleChannelModeHandler::SimpleChannelModeHandler(InspIRCd* Instance, char modeletter) : ModeHandler(Instance, modeletter, 0, 0, false, MODETYPE_CHANNEL, false)
+{
+}
+
+ModeAction SimpleUserModeHandler::OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool servermode)
+{
+       if (adding)
+       {
+               if (!dest->IsModeSet(this->GetModeChar()))
+               {
+                       dest->SetMode(this->GetModeChar(),true);
+                       return MODEACTION_ALLOW;
+               }
+       }
+       else
+       {
+               if (dest->IsModeSet(this->GetModeChar()))
+               {
+                       dest->SetMode(this->GetModeChar(),false);
+                       return MODEACTION_ALLOW;
+               }
+       }
+
+       return MODEACTION_DENY;
+}
+
+
+ModeAction SimpleChannelModeHandler::OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool servermode)
+{
+       if (adding)
+       {
+               if (!channel->IsModeSet(this->GetModeChar()))
+               {
+                       channel->SetMode(this->GetModeChar(),true);
+                       return MODEACTION_ALLOW;
+               }
+       }
+       else
+       {
+               if (channel->IsModeSet(this->GetModeChar()))
+               {
+                       channel->SetMode(this->GetModeChar(),false);
+                       return MODEACTION_ALLOW;
+               }
+       }
+
+       return MODEACTION_DENY;
+}
+
 ModeWatcher::ModeWatcher(InspIRCd* Instance, char modeletter, ModeType type) : ServerInstance(Instance), mode(modeletter), m_type(type)
 {
 }
@@ -186,7 +259,7 @@ User* ModeParser::SanityChecks(User *user, const char *dest, Channel *chan, int)
        d = ServerInstance->FindNick(dest);
        if (!d)
        {
-               user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick, dest);
+               user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel",user->nick.c_str(), dest);
                return NULL;
        }
        return d;
@@ -217,7 +290,7 @@ const char* ModeParser::Grant(User *d,Channel *chan,int MASK)
                                n->first->AddVoicedUser(d);
                        break;
                }
-               return d->nick;
+               return d->nick.c_str();
        }
        return "";
 }
@@ -247,7 +320,7 @@ const char* ModeParser::Revoke(User *d,Channel *chan,int MASK)
                                n->first->DelVoicedUser(d);
                        break;
                }
-               return d->nick;
+               return d->nick.c_str();
        }
        return "";
 }
@@ -257,39 +330,39 @@ void ModeParser::DisplayCurrentModes(User *user, User* targetuser, Channel* targ
        if (targetchannel)
        {
                /* Display channel's current mode string */
-               user->WriteNumeric(324, "%s %s +%s",user->nick, targetchannel->name, targetchannel->ChanModes(targetchannel->HasUser(user)));
-               user->WriteNumeric(329, "%s %s %lu", user->nick, targetchannel->name, (unsigned long)targetchannel->age);
+               user->WriteNumeric(RPL_CHANNELMODEIS, "%s %s +%s",user->nick.c_str(), targetchannel->name.c_str(), targetchannel->ChanModes(targetchannel->HasUser(user)));
+               user->WriteNumeric(RPL_CHANNELCREATED, "%s %s %lu", user->nick.c_str(), targetchannel->name.c_str(), (unsigned long)targetchannel->age);
                return;
        }
        else if (targetuser)
        {
                if (targetuser->Visibility && !targetuser->Visibility->VisibleTo(user))
                {
-                       user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick, text);
+                       user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel",user->nick.c_str(), text);
                        return;
                }
 
-               if ((targetuser == user) || (IS_OPER(user)))
+               if (targetuser == user || user->HasPrivPermission("users/auspex"))
                {
                        /* Display user's current mode string */
-                       user->WriteNumeric(221, "%s :+%s",targetuser->nick,targetuser->FormatModes());
+                       user->WriteNumeric(RPL_UMODEIS, "%s :+%s",targetuser->nick.c_str(),targetuser->FormatModes());
                        if (IS_OPER(targetuser))
-                               user->WriteNumeric(8, "%s +%s :Server notice mask", targetuser->nick, targetuser->FormatNoticeMasks());
+                               user->WriteNumeric(RPL_SNOMASKIS, "%s +%s :Server notice mask", targetuser->nick.c_str(), targetuser->FormatNoticeMasks());
                        return;
                }
                else
                {
-                       user->WriteNumeric(502, "%s :Can't change mode for other users", user->nick);
+                       user->WriteNumeric(ERR_USERSDONTMATCH, "%s :Can't change mode for other users", user->nick.c_str());
                        return;
                }
        }
 
        /* No such nick/channel */
-       user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick, text);
+       user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel",user->nick.c_str(), text);
        return;
 }
 
-void ModeParser::Process(const char* const* parameters, int pcnt, User *user, bool servermode)
+void ModeParser::Process(const std::vector<std::string>& parameters, User *user, bool servermode)
 {
        std::string target = parameters[0];
        ModeType type = MODETYPE_USER;
@@ -298,20 +371,21 @@ void ModeParser::Process(const char* const* parameters, int pcnt, User *user, bo
        User* targetuser  = ServerInstance->FindNick(parameters[0]);
 
        LastParse.clear();
+       LastParseParams.clear();
+       LastParseTranslate.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))
+       if ((targetchannel) && (parameters.size() == 2))
        {
-               const char* mode = parameters[1];
+               const char* mode = parameters[1].c_str();
                int nonlistmodes_found = 0;
-               bool sent[256];
+
+               seq++;
 
                mask = MASK_CHANNEL;
 
-               memset(&sent, 0, 256);
-               
                while (mode && *mode)
                {
                        unsigned char mletter = *mode;
@@ -321,13 +395,13 @@ void ModeParser::Process(const char* const* parameters, int pcnt, User *user, bo
                                mode++;
                                continue;
                        }
-                       
+
                        /* Ensure the user doesnt request the same mode twice,
                         * so they cant flood themselves off out of idiocy.
                         */
-                       if (!sent[mletter])
+                       if (sent[mletter] != seq)
                        {
-                               sent[mletter] = true;
+                               sent[mletter] = seq;
                        }
                        else
                        {
@@ -348,11 +422,14 @@ void ModeParser::Process(const char* const* parameters, int pcnt, User *user, bo
                                        continue;
                                }
 
-                               if (ServerInstance->Config->HideModeLists[mletter] && (targetchannel->GetStatus(user) < STATUS_HOP))
+                               if (!user->HasPrivPermission("channels/auspex"))
                                {
-                                       user->WriteNumeric(482, "%s %s :Only half-operators and above may view the +%c list",user->nick, targetchannel->name, *mode++);
-                                       mh->DisplayEmptyList(user, targetchannel);
-                                       continue;
+                                       if (ServerInstance->Config->HideModeLists[mletter] && (targetchannel->GetStatus(user) < STATUS_HOP))
+                                       {
+                                               user->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :Only half-operators and above may view the +%c list",user->nick.c_str(), targetchannel->name.c_str(), *mode++);
+                                               mh->DisplayEmptyList(user, targetchannel);
+                                               continue;
+                                       }
                                }
 
                                /** See below for a description of what craq this is :D
@@ -362,7 +439,7 @@ void ModeParser::Process(const char* const* parameters, int pcnt, User *user, bo
                                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;
                                }
@@ -381,11 +458,11 @@ void ModeParser::Process(const char* const* parameters, int pcnt, User *user, bo
                        return;
        }
 
-       if (pcnt == 1)
+       if (parameters.size() == 1)
        {
-               this->DisplayCurrentModes(user, targetuser, targetchannel, parameters[0]);
+               this->DisplayCurrentModes(user, targetuser, targetchannel, parameters[0].c_str());
        }
-       else if (pcnt > 1)
+       else if (parameters.size() > 1)
        {
                bool SkipAccessChecks = false;
 
@@ -412,16 +489,16 @@ void ModeParser::Process(const char* const* parameters, int pcnt, User *user, bo
                {
                        type = MODETYPE_USER;
                        mask = MASK_USER;
-                       if ((user != targetuser) && (!ServerInstance->ULine(user->server)))
+                       if (user != targetuser && IS_LOCAL(user) && !ServerInstance->ULine(user->server))
                        {
-                               user->WriteNumeric(502, "%s :Can't change mode for other users", user->nick);
+                               user->WriteNumeric(ERR_USERSDONTMATCH, "%s :Can't change mode for other users", user->nick.c_str());
                                return;
                        }
                }
                else
                {
                        /* No such nick/channel */
-                       user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick, parameters[0]);
+                       user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel",user->nick.c_str(), parameters[0].c_str());
                        return;
                }
 
@@ -431,9 +508,10 @@ void ModeParser::Process(const char* const* parameters, int pcnt, User *user, bo
                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;
+               unsigned int parameter_counter = 2; /* Index of first parameter */
+               unsigned int parameter_count = 0;
                bool last_successful_state_change = false;
+               LastParseTranslate.push_back(TR_TEXT);
 
                /* A mode sequence that doesnt start with + or -. Assume +. - Thanks for the suggestion spike (bug#132) */
                if ((*mode_sequence.begin() != '+') && (*mode_sequence.begin() != '-'))
@@ -495,7 +573,7 @@ void ModeParser::Process(const char* const* parameters, int pcnt, User *user, bo
                                                        if (modehandlers[handler_id]->GetNumParams(adding))
                                                        {
                                                                /* This mode expects a parameter, do we have any parameters left in our list to use? */
-                                                               if (parameter_counter < pcnt)
+                                                               if (parameter_counter < parameters.size())
                                                                {
                                                                        parameter = parameters[parameter_counter++];
 
@@ -506,6 +584,7 @@ void ModeParser::Process(const char* const* parameters, int pcnt, User *user, bo
                                                                else
                                                                {
                                                                        /* No parameter, continue to the next mode */
+                                                                       modehandlers[handler_id]->OnParameterMissing(user, targetuser, targetchannel);
                                                                        continue;
                                                                }
 
@@ -534,7 +613,7 @@ void ModeParser::Process(const char* const* parameters, int pcnt, User *user, bo
                                                                         */
                                                                        if (needed && !prefixmode)
                                                                                prefixmode = FindPrefix('%');
-                                               
+
                                                                        unsigned int neededrank = prefixmode->GetPrefixRank();
                                                                        /* Compare our rank on the channel against the rank of the required prefix,
                                                                         * allow if >= ours. Because mIRC and xchat throw a tizz if the modes shown
@@ -547,15 +626,15 @@ void ModeParser::Process(const char* const* parameters, int pcnt, User *user, bo
                                                                        if (!ourmode || ourmode->GetPrefixRank() < neededrank)
                                                                        {
                                                                                /* Bog off */
-                                                                               user->WriteNumeric(482, "%s %s :You must have channel privilege %c or above to %sset channel mode %c",
-                                                                                               user->nick, targetchannel->name, needed, adding ? "" : "un", modechar);
+                                                                               user->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :You must have channel privilege %c or above to %sset channel mode %c",
+                                                                                               user->nick.c_str(), targetchannel->name.c_str(), needed, adding ? "" : "un", modechar);
                                                                                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, servermode) == false)
@@ -574,6 +653,17 @@ void ModeParser::Process(const char* const* parameters, int pcnt, User *user, bo
                                                        if (abort)
                                                                continue;
 
+                                                       /* If it's disabled, they have to be an oper.
+                                                        */
+                                                       if (IS_LOCAL(user) && !IS_OPER(user) && ((type == MODETYPE_CHANNEL ? ServerInstance->Config->DisabledCModes : ServerInstance->Config->DisabledUModes)[modehandlers[handler_id]->GetModeChar() - 'A']))
+                                                       {
+                                                               user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Permission Denied - %s mode %c has been locked by the administrator",
+                                                                               user->nick.c_str(),
+                                                                               type == MODETYPE_CHANNEL ? "channel" : "user",
+                                                                               modehandlers[handler_id]->GetModeChar());
+                                                               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
                                                         */
@@ -581,16 +671,16 @@ void ModeParser::Process(const char* const* parameters, int pcnt, User *user, bo
                                                        {
                                                                if (IS_OPER(user))
                                                                {
-                                                                       user->WriteNumeric(481, "%s :Permission Denied - Oper type %s does not have access to set %s mode %c",
-                                                                                       user->nick,
-                                                                                       user->oper,
+                                                                       user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Permission Denied - Oper type %s does not have access to set %s mode %c",
+                                                                                       user->nick.c_str(),
+                                                                                       user->oper.c_str(),
                                                                                        type == MODETYPE_CHANNEL ? "channel" : "user",
                                                                                        modehandlers[handler_id]->GetModeChar());
                                                                }
                                                                else
                                                                {
-                                                                       user->WriteNumeric(481, "%s :Permission Denied - Only operators may set %s mode %c",
-                                                                                       user->nick,
+                                                                       user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Permission Denied - Only operators may set %s mode %c",
+                                                                                       user->nick.c_str(),
                                                                                        type == MODETYPE_CHANNEL ? "channel" : "user",
                                                                                        modehandlers[handler_id]->GetModeChar());
                                                                }
@@ -618,7 +708,7 @@ void ModeParser::Process(const char* const* parameters, int pcnt, User *user, bo
                                                                                output_sequence.append(adding ? "+" : "-");
                                                                        last_successful_state_change = adding;
                                                                }
-                                                               
+
                                                                /* Add the mode letter */
                                                                output_sequence.push_back(modechar);
 
@@ -628,6 +718,8 @@ void ModeParser::Process(const char* const* parameters, int pcnt, User *user, bo
                                                                if ((modehandlers[handler_id]->GetNumParams(adding)) && (!parameter.empty()))
                                                                {
                                                                        parameter_list << " " << parameter;
+                                                                       LastParseParams.push_back(parameter);
+                                                                       LastParseTranslate.push_back(modehandlers[handler_id]->GetTranslateType());
                                                                        parameter_count++;
                                                                        /* Does this mode have a prefix? */
                                                                        if (modehandlers[handler_id]->GetPrefix() && targetchannel)
@@ -647,7 +739,7 @@ void ModeParser::Process(const char* const* parameters, int pcnt, User *user, bo
                                                                state_change = false;
 
                                                                if ((output_sequence.length() + parameter_list.str().length() > 450) || (output_sequence.length() > 100)
-                                                                               || (parameter_count > MAXMODES))
+                                                                               || (parameter_count > ServerInstance->Config->Limits.MaxModes))
                                                                {
                                                                        /* We cant have a mode sequence this long */
                                                                        letter = mode_sequence.end() - 1;
@@ -659,7 +751,7 @@ void ModeParser::Process(const char* const* parameters, int pcnt, User *user, bo
                                        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);
+                                               user->WriteServ("%d %s %c :is unknown mode char to me", type == MODETYPE_CHANNEL ? 472 : 501, user->nick.c_str(), modechar);
                                        }
                                break;
                        }
@@ -672,27 +764,28 @@ void ModeParser::Process(const char* const* parameters, int pcnt, User *user, bo
                        {
                                if (type == MODETYPE_CHANNEL)
                                {
-                                       targetchannel->WriteChannelWithServ(ServerInstance->Config->ServerName, "MODE %s %s%s", targetchannel->name, output_sequence.c_str(), parameter_list.str().c_str());
+                                       targetchannel->WriteChannelWithServ(ServerInstance->Config->ServerName, "MODE %s %s%s", targetchannel->name.c_str(), 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());
+                                       targetuser->WriteServ("MODE %s %s%s",targetuser->nick.c_str(),output_sequence.c_str(), parameter_list.str().c_str());
                                        this->LastParse = targetuser->nick;
                                }
                        }
                        else
                        {
+                               LastParseParams.push_front(output_sequence);
                                if (type == MODETYPE_CHANNEL)
                                {
-                                       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()));
+                                       targetchannel->WriteChannel(user, "MODE %s %s%s", targetchannel->name.c_str(), output_sequence.c_str(), parameter_list.str().c_str());
+                                       FOREACH_MOD(I_OnMode,OnMode(user, targetchannel, TYPE_CHANNEL, LastParseParams, LastParseTranslate));
                                        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()));
+                                       user->WriteTo(targetuser, "MODE %s %s%s", targetuser->nick.c_str(), output_sequence.c_str(), parameter_list.str().c_str());
+                                       FOREACH_MOD(I_OnMode,OnMode(user, targetuser, TYPE_USER, LastParseParams, LastParseTranslate));
                                        this->LastParse = targetuser->nick;
                                }
                        }
@@ -716,6 +809,9 @@ void ModeParser::CleanMask(std::string &mask)
        std::string::size_type pos_of_dot = mask.find_first_of('.');
        std::string::size_type pos_of_colons = mask.find("::"); /* Because ipv6 addresses are colon delimited -- double so it treats extban as nick */
 
+       if (mask.length() >= 2 && mask[1] == ':')
+               return; // if it's an extban, don't even try guess how it needs to be formed.
+
        if ((pos_of_pling == std::string::npos) && (pos_of_at == std::string::npos))
        {
                /* Just a nick, or just a host - or clearly ipv6 (starting with :) */
@@ -846,9 +942,6 @@ std::string ModeParser::ChannelModeList()
 
        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])
@@ -865,9 +958,6 @@ std::string ModeParser::ParaModeList()
 
        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]->GetNumParams(true)))
@@ -925,7 +1015,7 @@ std::string ModeParser::ModeString(User* user, Channel* channel, bool nick_suffi
                return types;
 }
 
-std::string ModeParser::ChanModes()
+std::string ModeParser::GiveModeList(ModeMasks m)
 {
        std::string type1;      /* Listmodes EXCEPT those with a prefix */
        std::string type2;      /* Modes that take a param when adding or removing */
@@ -934,13 +1024,10 @@ std::string ModeParser::ChanModes()
 
        for (unsigned char mode = 'A'; mode <= 'z'; mode++)
        {
-               if ((!ServerInstance->Config->AllowHalfop) && (mode == 'h'))
-                       continue;
-
-               unsigned char pos = (mode-65) | MASK_CHANNEL;
+               unsigned char pos = (mode-65) | m;
                 /* One parameter when adding */
                if (modehandlers[pos])
-               {       
+               {
                        if (modehandlers[pos]->GetNumParams(true))
                        {
                                if ((modehandlers[pos]->IsListMode()) && (!modehandlers[pos]->GetPrefix()))
@@ -970,14 +1057,13 @@ std::string ModeParser::ChanModes()
                                type4 += modehandlers[pos]->GetModeChar();
                        }
                }
-                        
        }
 
        return type1 + "," + type2 + "," + type3 + "," + type4;
 }
 
 bool ModeParser::PrefixComparison(prefixtype one, prefixtype two)
-{       
+{
        return one.second > two.second;
 }
 
@@ -990,9 +1076,6 @@ std::string ModeParser::BuildPrefixes()
 
        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()))
@@ -1063,7 +1146,7 @@ bool ModeParser::DelModeWatcher(ModeWatcher* mw)
 void ModeHandler::RemoveMode(User* user, irc::modestacker* stack)
 {
        char moderemove[MAXBUF];
-       const char* parameters[] = { user->nick, moderemove };
+       std::vector<std::string> parameters;
 
        if (user->IsModeSet(this->GetModeChar()))
        {
@@ -1074,7 +1157,9 @@ void ModeHandler::RemoveMode(User* user, irc::modestacker* stack)
                else
                {
                        sprintf(moderemove,"-%c",this->GetModeChar());
-                       ServerInstance->Parser->CallHandler("MODE", parameters, 2, user);
+                       parameters.push_back(user->nick);
+                       parameters.push_back(moderemove);
+                       ServerInstance->Modes->Process(parameters, ServerInstance->FakeClient, false);
                }
        }
 }
@@ -1085,7 +1170,7 @@ void ModeHandler::RemoveMode(User* user, irc::modestacker* stack)
 void ModeHandler::RemoveMode(Channel* channel, irc::modestacker* stack)
 {
        char moderemove[MAXBUF];
-       const char* parameters[] = { channel->name, moderemove };
+       std::vector<std::string> parameters;
 
        if (channel->IsModeSet(this->GetModeChar()))
        {
@@ -1096,7 +1181,9 @@ void ModeHandler::RemoveMode(Channel* channel, irc::modestacker* stack)
                else
                {
                        sprintf(moderemove,"-%c",this->GetModeChar());
-                       ServerInstance->SendMode(parameters, 2, ServerInstance->FakeClient);
+                       parameters.push_back(channel->name);
+                       parameters.push_back(moderemove);
+                       ServerInstance->SendMode(parameters, ServerInstance->FakeClient);
                }
        }
 }
@@ -1117,7 +1204,6 @@ ModeParser::ModeParser(InspIRCd* Instance) : ServerInstance(Instance)
                new ModeChannelOp(Instance),
                new ModeChannelHalfOp(Instance),
                new ModeChannelVoice(Instance),
-               new ModeUserServerNotice(Instance),
                new ModeUserWallops(Instance),
                new ModeUserInvisible(Instance),
                new ModeUserOperator(Instance),
@@ -1134,4 +1220,7 @@ ModeParser::ModeParser(InspIRCd* Instance) : ServerInstance(Instance)
        /* Initialise the RFC mode letters */
        for (int index = 0; modes[index]; index++)
                this->AddMode(modes[index]);
+
+       seq = 0;
+       memset(&sent, 0, sizeof(sent));
 }