X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_override.cpp;h=b0143ea4522269714387f34ff6a5128f702f9e32;hb=d54fd9b1e6b31f69332a9241b5f17330c0ad61e0;hp=c65a992e7ad45d6d04858c65e907d1a658f84641;hpb=12737ab4ad61a0d8a908c8a21594c7012e21eb3c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_override.cpp b/src/modules/m_override.cpp
index c65a992e7..b0143ea45 100644
--- a/src/modules/m_override.cpp
+++ b/src/modules/m_override.cpp
@@ -17,14 +17,11 @@
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
 #include "configreader.h"
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for unreal-style oper-override */
 
-
-
 typedef std::map<std::string,std::string> override_t;
 
 class ModuleOverride : public Module
@@ -36,13 +33,7 @@ class ModuleOverride : public Module
  
 	ModuleOverride(InspIRCd* Me)
 		: Module::Module(Me)
-	{
-	
-		// here we initialise our module. Use new to create new instances of the required
-		// classes.
-		
-		
-		
+	{		
 		// read our config options (main config file)
 		OnRehash("");
 	}
@@ -213,7 +204,7 @@ class ModuleOverride : public Module
 						if (!user->IsInvited(x))
 						{
 							/* XXX - Ugly cast for a parameter that isn't used? :< - Om */
-							chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s invited himself into the channel", cname, user->nick);
+							chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper-override to bypass invite-only", cname, user->nick);
 						}
 					}
 					ServerInstance->WriteOpers("*** "+std::string(user->nick)+" used operoverride to bypass +i on "+std::string(cname));
@@ -223,7 +214,7 @@ class ModuleOverride : public Module
 				if ((chan->key[0]) && (CanOverride(user,"KEY")))
 				{
 					if (NoisyOverride)
-						chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s bypassed the channel key", cname, user->nick);
+						chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper-override to bypass the channel key", cname, user->nick);
 					ServerInstance->WriteOpers("*** "+std::string(user->nick)+" used operoverride to bypass +k on "+std::string(cname));
 					return -1;
 				}
@@ -231,7 +222,7 @@ class ModuleOverride : public Module
 				if ((chan->limit > 0) && (chan->GetUserCounter() >=  chan->limit) && (CanOverride(user,"LIMIT")))
 				{
 					if (NoisyOverride)
-						chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s passed through your channel limit", cname, user->nick);
+						chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper-override to bypass the channel limit", cname, user->nick);
 					ServerInstance->WriteOpers("*** "+std::string(user->nick)+" used operoverride to bypass +l on "+std::string(cname));
 					return -1;
 				}
@@ -239,6 +230,8 @@ class ModuleOverride : public Module
 				if (CanOverride(user,"BANWALK"))
 				{
 					// other join
+					if (NoisyOverride)
+						chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper-override to bypass channel bans", cname, user->nick);
 					return -1;
 				}
 			}