X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nonicks.cpp;h=b225cdba5f502d3c3c505327b14332a0e47fc9ec;hb=2330fc9ddd48c939e894e7e37e9bb2e62eafc38d;hp=5f7be158044125d89acf80e19f64b9173270bdce;hpb=feaf72ecb48470114fbe3f3058b5f4b9622b88a5;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_nonicks.cpp b/src/modules/m_nonicks.cpp
index 5f7be1580..b225cdba5 100644
--- a/src/modules/m_nonicks.cpp
+++ b/src/modules/m_nonicks.cpp
@@ -5,7 +5,7 @@
  *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *                       E-mail:
  *                <brain@chatspike.net>
- *           	  <Craig@chatspike.net>
+ *                <Craig@chatspike.net>
  *     
  * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
@@ -26,21 +26,51 @@ using namespace std;
 
 /* $ModDesc: Provides support for unreal-style GLOBOPS and umode +g */
 
+class NoNicks : public ModeHandler
+{
+ public:
+	NoNicks() : ModeHandler('N', 0, 0, false, MODETYPE_CHANNEL, false) { }
+
+	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* 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;
+	}
+};
+
 class ModuleNoNickChange : public Module
 {
 	Server *Srv;
+	NoNicks* nn;
 	
  public:
 	ModuleNoNickChange(Server* Me)
 		: Module::Module(Me)
 	{
 		Srv = Me;
-		
-		Srv->AddExtendedMode('N',MT_CHANNEL,false,0,0);
+		nn = new NoNicks();
+		Srv->AddMode(nn, 'N');
 	}
 	
 	virtual ~ModuleNoNickChange()
 	{
+		DELETE(nn);
 	}
 	
 	virtual Version GetVersion()
@@ -50,54 +80,37 @@ class ModuleNoNickChange : public Module
 
 	void Implements(char* List)
 	{
-		List[I_On005Numeric] = List[I_OnUserPreNick] = List[I_OnExtendedMode] = 1;
+		List[I_On005Numeric] = List[I_OnUserPreNick] = 1;
 	}
 
-        virtual void On005Numeric(std::string &output)
-        {
+	virtual void On005Numeric(std::string &output)
+	{
 		InsertMode(output,"N",4);
-        }
+	}
 	
-	virtual int OnUserPreNick(userrec* user, std::string newnick)
+	virtual int OnUserPreNick(userrec* user, const std::string &newnick)
 	{
 		irc::string server = user->server;
 		irc::string me = Srv->GetServerName().c_str();
 		if (server == me)
 		{
-			for (unsigned int i =0; i < user->chans.size(); i++)
+			for (std::vector<ucrec*>::iterator i = user->chans.begin(); i != user->chans.end(); i++)
 			{
-				if (user->chans[i].channel != NULL)
+				if (((ucrec*)(*i))->channel != NULL)
 				{
-					chanrec* curr = user->chans[i].channel;
-					if (curr->IsCustomModeSet('N'))
+					chanrec* curr = ((ucrec*)(*i))->channel;
+					if ((curr->IsModeSet('N')) && (!*user->oper))
 					{
-						if (!*user->oper)
-						{
-							// don't allow the nickchange, theyre on at least one channel with +N set
-							// and theyre not an oper
-							WriteServ(user->fd,"447 %s :Can't change nickname while on %s (+N is set)",user->nick,curr->name);
-							return 1;
-						}
+						// don't allow the nickchange, theyre on at least one channel with +N set
+						// and theyre not an oper
+						WriteServ(user->fd,"447 %s :Can't change nickname while on %s (+N is set)",user->nick,curr->name);
+						return 1;
 					}
 				}
 			}
 		}
 		return 0;
 	}
- 	
-	virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list &params)
-	{
-		// check if this is our mode character...
-		if ((modechar == 'N') && (type == MT_CHANNEL))
-  		{
-			return 1;
-		}
-		else
-		{
-			return 0;
-		}
-	}
-
 };
 
 // stuff down here is the module-factory stuff. For basic modules you can ignore this.