diff --git a/pandora_console/general/shortcut_bar.php b/pandora_console/general/shortcut_bar.php deleted file mode 100644 index 124fcc1e92..0000000000 --- a/pandora_console/general/shortcut_bar.php +++ /dev/null @@ -1,408 +0,0 @@ - $id_user)); - } - - echo json_encode($result); - return; - } - - // Update if shortcut is visible or hidden - if ($update_shortcut_state) { - $value = (int) get_parameter('value'); - $result = db_process_sql_update('tusuario', array('shortcut' => $value), array('id_user' => $config['id_user'])); - - echo json_encode($result); - return; - } - - // Get critical events (realtime update) - if ($get_alerts_fired) { - echo sc_get_alerts_fired(); - return; - } - - // Get critical events (realtime update) - if ($get_critical_events) { - echo sc_get_critical_events(); - return; - } - - // Select only opened incidents - if ($get_opened_incidents) { - echo sc_get_opened_incidents(); - return; - } - - return; -} - -function sc_get_alerts_fired () { - global $config; - - $data_reporting = reporting_get_group_stats(); - - return $data_reporting['monitor_alerts_fired']; -} - -function sc_get_critical_events () { - global $config; - - $own_info = get_user_info ($config['id_user']); - - if ($own_info['is_admin'] || check_acl ($config['id_user'], 0, "PM")) - $own_groups = array_keys(users_get_groups($config['id_user'], "IR")); - else - $own_groups = array_keys(users_get_groups($config['id_user'], "IR", false)); - - // Get events in the last 8 hours - $shortcut_events_update = events_get_agent (false, 28800, time(), false, false, false, false, - false, false, $own_groups, true); - if ($shortcut_events_update == false) - $shortcut_events_update = array(); - - $critical_events_update = 0; - foreach ($shortcut_events_update as $event_update) { - if ($event_update['criticity'] == 4 and $event_update['estado'] == 0) { - $critical_events_update++; - } - } - - return $critical_events_update; -} - -function sc_get_opened_incidents () { - global $config; - - $own_info = get_user_info ($config['id_user']); - - if ($own_info['is_admin'] || check_acl ($config['id_user'], 0, "PM")) { - $sql = "SELECT count(*) total_incidents - FROM tincidencia - WHERE estado = 0 - ORDER BY actualizacion"; - $result_incidents_update = db_get_all_rows_sql ($sql); - } - else { - $own_groups = array_keys(users_get_groups($config['id_user'], "IR", false)); - $sql = "SELECT count(*) total_incidents - FROM tincidencia - WHERE id_grupo IN (".implode (",",array_keys ($own_groups)).") - AND estado = 0 - ORDER BY actualizacion"; - if (!empty($own_groups)) { - $result_incidents_update = db_get_all_rows_sql($sql); - } - else { - $result_incidents_update = false; - } - } - - if ($result_incidents_update === false) - $shortcut_incidents = 0; - else - $shortcut_incidents = $result_incidents_update[0]['total_incidents']; - - return $shortcut_incidents; -} - - -$shortcut_state = db_get_value_filter('shortcut', 'tusuario', array('id_user' => $config['id_user'])); - -// If shortcut bar is disabled return to index.php -if ($shortcut_state == 0) - return; - -$own_info = get_user_info ($config['id_user']); - -$shortcut_html = "
"; -$shortcut_html .= "
"; -$shortcut_html .= html_print_image("images/control_play.png", true, array("title" => __("Press here to activate shortcut bar"))); -$shortcut_html .= "
"; -$shortcut_html .= "
"; - -$num_shortcut_items = 0; - -// Alerts item -if ($own_info['is_admin'] || check_acl ($config['id_user'], 0, "PM") || check_acl ($config['id_user'], 0, "AR")) { - $alerts_fired = sc_get_alerts_fired(); - - $shortcut_html .= ""; - $shortcut_html .= html_print_image("images/op_alerts.png", true, array("title" => __("Alerts fired"), "style" => "margin-bottom: 0px;")); - $shortcut_html .= " "; - $shortcut_html .= "" . $alerts_fired . ""; - $shortcut_html .= ""; - - $num_shortcut_items++; -} - -// Events item -if ($own_info['is_admin'] || check_acl ($config['id_user'], 0, "PM") || check_acl ($config['id_user'], 0, "IR")) { - $critical_events = sc_get_critical_events(); - - $shortcut_html .= ""; - $shortcut_html .= html_print_image("images/op_events.png", true, array("title" => __("Critical events"), "style" => "margin-bottom: 0px;")); - $shortcut_html .= " "; - $shortcut_html .= "" . $critical_events . ""; - $shortcut_html .= ""; - - $num_shortcut_items++; -} - -// Calculate opened incidents (id integria incidents are not enabled) - $shortcut_incidents = sc_get_opened_incidents(); - - $shortcut_html .= ""; - $shortcut_html .= html_print_image("images/incidents.png", true, array("title" => __("Incidents opened"), "style" => "margin-bottom: 0px;")); - $shortcut_html .= " "; - $shortcut_html .= "" . $shortcut_incidents . ""; - $shortcut_html .= ""; - - $num_shortcut_items++; - -if ($num_shortcut_items > 0) { - $shortcut_html .= ""; - $shortcut_html .= "|"; - $shortcut_html .= ""; -} - -$shortcut_html .= ""; -$shortcut_html .= html_print_image("images/op_reporting.png", true, array("title" => __("View reports"), "style" => "margin-bottom: 0px;")); -$shortcut_html .= ""; -$num_shortcut_items++; - -$shortcut_html .= ""; -$shortcut_html .= html_print_image("images/email_mc.png", true, array("title" => __("Create new message"), "style" => "margin-bottom: 0px;")); -$shortcut_html .= ""; -$num_shortcut_items++; - -//Quick access -// $shortcut_data = db_get_value('shortcut_data', 'tusuario', 'id_user', $config['id_user']); -// if (!empty($shortcut_data)) { -// $serialize = $shortcut_data; -// $unserialize = json_decode($serialize, true); - -// $items = $unserialize['item_shorcut']; -// } -// else { -// $items = array(); -// } -// $shortcut_html .= "
" . -// __("Shortcut: "); -// $shortcut_html .= "
    "; -// foreach ($items as $item) { -// $shortcut_html .= "
  • " . io_safe_output($item) . "
    • "; -// } -// $shortcut_html .= "
