Merge remote-tracking branch 'origin/develop' into ent-4697-cicd-pandorafms

2020-01-10 21:22:35 +01:00 · 2020-01-10 21:22:35 +01:00 · bec40aa5f3
parent 320ca5d021 50e533e559
commit bec40aa5f3
39 changed files with 54 additions and 58 deletions
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.742-200109
+Version: 7.0NG.742-200110
 Architecture: all
 Priority: optional
 Section: admin
--- a/pandora_agents/unix/DEBIAN/make_deb_package.sh
+++ b/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.742-200109"
+pandora_version="7.0NG.742-200110"

 echo "Test if you has the tools for to make the packages."
 whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@ -55,7 +55,7 @@ my $Sem = undef;
 my $ThreadSem = undef;

 use constant AGENT_VERSION => '7.0NG.742';
-use constant AGENT_BUILD => '200109';
+use constant AGENT_BUILD => '200110';

 # Agent log default file size maximum and instances
 use constant DEFAULT_MAX_LOG_SIZE => 600000;
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.742
-%define release     200109
+%define release     200110

 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.742
-%define release     200109
+%define release     200110

 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@ -10,7 +10,7 @@
 # **********************************************************************

 PI_VERSION="7.0NG.742"
-PI_BUILD="200109"
+PI_BUILD="200110"
 OS_NAME=`uname -s`

 FORCE=0
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@ -186,7 +186,7 @@ UpgradeApplicationID
 {}

 Version
-{200109}
+{200110}

 ViewReadme
 {Yes}
--- a/pandora_agents/win32/pandora.cc
+++ b/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.742(Build 200109)")
+#define PANDORA_VERSION ("7.0NG.742(Build 200110)")

 string pandora_path;
 string pandora_dir;
--- a/pandora_agents/win32/versioninfo.rc
+++ b/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.742(Build 200109))"
+      VALUE "ProductVersion", "(7.0NG.742(Build 200110))"
      VALUE "FileVersion", "1.0.0.0"
    END
  END
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.742-200109
+Version: 7.0NG.742-200110
 Architecture: all
 Priority: optional
 Section: admin
--- a/pandora_console/DEBIAN/make_deb_package.sh
+++ b/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.742-200109"
+pandora_version="7.0NG.742-200110"

 package_pear=0
 package_pandora=1
--- a/pandora_console/extensions/agents_modules.php
+++ b/pandora_console/extensions/agents_modules.php
@ -798,11 +798,7 @@ function mainAgentsModules()
                    echo "<td style='text-align: center;'>";
                    $win_handle = dechex(crc32($module_id.$module['name']));
                    $graph_type = return_graphtype(modules_get_agentmodule_type($module_id));
