X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_alias.cpp;h=bdb242938de2d62f1c6b7ab33b04d9570ac40324;hb=d23c030c9a8fd58807438245a004e4aa5b7288ba;hp=e99d9dab5b998bf1207a842ca8bd29e2e497d351;hpb=bb4aa10ed82612624da45d0c9592ddf7f2f51ab5;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp
index e99d9dab5..bdb242938 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;
 
@@ -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()))
@@ -309,7 +296,7 @@ class ModuleAlias : public Module
 				}
 				else if (!newline.compare(i, 5, "$host", 5))
 				{
-					result.append(user->host);
+					result.append(user->GetRealHost());
 					i += 4;
 				}
 				else if (!newline.compare(i, 5, "$chan", 5))
@@ -325,7 +312,7 @@ class ModuleAlias : public Module
 				}
 				else if (!newline.compare(i, 6, "$vhost", 6))
 				{
-					result.append(user->dhost);
+					result.append(user->GetDisplayedHost());
 					i += 5;
 				}
 				else if (!newline.compare(i, 12, "$requirement", 12))