Attach to events and register services in init()

[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 6cb336c83b73967dbb71d48ff7a6995268e6c858..991d6f26401168a121db63b09bb3f8a386111496 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();
@@ -103,7 +101,7 @@ class ModuleAlias : public Module
 
  public:
 
-       ModuleAlias()
+       void init()
        {
                ReadAliases();
                ServerInstance->Modules->Attach(I_OnPreCommand, this);
@@ -281,7 +279,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;
                        }
                }
@@ -290,7 +288,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;
                        }
                }