diff --git a/pandora_console/general/login_page.php b/pandora_console/general/login_page.php index 4bcce4142b..37421f655d 100755 --- a/pandora_console/general/login_page.php +++ b/pandora_console/general/login_page.php @@ -27,6 +27,22 @@ require_once __DIR__.'/../include/functions_ui.php'; require_once __DIR__.'/../include/functions.php'; require_once __DIR__.'/../include/functions_html.php'; +echo ''; if ($config['visual_animation']) { // form#login_form, div.login_data { @@ -121,7 +137,13 @@ if (empty($config['background_opacity']) === false) { $opacity = 30; } -$login_body_style = 'style="'.$background_100.'background: linear-gradient(rgba(0,0,0,.'.$opacity.'), rgba(0,0,0,.'.$opacity.")), url('".$background_url."');\""; +if ($config['style'] === 'pandora') { + $opacity_color = '255, 255, 255, .'; +} else { + $opacity_color = '0, 0, 0, .'; +} + +$login_body_style = 'style="'.$background_100.'background: linear-gradient(rgba('.$opacity_color.$opacity.'), rgba('.$opacity_color.$opacity.")), url('".$background_url."');\""; // Get alternative custom in case of db fail. $custom_fields = [ @@ -148,7 +170,7 @@ foreach ($custom_fields as $field) { $docs_logo = ui_get_docs_logo(); $support_logo = ui_get_support_logo(); echo '
'; -echo '
'; +echo '
'; echo '
    '; @@ -298,7 +320,7 @@ switch ($login_screen) { ); echo '
'; } else { - echo ''; echo '
'; diff --git a/pandora_console/godmode/alerts/alert_list.list.php b/pandora_console/godmode/alerts/alert_list.list.php index a2b0f242da..c11e3631a7 100644 --- a/pandora_console/godmode/alerts/alert_list.list.php +++ b/pandora_console/godmode/alerts/alert_list.list.php @@ -679,7 +679,7 @@ foreach ($simple_alerts as $alert) { true, [ 'id' => 'template-details-'.$alert['id_alert_template'], - 'class' => 'img_help action_button_img invert_filter', + 'class' => 'img_help main_menu_icon invert_filter', ] ); $data[2] .= ' '; @@ -757,7 +757,7 @@ foreach ($simple_alerts as $alert) { true, [ 'title' => __('Delete action'), - 'class' => 'action_button_img invert_filter', + 'class' => 'main_menu_icon invert_filter', ] ); $data[3] .= html_print_input_hidden('delete_action', 1, true); @@ -772,7 +772,7 @@ foreach ($simple_alerts as $alert) { true, [ 'title' => __('Update action'), - 'class' => 'action_button_img invert_filter', + 'class' => 'main_menu_icon invert_filter', 'onclick' => 'show_display_update_action(\''.$action['id'].'\',\''.$alert['id'].'\',\''.$alert['id_agent_module'].'\',\''.$action_id.'\',\''.$alert['id_agent_module'].'\')', ] ); diff --git a/pandora_console/godmode/setup/setup_visuals.php b/pandora_console/godmode/setup/setup_visuals.php index 29df51b114..e6dd22eb2d 100755 --- a/pandora_console/godmode/setup/setup_visuals.php +++ b/pandora_console/godmode/setup/setup_visuals.php @@ -431,7 +431,7 @@ $table_styles->data[$row][] = html_print_label_input_block( $config['login_background'], '', __('Default'), - 'background_pandora_console_keys.jpg', + '', true, false, true, @@ -571,7 +571,7 @@ if (enterprise_installed() === true) { $config['custom_splash_login'], '', __('Default'), - 'default.svg', + 'default', true, false, true, diff --git a/pandora_console/include/class/SatelliteAgent.class.php b/pandora_console/include/class/SatelliteAgent.class.php index 18a4806bb5..07acb23c6c 100644 --- a/pandora_console/include/class/SatelliteAgent.class.php +++ b/pandora_console/include/class/SatelliteAgent.class.php @@ -393,7 +393,7 @@ class SatelliteAgent extends HTML true, [ 'border' => '0', - 'class' => 'action_button_img mrgn_lft_05em invert_filter', + 'class' => 'main_menu_icon mrgn_lft_05em invert_filter', 'onclick' => 'disable_agent(\''.$tmp->address.'\',\''.strip_tags($tmp->name).'\',\''.(int) $disable.'\',\''.$id_agente.'\')', ] ); @@ -405,7 +405,7 @@ class SatelliteAgent extends HTML true, [ 'border' => '0', - 'class' => 'action_button_img mrgn_lft_05em invert_filter', + 'class' => 'main_menu_icon mrgn_lft_05em invert_filter', 'onclick' => 'delete_agent(\''.$tmp->address.'\',\''.strip_tags($tmp->name).'\',\''.(int) $delete.'\',\''.$id_agente.'\')', ] ); diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php index 057572a863..47a6cce1de 100644 --- a/pandora_console/include/functions_config.php +++ b/pandora_console/include/functions_config.php @@ -2561,7 +2561,7 @@ function config_process_config() } if (!isset($config['custom_splash_login'])) { - config_update_value('custom_splash_login', 'default'); + config_update_value('custom_splash_login', 'none.png'); } if (!isset($config['custom_docs_logo'])) { @@ -2597,11 +2597,11 @@ function config_process_config() } if (!isset($config['custom_title1_login'])) { - config_update_value('custom_title1_login', __('PANDORA FMS')); + config_update_value('custom_title1_login', __('ONE TOOL TO MONITOR THEM ALL')); } if (!isset($config['custom_title2_login'])) { - config_update_value('custom_title2_login', __('ONE TOOL TO MONITOR THEM ALL')); + config_update_value('custom_title2_login', ''); } if (!isset($config['custom_docs_url'])) { @@ -2649,11 +2649,11 @@ function config_process_config() } if (!isset($config['meta_custom_title1_login'])) { - config_update_value('meta_custom_title1_login', __('PANDORA FMS NEXT GENERATION')); + config_update_value('meta_custom_title1_login', __('ONE TOOL TO MONITOR THEM ALL')); } if (!isset($config['meta_custom_title2_login'])) { - config_update_value('meta_custom_title2_login', __('METACONSOLE')); + config_update_value('meta_custom_title2_login', __('COMMAND CENTER')); } if (!isset($config['vc_favourite_view'])) { @@ -3482,7 +3482,7 @@ function config_process_config() } if (!isset($config['random_background'])) { - config_update_value('random_background', ''); + config_update_value('random_background', 1); } if (!isset($config['meta_random_background'])) { diff --git a/pandora_console/include/functions_reporting_html.php b/pandora_console/include/functions_reporting_html.php index a43f852945..8b5cb3d917 100644 --- a/pandora_console/include/functions_reporting_html.php +++ b/pandora_console/include/functions_reporting_html.php @@ -6002,6 +6002,7 @@ function reporting_get_last_activity() $table = new stdClass(); $table->width = '100%'; $table->data = []; + $table->class = 'info_table'; $table->size = []; $table->size[2] = '150px'; $table->size[3] = '130px'; @@ -6015,37 +6016,13 @@ function reporting_get_last_activity() $table->head[5] = __('Comments'); $table->title = ''.__('Last activity in %s console', get_product_name()).''; - switch ($config['dbtype']) { - case 'mysql': - $sql = sprintf( - 'SELECT id_usuario,accion,fecha,ip_origen,descripcion,utimestamp - FROM tsesion - WHERE (`utimestamp` > UNIX_TIMESTAMP(NOW()) - '.SECONDS_1WEEK.") - AND `id_usuario` = '%s' ORDER BY `utimestamp` DESC LIMIT 5", - $config['id_user'] - ); - break; - - case 'postgresql': - $sql = sprintf( - "SELECT \"id_usuario\", accion, fecha, \"ip_origen\", descripcion, utimestamp - FROM tsesion - WHERE (\"utimestamp\" > ceil(date_part('epoch', CURRENT_TIMESTAMP)) - ".SECONDS_1WEEK.") - AND \"id_usuario\" = '%s' ORDER BY \"utimestamp\" DESC LIMIT 5", - $config['id_user'] - ); - break; - - case 'oracle': - $sql = sprintf( - "SELECT id_usuario, accion, fecha, ip_origen, descripcion, utimestamp - FROM tsesion - WHERE ((utimestamp > ceil((sysdate - to_date('19700101000000','YYYYMMDDHH24MISS')) * (".SECONDS_1DAY.')) - '.SECONDS_1WEEK.") - AND id_usuario = '%s') AND rownum <= 10 ORDER BY utimestamp DESC", - $config['id_user'] - ); - break; - } + $sql = sprintf( + 'SELECT id_usuario,accion,fecha,ip_origen,descripcion,utimestamp + FROM tsesion + WHERE (`utimestamp` > UNIX_TIMESTAMP(NOW()) - '.SECONDS_1WEEK.") + AND `id_usuario` = '%s' ORDER BY `utimestamp` DESC LIMIT 5", + $config['id_user'] + ); $sessions = db_get_all_rows_sql($sql); @@ -6056,18 +6033,8 @@ function reporting_get_last_activity() foreach ($sessions as $session) { $data = []; - switch ($config['dbtype']) { - case 'mysql': - case 'oracle': - $session_id_usuario = $session['id_usuario']; - $session_ip_origen = $session['ip_origen']; - break; - - case 'postgresql': - $session_id_usuario = $session['id_usuario']; - $session_ip_origen = $session['ip_origen']; - break; - } + $session_id_usuario = $session['id_usuario']; + $session_ip_origen = $session['ip_origen']; $data[0] = ''.$session_id_usuario.''; $data[1] = ui_print_session_action_icon($session['accion'], true); @@ -6079,10 +6046,6 @@ function reporting_get_last_activity() array_push($table->data, $data); } - if (defined('METACONSOLE')) { - $table->class = 'databox_tactical'; - } - return html_print_table($table, true); } diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php index ce111ea249..8f62bc4ce0 100755 --- a/pandora_console/include/functions_ui.php +++ b/pandora_console/include/functions_ui.php @@ -5020,30 +5020,22 @@ function ui_print_standard_header( $applyBreadcrumbs, true ); - // Create the header. - // if (is_metaconsole() === true) { - // $output = ui_meta_print_header( - // $title, - // false, - // $options - // ); - // } else { - $output = ui_print_page_header( - $title, - $icon, - true, - $help, - $godmode, - $options, - false, - '', - GENERIC_SIZE_TEXT, - '', - $headerInformation->printHeader(true), - false, - $fav_menu_config - ); - // } + + $output = ui_print_page_header( + $title, + $icon, + true, + $help, + $godmode, + $options, + false, + '', + GENERIC_SIZE_TEXT, + '', + $headerInformation->printHeader(true), + false, + $fav_menu_config + ); if ($return !== true) { echo $output; } else { @@ -7327,9 +7319,6 @@ function ui_get_inventory_module_add_form( $table->rowstyle = []; $table->rowstyle['hidden-custom-field-row'] = 'display: none;'; $table->rowstyle['custom-fields-button'] = 'display: none;'; - // $table->colspan = []; - // $table->colspan['custom-fields-row'] = []; - // $table->colspan['custom-fields-row']['custom-fields-column'] = 2; $table->data = []; $row = []; @@ -7593,13 +7582,10 @@ function ui_get_inventory_module_add_form( ob_start(); - echo '
'; + echo ''; echo html_print_table($table); - echo '
'; echo $form_buttons; - echo '
'; echo '
'; - ?>