m_spanningtree Remove unneeded #includes

[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 33f877a57ede222beb1d6574cf74048dd7c55790..cd53c9f9733cc45ea17cdc6be70375af3de1e0eb 100644 (file)
--- a/src/modules/m_alias.cpp
+++ b/src/modules/m_alias.cpp
@@ -1,16 +1,25 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2005, 2009 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2004-2007, 2009 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
 
 /* $ModDesc: Provides aliases of commands. */
@@ -50,14 +59,12 @@ class Alias
 
 class ModuleAlias : public Module
 {
- private:
-
        char fprefix;
 
        /* We cant use a map, there may be multiple aliases with the same name.
         * We can, however, use a fancy invention: the multimap. Maps a key to one or more values.
         *              -- w00t
-   */
+     */
        std::multimap<irc::string, Alias> Aliases;
 
        /* whether or not +B users are allowed to use fantasy commands */
@@ -65,11 +72,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();
@@ -78,7 +83,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");
@@ -92,17 +98,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);
-       }
-
-       virtual ~ModuleAlias()
-       {
+               Implementation eventlist[] = { I_OnPreCommand, I_OnRehash, I_OnUserMessage };
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
        virtual Version GetVersion()
@@ -263,7 +263,7 @@ class ModuleAlias : public Module
                        }
                }
 
-               if ((a->OperOnly) && (!IS_OPER(user)))
+               if ((a->OperOnly) && (!user->IsOper()))
                        return 0;
 
                if (!a->RequiredNick.empty())
@@ -271,7 +271,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;
                        }
                }
@@ -280,7 +280,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;
                        }
                }