X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_shun.cpp;h=739bfb36a8a6a807bb2eb5590eee1e5954f3464e;hb=77954a2e31213ce355e9e319229c767dfbd698a4;hp=509ed3ae1be528aa12497531f1d90fd0e2cd2794;hpb=e9b343457de271771c181a288aaa3e34bd397850;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_shun.cpp b/src/modules/m_shun.cpp
index 509ed3ae1..739bfb36a 100644
--- a/src/modules/m_shun.cpp
+++ b/src/modules/m_shun.cpp
@@ -1,11 +1,4 @@
-#include <algorithm>
-#include <vector>
-#include <string>
-#include <sstream>
 #include "inspircd.h"
-#include "modules.h"
-#include "hashcomp.h"
-#include "configreader.h"
 #include "xline.h"
 
 /* $ModDesc: Provides the /shun command, which stops a user executing all commands except PING and PONG. */
@@ -26,7 +19,7 @@ public:
 
 	bool Matches(User *u)
 	{
-		if (ServerInstance->MatchText(u->GetFullHost(), matchtext) || ServerInstance->MatchText(u->GetFullRealHost(), matchtext))
+		if (InspIRCd::Match(u->GetFullHost(), matchtext) || InspIRCd::Match(u->GetFullRealHost(), matchtext))
 			return true;
 
 		return false;
@@ -41,7 +34,8 @@ public:
 
 	void Apply(User *u)
 	{
-		// Application is done by the module.
+		if (!u->GetExt("shunned"))
+			u->Extend("shunned");
 	}
 
 
@@ -69,12 +63,6 @@ class ShunFactory : public XLineFactory
 	{
 		return new Shun(ServerInstance, set_time, duration, source, reason, xline_specific_mask);
 	}
-
-	virtual bool AutoApplyToUserList(XLine*)
-	{
-		// No, we don't want to be applied to users automagically.
-		return false;
-	}
 };
 
 //typedef std::vector<Shun> shunlist;
@@ -90,26 +78,26 @@ class cmd_shun : public Command
 		this->source = "m_shun.so";
 	}
 
