More tweaks

[user/henk/code/inspircd.git] / src / cmd_privmsg.cpp

diff --git a/src/cmd_privmsg.cpp b/src/cmd_privmsg.cpp
index 06207059d621b9b8de947de0ca9270db3e3df093..ce5ece2a282f97236b22369ee3eecdf742874ec5 100644 (file)
--- a/src/cmd_privmsg.cpp
+++ b/src/cmd_privmsg.cpp
@@ -22,23 +22,20 @@
 #include "modules.h"
 #include "wildcard.h"
 #include "commands.h"
-#include "helperfuncs.h"
-#include "commands/cmd_privmsg.h"
 
-extern InspIRCd* ServerInstance;
-extern time_t TIME;
+#include "commands/cmd_privmsg.h"
 
 void cmd_privmsg::Handle (const char** parameters, int pcnt, userrec *user)
 {
        userrec *dest;
        chanrec *chan;
 
-       user->idle_lastmsg = TIME;
+       user->idle_lastmsg = ServerInstance->Time();
        
        if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0))
                return;
 
-       if ((parameters[0][0] == '$') && ((*user->oper) || (is_uline(user->server))))
+       if ((parameters[0][0] == '$') && ((*user->oper) || (ServerInstance->ULine(user->server))))
        {
                int MOD_RESULT = 0;
                std::string temp = parameters[1];
@@ -123,7 +120,7 @@ void cmd_privmsg::Handle (const char** parameters, int pcnt, userrec *user)
                }
                parameters[1] = (char*)temp.c_str();
 
-               if (dest->fd > -1)
+               if (IS_LOCAL(dest))
                {
                        // direct write, same server
                        user->WriteTo(dest, "PRIVMSG %s :%s", dest->nick, parameters[1]);