Remove m_testcommand too

[user/henk/code/inspircd.git] / src / modules / m_alias.cpp

diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp
index 39d19b2bc6d58ace3f613e238c598feb9158d6c6..fb6783d8b0b4ddbd5575da9a3f061838672b50fa 100644 (file)
--- 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.
@@ -241,15 +241,12 @@ class ModuleAlias : public Module
                while (*(compare.c_str()) == ' ')
                        compare.erase(compare.begin());
 
-               std::string safe(compare);
-
-               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;
                        }
 
@@ -295,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;
                        }
@@ -363,6 +360,11 @@ class ModuleAlias : public Module
                        /* Channel specific variables */
                        SearchAndReplace(newline, std::string("$chan"), c->name);
                }
+               else
+               {
+                       /* We don't want these in a user alias */
+                       SearchAndReplace(newline, std::string("$chan"), std::string(""));
+               }
 
                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();
        }