X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodes%2Fcmode_o.cpp;h=85eb08c381a1ced66a9a593e14a96992d36b7024;hb=d54fd9b1e6b31f69332a9241b5f17330c0ad61e0;hp=6aa36cc79228990c1e3fc587290c74c1ec811369;hpb=e84bf9f3ec5a60078c32b272d3d7885c0708c544;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modes/cmode_o.cpp b/src/modes/cmode_o.cpp
index 6aa36cc79..85eb08c38 100644
--- a/src/modes/cmode_o.cpp
+++ b/src/modes/cmode_o.cpp
@@ -1,29 +1,26 @@
-#include <string>
-#include <vector>
-#include "inspircd_config.h"
 #include "configreader.h"
-#include "hash_map.h"
 #include "inspircd.h"
 #include "mode.h"
 #include "channels.h"
 #include "users.h"
-#include "helperfuncs.h"
-#include "commands.h"
 #include "modules.h"
-#include "inspstring.h"
-#include "hashcomp.h"
 #include "modes/cmode_o.h"
 
-ModeChannelOp::ModeChannelOp(InspIRCd* Instance) : ModeHandler(Instance, 'o', 1, 1, true, MODETYPE_CHANNEL, false)
+ModeChannelOp::ModeChannelOp(InspIRCd* Instance) : ModeHandler(Instance, 'o', 1, 1, true, MODETYPE_CHANNEL, false, '@')
 {
 }
 
+unsigned int ModeChannelOp::GetPrefixRank()
+{
+	return OP_VALUE;
+}
+
 ModePair ModeChannelOp::ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
 {
 	userrec* x = ServerInstance->FindNick(parameter);
 	if (x)
 	{
-		if (channel->GetStatus(x) == STATUS_OP)
+		if (channel->GetStatusFlags(x) & UCMODE_OP)
 		{
 			return std::make_pair(true, x->nick);
 		}
@@ -58,7 +55,7 @@ ModeAction ModeChannelOp::OnModeChange(userrec* source, userrec* dest, chanrec*
 
 std::string ModeChannelOp::AddOp(userrec *user,const char* dest,chanrec *chan,int status)
 {
-	userrec *d = ServerInstance->ModeGrok->SanityChecks(user,dest,chan,status);
+	userrec *d = ServerInstance->Modes->SanityChecks(user,dest,chan,status);
 
 	if (d)
 	{
@@ -71,7 +68,7 @@ std::string ModeChannelOp::AddOp(userrec *user,const char* dest,chanrec *chan,in
 				return "";
 			if (MOD_RESULT == ACR_DEFAULT)
 			{
-				if ((status < STATUS_OP) && (!is_uline(user->server)))
+				if ((status < STATUS_OP) && (!ServerInstance->ULine(user->server)))
 				{
 					user->WriteServ("482 %s %s :You're not a channel operator",user->nick, chan->name);
 					return "";
@@ -79,14 +76,14 @@ std::string ModeChannelOp::AddOp(userrec *user,const char* dest,chanrec *chan,in
 			}
 		}
 
-		return ServerInstance->ModeGrok->Grant(d,chan,UCMODE_OP);
+		return ServerInstance->Modes->Grant(d,chan,UCMODE_OP);
 	}
 	return "";
 }
 
 std::string ModeChannelOp::DelOp(userrec *user,const char *dest,chanrec *chan,int status)
 {
-	userrec *d = ServerInstance->ModeGrok->SanityChecks(user,dest,chan,status);
+	userrec *d = ServerInstance->Modes->SanityChecks(user,dest,chan,status);
 
 	if (d)
 	{
@@ -102,7 +99,7 @@ std::string ModeChannelOp::DelOp(userrec *user,const char *dest,chanrec *chan,in
 				return "";
 			if (MOD_RESULT == ACR_DEFAULT)
 			{
-				if ((status < STATUS_OP) && (!is_uline(user->server)) && (IS_LOCAL(user)))
+				if ((status < STATUS_OP) && (!ServerInstance->ULine(user->server)) && (IS_LOCAL(user)))
 				{
 					user->WriteServ("482 %s %s :You are not a channel operator",user->nick, chan->name);
 					return "";
@@ -110,7 +107,7 @@ std::string ModeChannelOp::DelOp(userrec *user,const char *dest,chanrec *chan,in
 			}
 		}
 
-		return ServerInstance->ModeGrok->Revoke(d,chan,UCMODE_OP);
+		return ServerInstance->Modes->Revoke(d,chan,UCMODE_OP);
 	}
 	return "";
 }