X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_timedbans.cpp;h=ec257d1e156ae70d397216c44016a00db700c2ad;hb=7c197db72eab03321e4f3e847054e13126520504;hp=a778ab4c6848866ead67e7111ca7b8acf0b57196;hpb=d0b4bb3811458aa335857514e4cbb95d5c84f433;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_timedbans.cpp b/src/modules/m_timedbans.cpp
index a778ab4c6..ec257d1e1 100644
--- a/src/modules/m_timedbans.cpp
+++ b/src/modules/m_timedbans.cpp
@@ -2,20 +2,15 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *           	  <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
 /* $ModDesc: Adds timed bans */
 
 #include <stdio.h>
@@ -23,14 +18,13 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
 #include "hashcomp.h"
 #include "configreader.h"
 #include "inspircd.h"
 
 
-extern InspIRCd* ServerInstance;
-
+/** Holds a timed ban
+ */
 class TimedBan : public classbase
 {
  public:
@@ -42,16 +36,18 @@ class TimedBan : public classbase
 typedef std::vector<TimedBan> timedbans;
 timedbans TimedBanList;
 
+/** Handle /TBAN
+ */
 class cmd_tban : public command_t
 {
  public:
-	cmd_tban () : command_t("TBAN", 0, 3)
+ cmd_tban (InspIRCd* Instance) : command_t(Instance,"TBAN", 0, 3)
 	{
 		this->source = "m_timedbans.so";
 		syntax = "<channel> <duration> <banmask>";
 	}
 
-	void Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
 	{
 		chanrec* channel = ServerInstance->FindChan(parameters[0]);
 		if (channel)
@@ -62,26 +58,26 @@ class cmd_tban : public command_t
 				if (!ServerInstance->IsValidMask(parameters[2]))
 				{
 					user->WriteServ("NOTICE "+std::string(user->nick)+" :Invalid ban mask");
-					return;
+					return CMD_FAILURE;
 				}
 				for (BanList::iterator i = channel->bans.begin(); i != channel->bans.end(); i++)
 				{
 					if (!strcasecmp(i->data,parameters[2]))
 					{
 						user->WriteServ("NOTICE "+std::string(user->nick)+" :The ban "+std::string(parameters[2])+" is already on the banlist of "+std::string(parameters[0]));
-						return;
+						return CMD_FAILURE;
 					}
 				}
 				TimedBan T;
 				std::string channelname = parameters[0];
-				unsigned long expire = ServerInstance->CalcDuration(parameters[1]) + time(NULL);
-				if (ServerInstance->CalcDuration(parameters[1]) < 1)
+				unsigned long expire = ServerInstance->Duration(parameters[1]) + time(NULL);
+				if (ServerInstance->Duration(parameters[1]) < 1)
 				{
 					user->WriteServ("NOTICE "+std::string(user->nick)+" :Invalid ban time");
-					return;
+					return CMD_FAILURE;
 				}
 				char duration[MAXBUF];
-				snprintf(duration,MAXBUF,"%lu",ServerInstance->CalcDuration(parameters[1]));
+				snprintf(duration,MAXBUF,"%lu",ServerInstance->Duration(parameters[1]));
 				std::string mask = parameters[2];
 				const char *setban[32];
 				setban[0] = parameters[0];
@@ -102,13 +98,15 @@ class cmd_tban : public command_t
 					T.expire = expire;
 					TimedBanList.push_back(T);
 					channel->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s added a timed ban on %s lasting for %s seconds.", channel->name, user->nick, mask.c_str(), duration);
+					return CMD_SUCCESS;
 				}
-				return;
+				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);
-			return;
+			return CMD_FAILURE;
 		}
 		user->WriteServ("401 %s %s :No such channel",user->nick, parameters[0]);
+		return CMD_FAILURE;
 	}
 };
 
@@ -120,7 +118,7 @@ class ModuleTimedBans : public Module
 		: Module::Module(Me)
 	{
 		
-		mycommand = new cmd_tban();
+		mycommand = new cmd_tban(ServerInstance);
 		ServerInstance->AddCommand(mycommand);
 		TimedBanList.clear();
 	}
@@ -137,11 +135,13 @@ class ModuleTimedBans : public Module
 
 	virtual int OnDelBan(userrec* source, chanrec* chan, const std::string &banmask)
 	{
+		irc::string listitem = banmask.c_str();
+		irc::string thischan = chan->name;
 		for (timedbans::iterator i = TimedBanList.begin(); i < TimedBanList.end(); i++)
 		{
-			irc::string listitem = banmask.c_str();
 			irc::string target = i->mask.c_str();
-			if (listitem == target)
+			irc::string tchan = i->channel.c_str();
+			if ((listitem == target) && (tchan == thischan))
 			{
 				TimedBanList.erase(i);
 				break;
@@ -175,16 +175,15 @@ class ModuleTimedBans : public Module
 						// hash and set its descriptor to FD_MAGIC_NUMBER so the data
 						// falls into the abyss :p
 						userrec* temp = new userrec(ServerInstance);
-						temp->fd = FD_MAGIC_NUMBER;
-						temp->server = "";
-						ServerInstance->SendMode(setban,3,temp);
+						temp->SetFd(FD_MAGIC_NUMBER);
                                                 /* FIX: Send mode remotely*/
                                                 std::deque<std::string> n;
-                                                n.push_back(i->channel);
+                                                n.push_back(setban[0]);
                                                 n.push_back("-b");
-                                                n.push_back(i->mask);
+                                                n.push_back(setban[2]);
+						ServerInstance->SendMode(setban,3,temp);
                                                 Event rmode((char *)&n, NULL, "send_mode");
-                                                rmode.Send();
+                                                rmode.Send(ServerInstance);
 						DELETE(temp);
 					}
 					else
@@ -201,7 +200,7 @@ class ModuleTimedBans : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,0,VF_VENDOR);
+		return Version(1,1,0,0,VF_VENDOR,API_VERSION);
 	}
 };