X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_svshold.cpp;h=e666b0fe24b977c1de8f5845e03c9152e01e12cc;hb=aec9540601a8ca8632d0a4e0c4cec1484cfef99a;hp=37288a32299433549be19abf525b44f443ee5491;hpb=f89e68d78684dab66f9c99aaf8bd8a37ec62bfce;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_svshold.cpp b/src/modules/m_svshold.cpp
index 37288a322..e666b0fe2 100644
--- a/src/modules/m_svshold.cpp
+++ b/src/modules/m_svshold.cpp
@@ -25,6 +25,11 @@
 
 /* $ModDesc: Implements SVSHOLD. Like Q:Lines, but can only be added/removed by Services. */
 
+namespace
+{
+	bool silent;
+}
+
 /** Holds a SVSHold item
  */
 class SVSHold : public XLine
@@ -32,7 +37,7 @@ class SVSHold : public XLine
 public:
 	irc::string nickname;
 
-	SVSHold(time_t s_time, long d, std::string src, std::string re, std::string nick)
+	SVSHold(time_t s_time, long d, const std::string& src, const std::string& re, const std::string& nick)
 		: XLine(s_time, d, src, re, "SVSHOLD")
 	{
 		this->nickname = nick.c_str();
@@ -58,8 +63,11 @@ public:
 
 	void DisplayExpiry()
 	{
-		ServerInstance->SNO->WriteToSnoMask('x',"Removing expired SVSHOLD %s (set by %s %ld seconds ago)",
-			this->nickname.c_str(), this->source.c_str(), (long int)(ServerInstance->Time() - this->set_time));
+		if (!silent)
+		{
+			ServerInstance->SNO->WriteToSnoMask('x',"Removing expired SVSHOLD %s (set by %s %ld seconds ago)",
+				this->nickname.c_str(), this->source.c_str(), (long int)(ServerInstance->Time() - this->set_time));
+		}
 	}
 
 	const char* Displayable()
@@ -114,7 +122,8 @@ class CommandSvshold : public Command
 		{
 			if (ServerInstance->XLines->DelLine(parameters[0].c_str(), "SVSHOLD", user))
 			{
-				ServerInstance->SNO->WriteToSnoMask('x',"%s removed SVSHOLD on %s",user->nick.c_str(),parameters[0].c_str());
+				if (!silent)
+					ServerInstance->SNO->WriteToSnoMask('x',"%s removed SVSHOLD on %s",user->nick.c_str(),parameters[0].c_str());
 			}
 			else
 			{
@@ -123,12 +132,18 @@ class CommandSvshold : public Command
 		}
 		else
 		{
+			if (parameters.size() < 3)
+				return CMD_FAILURE;
+
 			// Adding - XXX todo make this respect <insane> tag perhaps..
 			long duration = ServerInstance->Duration(parameters[1]);
 			SVSHold* r = new SVSHold(ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), parameters[0].c_str());
 
 			if (ServerInstance->XLines->AddLine(r, user))
 			{
+				if (silent)
+					return CMD_SUCCESS;
+
 				if (!duration)
 				{
 					ServerInstance->SNO->WriteGlobalSno('x', "%s added permanent SVSHOLD for %s: %s", user->nick.c_str(), parameters[0].c_str(), parameters[2].c_str());
@@ -136,7 +151,8 @@ class CommandSvshold : public Command
 				else
 				{
 					time_t c_requires_crap = duration + ServerInstance->Time();
-					ServerInstance->SNO->WriteGlobalSno('x', "%s added timed SVSHOLD 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());
+					std::string timestr = ServerInstance->TimeString(c_requires_crap);
+					ServerInstance->SNO->WriteGlobalSno('x', "%s added timed SVSHOLD for %s, expires on %s: %s", user->nick.c_str(), parameters[0].c_str(), timestr.c_str(), parameters[2].c_str());
 				}
 			}
 			else
@@ -151,7 +167,7 @@ class CommandSvshold : public Command
 
 	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
 	{
-		return ROUTE_LOCALONLY;
+		return ROUTE_BROADCAST;
 	}
 };
 
@@ -163,13 +179,23 @@ class ModuleSVSHold : public Module
 
  public:
 	ModuleSVSHold() : cmd(this)
+	{
+	}
+
+	void init()
 	{
 		ServerInstance->XLines->RegisterFactory(&s);
-		ServerInstance->AddCommand(&cmd);
-		Implementation eventlist[] = { I_OnUserPreNick, I_OnStats };
-		ServerInstance->Modules->Attach(eventlist, this, 2);
+		ServerInstance->Modules->AddService(cmd);
+		Implementation eventlist[] = { I_OnUserPreNick, I_OnStats, I_OnRehash };
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
+		OnRehash(NULL);
 	}
 
+	void OnRehash(User* user)
+	{
+		ConfigTag* tag = ServerInstance->Config->ConfValue("svshold");
+		silent = tag->getBool("silent");
+	}
 
 	virtual ModResult OnStats(char symbol, User* user, string_list &out)
 	{