Of course, it DOES help to actually initialise the Mutex objects, and delete them...

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

diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp
index 762ba6e29fd4665794a186e3fe7ddb93ea88f12e..8c04a4dadd3fe0742ce67116f02f4abfd65b3f7f 100644 (file)
--- a/src/modules/m_alias.cpp
+++ b/src/modules/m_alias.cpp
@@ -12,7 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "wildcard.h"
 
 /* $ModDesc: Provides aliases of commands. */
 
@@ -69,7 +68,7 @@ class ModuleAlias : public Module
        }
 
  public:
-       
+
        ModuleAlias(InspIRCd* Me)
                : Module(Me)
        {
@@ -85,7 +84,7 @@ class ModuleAlias : public Module
 
        virtual Version GetVersion()
        {
-               return Version(1,2,0,1,VF_VENDOR,API_VERSION);
+               return Version("$Id$", VF_VENDOR,API_VERSION);
        }
 
        std::string GetVar(std::string varname, const std::string &original_line)
@@ -157,8 +156,16 @@ class ModuleAlias : public Module
                                /* Does it match the pattern? */
                                if (!Aliases[i].format.empty())
                                {
-                                       if (!match(Aliases[i].case_sensitive, compare, Aliases[i].format))
-                                               continue;
+                                       if (Aliases[i].case_sensitive)
+                                       {
+                                               if (InspIRCd::Match(compare, Aliases[i].format, case_sensitive_map))
+                                                       continue;
+                                       }
+                                       else
+                                       {
+                                               if (InspIRCd::Match(compare, Aliases[i].format))
+                                                       continue;
+                                       }
                                }
 
                                if ((Aliases[i].operonly) && (!IS_OPER(user)))
@@ -177,7 +184,7 @@ class ModuleAlias : public Module
                                {
                                        if (!ServerInstance->ULine(u->server))
                                        {
-                                               ServerInstance->SNO->WriteToSnoMask('A', "NOTICE -- Service "+Aliases[i].requires+" required by alias "+std::string(Aliases[i].text.c_str())+" is not on a u-lined server, possibly underhanded antics detected!"); 
+                                               ServerInstance->SNO->WriteToSnoMask('A', "NOTICE -- Service "+Aliases[i].requires+" required by alias "+std::string(Aliases[i].text.c_str())+" is not on a u-lined server, possibly underhanded antics detected!");
                                                user->WriteNumeric(401, ""+std::string(user->nick)+" "+Aliases[i].requires+" :is an imposter! Please inform an IRC operator as soon as possible.");
                                                return 1;
                                        }
@@ -255,7 +262,7 @@ class ModuleAlias : public Module
                }
                ServerInstance->Parser->CallHandler(command, pars, user);
        }
- 
+
        virtual void OnRehash(User* user, const std::string &parameter)
        {
                ReadAliases();