X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_cban.cpp;h=4cf18264c862da780962de79b9381f7020545a4e;hb=1bfa48143c04504181d1b194af151fae2dac1eb1;hp=0452bff7cb8bf88f947396cdaf7a218c81ae9ca2;hpb=7047c17eab3391a372e0e06cb63d475a3fddcfb8;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_cban.cpp b/src/modules/m_cban.cpp
index 0452bff7c..4cf18264c 100644
--- a/src/modules/m_cban.cpp
+++ b/src/modules/m_cban.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -23,9 +23,10 @@ class CBan : public XLine
 public:
 	irc::string matchtext;
 
-	CBan(InspIRCd* Instance, time_t s_time, long d, const char* src, const char* re, const char *ch) : XLine(Instance, s_time, d, src, re, "CBAN")
+	CBan(time_t s_time, long d, std::string src, std::string re, std::string ch)
+		: XLine(s_time, d, src, re, "CBAN")
 	{
-		this->matchtext = ch;
+		this->matchtext = ch.c_str();
 	}
 
 	~CBan()
@@ -47,7 +48,8 @@ public:
 
 	void DisplayExpiry()
 	{
-		ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed CBan %s (set by %s %ld seconds ago)", this->matchtext.c_str(), this->source, this->duration);
+		ServerInstance->SNO->WriteToSnoMask('x',"Removing expired CBan %s (set by %s %ld seconds ago)",
+			this->matchtext.c_str(), this->source.c_str(), (long int)(ServerInstance->Time() - this->set_time));
 	}
 
 	const char* Displayable()
@@ -61,13 +63,13 @@ public:
 class CBanFactory : public XLineFactory
 {
  public:
-	CBanFactory(InspIRCd* Instance) : XLineFactory(Instance, "CBAN") { }
+	CBanFactory() : XLineFactory("CBAN") { }
 
 	/** Generate a shun
  	*/
-	XLine* Generate(time_t set_time, long duration, const char* source, const char* reason, const char* xline_specific_mask)
+	XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, std::string xline_specific_mask)
 	{
-		return new CBan(ServerInstance, set_time, duration, source, reason, xline_specific_mask);
+		return new CBan(set_time, duration, source, reason, xline_specific_mask);
 	}
 
 	bool AutoApplyToUserList(XLine *x)
