X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_restrictbanned.cpp;h=a5ab337ad30f1c1b4ca9be0bc5af690acf2f32b2;hb=e6d000042ea75d4e0485bec9564b47163a3ca414;hp=c8c5451ed0f817a367a7bd38fc8efbfd5662f1ce;hpb=3a554ef1e9be9dbcf3de3301a4a6c2938d643bea;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_restrictbanned.cpp b/src/modules/m_restrictbanned.cpp
index c8c5451ed..a5ab337ad 100644
--- a/src/modules/m_restrictbanned.cpp
+++ b/src/modules/m_restrictbanned.cpp
@@ -11,10 +11,6 @@
  * ---------------------------------------------------
  */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-
 #include "inspircd.h"
 
 /* $ModDesc: Restricts banned users in a channel. May not speak, etc. */
@@ -23,7 +19,7 @@ class ModuleRestrictBanned : public Module
 {
  private:
  public:
-	ModuleRestrictBanned(InspIRCd* Me) : Module::Module(Me)
+	ModuleRestrictBanned(InspIRCd* Me) : Module(Me)
 	{
 	}
 	
@@ -47,7 +43,7 @@ class ModuleRestrictBanned : public Module
 		if (!IS_LOCAL(user))
 			return 0;
 
-		if (channel->IsBanned(user) && channel->GetStatus(user) < STATUS_VOICE)
+		if (channel->GetStatus(user) < STATUS_VOICE && channel->IsBanned(user))
 		{
 			/* banned, boned. drop the message. */
 			user->WriteServ("NOTICE "+std::string(user->nick)+" :*** You may not " + action + ", as you are banned on channel " + channel->name);
@@ -63,6 +59,10 @@ class ModuleRestrictBanned : public Module
 		if (!IS_LOCAL(user))
 			return 0;
 
+		/* Allow changes to UID */
+		if (isdigit(newnick[0]))
+			return 0;
+
 		/* bit of a special case. */
 		for (UCListIter i = user->chans.begin(); i != user->chans.end(); i++)
 		{
@@ -96,28 +96,4 @@ class ModuleRestrictBanned : public Module
 	}
 };
 
-
-class ModuleRestrictBannedFactory : public ModuleFactory
-{
- public:
-	ModuleRestrictBannedFactory()
-	{
-	}
-	
-	~ModuleRestrictBannedFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleRestrictBanned(Me);
-	}
-	
-};
-
-
-extern "C" void * init_module( void )
-{
-	return new ModuleRestrictBannedFactory;
-}
-
+MODULE_INIT(ModuleRestrictBanned)