Fix memory leaks on reloadmodule and spanningtree unload while connecting servers

[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 f3137fc2477a8f0d580fc7005d5dedc69a72b777..da1e4d242a7d20ee5afddd1e14a1b4276e1fe0d9 100644 (file)
--- a/src/modules/m_operprefix.cpp
+++ b/src/modules/m_operprefix.cpp
@@ -24,7 +24,13 @@
 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, char pfx) : ModeHandler(Creator, "operprefix", 'y', PARAM_ALWAYS, MODETYPE_CHANNEL)
+               {
+                       list = true;
+                       prefix = pfx;
+                       levelrequired = OPERPREFIX_VALUE;
+                       m_paramtype = TR_NICK;
+               }
 
                unsigned int GetPrefixRank()
                {
@@ -33,7 +39,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
                        {
@@ -72,12 +78,11 @@ class ModuleOperPrefixMode : public Module
  private:
        OperPrefixMode* opm;
  public:
-       ModuleOperPrefixMode(InspIRCd* Me) : Module(Me)
-       {
-               ConfigReader Conf(ServerInstance);
+       ModuleOperPrefixMode()  {
+               ConfigReader Conf;
                std::string pfx = Conf.ReadValue("operprefix", "prefix", "!", 0, false);
 
-               opm = new OperPrefixMode(ServerInstance, this, pfx[0]);
+               opm = new OperPrefixMode(this, pfx[0]);
                if ((!ServerInstance->Modes->AddMode(opm)))
                        throw ModuleException("Could not add a new mode!");
 
@@ -92,7 +97,7 @@ 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(Membership* memb)
@@ -105,7 +110,7 @@ class ModuleOperPrefixMode : public Module
        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;
        }
@@ -123,13 +128,12 @@ 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_COMMON | VF_VENDOR);
        }
 };