-                    $link = "winopeng('".'operation/agentes/stat_win.php?'."type=$graph_type&".'period='.SECONDS_1DAY.'&'.'id='.$module_id.'&'.'label='.rawurlencode(
-                        urlencode(
-                            base64_encode($module['name'])
-                        )
-                    ).'&'.'refresh='.SECONDS_10MINUTES."', 'day_".$win_handle."')";
+                    $link = "winopeng('".'operation/agentes/stat_win.php?'."type=$graph_type&".'period='.SECONDS_1DAY.'&'.'id='.$module_id.'&'.'refresh='.SECONDS_10MINUTES."', 'day_".$win_handle."')";

                    echo '<a href="javascript:'.$link.'">';
                    switch ($status) {
--- a/pandora_console/godmode/users/configure_user.php
+++ b/pandora_console/godmode/users/configure_user.php
@ -243,6 +243,12 @@ if ($create_user) {
        $password_new = '';
        $password_confirm = '';
        $new_user = true;
+    } else if (preg_match('/^\s+|\s+$/', io_safe_output($id))) {
+        ui_print_error_message(__('Invalid user ID: leading or trailing blank spaces not allowed'));
+        $user_info = $values;
+        $password_new = '';
+        $password_confirm = '';
+        $new_user = true;
    } else if ($password_new == '') {
        ui_print_error_message(__('Passwords cannot be empty'));
        $user_info = $values;
--- a/pandora_console/include/ajax/module.php
+++ b/pandora_console/include/ajax/module.php
@ -1141,11 +1141,7 @@ if (check_login()) {
                    $draw_events = 0;
                }

-                $link = "winopeng_var('".'operation/agentes/stat_win.php?'."type=$graph_type&amp;".'period='.SECONDS_1DAY.'&amp;id='.$module['id_agente_modulo'].'&amp;label='.rawurlencode(
-                    urlencode(
-                        base64_encode($module['nombre'])
-                    )
-                ).'&amp;refresh='.SECONDS_10MINUTES.'&amp;'."draw_events=$draw_events', 'day_".$win_handle."', 1000, 700)";
+                $link = "winopeng_var('".'operation/agentes/stat_win.php?'."type=$graph_type&amp;".'period='.SECONDS_1DAY.'&amp;id='.$module['id_agente_modulo'].'&amp;refresh='.SECONDS_10MINUTES.'&amp;'."draw_events=$draw_events', 'day_".$win_handle."', 1000, 700)";
                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;';
                }
--- a/pandora_console/include/ajax/update_manager.ajax.php
+++ b/pandora_console/include/ajax/update_manager.ajax.php
@ -404,6 +404,13 @@ if ($search_minor) {
        $return['have_minor'] = true;
        $size_mr = get_number_of_mr($package, $ent, $offline);
        $return['mr'] = $size_mr;
+    } else {
+        $product_name = io_safe_output(get_product_name());
+        $version = get_parameter('version', '');
+        db_pandora_audit(
+            'ERROR: Update '.$product_name,
+            'Update version of '.$product_name.' by '.$config['id_user'].' has failed.'
+        );
    }

    echo json_encode($return);
--- a/pandora_console/include/class/Tree.class.php
+++ b/pandora_console/include/class/Tree.class.php
@ -652,7 +652,6 @@ class Tree
                'type'    => $graphType,
                'period'  => SECONDS_1DAY,
                'id'      => $module['id'],
-                'label'   => base64_encode($module['name']),
                'refresh' => SECONDS_10MINUTES,
            ];

--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@ -20,7 +20,7 @@
 /**
 * Pandora build version and version
 */
-$build_version = 'PC200109';
+$build_version = 'PC200110';
 $pandora_version = 'v7.0NG.742';

 // Do not overwrite default timezone set if defined.
