X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_operprefix.cpp;h=43346a4d033518776de9913c4c7f6dbfd66435d9;hb=e950f568d0f571e9475aa38177486468714de4d3;hp=b0737cb9a51404f2831a9b5c5f85d867cad5220a;hpb=ca838821e7c53da0ddaee35d9a401e3a5eaf8c8c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_operprefix.cpp b/src/modules/m_operprefix.cpp
index b0737cb9a..43346a4d0 100644
--- 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;
 			}
@@ -64,19 +58,22 @@ class ModuleOperPrefixMode;
 class HideOperWatcher : public ModeWatcher
 {
 	ModuleOperPrefixMode* parentmod;
+
  public:
-	HideOperWatcher(ModuleOperPrefixMode* parent) : ModeWatcher((Module*) parent, 'H', MODETYPE_USER), parentmod(parent) {}
+	HideOperWatcher(ModuleOperPrefixMode* parent);
 	void AfterMode(User* source, User* dest, Channel* channel, const std::string &parameter, bool adding);
 };
 
 class ModuleOperPrefixMode : public Module
 {
 	OperPrefixMode opm;
-	bool mw_added;
 	HideOperWatcher hideoperwatcher;
+	UserModeReference hideopermode;
+
  public:
 	ModuleOperPrefixMode()
-		: opm(this), mw_added(false), hideoperwatcher(this)
+		: opm(this), hideoperwatcher(this)
+		, hideopermode(this, "hideoper")
 	{
 	}
 
@@ -84,27 +81,17 @@ class ModuleOperPrefixMode : public Module
 	{
 		ServerInstance->Modules->AddService(opm);
 
-		Implementation eventlist[] = { I_OnUserPreJoin, I_OnPostOper, I_OnLoadModule, I_OnUnloadModule };
-		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.
 		 */
 
-		if (ServerInstance->Modules->Find("m_hideoper.so"))
-			mw_added = ServerInstance->Modes->AddModeWatcher(&hideoperwatcher);
+		ServerInstance->Modes->AddModeWatcher(&hideoperwatcher);
 	}
 
 	ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE
 	{
-		/* The user may have the +H umode on himself, but +H does not necessarily correspond
-		 * to the +H of m_hideoper.
-		 * However we only add the modewatcher when m_hideoper is loaded, so these
-		 * conditions (mw_added and the user being +H) together mean the user is a hidden oper.
-		 */
-
-		if (user->IsOper() && (!mw_added || !user->IsModeSet('H')))
+		if ((user->IsOper()) && (!user->IsModeSet(hideopermode)))
 			privs.push_back('y');
 		return MOD_RES_PASSTHRU;
 	}
@@ -113,37 +100,26 @@ 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) && (!mw_added || !user->IsModeSet('H')))
+		if (IS_LOCAL(user) && (!user->IsModeSet(hideopermode)))
 			SetOperPrefix(user, true);
 	}
 
-	void OnLoadModule(Module* mod) CXX11_OVERRIDE
-	{
-		if ((!mw_added) && (mod->ModuleSourceFile == "m_hideoper.so"))
-			mw_added = ServerInstance->Modes->AddModeWatcher(&hideoperwatcher);
-	}
-
-	void OnUnloadModule(Module* mod) CXX11_OVERRIDE
-	{
-		if ((mw_added) && (mod->ModuleSourceFile == "m_hideoper.so") && (ServerInstance->Modes->DelModeWatcher(&hideoperwatcher)))
-			mw_added = false;
-	}
 
 	~ModuleOperPrefixMode()
 	{
-		if (mw_added)
-			ServerInstance->Modes->DelModeWatcher(&hideoperwatcher);
+		ServerInstance->Modes->DelModeWatcher(&hideoperwatcher);
 	}
 
 	Version GetVersion() CXX11_OVERRIDE
@@ -159,6 +135,12 @@ class ModuleOperPrefixMode : public Module
 	}
 };
 
+HideOperWatcher::HideOperWatcher(ModuleOperPrefixMode* parent)
+	: ModeWatcher(parent, "hideoper", MODETYPE_USER)
+	, parentmod(parent)
+{
+}
+
 void HideOperWatcher::AfterMode(User* source, User* dest, Channel* channel, const std::string& parameter, bool adding)
 {
 	if (IS_LOCAL(dest))