X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_timedbans.cpp;h=473785149ced082ddcc771ffe086aa562dbbe35d;hb=cd7657bddc7a6dc2e7326077d173a874bf71f6bd;hp=8639aa7df16a9b3c3261e0a580bf8564250aeed5;hpb=e381b06561228aaea752deda20a62c6dc99a560e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_timedbans.cpp b/src/modules/m_timedbans.cpp
index 8639aa7df..473785149 100644
--- a/src/modules/m_timedbans.cpp
+++ b/src/modules/m_timedbans.cpp
@@ -2,35 +2,26 @@
  *       | 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.
+ *	    the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
 /* $ModDesc: Adds timed bans */
 
-#include <stdio.h>
-#include <vector>
+#include "inspircd.h"
 #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
 {
  public:
@@ -42,6 +33,8 @@ class TimedBan : public classbase
 typedef std::vector<TimedBan> timedbans;
 timedbans TimedBanList;
 
+/** Handle /TBAN
+ */
 class cmd_tban : public command_t
 {
  public:
@@ -51,7 +44,7 @@ class cmd_tban : public command_t
 		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,14 +55,14 @@ 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;
@@ -78,7 +71,7 @@ class cmd_tban : public command_t
 				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->Duration(parameters[1]));
@@ -102,13 +95,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;
 	}
 };
 
@@ -117,7 +112,7 @@ class ModuleTimedBans : public Module
 	cmd_tban* mycommand;
  public:
 	ModuleTimedBans(InspIRCd* Me)
-		: Module::Module(Me)
+		: Module(Me)
 	{
 		
 		mycommand = new cmd_tban(ServerInstance);
@@ -178,14 +173,14 @@ class ModuleTimedBans : public Module
 						// 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]);
+						/* 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);
+						Event rmode((char *)&n, NULL, "send_mode");
+						rmode.Send(ServerInstance);
 						DELETE(temp);
 					}
 					else
@@ -202,7 +197,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);
 	}
 };
 
@@ -226,7 +221,7 @@ class ModuleTimedBansFactory : public ModuleFactory
 };
 
 
-extern "C" void * init_module( void )
+extern "C" DllExport void * init_module( void )
 {
 	return new ModuleTimedBansFactory;
 }