X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_timedbans.cpp;h=fbaadbe1726e536fef7b99ed2bbab69db958edf5;hb=ea7aa89d61f5090ee7e7ecbe9eb633e1189ce40a;hp=c0511838c244878f273ed84ce8cf2e8c0101a3c5;hpb=82503a6b82042fb6d648690c8505dd31c6c057df;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_timedbans.cpp b/src/modules/m_timedbans.cpp
index c0511838c..fbaadbe17 100644
--- a/src/modules/m_timedbans.cpp
+++ b/src/modules/m_timedbans.cpp
@@ -14,12 +14,9 @@
  * ---------------------------------------------------
  */
 
-/* $ModDesc: Adds timed bans */
+using namespace std;
 
-/*
- * ToDo:
- *   Err... not a lot really.
- */ 
+/* $ModDesc: Adds timed bans */
 
 #include <stdio.h>
 #include <vector>
@@ -42,75 +39,86 @@ 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.cpp";
+	}
+
+	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[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.");
 				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();
 	}
 
@@ -155,6 +163,7 @@ 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;
 					}
@@ -183,9 +192,9 @@ class ModuleTimedBansFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule()
+	virtual Module * CreateModule(Server* Me)
 	{
-		return new ModuleTimedBans;
+		return new ModuleTimedBans(Me);
 	}
 	
 };