From 02ead21857c1470e415016cc95602bc4940bc188 Mon Sep 17 00:00:00 2001 From: Pinga <121483313+getpinga@users.noreply.github.com> Date: Wed, 14 Feb 2024 13:48:33 +0200 Subject: [PATCH] Couple of UI bugs fixed --- cp/app/Controllers/SystemController.php | 10 +++++++++- cp/app/Lib/Mail.php | 2 ++ cp/env-sample | 2 +- cp/resources/views/admin/system/createTld.twig | 8 -------- cp/resources/views/admin/system/manageTld.twig | 10 +++++----- cp/resources/views/partials/js-users.twig | 14 +++++++------- 6 files changed, 24 insertions(+), 22 deletions(-) diff --git a/cp/app/Controllers/SystemController.php b/cp/app/Controllers/SystemController.php index 1c22e16..291e39d 100644 --- a/cp/app/Controllers/SystemController.php +++ b/cp/app/Controllers/SystemController.php @@ -247,7 +247,6 @@ class SystemController extends Controller $validators = [ 'extension' => v::stringType()->notEmpty()->length(3, 64), - 'tldType' => v::stringType()->notEmpty(), 'script' => v::stringType()->notEmpty(), 'createm0' => v::numericVal()->between(0.00, 9999999.99, true), 'createm12' => v::numericVal()->between(0.00, 9999999.99, true), @@ -879,8 +878,17 @@ class SystemController extends Controller $scriptName = 'Unknown'; // Default or fallback script name } + if (strpos(strtolower($tld['tld']), '.xn--') === 0) { + $tld['tld'] = ltrim($tld['tld'], '.'); + $tld_u = '.'.idn_to_utf8($tld['tld'], 0, INTL_IDNA_VARIANT_UTS46); + $tld['tld'] = '.'.$tld['tld']; + } else { + $tld_u = $tld['tld']; + } + return view($response,'admin/system/manageTld.twig', [ 'tld' => $tld, + 'tld_u' => $tld_u, 'scriptName' => $scriptName, 'createPrices' => $createPrices, 'renewPrices' => $renewPrices, diff --git a/cp/app/Lib/Mail.php b/cp/app/Lib/Mail.php index 38a8639..f1d6cb4 100644 --- a/cp/app/Lib/Mail.php +++ b/cp/app/Lib/Mail.php @@ -60,6 +60,8 @@ class Mail echo "Message could not be sent. Mailer Error: {$mail->ErrorInfo}"; return false; } + } else { + return true; } } } \ No newline at end of file diff --git a/cp/env-sample b/cp/env-sample index 4767cca..142c645 100644 --- a/cp/env-sample +++ b/cp/env-sample @@ -13,7 +13,7 @@ DB_PORT=3306 #mailer settings (Driver = smtp or utopia, Api Provder = sendgrid or mailgun) -MAIL_DRIVER=smtp +MAIL_DRIVER=none MAIL_HOST=smtp.mailtrap.io MAIL_PORT=2525 MAIL_USERNAME=username diff --git a/cp/resources/views/admin/system/createTld.twig b/cp/resources/views/admin/system/createTld.twig index 59a86f2..0817858 100644 --- a/cp/resources/views/admin/system/createTld.twig +++ b/cp/resources/views/admin/system/createTld.twig @@ -44,14 +44,6 @@ {{ __('DNSSEC is currently activated manually. This option is for display purposes only.') }} -
- - - {{ __('Select the type of TLD: ccTLD (Country Code Top-Level Domain) or gTLD (Generic Top-Level Domain).') }} -
@@ -45,7 +45,7 @@
-
ccTLD/gTLD
+
{{ tld_u|length == 3 ? 'ccTLD' : (tld_u|length > 3 ? 'gTLD' : '') }}
@@ -141,7 +141,7 @@ - {{ __('Please upload a CSV file containing premium names. Each row should include a name and its corresponding pricing category, separated by a comma. Note: If one or more names in the file already exist in our system, they will be overwritten with the new information provided in the upload.') }} + {{ __('Please upload a CSV file containing premium names. Each row should include a name and its corresponding pricing category, separated by a comma. Note: If one or more names in the file already exist in our system, they will be overwritten with the new information provided in the upload.') }}
@@ -184,7 +184,7 @@
- +
diff --git a/cp/resources/views/partials/js-users.twig b/cp/resources/views/partials/js-users.twig index 23f1604..be6deb5 100644 --- a/cp/resources/views/partials/js-users.twig +++ b/cp/resources/views/partials/js-users.twig @@ -23,9 +23,9 @@ function roleLabelFormatter(cell) { var value = cell.getValue(); if (value === 0) { - return 'Administrator'; + return 'Administrator'; } else if (value === 4) { - return 'Registrar'; + return 'Registrar'; } return value; // If the value is neither 0 nor 4, return it as is } @@ -33,11 +33,11 @@ function verifiedFormatter(cell) { var value = cell.getValue(); if (value === false) { - return 'Pending'; + return 'Pending'; } else if (value === true) { - return 'ok'; + return 'ok'; } else { - return '?'; + return '?'; } return value; } @@ -45,9 +45,9 @@ function statusBadgeFormatter(cell) { var value = cell.getValue(); if (value === 0) { - return 'ok'; + return 'ok'; } else { - return 'Trouble'; + return 'Trouble'; } }