X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nonicks.cpp;h=7a6d3ffd07c51207b8eee148c5a3374380164e06;hb=8fa7e20b6b47d4de617e1bba2773606df569f11d;hp=3e378d59f6022a1b91762e413f2cdc007a327da0;hpb=579e707f017ca237d260165992f0b72bafba152c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_nonicks.cpp b/src/modules/m_nonicks.cpp
index 3e378d59f..7a6d3ffd0 100644
--- a/src/modules/m_nonicks.cpp
+++ b/src/modules/m_nonicks.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
@@ -46,12 +46,14 @@ class NoNicks : public ModeHandler
 class ModuleNoNickChange : public Module
 {
 	NoNicks nn;
+	bool override;
  public:
 	ModuleNoNickChange() : nn(this)
 	{
+		OnRehash(NULL);
 		ServerInstance->Modes->AddMode(&nn);
-		Implementation eventlist[] = { I_OnUserPreNick, I_On005Numeric };
-		ServerInstance->Modules->Attach(eventlist, this, 2);
+		Implementation eventlist[] = { I_OnUserPreNick, I_On005Numeric, I_OnRehash };
+		ServerInstance->Modules->Attach(eventlist, this, 3);
 	}
 
 	virtual ~ModuleNoNickChange()
@@ -60,7 +62,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, API_VERSION);
+		return Version("Provides support for channel mode +N & extban +b N: which prevents nick changes on channel", VF_VENDOR);
 	}
 
 
@@ -74,9 +76,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;
@@ -85,12 +84,14 @@ class ModuleNoNickChange : public Module
 		{
 			Channel* curr = *i;
 
-			ModResult res;
-			FIRST_MOD_RESULT(OnChannelRestrictionApply, res, (curr->GetUser(user),curr,"nonick"));
+			ModResult res = ServerInstance->OnCheckExemption(user,curr,"nonick");
 
 			if (res == MOD_RES_ALLOW)
 				continue;
 
+			if (override && IS_OPER(user))
+				continue;
+
 			if (!curr->GetExtBanStatus(user, 'N').check(!curr->IsModeSet('N')))
 			{
 				user->WriteNumeric(ERR_CANTCHANGENICK, "%s :Can't change nickname while on %s (+N is set)",
@@ -101,6 +102,12 @@ class ModuleNoNickChange : public Module
 
 		return MOD_RES_PASSTHRU;
 	}
+
+	virtual void OnRehash(User* user)
+	{
+		ConfigReader Conf;
+		override = Conf.ReadFlag("nonicks", "operoverride", "no", 0);
+	}
 };
 
 MODULE_INIT(ModuleNoNickChange)