diff options
Diffstat (limited to 'modules/webcpanel')
-rw-r--r-- | modules/webcpanel/pages/hostserv/request.cpp | 7 | ||||
-rw-r--r-- | modules/webcpanel/pages/nickserv/info.cpp | 7 |
2 files changed, 4 insertions, 10 deletions
diff --git a/modules/webcpanel/pages/hostserv/request.cpp b/modules/webcpanel/pages/hostserv/request.cpp index dc782361c..92f01f010 100644 --- a/modules/webcpanel/pages/hostserv/request.cpp +++ b/modules/webcpanel/pages/hostserv/request.cpp @@ -33,13 +33,10 @@ bool WebCPanel::HostServ::Request::OnRequest(HTTPProvider *server, const Anope:: WebPanel::RunCommand(na->GetAccount()->GetDisplay(), na->GetAccount(), "HostServ", "hostserv/request", params, replacements, "CMDR"); } - ::HostServ::VHost *vhost = na->GetVHost(); + ::HostServ::VHost *vhost = ::HostServ::FindVHost(na->GetAccount()); if (vhost != nullptr) { - if (vhost->GetIdent().empty() == false) - replacements["VHOST"] = vhost->GetIdent() + "@" + vhost->GetHost(); - else - replacements["VHOST"] = vhost->GetHost(); + replacements["VHOST"] = vhost->Mask(); } if (ServiceReference<Command>("hostserv/request")) replacements["CAN_REQUEST"] = "YES"; diff --git a/modules/webcpanel/pages/nickserv/info.cpp b/modules/webcpanel/pages/nickserv/info.cpp index 7b0f5d64f..5dc9eed03 100644 --- a/modules/webcpanel/pages/nickserv/info.cpp +++ b/modules/webcpanel/pages/nickserv/info.cpp @@ -101,13 +101,10 @@ bool WebCPanel::NickServ::Info::OnRequest(HTTPProvider *server, const Anope::str replacements["EMAIL"] = HTTPUtils::Escape(na->GetAccount()->GetEmail()); replacements["TIME_REGISTERED"] = Anope::strftime(na->GetTimeRegistered(), na->GetAccount()); - ::HostServ::VHost *vhost = na->GetVHost(); + ::HostServ::VHost *vhost = ::HostServ::FindVHost(na->GetAccount()); if (vhost != nullptr) { - if (vhost->GetIdent().empty() == false) - replacements["VHOST"] = vhost->GetIdent() + "@" + vhost->GetHost(); - else - replacements["VHOST"] = vhost->GetHost(); + replacements["VHOST"] = vhost->Mask(); } Anope::string *greet = na->GetAccount()->GetExt<Anope::string>("greet"); |