X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_joinflood.cpp;h=e739e3d92f276c6da7c8dda64bc941bd2f83da8f;hb=fea1a27cb96a114f698eedcf90401b78406108fb;hp=ac966cc39fabd77b3351550c6a38359f0531f5ad;hpb=3eefd1dfbdf611e526670b89dbd738e17c392c2c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_joinflood.cpp b/src/modules/m_joinflood.cpp
index ac966cc39..e739e3d92 100644
--- a/src/modules/m_joinflood.cpp
+++ b/src/modules/m_joinflood.cpp
@@ -25,7 +25,7 @@ using namespace std;
 
 /* $ModDesc: Provides channel mode +j (join flood protection) */
 
-class joinfloodsettings
+class joinfloodsettings : public classbase
 {
  public:
 
@@ -99,6 +99,21 @@ class JoinFlood : public ModeHandler
  public:
 	JoinFlood() : ModeHandler('j', 1, 0, false, MODETYPE_CHANNEL, false) { }
 
+        ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
+        {
+                joinfloodsettings* x;
+                if (channel->GetExt("joinflood",x))
+                        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, chanrec* channel)
+	{
+		/* When TS is equal, the alphabetically later one wins */
+		return (their_param < our_param);
+	}
+
 	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
 	{
 		joinfloodsettings* dummy;
@@ -128,7 +143,7 @@ class JoinFlood : public ModeHandler
 				int nsecs = atoi(secs);
 				if ((njoins<1) || (nsecs<1))
 				{
-					WriteServ(source->fd,"608 %s %s :Invalid flood parameter",source->nick,channel->name);
+					source->WriteServ("608 %s %s :Invalid flood parameter",source->nick,channel->name);
 					parameter = "";
 					return MODEACTION_DENY;
 				}
@@ -147,7 +162,7 @@ class JoinFlood : public ModeHandler
 			}
 			else
 			{
-				WriteServ(source->fd,"608 %s %s :Invalid flood parameter",source->nick,channel->name);
+				source->WriteServ("608 %s %s :Invalid flood parameter",source->nick,channel->name);
 				return MODEACTION_DENY;
 			}
 		}
@@ -191,7 +206,7 @@ class ModuleJoinFlood : public Module
 			{
 				if (f->islocked())
 				{
-					WriteServ(user->fd,"609 %s %s :This channel is temporarily unavailable (+j). Please try again later.",user->nick,chan->name);
+					user->WriteServ("609 %s %s :This channel is temporarily unavailable (+j). Please try again later.",user->nick,chan->name);
 					return 1;
 				}
 			}
@@ -209,7 +224,7 @@ class ModuleJoinFlood : public Module
 			{
 				f->clear();
 				f->lock();
-				WriteChannelWithServ((char*)Srv->GetServerName().c_str(), channel, "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*)Srv->GetServerName().c_str(), "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);
 			}
 		}
 	}