#include "channels.h"
#include "users.h"
#include "helperfuncs.h"
-#include "message.h"
#include "commands.h"
#include "modules.h"
#include "inspstring.h"
#include "hashcomp.h"
#include "modes/cmode_o.h"
-extern InspIRCd* ServerInstance;
-extern ServerConfig* Config;
-extern std::vector<Module*> modules;
-extern std::vector<ircd_module*> factory;
-extern int MODCOUNT;
-extern time_t TIME;
-
-ModeChannelOp::ModeChannelOp() : ModeHandler('o', 1, 1, true, MODETYPE_CHANNEL, false)
+ModeChannelOp::ModeChannelOp(InspIRCd* Instance) : ModeHandler(Instance, 'o', 1, 1, true, MODETYPE_CHANNEL, false)
{
}
-std::pair<bool,std::string> ModeChannelOp::ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string ¶meter)
+ModePair ModeChannelOp::ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string ¶meter)
{
- userrec* x = Find(parameter);
- if (x)
- {
- if (cstatus(x, channel) == STATUS_OP)
- {
- return std::make_pair(true, x->nick);
- }
- else
- {
- return std::make_pair(false, parameter);
- }
- }
+ userrec* x = ServerInstance->FindNick(parameter);
+ if (x)
+ {
+ if (channel->GetStatus(x) == STATUS_OP)
+ {
+ return std::make_pair(true, x->nick);
+ }
+ else
+ {
+ return std::make_pair(false, parameter);
+ }
+ }
return std::make_pair(false, parameter);
}
ModeAction ModeChannelOp::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding)
{
- int status = cstatus(source, channel);
+ int status = channel->GetStatus(source);
/* Call the correct method depending on wether we're adding or removing the mode */
if (adding)
std::string ModeChannelOp::AddOp(userrec *user,const char* dest,chanrec *chan,int status)
{
- userrec *d = ModeParser::SanityChecks(user,dest,chan,status);
+ userrec *d = ServerInstance->Modes->SanityChecks(user,dest,chan,status);
if (d)
{
return "";
if (MOD_RESULT == ACR_DEFAULT)
{
- if ((status < STATUS_OP) && (!is_uline(user->server)))
+ if ((status < STATUS_OP) && (!ServerInstance->ULine(user->server)))
{
- WriteServ(user->fd,"482 %s %s :You're not a channel operator",user->nick, chan->name);
+ user->WriteServ("482 %s %s :You're not a channel operator",user->nick, chan->name);
return "";
}
}
}
- return ModeParser::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 = ModeParser::SanityChecks(user,dest,chan,status);
+ userrec *d = ServerInstance->Modes->SanityChecks(user,dest,chan,status);
if (d)
{
if (IS_LOCAL(user))
{
int MOD_RESULT = 0;
+ ServerInstance->Log(DEBUG,"Call OnAccessCheck for AC_DEOP");
FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_DEOP));
+ 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)))
{
- WriteServ(user->fd,"482 %s %s :You are not a channel operator",user->nick, chan->name);
+ user->WriteServ("482 %s %s :You are not a channel operator",user->nick, chan->name);
return "";
}
}
}
- return ModeParser::Revoke(d,chan,UCMODE_OP);
+ return ServerInstance->Modes->Revoke(d,chan,UCMODE_OP);
}
return "";
}