X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_alias.cpp;h=2bf4440b0821cb30712e634b9803f705f6bbd292;hb=78fa4165c90088523e623ab2b64ca0db0d19def0;hp=e8fe736c4d0c02103e792c711496301135389d15;hpb=0c828ad6d498a15f42b1d281ea979135a91b87e2;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp
index e8fe736c4..2bf4440b0 100644
--- a/src/modules/m_alias.cpp
+++ b/src/modules/m_alias.cpp
@@ -11,12 +11,11 @@
  * ---------------------------------------------------
  */
 
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "inspircd.h"
 #include "wildcard.h"
-#include <vector>
 
 /* $ModDesc: Provides aliases of commands. */
 
@@ -75,10 +74,10 @@ class ModuleAlias : public Module
  public:
 	
 	ModuleAlias(InspIRCd* Me)
-		: Module::Module(Me)
+		: Module(Me)
 	{
 		ReadAliases();
-		pars.resize(127);
+		pars.resize(MAXPARAMETERS);
 	}
 
 	void Implements(char* List)
@@ -102,25 +101,21 @@ class ModuleAlias : public Module
 		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" : "");
+		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);
 			}
 		}
 
-		ServerInstance->Log(DEBUG,"Var is '%s'", word.c_str());
-
 		return word;
 	}
 
@@ -172,10 +167,10 @@ 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)
@@ -184,7 +179,7 @@ class ModuleAlias : public Module
 						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))
 					{
@@ -200,18 +195,15 @@ class ModuleAlias : public Module
 
 				if (crlf == std::string::npos)
 				{
-					ServerInstance->Log(DEBUG,"Single line alias: '%s'", Aliases[i].replace_with.c_str());
 					DoCommand(Aliases[i].replace_with, user, safe);
 					return 1;
 				}
 				else
 				{
-					ServerInstance->Log(DEBUG,"Multi line alias: '%s'", Aliases[i].replace_with.c_str());
 					irc::sepstream commands(Aliases[i].replace_with, '\n');
-					std::string command = "*";
-					while ((command = commands.GetToken()) != "")
+					std::string command;
+					while (commands.GetToken(command))
 					{
-						ServerInstance->Log(DEBUG,"Execute: '%s'", command.c_str());
 						DoCommand(command, user, safe);
 					}
 					return 1;
@@ -259,26 +251,16 @@ class ModuleAlias : public Module
 		SearchAndReplace(newline, "\r", "$");
 
 		irc::tokenstream ss(newline);
-		const char* parv[127];
+		const char* parv[MAXPARAMETERS];
 		int x = 0;
 
-		while ((pars[x] = ss.GetToken()) != "")
+		while (ss.GetToken(pars[x]) && x < MAXPARAMETERS)
 		{
 			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(userrec* user, const std::string &parameter)
@@ -287,27 +269,4 @@ class ModuleAlias : public Module
  	}
 };
 
-
-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)