X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_cban.cpp;h=b6e197c2f0c89b5790f4c8233584022fc7a3f0de;hb=cd7657bddc7a6dc2e7326077d173a874bf71f6bd;hp=50fac30411865d513b2f758d1a60c18d026c7342;hpb=76ebc88ccd6fef0bf2d97b607829fb3466e273af;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_cban.cpp b/src/modules/m_cban.cpp
index 50fac3041..b6e197c2f 100644
--- a/src/modules/m_cban.cpp
+++ b/src/modules/m_cban.cpp
@@ -1,35 +1,27 @@
-/*      +------------------------------------+
- *      | Inspire Internet Relay Chat Daemon |
- *      +------------------------------------+
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
  *
- * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                    E-mail:
- *              <brain@chatspike.net>
- *              <Craig@chatspike.net>
- *                <omster@gmail.com>
- * 
- * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
- * the file COPYING for details.
+ *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
+#include "inspircd.h"
 #include <algorithm>
-#include <vector>
-#include <string>
-#include <sstream>
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
-#include "hashcomp.h"
-#include "commands.h"
 #include "configreader.h"
-#include "inspircd.h"
 
 /* $ModDesc: Gives /cban, aka C:lines. Think Q:lines, for channels. */
 
+/** Holds a CBAN item
+ */
 class CBan : public classbase
 {
 public:
@@ -55,6 +47,8 @@ typedef std::vector<CBan> cbanlist;
 /* cbans is declared here, as our type is right above. Don't try move it. */
 cbanlist cbans;
 
+/** Handle /CBAN
+ */
 class cmd_cban : public command_t
 {
  public:
@@ -65,7 +59,7 @@ class cmd_cban : public command_t
 		syntax = "<channel> [<duration> :<reason>]";
 	}
 
-	void Handle(const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle(const char** parameters, int pcnt, userrec *user)
 	{
 		/* syntax: CBAN #channel time :reason goes here */
 		/* 'time' is a human-readable timestring, like 2d3h2s. */
@@ -92,7 +86,7 @@ class cmd_cban : public command_t
 				// parameters[0] = #channel
 				// parameters[1] = 1h3m2s
 				// parameters[2] = Tortoise abuser
-				long length = duration(parameters[1]);
+				long length = ServerInstance->Duration(parameters[1]);
 				std::string reason = (pcnt > 2) ? parameters[2] : "No reason supplied";
 				
 				cbans.push_back(CBan(parameters[0], user->nick, ServerInstance->Time(), length, reason));
@@ -113,8 +107,12 @@ class cmd_cban : public command_t
 			else
 			{
 				user->WriteServ( "403 %s %s :Invalid channel name", user->nick, parameters[0]);
+				return CMD_FAILURE;
 			}
 		}
+
+		/* we want this routed! */
+		return CMD_SUCCESS;
 	}
 };
 
@@ -129,7 +127,7 @@ class ModuleCBan : public Module
 	
 
  public:
-	ModuleCBan(InspIRCd* Me) : Module::Module(Me)
+	ModuleCBan(InspIRCd* Me) : Module(Me)
 	{
 		
 		mycommand = new cmd_cban(Me);
@@ -157,7 +155,7 @@ class ModuleCBan : public Module
 		return 0;
 	}
 
-	virtual int OnUserPreJoin(userrec *user, chanrec *chan, const char *cname)
+	virtual int OnUserPreJoin(userrec *user, chanrec *chan, const char *cname, std::string &privs)
 	{
 		ExpireBans();
 	
@@ -175,7 +173,7 @@ class ModuleCBan : public Module
 		return 0;
 	}
 	
-	virtual void OnSyncOtherMetaData(Module* proto, void* opaque)
+	virtual void OnSyncOtherMetaData(Module* proto, void* opaque, bool displayable)
 	{
 		for(cbanlist::iterator iter = cbans.begin(); iter != cbans.end(); iter++)
 		{
@@ -198,7 +196,7 @@ class ModuleCBan : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,1,VF_VENDOR);
+		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
 	}
 
 	std::string EncodeCBan(const CBan &ban)
@@ -236,7 +234,6 @@ class ModuleCBan : public Module
 				{
 					if (iter->set_on + iter->length <= ServerInstance->Time())
 					{
-						log(DEBUG, "m_cban.so: Ban on %s expired, removing...", iter->chname.c_str());
 						ServerInstance->WriteOpers("*** %li second CBAN on %s (%s) set %u seconds ago expired", iter->length, iter->chname.c_str(), iter->reason.c_str(), ServerInstance->Time() - iter->set_on);
 						cbans.erase(iter);
 						go_again = true;
@@ -269,7 +266,7 @@ class ModuleCBanFactory : public ModuleFactory
 };
 
 
-extern "C" void * init_module( void )
+extern "C" DllExport void * init_module( void )
 {
 	return new ModuleCBanFactory;
 }