Note where to find the docs.

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

diff --git a/src/modules/m_joinflood.cpp b/src/modules/m_joinflood.cpp
index effe67dab89f5e798c697303416ec84dfa130336..33ba98aa410951b33f69c3e688e19ede82bd5222 100644 (file)
--- a/src/modules/m_joinflood.cpp
+++ b/src/modules/m_joinflood.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
@@ -97,7 +97,7 @@ class JoinFlood : public ModeHandler
                        return std::make_pair(true, ConvToStr(x->joins)+":"+ConvToStr(x->secs));
                else
                        return std::make_pair(false, parameter);
-       } 
+       }
 
        bool CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, Channel* channel)
        {
@@ -105,7 +105,7 @@ class JoinFlood : public ModeHandler
                return (their_param < our_param);
        }
 
-       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
        {
                joinfloodsettings* dummy;
 
@@ -135,7 +135,7 @@ class JoinFlood : public ModeHandler
                                int nsecs = atoi(secs);
                                if ((njoins<1) || (nsecs<1))
                                {
-                                       source->WriteServ("608 %s %s :Invalid flood parameter",source->nick,channel->name);
+                                       source->WriteNumeric(608, "%s %s :Invalid flood parameter",source->nick.c_str(),channel->name.c_str());
                                        parameter.clear();
                                        return MODEACTION_DENY;
                                }
@@ -184,7 +184,7 @@ class JoinFlood : public ModeHandler
                        }
                        else
                        {
-                               source->WriteServ("608 %s %s :Invalid flood parameter",source->nick,channel->name);
+                               source->WriteNumeric(608, "%s %s :Invalid flood parameter",source->nick.c_str(),channel->name.c_str());
                                return MODEACTION_DENY;
                        }
                }
@@ -206,23 +206,23 @@ class JoinFlood : public ModeHandler
 
 class ModuleJoinFlood : public Module
 {
-       
+
        JoinFlood* jf;
-       
+
  public:
- 
+
        ModuleJoinFlood(InspIRCd* Me)
                : Module(Me)
        {
-               
+
                jf = new JoinFlood(ServerInstance);
-               if (!ServerInstance->AddMode(jf))
+               if (!ServerInstance->Modes->AddMode(jf))
                        throw ModuleException("Could not add new modes!");
                Implementation eventlist[] = { I_OnChannelDelete, I_OnUserPreJoin, I_OnUserJoin };
                ServerInstance->Modules->Attach(eventlist, this, 3);
        }
-       
-       virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs)
+
+       virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
        {
                if (chan)
                {
@@ -231,7 +231,7 @@ class ModuleJoinFlood : public Module
                        {
                                if (f->islocked())
                                {
-                                       user->WriteServ("609 %s %s :This channel is temporarily unavailable (+j). Please try again later.",user->nick,chan->name);
+                                       user->WriteNumeric(609, "%s %s :This channel is temporarily unavailable (+j). Please try again later.",user->nick.c_str(),chan->name.c_str());
                                        return 1;
                                }
                        }
@@ -255,7 +255,7 @@ class ModuleJoinFlood : public Module
                        {
                                f->clear();
                                f->lock();
-                               channel->WriteChannelWithServ((char*)ServerInstance->Config->ServerName, "NOTICE %s :This channel has been closed to new users for 60 seconds because there have been more than %d joins in %d seconds.", channel->name, f->joins, f->secs);
+                               channel->WriteChannelWithServ((char*)ServerInstance->Config->ServerName, "NOTICE %s :This channel has been closed to new users for 60 seconds because there have been more than %d joins in %d seconds.", channel->name.c_str(), f->joins, f->secs);
                        }
                }
        }
@@ -276,10 +276,10 @@ class ModuleJoinFlood : public Module
                ServerInstance->Modes->DelMode(jf);
                delete jf;
        }
-       
+
        virtual Version GetVersion()
        {
-               return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
        }
 };