A few more I missed.

[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 4e32f2856a9d11dde7d142ec2b5a61a0444b9b55..94c64b4055868754377e406f6f7ba9d19f9aa173 100644 (file)
--- a/src/modules/m_alias.cpp
+++ b/src/modules/m_alias.cpp
@@ -11,11 +11,11 @@
  * ---------------------------------------------------
  */
 
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "inspircd.h"
-#include <vector>
+#include "wildcard.h"
 
 /* $ModDesc: Provides aliases of commands. */
 
@@ -34,6 +34,8 @@ class Alias : public classbase
        bool uline;
        /** Requires oper? */
        bool operonly;
+       /* is case sensitive params */
+       bool case_sensitive;
        /** Format that must be matched for use */
        std::string format;
 };
@@ -43,6 +45,7 @@ class ModuleAlias : public Module
  private:
        /** We cant use a map, there may be multiple aliases with the same name */
        std::vector<Alias> Aliases;
+       std::map<std::string, int> AliasMap;
        std::vector<std::string> pars;
 
        virtual void ReadAliases()
@@ -50,6 +53,7 @@ class ModuleAlias : public Module
                ConfigReader MyConf(ServerInstance);
 
                Aliases.clear();
+               AliasMap.clear();
                for (int i = 0; i < MyConf.Enumerate("alias"); i++)
                {
                        Alias a;
@@ -61,14 +65,16 @@ class ModuleAlias : public Module
                        a.uline = MyConf.ReadFlag("alias", "uline", i);
                        a.operonly = MyConf.ReadFlag("alias", "operonly", i);
                        a.format = MyConf.ReadValue("alias", "format", i);
+                       a.case_sensitive = MyConf.ReadFlag("alias", "matchcase", i);
                        Aliases.push_back(a);
+                       AliasMap[txt] = 1;
                }
        }
 
  public:
        
        ModuleAlias(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {
                ReadAliases();
                pars.resize(127);
@@ -95,9 +101,7 @@ class ModuleAlias : public Module
                int index = *(varname.begin()) - 48;
                varname.erase(varname.begin());
                bool everything_after = (varname == "-");
-               std::string word = "";
-
-               ServerInstance->Log(DEBUG,"Get var %d%s", index , everything_after ? " and all after it" : "");
+               std::string word;
 
                for (int j = 0; j < index; j++)
                        word = ss.GetToken();
@@ -112,8 +116,6 @@ class ModuleAlias : public Module
                        }
                }
 
-               ServerInstance->Log(DEBUG,"Var is '%s'", word.c_str());
-
                return word;
        }
 
@@ -132,11 +134,14 @@ class ModuleAlias : public Module
        {
                userrec *u = NULL;
 
-               /* If the command is valid, we dont want to know,
-                * and if theyre not registered yet, we dont want
-                * to know either
+               /* If theyre not registered yet, we dont want
+                * to know.
                 */
-               if ((validated) || (user->registered != REG_ALL))
+               if (user->registered != REG_ALL)
+                       return 0;
+
+               /* We dont have any commands looking like this, dont bother with the loop */
+               if (AliasMap.find(command) == AliasMap.end())
                        return 0;
 
                irc::string c = command.c_str();
@@ -156,15 +161,16 @@ class ModuleAlias : public Module
                        if (Aliases[i].text == c)
                        {
                                /* Does it match the pattern? */
-                               if ((!Aliases[i].format.empty()) && (!ServerInstance->MatchText(compare, Aliases[i].format)))
+                               if (!Aliases[i].format.empty())
                                {
-                                       continue;
+                                       if (!match(Aliases[i].case_sensitive, compare.c_str(), Aliases[i].format.c_str()))
+                                               continue;
                                }
 
-                               if ((Aliases[i].operonly) && (!*user->oper))
+                               if ((Aliases[i].operonly) && (!IS_OPER(user)))
                                        return 0;
 
-                               if (Aliases[i].requires != "")
+                               if (!Aliases[i].requires.empty())
                                {
                                        u = ServerInstance->FindNick(Aliases[i].requires);
                                        if (!u)
@@ -173,7 +179,7 @@ class ModuleAlias : public Module
                                                return 1;
                                        }
                                }
-                               if ((u != NULL) && (Aliases[i].requires != "") && (Aliases[i].uline))
+                               if ((u != NULL) && (!Aliases[i].requires.empty()) && (Aliases[i].uline))
                                {
                                        if (!ServerInstance->ULine(u->server))
                                        {
@@ -189,18 +195,15 @@ class ModuleAlias : public Module
 
                                if (crlf == std::string::npos)
                                {
-                                       ServerInstance->Log(DEBUG,"Single line alias: '%s'", Aliases[i].replace_with.c_str());
                                        DoCommand(Aliases[i].replace_with, user, safe);
                                        return 1;
                                }
                                else
                                {
-                                       ServerInstance->Log(DEBUG,"Multi line alias: '%s'", Aliases[i].replace_with.c_str());
                                        irc::sepstream commands(Aliases[i].replace_with, '\n');
                                        std::string command = "*";
                                        while ((command = commands.GetToken()) != "")
                                        {
-                                               ServerInstance->Log(DEBUG,"Execute: '%s'", command.c_str());
                                                DoCommand(command, user, safe);
                                        }
                                        return 1;
@@ -251,52 +254,19 @@ class ModuleAlias : public Module
                const char* parv[127];
                int x = 0;
 
-               while ((pars[x] = ss.GetToken()) != "")
+               while (ss.GetToken(pars[x]))
                {
                        parv[x] = pars[x].c_str();
-                       ServerInstance->Log(DEBUG,"Parameter %d: %s", x, parv[x]);
                        x++;
                }
 
-               ServerInstance->Log(DEBUG,"Call command handler on %s", parv[0]);
-
-               if (ServerInstance->Parser->CallHandler(parv[0], &parv[1], x-1, user) == CMD_INVALID)
-               {
-                       ServerInstance->Log(DEBUG,"Unknown command or not enough parameters");
-               }
-               else
-               {
-                       ServerInstance->Log(DEBUG,"Command handler called successfully.");
-               }
+               ServerInstance->Parser->CallHandler(parv[0], &parv[1], x-1, user);
        }
  
-       virtual void OnRehash(const std::string &parameter)
+       virtual void OnRehash(userrec* user, const std::string &parameter)
        {
                ReadAliases();
        }
 };
 
-
-class ModuleAliasFactory : public ModuleFactory
-{
- public:
-       ModuleAliasFactory()
-       {
-       }
-
-       ~ModuleAliasFactory()
-       {
-       }
-
-               virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleAlias(Me);
-       }
-};
-
-
-extern "C" void * init_module( void )
-{
-       return new ModuleAliasFactory;
-}
-
+MODULE_INIT(ModuleAlias)