Merge branch 'develop' into 'ent-3432-Nueva-cabecera-y-menu-lateral'

Conflicts: pandora_console/install.php Former-commit-id: 35214830b309620c88c44b32f93cfae93775e9a8
2019-03-06 09:18:38 +01:00 · 2019-03-06 09:18:38 +01:00 · acc44ff9ce
parent b2bf411608 88f1f16a5a
commit acc44ff9ce
31 changed files with 160 additions and 34 deletions
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.732-190305
+Version: 7.0NG.732-190306
 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.732-190305"
+pandora_version="7.0NG.732-190306"

 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
@ -42,7 +42,7 @@ my $Sem = undef;
 my $ThreadSem = undef;

 use constant AGENT_VERSION => '7.0NG.732';
-use constant AGENT_BUILD => '190305';
+use constant AGENT_BUILD => '190306';

 # 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.732
-%define release     190305
+%define release     190306

 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.732
-%define release     190305
+%define release     190306

 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.732"
-PI_BUILD="190305"
+PI_BUILD="190306"
 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
-{190305}
+{190306}

 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.732(Build 190305)")
+#define PANDORA_VERSION ("7.0NG.732(Build 190306)")

 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.732(Build 190305))"
+      VALUE "ProductVersion", "(7.0NG.732(Build 190306))"
      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.732-190305
+Version: 7.0NG.732-190306
 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.732-190305"
+pandora_version="7.0NG.732-190306"

 package_pear=0
 package_pandora=1
--- a/pandora_console/general/mysqlerr.php
+++ b/pandora_console/general/mysqlerr.php
@ -0,0 +1,113 @@
+<html>
+<head>
+    
+<style>
+
+#alert_messages_na{
+    -moz-border-bottom-right-radius: 5px;
+    -webkit-border-bottom-left-radius: 5px;
+    border-bottom-right-radius: 5px;
+    border-bottom-left-radius: 5px;
+    z-index:2;
+    position:fixed;
+    width:700px;
+    background:white;
+    left:50%;
+    top:20%;
+    margin-left:-350px;
+
+}
+
+.modalheade{
+    text-align:center;
+    width:100%;
+    height:37px;
+    left:0px;
+    background-color:#82b92e;
+}
+.modalheadertex{
+    color:white;
+    position:relative;
+    font-family:Nunito;
+    font-size:13pt;
+    top:8px;
+}
+
+.modalconten{
+    color:black;
+    background:white;
+}
+.modalcontentim{
+    float:left;
+    margin-left:30px;
+    margin-top:30px;
+    margin-bottom:30px;
+}
+.modalcontenttex{
+    float:left;
+    text-align:justify;
+    color:black;
+    font-size: 9.5pt;
+    line-height:13pt;
+    margin-top:40px;
+    width:430px;
+    margin-left:30px;
+}
+.modalwikibutto{
+    cursor:pointer;
+    text-align:center;
+    margin-right:45px;
+    float:right;
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
+    margin-bottom:30px;
+    border-radius: 3px;
+    width:170px;
+    height:30px;
+    border: 1px solid #82b92e;
+    margin-top:8%;
+    background-color:#82b92e;
+}
+.modalwikibuttontex{
+    color:#ffffff;
+    font-family:Nunito;
+    font-size:10pt;
+    position:relative;
+    top:6px;
+}
+
+#opacity{
+background:black;opacity:0.1;left:0px;top:0px;width:100%;height:100%;
+}
+
+</style>
+</head>
+<body>
+    
+<div id="alert_messages_na">
+    
+    <div class='modalheade'>
+        <span class='modalheadertex'>
+            <?php echo __('Database error'); ?>
+        </span>
+    </div>
+
+    <div class='modalconten'>
+        <img class='modalcontentim' src='<?php echo $config['homeurl']; ?>/images/mysqlerr.png'>
+        <div class='modalcontenttex'>
+            <?php
+            echo __('Failure to connect to Database server, please check the configuration file config.php or contact system administrator if you need assistance.');
+            ?>
+        </div>
+    </div>
+    <a href='https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Configuration' target='_blank'>
+    <div class='modalwikibutto cerrar'>
+        <span class='modalwikibuttontex'> <?php echo __('Documentation'); ?></span>
+    </div>
+    </a>
+</div>
+    
+<div id="opacity"></div>
+    
+</body>
+</html>
--- a/pandora_console/images/mysqlerr.png
+++ b/pandora_console/images/mysqlerr.png
--- 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 = 'PC190305';
+$build_version = 'PC190306';
 $pandora_version = 'v7.0NG.732';

 // Do not overwrite default timezone set if defined.
