X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_timedbans.cpp;h=b1b0de25f7ebaac3292f818e01d209ad4f9bbefa;hb=9dd72b7003963d868a23da930a91300b49ab4959;hp=884a029b99229cf70e502d563c5e90fb0b6a9b2f;hpb=ab01aaeeee9aed655df2eec2522072233fe3aa57;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_timedbans.cpp b/src/modules/m_timedbans.cpp
index 884a029b9..b1b0de25f 100644
--- a/src/modules/m_timedbans.cpp
+++ b/src/modules/m_timedbans.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *                       E-mail:
  *                <brain@chatspike.net>
  *           	  <Craig@chatspike.net>
@@ -26,7 +26,7 @@ using namespace std;
 #include "helperfuncs.h"
 #include "hashcomp.h"
 
-Server *Srv;
+static Server *Srv;
 	 
 class TimedBan
 {
@@ -39,90 +39,106 @@ class TimedBan
 typedef std::vector<TimedBan> timedbans;
 timedbans TimedBanList;
 
-void handle_tban(char **parameters, int pcnt, userrec *user)
+class cmd_tban : public command_t
 {
-	chanrec* channel = Srv->FindChannel(parameters[0]);
-	if (channel)
+ public:
+	cmd_tban () : command_t("TBAN", 0, 3)
+	{
+		this->source = "m_timedbans.so";
+	}
+
+	void Handle (char **parameters, int pcnt, userrec *user)
 	{
-		std::string cm = Srv->ChanMode(user,channel);
-		if ((cm == "%") || (cm == "@"))
+		chanrec* channel = Srv->FindChannel(parameters[0]);
+		if (channel)
 		{
-			if (!Srv->IsValidMask(parameters[2]))
+			std::string cm = Srv->ChanMode(user,channel);
+			if ((cm == "%") || (cm == "@"))
 			{
-				Srv->SendServ(user->fd,"NOTICE "+std::string(user->nick)+" :Invalid ban mask");
-				return;
-			}
-			for (timedbans::iterator i = TimedBanList.begin(); i < TimedBanList.end(); i++)
-			{
-                                irc::string listitem = i->mask.c_str();
-                                irc::string target = parameters[2];
-				irc::string listchan = i->channel.c_str();
-				irc::string targetchan = parameters[0];
-				if ((listitem == target) && (listchan == targetchan))
+				if (!Srv->IsValidMask(parameters[2]))
 				{
-					Srv->SendServ(user->fd,"NOTICE "+std::string(user->nick)+" :The ban "+std::string(parameters[2])+" is already on the banlist of "+std::string(parameters[0]));
+					Srv->SendServ(user->fd,"NOTICE "+std::string(user->nick)+" :Invalid ban mask");
 					return;
 				}
-			}
-			TimedBan T;
-			std::string channelname = parameters[0];
-			unsigned long expire = Srv->CalcDuration(parameters[1]) + time(NULL);
-			if (Srv->CalcDuration(parameters[1]) < 1)
-			{
-				Srv->SendServ(user->fd,"NOTICE "+std::string(user->nick)+" :Invalid ban time");
+				for (timedbans::iterator i = TimedBanList.begin(); i < TimedBanList.end(); i++)
+				{
+					irc::string listitem = i->mask.c_str();
+					irc::string target = parameters[2];
+					irc::string listchan = i->channel.c_str();
+					irc::string targetchan = parameters[0];
+					if ((listitem == target) && (listchan == targetchan))
+					{
+						Srv->SendServ(user->fd,"NOTICE "+std::string(user->nick)+" :The ban "+std::string(parameters[2])+" is already on the banlist of "+std::string(parameters[0]));
+						return;
+					}
+				}
+				TimedBan T;
+				std::string channelname = parameters[0];
+				unsigned long expire = Srv->CalcDuration(parameters[1]) + time(NULL);
+				if (Srv->CalcDuration(parameters[1]) < 1)
+				{
+					Srv->SendServ(user->fd,"NOTICE "+std::string(user->nick)+" :Invalid ban time");
+					return;
+				}
+				char duration[MAXBUF];
+				snprintf(duration,MAXBUF,"%lu",Srv->CalcDuration(parameters[1]));
+				std::string mask = parameters[2];
+				char *setban[32];
+				setban[0] = parameters[0];
+				setban[1] = "+b";
+				setban[2] = parameters[2];
+				// use CallCommandHandler to make it so that the user sets the mode
+				// themselves
+				Srv->CallCommandHandler("MODE",setban,3,user);
+				T.channel = channelname;
+				T.mask = mask;
+				T.expire = expire;
+				TimedBanList.push_back(T);
+				Srv->SendChannelServerNotice(Srv->GetServerName(),channel,"NOTICE "+std::string(channel->name)+" :"+std::string(user->nick)+" added a timed ban on "+mask+" lasting for "+std::string(duration)+" seconds.");
 				return;
 			}
-			char duration[MAXBUF];
-			snprintf(duration,MAXBUF,"%lu",Srv->CalcDuration(parameters[1]));
-			std::string mask = parameters[2];
-			char *setban[3];
-			setban[0] = parameters[0];
-			setban[1] = "+b";
-			setban[2] = parameters[2];
-			// use CallCommandHandler to make it so that the user sets the mode
-			// themselves
-			Srv->CallCommandHandler("MODE",setban,3,user);
-			T.channel = channelname;
-			T.mask = mask;
-			T.expire = expire;
-			TimedBanList.push_back(T);
-			Srv->SendChannelServerNotice(Srv->GetServerName(),channel,"NOTICE "+std::string(channel->name)+" :"+std::string(user->nick)+" added a timed ban on "+mask+" lasting for "+std::string(duration)+" seconds.");
+			else WriteServ(user->fd,"482 %s %s :You must be at least a half-operator to change modes on this channel",user->nick, channel->name);
 			return;
 		}
-		else WriteServ(user->fd,"482 %s %s :You must be at least a half-operator to change modes on this channel",user->nick, channel->name);
-		return;
+		WriteServ(user->fd,"401 %s %s :No such channel",user->nick, parameters[0]);
 	}
-	WriteServ(user->fd,"401 %s %s :No such channel",user->nick, parameters[0]);
-}
+};
 
 class ModuleTimedBans : public Module
 {
+	cmd_tban* mycommand;
  public:
-	ModuleTimedBans()
+	ModuleTimedBans(Server* Me)
+		: Module::Module(Me)
 	{
-		Srv = new Server;
-		Srv->AddCommand("TBAN",handle_tban,0,3,"m_timedbans.so");
+		Srv = Me;
+		mycommand = new cmd_tban();
+		Srv->AddCommand(mycommand);
 		TimedBanList.clear();
 	}
 	
 	virtual ~ModuleTimedBans()
 	{
-		delete Srv;
 		TimedBanList.clear();
 	}
 
-	virtual int OnDelBan(userrec* source, chanrec* chan, std::string banmask)
+	void Implements(char* List)
 	{
-                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)
-                        {
-                                TimedBanList.erase(i);
-                                break;
-                        }
-                }
+		List[I_OnDelBan] = List[I_OnBackgroundTimer] = 1;
+	}
+
+	virtual int OnDelBan(userrec* source, chanrec* chan, const std::string &banmask)
+	{
+		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)
+			{
+				TimedBanList.erase(i);
+				break;
+			}
+		}
 		return 0;
 	}
 
@@ -152,8 +168,9 @@ class ModuleTimedBans : public Module
 						// falls into the abyss :p
 						userrec* temp = new userrec;
 						temp->fd = FD_MAGIC_NUMBER;
+						temp->server = "";
 						Srv->SendMode(setban,3,temp);
-						delete temp;
+						DELETE(temp);
 					}
 					// we used to delete the item here, but we dont need to as the servermode above does it for us,
 					break;
@@ -180,9 +197,9 @@ class ModuleTimedBansFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule()
+	virtual Module * CreateModule(Server* Me)
 	{
-		return new ModuleTimedBans;
+		return new ModuleTimedBans(Me);
 	}
 	
 };