X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_oper.cpp;h=1af42fffaa98e0536fcd8d63b241d4d8cbd33734;hb=4487dde76ffbdb21e7dc319b3b87d09c3cf60d8c;hp=7c7ab391e75aa4153f1e1216b515abf3fe819b7b;hpb=48d7ad4a34be421fec52c3e6e89758021e9bd127;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_oper.cpp b/src/cmd_oper.cpp
index 7c7ab391e..1af42fffa 100644
--- a/src/cmd_oper.cpp
+++ b/src/cmd_oper.cpp
@@ -11,10 +11,7 @@
  * ---------------------------------------------------
  */
 
-#include "configreader.h"
-#include "typedefs.h"
-#include "users.h"
-#include "modules.h"
+#include "inspircd.h"
 #include "wildcard.h"
 #include "commands/cmd_oper.h"
 #include "hashcomp.h"
@@ -33,18 +30,19 @@ bool OneOfMatches(const char* host, const char* ip, const char* hostlist)
 	return false;
 }
 
-extern "C" command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
 	return new cmd_oper(Instance);
 }
 
-CmdResult cmd_oper::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult cmd_oper::Handle (const char** parameters, int pcnt, User *user)
 {
 	char LoginName[MAXBUF];
 	char Password[MAXBUF];
 	char OperType[MAXBUF];
 	char TypeName[MAXBUF];
 	char HostName[MAXBUF];
+	char ClassName[MAXBUF];
 	char TheHost[MAXBUF];
 	char TheIP[MAXBUF];
 	int j;
@@ -74,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))
 				{
@@ -89,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;
@@ -102,30 +103,50 @@ 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])
+		user->WriteServ("381 %s :You are now %s %s",user->nick, strchr("aeiouAEIOU", *OperType) ? "an" : "a", irc::Spacify(OperType));
+		if (!user->IsModeSet('o'))
 			user->Oper(OperType);
 	}
 	else
 	{
+		std::deque<std::string> n;
+		n.push_back("o");
+		char broadcast[MAXBUF];
+
 		if (!type_invalid)
 		{
-			std::string fields = "";
+			std::string fields;
 			if (!match_login)
 				fields.append("login ");
-			if (!match_pass)
-				fields.append("password ");
-			if (!match_hosts)
-				fields.append("hosts");
+			else
+			{
+				if (!match_pass)
+					fields.append("password ");
+				if (!match_hosts)
+					fields.append("hosts");
+			}
 			user->WriteServ("491 %s :Invalid oper credentials",user->nick);
-			ServerInstance->SNO->WriteToSnoMask('o',"WARNING! Failed oper attempt by %s!%s@%s using login '%s': The following fields do not match: %s",user->nick,user->ident,user->host, parameters[0], fields.c_str());
+			
+			snprintf(broadcast, MAXBUF, "WARNING! Failed oper attempt by %s!%s@%s using login '%s': The following fields do not match: %s",user->nick,user->ident,user->host, parameters[0], fields.c_str());
+			ServerInstance->SNO->WriteToSnoMask('o',std::string(broadcast));
+			n.push_back(broadcast);
+			Event rmode2((char *)&n, NULL, "send_snoset");
+			rmode2.Send(ServerInstance);
+
 			ServerInstance->Log(DEFAULT,"OPER: Failed oper attempt by %s!%s@%s using login '%s': The following fields did not match: %s",user->nick,user->ident,user->host,parameters[0],fields.c_str());
 			return CMD_FAILURE;
 		}
 		else
 		{
 			user->WriteServ("491 %s :Your oper block does not have a valid opertype associated with it",user->nick);
-			ServerInstance->SNO->WriteToSnoMask('o',"CONFIGURATION ERROR! Oper block '%s': missing OperType %s",parameters[0],OperType);
+
+			snprintf(broadcast, MAXBUF, "CONFIGURATION ERROR! Oper block '%s': missing OperType %s",parameters[0],OperType);
+
+			ServerInstance->SNO->WriteToSnoMask('o', std::string(broadcast));
+			n.push_back(broadcast);
+			Event rmode2((char *)&n, NULL, "send_snoset");
+			rmode2.Send(ServerInstance);
+
 			ServerInstance->Log(DEFAULT,"OPER: Failed oper attempt by %s!%s@%s using login '%s': credentials valid, but oper type nonexistent.",user->nick,user->ident,user->host,parameters[0]);
 			return CMD_FAILURE;
 		}