X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_servprotect.cpp;h=340246cc888841f2a9c49e3752e5deb83e7bdce0;hb=f91a61fa22b239384c31526fd11da1e3030aaa96;hp=9a1da846514c2a6755fe21dc9ff692ccf8a42b3a;hpb=24731c63b6320be22f7b3220236271fa7476b975;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_servprotect.cpp b/src/modules/m_servprotect.cpp
index 9a1da8465..340246cc8 100644
--- a/src/modules/m_servprotect.cpp
+++ b/src/modules/m_servprotect.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -20,9 +20,9 @@
 class ServProtectMode : public ModeHandler
 {
  public:
-	ServProtectMode(InspIRCd* Instance, Module* Creator) : ModeHandler(Instance, Creator, 'k', 0, 0, false, MODETYPE_USER, true) { }
+	ServProtectMode(Module* Creator) : ModeHandler(Creator, "servprotect", 'k', PARAM_NONE, MODETYPE_USER) { oper = true; }
 
-	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
 		/* Because this returns MODEACTION_DENY all the time, there is only ONE
 		 * way to add this mode and that is at client introduction in the UID command,
@@ -34,17 +34,14 @@ class ServProtectMode : public ModeHandler
 		 */
 		return MODEACTION_DENY;
 	}
-
-	bool NeedsOper() { return true; }
 };
 
 class ModuleServProtectMode : public Module
 {
-
 	ServProtectMode bm;
  public:
-	ModuleServProtectMode(InspIRCd* Me)
-		: Module(Me), bm(Me, this)
+	ModuleServProtectMode()
+		: bm(this)
 	{
 		if (!ServerInstance->Modes->AddMode(&bm))
 			throw ModuleException("Could not add new modes!");
@@ -53,17 +50,16 @@ class ModuleServProtectMode : public Module
 	}
 
 
-	virtual ~ModuleServProtectMode()
+	~ModuleServProtectMode()
 	{
-		ServerInstance->Modes->DelMode(&bm);
 	}
 
-	virtual Version GetVersion()
+	Version GetVersion()
 	{
-		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides support for Austhex style +k / UnrealIRCD +S services mode", VF_VENDOR);
 	}
 
-	virtual void OnWhois(User* src, User* dst)
+	void OnWhois(User* src, User* dst)
 	{
 		if (dst->IsModeSet('k'))
 		{
@@ -71,62 +67,64 @@ class ModuleServProtectMode : public Module
 		}
 	}
 
-	virtual int OnRawMode(User* user, Channel* chan, const char mode, const std::string &param, bool adding, int pcnt, bool servermode)
+	ModResult OnRawMode(User* user, Channel* chan, const char mode, const std::string &param, bool adding, int pcnt)
 	{
 		/* Check that the mode is not a server mode, it is being removed, the user making the change is local, there is a parameter,
 		 * and the user making the change is not a uline
 		 */
-		if (!servermode && !adding && chan && IS_LOCAL(user) && !param.empty() && !ServerInstance->ULine(user->server))
+		if (!adding && chan && IS_LOCAL(user) && !param.empty() && !ServerInstance->ULine(user->server))
 		{
 			/* Check if the parameter is a valid nick/uuid
 			 */
 			User *u = ServerInstance->FindNick(param);
 			if (u)
 			{
+				Membership* memb = chan->GetUser(u);
 				/* The target user has +k set on themselves, and you are trying to remove a privilege mode the user has set on themselves.
 				 * This includes any prefix permission mode, even those registered in other modules, e.g. +qaohv. Using ::ModeString()
 				 * here means that the number of modes is restricted to only modes the user has, limiting it to as short a loop as possible.
 				 */
-				if (u->IsModeSet('k') && ServerInstance->Modes->ModeString(u, chan, false).find(mode) != std::string::npos)
+				if (u->IsModeSet('k') && memb && memb->modes.find(mode) != std::string::npos)
 				{
 					/* BZZZT, Denied! */
-					user->WriteNumeric(482, "%s %s :You are not permitted to remove privileges from %s services", user->nick.c_str(), chan->name.c_str(), ServerInstance->Config->Network);
-					return ACR_DENY;
+					user->WriteNumeric(482, "%s %s :You are not permitted to remove privileges from %s services", user->nick.c_str(), chan->name.c_str(), ServerInstance->Config->Network.c_str());
+					return MOD_RES_DENY;
 				}
 			}
 		}
 		/* Mode allowed */
-		return 0;
+		return MOD_RES_PASSTHRU;
 	}
 
-	virtual int OnKill(User* src, User* dst, const std::string &reason)
+	ModResult OnKill(User* src, User* dst, const std::string &reason)
 	{
 		if (src == NULL)
-			return 0;
+			return MOD_RES_PASSTHRU;
 
 		if (dst->IsModeSet('k'))
 		{
-			src->WriteNumeric(485, "%s :You are not permitted to kill %s services!", src->nick.c_str(), ServerInstance->Config->Network);
+			src->WriteNumeric(485, "%s :You are not permitted to kill %s services!", src->nick.c_str(), ServerInstance->Config->Network.c_str());
 			ServerInstance->SNO->WriteGlobalSno('a', std::string(src->nick)+" tried to kill service "+dst->nick+" ("+reason+")");
-			return 1;
+			return MOD_RES_DENY;
 		}
-		return 0;
+		return MOD_RES_PASSTHRU;
 	}
 
-	virtual int OnUserPreKick(User *src, User *dst, Channel *c, const std::string &reason)
+	ModResult OnUserPreKick(User *src, Membership* memb, const std::string &reason)
 	{
-		if (dst->IsModeSet('k'))
+		if (memb->user->IsModeSet('k'))
 		{
-			src->WriteNumeric(484, "%s %s :You are not permitted to kick services", src->nick.c_str(), c->name.c_str());
-			return 1;
+			src->WriteNumeric(484, "%s %s :You are not permitted to kick services",
+				src->nick.c_str(), memb->chan->name.c_str());
+			return MOD_RES_DENY;
 		}
 
-		return 0;
+		return MOD_RES_PASSTHRU;
 	}
 
-	virtual int OnWhoisLine(User* src, User* dst, int &numeric, std::string &text)
+	ModResult OnWhoisLine(User* src, User* dst, int &numeric, std::string &text)
 	{
-		return ((src != dst) && (numeric == 319) && dst->IsModeSet('k'));
+		return ((src != dst) && (numeric == 319) && dst->IsModeSet('k')) ? MOD_RES_DENY : MOD_RES_PASSTHRU;
 	}
 };