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

[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 996c710f3076f609cd74a50f97287a934753ace9..7c88b03da3dba9dcf049dfac896847e9bffe7993 100644 (file)
--- a/src/modules/m_cban.cpp
+++ b/src/modules/m_cban.cpp
@@ -12,11 +12,6 @@
  */
 
 #include "inspircd.h"
-#include <algorithm>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "configreader.h"
 
 /* $ModDesc: Gives /cban, aka C:lines. Think Q:lines, for channels. */
 
@@ -55,8 +50,8 @@ class cmd_cban : public command_t
        cmd_cban(InspIRCd* Me) : command_t(Me, "CBAN", 'o', 1)
        {
                this->source = "m_cban.so";
-               this->
-               syntax = "<channel> [<duration> :<reason>]";
+               this->syntax = "<channel> [<duration> :<reason>]";
+               TRANSLATE4(TR_TEXT,TR_TEXT,TR_TEXT,TR_END);
        }
 
        CmdResult Handle(const char** parameters, int pcnt, userrec *user)
@@ -71,8 +66,8 @@ class cmd_cban : public command_t
                        {
                                if (parameters[0] == iter->chname)
                                {
-                                       unsigned long remaining = (iter->set_on + iter->length) - ServerInstance->Time();
-                                       user->WriteServ( "386 %s %s :Removed CBAN with %lu seconds left before expiry (%s)", user->nick, iter->chname.c_str(), remaining, iter->reason.c_str());
+                                       long remaining = iter->length + ServerInstance->Time();
+                                       user->WriteServ("386 %s %s :Removed CBAN due to expire at %s (%s)", user->nick, iter->chname.c_str(), ServerInstance->TimeString(remaining).c_str(), iter->reason.c_str());
                                        cbans.erase(iter);
                                        break;
                                }
@@ -95,18 +90,18 @@ class cmd_cban : public command_t
                                
                                if(length > 0)
                                {
-                                       user->WriteServ( "385 %s %s :Added %lu second channel ban (%s)", user->nick, parameters[0], length, reason.c_str());
+                                       user->WriteServ("385 %s %s :Added %lu second channel ban (%s)", user->nick, parameters[0], length, reason.c_str());
                                        ServerInstance->WriteOpers("*** %s added %lu second channel ban on %s (%s)", user->nick, length, parameters[0], reason.c_str());
                                }
                                else
                                {
-                                       user->WriteServ( "385 %s %s :Added permanent channel ban (%s)", user->nick, parameters[0], reason.c_str());
+                                       user->WriteServ("385 %s %s :Added permanent channel ban (%s)", user->nick, parameters[0], reason.c_str());
                                        ServerInstance->WriteOpers("*** %s added permanent channel ban on %s (%s)", user->nick, parameters[0], reason.c_str());
                                }
                        }
                        else
                        {
-                               user->WriteServ( "403 %s %s :Invalid channel name", user->nick, parameters[0]);
+                               user->WriteServ("403 %s %s :Invalid channel name", user->nick, parameters[0]);
                                return CMD_FAILURE;
                        }
                }
@@ -196,7 +191,7 @@ class ModuleCBan : public Module
        
        virtual Version GetVersion()
        {
-               return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+               return Version(1, 1, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
        }
 
        std::string EncodeCBan(const CBan &ban)
@@ -235,7 +230,7 @@ class ModuleCBan : public Module
                                {
                                        if (iter->set_on + iter->length <= ServerInstance->Time())
                                        {
-                                               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);
+                                               ServerInstance->WriteOpers("*** %li second CBAN on %s (%s) set on %s expired", iter->length, iter->chname.c_str(), iter->reason.c_str(), ServerInstance->TimeString(iter->set_on).c_str());
                                                cbans.erase(iter);
                                                go_again = true;
                                        }
@@ -248,26 +243,5 @@ class ModuleCBan : public Module
        }
 };
 
-class ModuleCBanFactory : public ModuleFactory
-{
- public:
-       ModuleCBanFactory()
-       {
-       }
-       
-       ~ModuleCBanFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleCBan(Me);
-       }
-       
-};
+MODULE_INIT(ModuleCBan)
 
-
-extern "C" DllExport void * init_module( void )
-{
-       return new ModuleCBanFactory;
-}