Include explicit routing information in Command, will replace CMD_LOCALONLY return...

[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 5a06f55f5fe01053e49312f4f594105c68ee22bc..31d0b4e8483c276e098b4ab666abffc5c3233cd1 100644 (file)
--- a/src/modules/m_joinflood.cpp
+++ b/src/modules/m_joinflood.cpp
@@ -3,7 +3,7 @@
  *       +------------------------------------+
  *
  *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -97,12 +97,6 @@ class JoinFlood : public ModeHandler
                        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)
-       {
-               /* When TS is equal, the alphabetically later one wins */
-               return (their_param < our_param);
-       }
-
        ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
        {
                joinfloodsettings* dummy;
@@ -144,8 +138,7 @@ class JoinFlood : public ModeHandler
                                                parameter = ConvToStr(njoins) + ":" +ConvToStr(nsecs);
                                                joinfloodsettings *f = new joinfloodsettings(ServerInstance, nsecs, njoins);
                                                channel->Extend("joinflood", f);
-                                               channel->SetMode('j', true);
-                                               channel->SetModeParam('j', parameter.c_str(), true);
+                                               channel->SetModeParam('j', parameter);
                                                return MODEACTION_ALLOW;
                                        }
                                        else
@@ -168,8 +161,7 @@ class JoinFlood : public ModeHandler
                                                                f = new joinfloodsettings(ServerInstance, nsecs, njoins);
                                                                channel->Shrink("joinflood");
                                                                channel->Extend("joinflood", f);
-                                                               channel->SetModeParam('j', cur_param.c_str(), false);
-                                                               channel->SetModeParam('j', parameter.c_str(), true);
+                                                               channel->SetModeParam('j', parameter);
                                                                return MODEACTION_ALLOW;
                                                        }
                                                        else
@@ -194,7 +186,7 @@ class JoinFlood : public ModeHandler
                                channel->GetExt("joinflood", f);
                                delete f;
                                channel->Shrink("joinflood");
-                               channel->SetMode('j', false);
+                               channel->SetModeParam('j', "");
                                return MODEACTION_ALLOW;
                        }
                }
@@ -205,16 +197,15 @@ class JoinFlood : public ModeHandler
 class ModuleJoinFlood : public Module
 {
 
-       JoinFlood* jf;
+       JoinFlood jf;
 
  public:
 
        ModuleJoinFlood(InspIRCd* Me)
-               : Module(Me)
+               : Module(Me), jf(Me)
        {
 
-               jf = new JoinFlood(ServerInstance);
-               if (!ServerInstance->Modes->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);
@@ -237,7 +228,7 @@ class ModuleJoinFlood : public Module
                return 0;
        }
 
-       virtual void OnUserJoin(User* user, Channel* channel, bool sync, bool &silent)
+       virtual void OnUserJoin(User* user, Channel* channel, bool sync, bool &silent, bool created)
        {
                joinfloodsettings *f;
 
@@ -271,8 +262,7 @@ class ModuleJoinFlood : public Module
 
        virtual ~ModuleJoinFlood()
        {
-               ServerInstance->Modes->DelMode(jf);
-               delete jf;
+               ServerInstance->Modes->DelMode(&jf);
        }
 
        virtual Version GetVersion()