tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Minor fix

This commit is contained in:
Jose Gonzalez 2023-02-16 12:59:23 +01:00
parent 5dc8e19d6d
commit 29ed8be0d2
2 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pandora_console/godmode/users/configure_user.php
View File

@ -29,7 +29,7 @@
// Load global vars.
global $config;
hd($_REQUEST, true);
check_login();
require_once $config['homedir'].'/vendor/autoload.php';
@ -773,7 +773,6 @@ if ($update_user) {
);
}
hd('res1-res2', true);
ui_print_result_message(
$res1 || $res2,
__('User info successfully updated'),
@ -847,7 +846,7 @@ if ($update_user) {
false,
$info
);
hd('apitoken', true);
ui_print_result_message(
$res1,
($apiTokenRenewed === true) ? __('You have generated a new API Token.') : __('User info successfully updated'),
@ -916,15 +915,7 @@ if ($add_profile && empty($json_profile)) {
false,
'Profile: '.$profile2.' Group: '.$group2.' Tags: '.$tags
);
/*
hd('>>>>>', true);
hd($id2, true);
hd($profile2, true);
hd($group2, true);
hd($tags, true);
hd($no_hierarchy, true);
hd('<<<<<<', true);
*/
$return = profile_create_user_profile($id2, $profile2, $group2, false, $tags, $no_hierarchy);
if ($return === false) {
$is_err = true;
@ -1586,7 +1577,12 @@ if ($double_auth_enabled === true && (bool) $config['double_auth_enabled'] === t
);
}
$doubleAuthentication = html_print_div(['content' => implode('', $doubleAuthElementsContent)], true);
if (empty($doubleAuthElementsContent) === false) {
$doubleAuthentication = html_print_div(['content' => implode('', $doubleAuthElementsContent)], true);
} else {
$doubleAuthentication = '';
}
/*
if (isset($double_authentication)) {

13
pandora_console/godmode/users/user_management.php
View File

@ -220,9 +220,14 @@ $userManagementTable->data['fields_phone'][0] = html_print_input_text_extended(
true
);
$fieldsAdminUserCount = 0;
$userManagementTable->rowclass['captions_fields_admin_user'] = 'field_half_width w50p';
$userManagementTable->cellclass['captions_fields_admin_user'][0] = 'wrap';
$userManagementTable->data['captions_fields_admin_user'][0] = $doubleAuthentication;
$userManagementTable->cellclass['captions_fields_admin_user'][$fieldsAdminUserCount] = 'wrap';
if (empty($doubleAuthentication) === false) {
$userManagementTable->data['captions_fields_admin_user'][$fieldsAdminUserCount] = $doubleAuthentication;
$fieldsAdminUserCount++;
}
if (users_is_admin() === true) {
$globalProfileContent = [];
$globalProfileContent[] = '<span>'.__('Administrator user').'</span>';
@ -233,8 +238,8 @@ if (users_is_admin() === true) {
true
);
$userManagementTable->cellclass['captions_fields_admin_user'][1] = 'wrap';
$userManagementTable->data['captions_fields_admin_user'][1] = html_print_div(
$userManagementTable->cellclass['captions_fields_admin_user'][$fieldsAdminUserCount] = 'wrap';
$userManagementTable->data['captions_fields_admin_user'][$fieldsAdminUserCount] = html_print_div(
[
'class' => 'margin-top-10',
'style' => 'display: flex; flex-direction: row-reverse; align-items: center;',