Merge branch 'develop' into ent-3468-Ayudas_online

Conflicts:
pandora_console/godmode/reporting/reporting_builder.php

pandora_agents/unix/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.734-190514
+Version: 7.0NG.734-190521
 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-190514"
+pandora_version="7.0NG.734-190521"
 
 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 => '190514';
+use constant AGENT_BUILD => '190521';
 
 # 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     190514
+%define release     190521
 
 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     190514
+%define release     190521
 
 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="190514"
+PI_BUILD="190521"
 OS_NAME=`uname -s`
 
 FORCE=0

pandora_agents/win32/installer/pandora.mpi

@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{190514}
+{190521}
 
 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 190514)")
+#define PANDORA_VERSION ("7.0NG.734(Build 190521)")
 
 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 190514))"
+      VALUE "ProductVersion", "(7.0NG.734(Build 190521))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END

pandora_console/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.734-190514
+Version: 7.0NG.734-190521
 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-190514"
+pandora_version="7.0NG.734-190521"
 
 package_pear=0
 package_pandora=1

pandora_console/extensions/resource_registration.php

@@ -998,20 +998,23 @@ function process_upload_xml($xml)
 {
     $hook_enterprise = enterprise_include('extensions/resource_registration/functions.php');
 
-    // Extract component
+    // Extract component.
     process_upload_xml_component($xml);
 
     $group_filter = get_parameter('group');
 
-    // Extract visual map
+    // Extract visual map.
     process_upload_xml_visualmap($xml, $group_filter);
 
-    // Extract policies
+    // Extract policies.
     if ($hook_enterprise === true) {
-        process_upload_xml_policy($xml, $group_filter);
+        $centralized_management = !is_central_policies_on_node();
+        if ($centralized_management) {
+            process_upload_xml_policy($xml, $group_filter);
+        }
     }
 
-    // Extract reports
+    // Extract reports.
     process_upload_xml_report($xml, $group_filter);
 }
 
@@ -1038,6 +1041,11 @@ function resource_registration_extension_main()
         return;
     }
 
+    $centralized_management = !is_central_policies_on_node();
+    if (!$centralized_management) {
+        ui_print_warning_message(__('This node is configured with centralized mode. Go to metaconsole to create a policy.'));
+    }
+
     echo '<div class=notify>';
     echo __('This extension makes registering resource templates easier.').' '.__('Here you can upload a resource template in .ptr format.').' '.__('Please refer to our documentation for more information on how to obtain and use %s resources.', get_product_name()).' '.'<br> <br>'.__("You can get more resurces in our <a href='http://pandorafms.com/Library/Library/'>Public Resource Library</a>");
     echo '</div>';

pandora_console/extras/mr/28.sql

@@ -1,9 +1,16 @@
 START TRANSACTION;
 
+ALTER TABLE `treport_content` ADD COLUMN `current_month` TINYINT(1) DEFAULT '1';
+
+ALTER TABLE `treport_content_template` ADD COLUMN `current_month` TINYINT(1) DEFAULT '1';
+
 ALTER TABLE `talert_commands` ADD COLUMN `fields_hidden` text;
 
 ALTER TABLE `talert_templates` MODIFY COLUMN `type` ENUM('regex','max_min','max','min','equal','not_equal','warning','critical','onchange','unknown','always','not_normal');
 
 DELETE FROM `tevent_response` WHERE `name` LIKE 'Create Integria IMS incident from event';
