X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_alias.cpp;h=88e07e2d0f677076df7eb7e786ce393375c86140;hb=124bc04e841f9ca527b99c37563f19a85dec63fc;hp=d7ac3d04a3c74793d4d3885b2983c010e36e4253;hpb=d54fd9b1e6b31f69332a9241b5f17330c0ad61e0;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp
index d7ac3d04a..88e07e2d0 100644
--- a/src/modules/m_alias.cpp
+++ b/src/modules/m_alias.cpp
@@ -24,38 +24,45 @@ using namespace std;
 
 /* $ModDesc: Provides aliases of commands. */
 
+/** An alias definition
+ */
 class Alias : public classbase
 {
  public:
+	/** The text of the alias command */
 	irc::string text;
+	/** Text to replace with */
 	std::string replace_with;
+	/** Nickname required to perform alias */
 	std::string requires;
+	/** Alias requires ulined server */
 	bool uline;
+	/** Requires oper? */
+	bool operonly;
 };
 
 class ModuleAlias : public Module
 {
  private:
-	ConfigReader *MyConf;
 	std::vector<Alias> Aliases;
+	std::vector<std::string> pars;
 
 	virtual void ReadAliases()
 	{
+		ConfigReader MyConf(ServerInstance);
+
 		Aliases.clear();
 	
-		for (int i = 0; i < MyConf->Enumerate("alias"); i++)
+		for (int i = 0; i < MyConf.Enumerate("alias"); i++)
 		{
 			Alias a;
 			std::string txt;
-			txt = MyConf->ReadValue("alias", "text", i);
+			txt = MyConf.ReadValue("alias", "text", i);
 			a.text = txt.c_str();
-			a.replace_with = MyConf->ReadValue("alias", "replace", i);
-			a.requires = MyConf->ReadValue("alias", "requires", i);
-		
-			a.uline =	((MyConf->ReadValue("alias", "uline", i) == "yes") ||
-					(MyConf->ReadValue("alias", "uline", i) == "1") ||
-						(MyConf->ReadValue("alias", "uline", i) == "true"));
-					
+			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);
 		}
 
@@ -66,9 +73,8 @@ class ModuleAlias : public Module
 	ModuleAlias(InspIRCd* Me)
 		: Module::Module(Me)
 	{
-		
-		MyConf = new ConfigReader(ServerInstance);
 		ReadAliases();
+		pars.resize(127);
 	}
 
 	void Implements(char* List)
@@ -78,15 +84,54 @@ class ModuleAlias : public Module
 
 	virtual ~ModuleAlias()
 	{
-		DELETE(MyConf);
 	}
 
 	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)
+	{
+		irc::spacesepstream ss(original_line);
+		varname.erase(varname.begin());
+		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" : "");
+
+		for (int j = 0; j < index; j++)
+			word = ss.GetToken();
+
+		if (everything_after)
+		{
+			std::string more = "*";
+			while ((more = ss.GetToken()) != "")
+			{
+				word.append(" ");
+				word.append(more);
+			}
+		}
+
+		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)
+	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();
@@ -101,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);
@@ -119,34 +167,90 @@ class ModuleAlias : public Module
 						return 1;
 					}
 				}
-					std::string n = "";
-				for (int j = 0; j < pcnt; j++)
+
+				/* Now, search and replace in a copy of the original_line, replacing $1 through $9 and $1- etc */
+
+				std::string::size_type crlf = Aliases[i].replace_with.find('\n');
+
+				if (crlf == std::string::npos)
 				{
-					if (j)
-						n = n + " ";
-					n = n + parameters[j];
+					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()) != "")
+					{
+						DoCommand(command, user, original_line);
+					}
+					return 1;
 				}
-				/* Final param now in n as one string */
-				std::stringstream stuff(Aliases[i].replace_with);
-					std::string cmd = "";
-				std::string target = "";
-				stuff >> cmd;
-				stuff >> target;
-					const char* para[2];
-				para[0] = target.c_str();
-				para[1] = n.c_str();
-					ServerInstance->CallCommandHandler(cmd,para,2,user);
-				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);
+
+			while (x != std::string::npos)
+			{
+				newline.erase(x, var.length());
+				newline.insert(x, GetVar(var, original_line));
+				x = newline.find(var);
+			}
+
+			var = "$";
+			var.append(ConvToStr(v));
+			x = newline.find(var);
+
+			while (x != std::string::npos)
+			{
+				newline.erase(x, var.length());
+				newline.insert(x, GetVar(var, original_line));
+				x = newline.find(var);
+			}
+		}
+
+		/* 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)
 	{
-		DELETE(MyConf);
-		MyConf = new ConfigReader(ServerInstance);
-	
 		ReadAliases();
  	}
 };