X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nickflood.cpp;h=47c8bc8366d030eb3d741f90902230a66d851a8c;hb=46e56dedd37abe33af4e8b970d5b83729dc1ef05;hp=a267cd4043d448031046c3cd29db7e297bad9c91;hpb=fa452641bf37077fcda964d59e404a76e1fb13e5;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_nickflood.cpp b/src/modules/m_nickflood.cpp
index a267cd404..47c8bc836 100644
--- a/src/modules/m_nickflood.cpp
+++ b/src/modules/m_nickflood.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
@@ -92,15 +92,6 @@ class NickFlood : public ModeHandler
 	NickFlood(Module* Creator) : ModeHandler(Creator, "nickflood", 'F', PARAM_SETONLY, MODETYPE_CHANNEL),
 		ext("nickflood", Creator) { }
 
-	ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter)
-	{
-		nickfloodsettings* x = ext.get(channel);
-		if (x)
-			return std::make_pair(true, ConvToStr(x->nicks)+":"+ConvToStr(x->secs));
-		else
-			return std::make_pair(false, parameter);
-	}
-
 	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
 		nickfloodsettings *f = ext.get(channel);
@@ -207,7 +198,7 @@ class ModuleNickFlood : public Module
 
 	ModResult OnUserPreNick(User* user, const std::string &newnick)
 	{
-		if (isdigit(newnick[0])) /* allow switches to UID */
+		if (ServerInstance->NICKForced.get(user)) /* Allow forced nick changes */
 			return MOD_RES_PASSTHRU;
 
 		for (UCListIter i = user->chans.begin(); i != user->chans.end(); i++)
@@ -277,7 +268,7 @@ class ModuleNickFlood : public Module
 
 	Version GetVersion()
 	{
-		return Version("Channel mode F - nick flood protection", VF_COMMON | VF_VENDOR);
+		return Version("Channel mode F - nick flood protection", VF_VENDOR);
 	}
 };