From ad3524174350633c25dc8a4e5ffbb7066c4b8cba Mon Sep 17 00:00:00 2001 From: w00t Date: Sun, 21 Sep 2008 12:56:03 +0000 Subject: Be consistent. Use ServerInstance in all places instead of 'Instance' in half. This has bugged me forever :p. I think I got all of extra/ too.. git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@10579 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/modules/m_spanningtree/motd.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'src/modules/m_spanningtree/motd.cpp') diff --git a/src/modules/m_spanningtree/motd.cpp b/src/modules/m_spanningtree/motd.cpp index 6ec09c5fd..f16e3c29e 100644 --- a/src/modules/m_spanningtree/motd.cpp +++ b/src/modules/m_spanningtree/motd.cpp @@ -27,11 +27,11 @@ bool TreeSocket::Motd(const std::string &prefix, std::deque ¶ms { if (params.size() > 0) { - if (InspIRCd::Match(this->Instance->Config->ServerName, params[0])) + if (InspIRCd::Match(this->ServerInstance->Config->ServerName, params[0])) { /* It's for our server */ string_list results; - User* source = this->Instance->FindNick(prefix); + User* source = this->ServerInstance->FindNick(prefix); if (source) { @@ -39,30 +39,30 @@ bool TreeSocket::Motd(const std::string &prefix, std::deque ¶ms par.push_back(prefix); par.push_back(""); - if (!Instance->Config->MOTD.size()) + if (!ServerInstance->Config->MOTD.size()) { - par[1] = std::string("::")+Instance->Config->ServerName+" 422 "+source->nick+" :Message of the day file is missing."; - Utils->DoOneToOne(this->Instance->Config->GetSID(), "PUSH",par, source->server); + par[1] = std::string("::")+ServerInstance->Config->ServerName+" 422 "+source->nick+" :Message of the day file is missing."; + Utils->DoOneToOne(this->ServerInstance->Config->GetSID(), "PUSH",par, source->server); return true; } - par[1] = std::string("::")+Instance->Config->ServerName+" 375 "+source->nick+" :"+Instance->Config->ServerName+" message of the day"; - Utils->DoOneToOne(this->Instance->Config->GetSID(), "PUSH",par, source->server); + par[1] = std::string("::")+ServerInstance->Config->ServerName+" 375 "+source->nick+" :"+ServerInstance->Config->ServerName+" message of the day"; + Utils->DoOneToOne(this->ServerInstance->Config->GetSID(), "PUSH",par, source->server); - for (unsigned int i = 0; i < Instance->Config->MOTD.size(); i++) + for (unsigned int i = 0; i < ServerInstance->Config->MOTD.size(); i++) { - par[1] = std::string("::")+Instance->Config->ServerName+" 372 "+source->nick+" :- "+Instance->Config->MOTD[i]; - Utils->DoOneToOne(this->Instance->Config->GetSID(), "PUSH",par, source->server); + par[1] = std::string("::")+ServerInstance->Config->ServerName+" 372 "+source->nick+" :- "+ServerInstance->Config->MOTD[i]; + Utils->DoOneToOne(this->ServerInstance->Config->GetSID(), "PUSH",par, source->server); } - par[1] = std::string("::")+Instance->Config->ServerName+" 376 "+source->nick+" :End of message of the day."; - Utils->DoOneToOne(this->Instance->Config->GetSID(), "PUSH",par, source->server); + par[1] = std::string("::")+ServerInstance->Config->ServerName+" 376 "+source->nick+" :End of message of the day."; + Utils->DoOneToOne(this->ServerInstance->Config->GetSID(), "PUSH",par, source->server); } } else { /* Pass it on */ - User* source = this->Instance->FindNick(prefix); + User* source = this->ServerInstance->FindNick(prefix); if (source) Utils->DoOneToOne(prefix, "MOTD", params, params[0]); } -- cgit v1.3.1-10-gc9f91