This needs some general QA-ing. Add support to new parser (introduced in 1.1) for...

[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 21a3533ec52150b048b71ff787ed8525674975ba..32cd40d835065483b3065f5c73c6821cf06ed52d 100644 (file)
--- a/src/modules/m_cban.cpp
+++ b/src/modules/m_cban.cpp
@@ -1,16 +1,12 @@
-/*      +------------------------------------+
- *      | 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.
  *
  * ---------------------------------------------------
  */
@@ -24,6 +20,8 @@
 
 /* $ModDesc: Gives /cban, aka C:lines. Think Q:lines, for channels. */
 
+/** Holds a CBAN item
+ */
 class CBan : public classbase
 {
 public:
@@ -49,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:
@@ -59,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. */
@@ -107,8 +107,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;
        }
 };
 
@@ -151,7 +154,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();
        
@@ -192,7 +195,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)
@@ -230,7 +233,6 @@ class ModuleCBan : public Module
                                {
                                        if (iter->set_on + iter->length <= ServerInstance->Time())
                                        {
-                                               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;