diff options
| author | Sadie Powell <sadie@witchery.services> | 2024-03-04 10:36:10 +0000 |
|---|---|---|
| committer | Sadie Powell <sadie@witchery.services> | 2024-03-04 10:36:10 +0000 |
| commit | db4f845fe78f82bca4bdb9e44cc785a5a3947d37 (patch) | |
| tree | 63f1b943fe2baa3f1fbfbabaa63bf805803b3e8c /modules/webcpanel | |
| parent | d15ac93a8f5fb5c939807807be52108f7d49f8ed (diff) | |
Add NickAlias::GetVhostMask for getting the vident@vhost.
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, 2 insertions, 12 deletions
diff --git a/modules/webcpanel/pages/hostserv/request.cpp b/modules/webcpanel/pages/hostserv/request.cpp index 373686600..0a8513c76 100644 --- a/modules/webcpanel/pages/hostserv/request.cpp +++ b/modules/webcpanel/pages/hostserv/request.cpp @@ -22,12 +22,7 @@ bool WebCPanel::HostServ::Request::OnRequest(HTTPProvider *server, const Anope:: } if (na->HasVhost()) - { - if (!na->GetVhostIdent().empty()) - replacements["VHOST"] = na->GetVhostIdent() + "@" + na->GetVhostHost(); - else - replacements["VHOST"] = na->GetVhostHost(); - } + replacements["VHOST"] = na->GetVhostMask(); if (ServiceReference<Command>("Command", "hostserv/request")) replacements["CAN_REQUEST"] = "YES"; TemplateFileServer page("hostserv/request.html"); diff --git a/modules/webcpanel/pages/nickserv/info.cpp b/modules/webcpanel/pages/nickserv/info.cpp index 54b9c75c5..6a47e541c 100644 --- a/modules/webcpanel/pages/nickserv/info.cpp +++ b/modules/webcpanel/pages/nickserv/info.cpp @@ -81,12 +81,7 @@ bool WebCPanel::NickServ::Info::OnRequest(HTTPProvider *server, const Anope::str replacements["EMAIL"] = na->nc->email; replacements["TIME_REGISTERED"] = Anope::strftime(na->time_registered, na->nc); if (na->HasVhost()) - { - if (!na->GetVhostIdent().empty()) - replacements["VHOST"] = na->GetVhostIdent() + "@" + na->GetVhostHost(); - else - replacements["VHOST"] = na->GetVhostHost(); - } + replacements["VHOST"] = na->GetVhostMask(); Anope::string *greet = na->nc->GetExt<Anope::string>("greet"); if (greet) replacements["GREET"] = *greet; |