Merge branch 'develop' into 'ent-4004-Estilos-Discovery'

Conflicts:
  pandora_console/godmode/wizards/HostDevices.class.php
Former-commit-id: de7b4b069e1c5f673b567fcb3271ec867d0fbae1

pandora_agents/unix/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.734-190508
+Version: 7.0NG.734-190510
 Architecture: all
 Priority: optional
 Section: admin

pandora_agents/unix/DEBIAN/make_deb_package.sh

@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.734-190508"
+pandora_version="7.0NG.734-190510"
 
 echo "Test if you has the tools for to make the packages."
 whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null

pandora_agents/unix/pandora_agent

@@ -42,7 +42,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.734';
-use constant AGENT_BUILD => '190508';
+use constant AGENT_BUILD => '190510';
 
 # Agent log default file size maximum and instances
 use constant DEFAULT_MAX_LOG_SIZE => 600000;

pandora_agents/unix/pandora_agent.redhat.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.734
-%define release     190508
+%define release     190510
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}

pandora_agents/unix/pandora_agent.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.734
-%define release     190508
+%define release     190510
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}

pandora_agents/unix/pandora_agent_installer

@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.734"
-PI_BUILD="190508"
+PI_BUILD="190510"
 OS_NAME=`uname -s`
 
 FORCE=0

pandora_agents/win32/installer/pandora.mpi

@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{190508}
+{190510}
 
 ViewReadme
 {Yes}

pandora_agents/win32/pandora.cc

@@ -30,7 +30,7 @@ using namespace Pandora;
 using namespace Pandora_Strutils;
 
 #define PATH_SIZE    _MAX_PATH+1
-#define PANDORA_VERSION ("7.0NG.734(Build 190508)")
+#define PANDORA_VERSION ("7.0NG.734(Build 190510)")
 
 string pandora_path;
 string pandora_dir;

pandora_agents/win32/versioninfo.rc

@@ -11,7 +11,7 @@ BEGIN
       VALUE "LegalCopyright", "Artica ST"
       VALUE "OriginalFilename", "PandoraAgent.exe"
       VALUE "ProductName", "Pandora FMS Windows Agent"
-      VALUE "ProductVersion", "(7.0NG.734(Build 190508))"
+      VALUE "ProductVersion", "(7.0NG.734(Build 190510))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END

pandora_console/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.734-190508
+Version: 7.0NG.734-190510
 Architecture: all
 Priority: optional
 Section: admin

pandora_console/DEBIAN/make_deb_package.sh

@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.734-190508"
+pandora_version="7.0NG.734-190510"
 
 package_pear=0
 package_pandora=1

pandora_console/extras/mr/28.sql

@@ -0,0 +1,5 @@
+START TRANSACTION;
+
+DELETE FROM `tevent_response` WHERE `name` LIKE 'Create Integria IMS incident from event';
+
+COMMIT;

pandora_console/extras/pandora_diag.php

@@ -122,7 +122,7 @@ function execution_time()
     if ($times[0]['datos'] > ($times[1]['datos'] * 1.2)) {
         return "<a class= 'content' style= 'color: red;'>Warning Status</a><a>&nbsp&nbsp The execution time could be degrading. For a more extensive information of this data consult the  Execution Time graph</a>";
     } else {
-        return "<a style ='color: green;'>Normal Status</a><a>&nbsp&nbsp The execution time is correct. For a more extensive information of this data consult the  Execution Time graph</a>";
+        return "<a style ='color: green;'>Normal Status</a><a>&nbsp&nbsp The execution time is correct. For more information about this data, check the Execution Time graph</a>";
     }
 }
 
@@ -173,9 +173,9 @@ function license_capacity()
     $status_license_capacity = '';
         $current_count = db_get_value_sql('SELECT count(*) FROM tagente');
     if ($current_count > ($license_limit * 90 / 100)) {
-        $status_license_capacity = "<a class= 'content' style= 'color: red;text-decoration: none;'>Warning Status</a><a style ='text-decoration: none;'>&nbsp&nbsp The license capacity is more than 90 percent</a>";
+        $status_license_capacity = "<a class= 'content' style= 'color: red;text-decoration: none;'>Warning Status</a><a style ='text-decoration: none;'>&nbsp&nbsp License capacity exceeds 90 percent</a>";
     } else {
-        $status_license_capacity = "<a  style= 'color: green;text-decoration: none;'>Normal Status</a><a style ='text-decoration: none;'>&nbsp&nbsp The license capacity is less than 90 percent</a>";
+        $status_license_capacity = "<a  style= 'color: green;text-decoration: none;'>Normal Status</a><a style ='text-decoration: none;'>&nbsp&nbsp License capacity is less than 90 percent</a>";
     }
 
     return $status_license_capacity;
