X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_alias.cpp;h=95667e7ed359c9ebe57f4887eabdb4fa319ecd3c;hb=c46f8a368c42f64284244f3d2dfc022a383294fa;hp=1076b0a9a12c88d113b27648bc13510dcaba4071;hpb=3f4bdfaa981e15893f1a3a6e559f28118e468dfc;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp
index 1076b0a9a..95667e7ed 100644
--- a/src/modules/m_alias.cpp
+++ b/src/modules/m_alias.cpp
@@ -42,9 +42,6 @@ class Alias
 	/** Requires oper? */
 	bool OperOnly;
 
-	/* is case sensitive params */
-	bool CaseSensitive;
-
 	/* whether or not it may be executed via fantasy (default OFF) */
 	bool ChannelCommand;
 
@@ -62,7 +59,7 @@ class ModuleAlias : public Module
 	/* We cant use a map, there may be multiple aliases with the same name.
 	 * We can, however, use a fancy invention: the multimap. Maps a key to one or more values.
 	 *		-- w00t
-     */
+	 */
 	typedef insp::flat_multimap<std::string, Alias, irc::insensitive_swo> AliasMap;
 
 	AliasMap Aliases;
@@ -76,8 +73,7 @@ class ModuleAlias : public Module
 	{
 		ConfigTag* fantasy = ServerInstance->Config->ConfValue("fantasy");
 		AllowBots = fantasy->getBool("allowbots", false);
-		std::string fpre = fantasy->getString("prefix");
-		fprefix = fpre.empty() ? "!" : fpre;
+		fprefix = fantasy->getString("prefix", "!", 1, ServerInstance->Config->Limits.MaxLine);
 
 		Aliases.clear();
 		ConfigTagList tags = ServerInstance->Config->ConfTags("alias");
@@ -94,7 +90,6 @@ class ModuleAlias : public Module
 			a.UserCommand = tag->getBool("usercommand", true);
 			a.OperOnly = tag->getBool("operonly");
 			a.format = tag->getString("format");
-			a.CaseSensitive = tag->getBool("matchcase");
 			Aliases.insert(std::make_pair(a.AliasedCommand, a));
 		}
 	}
@@ -233,16 +228,8 @@ class ModuleAlias : public Module
 		/* Does it match the pattern? */
 		if (!a->format.empty())
 		{
-			if (a->CaseSensitive)
-			{
-				if (!InspIRCd::Match(compare, a->format, rfc_case_sensitive_map))
-					return 0;
-			}
-			else
-			{
-				if (!InspIRCd::Match(compare, a->format))
-					return 0;
-			}
+			if (!InspIRCd::Match(compare, a->format))
+				return 0;
 		}
 
 		if ((a->OperOnly) && (!user->IsOper()))
@@ -253,14 +240,14 @@ class ModuleAlias : public Module
 			User* u = ServerInstance->FindNick(a->RequiredNick);
 			if (!u)
 			{
-				user->WriteNumeric(ERR_NOSUCHNICK, a->RequiredNick + " :is currently unavailable. Please try again later.");
+				user->WriteNumeric(ERR_NOSUCHNICK, a->RequiredNick, "is currently unavailable. Please try again later.");
 				return 1;
 			}
 
 			if ((a->ULineOnly) && (!u->server->IsULine()))
 			{
 				ServerInstance->SNO->WriteToSnoMask('a', "NOTICE -- Service "+a->RequiredNick+" required by alias "+a->AliasedCommand+" is not on a u-lined server, possibly underhanded antics detected!");
-				user->WriteNumeric(ERR_NOSUCHNICK, a->RequiredNick + " :is an imposter! Please inform an IRC operator as soon as possible.");
+				user->WriteNumeric(ERR_NOSUCHNICK, a->RequiredNick, "is an imposter! Please inform an IRC operator as soon as possible.");
 				return 1;
 			}
 		}
@@ -271,7 +258,7 @@ class ModuleAlias : public Module
 
 		if (crlf == std::string::npos)
 		{
-			DoCommand(a->ReplaceFormat, user, c, safe);
+			DoCommand(a->ReplaceFormat, user, c, safe, a);
 			return 1;
 		}
 		else
@@ -280,13 +267,13 @@ class ModuleAlias : public Module
 			std::string scommand;
 			while (commands.GetToken(scommand))
 			{
-				DoCommand(scommand, user, c, safe);
+				DoCommand(scommand, user, c, safe, a);
 			}
 			return 1;
 		}
 	}
 
-	void DoCommand(const std::string& newline, User* user, Channel *chan, const std::string &original_line)
+	void DoCommand(const std::string& newline, User* user, Channel *chan, const std::string &original_line, Alias* a)
 	{
 		std::string result;
 		result.reserve(newline.length());
@@ -328,6 +315,11 @@ class ModuleAlias : public Module
 					result.append(user->dhost);
 					i += 5;
 				}
+				else if (!newline.compare(i, 12, "$requirement", 12))
+				{
+					result.append(a->RequiredNick);
+					i += 11;
+				}
 				else
 					result.push_back(c);
 			}
@@ -347,7 +339,7 @@ class ModuleAlias : public Module
 		ServerInstance->Parser.CallHandler(command, pars, user);
 	}
 
-	void Prioritize()
+	void Prioritize() CXX11_OVERRIDE
 	{
 		// Prioritise after spanningtree so that channel aliases show the alias before the effects.
 		Module* linkmod = ServerInstance->Modules->Find("m_spanningtree.so");