Fix potential for duplicate SID if the SID is auto generated.

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

diff --git a/src/modules/m_setidle.cpp b/src/modules/m_setidle.cpp
index 76a1ea3e52482ec1046aed75cc2ca149c9f6819e..d95a9bfc1b7da86591e5e2253fcb1ec6eb71d124 100644 (file)
--- a/src/modules/m_setidle.cpp
+++ b/src/modules/m_setidle.cpp
@@ -11,11 +11,6 @@
  * ---------------------------------------------------
  */
 
-#include <stdio.h>
-#include <string>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
 
 /* $ModDesc: Allows opers to set their idle time */
@@ -28,21 +23,23 @@ class cmd_setidle : public command_t
        cmd_setidle (InspIRCd* Instance) : command_t(Instance,"SETIDLE", 'o', 1)
        {
                this->source = "m_setidle.so";
-               syntax = "<idle-seconds>";
+               syntax = "<duration>";
+               TRANSLATE2(TR_TEXT, TR_END);
        }
 
        CmdResult Handle (const char** parameters, int pcnt, userrec *user)
        {
-               if (atoi(parameters[0]) < 1)
+               time_t idle = ServerInstance->Duration(parameters[0]);
+               if (idle < 1)
                {
                        user->WriteServ("948 %s :Invalid idle time.",user->nick);
                        return CMD_FAILURE;
                }
-               user->idle_lastmsg = time(NULL) - atoi(parameters[0]);
+               user->idle_lastmsg = (ServerInstance->Time() - idle);
                // minor tweak - we cant have signon time shorter than our idle time!
                if (user->signon > user->idle_lastmsg)
                        user->signon = user->idle_lastmsg;
-               ServerInstance->WriteOpers(std::string(user->nick)+" used SETIDLE to set their idle time to "+ConvToStr(atoi(parameters[0]))+" seconds");
+               ServerInstance->WriteOpers(std::string(user->nick)+" used SETIDLE to set their idle time to "+ConvToStr(idle)+" seconds");
                user->WriteServ("944 %s :Idle time set.",user->nick);
 
                return CMD_LOCALONLY;
@@ -55,7 +52,7 @@ class ModuleSetIdle : public Module
        cmd_setidle*    mycommand;
  public:
        ModuleSetIdle(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {
                
                mycommand = new cmd_setidle(ServerInstance);
@@ -68,33 +65,8 @@ class ModuleSetIdle : public Module
        
        virtual Version GetVersion()
        {
-               return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+               return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
        }
 };
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleSetIdleFactory : public ModuleFactory
-{
- public:
-       ModuleSetIdleFactory()
-       {
-       }
-       
-       ~ModuleSetIdleFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleSetIdle(Me);
-       }
-       
-};
-
-
-extern "C" void * init_module( void )
-{
-       return new ModuleSetIdleFactory;
-}
-
+MODULE_INIT(ModuleSetIdle)