X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_alias.cpp;h=7fc0f3bb038f360e3e0f69782abeee5f516c4c2d;hb=80e81e3b81b779901fd9d67f8ae030ee30c0bcec;hp=7e8c79154e8f55cd3bfff1ad5cc9f882cd1bbe14;hpb=52df21f646a803b85417a4b699b1be48c25fa566;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp index 7e8c79154..7fc0f3bb0 100644 --- a/src/modules/m_alias.cpp +++ b/src/modules/m_alias.cpp @@ -1,10 +1,15 @@ /* * InspIRCd -- Internet Relay Chat Daemon * - * Copyright (C) 2009 Daniel De Graaf - * Copyright (C) 2005, 2009 Robin Burchell - * Copyright (C) 2004-2007, 2009 Craig Edwards - * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2018-2019 linuxdaemon + * Copyright (C) 2013, 2015-2019, 2021 Sadie Powell + * Copyright (C) 2012-2015, 2018 Attila Molnar + * Copyright (C) 2012, 2019 Robby + * Copyright (C) 2009-2010 Daniel De Graaf + * Copyright (C) 2009 Matt Smith + * Copyright (C) 2008-2009 Robin Burchell + * Copyright (C) 2007-2008 Dennis Friis + * Copyright (C) 2004, 2006-2009 Craig Edwards * * 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 @@ -117,7 +122,7 @@ class ModuleAlias : public Module Version GetVersion() CXX11_OVERRIDE { - return Version("Provides aliases of commands", VF_VENDOR); + return Version("Allows the server administrator to define custom channel commands (e.g. !kick) and server commands (e.g. /OPERSERV).", VF_VENDOR); } std::string GetVar(std::string varname, const std::string &original_line) @@ -161,7 +166,7 @@ class ModuleAlias : public Module ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) CXX11_OVERRIDE { - /* If theyre not registered yet, we dont want + /* If they're not registered yet, we dont want * to know. */ if (user->registered != REG_ALL) @@ -281,17 +286,18 @@ class ModuleAlias : public Module if (!a->RequiredNick.empty()) { + int numeric = a->ULineOnly ? ERR_NOSUCHSERVICE : ERR_NOSUCHNICK; User* u = ServerInstance->FindNickOnly(a->RequiredNick); if (!u) { - user->WriteNumeric(ERR_NOSUCHNICK, a->RequiredNick, "is currently unavailable. Please try again later."); + user->WriteNumeric(numeric, a->RequiredNick, "is currently unavailable. Please try again later."); return 1; } if ((a->ULineOnly) && (!u->server->IsULine())) { ServerInstance->SNO->WriteToSnoMask('a', "NOTICE -- Service "+a->RequiredNick+" required by alias "+a->AliasedCommand+" is not on a U-lined server, possibly underhanded antics detected!"); - user->WriteNumeric(ERR_NOSUCHNICK, a->RequiredNick, "is not a network service! Please inform a server operator as soon as possible."); + user->WriteNumeric(numeric, a->RequiredNick, "is not a network service! Please inform a server operator as soon as possible."); return 1; } }