X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_alias.cpp;h=3893ad5bf3b22df33072b95a18000a3782669b9a;hb=7f00015727fab50e37de46aa90d218b31c852c87;hp=c2b26db5278281f071a4e8c8b725fb147f1f53cf;hpb=3a554ef1e9be9dbcf3de3301a4a6c2938d643bea;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp
index c2b26db52..3893ad5bf 100644
--- a/src/modules/m_alias.cpp
+++ b/src/modules/m_alias.cpp
@@ -15,6 +15,7 @@
 #include "channels.h"
 #include "modules.h"
 #include "inspircd.h"
+#include "wildcard.h"
 #include <vector>
 
 /* $ModDesc: Provides aliases of commands. */
@@ -34,12 +35,18 @@ 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;
 };
 
 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()
@@ -47,20 +54,22 @@ class ModuleAlias : public Module
 		ConfigReader MyConf(ServerInstance);
 
 		Aliases.clear();
-	
+		AliasMap.clear();
 		for (int i = 0; i < MyConf.Enumerate("alias"); i++)
 		{
 			Alias a;
 			std::string txt;
 			txt = MyConf.ReadValue("alias", "text", i);
 			a.text = txt.c_str();
-			a.replace_with = MyConf.ReadValue("alias", "replace", i);
+			a.replace_with = MyConf.ReadValue("alias", "replace", i, true);
 			a.requires = MyConf.ReadValue("alias", "requires", i);
 			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:
@@ -95,8 +104,6 @@ class ModuleAlias : public Module
 		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();
 
@@ -110,8 +117,6 @@ class ModuleAlias : public Module
 			}
 		}
 
-		ServerInstance->Log(DEBUG,"Var is '%s'", word.c_str());
-
 		return word;
 	}
 
@@ -129,18 +134,40 @@ class ModuleAlias : public Module
 	virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line)
 	{
 		userrec *u = NULL;
-		irc::string c = command.c_str();
-		/* 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();
+		/* The parameters for the command in their original form, with the command stripped off */
+		std::string compare = original_line.substr(command.length());
+		while (*(compare.c_str()) == ' ')
+			compare.erase(compare.begin());
+
+		std::string safe(original_line);
+
+		/* Escape out any $ symbols in the user provided text */
+
+		SearchAndReplace(safe, "$", "\r");
+
 		for (unsigned int i = 0; i < Aliases.size(); i++)
 		{
 			if (Aliases[i].text == c)
 			{
+				/* Does it match the pattern? */
+				if (!Aliases[i].format.empty())
+				{
+					if (!match(Aliases[i].case_sensitive, compare.c_str(), Aliases[i].format.c_str()))
+						continue;
+				}
+
 				if ((Aliases[i].operonly) && (!*user->oper))
 					return 0;
 
@@ -169,7 +196,7 @@ class ModuleAlias : public Module
 
 				if (crlf == std::string::npos)
 				{
-					DoCommand(Aliases[i].replace_with, user, original_line);
+					DoCommand(Aliases[i].replace_with, user, safe);
 					return 1;
 				}
 				else
@@ -178,7 +205,7 @@ class ModuleAlias : public Module
 					std::string command = "*";
 					while ((command = commands.GetToken()) != "")
 					{
-						DoCommand(command, user, original_line);
+						DoCommand(command, user, safe);
 					}
 					return 1;
 				}
@@ -221,30 +248,23 @@ class ModuleAlias : public Module
 		SearchAndReplace(newline, "$host", user->host);
 		SearchAndReplace(newline, "$vhost", user->dhost);
 
+		/* Unescape any variable names in the user text before sending */
+		SearchAndReplace(newline, "\r", "$");
+
 		irc::tokenstream ss(newline);
 		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();
  	}