X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_timedbans.cpp;h=4be32ffc2f14c22175a303d524d2b81f501fdf9c;hb=05cc48f1894e40f8a34496bf54a60d8b911e6a5e;hp=ae3da75497ce3c141233b3480a51865cfb79ae37;hpb=2b8ce39c6ea5e7a22fe39b21756f82051465f143;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_timedbans.cpp b/src/modules/m_timedbans.cpp
index ae3da7549..4be32ffc2 100644
--- a/src/modules/m_timedbans.cpp
+++ b/src/modules/m_timedbans.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -14,11 +14,6 @@
 /* $ModDesc: Adds timed bans */
 
 #include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "hashcomp.h"
-#include "configreader.h"
 
 /** Holds a timed ban
  */
@@ -35,18 +30,19 @@ timedbans TimedBanList;
 
 /** Handle /TBAN
  */
-class cmd_tban : public command_t
+class CommandTban : public Command
 {
  public:
- cmd_tban (InspIRCd* Instance) : command_t(Instance,"TBAN", 0, 3)
+ CommandTban (InspIRCd* Instance) : Command(Instance,"TBAN", 0, 3)
 	{
 		this->source = "m_timedbans.so";
 		syntax = "<channel> <duration> <banmask>";
+		TRANSLATE4(TR_TEXT, TR_TEXT, TR_TEXT, TR_END);
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const char* const* parameters, int pcnt, User *user)
 	{
-		chanrec* channel = ServerInstance->FindChan(parameters[0]);
+		Channel* channel = ServerInstance->FindChan(parameters[0]);
 		if (channel)
 		{
 			int cm = channel->GetStatus(user);
@@ -89,34 +85,39 @@ class cmd_tban : public command_t
 						was_added = true;
 				if (was_added)
 				{
+					CUList tmp;
 					T.channel = channelname;
 					T.mask = mask;
 					T.expire = expire;
 					TimedBanList.push_back(T);
-					channel->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s added a timed ban on %s lasting for %ld seconds.", channel->name, user->nick, mask.c_str(), duration);
+					channel->WriteAllExcept(user, true, '@', tmp, "NOTICE %s :%s added a timed ban on %s lasting for %ld seconds.", channel->name, user->nick, mask.c_str(), duration);
+					channel->WriteAllExcept(user, true, '%', tmp, "NOTICE %s :%s added a timed ban on %s lasting for %ld seconds.", channel->name, user->nick, mask.c_str(), duration);
 					return CMD_SUCCESS;
 				}
 				return CMD_FAILURE;
 			}
-			else user->WriteServ("482 %s %s :You must be at least a half-operator to change modes on this channel",user->nick, channel->name);
+			else user->WriteNumeric(482, "%s %s :You must be at least a%soperator to change modes on this channel",user->nick, channel->name,
+					ServerInstance->Config->AllowHalfop ? " half-" : " channel ");
 			return CMD_FAILURE;
 		}
-		user->WriteServ("401 %s %s :No such channel",user->nick, parameters[0]);
+		user->WriteNumeric(401, "%s %s :No such channel",user->nick, parameters[0]);
 		return CMD_FAILURE;
 	}
 };
 
 class ModuleTimedBans : public Module
 {
-	cmd_tban* mycommand;
+	CommandTban* mycommand;
  public:
 	ModuleTimedBans(InspIRCd* Me)
 		: Module(Me)
 	{
 		
-		mycommand = new cmd_tban(ServerInstance);
+		mycommand = new CommandTban(ServerInstance);
 		ServerInstance->AddCommand(mycommand);
 		TimedBanList.clear();
+		Implementation eventlist[] = { I_OnDelBan, I_OnBackgroundTimer };
+		ServerInstance->Modules->Attach(eventlist, this, 2);
 	}
 	
 	virtual ~ModuleTimedBans()
@@ -124,12 +125,8 @@ class ModuleTimedBans : public Module
 		TimedBanList.clear();
 	}
 
-	void Implements(char* List)
-	{
-		List[I_OnDelBan] = List[I_OnBackgroundTimer] = 1;
-	}
 
-	virtual int OnDelBan(userrec* source, chanrec* chan, const std::string &banmask)
+	virtual int OnDelBan(User* source, Channel* chan, const std::string &banmask)
 	{
 		irc::string listitem = banmask.c_str();
 		irc::string thischan = chan->name;
@@ -156,31 +153,22 @@ class ModuleTimedBans : public Module
 			{
 				if (curtime > i->expire)
 				{
-					chanrec* cr = ServerInstance->FindChan(i->channel);
+					Channel* cr = ServerInstance->FindChan(i->channel);
 					again = true;
 					if (cr)
 					{
-						cr->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :Timed ban on %s expired.", cr->name, i->mask.c_str());
 						const char *setban[3];
 						setban[0] = i->channel.c_str();
 						setban[1] = "-b";
 						setban[2] = i->mask.c_str();
-						// kludge alert!
-						// ::SendMode expects a userrec* to send the numeric replies
-						// back to, so we create it a fake user that isnt in the user
-						// hash and set its descriptor to FD_MAGIC_NUMBER so the data
-						// falls into the abyss :p
-						userrec* temp = new userrec(ServerInstance);
-						temp->SetFd(FD_MAGIC_NUMBER);
-						/* FIX: Send mode remotely*/
-						std::deque<std::string> n;
-						n.push_back(setban[0]);
-						n.push_back("-b");
-						n.push_back(setban[2]);
-						ServerInstance->SendMode(setban,3,temp);
-						Event rmode((char *)&n, NULL, "send_mode");
-						rmode.Send(ServerInstance);
-						DELETE(temp);
+
+						ServerInstance->PI->SendModeStr(i->channel, std::string("-b ") + setban[2]);
+						ServerInstance->SendMode(setban,3, ServerInstance->FakeClient);
+
+						CUList empty;
+						cr->WriteAllExcept(ServerInstance->FakeClient, true, '@', empty, "NOTICE %s :*** Timed ban on %s expired.", cr->name, i->mask.c_str());
+						if (ServerInstance->Config->AllowHalfop)
+							cr->WriteAllExcept(ServerInstance->FakeClient, true, '%', empty, "NOTICE %s :*** Timed ban on %s expired.", cr->name, i->mask.c_str());
 					}
 					else
 					{
@@ -196,7 +184,7 @@ class ModuleTimedBans : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,0,VF_VENDOR,API_VERSION);
+		return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 };