m_operprefix Remove unused hooks, move module initialization to init()

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

diff --git a/src/modules/m_operprefix.cpp b/src/modules/m_operprefix.cpp
index b8835f7989569df7ba76d02a4eeaf14be1174d37..b0cb0e4e9d8876b4183528eb5bbf316adec3b61a 100644 (file)
--- a/src/modules/m_operprefix.cpp
+++ b/src/modules/m_operprefix.cpp
@@ -1,16 +1,23 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
  *
- *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ * 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 free but copyrighted software; see
- *            the file COPYING for details.
+ * 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/>.
  */
 
+
 /*
  * Originally by Chernov-Phoenix Alexey (Phoenix@RusNet) mailto:phoenix /email address separator/ pravmail.ru
  */
@@ -24,10 +31,11 @@
 class OperPrefixMode : public ModeHandler
 {
        public:
-               OperPrefixMode(Module* Creator, char pfx) : ModeHandler(Creator, "operprefix", 'y', PARAM_ALWAYS, MODETYPE_CHANNEL)
+               OperPrefixMode(Module* Creator) : ModeHandler(Creator, "operprefix", 'y', PARAM_ALWAYS, MODETYPE_CHANNEL)
                {
+                       std::string pfx = ServerInstance->Config->ConfValue("operprefix")->getString("prefix", "!");
                        list = true;
-                       prefix = pfx;
+                       prefix = pfx.empty() ? '!' : pfx[0];
                        levelrequired = OPERPREFIX_VALUE;
                        m_paramtype = TR_NICK;
                }
@@ -55,18 +63,19 @@ class OperPrefixMode : public ModeHandler
 class ModuleOperPrefixMode : public Module
 {
  private:
-       OperPrefixMode* opm;
+       OperPrefixMode opm;
  public:
-       ModuleOperPrefixMode()  {
-               ConfigReader Conf;
-               std::string pfx = Conf.ReadValue("operprefix", "prefix", "!", 0, false);
+       ModuleOperPrefixMode()
+               : opm(this)
+       {
+       }
 
-               opm = new OperPrefixMode(this, pfx[0]);
-               if ((!ServerInstance->Modes->AddMode(opm)))
-                       throw ModuleException("Could not add a new mode!");
+       void init()
+       {
+               ServerInstance->Modules->AddService(opm);
 
-               Implementation eventlist[] = { I_OnPostJoin, I_OnUserQuit, I_OnUserKick, I_OnUserPart, I_OnOper };
-               ServerInstance->Modules->Attach(eventlist, this, 5);
+               Implementation eventlist[] = { I_OnPostJoin, I_OnOper };
+               ServerInstance->Modules->Attach(eventlist, this, 2);
        }
 
        void PushChanMode(Channel* channel, User* user)
@@ -107,7 +116,6 @@ class ModuleOperPrefixMode : public Module
 
        ~ModuleOperPrefixMode()
        {
-               delete opm;
        }
 
        Version GetVersion()