Don't send an override notice if no modes were actually applied, thanks Ankit.

[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 f605cc5f436fad2186e65bf2ff2601e249b751de..ad5f84034c7cf1e1b727d5a0e40fb8c7d453015f 100644 (file)
--- a/src/modules/m_alias.cpp
+++ b/src/modules/m_alias.cpp
@@ -71,8 +71,8 @@ class ModuleAlias : public Module
                        a.ReplaceFormat = MyConf.ReadValue("alias", "replace", i, true);
                        a.RequiredNick = MyConf.ReadValue("alias", "requires", i);
                        a.ULineOnly = MyConf.ReadFlag("alias", "uline", i);
-                       a.ChannelCommand = MyConf.ReadFlag("alias", "channelcommand", false, i);
-                       a.UserCommand = MyConf.ReadFlag("alias", "usercommand", true, i);
+                       a.ChannelCommand = MyConf.ReadFlag("alias", "channelcommand", "no", i);
+                       a.UserCommand = MyConf.ReadFlag("alias", "usercommand", "yes", i);
                        a.OperOnly = MyConf.ReadFlag("alias", "operonly", i);
                        a.format = MyConf.ReadValue("alias", "format", i);
                        a.CaseSensitive = MyConf.ReadFlag("alias", "matchcase", i);
@@ -167,7 +167,12 @@ class ModuleAlias : public Module
                while (i != Aliases.end())
                {
                        if (i->second.UserCommand)
-                               DoAlias(user, NULL, &(i->second), compare, safe);
+                       {
+                               if (DoAlias(user, NULL, &(i->second), compare, safe))
+                               {
+                                       return 1;
+                               }
+                       }
 
                        i++;
                }
@@ -240,7 +245,10 @@ class ModuleAlias : public Module
                while (i != Aliases.end())
                {
                        if (i->second.ChannelCommand)
-                               DoAlias(user, c, &(i->second), compare, safe);
+                       {
+                               if (DoAlias(user, c, &(i->second), compare, safe))
+                                       return 0;
+                       }
 
                        i++;
                }
@@ -249,26 +257,27 @@ class ModuleAlias : public Module
        }
 
 
-       void 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;
+
                /* Does it match the pattern? */
                if (!a->format.empty())
                {
                        if (a->CaseSensitive)
                        {
                                if (InspIRCd::Match(compare, a->format, case_sensitive_map))
-                                       return;
+                                       return 0;
                        }
                        else
                        {
                                if (InspIRCd::Match(compare, a->format))
-                                       return;
+                                       return 0;
                        }
                }
 
                if ((a->OperOnly) && (!IS_OPER(user)))
-                       return;
+                       return 0;
 
                if (!a->RequiredNick.empty())
                {
@@ -276,7 +285,7 @@ class ModuleAlias : public Module
                        if (!u)
                        {
                                user->WriteNumeric(401, ""+std::string(user->nick)+" "+a->RequiredNick+" :is currently unavailable. Please try again later.");
-                               return;
+                               return 1;
                        }
                }
                if ((u != NULL) && (!a->RequiredNick.empty()) && (a->ULineOnly))
@@ -285,7 +294,7 @@ class ModuleAlias : public Module
                        {
                                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;
+                               return 1;
                        }
                }
 
@@ -296,7 +305,7 @@ class ModuleAlias : public Module
                if (crlf == std::string::npos)
                {
                        DoCommand(a->ReplaceFormat, user, c, safe);
-                       return;
+                       return 1;
                }
                else
                {
@@ -306,7 +315,7 @@ class ModuleAlias : public Module
                        {
                                DoCommand(scommand, user, c, safe);
                        }
-                       return;
+                       return 1;
                }
        }