X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nicklock.cpp;h=5b7e78faffcd06361444c2c07616f80f60293c43;hb=6bc3d71946b339a5a10ca621b029fe8a5b180d68;hp=731704d6850c9ddeb25e46c83739dee503698a65;hpb=73e65d1d242c161e2aaa13d19bee28be2c04cb64;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_nicklock.cpp b/src/modules/m_nicklock.cpp index 731704d68..5b7e78faf 100644 --- a/src/modules/m_nicklock.cpp +++ b/src/modules/m_nicklock.cpp @@ -2,84 +2,96 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * - * - * Written by Craig Edwards, Craig McLure, and others. + * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * See: http://www.inspircd.org/wiki/index.php/Credits + * * This program is free but copyrighted software; see * the file COPYING for details. * * --------------------------------------------------- */ -using namespace std; - #include #include #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" + #include "hashcomp.h" +#include "inspircd.h" /* $ModDesc: Provides the NICKLOCK command, allows an oper to chage a users nick and lock them to it until they quit */ -Server *Srv; +/** Handle /NICKLOCK + */ class cmd_nicklock : public command_t { + char* dummy; public: - cmd_nicklock () : command_t("NICKLOCK", 'o', 2) - { + cmd_nicklock (InspIRCd* Instance) : command_t(Instance,"NICKLOCK", 'o', 2) + { this->source = "m_nicklock.so"; - } + syntax = " "; + } - void Handle(char **parameters, int pcnt, userrec *user) + CmdResult Handle(const char** parameters, int pcnt, userrec *user) { - userrec* source = Srv->FindNick(std::string(parameters[0])); + userrec* source = ServerInstance->FindNick(parameters[0]); irc::string server; irc::string me; if (source) { - if (source->GetExt("nick_locked")) + if (source->GetExt("nick_locked", dummy)) { - WriteServ(user->fd,"946 %s %s :This user's nickname is already locked.",user->nick,source->nick); - return; + user->WriteServ("946 %s %s :This user's nickname is already locked.",user->nick,source->nick); + return CMD_FAILURE; } - if (Srv->IsNick(std::string(parameters[1]))) + if (ServerInstance->IsNick(parameters[1])) { // give them a lock flag - Srv->SendOpers(std::string(user->nick)+" used NICKLOCK to change and hold "+std::string(parameters[0])+" to "+parameters[1]); - Srv->ChangeUserNick(source,std::string(parameters[1])); - // only attempt to set their lockflag after we know the change succeeded - source = Srv->FindNick(std::string(parameters[1])); - if (source) - source->Extend("nick_locked", "ON"); + ServerInstance->WriteOpers(std::string(user->nick)+" used NICKLOCK to change and hold "+parameters[0]+" to "+parameters[1]); + if (!source->ForceNickChange(parameters[1])) + { + userrec::QuitUser(ServerInstance, source, "Nickname collision"); + return CMD_FAILURE; + } + source->Extend("nick_locked", "ON"); + + return CMD_SUCCESS; } + + return CMD_FAILURE; } + + return CMD_FAILURE; } }; +/** Handle /NICKUNLOCK + */ class cmd_nickunlock : public command_t { public: - cmd_nickunlock () : command_t("NICKUNLOCK", 'o', 1) + cmd_nickunlock (InspIRCd* Instance) : command_t(Instance,"NICKUNLOCK", 'o', 1) { this->source = "m_nickunlock.so"; + syntax = ""; } - void Handle (char **parameters, int pcnt, userrec *user) + CmdResult Handle (const char** parameters, int pcnt, userrec *user) { - userrec* source = Srv->FindNick(std::string(parameters[0])); + userrec* source = ServerInstance->FindNick(parameters[0]); if (source) { source->Shrink("nick_locked"); - WriteServ(user->fd,"945 %s %s :Nickname now unlocked.",user->nick,source->nick); - Srv->SendOpers(std::string(user->nick)+" used NICKUNLOCK on "+std::string(parameters[0])); + user->WriteServ("945 %s %s :Nickname now unlocked.",user->nick,source->nick); + ServerInstance->WriteOpers(std::string(user->nick)+" used NICKUNLOCK on "+parameters[0]); + return CMD_SUCCESS; } + + return CMD_FAILURE; } }; @@ -88,15 +100,16 @@ class ModuleNickLock : public Module { cmd_nicklock* cmd1; cmd_nickunlock* cmd2; + char* n; public: - ModuleNickLock(Server* Me) + ModuleNickLock(InspIRCd* Me) : Module::Module(Me) { - Srv = Me; - cmd1 = new cmd_nicklock(); - cmd2 = new cmd_nickunlock(); - Srv->AddCommand(cmd1); - Srv->AddCommand(cmd2); + + cmd1 = new cmd_nicklock(ServerInstance); + cmd2 = new cmd_nickunlock(ServerInstance); + ServerInstance->AddCommand(cmd1); + ServerInstance->AddCommand(cmd2); } virtual ~ModuleNickLock() @@ -105,29 +118,37 @@ class ModuleNickLock : public Module virtual Version GetVersion() { - return Version(1,0,0,1,VF_VENDOR); + return Version(1,1,0,1,VF_VENDOR,API_VERSION); } void Implements(char* List) { - List[I_OnUserPreNick] = List[I_OnUserQuit] = 1; + List[I_OnUserPreNick] = List[I_OnUserQuit] = List[I_OnCleanup] = 1; } - virtual int OnUserPreNick(userrec* user, std::string newnick) + virtual int OnUserPreNick(userrec* user, const std::string &newnick) { - if (user->GetExt("nick_locked")) + if (user->GetExt("nick_locked", n)) { - WriteServ(user->fd,"447 %s :You cannot change your nickname (your nick is locked)",user->nick); + user->WriteServ("447 %s :You cannot change your nickname (your nick is locked)",user->nick); return 1; } return 0; } - virtual void OnUserQuit(userrec* user, std::string reason) - { - user->Shrink("nick_locked"); - } + virtual void OnUserQuit(userrec* user, const std::string &reason) + { + user->Shrink("nick_locked"); + } + virtual void OnCleanup(int target_type, void* item) + { + if(target_type == TYPE_USER) + { + userrec* user = (userrec*)item; + user->Shrink("nick_locked"); + } + } }; // stuff down here is the module-factory stuff. For basic modules you can ignore this. @@ -143,7 +164,7 @@ class ModuleNickLockFactory : public ModuleFactory { } - virtual Module * CreateModule(Server* Me) + virtual Module * CreateModule(InspIRCd* Me) { return new ModuleNickLock(Me); }