X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_joinflood.cpp;h=8922b4eae1d73fc2ae91c1c91a8d356a488fef73;hb=46e56dedd37abe33af4e8b970d5b83729dc1ef05;hp=2520cbfcf880c6e8aa391c6d25fb2e1b6bc17b98;hpb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_joinflood.cpp b/src/modules/m_joinflood.cpp
index 2520cbfcf..8922b4eae 100644
--- a/src/modules/m_joinflood.cpp
+++ b/src/modules/m_joinflood.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -17,7 +17,7 @@
 
 /** Holds settings and state associated with channel mode +j
  */
-class joinfloodsettings : public classbase
+class joinfloodsettings
 {
  public:
 	int secs;
@@ -85,18 +85,9 @@ class JoinFlood : public ModeHandler
 {
  public:
 	SimpleExtItem<joinfloodsettings> ext;
-	JoinFlood(Module* Creator) : ModeHandler(Creator, 'j', PARAM_SETONLY, MODETYPE_CHANNEL),
+	JoinFlood(Module* Creator) : ModeHandler(Creator, "joinflood", 'j', PARAM_SETONLY, MODETYPE_CHANNEL),
 		ext("joinflood", Creator) { }
 
-	ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter)
-	{
-		joinfloodsettings* x = ext.get(channel);
-		if (x)
-			return std::make_pair(true, ConvToStr(x->joins)+":"+ConvToStr(x->secs));
-		else
-			return std::make_pair(false, parameter);
-	}
-
 	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
 		if (adding)
@@ -200,9 +191,9 @@ class ModuleJoinFlood : public Module
 
 		if (!ServerInstance->Modes->AddMode(&jf))
 			throw ModuleException("Could not add new modes!");
-		Extensible::Register(&jf.ext);
-		Implementation eventlist[] = { I_OnChannelDelete, I_OnUserPreJoin, I_OnUserJoin };
-		ServerInstance->Modules->Attach(eventlist, this, 3);
+		ServerInstance->Extensions.Register(&jf.ext);
+		Implementation eventlist[] = { I_OnUserPreJoin, I_OnUserJoin };
+		ServerInstance->Modules->Attach(eventlist, this, 2);
 	}
 
 	ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
@@ -235,19 +226,18 @@ class ModuleJoinFlood : public Module
 			{
 				f->clear();
 				f->lock();
-				memb->chan->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.", memb->chan->name.c_str(), f->joins, f->secs);
+				memb->chan->WriteChannelWithServ((char*)ServerInstance->Config->ServerName.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.", memb->chan->name.c_str(), f->joins, f->secs);
 			}
 		}
 	}
 
 	~ModuleJoinFlood()
 	{
-		ServerInstance->Modes->DelMode(&jf);
 	}
 
 	Version GetVersion()
 	{
-		return Version("Provides channel mode +j (join flood protection)", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides channel mode +j (join flood protection)", VF_VENDOR);
 	}
 };