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

#13344 minor fix

This commit is contained in:
Jonathan 2024-04-12 11:53:24 +02:00
parent 8b7125fd59
commit ab6199640b
2 changed files with 14 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
pandora_console/godmode/users/token_list.php
View File

@ -77,7 +77,7 @@ if ($create_token === true || $update_token === true) {
$expirationDate = get_parameter('date-expiration', null); $expirationDate = get_parameter('date-expiration', null);
$expirationTime = get_parameter('time-expiration', null); $expirationTime = get_parameter('time-expiration', null);
$validity = null; $validity = null;
$error_date = false;
if (empty($expirationDate) === false && $expirationDate >= date('Y-m-d')) { if (empty($expirationDate) === false && $expirationDate >= date('Y-m-d')) {
$validity = $expirationDate; $validity = $expirationDate;
if (empty($expirationTime) === false && $expirationTime > date('H:i:s')) { if (empty($expirationTime) === false && $expirationTime > date('H:i:s')) {
@ -85,8 +85,6 @@ if ($create_token === true || $update_token === true) {
} else { } else {
$validity .= ' 23:59:59'; $validity .= ' 23:59:59';
} }
} else if ($expirationDate < date('Y-m-d')) {
$error_date = true;
} }
$values = [ $values = [
@ -98,22 +96,16 @@ if ($create_token === true || $update_token === true) {
// Create token. // Create token.
if ($create_token === true) { if ($create_token === true) {
try { try {
if ($error_date === false) { $token = create_user_token($values);
$token = create_user_token($values); $smgInfo = __('This code will appear only once, please keep it in a safe place');
$smgInfo = __('This code will appear only once, please keep it in a safe place'); $smgInfo .= '.</br>';
$smgInfo .= '.</br>'; $smgInfo .= __('If you lose the code, you will only able to delete it and create a new one');
$smgInfo .= __('If you lose the code, you will only able to delete it and create a new one'); $smgInfo .= '.</br></br>';
$smgInfo .= '.</br></br>'; $smgInfo .= '<i>';
$smgInfo .= '<i>'; $smgInfo .= $token['token'];
$smgInfo .= $token['token']; $smgInfo .= '</i>';
$smgInfo .= '</i>'; $tokenMsg = ui_print_info_message($smgInfo, '', true);
$tokenMsg = ui_print_info_message($smgInfo, '', true); ui_print_success_message(__('Successfully created'));
ui_print_success_message(__('Successfully created'));
} else {
ui_print_error_message(
__('Date expiration must be bigger than today')
);
}
} catch (\Exception $e) { } catch (\Exception $e) {
ui_print_error_message( ui_print_error_message(
__('There was a problem creating this token, %s', $e->getMessage()) __('There was a problem creating this token, %s', $e->getMessage())
@ -124,14 +116,8 @@ if ($create_token === true || $update_token === true) {
// Update token. // Update token.
if ($update_token === true) { if ($update_token === true) {
try { try {
if ($error_date === false) { $token = update_user_token($id_token, $values);
$token = update_user_token($id_token, $values); ui_print_success_message(__('Successfully updated'));
ui_print_success_message(__('Successfully updated'));
} else {
echo ui_print_error_message(
__('Date expiration must be bigger than today')
);
}
} catch (\Exception $e) { } catch (\Exception $e) {
ui_print_error_message( ui_print_error_message(
__('There was a problem updating this token, %s', $e->getMessage()) __('There was a problem updating this token, %s', $e->getMessage())

2
pandora_console/include/functions_ui.php
View File

@ -436,7 +436,7 @@ function ui_print_message($message, $class='', $attributes='', $return=false, $t
$_SESSION['info_box_count']++; $_SESSION['info_box_count']++;
} }
$position = (20 + (int) $_SESSION['info_box_count']); $position = (20 + (int) $_SESSION['info_box_count'] + 120);
$output = html_print_div( $output = html_print_div(
[ [