X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fuserprocess.cpp;h=3dc3143de02abaa8b441813e695c423147499700;hb=f474e7e6dc2d36f96150ebe33b23b4ea76814415;hp=286135f22e223878a180d9c4f1396d531fc67c44;hpb=d7a0cd3db1e8b64a6f706f1831e645ad69aa7927;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/userprocess.cpp b/src/userprocess.cpp index 286135f22..3dc3143de 100644 --- a/src/userprocess.cpp +++ b/src/userprocess.cpp @@ -21,10 +21,10 @@ void FloodQuitUserHandler::Call(User* current) { - Server->Logs->Log("USERS",DEFAULT,"Excess flood from: %s@%s", current->ident, current->host); + Server->Logs->Log("USERS",DEFAULT,"Excess flood from: %s@%s", current->ident.c_str(), current->host.c_str()); 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); + current->registered == REG_ALL ? current->nick.c_str() : "", + current->registered == REG_ALL ? "!" : "", current->ident.c_str(), current->host.c_str()); Server->Users->QuitUser(current, "Excess flood"); if (current->registered != REG_ALL) @@ -120,7 +120,7 @@ void ProcessUserHandler::Call(User* cu) Server->FloodQuitUser(current); else { - current->WriteServ("NOTICE %s :Your previous line was too long and was not delivered (Over %d chars) Please shorten it.", current->nick, MAXBUF-2); + current->WriteServ("NOTICE %s :Your previous line was too long and was not delivered (Over %d chars) Please shorten it.", current->nick.c_str(), MAXBUF-2); current->recvq.clear(); } } @@ -171,6 +171,9 @@ void InspIRCd::DoBackgroundUserStuff() { User *curr = *count2; + if (curr->quitting) + continue; + if (curr->Penalty) { curr->Penalty--;