X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_alias.cpp;h=6ee50ea0727120976c3ef8db9b2679da17653f25;hb=fea1a27cb96a114f698eedcf90401b78406108fb;hp=837750da85fa6a9bf9c7e7648f7ae3ee7c7c2d99;hpb=090e7863df54f91ab206141ef5ef9395afcbd752;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp
index 837750da8..6ee50ea07 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,14 +19,15 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
+#include "helperfuncs.h"
 #include <vector>
 
 /* $ModDesc: Provides aliases of commands. */
 
-class Alias
+class Alias : public classbase
 {
 	public:
- 		std::string text;
+ 		irc::string text;
 	 	std::string replace_with;
 	 	std::string requires;
 	 	bool uline;
@@ -38,8 +39,7 @@ class ModuleAlias : public Module
 		Server *Srv;
 		ConfigReader *MyConf;
 		std::vector<Alias> Aliases;
-	public:
-		/* XXX - small issue, why is this marked public when it's not (really) intended for external use */
+
  		virtual void ReadAliases()
 		{
 			Aliases.clear();
@@ -47,7 +47,9 @@ class ModuleAlias : public Module
 			for (int i = 0; i < MyConf->Enumerate("alias"); i++)
 			{
 				Alias a;
-				a.text = MyConf->ReadValue("alias", "text", i);
+				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);
 			
@@ -59,19 +61,25 @@ class ModuleAlias : public Module
 			}
 	
 		}
+
+	public:
 	
-		ModuleAlias()
+		ModuleAlias(Server* Me)
+			: Module::Module(Me)
 		{
-			Srv = new Server;
+			Srv = Me;
 			MyConf = new ConfigReader;
-
 			ReadAliases();
 		}
+
+		void Implements(char* List)
+		{
+			List[I_OnPreCommand] = List[I_OnRehash] = 1;
+		}
 	
 		virtual ~ModuleAlias()
 		{
-			delete Srv;
-			delete MyConf;
+			DELETE(MyConf);
 		}
 	
 		virtual Version GetVersion()
@@ -79,62 +87,70 @@ class ModuleAlias : public Module
 			return Version(1,0,0,1,VF_VENDOR);
 		}
 
-
-		virtual void OnServerRaw(std::string &raw, bool inbound, userrec* user)
+		virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated)
 		{
-			char data[MAXBUF];
-			char *dptr;
 			userrec *u = NULL;
+			irc::string c = command.c_str();
 
-			if (inbound)
-			{
-				strncpy(data, raw.c_str(),MAXBUF);
-				dptr = data;
+			/* 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++)
+			for (unsigned int i = 0; i < Aliases.size(); i++)
+			{
+				if (Aliases[i].text == c)
 				{
-					if (!strncasecmp(Aliases[i].text.c_str(),data,Aliases[i].text.length()))
+					if (Aliases[i].requires != "")
 					{
-						if (Aliases[i].requires != "")
-						{
-							u = Srv->FindNick(Aliases[i].requires);
-						}
-					
-						if ((Aliases[i].requires != "") && (!u))
+						u = Srv->FindNick(Aliases[i].requires);
+						if (!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;
+							user->WriteServ("401 "+std::string(user->nick)+" "+Aliases[i].requires+" :is currently unavailable. Please try again later.");
+							return 1;
 						}
-						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
+					}
+					if ((u != NULL) && (Aliases[i].requires != "") && (Aliases[i].uline))
+					{
+						if (!Srv->IsUlined(u->server))
 						{
-							raw = Aliases[i].replace_with;
+							Srv->SendOpers("*** 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;
 						}
-						return;
 					}
+
+					std::string n = "";
+					for (int j = 0; j < pcnt; j++)
+					{
+						if (j)
+							n = n + " ";
+						n = n + parameters[j];
+					}
+					/* 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();
+
+					Srv->CallCommandHandler(cmd,para,2,user);
+					return 1;
 				}
 			}
+			return 0;
 	 	}
   
-		virtual void OnRehash()
+		virtual void OnRehash(const std::string &parameter)
 		{
-			delete MyConf;
+			DELETE(MyConf);
 			MyConf = new ConfigReader;
 		
 			ReadAliases();
@@ -153,9 +169,9 @@ class ModuleAliasFactory : public ModuleFactory
 		{
 		}
 	
-		virtual Module * CreateModule()
+		virtual Module * CreateModule(Server* Me)
 		{
-			return new ModuleAlias;
+			return new ModuleAlias(Me);
 		}
 };