X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_svshold.cpp;h=1ce3852c272ccf9991617a03447c0cfaf704fb9e;hb=95c1fb9bdd5f93cf4f8306a7b8ae9ca098aade1a;hp=8607745747c0a0028443f9b1fe96d1d5a631d0c4;hpb=86775e2e98f55b3b88befe2daff0ca23f02f3155;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_svshold.cpp b/src/modules/m_svshold.cpp
index 860774574..1ce3852c2 100644
--- a/src/modules/m_svshold.cpp
+++ b/src/modules/m_svshold.cpp
@@ -23,8 +23,8 @@ class SVSHold : public XLine
 public:
 	irc::string nickname;
 
-	SVSHold(InspIRCd* Instance, time_t s_time, long d, std::string src, std::string re, std::string nick)
-		: XLine(Instance, s_time, d, src, re, "SVSHOLD")
+	SVSHold(time_t s_time, long d, std::string src, std::string re, std::string nick)
+		: XLine(s_time, d, src, re, "SVSHOLD")
 	{
 		this->nickname = nick.c_str();
 	}
@@ -64,13 +64,13 @@ public:
 class SVSHoldFactory : public XLineFactory
 {
  public:
-	SVSHoldFactory(InspIRCd* Instance) : XLineFactory(Instance, "SVSHOLD") { }
+	SVSHoldFactory() : XLineFactory("SVSHOLD") { }
 
 	/** Generate a shun
  	*/
 	XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, std::string xline_specific_mask)
 	{
-		return new SVSHold(ServerInstance, set_time, duration, source, reason, xline_specific_mask);
+		return new SVSHold(set_time, duration, source, reason, xline_specific_mask);
 	}
 };
 
@@ -79,9 +79,9 @@ class SVSHoldFactory : public XLineFactory
 class CommandSvshold : public Command
 {
  public:
-	CommandSvshold(InspIRCd* Me, Module* Creator) : Command(Me, Creator, "SVSHOLD", "o", 1)
+	CommandSvshold(Module* Creator) : Command(Creator, "SVSHOLD", 1)
 	{
-		this->syntax = "<nickname> [<duration> :<reason>]";
+		flags_needed = 'o'; this->syntax = "<nickname> [<duration> :<reason>]";
 		TRANSLATE4(TR_NICK, TR_TEXT, TR_TEXT, TR_END);
 	}
 
@@ -100,7 +100,7 @@ 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());
+				ServerInstance->SNO->WriteToSnoMask('x',"%s removed SVSHOLD on %s",user->nick.c_str(),parameters[0].c_str());
 			}
 			else
 			{
@@ -117,7 +117,7 @@ class CommandSvshold : public Command
 
 			try
 			{
-				r = new SVSHold(ServerInstance, ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), parameters[0].c_str());
+				r = new SVSHold(ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), parameters[0].c_str());
 			}
 			catch (...)
 			{
@@ -128,6 +128,16 @@ class CommandSvshold : public Command
 			{
 				if (ServerInstance->XLines->AddLine(r, user))
 				{
+					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());
+					}
+					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());
+					}
+
 					ServerInstance->XLines->ApplyLines();
 				}
 				else
@@ -139,6 +149,11 @@ class CommandSvshold : public Command
 
 		return CMD_SUCCESS;
 	}
+
+	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+	{
+		return ROUTE_BROADCAST;
+	}
 };
 
 class ModuleSVSHold : public Module
@@ -148,7 +163,7 @@ class ModuleSVSHold : public Module
 
 
  public:
-	ModuleSVSHold(InspIRCd* Me) : Module(Me), cmd(Me, this), s(Me)
+	ModuleSVSHold() : cmd(this)
 	{
 		ServerInstance->XLines->RegisterFactory(&s);
 		ServerInstance->AddCommand(&cmd);
@@ -187,7 +202,7 @@ class ModuleSVSHold : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Implements SVSHOLD. Like Q:Lines, but can only be added/removed by Services.", VF_COMMON | VF_VENDOR);
 	}
 };