X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_cban.cpp;h=20f56e3f779aed4f875fef3b462012497b77e875;hb=92796ffe6430162a9cb70f1361aaa9ca64645c90;hp=94d99c3747418569df89026d4e76a9097fa9d6b0;hpb=c2d1f2cdafb0a38446844f6bd3d683e8636e37b4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_cban.cpp b/src/modules/m_cban.cpp
index 94d99c374..20f56e3f7 100644
--- a/src/modules/m_cban.cpp
+++ b/src/modules/m_cban.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -81,7 +81,7 @@ class CBanFactory : public XLineFactory
 class CommandCBan : public Command
 {
  public:
-	CommandCBan(InspIRCd* Me) : Command(Me, "CBAN", "o", 1)
+	CommandCBan(InspIRCd* Me) : Command(Me, "CBAN", "o", 1, 3)
 	{
 		this->source = "m_cban.so";
 		this->syntax = "<channel> [<duration> :<reason>]";
@@ -97,11 +97,11 @@ 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,parameters[0].c_str());
+				ServerInstance->SNO->WriteToSnoMask('x',"%s Removed CBan on %s.",user->nick.c_str(),parameters[0].c_str());
 			}
 			else
 			{
-				user->WriteServ("NOTICE %s :*** CBan %s not found in list, try /stats C.",user->nick,parameters[0].c_str());
+				user->WriteServ("NOTICE %s :*** CBan %s not found in list, try /stats C.",user->nick.c_str(),parameters[0].c_str());
 			}
 
 			return CMD_SUCCESS;
@@ -114,7 +114,7 @@ class CommandCBan : public Command
 
 			try
 			{
-				r = new CBan(ServerInstance, ServerInstance->Time(), duration, user->nick, parameters[2].c_str(), parameters[0].c_str());
+				r = new CBan(ServerInstance, ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), parameters[0].c_str());
 			}
 			catch (...)
 			{
@@ -127,13 +127,12 @@ class CommandCBan : public Command
 				{
 					if (!duration)
 					{
-						ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent CBan for %s.", user->nick, parameters[0].c_str());
+						ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent CBan 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->WriteToSnoMask('x', "%s added timed CBan for %s, expires on %s", user->nick, 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(), parameters[2].c_str());
 					}
 
 					ServerInstance->XLines->ApplyLines();
@@ -141,7 +140,7 @@ class CommandCBan : public Command
 				else
 				{
 					delete r;
-					user->WriteServ("NOTICE %s :*** CBan for %s already exists", user->nick, parameters[0].c_str());
+					user->WriteServ("NOTICE %s :*** CBan for %s already exists", user->nick.c_str(), parameters[0].c_str());
 				}
 			}
 		}
@@ -169,12 +168,17 @@ class ModuleCBan : public Module
 
 	virtual ~ModuleCBan()
 	{
+		ServerInstance->XLines->DelAll("CBAN");
 		ServerInstance->XLines->UnregisterFactory(f);
 	}
-	
-	virtual int OnStats(char symbol, User* user, string_list &results)
+
+	virtual int OnStats(char symbol, User* user, string_list &out)
 	{
-		return 0;
+		if (symbol != 'C')
+			return 0;
+
+		ServerInstance->XLines->InvokeStats("CBAN", 210, user, out);
+		return 1;
 	}
 
 	virtual int OnUserPreJoin(User *user, Channel *chan, const char *cname, std::string &privs, const std::string &keygiven)
@@ -184,8 +188,8 @@ class ModuleCBan : public Module
 		if (rl)
 		{
 			// Channel is banned.
-			user->WriteServ( "384 %s %s :Cannot join channel, CBANed (%s)", user->nick, cname, rl->reason);
-			ServerInstance->SNO->WriteToSnoMask('A', "%s tried to join %s which is CBANed (%s)", user->nick, cname, rl->reason);
+			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;
 		}
 
@@ -194,7 +198,7 @@ class ModuleCBan : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version(1, 2, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 };