From f00e76d30a86acf0f18bcde5647eedd50de50569 Mon Sep 17 00:00:00 2001 From: Adam Date: Fri, 10 Sep 2010 20:31:31 -0400 Subject: Added Anope::CurTime to keep us from calling time() everywhere --- modules/extra/cs_appendtopic.cpp | 2 +- modules/extra/db_mysql.cpp | 36 +++++++++++++++++------------------- modules/extra/hs_request.cpp | 7 +++---- modules/extra/m_dnsbl.cpp | 2 +- 4 files changed, 22 insertions(+), 25 deletions(-) (limited to 'modules/extra') 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(r.Get(i, "time_registered")) : time(NULL); - na->last_seen = r.Get(i, "last_seen").is_pos_number_only() ? convertTo(r.Get(i, "last_seen")) : time(NULL); + na->time_registered = r.Get(i, "time_registered").is_pos_number_only() ? convertTo(r.Get(i, "time_registered")) : Anope::CurTime; + na->last_seen = r.Get(i, "last_seen").is_pos_number_only() ? convertTo(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(r.Get(i, "creeated")) : time(NULL); + bi->created = r.Get(i, "created").is_pos_number_only() ? convertTo(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(r.Get(i, "time_registered")) : time(NULL); - ci->last_used = r.Get(i, "last_used").is_pos_number_only() ? convertTo(r.Get(i, "last_used")) : time(NULL); + ci->time_registered = r.Get(i, "time_registered").is_pos_number_only() ? convertTo(r.Get(i, "time_registered")) : Anope::CurTime; + ci->last_used = r.Get(i, "last_used").is_pos_number_only() ? convertTo(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(r.Get(i, "last_topic_time")) : time(NULL); + ci->last_topic_time = r.Get(i, "last_topic_time").is_number_only() ? convertTo(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(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(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(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(r.Get(i, "requested")) : time(NULL); + nr->requested = r.Get(i, "requested").is_pos_number_only() ? convertTo(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(r.Get(i, "time")) : time(NULL); + m->time = r.Get(i, "time").is_pos_number_only() ? convertTo(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(r.Get(i, "seton")) : time(NULL); - time_t expires = r.Get(i, "expires").is_pos_number_only() ? convertTo(r.Get(i, "expires")) : time(NULL); + time_t seton = r.Get(i, "seton").is_pos_number_only() ? convertTo(r.Get(i, "seton")) : Anope::CurTime; + time_t expires = r.Get(i, "expires").is_pos_number_only() ? convertTo(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(r.Get(i, "seton")) : time(NULL); - time_t expires = r.Get(i, "expires").is_pos_number_only() ? convertTo(r.Get(i, "expires")) : time(NULL); + time_t seton = r.Get(i, "seton").is_pos_number_only() ? convertTo(r.Get(i, "seton")) : Anope::CurTime; + time_t expires = r.Get(i, "expires").is_pos_number_only() ? convertTo(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); Anope::string vIdent = myStrGetToken(rawhostmask, '@', 0); /* Get the first substring, @ as delimiter */ if (!vIdent.empty()) @@ -129,13 +128,13 @@ class CommandHSRequest : public Command if ((na = findnick(nick))) { - if ((HSRequestMemoOper || HSRequestMemoSetters) && Config->MSSendDelay > 0 && u && u->lastmemosend + Config->MSSendDelay > now) + if ((HSRequestMemoOper || HSRequestMemoSetters) && Config->MSSendDelay > 0 && u && u->lastmemosend + Config->MSSendDelay > Anope::CurTime) { me->NoticeLang(Config->s_HostServ, u, LNG_REQUEST_WAIT, Config->MSSendDelay); - u->lastmemosend = now; + u->lastmemosend = Anope::CurTime; return MOD_CONT; } - my_add_host_request(nick, vIdent, hostmask, u->nick, now); + my_add_host_request(nick, vIdent, hostmask, u->nick, Anope::CurTime); me->NoticeLang(Config->s_HostServ, u, LNG_REQUESTED); req_send_memos(u, vIdent, hostmask); diff --git a/modules/extra/m_dnsbl.cpp b/modules/extra/m_dnsbl.cpp index ac95c5e30..a72e8ac3b 100644 --- a/modules/extra/m_dnsbl.cpp +++ b/modules/extra/m_dnsbl.cpp @@ -32,7 +32,7 @@ class DNSBLResolver : public DNSRequest reason = reason.replace_all_ci("%i", user->ip.addr()); reason = reason.replace_all_ci("%h", user->host); - XLine *x = SGLine->Add(NULL, NULL, Anope::string("*@") + user->host, time(NULL) + this->blacklist.bantime, reason); + XLine *x = SGLine->Add(NULL, NULL, Anope::string("*@") + user->host, Anope::CurTime + this->blacklist.bantime, reason); if (x) { static Command command_akill("AKILL", 0); -- cgit