Merge remote-tracking branch 'origin/develop' into ent-5408-consola-visual-nueva-bugs

pandora_agents/unix/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.743-200205
+Version: 7.0NG.743-200210
 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.743-200205"
+pandora_version="7.0NG.743-200210"
 
 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

@@ -55,7 +55,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.743';
-use constant AGENT_BUILD => '200205';
+use constant AGENT_BUILD => '200210';
 
 # 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.743
-%define release     200205
+%define release     200210
 
 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.743
-%define release     200205
+%define release     200210
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}

pandora_agents/unix/pandora_agent_installer

@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.743"
-PI_BUILD="200205"
+PI_BUILD="200210"
 OS_NAME=`uname -s`
 
 FORCE=0

pandora_agents/win32/installer/pandora.mpi

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

pandora_console/DEBIAN/control

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

pandora_console/include/class/NetworkMap.class.php

@@ -226,6 +226,13 @@ class NetworkMap
      */
     public $tooltipParams;
 
+    /**
+     *  Defines if map is widget or not for JS
+     *
+     * @var boolean;
+     */
+    public $widget;
+
     /**
      * Shows the map using 100% of height and width if is a widget.
      *
@@ -406,8 +413,10 @@ class NetworkMap
             // Initialize as widget?
             if (isset($options['widget'])) {
                 $this->fullSize = (bool) $options['widget'];
+                $this->widget = true;
             } else {
                 $this->fullSize = true;
+                $this->widget = false;
             }
 
             // Use a custom parser.
@@ -2689,6 +2698,7 @@ class NetworkMap
         $this->cleanGraphRelations();
 
         // Print some params to handle it in js.
+        html_print_input_hidden('widget', $this->widget);
         html_print_input_hidden('product_name', get_product_name());
         html_print_input_hidden('center_logo', ui_get_full_url(ui_get_logo_to_center_networkmap()));
 

pandora_console/include/config_process.php

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

pandora_console/include/javascript/functions_pandora_networkmap.js

@@ -738,6 +738,14 @@ function add_new_link(new_link) {
 }
 
 function move_to_networkmap(node) {
+  // Checks if is widget or not
+  var widget = false;
+  widget = $("#hidden-widget").val();
+
+  if (widget == true) {
+    var id_cell = $(".widget_content").data("id_cell");
+    move_to_networkmap_widget(node.networkmap_id, id_cell);
+  } else {
     var params = [];
     params.push("get_networkmap_from_fictional=1");
     params.push("id=" + node.id_db);
@@ -760,6 +768,7 @@ function move_to_networkmap(node) {
       }
     });
   }
+}
 
 function edit_node(data_node, dblClick) {
   if (enterprise_installed) {
@@ -4516,3 +4525,38 @@ function update_fictional_node_popup(id) {
     color
   );
 }
+
+function move_to_networkmap_widget(networkmap_id, id_cell) {
+  var params = [];
+
+  $(".widget_content").each(function(i) {
+    $("#body_cell").empty();
+  });
+
+  var pathname = window.location.pathname;
+  var path;
+
+  if (
+    pathname == "/pandora_console/enterprise/dashboard/public_dashboard.php"
+  ) {
+    path = "../../ajax.php";
+  } else {
+    path = "ajax.php";
+  }
+
+  params.push("networkmap=true");
+  params.push("networkmap_id=" + networkmap_id);
+
+  params.push("page=enterprise/include/ajax/map_enterprise.ajax");
+  jQuery.ajax({
+    data: params.join("&"),
+    dataType: "html",
+    type: "POST",
+    url: path,
+    success: function(data) {
+      $(".widget_content").each(function(i) {
+        $("#body_cell").append(data);
+      });
+    }
+  });
+}

pandora_console/install.php

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

pandora_console/pandora_console.redhat.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.743
-%define release     200205
+%define release     200210
 
 # User and Group under which Apache is running
 %define httpd_name  httpd
@@ -86,3 +86,4 @@ fi
 %docdir %{prefix}/pandora_console/docs
 %{prefix}/pandora_console
 %config(noreplace) %{_sysconfdir}/logrotate.d/pandora_console
+%attr(0644, root, root) %{_sysconfdir}/logrotate.d/pandora_console

pandora_console/pandora_console.rhel7.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.743
-%define release     200205
+%define release     200210
 
 # User and Group under which Apache is running
 %define httpd_name  httpd
@@ -86,3 +86,4 @@ fi
 %docdir %{prefix}/pandora_console/docs
 %{prefix}/pandora_console
 %config(noreplace) %{_sysconfdir}/logrotate.d/pandora_console
+%attr(0644, root, root) %{_sysconfdir}/logrotate.d/pandora_console

pandora_console/pandora_console.spec

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

pandora_server/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.743-200205
+Version: 7.0NG.743-200210
 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.743-200205"
+pandora_version="7.0NG.743-200210"
 
 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.743";
-my $pandora_build = "200205";
+my $pandora_build = "200210";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash

pandora_server/lib/PandoraFMS/DataServer.pm

@@ -82,8 +82,11 @@ sub new ($$;$) {
 	my $self = $class->SUPER::new($config, DATASERVER, \&PandoraFMS::DataServer::data_producer, \&PandoraFMS::DataServer::data_consumer, $dbh);
 
 	# Load external .enc files for XML::Parser.
-	if ($config->{'enc_dir'} ne '' && !grep {$_ eq $config->{'enc_dir'}} @XML::Parser::Expat::Encoding_Path) {
+	if ($config->{'enc_dir'} ne '') {
 		push(@XML::Parser::Expat::Encoding_Path, $config->{'enc_dir'});
+		if ($XML::Simple::PREFERRED_PARSER eq 'XML::SAX::ExpatXS') {
+			push(@XML::SAX::ExpatXS::Encoding::Encoding_Path, $config->{'enc_dir'});
+		}
 	}
 
 	if ($config->{'autocreate_group'} > 0 && !defined(get_group_name ($dbh, $config->{'autocreate_group'}))) {

pandora_server/lib/PandoraFMS/PluginTools.pm

@@ -33,7 +33,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.743";
-my $pandora_build = "200205";
+my $pandora_build = "200210";
 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.743
-%define release     200205
+%define release     200210
 
 Summary:            Pandora FMS Server
 Name:               %{name}

pandora_server/pandora_server.spec

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

pandora_server/pandora_server_installer

@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.743"
-PI_BUILD="200205"
+PI_BUILD="200210"
 
 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.743 PS200205";
+my $version = "7.0NG.743 PS200210";
 
 # 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.743 PS200205";
+my $version = "7.0NG.743 PS200210";
 
 # save program name for logging
 my $progname = basename($0);