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 e7a772432b6d86b55ad396dc9ccd38dc9440e5de..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-2009 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,7 +31,14 @@
 class OperPrefixMode : public ModeHandler
 {
        public:
-               OperPrefixMode(InspIRCd* Instance, Module* Creator, char pfx) : ModeHandler(Instance, Creator, 'y', 1, 1, true, MODETYPE_CHANNEL, false, pfx, pfx, TR_NICK) { }
+               OperPrefixMode(Module* Creator) : ModeHandler(Creator, "operprefix", 'y', PARAM_ALWAYS, MODETYPE_CHANNEL)
+               {
+                       std::string pfx = ServerInstance->Config->ConfValue("operprefix")->getString("prefix", "!");
+                       list = true;
+                       prefix = pfx.empty() ? '!' : pfx[0];
+                       levelrequired = OPERPREFIX_VALUE;
+                       m_paramtype = TR_NICK;
+               }
 
                unsigned int GetPrefixRank()
                {
@@ -33,7 +47,7 @@ class OperPrefixMode : public ModeHandler
 
                ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
                {
-                       if (IS_FAKE(source) || (source && ServerInstance->ULine(source->server)))
+                       if (IS_SERVER(source) || (source && ServerInstance->ULine(source->server)))
                                return MODEACTION_ALLOW;
                        else
                        {
@@ -43,46 +57,25 @@ class OperPrefixMode : public ModeHandler
                        }
                }
 
-               ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter)
-               {
-                       User* x = ServerInstance->FindNick(parameter);
-                       Membership* m = channel->GetUser(x);
-                       if (x)
-                       {
-                               if (!m)
-                               {
-                                       return std::make_pair(false, parameter);
-                               }
-                               else
-                               {
-                                       if (m->hasMode('y'))
-                                               return std::make_pair(true, x->nick);
-                                       else
-                                                       return std::make_pair(false, parameter);
-                               }
-                       }
-                       return std::make_pair(false, parameter);
-               }
-
                bool NeedsOper() { return true; }
 };
 
 class ModuleOperPrefixMode : public Module
 {
  private:
-       OperPrefixMode* opm;
+       OperPrefixMode opm;
  public:
-       ModuleOperPrefixMode(InspIRCd* Me) : Module(Me)
+       ModuleOperPrefixMode()
+               : opm(this)
        {
-               ConfigReader Conf(ServerInstance);
-               std::string pfx = Conf.ReadValue("operprefix", "prefix", "!", 0, false);
+       }
 
-               opm = new OperPrefixMode(ServerInstance, 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)
@@ -92,27 +85,20 @@ class ModuleOperPrefixMode : public Module
                modechange.push_back(channel->name);
                modechange.push_back(modeline);
                modechange.push_back(user->nick);
-               ServerInstance->SendMode(modechange,this->ServerInstance->FakeClient);
+               ServerInstance->SendMode(modechange,ServerInstance->FakeClient);
        }
 
-       void OnPostJoin(User *user, Channel *channel)
+       void OnPostJoin(Membership* memb)
        {
-               if (user && IS_OPER(user))
-               {
-                       if (user->IsModeSet('H'))
-                       {
-                               /* we respect your wish to be invisible */
-                               return;
-                       }
-                       PushChanMode(channel, user);
-               }
+               if (IS_OPER(memb->user) && !memb->user->IsModeSet('H'))
+                       PushChanMode(memb->chan, memb->user);
        }
 
        // XXX: is there a better way to do this?
        ModResult OnRawMode(User* user, Channel* chan, const char mode, const std::string &param, bool adding, int pcnt)
        {
                /* force event propagation to its ModeHandler */
-               if (!IS_FAKE(user) && chan && (mode == 'y'))
+               if (!IS_SERVER(user) && chan && (mode == 'y'))
                        return MOD_RES_ALLOW;
                return MOD_RES_PASSTHRU;
        }
@@ -130,13 +116,11 @@ class ModuleOperPrefixMode : public Module
 
        ~ModuleOperPrefixMode()
        {
-               ServerInstance->Modes->DelMode(opm);
-               delete opm;
        }
 
        Version GetVersion()
        {
-               return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version("Gives opers cmode +y which provides a staff prefix.", VF_VENDOR);
        }
 };