X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodes%2Fcmode_o.cpp;h=bed7da615edbaa57a7b8d2e9239f4c6039b751f3;hb=c0f8576bbd4cfa5b4f0c13cad90c3b516e0efb43;hp=63588b45624875f339306347cba4903dcebee220;hpb=76ebc88ccd6fef0bf2d97b607829fb3466e273af;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modes/cmode_o.cpp b/src/modes/cmode_o.cpp
index 63588b456..bed7da615 100644
--- a/src/modes/cmode_o.cpp
+++ b/src/modes/cmode_o.cpp
@@ -7,15 +7,20 @@
 #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)
@@ -23,7 +28,7 @@ ModePair ModeChannelOp::ModeSet(userrec* source, userrec* dest, chanrec* channel
 	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 +63,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 +76,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,30 +84,30 @@ 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)
 	{
 		if (IS_LOCAL(user))
 		{
 			int MOD_RESULT = 0;
-			log(DEBUG,"Call OnAccessCheck for AC_DEOP");
+			ServerInstance->Log(DEBUG,"Call OnAccessCheck for AC_DEOP");
 			FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_DEOP));
 
-			log(DEBUG,"Returns %d",MOD_RESULT);
+			ServerInstance->Log(DEBUG,"Returns %d",MOD_RESULT);
 
 			if (MOD_RESULT == ACR_DENY)
 				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 +115,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 "";
 }