"; - -$shortcut_html .= "
"; -$shortcut_html .= "
"; - -echo $shortcut_html; - -// Login in Console and shortcut bar is disabled -// This will show and hide the shortcut value in Javascript code -if (isset($_POST['nick']) and $shortcut_state != 2) { - html_print_input_hidden("login_console", 1); -} -else { - html_print_input_hidden("login_console", 0); -} - -html_print_input_hidden("shortcut_id_user", $config['id_user']); - -?> - - \ No newline at end of file diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 8f64b33356..dfc7f0b1b0 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -2917,43 +2917,6 @@ td.empty_field { width: 96%; } -/* Shortcut bar */ - -#shortcut_container { - position: fixed; - margin: 0px !important; - bottom: 0px; - left: 0px; - z-index: 9001; -} - -#shortcut_bar { - background-color: #333; - border-top: 1px solid #808080; - border-right: 1px solid #808080; - border-top-right-radius: 5px; -} - -#shortcut_button { - display: inline-block; - background-color: #333; - border: 1px solid #808080; - border-bottom: none; - border-top-left-radius: 15px; - border-top-right-radius: 15px; -} - -.shortcut_item { - padding: 2px 10px; - text-decoration: none; -} - -.shortcut_item>span { - color: #eee; - font-weight: bold; - font-size: 9pt; -} - /* Policies styles */ table#policy_modules td * { diff --git a/pandora_console/include/styles/pandora_black.css b/pandora_console/include/styles/pandora_black.css index 628d5578f0..f8f24703ba 100644 --- a/pandora_console/include/styles/pandora_black.css +++ b/pandora_console/include/styles/pandora_black.css @@ -2909,43 +2909,6 @@ td.empty_field { width: 96%; } -/* Shortcut bar */ - -#shortcut_container { - position: fixed; - margin: 0px !important; - bottom: 0px; - left: 0px; - z-index: 9001; -} - -#shortcut_bar { - background-color: #333; - border-top: 1px solid #808080; - border-right: 1px solid #808080; - border-top-right-radius: 5px; -} - -#shortcut_button { - display: inline-block; - background-color: #333; - border: 1px solid #808080; - border-bottom: none; - border-top-left-radius: 15px; - border-top-right-radius: 15px; -} - -.shortcut_item { - padding: 2px 10px; - text-decoration: none; -} - -.shortcut_item>span { - color: #eee; - font-weight: bold; - font-size: 9pt; -} - /* Policies styles */ table#policy_modules td * { diff --git a/pandora_console/include/styles/pandora_green_old.css b/pandora_console/include/styles/pandora_green_old.css index 54eba63a3f..f63ce6743f 100644 --- a/pandora_console/include/styles/pandora_green_old.css +++ b/pandora_console/include/styles/pandora_green_old.css @@ -2912,43 +2912,6 @@ td.empty_field { width: 96%; } -/* Shortcut bar */ - -#shortcut_container { - position: fixed; - margin: 0px !important; - bottom: 0px; - left: 0px; - z-index: 9001; -} - -#shortcut_bar { - background-color: #333; - border-top: 1px solid #808080; - border-right: 1px solid #808080; - border-top-right-radius: 5px; -} - -#shortcut_button { - display: inline-block; - background-color: #333; - border: 1px solid #808080; - border-bottom: none; - border-top-left-radius: 15px; - border-top-right-radius: 15px; -} - -.shortcut_item { - padding: 2px 10px; - text-decoration: none; -} - -.shortcut_item>span { - color: #eee; - font-weight: bold; - font-size: 9pt; -} - /* Policies styles */ table#policy_modules td * { diff --git a/pandora_console/index.php b/pandora_console/index.php index 77b53c6b4f..0ce25349bc 100755 --- a/pandora_console/index.php +++ b/pandora_console/index.php @@ -831,9 +831,6 @@ else { require("general/logon_ok.php"); } } - if ($config["pure"] == 0) { - require("general/shortcut_bar.php"); - } } if ($config["pure"] == 0) { diff --git a/pandora_console/operation/users/user_edit.php b/pandora_console/operation/users/user_edit.php index 37e5ef47d5..206fbfec7c 100644 --- a/pandora_console/operation/users/user_edit.php +++ b/pandora_console/operation/users/user_edit.php @@ -53,30 +53,6 @@ else { $view_mode = true; } -if (is_ajax ()) { - - $shortcut_update = get_parameter("shortcut_update", 0); - - // Update of user to show/don't show shortcut bar - if ($shortcut_update) { - - // First we get the actual state - $shortcut_value = db_get_value_filter('shortcut', 'tusuario', array('id_user' => $id)); - - //Deactivate shorcut var - if ($shortcut_value == 1) { - db_process_sql_update('tusuario', array('shortcut' => 0), array('id_user' => $id)); - } - // Activate shortcut var - else { - db_process_sql_update('tusuario', array('shortcut' => 1), array('id_user' => $id)); - } - - } - - return; -} - // Header if ($meta) { user_meta_print_header(); @@ -110,7 +86,6 @@ if (isset ($_GET["modified"]) && !$view_mode) { } $upd_info["flash_chart"] = get_parameter ("flash_charts", $config["flash_charts"]); - $upd_info["shortcut"] = get_parameter ("shortcut_bar", 0); $upd_info["section"] = get_parameter ("section", $user_info["section"]); $upd_info["data_section"] = get_parameter ("data_section", ''); $dashboard = get_parameter('dashboard', ''); @@ -296,10 +271,7 @@ $id_usr = $config['id_user']; if (!$meta) { $data = array(); - $data[0] = ''.__('Shortcut bar') . ui_print_help_tip(__('This will activate a shortcut bar with alerts, events, messages... information'), true).''; - $data[0] .= $jump . ''.html_print_checkbox('shortcut_bar', 1, $user_info["shortcut"], true).''; - - $data[1] = ''.__('Home screen'). ui_print_help_tip(__('User can customize the home page. By default, will display \'Agent Detail\'. Example: Select \'Other\' and type sec=estado&sec2=operation/agentes/estado_agente to show agent detail view'), true).''; + $data[0] = ''.__('Home screen'). ui_print_help_tip(__('User can customize the home page. By default, will display \'Agent Detail\'. Example: Select \'Other\' and type sec=estado&sec2=operation/agentes/estado_agente to show agent detail view'), true).''; $values = array ( 'Default' =>__('Default'), 'Visual console'=>__('Visual console'), @@ -312,7 +284,7 @@ if (!$meta) { $values['Dashboard'] = __('Dashboard'); } - $data[1] .= $jump . ''.html_print_select($values, 'section', io_safe_output($user_info["section"]), 'show_data_section();', '', -1, true, false, false).''; + $data[0] .= $jump . ''.html_print_select($values, 'section', io_safe_output($user_info["section"]), 'show_data_section();', '', -1, true, false, false).''; if (enterprise_installed()) { $dashboards = get_user_dashboards ($config['id_user']); @@ -325,7 +297,7 @@ if (!$meta) { $dashboards_aux[$dashboard['name']] = $dashboard['name']; } } - $data[1] .= html_print_select ($dashboards_aux, 'dashboard', $user_info["data_section"], '', '', '', true); + $data[0] .= html_print_select ($dashboards_aux, 'dashboard', $user_info["data_section"], '', '', '', true); } $layouts = visual_map_get_user_layouts ($config['id_user'], true); @@ -338,17 +310,17 @@ if (!$meta) { $layouts_aux[$layout] = $layout; } } - $data[1] .= html_print_select ($layouts_aux, 'visual_console', $user_info["data_section"], '', '', '', true); - $data[1] .= html_print_input_text ('data_section', $user_info["data_section"], '', 60, 255, true, false); + $data[0] .= html_print_select ($layouts_aux, 'visual_console', $user_info["data_section"], '', '', '', true); + $data[0] .= html_print_input_text ('data_section', $user_info["data_section"], '', 60, 255, true, false); // User only can change skins if has more than one group - $data[2] = ''; + $data[1] = ''; if (function_exists('skins_print_select')) { if (count($usr_groups) > 1) { - $data[2] = ''.__('Skin').''; - $data[2] .= $jump . skins_print_select($id_usr,'skin', $user_info['id_skin'], '', __('None'), 0, true); + $data[1] = ''.__('Skin').''; + $data[1] .= $jump . skins_print_select($id_usr,'skin', $user_info['id_skin'], '', __('None'), 0, true); } } $table->rowclass[] = ''; @@ -506,6 +478,7 @@ unset($table); if (!defined('METACONSOLE')) echo '

'.__('Profiles/Groups assigned to this user').'

'; +$table = new stdClass(); $table->width = '100%'; $table->class = 'databox data'; if (defined('METACONSOLE')) {