X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_services.cpp;h=f32964a44147102612baeffd0a368357d667d602;hb=d54fd9b1e6b31f69332a9241b5f17330c0ad61e0;hp=924f8dc09971e52796b2989c3b5d77edc60b25bb;hpb=fd6ee21f2f55875984884a8413d61012e066029f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_services.cpp b/src/modules/m_services.cpp
index 924f8dc09..f32964a44 100644
--- a/src/modules/m_services.cpp
+++ b/src/modules/m_services.cpp
@@ -16,22 +16,15 @@
 
 using namespace std;
 
-#include <stdio.h>
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include <string>
-#include "helperfuncs.h"
-#include "commands.h"
-#include "hashcomp.h"
 #include "inspircd.h"
 
 static bool kludgeme = false;
 
 /* $ModDesc: Povides support for services +r user/chan modes and more */
 
-
-
 class Channel_r : public ModeHandler
 {
 	
@@ -41,15 +34,15 @@ class Channel_r : public ModeHandler
 	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
 	{
 		// only a u-lined server may add or remove the +r mode.
-		if ((is_uline(source->nick)) || (is_uline(source->server)) || (!*source->server || (strchr(source->nick,'.'))))
+		if ((ServerInstance->ULine(source->nick)) || (ServerInstance->ULine(source->server)) || (!*source->server || (strchr(source->nick,'.'))))
 		{
-			log(DEBUG,"Allowing cmode +r, server and nick are: '%s','%s'",source->nick,source->server);
+			ServerInstance->Log(DEBUG,"Allowing cmode +r, server and nick are: '%s','%s'",source->nick,source->server);
 			channel->SetMode('r',adding);
 			return MODEACTION_ALLOW;
 		}
 		else
 		{
-			log(DEBUG,"Only a server can set chanmode +r, server and nick are: '%s','%s'",source->nick,source->server);
+			ServerInstance->Log(DEBUG,"Only a server can set chanmode +r, server and nick are: '%s','%s'",source->nick,source->server);
 			source->WriteServ("500 "+std::string(source->nick)+" :Only a server may modify the +r channel mode");
 			return MODEACTION_DENY;
 		}
@@ -64,15 +57,15 @@ class User_r : public ModeHandler
 
 	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
 	{
-		if ((kludgeme) || (is_uline(source->nick)) || (is_uline(source->server)) || (!*source->server || (strchr(source->nick,'.'))))
+		if ((kludgeme) || (ServerInstance->ULine(source->nick)) || (ServerInstance->ULine(source->server)) || (!*source->server || (strchr(source->nick,'.'))))
 		{
-			log(DEBUG,"Allowing umode +r, server and nick are: '%s','%s'",source->nick,source->server);
+			ServerInstance->Log(DEBUG,"Allowing umode +r, server and nick are: '%s','%s'",source->nick,source->server);
 			dest->SetMode('r',adding);
 			return MODEACTION_ALLOW;
 		}
 		else
 		{
-			log(DEBUG,"Only a server can set umode +r, server and nick are: '%s','%s'",source->nick, source->server);
+			ServerInstance->Log(DEBUG,"Only a server can set umode +r, server and nick are: '%s','%s'",source->nick, source->server);
 			source->WriteServ("500 "+std::string(source->nick)+" :Only a server may modify the +r user mode");
 			return MODEACTION_DENY;
 		}
@@ -189,11 +182,6 @@ class ModuleServices : public Module
 		kludgeme = false;
 	}
 
-	virtual void On005Numeric(std::string &output)
-	{
-		ServerInstance->ModeGrok->InsertMode(output, "rRM", 4);
-	}
-
 	/* <- :stitch.chatspike.net 307 w00t w00t :is a registered nick */
 	virtual void OnWhois(userrec* source, userrec* dest)
 	{
@@ -206,7 +194,7 @@ class ModuleServices : public Module
 
 	void Implements(char* List)
 	{
-		List[I_OnWhois] = List[I_OnUserPostNick] = List[I_OnUserPreMessage] = List[I_On005Numeric] = List[I_OnUserPreNotice] = List[I_OnUserPreJoin] = 1;
+		List[I_OnWhois] = List[I_OnUserPostNick] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnUserPreJoin] = 1;
 	}
 
 	virtual void OnUserPostNick(userrec* user, const std::string &oldnick)
@@ -230,7 +218,7 @@ class ModuleServices : public Module
 			chanrec* c = (chanrec*)dest;
 			if ((c->IsModeSet('M')) && (!user->IsModeSet('r')))
 			{
-				if ((is_uline(user->nick)) || (is_uline(user->server)) || (!strcmp(user->server,"")))
+				if ((ServerInstance->ULine(user->nick)) || (ServerInstance->ULine(user->server)) || (!strcmp(user->server,"")))
 				{
 					// user is ulined, can speak regardless
 					return 0;
@@ -245,7 +233,7 @@ class ModuleServices : public Module
 			userrec* u = (userrec*)dest;
 			if ((u->IsModeSet('R')) && (user->IsModeSet('r')))
 			{
-				if ((is_uline(user->nick)) || (is_uline(user->server)))
+				if ((ServerInstance->ULine(user->nick)) || (ServerInstance->ULine(user->server)))
 				{
 					// user is ulined, can speak regardless
 					return 0;
@@ -271,7 +259,7 @@ class ModuleServices : public Module
 			{
 				if (user->IsModeSet('r'))
 				{
-					if ((is_uline(user->nick)) || (is_uline(user->server)))
+					if ((ServerInstance->ULine(user->nick)) || (ServerInstance->ULine(user->server)))
 					{
 						// user is ulined, won't be stopped from joining
 						return 0;