X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_alias.cpp;h=e0e4e647797aba3e1d8f2b5902f8094fd342bb28;hb=bc344671460c1675fbc31504fd1ffc03ff58a135;hp=3893ad5bf3b22df33072b95a18000a3782669b9a;hpb=5870145ac255da65f5bf4ff0fae4715cbb930ec9;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp
index 3893ad5bf..e0e4e6477 100644
--- a/src/modules/m_alias.cpp
+++ b/src/modules/m_alias.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -11,12 +11,8 @@
  * ---------------------------------------------------
  */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
 #include "wildcard.h"
-#include <vector>
 
 /* $ModDesc: Provides aliases of commands. */
 
@@ -75,15 +71,12 @@ class ModuleAlias : public Module
  public:
 	
 	ModuleAlias(InspIRCd* Me)
-		: Module::Module(Me)
+		: Module(Me)
 	{
 		ReadAliases();
-		pars.resize(127);
-	}
+		Me->Modules->Attach(I_OnPreCommand, this);
+		Me->Modules->Attach(I_OnRehash, this);
 
-	void Implements(char* List)
-	{
-		List[I_OnPreCommand] = List[I_OnRehash] = 1;
 	}
 
 	virtual ~ModuleAlias()
@@ -92,7 +85,7 @@ class ModuleAlias : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+		return Version(1,2,0,1,VF_VENDOR,API_VERSION);
 	}
 
 	std::string GetVar(std::string varname, const std::string &original_line)
@@ -102,15 +95,15 @@ class ModuleAlias : public Module
 		int index = *(varname.begin()) - 48;
 		varname.erase(varname.begin());
 		bool everything_after = (varname == "-");
-		std::string word = "";
+		std::string word;
 
 		for (int j = 0; j < index; j++)
-			word = ss.GetToken();
+			ss.GetToken(word);
 
 		if (everything_after)
 		{
-			std::string more = "*";
-			while ((more = ss.GetToken()) != "")
+			std::string more;
+			while (ss.GetToken(more))
 			{
 				word.append(" ");
 				word.append(more);
@@ -131,9 +124,9 @@ 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)
+	virtual int OnPreCommand(const std::string &command, const std::vector<std::string> &parameters, User *user, bool validated, const std::string &original_line)
 	{
-		userrec *u = NULL;
+		User *u = NULL;
 
 		/* If theyre not registered yet, we dont want
 		 * to know.
@@ -168,24 +161,24 @@ class ModuleAlias : public Module
 						continue;
 				}
 
-				if ((Aliases[i].operonly) && (!*user->oper))
+				if ((Aliases[i].operonly) && (!IS_OPER(user)))
 					return 0;
 
-				if (Aliases[i].requires != "")
+				if (!Aliases[i].requires.empty())
 				{
 					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.");
+						user->WriteNumeric(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 ((u != NULL) && (!Aliases[i].requires.empty()) && (Aliases[i].uline))
 				{
 					if (!ServerInstance->ULine(u->server))
 					{
-						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.");
+						ServerInstance->SNO->WriteToSnoMask('A', "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->WriteNumeric(401, ""+std::string(user->nick)+" "+Aliases[i].requires+" :is an imposter! Please inform an IRC operator as soon as possible.");
 						return 1;
 					}
 				}
@@ -202,10 +195,10 @@ class ModuleAlias : public Module
 				else
 				{
 					irc::sepstream commands(Aliases[i].replace_with, '\n');
-					std::string command = "*";
-					while ((command = commands.GetToken()) != "")
+					std::string scommand;
+					while (commands.GetToken(scommand))
 					{
-						DoCommand(command, user, safe);
+						DoCommand(scommand, user, safe);
 					}
 					return 1;
 				}
@@ -214,7 +207,7 @@ class ModuleAlias : public Module
 		return 0;
 	}
 
-	void DoCommand(std::string newline, userrec* user, const std::string &original_line)
+	void DoCommand(std::string newline, User* user, const std::string &original_line)
 	{
 		for (int v = 1; v < 10; v++)
 		{
@@ -252,45 +245,21 @@ class ModuleAlias : public Module
 		SearchAndReplace(newline, "\r", "$");
 
 		irc::tokenstream ss(newline);
-		const char* parv[127];
-		int x = 0;
+		pars.clear();
+		std::string command, token;
 
-		while (ss.GetToken(pars[x]))
+		ss.GetToken(command);
+		while (ss.GetToken(token) && (pars.size() <= MAXPARAMETERS))
 		{
-			parv[x] = pars[x].c_str();
-			x++;
+			pars.push_back(token);
 		}
-
-		ServerInstance->Parser->CallHandler(parv[0], &parv[1], x-1, user);
+		ServerInstance->Parser->CallHandler(command, pars, user);
 	}
  
-	virtual void OnRehash(userrec* user, const std::string &parameter)
+	virtual void OnRehash(User* user, const std::string &parameter)
 	{
 		ReadAliases();
  	}
 };
 
-
-class ModuleAliasFactory : public ModuleFactory
-{
- public:
-	ModuleAliasFactory()
-	{
-	}
-
-	~ModuleAliasFactory()
-	{
-	}
-
-		virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleAlias(Me);
-	}
-};
-
-
-extern "C" void * init_module( void )
-{
-	return new ModuleAliasFactory;
-}
-
+MODULE_INIT(ModuleAlias)