Added some missing parameter checking in m_swhois

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

diff --git a/src/modules/m_timedbans.cpp b/src/modules/m_timedbans.cpp
index 4c58306f53bf8295d93dc287a0fb2ae5e00a7247..ae3da75497ce3c141233b3480a51865cfb79ae37 100644 (file)
--- a/src/modules/m_timedbans.cpp
+++ b/src/modules/m_timedbans.cpp
@@ -2,35 +2,26 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ *         the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
 /* $ModDesc: Adds timed bans */
 
-#include <stdio.h>
-#include <vector>
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-
 #include "hashcomp.h"
 #include "configreader.h"
-#include "inspircd.h"
-
-
-
 
+/** Holds a timed ban
+ */
 class TimedBan : public classbase
 {
  public:
@@ -42,6 +33,8 @@ class TimedBan : public classbase
 typedef std::vector<TimedBan> timedbans;
 timedbans TimedBanList;
 
+/** Handle /TBAN
+ */
 class cmd_tban : public command_t
 {
  public:
@@ -74,14 +67,13 @@ class cmd_tban : public command_t
                                }
                                TimedBan T;
                                std::string channelname = parameters[0];
-                               unsigned long expire = ServerInstance->Duration(parameters[1]) + time(NULL);
-                               if (ServerInstance->Duration(parameters[1]) < 1)
+                               long duration = ServerInstance->Duration(parameters[1]);
+                               unsigned long expire = duration + time(NULL);
+                               if (duration < 1)
                                {
                                        user->WriteServ("NOTICE "+std::string(user->nick)+" :Invalid ban time");
                                        return CMD_FAILURE;
                                }
-                               char duration[MAXBUF];
-                               snprintf(duration,MAXBUF,"%lu",ServerInstance->Duration(parameters[1]));
                                std::string mask = parameters[2];
                                const char *setban[32];
                                setban[0] = parameters[0];
@@ -101,7 +93,7 @@ class cmd_tban : public command_t
                                        T.mask = mask;
                                        T.expire = expire;
                                        TimedBanList.push_back(T);
-                                       channel->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s added a timed ban on %s lasting for %s seconds.", channel->name, user->nick, mask.c_str(), duration);
+                                       channel->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s added a timed ban on %s lasting for %ld seconds.", channel->name, user->nick, mask.c_str(), duration);
                                        return CMD_SUCCESS;
                                }
                                return CMD_FAILURE;
@@ -119,7 +111,7 @@ class ModuleTimedBans : public Module
        cmd_tban* mycommand;
  public:
        ModuleTimedBans(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {
                
                mycommand = new cmd_tban(ServerInstance);
@@ -180,14 +172,14 @@ class ModuleTimedBans : public Module
                                                // falls into the abyss :p
                                                userrec* temp = new userrec(ServerInstance);
                                                temp->SetFd(FD_MAGIC_NUMBER);
-                                                /* FIX: Send mode remotely*/
-                                                std::deque<std::string> n;
-                                                n.push_back(setban[0]);
-                                                n.push_back("-b");
-                                                n.push_back(setban[2]);
+                                               /* FIX: Send mode remotely*/
+                                               std::deque<std::string> n;
+                                               n.push_back(setban[0]);
+                                               n.push_back("-b");
+                                               n.push_back(setban[2]);
                                                ServerInstance->SendMode(setban,3,temp);
-                                                Event rmode((char *)&n, NULL, "send_mode");
-                                                rmode.Send(ServerInstance);
+                                               Event rmode((char *)&n, NULL, "send_mode");
+                                               rmode.Send(ServerInstance);
                                                DELETE(temp);
                                        }
                                        else
@@ -204,31 +196,9 @@ class ModuleTimedBans : public Module
        
        virtual Version GetVersion()
        {
-               return Version(1,0,0,0,VF_VENDOR,API_VERSION);
+               return Version(1,1,0,0,VF_VENDOR,API_VERSION);
        }
 };
 
+MODULE_INIT(ModuleTimedBans)
 
-class ModuleTimedBansFactory : public ModuleFactory
-{
- public:
-       ModuleTimedBansFactory()
-       {
-       }
-       
-       ~ModuleTimedBansFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleTimedBans(Me);
-       }
-       
-};
-
-
-extern "C" void * init_module( void )
-{
-       return new ModuleTimedBansFactory;
-}