Patch from Namegduf converting all instances (where possible) of time() -> ServerInstance->Time(). Thanks!

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@10691 e03df62e-2008-0410-955e-edbf42e46eb7

4 files changed, 9 insertions, 6 deletions

diff --git a/src/modules/extra/m_sqllog.cpp b/src/modules/extra/m_sqllog.cpp
index e57e40354..a3f995355 100644
--- a/src/modules/extra/m_sqllog.cpp
+++ b/src/modules/extra/m_sqllog.cpp
@@ -28,6 +28,8 @@ std::map<unsigned long,QueryInfo*> active_queries;
 
 class QueryInfo
 {
+private:
+	InspIRCd* ServerInstance;
 public:
 	QueryState qs;
 	unsigned long id;
@@ -41,8 +43,9 @@ public:
 	time_t date;
 	bool insert;
 
-	QueryInfo(const std::string &n, const std::string &s, const std::string &h, unsigned long i, int cat)
+	QueryInfo(InspIRCd* Instance, const std::string &n, const std::string &s, const std::string &h, unsigned long i, int cat)
 	{
+		ServerInstance = Instance;
 		qs = FIND_SOURCE;
 		nick = n;
 		source = s;
@@ -50,7 +53,7 @@ public:
 		id = i;
 		category = cat;
 		sourceid = nickid = hostid = -1;
-		date = time(NULL);
+		date = ServerInstance->Time();
 		insert = false;
 	}
 
@@ -250,7 +253,7 @@ class ModuleSQLLog : public Module
 		SQLrequest req = SQLrequest(this, SQLModule, dbid, SQLquery("SELECT id,actor FROM ircd_log_actors WHERE actor='?'") % source);
 		if(req.Send())
 		{
-			QueryInfo* i = new QueryInfo(nick, source, host, req.id, category);
+			QueryInfo* i = new QueryInfo(ServerInstance, nick, source, host, req.id, category);
 			i->qs = FIND_SOURCE;
 			active_queries[req.id] = i;
 		}
diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp
index aaf19f925..1b2a1de96 100644
--- a/src/modules/extra/m_ssl_gnutls.cpp
+++ b/src/modules/extra/m_ssl_gnutls.cpp
@@ -903,7 +903,7 @@ class ModuleSSLGnuTLS : public Module
 
 		/* Beware here we do not check for errors.
 		 */
-		if ((gnutls_x509_crt_get_expiration_time(cert) < time(0)) || (gnutls_x509_crt_get_activation_time(cert) > time(0)))
+		if ((gnutls_x509_crt_get_expiration_time(cert) < ServerInstance->Time()) || (gnutls_x509_crt_get_activation_time(cert) > ServerInstance->Time()))
 		{
 			certinfo->data.insert(std::make_pair("error","Not activated, or expired certificate"));
 		}
diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp
index 389fffb85..796db66d7 100644
--- a/src/modules/extra/m_ssl_openssl.cpp
+++ b/src/modules/extra/m_ssl_openssl.cpp
@@ -871,7 +871,7 @@ class ModuleSSLOpenSSL : public Module
 			certinfo->data.insert(std::make_pair("fingerprint",irc::hex(md, n)));
 		}
 
-		if ((ASN1_UTCTIME_cmp_time_t(X509_get_notAfter(cert), time(NULL)) == -1) || (ASN1_UTCTIME_cmp_time_t(X509_get_notBefore(cert), time(NULL)) == 0))
+		if ((ASN1_UTCTIME_cmp_time_t(X509_get_notAfter(cert), ServerInstance->Time()) == -1) || (ASN1_UTCTIME_cmp_time_t(X509_get_notBefore(cert), ServerInstance->Time()) == 0))
 		{
 			certinfo->data.insert(std::make_pair("error","Not activated, or expired certificate"));
 		}
diff --git a/src/modules/extra/m_testclient.cpp b/src/modules/extra/m_testclient.cpp
index c5c07efc0..d80070939 100644
--- a/src/modules/extra/m_testclient.cpp
+++ b/src/modules/extra/m_testclient.cpp
@@ -40,7 +40,7 @@ public:
 		if(target)
 		{
 			SQLrequest foo = SQLrequest(this, target, "foo",
-					SQLquery("UPDATE rawr SET foo = '?' WHERE bar = 42") % time(NULL));
+					SQLquery("UPDATE rawr SET foo = '?' WHERE bar = 42") % ServerInstance->Time());
 
 			if(foo.Send())
 			{