@@ -202,9 +202,9 @@ function interval_average_of_network_modules()
     $average_time = ((int) $total_module_interval_time / $total_network_modules);
 
     if ($average_time < 180) {
-        $status_average_modules = "<a class= 'content' style= 'color: red;text-decoration: none;'>Warning Status</a><a style ='text-decoration: none;'>&nbsp&nbsp The system has a lot of load (average time $average_time) and a very fine configuration is required</a>";
+        $status_average_modules = "<a class= 'content' style= 'color: red;text-decoration: none;'>Warning Status</a><a style ='text-decoration: none;'>&nbsp&nbsp The system is overloaded (average time $average_time) and a very fine configuration is required</a>";
     } else {
-        $status_average_modules = "<a style ='color: green;text-decoration: none;'>Normal Status</a><a style ='text-decoration: none;'>&nbsp&nbsp The system has an acceptable charge (average time $average_time) </a>";
+        $status_average_modules = "<a style ='color: green;text-decoration: none;'>Normal Status</a><a style ='text-decoration: none;'>&nbsp&nbsp The system is not overloaded (average time $average_time) </a>";
     }
 
     if ($average_time == 0) {
@@ -221,9 +221,9 @@ $attachment_total_files = count(glob($config['homedir'].'/attachment/{*.*}', GLO
 function files_attachment_folder($total_files)
 {
     if ($total_files <= 700) {
-        $status_total_files = "<a style ='color: green;text-decoration: none;'>Normal Status</a><a style ='text-decoration: none;'>&nbsp&nbsp The attachment folder has less than 700 files.</a>";
+        $status_total_files = "<a style ='color: green;text-decoration: none;'>Normal Status</a><a style ='text-decoration: none;'>&nbsp&nbsp The attached folder contains less than 700 files.</a>";
     } else {
-        $status_total_files = "<a class= 'content' style= 'color: red;text-decoration: none;'>Warning Status</a><a style ='text-decoration: none;'>&nbsp&nbsp The attachment folder has more than 700 files.</a>";
+        $status_total_files = "<a class= 'content' style= 'color: red;text-decoration: none;'>Warning Status</a><a style ='text-decoration: none;'>&nbsp&nbsp The attached folder contains more than 700 files.</a>";
     }
 
     return $status_total_files;
@@ -236,9 +236,9 @@ $tagente_datos_size = db_get_value_sql('SELECT COUNT(*) FROM tagente_datos');
 function status_tagente_datos($tagente_datos_size)
 {
     if ($tagente_datos_size <= 3000000) {
-        $tagente_datos_size = "<a style ='color: green;text-decoration: none;'>Normal Status</a><a style ='text-decoration: none;'>&nbsp&nbsp The tagente_datos table has an acceptable amount of data.</a>";
+        $tagente_datos_size = "<a style ='color: green;text-decoration: none;'>Normal Status</a><a style ='text-decoration: none;'>&nbsp&nbsp The tagente_datos table contains an acceptable amount of data.</a>";
     } else {
-        $tagente_datos_size = "<a class= 'content' style ='color: red;text-decoration: none;'>Warning Status</a><a>&nbsp&nbsp The tagente_datos table has too much data. A historical database is recommended.</a>";
+        $tagente_datos_size = "<a class= 'content' style ='color: red;text-decoration: none;'>Warning Status</a><a>&nbsp&nbsp The tagente_datos table contains too much data. A historical database is recommended.</a>";
     }
 
     return $tagente_datos_size;
@@ -302,9 +302,9 @@ function status_fragmentation_tables($tables_fragmentation_max_rec_value, $table
 {
     $status_tables_frag = '';
     if ($tables_fragmentation > $tables_fragmentation_max_rec_value) {
-        $status_tables_frag = "<a class= 'content' style ='color: red; text-decoration: none;'>Warning Status</a><a style ='text-decoration: none;'>&nbsp&nbsp The fragmentation tables is higher than recommended. You should defragment them.</a>";
+        $status_tables_frag = "<a class= 'content' style ='color: red; text-decoration: none;'>Warning Status</a><a style ='text-decoration: none;'>&nbsp&nbsp Table fragmentation is higher than recommended. They should be defragmented.</a>";
     } else {
-        $status_tables_frag = "<a style ='color: green; text-decoration: none;'>Normal Status</a><a style ='text-decoration: none;'>&nbsp&nbsp The fragmentation tables is correct.</a>";
+        $status_tables_frag = "<a style ='color: green; text-decoration: none;'>Normal Status</a><a style ='text-decoration: none;'>&nbsp&nbsp Table fragmentation is correct.</a>";
     }
 
             return $status_tables_frag;
@@ -320,9 +320,9 @@ if ($console_mode == 1) {
     echo "\nPandora FMS PHP diagnostic tool v3.2 (c) Artica ST 2009-2010 \n";
 
     if ($argc == 1 || in_array($argv[1], ['--help', '-help', '-h', '-?'])) {
-        echo "\nThis command line script gives information about Pandora FMS database. 
+        echo "\nThis command line script contains information about Pandora FMS database. 
-This program only can be executed from console, and need a parameter, the
+        This program can only be executed from the console, and it needs a parameter, the
-full path to Pandora FMS 'config.php' file.
+        full path to Pandora FMS 'config.php' file.
 
   Usage:
   php pandora_diag.php path_to_pandora_console
@@ -705,7 +705,7 @@ render_info_data(
 
     render_row($tables_fragmentation_max_rec_value.'%', 'Tables fragmentation (maximum recommended value)');
     render_row(number_format($tables_fragmentation, 2).'%', 'Tables fragmentation (current value)');
-    render_row(status_fragmentation_tables($tables_fragmentation_max_rec_value, $tables_fragmentation), 'Status fragmentation tables');
+    render_row(status_fragmentation_tables($tables_fragmentation_max_rec_value, $tables_fragmentation), 'Table fragmentation status');
 
     echo "<tr><th style='background-color:#b1b1b1;font-weight:bold;font-style:italic;border-radius:2px;' align=center colspan='2'>".__(' Pandora FMS logs dates').'</th></tr>';
 
@@ -734,14 +734,14 @@ render_info_data(
 
     echo "<tr><th style='background-color:#b1b1b1;font-weight:bold;font-style:italic;border-radius:2px;' align=center colspan='2'>".__(' Status of the attachment folder').'</th></tr>';
 
-    render_row($attachment_total_files, 'Total files in the attachment folder');
+    render_row($attachment_total_files, 'Total files in the attached folder');
     render_row(files_attachment_folder($attachment_total_files), 'Status of the attachment folder');
 
     echo "<tr><th style='background-color:#b1b1b1;font-weight:bold;font-style:italic;border-radius:2px;' align=center colspan='2'>".__(' Information from the tagente_datos table').'</th></tr>';
 
-    render_row($tagente_datos_size, 'Total data in the tagente_datos table');
+    render_row($tagente_datos_size, 'Total data in tagente_datos table');
-    render_row(status_tagente_datos($tagente_datos_size), 'Status of the tagente_datos table');
+    render_row(status_tagente_datos($tagente_datos_size), 'Tangente_datos table status');
-    render_row(execution_time(), 'Degradation of the execution time when executing a count');
+    render_row(execution_time(), 'Execution time degradation when executing a count');
 
     echo "<tr><th style='background-color:#b1b1b1;font-weight:bold;font-style:italic;border-radius:2px;' align=center colspan='2'>".__(' Pandora FMS server threads').'</th></tr>';
 
@@ -784,6 +784,6 @@ render_info_data(
     echo "<hr color='#b1b1b1' size=1 width=1000 align=left>";
 
     echo '<span>'.__(
-        '(*) Please check your Pandora Server setup and be sure that database maintenance daemon is running. It\' very important to 
+        '(*) Please check your Pandora Server setup and make sure that the database maintenance daemon is running. It\' is very important to 
-keep up-to-date database to get the best performance and results in Pandora'
+        keep the database up-to-date to get the best performance and results in Pandora'
     ).'</span><br><br><br>';

pandora_console/godmode/agentes/module_manager_editor_common.php

@@ -1170,6 +1170,7 @@ html_print_input_hidden('module_relations_count', $relations_count);
 
 ui_require_jquery_file('json');
 
+
 ?>
 
 <script type="text/javascript">

pandora_console/godmode/alerts/configure_alert_command.php

@@ -33,6 +33,7 @@ if (! check_acl($config['id_user'], 0, 'LM')) {
 $update_command = (bool) get_parameter('update_command');
 $id = (int) get_parameter('id');
 $pure = get_parameter('pure', 0);
+$alert = [];
 
 // Header
 if (defined('METACONSOLE')) {
@@ -86,7 +87,15 @@ if ($update_command) {
         $result = '';
     } else {
         $result = alerts_update_alert_command($id, $values);
+        if ($result) {
             $info = '{"Name":"'.$name.'","Command":"'.$command.'","Description":"'.$description.' '.$info_fields.'"}';
+            $alert['fields_values'] = io_json_mb_encode($fields_values);
+            $alert['fields_descriptions'] = io_json_mb_encode($fields_descriptions);
+            $alert['name'] = $name;
+            $alert['command'] = $command;
+            $alert['description'] = $description;
+            $alert['id_group'] = $id_group;
+        }
     }
 
     if ($result) {
@@ -110,7 +119,10 @@ $fields_descriptions = '';
 $fields_values = '';
 $id_group = 0;
 if ($id) {
+    if (!$result) {
         $alert = alerts_get_alert_command($id);
+    }
+
     $name = $alert['name'];
     $command = $alert['command'];
     $description = $alert['description'];

pandora_console/godmode/servers/plugin.php

@@ -242,7 +242,6 @@ if ($filemanager) {
             $chunck_url = '&create=1';
         }
 
-        $homedir_filemanager = isset($config['homedir_filemanager']) ? $config['homedir_filemanager'] : false;
         filemanager_file_explorer(
             $real_directory,
             $directory,
@@ -253,7 +252,7 @@ if ($filemanager) {
             'index.php?sec=gservers&sec2=godmode/servers/plugin'.$chunck_url.'&plugin_command=[FILE_FULLPATH]&id_plugin='.$id_plugin,
             true,
             0775,
-            $homedir_filemanager
+            false
         );
     }
 

pandora_console/godmode/setup/file_manager.php

@@ -66,8 +66,6 @@ $real_directory = realpath($config['homedir'].'/'.$directory);
 
 echo '<h4>'.__('Index of %s', $directory).'</h4>';
 
-$homedir_filemanager = isset($config['homedir_filemanager']) ? $config['homedir_filemanager'] : false;
-
 filemanager_file_explorer(
     $real_directory,
     $directory,
@@ -78,5 +76,5 @@ filemanager_file_explorer(
     '',
     false,
     '',
-    $homedir_filemanager
+    false
 );

pandora_console/godmode/setup/news.php

@@ -331,7 +331,7 @@ ui_require_javascript_file('tiny_mce', 'include/javascript/tiny_mce/');
             theme : "advanced",
             theme_advanced_toolbar_location : "top",
             theme_advanced_toolbar_align : "left",
-            theme_advanced_buttons1 : "bold,italic, |, image, link, |, cut, copy, paste, |, undo, redo, |, forecolor, |, fontsizeselect, |, justifyleft, justifycenter, justifyright",
+            theme_advanced_buttons1 : "bold,italic, |, image, link, |, cut, copy, paste, |, undo, redo, |, forecolor, |, fontsizeselect, |, justifyleft, justifycenter, justifyright, | ,code",
             theme_advanced_buttons2 : "",
             theme_advanced_buttons3 : "",
             convert_urls : false,

pandora_console/godmode/wizards/Wizard.main.php

@@ -661,22 +661,25 @@ class Wizard
         $output_submit = '';
         $output = '';
 
-        if ($print_white_box === true)
+        if ($print_white_box === true) {
             $output .= '<div class="white_box">';
+        }
 
         $output .= '<ul class="wizard">';
 
         foreach ($inputs as $input) {
-            if ($input['arguments']['type']!='submit')
+            if ($input['arguments']['type'] != 'submit') {
                 $output .= $this->printBlock($input, true);
-            else
+            } else {
                 $output_submit .= $this->printBlock($input, true);
             }
+        }
 
         $output .= '</ul>';
 
-        if ($print_white_box === true)
+        if ($print_white_box === true) {
             $output .= '</div>';
+        }
 
         $output .= '<ul class="wizard">'.$output_submit.'</ul>';
         $output .= '</form>';

pandora_console/include/ajax/events.php

@@ -418,15 +418,15 @@ if ($get_extended_event) {
     }
 
     // Tabs.
-    $tabs = "<ul style='background:#ffffff !important; border-top: 0px; border-left: 0px; border-right: 0px; border-top-left-radius: 0px; border-top-right-radius: 0px; border-bottom-right-radius: 0px; border-bottom-left-radius: 0px; border-color: #D3D3D3;'>";
+    $tabs = "<ul class='events_tabs'>";
-    $tabs .= "<li><a href='#extended_event_general_page' id='link_general'>".html_print_image('images/lightning_go.png', true)."<span style='position:relative;top:-6px;left:5px;margin-right:10px;'>".__('General').'</span></a></li>';
+    $tabs .= "<li><a href='#extended_event_general_page' id='link_general'>".html_print_image('images/lightning_go.png', true).'<span>'.__('General').'</span></a></li>';
     if (events_has_extended_info($event['id_evento']) === true) {
-        $tabs .= "<li><a href='#extended_event_related_page' id='link_related'>".html_print_image('images/zoom.png', true)."<span style='position:relative;top:-6px;left:5px;margin-right:10px;'>".__('Related').'</span></a></li>';
+        $tabs .= "<li><a href='#extended_event_related_page' id='link_related'>".html_print_image('images/zoom.png', true).'<span>'.__('Related').'</span></a></li>';
     }
 
-    $tabs .= "<li><a href='#extended_event_details_page' id='link_details'>".html_print_image('images/zoom.png', true)."<span style='position:relative;top:-6px;left:5px;margin-right:10px;'>".__('Details').'</span></a></li>';
+    $tabs .= "<li><a href='#extended_event_details_page' id='link_details'>".html_print_image('images/zoom.png', true).'<span>'.__('Details').'</span></a></li>';
-    $tabs .= "<li><a href='#extended_event_custom_fields_page' id='link_custom_fields'>".html_print_image('images/custom_field_col.png', true)."<span style='position:relative;top:-6px;left:5px;margin-right:10px;'>".__('Agent fields').'</span></a></li>';
+    $tabs .= "<li><a href='#extended_event_custom_fields_page' id='link_custom_fields'>".html_print_image('images/custom_field_col.png', true).'<span>'.__('Agent fields').'</span></a></li>';
-    $tabs .= "<li><a href='#extended_event_comments_page' id='link_comments'>".html_print_image('images/pencil.png', true)."<span style='position:relative;top:-6px;left:5px;margin-right:10px;'>".__('Comments').'</span></a></li>';
+    $tabs .= "<li><a href='#extended_event_comments_page' id='link_comments'>".html_print_image('images/pencil.png', true).'<span>'.__('Comments').'</span></a></li>';
 
     if (!$readonly
         && ((tags_checks_event_acl(
@@ -546,7 +546,7 @@ if ($get_extended_event) {
 
     $loading = '<div id="response_loading" style="display:none">'.html_print_image('images/spinner.gif', true).'</div>';
 
-    $out = '<div id="tabs" style="height:95%; overflow: auto">'.$tabs.$notifications.$loading.$general.$details.$related.$custom_fields.$comments.$responses.$custom_data.html_print_input_hidden('id_event', $event['id_evento']).'</div>';
+    $out = '<div id="tabs">'.$tabs.$notifications.$loading.$general.$details.$related.$custom_fields.$comments.$responses.$custom_data.html_print_input_hidden('id_event', $event['id_evento']).'</div>';
 
     $js = '<script>
 	$(function() {

pandora_console/include/ajax/events_extended.php

@@ -82,11 +82,9 @@ if ($get_extended_info == 1) {
     $table->width = '100%';
     $table->data = [];
     $table->head = [];
-    $table->style[0] = 'min-width:120px; text-align: left;';
-    $table->style[1] = 'text-align: left;';
     $table->cellspacing = 2;
     $table->cellpadding = 2;
-    $table->class = 'alternate rounded_cells';
+    $table->class = 'events_show_more_table';
 
     $output = [];
     $output[] = '<b>'.__('Timestamp').'</b>';

pandora_console/include/ajax/module.php

@@ -1120,11 +1120,11 @@ if (check_login()) {
                     $draw_events = 0;
                 }
 
-                $link = "winopeng('".'operation/agentes/stat_win.php?'."type=$graph_type&".'period='.SECONDS_1DAY.'&'.'id='.$module['id_agente_modulo'].'&'.'label='.rawurlencode(
+                $link = "winopeng_var('".'operation/agentes/stat_win.php?'."type=$graph_type&".'period='.SECONDS_1DAY.'&'.'id='.$module['id_agente_modulo'].'&'.'label='.rawurlencode(
                     urlencode(
                         base64_encode($module['nombre'])
                     )
-                ).'&'.'refresh='.SECONDS_10MINUTES.'&'."draw_events=$draw_events', 'day_".$win_handle."')";
+                ).'&'.'refresh='.SECONDS_10MINUTES.'&'."draw_events=$draw_events', 'day_".$win_handle."', 1000, 650)";
                 if (!is_snapshot_data($module['datos'])) {
                     $data[8] .= '<a href="javascript:'.$link.'">'.html_print_image('images/chart_curve.png', true, ['border' => '0', 'alt' => '']).'</a> &nbsp;&nbsp;';
                 }

pandora_console/include/api.php

@@ -37,6 +37,9 @@ $api_password = get_parameter('apipass', '');
 $password = get_parameter('pass', '');
 $user = get_parameter('user', '');
 $info = get_parameter('info', '');
+
+$other = parseOtherParameter($otherSerialize, $otherMode);
+
 $other = parseOtherParameter($otherSerialize, $otherMode);
 $apiPassword = io_output_password(db_get_value_filter('value', 'tconfig', ['token' => 'api_password']));
 
@@ -104,6 +107,7 @@ if ($correctLogin) {
             if ($op == 'set' && $id) {
                 switch ($op2) {
                     case 'update_agent':
+
                     case 'add_module_in_conf':
                     case 'update_module_in_conf':
                     case 'delete_module_in_conf':
@@ -184,6 +188,7 @@ if ($correctLogin) {
                     break;
 
                     default:
+
                         // break;
                 }
             }

pandora_console/include/config_process.php

@@ -20,7 +20,7 @@
 /**
  * Pandora build version and version
  */
-$build_version = 'PC190508';
+$build_version = 'PC190510';
 $pandora_version = 'v7.0NG.734';
 
 // Do not overwrite default timezone set if defined.

pandora_console/include/functions.php

@@ -3541,25 +3541,21 @@ function series_type_graph_array($data, $show_elements_graph)
                     break;
                 }
 
-                if (isset($show_elements_graph['labels'])
+                if (isset($show_elements_graph['labels'][$value['agent_module_id']])
                     && is_array($show_elements_graph['labels'])
                     && (count($show_elements_graph['labels']) > 0)
                 ) {
-                    if ($show_elements_graph['unit']) {
+                    $name_legend = $data_return['legend'][$key] = $show_elements_graph['labels'][$value['agent_module_id']].' ';
-                        $name_legend = $data_return['legend'][$key] = $value['agent_alias'].' / '.$value['module_name'].' / '.__('Unit ').' '.$show_elements_graph['unit'].': ';
-                    } else {
-                        $name_legend = $data_return['legend'][$key] = $value['agent_alias'].' / '.$value['module_name'].': ';
-                    }
                 } else {
                     if (strpos($key, 'baseline') !== false) {
-                        if ($show_elements_graph['unit']) {
+                        if ($value['unit']) {
-                            $name_legend = $data_return['legend'][$key] = $value['agent_alias'].' / '.$value['module_name'].' / '.__('Unit ').' '.$show_elements_graph['unit'].'Baseline ';
+                            $name_legend = $data_return['legend'][$key] = $value['agent_alias'].' / '.$value['module_name'].' / '.__('Unit ').' '.$value['unit'].'Baseline ';
                         } else {
                             $name_legend = $data_return['legend'][$key] = $value['agent_alias'].' / '.$value['module_name'].'Baseline ';
                         }
                     } else {
-                        if ($show_elements_graph['unit']) {
+                        if ($value['unit']) {
-                            $name_legend = $data_return['legend'][$key] = $value['agent_alias'].' / '.$value['module_name'].' / '.__('Unit ').' '.$show_elements_graph['unit'].': ';
+                            $name_legend = $data_return['legend'][$key] = $value['agent_alias'].' / '.$value['module_name'].' / '.__('Unit ').' '.$value['unit'].': ';
                         } else {
                             $name_legend = $data_return['legend'][$key] = $value['agent_alias'].' / '.$value['module_name'].': ';
                         }

pandora_console/include/functions_api.php

@@ -1,36 +1,19 @@
 <?php
-/**
- * Extension to manage a list of gateways and the node address where they should
- * point to.
- *
- * @category   API
- * @package    Pandora FMS
- * @subpackage Community
- * @version    1.0.0
- * @license    See below
- *
- *    ______                 ___                    _______ _______ ________
- *   |   __ \.-----.--.--.--|  |.-----.----.-----. |    ___|   |   |     __|
- *  |    __/|  _  |     |  _  ||  _  |   _|  _  | |    ___|       |__     |
- * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
- *
- * ============================================================================
- * Copyright (c) 2005-2019 Artica Soluciones Tecnologicas
- * Please see http://pandorafms.org for full contribution list
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation for version 2.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * ============================================================================
- */
 
+// Pandora FMS- http://pandorafms.com
+// ==================================================
+// Copyright (c) 2005-2009 Artica Soluciones Tecnologicas
+// Please see http://pandorafms.org for full contribution list
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the  GNU Lesser General Public License
+// as published by the Free Software Foundation; version 2
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
 global $config;
 
-// Set character encoding to UTF-8
+// Set character encoding to UTF-8 - fixes a lot of multibyte character headaches
-// fixes a lot of multibyte character headaches.
 require_once 'functions_agents.php';
 require_once 'functions_modules.php';
 require_once $config['homedir'].'/include/functions_profile.php';
@@ -254,7 +237,7 @@ function returnData($returnType, $data, $separator=';')
         case 'json':
             $data = array_apply_io_safe_output($data);
             header('Content-type: application/json');
-            // Allows extra parameters to json_encode, like JSON_FORCE_OBJECT.
+            // Allows extra parameters to json_encode, like JSON_FORCE_OBJECT
             if ($separator == ';') {
                 $separator = null;
             }
@@ -559,6 +542,7 @@ $module_field_column_mampping = [
     'module_critical_inverse'  => 'critical_inverse as module_critical_inverse',
     'module_warning_inverse'   => 'warning_inverse as module_warning_inverse',
 ];
+
 // module related field mappings 2/2 (output field => column for 'tagente_estado')
 // module_id_agent_modulo  is not in this list
 $estado_fields_to_columns_mapping = [
@@ -3030,20 +3014,21 @@ function api_get_policy_modules($thrash1, $thrash2, $other, $thrash3)
 
 
 /**
- * Create a network module in agent.
+ * Create a network module in agent. And return the id_agent_module of new module.
- * And return the id_agent_module of new module.
  *
  * @param string            $id    Name of agent to add the module.
- * @param    string $thrash1 Don't use.
+ * @param $thrash1 Don't use.
- * @param    array  $other   It's array, $other as param is <name_module>;<disabled>;<id_module_type>;
+ * @param array             $other it's array, $other as param is <name_module>;<disabled>;<id_module_type>;
  *              <id_module_group>;<min_warning>;<max_warning>;<str_warning>;<min_critical>;<max_critical>;<str_critical>;<ff_threshold>;
  *              <history_data>;<ip_target>;<module_port>;<snmp_community>;<snmp_oid>;<module_interval>;<post_process>;
  *              <min>;<max>;<custom_id>;<description>;<disabled_types_event>;<module_macros>;
  *              <each_ff>;<ff_threshold_normal>;<ff_threshold_warning>;<ff_threshold_critical>; in this order
- *    and separator char (after text ; ) and separator (pass in param othermode as othermode=url_encode_separator_<separator>).
+ *              and separator char (after text ; ) and separator (pass in param othermode as othermode=url_encode_separator_<separator>)
- * @param    string $thrash3 Don't use.
+ *              example:
- * @example: api.php?op=set&op2=create_network_module&id=pepito&other=prueba|0|7|1|10|15|0|16|18|0|15|0|www.google.es|0||0|180|0|0|0|0|latency%20ping&other_mode=url_encode_separator_|*
+ *
- * @return   mixed Return.
+ *              api.php?op=set&op2=create_network_module&id=pepito&other=prueba|0|7|1|10|15|0|16|18|0|15|0|www.google.es|0||0|180|0|0|0|0|latency%20ping&other_mode=url_encode_separator_|
+ *
+ * @param $thrash3 Don't use
  */
 function api_set_create_network_module($id, $thrash1, $other, $thrash3)
 {
@@ -3105,23 +3090,22 @@ function api_set_create_network_module($id, $thrash1, $other, $thrash3)
         'min_ff_event_critical' => $other['data'][27],
         'critical_inverse'      => $other['data'][28],
         'warning_inverse'       => $other['data'][29],
-        'ff_type'               => $other['data'][30],
     ];
 
     if (! $values['descripcion']) {
         $values['descripcion'] = '';
-        // Column 'descripcion' cannot be null.
+        // Column 'descripcion' cannot be null
     }
 
     if (! $values['module_macros']) {
         $values['module_macros'] = '';
-        // Column 'module_macros' cannot be null.
+        // Column 'module_macros' cannot be null
     }
 
     $idModule = modules_create_agent_module($idAgent, $name, $values, true);
 
     if (is_error($idModule)) {
-        // TODO: Improve the error returning more info.
+        // TODO: Improve the error returning more info
         returnError('error_create_network_module', __('Error in creation network module.'));
     } else {
         returnData('string', ['type' => 'string', 'data' => $idModule]);
@@ -3238,7 +3222,6 @@ function api_set_update_network_module($id_module, $thrash1, $other, $thrash3)
         'critical_inverse',
         'warning_inverse',
         'policy_linked',
-        'ff_type',
     ];
 
     $values = [];
@@ -3343,23 +3326,22 @@ function api_set_create_plugin_module($id, $thrash1, $other, $thrash3)
         'min_ff_event_critical' => $other['data'][32],
         'critical_inverse'      => $other['data'][33],
         'warning_inverse'       => $other['data'][34],
-        'ff_type'               => $other['data'][35],
     ];
 
     if (! $values['descripcion']) {
         $values['descripcion'] = '';
-        // Column 'descripcion' cannot be null.
+        // Column 'descripcion' cannot be null
     }
 
     if (! $values['module_macros']) {
         $values['module_macros'] = '';
-        // Column 'module_macros' cannot be null.
+        // Column 'module_macros' cannot be null
     }
 
     $idModule = modules_create_agent_module($idAgent, $name, $values, true);
 
     if (is_error($idModule)) {
-        // TODO: Improve the error returning more info.
+        // TODO: Improve the error returning more info
         returnError('error_create_plugin_module', __('Error in creation plugin module.'));
     } else {
         returnData('string', ['type' => 'string', 'data' => $idModule]);
@@ -3405,7 +3387,7 @@ function api_set_update_plugin_module($id_module, $thrash1, $other, $thrash3)
         return;
     }
 
-    // If we want to change the module to a new agent.
+    // If we want to change the module to a new agent
     if ($other['data'][0] != '') {
         if (!util_api_check_agent_and_print_error($other['data'][0], 'string', 'AW')) {
             return;
@@ -3422,7 +3404,7 @@ function api_set_update_plugin_module($id_module, $thrash1, $other, $thrash3)
             }
         }
 
-        // Check if agent exists.
+        // Check if agent exists
         $check_id_agent = db_get_value('id_agente', 'tagente', 'id_agente', $other['data'][0]);
         if (!$check_id_agent) {
             returnError('error_update_data_module', __('Error updating plugin module. Id_agent doesn\'t exist.'));
@@ -3466,7 +3448,6 @@ function api_set_update_plugin_module($id_module, $thrash1, $other, $thrash3)
         'critical_inverse',
         'warning_inverse',
         'policy_linked',
-        'ff_type',
     ];
 
     $values = [];
@@ -3565,23 +3546,22 @@ function api_set_create_data_module($id, $thrash1, $other, $thrash3)
         'ff_timeout'            => $other['data'][23],
         'critical_inverse'      => $other['data'][24],
         'warning_inverse'       => $other['data'][25],
-        'ff_type'               => $other['data'][26],
     ];
 
     if (! $values['descripcion']) {
         $values['descripcion'] = '';
-        // Column 'descripcion' cannot be null.
+        // Column 'descripcion' cannot be null
     }
 
     if (! $values['module_macros']) {
         $values['module_macros'] = '';
-        // Column 'module_macros' cannot be null.
+        // Column 'module_macros' cannot be null
     }
 
     $idModule = modules_create_agent_module($idAgent, $name, $values, true);
 
     if (is_error($idModule)) {
-        // TODO: Improve the error returning more info.
+        // TODO: Improve the error returning more info
         returnError('error_create_data_module', __('Error in creation data module.'));
     } else {
         returnData('string', ['type' => 'string', 'data' => $idModule]);
@@ -3838,7 +3818,7 @@ function api_set_update_data_module($id_module, $thrash1, $other, $thrash3)
         return;
     }
 
-    // If we want to change the module to a new agent.
+    // If we want to change the module to a new agent
     if ($other['data'][0] != '') {
         if (!util_api_check_agent_and_print_error($other['data'][0], 'string', 'AW')) {
             return;
@@ -3855,7 +3835,7 @@ function api_set_update_data_module($id_module, $thrash1, $other, $thrash3)
             }
         }
 
-        // Check if agent exists.
+        // Check if agent exists
         $check_id_agent = db_get_value('id_agente', 'tagente', 'id_agente', $other['data'][0]);
         if (!$check_id_agent) {
             returnError('error_update_data_module', __('Error updating data module. Id_agent doesn\'t exist.'));
@@ -3890,7 +3870,6 @@ function api_set_update_data_module($id_module, $thrash1, $other, $thrash3)
         'critical_inverse',
         'warning_inverse',
         'policy_linked',
-        'ff_type',
     ];
 
     $values = [];
@@ -3968,7 +3947,7 @@ function api_set_create_snmp_module($id, $thrash1, $other, $thrash3)
     $disabled_types_event[EVENTS_GOING_UNKNOWN] = (int) !$other['data'][27];
     $disabled_types_event = json_encode($disabled_types_event);
 
-    // SNMP version 3.
+    // SNMP version 3
     if ($other['data'][14] == '3') {
         if ($other['data'][23] != 'AES' and $other['data'][23] != 'DES') {
             returnError('error_create_snmp_module', __('Error in creation SNMP module. snmp3_priv_method doesn\'t exist. Set it to \'AES\' or \'DES\'. '));
@@ -4021,7 +4000,6 @@ function api_set_create_snmp_module($id, $thrash1, $other, $thrash3)
             'min_ff_event_normal'   => $other['data'][31],
             'min_ff_event_warning'  => $other['data'][32],
             'min_ff_event_critical' => $other['data'][33],
-            'ff_type'               => $other['data'][34],
         ];
     } else {
         $values = [
@@ -4054,19 +4032,18 @@ function api_set_create_snmp_module($id, $thrash1, $other, $thrash3)
             'min_ff_event_normal'   => $other['data'][25],
             'min_ff_event_warning'  => $other['data'][26],
             'min_ff_event_critical' => $other['data'][27],
-            'ff_type'               => $other['data'][28],
         ];
     }
 
     if (! $values['descripcion']) {
         $values['descripcion'] = '';
-        // Column 'descripcion' cannot be null.
+        // Column 'descripcion' cannot be null
     }
 
     $idModule = modules_create_agent_module($idAgent, $name, $values, true);
 
     if (is_error($idModule)) {
-        // TODO: Improve the error returning more info.
+        // TODO: Improve the error returning more info
         returnError('error_create_snmp_module', __('Error in creation SNMP module.'));
     } else {
         returnData('string', ['type' => 'string', 'data' => $idModule]);
@@ -4114,7 +4091,7 @@ function api_set_update_snmp_module($id_module, $thrash1, $other, $thrash3)
         return;
     }
 
-    // If we want to change the module to a new agent.
+    // If we want to change the module to a new agent
     if ($other['data'][0] != '') {
         if (!util_api_check_agent_and_print_error($other['data'][0], 'string', 'AW')) {
             return;
@@ -4131,7 +4108,7 @@ function api_set_update_snmp_module($id_module, $thrash1, $other, $thrash3)
             }
         }
 
-        // Check if agent exists.
+        // Check if agent exists
         $check_id_agent = db_get_value('id_agente', 'tagente', 'id_agente', $other['data'][0]);
         if (!$check_id_agent) {
             returnError('error_update_data_module', __('Error updating snmp module. Id_agent doesn\'t exist.'));
@@ -4139,7 +4116,7 @@ function api_set_update_snmp_module($id_module, $thrash1, $other, $thrash3)
         }
     }
 
-    // SNMP version 3.
+    // SNMP version 3
     if ($other['data'][13] == '3') {
         if ($other['data'][22] != 'AES' and $other['data'][22] != 'DES') {
             returnError(
@@ -4203,7 +4180,6 @@ function api_set_update_snmp_module($id_module, $thrash1, $other, $thrash3)
             'min_ff_event_warning',
             'min_ff_event_critical',
             'policy_linked',
-            'ff_type',
         ];
     } else {
         $snmp_module_fields = [
@@ -4235,7 +4211,6 @@ function api_set_update_snmp_module($id_module, $thrash1, $other, $thrash3)
             'min_ff_event_warning',
             'min_ff_event_critical',
             'policy_linked',
-            'ff_type',
         ];
     }
 
@@ -4333,7 +4308,6 @@ function api_set_new_network_component($id, $thrash1, $other, $thrash2)
         'min_ff_event_normal'   => $other['data'][20],
         'min_ff_event_warning'  => $other['data'][21],
         'min_ff_event_critical' => $other['data'][22],
-        'ff_type'               => $other['data'][23],
     ];
 
     $name_check = db_get_value('name', 'tnetwork_component', 'name', $id);
@@ -4434,7 +4408,6 @@ function api_set_new_plugin_component($id, $thrash1, $other, $thrash2)
         'min_ff_event_normal'   => $other['data'][24],
         'min_ff_event_warning'  => $other['data'][25],
         'min_ff_event_critical' => $other['data'][26],
-        'ff_type'               => $other['data'][27],
     ];
 
     $name_check = db_get_value('name', 'tnetwork_component', 'name', $id);
@@ -4570,7 +4543,6 @@ function api_set_new_snmp_component($id, $thrash1, $other, $thrash2)
             'min_ff_event_normal'   => $other['data'][29],
             'min_ff_event_warning'  => $other['data'][30],
             'min_ff_event_critical' => $other['data'][31],
-            'ff_type'               => $other['data'][32],
         ];
     } else {
         $values = [
@@ -4602,7 +4574,6 @@ function api_set_new_snmp_component($id, $thrash1, $other, $thrash2)
             'min_ff_event_normal'   => $other['data'][25],
             'min_ff_event_warning'  => $other['data'][26],
             'min_ff_event_critical' => $other['data'][27],
-            'ff_type'               => $other['data'][28],
         ];
     }
 
@@ -4683,7 +4654,6 @@ function api_set_new_local_component($id, $thrash1, $other, $thrash2)
         'min_ff_event_warning'       => $other['data'][8],
         'min_ff_event_critical'      => $other['data'][9],
         'ff_timeout'                 => $other['data'][10],
-        'ff_type'                    => $other['data'][11],
     ];
 
     $name_check = enterprise_hook(
@@ -6439,7 +6409,6 @@ function api_set_add_data_module_policy($id, $thrash1, $other, $thrash3)
     $values['min_ff_event_warning'] = $other['data'][21];
     $values['min_ff_event_critical'] = $other['data'][22];
     $values['ff_timeout'] = $other['data'][23];
-    $values['ff_type'] = $other['data'][24];
 
     if ($name_module_policy !== false) {
         if ($name_module_policy[0]['name'] == $other['data'][0]) {
@@ -6681,7 +6650,6 @@ function api_set_add_network_module_policy($id, $thrash1, $other, $thrash3)
     $values['min_ff_event_normal'] = $other['data'][24];
     $values['min_ff_event_warning'] = $other['data'][25];
     $values['min_ff_event_critical'] = $other['data'][26];
-    $values['ff_type'] = $other['data'][27];
 
     if ($name_module_policy !== false) {
         if ($name_module_policy[0]['name'] == $other['data'][0]) {
@@ -6891,7 +6859,6 @@ function api_set_add_plugin_module_policy($id, $thrash1, $other, $thrash3)
     $values['min_ff_event_normal'] = $other['data'][29];
     $values['min_ff_event_warning'] = $other['data'][30];
     $values['min_ff_event_critical'] = $other['data'][31];
-    $values['ff_type'] = $other['data'][32];
 
     if ($name_module_policy !== false) {
         if ($name_module_policy[0]['name'] == $other['data'][0]) {
@@ -7309,7 +7276,6 @@ function api_set_add_snmp_module_policy($id, $thrash1, $other, $thrash3)
             'min_ff_event_normal'   => $other['data'][30],
             'min_ff_event_warning'  => $other['data'][31],
             'min_ff_event_critical' => $other['data'][32],
-            'ff_type'               => $other['data'][33],
         ];
     } else {
         $values = [
@@ -7339,7 +7305,6 @@ function api_set_add_snmp_module_policy($id, $thrash1, $other, $thrash3)
             'min_ff_event_normal'   => $other['data'][24],
             'min_ff_event_warning'  => $other['data'][25],
             'min_ff_event_critical' => $other['data'][26],
-            'ff_type'               => $other['data'][27],
         ];
     }
 
@@ -8829,14 +8794,7 @@ function api_set_alert_actions($id, $id2, $other, $trash1)
         }
 
         $firesMin = $other['data'][2];
-        if (!$firesMin) {
-            $firesMin = 0;
-        }
-
         $firesMax = $other['data'][3];
-        if (!$firesMax) {
-            $firesMax = 0;
-        }
 
         $values = [
             'id_alert_template_module' => $idAlertTemplateModule,
@@ -13311,7 +13269,6 @@ function api_set_apply_module_template($id_template, $id_agent, $thrash3, $thras
                     'min_ff_event_normal'   => $row2['min_ff_event_normal'],
                     'min_ff_event_warning'  => $row2['min_ff_event_warning'],
                     'min_ff_event_critical' => $row2['min_ff_event_critical'],
-                    'ff_type'               => $row2['ff_type'],
                 ];
 
                 $name = $row2['name'];

pandora_console/include/functions_events.php

@@ -1987,9 +1987,9 @@ function events_page_responses($event, $childrens_ids=[])
     $table_responses->width = '100%';
     $table_responses->data = [];
     $table_responses->head = [];
-    $table_responses->style[0] = 'width:35%; font-weight: bold; text-align: left; height: 23px;';
+    $table_responses->style[0] = 'height:30px';
-    $table_responses->style[1] = 'text-align: left; height: 23px; text-align: right;';
+    $table_responses->style[2] = 'text-align:right;';
-    $table_responses->class = 'alternate rounded_cells';
+    $table_responses->class = 'events_show_more_table';
 
     if (tags_checks_event_acl($config['id_user'], $event['id_grupo'], 'EM', $event['clean_tags'], $childrens_ids)) {
         // Owner.
@@ -2056,7 +2056,7 @@ function events_page_responses($event, $childrens_ids=[])
             -1,
             true
         );
-        $data[1] .= html_print_button(
+        $data[2] .= html_print_button(
             __('Update'),
             'owner_button',
             false,
@@ -2136,7 +2136,7 @@ function events_page_responses($event, $childrens_ids=[])
     );
 
     if (!$status_blocked) {
-        $data[1] .= html_print_button(
+        $data[2] .= html_print_button(
             __('Update'),
             'status_button',
             false,
@@ -2151,7 +2151,8 @@ function events_page_responses($event, $childrens_ids=[])
     // Comments.
     $data = [];
     $data[0] = __('Comment');
-    $data[1] = html_print_button(
+    $data[1] = '';
+    $data[2] = html_print_button(
         __('Add comment'),
         'comment_button',
         false,
@@ -2173,8 +2174,9 @@ function events_page_responses($event, $childrens_ids=[])
         // Delete.
         $data = [];
         $data[0] = __('Delete event');
-        $data[1] = '<form method="post">';
+        $data[1] = '';
-        $data[1] .= html_print_button(
+        $data[2] = '<form method="post">';
+        $data[2] .= html_print_button(
             __('Delete event'),
             'delete_button',
             false,
@@ -2182,13 +2184,13 @@ function events_page_responses($event, $childrens_ids=[])
             'class="sub cancel"',
             true
         );
-        $data[1] .= html_print_input_hidden('delete', 1, true);
+        $data[2] .= html_print_input_hidden('delete', 1, true);
-        $data[1] .= html_print_input_hidden(
+        $data[2] .= html_print_input_hidden(
             'validate_ids',
             $event['id_evento'],
             true
         );
-        $data[1] .= '</form>';
+        $data[2] .= '</form>';
 
         $table_responses->data[] = $data;
     }
@@ -2229,7 +2231,7 @@ function events_page_responses($event, $childrens_ids=[])
             $server_id = 0;
         }
 
-        $data[1] .= html_print_button(
+        $data[2] .= html_print_button(
             __('Execute'),
             'custom_response_button',
             false,
@@ -2249,14 +2251,14 @@ function events_page_responses($event, $childrens_ids=[])
 				$('.params_rows').remove();
 				
 				$('#responses_table')
-					.append('<tr class=\"params_rows\"><td style=\"text-align:left; font-weight: bolder;\">".__('Description')."</td><td style=\"text-align:left;\">'+description+'</td></tr>');
+					.append('<tr class=\"params_rows\"><td>".__('Description')."</td><td style=\"text-align:left; height:30px;\" colspan=\"2\">'+description+'</td></tr>');
 				
 				if (params.length == 1 && params[0] == '') {
 					return;
 				}
 				
 				$('#responses_table')
-					.append('<tr class=\"params_rows\"><td style=\"text-align:left; padding-left:20px;\" colspan=\"2\">".__('Parameters')."</td></tr>');
+					.append('<tr class=\"params_rows\"><td style=\"text-align:left; padding-left:20px; height:30px;\" colspan=\"3\">".__('Parameters')."</td></tr>');
 				
 				for (i = 0; i < params.length; i++) {
 					add_row_param('responses_table',params[i]);
@@ -2521,9 +2523,7 @@ function events_page_custom_fields($event)
     $table->width = '100%';
     $table->data = [];
     $table->head = [];
-    $table->style[0] = 'width:35%; font-weight: bold; text-align: left; height: 23px;';
+    $table->class = 'events_show_more_table';
-    $table->style[1] = 'text-align: left; height: 23px;';
-    $table->class = 'alternate rounded_cells';
 
     $all_customs_fields = (bool) check_acl(
         $config['id_user'],
@@ -2671,11 +2671,9 @@ function events_page_details($event, $server='')
     $table_details->width = '100%';
     $table_details->data = [];
     $table_details->head = [];
-    $table_details->cellspacing = 2;
+    $table_details->cellspacing = 0;
-    $table_details->cellpadding = 2;
+    $table_details->cellpadding = 0;
-    $table_details->style[0] = 'width:35%; font-weight: bold; text-align: left; height: 23px;';
+    $table_details->class = 'events_show_more_table';
-    $table_details->style[1] = 'text-align: left; height: 23px;';
-    $table_details->class = 'alternate rounded_cells';
 
     /*
      * Useless switch.
@@ -2985,9 +2983,7 @@ function events_page_custom_data($event)
     $table->width = '100%';
     $table->data = [];
     $table->head = [];
-    $table->style[0] = 'width:35%; font-weight: bold; text-align: left;';
+    $table->class = 'events_show_more_table';
-    $table->style[1] = 'text-align: left;';
-    $table->class = 'alternate rounded_cells';
 
     $json_custom_data = base64_decode($event['custom_data']);
     $custom_data = json_decode($json_custom_data);
@@ -3137,14 +3133,12 @@ function events_page_general($event)
 
     // General.
     $table_general = new stdClass;
-    $table_general->cellspacing = 2;
+    $table_general->cellspacing = 0;
-    $table_general->cellpadding = 2;
+    $table_general->cellpadding = 0;
     $table_general->width = '100%';
     $table_general->data = [];
     $table_general->head = [];
-    $table_general->style[0] = 'width:35%; font-weight: bold; text-align: left; height: 23px;';
+    $table_general->class = 'events_show_more_table';
-    $table_general->style[1] = 'text-align: left; height: 23px;';
-    $table_general->class = 'alternate rounded_cells';
 
     $data = [];
     $data[0] = __('Event ID');
@@ -3185,10 +3179,12 @@ function events_page_general($event)
 
     $data = [];
     $data[0] = __('Type');
-    $data[1] = events_print_type_img(
+    $data[1] = events_print_type_description($event['event_type'], true);
+    $data[2] = events_print_type_img(
         $event['event_type'],
         true
-    ).' '.events_print_type_description($event['event_type'], true);
+    );
+
     $table_general->data[] = $data;
 
     $data = [];
@@ -3208,8 +3204,8 @@ function events_page_general($event)
     $data = [];
     $data[0] = __('Severity');
     $event_criticity = get_priority_name($event['criticity']);
-
+    $data[1] = $event_criticity;
-    $data[1] = html_print_image(
+    $data[2] = html_print_image(
         $img_sev,
         true,
         [
@@ -3219,7 +3215,6 @@ function events_page_general($event)
             'title'  => $event_criticity,
         ]
     );
-    $data[1] .= ' '.$event_criticity;
     $table_general->data[] = $data;
 
     // Get Status.
@@ -3227,7 +3222,8 @@ function events_page_general($event)
 
     $data = [];
     $data[0] = __('Status');
-    $data[1] = html_print_image($event_st['img'], true).' '.$event_st['title'];
+    $data[1] = $event_st['title'];
+    $data[2] = html_print_image($event_st['img'], true);
     $table_general->data[] = $data;
 
     // If event is validated, show who and when acknowleded it.
@@ -3250,12 +3246,11 @@ function events_page_general($event)
 
     $data = [];
     $data[0] = __('Group');
-    $data[1] = '';
+    $data[1] = groups_get_name($event['id_grupo']);
     if (!$config['show_group_name']) {
-        $data[1] = ui_print_group_icon($event['id_grupo'], true);
+        $data[2] = ui_print_group_icon($event['id_grupo'], true);
     }
 
-    $data[1] .= groups_get_name($event['id_grupo']);
     $table_general->data[] = $data;
 
     $data = [];
@@ -3293,6 +3288,16 @@ function events_page_general($event)
 
     $table_general->data[] = $data;
 
+    $table_data = $table_general->data;
+    $table_data_total = count($table_data);
+
+    for ($i = 0; $i <= $table_data_total; $i++) {
+        if (count($table_data[$i]) == 2) {
+            $table_general->colspan[$i][1] = 2;
+            $table_general->style[2] = 'text-align:center; width:10%;';
+        }
+    }
+
     $general = '<div id="extended_event_general_page" class="extended_event_pages">'.html_print_table($table_general, true).'</div>';
 
     return $general;
@@ -3316,9 +3321,7 @@ function events_page_comments($event, $childrens_ids=[])
     $table_comments->width = '100%';
     $table_comments->data = [];
     $table_comments->head = [];
-    $table_comments->style[0] = 'width:35%; vertical-align: top; text-align: left;';
+    $table_comments->class = 'events_show_more_table';
-    $table_comments->style[1] = 'text-align: left;';
-    $table_comments->class = 'alternate rounded_cells';
 
     $event_comments = $event['user_comment'];
     $event_comments = str_replace(["\n", '&#x0a;'], '<br>', $event_comments);
@@ -3423,9 +3426,9 @@ function events_page_comments($event, $childrens_ids=[])
         $childrens_ids
     ))) && $config['show_events_in_local'] == false || $config['event_replication'] == false
     ) {
-        $comments_form = '<br><div id="comments_form" style="width:98%;">'.html_print_textarea('comment', 3, 10, '', 'style="min-height: 15px; width: 100%; disabled"', true);
+        $comments_form = '<br><div id="comments_form" style="width:98%;">'.html_print_textarea('comment', 3, 10, '', 'style="min-height: 15px; padding:0; width: 100%; disabled"', true);
 
-        $comments_form .= '<br><div style="text-align:right;">'.html_print_button(__('Add comment'), 'comment_button', false, 'event_comment();', 'class="sub next"', true).'</div><br></div>';
+        $comments_form .= '<br><div style="text-align:right; margin-top:10px;">'.html_print_button(__('Add comment'), 'comment_button', false, 'event_comment();', 'class="sub next"', true).'</div><br></div>';
     } else {
         $comments_form = ui_print_message(
             __('If event replication is ongoing, it won\'t be possible to enter comments here. This option is only to allow local pandora users to see comments, but not to operate with them. The operation, when event replication is enabled, must be done only in the Metaconsole.')

pandora_console/include/functions_filemanager.php

@@ -120,18 +120,13 @@ if (!function_exists('mime_content_type')) {
 
 global $config;
 
-if (isset($config['homedir_filemanager'])) {
-    $homedir_filemanager = trim(io_safe_output($config['homedir_filemanager']));
-} else {
-    $homedir_filemanager = trim($config['homedir']);
-}
 
+$homedir_filemanager = trim($config['homedir']);
 $sec2 = get_parameter('sec2');
 if ($sec2 == 'enterprise/godmode/agentes/collections' || $sec2 == 'advanced/collections') {
     $homedir_filemanager .= '/attachment/collection/';
 }
 
-
 $upload_file_or_zip = (bool) get_parameter('upload_file_or_zip');
 
 if ($upload_file_or_zip) {
@@ -738,6 +733,7 @@ function filemanager_file_explorer(
             $data[4] .= html_print_input_hidden('delete_file', 1, true);
 
             $relative_dir = str_replace($homedir_filemanager, '', str_replace('\\', '/', dirname($fileinfo['realpath'])));
+
             if ($relative_dir[0] == '/') {
                 $relative_dir = substr($relative_dir, 1);
             }

pandora_console/include/functions_graph.php

@@ -256,6 +256,7 @@ function grafico_modulo_sparse_data(
     $array_data['sum'.$series_suffix]['agent_name']     = $data_module_graph['agent_name'];
     $array_data['sum'.$series_suffix]['module_name']    = $data_module_graph['module_name'];
     $array_data['sum'.$series_suffix]['agent_alias']    = $data_module_graph['agent_alias'];
+    $array_data['sum'.$series_suffix]['unit']    = $data_module_graph['unit'];
 
     // This is for a specific type of report that consists in passing an interval and doing the average sum and avg.
     if ($params['force_interval'] != '') {
@@ -759,6 +760,7 @@ function grafico_modulo_sparse($params)
         $data_module_graph['c_min']             = $module_data['min_critical'];
         $data_module_graph['c_max']             = $module_data['max_critical'];
         $data_module_graph['c_inv']             = $module_data['critical_inverse'];
+        $data_module_graph['unit']              = $module_data['unit'];
     } else {
         $data_module_graph = false;
     }
@@ -1225,11 +1227,11 @@ function graphic_combined_module(
             foreach ($sources as $source) {
                 array_push($modules, $source['id_agent_module']);
                 array_push($weights, $source['weight']);
-                if ($source['label'] != '') {
+                if ($source['label'] != '' || $params_combined['labels']) {
                     $item['type']            = 'custom_graph';
                     $item['id_agent']        = agents_get_module_id($source['id_agent_module']);
                     $item['id_agent_module'] = $source['id_agent_module'];
-                    $labels[$source['id_agent_module']] = reporting_label_macro($item, $source['label']);
+                    $labels[$source['id_agent_module']] = ($source['label'] != '') ? reporting_label_macro($item, $source['label']) : reporting_label_macro($item, $params_combined['labels']);
                 }
             }
         }
@@ -1357,6 +1359,7 @@ function graphic_combined_module(
                 $data_module_graph['c_max']          = $module_data['max_critical'];
                 $data_module_graph['c_inv']          = $module_data['critical_inverse'];
                 $data_module_graph['module_id']      = $agent_module_id;
+                $data_module_graph['unit']           = $module_data['unit'];
 
                 // stract data
                 $array_data_module = grafico_modulo_sparse_data(

pandora_console/include/functions_html.php

@@ -1790,7 +1790,6 @@ function html_print_button($label='OK', $name='', $disabled=false, $script='', $
  */
 function html_print_textarea($name, $rows, $columns, $value='', $attributes='', $return=false, $class='')
 {
-
     $output = '<textarea id="textarea_'.$name.'" name="'.$name.'" cols="'.$columns.'" rows="'.$rows.'" '.$attributes.'" class="'.$class.'">';
     // $output .= io_safe_input ($value);
     $output .= ($value);

pandora_console/include/functions_reporting.php

@@ -4439,6 +4439,9 @@ function reporting_value($report, $content, $type, $pdf=false)
     $return['description'] = $content['description'];
     $return['date'] = reporting_get_date_text($report, $content);
     $return['label'] = (isset($content['style']['label'])) ? $content['style']['label'] : '';
+    $return['agents'] = [$content['id_agent']];
+    $return['id_agent'] = $content['id_agent'];
+    $return['id_agent_module'] = $content['id_agent_module'];
 
     $return['agent_name'] = $agent_name;
     $return['module_name'] = $module_name;
@@ -7267,6 +7270,7 @@ function reporting_custom_graph(
                 'modules_series' => $graphs[0]['modules_series'],
                 'id_graph'       => $id_graph,
                 'type_report'    => $type_report,
+                'labels'         => $content['style']['label'],
             ];
 
             $return['chart'] = graphic_combined_module(
@@ -11659,7 +11663,7 @@ function reporting_translate_sla_status_for_graph($status)
  *
  * @return html Return table of header.
  */
-function reporting_header_table_for_pdf(string $title='', string $description='')
+function reporting_header_table_for_pdf($title='', $description='')
 {
     $result_pdf .= '<pagebreak>';
     $result_pdf .= '<table class="header_table databox">';

pandora_console/include/functions_reporting_html.php

@@ -1026,11 +1026,9 @@ function reporting_html_event_report_group($table, $item, $pdf=0)
         if ($pdf) {
             $table0 = new stdClass();
             $table0->width = '99%';
-            $table0->class = 'table-beauty';
             $table0->data['count_row']['count'] = 'Total events: '.$item['total_events'];
             $pdf_export = html_print_table($table0, true);
 
-            $table1->class = 'table-beauty';
             $pdf_export .= html_print_table($table1, true);
             $pdf_export .= '<br>';
         } else {
@@ -1046,7 +1044,6 @@ function reporting_html_event_report_group($table, $item, $pdf=0)
             $table1->data[0][0] = $item['chart']['by_agent'];
 
             if ($pdf) {
-                $table1->class = 'table-beauty';
                 $pdf_export .= html_print_table($table1, true);
                 $pdf_export .= '<br>';
             } else {
@@ -1064,7 +1061,6 @@ function reporting_html_event_report_group($table, $item, $pdf=0)
             $table1->data[0][0] = $item['chart']['by_user_validator'];
 
             if ($pdf) {
-                $table1->class = 'table-beauty';
                 $pdf_export .= html_print_table($table1, true);
                 $pdf_export .= '<br>';
             } else {
@@ -1082,7 +1078,6 @@ function reporting_html_event_report_group($table, $item, $pdf=0)
             $table1->data[0][0] = $item['chart']['by_criticity'];
 
             if ($pdf) {
-                $table1->class = 'table-beauty';
                 $pdf_export .= html_print_table($table1, true);
                 $pdf_export .= '<br>';
             } else {
@@ -1100,7 +1095,6 @@ function reporting_html_event_report_group($table, $item, $pdf=0)
             $table1->data[0][0] = $item['chart']['validated_vs_unvalidated'];
 
             if ($pdf) {
-                $table1->class = 'table-beauty';
                 $pdf_export .= html_print_table($table1, true);
                 $pdf_export .= '<br>';
             } else {
@@ -1117,7 +1111,6 @@ function reporting_html_event_report_group($table, $item, $pdf=0)
         if ($pdf) {
             $table0 = new stdClass();
             $table0->width = '99%';
-            $table0->class = 'table-beauty';
             $table0->data['count_row']['count'] = 'Total events: '.$item['total_events'];
             $pdf_export = html_print_table($table0, true);
 
@@ -1233,11 +1226,9 @@ function reporting_html_event_report_module($table, $item, $pdf=0)
                 if ($pdf) {
                     $table0 = new stdClass();
                     $table0->width = '99%';
-                    $table0->class = 'table-beauty';
                     $table0->data['count_row']['count'] = 'Total events: '.$item['total_events'];
                     $pdf_export = html_print_table($table0, true);
 
-                    $table1->class = 'table-beauty';
                     $pdf_export .= html_print_table($table1, true);
                     $pdf_export .= '<br>';
                 } else {
@@ -1253,7 +1244,6 @@ function reporting_html_event_report_module($table, $item, $pdf=0)
                     $table1->data[0][0] = $item['chart']['by_agent'];
 
                     if ($pdf) {
-                        $table1->class = 'table-beauty';
                         $pdf_export .= html_print_table($table1, true);
                         $pdf_export .= '<br>';
                     } else {
@@ -1271,7 +1261,6 @@ function reporting_html_event_report_module($table, $item, $pdf=0)
                     $table1->data[0][0] = $item['chart']['by_user_validator'];
 
                     if ($pdf) {
-                        $table1->class = 'table-beauty';
                         $pdf_export .= html_print_table($table1, true);
                         $pdf_export .= '<br>';
                     } else {
@@ -1289,7 +1278,6 @@ function reporting_html_event_report_module($table, $item, $pdf=0)
                     $table1->data[0][0] = $item['chart']['by_criticity'];
 
                     if ($pdf) {
-                        $table1->class = 'table-beauty';
                         $pdf_export .= html_print_table($table1, true);
                         $pdf_export .= '<br>';
                     } else {
@@ -1307,7 +1295,6 @@ function reporting_html_event_report_module($table, $item, $pdf=0)
                     $table1->data[0][0] = $item['chart']['validated_vs_unvalidated'];
 
                     if ($pdf) {
-                        $table1->class = 'table-beauty';
                         $pdf_export .= html_print_table($table1, true);
                         $pdf_export .= '<br>';
                     } else {
@@ -1326,7 +1313,6 @@ function reporting_html_event_report_module($table, $item, $pdf=0)
         if ($pdf) {
             $table0 = new stdClass();
             $table0->width = '99%';
-            $table0->class = 'table-beauty';
             $table0->data['count_row']['count'] = 'Total events: '.$item['total_events'];
             $pdf_export = html_print_table($table0, true);
 
@@ -2021,11 +2007,9 @@ function reporting_html_event_report_agent($table, $item, $pdf=0)
         if ($pdf) {
             $table0 = new stdClass();
             $table0->width = '99%';
-            $table0->class = 'table-beauty';
             $table0->data['count_row']['count'] = 'Total events: '.$item['total_events'];
             $pdf_export = html_print_table($table0, true);
 
-            $table1->class = 'table-beauty';
             $pdf_export .= html_print_table($table1, true);
             $pdf_export .= '<br>';
         } else {
@@ -2042,7 +2026,6 @@ function reporting_html_event_report_agent($table, $item, $pdf=0)
             $table1->data[0][0] = $item['chart']['by_user_validator'];
 
             if ($pdf) {
-                $table1->class = 'table-beauty';
                 $pdf_export .= html_print_table($table1, true);
                 $pdf_export .= '<br>';
             } else {
@@ -2060,7 +2043,6 @@ function reporting_html_event_report_agent($table, $item, $pdf=0)
             $table1->data[0][0] = $item['chart']['by_criticity'];
 
             if ($pdf) {
-                $table1->class = 'table-beauty';
                 $pdf_export .= html_print_table($table1, true);
                 $pdf_export .= '<br>';
             } else {
@@ -2078,7 +2060,6 @@ function reporting_html_event_report_agent($table, $item, $pdf=0)
             $table1->data[0][0] = $item['chart']['validated_vs_unvalidated'];
 
             if ($pdf) {
-                $table1->class = 'table-beauty';
                 $pdf_export .= html_print_table($table1, true);
                 $pdf_export .= '<br>';
             } else {
@@ -2095,7 +2076,6 @@ function reporting_html_event_report_agent($table, $item, $pdf=0)
         if ($pdf) {
             $table0 = new stdClass();
             $table0->width = '99%';
-            $table0->class = 'table-beauty';
             $table0->data['count_row']['count'] = 'Total events: '.$item['total_events'];
             $pdf_export = html_print_table($table0, true);
 
@@ -2438,7 +2418,7 @@ function reporting_html_alert_report($table, $item, $pdf=0)
 
     $table->data['alerts']['cell'] = html_print_table($table1, true);
     if ($pdf) {
-        $table1->class = 'table-beauty pdf_alert_table';
+        $table1->class = 'pdf_alert_table';
         return html_print_table($table1, true);
     }
 }
@@ -4937,7 +4917,7 @@ function reporting_html_planned_downtimes_table($planned_downtimes)
 
     if ($for_pdf) {
         $table->titlestyle = 'background: #373737; color: #FFF; display: table-cell; font-size: 12px; border: 1px solid grey';
-        $table->class = 'table_sla table_beauty';
+        $table->class = 'table_sla';
 
         for ($i = 0; $i < count($table->head); $i++) {
             $table->headstyle[$i] = 'background: #666; color: #FFF; display: table-cell; font-size: 11px; border: 1px solid grey';

pandora_console/include/javascript/pandora_events.js

@@ -365,9 +365,9 @@ function get_event_name(event_id, meta, history) {
 
 function add_row_param(id_table, param) {
   $("#" + id_table).append(
-    '<tr class="params_rows"><td style="text-align:left; padding-left:40px;">' +
+    '<tr class="params_rows"><td style="text-align:left; padding-left:40px; font-weight: normal; font-style: italic;">' +
       param +
-      '</td><td style="text-align:left"><input type="text" name="' +
+      '</td><td style="text-align:left" colspan="2"><input type="text" name="' +
       param +
       '" id="' +
       param +

pandora_console/include/javascript/tree/TreeController.js

@@ -747,9 +747,11 @@ var TreeController = {
                       }
                     } else {
                       try {
-                        winopeng(
+                        winopeng_var(
                           element.moduleGraph.url,
-                          element.moduleGraph.handle
+                          element.moduleGraph.handle,
+                          1000,
+                          650
                         );
                       } catch (error) {
                         // console.log(error);

pandora_console/include/styles/pandora.css

@@ -3598,6 +3598,78 @@ div.simple_value > a > span.text p {
   cursor: pointer;
 }
 
+.events_show_more_table {
+  border-spacing: 0px;
+  text-align: left;
+}
+
+/* Modal window - Show More */
+table.events_show_more_table tr:nth-child(odd) td {
+  background-color: #ffffff;
+}
+table.events_show_more_table tr:nth-child(even) td {
+  background-color: #f5f5f5;
+  border-top: 1px solid #cacaca;
+  border-bottom: 1px solid #cacaca;
+}
+
+table.events_show_more_table tr td {
+  height: 22px;
+  padding: 4px;
+}
+
+table.events_show_more_table tr td:first-child {
+  width: 35%;
+  font-weight: bold;
+  padding-left: 20px;
+}
+
+ul.events_tabs {
+  background: #ffffff !important;
+  border: 0px;
+  display: flex;
+  justify-content: space-between;
+  padding: 0px !important;
+}
+
+ul.events_tabs:before,
+ul.events_tabs:after {
+  content: none !important;
+}
+
+ul.events_tabs > li {
+  margin: 0 !important;
+  width: 20%;
+  text-align: center;
+  float: none !important;
+  outline-width: 0;
+}
+
+ul.events_tabs > li.ui-state-default {
+  background: #fff !important;
+  border: none !important;
+  border-bottom: 2px solid black !important;
+}
+
+ul.events_tabs > li a {
+  text-align: center;
+  float: none !important;
+  padding: 8px !important;
+  display: block;
+}
+
+ul.events_tabs > li span {
+  position: relative;
+  top: -6px;
+  left: 5px;
+  margin-right: 10px;
+}
+
+ul.events_tabs > li.ui-tabs-active {
+  border-bottom: 2px solid #82b92e !important;
+  border-top: 2px solid #82b92e !important;
+}
+
 /*
  * ---------------------------------------------------------------------
  * - modal window and edit user 									-
@@ -5438,3 +5510,48 @@ table.info_table.policy_sub_table {
   margin-top: 0px;
   align-items: flex-start;
 }
+
+/*
+ * ---------------------------------------------------------------------
+ * - MODULE GRAPHS
+ * ---------------------------------------------------------------------
+ */
+.module_graph_menu_dropdown {
+  padding-top: 20px;
+  padding-bottom: 20px;
+  position: absolute;
+  top: 10px;
+  width: 100%;
+  z-index: 1001;
+}
+
+.module_graph_menu_content,
+.module_graph_menu_header {
+  width: 92%;
+  border: 1px solid #e2e2e2;
+  margin: 0 auto;
+  box-sizing: border-box;
+  background-color: #fff;
+}
+
+.module_graph_menu_header {
+  border-top-left-radius: 4px;
+  border-top-right-radius: 4px;
+  padding: 6px 10px;
+  cursor: pointer;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.module_graph_menu_header span > img {
+  vertical-align: middle;
+  padding-left: 5px;
+}
+
+.module_graph_menu_content {
+  border-bottom-left-radius: 4px;
+  border-bottom-right-radius: 4px;
+  padding: 15px;
+  border-top: none;
+}

pandora_console/install.php

@@ -129,7 +129,7 @@
         <div style='height: 10px'>
             <?php
             $version = '7.0NG.734';
-            $build = '190508';
+            $build = '190510';
             $banner = "v$version Build $build";
 
             error_reporting(0);

pandora_console/operation/agentes/interface_traffic_graph_win.php

@@ -96,7 +96,7 @@ if ($refresh > 0) {
             -->
         </script>
     </head>
-    <body bgcolor="#ffffff" style='background:#ffffff;'>
+    <body style='background:#ffffff;'>
 <?php
 // ACL
         $all_groups = agents_get_all_groups_agent($agent_id);
@@ -136,7 +136,8 @@ if ($date > $now) {
 
         $urlImage = ui_get_full_url(false);
 
-        echo '<div style="margin-left: 70px; padding-top: 10px;">';
+        // Graph.
+        echo '<div style="padding-top:80px;">';
 
         $height = 400;
         $width  = '90%';
@@ -177,27 +178,14 @@ if ($date > $now) {
 
         echo '</div>';
 
-        //
-        // SIDE MENU
-        //
-        $side_layer_params = [];
-        // TOP TEXT
-        $side_layer_params['top_text'] = "<div style='color: white; width: 100%; text-align: center; font-weight: bold; vertical-align: top;'>".html_print_image('/images/config.disabled.png', true, ['width' => '16px'], false, false, false, true).' '.__('Graph configuration menu').'</div>';
-        $side_layer_params['body_text'] = "<div class='menu_sidebar_outer'>";
-        $side_layer_params['body_text'] .= __('Please, make your changes and apply with the <i>Reload</i> button');
-
-        // MENU
-        $side_layer_params['body_text'] .= '<form method="get" action="interface_traffic_graph_win.php">';
-        $side_layer_params['body_text'] .= html_print_input_hidden('params', base64_encode($params_json), true);
-
         // FORM TABLE
         $table = html_get_predefined_table('transparent', 2);
-        $table->width = '98%';
+        $table->width = '100%';
         $table->id = 'stat_win_form_div';
-        $table->style[0] = 'text-align:left; padding: 7px;';
+        $table->style[0] = 'text-align:left;';
         $table->style[1] = 'text-align:left;';
-        $table->styleTable = 'border-spacing: 4px;';
+        $table->styleTable = 'margin-bottom: 20px;';
-        $table->class = 'alternate';
+        $table->class = 'events_show_more_table';
 
         $data = [];
         $data[0] = __('Refresh time');
@@ -255,40 +243,32 @@ if ($date > $now) {
         $table->rowclass[] = '';
 
         $form_table = html_print_table($table, true);
+        $form_table .= '<div style="width:100%; text-align:right;">'.html_print_submit_button(
+            __('Reload'),
+            'submit',
+            false,
+            'class="sub upd"',
+            true
+        ).'</div>';
 
-        unset($table);
 
-        $table->id = 'stat_win_form';
+        // Menu.
-        $table->width = '100%';
+        $menu_form = "<form method='get' action='interface_traffic_graph_win.php'>".html_print_input_hidden('params', base64_encode($params_json), true);
-        $table->cellspacing = 2;
-        $table->cellpadding = 2;
-        $table->class = 'databox';
 
-        $data = [];
+        if (!empty($server_id)) {
-        $data[0] = html_print_div(['content' => $form_table, 'style' => 'overflow: auto; height: 220px'], true);
+            $menu_form .= html_print_input_hidden('server', $server_id, true);
-        $table->data[] = $data;
+        }
-        $table->rowclass[] = '';
 
-        $data = [];
+        echo $menu_form;
-        $data[0] = '<div style="width:100%; text-align:right;">'.html_print_submit_button(__('Reload'), 'submit', false, 'class="sub upd"', true).'</div>';
+        echo '<div class="module_graph_menu_dropdown">
-        $table->data[] = $data;
+                <div id="module_graph_menu_header" class="module_graph_menu_header">
-        $table->rowclass[] = '';
+                    '.html_print_image('images/arrow_down_green.png', true, ['class' => 'module_graph_menu_arrow', 'float' => 'left'], false, false, true).'
-
+                    <span>'.__('Graph configuration menu').ui_print_help_icon('graphs', true, $config['homeurl'], 'images/help_g.png', true).'</span>
-        $side_layer_params['body_text'] .= html_print_table($table, true);
+                    '.html_print_image('images/config.png', true, ['float' => 'right'], false, false, true).'
-        $side_layer_params['body_text'] .= '</form>';
+                </div>
-        $side_layer_params['body_text'] .= '</div>';
+                <div class="module_graph_menu_content module_graph_menu_content_closed" style="display:none;">'.$form_table.'</div>
-        // outer
+            </div>';
-        // ICONS
+        echo '</form>';
-        $side_layer_params['icon_closed'] = '/images/graphmenu_arrow_hide.png';
-        $side_layer_params['icon_open'] = '/images/graphmenu_arrow.png';
-
-        // SIZE
-        $side_layer_params['width'] = 500;
-
-        // POSITION
-        $side_layer_params['position'] = 'left';
-
-        html_print_side_layer($side_layer_params);
 
         // Hidden div to forced title
         html_print_div(['id' => 'forced_title_layer', 'class' => 'forced_title_layer', 'hidden' => true]);
@@ -341,4 +321,22 @@ ui_include_time_picker(true);
     $.datepicker.setDefaults($.datepicker.regional["<?php echo $custom_user_language; ?>"]);
 
     forced_title_callback();
+
+    // Menu.
+    $('#module_graph_menu_header').on('click', function(){
+        var arrow = $('#module_graph_menu_header .module_graph_menu_arrow');
+        var arrow_up = 'arrow_up_green';
+        var arrow_down = 'arrow_down_green';
+        if( $('.module_graph_menu_content').hasClass('module_graph_menu_content_closed')){
+            $('.module_graph_menu_content').show();
+            $('.module_graph_menu_content').removeClass('module_graph_menu_content_closed');          
+            arrow.attr('src',arrow.attr('src').replace(arrow_down, arrow_up));
+        }
+        else{
+            $('.module_graph_menu_content').hide();
+            $('.module_graph_menu_content').addClass('module_graph_menu_content_closed'); 
+            arrow.attr('src',arrow.attr('src').replace(arrow_up, arrow_down));
+        }
+    });
+
 </script>

pandora_console/operation/agentes/stat_win.php

@@ -89,7 +89,7 @@ $alias    = db_get_value('alias', 'tagente', 'id_agente', $id_agent);
             };
         </script>
     </head>
-    <body bgcolor="#ffffff" style='background:#ffffff;'>
+    <body style='background:#ffffff;'>
     
         <?php
         echo "<div id='dialog' title='".__('CSV Export Information')."' style='visibility:hidden;'>";
@@ -175,8 +175,9 @@ $alias    = db_get_value('alias', 'tagente', 'id_agente', $id_agent);
 
         $unit = db_get_value('unit', 'tagente_modulo', 'id_agente_modulo', $id);
 
-        echo '<div style="margin-left: 65px; padding-top: 10px;">';
 
+        // Graph.
+        echo '<div style="padding-top: 60px;">';
         $width  = '90%';
         $height = '450';
 
@@ -228,39 +229,16 @@ $alias    = db_get_value('alias', 'tagente', 'id_agente', $id_agent);
 
         echo '</div>';
 
-        //
-        // SIDE MENU
-        //
-        $params = [];
-        // TOP TEXT
-        // Use the no_meta parameter because this image is only in the base console
-        $params['top_text'] = "<div style='color: white; width: 100%; text-align: center; font-weight: bold; vertical-align: top;'>".html_print_image('images/wrench_blanco.png', true, ['width' => '16px'], false, false, true).' '.__('Graph configuration menu').ui_print_help_icon('graphs', true, $config['homeurl'], 'images/help_w.png', true).'</div>';
-        $params['body_text'] = "<div class='menu_sidebar_outer'>";
-        $params['body_text'] .= __('Please, make your changes and apply with the <i>Reload</i> button');
 
-        // MENU
-        $params['body_text'] .= '<form method="get" action="stat_win.php">';
-        $params['body_text'] .= html_print_input_hidden('id', $id, true);
-        $params['body_text'] .= html_print_input_hidden('label', $label, true);
 
-        if (!empty($server_id)) {
+        // FORM TABLE.
-            $params['body_text'] .= html_print_input_hidden('server', $server_id, true);
-        }
-
-        if (isset($_GET['type'])) {
-            $type = get_parameter_get('type');
-            $params['body_text'] .= html_print_input_hidden('type', $type, true);
-        }
-
-        // FORM TABLE
         $table = html_get_predefined_table('transparent', 2);
-        $table->width = '98%';
+        $table->width = '100%';
         $table->id = 'stat_win_form_div';
-        $table->style[0] = 'text-align:left; padding: 7px;';
+        $table->style[0] = 'text-align:left;';
         $table->style[1] = 'text-align:left;';
-        // $table->size[0] = '50%';
+        $table->styleTable = 'margin-bottom: 20px;';
-        $table->styleTable = 'border-spacing: 4px;';
+        $table->class = 'events_show_more_table';
-        $table->class = 'alternate';
 
         $data = [];
         $data[0] = __('Refresh time');
@@ -407,42 +385,29 @@ $alias    = db_get_value('alias', 'tagente', 'id_agente', $id_agent);
             true
         ).'</div>';
 
-        unset($table);
 
-        $table = new stdClass();
+        // Menu.
-        $table->id = 'stat_win_form';
+        $menu_form = "<form method='get' action='stat_win.php'>".html_print_input_hidden('id', $id, true).html_print_input_hidden('label', $label, true);
-        $table->width = '100%';
-        $table->cellspacing = 2;
-        $table->cellpadding = 2;
-        $table->class = 'databox';
 
-        $data = [];
+        if (!empty($server_id)) {
-        $data[0] = html_print_div(
+            $menu_form .= html_print_input_hidden('server', $server_id, true);
-            [
+        }
-                'id'      => 'field_list',
-                'content' => $form_table,
-                'style'   => 'overflow: auto; height: 220px',
-            ],
-            true
-        );
-        $table->data[] = $data;
-        $table->rowclass[] = '';
 
-        $params['body_text'] .= html_print_table($table, true);
+        if (isset($_GET['type'])) {
-        $params['body_text'] .= '</form>';
+            $type = get_parameter_get('type');
-        $params['body_text'] .= '</div>';
+            $menu_form .= html_print_input_hidden('type', $type, true);
-        // outer
+        }
-        // ICONS
-        $params['icon_closed'] = '/images/graphmenu_arrow_hide.png';
-        $params['icon_open'] = '/images/graphmenu_arrow.png';
 
-        // SIZE
+        echo $menu_form;
-        $params['width'] = 500;
+        echo '<div class="module_graph_menu_dropdown">
-
+                <div id="module_graph_menu_header" class="module_graph_menu_header">
-        // POSITION
+                    '.html_print_image('images/arrow_down_green.png', true, ['class' => 'module_graph_menu_arrow', 'float' => 'left'], false, false, true).'
-        $params['position'] = 'left';
+                    <span>'.__('Graph configuration menu').ui_print_help_icon('graphs', true, $config['homeurl'], 'images/help_g.png', true).'</span>
-
+                    '.html_print_image('images/config.png', true, ['float' => 'right'], false, false, true).'
-        html_print_side_layer($params);
+                </div>
+                <div class="module_graph_menu_content module_graph_menu_content_closed" style="display:none;">'.$form_table.'</div>
+            </div>';
+        echo '</form>';
 
         // Hidden div to forced title
         html_print_div(
@@ -491,11 +456,21 @@ ui_include_time_picker(true);
 
     $.datepicker.setDefaults($.datepicker.regional["<?php echo $custom_user_language; ?>"]);
 
-    $(window).ready(function() {
+    // Menu.
-        $("#field_list").css('height', ($(window).height() - 160) + 'px');
+    $('#module_graph_menu_header').on('click', function(){
+        var arrow = $('#module_graph_menu_header .module_graph_menu_arrow');
+        var arrow_up = 'arrow_up_green';
+        var arrow_down = 'arrow_down_green';
+        if( $('.module_graph_menu_content').hasClass('module_graph_menu_content_closed')){
+            $('.module_graph_menu_content').show();
+            $('.module_graph_menu_content').removeClass('module_graph_menu_content_closed');          
+            arrow.attr('src',arrow.attr('src').replace(arrow_down, arrow_up));
+        }
+        else{
+            $('.module_graph_menu_content').hide();
+            $('.module_graph_menu_content').addClass('module_graph_menu_content_closed'); 
+            arrow.attr('src',arrow.attr('src').replace(arrow_up, arrow_down));
+        }
     });
 
-    $(window).resize(function() {
-        $("#field_list").css('height', ($(document).height() - 160) + 'px');
-    });
 </script>

pandora_console/operation/events/events.build_table.php

@@ -896,7 +896,7 @@ if ($group_rep == 2) {
                     // Checkbox
                     $data[$i] = html_print_checkbox_extended('validate_ids[]', $event['id_evento'], false, false, false, 'class="chk_val"', true);
                 } else if (isset($table->header[$i]) || true) {
-                    $data[$i] = '';
+                    $data[$i] = html_print_checkbox_extended('validate_ids[]', $event['id_evento'], false, false, false, 'class="chk_val"', true);
                 }
             }
 

pandora_console/operation/snmpconsole/snmp_mib_uploader.php

@@ -69,9 +69,6 @@ $real_directory = realpath($config['homedir'].'/'.$directory);
 
 ui_print_info_message(__('MIB files will be installed on the system. Please note that a MIB may depend on other MIB. To customize trap definitions use the SNMP trap editor.'));
 
-// echo '<h4>' . __('Index of %s', $directory) . '</h4>';
-$homedir_filemanager = isset($config['homedir_filemanager']) ? $config['homedir_filemanager'] : false;
-
 filemanager_file_explorer(
     $real_directory,
     $directory,
@@ -82,5 +79,5 @@ filemanager_file_explorer(
     '',
     false,
     '',
-    $homedir_filemanager
+    false
 );

pandora_console/pandora_console.redhat.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.734
-%define release     190508
+%define release     190510
 
 # User and Group under which Apache is running
 %define httpd_name  httpd

pandora_console/pandora_console.rhel7.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.734
-%define release     190508
+%define release     190510
 
 # User and Group under which Apache is running
 %define httpd_name  httpd

pandora_console/pandora_console.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.734
-%define release     190508
+%define release     190510
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2

pandora_console/pandoradb_data.sql

@@ -1158,7 +1158,7 @@ INSERT INTO `tagent_custom_fields` VALUES (1,'Serial Number',0,0,''),(2,'De
 
 INSERT INTO `ttag` VALUES (1,'network','Network equipment','http://artica.es','',''),(2,'critical','Critical modules','','',''),(3,'dmz','DMZ Network Zone','','',''),(4,'performance','Performance anda capacity modules','','',''),(5,'configuration','','','','');
 
-INSERT INTO `tevent_response` VALUES (1,'Ping to host','Ping to the agent host','ping -c 5 _agent_address_','command',0,620,500,0,'',0),(3,'Create incident from event','Create a incident from the event with the standard incidents system of Pandora FMS','index.php?sec=workspace&sec2=operation/incidents/incident_detail&insert_form&from_event=_event_id_','url',0,0,0,1,'',0),(4,'Create Integria IMS incident from event','Create a incident from the event with integria incidents system of Pandora FMS. 

Is necessary to enable and configure the Integria incidents in Pandora FMS setup.','index.php?sec=workspace&sec2=operation/integria_incidents/incident&tab=editor&from_event=_event_id_','url',0,0,0,1,'',0),(5,'Restart agent','Restart the agent with using UDP protocol.

To use this response is necessary to have installed Pandora FMS server and console in the same machine.','/usr/share/pandora_server/util/udp_client.pl _agent_address_ 41122 "REFRESH AGENT"','command',0,620,500,0,'',0),(6,'Ping to module agent host','Ping to the module agent host','ping -c 5 _module_address_','command',0,620,500,0,'',0);
+INSERT INTO `tevent_response` VALUES (1,'Ping to host','Ping to the agent host','ping -c 5 _agent_address_','command',0,620,500,0,'',0),(3,'Create incident from event','Create a incident from the event with the standard incidents system of Pandora FMS','index.php?sec=workspace&sec2=operation/incidents/incident_detail&insert_form&from_event=_event_id_','url',0,0,0,1,'',0),(5,'Restart agent','Restart the agent with using UDP protocol.

To use this response is necessary to have installed Pandora FMS server and console in the same machine.','/usr/share/pandora_server/util/udp_client.pl _agent_address_ 41122 "REFRESH AGENT"','command',0,620,500,0,'',0),(6,'Ping to module agent host','Ping to the module agent host','ping -c 5 _module_address_','command',0,620,500,0,'',0);
 
 INSERT INTO `tupdate_settings` VALUES  ('current_update', '412'), ('customer_key', 'PANDORA-FREE'), ('updating_binary_path', 'Path where the updated binary files will be stored'), ('updating_code_path', 'Path where the updated code is stored'), ('dbname', ''), ('dbhost', ''), ('dbpass', ''), ('dbuser', ''), ('dbport', ''), ('proxy', ''), ('proxy_port', ''), ('proxy_user', ''), ('proxy_pass', '');
 

pandora_server/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.734-190508
+Version: 7.0NG.734-190510
 Architecture: all
 Priority: optional
 Section: admin

pandora_server/DEBIAN/make_deb_package.sh

@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.734-190508"
+pandora_version="7.0NG.734-190510"
 
 package_cpan=0
 package_pandora=1

pandora_server/lib/PandoraFMS/Config.pm

@@ -45,7 +45,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.734";
-my $pandora_build = "190508";
+my $pandora_build = "190510";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash

pandora_server/lib/PandoraFMS/PluginTools.pm

@@ -32,7 +32,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.734";
-my $pandora_build = "190508";
+my $pandora_build = "190510";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 our %EXPORT_TAGS = ( 'all' => [ qw() ] );

pandora_server/pandora_server.redhat.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.734
-%define release     190508
+%define release     190510
 
 Summary:            Pandora FMS Server
 Name:               %{name}

pandora_server/pandora_server.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.734
-%define release     190508
+%define release     190510
 
 Summary:            Pandora FMS Server
 Name:               %{name}

pandora_server/pandora_server_installer

@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.734"
-PI_BUILD="190508"
+PI_BUILD="190510"
 
 MODE=$1
 if [ $# -gt 1 ]; then

pandora_server/util/pandora_db.pl

@@ -34,7 +34,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.734 PS190508";
+my $version = "7.0NG.734 PS190510";
 
 # Pandora server configuration
 my %conf;

pandora_server/util/pandora_manage.pl

@@ -36,7 +36,7 @@ use Encode::Locale;
 Encode::Locale::decode_argv;
 
 # version: define current version
-my $version = "7.0NG.734 PS190508";
+my $version = "7.0NG.734 PS190510";
 
 # save program name for logging
 my $progname = basename($0);