Move all the parameters around AGAIN. See docs shortly

[user/henk/code/inspircd.git] / src / modules / m_silence.cpp

diff --git a/src/modules/m_silence.cpp b/src/modules/m_silence.cpp
index 310f2d95aa2f16e48bee1d40e491783dd1a54f77..d9ddb8c77a82b1c3dcb5e79f082fa031a3e0c83f 100644 (file)
--- a/src/modules/m_silence.cpp
+++ b/src/modules/m_silence.cpp
@@ -12,7 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "wildcard.h"
 
 /* $ModDesc: Provides support for the /SILENCE command */
 
@@ -72,16 +71,16 @@ class CommandSVSSilence : public Command
                 */
                if (!ServerInstance->ULine(user->server))
                        return CMD_FAILURE;
-                       
+
                User *u = ServerInstance->FindNick(parameters[0]);
                if (!u)
                        return CMD_FAILURE;
-                       
+
                if (IS_LOCAL(u))
                {
                        ServerInstance->Parser->CallHandler("SILENCE", std::vector<std::string>(++parameters.begin(), parameters.end()), u);
                }
-               
+
                return CMD_SUCCESS;
        }
 };
@@ -129,13 +128,13 @@ class CommandSilence : public Command
                        if (parameters.size() > 1) {
                                pattern = CompilePattern(parameters[1].c_str());
                        }
-                       
+
                        if (!mask.length())
                        {
                                // 'SILENCE +' or 'SILENCE -', assume *!*@*
                                mask = "*!*@*";
                        }
-                       
+
                        ModeParser::CleanMask(mask);
 
                        if (action == '-')
@@ -219,7 +218,7 @@ class CommandSilence : public Command
                                case 'c':
                                        p |= SILENCE_CHANNEL;
                                        break;
-                               case 'i': 
+                               case 'i':
                                        p |= SILENCE_INVITE;
                                        break;
                                case 'n':
@@ -271,7 +270,7 @@ class ModuleSilence : public Module
        CommandSVSSilence *cmdsvssilence;
        unsigned int maxsilence;
  public:
- 
+
        ModuleSilence(InspIRCd* Me)
                : Module(Me), maxsilence(32)
        {
@@ -391,7 +390,7 @@ class ModuleSilence : public Module
                {
                        for (silencelist::const_iterator c = sl->begin(); c != sl->end(); c++)
                        {
-                               if (((((c->second & pattern) > 0)) || ((c->second & SILENCE_ALL) > 0)) && (ServerInstance->MatchText(source->GetFullHost(), c->first)))
+                               if (((((c->second & pattern) > 0)) || ((c->second & SILENCE_ALL) > 0)) && (InspIRCd::Match(source->GetFullHost(), c->first)))
                                        return !(((c->second & SILENCE_EXCLUDE) > 0));
                        }
                }
@@ -401,10 +400,10 @@ class ModuleSilence : public Module
        virtual ~ModuleSilence()
        {
        }
-       
+
        virtual Version GetVersion()
        {
-               return Version(1, 2, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
        }
 };