diff options
Diffstat (limited to 'modules/extra')
| -rw-r--r-- | modules/extra/m_ldap_authentication.cpp | 2 | ||||
| -rw-r--r-- | modules/extra/m_ldap_oper.cpp | 2 | ||||
| -rw-r--r-- | modules/extra/m_sql_oper.cpp | 2 | ||||
| -rw-r--r-- | modules/extra/stats/irc2sql/irc2sql.cpp | 4 | ||||
| -rw-r--r-- | modules/extra/stats/m_chanstats.cpp | 6 |
5 files changed, 8 insertions, 8 deletions
diff --git a/modules/extra/m_ldap_authentication.cpp b/modules/extra/m_ldap_authentication.cpp index 5340038dd..1d44c807f 100644 --- a/modules/extra/m_ldap_authentication.cpp +++ b/modules/extra/m_ldap_authentication.cpp @@ -143,7 +143,7 @@ class OnIdentifyInterface : public LDAPInterface { User *u = User::Find(uid); - if (!u || !u->Account() || r.empty()) + if (!u || !u->IsIdentified() || r.empty()) return; try diff --git a/modules/extra/m_ldap_oper.cpp b/modules/extra/m_ldap_oper.cpp index 469b3dd84..de6af45c1 100644 --- a/modules/extra/m_ldap_oper.cpp +++ b/modules/extra/m_ldap_oper.cpp @@ -23,7 +23,7 @@ class IdentifyInterface : public LDAPInterface void OnResult(const LDAPResult &r) anope_override { - if (!u || !u->Account()) + if (!u || !u->IsIdentified()) return; NickCore *nc = u->Account(); diff --git a/modules/extra/m_sql_oper.cpp b/modules/extra/m_sql_oper.cpp index 4bc75ac7b..d0cb48ff5 100644 --- a/modules/extra/m_sql_oper.cpp +++ b/modules/extra/m_sql_oper.cpp @@ -46,7 +46,7 @@ class SQLOperResult : public SQL::Interface { SQLOperResultDeleter d(this); - if (!user || !user->Account()) + if (!user || !user->IsIdentified()) return; if (r.Rows() == 0) diff --git a/modules/extra/stats/irc2sql/irc2sql.cpp b/modules/extra/stats/irc2sql/irc2sql.cpp index 8377c5d2e..391fad050 100644 --- a/modules/extra/stats/irc2sql/irc2sql.cpp +++ b/modules/extra/stats/irc2sql/irc2sql.cpp @@ -108,7 +108,7 @@ void IRC2SQL::OnUserConnect(User *u, bool &exempt) query.SetValue("ident", u->GetIdent()); query.SetValue("vident", u->GetVIdent()); query.SetValue("secure", u->HasMode("SSL") || u->HasExt("ssl") ? "Y" : "N"); - query.SetValue("account", u->Account() ? u->Account()->display : ""); + query.SetValue("account", u->IsIdentified() ? u->Account()->display : ""); query.SetValue("fingerprint", u->fingerprint); query.SetValue("signon", u->signon); query.SetValue("server", u->server->GetName()); @@ -176,7 +176,7 @@ void IRC2SQL::OnUserLogin(User *u) { query = "UPDATE `" + prefix + "user` SET account=@account@ WHERE nick=@nick@"; query.SetValue("nick", u->nick); - query.SetValue("account", u->Account() ? u->Account()->display : ""); + query.SetValue("account", u->IsIdentified() ? u->Account()->display : ""); this->RunQuery(query); } diff --git a/modules/extra/stats/m_chanstats.cpp b/modules/extra/stats/m_chanstats.cpp index cccf4021b..f5b01dde0 100644 --- a/modules/extra/stats/m_chanstats.cpp +++ b/modules/extra/stats/m_chanstats.cpp @@ -207,7 +207,7 @@ class MChanstats : public Module const Anope::string GetDisplay(User *u) { - if (u && u->Account() && ns_stats.HasExt(u->Account())) + if (u && u->IsIdentified() && ns_stats.HasExt(u->Account())) return u->Account()->display; else return ""; @@ -527,7 +527,7 @@ class MChanstats : public Module void OnTopicUpdated(User *source, Channel *c, const Anope::string &user, const Anope::string &topic) anope_override { - if (!source || !source->Account() || !c->ci || !cs_stats.HasExt(c->ci)) + if (!source || !source->IsIdentified() || !c->ci || !cs_stats.HasExt(c->ci)) return; query = "CALL " + prefix + "chanstats_proc_update(@channel@, @nick@, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1);"; query.SetValue("channel", c->name); @@ -550,7 +550,7 @@ class MChanstats : public Module private: void OnModeChange(Channel *c, User *u) { - if (!u || !u->Account() || !c->ci || !cs_stats.HasExt(c->ci)) + if (!u || !u->IsIdentified() || !c->ci || !cs_stats.HasExt(c->ci)) return; query = "CALL " + prefix + "chanstats_proc_update(@channel@, @nick@, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0);"; |