--- a/pandora_console/include/functions_agents.php
+++ b/pandora_console/include/functions_agents.php
@ -146,7 +146,7 @@ function agents_get_next_contact_time_left(int $id_agente)
    if ($id_agente > 0) {
        $last_contact = db_get_value_sql(
            sprintf(
-                'SELECT format(intervalo,2) - (UNIX_TIMESTAMP() - UNIX_TIMESTAMP(IF(ultimo_contacto > ultimo_contacto_remoto, ultimo_contacto, ultimo_contacto_remoto))) as "val"
+                'SELECT CAST(intervalo AS SIGNED) - (UNIX_TIMESTAMP() - UNIX_TIMESTAMP(IF(ultimo_contacto >= ultimo_contacto_remoto, ultimo_contacto, ultimo_contacto_remoto))) as "val"
                    FROM `tagente`
                    WHERE id_agente = %d ',
                $id_agente
--- a/pandora_console/include/functions_cron.php
+++ b/pandora_console/include/functions_cron.php
@ -551,8 +551,9 @@ function cron_list_table()
                    $report_per_agent = $args[0];
                    $report_name = $args[3];
                    $email = $args[4];
-                    $data[2] .= '<br>- '.__('Template').": <a href='index.php?sec=reporting&sec2=operation/reporting/reporting_viewer";
-                    $data[2] .= '&id='.$args[0]."'>".$template['name'].'</a>';
+                    $data[2] .= '<br>- '.__('Template').': ';
+                    $data[2] .= '<a href="'.ui_get_full_url('index.php?sec=reporting&sec2=enterprise/godmode/reporting/reporting_builder.template&action=edit&id_template='.$args[0]).'">';
+                    $data[2] .= $template['name'].'</a>';
                    $data[2] .= '<br>- '.__('Agents').': '.$agents_id.'</a>';
                    $data[2] .= '<br>- '.__('Report per agent').': '.$report_per_agent.'</a>';
                    $data[2] .= '<br>- '.__('Report name').': '.$report_name.'</a>';
--- a/pandora_console/include/functions_events.php
+++ b/pandora_console/include/functions_events.php
@ -4116,7 +4116,6 @@ function events_page_details($event, $server='')
                'type'    => $graph_type,
                'period'  => SECONDS_1DAY,
                'id'      => $module['id_agente_modulo'],
-                'label'   => base64_encode($module['nombre']),
                'refresh' => SECONDS_10MINUTES,
            ];

--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@ -321,7 +321,7 @@ function ui_print_message($message, $class='', $attributes='', $return=false, $t
    $output = '<table cellspacing="0" cellpadding="0" id="'.$id.'" '.$attributes.'
 		class="info_box '.$id.' '.$class.' textodialogo" style="'.$force_style.'">
 		<tr>
-			<td class="icon" rowspan="2" style="padding-right: 10px; padding-top: 3px;">'.html_print_image($icon_image, true, false, false, false, true).'</td>
+			<td class="icon" rowspan="2" style="padding-right: 10px; padding-top: 3px;">'.html_print_image($icon_image, true, false, false, false, false).'</td>
 			<td class="title" style="text-transform: uppercase; padding-top: 10px;"><b>'.$text_title.'</b></td>
 			<td class="icon" style="text-align: right; padding-right: 3px;">';
    if (!$no_close_bool) {
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@ -913,15 +913,15 @@ div#head {
  min-width: 882px;
  background-color: #fff;
  color: #000;
-  z-index: 2;
+  z-index: 11;
 }

 .fixed_header {
-  z-index: 9999;
  position: fixed;
  left: 0;
  top: 0;
  width: 100%;
+  z-index: 11;
 }

 #ver {
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@ -129,7 +129,7 @@
        <div style='height: 10px'>
            <?php
            $version = '7.0NG.742';
-            $build = '200109';
+            $build = '200110';
            $banner = "v$version Build $build";

            error_reporting(0);
--- a/pandora_console/operation/agentes/estado_generalagente.php
+++ b/pandora_console/operation/agentes/estado_generalagente.php
@ -317,7 +317,7 @@ $data[1] = ui_progress(
    1.8,
    '#BBB',
    true,
-    floor(($agent['intervalo'] * (100 - $progress) / 100)).' s',
+    ($agent['intervalo'] - (strtotime('now') - strtotime($agent['ultimo_contacto']))).' s',
    [
        'page'     => 'operation/agentes/ver_agente',
        'interval' => (100 / $agent['intervalo']),
--- a/pandora_console/operation/agentes/stat_win.php
+++ b/pandora_console/operation/agentes/stat_win.php
@ -49,11 +49,10 @@ if (file_exists('../../include/languages/'.$user_language.'.mo')) {

 echo '<link rel="stylesheet" href="../../include/styles/pandora.css" type="text/css"/>';

-$label    = get_parameter('label');
-$label    = base64_decode($label);
 $id          = get_parameter('id');
 $id_agent    = db_get_value('id_agente', 'tagente_modulo', 'id_agente_modulo', $id);
 $alias       = db_get_value('alias', 'tagente', 'id_agente', $id_agent);
+$label       = db_get_value('nombre', 'tagente_modulo', 'id_agente_modulo', $id);
 // $agent = agents_get_agent_with_ip ("192.168.50.31");
 // $label = rawurldecode(urldecode(base64_decode(get_parameter('label', ''))));
 ?>
@ -117,8 +116,6 @@ $alias    = db_get_value('alias', 'tagente', 'id_agente', $id_agent);

        $period = get_parameter('period');
        $id     = get_parameter('id', 0);
-        $label = get_parameter('label', '');
-        $label_graph = base64_decode(get_parameter('label', ''));
        $start_date = get_parameter('start_date', date('Y/m/d'));
        $start_time = get_parameter('start_time', date('H:i:s'));
        $draw_events = get_parameter('draw_events', 0);
@ -190,7 +187,7 @@ $alias    = db_get_value('alias', 'tagente', 'id_agente', $id_agent);
                    'agent_module_id' => $id,
                    'period'          => $period,
                    'show_events'     => $draw_events,
-                    'title'           => $label_graph,
+                    'title'           => $label,
                    'unit_name'       => $unit,
                    'show_alerts'     => $draw_alerts,
                    'date'            => $date,
--- a/pandora_console/operation/agentes/status_monitor.php
+++ b/pandora_console/operation/agentes/status_monitor.php
@ -1502,7 +1502,6 @@ if (!empty($result)) {
                    'type'    => $graph_type,
                    'period'  => SECONDS_1DAY,
                    'id'      => $row['id_agente_modulo'],
-                    'label'   => base64_encode($row['module_name']),
                    'refresh' => SECONDS_10MINUTES,
                ];

--- a/pandora_console/operation/search_modules.php
+++ b/pandora_console/operation/search_modules.php
@ -152,11 +152,7 @@ if (!$modules || !$searchModules) {
            $url = 'include/procesos.php?agente='.$module['id_agente_modulo'];
            $win_handle = dechex(crc32($module['id_agente_modulo'].$module['module_name']));

-            $link = "winopeng('".'operation/agentes/stat_win.php?'."type=$graph_type&".'period='.SECONDS_1DAY.'&'.'id='.$module['id_agente_modulo'].'&'.'label='.rawurlencode(
-                urlencode(
-                    base64_encode($module['module_name'])
-                )
-            ).'&'.'refresh='.SECONDS_10MINUTES."', "."'day_".$win_handle."')";
+            $link = "winopeng('".'operation/agentes/stat_win.php?'."type=$graph_type&".'period='.SECONDS_1DAY.'&'.'id='.$module['id_agente_modulo'].'&'.'refresh='.SECONDS_10MINUTES."', "."'day_".$win_handle."')";

            $graphCell = '<a href="javascript:'.$link.'">'.html_print_image('images/chart_curve.png', true, ['border' => 0, 'alt' => '']).'</a>';
            $graphCell .= '&nbsp;'."<a href='index.php?".'sec=estado&amp;'.'sec2=operation/agentes/ver_agente&amp;'.'id_agente='.$module['id_agente'].'&amp;'.'tab=data_view&'.'period='.SECONDS_1DAY.'&amp;'.'id='.$module['id_agente_modulo']."'>".html_print_image(
--- 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.742
-%define release     200109
+%define release     200110

 # User and Group under which Apache is running
 %define httpd_name  httpd
--- a/pandora_console/pandora_console.rhel7.spec
+++ b/pandora_console/pandora_console.rhel7.spec
@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.742
-%define release     200109
+%define release     200110

 # User and Group under which Apache is running
 %define httpd_name  httpd
--- a/pandora_console/pandora_console.spec
+++ b/pandora_console/pandora_console.spec
@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.742
-%define release     200109
+%define release     200110
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.742-200109
+Version: 7.0NG.742-200110
 Architecture: all
 Priority: optional
 Section: admin
--- 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.742-200109"
+pandora_version="7.0NG.742-200110"

 package_cpan=0
 package_pandora=1
--- 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.742";
-my $pandora_build = "200109";
+my $pandora_build = "200110";
 our $VERSION = $pandora_version." ".$pandora_build;

 # Setup hash
--- 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.742";
-my $pandora_build = "200109";
+my $pandora_build = "200110";
 our $VERSION = $pandora_version." ".$pandora_build;

 our %EXPORT_TAGS = ( 'all' => [ qw() ] );
--- 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.742
-%define release     200109
+%define release     200110

 Summary:            Pandora FMS Server
 Name:               %{name}
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.742
-%define release     200109
+%define release     200110

 Summary:            Pandora FMS Server
 Name:               %{name}
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@ -9,7 +9,7 @@
 # **********************************************************************

 PI_VERSION="7.0NG.742"
-PI_BUILD="200109"
+PI_BUILD="200110"

 MODE=$1
 if [ $# -gt 1 ]; then
--- 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.742 PS200109";
+my $version = "7.0NG.742 PS200110";

 # Pandora server configuration
 my %conf;
--- 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.742 PS200109";
+my $version = "7.0NG.742 PS200110";

 # save program name for logging
 my $progname = basename($0);