Convert more modules

[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 6d13b59a5cb341d9f4baec6d079abf60591daa02..df24ddf18c3d00b52c440dc99471a429c2a9f122 100644 (file)
--- a/src/modules/m_cban.cpp
+++ b/src/modules/m_cban.cpp
@@ -11,12 +11,12 @@
  * ---------------------------------------------------
  */
 
+#include "inspircd.h"
 #include <algorithm>
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
 #include "configreader.h"
-#include "inspircd.h"
 
 /* $ModDesc: Gives /cban, aka C:lines. Think Q:lines, for channels. */
 
@@ -55,8 +55,7 @@ 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>]";
        }
 
        CmdResult Handle(const char** parameters, int pcnt, userrec *user)
@@ -71,8 +70,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,22 +94,23 @@ 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 permenant channel ban (%s)", user->nick, parameters[0], reason.c_str());
-                                       ServerInstance->WriteOpers("*** %s added permenant channel ban on %s (%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;
                        }
                }
 
+               /* we want this routed! */
                return CMD_SUCCESS;
        }
 };
@@ -126,7 +126,7 @@ class ModuleCBan : public Module
        
 
  public:
-       ModuleCBan(InspIRCd* Me) : Module::Module(Me)
+       ModuleCBan(InspIRCd* Me) : Module(Me)
        {
                
                mycommand = new cmd_cban(Me);
@@ -172,7 +172,7 @@ class ModuleCBan : public Module
                return 0;
        }
        
-       virtual void OnSyncOtherMetaData(Module* proto, void* opaque)
+       virtual void OnSyncOtherMetaData(Module* proto, void* opaque, bool displayable)
        {
                for(cbanlist::iterator iter = cbans.begin(); iter != cbans.end(); iter++)
                {
@@ -201,20 +201,21 @@ class ModuleCBan : public Module
        std::string EncodeCBan(const CBan &ban)
        {
                std::ostringstream stream;      
-               stream << ban.chname << " " << ban.set_by << " " << ban.set_on << " " << ban.length << " " << ban.reason;
-               return stream.str();    
+               stream << ban.chname << " " << ban.set_by << " " << ban.set_on << " " << ban.length << " :" << ban.reason;
+               return stream.str();
        }
 
        CBan DecodeCBan(const std::string &data)
        {
                CBan res;
-               std::istringstream stream(data);
-               stream >> res.chname;
-               stream >> res.set_by;
-               stream >> res.set_on;
-               stream >> res.length;
-               res.reason = stream.str();
-       
+               int set_on;
+               irc::tokenstream tokens(data);
+               tokens.GetToken(res.chname);
+               tokens.GetToken(res.set_by);
+               tokens.GetToken(set_on);
+               res.set_on = set_on;
+               tokens.GetToken(res.length);
+               tokens.GetToken(res.reason);
                return res;
        }
 
@@ -233,8 +234,7 @@ 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);
+                                               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;
                                        }
@@ -266,7 +266,7 @@ class ModuleCBanFactory : public ModuleFactory
 };
 
 
-extern "C" void * init_module( void )
+extern "C" DllExport void * init_module( void )
 {
        return new ModuleCBanFactory;
 }