X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_samode.cpp;h=bcb876d5b41906c5ca20383517b807852cd210a7;hb=806e57433a38193ae14942ee60f573fe47f4b643;hp=51a862701839e32231f485b28e6c4e30f38a9cad;hpb=364735e18b500f0a071fab4cc5c9e7bace1835fc;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_samode.cpp b/src/modules/m_samode.cpp index 51a862701..bcb876d5b 100644 --- a/src/modules/m_samode.cpp +++ b/src/modules/m_samode.cpp @@ -1,66 +1,75 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * - * - * Written by Craig Edwards, Craig McLure, and others. - * This program is free but copyrighted software; see - * the file COPYING for details. + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2006-2007 Robin Burchell + * Copyright (C) 2004-2005 Craig Edwards * - * --------------------------------------------------- - */ - -using namespace std; - -/* - * SAMODE module for InspIRCd - * Co authored by Brain and w00t + * 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. * - * Syntax: /SAMODE <#chan/nick> +/- [parameters for modes] - * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ -/* $ModDesc: Provides more advanced UnrealIRCd SAMODE command */ -/* - * ToDo: - * Err... not a lot really. - */ - -#include -#include "users.h" -#include "channels.h" -#include "modules.h" #include "inspircd.h" /** Handle /SAMODE */ -class cmd_samode : public command_t +class CommandSamode : public Command { public: - cmd_samode (InspIRCd* Instance) : command_t(Instance,"SAMODE", 'o', 2) + bool active; + CommandSamode(Module* Creator) : Command(Creator,"SAMODE", 2) { - this->source = "m_samode.so"; - syntax = " {}"; + allow_empty_last_param = false; + flags_needed = 'o'; Penalty = 0; syntax = " {}"; + active = false; } - CmdResult Handle (const char** parameters, int pcnt, userrec *user) + CmdResult Handle (const std::vector& parameters, User *user) { - /* - * Handles an SAMODE request. Notifies all +s users. - */ + if (parameters[0].c_str()[0] != '#') + { + User* target = ServerInstance->FindNickOnly(parameters[0]); + if ((!target) || (target->registered != REG_ALL)) + { + user->WriteNumeric(Numerics::NoSuchNick(parameters[0])); + return CMD_FAILURE; + } + + // Changing the modes of another user requires a special permission + if ((target != user) && (!user->HasPrivPermission("users/samode-usermodes", true))) + return CMD_FAILURE; + } - userrec* n = new userrec(ServerInstance); - n->SetFd(FD_MAGIC_NUMBER); - ServerInstance->SendMode(parameters,pcnt,n); - delete n; + // XXX: Make ModeParser clear LastParse + Modes::ChangeList emptychangelist; + ServerInstance->Modes->ProcessSingle(ServerInstance->FakeClient, NULL, ServerInstance->FakeClient, emptychangelist); - if (ServerInstance->Modes->GetLastParse().length()) - ServerInstance->WriteOpers(std::string(user->nick)+" used SAMODE: "+ServerInstance->Modes->GetLastParse()); + this->active = true; + CmdResult result = ServerInstance->Parser.CallHandler("MODE", parameters, user); + this->active = false; + + if (result == CMD_SUCCESS) + { + // If lastparse is empty and the MODE command handler returned CMD_SUCCESS then + // the client queried the list of a listmode (e.g. /SAMODE #chan b), which was + // handled internally by the MODE command handler. + // + // Viewing the modes of a user or a channel can also result in CMD_SUCCESS, but + // that is not possible with /SAMODE because we require at least 2 parameters. + const std::string& lastparse = ServerInstance->Modes.GetLastParse(); + ServerInstance->SNO->WriteGlobalSno('a', user->nick + " used SAMODE: " + (lastparse.empty() ? irc::stringjoiner(parameters) : lastparse)); + } return CMD_SUCCESS; } @@ -68,47 +77,30 @@ class cmd_samode : public command_t class ModuleSaMode : public Module { - cmd_samode* mycommand; + CommandSamode cmd; public: - ModuleSaMode(InspIRCd* Me) - : Module::Module(Me) - { - - mycommand = new cmd_samode(ServerInstance); - ServerInstance->AddCommand(mycommand); - } - - virtual ~ModuleSaMode() - { - } - - virtual Version GetVersion() + ModuleSaMode() + : cmd(this) { - return Version(1,0,2,2,VF_VENDOR,API_VERSION); } -}; - -class ModuleSaModeFactory : public ModuleFactory -{ - public: - ModuleSaModeFactory() + Version GetVersion() CXX11_OVERRIDE { + return Version("Provides command SAMODE to allow opers to change modes on channels and users", VF_VENDOR); } - - ~ModuleSaModeFactory() + + ModResult OnPreMode(User* source, User* dest, Channel* channel, Modes::ChangeList& modes) CXX11_OVERRIDE { + if (cmd.active) + return MOD_RES_ALLOW; + return MOD_RES_PASSTHRU; } - - virtual Module * CreateModule(InspIRCd* Me) + + void Prioritize() { - return new ModuleSaMode(Me); + Module *override = ServerInstance->Modules->Find("m_override.so"); + ServerInstance->Modules->SetPriority(this, I_OnPreMode, PRIORITY_BEFORE, override); } - }; - -extern "C" void * init_module( void ) -{ - return new ModuleSaModeFactory; -} +MODULE_INIT(ModuleSaMode)