From 612b61dada5c05eb5d211a5edf92150c6cbd6b98 Mon Sep 17 00:00:00 2001
From: psychon <psychon@726aef4b-f618-498e-8847-2d620e286838>
Date: Sat, 6 Nov 2010 16:52:19 +0000
Subject: [PATCH] Remove CUser::ConnectPaused()

Once Upon A Time, this was the only mechanism that throttled users that wanted
to connect to IRC servers. ConnectDelay and ServerThrottle now do a much better
job on this problem.


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2174 726aef4b-f618-498e-8847-2d620e286838
---
 User.cpp | 15 ---------------
 User.h   |  2 --
 znc.cpp  |  3 ---
 3 files changed, 20 deletions(-)

diff --git a/User.cpp b/User.cpp
index 87261405..25d6b4e9 100644
--- a/User.cpp
+++ b/User.cpp
@@ -51,7 +51,6 @@ protected:
 CUser::CUser(const CString& sUserName) {
 	m_pIRCSock = NULL;
 	m_fTimezoneOffset = 0;
-	m_uConnectTime = 0;
 	SetUserName(sUserName);
 	m_sNick = m_sCleanUserName;
 	m_sIdent = m_sCleanUserName;
@@ -1247,20 +1246,6 @@ const CString& CUser::GetPass() const { return m_sPass; }
 CUser::eHashType CUser::GetPassHashType() const { return m_eHashType; }
 const CString& CUser::GetPassSalt() const { return m_sPassSalt; }
 
-bool CUser::ConnectPaused() {
-	if (!m_uConnectTime) {
-		m_uConnectTime = time(NULL);
-		return false;
-	}
-
-	if (time(NULL) - m_uConnectTime >= 5) {
-		m_uConnectTime = time(NULL);
-		return false;
-	}
-
-	return true;
-}
-
 bool CUser::UseClientIP() const { return m_bUseClientIP; }
 bool CUser::DenyLoadMod() const { return m_bDenyLoadMod; }
 bool CUser::IsAdmin() const { return m_bAdmin; }
diff --git a/User.h b/User.h
index 286451ea..834ae967 100644
--- a/User.h
+++ b/User.h
@@ -68,7 +68,6 @@ public:
 	static bool IsValidUserName(const CString& sUserName);
 	static CString MakeCleanUserName(const CString& sUserName);
 	bool IsLastServer() const;
-	bool ConnectPaused();
 
 	void DelClients();
 	void DelServers();
@@ -226,7 +225,6 @@ public:
 	// !Getters
 private:
 protected:
-	time_t                m_uConnectTime;
 	CString               m_sUserName;
 	CString               m_sCleanUserName;
 	CString               m_sNick;
diff --git a/znc.cpp b/znc.cpp
index d03f9cf9..24c0d2e3 100644
--- a/znc.cpp
+++ b/znc.cpp
@@ -123,9 +123,6 @@ bool CZNC::ConnectUser(CUser *pUser) {
 	if (pIRCSock || !pUser->HasServers())
 		return false;
 
-	if (pUser->ConnectPaused())
-		return false;
-
 	CServer* pServer = pUser->GetNextServer();
 
 	if (!pServer)