X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_operprefix.cpp;h=0144e5c23fafbe655f8dc8efcb741742b62191b3;hb=c4d6ce8c5e1802e5b834d5845e31c3adf7700585;hp=47f19e90d4b2f3039beeff737714a06806780463;hpb=1524caf2f799cff54c2de330c9670a0b761ba3d8;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_operprefix.cpp b/src/modules/m_operprefix.cpp
index 47f19e90d..0144e5c23 100644
--- a/src/modules/m_operprefix.cpp
+++ b/src/modules/m_operprefix.cpp
@@ -24,7 +24,7 @@
 class OperPrefixMode : public ModeHandler
 {
 	public:
-		OperPrefixMode(InspIRCd* Instance, Module* Creator, char pfx) : ModeHandler(Creator, 'y', PARAM_ALWAYS, MODETYPE_CHANNEL)
+		OperPrefixMode(Module* Creator, char pfx) : ModeHandler(Creator, "operprefix", 'y', PARAM_ALWAYS, MODETYPE_CHANNEL)
 		{
 			list = true;
 			prefix = pfx;
@@ -39,7 +39,7 @@ class OperPrefixMode : public ModeHandler
 
 		ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 		{
-			if (IS_FAKE(source) || (source && ServerInstance->ULine(source->server)))
+			if (IS_SERVER(source) || (source && ServerInstance->ULine(source->server)))
 				return MODEACTION_ALLOW;
 			else
 			{
@@ -78,12 +78,11 @@ class ModuleOperPrefixMode : public Module
  private:
 	OperPrefixMode* opm;
  public:
-	ModuleOperPrefixMode(InspIRCd* Me) : Module(Me)
-	{
-		ConfigReader Conf(ServerInstance);
+	ModuleOperPrefixMode() 	{
+		ConfigReader Conf;
 		std::string pfx = Conf.ReadValue("operprefix", "prefix", "!", 0, false);
 
-		opm = new OperPrefixMode(ServerInstance, this, pfx[0]);
+		opm = new OperPrefixMode(this, pfx[0]);
 		if ((!ServerInstance->Modes->AddMode(opm)))
 			throw ModuleException("Could not add a new mode!");
 
@@ -98,7 +97,7 @@ class ModuleOperPrefixMode : public Module
 		modechange.push_back(channel->name);
 		modechange.push_back(modeline);
 		modechange.push_back(user->nick);
-		ServerInstance->SendMode(modechange,this->ServerInstance->FakeClient);
+		ServerInstance->SendMode(modechange,ServerInstance->FakeClient);
 	}
 
 	void OnPostJoin(Membership* memb)
@@ -111,7 +110,7 @@ class ModuleOperPrefixMode : public Module
 	ModResult OnRawMode(User* user, Channel* chan, const char mode, const std::string &param, bool adding, int pcnt)
 	{
 		/* force event propagation to its ModeHandler */
-		if (!IS_FAKE(user) && chan && (mode == 'y'))
+		if (!IS_SERVER(user) && chan && (mode == 'y'))
 			return MOD_RES_ALLOW;
 		return MOD_RES_PASSTHRU;
 	}
@@ -129,13 +128,12 @@ class ModuleOperPrefixMode : public Module
 
 	~ModuleOperPrefixMode()
 	{
-		ServerInstance->Modes->DelMode(opm);
 		delete opm;
 	}
 
 	Version GetVersion()
 	{
-		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Gives opers cmode +y which provides a staff prefix.", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 };