Wakey wakey w00t :p

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

diff --git a/src/users.cpp b/src/users.cpp
index 0a196d798a440c539ed092f9f40140a02501cafe..851e0a1d66e8b891b520064553e28c1525819ea8 100644 (file)
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -90,6 +90,12 @@ std::string User::ProcessNoticeMasks(const char *sm)
                *c++;
        }
 
+       std::string s = this->FormatNoticeMasks();
+       if (s.length() == 0)
+       {
+               this->modes[UM_SNOMASK] = false;
+       }
+
        return output;
 }
 
@@ -203,12 +209,11 @@ void User::DecrementModes()
 User::User(InspIRCd* Instance, const std::string &uid) : ServerInstance(Instance)
 {
        server = (char*)Instance->FindServerNamePtr(Instance->Config->ServerName);
-       reset_due = ServerInstance->Time();
        age = ServerInstance->Time();
        Penalty = 0;
-       lines_in = lastping = signon = idle_lastmsg = nping = registered = 0;
+       lastping = signon = idle_lastmsg = nping = registered = 0;
        bytes_in = bytes_out = cmds_in = cmds_out = 0;
-       quietquit = OverPenalty = ExemptFromPenalty = quitting = exempt = haspassed = dns_done = false;
+       quietquit = quitting = exempt = haspassed = dns_done = false;
        fd = -1;
        recvq.clear();
        sendq.clear();
@@ -607,7 +612,7 @@ bool User::AddBuffer(const std::string &a)
                }
        }
 
-       if (this->MyClass && (recvq.length() > this->MyClass->GetRecvqMax()))
+       if (this->MyClass && !this->HasPrivPermission("users/flood/increased-buffers") && recvq.length() > this->MyClass->GetRecvqMax())
        {
                ServerInstance->Users->QuitUser(this, "RecvQ exceeded");
                ServerInstance->SNO->WriteToSnoMask('A', "User %s RecvQ of %lu exceeds connect class maximum of %lu",this->nick.c_str(),(unsigned long int)recvq.length(),this->MyClass->GetRecvqMax());
@@ -672,7 +677,7 @@ void User::AddWriteBuf(const std::string &data)
        if (this->quitting)
                return;
 
-       if (this->MyClass && (sendq.length() + data.length() > this->MyClass->GetSendqMax()))
+       if (this->MyClass && !this->HasPrivPermission("users/flood/increased-buffers") && sendq.length() + data.length() > this->MyClass->GetSendqMax())
        {
                /*
                 * Fix by brain - Set the error text BEFORE calling, because