zydronium/getnamingo-registry
1
0
Fork 0
mirror of https://github.com/getnamingo/registry.git synced 2025-08-15 05:43:55 +02:00
Code Issues Projects Releases Packages Wiki Activity

Work on multiple roles and per registrar currency

Browse source
This commit is contained in:
Pinga 2025-02-06 11:26:18 +02:00
parent 503cb53f45
commit 88277bdc95
2 changed files with 61 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

51
cp/bootstrap/app.php
View file

@ -154,30 +154,61 @@ $container->set('view', function ($container) {
if (isset($_SESSION['auth_roles'])) { if (isset($_SESSION['auth_roles'])) {
$view->getEnvironment()->addGlobal('roles', $_SESSION['auth_roles']); $view->getEnvironment()->addGlobal('roles', $_SESSION['auth_roles']);
} }
$view->getEnvironment()->addFunction(new TwigFunction('has_any_role', function (int $userRoles, array $requiredRoles): bool {
foreach ($requiredRoles as $role) {
if (($userRoles & $role) !== 0) {
return true;
}
}
return false;
}));
// Fetch registrar currency and registry default currency
$db = $container->get('db'); $db = $container->get('db');
$user_data = 'SELECT ru.registrar_id $user_data = "SELECT
ru.registrar_id,
r.currency AS registrar_currency,
(SELECT value FROM settings WHERE name = 'currency') AS registry_currency
FROM registrar_users ru FROM registrar_users ru
JOIN registrar r ON ru.registrar_id = r.id LEFT JOIN registrar r ON ru.registrar_id = r.id
WHERE ru.user_id = ?'; WHERE ru.user_id = ?
$currency_data = "SELECT value FROM settings WHERE name = 'currency'"; LIMIT 1"; // Ensure we get only one row for optimization
if (isset($_SESSION['auth_user_id'])) { if (isset($_SESSION['auth_user_id'])) {
$result = $db->select($user_data, [$_SESSION['auth_user_id']]); $result = $db->select($user_data, [$_SESSION['auth_user_id']]);
$db_currency = $db->select($currency_data);
$_SESSION['_currency'] = $db_currency[0]['value']; $_SESSION['auth_registrar_id'] = null; // Default to null
$_SESSION['auth_registrar_id'] = null; // Default registrar_id $_SESSION['_currency'] = null; // Ensure it's explicitly handled
$_SESSION['registry_currency'] = null;
if ($result !== null && count($result) > 0) { if (!empty($result)) {
if (isset($result[0]['registrar_id'])) {
$_SESSION['auth_registrar_id'] = $result[0]['registrar_id']; $_SESSION['auth_registrar_id'] = $result[0]['registrar_id'];
$_SESSION['registry_currency'] = $result[0]['registry_currency']; // Registry currency (if available)
} }
// Ensure registry currency is always set
if (empty($_SESSION['registry_currency'])) {
// Only fetch settings currency separately if needed
$default_currency = $db->select("SELECT value FROM settings WHERE name = 'currency'");
$_SESSION['registry_currency'] = $default_currency[0]['value'] ?? 'USD';
}
// Apply currency logic
if (!empty($_SESSION['auth_roles']) && $_SESSION['auth_roles'] != 0) {
// Use registrar's currency if set, else fallback to registry currency
$_SESSION['_currency'] = $result[0]['registrar_currency'] ?? $_SESSION['registry_currency'];
} else {
// If auth_roles == 0 (admin), force registry currency
$_SESSION['_currency'] = $_SESSION['registry_currency'];
} }
} }
$currency = isset($_SESSION['_currency']) ? $_SESSION['_currency'] : 'USD'; // Ensure currency is set (last fallback to 'USD')
$currency = $_SESSION['_currency'] ?? 'USD';
// Make it accessible in templates
$view->getEnvironment()->addGlobal('currency', $currency); $view->getEnvironment()->addGlobal('currency', $currency);
$view->getEnvironment()->addGlobal('registry_currency', $_SESSION['registry_currency']);
// Check if the user is impersonated from the admin, otherwise default to false // Check if the user is impersonated from the admin, otherwise default to false
$isAdminImpersonation = isset($_SESSION['impersonator']) ? $_SESSION['impersonator'] : false; $isAdminImpersonation = isset($_SESSION['impersonator']) ? $_SESSION['impersonator'] : false;

17
cp/bootstrap/helper.php
View file

@ -657,3 +657,20 @@ function checkPasswordRenewal($lastPasswordUpdateTimestamp) {
} }
return null; return null;
} }
function hasRequiredRole(int $userRoles, int $requiredRole): bool {
return ($userRoles & $requiredRole) !== 0;
}
function lacksRoles(int $userRoles, int ...$excludedRoles): bool {
foreach ($excludedRoles as $role) {
if (($userRoles & $role) !== 0) {
return false; // User has at least one of the excluded roles
}
}
return true; // User lacks all specified roles
}
function hasOnlyRole(int $userRoles, int $specificRole): bool {
return $userRoles === $specificRole;
}