X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_operprefix.cpp;h=73155b39473c577fec04b7c8ccfd9d04b92eec70;hb=c46f8a368c42f64284244f3d2dfc022a383294fa;hp=51281a528b6867e102c8ccd0dfdad43ed5835528;hpb=b9e11915a976daaf790ebc763aff56e19fd49e0f;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_operprefix.cpp b/src/modules/m_operprefix.cpp index 51281a528..73155b394 100644 --- 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,12 +71,12 @@ class ModuleOperPrefixMode : public Module return MOD_RES_PASSTHRU; } - void OnPostJoin(Membership* memb) + void OnPostJoin(Membership* memb) CXX11_OVERRIDE { if ((!IS_LOCAL(memb->user)) || (!memb->user->IsOper()) || (memb->user->IsModeSet(hideopermode))) return; - if (memb->hasMode(opm.GetModeChar())) + if (memb->HasMode(&opm)) return; // The user was force joined and OnUserPreJoin() did not run. Set the operprefix now. @@ -105,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");