Merge branch 'develop' into ent-3120-Cambio-de-radio-buttons-yes-no-por-checkbox-2-parte

Conflicts:
	pandora_console/install.php

Former-commit-id: b910529699b6e6afaeea286ac43c89779b11a26e

pandora_agents/unix/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.731-190208
+Version: 7.0NG.731-190211
 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.731-190208"
+pandora_version="7.0NG.731-190211"
 
 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.731';
-use constant AGENT_BUILD => '190208';
+use constant AGENT_BUILD => '190211';
 
 # 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.731
-%define release     190208
+%define release     190211
 
 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.731
-%define release     190208
+%define release     190211
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}

pandora_agents/unix/pandora_agent_installer

@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.731"
-PI_BUILD="190208"
+PI_BUILD="190211"
 OS_NAME=`uname -s`
 
 FORCE=0

pandora_agents/win32/installer/pandora.mpi

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

pandora_console/DEBIAN/control

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

pandora_console/general/main_menu.php

@@ -320,6 +320,23 @@ $(document).ready( function() {
     }
     else {
         $('div#title_menu').hide();
+        if(!click_display){
+            $('#menu').mouseenter(function() {
+                handsInMenu = 1;
+                openTimeMenu = new Date().getTime();
+                $('ul.submenu').css('left', '44px');
+            }).mouseleave(function() {
+                handsInMenu = 0;
+                setTimeout(function() {
+                    openedMenu = new Date().getTime() - openTimeMenu;
+                    if(openedMenu > 1000 && handsInMenu == 0) {
+                        $('li.menu_icon').removeClass( " no_hidden_menu");
+                        $('li.menu_icon').find('li').removeClass( " no_hidden_menu" );
+                        $('ul.submenu').css('left', '44px');
+                    }
+                }, 2500);
+            });
+        }
     }
 });
 /* ]]> */
@@ -332,7 +349,6 @@ $(document).ready( function() {
     handsIn2 = 0;
 
     if(!click_display){
-        if (autohidden_menu) {
             $('.menu_icon').mouseenter(function() {
                 table_hover = $(this);
                 handsIn = 1;
@@ -352,7 +368,6 @@ $(document).ready( function() {
                     }
                 }, 2500);
             });
-        }
     }else{
         $(document).ready(function() {
             if (autohidden_menu) {

pandora_console/godmode/reporting/map_builder.php

@@ -42,6 +42,7 @@ if (!$is_metaconsole) {
     $url_visual_console_favorite        = 'index.php?sec=screen&sec2=screens/screens&action=visualmap_favorite';
     $url_visual_console_template        = 'index.php?sec=screen&sec2=screens/screens&action=visualmap_template';
     $url_visual_console_template_wizard = 'index.php?sec=screen&sec2=screens/screens&action=visualmap_wizard';
+    $url_visual_console_manager         = 'index.php?sec=screen&sec2=enterprise/extensions/visual_console_manager';
 }
 
 $pure = (int) get_parameter('pure', 0);
@@ -70,6 +71,12 @@ if ($is_enterprise && $vconsoles_manage) {
         'active' => false,
         'text'   => '<a href="'.$url_visual_console_template_wizard.'">'.html_print_image('images/wand.png', true, ['title' => __('Visual Console Template Wizard')]).'</a>',
     ];
+    if ($is_metaconsole) {
+        $buttons['visual_console_manager'] = [
+            'active' => false,
+            'text'   => '<a href="'.$url_visual_console_manager.'">'.html_print_image('images/builder.png', true, ['title' => __('Visual Console Manager')]).'</a>',
+        ];
+    }
 }
 
 if (!$is_metaconsole) {

pandora_console/godmode/reporting/visual_console_favorite.php

@@ -41,6 +41,7 @@ if (!$is_metaconsole) {
     $url_visual_console_favorite        = 'index.php?sec=screen&sec2=screens/screens&action=visualmap_favorite';
     $url_visual_console_template        = 'index.php?sec=screen&sec2=screens/screens&action=visualmap_template';
     $url_visual_console_template_wizard = 'index.php?sec=screen&sec2=screens/screens&action=visualmap_wizard';
+    $url_visual_console_manager         = 'index.php?sec=screen&sec2=enterprise/extensions/visual_console_manager';
 }
 
 $buttons['visual_console'] = [
@@ -63,6 +64,13 @@ if ($is_enterprise && $vconsoles_manage) {
         'active' => false,
         'text'   => '<a href="'.$url_visual_console_template_wizard.'">'.html_print_image('images/wand.png', true, ['title' => __('Visual Console Template Wizard')]).'</a>',
     ];
+
+    if ($is_metaconsole) {
+        $buttons['visual_console_manager'] = [
+            'active' => false,
+            'text'   => '<a href="'.$url_visual_console_manager.'">'.html_print_image('images/builder.png', true, ['title' => __('Visual Console Manager')]).'</a>',
+        ];
+    }
 }
 
 if (!$is_metaconsole) {

pandora_console/include/config_process.php

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

pandora_console/include/functions_menu.php

@@ -372,7 +372,7 @@ function menu_print_menu(&$menu)
         }
 
         // Print out the first level
-        $output .= '<li title="'.ucwords(str_replace(['oper-', 'god-'], '', $id)).'" class="'.implode(' ', $classes).' '.$seleccionado.'" id="icon_'.$id.'">';
+        $output .= '<li title="'.$main['text'].'" class="'.implode(' ', $classes).' '.$seleccionado.'" id="icon_'.$id.'">';
                         // onclick="location.href=\'index.php?sec='.$mainsec.'&amp;sec2='.$main["sec2"].($main["refr"] ? '&amp;refr='.$main["refr"] : '').'\'">';
         $length = strlen(__($main['text']));
         $padding_top = ( $length >= 18) ? 6 : 12;

pandora_console/include/functions_visual_map.php

@@ -3902,13 +3902,16 @@ function visual_map_translate_agent_status($agent_status)
 {
     switch ($agent_status) {
         case AGENT_STATUS_NORMAL:
+        case AGENT_MODULE_STATUS_NORMAL_ALERT:
         default:
         return VISUAL_MAP_STATUS_NORMAL;
 
         case AGENT_STATUS_CRITICAL:
+        case AGENT_MODULE_STATUS_CRITICAL_ALERT:
         return VISUAL_MAP_STATUS_CRITICAL_BAD;
 
         case AGENT_STATUS_WARNING:
+        case AGENT_MODULE_STATUS_WARNING_ALERT:
         return VISUAL_MAP_STATUS_WARNING;
 
         case AGENT_STATUS_NOT_INIT:

pandora_console/pandora_console.redhat.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.731
-%define release     190208
+%define release     190211
 
 # 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.731
-%define release     190208
+%define release     190211
 %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.731-190208
+Version: 7.0NG.731-190211
 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.731-190208"
+pandora_version="7.0NG.731-190211"
 
 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.731";
-my $pandora_build = "190208";
+my $pandora_build = "190211";
 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.731";
-my $pandora_build = "190208";
+my $pandora_build = "190211";
 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.731
-%define release     190208
+%define release     190211
 
 Summary:            Pandora FMS Server
 Name:               %{name}

pandora_server/pandora_server.spec

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

pandora_server/pandora_server_installer

@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.731"
-PI_BUILD="190208"
+PI_BUILD="190211"
 
 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.731 PS190208";
+my $version = "7.0NG.731 PS190211";
 
 # 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.731 PS190208";
+my $version = "7.0NG.731 PS190211";
 
 # save program name for logging
 my $progname = basename($0);