More stuff so that freebsd users can still use the ports version of openssl if they...

[user/henk/code/inspircd.git] / src / modules / m_nicklock.cpp

diff --git a/src/modules/m_nicklock.cpp b/src/modules/m_nicklock.cpp
index 74625da38657fdf43aee9708265b55a00b760b77..8fae4627907ea4eda4970968d3df2fe2c6e680cb 100644 (file)
--- 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-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -21,29 +21,29 @@ class CommandNicklock : public Command
 {
        char* dummy;
  public:
-       CommandNicklock (InspIRCd* Instance) : Command(Instance,"NICKLOCK", 'o', 2)
+       CommandNicklock (InspIRCd* Instance) : Command(Instance,"NICKLOCK", "o", 2)
        {
                this->source = "m_nicklock.so";
                syntax = "<oldnick> <newnick>";
                TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
        }
 
-       CmdResult Handle(const char** parameters, int pcnt, User *user)
+       CmdResult Handle(const char* const* parameters, int pcnt, User *user)
        {
-               User* 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,target->nick);
                        return CMD_FAILURE;
                }
 
@@ -54,16 +54,16 @@ class CommandNicklock : public Command
                }
 
                // 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]))
                {
-                       // ugh, nickchange failed for some reason -- possibly existing nick?
-                       User::QuitUser(ServerInstance, source, "Nickname collision");
+                       // ugh, nickchange failed for some reason -- possibly existing nick? XXX change to UID here
+                       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;
@@ -75,20 +75,20 @@ class CommandNicklock : public Command
 class CommandNickunlock : public Command
 {
  public:
-       CommandNickunlock (InspIRCd* Instance) : Command(Instance,"NICKUNLOCK", 'o', 1)
+       CommandNickunlock (InspIRCd* Instance) : Command(Instance,"NICKUNLOCK", "o", 1)
        {
                this->source = "m_nicklock.so";
                syntax = "<locked-nick>";
        }
 
-       CmdResult Handle (const char** parameters, int pcnt, User *user)
+       CmdResult Handle (const char* const* parameters, int pcnt, User *user)
        {
-               User* 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,target->nick);
+                       ServerInstance->SNO->WriteToSnoMask('A', std::string(user->nick)+" used NICKUNLOCK on "+parameters[0]);
                        return CMD_SUCCESS;
                }
 
@@ -121,13 +121,9 @@ class ModuleNickLock : public Module
        
        virtual Version GetVersion()
        {
-               return Version(1, 1, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version(1, 2, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
        }
 
-       void Implements(char* List)
-       {
-               List[I_OnUserPreNick] = List[I_OnUserQuit] = List[I_OnCleanup] = 1;
-       }
 
        virtual int OnUserPreNick(User* user, const std::string &newnick)
        {
@@ -136,7 +132,7 @@ class ModuleNickLock : public Module
 
                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);
                        return 1;
                }
                return 0;