X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nonicks.cpp;h=90fd93f1ce9451f7281c71377dd4d79a2f475cf1;hb=124bc04e841f9ca527b99c37563f19a85dec63fc;hp=6328e5ee2b2a8ba4b8184b00091745057258bbea;hpb=a1ecc3014a2a218751505a1ea9b34bf7aa47f9a5;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_nonicks.cpp b/src/modules/m_nonicks.cpp
index 6328e5ee2..90fd93f1c 100644
--- a/src/modules/m_nonicks.cpp
+++ b/src/modules/m_nonicks.cpp
@@ -1,47 +1,102 @@
-#include <stdio.h>
-#include <string>
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
+ *                       E-mail:
+ *                <brain@chatspike.net>
+ *                <Craig@chatspike.net>
+ *     
+ * Written by Craig Edwards, Craig McLure, and others.
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
+using namespace std;
+
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
+#include "hashcomp.h"
+#include "configreader.h"
+#include "inspircd.h"
 
 /* $ModDesc: Provides support for unreal-style GLOBOPS and umode +g */
 
-Server *Srv;
+class NoNicks : public ModeHandler
+{
+ public:
+	NoNicks(InspIRCd* Instance) : ModeHandler(Instance, '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
 {
+	NoNicks* nn;
  public:
-	ModuleNoNickChange()
+	ModuleNoNickChange(InspIRCd* Me)
+		: Module::Module(Me)
 	{
-		Srv = new Server;
 		
-		Srv->AddExtendedMode('N',MT_CHANNEL,false,0,0);
+		nn = new NoNicks(ServerInstance);
+		ServerInstance->AddMode(nn, 'N');
 	}
 	
 	virtual ~ModuleNoNickChange()
 	{
-		delete Srv;
+		ServerInstance->Modes->DelMode(nn);
+		DELETE(nn);
 	}
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,1);
+		return Version(1,1,0,1,VF_COMMON|VF_VENDOR,API_VERSION);
 	}
-	
-	virtual int OnUserPreNick(userrec* user, std::string newnick)
+
+	void Implements(char* List)
+	{
+		List[I_OnUserPreNick] = 1;
+	}
+
+	virtual int OnUserPreNick(userrec* user, const std::string &newnick)
 	{
-		if (!strcasecmp(user->server,Srv->GetServerName().c_str()))
+		irc::string server = user->server;
+		irc::string me = ServerInstance->Config->ServerName;
+		if (server == me)
 		{
-			for (int i =0; i != MAXCHANS; 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')) && (user->chans[i].uc_modes < STATUS_HOP))
+					chanrec* curr = ((ucrec*)(*i))->channel;
+					if ((curr->IsModeSet('N')) && (!*user->oper))
 					{
 						// don't allow the nickchange, theyre on at least one channel with +N set
-						// and theyre not a (H)OP on the channel
-						WriteServ(user->fd,"447 %s :Can't change nickname while on %s (+N is set)",user->nick,curr->name);
+						// and theyre not an oper
+						user->WriteServ("447 %s :Can't change nickname while on %s (+N is set)",user->nick,curr->name);
 						return 1;
 					}
 				}
@@ -49,20 +104,6 @@ class ModuleNoNickChange : public Module
 		}
 		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.
@@ -78,9 +119,9 @@ class ModuleNoNickChangeFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule()
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
-		return new ModuleNoNickChange;
+		return new ModuleNoNickChange(Me);
 	}
 	
 };