+INSERT INTO `tnews` (`id_news`, `author`, `subject`, `text`, `timestamp`) VALUES (1,'admin','Welcome to Pandora FMS Console', '<p style="text-align: center; font-size: 13px;">Hello, congratulations, if you've arrived here you already have an operational monitoring console. Remember that our forums and online documentation are available 24x7 to get you out of any trouble. You can replace this message with a personalized one at Admin tools -> Site news.</p> ',NOW());
 
-COMMIT;
+
+
+COMMIT;

pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql

@@ -761,6 +761,23 @@ CREATE TABLE IF NOT EXISTS `treport_content_template` (
 	PRIMARY KEY(`id_rc`)
 ) ENGINE = InnoDB DEFAULT CHARSET=utf8;
 
+-- ----------------------------------------------------------------------
+-- Table `tnews`
+-- ----------------------------------------------------------------------
+CREATE TABLE IF NOT EXISTS `tnews` (
+	`id_news` INTEGER UNSIGNED NOT NULL  AUTO_INCREMENT,
+	`author` varchar(255)  NOT NULL DEFAULT '',
+	`subject` varchar(255)  NOT NULL DEFAULT '',
+	`text` TEXT NOT NULL,
+	`timestamp` DATETIME  NOT NULL DEFAULT 0,
+	`id_group` int(10) NOT NULL default 0,
+	`modal` tinyint(1) DEFAULT 0,
+	`expire` tinyint(1) DEFAULT 0,
+	`expire_timestamp` DATETIME  NOT NULL DEFAULT 0,
+	PRIMARY KEY(`id_news`)
+) ENGINE = InnoDB DEFAULT CHARSET=utf8;
+
+
 ALTER TABLE treport_content_template ADD COLUMN `historical_db` tinyint(1) NOT NULL DEFAULT '0';
 ALTER TABLE treport_content_template ADD COLUMN `lapse_calc` tinyint(1) default '0';
 ALTER TABLE treport_content_template ADD COLUMN `lapse` int(11) default '300';
@@ -778,6 +795,7 @@ ALTER TABLE `treport_content_template` ADD COLUMN `checks_in_ok_status` TINYINT(
 ALTER TABLE `treport_content_template` ADD COLUMN `unknown_checks` TINYINT(1) DEFAULT '1';
 ALTER TABLE `treport_content_template` ADD COLUMN `agent_max_value` TINYINT(1) DEFAULT '1';
 ALTER TABLE `treport_content_template` ADD COLUMN `agent_min_value` TINYINT(1) DEFAULT '1';
+ALTER TABLE `treport_content_template` ADD COLUMN `current_month` TINYINT(1) DEFAULT '1';
 
 -- -----------------------------------------------------
 -- Table `treport_content_sla_com_temp` (treport_content_sla_combined_template)
@@ -1393,7 +1411,6 @@ UPDATE treport_custom_sql SET `sql` = 'select t1.alias as agent_n
 -- ----------------------------------------------------------------------
 -- Table `treport_content`
 -- ---------------------------------------------------------------------
-	
 ALTER TABLE treport_content ADD COLUMN `historical_db` tinyint(1) NOT NULL DEFAULT '0';
 ALTER TABLE treport_content ADD COLUMN `lapse_calc` tinyint(1) default '0';
 ALTER TABLE treport_content ADD COLUMN `lapse` int(11) default '300';
@@ -1414,6 +1431,7 @@ ALTER TABLE `treport_content` ADD COLUMN `checks_in_ok_status` TINYINT(1) DEFAUL
 ALTER TABLE `treport_content` ADD COLUMN `unknown_checks` TINYINT(1) DEFAULT '1';
 ALTER TABLE `treport_content` ADD COLUMN `agent_max_value` TINYINT(1) DEFAULT '1';
 ALTER TABLE `treport_content` ADD COLUMN `agent_min_value` TINYINT(1) DEFAULT '1';
+ALTER TABLE `treport_content` ADD COLUMN `current_month` TINYINT(1) DEFAULT '1';
 
 -- ---------------------------------------------------------------------
 -- Table `tmodule_relationship`
@@ -2105,8 +2123,15 @@ ALTER TABLE `tnetflow_filter` DROP COLUMN `output`;
 -- ----------------------------------------------------------------------
 UPDATE tuser_task set parameters = 'a:5:{i:0;a:6:{s:11:\"description\";s:28:\"Report pending to be created\";s:5:\"table\";s:7:\"treport\";s:8:\"field_id\";s:9:\"id_report\";s:10:\"field_name\";s:4:\"name\";s:4:\"type\";s:3:\"int\";s:9:\"acl_group\";s:8:\"id_group\";}i:1;a:2:{s:11:\"description\";s:46:\"Send to email addresses (separated by a comma)\";s:4:\"type\";s:4:\"text\";}i:2;a:2:{s:11:\"description\";s:7:\"Subject\";s:8:\"optional\";i:1;}i:3;a:3:{s:11:\"description\";s:7:\"Message\";s:4:\"type\";s:4:\"text\";s:8:\"optional\";i:1;}i:4;a:2:{s:11:\"description\";s:11:\"Report Type\";s:4:\"type\";s:11:\"report_type\";}}' where function_name = "cron_task_generate_report";
 
+------------------------------------------------------------------------
+------ ADD message in table 'tnews'
+------------------------------------------------------------------------
+
+INSERT INTO `tnews` (`id_news`, `author`, `subject`, `text`, `timestamp`) VALUES (1,'admin','Welcome to Pandora FMS Console', '<p style="text-align: center; font-size: 13px;">Hello, congratulations, if you've arrived here you already have an operational monitoring console. Remember that our forums and online documentation are available 24x7 to get you out of any trouble. You can replace this message with a personalized one at Admin tools -> Site news.</p> ',NOW());
+
 -- ----------------------------------------------------------------------
 -- Alter table `talert_templates`
 -- ----------------------------------------------------------------------
 
  ALTER TABLE `talert_templates` MODIFY COLUMN `type` ENUM('regex','max_min','max','min','equal','not_equal','warning','critical','onchange','unknown','always','not_normal');
+

pandora_console/general/logon_ok.php

@@ -197,12 +197,15 @@ if (!empty($all_data)) {
                 }
 
                 foreach ($news as $article) {
-                    $text = io_safe_output($article['text']);
+                    $text_bbdd = io_safe_output($article['text']);
-
+                    $text = html_entity_decode($text_bbdd);
-
                     echo '<tr><th class="green_title">'.$article['subject'].'</th></tr>';
                     echo '<tr><td>'.__('by').' <b>'.$article['author'].'</b> <i>'.ui_print_timestamp($article['timestamp'], true).'</i> '.$comparation_suffix.'</td></tr>';
                     echo '<tr><td class="datos">';
+                    if ($article['id_news'] == 1) {
+                        echo '<center><img src="./images/welcome_image.png" alt="img colabora con nosotros - Support" width="191" height="207"></center>';
+                    }
+
                     echo nl2br($text);
                     echo '</td></tr>';
                 }

pandora_console/godmode/agentes/agent_wizard.snmp_explorer.php

@@ -1062,7 +1062,7 @@ $(document).ready (function () {
                     $("select[name='module[]']").append($("<option></option>").val(id).html(name));
                 }
                 else {
-                    alert('<?php echo __('Repeated'); ?>');
+                    alert("<?php echo __('Repeated'); ?>");
                 }
                 $("#module").find("option[value='0']").remove();
             }
@@ -1078,7 +1078,7 @@ $(document).ready (function () {
                     $("select[name='module[]']").append($("<option></option>").val(id).html(name));
                 }
                 else {
-                    alert('<?php echo __('Repeated'); ?>');
+                    alert("<?php echo __('Repeated'); ?>");
                 }
                 $("#module").find("option[value='0']").remove();
             }
@@ -1094,7 +1094,7 @@ $(document).ready (function () {
                     $("select[name='module[]']").append($("<option></option>").val(id).html(name));
                 }
                 else {
-                    alert('<?php echo __('Repeated'); ?>');
+                    alert("<?php echo __('Repeated'); ?>");
                 }
                 $("#module").find("option[value='0']").remove();
             }
@@ -1110,7 +1110,7 @@ $(document).ready (function () {
                     $("select[name='module[]']").append($("<option></option>").val(id).html(name));
                 }
                 else {
-                    alert('<?php echo __('Repeated'); ?>');
+                    alert("<?php echo __('Repeated'); ?>");
                 }
                 $("#module").find("option[value='0']").remove();
             }
@@ -1126,7 +1126,7 @@ $(document).ready (function () {
                     $("select[name='module[]']").append($("<option></option>").val(id).html(name));
                 }
                 else {
-                    alert('<?php echo __('Repeated'); ?>');
+                    alert("<?php echo __('Repeated'); ?>");
                 }
                 $("#module").find("option[value='0']").remove();
             }
@@ -1151,7 +1151,7 @@ $(document).ready (function () {
             || ($("#module option").length == 1
             && $("#module option").eq(0).val() == 0)) {
             
-            alert('<?php echo __('Modules list is empty'); ?>');
+            alert("<?php echo __('Modules list is empty'); ?>");
             return false;
         }
         $('#module option').map(function() {

pandora_console/godmode/agentes/agent_wizard.wmi_explorer.php

@@ -570,7 +570,7 @@ $(document).ready (function () {
                     $("select[name='module[]']").append($("<option></option>").val(id).html(name));
                 }
                 else {
-                    alert('<?php echo __('Repeated'); ?>');
+                    alert("<?php echo __('Repeated'); ?>");
                 }
                 $("#module").find("option[value='0']").remove();
             }
@@ -586,7 +586,7 @@ $(document).ready (function () {
                     $("select[name='module[]']").append($("<option></option>").val(id).html(name));
                 }
                 else {
-                    alert('<?php echo __('Repeated'); ?>');
+                    alert("<?php echo __('Repeated'); ?>");
                 }
                 $("#module").find("option[value='0']").remove();
             }
@@ -602,7 +602,7 @@ $(document).ready (function () {
                     $("select[name='module[]']").append($("<option></option>").val(id).html(name));
                 }
                 else {
-                    alert('<?php echo __('Repeated'); ?>');
+                    alert("<?php echo __('Repeated'); ?>");
                 }
                 $("#module").find("option[value='0']").remove();
             }
@@ -618,7 +618,7 @@ $(document).ready (function () {
                     $("select[name='module[]']").append($("<option></option>").val(id).html(name));
                 }
                 else {
-                    alert('<?php echo __('Repeated'); ?>');
+                    alert("<?php echo __('Repeated'); ?>");
                 }
                 $("#module").find("option[value='0']").remove();
             }
@@ -640,7 +640,7 @@ $(document).ready (function () {
     
     $("#submit-create_modules_btn").click(function () {
         if($("#module option").length == 0 || ($("#module option").length == 1 && $("#module option").eq(0).val() == 0)) {
-            alert('<?php echo __('Modules list is empty'); ?>');
+            alert("<?php echo __('Modules list is empty'); ?>");
             return false;
         }
         $('#module option').map(function() {

pandora_console/godmode/agentes/planned_downtime.editor.php

@@ -1232,7 +1232,7 @@ ui_require_jquery_file('ui.datepicker-'.get_user_language(), 'include/javascript
     }
     
     function show_executing_alert () {
-        alert('<?php echo __('This elements cannot be modified while the downtime is being executed'); ?>');
+        alert("<?php echo __('This elements cannot be modified while the downtime is being executed'); ?>");
     }
     
     function show_editor_module(id_agent) {
@@ -1362,7 +1362,7 @@ ui_require_jquery_file('ui.datepicker-'.get_user_language(), 'include/javascript
         var module_sel = $("#modules", $('#module_editor_' + id_agent)).val();
         
         if (module_sel == 0) {
-            alert('<?php echo __('Please select a module.'); ?>');
+            alert("<?php echo __('Please select a module.'); ?>");
         }
         else {
             action_in_progress = true;

pandora_console/godmode/alerts/alert_commands.php

@@ -68,10 +68,6 @@ if (is_ajax()) {
 
         $fields_rows = [];
         for ($i = 1; $i <= $config['max_macro_fields']; $i++) {
-            if (($i == 5) && ($command['id'] == 3)) {
-                continue;
-            }
-
             $field_description = $fields_descriptions[($i - 1)];
             $field_value = $fields_values[($i - 1)];
             $field_hidden = $fields_hidden_checked[($i - 1)];
@@ -255,10 +251,6 @@ if (is_ajax()) {
         }
 
         // If command is PandoraFMS event, field 5 must be empty because "severity" must be set by the alert.
-        if ($command['id'] == 3) {
-            $fields_rows[5] = '';
-        }
-
         $command['fields_rows'] = $fields_rows;
 
         echo json_encode($command);

pandora_console/godmode/gis_maps/configure_gis_map.php

@@ -357,7 +357,7 @@ function addConnectionMap() {
     for (var index in connectionMaps) {
         if (isInt(index)) {
             if (connectionMaps[index] == idConnectionMap) {
-                alert('<?php echo __('The connection'); ?> "' + connectionMapName + '" <?php echo __('just added previously.'); ?>');
+                alert("<?php echo __('The connection'); ?> "' + connectionMapName + '" <?php echo __('just added previously.'); ?>");
                 
                 return;
             }

pandora_console/godmode/reporting/graph_builder.graph_editor.php

@@ -391,7 +391,7 @@ $(document).ready (function () {
         });
         
         if($('#module')[0].childElementCount == 1 && ($('#module')[0].value == "" || $('#module')[0].value == "0")) {
-            alert('<?php echo __('Please, select a module'); ?>');
+            alert("<?php echo __('Please, select a module'); ?>");
             return false;
         }
     });

pandora_console/godmode/reporting/graphs.php

@@ -151,100 +151,193 @@ if ($multiple_delete) {
 }
 
 
+$id_group = (int) get_parameter('id_group', 0);
+$search = trim(get_parameter('search', ''));
 $graphs = custom_graphs_get_user($config['id_user'], false, true, $access);
 $offset = (int) get_parameter('offset');
+$table_aux = new stdClass();
 
-ui_pagination(count($graphs));
+        $table_aux->width = '100%';
+        $table_aux->class = 'databox filters';
+        $table_aux->cellpadding = 0;
+        $table_aux->cellspacing = 0;
 
-if (!empty($graphs)) {
+        $table_aux->colspan[0][0] = 4;
-    $table = new stdClass();
+        $table_aux->data[0][0] = '<b>'.__('Group').'</b>';
-    $table->width = '100%';
-    $table->class = 'info_table';
-    $table->cellpadding = 0;
-    $table->cellspacing = 0;
-    $table->align = [];
-    $table->head = [];
-    if ($report_w || $report_m) {
-        $table->align[5] = 'left';
-        $table->head[5] = html_print_checkbox('all_delete', 0, false, true, false);
-        $table->size[5] = '20px';
-    }
 
-    $table->head[0] = __('Graph name');
+        $table_aux->data[0][1] = html_print_select_groups(false, $access, true, 'id_group', $id_group, '', '', '', true, false, true, '', false, '', false, false, 'id_grupo', $strict_user).'<br>';
-    $table->head[1] = __('Description');
-    $table->head[2] = __('Number of Graphs');
-    $table->head[3] = __('Group');
-    $table->size[0] = '30%';
-    $table->size[2] = '200px';
-    $table->size[3] = '200px';
-    $table->align[2] = 'left';
-    $table->align[3] = 'left';
-    $op_column = false;
-    if ($report_w || $report_m) {
-        $op_column = true;
-        $table->align[4] = 'left';
-        $table->head[4] = __('Op.');
-        $table->size[4] = '90px';
-    }
 
-    $table->data = [];
+        $table_aux->data[0][2] = '<b>'.__('Free text for search: ').ui_print_help_tip(
+            __('Search by report name or description, list matches.'),
+            true
+        ).'</b>';
+        $table_aux->data[0][3] = html_print_input_text('search', $search, '', 30, '', true);
 
-    $result_graphs = array_slice($graphs, $offset, $config['block_size']);
+        $table_aux->data[0][6] = html_print_submit_button(__('Search'), 'search_submit', false, 'class="sub upd"', true);
 
-    foreach ($result_graphs as $graph) {
+        if (is_metaconsole()) {
-        $data = [];
+            $filter = "<form class ='' action='index.php?sec=reporting&sec2=godmode/reporting/graphs&id_group=$id_group&pure=$pure'
-
+				method='post'>";
-        if ($report_m) {
+            $filter .= html_print_table($table_aux, true);
-            $data[5] .= html_print_checkbox_extended('delete_multiple[]', $graph['id_graph'], false, false, '', 'class="check_delete" style="margin-left:2px;"', true);
+            $filter .= '</form>';
+            ui_toggle($filter, __('Show Option'));
+        } else {
+            echo "<form action='index.php?sec=reporting&sec2=godmode/reporting/graphs&id_group=$id_group&pure=$pure'
+				method='post'>";
+            html_print_table($table_aux);
+            echo '</form>';
         }
 
-        $data[0] = '<a href="index.php?sec=reporting&sec2=operation/reporting/graph_viewer&view_graph=1&id='.$graph['id_graph'].'">'.ui_print_truncate_text($graph['name'], 70).'</a>';
+        // Show only selected groups.
-
+        if ($id_group > 0) {
-        $data[1] = ui_print_truncate_text($graph['description'], 70);
+            $group = ["$id_group" => $id_group];
-
+        } else {
-        $data[2] = $graph['graphs_count'];
+            $group = false;
-        $data[3] = ui_print_group_icon($graph['id_group'], true);
-
-        $data[4] = '';
-        $table->cellclass[][4] = 'action_buttons';
-        if (($report_w || $report_m)) {
-            $data[4] = '<a href="index.php?sec=reporting&sec2=godmode/reporting/graph_builder&edit_graph=1&id='.$graph['id_graph'].'">'.html_print_image('images/config.png', true).'</a>';
         }
 
-        if ($report_m) {
+        $own_info = get_user_info($config['id_user']);
-            $data[4] .= '<a href="index.php?sec=reporting&sec2=godmode/reporting/graphs&delete_graph=1&id='.$graph['id_graph'].'" onClick="if (!confirm(\''.__('Are you sure?').'\'))
+        if ($own_info['is_admin'] || check_acl($config['id_user'], 0, 'RM')) {
+            $return_all_group = true;
+        } else {
+            $return_all_group = false;
+        }
+
+        if ($search != '') {
+            $filter = [
+                'name'  => $search_name,
+                'order' => 'name',
+            ];
+        } else {
+            $filter = ['order' => 'name'];
+        }
+
+        // Fix : group filter was not working
+        // Show only selected groups.
+        if ($id_group > 0) {
+            $group = ["$id_group" => $id_group];
+            $filter['id_group'] = $id_group;
+        } else {
+            $group = false;
+        }
+
+        // Filter normal and metaconsole reports.
+        if ($config['metaconsole'] == 1 && defined('METACONSOLE')) {
+            $filter['metaconsole'] = 1;
+        } else {
+            $filter['metaconsole'] = 0;
+        }
+
+
+        /*
+            $reports = reports_get_reports(
+            $filter,
+            [
+                'name',
+                'description',
+                'id_graph',
+                'id_group',
+            ],
+            $return_all_group,
+            $access,
+            $group,
+            false
+        );*/
+
+        if ($id_group != null || $search != null) {
+            $graphs = custom_graphs_search($id_group, $search);
+        }
+
+        ui_pagination(count($graphs));
+
+        if (!empty($graphs)) {
+            $table = new stdClass();
+            $table->width = '100%';
+            $table->class = 'info_table';
+            $table->cellpadding = 0;
+            $table->cellspacing = 0;
+            $table->align = [];
+            $table->head = [];
+            if ($report_w || $report_m) {
+                $table->align[5] = 'left';
+                $table->head[5] = html_print_checkbox('all_delete', 0, false, true, false);
+                $table->size[5] = '20px';
+            }
+
+            $table->head[0] = __('Graph name');
+            $table->head[1] = __('Description');
+            $table->head[2] = __('Number of Graphs');
+            $table->head[3] = __('Group');
+            $table->size[0] = '30%';
+            $table->size[2] = '200px';
+            $table->size[3] = '200px';
+            $table->align[2] = 'left';
+            $table->align[3] = 'left';
+            $op_column = false;
+            if ($report_w || $report_m) {
+                $op_column = true;
+                $table->align[4] = 'left';
+                $table->head[4] = __('Op.');
+                $table->size[4] = '90px';
+            }
+
+            $table->data = [];
+
+            $result_graphs = array_slice($graphs, $offset, $config['block_size']);
+
+            foreach ($result_graphs as $graph) {
+                $data = [];
+
+                if ($report_m) {
+                    $data[5] .= html_print_checkbox_extended('delete_multiple[]', $graph['id_graph'], false, false, '', 'class="check_delete" style="margin-left:2px;"', true);
+                }
+
+                $data[0] = '<a href="index.php?sec=reporting&sec2=operation/reporting/graph_viewer&view_graph=1&id='.$graph['id_graph'].'">'.ui_print_truncate_text($graph['name'], 70).'</a>';
+
+                $data[1] = ui_print_truncate_text($graph['description'], 70);
+
+                $data[2] = $graph['graphs_count'];
+                $data[3] = ui_print_group_icon($graph['id_group'], true);
+
+                $data[4] = '';
+                $table->cellclass[][4] = 'action_buttons';
+                if (($report_w || $report_m)) {
+                    $data[4] = '<a href="index.php?sec=reporting&sec2=godmode/reporting/graph_builder&edit_graph=1&id='.$graph['id_graph'].'">'.html_print_image('images/config.png', true).'</a>';
+                }
+
+                if ($report_m) {
+                    $data[4] .= '<a href="index.php?sec=reporting&sec2=godmode/reporting/graphs&delete_graph=1&id='.$graph['id_graph'].'" onClick="if (!confirm(\''.__('Are you sure?').'\'))
                     return false;">'.html_print_image('images/cross.png', true, ['alt' => __('Delete'), 'title' => __('Delete')]).'</a>';
+                }
+
+                array_push($table->data, $data);
+            }
+
+
+            if (!empty($result_graphs)) {
+                echo "<form method='post' style='' action='index.php?sec=reporting&sec2=godmode/reporting/graphs'>";
+                    html_print_input_hidden('multiple_delete', 1);
+                    html_print_table($table);
+                    ui_pagination(count($graphs), false, 0, 0, false, 'offset', true, 'pagination-bottom');
+                    echo "<div style='float: right;'>";
+                html_print_submit_button(__('Delete'), 'delete_btn', false, 'class="sub delete"');
+                    echo '</div>';
+                echo '</form>';
+            }
+
+
+            echo "<div style='float: right;'>";
+            if ($report_w || $report_m) {
+                echo '<form method="post" style="float:right;" action="index.php?sec=reporting&sec2=godmode/reporting/graph_builder">';
+                    html_print_submit_button(__('Create graph'), 'create', false, 'class="sub next" style="margin-right:5px;"');
+                echo '</form>';
+            }
+
+            echo '</div>';
+        } else {
+            include_once $config['homedir'].'/general/firts_task/custom_graphs.php';
         }
 
-        array_push($table->data, $data);
+        ?>
-    }
-
-
-    if (!empty($result_graphs)) {
-        echo "<form method='post' style='' action='index.php?sec=reporting&sec2=godmode/reporting/graphs'>";
-            html_print_input_hidden('multiple_delete', 1);
-            html_print_table($table);
-            ui_pagination(count($graphs), false, 0, 0, false, 'offset', true, 'pagination-bottom');
-            echo "<div style='float: right;'>";
-                html_print_submit_button(__('Delete'), 'delete_btn', false, 'class="sub delete"');
-            echo '</div>';
-        echo '</form>';
-    }
-
-
-    echo "<div style='float: right;'>";
-    if ($report_w || $report_m) {
-        echo '<form method="post" style="float:right;" action="index.php?sec=reporting&sec2=godmode/reporting/graph_builder">';
-            html_print_submit_button(__('Create graph'), 'create', false, 'class="sub next" style="margin-right:5px;"');
-        echo '</form>';
-    }
-
-    echo '</div>';
-} else {
-    include_once $config['homedir'].'/general/firts_task/custom_graphs.php';
-}
-
-?>
 
 <script type="text/javascript">
 

pandora_console/godmode/servers/plugin.php

@@ -1198,13 +1198,13 @@ ui_require_javascript_file('pandora_modules');
                 }
             }
             else {
-                alert('<?php echo __('The plugin command cannot be updated because some modules or components are using the plugin.'); ?>');
+                alert("<?php echo __('The plugin command cannot be updated because some modules or components are using the plugin.'); ?>");
             }
         }
     }
     
     var macros_click_locked_event = function (event) {
-        alert('<?php echo __('The plugin macros cannot be updated because some modules or components are using the plugin'); ?>');
+        alert("<?php echo __('The plugin macros cannot be updated because some modules or components are using the plugin'); ?>");
     }
     
     if (locked) {

pandora_console/godmode/setup/setup_ehorus.php

@@ -52,9 +52,8 @@ $table_enable->style['name'] = 'font-weight: bold';
 
 // Enable eHorus.
 $row = [];
-$row['name'] = ('Enable eHorus');
+$row['name'] = __('Enable eHorus');
 $row['control'] = html_print_checkbox_switch('ehorus_enabled', 1, $config['ehorus_enabled'], true);
-$row['button'] = html_print_submit_button(('Update'), 'update_button', false, 'class="sub upd"', true);
 $table_enable->data['ehorus_enabled'] = $row;
 
 // Remote config table.
@@ -153,10 +152,11 @@ echo '</div>';
     echo '<legend>'.__('eHorus API').'</legend>';
     html_print_input_hidden('update_config', 1);
     html_print_table($table_remote);
-    echo '<div class="action-buttons" style="width: '.$table_remote->width.'">';
+
-    html_print_submit_button(__('Update'), 'update_button', false, 'class="sub upd"');
-    echo '</div>';
     echo '</fieldset>';
+    echo '</div>';
+     echo '<div class="action-buttons" style="width: '.$table_remote->width.'">';
+    html_print_submit_button(__('Update'), 'update_button', false, 'class="sub upd"');
     echo '</div>';
     echo '</form>';
 

pandora_console/include/class/NetworkMap.class.php

@@ -3467,19 +3467,18 @@ class NetworkMap
             $output .= '<div id="arrow_minimap_'.$networkmap['id'].'"';
             $output .= ' style="position: absolute; left: 0px; top: 0px;">';
             $output .= '<a title="'.__('Open Minimap').'" href="javascript: toggle_minimap();">';
-            $output .= '<img id="image_arrow_minimap_'.$networkmap['id'].'"';
+            $output .= html_print_image('/images/minimap_open_arrow.png', true, ['id' => 'arrow_minimap_'.$networkmap['id']]);
-            $output .= ' src="images/minimap_open_arrow.png" />';
             $output .= '</a><div></div></div>';
 
             $output .= '<div id="hide_labels_'.$networkmap['id'].'"';
             $output .= ' style="position: absolute; right: 10px; top: 10px;">';
             $output .= '<a title="'.__('Hide Labels').'" href="javascript: hide_labels();">';
-            $output .= '<img id="image_hide_show_labels" src="images/icono_borrar.png" />';
+            $output .= html_print_image('/images/icono_borrar.png', true, ['id' => 'image_hide_show_labels']);
             $output .= '</a></div>';
 
             $output .= '<div id="holding_spinner_'.$networkmap['id'].'" ';
             $output .= ' style="display: none; position: absolute; right: 50px; top: 20px;">';
-            $output .= '<img id="image_hide_show_labels" src="images/spinner.gif" />';
+            $output .= html_print_image('/images/spinner.png', true, ['id' => 'image_hide_show_labels']);
             $output .= '</div>';
 
             // Close networkconsole_id div.

pandora_console/include/config_process.php

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

pandora_console/include/functions.php

@@ -2675,7 +2675,7 @@ function get_news($arguments)
         case 'mysql':
         case 'postgresql':
             $sql = sprintf(
-                "SELECT subject,timestamp,text,author
+                "SELECT id_news,subject,timestamp,text,author
 				FROM tnews WHERE id_group IN (%s) AND 
 								modal = %s AND 
 								(expire = 0 OR (expire = 1 AND expire_timestamp > '%s'))

pandora_console/include/functions_custom_graphs.php

@@ -161,3 +161,35 @@ function custom_graphs_get_user($id_user=0, $only_names=false, $returnAllGroup=t
 
     return $graphs;
 }
+
+
+function custom_graphs_search($id_group, $search)
+{
+    if ($id_group != '' && $search != '') {
+        $all_graphs = db_get_all_rows_sql('select * from tgraph where id_group = '.$id_group.' AND name LIKE "%'.$search.'%"');
+    } else if ($id_group != '') {
+        $all_graphs = db_get_all_rows_sql('select * from tgraph where id_group = '.$id_group.'');
+    } else {
+        $all_graphs = db_get_all_rows_sql('select * from tgraph where name LIKE "%'.$search.'%"');
+    }
+
+    if ($all_graphs === false) {
+        return [];
+    }
+
+    $graphs = [];
+    foreach ($all_graphs as $graph) {
+        $graphsCount = db_get_value_sql(
+            'SELECT COUNT(id_gs)
+                        FROM tgraph_source
+                        WHERE id_graph = '.$graph['id_graph'].''
+        );
+
+        $graphs[$graph['id_graph']]['graphs_count'] = $graphsCount;
+        $graphs[$graph['id_graph']]['name'] = $graph['name'];
+        $graphs[$graph['id_graph']]['description'] = $graph['description'];
+        $graphs[$graph['id_graph']]['id_group'] = $graph['id_group'];
+    }
+
+    return $graphs;
+}

pandora_console/include/functions_reporting.php

@@ -5515,6 +5515,10 @@ function reporting_advanced_sla(
                 $max_value = 0;
                 $min_value = 0;
                 $inverse_interval = 1;
+            } else if ($agentmodule_info['id_tipo_modulo'] == '100') {
+                $max_value = 0.9;
+                $min_value = 0;
+                $inverse_interval = 1;
             }
         }
     }

pandora_console/include/javascript/functions_pandora_networkmap.js

@@ -1284,7 +1284,7 @@ function hide_labels_function() {
   $("#hide_labels_" + networkmap_id + " > a").attr("title", "Show Labels");
   $("#hide_labels_" + networkmap_id + " > a > img").attr(
     "src",
-    "images/icono_pintar.png"
+    window.location.origin + "/pandora_console/images/icono_pintar.png"
   );
 
   d3.selectAll(".node_text").style("display", "none");
@@ -1297,7 +1297,7 @@ function show_labels_function() {
   $("#hide_labels_" + networkmap_id + " > a").attr("title", "Hide Labels");
   $("#hide_labels_" + networkmap_id + " > a > img").attr(
     "src",
-    "images/icono_borrar.png"
+    window.location.origin + "/pandora_console/images//icono_borrar.png"
   );
 
   d3.selectAll(".node_text").style("display", "");

pandora_console/install.php

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

pandora_console/operation/gis_maps/gis_map.php

@@ -226,7 +226,7 @@ unset($table);
                 url: "ajax.php",
                 success: function (data) {
                     if (data.correct == 0) {
-                        alert('<?php echo __('There was error on setup the default map.'); ?>');
+                        alert("<?php echo __('There was error on setup the default map.'); ?>");
                     }
                 }
             });

pandora_console/pandora_console.redhat.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.734
-%define release     190514
+%define release     190521
 
 # 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     190514
+%define release     190521
 
 # 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     190514
+%define release     190521
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2

pandora_console/pandoradb.sql

@@ -14,7 +14,7 @@
 -- along with this program; if not, write to the Free Software
 -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
--- PLEASE NO NOT USE MULTILINE COMMENTS 
+-- PLEASE NO NOT USE MULTILINE COMMENTS
 -- Because Pandora Installer don't understand them
 -- and fails creating database !!!
 
@@ -1434,6 +1434,7 @@ CREATE TABLE IF NOT EXISTS `treport_content` (
 	`unknown_checks` TINYINT(1) DEFAULT '1',
 	`agent_max_value` TINYINT(1) DEFAULT '1',
 	`agent_min_value` TINYINT(1) DEFAULT '1',
+	`current_month` TINYINT(1) DEFAULT '1',
 	PRIMARY KEY(`id_rc`),
 	FOREIGN KEY (`id_report`) REFERENCES treport(`id_report`)
 		ON UPDATE CASCADE ON DELETE CASCADE
@@ -2973,6 +2974,7 @@ CREATE TABLE IF NOT EXISTS `treport_content_template` (
 	`unknown_checks` TINYINT(1) DEFAULT '1',
 	`agent_max_value` TINYINT(1) DEFAULT '1',
 	`agent_min_value` TINYINT(1) DEFAULT '1',
+	`current_month` TINYINT(1) DEFAULT '1',
 	PRIMARY KEY(`id_rc`)
 ) ENGINE = InnoDB DEFAULT CHARSET=utf8;
 

pandora_console/pandoradb_data.sql

@@ -345,8 +345,7 @@ INSERT INTO `tperfil` VALUES (1,'Operator (Read)',0,1,0,1,0,0,0,0,0
 -- Dumping data for table `tnews`
 --
 
-INSERT INTO `tnews` (`id_news`, `author`, `subject`, `text`, `timestamp`) VALUES (1,'admin','Welcome to Pandora FMS!','This is the Pandora FMS Console. A lot of new features have been added since last version. Please read the documentation about it, and feel free to test any option.\r\n\r\nThe Pandora FMS Team.',NOW());
+INSERT INTO `tnews` (`id_news`, `author`, `subject`, `text`, `timestamp`) VALUES (1,'admin','Welcome to Pandora FMS Console', '<p style="text-align: center; font-size: 13px;">Hello, congratulations, if you've arrived here you already have an operational monitoring console. Remember that our forums and online documentation are available 24x7 to get you out of any trouble. You can replace this message with a personalized one at Admin tools -> Site news.</p> ',NOW());
-INSERT INTO `tnews` (`id_news`, `author`, `subject`, `text`, `timestamp`) VALUES (2,'admin','New Pandora FMS Agent Features','Feel free to test our new features for both Windows and Linux agents: Proxy and Broker modes.',NOW());
 
 INSERT INTO tmodule VALUES (1,'Agent module');
 INSERT INTO tmodule VALUES (2,'Network module');

pandora_server/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.734-190514
+Version: 7.0NG.734-190521
 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-190514"
+pandora_version="7.0NG.734-190521"
 
 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 = "190514";
+my $pandora_build = "190521";
 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 = "190514";
+my $pandora_build = "190521";
 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     190514
+%define release     190521
 
 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     190514
+%define release     190521
 
 Summary:            Pandora FMS Server
 Name:               %{name}

pandora_server/pandora_server_installer

@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.734"
-PI_BUILD="190514"
+PI_BUILD="190521"
 
 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 PS190514";
+my $version = "7.0NG.734 PS190521";
 
 # 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 PS190514";
+my $version = "7.0NG.734 PS190521";
 
 # save program name for logging
 my $progname = basename($0);