Fix these too!

[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 d1c119feb33076de47f86df7e735b8b4beb8ee4a..88e07e2d0f677076df7eb7e786ce393375c86140 100644 (file)
--- a/src/modules/m_alias.cpp
+++ b/src/modules/m_alias.cpp
@@ -37,6 +37,8 @@ class Alias : public classbase
        std::string requires;
        /** Alias requires ulined server */
        bool uline;
+       /** Requires oper? */
+       bool operonly;
 };
 
 class ModuleAlias : public Module
@@ -60,7 +62,7 @@ class ModuleAlias : public Module
                        a.replace_with = MyConf.ReadValue("alias", "replace", i);
                        a.requires = MyConf.ReadValue("alias", "requires", i);
                        a.uline = MyConf.ReadFlag("alias", "uline", i);
-       
+                       a.operonly = MyConf.ReadFlag("alias", "operonly", i);
                        Aliases.push_back(a);
                }
 
@@ -86,7 +88,7 @@ class ModuleAlias : public Module
 
        virtual Version GetVersion()
        {
-               return Version(1,0,0,1,VF_VENDOR);
+               return Version(1,1,0,1,VF_VENDOR,API_VERSION);
        }
 
        std::string GetVar(std::string varname, const std::string &original_line)
@@ -97,7 +99,9 @@ class ModuleAlias : public Module
                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" : "");
+
                for (int j = 0; j < index; j++)
                        word = ss.GetToken();
 
@@ -111,9 +115,22 @@ class ModuleAlias : public Module
                        }
                }
 
+               ServerInstance->Log(DEBUG,"Var is '%s'", word.c_str());
+
                return word;
        }
 
+       void SearchAndReplace(std::string& newline, const std::string &find, const std::string &replace)
+       {
+               std::string::size_type x = newline.find(find);
+               while (x != std::string::npos)
+               {
+                       newline.erase(x, find.length());
+                       newline.insert(x, replace);
+                       x = newline.find(find);
+               }
+       }
+
        virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line)
        {
                userrec *u = NULL;
@@ -129,6 +146,9 @@ class ModuleAlias : public Module
                {
                        if (Aliases[i].text == c)
                        {
+                               if ((Aliases[i].operonly) && (!*user->oper))
+                                       return 0;
+
                                if (Aliases[i].requires != "")
                                {
                                        u = ServerInstance->FindNick(Aliases[i].requires);
@@ -150,36 +170,84 @@ class ModuleAlias : public Module
 
                                /* Now, search and replace in a copy of the original_line, replacing $1 through $9 and $1- etc */
 
-                               std::string newline = Aliases[i].replace_with;
+                               std::string::size_type crlf = Aliases[i].replace_with.find('\n');
 
-                               for (int var = 1; var < 10; var++)
+                               if (crlf == std::string::npos)
                                {
-                                       std::string var = "$" + ConvToStr(var) + "-";
-                                       std::string::size_type x = newline.find(var);
-
-                                       while (x != std::string::npos)
+                                       DoCommand(Aliases[i].replace_with, user, original_line);
+                                       return 1;
+                               }
+                               else
+                               {
+                                       irc::sepstream commands(Aliases[i].replace_with, '\n');
+                                       std::string command = "*";
+                                       while ((command = commands.GetToken()) != "")
                                        {
-                                               newline.erase(x, var.length());
-                                               newline.insert(x, GetVar(var, original_line));
+                                               DoCommand(command, user, original_line);
                                        }
+                                       return 1;
                                }
+                       }
+               }
+               return 0;
+       }
+
+       void DoCommand(std::string newline, userrec* user, const std::string &original_line)
+       {
+               for (int v = 1; v < 10; v++)
+               {
+                       std::string var = "$";
+                       var.append(ConvToStr(v));
+                       var.append("-");
+                       std::string::size_type x = newline.find(var);
 
-                               irc::tokenstream ss(newline);
-                               const char* parv[127];
-                               int x = 0;
+                       while (x != std::string::npos)
+                       {
+                               newline.erase(x, var.length());
+                               newline.insert(x, GetVar(var, original_line));
+                               x = newline.find(var);
+                       }
 
-                               while ((pars[x] = ss.GetToken()) != "")
-                               {
-                                       parv[x] = pars[x].c_str();
-                                       x++;
-                               }
+                       var = "$";
+                       var.append(ConvToStr(v));
+                       x = newline.find(var);
 
-                               ServerInstance->CallCommandHandler(parv[0], &parv[1], x-2, user);
-                               return 1;
+                       while (x != std::string::npos)
+                       {
+                               newline.erase(x, var.length());
+                               newline.insert(x, GetVar(var, original_line));
+                               x = newline.find(var);
                        }
                }
-               return 0;
-       }
+
+               /* Special variables */
+               SearchAndReplace(newline, "$nick", user->nick);
+               SearchAndReplace(newline, "$ident", user->ident);
+               SearchAndReplace(newline, "$host", user->host);
+               SearchAndReplace(newline, "$vhost", user->dhost);
+
+               irc::tokenstream ss(newline);
+               const char* parv[127];
+               int x = 0;
+
+               while ((pars[x] = ss.GetToken()) != "")
+               {
+                       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.");
+               }
+       }
  
        virtual void OnRehash(const std::string &parameter)
        {