X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nicklock.cpp;h=40965ffe007aa0824eac30fd634827d0415c06db;hb=95fd083b589d7b16df98fe00711e8ac2cf9cc871;hp=26d5bfbd7f1c1c6f55d0f95c37de059bfe83fa88;hpb=2b8ce39c6ea5e7a22fe39b21756f82051465f143;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_nicklock.cpp b/src/modules/m_nicklock.cpp index 26d5bfbd7..40965ffe0 100644 --- a/src/modules/m_nicklock.cpp +++ b/src/modules/m_nicklock.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * InspIRCd: (C) 2002-2009 InspIRCd Development Team * See: http://www.inspircd.org/wiki/index.php/Credits * * This program is free but copyrighted software; see @@ -12,62 +12,62 @@ */ #include "inspircd.h" -#include "users.h" -#include "channels.h" -#include "modules.h" -#include "hashcomp.h" /* $ModDesc: Provides the NICKLOCK command, allows an oper to chage a users nick and lock them to it until they quit */ /** Handle /NICKLOCK */ -class cmd_nicklock : public command_t +class CommandNicklock : public Command { char* dummy; public: - cmd_nicklock (InspIRCd* Instance) : command_t(Instance,"NICKLOCK", 'o', 2) + CommandNicklock (InspIRCd* Instance) : Command(Instance,"NICKLOCK", "o", 2) { this->source = "m_nicklock.so"; syntax = " "; + TRANSLATE3(TR_NICK, TR_TEXT, TR_END); } - CmdResult Handle(const char** parameters, int pcnt, userrec *user) + CmdResult Handle(const std::vector& parameters, User *user) { - userrec* source = ServerInstance->FindNick(parameters[0]); + User* target = ServerInstance->FindNick(parameters[0]); irc::string server; irc::string me; // check user exists - if (!source) + if (!target) { return CMD_FAILURE; } // check if user is locked - if (source->GetExt("nick_locked", dummy)) + if (target->GetExt("nick_locked", dummy)) { - user->WriteServ("946 %s %s :This user's nickname is already locked.",user->nick,source->nick); + user->WriteNumeric(946, "%s %s :This user's nickname is already locked.",user->nick.c_str(),target->nick.c_str()); return CMD_FAILURE; } // check nick is valid - if (!ServerInstance->IsNick(parameters[1])) + if (IS_LOCAL(user) && !ServerInstance->IsNick(parameters[1].c_str(), ServerInstance->Config->Limits.NickMax)) { return CMD_FAILURE; } // let others know - ServerInstance->WriteOpers(std::string(user->nick)+" used NICKLOCK to change and hold "+parameters[0]+" to "+parameters[1]); + ServerInstance->SNO->WriteToSnoMask('A', std::string(user->nick)+" used NICKLOCK to change and hold "+parameters[0]+" to "+parameters[1]); - if (!source->ForceNickChange(parameters[1])) + if (!target->ForceNickChange(parameters[1].c_str())) { // ugh, nickchange failed for some reason -- possibly existing nick? - userrec::QuitUser(ServerInstance, source, "Nickname collision"); - return CMD_FAILURE; + if (!target->ForceNickChange(target->uuid.c_str())) + { + // Well shit, we cant even change them to their UID (this should not happen!) + ServerInstance->Users->QuitUser(target, "Nickname collision"); + } } // give them a lock flag - source->Extend("nick_locked", "ON"); + target->Extend("nick_locked", "ON"); /* route */ return CMD_SUCCESS; @@ -76,23 +76,23 @@ class cmd_nicklock : public command_t /** Handle /NICKUNLOCK */ -class cmd_nickunlock : public command_t +class CommandNickunlock : public Command { public: - cmd_nickunlock (InspIRCd* Instance) : command_t(Instance,"NICKUNLOCK", 'o', 1) + CommandNickunlock (InspIRCd* Instance) : Command(Instance,"NICKUNLOCK", "o", 1) { - this->source = "m_nickunlock.so"; + this->source = "m_nicklock.so"; syntax = ""; } - CmdResult Handle (const char** parameters, int pcnt, userrec *user) + CmdResult Handle (const std::vector& parameters, User *user) { - userrec* source = ServerInstance->FindNick(parameters[0]); - if (source) + User* target = ServerInstance->FindNick(parameters[0]); + if (target) { - source->Shrink("nick_locked"); - user->WriteServ("945 %s %s :Nickname now unlocked.",user->nick,source->nick); - ServerInstance->WriteOpers(std::string(user->nick)+" used NICKUNLOCK on "+parameters[0]); + target->Shrink("nick_locked"); + user->WriteNumeric(945, "%s %s :Nickname now unlocked.",user->nick.c_str(),target->nick.c_str()); + ServerInstance->SNO->WriteToSnoMask('A', std::string(user->nick)+" used NICKUNLOCK on "+parameters[0]); return CMD_SUCCESS; } @@ -103,45 +103,46 @@ class cmd_nickunlock : public command_t class ModuleNickLock : public Module { - cmd_nicklock* cmd1; - cmd_nickunlock* cmd2; + CommandNicklock* cmd1; + CommandNickunlock* cmd2; char* n; public: ModuleNickLock(InspIRCd* Me) : Module(Me) { - - cmd1 = new cmd_nicklock(ServerInstance); - cmd2 = new cmd_nickunlock(ServerInstance); + + cmd1 = new CommandNicklock(ServerInstance); + cmd2 = new CommandNickunlock(ServerInstance); ServerInstance->AddCommand(cmd1); ServerInstance->AddCommand(cmd2); + Implementation eventlist[] = { I_OnUserPreNick, I_OnUserQuit, I_OnCleanup }; + ServerInstance->Modules->Attach(eventlist, this, 3); } - + virtual ~ModuleNickLock() { } - + virtual Version GetVersion() { - return Version(1,1,0,1,VF_VENDOR,API_VERSION); + return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION); } - void Implements(char* List) - { - List[I_OnUserPreNick] = List[I_OnUserQuit] = List[I_OnCleanup] = 1; - } - virtual int OnUserPreNick(userrec* user, const std::string &newnick) + virtual int OnUserPreNick(User* user, const std::string &newnick) { + if (isdigit(newnick[0])) /* allow a switch to a UID */ + return 0; + if (user->GetExt("nick_locked", n)) { - user->WriteServ("447 %s :You cannot change your nickname (your nick is locked)",user->nick); + user->WriteNumeric(447, "%s :You cannot change your nickname (your nick is locked)",user->nick.c_str()); return 1; } return 0; } - virtual void OnUserQuit(userrec* user, const std::string &reason, const std::string &oper_message) + virtual void OnUserQuit(User* user, const std::string &reason, const std::string &oper_message) { user->Shrink("nick_locked"); } @@ -150,7 +151,7 @@ class ModuleNickLock : public Module { if(target_type == TYPE_USER) { - userrec* user = (userrec*)item; + User* user = (User*)item; user->Shrink("nick_locked"); } }