zydronium/getnamingo-registry
1
0
Fork 0
mirror of https://github.com/getnamingo/registry.git synced 2025-05-17 10:06:59 +02:00
Code Issues Projects Releases Packages Wiki Activity

Additional formatting in panel for IDN domains

Browse source
This commit is contained in:
Pinga 2024-01-25 10:05:33 +02:00
parent e64cd1de7a
commit 4799d57f77
3 changed files with 17 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
cp/app/Controllers/DomainsController.php
View file

@ -976,6 +976,9 @@ class DomainsController extends Controller
WHERE dcm.domain_id = ?'; WHERE dcm.domain_id = ?';
$domainContacts = $db->select($domainContactsQuery, [$domain['id']]); $domainContacts = $db->select($domainContactsQuery, [$domain['id']]);
if (strpos($domain['name'], 'xn--') === 0) {
$domain['name'] = idn_to_utf8($domain['name'], IDNA_NONTRANSITIONAL_TO_ASCII, INTL_IDNA_VARIANT_UTS46);
}
return view($response,'admin/domains/viewDomain.twig', [ return view($response,'admin/domains/viewDomain.twig', [
'domain' => $domain, 'domain' => $domain,
'domainStatus' => $domainStatus, 'domainStatus' => $domainStatus,
@ -1064,6 +1067,9 @@ class DomainsController extends Controller
$csrfTokenName = $this->container->get('csrf')->getTokenName(); $csrfTokenName = $this->container->get('csrf')->getTokenName();
$csrfTokenValue = $this->container->get('csrf')->getTokenValue(); $csrfTokenValue = $this->container->get('csrf')->getTokenValue();
if (strpos($domain['name'], 'xn--') === 0) {
$domain['name'] = idn_to_utf8($domain['name'], IDNA_NONTRANSITIONAL_TO_ASCII, INTL_IDNA_VARIANT_UTS46);
}
return view($response,'admin/domains/updateDomain.twig', [ return view($response,'admin/domains/updateDomain.twig', [
'domain' => $domain, 'domain' => $domain,
'domainStatus' => $domainStatus, 'domainStatus' => $domainStatus,
@ -1889,6 +1895,10 @@ class DomainsController extends Controller
// Determine currency position (before or after) // Determine currency position (before or after)
$position = (strpos($pattern, '¤') < strpos($pattern, '#')) ? 'before' : 'after'; $position = (strpos($pattern, '¤') < strpos($pattern, '#')) ? 'before' : 'after';
if (strpos($domain['name'], 'xn--') === 0) {
$domain['punycode'] = $domain['name'];
$domain['name'] = idn_to_utf8($domain['name'], IDNA_NONTRANSITIONAL_TO_ASCII, INTL_IDNA_VARIANT_UTS46);
}
return view($response,'admin/domains/renewDomain.twig', [ return view($response,'admin/domains/renewDomain.twig', [
'domain' => $domain, 'domain' => $domain,
'domainStatus' => $domainStatus, 'domainStatus' => $domainStatus,

6
cp/app/Controllers/HostsController.php
View file

@ -288,6 +288,9 @@ class HostsController extends Controller
$hostIPv6 = $db->select("SELECT addr FROM host_addr WHERE host_id = ? AND ip = 'v6'", $hostIPv6 = $db->select("SELECT addr FROM host_addr WHERE host_id = ? AND ip = 'v6'",
[ $host['id'] ]); [ $host['id'] ]);
if (strpos($host['name'], 'xn--') === 0) {
$host['name'] = idn_to_utf8($host['name'], IDNA_NONTRANSITIONAL_TO_ASCII, INTL_IDNA_VARIANT_UTS46);
}
return view($response,'admin/hosts/viewHost.twig', [ return view($response,'admin/hosts/viewHost.twig', [
'host' => $host, 'host' => $host,
'hostStatus' => $hostStatus, 'hostStatus' => $hostStatus,
@ -382,6 +385,9 @@ class HostsController extends Controller
$hostIPv6 = $db->select("SELECT addr FROM host_addr WHERE host_id = ? AND ip = 'v6'", $hostIPv6 = $db->select("SELECT addr FROM host_addr WHERE host_id = ? AND ip = 'v6'",
[ $host['id'] ]); [ $host['id'] ]);
if (strpos($host['name'], 'xn--') === 0) {
$host['name'] = idn_to_utf8($host['name'], IDNA_NONTRANSITIONAL_TO_ASCII, INTL_IDNA_VARIANT_UTS46);
}
return view($response,'admin/hosts/updateHost.twig', [ return view($response,'admin/hosts/updateHost.twig', [
'host' => $host, 'host' => $host,
'hostIPv4' => $hostIPv4, 'hostIPv4' => $hostIPv4,

2
cp/resources/views/admin/domains/renewDomain.twig
View file

@ -31,7 +31,7 @@
{{ csrf.field | raw }}{% endif %} {{ csrf.field | raw }}{% endif %}
<div class="mb-3"> <div class="mb-3">
<label for="domainName" class="form-label">{{ __('Domain Name') }}</label> <label for="domainName" class="form-label">{{ __('Domain Name') }}</label>
<div class="form-control-plaintext">{{ domain.name }}</div><input type="hidden" name="domainName" id="domainName" value="{{ domain.name }}"> <div class="form-control-plaintext">{{ domain.name }}</div><input type="hidden" name="domainName" id="domainName" value="{{ domain.punycode }}">
</div> </div>
{% if maxYears >= 1 %} {% if maxYears >= 1 %}