-	CmdResult Handle(const char* const*parameters, int pcnt, User *user)
+	CmdResult Handle(const std::vector<std::string>& parameters, User *user)
 	{
 		/* syntax: SHUN nick!user@host time :reason goes here */
 		/* 'time' is a human-readable timestring, like 2d3h2s. */
 
-		if(pcnt == 1)
+		if (parameters.size() == 1)
 		{
-			if (ServerInstance->XLines->DelLine(parameters[0], "S", user))
+			if (ServerInstance->XLines->DelLine(parameters[0].c_str(), "SHUN", user))
 			{
-				ServerInstance->SNO->WriteToSnoMask('x',"%s Removed shun on %s.",user->nick,parameters[0]);
+				ServerInstance->SNO->WriteToSnoMask('x',"%s Removed shun on %s.",user->nick.c_str(),parameters[0].c_str());
 			}
 			else
 			{
 				// XXX todo implement stats
-				user->WriteServ("NOTICE %s :*** Shun %s not found in list, try /stats s.",user->nick,parameters[0]);
+				user->WriteServ("NOTICE %s :*** Shun %s not found in list, try /stats s.",user->nick.c_str(),parameters[0].c_str());
 			}
 
 			return CMD_SUCCESS;
 		}
-		else if (pcnt >= 2)
+		else if (parameters.size() >= 2)
 		{
 			// Adding - XXX todo make this respect <insane> tag perhaps..
 			long duration = ServerInstance->Duration(parameters[1]);
@@ -117,7 +105,7 @@ class cmd_shun : public Command
 
 			try
 			{
-				r = new Shun(ServerInstance, ServerInstance->Time(), duration, user->nick, parameters[2], parameters[0]);
+				r = new Shun(ServerInstance, ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), parameters[0].c_str());
 			}
 			catch (...)
 			{
@@ -130,12 +118,12 @@ class cmd_shun : public Command
 				{
 					if (!duration)
 					{
-						ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent shun for %s.", user->nick, parameters[0]);
+						ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent shun for %s.", user->nick.c_str(), parameters[0].c_str());
 					}
 					else
 					{
 						time_t c_requires_crap = duration + ServerInstance->Time();
-						ServerInstance->SNO->WriteToSnoMask('x', "%s added timed shun for %s, expires on %s", user->nick, parameters[0],
+						ServerInstance->SNO->WriteToSnoMask('x', "%s added timed shun for %s, expires on %s", user->nick.c_str(), parameters[0].c_str(),
 						ServerInstance->TimeString(c_requires_crap).c_str());
 					}
 
@@ -144,7 +132,7 @@ class cmd_shun : public Command
 				else
 				{
 					delete r;
-					user->WriteServ("NOTICE %s :*** Shun for %s already exists", user->nick, parameters[0]);
+					user->WriteServ("NOTICE %s :*** Shun for %s already exists", user->nick.c_str(), parameters[0].c_str());
 				}
 			}
 		}
@@ -157,6 +145,8 @@ class ModuleShun : public Module
 {
 	cmd_shun* mycommand;
 	ShunFactory *f;
+	std::map<std::string, bool> ShunEnabledCommands;
+	bool NotifyOfShun;
 
  public:
 	ModuleShun(InspIRCd* Me) : Module(Me)
@@ -166,49 +156,101 @@ class ModuleShun : public Module
 
 		mycommand = new cmd_shun(ServerInstance);
 		ServerInstance->AddCommand(mycommand);
+
+		Implementation eventlist[] = { I_OnStats, I_OnPreCommand, I_OnUserConnect, I_OnRehash };
+		ServerInstance->Modules->Attach(eventlist, this, 4);
+		OnRehash(NULL, "");
 	}
 
 	virtual ~ModuleShun()
 	{
+		ServerInstance->XLines->DelAll("SHUN");
 		ServerInstance->XLines->UnregisterFactory(f);
 	}
 
-	void Implements(char* List)
+	virtual int OnStats(char symbol, User* user, string_list& out)
 	{
-		List[I_OnPreCommand] = List[I_OnStats] = 1;
+		if (symbol != 'S')
+			return 0;
+
+		ServerInstance->XLines->InvokeStats("SHUN", 223, user, out);
+		return 1;
 	}
-	
-	virtual int OnStats(char symbol, User* user, string_list& out)
+
+	virtual void OnRehash(User* user, const std::string &parameter)
 	{
-		// XXX write me
-//format << Srv->Config->ServerName << " 223 " << user->nick << " :" << iter->banmask << " " << iter->set_on << " " << iter->length << " " << 
-//iter->set_by << " " << iter->reason; 
-		
-		return 0;
+		ConfigReader MyConf(ServerInstance);
+		std::string cmds = MyConf.ReadValue("shun", "enabledcommands", 0);
+
+		if (cmds.empty())
+			cmds = "PING PONG QUIT";
+
+		ShunEnabledCommands.clear();
+		NotifyOfShun = true;
+
+		std::stringstream dcmds(cmds);
+		std::string thiscmd;
+
+		while (dcmds >> thiscmd)
+		{
+			ShunEnabledCommands[thiscmd] = true;
+		}
+
+		NotifyOfShun = MyConf.ReadFlag("shun", "notifyuser", "yes", 0);
 	}
 
-	virtual int OnPreCommand(const std::string &command, const char* const*parameters, int pcnt, User* user, bool validated, const std::string &original_line)
+	virtual void OnUserConnect(User* user)
 	{
-		if (user->registered != REG_ALL)
+		if (!IS_LOCAL(user))
+			return;
+
+		// Apply lines on user connect
+		XLine *rl = ServerInstance->XLines->MatchesLine("SHUN", user);
+
+		if (rl)
+		{
+			// Bang. :P
+			rl->Apply(user);
+		}
+	}
+
+	virtual int OnPreCommand(std::string &command, std::vector<std::string>& parameters, User* user, bool validated, const std::string &original_line)
+	{
+		if (validated || !user->GetExt("shunned"))
 			return 0;
 
-		if((command != "PONG") && (command != "PING"))
+		if (!ServerInstance->XLines->MatchesLine("SHUN", user))
 		{
-			// Don't let them issue cmd if they are shunned..
-			XLine *rl = ServerInstance->XLines->MatchesLine("S", user);
+			/* The shun previously set on this user has expired or been removed */
+			user->Shrink("shunned");
+			return 0;
+		}
 
-			if (rl)
-			{
-				return 1;
-			}
+		std::map<std::string, bool>::iterator i = ShunEnabledCommands.find(command);
+
+		if (i == ShunEnabledCommands.end())
+		{
+			user->WriteServ("NOTICE %s :*** Command %s not processed, as you have been blocked from issuing commands (SHUN)", user->nick.c_str(), command.c_str());
+			return 1;
+		}
+
+		if (command == "QUIT")
+		{
+			/* Allow QUIT but dont show any quit message */
+			parameters.clear();
+		}
+		else if (command == "PART")
+		{
+			/* same for PART */
+			parameters.clear();
 		}
 
-		return 0;
+		return 1;
 	}
 
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,0,0,API_VERSION);
+		return Version("$Id$",VF_VENDOR|VF_COMMON,API_VERSION);
 	}
 };