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

diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp
index 6eda35f13..88e07e2d0 100644
--- a/src/modules/m_alias.cpp
+++ b/src/modules/m_alias.cpp
@@ -2,7 +2,7 @@
  *   | Inspire Internet Relay Chat Daemon |
  *   +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *   E-mail:
  *	<brain@chatspike.net>
  *	<Craig@chatspike.net>
@@ -19,147 +19,258 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
+#include "inspircd.h"
 #include <vector>
 
 /* $ModDesc: Provides aliases of commands. */
 
-class Alias
+/** An alias definition
+ */
+class Alias : public classbase
 {
-	public:
- 		std::string text;
-	 	std::string replace_with;
-	 	std::string requires;
-	 	bool uline;
+ 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:
-		Server *Srv;
-		ConfigReader *MyConf;
-		std::vector<Alias> Aliases;
-
-		/* XXX - small issue, why is this marked public when it's not (really) intended for external use
-		 * Fixed 30/11/05 by Brain as suggestion by w00t */
- 		virtual void ReadAliases()
-		{
-			Aliases.clear();
-		
-			for (int i = 0; i < MyConf->Enumerate("alias"); i++)
-			{
-				Alias a;
-				a.text = MyConf->ReadValue("alias", "text", i);
-				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"));
- 					
-				Aliases.push_back(a);
-			}
-	
-		}
+ private:
+	std::vector<Alias> Aliases;
+	std::vector<std::string> pars;
 
-	public:
-	
-		ModuleAlias()
-		{
-			Srv = new Server;
-			MyConf = new ConfigReader;
+	virtual void ReadAliases()
+	{
+		ConfigReader MyConf(ServerInstance);
 
-			ReadAliases();
-		}
+		Aliases.clear();
 	
-		virtual ~ModuleAlias()
+		for (int i = 0; i < MyConf.Enumerate("alias"); i++)
 		{
-			delete Srv;
-			delete MyConf;
+			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.requires = MyConf.ReadValue("alias", "requires", i);
+			a.uline = MyConf.ReadFlag("alias", "uline", i);
+			a.operonly = MyConf.ReadFlag("alias", "operonly", i);
+			Aliases.push_back(a);
 		}
+
+	}
+
+ public:
 	
-		virtual Version GetVersion()
+	ModuleAlias(InspIRCd* Me)
+		: Module::Module(Me)
+	{
+		ReadAliases();
+		pars.resize(127);
+	}
+
+	void Implements(char* List)
+	{
+		List[I_OnPreCommand] = List[I_OnRehash] = 1;
+	}
+
+	virtual ~ModuleAlias()
+	{
+	}
+
+	virtual Version GetVersion()
+	{
+		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)
 		{
-			return Version(1,0,0,1,VF_VENDOR);
+			std::string more = "*";
+			while ((more = ss.GetToken()) != "")
+			{
+				word.append(" ");
+				word.append(more);
+			}
 		}
 
+		ServerInstance->Log(DEBUG,"Var is '%s'", word.c_str());
 
-		virtual void OnServerRaw(std::string &raw, bool inbound, userrec* user)
+		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)
 		{
-			char data[MAXBUF];
-			char *dptr;
-			userrec *u = NULL;
+			newline.erase(x, find.length());
+			newline.insert(x, replace);
+			x = newline.find(find);
+		}
+	}
 
-			if (inbound)
+	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 ((validated) || (user->registered != REG_ALL))
+			return 0;
+		
+		for (unsigned int i = 0; i < Aliases.size(); i++)
+		{
+			if (Aliases[i].text == c)
 			{
-				strncpy(data, raw.c_str(),MAXBUF);
-				dptr = data;
-			
-				for (unsigned int i = 0; i < Aliases.size(); i++)
+				if ((Aliases[i].operonly) && (!*user->oper))
+					return 0;
+
+				if (Aliases[i].requires != "")
+				{
+					u = ServerInstance->FindNick(Aliases[i].requires);
+					if (!u)
+					{
+						user->WriteServ("401 "+std::string(user->nick)+" "+Aliases[i].requires+" :is currently unavailable. Please try again later.");
+						return 1;
+					}
+				}
+				if ((u != NULL) && (Aliases[i].requires != "") && (Aliases[i].uline))
 				{
-					if (!strncasecmp(Aliases[i].text.c_str(),data,Aliases[i].text.length()))
+					if (!ServerInstance->ULine(u->server))
 					{
-						if (Aliases[i].requires != "")
-						{
-							u = Srv->FindNick(Aliases[i].requires);
-						}
-					
-						if ((Aliases[i].requires != "") && (!u))
-						{
-							Srv->SendServ(user->fd,"401 "+std::string(user->nick)+" "+Aliases[i].requires+" :is currently unavailable. Please try again later.");
-							raw = "PONG :"+Srv->GetServerName();
-							return;
-						}
-						if (Aliases[i].uline)
-						{
-							if (!Srv->IsUlined(u->server))
-							{
-								Srv->SendOpers("*** NOTICE -- Service "+Aliases[i].requires+" required by alias "+Aliases[i].text+" is not on a u-lined server, possibly underhanded antics detected!"); 
-								Srv->SendServ(user->fd,"401 "+std::string(user->nick)+" "+Aliases[i].requires+" :is an imposter! Please inform an IRC operator as soon as possible.");
-								raw = "PONG :"+Srv->GetServerName();
-								return;
-							}
-						}
-					
-						dptr += Aliases[i].text.length();
-						if (strlen(dptr))
-						{
-							raw = Aliases[i].replace_with + std::string(dptr);
-						}
-						else
-						{
-							raw = Aliases[i].replace_with;
-						}
-						return;
+						ServerInstance->WriteOpers("*** 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->WriteServ("401 "+std::string(user->nick)+" "+Aliases[i].requires+" :is an imposter! Please inform an IRC operator as soon as possible.");
+						return 1;
 					}
 				}
+
+				/* 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)
+				{
+					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;
+				}
 			}
-	 	}
-  
-		virtual void OnRehash(std::string parameter)
+		}
+		return 0;
+	}
+
+	void DoCommand(std::string newline, userrec* user, const std::string &original_line)
+	{
+		for (int v = 1; v < 10; v++)
 		{
-			delete MyConf;
-			MyConf = new ConfigReader;
-		
-			ReadAliases();
-  		}
-};
+			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);
 
-class ModuleAliasFactory : public ModuleFactory
-{
-	public:
-		ModuleAliasFactory()
+			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++;
 		}
-	
-		~ModuleAliasFactory()
+
+		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");
 		}
-	
-		virtual Module * CreateModule()
+		else
 		{
-			return new ModuleAlias;
+			ServerInstance->Log(DEBUG,"Command handler called successfully.");
 		}
+	}
+ 
+	virtual void OnRehash(const std::string &parameter)
+	{
+		ReadAliases();
+ 	}
+};
+
+
+class ModuleAliasFactory : public ModuleFactory
+{
+ public:
+	ModuleAliasFactory()
+	{
+	}
+
+	~ModuleAliasFactory()
+	{
+	}
+
+		virtual Module * CreateModule(InspIRCd* Me)
+	{
+		return new ModuleAlias(Me);
+	}
 };