X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_svshold.cpp;h=b95a847a5cbbd9c99997ea1869decb01dab3f526;hb=da29af8cba49d51e53d6e68237ccbf6370b6dd1f;hp=93fb8a12f51fdda2cd22725dfcc6ab5ca404b3d1;hpb=886f1ba488a5ab9d7fe4d7b4ac6b9c9dc2841738;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_svshold.cpp b/src/modules/m_svshold.cpp
index 93fb8a12f..b95a847a5 100644
--- a/src/modules/m_svshold.cpp
+++ b/src/modules/m_svshold.cpp
@@ -23,19 +23,22 @@
 #include "inspircd.h"
 #include "xline.h"
 
-/* $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
 {
 public:
-	irc::string nickname;
+	std::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();
+		this->nickname = nick;
 	}
 
 	bool Matches(User *u)
@@ -47,20 +50,21 @@ public:
 
 	bool Matches(const std::string &s)
 	{
-		if (nickname == s)
-			return true;
-		return false;
+		return InspIRCd::Match(s, nickname);
 	}
 
 	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)",
+				nickname.c_str(), source.c_str(), (long)(ServerInstance->Time() - set_time));
+		}
 	}
 
-	const char* Displayable()
+	const std::string& Displayable()
 	{
-		return nickname.c_str();
+		return nickname;
 	}
 };
 
@@ -92,7 +96,6 @@ class CommandSvshold : public Command
 	CommandSvshold(Module* Creator) : Command(Creator, "SVSHOLD", 1)
 	{
 		flags_needed = 'o'; this->syntax = "<nickname> [<duration> :<reason>]";
-		TRANSLATE4(TR_TEXT, TR_TEXT, TR_TEXT, TR_END);
 	}
 
 	CmdResult Handle(const std::vector<std::string> &parameters, User *user)
@@ -100,7 +103,7 @@ class CommandSvshold : public Command
 		/* syntax: svshold nickname time :reason goes here */
 		/* 'time' is a human-readable timestring, like 2d3h2s. */
 
-		if (!ServerInstance->ULine(user->server))
+		if (!user->server->IsULine())
 		{
 			/* don't allow SVSHOLD from non-ulined clients */
 			return CMD_FAILURE;
@@ -110,11 +113,12 @@ 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
 			{
-				user->WriteServ("NOTICE %s :*** SVSHOLD %s not found in list, try /stats S.",user->nick.c_str(),parameters[0].c_str());
+				user->WriteNotice("*** SVSHOLD " + parameters[0] + " not found in list, try /stats S.");
 			}
 		}
 		else
@@ -127,6 +131,9 @@ class CommandSvshold : public Command
 
 			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());
@@ -134,7 +141,7 @@ class CommandSvshold : public Command
 				else
 				{
 					time_t c_requires_crap = duration + ServerInstance->Time();
-					std::string timestr = ServerInstance->TimeString(c_requires_crap);
+					std::string timestr = InspIRCd::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());
 				}
 			}
@@ -165,15 +172,18 @@ class ModuleSVSHold : public Module
 	{
 	}
 
-	void init()
+	void init() CXX11_OVERRIDE
 	{
 		ServerInstance->XLines->RegisterFactory(&s);
-		ServerInstance->Modules->AddService(cmd);
-		Implementation eventlist[] = { I_OnUserPreNick, I_OnStats };
-		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
-	virtual ModResult OnStats(char symbol, User* user, string_list &out)
+	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
+	{
+		ConfigTag* tag = ServerInstance->Config->ConfValue("svshold");
+		silent = tag->getBool("silent", true);
+	}
+
+	ModResult OnStats(char symbol, User* user, string_list &out) CXX11_OVERRIDE
 	{
 		if(symbol != 'S')
 			return MOD_RES_PASSTHRU;
@@ -182,26 +192,26 @@ class ModuleSVSHold : public Module
 		return MOD_RES_DENY;
 	}
 
-	virtual ModResult OnUserPreNick(User *user, const std::string &newnick)
+	ModResult OnUserPreNick(LocalUser* user, const std::string& newnick) CXX11_OVERRIDE
 	{
 		XLine *rl = ServerInstance->XLines->MatchesLine("SVSHOLD", newnick);
 
 		if (rl)
 		{
-			user->WriteServ( "432 %s %s :Services reserved nickname: %s", user->nick.c_str(), newnick.c_str(), rl->reason.c_str());
+			user->WriteNumeric(ERR_ERRONEUSNICKNAME, newnick, InspIRCd::Format("Services reserved nickname: %s", rl->reason.c_str()));
 			return MOD_RES_DENY;
 		}
 
 		return MOD_RES_PASSTHRU;
 	}
 
-	virtual ~ModuleSVSHold()
+	~ModuleSVSHold()
 	{
 		ServerInstance->XLines->DelAll("SVSHOLD");
 		ServerInstance->XLines->UnregisterFactory(&s);
 	}
 
-	virtual Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("Implements SVSHOLD. Like Q:Lines, but can only be added/removed by Services.", VF_COMMON | VF_VENDOR);
 	}