lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-16 01:24:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

System: Access: Users - change isset() to !empty() for disabled status in preperation for https://github.com/opnsense/core/issues/7904

Browse Source
This commit is contained in:
Ad Schellevis 2024-10-24 19:36:21 +02:00
parent 9e01cc3191
commit 85bde6565c
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/etc/inc/auth.inc
View File

@ -328,7 +328,7 @@ function local_user_set(&$user, $force_password = false, $userattrs = null)
$is_expired = !empty($user['expires']) &&
strtotime('-1 day') > strtotime(date('m/d/Y', strtotime($user['expires'])));
$is_disabled = isset($user['disabled']);
$is_disabled = !empty($user['disabled']);
$is_unlocked = !$is_disabled && !$is_expired;

2
src/opnsense/mvc/app/library/OPNsense/Auth/API.php
View File

@ -160,7 +160,7 @@ class API extends Base implements IAuthConnector
}
if ($userObject != null) {
if (isset($userObject->disabled)) {
if (!empty((string)$userObject->disabled)) {
// disabled user
return false;
}

2
src/opnsense/mvc/app/library/OPNsense/Auth/Local.php
View File

@ -153,7 +153,7 @@ class Local extends Base implements IAuthConnector
{
$userObject = $this->getUser($username);
if ($userObject != null) {
if (isset($userObject->disabled)) {
if (!empty((string)$userObject->disabled)) {
// disabled user
return false;
}

4
src/www/system_usermanager.php
View File

@ -149,7 +149,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
$pconfig['usernamefld'] = $a_user[$id]['name'];
}
$pconfig['groups'] = local_user_get_groups($a_user[$id]);
$pconfig['disabled'] = isset($a_user[$id]['disabled']);
$pconfig['disabled'] = !empty($a_user[$id]['disabled']);
foreach ($fieldnames as $fieldname) {
if (isset($a_user[$id][$fieldname])) {
$pconfig[$fieldname] = $a_user[$id][$fieldname];
@ -1017,7 +1017,7 @@ $( document ).ready(function() {
<tr>
<td>
<?php
if (isset($userent['disabled'])) {
if (!empty($userent['disabled'])) {
$usrimg = 'text-muted';
} elseif (userIsAdmin($userent['name'])) {
$usrimg = 'text-danger';