X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodes%2Fcmode_o.cpp;h=7b27788fcd3bcd94c8e345d9e8f3ad779c0162d5;hb=97ab3c404ccd201681f465aa2c3e9ff6586acbd8;hp=e75e551b2be1d2b2aecd77dc5bec777beef5314d;hpb=3719db12e6b43e87ef9fad1917b697c565cf59ff;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modes/cmode_o.cpp b/src/modes/cmode_o.cpp index e75e551b2..7b27788fc 100644 --- a/src/modes/cmode_o.cpp +++ b/src/modes/cmode_o.cpp @@ -1,51 +1,81 @@ -#include -#include -#include "inspircd_config.h" -#include "configreader.h" -#include "hash_map.h" +/* +------------------------------------+ + * | Inspire Internet Relay Chat Daemon | + * +------------------------------------+ + * + * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * See: http://www.inspircd.org/wiki/index.php/Credits + * + * This program is free but copyrighted software; see + * the file COPYING for details. + * + * --------------------------------------------------- + */ + #include "inspircd.h" +#include "configreader.h" #include "mode.h" #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 modules; -extern std::vector factory; -extern int MODCOUNT; -extern time_t TIME; +ModeChannelOp::ModeChannelOp(InspIRCd* Instance) : ModeHandler(Instance, 'o', 1, 1, true, MODETYPE_CHANNEL, false, '@', '@') +{ +} -ModeChannelOp::ModeChannelOp() : ModeHandler('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 ¶meter) +ModePair ModeChannelOp::ModeSet(User*, User*, Channel* 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); - } - } + User* x = ServerInstance->FindNick(parameter); + if (x) + { + if (channel->GetStatusFlags(x) & UCMODE_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) + +void ModeChannelOp::RemoveMode(Channel* channel, irc::modestacker* stack) +{ + CUList* clist = channel->GetOppedUsers(); + CUList copy; + + for (CUList::iterator i = clist->begin(); i != clist->end(); i++) + { + User* n = i->first; + copy.insert(std::make_pair(n,n->nick)); + } + + for (CUList::iterator i = copy.begin(); i != copy.end(); i++) + { + if (stack) + stack->Push(this->GetModeChar(), i->first->nick); + else + { + std::vector parameters; parameters.push_back(channel->name); parameters.push_back("-o"); parameters.push_back(i->first->nick); + ServerInstance->SendMode(parameters, ServerInstance->FakeClient); + } + } +} + +void ModeChannelOp::RemoveMode(User*, irc::modestacker* stack) { - int status = cstatus(source, channel); +} + +ModeAction ModeChannelOp::OnModeChange(User* source, User*, Channel* channel, std::string ¶meter, bool adding, bool servermode) +{ + int status = channel->GetStatus(source); /* Call the correct method depending on wether we're adding or removing the mode */ if (adding) @@ -61,12 +91,15 @@ ModeAction ModeChannelOp::OnModeChange(userrec* source, userrec* dest, chanrec* * the return value and is always MODEACTION_DENY if the mode is supposed to have * a parameter. */ - return MODEACTION_ALLOW; + if (parameter.length()) + return MODEACTION_ALLOW; + else + return MODEACTION_DENY; } -std::string ModeChannelOp::AddOp(userrec *user,const char* dest,chanrec *chan,int status) +std::string ModeChannelOp::AddOp(User *user,const char* dest,Channel *chan,int status) { - userrec *d = ModeParser::SanityChecks(user,dest,chan,status); + User *d = ServerInstance->Modes->SanityChecks(user,dest,chan,status); if (d) { @@ -79,46 +112,43 @@ 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))) { - 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.c_str(), chan->name.c_str()); 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) +std::string ModeChannelOp::DelOp(User *user,const char *dest,Channel *chan,int status) { - userrec *d = ModeParser::SanityChecks(user,dest,chan,status); + User *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"); FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_DEOP)); - 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.c_str(), chan->name.c_str()); return ""; } } } - return ModeParser::Revoke(d,chan,UCMODE_OP); + return ServerInstance->Modes->Revoke(d,chan,UCMODE_OP); } return ""; }