Fix multiple (useless) linefeeds on the end of ADDLINE in burst

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

diff --git a/src/userprocess.cpp b/src/userprocess.cpp
index 5ec2581f7a72b5c730c0448bb1aad750e7e188a1..62cd452cd182aee2e67e743897d3a8b7f7b115bc 100644 (file)
--- a/src/userprocess.cpp
+++ b/src/userprocess.cpp
@@ -21,7 +21,7 @@
 
 void FloodQuitUserHandler::Call(User* current)
 {
-       Server->Log(DEFAULT,"Excess flood from: %s@%s", current->ident, current->host);
+       Server->Logs->Log("USERS",DEFAULT,"Excess flood from: %s@%s", current->ident, current->host);
        Server->SNO->WriteToSnoMask('f',"Excess flood from: %s%s%s@%s",
                        current->registered == REG_ALL ? current->nick : "",
                        current->registered == REG_ALL ? "!" : "", current->ident, current->host);
@@ -57,7 +57,7 @@ void ProcessUserHandler::Call(User* cu)
                }
                catch (CoreException& modexcept)
                {
-                       Server->Log(DEBUG, "%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
+                       Server->Logs->Log("USERS",DEBUG, "%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
                }
 
                if (MOD_RESULT < 0)
@@ -167,7 +167,7 @@ void InspIRCd::DoBackgroundUserStuff()
        /*
         * loop over all local users..
         */
-       for (std::vector<User*>::iterator count2 = local_users.begin(); count2 != local_users.end(); count2++)
+       for (std::vector<User*>::iterator count2 = this->Users->local_users.begin(); count2 != this->Users->local_users.end(); count2++)
        {
                User *curr = *count2;
 
@@ -216,7 +216,7 @@ void InspIRCd::DoBackgroundUserStuff()
                        // This user didn't answer the last ping, remove them
                        if (!curr->lastping)
                        {
-                               time_t time = this->Time(false) - (curr->nping - curr->MyClass->GetPingTime());
+                               time_t time = this->Time() - (curr->nping - curr->MyClass->GetPingTime());
                                char message[MAXBUF];
                                snprintf(message, MAXBUF, "Ping timeout: %ld second%s", (long)time, time > 1 ? "s" : "");
                                curr->lastping = 1;