Wahhhhhhhhhhhh bwahahaha. Mass commit to tidy up tons of messy include lists

[user/henk/code/inspircd.git] / src / modules / m_cban.cpp

diff --git a/src/modules/m_cban.cpp b/src/modules/m_cban.cpp
index 50fac30411865d513b2f758d1a60c18d026c7342..21a3533ec52150b048b71ff787ed8525674975ba 100644 (file)
--- a/src/modules/m_cban.cpp
+++ b/src/modules/m_cban.cpp
@@ -16,15 +16,9 @@
  */
 
 #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"
 
@@ -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));
@@ -236,7 +230,7 @@ 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->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;