Merge tag 'v2.0.27' into master.

[user/henk/code/inspircd.git] / src / coremods / core_xline / cmd_qline.cpp

diff --git a/src/coremods/core_xline/cmd_qline.cpp b/src/coremods/core_xline/cmd_qline.cpp
index 003aacbef5fe3ea5238fc1f2fcffad919580ff8e..b7597386129215b9a21c1bee66f0146efb03e542 100644 (file)
--- a/src/coremods/core_xline/cmd_qline.cpp
+++ b/src/coremods/core_xline/cmd_qline.cpp
@@ -21,29 +21,21 @@
 
 #include "inspircd.h"
 #include "xline.h"
+#include "core_xline.h"
 
-/** Handle /QLINE.  */
-class CommandQline : public Command
+CommandQline::CommandQline(Module* parent)
+       : Command(parent, "QLINE", 1, 3)
 {
- public:
-       /** Constructor for qline.
-        */
-       CommandQline ( Module* parent) : Command(parent,"QLINE",1,3) { flags_needed = 'o'; Penalty = 0; syntax = "<nick> [<duration> :<reason>]"; }
-       /** Handle command.
-        * @param parameters The parameters to the command
-        * @param pcnt The number of parameters passed to the command
-        * @param user The user issuing the command
-        * @return A value from CmdResult to indicate command success or failure.
-        */
-       CmdResult Handle(const std::vector<std::string>& parameters, User *user);
-};
-
+       flags_needed = 'o';
+       syntax = "<nick> [<duration> :<reason>]";
+}
 
-CmdResult CommandQline::Handle (const std::vector<std::string>& parameters, User *user)
+CmdResult CommandQline::Handle(User* user, const Params& parameters)
 {
        if (parameters.size() >= 3)
        {
-               if (ServerInstance->NickMatchesEveryone(parameters[0],user))
+               NickMatcher matcher;
+               if (InsaneBan::MatchesEveryone(parameters[0], matcher, user, "Q", "nickmasks"))
                        return CMD_FAILURE;
 
                if (parameters[0].find('@') != std::string::npos || parameters[0].find('!') != std::string::npos || parameters[0].find('.') != std::string::npos)
@@ -91,5 +83,7 @@ CmdResult CommandQline::Handle (const std::vector<std::string>& parameters, User
        return CMD_SUCCESS;
 }
 
-
-COMMAND_INIT(CommandQline)
+bool CommandQline::NickMatcher::Check(User* user, const std::string& nick) const
+{
+       return InspIRCd::Match(user->nick, nick);
+}