X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_alias.cpp;h=fb6783d8b0b4ddbd5575da9a3f061838672b50fa;hb=0da6b3a13def40e8fd002b9fc60f955467f6372d;hp=76aceffc97d81af7ee1d843def06627f35d0fae4;hpb=a3fb932831ca09b2a931616f1701ea39429356c2;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp
index 76aceffc9..fb6783d8b 100644
--- a/src/modules/m_alias.cpp
+++ b/src/modules/m_alias.cpp
@@ -3,7 +3,7 @@
  *       +------------------------------------+
  *
  *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -60,10 +60,15 @@ class ModuleAlias : public Module
    */
 	std::multimap<std::string, Alias> Aliases;
 
+	/* whether or not +B users are allowed to use fantasy commands */
+	bool AllowBots;
+
 	virtual void ReadAliases()
 	{
 		ConfigReader MyConf(ServerInstance);
-		
+
+		AllowBots = MyConf.ReadFlag("fantasy", "allowbots", "no", 0);
+
 		std::string fpre = MyConf.ReadValue("fantasy","prefix",0);
 		fprefix = fpre.empty() ? '!' : fpre[0];
 
@@ -155,17 +160,11 @@ class ModuleAlias : public Module
 		while (*(compare.c_str()) == ' ')
 			compare.erase(compare.begin());
 
-		std::string safe(original_line);
-
-		/* Escape out any $ symbols in the user provided text */
-
-		SearchAndReplace(safe, "$", "\r");
-
 		while (i != upperbound)
 		{
 			if (i->second.UserCommand)
 			{
-				if (DoAlias(user, NULL, &(i->second), compare, safe))
+				if (DoAlias(user, NULL, &(i->second), compare, original_line))
 				{
 					return 1;
 				}
@@ -174,8 +173,8 @@ class ModuleAlias : public Module
 			i++;
 		}
 
-		// If aliases have been processed, aliases took it.
-		return 1;
+		// If we made it here, no aliases actually matched.
+		return 0;
 	}
 
 	virtual int OnUserPreMessage(User *user, void *dest, int target_type, std::string &text, char status, CUList &exempt_list)
@@ -193,6 +192,13 @@ class ModuleAlias : public Module
 			return 0;
 		}
 
+		/* Stop here if the user is +B and allowbot is set to no. */
+		if (!AllowBots && user->IsModeSet('B'))
+		{
+			ServerInstance->Logs->Log("FANTASY", DEBUG, "fantasy: user is +B and allowbot is set to no");
+			return 0;
+		}
+
 		Channel *c = (Channel *)dest;
 		std::string fcommand;
 
@@ -225,7 +231,7 @@ class ModuleAlias : public Module
 
 		if (i == Aliases.end())
 			return 0;
-		
+
 		/* Avoid iterating on to other aliases if no patterns match */
 		std::multimap<std::string, Alias>::iterator upperbound = Aliases.upper_bound(fcommand);
 
@@ -235,24 +241,18 @@ class ModuleAlias : public Module
 		while (*(compare.c_str()) == ' ')
 			compare.erase(compare.begin());
 
-		std::string safe(compare);
-
-		/* Escape out any $ symbols in the user provided text (ugly, but better than crashy) */
-		SearchAndReplace(safe, "$", "\r");
-
-		ServerInstance->Logs->Log("FANTASY", DEBUG, "fantasy: compare is %s and safe is %s", compare.c_str(), safe.c_str());
-
 		while (i != upperbound)
 		{
 			if (i->second.ChannelCommand)
 			{
-				if (DoAlias(user, c, &(i->second), compare, safe))
+				// We use substr(1) here to remove the fantasy prefix
+				if (DoAlias(user, c, &(i->second), compare, text.substr(1)))
 					return 0;
 			}
 
 			i++;
 		}
-		
+
 		return 0;
 	}
 
@@ -292,7 +292,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!");
+				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.");
 				return 1;
 			}
@@ -350,19 +350,21 @@ class ModuleAlias : public Module
 		}
 
 		/* Special variables */
-		SearchAndReplace(newline, "$nick", user->nick);
-		SearchAndReplace(newline, "$ident", user->ident);
-		SearchAndReplace(newline, "$host", user->host);
-		SearchAndReplace(newline, "$vhost", user->dhost);
+		SearchAndReplace(newline, std::string("$nick"), user->nick);
+		SearchAndReplace(newline, std::string("$ident"), user->ident);
+		SearchAndReplace(newline, std::string("$host"), user->host);
+		SearchAndReplace(newline, std::string("$vhost"), user->dhost);
 
 		if (c)
 		{
 			/* Channel specific variables */
-			SearchAndReplace(newline, "$chan", c->name);			
+			SearchAndReplace(newline, std::string("$chan"), c->name);
+		}
+		else
+		{
+			/* We don't want these in a user alias */
+			SearchAndReplace(newline, std::string("$chan"), std::string(""));
 		}
-
-		/* Unescape any variable names in the user text before sending */
-		SearchAndReplace(newline, "\r", "$");
 
 		irc::tokenstream ss(newline);
 		pars.clear();
@@ -376,7 +378,7 @@ class ModuleAlias : public Module
 		ServerInstance->Parser->CallHandler(command, pars, user);
 	}
 
-	virtual void OnRehash(User* user, const std::string &parameter)
+	virtual void OnRehash(User* user)
 	{
 		ReadAliases();
  	}