X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodes%2Fcmode_h.cpp;h=580eee4432fcb42fb7ca238c7283db356a93a3cc;hb=5db3290d939509015167b7fdfba5073285051560;hp=5137bfd4a4876e7cdf64caa159eaf4a82962073b;hpb=09afa5085614e0224a296abd082fce205003c3fe;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modes/cmode_h.cpp b/src/modes/cmode_h.cpp index 5137bfd4a..580eee443 100644 --- a/src/modes/cmode_h.cpp +++ b/src/modes/cmode_h.cpp @@ -1,49 +1,81 @@ -#include -#include -#include "inspircd_config.h" -#include "configreader.h" -#include "hash_map.h" +/* +------------------------------------+ + * | Inspire Internet Relay Chat Daemon | + * +------------------------------------+ + * + * InspIRCd: (C) 2002-2008 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_h.h" -extern InspIRCd* ServerInstance; -extern InspIRCd* ServerInstance; -extern std::vector modules; -extern std::vector factory; -extern int MODCOUNT; -extern time_t TIME; +ModeChannelHalfOp::ModeChannelHalfOp(InspIRCd* Instance) : ModeHandler(Instance, 'h', 1, 1, true, MODETYPE_CHANNEL, false, '%', '@') +{ +} -ModeChannelHalfOp::ModeChannelHalfOp() : ModeHandler('h', 1, 1, true, MODETYPE_CHANNEL, false) +unsigned int ModeChannelHalfOp::GetPrefixRank() { + return HALFOP_VALUE; } -ModePair ModeChannelHalfOp::ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string ¶meter) +ModePair ModeChannelHalfOp::ModeSet(User*, User*, Channel* channel, const std::string ¶meter) { - userrec* x = Find(parameter); + User* x = ServerInstance->FindNick(parameter); if (x) { - if (cstatus(x, channel) == STATUS_HOP) - { - return std::make_pair(true, x->nick); - } - else - { - return std::make_pair(false, parameter); - } + if (channel->GetStatusFlags(x) & UCMODE_HOP) + { + return std::make_pair(true, x->nick); + } + else + { + return std::make_pair(false, parameter); + } } return std::make_pair(false, parameter); } -ModeAction ModeChannelHalfOp::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) +void ModeChannelHalfOp::RemoveMode(Channel* channel, irc::modestacker* stack) +{ + CUList* clist = channel->GetHalfoppedUsers(); + 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("-h"); parameters.push_back(i->first->nick); + ServerInstance->SendMode(parameters, ServerInstance->FakeClient); + } + } + +} + +void ModeChannelHalfOp::RemoveMode(User*, irc::modestacker* stack) +{ +} + +ModeAction ModeChannelHalfOp::OnModeChange(User* source, User*, Channel* channel, std::string ¶meter, bool adding, bool servermode) { /* If halfops are not enabled in the conf, we don't execute * anything in this class at all. @@ -54,7 +86,7 @@ ModeAction ModeChannelHalfOp::OnModeChange(userrec* source, userrec* dest, chanr return MODEACTION_DENY; } - 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) @@ -70,12 +102,15 @@ ModeAction ModeChannelHalfOp::OnModeChange(userrec* source, userrec* dest, chanr * 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 ModeChannelHalfOp::AddHalfOp(userrec *user,const char* dest,chanrec *chan,int status) +std::string ModeChannelHalfOp::AddHalfOp(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) { @@ -88,22 +123,22 @@ std::string ModeChannelHalfOp::AddHalfOp(userrec *user,const char* dest,chanrec 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); + 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_HOP); + return ServerInstance->Modes->Grant(d,chan,UCMODE_HOP); } return ""; } -std::string ModeChannelHalfOp::DelHalfOp(userrec *user,const char *dest,chanrec *chan,int status) +std::string ModeChannelHalfOp::DelHalfOp(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) { @@ -116,15 +151,15 @@ std::string ModeChannelHalfOp::DelHalfOp(userrec *user,const char *dest,chanrec return ""; if (MOD_RESULT == ACR_DEFAULT) { - if ((user != d) && ((status < STATUS_OP) && (!is_uline(user->server)))) + if ((user != d) && ((status < STATUS_OP) && (!ServerInstance->ULine(user->server)))) { - user->WriteServ("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_HOP); + return ServerInstance->Modes->Revoke(d,chan,UCMODE_HOP); } return ""; }