diff --git a/pandora_console/godmode/menu.php b/pandora_console/godmode/menu.php index d0d21c14a6..a6ec702923 100644 --- a/pandora_console/godmode/menu.php +++ b/pandora_console/godmode/menu.php @@ -475,7 +475,7 @@ if ($access_console_node === true) { } } - $sub2['godmode/setup/setup§ion=ehorus']['text'] = __('eHorus'); + $sub2['godmode/setup/setup§ion=ehorus']['text'] = __('Pandora RC'); $sub2['godmode/setup/setup§ion=ehorus']['refr'] = 0; $sub2['godmode/setup/setup§ion=ITSM']['text'] = __('ITSM'); diff --git a/pandora_console/godmode/setup/setup.php b/pandora_console/godmode/setup/setup.php index a868017ad2..0fd6bebff8 100644 --- a/pandora_console/godmode/setup/setup.php +++ b/pandora_console/godmode/setup/setup.php @@ -188,7 +188,7 @@ $buttons['ehorus'] = [ 'images/RC.png', true, [ - 'title' => __('eHorus'), + 'title' => __('Pandora RC'), 'class' => 'invert_filter', ] ).'', @@ -299,7 +299,7 @@ switch ($section) { case 'ehorus': $buttons['ehorus']['active'] = true; - $subpage = __('eHorus'); + $subpage = __('Pandora RC'); $help_header = 'setup_ehorus_tab'; break; diff --git a/pandora_console/godmode/setup/setup_ehorus.php b/pandora_console/godmode/setup/setup_ehorus.php index 9a711c9a39..6f4879a4ac 100644 --- a/pandora_console/godmode/setup/setup_ehorus.php +++ b/pandora_console/godmode/setup/setup_ehorus.php @@ -64,7 +64,7 @@ $table_enable->style['name'] = 'font-weight: bold'; // Enable eHorus. $row = []; -$row['name'] = __('Enable eHorus'); +$row['name'] = __('Enable Pandora RC'); $row['control'] = html_print_checkbox_switch('ehorus_enabled', 1, $config['ehorus_enabled'], true); $table_enable->data['ehorus_enabled'] = $row; @@ -81,7 +81,7 @@ $table_remote->size['ehorus_port'] = '50%'; // Enable eHorus user configuration. $row = []; $row['ehorus_user_level_conf'] = html_print_label_input_block( - __('eHorus configuration at user level'), + __('Pandora RC configuration at user level'), html_print_checkbox_switch( 'ehorus_user_level_conf', 1, @@ -154,16 +154,16 @@ $table_remote->data['ehorus_test'] = $row; // Print. echo '
'; -echo ''; -if ($config['style'] === 'pandora_black' && is_metaconsole() === true) { +echo ''; +if ($config['style'] === 'pandora_black' || is_metaconsole() === true) { html_print_image( - 'include/ehorus/images/ehorus-logo.png', + 'include/ehorus/images/Pandora RC blanco@2x.png', false, ['class' => 'w400px mrgn_top_15px'] ); } else { html_print_image( - 'include/ehorus/images/ehorus-logo-grey.png', + 'include/ehorus/images/Pandora RC@2x.png', false, ['class' => 'w400px mrgn_top_15px'] ); @@ -174,19 +174,19 @@ echo '
'; echo '
'; echo __('Remote Management System'); echo '
'; -echo ''; -echo 'https://ehorus.com'; +echo ''; +echo 'https://pandorafms.com/es/control-remoto/'; echo ''; echo '
'; if ($custom_field_created !== null) { - ui_print_result_message($custom_field_created, __('Custom field eHorusID created'), __('Error creating custom field')); + ui_print_result_message($custom_field_created, __('Custom field Pandora RC ID created'), __('Error creating custom field')); } if ($custom_field_created) { - $info_messsage = __('eHorus has his own agent identifiers'); + $info_messsage = __('Pandora RC has his own agent identifiers'); $info_messsage .= '. '.__('To store them, it will be necessary to use an agent custom field'); - $info_messsage .= '.
'.__('Possibly the eHorus id will have to be filled in by hand for every agent').'.'; + $info_messsage .= '.
'.__('Possibly the Pandora RC id will have to be filled in by hand for every agent').'.'; ui_print_info_message($info_messsage); } @@ -205,7 +205,7 @@ echo ''; // Form remote. echo '
'; echo '
'; - echo ''.__('eHorus API').''; + echo ''.__('Pandora RC API').''; html_print_input_hidden('update_config', 1); html_print_table($table_remote); diff --git a/pandora_console/godmode/users/user_management.php b/pandora_console/godmode/users/user_management.php index 9991736583..6d5f9bf18b 100644 --- a/pandora_console/godmode/users/user_management.php +++ b/pandora_console/godmode/users/user_management.php @@ -576,6 +576,57 @@ $userManagementTable->data['fields_autorefreshTime'][0] .= ui_print_input_placeh true ); +// eHorus conf +if (isset($config['ehorus_user_level_conf']) === true && (bool) $config['ehorus_user_level_conf'] === true) { + $userManagementTable->data['captions_ehorus_user_level_enabled'][1] = __('Pandora RC user access enabled'); + $userManagementTable->data['fields_ehorus_user_level_enabled'][1] = html_print_checkbox_switch( + 'ehorus_user_level_enabled', + 1, + $user_info['ehorus_user_level_enabled'], + true + ); + + $userManagementTable->rowclass['captions_ehorus_user_level_user'] = 'field_half_width'; + $userManagementTable->rowclass['fields_ehorus_user_level_user'] = 'field_half_width'; + $userManagementTable->data['captions_ehorus_user_level_user'][1] = __('Pandora RC User'); + $userManagementTable->data['fields_ehorus_user_level_user'][1] = html_print_input_text_extended( + 'ehorus_user_level_user', + $user_info['ehorus_user_level_user'], + '', + '', + 25, + 150, + $view_mode, + '', + [ + 'class' => 'input', + 'placeholder' => __('Pandora RC User'), + ], + true + ); + + $userManagementTable->rowclass['captions_ehorus_user_level_pass'] = 'field_half_width'; + $userManagementTable->rowclass['fields_ehorus_user_level_pass'] = 'field_half_width'; + $userManagementTable->data['captions_ehorus_user_level_pass'][1] = __('Pandora RC Password'); + $userManagementTable->data['fields_ehorus_user_level_pass'][1] = html_print_input_text_extended( + 'ehorus_user_level_pass', + io_output_password($user_info['ehorus_user_level_pass']), + '', + '', + '25', + '150', + $view_mode, + '', + [ + 'class' => 'input w100p', + 'placeholder' => __('Pandora RC Password'), + ], + true, + true + ); +} + + // Title for Language and Appearance. $userManagementTable->data['title_lookAndFeel'] = html_print_subtitle_table(__('Language and Appearance')); // Language and color scheme. @@ -893,5 +944,45 @@ $(document).ready(function () { $('#skin1').on("change", () => { $('#advanced-line1_looknfeel-1 > a').css('display', 'block'); }) + + var ehorus_user_level_enabled = + + ; + var chk_ehorus_user_level_enabled = ehorus_user_level_enabled; + + if (ehorus_user_level_enabled == 0) { + $('#advanced-captions_ehorus_user_level_user').hide(); + $('#advanced-fields_ehorus_user_level_user').hide(); + $('#advanced-captions_ehorus_user_level_pass').hide(); + $('#advanced-fields_ehorus_user_level_pass').hide(); + } else { + $('#advanced-captions_ehorus_user_level_user').show(); + $('#advanced-fields_ehorus_user_level_user').show(); + $('#advanced-captions_ehorus_user_level_pass').show(); + $('#advanced-fields_ehorus_user_level_pass').show(); + } + + $('#checkbox-ehorus_user_level_enabled1').on('change', () =>{ + + if (chk_ehorus_user_level_enabled == 1) { + $('#advanced-captions_ehorus_user_level_user').hide(); + $('#advanced-fields_ehorus_user_level_user').hide(); + $('#advanced-captions_ehorus_user_level_pass').hide(); + $('#advanced-fields_ehorus_user_level_pass').hide(); + chk_ehorus_user_level_enabled = 0; + } else { + $('#advanced-captions_ehorus_user_level_user').show(); + $('#advanced-fields_ehorus_user_level_user').show(); + $('#advanced-captions_ehorus_user_level_pass').show(); + $('#advanced-fields_ehorus_user_level_pass').show(); + chk_ehorus_user_level_enabled = 1; + } + }) }); \ No newline at end of file diff --git a/pandora_console/include/ehorus/images/Pandora RC blanco.svg b/pandora_console/include/ehorus/images/Pandora RC blanco.svg new file mode 100644 index 0000000000..1092ba6c90 --- /dev/null +++ b/pandora_console/include/ehorus/images/Pandora RC blanco.svg @@ -0,0 +1,20 @@ + + + Pandora RC blanco + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pandora_console/include/ehorus/images/Pandora RC blanco@2x.png b/pandora_console/include/ehorus/images/Pandora RC blanco@2x.png new file mode 100644 index 0000000000..444fc6397b Binary files /dev/null and b/pandora_console/include/ehorus/images/Pandora RC blanco@2x.png differ diff --git a/pandora_console/include/ehorus/images/Pandora RC negro.svg b/pandora_console/include/ehorus/images/Pandora RC negro.svg new file mode 100644 index 0000000000..f70b0cd6fa --- /dev/null +++ b/pandora_console/include/ehorus/images/Pandora RC negro.svg @@ -0,0 +1,20 @@ + + + Pandora RC negro + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pandora_console/include/ehorus/images/Pandora RC negro@2x.png b/pandora_console/include/ehorus/images/Pandora RC negro@2x.png new file mode 100644 index 0000000000..d8e182f641 Binary files /dev/null and b/pandora_console/include/ehorus/images/Pandora RC negro@2x.png differ diff --git a/pandora_console/include/ehorus/images/Pandora RC.svg b/pandora_console/include/ehorus/images/Pandora RC.svg new file mode 100644 index 0000000000..40ae2cc21b --- /dev/null +++ b/pandora_console/include/ehorus/images/Pandora RC.svg @@ -0,0 +1,28 @@ + + + Pandora RC + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pandora_console/include/ehorus/images/Pandora RC@2x.png b/pandora_console/include/ehorus/images/Pandora RC@2x.png new file mode 100644 index 0000000000..b979f96270 Binary files /dev/null and b/pandora_console/include/ehorus/images/Pandora RC@2x.png differ diff --git a/pandora_console/operation/agentes/ver_agente.php b/pandora_console/operation/agentes/ver_agente.php index 4e0299fa86..383a3b40d5 100644 --- a/pandora_console/operation/agentes/ver_agente.php +++ b/pandora_console/operation/agentes/ver_agente.php @@ -1759,7 +1759,7 @@ if ((bool) $config['ehorus_enabled'] === true && empty($config['ehorus_custom_fi 'images/RC.png', true, [ - 'title' => __('eHorus'), + 'title' => __('Pandora RC'), 'class' => 'invert_filter', ] ).''; @@ -2048,7 +2048,7 @@ switch ($tab) { break; case 'ehorus': - $tab_name = __('eHorus'); + $tab_name = __('Pandora RC'); break; case 'extension':