Added Anope::CurTime to keep us from calling time() everywhere

34 files changed, 104 insertions, 111 deletions

diff --git a/modules/core/bs_act.cpp b/modules/core/bs_act.cpp
index d52dbdb78..a3487a0ab 100644
--- a/modules/core/bs_act.cpp
+++ b/modules/core/bs_act.cpp
@@ -48,7 +48,7 @@ class CommandBSAct : public Command
 			message.erase(i, 1);
 
 		ircdproto->SendAction(ci->bi, ci->name, "%s", message.c_str());
-		ci->bi->lastmsg = time(NULL);
+		ci->bi->lastmsg = Anope::CurTime;
 
 		// XXX Need to be able to find if someone is overriding this.
 		Log(LOG_COMMAND, u, this, ci) << message;
diff --git a/modules/core/bs_say.cpp b/modules/core/bs_say.cpp
index 916cf8fca..34524e11c 100644
--- a/modules/core/bs_say.cpp
+++ b/modules/core/bs_say.cpp
@@ -54,7 +54,7 @@ class CommandBSSay : public Command
 		}
 
 		ircdproto->SendPrivmsg(ci->bi, ci->name, "%s", text.c_str());
-		ci->bi->lastmsg = time(NULL);
+		ci->bi->lastmsg = Anope::CurTime;
 
 		// XXX need a way to find if someone is overriding this
 		Log(LOG_COMMAND, u, this, ci) << text;
diff --git a/modules/core/cs_topic.cpp b/modules/core/cs_topic.cpp
index ebd09b385..98ca4a2ac 100644
--- a/modules/core/cs_topic.cpp
+++ b/modules/core/cs_topic.cpp
@@ -36,7 +36,7 @@ class CommandCSTopic : public Command
 		{
 			ci->last_topic = topic;
 			ci->last_topic_setter = u->nick;
-			ci->last_topic_time = time(NULL);
+			ci->last_topic_time = Anope::CurTime;
 
 			c->topic = topic;
 			c->topic_setter = u->nick;
diff --git a/modules/core/db_plain.cpp b/modules/core/db_plain.cpp
index 6ac61ba11..643146f5d 100644
--- a/modules/core/db_plain.cpp
+++ b/modules/core/db_plain.cpp
@@ -520,7 +520,7 @@ class DBPlain : public Module
 		if (!IsFile(DatabaseFile))
 			return;
 
-		time_t now = time(NULL);
+		time_t now = Anope::CurTime;
 		tm *tm = localtime(&now);
 
 		if (tm->tm_mday != LastDay)
diff --git a/modules/core/hs_set.cpp b/modules/core/hs_set.cpp
index 68407790a..ca554933c 100644
--- a/modules/core/hs_set.cpp
+++ b/modules/core/hs_set.cpp
@@ -72,7 +72,7 @@ class CommandHSSet : public Command
 			return MOD_CONT;
 		}
 
-		tmp_time = time(NULL);
+		tmp_time = Anope::CurTime;
 
 		if ((na = findnick(nick)))
 		{
diff --git a/modules/core/hs_setall.cpp b/modules/core/hs_setall.cpp
index bea594da6..715559c5a 100644
--- a/modules/core/hs_setall.cpp
+++ b/modules/core/hs_setall.cpp
@@ -84,7 +84,7 @@ class CommandHSSetAll : public Command
 			return MOD_CONT;
 		}
 
-		tmp_time = time(NULL);
+		tmp_time = Anope::CurTime;
 
 		Log(LOG_ADMIN, u, this) << "to set the vhost for all nicks in group " << na->nc->display << " to " << (!vIdent.empty() ? vIdent + "@" : "") << hostmask;
 
diff --git a/modules/core/ns_group.cpp b/modules/core/ns_group.cpp
index 22fad9b3c..6bb187908 100644
--- a/modules/core/ns_group.cpp
+++ b/modules/core/ns_group.cpp
@@ -57,8 +57,8 @@ class CommandNSGroup : public Command
 		na = findnick(u->nick);
 		if (!(target = findnick(nick)))
 			notice_lang(Config->s_NickServ, u, NICK_X_NOT_REGISTERED, nick.c_str());
