diff --git a/cp/app/Controllers/DomainsController.php b/cp/app/Controllers/DomainsController.php index 0641194..3741018 100644 --- a/cp/app/Controllers/DomainsController.php +++ b/cp/app/Controllers/DomainsController.php @@ -2314,6 +2314,12 @@ class DomainsController extends Controller } } $registrar_id = $data['registrar'] ?? null; + $registrars = $db->select("SELECT id, clid, name FROM registrar"); + if ($_SESSION["auth_roles"] != 0) { + $registrar = true; + } else { + $registrar = null; + } $authInfo = $data['authInfo'] ?? null; $transferYears = $data['transferYears'] ?? null; @@ -2575,6 +2581,11 @@ class DomainsController extends Controller $db = $this->container->get('db'); $registrars = $db->select("SELECT id, clid, name FROM registrar"); + if ($_SESSION["auth_roles"] != 0) { + $registrar = true; + } else { + $registrar = null; + } $locale = (isset($_SESSION['_lang']) && !empty($_SESSION['_lang'])) ? $_SESSION['_lang'] : 'en_US'; $currency = $_SESSION['_currency'] ?? 'USD'; // Default to USD if not set @@ -2591,6 +2602,7 @@ class DomainsController extends Controller // Default view for GET requests or if POST data is not set return view($response,'admin/domains/requestTransfer.twig', [ 'registrars' => $registrars, + 'registrar' => $registrar, 'currencySymbol' => $symbol, 'currencyPosition' => $position, 'currency' => $currency diff --git a/cp/resources/views/partials/js-transfers.twig b/cp/resources/views/partials/js-transfers.twig index c83b86c..f5ae1f0 100644 --- a/cp/resources/views/partials/js-transfers.twig +++ b/cp/resources/views/partials/js-transfers.twig @@ -21,13 +21,13 @@ const tableResponsive = document.querySelector('.table-responsive'); const clidValue = atob(tableResponsive.dataset.ref); - if (hasPendingStatus && clidValue === '0') { + if (hasPendingStatus && clidValue == '0') { actionButtons += ` `; actionButtons += ` `; actionButtons += ``; - } else if (clidValue === rowData.reid) { + } else if (clidValue == rowData.reid) { actionButtons += ` `; - } else if (clidValue === rowData.acid) { + } else if (clidValue == rowData.acid) { actionButtons += ` `; actionButtons += ``; } else { diff --git a/cp/routes/web.php b/cp/routes/web.php index a312bcf..f26b187 100644 --- a/cp/routes/web.php +++ b/cp/routes/web.php @@ -252,7 +252,15 @@ $app->any('/api[/{params:.*}]', function ( 'users_audit' => 'user_id', // Continues to use user_id ]; + // Check if the special filter condition for the domain table is met + $isSpecialDomainRequest = $tableName === 'domain' && isset($_GET['filter']) && $_GET['filter'] === 'trstatus,nis'; + if (array_key_exists($tableName, $columnMap)) { + // If it's a special domain request, bypass the usual filtering + if ($isSpecialDomainRequest) { + return []; + } + // Use registrarId for tables where 'registrar_id' is the filter // For 'support_tickets' and 'users_audit', use userId return [$columnMap[$tableName] => (in_array($tableName, ['support_tickets', 'users_audit']) ? $_SESSION['auth_user_id'] : $registrarId)];