X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_timedbans.cpp;h=58dffbbe44be41c9493d81f32b13cef6b1dd1666;hb=e6d000042ea75d4e0485bec9564b47163a3ca414;hp=ec257d1e156ae70d397216c44016a00db700c2ad;hpb=3a554ef1e9be9dbcf3de3301a4a6c2938d643bea;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_timedbans.cpp b/src/modules/m_timedbans.cpp
index ec257d1e1..58dffbbe4 100644
--- a/src/modules/m_timedbans.cpp
+++ b/src/modules/m_timedbans.cpp
@@ -6,23 +6,15 @@
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ *	    the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
 /* $ModDesc: Adds timed bans */
 
-#include <stdio.h>
-#include <vector>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "hashcomp.h"
-#include "configreader.h"
 #include "inspircd.h"
 
-
 /** Holds a timed ban
  */
 class TimedBan : public classbase
@@ -45,6 +37,7 @@ class cmd_tban : public command_t
 	{
 		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)
@@ -70,14 +63,13 @@ class cmd_tban : public command_t
 				}
 				TimedBan T;
 				std::string channelname = parameters[0];
-				unsigned long expire = ServerInstance->Duration(parameters[1]) + time(NULL);
-				if (ServerInstance->Duration(parameters[1]) < 1)
+				long duration = ServerInstance->Duration(parameters[1]);
+				unsigned long expire = duration + time(NULL);
+				if (duration < 1)
 				{
 					user->WriteServ("NOTICE "+std::string(user->nick)+" :Invalid ban time");
 					return CMD_FAILURE;
 				}
-				char duration[MAXBUF];
-				snprintf(duration,MAXBUF,"%lu",ServerInstance->Duration(parameters[1]));
 				std::string mask = parameters[2];
 				const char *setban[32];
 				setban[0] = parameters[0];
@@ -97,7 +89,7 @@ class cmd_tban : public command_t
 					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 %s seconds.", channel->name, user->nick, mask.c_str(), duration);
+					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);
 					return CMD_SUCCESS;
 				}
 				return CMD_FAILURE;
@@ -115,7 +107,7 @@ class ModuleTimedBans : public Module
 	cmd_tban* mycommand;
  public:
 	ModuleTimedBans(InspIRCd* Me)
-		: Module::Module(Me)
+		: Module(Me)
 	{
 		
 		mycommand = new cmd_tban(ServerInstance);
@@ -169,22 +161,15 @@ class ModuleTimedBans : public Module
 						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);
+
+						/* 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, ServerInstance->FakeClient);
+						Event rmode((char *)&n, NULL, "send_mode");
+						rmode.Send(ServerInstance);
 					}
 					else
 					{
@@ -200,31 +185,9 @@ class ModuleTimedBans : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,0,VF_VENDOR,API_VERSION);
+		return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 };
 
+MODULE_INIT(ModuleTimedBans)
 
-class ModuleTimedBansFactory : public ModuleFactory
-{
- public:
-	ModuleTimedBansFactory()
-	{
-	}
-	
-	~ModuleTimedBansFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleTimedBans(Me);
-	}
-	
-};
-
-
-extern "C" void * init_module( void )
-{
-	return new ModuleTimedBansFactory;
-}