X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_cban.cpp;h=32b45abfb7cf6aaf663db3c8847e13346189255f;hb=d57cad7896a4e9f78565d998e3fbd98b0b32c94e;hp=5f98def8f6eea222ad00672c0b9e992d0c15d4b6;hpb=384ef31bc01e4a1a2e59d082c9066002410ba54a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_cban.cpp b/src/modules/m_cban.cpp
index 5f98def8f..32b45abfb 100644
--- a/src/modules/m_cban.cpp
+++ b/src/modules/m_cban.cpp
@@ -24,6 +24,12 @@
 #include "xline.h"
 #include "modules/stats.h"
 
+enum
+{
+	// InspIRCd-specific.
+	ERR_BADCHANNEL = 926
+};
+
 /** Holds a CBAN item
  */
 class CBan : public XLine
@@ -32,7 +38,7 @@ private:
 	std::string matchtext;
 
 public:
-	CBan(time_t s_time, long d, const std::string& src, const std::string& re, const std::string& ch)
+	CBan(time_t s_time, unsigned long d, const std::string& src, const std::string& re, const std::string& ch)
 		: XLine(s_time, d, src, re, "CBAN")
 		, matchtext(ch)
 	{
@@ -64,7 +70,7 @@ class CBanFactory : public XLineFactory
 
 	/** Generate a CBAN
  	*/
-	XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, std::string xline_specific_mask) CXX11_OVERRIDE
+	XLine* Generate(time_t set_time, unsigned long duration, const std::string& source, const std::string& reason, const std::string& xline_specific_mask) CXX11_OVERRIDE
 	{
 		return new CBan(set_time, duration, source, reason, xline_specific_mask);
 	}
@@ -82,7 +88,7 @@ class CommandCBan : public Command
  public:
 	CommandCBan(Module* Creator) : Command(Creator, "CBAN", 1, 3)
 	{
-		flags_needed = 'o'; this->syntax = "<channel> [<duration> :<reason>]";
+		flags_needed = 'o'; this->syntax = "<channel> [<duration> [:<reason>]]";
 	}
 
 	CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
@@ -92,9 +98,11 @@ class CommandCBan : public Command
 
 		if (parameters.size() == 1)
 		{
-			if (ServerInstance->XLines->DelLine(parameters[0].c_str(), "CBAN", user))
+			std::string reason;
+
+			if (ServerInstance->XLines->DelLine(parameters[0].c_str(), "CBAN", reason, user))
 			{
-				ServerInstance->SNO->WriteGlobalSno('x', "%s removed CBan on %s.",user->nick.c_str(),parameters[0].c_str());
+				ServerInstance->SNO->WriteGlobalSno('x', "%s removed CBan on %s: %s", user->nick.c_str(), parameters[0].c_str(), reason.c_str());
 			}
 			else
 			{
@@ -105,7 +113,12 @@ class CommandCBan : public Command
 		else
 		{
 			// Adding - XXX todo make this respect <insane> tag perhaps..
-			unsigned long duration = InspIRCd::Duration(parameters[1]);
+			unsigned long duration;
+			if (!InspIRCd::Duration(parameters[1], duration))
+			{
+				user->WriteNotice("*** Invalid duration for CBan.");
+				return CMD_FAILURE;
+			}
 			const char *reason = (parameters.size() > 2) ? parameters[2].c_str() : "No reason supplied";
 			CBan* r = new CBan(ServerInstance->Time(), duration, user->nick.c_str(), reason, parameters[0].c_str());
 
@@ -117,9 +130,9 @@ class CommandCBan : public Command
 				}
 				else
 				{
-					time_t c_requires_crap = duration + ServerInstance->Time();
-					std::string timestr = InspIRCd::TimeString(c_requires_crap);
-					ServerInstance->SNO->WriteGlobalSno('x', "%s added timed CBan for %s, expires on %s: %s", user->nick.c_str(), parameters[0].c_str(), timestr.c_str(), reason);
+					ServerInstance->SNO->WriteGlobalSno('x', "%s added timed CBan for %s, expires in %s (on %s): %s",
+						user->nick.c_str(), parameters[0].c_str(), InspIRCd::DurationString(duration).c_str(),
+						InspIRCd::TimeString(ServerInstance->Time() + duration).c_str(), reason);
 				}
 			}
 			else
@@ -180,7 +193,7 @@ class ModuleCBan : public Module, public Stats::EventListener
 		if (rl)
 		{
 			// Channel is banned.
-			user->WriteNumeric(384, cname, InspIRCd::Format("Cannot join channel, CBANed (%s)", rl->reason.c_str()));
+			user->WriteNumeric(ERR_BADCHANNEL, cname, InspIRCd::Format("Channel %s is CBANed: %s", cname.c_str(), rl->reason.c_str()));
 			ServerInstance->SNO->WriteGlobalSno('a', "%s tried to join %s which is CBANed (%s)",
 				 user->nick.c_str(), cname.c_str(), rl->reason.c_str());
 			return MOD_RES_DENY;
@@ -191,7 +204,7 @@ class ModuleCBan : public Module, public Stats::EventListener
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Gives /cban, aka C:lines. Think Q:lines, for channels.", VF_COMMON | VF_VENDOR);
+		return Version("Gives /cban, aka C-lines. Think Q-lines, for channels.", VF_COMMON | VF_VENDOR);
 	}
 };