If the user's nick is just a case change, the TS is NOT updated (thanks jilles)

[user/henk/code/inspircd.git] / src / cmd_oper.cpp

diff --git a/src/cmd_oper.cpp b/src/cmd_oper.cpp
index 59b35deba024e8081876df8d978bd117b6b55559..d9ae74bf69a5c18afc6ddfe4bbe2f16bb736c693 100644 (file)
--- 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,7 +30,7 @@ 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_t* init_command(InspIRCd* Instance)
 {
        return new cmd_oper(Instance);
 }
@@ -45,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;
@@ -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;
@@ -103,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
@@ -114,7 +115,7 @@ CmdResult cmd_oper::Handle (const char** parameters, int pcnt, userrec *user)
 
                if (!type_invalid)
                {
-                       std::string fields = "";
+                       std::string fields;
                        if (!match_login)
                                fields.append("login ");
                        if (!match_pass)