X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nicklock.cpp;h=755ae6da4114a4f0a349389ad1830b6c16cbc628;hb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;hp=b88d4d2124041a4f74c141cb0a0bc59e0d25b5bc;hpb=d4ee4c5aa4312cde76fe50e34ef8ca1685d521f0;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_nicklock.cpp b/src/modules/m_nicklock.cpp index b88d4d212..755ae6da4 100644 --- a/src/modules/m_nicklock.cpp +++ b/src/modules/m_nicklock.cpp @@ -19,11 +19,12 @@ */ class CommandNicklock : public Command { - public: - CommandNicklock (InspIRCd* Instance) : Command(Instance,"NICKLOCK", "o", 2) + LocalIntExt& locked; + CommandNicklock (Module* Creator, LocalIntExt& ext) : Command(Creator,"NICKLOCK", 2), + locked(ext) { - this->source = "m_nicklock.so"; + flags_needed = 'o'; syntax = " "; TRANSLATE3(TR_NICK, TR_TEXT, TR_END); } @@ -47,12 +48,6 @@ class CommandNicklock : public Command return CMD_FAILURE; } - if (target->GetExt("nick_locked")) - { - user->WriteNumeric(946, "%s %s :This user's nickname is already locked.",user->nick.c_str(),target->nick.c_str()); - return CMD_FAILURE; - } - if (!ServerInstance->IsNick(parameters[1].c_str(), ServerInstance->Config->Limits.NickMax)) { user->WriteServ("NOTICE %s :*** Invalid nickname '%s'", user->nick.c_str(), parameters[1].c_str()); @@ -63,32 +58,30 @@ class CommandNicklock : public Command } /* If we made it this far, extend the user */ - if (target) + if (target && IS_LOCAL(target)) { - // This has to be done *here*, because this metadata must be stored netwide. - target->Extend("nick_locked", "ON"); + locked.set(target, 1); - /* Only send out nick from local server */ - if (IS_LOCAL(target)) + std::string oldnick = target->nick; + if (target->ForceNickChange(parameters[1].c_str())) + ServerInstance->SNO->WriteGlobalSno('a', user->nick+" used NICKLOCK to change and hold "+oldnick+" to "+parameters[1]); + else { - ServerInstance->SNO->WriteGlobalSno('a', user->nick+" used NICKLOCK to change and hold "+target->nick+" to "+parameters[1]); - std::string oldnick = user->nick; std::string newnick = target->nick; - if (!target->ForceNickChange(parameters[1].c_str())) - { - /* XXX: We failed, this *should* not happen but if it does - * tell everybody. Note user is still nick locked on their old - * nick instead. - */ - ServerInstance->SNO->WriteToSnoMask('a', oldnick+" failed nickchange on NICKLOCK (from "+newnick+" to "+parameters[1]+") Locked to "+newnick+" instead"); - ServerInstance->PI->SendSNONotice("A", oldnick+" failed nickchange on NICKLOCK (from "+newnick+" to "+parameters[1]+") Locked to "+newnick+" instead"); - } + ServerInstance->SNO->WriteGlobalSno('a', user->nick+" used NICKLOCK, but "+oldnick+" failed nick change to "+parameters[1]+" and was locked to "+newnick+" instead"); } } - /* Route it */ return CMD_SUCCESS; } + + RouteDescriptor GetRouting(User* user, const std::vector& parameters) + { + User* dest = ServerInstance->FindNick(parameters[0]); + if (dest) + return ROUTE_OPT_UCAST(dest->server); + return ROUTE_LOCALONLY; + } }; /** Handle /NICKUNLOCK @@ -96,10 +89,13 @@ class CommandNicklock : public Command class CommandNickunlock : public Command { public: - CommandNickunlock (InspIRCd* Instance) : Command(Instance,"NICKUNLOCK", "o", 1) + LocalIntExt& locked; + CommandNickunlock (Module* Creator, LocalIntExt& ext) : Command(Creator,"NICKUNLOCK", 1), + locked(ext) { - this->source = "m_nicklock.so"; + flags_needed = 'o'; syntax = ""; + TRANSLATE2(TR_NICK, TR_END); } CmdResult Handle (const std::vector& parameters, User *user) @@ -120,80 +116,77 @@ class CommandNickunlock : public Command user->WriteServ("NOTICE %s :*** No such nickname: '%s'", user->nick.c_str(), parameters[0].c_str()); return CMD_FAILURE; } + } - if (!target->GetExt("nick_locked")) + if (target && 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()); + } + else { user->WriteNumeric(946, "%s %s :This user's nickname is not locked.",user->nick.c_str(),target->nick.c_str()); return CMD_FAILURE; } } - /* If we made it this far, the command is going out on the wire so send local snotice */ - ServerInstance->SNO->WriteGlobalSno('a', std::string(user->nick)+" used NICKUNLOCK on "+parameters[0]); - - if (target) - { - target->Shrink("nick_locked"); - if (IS_LOCAL(user)) - user->WriteNumeric(945, "%s %s :Nickname now unlocked.",user->nick.c_str(),target->nick.c_str()); - } - - /* Route it */ return CMD_SUCCESS; } + + RouteDescriptor GetRouting(User* user, const std::vector& parameters) + { + User* dest = ServerInstance->FindNick(parameters[0]); + if (dest) + return ROUTE_OPT_UCAST(dest->server); + return ROUTE_LOCALONLY; + } }; class ModuleNickLock : public Module { - CommandNicklock* cmd1; - CommandNickunlock* cmd2; - char* n; + LocalIntExt locked; + CommandNicklock cmd1; + CommandNickunlock cmd2; public: - ModuleNickLock(InspIRCd* Me) - : Module(Me) + ModuleNickLock() + : locked("nick_locked", this), cmd1(this, locked), cmd2(this, locked) { - - 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); + ServerInstance->AddCommand(&cmd1); + ServerInstance->AddCommand(&cmd2); + Extensible::Register(&locked); + ServerInstance->Modules->Attach(I_OnUserPreNick, this); } - virtual ~ModuleNickLock() + ~ModuleNickLock() { } - virtual Version GetVersion() + Version GetVersion() { - return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION); + 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); } - virtual int OnUserPreNick(User* user, const std::string &newnick) + ModResult OnUserPreNick(User* user, const std::string &newnick) { if (!IS_LOCAL(user)) - return 0; + return MOD_RES_PASSTHRU; if (isdigit(newnick[0])) /* Allow a switch to a UID */ - return 0; + return MOD_RES_PASSTHRU; - if (user->GetExt("NICKForced")) /* Allow forced nick changes */ - return 0; + if (User::NICKForced.get(user)) /* Allow forced nick changes */ + return MOD_RES_PASSTHRU; - if (user->GetExt("nick_locked", n)) + if (locked.get(user)) { user->WriteNumeric(447, "%s :You cannot change your nickname (your nick is locked)",user->nick.c_str()); - return 1; + return MOD_RES_DENY; } - return 0; - } - - virtual void OnUserQuit(User* user, const std::string &reason, const std::string &oper_message) - { - user->Shrink("nick_locked"); + return MOD_RES_PASSTHRU; } void Prioritize() @@ -201,15 +194,6 @@ class ModuleNickLock : public Module Module *nflood = ServerInstance->Modules->Find("m_nickflood.so"); ServerInstance->Modules->SetPriority(this, I_OnUserPreJoin, PRIORITY_BEFORE, &nflood); } - - virtual void OnCleanup(int target_type, void* item) - { - if(target_type == TYPE_USER) - { - User* user = (User*)item; - user->Shrink("nick_locked"); - } - } }; MODULE_INIT(ModuleNickLock)