X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_cban.cpp;h=4b0319d87aab55c92e21eedf84840c6dff4d68db;hb=5d67a5fff127bf95bca69b436ef7f645f2fe3281;hp=1350a0afb5cff895b066bfbd0a2e40859ad142ad;hpb=dcfd227ffbfb11833663c1f96490d41537b4f496;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_cban.cpp b/src/modules/m_cban.cpp
index 1350a0afb..4b0319d87 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-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -47,7 +47,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, (long int)(ServerInstance->Time() - this->set_time));
+		ServerInstance->PI->SendSNONotice("x", "Removing expired CBan " + assign(this->matchtext) + " (set by " + std::string(this->source) + " " + ConvToStr(ServerInstance->Time() - this->set_time) + " seconds ago)");
 	}
 
 	const char* Displayable()
@@ -97,7 +98,8 @@ 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->WriteToSnoMask('x',"%s removed CBan on %s.",user->nick.c_str(),parameters[0].c_str());
+				ServerInstance->PI->SendSNONotice("x", user->nick + " removed CBan on " + parameters[0]);
 			}
 			else
 			{
@@ -111,10 +113,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, ServerInstance->Time(), duration, user->nick.c_str(), reason, parameters[0].c_str());
 			}
 			catch (...)
 			{
@@ -127,13 +130,14 @@ 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->WriteToSnoMask('x',"%s added permanent CBan for %s: %s", user->nick.c_str(), parameters[0].c_str(), reason);
+						ServerInstance->PI->SendSNONotice("x", user->nick + " added permenant CBan for " + parameters[0] + ": " + std::string(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->WriteToSnoMask('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->PI->SendSNONotice("x", user->nick + " added timed CBan for " + parameters[0] + ", expires on " + ServerInstance->TimeString(c_requires_crap) + ": " + std::string(reason));
 					}
 
 					ServerInstance->XLines->ApplyLines();
@@ -152,17 +156,15 @@ class CommandCBan : public Command
 
 class ModuleCBan : public Module
 {
-	CommandCBan* mycommand;
-	CBanFactory *f;
+	CommandCBan mycommand;
+	CBanFactory f;
 
  public:
-	ModuleCBan(InspIRCd* Me) : Module(Me)
+	ModuleCBan(InspIRCd* Me) : Module(Me), mycommand(Me), f(Me)
 	{
-		f = new CBanFactory(ServerInstance);
-		ServerInstance->XLines->RegisterFactory(f);
+		ServerInstance->XLines->RegisterFactory(&f);
 
-		mycommand = new CommandCBan(Me);
-		ServerInstance->AddCommand(mycommand);
+		ServerInstance->AddCommand(&mycommand);
 		Implementation eventlist[] = { I_OnUserPreJoin, I_OnSyncOtherMetaData, I_OnDecodeMetaData, I_OnStats };
 		ServerInstance->Modules->Attach(eventlist, this, 4);
 	}
@@ -170,7 +172,7 @@ class ModuleCBan : public Module
 	virtual ~ModuleCBan()
 	{
 		ServerInstance->XLines->DelAll("CBAN");
-		ServerInstance->XLines->UnregisterFactory(f);
+		ServerInstance->XLines->UnregisterFactory(&f);
 	}
 
 	virtual int OnStats(char symbol, User* user, string_list &out)
@@ -190,7 +192,8 @@ class ModuleCBan : public Module
 		{
 			// 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);
+			ServerInstance->SNO->WriteToSnoMask('a', "%s tried to join %s which is CBANed (%s)", user->nick.c_str(), cname, rl->reason);
+			ServerInstance->PI->SendSNONotice("A", user->nick + " tried to join " + std::string(cname) + " which is CBANed (" + std::string(rl->reason) + ")");
 			return 1;
 		}