Merge pull request #1361 from genius3000/master+rline_IP

[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 4c63e53d1b109153d45560eacd2924c76a0c508b..73155b39473c577fec04b7c8ccfd9d04b92eec70 100644 (file)
--- a/src/modules/m_operprefix.cpp
+++ b/src/modules/m_operprefix.cpp
@@ -32,8 +32,7 @@ class OperPrefixMode : public PrefixMode
                OperPrefixMode(Module* Creator)
                        : PrefixMode(Creator, "operprefix", 'y', OPERPREFIX_VALUE)
                {
-                       std::string pfx = ServerInstance->Config->ConfValue("operprefix")->getString("prefix", "!");
-                       prefix = pfx.empty() ? '!' : pfx[0];
+                       prefix = ServerInstance->Config->ConfValue("operprefix")->getString("prefix", "!", 1, 1)[0];
                        levelrequired = INT_MAX;
                }
 };
@@ -72,6 +71,20 @@ 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)
        {
                Modes::ChangeList changelist;
@@ -91,7 +104,7 @@ class ModuleOperPrefixMode : public Module
                return Version("Gives opers cmode +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");