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

diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp
index a901ab165..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,15 +101,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);
@@ -171,7 +170,7 @@ class ModuleAlias : public Module
 				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)
@@ -180,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))
 					{
@@ -202,8 +201,8 @@ class ModuleAlias : public Module
 				else
 				{
 					irc::sepstream commands(Aliases[i].replace_with, '\n');
-					std::string command = "*";
-					while ((command = commands.GetToken()) != "")
+					std::string command;
+					while (commands.GetToken(command))
 					{
 						DoCommand(command, user, safe);
 					}
@@ -252,10 +251,10 @@ class ModuleAlias : public Module
 		SearchAndReplace(newline, "\r", "$");
 
 		irc::tokenstream ss(newline);
-		const char* parv[127];
+		const char* parv[MAXPARAMETERS];
 		int x = 0;
 
-		while (ss.GetToken(pars[x]))
+		while (ss.GetToken(pars[x]) && x < MAXPARAMETERS)
 		{
 			parv[x] = pars[x].c_str();
 			x++;
@@ -270,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)