@@ -81,10 +83,9 @@ class CBanFactory : public XLineFactory
 class CommandCBan : public Command
 {
  public:
-	CommandCBan(InspIRCd* Me) : Command(Me, "CBAN", "o", 1)
+	CommandCBan(Module* Creator) : Command(Creator, "CBAN", 1, 3)
 	{
-		this->source = "m_cban.so";
-		this->syntax = "<channel> [<duration> :<reason>]";
+		flags_needed = 'o'; this->syntax = "<channel> [<duration> :<reason>]";
 		TRANSLATE4(TR_TEXT,TR_TEXT,TR_TEXT,TR_END);
 	}
 
@@ -97,7 +98,7 @@ class CommandCBan : public Command
 		{
 			if (ServerInstance->XLines->DelLine(parameters[0].c_str(), "CBAN", user))
 			{
-				ServerInstance->SNO->WriteToSnoMask('x',"%s Removed CBan on %s.",user->nick.c_str(),parameters[0].c_str());
+				ServerInstance->SNO->WriteGlobalSno('x', "%s removed CBan on %s.",user->nick.c_str(),parameters[0].c_str());
 			}
 			else
 			{
@@ -111,10 +112,11 @@ class CommandCBan : public Command
 			// Adding - XXX todo make this respect <insane> tag perhaps..
 			long duration = ServerInstance->Duration(parameters[1]);
 			CBan *r = NULL;
+			const char *reason = (parameters.size() > 2) ? parameters[2].c_str() : "No reason supplied";
 
 			try
 			{
-				r = new CBan(ServerInstance, ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), parameters[0].c_str());
+				r = new CBan(ServerInstance->Time(), duration, user->nick.c_str(), reason, parameters[0].c_str());
 			}
 			catch (...)
 			{
@@ -127,13 +129,12 @@ class CommandCBan : public Command
 				{
 					if (!duration)
 					{
-						ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent CBan for %s.", user->nick.c_str(), parameters[0].c_str());
+						ServerInstance->SNO->WriteGlobalSno('x', "%s added permanent CBan for %s: %s", user->nick.c_str(), parameters[0].c_str(), reason);
 					}
 					else
 					{
 						time_t c_requires_crap = duration + ServerInstance->Time();
-						ServerInstance->SNO->WriteToSnoMask('x', "%s added timed CBan for %s, expires on %s", user->nick.c_str(), parameters[0].c_str(),
-						ServerInstance->TimeString(c_requires_crap).c_str());
+						ServerInstance->SNO->WriteGlobalSno('x', "%s added timed CBan for %s, expires on %s: %s", user->nick.c_str(), parameters[0].c_str(), ServerInstance->TimeString(c_requires_crap).c_str(), reason);
 					}
 
 					ServerInstance->XLines->ApplyLines();
@@ -148,58 +149,63 @@ class CommandCBan : public Command
 
 		return CMD_FAILURE;
 	}
+
+	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+	{
+		return ROUTE_BROADCAST;
+	}
 };
 
 class ModuleCBan : public Module
 {
-	CommandCBan* mycommand;
-	CBanFactory *f;
+	CommandCBan mycommand;
+	CBanFactory f;
 
  public:
-	ModuleCBan(InspIRCd* Me) : Module(Me)
+	ModuleCBan() : mycommand(this)
 	{
-		f = new CBanFactory(ServerInstance);
-		ServerInstance->XLines->RegisterFactory(f);
+		ServerInstance->XLines->RegisterFactory(&f);
 
-		mycommand = new CommandCBan(Me);
-		ServerInstance->AddCommand(mycommand);
-		Implementation eventlist[] = { I_OnUserPreJoin, I_OnSyncOtherMetaData, I_OnDecodeMetaData, I_OnStats };
-		ServerInstance->Modules->Attach(eventlist, this, 4);
+		ServerInstance->AddCommand(&mycommand);
+		Implementation eventlist[] = { I_OnUserPreJoin, I_OnStats };
+		ServerInstance->Modules->Attach(eventlist, this, 2);
 	}
 
 	virtual ~ModuleCBan()
 	{
 		ServerInstance->XLines->DelAll("CBAN");
-		ServerInstance->XLines->UnregisterFactory(f);
+		ServerInstance->XLines->UnregisterFactory(&f);
 	}
 
-	virtual int OnStats(char symbol, User* user, string_list &out)
+	virtual ModResult OnStats(char symbol, User* user, string_list &out)
 	{
 		if (symbol != 'C')
-			return 0;
+			return MOD_RES_PASSTHRU;
 
 		ServerInstance->XLines->InvokeStats("CBAN", 210, user, out);
-		return 1;
+		return MOD_RES_DENY;
 	}
 
-	virtual int OnUserPreJoin(User *user, Channel *chan, const char *cname, std::string &privs, const std::string &keygiven)
+	virtual ModResult OnUserPreJoin(User *user, Channel *chan, const char *cname, std::string &privs, const std::string &keygiven)
 	{
 		XLine *rl = ServerInstance->XLines->MatchesLine("CBAN", cname);
 
 		if (rl)
 		{
 			// Channel is banned.
-			user->WriteServ( "384 %s %s :Cannot join channel, CBANed (%s)", user->nick.c_str(), cname, rl->reason);
-			ServerInstance->SNO->WriteToSnoMask('A', "%s tried to join %s which is CBANed (%s)", user->nick.c_str(), cname, rl->reason);
-			return 1;
+			user->WriteServ( "384 %s %s :Cannot join channel, CBANed (%s)", user->nick.c_str(), cname, rl->reason.c_str());
+			ServerInstance->SNO->WriteToSnoMask('a', "%s tried to join %s which is CBANed (%s)",
+				 user->nick.c_str(), cname, rl->reason.c_str());
+			ServerInstance->PI->SendSNONotice("A", user->nick + " tried to join " + std::string(cname) + " which is CBANed (" + rl->reason + ")");
+			return MOD_RES_DENY;
 		}
 
-		return 0;
+		return MOD_RES_PASSTHRU;
 	}
 
 	virtual Version GetVersion()
 	{
-		return Version(1, 2, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Gives /cban, aka C:lines. Think Q:lines, for channels.", VF_COMMON | VF_VENDOR);
 	}
 };