X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_oper.cpp;h=d9ae74bf69a5c18afc6ddfe4bbe2f16bb736c693;hb=316e19f10c1d30215a2617f44ca61f8d6d2559a8;hp=686182876beda77953873396b9c7977ada21e193;hpb=f2acdbc3820f0f4f5ef76a0a64e73d2a320df91f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_oper.cpp b/src/cmd_oper.cpp
index 686182876..d9ae74bf6 100644
--- a/src/cmd_oper.cpp
+++ b/src/cmd_oper.cpp
@@ -12,10 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "configreader.h"
-#include "typedefs.h"
-#include "users.h"
-#include "modules.h"
 #include "wildcard.h"
 #include "commands/cmd_oper.h"
 #include "hashcomp.h"
@@ -46,6 +42,7 @@ CmdResult cmd_oper::Handle (const char** parameters, int pcnt, userrec *user)
 	char OperType[MAXBUF];
 	char TypeName[MAXBUF];
 	char HostName[MAXBUF];
+	char ClassName[MAXBUF];
 	char TheHost[MAXBUF];
 	char TheIP[MAXBUF];
 	int j;
@@ -75,7 +72,8 @@ CmdResult cmd_oper::Handle (const char** parameters, int pcnt, userrec *user)
 			type_invalid = true;
 			for (j =0; j < ServerInstance->Config->ConfValueEnum(ServerInstance->Config->config_data, "type"); j++)
 			{
-				ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "type","name", j, TypeName, MAXBUF);
+				ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "type", "name", j, TypeName, MAXBUF);
+				ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "type", "class", j, ClassName, MAXBUF);
 
 				if (!strcmp(TypeName,OperType))
 				{
@@ -90,6 +88,8 @@ CmdResult cmd_oper::Handle (const char** parameters, int pcnt, userrec *user)
 					ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "type","host", j, HostName, MAXBUF);
 					if (*HostName)
 						user->ChangeDisplayedHost(HostName);
+					if (*ClassName)
+						user->CheckClass(ClassName);
 					found = true;
 					type_invalid = false;
 					break;
@@ -104,7 +104,7 @@ CmdResult cmd_oper::Handle (const char** parameters, int pcnt, userrec *user)
 		/* correct oper credentials */
 		ServerInstance->SNO->WriteToSnoMask('o',"%s (%s@%s) is now an IRC operator of type %s (using oper '%s')",user->nick,user->ident,user->host,irc::Spacify(OperType),parameters[0]);
 		user->WriteServ("381 %s :You are now an IRC operator of type %s",user->nick,irc::Spacify(OperType));
-		if (!user->modes[UM_OPERATOR])
+		if (!user->IsModeSet('o'))
 			user->Oper(OperType);
 	}
 	else