-		else if (time(NULL) < u->lastnickreg + Config->NSRegDelay)
-			notice_lang(Config->s_NickServ, u, NICK_GROUP_PLEASE_WAIT, (Config->NSRegDelay + u->lastnickreg) - time(NULL));
+		else if (Anope::CurTime < u->lastnickreg + Config->NSRegDelay)
+			notice_lang(Config->s_NickServ, u, NICK_GROUP_PLEASE_WAIT, (Config->NSRegDelay + u->lastnickreg) - Anope::CurTime);
 		else if (u->Account() && u->Account()->HasFlag(NI_SUSPENDED))
 		{
 			//Alog() << Config->s_NickServ << ": " << u->GetMask() << " tried to use GROUP from SUSPENDED nick " << target->nick;
@@ -113,7 +113,7 @@ class CommandNSGroup : public Command
 					Anope::string last_usermask = u->GetIdent() + "@" + u->GetDisplayedHost();
 					na->last_usermask = last_usermask;
 					na->last_realname = u->realname;
-					na->time_registered = na->last_seen = time(NULL);
+					na->time_registered = na->last_seen = Anope::CurTime;
 
 					u->Login(na->nc);
 					FOREACH_MOD(I_OnNickGroup, OnNickGroup(u, target));
@@ -122,7 +122,7 @@ class CommandNSGroup : public Command
 					Log(LOG_COMMAND, u, this) << "makes " << u->nick << " join group of " << target->nick << " (" << target->nc->display << ") (email: " << (!target->nc->email.empty() ? target->nc->email : "none") << ")";
 					notice_lang(Config->s_NickServ, u, NICK_GROUP_JOINED, target->nick.c_str());
 
-					u->lastnickreg = time(NULL);
+					u->lastnickreg = Anope::CurTime;
 
 					check_memos(u);
 				}
diff --git a/modules/core/ns_identify.cpp b/modules/core/ns_identify.cpp
index 1d4938058..e87d13d22 100644
--- a/modules/core/ns_identify.cpp
+++ b/modules/core/ns_identify.cpp
@@ -63,7 +63,7 @@ class CommandNSIdentify : public Command
 					Log(LOG_COMMAND, "nickserv/identify") << "to log out of account " << u->Account()->display;
 
 				na->last_realname = u->realname;
-				na->last_seen = time(NULL);
+				na->last_seen = Anope::CurTime;
 
 				u->Login(na->nc);
 				ircdproto->SendAccountLogin(u, u->Account());
diff --git a/modules/core/ns_register.cpp b/modules/core/ns_register.cpp
index 48a869bb8..b95b0c68a 100644
--- a/modules/core/ns_register.cpp
+++ b/modules/core/ns_register.cpp
@@ -50,7 +50,7 @@ class CommandNSConfirm : public Command
 				na->nc->AddAccess(create_mask(u));
 		}
 
-		na->time_registered = na->last_seen = time(NULL);
+		na->time_registered = na->last_seen = Anope::CurTime;
 		na->nc->language = Config->NSDefLanguage;
 		if (!nr->email.empty())
 			na->nc->email = nr->email;
@@ -71,7 +71,7 @@ class CommandNSConfirm : public Command
 			if (enc_decrypt(na->nc->pass, tmp_pass) == 1)
 				notice_lang(Config->s_NickServ, u, NICK_PASSWORD_IS, tmp_pass.c_str());
 
-			u->lastnickreg = time(NULL);
+			u->lastnickreg = Anope::CurTime;
 		}
 		else
 		{
@@ -201,7 +201,7 @@ class CommandNSRegister : public CommandNSConfirm
 			return MOD_CONT;
 		}
 
