Support SASL messages other than 'C' and 'D'

[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 ec426fe9b998b319927d38648037993661c40770..25f071bab3ded04560ae8f7e73f7afc42991d38b 100644 (file)
--- a/src/modules/m_alias.cpp
+++ b/src/modules/m_alias.cpp
@@ -74,11 +74,9 @@ class ModuleAlias : public Module
 
        virtual void ReadAliases()
        {
-               ConfigReader MyConf;
-
-               AllowBots = MyConf.ReadFlag("fantasy", "allowbots", "no", 0);
-
-               std::string fpre = MyConf.ReadValue("fantasy","prefix",0);
+               ConfigTag* fantasy = ServerInstance->Config->ConfValue("fantasy");
+               AllowBots = fantasy->getBool("allowbots", false);
+               std::string fpre = fantasy->getString("prefix", "!");
                fprefix = fpre.empty() ? '!' : fpre[0];
 
                Aliases.clear();
@@ -87,7 +85,8 @@ class ModuleAlias : public Module
                {
                        ConfigTag* tag = i->second;
                        Alias a;
-                       a.AliasedCommand = tag->getString("text").c_str();
+                       std::string aliastext = tag->getString("text");
+                       a.AliasedCommand = aliastext.c_str();
                        tag->readString("replace", a.ReplaceFormat, true);
                        a.RequiredNick = tag->getString("requires");
                        a.ULineOnly = tag->getBool("uline");
@@ -102,12 +101,11 @@ class ModuleAlias : public Module
 
  public:
 
-       ModuleAlias()
+       void init()
        {
                ReadAliases();
-               ServerInstance->Modules->Attach(I_OnPreCommand, this);
-               ServerInstance->Modules->Attach(I_OnRehash, this);
-               ServerInstance->Modules->Attach(I_OnUserMessage, this);
+               Implementation eventlist[] = { I_OnPreCommand, I_OnRehash, I_OnUserMessage };
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
        virtual ~ModuleAlias()
@@ -253,7 +251,7 @@ class ModuleAlias : public Module
        }
 
 
-       int 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;
 
@@ -280,7 +278,7 @@ class ModuleAlias : public Module
                        u = ServerInstance->FindNick(a->RequiredNick);
                        if (!u)
                        {
-                               user->WriteNumeric(401, ""+std::string(user->nick)+" "+a->RequiredNick+" :is currently unavailable. Please try again later.");
+                               user->WriteNumeric(401, ""+user->nick+" "+a->RequiredNick+" :is currently unavailable. Please try again later.");
                                return 1;
                        }
                }
@@ -289,7 +287,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!");
-                               user->WriteNumeric(401, ""+std::string(user->nick)+" "+a->RequiredNick+" :is an imposter! Please inform an IRC operator as soon as possible.");
+                               user->WriteNumeric(401, ""+user->nick+" "+a->RequiredNick+" :is an imposter! Please inform an IRC operator as soon as possible.");
                                return 1;
                        }
                }