X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nonicks.cpp;h=672a48f8d9bca45091d980ebb5290efb4f2a64ca;hb=6a1892b1c1bdd8e8ecb519933ee9887adb5b8585;hp=e7903acc411ebf21b8e6f0561e40e4006c72850b;hpb=585138e4a46a3c9f3ad3666f675d178922a81815;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_nonicks.cpp b/src/modules/m_nonicks.cpp
index e7903acc4..672a48f8d 100644
--- a/src/modules/m_nonicks.cpp
+++ b/src/modules/m_nonicks.cpp
@@ -1,46 +1,32 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2004, 2006 Craig Edwards <craigedwards@brainbox.cc>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for channel mode +N & extban +b N: which prevents nick changes on channel */
 
-class NoNicks : public ModeHandler
+class NoNicks : public SimpleChannelModeHandler
 {
  public:
-	NoNicks(Module* Creator) : ModeHandler(Creator, "nonick", 'N', PARAM_NONE, MODETYPE_CHANNEL) { }
-
-	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
-	{
-		if (adding)
-		{
-			if (!channel->IsModeSet('N'))
-			{
-				channel->SetMode('N',true);
-				return MODEACTION_ALLOW;
-			}
-		}
-		else
-		{
-			if (channel->IsModeSet('N'))
-			{
-				channel->SetMode('N',false);
-				return MODEACTION_ALLOW;
-			}
-		}
-
-		return MODEACTION_DENY;
-	}
+	NoNicks(Module* Creator) : SimpleChannelModeHandler(Creator, "nonick", 'N') { }
 };
 
 class ModuleNoNickChange : public Module
@@ -49,11 +35,15 @@ class ModuleNoNickChange : public Module
 	bool override;
  public:
 	ModuleNoNickChange() : nn(this)
+	{
+	}
+
+	void init()
 	{
 		OnRehash(NULL);
-		ServerInstance->Modes->AddMode(&nn);
+		ServerInstance->Modules->AddService(nn);
 		Implementation eventlist[] = { I_OnUserPreNick, I_On005Numeric, I_OnRehash };
-		ServerInstance->Modules->Attach(eventlist, this, 2);
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
 	virtual ~ModuleNoNickChange()
@@ -62,7 +52,7 @@ class ModuleNoNickChange : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Provides support for channel mode +N & extban +b N: which prevents nick changes on channel", VF_COMMON | VF_VENDOR);
+		return Version("Provides support for channel mode +N & extban +b N: which prevents nick changes on channel", VF_VENDOR);
 	}
 
 
@@ -76,9 +66,6 @@ class ModuleNoNickChange : public Module
 		if (!IS_LOCAL(user))
 			return MOD_RES_PASSTHRU;
 
-		if (isdigit(newnick[0])) /* don't even think about touching a switch to uid! */
-			return MOD_RES_PASSTHRU;
-
 		// Allow forced nick changes.
 		if (ServerInstance->NICKForced.get(user))
 			return MOD_RES_PASSTHRU;
@@ -87,8 +74,7 @@ class ModuleNoNickChange : public Module
 		{
 			Channel* curr = *i;
 
-			ModResult res;
-			FIRST_MOD_RESULT(OnChannelRestrictionApply, res, (user,curr,"nonick"));
+			ModResult res = ServerInstance->OnCheckExemption(user,curr,"nonick");
 
 			if (res == MOD_RES_ALLOW)
 				continue;
@@ -109,8 +95,7 @@ class ModuleNoNickChange : public Module
 
 	virtual void OnRehash(User* user)
 	{
-		ConfigReader Conf;
-		override = Conf.ReadFlag("nonicks", "operoverride", "no", 0);
+		override = ServerInstance->Config->ConfValue("nonicks")->getBool("operoverride", false);
 	}
 };