X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_shun.cpp;h=c013776ed217029838b9018601908a1eb2d565bc;hb=a23a840749db9646884907ae28588b1962dc2449;hp=d5ad01dc0dc11d8f337e1caf2c1f2b37f889cd1c;hpb=b817341e2149af163011cce47605ae17b4f67eeb;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_shun.cpp b/src/modules/m_shun.cpp
index d5ad01dc0..c013776ed 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;
@@ -80,9 +73,10 @@ class cmd_shun : public Command
 	InspIRCd *Srv;
 
  public:
-	cmd_shun(InspIRCd* Me) : Command(Me, "SHUN", "o", 1), Srv(Me)
+	cmd_shun(InspIRCd* Me) : Command(Me, "SHUN", "o", 1, 3), Srv(Me)
 	{
 		this->source = "m_shun.so";
+		this->syntax = "<nick!user@hostmask> [<shun-duration>] :<reason>";
 	}
 
 	CmdResult Handle(const std::vector<std::string>& parameters, User *user)
@@ -94,12 +88,12 @@ class cmd_shun : public Command
 		{
 			if (ServerInstance->XLines->DelLine(parameters[0].c_str(), "SHUN", user))
 			{
-				ServerInstance->SNO->WriteToSnoMask('x',"%s Removed shun on %s.",user->nick,parameters[0].c_str());
+				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].c_str());
+				user->WriteServ("NOTICE %s :*** Shun %s not found in list, try /stats s.",user->nick.c_str(),parameters[0].c_str());
 			}
 
 			return CMD_SUCCESS;
@@ -112,7 +106,7 @@ class cmd_shun : public Command
 
 			try
 			{
-				r = new Shun(ServerInstance, ServerInstance->Time(), duration, user->nick, parameters[2].c_str(), parameters[0].c_str());
+				r = new Shun(ServerInstance, ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), parameters[0].c_str());
 			}
 			catch (...)
 			{
@@ -125,13 +119,12 @@ class cmd_shun : public Command
 				{
 					if (!duration)
 					{
-						ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent shun for %s.", user->nick, parameters[0].c_str());
+						ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent shun for %s: %s", user->nick.c_str(), parameters[0].c_str(), parameters[2].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].c_str(),
-						ServerInstance->TimeString(c_requires_crap).c_str());
+						ServerInstance->SNO->WriteToSnoMask('x', "%s added timed shun for %s, expires on %s: %s", user->nick.c_str(), parameters[0].c_str(), ServerInstance->TimeString(c_requires_crap).c_str(), parameters[2].c_str());
 					}
 
 					ServerInstance->XLines->ApplyLines();
@@ -139,7 +132,7 @@ class cmd_shun : public Command
 				else
 				{
 					delete r;
-					user->WriteServ("NOTICE %s :*** Shun for %s already exists", user->nick, parameters[0].c_str());
+					user->WriteServ("NOTICE %s :*** Shun for %s already exists", user->nick.c_str(), parameters[0].c_str());
 				}
 			}
 		}
@@ -152,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)
@@ -162,22 +157,46 @@ class ModuleShun : public Module
 		mycommand = new cmd_shun(ServerInstance);
 		ServerInstance->AddCommand(mycommand);
 
-		Implementation eventlist[] = { I_OnStats, I_OnPreCommand, I_OnUserConnect };
-		ServerInstance->Modules->Attach(eventlist, this, 3);
+		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);
 	}
 
 	virtual int OnStats(char symbol, User* user, string_list& out)
 	{
-		// XXX write me
-//format << Srv->Config->ServerName << " 223 " << user->nick << " :" << iter->banmask << " " << iter->set_on << " " << iter->length << " " << 
-//iter->set_by << " " << iter->reason; 
-		
-		return 0;
+		if (symbol != 'S')
+			return 0;
+
+		ServerInstance->XLines->InvokeStats("SHUN", 223, user, out);
+		return 1;
+	}
+
+	virtual void OnRehash(User* user, const std::string &parameter)
+	{
+		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 void OnUserConnect(User* user)
@@ -195,20 +214,43 @@ class ModuleShun : public Module
 		}
 	}
 
-	virtual int OnPreCommand(const std::string &command, const std::vector<std::string>& parameters, User* user, bool validated, const std::string &original_line)
+	virtual int OnPreCommand(std::string &command, std::vector<std::string>& parameters, User* user, bool validated, const std::string &original_line)
 	{
-		if((command != "PONG") && (command != "PING"))
+		if (validated || !user->GetExt("shunned"))
+			return 0;
+
+		if (!ServerInstance->XLines->MatchesLine("SHUN", user))
+		{
+			/* The shun previously set on this user has expired or been removed */
+			user->Shrink("shunned");
+			return 0;
+		}
+
+		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")
 		{
-			if (user->GetExt("shunned"))
-				return 1;
+			/* 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);
 	}
 };