';
return $output;
}
@@ -2898,10 +3620,11 @@ function reporting_get_stats_summary($data, $graph_width, $graph_height)
* It construct a table object with all the events happened in a group
* during a period of time.
*
- * @param int Group id to get the report.
- * @param int Period of time to get the report.
- * @param int Beginning date of the report
- * @param int Flag to return or echo the report table (echo by default).
+ * @param integer $id_group Group id to get the report.
+ * @param integer $period Period of time to get the report.
+ * @param integer $date Beginning date of the report.
+ * @param boolean $return Flag to return or echo the
+ * report table (echo by default).
*
* @return object A table object
*/
@@ -2934,7 +3657,7 @@ function reporting_event_reporting($id_group, $period, $date=0, $return=false)
}
$data[1] = $event['evento'];
- $data[2] = $event['id_usuario'] != '0' ? $event['id_usuario'] : '';
+ $data[2] = ($event['id_usuario'] != '0') ? $event['id_usuario'] : '';
$data[3] = $event['timestamp'];
array_push($table->data, $data);
}
@@ -2950,8 +3673,9 @@ function reporting_event_reporting($id_group, $period, $date=0, $return=false)
/**
* Get a table report from a alerts fired array.
*
- * @param array Alerts fired array.
- * @see function get_alerts_fired ()
+ * @param array $alerts_fired Alerts fired array.
+ *
+ * @see function get_alerts_fired ()
*
* @return object A table object with a report of the fired alerts.
*/
@@ -2966,7 +3690,7 @@ function reporting_get_fired_alerts_table($alerts_fired)
$alert_module = alerts_get_alert_agent_module($id_alert);
$template = alerts_get_alert_template($id_alert);
- // Add alerts fired to $agents_fired_alerts indexed by id_agent
+ // Add alerts fired to $agents_fired_alerts indexed by id_agent.
$id_agent = db_get_value(
'id_agente',
'tagente_modulo',
@@ -3012,8 +3736,9 @@ function reporting_get_fired_alerts_table($alerts_fired)
/**
* Get a report table with all the monitors down.
*
- * @param array An array with all the monitors down
- * @see function modules_get_monitors_down()
+ * @param array $monitors_down An array with all the monitors down.
+ *
+ * @see Function modules_get_monitors_down().
*
* @return object A table object with a monitors down report.
*/
@@ -3027,7 +3752,7 @@ function reporting_get_monitors_down_table($monitors_down)
$agents = [];
if ($monitors_down) {
foreach ($monitors_down as $monitor) {
- // Add monitors fired to $agents_fired_alerts indexed by id_agent
+ // Add monitors fired to $agents_fired_alerts indexed by id_agent.
$id_agent = $monitor['id_agente'];
if (!isset($agents[$id_agent])) {
$agents[$id_agent] = [];
@@ -3067,8 +3792,8 @@ function reporting_get_monitors_down_table($monitors_down)
*
* It shows the number of agents and no more things right now.
*
- * @param int Group to get the report
- * @param bool Flag to return or echo the report (by default).
+ * @param integer $id_group Group to get the report.
+ * @param boolean $return Flag to return or echo the report (by default).
*
* @return HTML string with group report
*/
@@ -3088,9 +3813,10 @@ function reporting_print_group_reporting($id_group, $return=false)
/**
* Get a report table of the fired alerts group by agents.
*
- * @param int Agent id to generate the report.
- * @param int Period of time of the report.
- * @param int Beginning date of the report in UNIX time (current date by default).
+ * @param integer $id_agent Agent id to generate the report.
+ * @param integer $period Period of time of the report.
+ * @param integer $date Beginning date of the report in
+ * UNIX time (current date by default).
*
* @return object A table object with the alert reporting..
*/
@@ -3123,6 +3849,7 @@ function reporting_get_agent_alerts_table($id_agent, $period=0, $date=0)
switch ($template['type']) {
case 'regex':
+ default:
if ($template['matches_value']) {
$data[2] = '≃ "'.$template['value'].'"';
} else {
@@ -3133,23 +3860,19 @@ function reporting_get_agent_alerts_table($id_agent, $period=0, $date=0)
case 'equal':
case 'not_equal':
$data[2] = $template['value'];
-
break;
case 'max-min':
$data[2] = __('Min.').': '.$template['min_value'].' ';
$data[2] .= __('Max.').': '.$template['max_value'].' ';
-
break;
case 'max':
$data[2] = $template['max_value'];
-
break;
case 'min':
$data[2] = $template['min_value'];
-
break;
}
@@ -3167,9 +3890,10 @@ function reporting_get_agent_alerts_table($id_agent, $period=0, $date=0)
/**
* Get a report of monitors in an agent.
*
- * @param int Agent id to get the report
- * @param int Period of time of the report.
- * @param int Beginning date of the report in UNIX time (current date by default).
+ * @param integer $id_agent Agent id to get the report.
+ * @param integer $period Period of time of the report.
+ * @param integer $date Beginning date of the report in UNIX time
+ * (current date by default).
*
* @return object A table object with the report.
*/
@@ -3187,7 +3911,11 @@ function reporting_get_agent_monitors_table($id_agent, $period=0, $date=0)
}
foreach ($monitors as $monitor) {
- $downs = modules_get_monitor_downs_in_period($monitor['id_agente_modulo'], $period, $date);
+ $downs = modules_get_monitor_downs_in_period(
+ $monitor['id_agente_modulo'],
+ $period,
+ $date
+ );
if (! $downs) {
continue;
}
@@ -3199,7 +3927,11 @@ function reporting_get_agent_monitors_table($id_agent, $period=0, $date=0)
$data[0] = $monitor['nombre'];
}
- $data[1] = modules_get_last_down_timestamp_in_period($monitor['id_agente_modulo'], $period, $date);
+ $data[1] = modules_get_last_down_timestamp_in_period(
+ $monitor['id_agente_modulo'],
+ $period,
+ $date
+ );
array_push($table->data, $data);
}
@@ -3210,9 +3942,10 @@ function reporting_get_agent_monitors_table($id_agent, $period=0, $date=0)
/**
* Get a report of all the modules in an agent.
*
- * @param int Agent id to get the report.
- * @param int Period of time of the report
- * @param int Beginning date of the report in UNIX time (current date by default).
+ * @param integer $id_agent Agent id to get the report.
+ * @param integer $period Period of time of the report.
+ * @param integer $date Beginning date of the report in UNIX time
+ * (current date by default).
*
* @return object
*/
@@ -3244,19 +3977,24 @@ function reporting_get_agent_modules_table($id_agent, $period=0, $date=0)
/**
* Get a detailed report of an agent
*
- * @param int Agent to get the report.
- * @param int Period of time of the desired report.
- * @param int Beginning date of the report in UNIX time (current date by default).
- * @param bool Flag to return or echo the report (by default).
+ * @param integer $id_agent Agent to get the report.
+ * @param integer $period Period of time of the desired report.
+ * @param integer $date Beginning date of the report in UNIX time
+ * (current date by default).
+ * @param boolean $return Flag to return or echo the report (by default).
*
* @return string
*/
-function reporting_get_agent_detailed($id_agent, $period=0, $date=0, $return=false)
-{
+function reporting_get_agent_detailed(
+ $id_agent,
+ $period=0,
+ $date=0,
+ $return=false
+) {
$output = '';
$n_a_string = __('N/A(*)');
- // Show modules in agent
+ // Show modules in agent.
$output .= '
Checking software dependencies';
echo '
';
$res = 0;
- $res += check_variable(phpversion(), '5.2', 'PHP version >= 5.2', 1);
+ $res += check_variable(phpversion(), '7.0', 'PHP version >= 7.0', 1);
$res += check_extension('gd', 'PHP GD extension');
$res += check_extension('ldap', 'PHP LDAP extension');
$res += check_extension('snmp', 'PHP SNMP extension');
@@ -548,7 +564,6 @@ function install_step2()
font-size: 8.5pt;margin-top: 2px; font-weight: bolder;'>DB Engines";
echo '| ';
echo ' | ';
- check_extension('mysql', 'PHP MySQL extension');
check_extension('mysqli', 'PHP MySQL(mysqli) extension');
echo '
';
diff --git a/pandora_console/mobile/operation/alerts.php b/pandora_console/mobile/operation/alerts.php
index b95ba9492d..8991f0d8b3 100644
--- a/pandora_console/mobile/operation/alerts.php
+++ b/pandora_console/mobile/operation/alerts.php
@@ -313,7 +313,7 @@ class Alerts
$row = [];
if (isset($this->columns['agent']) && $this->columns['agent']) {
- $row[__('Agent')] = sprintf($disabled_style, io_safe_output($alert['agent_name']));
+ $row[__('Agent')] = sprintf($disabled_style, io_safe_output($alert['agent_alias']));
}
$row[__('Module')] = sprintf(
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index 2d967815bd..4653843f6a 100644
--- a/pandora_console/pandora_console.redhat.spec
+++ b/pandora_console/pandora_console.redhat.spec
@@ -3,7 +3,7 @@
#
%define name pandorafms_console
%define version 7.0NG.731
-%define release 190214
+%define release 190219
# User and Group under which Apache is running
%define httpd_name httpd
@@ -26,7 +26,7 @@ BuildRoot: %{_tmppath}/%{name}
BuildArch: noarch
AutoReq: 0
Requires: %{httpd_name} >= 2.0.0
-Requires: mod_php >= 5.2.0
+Requires: mod_php >= 7.0
Requires: php-gd, php-ldap, php-snmp, php-session, php-gettext
Requires: php-mysqlnd, php-mbstring, php-zip, php-zlib, php-curl
Requires: xorg-x11-fonts-75dpi, xorg-x11-fonts-misc, php-pecl-zip
diff --git a/pandora_console/pandora_console.spec b/pandora_console/pandora_console.spec
index bc06faf96d..a5f4fb2163 100644
--- a/pandora_console/pandora_console.spec
+++ b/pandora_console/pandora_console.spec
@@ -3,7 +3,7 @@
#
%define name pandorafms_console
%define version 7.0NG.731
-%define release 190214
+%define release 190219
%define httpd_name httpd
# User and Group under which Apache is running
%define httpd_name apache2
@@ -29,7 +29,7 @@ BuildArch: noarch
AutoReq: 0
Requires: apache2
Requires: apache2-mod_php7
-Requires: php >= 4.3.0
+Requires: php >= 7.0
Requires: php-gd, php-snmp, php-json, php-gettext
Requires: php-mysqlnd, php-ldap, php-mbstring, php
Requires: graphviz, xorg-x11-fonts-core, graphviz-gd
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index d607a98e44..e307f4aa2b 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
package: pandorafms-server
-Version: 7.0NG.731-190214
+Version: 7.0NG.731-190219
Architecture: all
Priority: optional
Section: admin
diff --git a/pandora_server/DEBIAN/make_deb_package.sh b/pandora_server/DEBIAN/make_deb_package.sh
index 37d7388974..c4305947c6 100644
--- a/pandora_server/DEBIAN/make_deb_package.sh
+++ b/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.731-190214"
+pandora_version="7.0NG.731-190219"
package_cpan=0
package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index db418c8607..a3469c8f4c 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/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.731";
-my $pandora_build = "190214";
+my $pandora_build = "190219";
our $VERSION = $pandora_version." ".$pandora_build;
# Setup hash
diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm
index 3bfd1e1a7d..4682c38820 100644
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@@ -3454,6 +3454,7 @@ sub pandora_evaluate_snmp_alerts ($$$$$$$$$) {
# Specific SNMP Trap alert macros for regexp selectors in trap info
my %macros;
+ $macros{'_trap_id_'} = $trap_id;
$macros{'_snmp_oid_'} = $trap_oid;
$macros{'_snmp_value_'} = $trap_value;
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index 2a00199ac6..06ba620049 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/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.731";
-my $pandora_build = "190214";
+my $pandora_build = "190219";
our $VERSION = $pandora_version." ".$pandora_build;
our %EXPORT_TAGS = ( 'all' => [ qw() ] );
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index 0c678b8e79..0e83289792 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -3,7 +3,7 @@
#
%define name pandorafms_server
%define version 7.0NG.731
-%define release 190214
+%define release 190219
Summary: Pandora FMS Server
Name: %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index c2eabe1dbe..3696930e4d 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -3,7 +3,7 @@
#
%define name pandorafms_server
%define version 7.0NG.731
-%define release 190214
+%define release 190219
Summary: Pandora FMS Server
Name: %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 3ed28d9c0c..6ef203a875 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
# **********************************************************************
PI_VERSION="7.0NG.731"
-PI_BUILD="190214"
+PI_BUILD="190219"
MODE=$1
if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 312570299d..ab35080dc9 100644
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -34,7 +34,7 @@ use PandoraFMS::Config;
use PandoraFMS::DB;
# version: define current version
-my $version = "7.0NG.731 PS190214";
+my $version = "7.0NG.731 PS190219";
# Pandora server configuration
my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index c7f32c51d7..aaafd6978c 100644
--- a/pandora_server/util/pandora_manage.pl
+++ b/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.731 PS190214";
+my $version = "7.0NG.731 PS190219";
# save program name for logging
my $progname = basename($0);