X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_alias.cpp;h=32fc80b64d5427638a4a7919b2d437fa34afdec3;hb=692865acd58c9a475db1fdf4d419188325cd2182;hp=ec426fe9b998b319927d38648037993661c40770;hpb=553a8da754c8cd308bad2008018849714e70f9b7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp
index ec426fe9b..32fc80b64 100644
--- a/src/modules/m_alias.cpp
+++ b/src/modules/m_alias.cpp
@@ -74,11 +74,9 @@ class ModuleAlias : public Module
 
 	virtual void ReadAliases()
 	{
-		ConfigReader MyConf;
-
-		AllowBots = MyConf.ReadFlag("fantasy", "allowbots", "no", 0);
-
-		std::string fpre = MyConf.ReadValue("fantasy","prefix",0);
+		ConfigTag* fantasy = ServerInstance->Config->ConfValue("fantasy");
+		AllowBots = fantasy->getBool("allowbots", false);
+		std::string fpre = fantasy->getString("prefix", "!");
 		fprefix = fpre.empty() ? '!' : fpre[0];
 
 		Aliases.clear();
@@ -87,7 +85,8 @@ class ModuleAlias : public Module
 		{
 			ConfigTag* tag = i->second;
 			Alias a;
-			a.AliasedCommand = tag->getString("text").c_str();
+			std::string aliastext = tag->getString("text");
+			a.AliasedCommand = aliastext.c_str();
 			tag->readString("replace", a.ReplaceFormat, true);
 			a.RequiredNick = tag->getString("requires");
 			a.ULineOnly = tag->getBool("uline");
@@ -102,12 +101,11 @@ class ModuleAlias : public Module
 
  public:
 
-	ModuleAlias()
+	void init()
 	{
 		ReadAliases();
-		ServerInstance->Modules->Attach(I_OnPreCommand, this);
-		ServerInstance->Modules->Attach(I_OnRehash, this);
-		ServerInstance->Modules->Attach(I_OnUserMessage, this);
+		Implementation eventlist[] = { I_OnPreCommand, I_OnRehash, I_OnUserMessage };
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
 	virtual ~ModuleAlias()
@@ -253,7 +251,7 @@ class ModuleAlias : public Module
 	}
 
 
-	int DoAlias(User *user, Channel *c, Alias *a, const std::string compare, const std::string safe)
+	int DoAlias(User *user, Channel *c, Alias *a, const std::string& compare, const std::string& safe)
 	{
 		User *u = NULL;
 
@@ -280,7 +278,7 @@ class ModuleAlias : public Module
 			u = ServerInstance->FindNick(a->RequiredNick);
 			if (!u)
 			{
-				user->WriteNumeric(401, ""+std::string(user->nick)+" "+a->RequiredNick+" :is currently unavailable. Please try again later.");
+				user->WriteNumeric(401, ""+user->nick+" "+a->RequiredNick+" :is currently unavailable. Please try again later.");
 				return 1;
 			}
 		}
@@ -289,7 +287,7 @@ class ModuleAlias : public Module
 			if (!ServerInstance->ULine(u->server))
 			{
 				ServerInstance->SNO->WriteToSnoMask('a', "NOTICE -- Service "+a->RequiredNick+" required by alias "+std::string(a->AliasedCommand.c_str())+" is not on a u-lined server, possibly underhanded antics detected!");
-				user->WriteNumeric(401, ""+std::string(user->nick)+" "+a->RequiredNick+" :is an imposter! Please inform an IRC operator as soon as possible.");
+				user->WriteNumeric(401, ""+user->nick+" "+a->RequiredNick+" :is an imposter! Please inform an IRC operator as soon as possible.");
 				return 1;
 			}
 		}
@@ -322,11 +320,11 @@ class ModuleAlias : public Module
 		for (unsigned int i = 0; i < newline.length(); i++)
 		{
 			char c = newline[i];
-			if (c == '$')
+			if ((c == '$') && (i + 1 < newline.length()))
 			{
 				if (isdigit(newline[i+1]))
 				{
-					int len = (newline[i+2] == '-') ? 3 : 2;
+					int len = ((i + 2 < newline.length()) && (newline[i+2] == '-')) ? 3 : 2;
 					std::string var = newline.substr(i, len);
 					result.append(GetVar(var, original_line));
 					i += len - 1;