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

diff --git a/src/modules/m_nonicks.cpp b/src/modules/m_nonicks.cpp
index 3591b954d..b225cdba5 100644
--- a/src/modules/m_nonicks.cpp
+++ b/src/modules/m_nonicks.cpp
@@ -2,10 +2,10 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
+ *  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
@@ -14,6 +14,8 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include <stdio.h>
 #include <string>
 #include "users.h"
@@ -24,21 +26,51 @@
 
 /* $ModDesc: Provides support for unreal-style GLOBOPS and umode +g */
 
-Server *Srv;
+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()
+	ModuleNoNickChange(Server* Me)
+		: Module::Module(Me)
 	{
-		Srv = new Server;
-		
-		Srv->AddExtendedMode('N',MT_CHANNEL,false,0,0);
+		Srv = Me;
+		nn = new NoNicks();
+		Srv->AddMode(nn, 'N');
 	}
 	
 	virtual ~ModuleNoNickChange()
 	{
-		delete Srv;
+		DELETE(nn);
 	}
 	
 	virtual Version GetVersion()
@@ -46,65 +78,39 @@ class ModuleNoNickChange : public Module
 		return Version(1,0,0,1,VF_STATIC|VF_VENDOR);
 	}
 
-        virtual void On005Numeric(std::string &output)
-        {
-                std::stringstream line(output);
-                std::string temp1, temp2;
-                while (!line.eof())
-                {
-                        line >> temp1;
-                        if (temp1.substr(0,10) == "CHANMODES=")
-                        {
-                                // append the chanmode to the end
-                                temp1 = temp1.substr(10,temp1.length());
-                                temp1 = "CHANMODES=" + temp1 + "N";
-                        }
-                        temp2 = temp2 + temp1 + " ";
-                }
-		if (temp2.length())
-	                output = temp2.substr(0,temp2.length()-1);
-        }
+	void Implements(char* List)
+	{
+		List[I_On005Numeric] = List[I_OnUserPreNick] = 1;
+	}
+
+	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 (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'))
+					chanrec* curr = ((ucrec*)(*i))->channel;
+					if ((curr->IsModeSet('N')) && (!*user->oper))
 					{
-						if (!strchr(user->modes,'o'))
-						{
-							// 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.
@@ -120,9 +126,9 @@ class ModuleNoNickChangeFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule()
+	virtual Module * CreateModule(Server* Me)
 	{
-		return new ModuleNoNickChange;
+		return new ModuleNoNickChange(Me);
 	}
 	
 };