From f6020e87918206218775dce0f2f3f3ef33c3fbc3 Mon Sep 17 00:00:00 2001 From: fbsanchez Date: Mon, 19 Oct 2020 10:59:46 +0200 Subject: [PATCH] Removed unwanted traces --- pandora_console/general/login_page.php | 7 ++- pandora_console/include/load_session.php | 40 ++++++++----- pandora_console/index.php | 73 +++++++++++++++++------- 3 files changed, 83 insertions(+), 37 deletions(-) diff --git a/pandora_console/general/login_page.php b/pandora_console/general/login_page.php index c4cd8482bc..97548deee4 100755 --- a/pandora_console/general/login_page.php +++ b/pandora_console/general/login_page.php @@ -450,7 +450,12 @@ if ($login_screen == 'logout') { echo '
'; echo '
'; echo '

'.__('Logged out').'

'; - echo '

'.__('Your session has ended. Please close your browser window to close this %s session.', get_product_name()).'

'; + if (empty($config['logout_msg']) === true) { + echo '

'.__('Your session has ended. Please close your browser window to close this %s session.', get_product_name()).'

'; + } else { + echo '

'.__($config['logout_msg']).'

'; + } + echo '
'; echo '
'; html_print_submit_button('Ok', 'hide-login-logout', false); diff --git a/pandora_console/include/load_session.php b/pandora_console/include/load_session.php index 883704b8e0..b557edd5d3 100644 --- a/pandora_console/include/load_session.php +++ b/pandora_console/include/load_session.php @@ -64,14 +64,23 @@ function pandora_session_close() function pandora_session_read($session_id) { $session_id = addslashes($session_id); - $session_data = db_get_value( - 'data', - 'tsessions_php', - 'id_session', - $session_id + + // Do not use SQL cache here. + $session_data = db_get_all_rows_sql( + sprintf( + 'SELECT data + FROM `tsessions_php` WHERE id_session="%s"', + $session_id + ), + false, + false ); - if (!empty($session_data)) { + if (is_array($session_data) === true) { + $session_data = $session_data[0]['data']; + } + + if (empty($session_data) === false) { return $session_data; } else { return ''; @@ -90,7 +99,6 @@ function pandora_session_read($session_id) function pandora_session_write($session_id, $data) { $session_id = addslashes($session_id); - if (is_ajax()) { // Avoid session upadte while processing ajax responses - notifications. if (get_parameter('check_new_notifications', false)) { @@ -101,18 +109,22 @@ function pandora_session_write($session_id, $data) $values = []; $values['last_active'] = time(); - if (!empty($data)) { + if (empty($data) === false) { $values['data'] = addslashes($data); } - $session_exists = (bool) db_get_value( - 'COUNT(id_session)', - 'tsessions_php', - 'id_session', - $session_id + // Do not use SQL cache here. + $session_exists = db_get_all_rows_sql( + sprintf( + 'SELECT id_session + FROM `tsessions_php` WHERE id_session="%s"', + $session_id + ), + false, + false ); - if (!$session_exists) { + if ($session_exists === false) { $values['id_session'] = $session_id; $retval_write = db_process_sql_insert('tsessions_php', $values); } else { diff --git a/pandora_console/index.php b/pandora_console/index.php index 8a95702146..56ea0fcd34 100755 --- a/pandora_console/index.php +++ b/pandora_console/index.php @@ -222,7 +222,7 @@ echo ''."\n"; ob_start('ui_process_page_head'); // Enterprise main. -enterprise_include('index.php'); +enterprise_include_once('index.php'); echo '