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

diff --git a/src/modules/m_shun.cpp b/src/modules/m_shun.cpp
index 5399f996c..739bfb36a 100644
--- a/src/modules/m_shun.cpp
+++ b/src/modules/m_shun.cpp
@@ -19,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;
@@ -145,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)
@@ -155,12 +157,14 @@ 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);
 	}
 
@@ -173,6 +177,28 @@ class ModuleShun : public Module
 		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)
 	{
 		if (!IS_LOCAL(user))
@@ -200,23 +226,31 @@ class ModuleShun : public Module
 			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();
-			return 0;
 		}
-
-		/* Always allow PONG and PING */
-		if (command == "PONG" || command == "PING")
-			return 0;
+		else if (command == "PART")
+		{
+			/* same for PART */
+			parameters.clear();
+		}
 
 		return 1;
 	}
 
 	virtual Version GetVersion()
 	{
-		return Version(1,2,0,0,VF_VENDOR|VF_COMMON,API_VERSION);
+		return Version("$Id$",VF_VENDOR|VF_COMMON,API_VERSION);
 	}
 };