-		if (!is_oper(u) && Config->NickRegDelay && time(NULL) - u->my_signon < Config->NickRegDelay)
+		if (!is_oper(u) && Config->NickRegDelay && Anope::CurTime - u->my_signon < Config->NickRegDelay)
 		{
 			notice_lang(Config->s_NickServ, u, NICK_REG_DELAY, Config->NickRegDelay);
 			return MOD_CONT;
@@ -244,8 +244,8 @@ class CommandNSRegister : public CommandNSConfirm
 
 		if (Config->NSForceEmail && email.empty())
 			this->OnSyntaxError(u, "");
-		else if (time(NULL) < u->lastnickreg + Config->NSRegDelay)
-			notice_lang(Config->s_NickServ, u, NICK_REG_PLEASE_WAIT, (u->lastnickreg + Config->NSRegDelay) - time(NULL));
+		else if (Anope::CurTime < u->lastnickreg + Config->NSRegDelay)
+			notice_lang(Config->s_NickServ, u, NICK_REG_PLEASE_WAIT, (u->lastnickreg + Config->NSRegDelay) - Anope::CurTime);
 		else if ((na = findnick(u->nick)))
 		{
 			/* i.e. there's already such a nick regged */
@@ -273,7 +273,7 @@ class CommandNSRegister : public CommandNSConfirm
 			enc_encrypt(pass, nr->password);
 			if (!email.empty())
 				nr->email = email;
-			nr->requested = time(NULL);
+			nr->requested = Anope::CurTime;
 			FOREACH_MOD(I_OnMakeNickRequest, OnMakeNickRequest(nr));
 			if (Config->NSEmailReg)
 			{
@@ -335,14 +335,14 @@ class CommandNSResend : public Command
 		{
 			if ((nr = findrequestnick(u->nick)))
 			{
-				if (time(NULL) < nr->lastmail + Config->NSResendDelay)
+				if (Anope::CurTime < nr->lastmail + Config->NSResendDelay)
 				{
 					notice_lang(Config->s_NickServ, u, MAIL_LATER);
 					return MOD_CONT;
 				}
 				if (!SendRegmail(u, nr))
 				{
-					nr->lastmail = time(NULL);
+					nr->lastmail = Anope::CurTime;
 					notice_lang(Config->s_NickServ, u, NICK_REG_RESENT, nr->email.c_str());
 					Log(LOG_COMMAND, u, this) << "resend registration verification code for " << nr->nick;
 				}
diff --git a/modules/core/ns_resetpass.cpp b/modules/core/ns_resetpass.cpp
index ccb597862..a0efa373c 100644
--- a/modules/core/ns_resetpass.cpp
+++ b/modules/core/ns_resetpass.cpp
@@ -90,7 +90,7 @@ class NSResetPass : public Module
 			Anope::string c;
 			if (na && na->nc->GetExtRegular("ns_resetpass_code", c) && na->nc->GetExtRegular("ns_resetpass_time", t))
 			{
-				if (t < time(NULL) - 3600)
+				if (t < Anope::CurTime - 3600)
 				{
 					na->nc->Shrink("ns_resetpass_code");
 					na->nc->Shrink("ns_resetpass_time");
@@ -106,7 +106,7 @@ class NSResetPass : public Module
 
 					u->UpdateHost();
 					na->last_realname = u->realname;
-					na->last_seen = time(NULL);
+					na->last_seen = Anope::CurTime;
 					u->Login(na->nc);
 					ircdproto->SendAccountLogin(u, u->Account());
 					ircdproto->SetAutoIdentificationToken(u);
@@ -162,7 +162,7 @@ static bool SendResetEmail(User *u, NickAlias *na)
 	na->nc->Shrink("ns_resetpass_time");
 
 	na->nc->Extend("ns_resetpass_code", new ExtensibleItemRegular<Anope::string>(passcode));
-	na->nc->Extend("ns_resetpass_time", new ExtensibleItemRegular<time_t>(time(NULL)));
+	na->nc->Extend("ns_resetpass_time", new ExtensibleItemRegular<time_t>(Anope::CurTime));
 
 	return Mail(u, na->nc, Config->s_NickServ, subject, message);
 }
diff --git a/modules/core/ns_update.cpp b/modules/core/ns_update.cpp
index baeae756c..e101158a9 100644
--- a/modules/core/ns_update.cpp
+++ b/modules/core/ns_update.cpp
@@ -31,7 +31,7 @@ class CommandNSUpdate : public Command
 		check_memos(u);
 
 		na->last_realname = u->realname;
-		na->last_seen = time(NULL);
+		na->last_seen = Anope::CurTime;
 		if (ircd->vhost)
 			do_on_id(u);
 		notice_lang(Config->s_NickServ, u, NICK_UPDATE_SUCCESS, Config->s_NickServ.c_str());
diff --git a/modules/core/os_akill.cpp b/modules/core/os_akill.cpp
index abda0348a..1f4614465 100644
--- a/modules/core/os_akill.cpp
+++ b/modules/core/os_akill.cpp
@@ -155,7 +155,7 @@ class CommandOSAKill : public Command
 			return MOD_CONT;
 		}
 		else if (expires > 0)
-			expires += time(NULL);
+			expires += Anope::CurTime;
 
 		if (params.size() <= last_param)
 		{
@@ -183,7 +183,7 @@ class CommandOSAKill : public Command
 					buf = "does not expire";
 				else
 				{
-					int wall_expiry = expires - time(NULL);
+					time_t wall_expiry = expires - Anope::CurTime;
 					Anope::string s;
 
 					if (wall_expiry >= 86400)
diff --git a/modules/core/os_chankill.cpp b/modules/core/os_chankill.cpp
index 04ce6603c..81b15710a 100644
--- a/modules/core/os_chankill.cpp
+++ b/modules/core/os_chankill.cpp
@@ -44,7 +44,7 @@ class CommandOSChanKill : public Command
 			return MOD_CONT;
 		}
 		else if (expires > 0)
-			expires += time(NULL);
+			expires += Anope::CurTime;
 
 		if (params.size() <= last_param)
 		{
diff --git a/modules/core/os_defcon.cpp b/modules/core/os_defcon.cpp
index 711046beb..18a1ecfa0 100644
--- a/modules/core/os_defcon.cpp
+++ b/modules/core/os_defcon.cpp
@@ -158,7 +158,7 @@ class OSDefcon : public Module
 			if (CheckDefCon(DEFCON_AKILL_NEW_CLIENTS))
 			{
 				Log(OperServ, "operserv/defcon") << "DEFCON: adding akill for *@" << u->host;
-				XLine *x = SGLine->Add(NULL, NULL, "*@" + u->host, time(NULL) + Config->DefConAKILL, !Config->DefConAkillReason.empty() ? Config->DefConAkillReason : "DEFCON AKILL");
+				XLine *x = SGLine->Add(NULL, NULL, "*@" + u->host, Anope::CurTime + Config->DefConAKILL, !Config->DefConAkillReason.empty() ? Config->DefConAkillReason : "DEFCON AKILL");
 				if (x)
 					x->By = Config->s_OperServ;
 			}
@@ -289,7 +289,7 @@ class OSDefcon : public Module
 				++session->hits;
 				if (Config->MaxSessionKill && session->hits >= Config->MaxSessionKill)
 				{
-					SGLine->Add(NULL, NULL, "*@" + u->host, time(NULL) + Config->SessionAutoKillExpiry, "Session limit exceeded");
+					SGLine->Add(NULL, NULL, "*@" + u->host, Anope::CurTime + Config->SessionAutoKillExpiry, "Session limit exceeded");
 					ircdproto->SendGlobops(OperServ, "Added a temporary AKILL for \2*@%s\2 due to excessive connections", u->host.c_str());
 				}
 			}
diff --git a/modules/core/os_ignore.cpp b/modules/core/os_ignore.cpp
index 05ac57c9b..9cb5cf4d2 100644
--- a/modules/core/os_ignore.cpp
+++ b/modules/core/os_ignore.cpp
@@ -164,11 +164,9 @@ class OSIgnore : public Module
 
 	void OnDatabaseWrite(void (*Write)(const Anope::string &))
 	{
-		time_t now = time(NULL);
-
 		for (std::list<IgnoreData *>::iterator ign = ignore.begin(), ign_end = ignore.end(); ign != ign_end; )
 		{
-			if ((*ign)->time && (*ign)->time <= now)
+			if ((*ign)->time && (*ign)->time <= Anope::CurTime)
 			{
 				Log(LOG_DEBUG) << "[os_ignore] Expiring ignore entry " << (*ign)->mask;
 				delete *ign;
diff --git a/modules/core/os_news.cpp b/modules/core/os_news.cpp
index 8b286eebb..f77db4494 100644
--- a/modules/core/os_news.cpp
+++ b/modules/core/os_news.cpp
@@ -142,7 +142,7 @@ static int add_newsitem(User *u, const Anope::string &text, NewsType type)
 	news->type = type;
 	news->num = num + 1;
 	news->Text = text;
-	news->time = time(NULL);
+	news->time = Anope::CurTime;
 	news->who = u->nick;
 
 	News.push_back(news);
diff --git a/modules/core/os_session.cpp b/modules/core/os_session.cpp
index 9f81ef12d..84619e9b3 100644
--- a/modules/core/os_session.cpp
+++ b/modules/core/os_session.cpp
@@ -114,7 +114,7 @@ class ExceptionViewCallback : public ExceptionListCallback
 
 		char timebuf[32];
 		struct tm tm;
-		time_t t = time(NULL);
+		time_t t = Anope::CurTime;
 
 		tm = *localtime(exceptions[index]->time ? &exceptions[index]->time : &t);
 		strftime_lang(timebuf, sizeof(timebuf), u, STRFTIME_SHORT_DATE_FORMAT, &tm);
@@ -249,7 +249,7 @@ class CommandOSException : public Command
 			return MOD_CONT;
 		}
 		else if (expires > 0)
-			expires += time(NULL);
+			expires += Anope::CurTime;
 
 		int limit = !limitstr.empty() && limitstr.is_number_only() ? convertTo<int>(limitstr) : -1;
 
diff --git a/modules/core/os_snline.cpp b/modules/core/os_snline.cpp
index 30be073b5..10c813dd9 100644
--- a/modules/core/os_snline.cpp
+++ b/modules/core/os_snline.cpp
@@ -153,7 +153,7 @@ class CommandOSSNLine : public Command
 			return MOD_CONT;
 		}
 		else if (expires > 0)
-			expires += time(NULL);
+			expires += Anope::CurTime;
 
 		if (param.empty())
 		{
@@ -200,7 +200,7 @@ class CommandOSSNLine : public Command
 					buf = "does not expire";
 				else
 				{
-					int wall_expiry = expires - time(NULL);
+					time_t wall_expiry = expires - Anope::CurTime;
 					Anope::string s;
 
 					if (wall_expiry >= 86400)
diff --git a/modules/core/os_sqline.cpp b/modules/core/os_sqline.cpp
index e014d6c82..68a28347a 100644
--- a/modules/core/os_sqline.cpp
+++ b/modules/core/os_sqline.cpp
@@ -152,7 +152,7 @@ class CommandOSSQLine : public Command
 			return MOD_CONT;
 		}
 		else if (expires > 0)
-			expires += time(NULL);
+			expires += Anope::CurTime;
 
 		if (params.size() <= last_param)
 		{
@@ -180,7 +180,7 @@ class CommandOSSQLine : public Command
 					buf = "does not expire";
 				else
 				{
-					int wall_expiry = expires - time(NULL);
+					time_t wall_expiry = expires - Anope::CurTime;
 					Anope::string s;
 
 					if (wall_expiry >= 86400)
diff --git a/modules/core/os_stats.cpp b/modules/core/os_stats.cpp
index d965c7dc5..332b6ba4f 100644
--- a/modules/core/os_stats.cpp
+++ b/modules/core/os_stats.cpp
@@ -130,7 +130,7 @@ class CommandOSStats : public Command
 	CommandReturn DoStatsUptime(User *u)
 	{
 		char timebuf[64];
-		time_t uptime = time(NULL) - start_time;
+		time_t uptime = Anope::CurTime - start_time;
 		int days = uptime / 86400, hours = (uptime / 3600) % 24, mins = (uptime / 60) % 60, secs = uptime % 60;
 		notice_lang(Config->s_OperServ, u, OPER_STATS_CURRENT_USERS, usercnt, opcnt);
 		struct tm *tm = localtime(&maxusertime);
diff --git a/modules/core/os_svsnick.cpp b/modules/core/os_svsnick.cpp
index a459691b0..537b32b6a 100644
--- a/modules/core/os_svsnick.cpp
+++ b/modules/core/os_svsnick.cpp
@@ -59,7 +59,7 @@ class CommandOSSVSNick : public Command
 		{
 			notice_lang(Config->s_OperServ, u, OPER_SVSNICK_NEWNICK, nick.c_str(), newnick.c_str());
 			ircdproto->SendGlobops(OperServ, "%s used SVSNICK to change %s to %s", u->nick.c_str(), nick.c_str(), newnick.c_str());
-			ircdproto->SendForceNickChange(u2, newnick, time(NULL));
+			ircdproto->SendForceNickChange(u2, newnick, Anope::CurTime);
 		}
 		return MOD_CONT;
 	}
diff --git a/modules/core/os_szline.cpp b/modules/core/os_szline.cpp
index 6174d4c43..0d024282a 100644
--- a/modules/core/os_szline.cpp
+++ b/modules/core/os_szline.cpp
@@ -152,7 +152,7 @@ class CommandOSSZLine : public Command
 			return MOD_CONT;
 		}
 		else if (expires > 0)
-			expires += time(NULL);
+			expires += Anope::CurTime;
 
 		if (params.size() <= last_param)
 		{
@@ -180,7 +180,7 @@ class CommandOSSZLine : public Command
 					buf = "does not expire";
 				else
 				{
-					int wall_expiry = expires - time(NULL);
+					time_t wall_expiry = expires - Anope::CurTime;
 					Anope::string s;
 
 					if (wall_expiry >= 86400)
diff --git a/modules/extra/cs_appendtopic.cpp b/modules/extra/cs_appendtopic.cpp
index 387c55f73..e331d46c6 100644
--- a/modules/extra/cs_appendtopic.cpp
+++ b/modules/extra/cs_appendtopic.cpp
@@ -85,7 +85,7 @@ class CommandCSAppendTopic : public Command
 
 			ci->last_topic = topic;
 			ci->last_topic_setter = u->nick;
-			ci->last_topic_time = time(NULL);
+			ci->last_topic_time = Anope::CurTime;
 
 			c->topic = topic;
 			c->topic_setter = u->nick;
diff --git a/modules/extra/db_mysql.cpp b/modules/extra/db_mysql.cpp
index 4920e9b00..eb55a3952 100644
--- a/modules/extra/db_mysql.cpp
+++ b/modules/extra/db_mysql.cpp
@@ -338,13 +338,11 @@ class DBMySQL : public Module
 		}
 		else
 		{
-			time_t now = time(NULL);
-
-			if (now - Config->UpdateTimeout > lastwarn)
+			if (Anope::CurTime - Config->UpdateTimeout > lastwarn)
 			{
 				ircdproto->SendGlobops(OperServ, "Unable to locate SQL reference, is m_mysql loaded? Going to readonly...");
 				readonly = this->ro = true;
-				this->lastwarn = now;
+				this->lastwarn = Anope::CurTime;
 			}
 		}
 	}
@@ -478,8 +476,8 @@ class DBMySQL : public Module
 			na->last_quit = r.Get(i, "last_quit");
 			na->last_realname = r.Get(i, "last_realname");
 			na->last_usermask = r.Get(i, "last_usermask");
-			na->time_registered = r.Get(i, "time_registered").is_pos_number_only() ? convertTo<time_t>(r.Get(i, "time_registered")) : time(NULL);
-			na->last_seen = r.Get(i, "last_seen").is_pos_number_only() ? convertTo<time_t>(r.Get(i, "last_seen")) : time(NULL);
+			na->time_registered = r.Get(i, "time_registered").is_pos_number_only() ? convertTo<time_t>(r.Get(i, "time_registered")) : Anope::CurTime;
+			na->last_seen = r.Get(i, "last_seen").is_pos_number_only() ? convertTo<time_t>(r.Get(i, "last_seen")) : Anope::CurTime;
 
 			spacesepstream sep(r.Get(i, "flags"));
 			Anope::string buf;
@@ -518,7 +516,7 @@ class DBMySQL : public Module
 			if (!bi)
 				bi = new BotInfo(r.Get(i, "nick"), r.Get(i, "user"), r.Get(i, "host"));
 			bi->realname = r.Get(i, "rname");
-			bi->created = r.Get(i, "created").is_pos_number_only() ? convertTo<time_t>(r.Get(i, "creeated")) : time(NULL);
+			bi->created = r.Get(i, "created").is_pos_number_only() ? convertTo<time_t>(r.Get(i, "creeated")) : Anope::CurTime;
 
 			spacesepstream sep(r.Get(i, "flags"));
 			Anope::string buf;
@@ -569,11 +567,11 @@ class DBMySQL : public Module
 				if (!r.Get(i, "successor").empty())
 					ci->successor = findcore(r.Get(i, "successor"));
 				ci->desc = r.Get(i, "descr");
-				ci->time_registered = r.Get(i, "time_registered").is_pos_number_only() ? convertTo<time_t>(r.Get(i, "time_registered")) : time(NULL);
-				ci->last_used = r.Get(i, "last_used").is_pos_number_only() ? convertTo<time_t>(r.Get(i, "last_used")) : time(NULL);
+				ci->time_registered = r.Get(i, "time_registered").is_pos_number_only() ? convertTo<time_t>(r.Get(i, "time_registered")) : Anope::CurTime;
+				ci->last_used = r.Get(i, "last_used").is_pos_number_only() ? convertTo<time_t>(r.Get(i, "last_used")) : Anope::CurTime;
 				ci->last_topic = r.Get(i, "last_topic");
 				ci->last_topic_setter = r.Get(i, "last_topic_setter");
-				ci->last_topic_time = r.Get(i, "last_topic_time").is_number_only() ? convertTo<int>(r.Get(i, "last_topic_time")) : time(NULL);
+				ci->last_topic_time = r.Get(i, "last_topic_time").is_number_only() ? convertTo<int>(r.Get(i, "last_topic_time")) : Anope::CurTime;
 				ci->forbidby = r.Get(i, "forbidby");
 				ci->forbidreason = r.Get(i, "forbidreason");
 				ci->bantype = r.Get(i, "bantype").is_number_only() ? convertTo<int>(r.Get(i, "bantype")) : 2;
@@ -706,7 +704,7 @@ class DBMySQL : public Module
 				continue;
 			}
 
-			ci->AddAccess(nc, atoi(r.Get(i, "level").c_str()), r.Get(i, "creator"), (r.Get(i, "last_seen").is_pos_number_only() ? convertTo<time_t>(r.Get(i, "last_seen")) : time(NULL)));
+			ci->AddAccess(nc, atoi(r.Get(i, "level").c_str()), r.Get(i, "creator"), (r.Get(i, "last_seen").is_pos_number_only() ? convertTo<time_t>(r.Get(i, "last_seen")) : Anope::CurTime));
 		}
 
 		r = SQL->RunQuery("SELECT * FROM `anope_cs_akick`");
@@ -777,7 +775,7 @@ class DBMySQL : public Module
 			nr->password = r.Get(i, "passcode");
 			nr->password = r.Get(i, "password");
 			nr->email = r.Get(i, "email");
-			nr->requested = r.Get(i, "requested").is_pos_number_only() ? convertTo<time_t>(r.Get(i, "requested")) : time(NULL);
+			nr->requested = r.Get(i, "requested").is_pos_number_only() ? convertTo<time_t>(r.Get(i, "requested")) : Anope::CurTime;
 		}
 
 		r = SQL->RunQuery("SELECT * FROM `anope_ms_info`");
@@ -812,7 +810,7 @@ class DBMySQL : public Module
 				}
 				else
 					m->number = 1;
-				m->time = r.Get(i, "time").is_pos_number_only() ? convertTo<time_t>(r.Get(i, "time")) : time(NULL);
+				m->time = r.Get(i, "time").is_pos_number_only() ? convertTo<time_t>(r.Get(i, "time")) : Anope::CurTime;
 				m->text = r.Get(i, "text");
 
 				if (!r.Get(i, "flags").empty())
@@ -843,8 +841,8 @@ class DBMySQL : public Module
 				Anope::string host = r.Get(i, "host");
 				Anope::string by = r.Get(i, "by");
 				Anope::string reason = r.Get(i, "reason");
-				time_t seton = r.Get(i, "seton").is_pos_number_only() ? convertTo<time_t>(r.Get(i, "seton")) : time(NULL);
-				time_t expires = r.Get(i, "expires").is_pos_number_only() ? convertTo<time_t>(r.Get(i, "expires")) : time(NULL);
+				time_t seton = r.Get(i, "seton").is_pos_number_only() ? convertTo<time_t>(r.Get(i, "seton")) : Anope::CurTime;
+				time_t expires = r.Get(i, "expires").is_pos_number_only() ? convertTo<time_t>(r.Get(i, "expires")) : Anope::CurTime;
 
 				XLine *x = SGLine->Add(NULL, NULL, user + "@" + host, expires, reason);
 				if (x)
@@ -861,8 +859,8 @@ class DBMySQL : public Module
 			Anope::string mask = r.Get(i, "mask");
 			Anope::string by = r.Get(i, "xby");
 			Anope::string reason = r.Get(i, "reason");
-			time_t seton = r.Get(i, "seton").is_pos_number_only() ? convertTo<time_t>(r.Get(i, "seton")) : time(NULL);
-			time_t expires = r.Get(i, "expires").is_pos_number_only() ? convertTo<time_t>(r.Get(i, "expires")) : time(NULL);
+			time_t seton = r.Get(i, "seton").is_pos_number_only() ? convertTo<time_t>(r.Get(i, "seton")) : Anope::CurTime;
+			time_t expires = r.Get(i, "expires").is_pos_number_only() ? convertTo<time_t>(r.Get(i, "expires")) : Anope::CurTime;
 
 			XLine *x = NULL;
 			if (SNLine && r.Get(i, "type").equals_cs("SNLINE"))
@@ -1145,7 +1143,7 @@ class DBMySQL : public Module
 
 	void OnAccessAdd(ChannelInfo *ci, User *u, NickAlias *na, int level)
 	{
-		this->RunQuery("INSERT DELAYED INTO `anope_cs_access` (level, display, channel, last_seen, creator) VALUES (" + stringify(level) + ", '" + this->Escape(na->nc->display) + "', '" + this->Escape(ci->name) + "', " + stringify(time(NULL)) + ", '" + this->Escape(u->nick) + "')");
+		this->RunQuery("INSERT DELAYED INTO `anope_cs_access` (level, display, channel, last_seen, creator) VALUES (" + stringify(level) + ", '" + this->Escape(na->nc->display) + "', '" + this->Escape(ci->name) + "', " + stringify(Anope::CurTime) + ", '" + this->Escape(u->nick) + "')");
 	}
 
 	void OnAccessDel(ChannelInfo *ci, User *u, NickCore *nc)
@@ -1155,7 +1153,7 @@ class DBMySQL : public Module
 
 	void OnAccessChange(ChannelInfo *ci, User *u, NickAlias *na, int level)
 	{
-		this->RunQuery("INSERT DELAYED INTO `anope_cs_access` (level, display, channel, last_seen, creator) VALUES (" + stringify(level) + ", '" + this->Escape(na->nc->display) + "', '" + this->Escape(ci->name) + "', " + stringify(time(NULL)) + ", '" + this->Escape(u->nick) + "') ON DUPLICATE KEY UPDATE level=VALUES(level), display=VALUES(display), channel=VALUES(channel), last_seen=VALUES(last_seen), creator=VALUES(creator)");
+		this->RunQuery("INSERT DELAYED INTO `anope_cs_access` (level, display, channel, last_seen, creator) VALUES (" + stringify(level) + ", '" + this->Escape(na->nc->display) + "', '" + this->Escape(ci->name) + "', " + stringify(Anope::CurTime) + ", '" + this->Escape(u->nick) + "') ON DUPLICATE KEY UPDATE level=VALUES(level), display=VALUES(display), channel=VALUES(channel), last_seen=VALUES(last_seen), creator=VALUES(creator)");
 	}
 
 	void OnAccessClear(ChannelInfo *ci, User *u)
diff --git a/modules/extra/hs_request.cpp b/modules/extra/hs_request.cpp
index 9b1218113..edca02ade 100644
--- a/modules/extra/hs_request.cpp
+++ b/modules/extra/hs_request.cpp
@@ -84,7 +84,6 @@ class CommandHSRequest : public Command
 		Anope::string rawhostmask = params[0];
 		Anope::string hostmask;
 		NickAlias *na;
-		time_t now = time(NULL);