Tidyup

[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 cf46b2af90a77156b3a009fead2073d3e249e800..49b272de5f7bbac0fe98224fdd5cc6105dc19d8e 100644 (file)
--- a/src/modules/m_cban.cpp
+++ b/src/modules/m_cban.cpp
@@ -16,20 +16,16 @@
  */
 
 #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 +51,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 +63,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 +90,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 +111,11 @@ class cmd_cban : public command_t
                        else
                        {
                                user->WriteServ( "403 %s %s :Invalid channel name", user->nick, parameters[0]);
+                               return CMD_FAILURE;
                        }
                }
+
+               return CMD_SUCCESS;
        }
 };
 
@@ -157,7 +158,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();
        
@@ -198,7 +199,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)