Merge branch 'insp20' into insp3.

[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 3bf4c8434352e985d3d39dda126489ce8ed6d628..dbc0a3b5aa1b6d9481cb9dcda87398f01f30ea21 100644 (file)
--- a/src/modules/m_operprefix.cpp
+++ b/src/modules/m_operprefix.cpp
@@ -29,12 +29,11 @@
 class OperPrefixMode : public PrefixMode
 {
        public:
-               OperPrefixMode(Module* Creator) : PrefixMode(Creator, "operprefix", 'y')
+               OperPrefixMode(Module* Creator)
+                       : PrefixMode(Creator, "operprefix", 'y', OPERPREFIX_VALUE)
                {
-                       std::string pfx = ServerInstance->Config->ConfValue("operprefix")->getString("prefix", "!");
-                       prefix = pfx.empty() ? '!' : pfx[0];
-                       levelrequired = INT_MAX;
-                       prefixrank = OPERPREFIX_VALUE;
+                       prefix = ServerInstance->Config->ConfValue("operprefix")->getString("prefix", "!", 1, 1)[0];
+                       ranktoset = ranktounset = UINT_MAX;
                }
 };
 
@@ -45,7 +44,7 @@ class HideOperWatcher : public ModeWatcher
 
  public:
        HideOperWatcher(ModuleOperPrefixMode* parent);
-       void AfterMode(User* source, User* dest, Channel* channel, const std::string &parameter, bool adding);
+       void AfterMode(User* source, User* dest, Channel* channel, const std::string &parameter, bool adding) CXX11_OVERRIDE;
 };
 
 class ModuleOperPrefixMode : public Module
@@ -72,18 +71,26 @@ class ModuleOperPrefixMode : public Module
                return MOD_RES_PASSTHRU;
        }
 
+       void OnPostJoin(Membership* memb) CXX11_OVERRIDE
+       {
+               if ((!IS_LOCAL(memb->user)) || (!memb->user->IsOper()) || (memb->user->IsModeSet(hideopermode)))
+                       return;
+
+               if (memb->HasMode(&opm))
+                       return;
+
+               // The user was force joined and OnUserPreJoin() did not run. Set the operprefix now.
+               Modes::ChangeList changelist;
+               changelist.push_add(&opm, memb->user->nick);
+               ServerInstance->Modes.Process(ServerInstance->FakeClient, memb->chan, NULL, changelist);
+       }
+
        void SetOperPrefix(User* user, bool add)
        {
-               std::vector<std::string> modechange;
-               modechange.push_back("");
-               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)->chan->name;
-                       ServerInstance->Modes->Process(modechange, ServerInstance->FakeClient);
-               }
+               Modes::ChangeList changelist;
+               changelist.push(&opm, add, user->nick);
+               for (User::ChanList::iterator v = user->chans.begin(); v != user->chans.end(); v++)
+                       ServerInstance->Modes->Process(ServerInstance->FakeClient, (*v)->chan, NULL, changelist);
        }
 
        void OnPostOper(User* user, const std::string& opername, const std::string& opertype) CXX11_OVERRIDE
@@ -94,10 +101,10 @@ class ModuleOperPrefixMode : public Module
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Gives opers cmode +y which provides a staff prefix.", VF_VENDOR);
+               return Version("Gives opers channel mode +y which provides a staff prefix", VF_VENDOR);
        }
 
-       void Prioritize()
+       void Prioritize() CXX11_OVERRIDE
        {
                // m_opermodes may set +H on the oper to hide him, we don't want to set the oper prefix in that case
                Module* opermodes = ServerInstance->Modules->Find("m_opermodes.so");