X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_oper.cpp;h=e8654ea590c598d09cb8e587a93f82082ef1db8e;hb=76ebc88ccd6fef0bf2d97b607829fb3466e273af;hp=abd34f65341cca94f281b608e69bfe7da67498a8;hpb=6d4128715da39b1e097642a64ee0bd40586d9a38;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_oper.cpp b/src/cmd_oper.cpp
index abd34f653..e8654ea59 100644
--- a/src/cmd_oper.cpp
+++ b/src/cmd_oper.cpp
@@ -25,7 +25,6 @@
 #include "modules.h"
 #include "dynamic.h"
 #include "wildcard.h"
-#include "message.h"
 #include "commands.h"
 #include "mode.h"
 #include "xline.h"
@@ -37,12 +36,6 @@
 #include "command_parse.h"
 #include "commands/cmd_oper.h"
 
-extern ServerConfig* Config;
-extern int MODCOUNT;
-extern ModuleList modules;
-extern FactoryList factory;
-extern time_t TIME;
-
 bool OneOfMatches(const char* host, const char* ip, const char* hostlist)
 {
 	std::stringstream hl(hostlist);
@@ -74,30 +67,30 @@ void cmd_oper::Handle (const char** parameters, int pcnt, userrec *user)
 	snprintf(TheHost,MAXBUF,"%s@%s",user->ident,user->host);
 	snprintf(TheIP, MAXBUF,"%s@%s",user->ident,user->GetIPString());
 
-	for (int i = 0; i < Config->ConfValueEnum(Config->config_data, "oper"); i++)
+	for (int i = 0; i < ServerInstance->Config->ConfValueEnum(ServerInstance->Config->config_data, "oper"); i++)
 	{
-		Config->ConfValue(Config->config_data, "oper", "name", i, LoginName, MAXBUF);
-		Config->ConfValue(Config->config_data, "oper", "password", i, Password, MAXBUF);
-		Config->ConfValue(Config->config_data, "oper", "type", i, OperType, MAXBUF);
-		Config->ConfValue(Config->config_data, "oper", "host", i, HostName, MAXBUF);
+		ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "oper", "name", i, LoginName, MAXBUF);
+		ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "oper", "password", i, Password, MAXBUF);
+		ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "oper", "type", i, OperType, MAXBUF);
+		ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "oper", "host", i, HostName, MAXBUF);
 
 		if ((!strcmp(LoginName,parameters[0])) && (!operstrcmp(Password,parameters[1])) && (OneOfMatches(TheHost,TheIP,HostName)))
 		{
 			fail2 = true;
-			for (j =0; j < Config->ConfValueEnum(Config->config_data, "type"); j++)
+			for (j =0; j < ServerInstance->Config->ConfValueEnum(ServerInstance->Config->config_data, "type"); j++)
 			{
-				Config->ConfValue(Config->config_data, "type","name", j, TypeName, MAXBUF);
+				ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "type","name", j, TypeName, MAXBUF);
 
 				if (!strcmp(TypeName,OperType))
 				{
 					/* found this oper's opertype */
-					Config->ConfValue(Config->config_data, "type","host", j, HostName, MAXBUF);
+					ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "type","host", j, HostName, MAXBUF);
 					if (*HostName)
 						user->ChangeDisplayedHost(HostName);
-					if (!isnick(TypeName))
+					if (!ServerInstance->IsNick(TypeName))
 					{
 						user->WriteServ("491 %s :Invalid oper type (oper types must follow the same syntax as nicknames)",user->nick);
-						WriteOpers("*** CONFIGURATION ERROR! Oper type invalid for OperType '%s'",OperType);
+						ServerInstance->WriteOpers("*** CONFIGURATION ERROR! Oper type invalid for OperType '%s'",OperType);
 						log(DEFAULT,"OPER: Failed oper attempt by %s!%s@%s: credentials valid, but oper type erroneous.",user->nick,user->ident,user->host);
 						return;
 					}
@@ -113,7 +106,7 @@ void cmd_oper::Handle (const char** parameters, int pcnt, userrec *user)
 	if (found)
 	{
 		/* correct oper credentials */
-		WriteOpers("*** %s (%s@%s) is now an IRC operator of type %s",user->nick,user->ident,user->host,OperType);
+		ServerInstance->WriteOpers("*** %s (%s@%s) is now an IRC operator of type %s",user->nick,user->ident,user->host,OperType);
 		user->WriteServ("381 %s :You are now an IRC operator of type %s",user->nick,OperType);
 		if (!user->modes[UM_OPERATOR])
 			user->Oper(OperType);
@@ -123,13 +116,13 @@ void cmd_oper::Handle (const char** parameters, int pcnt, userrec *user)
 		if (!fail2)
 		{
 			user->WriteServ("491 %s :Invalid oper credentials",user->nick);
-			WriteOpers("*** WARNING! Failed oper attempt by %s!%s@%s!",user->nick,user->ident,user->host);
+			ServerInstance->WriteOpers("*** WARNING! Failed oper attempt by %s!%s@%s!",user->nick,user->ident,user->host);
 			log(DEFAULT,"OPER: Failed oper attempt by %s!%s@%s: user, host or password did not match.",user->nick,user->ident,user->host);
 		}
 		else
 		{
 			user->WriteServ("491 %s :Your oper block does not have a valid opertype associated with it",user->nick);
-			WriteOpers("*** CONFIGURATION ERROR! Oper block mismatch for OperType %s",OperType);
+			ServerInstance->WriteOpers("*** CONFIGURATION ERROR! Oper block mismatch for OperType %s",OperType);
 			log(DEFAULT,"OPER: Failed oper attempt by %s!%s@%s: credentials valid, but oper type nonexistent.",user->nick,user->ident,user->host);
 		}
 	}