X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_cban.cpp;h=21a3533ec52150b048b71ff787ed8525674975ba;hb=d54fd9b1e6b31f69332a9241b5f17330c0ad61e0;hp=eba40ee0c803dae8cea8108591e8a7d59ea2488e;hpb=fd6ee21f2f55875984884a8413d61012e066029f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_cban.cpp b/src/modules/m_cban.cpp
index eba40ee0c..21a3533ec 100644
--- a/src/modules/m_cban.cpp
+++ b/src/modules/m_cban.cpp
@@ -16,22 +16,14 @@
  */
 
 #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. */
 
-
-
 class CBan : public classbase
 {
 public:
@@ -50,12 +42,8 @@ public:
 	}
 };
 
-std::string EncodeCBan(const CBan &ban);
-CBan DecodeCBan(const std::string &data);
 bool CBanComp(const CBan &ban1, const CBan &ban2);
-void ExpireBans();
 
-extern time_t TIME;
 typedef std::vector<CBan> cbanlist;
 
 /* cbans is declared here, as our type is right above. Don't try move it. */
@@ -75,8 +63,6 @@ class cmd_cban : public command_t
 	{
 		/* syntax: CBAN #channel time :reason goes here */
 		/* 'time' is a human-readable timestring, like 2d3h2s. */
-		
-		ExpireBans();
 
 		if(pcnt == 1)
 		{
@@ -85,7 +71,7 @@ class cmd_cban : public command_t
 			{
 				if (parameters[0] == iter->chname)
 				{
-					unsigned long remaining = (iter->set_on + iter->length) - TIME;
+					unsigned long remaining = (iter->set_on + iter->length) - ServerInstance->Time();
 					user->WriteServ( "386 %s %s :Removed CBAN with %lu seconds left before expiry (%s)", user->nick, iter->chname.c_str(), remaining, iter->reason.c_str());
 					cbans.erase(iter);
 					break;
@@ -100,10 +86,10 @@ 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, TIME, length, reason));
+				cbans.push_back(CBan(parameters[0], user->nick, ServerInstance->Time(), length, reason));
 					
 				std::sort(cbans.begin(), cbans.end(), CBanComp);
 				
@@ -157,7 +143,7 @@ class ModuleCBan : public Module
 		{
 			for(cbanlist::iterator iter = cbans.begin(); iter != cbans.end(); iter++)
 			{
-				unsigned long remaining = (iter->set_on + iter->length) - TIME;
+				unsigned long remaining = (iter->set_on + iter->length) - ServerInstance->Time();
 				results.push_back(std::string(ServerInstance->Config->ServerName)+" 210 "+user->nick+" "+iter->chname.c_str()+" "+iter->set_by+" "+ConvToStr(iter->set_on)+" "+ConvToStr(iter->length)+" "+ConvToStr(remaining)+" :"+iter->reason);
 			}
 		}
@@ -242,10 +228,10 @@ class ModuleCBan : public Module
 				/* 0 == permanent, don't mess with them! -- w00t */
 				if (iter->length != 0)
 				{
-					if (iter->set_on + iter->length <= TIME)
+					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(), TIME - iter->set_on);
+						ServerInstance->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;
 					}