Implement <disabled:usermodes> and <disabled:chanmodes>.

[user/henk/code/inspircd.git] / src / mode.cpp

diff --git a/src/mode.cpp b/src/mode.cpp
index b778d1d5c5f458e64fcb7eb9de9125a084495771..bce2b20191493a115f6957470bbe4d1f71f06847 100644 (file)
--- a/src/mode.cpp
+++ b/src/mode.cpp
@@ -251,7 +251,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.c_str(), dest);
+               user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel",user->nick.c_str(), dest);
                return NULL;
        }
        return d;
@@ -322,35 +322,35 @@ 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.c_str(), targetchannel->name.c_str(), targetchannel->ChanModes(targetchannel->HasUser(user)));
-               user->WriteNumeric(329, "%s %s %lu", user->nick.c_str(), targetchannel->name.c_str(), (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.c_str(), text);
+                       user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel",user->nick.c_str(), text);
                        return;
                }
 
                if ((targetuser == user) || (IS_OPER(user)))
                {
                        /* Display user's current mode string */
-                       user->WriteNumeric(221, "%s :+%s",targetuser->nick.c_str(),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.c_str(), 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.c_str());
+                       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.c_str(), text);
+       user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel",user->nick.c_str(), text);
        return;
 }
 
@@ -412,11 +412,14 @@ void ModeParser::Process(const std::vector<std::string>& parameters, User *user,
                                        continue;
                                }
 
-                               if (ServerInstance->Config->HideModeLists[mletter] && (targetchannel->GetStatus(user) < STATUS_HOP))
+                               if (!IS_OPER(user))
                                {
-                                       user->WriteNumeric(482, "%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;
+                                       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
@@ -478,14 +481,14 @@ void ModeParser::Process(const std::vector<std::string>& parameters, User *user,
                        mask = MASK_USER;
                        if ((user != targetuser) && (!ServerInstance->ULine(user->server)))
                        {
-                               user->WriteNumeric(502, "%s :Can't change mode for other users", user->nick.c_str());
+                               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.c_str(), parameters[0].c_str());
+                       user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel",user->nick.c_str(), parameters[0].c_str());
                        return;
                }
 
@@ -611,7 +614,7 @@ void ModeParser::Process(const std::vector<std::string>& parameters, User *user,
                                                                        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->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;
                                                                        }
@@ -638,6 +641,17 @@ void ModeParser::Process(const std::vector<std::string>& parameters, User *user,
                                                        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
                                                         */
@@ -645,7 +659,7 @@ void ModeParser::Process(const std::vector<std::string>& parameters, User *user,
                                                        {
                                                                if (IS_OPER(user))
                                                                {
-                                                                       user->WriteNumeric(481, "%s :Permission Denied - Oper type %s does not have access to set %s mode %c",
+                                                                       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",
@@ -653,7 +667,7 @@ void ModeParser::Process(const std::vector<std::string>& parameters, User *user,
                                                                }
                                                                else
                                                                {
-                                                                       user->WriteNumeric(481, "%s :Permission Denied - Only operators may set %s mode %c",
+                                                                       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());
@@ -780,6 +794,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 :) */