--- a/pandora_console/include/db/mysql.php
+++ b/pandora_console/include/db/mysql.php
@ -45,6 +45,7 @@ function mysql_connect_db($host=null, $db=null, $user=null, $pass=null, $port=nu
    if ($config['mysqli']) {
        $connect_id = mysqli_connect($host, $user, $pass, $db, $port);
        if (mysqli_connect_errno() > 0) {
+            include 'general/mysqlerr.php';
            return false;
        }

--- a/pandora_console/include/functions_planned_downtimes.php
+++ b/pandora_console/include/functions_planned_downtimes.php
@ -534,9 +534,10 @@ function planned_downtimes_migrate_malformed_downtimes_copy_items($original_down
 /**
 * Stop a planned downtime.
 *
- * @param array Planned downtime data.
+ * @param array $downtime Planned downtime data.
 *
- * @return mixes False on error or an array with the result and a message of the operation.
+ * @return mixed False on error or an array with the result and a message of
+ *      the operation.
 */
 function planned_downtimes_stop($downtime)
 {
@ -566,7 +567,9 @@ function planned_downtimes_stop($downtime)
        case 'periodically':
        return false;

-            break;
+        default:
+            // Nothing to do.
+        break;
    }

    $message .= ui_print_result_message(
@ -593,7 +596,7 @@ function planned_downtimes_stop($downtime)
            true
        );

-        // Reenabled the Agents or Modules or alerts...depends of type
+        // Reenabled the Agents or Modules or alerts...depends of type.
        switch ($downtime['type_downtime']) {
            case 'quiet':
                $agents = db_get_all_rows_filter(
@ -658,7 +661,10 @@ function planned_downtimes_stop($downtime)
                foreach ($agents as $agent) {
                    $result = db_process_sql_update(
                        'tagente',
-                        ['disabled' => 0],
+                        [
+                            'disabled'            => 0,
+                            'update_module_count' => 1,
+                        ],
                        ['id_agente' => $agent['id_agent']]
                    );

@ -702,6 +708,10 @@ function planned_downtimes_stop($downtime)
                    }
                }
            break;
+
+            default:
+                // Nothing to do.
+            break;
        }

        $message .= ui_print_info_message(
--- a/pandora_console/include/graphs/functions_flot.php
+++ b/pandora_console/include/graphs/functions_flot.php
@ -748,7 +748,7 @@ function flot_slicesbar_graph(
        if ($widgets) {
            $return = "<div id='$graph_id' class='noresizevc graph $adapt_key' style='width: ".$width.'px; height: '.$height."px;'></div>";
        } else {
-            $return = "<div id='$graph_id' class='noresizevc graph $adapt_key' style='width: ".$width.'%; height: '.$height."px;'></div>";
+            $return = "<div id='$graph_id' class='noresizevc graph $adapt_key' style='width: ".$width.'px; height: '.$height."px;'></div>";
        }
    }

--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@ -128,8 +128,8 @@
        </div>
        <div style='height: 10px'>
            <?php
-            $version = '7.0NG.732';
-            $build = '190306';
+$version = '7.0NG.732';
+$build = '190306';
            $banner = "v$version Build $build";

            error_reporting(0);
--- 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.732
-%define release     190305
+%define release     190306

 # 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.732
-%define release     190305
+%define release     190306
 %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.732-190305
+Version: 7.0NG.732-190306
 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.732-190305"
+pandora_version="7.0NG.732-190306"

 package_cpan=0
 package_pandora=1
--- a/pandora_server/bin/pandora_server
+++ b/pandora_server/bin/pandora_server
@ -306,7 +306,7 @@ sub pandora_server_tasks ($) {
 			if (($counter % 30) == 0) {

 				# Update module status and fired alert counts
-				my @agents = get_db_rows ($dbh, 'SELECT id_agente, nombre, update_module_count, update_alert_count, update_secondary_groups FROM tagente WHERE disabled = 0 AND (update_module_count=1 OR update_alert_count=1 OR update_secondary_groups=1)');
+				my @agents = get_db_rows ($dbh, 'SELECT id_agente, nombre, update_module_count, update_alert_count, update_secondary_groups FROM tagente WHERE (update_module_count=1 OR update_alert_count=1 OR update_secondary_groups=1)');
 				foreach my $agent (@agents) {
 					logger ($pa_config, "Updating module status and fired alert counts for agent " . $agent->{'nombre'}, 10);
 					
--- 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.732";
-my $pandora_build = "190305";
+my $pandora_build = "190306";
 our $VERSION = $pandora_version." ".$pandora_build;

 # Setup hash
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@ -1820,7 +1820,8 @@ sub pandora_planned_downtime_set_disabled_elements($$$) {
 			WHERE tp.id_agent = ta.id_agente AND tp.id_downtime = ?',$downtime->{'id'});
 		
 		db_do($dbh,'UPDATE tagente ta, tplanned_downtime_agents tpa
-			SET ta.disabled = 1 WHERE tpa.id_agent = ta.id_agente AND
+			SET ta.disabled = 1, ta.update_module_count = 1
+			WHERE tpa.id_agent = ta.id_agente AND
 			tpa.id_downtime = ?',$downtime->{'id'});
 			
 	} else {
@ -1857,7 +1858,8 @@ sub pandora_planned_downtime_unset_disabled_elements($$$) {
 		
 	if ($only_alerts == 0) {
 		db_do($dbh,'UPDATE tagente ta, tplanned_downtime_agents tpa
-			set ta.disabled = 0 WHERE tpa.id_agent = ta.id_agente AND
+			set ta.disabled = 0, ta.update_module_count = 1
+			WHERE tpa.id_agent = ta.id_agente AND
 			tpa.manually_disabled = 0 AND tpa.id_downtime = ?',$downtime->{'id'});
 	} else {
 		my @downtime_agents = get_db_rows($dbh, 'SELECT *
--- 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.732";
-my $pandora_build = "190305";
+my $pandora_build = "190306";
 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.732
-%define release     190305
+%define release     190306

 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.732
-%define release     190305
+%define release     190306

 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.732"
-PI_BUILD="190305"
+PI_BUILD="190306"

 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.732 PS190305";
+my $version = "7.0NG.732 PS190306";

 # 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.732 PS190305";
+my $version = "7.0NG.732 PS190306";

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