tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-11670-15842-problemas-con-idioma-en-espanol-y-la-seleccion-la-pagina-de-incicio' into 'develop'

Browse Source 
Ent 11670 15842 problemas con idioma en espanol y la seleccion la pagina de incicio

See merge request artica/pandorafms!6189
This commit is contained in:
Gorka Sanchez 2023-07-03 09:14:01 +00:00
commit 7170dc5d1e
4 changed files with 22 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -353,8 +353,7 @@ if ($create_user === true) {
$values['data_section'] = get_parameter('data_section'); $values['data_section'] = get_parameter('data_section');
} }
$values['section'] = $homeScreenValues[$values['section']]; // $values['section'] = $homeScreenValues[$values['section']];
if (enterprise_installed() === true) { if (enterprise_installed() === true) {
$values['force_change_pass'] = 1; $values['force_change_pass'] = 1;
$values['last_pass_change'] = date('Y/m/d H:i:s', get_system_time()); $values['last_pass_change'] = date('Y/m/d H:i:s', get_system_time());
@ -645,8 +644,7 @@ if ($update_user) {
$values['data_section'] = get_parameter('data_section'); $values['data_section'] = get_parameter('data_section');
} }
$values['section'] = $homeScreenValues[$values['section']]; // $values['section'] = $homeScreenValues[$values['section']];
if (enterprise_installed() === true && is_metaconsole() === true) { if (enterprise_installed() === true && is_metaconsole() === true) {
if (users_is_admin() === true) { if (users_is_admin() === true) {
$values['metaconsole_access'] = get_parameter('metaconsole_access'); $values['metaconsole_access'] = get_parameter('metaconsole_access');

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

@ -633,7 +633,7 @@ $homeScreenTable->rowclass['fields_homescreen'] = 'field_half_width flex';
$homeScreenTable->data['fields_homescreen'][0] = html_print_select( $homeScreenTable->data['fields_homescreen'][0] = html_print_select(
$homeScreenValues, $homeScreenValues,
'section', 'section',
array_search($user_info['section'], $homeScreenValues), $user_info['section'],
'show_data_section();', 'show_data_section();',
'', '',
-1, -1,

4
pandora_console/include/auth/mysql.php
View File

@ -814,10 +814,6 @@ function update_user(string $id_user, array $values)
HOME_SCREEN_DASHBOARD => __('Dashboard'), HOME_SCREEN_DASHBOARD => __('Dashboard'),
]; ];
if (array_key_exists($values['section'], $homeScreenValues) === true) {
$values['section'] = $homeScreenValues[$values['section']];
}
if (is_metaconsole() === true) { if (is_metaconsole() === true) {
$values['metaconsole_section'] = $values['section']; $values['metaconsole_section'] = $values['section'];
$values['metaconsole_data_section'] = $values['data_section']; $values['metaconsole_data_section'] = $values['data_section'];

38
pandora_console/index.php
View File

@ -600,44 +600,44 @@ if (isset($config['id_user']) === false) {
$home_url = $user_info['data_section']; $home_url = $user_info['data_section'];
if ($home_page != '') { if ($home_page != '') {
switch ($home_page) { switch ($home_page) {
case 'Event list': case 'event_list':
$_GET['sec'] = 'eventos'; $_GET['sec'] = 'eventos';
$_GET['sec2'] = 'operation/events/events'; $_GET['sec2'] = 'operation/events/events';
break; break;
case 'Group view': case 'group_view':
$_GET['sec'] = 'view'; $_GET['sec'] = 'view';
$_GET['sec2'] = 'operation/agentes/group_view'; $_GET['sec2'] = 'operation/agentes/group_view';
break; break;
case 'Alert detail': case 'alert_detail':
$_GET['sec'] = 'view'; $_GET['sec'] = 'view';
$_GET['sec2'] = 'operation/agentes/alerts_status'; $_GET['sec2'] = 'operation/agentes/alerts_status';
break; break;
case 'Tactical view': case 'tactical_view':
$_GET['sec'] = 'view'; $_GET['sec'] = 'view';
$_GET['sec2'] = 'operation/agentes/tactical'; $_GET['sec2'] = 'operation/agentes/tactical';
break; break;
case 'Default': case 'default':
default: default:
$_GET['sec'] = 'general/logon_ok'; $_GET['sec'] = 'general/logon_ok';
break; break;
case 'Dashboard': case 'dashboard':
$_GET['sec'] = 'reporting'; $_GET['sec'] = 'reporting';
$_GET['sec2'] = 'operation/dashboard/dashboard'; $_GET['sec2'] = 'operation/dashboard/dashboard';
$_GET['id_dashboard_select'] = $home_url; $_GET['id_dashboard_select'] = $home_url;
$_GET['d_from_main_page'] = 1; $_GET['d_from_main_page'] = 1;
break; break;
case 'Visual console': case 'visual_console':
$_GET['sec'] = 'network'; $_GET['sec'] = 'network';
$_GET['sec2'] = 'operation/visual_console/index'; $_GET['sec2'] = 'operation/visual_console/index';
break; break;
case 'Other': case 'other':
$home_url = io_safe_output($home_url); $home_url = io_safe_output($home_url);
$url_array = parse_url($home_url); $url_array = parse_url($home_url);
parse_str($url_array['query'], $res); parse_str($url_array['query'], $res);
@ -732,12 +732,12 @@ if (isset($config['id_user']) === false) {
// Form the url. // Form the url.
$query_params_redirect = $_GET; $query_params_redirect = $_GET;
// Visual console do not want sec2. // Visual console do not want sec2.
if ($home_page === 'Visual console') { if ($home_page === 'visual_console') {
unset($query_params_redirect['sec2']); unset($query_params_redirect['sec2']);
} }
// Dashboard do not want sec2. // Dashboard do not want sec2.
if ($home_page === 'Dashboard') { if ($home_page === 'dashboard') {
unset($query_params_redirect['sec2']); unset($query_params_redirect['sec2']);
} }
@ -1352,32 +1352,32 @@ if ($searchPage) {
if ($home_page != '') { if ($home_page != '') {
switch ($home_page) { switch ($home_page) {
case 'Event list': case 'event_list':
$_GET['sec'] = 'eventos'; $_GET['sec'] = 'eventos';
$_GET['sec2'] = 'operation/events/events'; $_GET['sec2'] = 'operation/events/events';
break; break;
case 'Group view': case 'group_view':
$_GET['sec'] = 'view'; $_GET['sec'] = 'view';
$_GET['sec2'] = 'operation/agentes/group_view'; $_GET['sec2'] = 'operation/agentes/group_view';
break; break;
case 'Alert details': case 'alert_detail':
$_GET['sec'] = 'view'; $_GET['sec'] = 'view';
$_GET['sec2'] = 'operation/agentes/alerts_status'; $_GET['sec2'] = 'operation/agentes/alerts_status';
break; break;
case 'Tactical view': case 'tactical_view':
$_GET['sec'] = 'view'; $_GET['sec'] = 'view';
$_GET['sec2'] = 'operation/agentes/tactical'; $_GET['sec2'] = 'operation/agentes/tactical';
break; break;
case 'Default': case 'default':
default: default:
$_GET['sec2'] = 'general/logon_ok'; $_GET['sec2'] = 'general/logon_ok';
break; break;
case 'Dashboard': case 'dashboard':
$_GET['specialSec2'] = sprintf('operation/dashboard/dashboard&dashboardId=%s', $home_url); $_GET['specialSec2'] = sprintf('operation/dashboard/dashboard&dashboardId=%s', $home_url);
$str = sprintf('sec=reporting&sec2=%s&d_from_main_page=1', $_GET['specialSec2']); $str = sprintf('sec=reporting&sec2=%s&d_from_main_page=1', $_GET['specialSec2']);
parse_str($str, $res); parse_str($str, $res);
@ -1386,7 +1386,7 @@ if ($searchPage) {
} }
break; break;
case 'Visual console': case 'visual_console':
$id_visualc = db_get_value('id', 'tlayout', 'name', $home_url); $id_visualc = db_get_value('id', 'tlayout', 'name', $home_url);
if (($home_url == '') || ($id_visualc == false)) { if (($home_url == '') || ($id_visualc == false)) {
$str = 'sec=godmode/reporting/map_builder&sec2=godmode/reporting/map_builder'; $str = 'sec=godmode/reporting/map_builder&sec2=godmode/reporting/map_builder';
@ -1400,7 +1400,7 @@ if ($searchPage) {
} }
break; break;
case 'Other': case 'other':
$home_url = io_safe_output($home_url); $home_url = io_safe_output($home_url);
$url_array = parse_url($home_url); $url_array = parse_url($home_url);
parse_str($url_array['query'], $res); parse_str($url_array['query'], $res);
@ -1409,7 +1409,7 @@ if ($searchPage) {
} }
break; break;
case 'External link': case 'external_link':
$home_url = io_safe_output($home_url); $home_url = io_safe_output($home_url);
if (strlen($home_url) !== 0) { if (strlen($home_url) !== 0) {
echo '<script type="text/javascript">document.location="'.$home_url.'"</script>'; echo '<script type="text/javascript">document.location="'.$home_url.'"</script>';