X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_knock.cpp;h=a0a8455a8ebd76b929bcda25e4df4d29d93d23e8;hb=384ef31bc01e4a1a2e59d082c9066002410ba54a;hp=07b898110e3ab9b59b370527f1f1fcee34a0ebe6;hpb=b03f6ce251aa3a64a2351bdb39aed4751824b7dc;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_knock.cpp b/src/modules/m_knock.cpp index 07b898110..a0a8455a8 100644 --- a/src/modules/m_knock.cpp +++ b/src/modules/m_knock.cpp @@ -1,108 +1,133 @@ -/* +------------------------------------+ - * | 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) 2004-2006, 2008 Craig Edwards + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2007 Robin Burchell * - * 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" -/* $ModDesc: Provides support for /KNOCK and mode +K */ +enum +{ + // From UnrealIRCd. + ERR_CANNOTKNOCK = 480, + + // From ircd-ratbox. + ERR_CHANOPEN = 713, + ERR_KNOCKONCHAN = 714 +}; /** Handles the /KNOCK command */ class CommandKnock : public Command { + SimpleChannelModeHandler& noknockmode; + ChanModeReference inviteonlymode; + public: - CommandKnock (InspIRCd* Instance) : Command(Instance,"KNOCK", 0, 2) + bool sendnotice; + bool sendnumeric; + CommandKnock(Module* Creator, SimpleChannelModeHandler& Noknockmode) + : Command(Creator,"KNOCK", 2, 2) + , noknockmode(Noknockmode) + , inviteonlymode(Creator, "inviteonly") { - this->source = "m_knock.so"; syntax = " "; - TRANSLATE3(TR_TEXT, TR_TEXT, TR_END); + Penalty = 5; } - - CmdResult Handle (const std::vector ¶meters, User *user) + + CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE { Channel* c = ServerInstance->FindChan(parameters[0]); - std::string line; - if (!c) { - user->WriteNumeric(401, "%s %s :No such channel",user->nick.c_str(), parameters[0].c_str()); + user->WriteNumeric(Numerics::NoSuchChannel(parameters[0])); return CMD_FAILURE; } if (c->HasUser(user)) { - user->WriteNumeric(480, "%s :Can't KNOCK on %s, you are already on that channel.", user->nick.c_str(), c->name); + user->WriteNumeric(ERR_KNOCKONCHAN, c->name, InspIRCd::Format("Can't KNOCK on %s, you are already on that channel.", c->name.c_str())); return CMD_FAILURE; } - if (c->IsModeSet('K')) + if (c->IsModeSet(noknockmode)) { - user->WriteNumeric(480, "%s :Can't KNOCK on %s, +K is set.",user->nick.c_str(), c->name); + user->WriteNumeric(ERR_CANNOTKNOCK, InspIRCd::Format("Can't KNOCK on %s, +K is set.", c->name.c_str())); return CMD_FAILURE; } - if (!c->modes[CM_INVITEONLY]) + if (!c->IsModeSet(inviteonlymode)) { - user->WriteNumeric(480, "%s :Can't KNOCK on %s, channel is not invite only so knocking is pointless!",user->nick.c_str(), c->name); + user->WriteNumeric(ERR_CHANOPEN, c->name, InspIRCd::Format("Can't KNOCK on %s, channel is not invite only so knocking is pointless!", c->name.c_str())); return CMD_FAILURE; } - for (int i = 1; i < (int)parameters.size() - 1; i++) - { - line = line + parameters[i] + " "; - } - line = line + parameters[parameters.size()-1]; + if (sendnotice) + c->WriteNotice(InspIRCd::Format("User %s is KNOCKing on %s (%s)", user->nick.c_str(), c->name.c_str(), parameters[1].c_str())); + + if (sendnumeric) + c->WriteChannelWithServ(ServerInstance->Config->ServerName, "710 %s %s %s :is KNOCKing: %s", c->name.c_str(), c->name.c_str(), user->GetFullHost().c_str(), parameters[1].c_str()); - c->WriteChannelWithServ((char*)ServerInstance->Config->ServerName, "NOTICE %s :User %s is KNOCKing on %s (%s)", c->name, user->nick.c_str(), c->name, line.c_str()); - user->WriteServ("NOTICE %s :KNOCKing on %s",user->nick.c_str(),c->name); + user->WriteNotice("KNOCKing on " + c->name); return CMD_SUCCESS; } -}; -/** Handles channel mode +K - */ -class Knock : public SimpleChannelModeHandler -{ - public: - Knock(InspIRCd* Instance) : SimpleChannelModeHandler(Instance, 'K') { } + RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE + { + return ROUTE_OPT_BCAST; + } }; class ModuleKnock : public Module { - CommandKnock* mycommand; - Knock* kn; + SimpleChannelModeHandler kn; + CommandKnock cmd; + public: - ModuleKnock(InspIRCd* Me) : Module(Me) + ModuleKnock() + : kn(this, "noknock", 'K') + , cmd(this, kn) { - kn = new Knock(ServerInstance); - - if (!ServerInstance->Modes->AddMode(kn)) - throw ModuleException("Could not add new modes!"); - - mycommand = new CommandKnock(ServerInstance); - ServerInstance->AddCommand(mycommand); - } - - virtual ~ModuleKnock() + void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE { - ServerInstance->Modes->DelMode(kn); - delete kn; + std::string knocknotify = ServerInstance->Config->ConfValue("knock")->getString("notify"); + if (stdalgo::string::equalsci(knocknotify, "numeric")) + { + cmd.sendnotice = false; + cmd.sendnumeric = true; + } + else if (stdalgo::string::equalsci(knocknotify, "both")) + { + cmd.sendnotice = true; + cmd.sendnumeric = true; + } + else + { + cmd.sendnotice = true; + cmd.sendnumeric = false; + } } - virtual Version GetVersion() + Version GetVersion() CXX11_OVERRIDE { - return Version(1, 2, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION); + return Version("Provides support for /KNOCK and channel mode +K", VF_OPTCOMMON | VF_VENDOR); } };