- Modify ServerConfig::GetFullProgDir to just return cwd, previously it did a lot...

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

diff --git a/src/cmd_whowas.cpp b/src/cmd_whowas.cpp
index 46228f0dc04ac410aedf523bfe6d71e640ae87e3..2030667a9eb56186d54b645918c61a49a4f9a6f9 100644 (file)
--- a/src/cmd_whowas.cpp
+++ b/src/cmd_whowas.cpp
@@ -15,7 +15,9 @@
 #include "users.h"
 #include "commands/cmd_whowas.h"
 
-extern "C" command_t* init_command(InspIRCd* Instance)
+WhoWasMaintainTimer * timer;
+
+extern "C" DllExport command_t* init_command(InspIRCd* Instance)
 {
        return new cmd_whowas(Instance);
 }
@@ -24,7 +26,7 @@ cmd_whowas::cmd_whowas(InspIRCd* Instance)
 : command_t(Instance, "WHOWAS", 0, 1)
 {
        syntax = "<nick>{,<nick>}";
-       timer = new MaintainTimer(Instance, 3600);
+       timer = new WhoWasMaintainTimer(Instance, 3600);
        Instance->Timers->AddTimer(timer);
 }
 
@@ -36,7 +38,7 @@ CmdResult cmd_whowas::Handle (const char** parameters, int pcnt, userrec* user)
                user->WriteServ("421 %s %s :This command has been disabled.",user->nick,command.c_str());
                return CMD_FAILURE;
        }
-                        
+
        whowas_users::iterator i = whowas.find(parameters[0]);
 
        if (i == whowas.end())
@@ -65,10 +67,10 @@ CmdResult cmd_whowas::Handle (const char** parameters, int pcnt, userrec* user)
 
                                user->WriteServ("314 %s %s %s %s * :%s",user->nick,parameters[0],u->ident,u->dhost,u->gecos);
                                
-                               if(*user->oper)
+                               if (IS_OPER(user))
                                        user->WriteServ("379 %s %s :was connecting from *@%s", user->nick, parameters[0], u->host);
                                
-                               if(*ServerInstance->Config->HideWhoisServer && !(*user->oper))
+                               if (*ServerInstance->Config->HideWhoisServer && !IS_OPER(user))
                                        user->WriteServ("312 %s %s %s :%s",user->nick,parameters[0], ServerInstance->Config->HideWhoisServer, b);
                                else
                                        user->WriteServ("312 %s %s %s :%s",user->nick,parameters[0], u->server, b);
@@ -326,7 +328,7 @@ WhoWasGroup::~WhoWasGroup()
 }
 
 /* every hour, run this function which removes all entries older than Config->WhoWasMaxKeep */
-void MaintainTimer::Tick(time_t t)
+void WhoWasMaintainTimer::Tick(time_t t)
 {
        command_t* whowas_command = ServerInstance->Parser->GetHandler("WHOWAS");
        if (whowas_command)