From 5fd2d0ee3e136e01926f21edc759a4ab9fd48806 Mon Sep 17 00:00:00 2001 From: Adam Date: Sun, 9 Oct 2016 12:00:15 -0400 Subject: Split vhosts into its own structure --- modules/webcpanel/pages/nickserv/info.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'modules/webcpanel/pages/nickserv/info.cpp') diff --git a/modules/webcpanel/pages/nickserv/info.cpp b/modules/webcpanel/pages/nickserv/info.cpp index f3c353044..7b0f5d64f 100644 --- a/modules/webcpanel/pages/nickserv/info.cpp +++ b/modules/webcpanel/pages/nickserv/info.cpp @@ -100,13 +100,16 @@ bool WebCPanel::NickServ::Info::OnRequest(HTTPProvider *server, const Anope::str if (na->GetAccount()->GetEmail().empty() == false) replacements["EMAIL"] = HTTPUtils::Escape(na->GetAccount()->GetEmail()); replacements["TIME_REGISTERED"] = Anope::strftime(na->GetTimeRegistered(), na->GetAccount()); - if (na->HasVhost()) + + ::HostServ::VHost *vhost = na->GetVHost(); + if (vhost != nullptr) { - if (na->GetVhostIdent().empty() == false) - replacements["VHOST"] = na->GetVhostIdent() + "@" + na->GetVhostHost(); + if (vhost->GetIdent().empty() == false) + replacements["VHOST"] = vhost->GetIdent() + "@" + vhost->GetHost(); else - replacements["VHOST"] = na->GetVhostHost(); + replacements["VHOST"] = vhost->GetHost(); } + Anope::string *greet = na->GetAccount()->GetExt("greet"); if (greet) replacements["GREET"] = HTTPUtils::Escape(*greet); -- cgit