X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_knock.cpp;h=8d2aa4543065be26e7b410ef41007c6d664cd37d;hb=571714e28b26cc59cbc8d27098a5ba981240ee2d;hp=fd82566417eb259d09abe72d2514ab79a7f07946;hpb=694e307c09334c21aaf1a6c3f0b7b6d95440dd3e;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_knock.cpp b/src/modules/m_knock.cpp index fd8256641..8d2aa4543 100644 --- a/src/modules/m_knock.cpp +++ b/src/modules/m_knock.cpp @@ -1,127 +1,136 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2007 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 */ +/* $ModDesc: Provides support for /KNOCK and channel mode +K */ /** Handles the /KNOCK command */ -class cmd_knock : public Command +class CommandKnock : public Command { public: - cmd_knock (InspIRCd* Instance) : Command(Instance,"KNOCK", 0, 2) + bool sendnotice; + bool sendnumeric; + CommandKnock(Module* Creator) : Command(Creator,"KNOCK", 2, 2) { - this->source = "m_knock.so"; syntax = " "; + Penalty = 5; TRANSLATE3(TR_TEXT, TR_TEXT, TR_END); } - - CmdResult Handle (const char** parameters, int pcnt, userrec *user) - { - chanrec* c = ServerInstance->FindChan(parameters[0]); + CmdResult Handle (const std::vector ¶meters, User *user) + { + Channel* c = ServerInstance->FindChan(parameters[0]); if (!c) { - user->WriteServ("401 %s %s :No such channel",user->nick, parameters[0]); + user->WriteNumeric(401, "%s %s :No such channel",user->nick.c_str(), parameters[0].c_str()); return CMD_FAILURE; } - std::string line; - - if (c->IsModeSet('K')) + if (c->HasUser(user)) { - user->WriteServ("480 %s :Can't KNOCK on %s, +K is set.",user->nick, c->name); + user->WriteNumeric(480, "%s :Can't KNOCK on %s, you are already on that channel.", user->nick.c_str(), c->name.c_str()); return CMD_FAILURE; } - for (int i = 1; i < pcnt - 1; i++) + if (c->IsModeSet('K')) { - line = line + std::string(parameters[i]) + " "; + user->WriteNumeric(480, "%s :Can't KNOCK on %s, +K is set.",user->nick.c_str(), c->name.c_str()); + return CMD_FAILURE; } - line = line + std::string(parameters[pcnt-1]); - if (!c->modes[CM_INVITEONLY]) + if (!c->IsModeSet('i')) { - user->WriteServ("480 %s :Can't KNOCK on %s, channel is not invite only so knocking is pointless!",user->nick, c->name); + user->WriteNumeric(480, "%s :Can't KNOCK on %s, channel is not invite only so knocking is pointless!",user->nick.c_str(), c->name.c_str()); return CMD_FAILURE; } - c->WriteChannelWithServ((char*)ServerInstance->Config->ServerName, "NOTICE %s :User %s is KNOCKing on %s (%s)", c->name, user->nick, c->name, line.c_str()); - user->WriteServ("NOTICE %s :KNOCKing on %s",user->nick,c->name); + if (sendnotice) + c->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :User %s is KNOCKing on %s (%s)", c->name.c_str(), 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()); + + user->WriteServ("NOTICE %s :KNOCKing on %s", user->nick.c_str(), c->name.c_str()); return CMD_SUCCESS; } + + RouteDescriptor GetRouting(User* user, const std::vector& parameters) + { + return ROUTE_OPT_BCAST; + } }; /** Handles channel mode +K */ -class Knock : public ModeHandler +class Knock : public SimpleChannelModeHandler { public: - Knock(InspIRCd* Instance) : ModeHandler(Instance, 'K', 0, 0, false, MODETYPE_CHANNEL, false) { } - - ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) - { - if (adding) - { - if (!channel->IsModeSet('K')) - { - channel->SetMode('K',true); - return MODEACTION_ALLOW; - } - } - else - { - if (channel->IsModeSet('K')) - { - channel->SetMode('K',false); - return MODEACTION_ALLOW; - } - } - - return MODEACTION_DENY; - } + Knock(Module* Creator) : SimpleChannelModeHandler(Creator, "noknock", 'K') { } }; class ModuleKnock : public Module { - cmd_knock* mycommand; - Knock* kn; + CommandKnock cmd; + Knock kn; public: - ModuleKnock(InspIRCd* Me) : Module(Me) + ModuleKnock() : cmd(this), kn(this) { - kn = new Knock(ServerInstance); - - if (!ServerInstance->AddMode(kn, 'K')) - throw ModuleException("Could not add new modes!"); - - mycommand = new cmd_knock(ServerInstance); - ServerInstance->AddCommand(mycommand); } - void Implements(char* List) + void init() { + ServerInstance->Modules->AddService(kn); + ServerInstance->Modules->AddService(cmd); + + ServerInstance->Modules->Attach(I_OnRehash, this); + OnRehash(NULL); } - virtual ~ModuleKnock() + void OnRehash(User* user) { - ServerInstance->Modes->DelMode(kn); - delete kn; + std::string knocknotify = ServerInstance->Config->ConfValue("knock")->getString("notify"); + irc::string notify(knocknotify.c_str()); + + if (notify == "numeric") + { + cmd.sendnotice = false; + cmd.sendnumeric = true; + } + else if (notify == "both") + { + cmd.sendnotice = true; + cmd.sendnumeric = true; + } + else + { + cmd.sendnotice = true; + cmd.sendnumeric = false; + } } virtual Version GetVersion() { - return Version(1, 1, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION); + return Version("Provides support for /KNOCK and channel mode +K", VF_OPTCOMMON | VF_VENDOR); } };