X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nicklock.cpp;h=a99628bf1258396e1bb5d82f21935f4755a9a155;hb=df9bd50866a1ee95db78b88090aae74e245ad469;hp=755ae6da4114a4f0a349389ad1830b6c16cbc628;hpb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_nicklock.cpp b/src/modules/m_nicklock.cpp index 755ae6da4..a99628bf1 100644 --- a/src/modules/m_nicklock.cpp +++ b/src/modules/m_nicklock.cpp @@ -1,19 +1,26 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2009 InspIRCd Development Team - * See: http://wiki.inspircd.org/Credits + * Copyright (C) 2009-2010 Daniel De Graaf + * Copyright (C) 2007, 2009 Dennis Friis + * Copyright (C) 2007-2008 Robin Burchell + * Copyright (C) 2005-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" -/* $ModDesc: Provides the NICKLOCK command, allows an oper to chage a users nick and lock them to it until they quit */ +#include "inspircd.h" /** Handle /NICKLOCK */ @@ -26,44 +33,38 @@ class CommandNicklock : public Command { flags_needed = 'o'; syntax = " "; - TRANSLATE3(TR_NICK, TR_TEXT, TR_END); + TRANSLATE2(TR_NICK, TR_TEXT); } CmdResult Handle(const std::vector& parameters, User *user) { User* target = ServerInstance->FindNick(parameters[0]); + if ((!target) || (target->registered != REG_ALL)) + { + user->WriteNotice("*** No such nickname: '" + parameters[0] + "'"); + return CMD_FAILURE; + } + /* Do local sanity checks and bails */ if (IS_LOCAL(user)) { - if (target && ServerInstance->ULine(target->server)) - { - user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Cannot use an NICKLOCK command on a u-lined client",user->nick.c_str()); - return CMD_FAILURE; - } - - if (!target) - { - user->WriteServ("NOTICE %s :*** No such nickname: '%s'", user->nick.c_str(), parameters[0].c_str()); - return CMD_FAILURE; - } - - if (!ServerInstance->IsNick(parameters[1].c_str(), ServerInstance->Config->Limits.NickMax)) + if (!ServerInstance->IsNick(parameters[1])) { - user->WriteServ("NOTICE %s :*** Invalid nickname '%s'", user->nick.c_str(), parameters[1].c_str()); + user->WriteNotice("*** Invalid nickname '" + parameters[1] + "'"); return CMD_FAILURE; } - user->WriteServ("947 %s %s :Nickname now locked.", user->nick.c_str(), parameters[1].c_str()); + user->WriteNumeric(947, "%s :Nickname now locked.", parameters[1].c_str()); } /* If we made it this far, extend the user */ - if (target && IS_LOCAL(target)) + if (IS_LOCAL(target)) { locked.set(target, 1); std::string oldnick = target->nick; - if (target->ForceNickChange(parameters[1].c_str())) + if (target->ChangeNick(parameters[1])) ServerInstance->SNO->WriteGlobalSno('a', user->nick+" used NICKLOCK to change and hold "+oldnick+" to "+parameters[1]); else { @@ -95,39 +96,31 @@ class CommandNickunlock : public Command { flags_needed = 'o'; syntax = ""; - TRANSLATE2(TR_NICK, TR_END); + TRANSLATE1(TR_NICK); } CmdResult Handle (const std::vector& parameters, User *user) { User* target = ServerInstance->FindNick(parameters[0]); - /* Do local sanity checks and bails */ - if (IS_LOCAL(user)) + if (!target) { - if (target && ServerInstance->ULine(target->server)) - { - user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Cannot use an NICKUNLOCK command on a u-lined client",user->nick.c_str()); - return CMD_FAILURE; - } - - if (!target) - { - user->WriteServ("NOTICE %s :*** No such nickname: '%s'", user->nick.c_str(), parameters[0].c_str()); - return CMD_FAILURE; - } + user->WriteNotice("*** No such nickname: '" + parameters[0] + "'"); + return CMD_FAILURE; } - if (target && IS_LOCAL(target)) + if (IS_LOCAL(target)) { if (locked.set(target, 0)) { - ServerInstance->SNO->WriteGlobalSno('a', std::string(user->nick)+" used NICKUNLOCK on "+parameters[0]); - user->WriteNumeric(945, "%s %s :Nickname now unlocked.",user->nick.c_str(),target->nick.c_str()); + ServerInstance->SNO->WriteGlobalSno('a', user->nick+" used NICKUNLOCK on "+target->nick); + user->SendText(":%s 945 %s %s :Nickname now unlocked.", + ServerInstance->Config->ServerName.c_str(),user->nick.c_str(),target->nick.c_str()); } else { - user->WriteNumeric(946, "%s %s :This user's nickname is not locked.",user->nick.c_str(),target->nick.c_str()); + user->SendText(":%s 946 %s %s :This user's nickname is not locked.", + ServerInstance->Config->ServerName.c_str(),user->nick.c_str(),target->nick.c_str()); return CMD_FAILURE; } } @@ -144,7 +137,6 @@ class CommandNickunlock : public Command } }; - class ModuleNickLock : public Module { LocalIntExt locked; @@ -152,38 +144,22 @@ class ModuleNickLock : public Module CommandNickunlock cmd2; public: ModuleNickLock() - : locked("nick_locked", this), cmd1(this, locked), cmd2(this, locked) + : locked("nick_locked", ExtensionItem::EXT_USER, this) + , cmd1(this, locked) + , cmd2(this, locked) { - ServerInstance->AddCommand(&cmd1); - ServerInstance->AddCommand(&cmd2); - Extensible::Register(&locked); - ServerInstance->Modules->Attach(I_OnUserPreNick, this); } - ~ModuleNickLock() + Version GetVersion() CXX11_OVERRIDE { + return Version("Provides the NICKLOCK command, allows an oper to change a users nick and lock them to it until they quit", VF_OPTCOMMON | VF_VENDOR); } - Version GetVersion() + ModResult OnUserPreNick(LocalUser* user, const std::string& newnick) CXX11_OVERRIDE { - return Version("Provides the NICKLOCK command, allows an oper to chage a users nick and lock them to it until they quit", VF_COMMON | VF_VENDOR, API_VERSION); - } - - - ModResult OnUserPreNick(User* user, const std::string &newnick) - { - if (!IS_LOCAL(user)) - return MOD_RES_PASSTHRU; - - if (isdigit(newnick[0])) /* Allow a switch to a UID */ - return MOD_RES_PASSTHRU; - - if (User::NICKForced.get(user)) /* Allow forced nick changes */ - return MOD_RES_PASSTHRU; - if (locked.get(user)) { - user->WriteNumeric(447, "%s :You cannot change your nickname (your nick is locked)",user->nick.c_str()); + user->WriteNumeric(ERR_CANTCHANGENICK, ":You cannot change your nickname (your nick is locked)"); return MOD_RES_DENY; } return MOD_RES_PASSTHRU; @@ -192,7 +168,7 @@ class ModuleNickLock : public Module void Prioritize() { Module *nflood = ServerInstance->Modules->Find("m_nickflood.so"); - ServerInstance->Modules->SetPriority(this, I_OnUserPreJoin, PRIORITY_BEFORE, &nflood); + ServerInstance->Modules->SetPriority(this, I_OnUserPreNick, PRIORITY_BEFORE, nflood); } };