X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodes%2Fcmode_o.cpp;h=0a13b39ce0101cd5fb0a1afe4b39614cbd67e6f5;hb=e6601069038c35c546fd3f3dce95024b0d13f1b4;hp=fe40adba6af68211f346a5a27fc21b4eda3ee35b;hpb=4b856bda135a08e800b96c970a10b0b6a34d433a;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modes/cmode_o.cpp b/src/modes/cmode_o.cpp index fe40adba6..0a13b39ce 100644 --- a/src/modes/cmode_o.cpp +++ b/src/modes/cmode_o.cpp @@ -1,16 +1,25 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2007 Robin Burchell + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2006 Craig Edwards * - * This program is free but copyrighted software; see - * the file COPYING for details. + * This file is part of InspIRCd. InspIRCd is free software: you can + * redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation, version 2. * - * --------------------------------------------------- + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ + #include "inspircd.h" #include "configreader.h" #include "mode.h" @@ -19,8 +28,12 @@ #include "modules.h" #include "modes/cmode_o.h" -ModeChannelOp::ModeChannelOp(InspIRCd* Instance) : ModeHandler(Instance, 'o', 1, 1, true, MODETYPE_CHANNEL, false, '@', '@') +ModeChannelOp::ModeChannelOp() : ModeHandler(NULL, "op", 'o', PARAM_ALWAYS, MODETYPE_CHANNEL) { + list = true; + prefix = '@'; + levelrequired = OP_VALUE; + m_paramtype = TR_NICK; } unsigned int ModeChannelOp::GetPrefixRank() @@ -28,42 +41,20 @@ unsigned int ModeChannelOp::GetPrefixRank() return OP_VALUE; } -ModePair ModeChannelOp::ModeSet(User*, User*, Channel* channel, const std::string ¶meter) -{ - 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); -} - - 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)); - } + const UserMembList* clist = channel->GetUsers(); - for (CUList::iterator i = copy.begin(); i != copy.end(); i++) + for (UserMembCIter i = clist->begin(); i != clist->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); + std::vector parameters; + parameters.push_back(channel->name); + parameters.push_back("-o"); + parameters.push_back(i->first->nick); ServerInstance->SendMode(parameters, ServerInstance->FakeClient); } } @@ -73,82 +64,7 @@ void ModeChannelOp::RemoveMode(User*, irc::modestacker* stack) { } -ModeAction ModeChannelOp::OnModeChange(User* source, User*, Channel* channel, std::string ¶meter, bool adding, bool servermode) +ModeAction ModeChannelOp::OnModeChange(User* source, User*, Channel* channel, std::string ¶meter, bool adding) { - int status = channel->GetStatus(source); - - /* Call the correct method depending on wether we're adding or removing the mode */ - if (adding) - { - parameter = this->AddOp(source, parameter.c_str(), channel, status); - } - else - { - parameter = this->DelOp(source, parameter.c_str(), channel, status); - } - /* If the method above 'ate' the parameter by reducing it to an empty string, then - * it won't matter wether we return ALLOW or DENY here, as an empty string overrides - * the return value and is always MODEACTION_DENY if the mode is supposed to have - * a parameter. - */ - if (parameter.length()) - return MODEACTION_ALLOW; - else - return MODEACTION_DENY; -} - -std::string ModeChannelOp::AddOp(User *user,const char* dest,Channel *chan,int status) -{ - User *d = ServerInstance->Modes->SanityChecks(user,dest,chan,status); - - if (d) - { - if (IS_LOCAL(user)) - { - int MOD_RESULT = 0; - FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_OP)); - - if (MOD_RESULT == ACR_DENY) - return ""; - if (MOD_RESULT == ACR_DEFAULT) - { - if ((status < STATUS_OP) && (!ServerInstance->ULine(user->server))) - { - user->WriteServ("482 %s %s :You're not a channel operator",user->nick.c_str(), chan->name); - return ""; - } - } - } - - return ServerInstance->Modes->Grant(d,chan,UCMODE_OP); - } - return ""; -} - -std::string ModeChannelOp::DelOp(User *user,const char *dest,Channel *chan,int status) -{ - User *d = ServerInstance->Modes->SanityChecks(user,dest,chan,status); - - if (d) - { - if (IS_LOCAL(user)) - { - int MOD_RESULT = 0; - FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_DEOP)); - - if (MOD_RESULT == ACR_DENY) - return ""; - if (MOD_RESULT == ACR_DEFAULT) - { - if ((status < STATUS_OP) && (!ServerInstance->ULine(user->server)) && (IS_LOCAL(user))) - { - user->WriteServ("482 %s %s :You are not a channel operator",user->nick.c_str(), chan->name); - return ""; - } - } - } - - return ServerInstance->Modes->Revoke(d,chan,UCMODE_OP); - } - return ""; + return MODEACTION_ALLOW; }