m_spanningtree Remove SpanningTreeUtilities* fields and parameters

[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 fbb7e8b50b291c8d67d7665c4fbf1cb3f51f3c63..43346a4d033518776de9913c4c7f6dbfd66435d9 100644 (file)
--- a/src/modules/m_operprefix.cpp
+++ b/src/modules/m_operprefix.cpp
@@ -22,8 +22,6 @@
  * Originally by Chernov-Phoenix Alexey (Phoenix@RusNet) mailto:phoenix /email address separator/ pravmail.ru
  */
 
-/* $ModDesc: Gives opers cmode +y which provides a staff prefix. */
-
 #include "inspircd.h"
 
 #define OPERPREFIX_VALUE 1000000
@@ -38,11 +36,7 @@ class OperPrefixMode : public ModeHandler
                        prefix = pfx.empty() ? '!' : pfx[0];
                        levelrequired = OPERPREFIX_VALUE;
                        m_paramtype = TR_NICK;
-               }
-
-               unsigned int GetPrefixRank()
-               {
-                       return OPERPREFIX_VALUE;
+                       prefixrank = OPERPREFIX_VALUE;
                }
 
                ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
@@ -51,7 +45,7 @@ class OperPrefixMode : public ModeHandler
                                return MODEACTION_ALLOW;
                        else
                        {
-                               if (source && channel)
+                               if (channel)
                                        source->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :Only servers are permitted to change channel mode '%c'", source->nick.c_str(), channel->name.c_str(), 'y');
                                return MODEACTION_DENY;
                        }
@@ -74,10 +68,12 @@ class ModuleOperPrefixMode : public Module
 {
        OperPrefixMode opm;
        HideOperWatcher hideoperwatcher;
+       UserModeReference hideopermode;
 
  public:
        ModuleOperPrefixMode()
                : opm(this), hideoperwatcher(this)
+               , hideopermode(this, "hideoper")
        {
        }
 
@@ -85,9 +81,6 @@ class ModuleOperPrefixMode : public Module
        {
                ServerInstance->Modules->AddService(opm);
 
-               Implementation eventlist[] = { I_OnUserPreJoin, I_OnPostOper };
-               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
-
                /* To give clients a chance to learn about the new prefix we don't give +y to opers
                 * right now. That means if the module was loaded after opers have joined channels
                 * they need to rejoin them in order to get the oper prefix.
@@ -98,7 +91,7 @@ class ModuleOperPrefixMode : public Module
 
        ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE
        {
-               if ((user->IsOper()) && (user->IsModeSet('H')))
+               if ((user->IsOper()) && (!user->IsModeSet(hideopermode)))
                        privs.push_back('y');
                return MOD_RES_PASSTHRU;
        }
@@ -107,18 +100,19 @@ class ModuleOperPrefixMode : public Module
        {
                std::vector<std::string> modechange;
                modechange.push_back("");
-               modechange.push_back(add ? "+y" : "-y");
+               modechange.push_back(add ? "+" : "-");
+               modechange[1].push_back(opm.GetModeChar());
                modechange.push_back(user->nick);
                for (UCListIter v = user->chans.begin(); v != user->chans.end(); v++)
                {
                        modechange[0] = (*v)->name;
-                       ServerInstance->SendGlobalMode(modechange, ServerInstance->FakeClient);
+                       ServerInstance->Modes->Process(modechange, ServerInstance->FakeClient);
                }
        }
 
        void OnPostOper(User* user, const std::string& opername, const std::string& opertype) CXX11_OVERRIDE
        {
-               if (IS_LOCAL(user) && (!user->IsModeSet('H')))
+               if (IS_LOCAL(user) && (!user->IsModeSet(hideopermode)))
                        SetOperPrefix(user, true);
        }