Should now work with ports bound to all interfaces

[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 abb4cd12a5092af668cf92809f35b84afac42ac7..60884331e64031c0ce106bebd232a56f208f659a 100644 (file)
--- a/src/modules/m_cban.cpp
+++ b/src/modules/m_cban.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -44,16 +44,17 @@ cbanlist cbans;
 
 /** Handle /CBAN
  */
-class cmd_cban : public command_t
+class CommandCban : public Command
 {
  public:
-       cmd_cban(InspIRCd* Me) : command_t(Me, "CBAN", 'o', 1)
+       CommandCban(InspIRCd* Me) : Command(Me, "CBAN", "o", 1)
        {
                this->source = "m_cban.so";
                this->syntax = "<channel> [<duration> :<reason>]";
+               TRANSLATE4(TR_TEXT,TR_TEXT,TR_TEXT,TR_END);
        }
 
-       CmdResult Handle(const char** parameters, int pcnt, userrec *user)
+       CmdResult Handle(const char* const* parameters, int pcnt, User *user)
        {
                /* syntax: CBAN #channel time :reason goes here */
                /* 'time' is a human-readable timestring, like 2d3h2s. */
@@ -66,7 +67,7 @@ class cmd_cban : public command_t
                                if (parameters[0] == iter->chname)
                                {
                                        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());
+                                       user->WriteNumeric(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;
                                }
@@ -89,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());
-                                       ServerInstance->WriteOpers("*** %s added %lu second channel ban on %s (%s)", user->nick, length, parameters[0], reason.c_str());
+                                       user->WriteNumeric(385, "%s %s :Added %lu second channel ban (%s)", user->nick, parameters[0], length, reason.c_str());
+                                       ServerInstance->SNO->WriteToSnoMask('A', "%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());
-                                       ServerInstance->WriteOpers("*** %s added permanent channel ban on %s (%s)", user->nick, parameters[0], reason.c_str());
+                                       user->WriteNumeric(385, "%s %s :Added permanent channel ban (%s)", user->nick, parameters[0], reason.c_str());
+                                       ServerInstance->SNO->WriteToSnoMask('A', "%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->WriteNumeric(403, "%s %s :Invalid channel name", user->nick, parameters[0]);
                                return CMD_FAILURE;
                        }
                }
@@ -117,23 +118,21 @@ bool CBanComp(const CBan &ban1, const CBan &ban2)
 
 class ModuleCBan : public Module
 {
-       cmd_cban* mycommand;
+       CommandCban* mycommand;
        
 
  public:
        ModuleCBan(InspIRCd* Me) : Module(Me)
        {
                
-               mycommand = new cmd_cban(Me);
+               mycommand = new CommandCban(Me);
                ServerInstance->AddCommand(mycommand);
+               Implementation eventlist[] = { I_OnUserPreJoin, I_OnSyncOtherMetaData, I_OnDecodeMetaData, I_OnStats };
+               ServerInstance->Modules->Attach(eventlist, this, 4);
        }
 
-       void Implements(char* List)
-       {
-               List[I_OnUserPreJoin] = List[I_OnSyncOtherMetaData] = List[I_OnDecodeMetaData] = List[I_OnStats] = 1;
-       }
        
-       virtual int OnStats(char symbol, userrec* user, string_list &results)
+       virtual int OnStats(char symbol, User* user, string_list &results)
        {
                ExpireBans();
        
@@ -149,7 +148,7 @@ class ModuleCBan : public Module
                return 0;
        }
 
-       virtual int OnUserPreJoin(userrec *user, chanrec *chan, const char *cname, std::string &privs)
+       virtual int OnUserPreJoin(User *user, Channel *chan, const char *cname, std::string &privs)
        {
                ExpireBans();
        
@@ -160,7 +159,7 @@ class ModuleCBan : public Module
                        {
                                // Channel is banned.
                                user->WriteServ( "384 %s %s :Cannot join channel, CBANed (%s)", user->nick, cname, iter->reason.c_str());
-                               ServerInstance->WriteOpers("*** %s tried to join %s which is CBANed (%s)", user->nick, cname, iter->reason.c_str());
+                               ServerInstance->SNO->WriteToSnoMask('A', "%s tried to join %s which is CBANed (%s)", user->nick, cname, iter->reason.c_str());
                                return 1;
                        }
                }
@@ -190,7 +189,7 @@ class ModuleCBan : public Module
        
        virtual Version GetVersion()
        {
-               return Version(1, 1, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version(1, 2, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
        }
 
        std::string EncodeCBan(const CBan &ban)
@@ -229,7 +228,7 @@ class ModuleCBan : public Module
                                {
                                        if (iter->set_on + iter->length <= ServerInstance->Time())
                                        {
-                                               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());
+                                               ServerInstance->SNO->WriteToSnoMask('A', "%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;
                                        }