X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_shun.cpp;h=09d9872ad1dddfc1876e9c79f327d80bbe29d801;hb=00fa6d592ed2640fcdf74444786de555c1c3da25;hp=c39962658640363f1da4f80989b2c248d0e74717;hpb=dcfd227ffbfb11833663c1f96490d41537b4f496;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_shun.cpp b/src/modules/m_shun.cpp
index c39962658..09d9872ad 100644
--- a/src/modules/m_shun.cpp
+++ b/src/modules/m_shun.cpp
@@ -1,3 +1,16 @@
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
+ * This program is free but copyrighted software; see
+ *          the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
 #include "inspircd.h"
 #include "xline.h"
 
@@ -41,7 +54,7 @@ public:
 
 	void DisplayExpiry()
 	{
-		ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed shun %s (set by %s %ld seconds ago)", this->matchtext.c_str(), this->source, this->duration);
+		ServerInstance->SNO->WriteToSnoMask('x',"Removing expired shun %s (set by %s %ld seconds ago)", this->matchtext.c_str(), this->source, (long int)(ServerInstance->Time() - this->set_time));
 	}
 
 	const char* Displayable()
@@ -67,13 +80,13 @@ class ShunFactory : public XLineFactory
 
 //typedef std::vector<Shun> shunlist;
 
-class cmd_shun : public Command
+class CommandShun : public Command
 {
  private:
 	InspIRCd *Srv;
 
  public:
-	cmd_shun(InspIRCd* Me) : Command(Me, "SHUN", "o", 1, 3), Srv(Me)
+	CommandShun(InspIRCd* Me) : Command(Me, "SHUN", "o", 1, 3), Srv(Me)
 	{
 		this->source = "m_shun.so";
 		this->syntax = "<nick!user@hostmask> [<shun-duration>] :<reason>";
@@ -93,7 +106,7 @@ class cmd_shun : public Command
 			else
 			{
 				// XXX todo implement stats
-				user->WriteServ("NOTICE %s :*** Shun %s not found in list, try /stats s.",user->nick.c_str(),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;
@@ -101,12 +114,23 @@ class cmd_shun : public Command
 		else if (parameters.size() >= 2)
 		{
 			// Adding - XXX todo make this respect <insane> tag perhaps..
-			long duration = ServerInstance->Duration(parameters[1]);
+			long duration;
+			std::string expr;
+			if (parameters.size() > 2)
+			{
+				duration = ServerInstance->Duration(parameters[1]);
+				expr = parameters[2];
+			}
+			else
+			{
+				duration = 0;
+				expr = parameters[1];
+			}
 			Shun *r = NULL;
 
 			try
 			{
-				r = new Shun(ServerInstance, ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), parameters[0].c_str());
+				r = new Shun(ServerInstance, ServerInstance->Time(), duration, user->nick.c_str(), expr.c_str(), parameters[0].c_str());
 			}
 			catch (...)
 			{
@@ -119,13 +143,14 @@ class cmd_shun : public Command
 				{
 					if (!duration)
 					{
-						ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent shun for %s.", user->nick.c_str(), parameters[0].c_str());
+						ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent shun for %s: %s",
+							user->nick.c_str(), parameters[0].c_str(), expr.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.c_str(), 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(), expr.c_str());
 					}
 
 					ServerInstance->XLines->ApplyLines();
@@ -133,7 +158,7 @@ class cmd_shun : public Command
 				else
 				{
 					delete r;
-					user->WriteServ("NOTICE %s :*** Shun for %s already exists", user->nick.c_str(), parameters[0].c_str());
+					user->WriteServ("NOTICE %s :*** Shun for %s already exists", user->nick.c_str(), expr.c_str());
 				}
 			}
 		}
@@ -144,10 +169,11 @@ class cmd_shun : public Command
 
 class ModuleShun : public Module
 {
-	cmd_shun* mycommand;
+	CommandShun* mycommand;
 	ShunFactory *f;
-	std::map<std::string, bool> ShunEnabledCommands;
+	std::set<std::string> ShunEnabledCommands;
 	bool NotifyOfShun;
+	bool affectopers;
 
  public:
 	ModuleShun(InspIRCd* Me) : Module(Me)
@@ -155,7 +181,7 @@ class ModuleShun : public Module
 		f = new ShunFactory(ServerInstance);
 		ServerInstance->XLines->RegisterFactory(f);
 
-		mycommand = new cmd_shun(ServerInstance);
+		mycommand = new CommandShun(ServerInstance);
 		ServerInstance->AddCommand(mycommand);
 
 		Implementation eventlist[] = { I_OnStats, I_OnPreCommand, I_OnUserConnect, I_OnRehash };
@@ -188,16 +214,18 @@ class ModuleShun : public Module
 
 		ShunEnabledCommands.clear();
 		NotifyOfShun = true;
+		affectopers = false;
 
 		std::stringstream dcmds(cmds);
 		std::string thiscmd;
 
 		while (dcmds >> thiscmd)
 		{
-			ShunEnabledCommands[thiscmd] = true;
+			ShunEnabledCommands.insert(thiscmd);
 		}
 
 		NotifyOfShun = MyConf.ReadFlag("shun", "notifyuser", "yes", 0);
+		affectopers = MyConf.ReadFlag("shun", "affectopers", "no", 0);
 	}
 
 	virtual void OnUserConnect(User* user)
@@ -227,11 +255,18 @@ class ModuleShun : public Module
 			return 0;
 		}
 
-		std::map<std::string, bool>::iterator i = ShunEnabledCommands.find(command);
+		if (!affectopers && IS_OPER(user))
+		{
+			/* Don't do anything if the user is an operator and affectopers isn't set */
+			return 0;
+		}
+
+		std::set<std::string>::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());
+			if (NotifyOfShun)
+				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;
 		}