Merge branch 'develop' into 'ent-3837-7848-campo-id_source_event-en-vista-de-eventos-y-poder-filtrar-por-este'

# Conflicts:
#   pandora_console/extras/mr/29.sql

pandora_agents/pc/AIX/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.734, AIX version
+# Version 7.0NG.735, AIX version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2010 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com

pandora_agents/pc/FreeBSD/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.734, FreeBSD Version
+# Version 7.0NG.735, FreeBSD Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2010 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com

pandora_agents/pc/HP-UX/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.734, HP-UX Version
+# Version 7.0NG.735, HP-UX Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com

pandora_agents/pc/Linux/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.734, GNU/Linux
+# Version 7.0NG.735, GNU/Linux
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com

pandora_agents/pc/NT4/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.734, GNU/Linux
+# Version 7.0NG.735, GNU/Linux
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com

pandora_agents/pc/SunOS/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.734, Solaris Version
+# Version 7.0NG.735, Solaris Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com

pandora_agents/pc/Win32/pandora_agent.conf

@@ -1,6 +1,6 @@
 # Base config file for Pandora FMS Windows Agent
 # (c) 2006-2010 Artica Soluciones Tecnologicas 
-# Version 7.0NG.734
+# Version 7.0NG.735
 
 # This program is Free Software, you can redistribute it and/or modify it
 # under the terms of the GNU General Public Licence as published by the Free Software

pandora_agents/shellscript/aix/pandora_agent.conf

@@ -1,6 +1,6 @@
 # Fichero de configuracion base de agentes de Pandora
 # Base config file for Pandora agents
-# Version 7.0NG.734, AIX version
+# Version 7.0NG.735, AIX version
 
 # General Parameters
 # ==================

pandora_agents/shellscript/bsd-ipso/pandora_agent.conf

@@ -1,6 +1,6 @@
 # Fichero de configuracion base de agentes de Pandora
 # Base config file for Pandora agents
-# Version 7.0NG.734
+# Version 7.0NG.735
 # FreeBSD/IPSO version
 # Licenced under GPL licence, 2003-2007 Sancho Lerena
 

pandora_agents/shellscript/hp-ux/pandora_agent.conf

@@ -1,6 +1,6 @@
 # Fichero de configuracion base de agentes de Pandora
 # Base config file for Pandora agents
-# Version 7.0NG.734, HPUX Version
+# Version 7.0NG.735, HPUX Version
 
 # General Parameters
 # ==================

pandora_agents/shellscript/linux/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.734
+# Version 7.0NG.735
 # Licensed under GPL license v2,
 # (c) 2003-2010 Artica Soluciones Tecnologicas
 # please visit http://pandora.sourceforge.net

pandora_agents/shellscript/mac_osx/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.734
+# Version 7.0NG.735
 # Licensed under GPL license v2,
 # (c) 2003-2009 Artica Soluciones Tecnologicas
 # please visit http://pandora.sourceforge.net

pandora_agents/shellscript/openWRT/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.734
+# Version 7.0NG.735
 # Licensed under GPL license v2,
 # please visit http://pandora.sourceforge.net
 

pandora_agents/shellscript/solaris/pandora_agent.conf

@@ -1,6 +1,6 @@
 # Fichero de configuracion base de agentes de Pandora
 # Base config file for Pandora agents
-# Version 7.0NG.734, Solaris version
+# Version 7.0NG.735, Solaris version
 
 # General Parameters
 # ==================

pandora_agents/unix/AIX/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.734, AIX version
+# Version 7.0NG.735, AIX version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2010 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com

pandora_agents/unix/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.734-190522
+Version: 7.0NG.735-190621
 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.734-190522"
+pandora_version="7.0NG.735-190621"
 
 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/Darwin/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.734, GNU/Linux
+# Version 7.0NG.735, GNU/Linux
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2012 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com

pandora_agents/unix/FreeBSD/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.734, FreeBSD Version
+# Version 7.0NG.735, FreeBSD Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2016 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com

pandora_agents/unix/HP-UX/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.734, HP-UX Version
+# Version 7.0NG.735, HP-UX Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com

pandora_agents/unix/Linux/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.734, GNU/Linux
+# Version 7.0NG.735, GNU/Linux
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2014 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com

pandora_agents/unix/NT4/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.734, GNU/Linux
+# Version 7.0NG.735, GNU/Linux
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com

pandora_agents/unix/NetBSD/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.734, NetBSD Version
+# Version 7.0NG.735, NetBSD Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2010 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com

pandora_agents/unix/SunOS/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.734, Solaris Version
+# Version 7.0NG.735, Solaris Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com

pandora_agents/unix/pandora_agent

@@ -41,8 +41,8 @@ my $Sem = undef;
 # Semaphore used to control the number of threads
 my $ThreadSem = undef;
 
-use constant AGENT_VERSION => '7.0NG.734';
+use constant AGENT_VERSION => '7.0NG.735';
-use constant AGENT_BUILD => '190522';
+use constant AGENT_BUILD => '190621';
 
 # Agent log default file size maximum and instances
 use constant DEFAULT_MAX_LOG_SIZE => 600000;
@@ -536,6 +536,12 @@ sub parse_conf_modules($) {
 			# Check for invalid modules
 			next unless (($module->{'name'} ne '' && $module->{'func'} != 0) || $module->{'func'} == \&module_plugin);
 
+			# Skip disabled modules.
+			if (defined($module->{'disabled'}) && $module->{'disabled'} == 1) {
+				log_message('setup', 'Skipping disabled module "' . $module->{'name'} . '"');
+				next;
+			}
+
 			# Set the intensive interval
 			if ($module->{'is_intensive'} == 1) {				
 				$module->{'intensive_interval'} = $module->{'interval'};
@@ -3032,10 +3038,10 @@ while (1) {
 			my @address_list;
 
 			if( -x "/bin/ip" || -x "/sbin/ip" || -x "/usr/sbin/ip" ) {
-				@address_list = `ip addr show 2>$DevNull | sed -e '/127.0.0/d' -e '/[0-9]*\\.[0-9]*\\.[0-9]*/!d' -e 's/^[ \\t]*\\([^ \\t]*\\)[ \\t]*\\([^ \\t]*\\)[ \\t].*/\\2/' -e 's/\\/.*//'`;
+				@address_list = `ip addr show 2>$DevNull | sed -e '/127.0.0/d' -e '/\\([0-9][0-9]*\\.\\)\\{3\\}[0-9][0-9]*/!d' -e 's/^[ \\t]*\\([^ \\t]*\\)[ \\t]*\\([^ \\t]*\\)[ \\t].*/\\2/' -e 's/\\/.*//'`;
 			}
 			else {
-				@address_list = `ifconfig -a 2>$DevNull | sed -e '/127.0.0/d' -e '/[0-9]*\\.[0-9]*\\.[0-9]*/!d' -e 's/^[ \\t]*\\([^ \\t]*\\)[ \\t]*\\([^ \\t]*\\)[ \\t].*/\\2/' -e 's/.*://'`;
+				@address_list = `ifconfig -a 2>$DevNull | sed -e '/127.0.0/d' -e '/\\([0-9][0-9]*\\.\\)\\{3\\}[0-9][0-9]*/!d' -e 's/^[ \\t]*\\([^ \\t]*\\)[ \\t]*\\([^ \\t]*\\)[ \\t].*/\\2/' -e 's/.*://'`;
 			}
 
 			for (my $i = 0; $i <= $#address_list; $i++) {		

pandora_agents/unix/pandora_agent.redhat.spec

@@ -2,8 +2,8 @@
 #Pandora FMS Linux Agent
 #
 %define name        pandorafms_agent_unix
-%define version     7.0NG.734
+%define version     7.0NG.735
-%define release     190522
+%define release     190621
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}

pandora_agents/unix/pandora_agent.spec

@@ -2,8 +2,8 @@
 #Pandora FMS Linux Agent
 #
 %define name        pandorafms_agent_unix
-%define version     7.0NG.734
+%define version     7.0NG.735
-%define release     190522
+%define release     190621
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}

pandora_agents/unix/pandora_agent_installer

@@ -9,8 +9,8 @@
 # Please see http://www.pandorafms.org. This code is licensed under GPL 2.0 license.
 # **********************************************************************
 
-PI_VERSION="7.0NG.734"
+PI_VERSION="7.0NG.735"
-PI_BUILD="190522"
+PI_BUILD="190621"
 OS_NAME=`uname -s`
 
 FORCE=0

pandora_agents/unix/plugins/grep_log

@@ -6,17 +6,17 @@
 #
 # grep_log	Perl script to search log files for a matching pattern. The last
 #           searched position is saved in an index file so that consecutive
-#           runs do not return the same results. The log file inode number is 
+#           runs do not return the same results. The log file inode number is
 #           also saved to detect log rotation.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; version 2 of the License.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.	
+# GNU General Public License for more details.
 #
 ###############################################################################
 use strict;
@@ -30,7 +30,7 @@ my $Output = 'module';
 my $Verbose = 0;
 
 # Index file storage directory, with a trailing '/'
-my $Idx_dir=($^O =~ /win/i)?'.\\':'/tmp/';
+my $Idx_dir=($^O =~ /win/i)?"$ENV{'TMP'}\\":"/tmp/";
 
 # Log file
 my $Log_file = '';
@@ -64,7 +64,7 @@ if ( (defined ($ENV{GREP_LOG_TMP})) && (-d $ENV{GREP_LOG_TMP}) ) {
 }
 
 ########################################################################################
-# Erase blank spaces before and after the string 
+# Erase blank spaces before and after the string
 ########################################################################################
 sub trim($){
 	my $string = shift;
@@ -226,7 +226,7 @@ sub parse_log (;$$) {
 	open(LOGFILE, $Log_file) || error_msg("Error opening file $Log_file: " .
 	                                     $!);
 
-	# Go to starting position. 
+	# Go to starting position.
 	seek(LOGFILE, $Idx_pos, 0);
 
 	# Parse log file
@@ -318,7 +318,7 @@ sub print_log ($) {
 		print_summary() if ($summary_flag == 1);
 		return;
 	}
-	
+
 	# Log module
 	if ($Output eq 'log_module') {
 		my $output = "<log_module>\n";

pandora_agents/win32/bin/pandora_agent.conf

@@ -1,6 +1,6 @@
 # Base config file for Pandora FMS Windows Agent
 # (c) 2006-2017 Artica Soluciones Tecnologicas 
-# Version 7.0NG.734
+# Version 7.0NG.735
 
 # This program is Free Software, you can redistribute it and/or modify it
 # under the terms of the GNU General Public Licence as published by the Free Software

pandora_agents/win32/installer/pandora.mpi

@@ -3,7 +3,7 @@ AllowLanguageSelection
 {Yes}
 
 AppName
-{Pandora FMS Windows Agent v7.0NG.734}
+{Pandora FMS Windows Agent v7.0NG.735}
 
 ApplicationID
 {17E3D2CF-CA02-406B-8A80-9D31C17BD08F}
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{190522}
+{190621}
 
 ViewReadme
 {Yes}

pandora_agents/win32/modules/pandora_module_factory.cc

@@ -1117,6 +1117,12 @@ Pandora_Module_Factory::getModuleFromDefinition (string definition) {
 		}
 	}
 
+	/* Skip disabled modules */
+	if (module_disabled == "1") {
+		pandoraLog ("Skipping disabled module \"%s\"", module_name.c_str ());
+		return NULL;
+	}
+
 	/* Create module objects */
 	if (module_exec != "") {
 		module = new Pandora_Module_Exec (module_name,

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.734(Build 190522)")
+#define PANDORA_VERSION ("7.0NG.735(Build 190621)")
 
 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.734(Build 190522))"
+      VALUE "ProductVersion", "(7.0NG.735(Build 190621))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END

pandora_console/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.734-190522
+Version: 7.0NG.735-190621
 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.734-190522"
+pandora_version="7.0NG.735-190621"
 
 package_pear=0
 package_pandora=1

pandora_console/extensions/agents_alerts.php

@@ -298,7 +298,7 @@ function mainAgentsAlerts()
 
             $table2->data[2][0] = __('Threshold');
             $table2->data[2][1] = html_print_input_text('module_action_threshold', '0', '', 5, 7, true);
-            $table2->data[2][1] .= ' '.__('seconds').ui_print_help_icon('action_threshold', true);
+            $table2->data[2][1] .= ' '.__('seconds');
 
             $content2 = '<form class="add_alert_form" method="post">';
             $content2 .= html_print_table($table2, true);

pandora_console/extensions/agents_modules.php

@@ -1,23 +1,24 @@
 <?php
+/**
+ *  Pandora FMS - http://pandorafms.com
+ *  ==================================================
+ *  Copyright (c) 2005-2011 Artica Soluciones Tecnologicas
+ *  Please see http://pandorafms.org for full contribution list
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU General Public License
+ *  as published by the Free Software Foundation; version 2
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ */
+
 
-// Pandora FMS - http://pandorafms.com
-// ==================================================
-// Copyright (c) 2005-2011 Artica Soluciones Tecnologicas
-// Please see http://pandorafms.org for full contribution list
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; version 2
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-$refr = (int) get_parameter('refresh', 0);
-// By default 30 seconds
 function mainAgentsModules()
 {
     global $config;
 
-    // Load global vars
+    // Load global vars.
     include_once 'include/config.php';
     include_once 'include/functions_reporting.php';
     include_once $config['homedir'].'/include/functions_agents.php';
@@ -25,7 +26,7 @@ function mainAgentsModules()
     include_once $config['homedir'].'/include/functions_users.php';
 
     check_login();
-    // ACL Check
+    // ACL Check.
     if (! check_acl($config['id_user'], 0, 'AR')) {
         db_pandora_audit(
             'ACL Violation',
@@ -37,7 +38,7 @@ function mainAgentsModules()
 
     // Update network modules for this group
     // Check for Network FLAG change request
-    // Made it a subquery, much faster on both the database and server side
+    // Made it a subquery, much faster on both the database and server side.
     if (isset($_GET['update_netgroup'])) {
         $group = get_parameter_get('update_netgroup', 0);
         if (check_acl($config['id_user'], $group, 'AW')) {
@@ -62,7 +63,7 @@ function mainAgentsModules()
 
     $modulegroup = get_parameter('modulegroup', 0);
     $refr = (int) get_parameter('refresh', 0);
-    // By default 30 seconds
+    // By default 30 seconds.
     $recursion = get_parameter('recursion', 0);
     $group_id = (int) get_parameter('group_id', 0);
     $offset = (int) get_parameter('offset', 0);
@@ -79,7 +80,8 @@ function mainAgentsModules()
     $full_modules_selected = explode(';', get_parameter('full_modules_selected', 0));
     $full_agents_id = explode(';', get_parameter('full_agents_id', 0));
 
-    if ($save_serialize && $update_item == '') {
+    // In full screen there is no pagination neither filters.
+    if (( ($config['pure'] == 0 && $save_serialize) && $update_item == '' ) || ( ($config['pure'] == 1 && $save_serialize == 0) && $update_item == '' )) {
         $unserialize_modules_selected  = unserialize_in_temp($config['id_user'].'_agent_module', true, 1);
         $unserialize_agents_id         = unserialize_in_temp($config['id_user'].'_agents', true, 1);
         if ($unserialize_modules_selected) {
@@ -102,7 +104,6 @@ function mainAgentsModules()
         serialize_in_temp($agents_id, $config['id_user'].'_agents', 1);
     }
 
-    // if($agents_id != -1) $agents_id = null;
     if ($config['pure'] == 0) {
         if ($modules_selected[0] && $agents_id[0]) {
             $full_modules = urlencode(implode(';', $modules_selected));
@@ -124,13 +125,13 @@ function mainAgentsModules()
         }
     }
 
-    // groups
+    // Groups.
     $filter_groups_label = '<b>'.__('Group').'</b>';
     $filter_groups = html_print_select_groups(false, 'AR', true, 'group_id', $group_id, '', '', '', true, false, true, '', false, 'width: auto;');
 
     $filter_recursion_label = '<b>'.__('Recursion').'</b>';
     $filter_recursion = html_print_checkbox('recursion', 1, 0, true);
-    // groups module
+    // Groups module.
     $filter_module_groups_label = '<b>'.__('Module group').'</b>';
     $filter_module_groups = html_print_select_from_sql(
         'SELECT * FROM tmodule_group ORDER BY name',
@@ -146,7 +147,7 @@ function mainAgentsModules()
         'width: auto;'
     );
 
-    // agent
+    // Agent.
     $agents = agents_get_group_agents($group_id);
     if ((empty($agents)) || $agents == -1) {
         $agents = [];
@@ -155,7 +156,7 @@ function mainAgentsModules()
     $filter_agents_label = '<b>'.__('Agents').'</b>';
     $filter_agents = html_print_select($agents, 'id_agents2[]', $agents_id, '', '', 0, true, true, true, '', false, 'min-width: 180px; max-width: 200px;');
 
-    // type show
+    // Type show.
     $selection = [
         0 => __('Show common modules'),
         1 => __('Show all modules'),
@@ -163,12 +164,12 @@ function mainAgentsModules()
     $filter_type_show_label = '<b>'.__('Show common modules').'</b>';
     $filter_type_show = html_print_select($selection, 'selection_agent_module', $selection_a_m, '', '', 0, true, false, true, '', false, 'min-width: 180px;');
 
-    // modules
+    // Modules.
     $all_modules = select_modules_for_agent_group($group_id, $agents_id, $selection_a_m, false);
     $filter_modules_label = '<b>'.__('Module').'</b>';
     $filter_modules = html_print_select($all_modules, 'module[]', $modules_selected, '', '', 0, true, true, false, '', false, 'min-width: 180px; max-width: 200px;');
 
-    // update
+    // Update.
     $filter_update = html_print_submit_button(__('Update item'), 'edit_item', false, 'class="sub upd"', true);
 
     $onheader = [
@@ -178,8 +179,11 @@ function mainAgentsModules()
         'combo_groups'        => $filter_groups,
     ];
 
-    // Old style table, we need a lot of special formatting,don't use table function
+    /*
-    // Prepare old-style table
+     * Old style table, we need a lot of special formatting,don't use table function.
+     * Prepare old-style table.
+     */
+
     if ($config['pure'] == 0) {
         // Header.
         ui_print_page_header(
@@ -200,38 +204,51 @@ function mainAgentsModules()
             $full_modules = urlencode(implode(';', $full_modules_selected));
             $full_agents = urlencode(implode(';', $full_agents_id));
 
-            $url = " index.php?sec=view&sec2=extensions/agents_modules&amp;pure=0&amp;offset=$offset
+            $url = 'index.php?sec=view&sec2=extensions/agents_modules&amp;pure=0&amp;offset=$offset
 			&group_id=$group_id&modulegroup=$modulegroup&refresh=$refr&full_modules_selected=$full_modules
-			&full_agents_id=$full_agents&selection_agent_module=$selection_a_m";
+			&full_agents_id=$full_agents&selection_agent_module=$selection_a_m';
         } else {
-            $url = " index.php?sec=view&sec2=extensions/agents_modules&amp;pure=0&amp;offset=$offset&group_id=$group_id&modulegroup=$modulegroup&refresh=$refr";
+            $url = 'index.php?sec=view&sec2=extensions/agents_modules&amp;pure=0&amp;offset=$offset&group_id=$group_id&modulegroup=$modulegroup&refresh=$refr';
         }
 
-        // Floating menu - Start
+        // Floating menu - Start.
         echo '<div id="vc-controls" style="z-index: 999">';
 
         echo '<div id="menu_tab">';
         echo '<ul class="mn">';
 
-        // Quit fullscreen
+        // Quit fullscreen.
         echo '<li class="nomn">';
         echo '<a target="_top" href="'.$url.'">';
         echo html_print_image('images/normal_screen.png', true, ['title' => __('Back to normal mode')]);
         echo '</a>';
         echo '</li>';
 
-        // Countdown
+        // Countdown.
         echo '<li class="nomn">';
         echo '<div class="vc-refr">';
-        echo '<div class="vc-countdown"></div>';
+        echo '<div class="vc-countdown style="display: inline;"></div>';
         echo '<div id="vc-refr-form">';
         echo __('Refresh').':';
-        echo html_print_select(get_refresh_time_array(), 'refresh', $refr, '', '', 0, true, false, false);
+        echo html_print_select(
+            get_refresh_time_array(),
+            'refresh',
+            $refr,
+            '',
+            '',
+            0,
+            true,
+            false,
+            false,
+            '',
+            false,
+            'margin-top: 3px;'
+        );
         echo '</div>';
         echo '</div>';
         echo '</li>';
 
-        // Console name
+        // Console name.
         echo '<li class="nomn">';
         echo '<div class="vc-title">'.__('Agent/module view').'</div>';
         echo '</li>';
@@ -240,35 +257,35 @@ function mainAgentsModules()
         echo '</div>';
 
         echo '</div>';
-        // Floating menu - End
+        // Floating menu - End.
         ui_require_jquery_file('countdown');
     }
 
     if ($config['pure'] != 1) {
-        echo '<form method="post" action="'.ui_get_url_refresh(['offset' => $offset, 'hor_offset' => $offset, 'group_id' => $group_id, 'modulegroup' => $modulegroup]).'">';
+        $show_filters = '<form method="post" action="'.ui_get_url_refresh(['offset' => $offset, 'hor_offset' => $offset, 'group_id' => $group_id, 'modulegroup' => $modulegroup]).'" style="width:100%;">';
-
+        $show_filters .= '<table class="white_table" cellpadding="0" cellspacing="0" border="0" style="width:100%; border:none;">';
-        echo '<table class="databox filters" cellpadding="0" cellspacing="0" border="0" style="width:100%;">';
+            $show_filters .= '<tr>';
-            echo '<tr>';
+                $show_filters .= '<td>'.$filter_groups_label.'</td>';
-                echo '<td>'.$filter_groups_label.'</td>';
+                $show_filters .= '<td>'.$filter_groups.'&nbsp;&nbsp;&nbsp;'.$filter_recursion_label.$filter_recursion.'</td>';
-                echo '<td>'.$filter_groups.'&nbsp;&nbsp;&nbsp;'.$filter_recursion_label.$filter_recursion.'</td>';
+                $show_filters .= '<td></td>';
-                echo '<td></td>';
+                $show_filters .= '<td></td>';
-                echo '<td></td>';
+                $show_filters .= '<td>'.$filter_module_groups_label.'</td>';
-                echo '<td>'.$filter_module_groups_label.'</td>';
+                $show_filters .= '<td>'.$filter_module_groups.'</td>';
-                echo '<td>'.$filter_module_groups.'</td>';
+            $show_filters .= '</tr>';
-            echo '</tr>';
+            $show_filters .= '<tr>';
-            echo '<tr>';
+                $show_filters .= '<td>'.$filter_agents_label.'</td>';
-                echo '<td>'.$filter_agents_label.'</td>';
+                $show_filters .= '<td>'.$filter_agents.'</td>';
-                echo '<td>'.$filter_agents.'</td>';
+                $show_filters .= '<td>'.$filter_type_show_label.'</td>';
-                echo '<td>'.$filter_type_show_label.'</td>';
+                $show_filters .= '<td>'.$filter_type_show.'</td>';
-                echo '<td>'.$filter_type_show.'</td>';
+                $show_filters .= '<td>'.$filter_modules_label.'</td>';
-                echo '<td>'.$filter_modules_label.'</td>';
+                $show_filters .= '<td>'.$filter_modules.'</td>';
-                echo '<td>'.$filter_modules.'</td>';
+            $show_filters .= '</tr>';
-            echo '</tr>';
+            $show_filters .= '<tr>';
-            echo '<tr>';
+                $show_filters .= "<td colspan=6 ><span style='float: right; padding-right: 20px;'>".$filter_update.'</sapn></td>';
-                echo "<td colspan=6 ><span style='float: right; padding-right: 20px;'>".$filter_update.'</sapn></td>';
+            $show_filters .= '</tr>';
-            echo '</tr>';
+        $show_filters .= '</table>';
-        echo '</table>';
+        $show_filters .= '</form>';
-        echo '</form>';
+        ui_toggle($show_filters, __('Filters'));
     }
 
     if ($agents_id[0] != -1) {
@@ -291,7 +308,7 @@ function mainAgentsModules()
 
     $count = 0;
     foreach ($agents as $agent) {
-        // TODO TAGS agents_get_modules
+        // TODO TAGS agents_get_modules.
         $module = agents_get_modules(
             $agent,
             false,
@@ -339,7 +356,7 @@ function mainAgentsModules()
                 }
             }
         } else {
-            // TODO TAGS agents_get_modules
+            // TODO TAGS agents_get_modules.
             $all_modules = agents_get_modules(
                 $agents,
                 false,
@@ -414,11 +431,11 @@ function mainAgentsModules()
 
     if ($hor_offset > 0) {
         $new_hor_offset = ($hor_offset - $block);
-        echo "<th width='20px' "."style='vertical-align:top; padding-top: 35px;' "."rowspan='".($nagents + 1)."'>"."<a href='index.php?".'extension_in_menu=estado&'.'sec=extensions&'.'sec2=extensions/agents_modules&'.'refr=0&'.'save_serialize=1&'.'selection_a_m='.$selection_a_m.'&'.'hor_offset='.$new_hor_offset.'&'.'offset='.$offset."'>".html_print_image(
+        echo "<th width='20px' style='vertical-align: middle; text-align: center;' rowspan='".($nagents + 1)."'><a href='index.php?".'extension_in_menu=estado&sec=extensions&sec2=extensions/agents_modules&refr=0&save_serialize=1&selection_a_m='.$selection_a_m.'&hor_offset='.$new_hor_offset.'&offset='.$offset."'>".html_print_image(
-            'images/arrow_left.png',
+            'images/arrow_left_green.png',
             true,
             ['title' => __('Previous modules')]
-        ).'</a>'.'</th>';
+        ).'</a></th>';
     }
 
     $nmodules = 0;
@@ -440,11 +457,11 @@ function mainAgentsModules()
 
     if (($hor_offset + $block) < $nmodules) {
         $new_hor_offset = ($hor_offset + $block);
-        echo "<th width='20px' "."style='vertical-align:top; padding-top: 35px;' "."rowspan='".($nagents + 1)."'>"."<a href='index.php?".'extension_in_menu=estado&'.'sec=extensions&'.'sec2=extensions/agents_modules&'.'save_serialize=1&'.'selection_a_m='.$selection_a_m.'&'.'hor_offset='.$new_hor_offset.'&'.'offset='.$offset."'>".html_print_image(
+        echo "<th width='20px' style='vertical-align: middle; text-align: center;' rowspan='".($nagents + 1)."'><a href='index.php?".'extension_in_menu=estado&sec=extensions&sec2=extensions/agents_modules&save_serialize=1&selection_a_m='.$selection_a_m.'&hor_offset='.$new_hor_offset.'&offset='.$offset."'>".html_print_image(
-            'images/arrow.png',
+            'images/arrow_right_green.png',
             true,
             ['title' => __('More modules')]
-        ).'</a>'.'</th>';
+        ).'</a></th>';
     }
 
     echo '</tr>';
@@ -457,12 +474,12 @@ function mainAgentsModules()
         $filter_agents['id_grupo'] = $group_id;
     }
 
-    // Prepare pagination
+    // Prepare pagination.
-    $url = 'index.php?extension_in_menu=estado&sec=extensions&sec2=extensions/agents_modules&save_serialize=1&'.'hor_offset='.$hor_offset.'&selection_a_m='.$selection_a_m;
+    $url = 'index.php?extension_in_menu=estado&sec=extensions&sec2=extensions/agents_modules&save_serialize=1&hor_offset='.$hor_offset.'&selection_a_m='.$selection_a_m;
     ui_pagination($total_pagination, $url);
 
     foreach ($agents as $agent) {
-        // Get stats for this group
+        // Get stats for this group.
         $agent_status = agents_get_status($agent['id_agente']);
         $alias = db_get_row('tagente', 'id_agente', $agent['id_agente']);
         if (empty($alias['alias'])) {
@@ -471,29 +488,29 @@ function mainAgentsModules()
 
         switch ($agent_status) {
             case 4:
-                // Alert fired status
+                // Alert fired status.
                 $rowcolor = 'group_view_alrm';
             break;
 
             case 1:
-                // Critical status
+                // Critical status.
                 $rowcolor = 'group_view_crit';
             break;
 
             case 2:
-                // Warning status
+                // Warning status.
                 $rowcolor = 'group_view_warn';
             break;
 
             case 0:
-                // Normal status
+                // Normal status.
                 $rowcolor = 'group_view_ok';
             break;
 
             case 3:
             case -1:
             default:
-                // Unknown status
+                // Unknown status.
                 $rowcolor = 'group_view_unk';
             break;
         }
@@ -502,7 +519,7 @@ function mainAgentsModules()
 
         echo "<td class='$rowcolor'>
 			<a class='$rowcolor' href='index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente=".$agent['id_agente']."'>".$alias['alias'].'</a></td>';
-        // TODO TAGS agents_get_modules
+        // TODO TAGS agents_get_modules.
         $agent_modules = agents_get_modules($agent['id_agente'], false, $filter_module_group, true, true);
 
         $nmodules = 0;
@@ -572,18 +589,23 @@ function mainAgentsModules()
 
     echo '</table>';
 
-    echo "<div class='legend_basic' style='width: 96%'>";
+    $show_legend = "<div class='legend_white'>";
+    $show_legend .= "<div style='display: flex;align-items: center;'>
+            <div class='legend_square_simple'><div style='background-color: ".COL_ALERTFIRED.";'></div></div>".__('Orange cell when the module has fired alerts').'</div>';
+    $show_legend .= "<div style='display: flex;align-items: center;'>
+            <div class='legend_square_simple'><div style='background-color: ".COL_CRITICAL.";'></div></div>".__('Red cell when the module has a critical status').'
+        </div>';
+    $show_legend .= "<div style='display: flex;align-items: center;'>
+        <div class='legend_square_simple'><div style='background-color: ".COL_WARNING.";'></div></div>".__('Yellow cell when the module has a warning status').'</div>';
+    $show_legend .= "<div style='display: flex;align-items: center;'>
+        <div class='legend_square_simple'><div style='background-color: ".COL_NORMAL.";'></div></div>".__('Green cell when the module has a normal status').'</div>';
+    $show_legend .= "<div style='display: flex;align-items: center;'>
+        <div class='legend_square_simple'><div style='background-color: ".COL_UNKNOWN.";'></div></div>".__('Grey cell when the module has an unknown status').'</div>';
+    $show_legend .= "<div style='display: flex;align-items: center;'>
+        <div class='legend_square_simple'><div style='background-color: ".COL_NOTINIT.";'></div></div>".__("Cell turns blue when the module is in 'not initialize' status").'</div>';
+    $show_legend .= '</div>';
+    ui_toggle($show_legend, __('Legend'));
 
-    echo '<table>';
-    echo "<tr><td colspan='2' style='padding-bottom: 10px;'><b>".__('Legend').'</b></td></tr>';
-    echo "<tr><td class='legend_square_simple'><div style='background-color: ".COL_ALERTFIRED.";'></div></td><td>".__('Orange cell when the module has fired alerts').'</td></tr>';
-    echo "<tr><td class='legend_square_simple'><div style='background-color: ".COL_CRITICAL.";'></div></td><td>".__('Red cell when the module has a critical status').'</td></tr>';
-    echo "<tr><td class='legend_square_simple'><div style='background-color: ".COL_WARNING.";'></div></td><td>".__('Yellow cell when the module has a warning status').'</td></tr>';
-    echo "<tr><td class='legend_square_simple'><div style='background-color: ".COL_NORMAL.";'></div></td><td>".__('Green cell when the module has a normal status').'</td></tr>';
-    echo "<tr><td class='legend_square_simple'><div style='background-color: ".COL_UNKNOWN.";'></div></td><td>".__('Grey cell when the module has an unknown status').'</td></tr>';
-    echo "<tr><td class='legend_square_simple'><div style='background-color: ".COL_NOTINIT.";'></div></td><td>".__("Cell turns blue when the module is in 'not initialize' status").'</td></tr>';
-    echo '</table>';
-    echo '</div>';
     $pure_var = $config['pure'];
     if ($pure_var) {
         $pure_var = 1;
@@ -627,16 +649,14 @@ $ignored_params['refresh'] = '';
         $.each($('.th_class_module_r'), function (i, elem) {
             id = $(elem).attr('id').replace('th_module_r_', '');
             $("#th_module_r_" + id).height(($("#div_module_r_" + id).width() + 10) + 'px');
-            
-            //$("#div_module_r_" + id).css('margin-top', (max_width - $("#div_module_r_" + id).width()) + 'px');
             $("#div_module_r_" + id).css('margin-top', (max_width - 20) + 'px');
             $("#div_module_r_" + id).show();
         });
 
-        var refr =" . $refr . ";
+        var refr = '<?php echo get_parameter('refresh', 0); ?>';
-        var pure =" . $pure_var . ";
+        var pure = '<?php echo get_parameter('pure', 0); ?>';
-        var href ='" . ui_get_url_refresh ($ignored_params) . "';
+        var href =' <?php echo ui_get_url_refresh($ignored_params); ?>';
-            
+
         if (pure) {
             var startCountDown = function (duration, cb) {
                 $('div.vc-countdown').countdown('destroy');
@@ -646,7 +666,7 @@ $ignored_params['refresh'] = '';
                 $('div.vc-countdown').countdown({
                     until: t,
                     format: 'MS',
-                    layout: '(%M%nn%M:%S%nn%S Until refresh)',
+                    layout: '(%M%nn%M:%S%nn%S <?php echo __('Until next'); ?>) ',
                     alwaysExpire: true,
                     onExpiry: function () {
                         $('div.vc-countdown').countdown('destroy');
@@ -655,8 +675,11 @@ $ignored_params['refresh'] = '';
                     }
                 });
             }
-            
+
-            startCountDown(refr, false);
+            if(refr>0){
+                startCountDown(refr, false);
+            }
+
             var controls = document.getElementById('vc-controls');
             autoHideElement(controls, 1000);
             

pandora_console/extensions/db_status.php

@@ -215,7 +215,7 @@ function extension_db_check_tables_differences(
     $diff_tables = array_diff($tables_test, $tables_system);
 
     ui_print_result_message(
-        !empty($diff_tables),
+        empty($diff_tables),
         __('Success! %s DB contains all tables', get_product_name()),
         __(
             '%s DB could not retrieve all tables. The missing tables are (%s)',

pandora_console/extensions/module_groups.php

@@ -1,17 +1,32 @@
 <?php
+/**
+ * Module groups.
+ *
+ * @category   Extensions
+ * @package    Pandora FMS
+ * @subpackage Module groups view.
+ * @version    1.0.0
+ * @license    See below
+ *
+ *    ______                 ___                    _______ _______ ________
+ *   |   __ \.-----.--.--.--|  |.-----.----.-----. |    ___|   |   |     __|
+ *  |    __/|  _  |     |  _  ||  _  |   _|  _  | |    ___|       |__     |
+ * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
+ *
+ * ============================================================================
+ * Copyright (c) 2005-2019 Artica Soluciones Tecnologicas
+ * Please see http://pandorafms.org for full contribution list
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation for version 2.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * ============================================================================
+ */
 
-// Pandora FMS - http://pandorafms.com
+// Begin.
-// ==================================================
-// Copyright (c) 2005-2011 Artica Soluciones Tecnologicas
-// Please see http://pandorafms.org for full contribution list
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; version 2
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-// Load global vars
 global $config;
 
 check_login();
@@ -32,10 +47,12 @@ if (is_ajax()) {
 }
 
 
-/**
+ /**
- * The main function of module groups and the enter point to
+  * The main function of module groups and the enter point to
- * execute the code.
+  * execute the code.
- */
+  *
+  * @return void
+  */
 function mainModuleGroups()
 {
     global $config;
@@ -68,13 +85,20 @@ function mainModuleGroups()
     $info = array_filter(
         $info,
         function ($v, $k) use ($agent_group_search) {
-            return preg_match("/$agent_group_search/i", $v['name']);
+            return preg_match(
+                '/'.$agent_group_search.'/i',
+                $v['name']
+            );
         },
         ARRAY_FILTER_USE_BOTH
     );
 
     if (!empty($info)) {
-        $groups_view = $is_not_paginated ? $info : array_slice($info, $offset, $config['block_size']);
+        $groups_view = ($is_not_paginated) ? $info : array_slice(
+            $info,
+            $offset,
+            $config['block_size']
+        );
         $agents_counters = array_reduce(
             $groups_view,
             function ($carry, $item) {
@@ -113,7 +137,7 @@ function mainModuleGroups()
     $array_module_group = array_filter(
         $array_module_group,
         function ($v, $k) use ($module_group_search) {
-            return preg_match("/$module_group_search/i", $v);
+            return preg_match('/'.$module_group_search.'/i', $v);
         },
         ARRAY_FILTER_USE_BOTH
     );
@@ -125,66 +149,75 @@ function mainModuleGroups()
         $array_for_defect[$key]['data']['icon'] = $value['icon'];
     }
 
-    $sql = "SELECT SUM(IF(tae.alert_fired <> 0, 1, 0)) AS alerts_module_count,
+    $sql = sprintf(
-		SUM(IF($condition_warning, 1, 0)) AS warning_module_count,
+        "SELECT SUM(IF(tae.alert_fired <> 0, 1, 0)) AS alerts_module_count,
-		SUM(IF($condition_unknown, 1, 0)) AS unknown_module_count,
+            SUM(IF(%s, 1, 0)) AS warning_module_count,
-		SUM(IF($condition_not_init, 1, 0)) AS notInit_module_count,
+            SUM(IF(%s, 1, 0)) AS unknown_module_count,
-		SUM(IF($condition_critical, 1, 0)) AS critical_module_count,
+            SUM(IF(%s, 1, 0)) AS notInit_module_count,
-		SUM(IF($condition_normal, 1, 0)) AS normal_module_count,
+            SUM(IF(%s, 1, 0)) AS critical_module_count,
-		COUNT(tae.id_agente_modulo) AS total_count,
+            SUM(IF(%s, 1, 0)) AS normal_module_count,
-		tmg.id_mg,
+            COUNT(tae.id_agente_modulo) AS total_count,
-		tmg.name as n,
+            tmg.id_mg,
-		tg.id_grupo
+            tmg.name as n,
-	FROM (
+            tg.id_grupo
-		SELECT tam.id_agente_modulo,
+        FROM (
-			tam.id_module_group,
+            SELECT tam.id_agente_modulo,
-			ta.id_grupo AS g,
+                tam.id_module_group,
-			tae.estado,
+                ta.id_grupo AS g,
-			SUM(IF(tatm.last_fired <> 0, 1, 0)) AS alert_fired
+                tae.estado,
-			FROM tagente_modulo tam
+                SUM(IF(tatm.last_fired <> 0, 1, 0)) AS alert_fired
-			LEFT JOIN talert_template_modules tatm
+                FROM tagente_modulo tam
-				ON tatm.id_agent_module = tam.id_agente_modulo
+                LEFT JOIN talert_template_modules tatm
-				AND tatm.times_fired = 1
+                    ON tatm.id_agent_module = tam.id_agente_modulo
-			LEFT JOIN tagente_estado tae
+                    AND tatm.times_fired = 1
-				ON tae.id_agente_modulo = tam.id_agente_modulo
+                LEFT JOIN tagente_estado tae
-			INNER JOIN tagente ta
+                    ON tae.id_agente_modulo = tam.id_agente_modulo
-				ON ta.id_agente = tam.id_agente
+                INNER JOIN tagente ta
-			WHERE ta.disabled = 0
+                    ON ta.id_agente = tam.id_agente
-				AND tam.disabled = 0
+                WHERE ta.disabled = 0
-				AND tam.delete_pending = 0
+                    AND tam.disabled = 0
-				AND ta.id_grupo IN ($ids_group)
+                    AND tam.delete_pending = 0
-			GROUP BY tam.id_agente_modulo
+                    AND ta.id_grupo IN (%s)
-		UNION ALL
+                GROUP BY tam.id_agente_modulo
-		SELECT tam.id_agente_modulo,
+            UNION ALL
-			tam.id_module_group,
+            SELECT tam.id_agente_modulo,
-			tasg.id_group AS g,
+                tam.id_module_group,
-			tae.estado,
+                tasg.id_group AS g,
-			SUM(IF(tatm.last_fired <> 0, 1, 0)) AS alert_fired
+                tae.estado,
-			FROM tagente_modulo tam
+                SUM(IF(tatm.last_fired <> 0, 1, 0)) AS alert_fired
-			LEFT JOIN talert_template_modules tatm
+                FROM tagente_modulo tam
-				ON tatm.id_agent_module = tam.id_agente_modulo
+                LEFT JOIN talert_template_modules tatm
-				AND tatm.times_fired = 1
+                    ON tatm.id_agent_module = tam.id_agente_modulo
-			LEFT JOIN tagente_estado tae
+                    AND tatm.times_fired = 1
-				ON tae.id_agente_modulo = tam.id_agente_modulo
+                LEFT JOIN tagente_estado tae
-			INNER JOIN tagente ta
+                    ON tae.id_agente_modulo = tam.id_agente_modulo
-				ON ta.id_agente = tam.id_agente
+                INNER JOIN tagente ta
-			INNER JOIN tagent_secondary_group tasg
+                    ON ta.id_agente = tam.id_agente
-				ON ta.id_agente = tasg.id_agent
+                INNER JOIN tagent_secondary_group tasg
-			WHERE ta.disabled = 0
+                    ON ta.id_agente = tasg.id_agent
-				AND tam.disabled = 0
+                WHERE ta.disabled = 0
-				AND tam.delete_pending = 0
+                    AND tam.disabled = 0
-				AND tasg.id_group IN ($ids_group)
+                    AND tam.delete_pending = 0
-			GROUP BY tam.id_agente_modulo, tasg.id_group
+                    AND tasg.id_group IN (%s)
-	) AS tae
+                GROUP BY tam.id_agente_modulo, tasg.id_group
-	RIGHT JOIN tgrupo tg
+        ) AS tae
-		ON tg.id_grupo = tae.g
+        RIGHT JOIN tgrupo tg
-	INNER JOIN (
+            ON tg.id_grupo = tae.g
-		SELECT * FROM tmodule_group
+        INNER JOIN (
-		UNION ALL
+            SELECT * FROM tmodule_group
-		SELECT 0 AS 'id_mg', 'Nothing' AS 'name'
+            UNION ALL
-	) AS tmg
+            SELECT 0 AS 'id_mg', 'Nothing' AS 'name'
-		ON tae.id_module_group = tmg.id_mg
+        ) AS tmg
-	GROUP BY tae.g, tmg.id_mg";
+            ON tae.id_module_group = tmg.id_mg
+        GROUP BY tae.g, tmg.id_mg",
+        $condition_warning,
+        $condition_unknown,
+        $condition_not_init,
+        $condition_critical,
+        $condition_normal,
+        $ids_group,
+        $ids_group
+    );
 
     $array_data_prev = db_get_all_rows_sql($sql);
 
@@ -220,9 +253,21 @@ function mainModuleGroups()
     echo '<td>';
     echo '</tr></table>';
 
+    $cell_style = '
+        min-width: 60px;
+        width: 100%;
+        margin: 0;
+        overflow:hidden;
+        text-align: center;
+        padding: 5px;
+        padding-bottom:10px;
+        font-size: 18px;
+        text-align: center;
+    ';
+
     if (true) {
         $table = new StdClass();
-        $table->style[0] = 'color: #ffffff; background-color: #373737; font-weight: bolder; padding-right: 10px; min-width: 230px;';
+        $table->style[0] = 'color: #ffffff; background-color: #373737; font-weight: bolder; min-width: 230px;';
         $table->width = '100%';
 
         $head[0] = __('Groups');
@@ -248,28 +293,28 @@ function mainModuleGroups()
                             $color = '#FFA631';
                             // Orange when the cell for this model group and agent has at least one alert fired.
                         } else if ($array_data[$key][$k]['critical_module_count'] != 0) {
-                            $color = '#FC4444';
+                            $color = '#e63c52';
                             // Red when the cell for this model group and agent has at least one module in critical state and the rest in any state.
                         } else if ($array_data[$key][$k]['warning_module_count'] != 0) {
-                            $color = '#FAD403';
+                            $color = '#f3b200';
                             // Yellow when the cell for this model group and agent has at least one in warning state and the rest in green state.
                         } else if ($array_data[$key][$k]['unknown_module_count'] != 0) {
                             $color = '#B2B2B2 ';
                             // Grey when the cell for this model group and agent has at least one module in unknown state and the rest in any state.
                         } else if ($array_data[$key][$k]['normal_module_count'] != 0) {
-                            $color = '#80BA27';
+                            $color = '#82b92e';
                             // Green when the cell for this model group and agent has OK state all modules.
                         } else if ($array_data[$key][$k]['notInit_module_count'] != 0) {
                             $color = '#5BB6E5';
                             // Blue when the cell for this module group and all modules have not init value.
                         }
 
-                        $data[$i][$j] = "<div style='background:$color; height: 20px;min-width: 60px;max-width:5%;overflow:hidden; margin-left: auto; margin-right: auto; text-align: center; padding: 5px;padding-bottom:10px;font-size: 18px;line-height:25px;'>";
+                        $data[$i][$j] = "<div style='".$cell_style.'background:'.$color.";'>";
                         $data[$i][$j] .= "<a class='info_cell' rel='$rel' href='$url' style='color:white;font-size: 18px;'>";
                         $data[$i][$j] .= $array_data[$key][$k]['total_count'];
                         $data[$i][$j] .= '</a></div>';
                     } else {
-                        $data[$i][$j] = "<div style='background:white; height: 20px;min-width: 60px;max-width:5%;overflow:hidden; margin-left: auto; margin-right: auto; text-align: center; padding: 5px;padding-bottom:10px;font-size: 18px;line-height:25px;'>";
+                        $data[$i][$j] = "<div style='background:white;".$cell_style."'>";
                         $data[$i][$j] .= 0;
                         $data[$i][$j] .= '</div>';
                     }
@@ -278,7 +323,7 @@ function mainModuleGroups()
                 }
             } else {
                 foreach ($value['gm'] as $k => $v) {
-                    $data[$i][$j] = "<div style='background:white; height: 20px;min-width: 60px;max-width:5%;overflow:hidden; margin-left: auto; margin-right: auto; text-align: center; padding: 5px;padding-bottom:10px;font-size: 18px;line-height:25px;'>";
+                    $data[$i][$j] = "<div style='background:white; min-width: 60px;max-width:5%;overflow:hidden; margin-left: auto; margin-right: auto; text-align: center; padding: 5px;padding-bottom:10px;font-size: 18px;line-height:25px;'>";
                     $data[$i][$j] .= 0;
                     $data[$i][$j] .= '</div>';
                     $j++;

pandora_console/extensions/realtime_graphs/realtime_graphs.css

@@ -11,5 +11,5 @@
 
 #graph_container {
   width: 800px;
-  margin: 20px auto !important;
+  margin: 20px auto;
 }

pandora_console/extras/delete_files/delete_files.txt

@@ -1,3 +0,0 @@
-/godmode/servers/recon_script.php
-/godmode/servers/manage_recontask_form.php
-/godmode/servers/manage_recontask.php

pandora_console/extras/mr/28.sql

@@ -9,8 +9,37 @@ ALTER TABLE `talert_commands` ADD COLUMN `fields_hidden` text;
 ALTER TABLE `talert_templates` MODIFY COLUMN `type` ENUM('regex','max_min','max','min','equal','not_equal','warning','critical','onchange','unknown','always','not_normal');
 
 DELETE FROM `tevent_response` WHERE `name` LIKE 'Create Integria IMS incident from event';
-INSERT INTO `tnews` (`id_news`, `author`, `subject`, `text`, `timestamp`) VALUES (1,'admin','Welcome to Pandora FMS Console', '<p style="text-align: center; font-size: 13px;">Hello, congratulations, if you've arrived here you already have an operational monitoring console. Remember that our forums and online documentation are available 24x7 to get you out of any trouble. You can replace this message with a personalized one at Admin tools -> Site news.</p> ',NOW());
+INSERT INTO `tnews` (`id_news`, `author`, `subject`, `text`, `timestamp`) VALUES (NULL,'admin','Welcome to Pandora FMS Console', '<p style="text-align: center; font-size: 13px;">Hello, congratulations, if you've arrived here you already have an operational monitoring console. Remember that our forums and online documentation are available 24x7 to get you out of any trouble. You can replace this message with a personalized one at Admin tools -> Site news.</p> ',NOW());
 
 
+INSERT INTO `tnotification_source_user` (`id_source`, `id_user`, `enabled`, `also_mail`) VALUES ((SELECT `id` FROM `tnotification_source` WHERE `description`="Official communication"), "admin", 1, 0);
+UPDATE `tnotification_source` SET `enabled`=1 WHERE `description` = 'System status' OR `description` = 'Official communication';
+UPDATE `tnotification_source` SET `icon`="icono_logo_pandora.png" WHERE `description` = 'Official communication';
 
-COMMIT;
+-- ---------------------------------------------------------------------
+-- Table `tvisual_console_items_cache`
+-- ---------------------------------------------------------------------
+CREATE TABLE IF NOT EXISTS `tvisual_console_elements_cache` (
+    `id` INTEGER UNSIGNED NOT NULL AUTO_INCREMENT,
+    `vc_id` INTEGER UNSIGNED NOT NULL,
+    `vc_item_id` INTEGER UNSIGNED NOT NULL,
+    `user_id` VARCHAR(60) DEFAULT NULL,
+    `data` TEXT NOT NULL,
+    `created_at` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    `expiration` INTEGER UNSIGNED NOT NULL COMMENT 'Seconds to expire',
+    PRIMARY KEY(`id`),
+    FOREIGN KEY(`vc_id`) REFERENCES `tlayout`(`id`)
+    ON DELETE CASCADE,
+    FOREIGN KEY(`vc_item_id`) REFERENCES `tlayout_data`(`id`)
+    ON DELETE CASCADE,
+    FOREIGN KEY (`user_id`) REFERENCES `tusuario`(`id_user`)
+    ON DELETE CASCADE ON UPDATE CASCADE
+) engine=InnoDB DEFAULT CHARSET=utf8;
+
+ALTER TABLE `tlayout_data` ADD COLUMN `cache_expiration` INTEGER UNSIGNED NOT NULL DEFAULT 0;
+
+ALTER TABLE `tusuario` ADD COLUMN `ehorus_user_level_user` VARCHAR(60);
+ALTER TABLE `tusuario` ADD COLUMN `ehorus_user_level_pass` VARCHAR(45);
+ALTER TABLE `tusuario` ADD COLUMN `ehorus_user_level_enabled` TINYINT(1) DEFAULT '1';
+
+COMMIT;

pandora_console/extras/pandora_diag.php

@@ -139,8 +139,9 @@ function get_logs_size($file)
 function get_status_logs($path)
 {
     $status_server_log = '';
-    $size_server_log = get_logs_size($path);
+    $size_server_log = number_format(get_logs_size($path));
-    if ($size_server_log <= 1048576) {
+    $size_server_log = (0 + str_replace(',', '', $size_server_log));
+    if ($size_server_log <= 10485760) {
         $status_server_log = "<a style ='color: green;text-decoration: none;'>Normal Status</a><a style ='text-decoration: none;'>&nbsp&nbsp You have less than 10 MB of logs</a>";
     } else {
         $status_server_log = "<a class= 'content' style= 'color: red;text-decoration: none;'>Warning Status</a><a style ='text-decoration: none;'>&nbsp&nbsp You have more than 10 MB of logs</a>";
@@ -295,7 +296,7 @@ $key_buffer_size_min_rec_value = 256;
 $read_buffer_size_min_rec_value = 32;
 $read_rnd_buffer_size_min_rec_value = 32;
 $query_cache_min_res_unit_min_rec_value = 2;
-$innodb_file_per_table_min_rec_value = 0;
+$innodb_file_per_table_min_rec_value = 1;
 
 
 function status_fragmentation_tables($tables_fragmentation_max_rec_value, $tables_fragmentation)

pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql

@@ -1289,6 +1289,11 @@ alter table tusuario add autorefresh_white_list text not null default '';
 ALTER TABLE tusuario ADD COLUMN `time_autorefresh` int(5) unsigned NOT NULL default '30';
 ALTER TABLE `tusuario` DROP COLUMN `flash_chart`;
 ALTER TABLE `tusuario` ADD COLUMN `default_custom_view` int(10) unsigned NULL default '0';
+ALTER TABLE `tusuario` ADD COLUMN `ehorus_user_level_user` VARCHAR(60);
+ALTER TABLE `tusuario` ADD COLUMN `ehorus_user_level_pass` VARCHAR(45);
+ALTER TABLE `tusuario` ADD COLUMN `ehorus_user_level_enabled` TINYINT(1);
+
+
 
 -- ---------------------------------------------------------------------
 -- Table `tagente_modulo`
@@ -1371,6 +1376,7 @@ ALTER TABLE `tlayout_data` ADD COLUMN `linked_layout_status_type` ENUM ('default
 ALTER TABLE `tlayout_data` ADD COLUMN `linked_layout_status_as_service_warning` FLOAT(20, 3) NOT NULL default 0;
 ALTER TABLE `tlayout_data` ADD COLUMN `linked_layout_status_as_service_critical` FLOAT(20, 3) NOT NULL default 0;
 ALTER TABLE `tlayout_data` ADD COLUMN `linked_layout_node_id` INT(10) NOT NULL default 0;
+ALTER TABLE `tlayout_data` ADD COLUMN `cache_expiration` INTEGER UNSIGNED NOT NULL DEFAULT 0;
 
 -- ---------------------------------------------------------------------
 -- Table `tagent_custom_fields`
@@ -1984,6 +1990,33 @@ CREATE TABLE IF NOT EXISTS `tnetwork_matrix` (
 	UNIQUE (`source`, `destination`, `utimestamp`)
 ) ENGINE = InnoDB DEFAULT CHARSET=utf8 ;
 
+-- ---------------------------------------------------------------------
+-- Table `user_task`
+-- ---------------------------------------------------------------------
+CREATE TABLE IF NOT EXISTS `tuser_task` (
+	`id` int(20) unsigned NOT NULL auto_increment,
+	`function_name` varchar(80) NOT NULL default '',
+	`parameters` text NOT NULL default '',
+	`name` varchar(60) NOT NULL default '',
+	PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- ---------------------------------------------------------------------
+-- Table `user_task_scheduled`
+-- ---------------------------------------------------------------------
+CREATE TABLE IF NOT EXISTS `tuser_task_scheduled` (
+	`id` int(20) unsigned NOT NULL auto_increment,
+	`id_usuario` varchar(60) NOT NULL default '0',
+	`id_user_task` int(20) unsigned NOT NULL default '0',
+	`args` TEXT NOT NULL,
+	`scheduled` enum('no','hourly','daily','weekly','monthly','yearly','custom') default 'no',
+	`last_run` int(20) unsigned default '0',
+	`custom_data` int(10) NULL default '0',
+	`flag_delete` tinyint(1) UNSIGNED NOT NULL default 0,
+	`id_grupo` int(10) unsigned NOT NULL default 0,
+	PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
 -- -----------------------------------------------------
 -- Table `tnotification_source`
 -- -----------------------------------------------------
@@ -2006,7 +2039,7 @@ INSERT INTO `tnotification_source`(`description`, `icon`, `max_postpone_time`, `
   ("Message", "icono_info_mr.png", 86400, 1, 1, 0),
   ("Pending task", "icono_info_mr.png", 86400, 1, 1, 0),
   ("Advertisement", "icono_info_mr.png", 86400, 1, 1, 0),
-  ("Official communication", "icono_info_mr.png", 86400, 1, 1, 0),
+  ("Official communication", "icono_logo_pandora.png", 86400, 1, 1, 0),
   ("Sugerence", "icono_info_mr.png", 86400, 1, 1, 0);
 
 -- -----------------------------------------------------
@@ -2103,6 +2136,9 @@ INSERT INTO `talert_commands` (`name`, `command`, `description`, `internal`, `fi
 INSERT INTO `tnotification_source_user` (`id_source`, `id_user`, `enabled`, `also_mail`) VALUES ((SELECT `id` FROM `tnotification_source` WHERE `description`="System status"), "admin", 1, 0);
 INSERT INTO `tnotification_source_group` SELECT `id`,0 FROM `tnotification_source` WHERE `description`="Message";
 INSERT INTO `tnotification_user` (`id_mensaje`, `id_user`) SELECT `id_mensaje`, `id_usuario_destino` FROM `tmensajes` WHERE `id_usuario_destino` != '';
+INSERT INTO `tnotification_source_user` (`id_source`, `id_user`, `enabled`, `also_mail`) VALUES ((SELECT `id` FROM `tnotification_source` WHERE `description`="Official communication"), "admin", 1, 0);
+UPDATE `tnotification_source` SET `enabled`=1 WHERE `description` = 'System status' OR `description` = 'Official communication';
+
 -- ----------------------------------------------------------------------
 -- Add custom internal recon scripts
 -- ----------------------------------------------------------------------
@@ -2124,11 +2160,11 @@ ALTER TABLE `tnetflow_filter` DROP COLUMN `output`;
 -- ----------------------------------------------------------------------
 UPDATE tuser_task set parameters = 'a:5:{i:0;a:6:{s:11:\"description\";s:28:\"Report pending to be created\";s:5:\"table\";s:7:\"treport\";s:8:\"field_id\";s:9:\"id_report\";s:10:\"field_name\";s:4:\"name\";s:4:\"type\";s:3:\"int\";s:9:\"acl_group\";s:8:\"id_group\";}i:1;a:2:{s:11:\"description\";s:46:\"Send to email addresses (separated by a comma)\";s:4:\"type\";s:4:\"text\";}i:2;a:2:{s:11:\"description\";s:7:\"Subject\";s:8:\"optional\";i:1;}i:3;a:3:{s:11:\"description\";s:7:\"Message\";s:4:\"type\";s:4:\"text\";s:8:\"optional\";i:1;}i:4;a:2:{s:11:\"description\";s:11:\"Report Type\";s:4:\"type\";s:11:\"report_type\";}}' where function_name = "cron_task_generate_report";
 
-------------------------------------------------------------------------
+-- ----------------------------------------------------------------------
------- ADD message in table 'tnews'
+-- ADD message in table 'tnews'
-------------------------------------------------------------------------
+-- ----------------------------------------------------------------------
 
-INSERT INTO `tnews` (`id_news`, `author`, `subject`, `text`, `timestamp`) VALUES (1,'admin','Welcome to Pandora FMS Console', '<p style="text-align: center; font-size: 13px;">Hello, congratulations, if you've arrived here you already have an operational monitoring console. Remember that our forums and online documentation are available 24x7 to get you out of any trouble. You can replace this message with a personalized one at Admin tools -> Site news.</p> ',NOW());
+INSERT INTO `tnews` (`id_news`, `author`, `subject`, `text`, `timestamp`) VALUES (NULL,'admin','Welcome to Pandora FMS Console', '<p style="text-align: center; font-size: 13px;">Hello, congratulations, if you've arrived here you already have an operational monitoring console. Remember that our forums and online documentation are available 24x7 to get you out of any trouble. You can replace this message with a personalized one at Admin tools -> Site news.</p> ',NOW());
 
 -- ----------------------------------------------------------------------
 -- Alter table `talert_templates`
@@ -2136,3 +2172,24 @@ INSERT INTO `tnews` (`id_news`, `author`, `subject`, `text`, `timestamp`) VALUES
 
  ALTER TABLE `talert_templates` MODIFY COLUMN `type` ENUM('regex','max_min','max','min','equal','not_equal','warning','critical','onchange','unknown','always','not_normal');
 
+-- ---------------------------------------------------------------------
+-- Table `tvisual_console_items_cache`
+-- ---------------------------------------------------------------------
+CREATE TABLE `tvisual_console_elements_cache` (
+    `id` INTEGER UNSIGNED NOT NULL AUTO_INCREMENT,
+    `vc_id` INTEGER UNSIGNED NOT NULL,
+    `vc_item_id` INTEGER UNSIGNED NOT NULL,
+    `user_id` VARCHAR(60) DEFAULT NULL,
+    `data` TEXT NOT NULL,
+    `created_at` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+	`expiration` INTEGER UNSIGNED NOT NULL COMMENT 'Seconds to expire',
+    PRIMARY KEY(`id`),
+    FOREIGN KEY(`vc_id`) REFERENCES `tlayout`(`id`)
+        ON DELETE CASCADE,
+    FOREIGN KEY(`vc_item_id`) REFERENCES `tlayout_data`(`id`)
+        ON DELETE CASCADE,
+    FOREIGN KEY (`user_id`) REFERENCES `tusuario`(`id_user`)
+        ON DELETE CASCADE
+        ON UPDATE CASCADE
+) engine=InnoDB DEFAULT CHARSET=utf8;
+

pandora_console/general/footer.php

@@ -20,6 +20,8 @@ if (isset($_SERVER['REQUEST_TIME'])) {
     $time = get_system_time();
 }
 
+ui_require_css_file('footer');
+
 $license_file = 'general/license/pandora_info_'.$config['language'].'.html';
 if (! file_exists($config['homedir'].$license_file)) {
     $license_file = 'general/license/pandora_info_en.html';
@@ -41,9 +43,17 @@ if ($current_package == 0) {
     $build_package_version = $current_package;
 }
 
-echo sprintf(__('%s %s - Build %s - MR %s', get_product_name(), $pandora_version, $build_package_version, $config['MR']));
+echo __(
+    '%s %s - Build %s - MR %s',
+    get_product_name(),
+    $pandora_version,
+    $build_package_version,
+    $config['MR']
+);
+echo '</a><br />';
+echo '<small><span>'.__('Page generated on %s', date('Y-m-d H:i:s')).'</span></small>';
+
 
-echo '</a> ';
 
 if (isset($config['debug'])) {
     $cache_info = [];

pandora_console/general/login_identification_wizard.php

@@ -1,455 +0,0 @@
-<?php
-
-// Pandora FMS - http://pandorafms.com
-// ==================================================
-// Copyright (c) 2005-2011 Artica Soluciones Tecnologicas
-// Please see http://pandorafms.org for full contribution list
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; version 2
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-/**
- * @package General
- */
-
-global $config;
-
-
-function display_register($data)
-{
-    if ($data['instance_registered'] == 1) {
-        return false;
-    }
-
-    if ($data['force_register'] == 1) {
-        return true;
-    }
-
-    if ($data['force_register'] == 0) {
-        return false;
-    }
-
-    if ($data['identification_reminder'] == 0) {
-        return false;
-    }
-
-    if (!isset($data['identification_reminder_timestamp'])) {
-        return true;
-    }
-
-    if ($data['identification_reminder_timestamp'] < time()) {
-        return true;
-    }
-
-    return false;
-}
-
-
-function display_newsletter($data)
-{
-    if ($data['newsletter_subscribed'] == 1) {
-        return false;
-    }
-
-    if ($data['force_newsletter'] == 1) {
-        return true;
-    }
-
-    if ($data['force_newsletter'] == 0) {
-        return false;
-    }
-
-    if ($data['newsletter_reminder'] === 0) {
-        return false;
-    }
-
-    if (!isset($data['newsletter_reminder_timestamp'])) {
-        return true;
-    }
-
-    if (!is_numeric($data['newsletter_reminder_timestamp'])) {
-        return true;
-    }
-
-    if ($data['newsletter_reminder_timestamp'] < time()) {
-        return true;
-    }
-
-    return false;
-}
-
-
-if (is_ajax()) {
-    include_once $config['homedir'].'/include/functions_update_manager.php';
-
-    $open_wizard = get_parameter('open_wizard', 0);
-    $not_return = get_parameter('not_return', 0);
-    $reset_initial_wizard = get_parameter('reset_initial_wizard', 0);
-
-    if ($reset_initial_wizard) {
-        config_update_value('initial_wizard', 0);
-    }
-
-    if ($open_wizard) {
-        $register_pandora = get_parameter('register_pandora', 0);
-        $newsletter = get_parameter('newsletter', 0);
-        $forced = get_parameter('forced', 0);
-        $future_8_days = (time() + 8 * SECONDS_1DAY);
-        $ui_feedback = [
-            'status'  => true,
-            'message' => '',
-        ];
-
-        if ($register_pandora) {
-            // Pandora register update
-            $um_message = update_manager_register_instance();
-            $ui_feedback['message'] .= $um_message['message'].'<br><br>';
-            if ($um_message['success']) {
-                config_update_value('instance_registered', 1);
-                $ui_feedback['status'] = true && $ui_feedback['status'];
-            } else {
-                $ui_feedback['status'] = false;
-            }
-        } else if (!$forced) {
-            config_update_value('identification_reminder_timestamp', $future_8_days);
-        }
-
-        if ($newsletter) {
-            // Pandora newsletter update
-            $email = get_parameter('email', '');
-            $um_message = update_manager_insert_newsletter($email);
-            $ui_feedback['message'] .= $um_message['message'];
-            if ($um_message['success']) {
-                db_process_sql_update('tusuario', ['middlename' => 1], ['id_user' => $config['id_user']]);
-                $ui_feedback['status'] = true && $ui_feedback['status'];
-            } else {
-                $ui_feedback['status'] = false;
-            }
-        } else if (!$forced) {
-            db_process_sql_update('tusuario', ['lastname' => $future_8_days], ['id_user' => $config['id_user']]);
-        }
-
-        // Form answer JSON
-        $ui_feedback['status'] = $ui_feedback['status'] ? 1 : 0;
-        echo io_json_mb_encode($ui_feedback);
-    }
-
-    if (!$not_return) {
-        return;
-    }
-}
-
-// Check if user is admin
-if (!license_free()) {
-    return;
-}
-
-if (!users_is_admin($config['id_user'])) {
-    return;
-}
-
-// Get data to display properly the wizard
-$wizard_data = [];
-
-$wizard_data['newsletter_subscribed'] = db_get_value('middlename', 'tusuario', 'id_user', $config['id_user']);
-// force_* = 1 -> force show
-// force_* = 0 -> force hide
-// force_* = -1 -> show or hide depends reminder and timestamp
-$wizard_data['force_newsletter'] = get_parameter('force_newsletter', -1);
-$wizard_data['newsletter_reminder'] = db_get_value('firstname', 'tusuario', 'id_user', $config['id_user']);
-$wizard_data['newsletter_reminder_timestamp'] = db_get_value('lastname', 'tusuario', 'id_user', $config['id_user']);
-
-
-$wizard_data['instance_registered'] = $config['instance_registered'];
-$wizard_data['force_register'] = get_parameter('force_register', -1);
-$wizard_data['identification_reminder'] = $config['identification_reminder'];
-$wizard_data['identification_reminder_timestamp'] = $config['identification_reminder_timestamp'];
-
-$display_newsletter = display_newsletter($wizard_data);
-$display_register = display_register($wizard_data);
-$display_forced = ($wizard_data['force_newsletter'] != -1) || ($wizard_data['force_register'] != -1);
-
-// Return if it is fully completed
-if ((!$display_register) && (!$display_newsletter)) {
-    return false;
-}
-
-$return_button = get_parameter('return_button', 0) == 1;
-
-$email = db_get_value('email', 'tusuario', 'id_user', $config['id_user']);
-// Avoid to show default email
-if ($email == 'admin@example.com') {
-    $email = '';
-}
-
-// Prints accept register license
-echo '<div id="login_accept_register" title="'.__('The %s community wizard', get_product_name()).'" style="">';
-    echo '<div style="margin: 5px 0 10px; float: left; padding-left: 15px;">';
-        echo html_print_image('images/pandora_circle_big.png', true);
-    echo '</div>';
-    echo '<div style="font-size: 12pt; margin: 5px 20px; float: left; padding-top: 23px;">';
-        echo __('Stay up to date with the %s community', get_product_name()).'.';
-    echo '</div>';
-
-    echo '<div id="license_newsletter">';
-        echo '<p>'.__('When you subscribe to the %s Update Manager service, you accept that we register your %s instance as an identifier on the database owned by Artica TS. This data will solely be used to provide you with information about %s and will not be conceded to third parties. You can unregister from said database at any time from the Update Manager options.', get_product_name(), get_product_name(), get_product_name()).'</p>';
-        echo '<p>'.__('In the same fashion, when subscribed to the newsletter you accept that your email will pass on to a database property of Artica TS. This data will solely be used to provide you with information about %s and will not be conceded to third parties. You can unregister from said database at any time from the newsletter subscription options.', get_product_name()).'</p>';
-    echo '</div>';
-
-    echo '<div style="position:absolute; margin: 0 auto; bottom: 0px; padding-top:10px; position:relative; border: 1px solid #FFF;">';
-        echo '<div style="float: right;">';
-            html_print_submit_button(__('Finish'), 'finish_dialog_button', false, 'class="ui-button-dialog ui-widget ui-state-default ui-corner-all ui-button-text-only sub ok" style="width:100px;"');
-        echo '</div>';
-        $display_status_return = $return_button ? 'block' : 'none';
-        echo '<div style="float: right; width: 20%; display: '.$display_status_return.';">';
-            html_print_submit_button(__('Return'), 'return_dialog_button', false, 'class="ui-button-dialog ui-widget ui-state-default ui-corner-all ui-button-text-only sub upd" style="width:100px;"');
-        echo '</div>';
-        echo '<div style="float: left; margin-left: 0px; width: 50%; text-align: left;">';
-            html_print_checkbox('register', 1, false, false, false, 'cursor: \'pointer\'');
-            echo '&nbsp;<span style="font-size: 12px;" id="label-register">'.__('Join the %s community!', get_product_name()).'!</span><br>';
-            html_print_checkbox('newsletter', 1, false, false, false, 'cursor: \'pointer\'');
-            echo '&nbsp;<span style="font-size: 12px;" id="label-newsletter">'.__('Subscribe to our newsletter').'</span>';
-            echo '<br>';
-            echo '<div id="email_container">';
-                echo '&nbsp;<span id="label-email-newsletter"style="font-size: 12px; display: none">'.__('Email').': </span>';
-                html_print_input_text_extended('email-newsletter', $email, 'text-email-newsletter', '', 30, 255, false, '', ['style' => 'display:none; width: 200px;']);
-echo '&nbsp;<span id="label-email-newsletter"style="font-size: 12px; display: none">'.__('Email').': </span>';
-                echo '&nbsp;<span id="required-email-newsletter">*'.__('Required').' </span>';
-            echo '</div>';
-        echo '</div>';
-    echo '</div>';
-echo '</div>';
-
-// Print yes or not dialog
-echo '<div id="login_registration_yesno" title="'.__('%s instance identification wizard', get_product_name()).'" style="">';
-    echo '<div style="font-size: 12pt; margin: 20px;">';
-        echo __('Do you want to continue without any registration').'?';
-    echo '</div>';
-    echo '<div style="float: left;  padding-left: 15px; padding-top: 20px;">';
-        html_print_submit_button(__('No'), 'no_registration', false, 'class="ui-button-dialog ui-widget ui-state-default ui-corner-all ui-button-text-only sub cancel" style="width:100px;"');
-    echo '</div>';
-    echo '<div style="float: right;  padding-right: 15px; padding-top: 20px;">';
-        html_print_submit_button(__('Yes'), 'yes_registration', false, 'class="ui-button-dialog ui-widget ui-state-default ui-corner-all ui-button-text-only sub upd" style="width:100px;"');
-    echo '</div>';
-echo '</div>';
-
-// Print feedback user dialog
-echo '<div id="ui_messages_feedback" style="">';
-    echo '<div style="float: left;  margin: 15px; margin-left: 5px;">';
-        echo html_print_image('images/success_circle_big.png', true);
-    echo '</div>';
-    echo '<div id="feedback_message" style="font-size: 13pt; margin: 15px 20px; padding-left:80px;"></div>';
-echo '</div>';
-?>
-
-<script type="text/javascript" language="javascript">
-/* <![CDATA[ */
-
-//Show newsletter and register checkboxes
-var display_register = <?php echo json_encode($display_register); ?>;
-var display_newsletter = <?php echo json_encode($display_newsletter); ?>;
-var display_forced = <?php echo json_encode($display_forced); ?>;
-var return_button = <?php echo json_encode($return_button); ?>;
-////////////////////////////////////////////////////////////////////////
-//HELPER FUNCTIONS
-
-function submit_open_wizard (register, newsletter, email, forced) {
-    
-    register = register;
-    newsletter = newsletter ? 1 : 0;
-    forced = forced ? 1 : 0;
-    
-    var feedback_message = '';
-    var feedback_status = 1;
-    
-    jQuery.post ("ajax.php",
-                {"page": "general/login_identification_wizard",
-                "open_wizard": 1,
-                "register_pandora": register,
-                "newsletter": newsletter,
-                "email": email,
-                "forced": forced},
-                function (data) {
-                    var feedback_message = '';
-                    var feedback_status = 1;
-                    
-                    jQuery.each (data, function (i, val) {
-                        if (i == 'message') feedback_message = val;
-                        if (i == 'status') feedback_status = val;
-                    });
-                    if (feedback_status == 0) {
-                        $("#ui_messages_feedback img").attr("src", "images/fail_circle_big.png");
-                    } else {
-                        $("#ui_messages_feedback img").attr("src", "images/success_circle_big.png");
-                    }
-                    $("#feedback_message").html(feedback_message);    
-                },
-                "json"
-            );
-}
-
-////////////////////////////////////////////////////////////////////////
-//EVENT FUNCTIONS
-$("#submit-return_dialog_button").click (function () {
-    $("#login_accept_register" ).dialog('close');
-    $("#all-required").hide();
-    $("#login_id_dialog" ).dialog('open');
-    
-    jQuery.post ("ajax.php",
-        {"page": "general/login_identification_wizard",
-         "reset_initial_wizard": 1},
-        function (data) {}
-    );
-});
-
-$("#submit-finish_dialog_button").click (function () {
-    
-    var newsletter = $("#checkbox-newsletter").is(':checked') ? 1 : 0;
-    var register = $("#checkbox-register").is(':checked');
-    var email = $("#text-email-newsletter").val();
-    
-    if (email == '' && newsletter) {
-        $("#label-email-newsletter").show();
-        $("#text-email-newsletter").show();
-        $("#required-email-newsletter").show();
-        return;
-    }
-    
-    if (!register && display_register && !display_forced) {
-        $("#login_registration_yesno").dialog('open');
-    } else {
-        var register_forced = register ? 1 : 0;
-        submit_open_wizard (register_forced, newsletter, email, display_forced);
-        $("#login_accept_register" ).dialog('close');
-        if (register || newsletter) {
-            $("#ui_messages_feedback").dialog('open');
-        }
-    }
-});
-
-$("#submit-no_registration").click (function () {
-    $("#login_registration_yesno").dialog('close');
-});
-
-$("#submit-yes_registration").click (function () {
-    var newsletter = $("#checkbox-newsletter").is(':checked') ? 1 : 0;
-    var email = $("#text-email-newsletter").val();
-    submit_open_wizard (0, newsletter, email, display_forced);
-    
-    $("#login_registration_yesno").dialog('close');
-    $("#login_accept_register" ).dialog('close');
-});
-
-$("#checkbox-newsletter").click (function () {
-    var newsletter = $("#checkbox-newsletter").is(':checked') ? 1 : 0;
-    if (!return_button && newsletter) {
-        $("#label-email-newsletter").show();
-        $("#text-email-newsletter").show();
-    }
-    
-    if (!newsletter) {
-        $("#label-email-newsletter").hide();
-        $("#text-email-newsletter").hide();
-        $("#required-email-newsletter").hide();
-    }
-});
-
-////////////////////////////////////////////////////////////////////////
-//DISPLAY
-$(document).ready (function () {
-    
-    $("#login_accept_register").dialog({
-        resizable: false,
-        draggable: true,
-        modal: true,
-        height: 320,
-        width: 750
-    });
-    
-    $("#login_registration_yesno").dialog({
-        resizable: false,
-        draggable: true,
-        modal: true,
-        width: 320,
-        overlay: {
-                opacity: 1,
-                background: "black"
-            },
-        autoOpen: false
-    });
-    
-    
-    $("#ui_messages_feedback").dialog({
-        resizable: false,
-        draggable: true,
-        modal: true,
-        width: 300,
-        overlay: {
-                opacity: 1,
-                background: "black"
-            },
-        autoOpen: false
-    });
-    
-    //Display return button if required
-    if (return_button) {
-        $("#submit-return_dialog_button").show ();
-    }
-    // Remove the completed parts
-    if (!display_register) {
-        $("#checkbox-register").attr ('style', 'display: none !important');
-        $("#label-register").hide ();
-    }
-    if (!display_newsletter) {
-        $("#checkbox-newsletter").attr ('style', 'display: none !important');
-        $("#label-newsletter").hide ();
-    }
-});
-
-/* ]]> */
-</script>
-
-
-<style type="text/css">
-
-    #required-email-newsletter{
-        font-size : 9px;
-        color: red;
-        margin-left: -2px;
-        margin-top: 3px;
-        position: absolute;
-        display: none;
-    }
-    
-    #email_container{
-        margin-top: 3px;
-        width: 500px;
-    }
-    
-    #license_newsletter {
-        height: 100px;
-        width: 100%;
-        overflow-y: scroll;
-        border: 1px solid #E4E4E4;
-        border-radius: 3px; 
-    }
-    
-    #license_newsletter p{
-        padding: 0 3px;
-    }
-    
-    .ui-widget-overlay {
-        background: #000;
-        opacity: .6;
-    }
-    
-    .ui-draggable {
-        cursor: inherit;
-    }
-    
-
-</style>

pandora_console/general/login_page.php

@@ -19,8 +19,8 @@ if (isset($config['homedir'])) {
 
 ui_require_css_file('login');
 
-require_once $homedir.'include/functions_ui.php';
+require_once __DIR__.'/../include/functions_ui.php';
-require_once $homedir.'include/functions.php';
+require_once __DIR__.'/../include/functions.php';
 require_once __DIR__.'/../include/functions_html.php';
 
 
@@ -186,7 +186,7 @@ switch ($login_screen) {
             echo '</div>';
 
             echo '<div id="log_button" class="login_button" style="display: none;">';
-                html_print_submit_button(__('Login as admin'), 'login_button', false, 'class="sub next_login"');
+                html_print_submit_button(__('Login as admin'), 'login_button', false, 'class="next_login"');
             echo '</div>';
 
             echo '<div class="login_button" id="remove_button">';
@@ -226,7 +226,7 @@ switch ($login_screen) {
                 );
             echo '</div>';
             echo '<div class="login_button">';
-                html_print_submit_button(__('Login'), 'login_button', false, 'class="sub next_login"');
+                html_print_submit_button(__('Login'), 'login_button', false, 'class="next_login"');
             echo '</div>';
         }
     break;
@@ -245,7 +245,7 @@ switch ($login_screen) {
         html_print_input_text_extended('auth_code', '', 'auth_code', '', '', '', false, '', 'class="login login_password" placeholder="'.__('Authentication code').'"', false, true);
         echo '</div>';
         echo '<div class="login_button">';
-        html_print_submit_button(__('Check code').'&nbsp;&nbsp;>', 'login_button', false, 'class="sub next_login"');
+        html_print_submit_button(__('Check code').'&nbsp;&nbsp;>', 'login_button', false, 'class="next_login"');
         echo '</div>';
     break;
 
@@ -319,7 +319,7 @@ echo '</div>';
 echo '<div id="ver_num">'.$pandora_version.(($develop_bypass == 1) ? ' '.__('Build').' '.$build_version : '').'</div>';
 echo '</div>';
 
-if (!isset($process_error_message) && isset($mail)) {
+if (empty($process_error_message) && isset($mail)) {
     echo '<div id="reset_correct" title="'.__('Password reset').'">';
         echo '<div class="content_alert">';
             echo '<div class="icon_message_alert">';
@@ -336,7 +336,7 @@ if (!isset($process_error_message) && isset($mail)) {
             echo '</div>';
         echo '</div>';
     echo '</div>';
-} else if (isset($process_error_message)) {
+} else if (isset($process_error_message) && !empty($process_error_message)) {
     echo '<div id="reset_correct" title="'.__('Password reset').'">';
         echo '<div class="content_alert">';
             echo '<div class="icon_message_alert">';
@@ -518,6 +518,7 @@ if ($login_screen == 'error_authconfig' || $login_screen == 'error_emptyconfig'
 ui_require_css_file('dialog');
 ui_require_css_file('jquery-ui.min', 'include/styles/js/');
 ui_require_jquery_file('jquery-ui.min');
+ui_require_jquery_file('jquery-ui_custom');
 ?>
 
 <?php

pandora_console/general/login_required.php

@@ -1,273 +0,0 @@
-<?php
-
-// Pandora FMS - http://pandorafms.com
-// ==================================================
-// Copyright (c) 2005-2011 Artica Soluciones Tecnologicas
-// Please see http://pandorafms.org for full contribution list
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; version 2
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-/**
- * @package General
- */
-
-global $config;
-
-if (is_ajax()) {
-    $save_identification = get_parameter('save_required_wizard', 0);
-    $change_language = get_parameter('change_language', 0);
-    $cancel_wizard = get_parameter('cancel_wizard', 0);
-
-    // Updates the values get on the identification wizard
-    if ($save_identification) {
-        $email = get_parameter('email', false);
-        $timezone = get_parameter('timezone', false);
-        $language = get_parameter('language', false);
-
-        if ($email !== false) {
-            config_update_value('language', $language);
-        }
-
-        if ($timezone !== false) {
-            config_update_value('timezone', $timezone);
-        }
-
-        if ($email !== false) {
-            db_process_sql_update(
-                'tusuario',
-                ['email' => $email],
-                ['id_user' => $config['id_user']]
-            );
-        }
-
-        // Update the alert action Mail to XXX/Administrator if it is set to default
-        $mail_check = 'yourmail@domain.es';
-        $mail_alert = alerts_get_alert_action_field1(1);
-        if ($mail_check === $mail_alert && $email !== false) {
-            alerts_update_alert_action(
-                1,
-                [
-                    'field1'          => $email,
-                    'field1_recovery' => $email,
-                ]
-            );
-        }
-
-        config_update_value('initial_wizard', 1);
-    }
-
-    // Change the language if is change in checkbox
-    if ($change_language !== 0) {
-        config_update_value('language', $change_language);
-    }
-
-    if ($cancel_wizard !== 0) {
-        config_update_value('initial_wizard', 1);
-    }
-
-    return;
-}
-
-$email = db_get_value('email', 'tusuario', 'id_user', $config['id_user']);
-// Avoid to show default email
-if ($email == 'admin@example.com') {
-    $email = '';
-}
-
-// Prints first step pandora registration
-echo '<div id="login_id_dialog" title="'.__('%s instance identification wizard', get_product_name()).'" style="display: none;">';
-
-    echo '<div style="font-size: 10pt; margin: 20px;">';
-    echo __('Please fill the following information in order to configure your %s instance successfully', get_product_name()).'.';
-    echo '</div>';
-
-    echo '<div style="">';
-        $table = new StdClass();
-        $table->class = 'databox filters';
-        $table->width = '100%';
-        $table->data = [];
-        $table->size = [];
-        $table->size[0] = '40%';
-        $table->style[0] = 'font-weight:bold';
-        $table->size[1] = '60%';
-        $table->border = '5px solid';
-
-        $table->data[0][0] = __('Language code');
-        $table->data[0][1] = html_print_select_from_sql(
-            'SELECT id_language, name FROM tlanguage',
-            'language',
-            $config['language'],
-            '',
-            '',
-            '',
-            true
-        );
-
-        $zone_name = [
-            'Africa'     => __('Africa'),
-            'America'    => __('America'),
-            'Antarctica' => __('Antarctica'),
-            'Arctic'     => __('Arctic'),
-            'Asia'       => __('Asia'),
-            'Atlantic'   => __('Atlantic'),
-            'Australia'  => __('Australia'),
-            'Europe'     => __('Europe'),
-            'Indian'     => __('Indian'),
-            'Pacific'    => __('Pacific'),
-            'UTC'        => __('UTC'),
-        ];
-
-        if ($zone_selected == '') {
-            if ($config['timezone'] != '') {
-                $zone_array = explode('/', $config['timezone']);
-                $zone_selected = $zone_array[0];
-            } else {
-                $zone_selected = 'Europe';
-            }
-        }
-
-        $timezones = timezone_identifiers_list();
-        foreach ($timezones as $timezone) {
-            if (strpos($timezone, $zone_selected) !== false) {
-                $timezone_country = preg_replace('/^.*\//', '', $timezone);
-                $timezone_n[$timezone] = $timezone_country;
-            }
-        }
-
-        $table->data[2][0] = __('Timezone setup').' '.ui_print_help_tip(
-            __('Must have the same time zone as the system or database to avoid mismatches of time.'),
-            true
-        );
-        $table->data[2][1] = html_print_select($zone_name, 'zone', $zone_selected, 'show_timezone()', '', '', true);
-        $table->data[2][1] .= '&nbsp;&nbsp;'.html_print_select($timezone_n, 'timezone', $config['timezone'], '', '', '', true);
-
-        $table->data[4][0] = __('E-mail for receiving alerts');
-        $table->data[4][1] = html_print_input_text('email', $email, '', 50, 255, true);
-
-        html_print_table($table);
-        echo '</div>';
-
-        echo '<div style="position:absolute; margin: 0 auto; bottom: 0px; right: 10px; border: 1px solid #FFF; width: 570px">';
-        echo '<div style="float: right; width: 20%;">';
-        html_print_submit_button(__('Register'), 'id_dialog_button', false, 'class="ui-button-dialog ui-widget ui-state-default ui-corner-all ui-button-text-only sub ok" style="width:100px;"');
-        echo '</div>';
-        echo '<div style="float: right; width: 20%;">';
-            html_print_button(__('Cancel'), 'cancel', false, '', 'class="ui-button-dialog ui-widget ui-state-default ui-corner-all ui-button-text-only sub ok" style="width:100px;"');
-        echo '</div>';
-        echo '<div id="all-required" style="float: right; margin-right: 30px; display: none; color: red;">';
-            echo __('All fields required');
-        echo '</div>';
-        echo '</div>';
-
-        echo '</div>';
-
-        ?>
-
-<script type="text/javascript" language="javascript">
-/* <![CDATA[ */
-
-var default_language_displayed;
-
-////////////////////////////////////////////////////////////////////////
-//HELPER FUNCTIONS
-function show_timezone () {
-    zone = $("#zone").val();
-    
-    $.ajax({
-        type: "POST",
-        url: "ajax.php",
-        data: "page=godmode/setup/setup&select_timezone=1&zone=" + zone,
-        dataType: "json",
-        success: function(data) {
-            $("#timezone").empty();
-            jQuery.each (data, function (id, value) {
-                timezone = value;
-                var timezone_country = timezone.replace (/^.*\//g, "");
-                $("select[name='timezone']").append($("<option>").val(timezone).html(timezone_country));
-            });
-        }
-    });
-}
-
-////////////////////////////////////////////////////////////////////////
-//EVENT FUNCTIONS
-$("#submit-id_dialog_button").click (function () {
-    
-    //All fields required
-    if ($("#text-email").val() == '') {
-        $("#all-required").show();
-    } else {
-        var timezone = $("#timezone").val();
-        var language = $("#language").val();
-        var email_identification = $("#text-email").val();
-        
-        jQuery.post ("ajax.php",
-            {"page": "general/login_required",
-            "save_required_wizard": 1,
-            "email": email_identification,
-            "language": language,
-            "timezone": timezone},
-            function (data) {}
-        );
-                    
-        $("#login_id_dialog").dialog('close');
-        first_time_identification ();
-    }
-});
-
-$("#language").click(function () {
-    var change_language = $("#language").val();
-    
-    if (change_language === default_language_displayed) return;
-    jQuery.post ("ajax.php",
-            {"page": "general/login_required",
-            "change_language": change_language},
-            function (data) {}
-    ).done(function () {
-        location.reload();
-    });
-});
-
-////////////////////////////////////////////////////////////////////////
-//DISPLAY
-$(document).ready (function () {
-    
-    $("#login_id_dialog").dialog({
-        resizable: true,
-        draggable: true,
-        modal: true,
-        height: 280,
-        width: 630,
-        overlay: {
-                opacity: 0.5,
-                background: "black"
-            },
-        closeOnEscape: false,
-        open: function(event, ui) { $(".ui-dialog-titlebar-close").hide(); }
-    });
-    
-    default_language_displayed = $("#language").val();
-    
-    $(".ui-widget-overlay").css("background", "#000");
-    $(".ui-widget-overlay").css("opacity", 0.6);
-    $(".ui-draggable").css("cursor", "inherit");
-    
-    $("#button-cancel").click (function () {
-        jQuery.post ("ajax.php",
-            {"page": "general/login_required",
-            "cancel_wizard": 1},
-            function (data) {}
-        );
-        
-        $("#login_id_dialog" ).dialog('close');
-    });
-    
-});
-
-/* ]]> */
-</script>

pandora_console/general/logon_ok.php

@@ -103,246 +103,203 @@ if (!empty($all_data)) {
     $data['server_sanity'] = format_numeric((100 - $data['module_sanity']), 1);
 }
 
+ui_require_css_file('logon');
 
-?>
+echo '<div id="welcome_panel">';
-<table border="0" width="100%" cellspacing="0" cellpadding="0">
-    <tr>
-        
-        <td width="25%" style="padding-right: 20px;" valign="top">
-            
-            
-            <?php
-            //
-            // Overview Table.
-            //
-            $table = new stdClass();
-            $table->class = 'databox';
-            $table->cellpadding = 4;
-            $table->cellspacing = 4;
-            $table->head = [];
-            $table->data = [];
-            $table->headstyle[0] = 'text-align:center;';
-            $table->width = '100%';
-            $table->head[0] = '<span>'.__('%s Overview', get_product_name()).'</span>';
-            $table->head_colspan[0] = 4;
 
-            // Indicators.
+//
-            $tdata = [];
+// Overview Table.
-            $stats = reporting_get_stats_indicators($data, 120, 10, false);
+//
-            $status = '<table class="status_tactical">';
+$table = new stdClass();
-            foreach ($stats as $stat) {
+$table->class = 'no-class';
-                $status .= '<tr><td><b>'.$stat['title'].'</b></td><td>'.$stat['graph'].'</td></tr>';
+$table->cellpadding = 4;
-            }
+$table->cellspacing = 4;
+$table->head = [];
+$table->data = [];
+$table->headstyle[0] = 'text-align:center;';
+$table->width = '100%';
+$table->head_colspan[0] = 4;
 
-            $status .= '</table>';
+// Indicators.
-            $table->data[0][0] = $status;
+$tdata = [];
-            $table->rowclass[] = '';
+$stats = reporting_get_stats_indicators($data, 120, 10, false);
+$status = '<table class="status_tactical">';
+foreach ($stats as $stat) {
+    $status .= '<tr><td><b>'.$stat['title'].'</b></td><td>'.$stat['graph'].'</td></tr>';
+}
 
-            $table->data[] = $tdata;
+$status .= '</table>';
+$table->data[0][0] = $status;
+$table->rowclass[] = '';
 
-            // Alerts.
+$table->data[] = $tdata;
-            $tdata = [];
-            $tdata[0] = reporting_get_stats_alerts($data);
-            $table->rowclass[] = '';
-            $table->data[] = $tdata;
 
-            // Modules by status.
+// Alerts.
-            $tdata = [];
+$tdata = [];
-            $tdata[0] = reporting_get_stats_modules_status($data, 180, 100);
+$tdata[0] = reporting_get_stats_alerts($data);
-            $table->rowclass[] = '';
+$table->rowclass[] = '';
-            $table->data[] = $tdata;
+$table->data[] = $tdata;
 
-            // Total agents and modules.
+// Modules by status.
-            $tdata = [];
+$tdata = [];
-            $tdata[0] = reporting_get_stats_agents_monitors($data);
+$tdata[0] = reporting_get_stats_modules_status($data, 180, 100);
-            $table->rowclass[] = '';
+$table->rowclass[] = '';
-            $table->data[] = $tdata;
+$table->data[] = $tdata;
 
-            // Users.
+// Total agents and modules.
-            if (users_is_admin()) {
+$tdata = [];
-                $tdata = [];
+$tdata[0] = reporting_get_stats_agents_monitors($data);
-                $tdata[0] = reporting_get_stats_users($data);
+$table->rowclass[] = '';
-                $table->rowclass[] = '';
+$table->data[] = $tdata;
-                $table->data[] = $tdata;
-            }
 
-            html_print_table($table);
+// Users.
-            unset($table);
+if (users_is_admin()) {
-            ?>
+    $tdata = [];
-            
+    $tdata[0] = reporting_get_stats_users($data);
-            
+    $table->rowclass[] = '';
-        </td>
+    $table->data[] = $tdata;
-        
+}
-        <td width="75%" valign="top">
+
-            
+ui_toggle(
-            
+    html_print_table($table, true),
-            <?php
+    __('%s Overview', get_product_name()),
-            $options = [];
+    '',
-            $options['id_user'] = $config['id_user'];
+    'overview',
-            $options['modal'] = false;
+    false
-            $options['limit'] = 3;
+);
-            $news = get_news($options);
+unset($table);
+
+echo '<div id="right">';
+
+// News.
+$options = [];
+$options['id_user'] = $config['id_user'];
+$options['modal'] = false;
+$options['limit'] = 3;
+$news = get_news($options);
 
 
-            if (!empty($news)) {
+if (!empty($news)) {
-                // NEWS BOARD.
+    ui_require_css_file('news');
-                echo '<div id="news_board">';
+    // NEWS BOARD.
+    if ($config['prominent_time'] == 'timestamp') {
+        $comparation_suffix = '';
+    } else {
+        $comparation_suffix = __('ago');
+    }
 
-                echo '<table cellpadding="0" width=100% cellspacing="0" class="databox filters">';
+    $output_news = '<div id="news_board" class="new">';
-                echo '<tr><th style="text-align:center;"><span >'.__('News board').'</span></th></tr>';
+    foreach ($news as $article) {
-                if ($config['prominent_time'] == 'timestamp') {
+        $image = false;
-                    $comparation_suffix = '';
+        if ($article['text'] == '&amp;lt;p&#x20;style=&quot;text-align:&#x20;center;&#x20;font-size:&#x20;13px;&quot;&amp;gt;Hello,&#x20;congratulations,&#x20;if&#x20;you&apos;ve&#x20;arrived&#x20;here&#x20;you&#x20;already&#x20;have&#x20;an&#x20;operational&#x20;monitoring&#x20;console.&#x20;Remember&#x20;that&#x20;our&#x20;forums&#x20;and&#x20;online&#x20;documentation&#x20;are&#x20;available&#x20;24x7&#x20;to&#x20;get&#x20;you&#x20;out&#x20;of&#x20;any&#x20;trouble.&#x20;You&#x20;can&#x20;replace&#x20;this&#x20;message&#x20;with&#x20;a&#x20;personalized&#x20;one&#x20;at&#x20;Admin&#x20;tools&#x20;-&amp;amp;gt;&#x20;Site&#x20;news.&amp;lt;/p&amp;gt;&#x20;') {
-                } else {
+            $image = true;
-                    $comparation_suffix = __('ago');
+        }
-                }
 
-                foreach ($news as $article) {
+        $text_bbdd = io_safe_output($article['text']);
-                    $text_bbdd = io_safe_output($article['text']);
+        $text = html_entity_decode($text_bbdd);
-                    $text = html_entity_decode($text_bbdd);
+        $output_news .= '<span class="green_title">'.$article['subject'].'</span>';
-                    echo '<tr><th class="green_title">'.$article['subject'].'</th></tr>';
+        $output_news .= '<div class="new content">';
-                    echo '<tr><td>'.__('by').' <b>'.$article['author'].'</b> <i>'.ui_print_timestamp($article['timestamp'], true).'</i> '.$comparation_suffix.'</td></tr>';
+        $output_news .= '<p>'.__('by').' <b>'.$article['author'].'</b> <i>'.ui_print_timestamp($article['timestamp'], true).'</i> '.$comparation_suffix.'</p>';
-                    echo '<tr><td class="datos">';
+        if ($image) {
-                    if ($article['id_news'] == 1) {
+            $output_news .= '<center><img src="./images/welcome_image.png" alt="img colabora con nosotros - Support" width="191" height="207"></center>';
-                        echo '<center><img src="./images/welcome_image.png" alt="img colabora con nosotros - Support" width="191" height="207"></center>';
+        }
-                    }
 
-                    echo nl2br($text);
+        $output_news .= nl2br($text);
-                    echo '</td></tr>';
+        $output_news .= '</div>';
-                }
+    }
 
-                echo '</table>';
+    $output_news .= '</div>';
-                echo '</div>';
-                // News board.
-                echo '<br><br>';
 
-                // END OF NEWS BOARD.
+    // News board.
-            }
+    ui_toggle(
+        $output_news,
+        __('News board'),
+        '',
+        'news',
+        false
+    );
+    // END OF NEWS BOARD.
+}
 
-            $nots = messages_get_overview('utimestamp', 'DESC', false);
+// LAST ACTIVITY.
-            if (!empty($nots)) {
+// Show last activity from this user.
-                // Notifications board.
+$table = new stdClass();
-                echo '<div id="notifications_board">';
+$table->class = 'no-td-padding info_table';
-
+$table->cellpadding = 0;
-                echo '<table cellpadding="0" width=100% cellspacing="0" class="databox filters">';
+$table->cellspacing = 0;
-                echo '<tr><th style="text-align:center;"><span >'.__('Pending notifications').'</span></th></tr>';
+$table->width = '100%';
-                if ($config['prominent_time'] == 'timestamp') {
+// Don't specify px.
-                    $comparation_suffix = '';
+$table->data = [];
-                } else {
+$table->size = [];
-                    $comparation_suffix = __('ago');
+$table->headstyle = [];
-                }
+$table->size[0] = '5%';
-
+$table->size[1] = '15%';
-                foreach ($nots as $msg) {
+$table->headstyle[1] = 'min-width: 12em;';
-                    $conversation = io_safe_output(
+$table->size[2] = '5%';
-                        messages_get_conversation($msg)
+$table->headstyle[2] = 'min-width: 65px;';
-                    );
+$table->size[3] = '10%';
-
+$table->size[4] = '25%';
-                    if (is_array($conversation)) {
+$table->head = [];
-                        $text = array_pop($conversation)['message'];
+$table->head[0] = __('User');
-                    } else {
+$table->head[1] = __('Action');
-                        // Skip empty message.
+$table->head[2] = __('Date');
-                        continue;
+$table->head[3] = __('Source IP');
-                    }
+$table->head[4] = __('Comments');
-
+$table->align[4] = 'left';
-                    $url = ui_get_full_url(
+$sql = sprintf(
-                        'index.php?sec=message_list&sec2=operation/messages/message_edit&read_message=1&id_message='.$msg['id_mensaje']
+    'SELECT id_usuario,accion, ip_origen,descripcion,utimestamp
-                    );
+            FROM tsesion
-                    if ($msg['url'] != '') {
+            WHERE (`utimestamp` > UNIX_TIMESTAMP(NOW()) - '.SECONDS_1WEEK.") 
-                        $url = $msg['url'];
+                AND `id_usuario` = '%s' ORDER BY `utimestamp` DESC LIMIT 10",
-                    }
+    $config['id_user']
-
+);
-                    echo '<tr><th class="green_title">'.$msg['subject'].'</th></tr>';
-                    echo '<tr><td><a href="'.$url.'">';
-                    if ($msg['id_usuario_origen'] != '') {
-                        echo '<b>'.get_user_fullname($msg['id_usuario_origen']).'</b> ';
-                    }
-
-                    echo '<i>'.ui_print_timestamp($msg['timestamp'], true).'</i> '.$comparation_suffix.'</a></td></tr>';
-                    echo '<tr><td class="datos">';
-                    echo nl2br($text);
-                    echo '</td></tr>';
-                }
-
-                echo '</table>';
-                echo '</div>';
-
-                echo '<br><br>';
-
-                // EO Notifications board.
-            }
-
-            // LAST ACTIVITY.
-            // Show last activity from this user.
-            echo '<div id="activity">';
-
-            $table = new stdClass();
-            $table->class = 'info_table';
-            $table->cellpadding = 0;
-            $table->cellspacing = 0;
-            $table->width = '100%';
-            // Don't specify px.
-            $table->data = [];
-            $table->size = [];
-            $table->size[0] = '5%';
-            $table->size[1] = '15%';
-            $table->size[2] = '15%';
-            $table->size[3] = '10%';
-            $table->size[4] = '25%';
-            $table->head = [];
-            $table->head[0] = __('User');
-            $table->head[1] = __('Action');
-            $table->head[2] = __('Date');
-            $table->head[3] = __('Source IP');
-            $table->head[4] = __('Comments');
-            $table->title = '<span>'.__('This is your last activity performed on the %s console', get_product_name()).'</span>';
-            $sql = sprintf(
-                'SELECT id_usuario,accion, ip_origen,descripcion,utimestamp
-						FROM tsesion
-						WHERE (`utimestamp` > UNIX_TIMESTAMP(NOW()) - '.SECONDS_1WEEK.") 
-							AND `id_usuario` = '%s' ORDER BY `utimestamp` DESC LIMIT 10",
-                $config['id_user']
-            );
 
 
-            $sessions = db_get_all_rows_sql($sql);
+$sessions = db_get_all_rows_sql($sql);
 
-            if ($sessions === false) {
+if ($sessions === false) {
-                $sessions = [];
+    $sessions = [];
-            }
+}
 
-            foreach ($sessions as $session) {
+foreach ($sessions as $session) {
-                $data = [];
+    $data = [];
-                $session_id_usuario = $session['id_usuario'];
+    $session_id_usuario = $session['id_usuario'];
-                $session_ip_origen = $session['ip_origen'];
+    $session_ip_origen = $session['ip_origen'];
 
 
+    $data[0] = '<strong>'.$session_id_usuario.'</strong>';
+    $data[1] = ui_print_session_action_icon($session['accion'], true).' '.$session['accion'];
+    $data[2] = ui_print_help_tip(
+        date($config['date_format'], $session['utimestamp']),
+        true
+    ).human_time_comparation($session['utimestamp'], 'tiny');
+    $data[3] = $session_ip_origen;
+    $description = str_replace([',', ', '], ', ', $session['descripcion']);
+    if (strlen($description) > 100) {
+        $data[4] = '<div >'.io_safe_output(substr($description, 0, 150).'...').'</div>';
+    } else {
+        $data[4] = '<div >'.io_safe_output($description).'</div>';
+    }
 
-                $data[0] = '<strong>'.$session_id_usuario.'</strong>';
+    array_push($table->data, $data);
-                $data[1] = ui_print_session_action_icon($session['accion'], true).' '.$session['accion'];
+}
-                $data[2] = ui_print_help_tip(
-                    date($config['date_format'], $session['utimestamp']),
-                    true
-                ).human_time_comparation($session['utimestamp'], 'tiny');
-                $data[3] = $session_ip_origen;
-                $description = str_replace([',', ', '], ', ', $session['descripcion']);
-                if (strlen($description) > 100) {
-                    $data[4] = '<div >'.io_safe_output(substr($description, 0, 150).'...').'</div>';
-                } else {
-                    $data[4] = '<div >'.io_safe_output($description).'</div>';
-                }
 
-                array_push($table->data, $data);
+$activity .= html_print_table($table, true);
-            }
+unset($table);
 
-            echo "<div style='width:100%; overflow-x:auto;'>";
+ui_toggle(
-            html_print_table($table);
+    $activity,
-            unset($table);
+    __('Latest activity'),
-            echo '</div>';
+    '',
-            echo '</div>';
+    'activity',
-            // END OF LAST ACTIVIYY.
+    false,
-            ?>
+    false,
-            
+    '',
-            
+    'white-box-content padded'
-        </td>
+);
-        
+// END OF LAST ACTIVIYY.
-    </tr>
+// Close right panel.
-</table>
+echo '</div>';
+
+// Close welcome panel.
+echo '</div>';

pandora_console/general/main_menu.php

@@ -30,12 +30,6 @@ $(document).ready(function(){
     }
 });
 
-
-// Set the height of the menu.
-$(window).on('load', function (){   
-    $("#menu_full").height($("#container").height());
-});
-
 </script>
 <?php
 $autohidden_menu = 0;

pandora_console/general/register.php

@@ -0,0 +1,184 @@
+<?php
+/**
+ * Update Manager registration process client controller.
+ *
+ * @category   Client controller
+ * @package    Pandora FMS
+ * @subpackage Update manager
+ * @version    1.0.0
+ * @license    See below
+ *
+ *    ______                 ___                    _______ _______ ________
+ *   |   __ \.-----.--.--.--|  |.-----.----.-----. |    ___|   |   |     __|
+ *  |    __/|  _  |     |  _  ||  _  |   _|  _  | |    ___|       |__     |
+ * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
+ *
+ * ============================================================================
+ * Copyright (c) 2005-2019 Artica Soluciones Tecnologicas
+ * Please see http://pandorafms.org for full contribution list
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation for version 2.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * ============================================================================
+ */
+
+// Begin.
+global $config;
+
+require_once $config['homedir'].'/include/functions_update_manager.php';
+
+
+if (is_ajax()) {
+    // Parse responses, flow control.
+    $configuration_wizard = get_parameter('save_required_wizard', 0);
+    $change_language = get_parameter('change_language', 0);
+    $cancel_wizard = get_parameter('cancel_wizard', 0);
+
+    // Console registration.
+    $cancel_registration = get_parameter('cancel_registration', 0);
+    $register_console = get_parameter('register_console', 0);
+
+    // Newsletter.
+    $cancel_newsletter = get_parameter('cancel_newsletter', 0);
+    $register_newsletter = get_parameter('register_newsletter', 0);
+
+    // Load wizards.
+    $load_wizards = get_parameter('load_wizards', '');
+
+    $feedback = [];
+
+    // Load wizards.
+    if ($load_wizards != '') {
+        switch ($load_wizards) {
+            case 'initial':
+            return config_wiz_modal(false, false);
+
+            case 'registration':
+            return registration_wiz_modal(false, false);
+
+            case 'newsletter':
+            return newsletter_wiz_modal(false, false);
+
+            case 'all':
+                config_wiz_modal(false, false);
+                registration_wiz_modal(false, false);
+                newsletter_wiz_modal(false, false);
+            return;
+
+            default:
+                // Ignore.
+            break;
+        }
+    }
+
+    // Configuration wizard process.
+    if ($configuration_wizard) {
+        $feedback = config_wiz_process();
+    }
+
+    if ($change_language) {
+        // Change the language if is change in checkbox.
+        config_update_value('language', $change_language);
+    }
+
+    if ($cancel_wizard) {
+        config_update_value('initial_wizard', 1);
+    }
+
+    // Update Manager registration.
+    if ($cancel_registration) {
+        config_update_value('pandora_uid', 'OFFLINE');
+    }
+
+    if ($register_console) {
+        $feedback = registration_wiz_process();
+    }
+
+    // Newsletter.
+    if ($cancel_newsletter) {
+        db_process_sql_update(
+            'tusuario',
+            ['middlename' => -1],
+            ['id_user' => $config['id_user']]
+        );
+
+        // XXX: Also notify UpdateManager.
+    }
+
+    if ($register_newsletter) {
+        $feedback = newsletter_wiz_process();
+    }
+
+    if (is_array($feedback)) {
+        echo json_encode($feedback);
+    }
+
+
+    // Ajax calls finish here.
+    exit();
+}
+
+
+ui_require_css_file('register');
+
+$initial = isset($config['initial_wizard']) !== true
+    || $config['initial_wizard'] != '1';
+
+$newsletter = db_get_value(
+    'middlename',
+    'tusuario',
+    'id_user',
+    $config['id_user']
+);
+$show_newsletter = $newsletter == '0' || $newsletter == '';
+
+$registration = isset($config['pandora_uid']) !== true
+    || $config['pandora_uid'] == '';
+
+
+if ($initial && users_is_admin()) {
+    // Show all forms in order.
+    // 1- Ask for email, timezone, etc. Fullfill alerts and user mail.
+    config_wiz_modal(
+        false,
+        true,
+        (($registration === true) ? 'show_registration_wizard()' : null)
+    );
+}
+
+if ($registration && users_is_admin()) {
+    // Prepare registration wizard, not launch. leave control to flow.
+    registration_wiz_modal(
+        false,
+        // Launch only if not being launch from 'initial'.
+        !$initial,
+        (($show_newsletter === true) ? 'force_run_newsletter()' : null)
+    );
+} else {
+    if ($show_newsletter) {
+        // Show newsletter wizard for current user.
+        newsletter_wiz_modal(
+            false,
+            // Launch only if not being call from 'registration'.
+            !$registration && !$initial
+        );
+    }
+}
+
+
+$newsletter = null;
+
+?>
+<script type="text/javascript">
+
+$(document).ready (function () {
+
+});
+
+
+
+</script>

pandora_console/godmode/admin_access_logs.php

@@ -94,7 +94,7 @@ $table->data[1] = $data;
 $form = '<form name="query_sel" method="post" action="index.php?sec=glog&sec2=godmode/admin_access_logs">';
 $form .= html_print_table($table, true);
 $form .= '</form>';
-ui_toggle($form, __('Filter'), '', false);
+ui_toggle($form, __('Filter'), '', '', false);
 
 $filter = '1=1';
 

pandora_console/godmode/agentes/agent_manager.php

@@ -1,17 +1,32 @@
 <?php
+/**
+ * Extension to schedule tasks on Pandora FMS Console
+ *
+ * @category   Agent editor/ builder.
+ * @package    Pandora FMS
+ * @subpackage Classic agent management view.
+ * @version    1.0.0
+ * @license    See below
+ *
+ *    ______                 ___                    _______ _______ ________
+ *   |   __ \.-----.--.--.--|  |.-----.----.-----. |    ___|   |   |     __|
+ *  |    __/|  _  |     |  _  ||  _  |   _|  _  | |    ___|       |__     |
+ * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
+ *
+ * ============================================================================
+ * Copyright (c) 2005-2019 Artica Soluciones Tecnologicas
+ * Please see http://pandorafms.org for full contribution list
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation for version 2.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * ============================================================================
+ */
 
-// Pandora FMS - http://pandorafms.com
+// Begin.
-// ==================================================
-// Copyright (c) 2005-2010 Artica Soluciones Tecnologicas
-// Please see http://pandorafms.org for full contribution list
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation for version 2.
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// Load global vars
 enterprise_include('godmode/agentes/agent_manager.php');
 
 require_once 'include/functions_clippy.php';
@@ -30,23 +45,19 @@ if (is_ajax()) {
 
         $id_agent = (int) get_parameter('id_agent');
         $string = (string) get_parameter('q');
-        // q is what autocomplete plugin gives
+        // Field q is what autocomplete plugin gives.
         $filter = [];
-
+        $filter[] = '(nombre COLLATE utf8_general_ci LIKE "%'.$string.'%" OR direccion LIKE "%'.$string.'%" OR comentarios LIKE "%'.$string.'%" OR alias LIKE "%'.$string.'%")';
-        switch ($config['dbtype']) {
-            case 'mysql':
-            case 'postgresql':
-                $filter[] = '(nombre COLLATE utf8_general_ci LIKE "%'.$string.'%" OR direccion LIKE "%'.$string.'%" OR comentarios LIKE "%'.$string.'%" OR alias LIKE "%'.$string.'%")';
-            break;
-
-            case 'oracle':
-                $filter[] = '(upper(nombre) LIKE upper(\'%'.$string.'%\') OR upper(direccion) LIKE upper(\'%'.$string.'%\') OR upper(comentarios) LIKE upper(\'%'.$string.'%\') OR upper(alias) LIKE upper(\'%'.$string.'%\'))';
-            break;
-        }
-
         $filter[] = 'id_agente != '.$id_agent;
 
-        $agents = agents_get_agents($filter, ['id_agente', 'nombre', 'direccion']);
+        $agents = agents_get_agents(
+            $filter,
+            [
+                'id_agente',
+                'nombre',
+                'direccion',
+            ]
+        );
         if ($agents === false) {
             $agents = [];
         }
@@ -78,7 +89,7 @@ if (is_ajax()) {
         $out = false;
         foreach ($idSNMP as $id) {
             foreach ($snmp[$id] as $key => $value) {
-                // Check if it has "ifXXXX" syntax and skip it
+                // Check if it has "ifXXXX" syntax and skip it.
                 if (! preg_match('/if/', $key)) {
                     continue;
                 }
@@ -98,7 +109,7 @@ if (is_ajax()) {
         echo io_json_mb_encode($out);
     }
 
-    // And and remove groups use the same function
+    // And and remove groups use the same function.
     $add_secondary_groups = get_parameter('add_secondary_groups');
     $remove_secondary_groups = get_parameter('remove_secondary_groups');
     if ($add_secondary_groups || $remove_secondary_groups) {
@@ -114,12 +125,12 @@ if (is_ajax()) {
                 'agents_update_secondary_groups',
                 [
                     $id_agent,
-                    $add_secondary_groups ? $groups_to_add : [],
+                    ($add_secondary_groups) ? $groups_to_add : [],
-                    $remove_secondary_groups ? $groups_to_add : [],
+                    ($remove_secondary_groups) ? $groups_to_add : [],
                 ]
             );
             // Echo 0 in case of error. 0 Otherwise.
-            echo $ret ? 1 : 0;
+            echo ($ret) ? 1 : 0;
         }
     }
 
@@ -149,7 +160,7 @@ if ($new_agent) {
 }
 
 if (!$new_agent) {
-    // Agent remote configuration editor
+    // Agent remote configuration editor.
     enterprise_include_once('include/functions_config_agents.php');
     if (enterprise_installed()) {
         $filename = config_agents_get_agent_config_filenames($id_agente);
@@ -157,27 +168,41 @@ if (!$new_agent) {
 }
 
 $disk_conf_delete = (bool) get_parameter('disk_conf_delete');
-// Agent remote configuration DELETE
+// Agent remote configuration DELETE.
 if ($disk_conf_delete) {
     // TODO: Get this working on computers where the Pandora server(s) are not on the webserver
-    // TODO: Get a remote_config editor working in the open version
+    // TODO: Get a remote_config editor working in the open version.
     @unlink($filename['md5']);
     @unlink($filename['conf']);
 }
 
-echo '<form name="conf_agent" method="post" action="index.php?sec=gagente&amp;sec2=godmode/agentes/configurar_agente">';
+echo '<form autocomplete="new-password" name="conf_agent" method="post" action="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente">';
+
+// Custom ID.
+$custom_id_div = '<div class="label_select">';
+$custom_id_div .= '<p class="input_label">'.__('Custom ID').': </p>';
+$custom_id_div .= html_print_input_text(
+    'custom_id',
+    $custom_id,
+    '',
+    16,
+    255,
+    true,
+    false,
+    false,
+    '',
+    'agent_custom_id'
+).'</div>';
 
 if (!$new_agent && $alias != '') {
     $table_agent_name = '<div class="label_select"><p class="input_label">'.__('Agent name').': '.ui_print_help_tip(__("The agent's name must be the same as the one defined at the console"), true).'</p>';
     $table_agent_name .= '<div class="label_select_parent">';
-    $table_agent_name .= '<div class="label_select_child_left">'.html_print_input_text('agente', $nombre_agente, '', 50, 100, true).'</div>';
+    $table_agent_name .= '<div class="label_select_child_left" style="width: 60%;">'.html_print_input_text('agente', $nombre_agente, '', 50, 100, true).'</div>';
-    $table_agent_name .= '<div class="label_select_child_right agent_options_agent_name">';
+    $table_agent_name .= '<div class="label_select_child_right agent_options_agent_name" style="width: 40%;">';
-
-    $table_qr_code = '<div class="agent_qr white_box"><p class="input_label">'.__('QR Code Agent view').': </p>';
 
     if ($id_agente) {
-        $table_agent_name .= '<span>'.__('ID').' '.$id_agente.'</span>';
+        $table_agent_name .= '<label>'.__('ID').'</label><input style="width: 50%;" type="text" disabled="true" value="'.$id_agente.'" />';
-        $table_agent_name .= '<a href="index.php?sec=gagente&amp;sec2=operation/agentes/ver_agente&amp;id_agente='.$id_agente.'">';
+        $table_agent_name .= '<a href="index.php?sec=gagente&sec2=operation/agentes/ver_agente&id_agente='.$id_agente.'">';
         $table_agent_name .= html_print_image(
             'images/zoom.png',
             true,
@@ -192,7 +217,7 @@ if (!$new_agent && $alias != '') {
     $agent_options_update = 'agent_options_update';
 
     // Delete link from here.
-    $table_agent_name .= "<a onClick=\"if (!confirm('".__('Are you sure?')."')) return false;\" href='index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&borrar_agente=$id_agente&search=&offset=0&sort_field=&sort=none'>".html_print_image('images/cross.png', true, ['title' => __('Delete agent')]).'</a>';
+    $table_agent_name .= "<a onClick=\"if (!confirm('".__('Are you sure?')."')) return false;\" href='index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&borrar_agente=".$id_agente."&search=&offset=0&sort_field=&sort=none'>".html_print_image('images/cross.png', true, ['title' => __('Delete agent')]).'</a>';
 
     // Remote configuration available.
     if (isset($filename)) {
@@ -201,7 +226,7 @@ if (!$new_agent && $alias != '') {
             $agent_name = io_safe_output($agent_name);
             $agent_md5 = md5($agent_name, false);
 
-            $table_agent_name .= '<a href="index.php?'.'sec=gagente&amp;'.'sec2=godmode/agentes/configurar_agente&amp;'.'tab=remote_configuration&amp;'.'id_agente='.$id_agente.'&amp;'.'disk_conf='.$agent_md5.'">';
+            $table_agent_name .= '<a href="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=remote_configuration&id_agente='.$id_agente.'&disk_conf='.$agent_md5.'">';
             $table_agent_name .= html_print_image(
                 'images/application_edit.png',
                 true,
@@ -218,6 +243,19 @@ if (!$new_agent && $alias != '') {
     }
 
     $table_agent_name .= '</div></div></div>';
+
+    // QR code div.
+    $table_qr_code = '<div class="box-shadow agent_qr white_box">';
+    $table_qr_code .= '<p class="input_label">'.__('QR Code Agent view').': </p>';
+    $table_qr_code .= '<div id="qr_container_image"></div>';
+    if ($id_agente) {
+        $table_qr_code .= "<a id='qr_code_agent_view' href='javascript: show_dialog_qrcode(null, \"".ui_get_full_url('mobile/index.php?page=agent&id='.$id_agente)."\" );'></a>";
+    }
+
+    // Add Custom id div.
+    $table_qr_code .= '<br />';
+    $table_qr_code .= $custom_id_div;
+    $table_qr_code .= '</div>';
 }
 
 if ($new_agent) {
@@ -257,14 +295,6 @@ if ($id_agente) {
     }
 </style>
 <?php
-if (!$new_agent && $alias != '') {
-    if ($id_agente) {
-        $table_qr_code .= "<a id='qr_code_agent_view' href='javascript: show_dialog_qrcode(null, \"".ui_get_full_url('mobile/index.php?page=agent&id='.$id_agente)."\" );'></a>";
-    }
-
-    $table_qr_code .= '</div>';
-}
-
 $groups = users_get_groups($config['id_user'], 'AR', false);
 
 $modules = db_get_all_rows_sql(
@@ -295,7 +325,21 @@ $table_primary_group .= '</span></div></div></div>';
 
 $table_interval = '<div class="label_select"><p class="input_label">'.__('Interval').': </p>';
 $table_interval .= '<div class="label_select_parent">';
-$table_interval .= html_print_extended_select_for_time('intervalo', $intervalo, '', '', '0', 10, true);
+$table_interval .= html_print_extended_select_for_time(
+    'intervalo',
+    $intervalo,
+    '',
+    '',
+    '0',
+    10,
+    true,
+    false,
+    true,
+    'w40p'
+);
+
+
+
 if ($intervalo < SECONDS_5MINUTES) {
     $table_interval .= clippy_context_help('interval_agent_min');
 }
@@ -341,22 +385,23 @@ $table_server .= html_print_select(
     __('None'),
     0,
     true
-).'<div class="label_select_child_icons">'.ui_print_help_icon('agent_server', true).'</div></div></div>';
+).'<div class="label_select_child_icons"></div></div></div>';
 
 // Description.
 $table_description = '<div class="label_select"><p class="input_label">'.__('Description').': </p>';
-$table_description .= html_print_input_text(
+$table_description .= html_print_textarea(
     'comentarios',
+    3,
+    10,
     $comentarios,
     '',
-    45,
+    true,
-    200,
+    'agent_description'
-    true
 ).'</div>';
 
-
+// QR code.
 echo '<div class="first_row">
-        <div class="agent_options '.$agent_options_update.' white_box">
+        <div class="box-shadow agent_options '.$agent_options_update.' white_box">
             <div class="agent_options_column_left">'.$table_agent_name.$table_alias.$table_ip.$table_primary_group.'</div>
             <div class="agent_options_column_right">'.$table_interval.$table_os.$table_server.$table_description.'</div>
         </div>';
@@ -368,49 +413,49 @@ echo '</div>';
 
 if (enterprise_installed()) {
     $secondary_groups_selected = enterprise_hook('agents_get_secondary_groups', [$id_agente]);
-    $table_adv_secondary_groups = '<div class="label_select"><p class="input_label">'.__('Secondary groups').': '.ui_print_help_icon('secondary_groups', true).'</p></div>';
+    $adv_secondary_groups_label = '<div class="label_select"><p class="input_label">'.__('Secondary groups').': </p></div>';
-    $table_adv_secondary_groups_left = html_print_select_groups(
+    $adv_secondary_groups_left = html_print_select_groups(
         false,
-        // Use the current user to select the groups
+        // Use the current user to select the groups.
         'AR',
-        // ACL permission
+        // ACL permission.
         false,
-        // Not all group
+        // Not all group.
         'secondary_groups',
-        // HTML id
+        // HTML id.
         '',
-        // No select any by default
+        // No select any by default.
         '',
-        // Javascript onChange code
+        // Javascript onChange code.
         '',
-        // Do not user no selected value
+        // Do not user no selected value.
         0,
-        // Do not use no selected value
+        // Do not use no selected value.
         true,
-        // Return HTML (not echo)
+        // Return HTML (not echo).
         true,
-        // Multiple selection
+        // Multiple selection.
         true,
-        // Sorting by default
+        // Sorting by default.
         '',
-        // CSS classnames (default)
+        // CSS classnames (default).
         false,
-        // Not disabled (default)
+        // Not disabled (default).
-        'width:50%; min-width:170px; text-align:center',
+        'min-width:170px;',
-        // Inline styles (default)
+        // Inline styles (default).
         false,
-        // Option style select (default)
+        // Option style select (default).
         false,
-        // Do not truncate the users tree (default)
+        // Do not truncate the users tree (default).
         'id_grupo',
-        // Key to get as value (default)
+        // Key to get as value (default).
         false,
-        // Not strict user (default)
+        // Not strict user (default).
         $secondary_groups_selected['plain']
-        // Do not show the primary group in this selection
+        // Do not show the primary group in this selection.
     );
 
-    $table_adv_secondary_groups_arrows = html_print_input_image(
+    $adv_secondary_groups_arrows = html_print_input_image(
         'add_secondary',
         'images/darrowright_green.png',
         1,
@@ -434,34 +479,34 @@ if (enterprise_installed()) {
         ]
     );
 
-    $table_adv_secondary_groups_right .= html_print_select(
+    $adv_secondary_groups_right .= html_print_select(
         $secondary_groups_selected['for_select'],
-        // Values
+        // Values.
         'secondary_groups_selected',
-        // HTML id
+        // HTML id.
         '',
-        // Selected
+        // Selected.
         '',
-        // Javascript onChange code
+        // Javascript onChange code.
         '',
-        // Nothing selected
+        // Nothing selected.
         0,
-        // Nothing selected
+        // Nothing selected.
         true,
-        // Return HTML (not echo)
+        // Return HTML (not echo).
         true,
-        // Multiple selection
+        // Multiple selection.
         true,
-        // Sort
+        // Sort.
         '',
-        // Class
+        // Class.
         false,
-        // Disabled
+        // Disabled.
-        'width:50%; min-width:170px; text-align:center'
+        'min-width:170px;'
-        // Style
+        // Style.
     );
 
-    // safe operation mode
+    // Safe operation mode.
     if ($id_agente) {
         $sql_modules = db_get_all_rows_sql(
             'SELECT id_agente_modulo as id_module, nombre as name FROM tagente_modulo 
@@ -485,13 +530,13 @@ if (enterprise_installed()) {
         $table_adv_safe .= __('Module').'&nbsp;'.html_print_select($safe_mode_modules, 'safe_mode_module', $safe_mode_module, '', '', 0, true).'</div>';
     }
 
-    // Remote configuration
+    // Remote configuration.
     $table_adv_remote = '<div class="label_select"><p class="input_label">'.__('Remote configuration').': </p>';
 
     if (!$new_agent && isset($filename) && file_exists($filename['md5'])) {
         $table_adv_remote .= date('F d Y H:i:s', fileatime($filename['md5']));
-        // Delete remote configuration
+        // Delete remote configuration.
-        $table_adv_remote .= '<a href="index.php?'.'sec=gagente&amp;'.'sec2=godmode/agentes/configurar_agente&amp;'.'tab=main&amp;'.'disk_conf_delete=1&amp;'.'id_agente='.$id_agente.'">';
+        $table_adv_remote .= '<a href="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=main&disk_conf_delete=1&id_agente='.$id_agente.'">';
         $table_adv_remote .= html_print_image(
             'images/cross.png',
             true,
@@ -510,28 +555,31 @@ if (enterprise_installed()) {
 
     $table_adv_remote .= '</div>';
 
-    $cps_array[-1] = __('Disabled');
-    if ($cps > 0) {
-        $cps_array[$cps] = __('Enabled');
-    } else {
-        $cps_inc = 0;
-        if ($id_agente) {
-            $cps_inc = service_agents_cps($id_agente);
-        }
 
-        $cps_array[$cps_inc] = __('Enabled');
+    // Calculate cps value - agents.
+    if ($id_agente) {
+        $cps_val = service_agents_cps($id_agente);
+    } else {
+        // No agent defined, use received cps as base value.
+        if ($cps >= 0) {
+            $cps_val = $cps;
+        }
     }
 
-    $table_adv_cascade = '<div class="label_select"><p class="input_label">'.__('Cascade protection services').': ';
+    $cps_html = '<div class="label_select"><div class="label_simple_items">';
-    $table_adv_cascade .= ui_print_help_tip(__('Disable the alerts and events of the elements that belong to this service'), true).'</p>';
+    $cps_html .= html_print_checkbox_switch('cps', $cps_val, ($cps >= 0), true);
-    $table_adv_cascade .= html_print_select($cps_array, 'cps', $cps, '', '', 0, true).'</div>';
+    $cps_html .= __('Cascade protection services').'&nbsp;';
+    $cps_html .= ui_print_help_tip(
+        __('Alerts and events will be managed by the service joined by this agent.'),
+        true
+    );
+    $cps_html .= '</div></div>';
+
+    $table_adv_cascade .= $cps_html;
 }
 
-// Custom ID
-$table_adv_custom_id = '<div class="label_select"><p class="input_label">'.__('Custom ID').': </p>';
-$table_adv_custom_id .= html_print_input_text('custom_id', $custom_id, '', 16, 255, true).'</div>';
 
-$table_adv_parent = '<div class="label_select"><p class="input_label">'.__('Parent').': </p>';
+$table_adv_parent = '<div class="label_select"><label class="input_label">'.__('Parent').': </label>';
 $params = [];
 $params['return'] = true;
 $params['show_helptip'] = true;
@@ -546,13 +594,26 @@ $params['cascade_protection'] = true;
 $table_adv_parent .= '<div class="label_simple_items">';
 $table_adv_parent .= ui_print_agent_autocomplete_input($params);
 if (enterprise_installed()) {
-    $table_adv_parent .= html_print_checkbox_switch('cascade_protection', 1, $cascade_protection, true).__('Cascade protection').'&nbsp;'.ui_print_help_icon('cascade_protection', true);
+    $table_adv_parent .= html_print_checkbox_switch(
+        'cascade_protection',
+        1,
+        $cascade_protection,
+        true
+    ).__('Cascade protection').'&nbsp;';
 }
 
-$table_adv_parent .= __('Module').'&nbsp;'.html_print_select($modules_values, 'cascade_protection_module', $cascade_protection_module, '', '', 0, true).'</div></div>';
+$table_adv_parent .= __('Module').'&nbsp;'.html_print_select(
+    $modules_values,
+    'cascade_protection_module',
+    $cascade_protection_module,
+    '',
+    '',
+    0,
+    true
+).'</div></div>';
 
-// Learn mode / Normal mode
+// Learn mode / Normal mode.
-$table_adv_module_mode = '<div class="label_select"><p class="input_label">'.__('Module definition').': '.ui_print_help_icon('module_definition', true).'</p>';
+$table_adv_module_mode = '<div class="label_select"><p class="input_label">'.__('Module definition').': </p>';
 $table_adv_module_mode .= '<div class="switch_radio_button">';
 $table_adv_module_mode .= html_print_radio_button_extended(
     'modo',
@@ -586,9 +647,16 @@ $table_adv_module_mode .= html_print_radio_button_extended(
 );
 $table_adv_module_mode .= '</div></div>';
 
-// Status (Disabled / Enabled)
+// Status (Disabled / Enabled).
-$table_adv_status = '<div class="label_select_simple label_simple_one_item"><p class="input_label input_label_simple">'.__('Disabled').': '.ui_print_help_tip(__('If the remote configuration is enabled, it will also go into standby mode when disabling it.'), true).'</p>';
+$table_adv_status = '<div class="label_select_simple label_simple_one_item">';
-$table_adv_status .= html_print_checkbox_switch('disabled', 1, $disabled, true).'</div>';
+$table_adv_status .= html_print_checkbox_switch(
+    'disabled',
+    1,
+    $disabled,
+    true
+);
+$table_adv_status .= '<p class="input_label input_label_simple">'.__('Disabled').': '.ui_print_help_tip(__('If the remote configuration is enabled, it will also go into standby mode when disabling it.'), true).'</p>';
+$table_adv_status .= '</div>';
 
 // Url address.
 if (enterprise_installed()) {
@@ -599,7 +667,14 @@ if (enterprise_installed()) {
         '',
         45,
         255,
-        true
+        true,
+        false,
+        false,
+        '',
+        '',
+        '',
+        // Autocomplete.
+        'new-password'
     ).'</div>';
 } else {
     $table_adv_url = '<div class="label_select"><p class="input_label">'.__('Url address').': </p></div>';
@@ -613,9 +688,11 @@ if (enterprise_installed()) {
     ).'</div>';
 }
 
-$table_adv_quiet = '<div class="label_select_simple label_simple_one_item"><p class="input_label input_label_simple">'.__('Quiet').': ';
+$table_adv_quiet = '<div class="label_select_simple label_simple_one_item">';
+$table_adv_quiet .= html_print_checkbox_switch('quiet', 1, $quiet, true);
+$table_adv_quiet .= '<p class="input_label input_label_simple">'.__('Quiet').': ';
 $table_adv_quiet .= ui_print_help_tip(__('The agent still runs but the alerts and events will be stop'), true).'</p>';
-$table_adv_quiet .= html_print_checkbox_switch('quiet', 1, $quiet, true).'</div>';
+$table_adv_quiet .= '</div>';
 
 $listIcons = gis_get_array_list_icons();
 
@@ -625,11 +702,11 @@ foreach ($listIcons as $index => $value) {
 }
 
 $path = 'images/gis_map/icons/';
-// TODO set better method the path
+// TODO set better method the path.
 $table_adv_agent_icon = '<div class="label_select"><p class="input_label">'.__('Agent icon').': '.ui_print_help_tip(__('Agent icon for GIS Maps.'), true).'</p>';
 if ($icon_path == '') {
     $display_icons = 'none';
-    // Hack to show no icon. Use any given image to fix not found image errors
+    // Hack to show no icon. Use any given image to fix not found image errors.
     $path_without = 'images/spinner.png';
     $path_default = 'images/spinner.png';
     $path_ok = 'images/spinner.png';
@@ -686,24 +763,47 @@ if ($config['activate_gis']) {
 
 
 
-$table_adv_options = $table_adv_secondary_groups.'<div class="secondary_groups_select" style="margin-bottom:30px;">
+// General display distribution.
-        <div class="secondary_groups_list_left">
+$table_adv_options = '
-            '.$table_adv_secondary_groups_left.'
+        <div class="secondary_groups_list">
+           '.$adv_secondary_groups_label.'
+            <div class="sg_source">
+                '.$adv_secondary_groups_left.'
+            </div>
+            <div class="secondary_group_arrows">
+                '.$adv_secondary_groups_arrows.'
+            </div>
+            <div class="sg_target">      
+                '.$adv_secondary_groups_right.'
+            </div>
         </div>
-        <div class="secondary_groups_select_arrows">
+<div class="adv_right" >
-            '.$table_adv_secondary_groups_arrows.'
+        '.$table_adv_parent.$table_adv_module_mode.$table_adv_cascade;
-        </div>    
+
-        <div class="secondary_groups_list_right">      
+if ($new_agent) {
-            '.$table_adv_secondary_groups_right.'
+    // If agent is new, show custom id as old style format.
-        </div>
+    $table_adv_options .= $custom_id_div;
-    </div>
+}
-    <div class="agent_options agent_options_adv">
+
-        <div class="agent_options_column_left" >'.$table_adv_parent.$table_adv_custom_id.$table_adv_module_mode.$table_adv_cascade.$table_adv_gis.'</div>
+$table_adv_options .= '</div>';
-        <div class="agent_options_column_right" >'.$table_adv_agent_icon.$table_adv_url.$table_adv_quiet.$table_adv_status.$table_adv_remote.$table_adv_safe.'</div>
+
-    </div>';
+$table_adv_options .= '
+        <div class="adv_left" >
+        '.$table_adv_gis.$table_adv_agent_icon.$table_adv_url.$table_adv_quiet.$table_adv_status.$table_adv_remote.$table_adv_safe.'
+        </div>';
+
 
 echo '<div class="ui_toggle">';
-        ui_toggle($table_adv_options, __('Advanced options'), '', true, false, 'white_box white_box_opened');
+ui_toggle(
+    $table_adv_options,
+    __('Advanced options'),
+    '',
+    '',
+    true,
+    false,
+    'white_box white_box_opened',
+    'no-border flex'
+);
 echo '</div>';
 
 
@@ -711,10 +811,17 @@ $table = new stdClass();
 $table->width = '100%';
 $table->class = 'custom_fields_table';
 
-$table->head = [];
+$table->head = [
+    0 => __('Click to display').ui_print_help_tip(
+        __('This field allows url insertion using the BBCode\'s url tag').'.<br />'.__('The format is: [url=\'url to navigate\']\'text to show\'[/url]').'.<br /><br />'.__('e.g.: [url=google.com]Google web search[/url]'),
+        true
+    ),
+];
+$table->class = 'info_table';
 $table->style = [];
 $table->style[0] = 'font-weight: bold;';
 $table->data = [];
+$table->rowstyle = [];
 
 $fields = db_get_all_fields_in_table('tagent_custom_fields');
 
@@ -722,15 +829,12 @@ if ($fields === false) {
     $fields = [];
 }
 
+$i = 0;
 foreach ($fields as $field) {
     $id_custom_field = $field['id_field'];
 
     $data[0] = '<div class="field_title" onclick="show_custom_field_row('.$id_custom_field.')">';
     $data[0] .= '<b>'.$field['name'].'</b>';
-    $data[0] .= ui_print_help_tip(
-        __('This field allows url insertion using the BBCode\'s url tag').'.<br />'.__('The format is: [url=\'url to navigate\']\'text to show\'[/url]').'.<br /><br />'.__('e.g.: [url=google.com]Google web search[/url]'),
-        true
-    );
     $data[0] .= '</div>';
     $combo = [];
     $combo = $field['combo_values'];
@@ -753,6 +857,13 @@ foreach ($fields as $field) {
         $custom_value = '';
     }
 
+    $table->rowstyle[$i] = 'cursor: pointer;user-select: none;';
+    if (!empty($custom_value)) {
+        $table->rowstyle[($i + 1)] = 'display: table-row;';
+    } else {
+        $table->rowstyle[($i + 1)] = 'display: none;';
+    }
+
     if ($field['is_password_type']) {
         $data_field[1] = html_print_input_text_extended(
             'customvalue_'.$field['id_field'],
@@ -801,21 +912,30 @@ foreach ($fields as $field) {
     };
 
     $table->rowid[] = 'name_field-'.$id_custom_field;
-    array_push($table->data, $data);
+    $table->data[] = $data;
 
     $table->rowid[] = 'field-'.$id_custom_field;
-    array_push($table->data, $data_field);
+    $table->data[] = $data_field;
+    $i += 2;
 }
 
 if (!empty($fields)) {
     echo '<div class="ui_toggle">';
-            ui_toggle(html_print_table($table, true), __('Custom fields'), '', true, false, 'white_box white_box_opened');
+    ui_toggle(
+        html_print_table($table, true),
+        __('Custom fields'),
+        '',
+        '',
+        true,
+        false,
+        'white_box white_box_opened',
+        'no-border'
+    );
     echo '</div>';
 }
 
 echo '<div class="action-buttons" style="display: flex; justify-content: flex-end; align-items: center; width: '.$table->width.'">';
 
-
 // The context help about the learning mode.
 if ($modo == 0) {
     echo "<span id='modules_not_learning_mode_context_help' style='padding-right:8px;'>";

pandora_console/godmode/agentes/agent_wizard.snmp_interfaces_explorer.php

@@ -322,7 +322,7 @@ if ($create_modules) {
                     } else if (preg_match('/ifAdminStatus/', $name_array[1])) {
                         $module_type = 2;
                     } else if (preg_match('/ifOperStatus/', $name_array[1])) {
-                        $module_type = 18;
+                        $module_type = 2;
                     } else {
                         $module_type = 4;
                     }
@@ -608,11 +608,11 @@ ui_require_jquery_file('bgiframe');
 
 $(document).ready (function () {
     var inputActive = true;
-    
+
     $(document).data('text_for_module', $("#none_text").html());
-    
+
     $("#id_snmp").change(snmp_changed_by_multiple_snmp);
-    
+
     $("#snmp_version").change(function () {
         if (this.value == "3") {
             $("#snmp3_options").css("display", "");
@@ -621,7 +621,7 @@ $(document).ready (function () {
             $("#snmp3_options").css("display", "none");
         }
     });
-    
+
     $("#walk_form").submit(function() {
         $("#submit-snmp_walk").disable ();
         $("#oid_loading").show ();
@@ -632,15 +632,15 @@ $(document).ready (function () {
 
 function snmp_changed_by_multiple_snmp (event, id_snmp, selected) {
     var idSNMP = Array();
-    
+
     jQuery.each ($("#id_snmp option:selected"), function (i, val) {
         idSNMP.push($(val).val());
     });
     $('#module').attr ('disabled', 1);
     $('#module').empty ();
     $('#module').append ($('<option></option>').html ("Loading...").attr ("value", 0));
-    
+
-    jQuery.post ('ajax.php', 
+    jQuery.post ('ajax.php',
         {"page" : "godmode/agentes/agent_manager",
             "get_modules_json_for_multiple_snmp": 1,
             "id_snmp[]": idSNMP,
@@ -655,7 +655,7 @@ function snmp_changed_by_multiple_snmp (event, id_snmp, selected) {
                 $('#module').fadeIn ('normal');
                 c++;
                 });
-            
+
             if (c == 0) {
                 if (typeof($(document).data('text_for_module')) != 'undefined') {
                     $('#module').append ($('<option></option>').html ($(document).data('text_for_module')).attr("value", 0).prop('selected', true));
@@ -666,11 +666,11 @@ function snmp_changed_by_multiple_snmp (event, id_snmp, selected) {
                     }
                     else {
                         var anyText = $("#any_text").html(); //Trick for catch the translate text.
-                        
+
                         if (anyText == null) {
                             anyText = 'Any';
                         }
-                        
+
                         $('#module').append ($('<option></option>').html (anyText).attr ("value", 0).prop('selected', true));
                     }
                 }
@@ -684,4 +684,3 @@ function snmp_changed_by_multiple_snmp (event, id_snmp, selected) {
 
 /* ]]> */
 </script>
-

pandora_console/godmode/agentes/configurar_agente.php

@@ -1,17 +1,32 @@
 <?php
+/**
+ * Configure agents.
+ *
+ * @category   Agents view - management.
+ * @package    Pandora FMS
+ * @subpackage User interface.
+ * @version    1.0.0
+ * @license    See below
+ *
+ *    ______                 ___                    _______ _______ ________
+ *   |   __ \.-----.--.--.--|  |.-----.----.-----. |    ___|   |   |     __|
+ *  |    __/|  _  |     |  _  ||  _  |   _|  _  | |    ___|       |__     |
+ * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
+ *
+ * ============================================================================
+ * Copyright (c) 2005-2019 Artica Soluciones Tecnologicas
+ * Please see http://pandorafms.org for full contribution list
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation for version 2.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * ============================================================================
+ */
 
-// Pandora FMS - http://pandorafms.com
+// Begin.
-// ==================================================
-// Copyright (c) 2005-2010 Artica Soluciones Tecnologicas
-// Please see http://pandorafms.org for full contribution list
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation for version 2.
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// Load global vars.
 global $config;
 
 enterprise_include('godmode/agentes/configurar_agente.php');
@@ -20,6 +35,7 @@ enterprise_include_once('include/functions_modules.php');
 require_once $config['homedir'].'/include/functions_agents.php';
 require_once $config['homedir'].'/include/functions_cron.php';
 ui_require_javascript_file('encode_decode_base64');
+ui_require_css_file('agent_manager');
 
 check_login();
 
@@ -194,7 +210,7 @@ if ($create_agent) {
     $update_gis_data = (int) get_parameter_post('update_gis_data', 0);
     $url_description = (string) get_parameter('url_description');
     $quiet = (int) get_parameter('quiet', 0);
-    $cps = (int) get_parameter('cps', 0);
+    $cps = (int) get_parameter_switch('cps', -1);
 
     $secondary_groups = (string) get_parameter('secondary_hidden', '');
     $fields = db_get_all_fields_in_table('tagent_custom_fields');
@@ -325,7 +341,7 @@ if ($create_agent) {
             $unsafe_alias = io_safe_output($alias);
             db_pandora_audit(
                 'Agent management',
-                "Created agent $unsafe_alias",
+                'Created agent '.$unsafe_alias,
                 false,
                 true,
                 $info
@@ -489,7 +505,7 @@ if ($id_agente) {
             $agent_name = io_safe_output($agent_name);
             $agent_md5 = md5($agent_name, false);
 
-            $remote_configuration_tab['text'] = '<a href="index.php?'.'sec=gagente&amp;'.'sec2=godmode/agentes/configurar_agente&amp;'.'tab=remote_configuration&amp;'.'id_agente='.$id_agente.'&amp;'.'disk_conf='.$agent_md5.'">'.html_print_image(
+            $remote_configuration_tab['text'] = '<a href="index.php?sec=gagente&amp;sec2=godmode/agentes/configurar_agente&amp;tab=remote_configuration&amp;id_agente='.$id_agente.'&amp;disk_conf='.$agent_md5.'">'.html_print_image(
                 'images/remote_configuration.png',
                 true,
                 ['title' => __('Remote configuration')]
@@ -575,20 +591,24 @@ if ($id_agente) {
     }
 
     $help_header = '';
+    $tab_name = '';
     // This add information to the header.
     switch ($tab) {
         case 'main':
             $tab_description = '- '.__('Setup');
             $help_header = 'main_tab';
+            $tab_name = 'Setup';
         break;
 
         case 'collection':
             $tab_description = '- '.__('Collection');
+            $tab_name = 'Collection';
         break;
 
         case 'inventory':
             $tab_description = '- '.__('Inventory');
             $help_header = 'inventory_tab';
+            $tab_name = 'Inventory';
         break;
 
         case 'plugins':
@@ -599,6 +619,7 @@ if ($id_agente) {
         case 'module':
             $type_module_t = get_parameter('moduletype', '');
             $tab_description = '- '.__('Modules');
+            $tab_name = 'Modules';
             if ($type_module_t == 'webux') {
                 $help_header = 'wux_console';
             } else {
@@ -609,10 +630,12 @@ if ($id_agente) {
         case 'alert':
             $tab_description = '- '.__('Alert');
             $help_header = 'manage_alert_list';
+            $tab_name = 'Alerts';
         break;
 
         case 'template':
             $tab_description = '- '.__('Templates');
+            $tab_name = 'Module templates';
         break;
 
         case 'gis':
@@ -633,16 +656,19 @@ if ($id_agente) {
                 case 'snmp_explorer':
                     $tab_description = '- '.__('SNMP Wizard');
                     $help_header = 'agent_snmp_explorer_tab';
+                    $tab_name = 'SNMP Wizard';
                 break;
 
                 case 'snmp_interfaces_explorer':
                     $tab_description = '- '.__('SNMP Interfaces wizard');
                     $help_header = 'agent_snmp_interfaces_explorer_tab';
+                    $tab_name = 'SNMP Interfaces wizard';
                 break;
 
                 case 'wmi_explorer':
                     $tab_description = '- '.__('WMI Wizard');
                     $help_header = 'agent_snmp_wmi_explorer_tab';
+                    $tab_name = 'WMI Wizard';
                 break;
 
                 default:
@@ -679,7 +705,15 @@ if ($id_agente) {
         $onheader,
         false,
         '',
-        $config['item_title_size_text']
+        $config['item_title_size_text'],
+        '',
+        ui_print_breadcrums(
+            [
+                __('Resources'),
+                __('Manage agents'),
+                '<span class="breadcrumb_active">'.$tab_name.'</span>',
+            ]
+        )
     );
 } else {
     // Create agent.
@@ -688,7 +722,19 @@ if ($id_agente) {
         'images/bricks.png',
         false,
         'create_agent',
-        true
+        true,
+        '',
+        false,
+        '',
+        GENERIC_SIZE_TEXT,
+        '',
+        ui_print_breadcrums(
+            [
+                __('Resources'),
+                __('Manage agents'),
+                '<span class="breadcrumb_active">'.__('Create agent').'</span>',
+            ]
+        )
     );
 }
 
@@ -829,8 +875,7 @@ if ($update_agent) {
     $update_gis_data = (int) get_parameter_post('update_gis_data', 0);
     $url_description = (string) get_parameter('url_description');
     $quiet = (int) get_parameter('quiet', 0);
-    $cps = (int) get_parameter('cps', 0);
+    $cps = get_parameter_switch('cps', -1);
-
     $old_values = db_get_row('tagente', 'id_agente', $id_agente);
     $fields = db_get_all_fields_in_table('tagent_custom_fields');
 
@@ -978,7 +1023,7 @@ if ($update_agent) {
                     [
                         $id_agente,
                         'standby',
-                        $disabled ? '1' : '0',
+                        ($disabled) ? '1' : '0',
                     ]
                 );
                 // Validate alerts for disabled agents.
@@ -1064,7 +1109,7 @@ if ($update_agent) {
             ui_print_success_message(__('Successfully updated'));
             db_pandora_audit(
                 'Agent management',
-                "Updated agent $alias",
+                'Updated agent '.$alias,
                 false,
                 false,
                 $info
@@ -1206,7 +1251,7 @@ if ($update_module || $create_module) {
     }
 
     if ($id_module_type == 25) {
-        // web analysis, from MODULE_WUX.
+        // Web analysis, from MODULE_WUX.
         $custom_string_1 = base64_encode((string) get_parameter('custom_string_1', $custom_string_1_default));
         $custom_integer_1 = (int) get_parameter('custom_integer_1', $custom_integer_1_default);
     } else {
@@ -1220,6 +1265,7 @@ if ($update_module || $create_module) {
 
     // Get macros.
     $macros = (string) get_parameter('macros');
+    $macros_names = (array) get_parameter('macro_name', []);
 
     if (!empty($macros)) {
         $macros = json_decode(base64_decode($macros), true);
@@ -1230,10 +1276,18 @@ if ($update_module || $create_module) {
                 $m_hide = $m['hide'];
             }
 
-            if ($m_hide == '1') {
+            if ($update_module) {
-                $macros[$k]['value'] = io_input_password(get_parameter($m['macro'], ''));
+                if ($m_hide == '1') {
+                    $macros[$k]['value'] = io_input_password(get_parameter($m['macro'], ''));
+                } else {
+                    $macros[$k]['value'] = get_parameter($m['macro'], '');
+                }
             } else {
-                $macros[$k]['value'] = get_parameter($m['macro'], '');
+                if ($m_hide == '1') {
+                    $macros[$k]['value'] = io_input_password($macros_names[$k]);
+                } else {
+                    $macros[$k]['value'] = $macros_names[$k];
+                }
             }
         }
 
@@ -1243,12 +1297,11 @@ if ($update_module || $create_module) {
 
         foreach ($conf_array as $line) {
             if (preg_match('/^module_name\s*(.*)/', $line, $match)) {
-                $new_configuration_data .= 'module_name '.io_safe_output($name)."\n";
+                $new_configuration_data .= 'module_name ';
-            }
+                $new_configuration_data .= io_safe_output($name)."\n";
-
+            } else if (!preg_match('/^module_macro_field.*/', $line, $match)) {
-            // We delete from conf all the module macros starting with _field.
+                // We delete from conf all the module macros starting with _field.
-            else if (!preg_match('/^module_macro_field.*/', $line, $match)) {
+                $new_configuration_data .= $line."\n";
-                $new_configuration_data .= "$line\n";
             }
         }
 
@@ -1410,9 +1463,13 @@ if ($update_module || $create_module) {
     }
 
     $active_snmp_v3 = get_parameter('active_snmp_v3');
-    if ($active_snmp_v3) {
+
-        // LOST CODE?
+    /*
-    }
+     * if ($active_snmp_v3) {
+     *     // LOST CODE?.
+     *
+     * }
+     */
 
     $throw_unknown_events = (bool) get_parameter('throw_unknown_events', false);
     // Set the event type that can show.
@@ -1428,32 +1485,11 @@ if ($update_module || $create_module) {
 
     $module_in_policy = enterprise_hook('policies_is_module_in_policy', [$id_agent_module]);
     $module_linked = enterprise_hook('policies_is_module_linked', [$id_agent_module]);
-
-    if ((!$module_in_policy && !$module_linked && $update_module)
-        || ( $module_in_policy && !$module_linked && $update_module)
-    ) {
-        enterprise_hook(
-            'config_agents_update_module_in_conf',
-            [
-                $id_agente,
-                io_safe_output($old_configuration_data),
-                io_safe_output($configuration_data),
-                $disabled,
-            ]
-        );
-    } else {
-        enterprise_hook(
-            'config_agents_write_module_in_conf',
-            [
-                $id_agente,
-                io_safe_output($old_configuration_data),
-                io_safe_output($configuration_data),
-                $disabled,
-            ]
-        );
-    }
 }
 
+// Initialize result of the action (insert or update).
+$success_action = NOERR;
+
 // MODULE UPDATE.
 if ($update_module) {
     $id_agent_module = (int) get_parameter('id_agent_module');
@@ -1589,6 +1625,8 @@ if ($update_module) {
             break;
         }
 
+        // I save the result of the action (insert or update).
+        $success_action = $result;
         $result = false;
         ui_print_error_message($msg);
 
@@ -1596,7 +1634,7 @@ if ($update_module) {
 
         db_pandora_audit(
             'Agent management',
-            "Fail to try update module '$name' for agent ".$agent['alias']
+            "Fail to try update module '".$name."' for agent ".$agent['alias']
         );
     } else {
         if ($prediction_module == 3) {
@@ -1620,7 +1658,7 @@ if ($update_module) {
 
         db_pandora_audit(
             'Agent management',
-            "Updated module '$name' for agent ".$agent['alias'],
+            "Updated module '".$name."' for agent ".$agent['alias'],
             false,
             false,
             io_json_mb_encode($values)
@@ -1630,6 +1668,9 @@ if ($update_module) {
 
 // MODULE INSERT.
 if ($create_module) {
+    // Old configuration data must always be empty in case of creation.
+    $old_configuration_data = '';
+
     if (isset($_POST['combo_snmp_oid'])) {
         $combo_snmp_oid = get_parameter_post('combo_snmp_oid');
     }
@@ -1639,12 +1680,6 @@ if ($create_module) {
     }
 
     $id_module = (int) get_parameter('id_module');
-    // Commented because can't create prediction modules
-    /*
-        if ($id_module == 5) {
-        $prediction_module = 1;
-        }
-    */
 
     switch ($config['dbtype']) {
         case 'oracle':
@@ -1768,17 +1803,26 @@ if ($create_module) {
             break;
         }
 
+        // I save the result of the action (insert or update).
+        $success_action = $id_agent_module;
+
         $id_agent_module = false;
         ui_print_error_message($msg);
         $edit_module = true;
         $moduletype = $id_module;
         db_pandora_audit(
             'Agent management',
-            "Fail to try added module '$name' for agent ".$agent['alias']
+            "Fail to try added module '".$name."' for agent ".$agent['alias']
         );
     } else {
         if ($prediction_module == 3) {
-            enterprise_hook('modules_create_synthetic_operations', [$id_agent_module, $serialize_ops]);
+            enterprise_hook(
+                'modules_create_synthetic_operations',
+                [
+                    $id_agent_module,
+                    $serialize_ops,
+                ]
+            );
         }
 
         // Update the module interval.
@@ -1793,7 +1837,7 @@ if ($create_module) {
         $agent = db_get_row('tagente', 'id_agente', $id_agente);
         db_pandora_audit(
             'Agent management',
-            "Added module '$name' for agent ".$agent['alias'],
+            "Added module '".$name."' for agent ".$agent['alias'],
             false,
             true,
             io_json_mb_encode($values)
@@ -1801,6 +1845,112 @@ if ($create_module) {
     }
 }
 
+// MODULE ENABLE/DISABLE
+// =====================.
+if ($enable_module) {
+    $result = modules_change_disabled($enable_module, 0);
+    $module_name = modules_get_agentmodule_name($enable_module);
+
+    // Write for conf disable if remote_config.
+    $configuration_data = enterprise_hook(
+        'config_agents_get_module_from_conf',
+        [
+            $id_agente,
+            io_safe_output($module_name),
+        ]
+    );
+    // Force disable.
+    $disabled = 0;
+
+    // Force Update when disabled for save disabled in conf.
+    $old_configuration_data = $configuration_data;
+
+    // Successfull action.
+    $success_action = $result;
+
+    $success_action = $result;
+    if ($result === NOERR) {
+        db_pandora_audit(
+            'Module management',
+            'Enable #'.$enable_module.' | '.$module_name.' | '.$agent['alias']
+        );
+    } else {
+        db_pandora_audit(
+            'Module management',
+            'Fail to enable #'.$enable_module.' | '.$module_name.' | '.$agent['alias']
+        );
+    }
+
+    ui_print_result_message(
+        $result,
+        __('Successfully enabled'),
+        __('Could not be enabled')
+    );
+}
+
+if ($disable_module) {
+    $result = modules_change_disabled($disable_module, 1);
+    $module_name = modules_get_agentmodule_name($disable_module);
+
+    // Write for conf disable if remote_config.
+    $configuration_data = enterprise_hook(
+        'config_agents_get_module_from_conf',
+        [
+            $id_agente,
+            io_safe_output($module_name),
+        ]
+    );
+    // Force disable.
+    $disabled = 1;
+
+    // Force Update when disabled for save disabled in conf.
+    $old_configuration_data = $configuration_data;
+
+    // Successfull action.
+    $success_action = $result;
+
+
+    if ($result === NOERR) {
+        db_pandora_audit(
+            'Module management',
+            'Disable #'.$disable_module.' | '.$module_name.' | '.$agent['alias']
+        );
+    } else {
+        db_pandora_audit(
+            'Module management',
+            'Fail to disable #'.$disable_module.' | '.$module_name.' | '.$agent['alias']
+        );
+    }
+
+    ui_print_result_message(
+        $result,
+        __('Successfully disabled'),
+        __('Could not be disabled')
+    );
+}
+
+// Fix to stop the module from being added to the agent's conf
+// when an error occurred while updating or inserting. or enable disable module.
+if ($update_module || $create_module
+    || $enable_module || $disable_module
+) {
+    if ((!$module_in_policy && !$module_linked)
+        || ($module_in_policy && !$module_linked)
+    ) {
+        if ($success_action > 0) {
+            enterprise_hook(
+                'config_agents_write_module_in_conf',
+                [
+                    $id_agente,
+                    io_safe_output($old_configuration_data),
+                    io_safe_output($configuration_data),
+                    $disabled,
+                ]
+            );
+        }
+    }
+}
+
 // MODULE DELETION
 // =================.
 if ($delete_module) {
@@ -2000,46 +2150,6 @@ if (!empty($duplicate_module)) {
     }
 }
 
-// MODULE ENABLE/DISABLE
-// =====================.
-if ($enable_module) {
-    $result = modules_change_disabled($enable_module, 0);
-    $modulo_nombre = db_get_row_sql('SELECT nombre FROM tagente_modulo WHERE id_agente_modulo = '.$enable_module.'');
-    $modulo_nombre = $modulo_nombre['nombre'];
-
-    if ($result === NOERR) {
-        enterprise_hook('config_agents_enable_module_conf', [$id_agente, $enable_module]);
-        db_pandora_audit('Module management', 'Enable #'.$enable_module.' | '.$modulo_nombre.' | '.$agent['alias']);
-    } else {
-        db_pandora_audit('Module management', 'Fail to enable #'.$enable_module.' | '.$modulo_nombre.' | '.$agent['alias']);
-    }
-
-    ui_print_result_message(
-        $result,
-        __('Successfully enabled'),
-        __('Could not be enabled')
-    );
-}
-
-if ($disable_module) {
-    $result = modules_change_disabled($disable_module, 1);
-    $modulo_nombre = db_get_row_sql('SELECT nombre FROM tagente_modulo WHERE id_agente_modulo = '.$disable_module.'');
-    $modulo_nombre = $modulo_nombre['nombre'];
-
-    if ($result === NOERR) {
-        enterprise_hook('config_agents_disable_module_conf', [$id_agente, $disable_module]);
-        db_pandora_audit('Module management', 'Disable #'.$disable_module.' | '.$modulo_nombre.' | '.$agent['alias']);
-    } else {
-        db_pandora_audit('Module management', 'Fail to disable #'.$disable_module.' | '.$modulo_nombre.' | '.$agent['alias']);
-    }
-
-    ui_print_result_message(
-        $result,
-        __('Successfully disabled'),
-        __('Could not be disabled')
-    );
-}
-
 // UPDATE GIS
 // ==========.
 $updateGIS = get_parameter('update_gis', 0);

pandora_console/godmode/agentes/modificar_agente.php

@@ -118,7 +118,7 @@ if ($enable_agent) {
         enterprise_include_once('include/functions_agents.php');
         $values = ['disabled' => 0];
         enterprise_hook('agent_update_from_cache', [$enable_agent, $values, $server_name]);
-
+        config_agents_update_config_token($enable_agent, 'standby', 0);
         db_pandora_audit('Agent management', 'Enable  '.$alias);
     } else {
         db_pandora_audit('Agent management', 'Fail to enable '.$alias);
@@ -140,6 +140,7 @@ if ($disable_agent) {
         enterprise_include_once('include/functions_agents.php');
         $values = ['disabled' => 1];
         enterprise_hook('agent_update_from_cache', [$disable_agent, $values, $server_name]);
+        config_agents_update_config_token($disable_agent, 'standby', 1);
 
         db_pandora_audit('Agent management', 'Disable  '.$alias);
     } else {

pandora_console/godmode/agentes/module_manager_editor.php

@@ -583,7 +583,13 @@ echo '<h3 id="message" class="error invisible"></h3>';
 // TODO: Change to the ui_print_error system
 echo '<form method="post" id="module_form">';
 
-html_print_table($table_simple);
+ui_toggle(
+    html_print_table($table_simple, true),
+    __('Base options'),
+    '',
+    '',
+    false
+);
 
 ui_toggle(
     html_print_table($table_advanced, true),

pandora_console/godmode/agentes/module_manager_editor_common.php

@@ -81,7 +81,6 @@ function add_component_selection($id_network_component_type)
 
     $data = [];
     $data[0] = __('Using module component').' ';
-    $data[0] .= ui_print_help_icon('network_component', true);
 
     $component_groups = network_components_get_groups($id_network_component_type);
     $data[1] = '<span id="component_group" class="left">';
@@ -163,7 +162,7 @@ $edit_module = (bool) get_parameter_get('edit_module');
 $table_simple = new stdClass();
 $table_simple->id = 'simple';
 $table_simple->width = '100%';
-$table_simple->class = 'databox';
+$table_simple->class = 'no-class';
 $table_simple->data = [];
 $table_simple->style = [];
 $table_simple->style[0] = 'font-weight: bold; width: 25%;';
@@ -384,7 +383,7 @@ if ($disabledBecauseInPolicy) {
     $table_simple->data[2][3] .= html_print_input_hidden('id_module_group', $id_module_group, true);
 }
 
-$table_simple->data[3][0] = __('Dynamic Threshold Interval').' '.ui_print_help_icon('dynamic_threshold', true);
+$table_simple->data[3][0] = __('Dynamic Threshold Interval');
 $table_simple->data[3][1] = html_print_extended_select_for_time('dynamic_interval', $dynamic_interval, '', 'None', '0', 10, true, 'width:150px', false, $classdisabledBecauseInPolicy, $disabledBecauseInPolicy);
 $table_simple->data[3][1] .= '<a onclick=advanced_option_dynamic()>'.html_print_image('images/cog.png', true, ['title' => __('Advanced options Dynamic Threshold')]).'</a>';
 if ($in_policy) {
@@ -424,7 +423,7 @@ $table_simple->data[3][2] .= html_print_input_text(
 $table_simple->data[3][3] = '<span><em>'.__('Dynamic Threshold Two Tailed: ').'</em>';
 $table_simple->data[3][3] .= html_print_checkbox('dynamic_two_tailed', 1, $dynamic_two_tailed, true, $disabledBecauseInPolicy);
 
-$table_simple->data[4][0] = __('Warning status').' '.ui_print_help_icon('warning_status', true);
+$table_simple->data[4][0] = __('Warning status');
 if (!modules_is_string_type($id_module_type) || $edit) {
     $table_simple->data[4][1] .= '<span id="minmax_warning"><em>'.__('Min. ').'</em>';
     $table_simple->data[4][1] .= html_print_input_text(
@@ -477,7 +476,7 @@ if (!modules_is_string_type($id_module_type) || $edit) {
     $table_simple->data[4][2] = '<svg id="svg_dinamic" width="500" height="300"> </svg>';
 }
 
-$table_simple->data[5][0] = __('Critical status').' '.ui_print_help_icon('critical_status', true);
+$table_simple->data[5][0] = __('Critical status');
 if (!modules_is_string_type($id_module_type) || $edit) {
     $table_simple->data[5][1] .= '<span id="minmax_critical"><em>'.__('Min. ').'</em>';
     $table_simple->data[5][1] .= html_print_input_text(
@@ -528,7 +527,6 @@ $table_simple->data[5][1] .= html_print_checkbox('critical_inverse', 1, $critica
 
 // FF stands for Flip-flop.
 $table_simple->data[6][0] = __('FF threshold').' ';
-$table_simple->data[6][0] .= ui_print_help_icon('ff_threshold', true);
 
 $table_simple->data[6][1] .= __('Keep counters');
 $table_simple->data[6][1] .= html_print_checkbox(
@@ -639,7 +637,7 @@ if ($disabledBecauseInPolicy) {
 $table_advanced = new stdClass();
 $table_advanced->id = 'advanced';
 $table_advanced->width = '100%';
-$table_advanced->class = 'databox filters';
+$table_advanced->class = 'no-class';
 $table_advanced->data = [];
 $table_advanced->style = [];
 $table_advanced->style[0] = $table_advanced->style[3] = $table_advanced->style[5] = 'font-weight: bold;';
@@ -703,15 +701,15 @@ if ($moduletype == MODULE_DATA) {
     if (isset($id_agente)) {
         $agent_interval = agents_get_interval($id_agente);
         $interval_factor = ($interval / $agent_interval);
-        $table_advanced->data[2][1] = human_time_description_raw($interval).' ('.sprintf(__('Agent interval x %s'), $interval_factor).') '.ui_print_help_icon('module_interval_factor', true);
+        $table_advanced->data[2][1] = human_time_description_raw($interval).' ('.sprintf(__('Agent interval x %s'), $interval_factor).') ';
     } else {
-        $table_advanced->data[2][1] = sprintf(__('Agent interval x %s'), $interval_factor).ui_print_help_icon('module_interval_factor', true);
+        $table_advanced->data[2][1] = sprintf(__('Agent interval x %s'), $interval_factor);
     }
 
     if ($__code_from == 'policies') {
         // If is the policy form, module_interval will store the factor (not the seconds).
         // So server will transform it to interval in seconds
-        $table_advanced->data[2][1] = sprintf(__('Default').': 1', $interval_factor).ui_print_help_icon('module_interval_factor', true);
+        $table_advanced->data[2][1] = sprintf(__('Default').': 1', $interval_factor);
         $table_advanced->data[2][1] .= html_print_input_hidden('module_interval', $interval_factor, true);
     } else if ($module_id_policy_module != 0) {
         $table_advanced->data[2][1] .= ui_print_help_tip(__('The policy modules of data type will only update their intervals when policy is applied.'), true);
@@ -720,14 +718,14 @@ if ($moduletype == MODULE_DATA) {
     // If it is a non policy form, the module_interval will not provided and will
     // be taken the agent interval (this code is at configurar_agente.php)
 } else {
-    $table_advanced->data[2][0] = __('Interval').ui_print_help_icon('module_interval', true);
+    $table_advanced->data[2][0] = __('Interval');
     $table_advanced->colspan[2][1] = 2;
     $table_advanced->data[2][1] = html_print_extended_select_for_time('module_interval', $interval, '', '', '0', false, true, false, false, $classdisabledBecauseInPolicy, $disabledBecauseInPolicy);
 }
 
 $table_advanced->data[2][1] .= html_print_input_hidden('moduletype', $moduletype, true);
 
-$table_advanced->data[2][3] = __('Post process').' '.ui_print_help_icon('postprocess', true);
+$table_advanced->data[2][3] = __('Post process');
 $table_advanced->data[2][4] = html_print_extended_select_for_post_process(
     'post_process',
     $post_process,
@@ -793,7 +791,7 @@ $table_advanced->data[4][4] = html_print_checkbox(
 );
 $table_advanced->colspan[4][4] = 3;
 
-$table_advanced->data[5][0] = __('FF interval').' '.ui_print_help_icon('ff_interval', true);
+$table_advanced->data[5][0] = __('FF interval');
 $table_advanced->data[5][1] = html_print_input_text(
     'module_ff_interval',
     $ff_interval,
@@ -808,7 +806,7 @@ $table_advanced->data[5][1] = html_print_input_text(
 ).ui_print_help_tip(__('Module execution flip flop time interval (in secs).'), true);
 $table_advanced->colspan[5][1] = 2;
 
-$table_advanced->data[5][3] = __('FF timeout').' '.ui_print_help_icon('ff_timeout', true);
+$table_advanced->data[5][3] = __('FF timeout');
 
 $module_type_name = modules_get_type_name($id_module_type);
 $table_advanced->data[5][4] = '';
@@ -1010,7 +1008,7 @@ $table_advanced->colspan[10][1] = 6;
 if (isset($id_agente) && $moduletype == MODULE_DATA) {
     $has_remote_conf = enterprise_hook('config_agents_has_remote_configuration', [$agent['id_agente']]);
     if ($has_remote_conf) {
-        $table_advanced->data[11][0] = __('Cron from').ui_print_help_icon('cron', true);
+        $table_advanced->data[11][0] = __('Cron from');
         $table_advanced->data[11][1] = html_print_extended_select_for_cron($hour_from, $minute_from, $mday_from, $month_from, $wday_from, true, $disabledBecauseInPolicy);
         $table_advanced->colspan[11][1] = 6;
 
@@ -1018,7 +1016,7 @@ if (isset($id_agente) && $moduletype == MODULE_DATA) {
         $table_advanced->data[12][1] = html_print_extended_select_for_cron($hour_to, $minute_to, $mday_to, $month_to, $wday_to, true, $disabledBecauseInPolicy, true);
         $table_advanced->colspan[12][1] = 6;
     } else {
-        $table_advanced->data[11][0] = __('Cron from').ui_print_help_icon('cron', true);
+        $table_advanced->data[11][0] = __('Cron from');
         $table_advanced->data[11][1] = html_print_extended_select_for_cron($hour_from, $minute_from, $mday_from, $month_from, $wday_from, true, true);
         $table_advanced->colspan[11][1] = 6;
 
@@ -1027,7 +1025,7 @@ if (isset($id_agente) && $moduletype == MODULE_DATA) {
         $table_advanced->colspan[12][1] = 6;
     }
 } else {
-    $table_advanced->data[11][0] = __('Cron from').ui_print_help_icon('cron', true);
+    $table_advanced->data[11][0] = __('Cron from');
     $table_advanced->data[11][1] = html_print_extended_select_for_cron($hour_from, $minute_from, $mday_from, $month_from, $wday_from, true, $disabledBecauseInPolicy);
     $table_advanced->colspan[11][1] = 6;
 
@@ -1068,7 +1066,7 @@ if (check_acl($config['id_user'], 0, 'PM')) {
 $table_macros = new stdClass();
 $table_macros->id = 'module_macros';
 $table_macros->width = '100%';
-$table_macros->class = 'databox filters';
+$table_macros->class = 'no-class';
 $table_macros->data = [];
 $table_macros->style = [];
 $table_macros->style[0] = 'font-weight: bold;';
@@ -1109,7 +1107,7 @@ html_print_input_hidden('module_macro_count', $macro_count);
 $table_new_relations = new stdClass();
 $table_new_relations->id = 'module_new_relations';
 $table_new_relations->width = '100%';
-$table_new_relations->class = 'databox filters';
+$table_new_relations->class = 'no-class';
 $table_new_relations->data = [];
 $table_new_relations->style = [];
 $table_new_relations->style[0] = 'width: 10%; font-weight: bold;';

pandora_console/godmode/agentes/module_manager_editor_network.php

@@ -128,7 +128,7 @@ $snmp_versions['2c'] = 'v. 2c';
 $snmp_versions['3'] = 'v. 3';
 
 $data = [];
-$data[0] = __('SNMP community').ui_print_help_icon('column_macros', true);
+$data[0] = __('SNMP community');
 $adopt = false;
 if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK && isset($id_agent_module)) {
     $adopt = policies_is_module_adopt($id_agent_module);
@@ -233,7 +233,7 @@ push_table_simple($data, 'snmp_2');
 
 // Advanced stuff
 $data = [];
-$data[0] = __('TCP send').' '.ui_print_help_icon('tcp_send', true);
+$data[0] = __('TCP send');
 $data[1] = html_print_textarea('tcp_send', 2, 65, $tcp_send, $disabledTextBecauseInPolicy, true, $largeclassdisabledBecauseInPolicy);
 $table_simple->colspan['tcp_send'][1] = 3;
 
@@ -277,7 +277,7 @@ if (!isset($id_agent_module)) {
 }
 
 $data = [];
-$data[0] = __('Auth user').ui_print_help_icon('column_macros', true);
+$data[0] = __('Auth user');
 $data[1] = html_print_input_text(
     'snmp3_auth_user',
     $snmp3_auth_user,
@@ -290,7 +290,7 @@ $data[1] = html_print_input_text(
     '',
     $classdisabledBecauseInPolicy
 );
-$data[2] = __('Auth password').ui_print_help_icon('column_macros', true).ui_print_help_tip(__('The pass length must be eight character minimum.'), true);
+$data[2] = __('Auth password').ui_print_help_tip(__('The pass length must be eight character minimum.'), true);
 $data[3] = html_print_input_password(
     'snmp3_auth_pass',
     $snmp3_auth_pass,
@@ -312,7 +312,7 @@ push_table_simple($data, 'field_snmpv3_row1');
 $data = [];
 $data[0] = __('Privacy method');
 $data[1] = html_print_select(['DES' => __('DES'), 'AES' => __('AES')], 'snmp3_privacy_method', $snmp3_privacy_method, '', '', '', true, false, false, '', $disabledBecauseInPolicy);
-$data[2] = __('Privacy pass').ui_print_help_icon('column_macros', true).ui_print_help_tip(__('The pass length must be eight character minimum.'), true);
+$data[2] = __('Privacy pass').ui_print_help_tip(__('The pass length must be eight character minimum.'), true);
 $data[3] = html_print_input_password(
     'snmp3_privacy_pass',
     $snmp3_privacy_pass,

pandora_console/godmode/agentes/module_manager_editor_plugin.php

@@ -79,7 +79,7 @@ push_table_simple($data, 'plugin_1');
 $data = [];
 $data[0] = 'macro_desc';
 $data[0] .= ui_print_help_tip('macro_help', true);
-$data[1] = html_print_input_text('macro_name', 'macro_value', '', 100, 1024, true);
+$data[1] = html_print_input_text('macro_name[]', 'macro_value', '', 100, 1024, true);
 $table_simple->colspan['macro_field'][1] = 3;
 $table_simple->rowstyle['macro_field'] = 'display:none';
 

pandora_console/godmode/agentes/module_manager_editor_wmi.php

@@ -60,7 +60,7 @@ $data[3] = html_print_input_text(
 push_table_simple($data, 'target_ip');
 
 $data = [];
-$data[0] = __('Username').ui_print_help_icon('column_macros', true);
+$data[0] = __('Username');
 $data[1] = html_print_input_text(
     'plugin_user',
     $plugin_user,
@@ -73,7 +73,7 @@ $data[1] = html_print_input_text(
     '',
     $classdisabledBecauseInPolicy
 );
-$data[2] = __('Password').ui_print_help_icon('column_macros', true);
+$data[2] = __('Password');
 $data[3] = html_print_input_password(
     'plugin_pass',
     $plugin_pass,
@@ -83,15 +83,14 @@ $data[3] = html_print_input_password(
     true,
     $disabledBecauseInPolicy,
     false,
-    '',
+    $classdisabledBecauseInPolicy,
-    $classdisabledBecauseInPolicy
+    'new-password'
 );
 
 push_table_simple($data, 'user_pass');
 
 $data = [];
 $data[0] = __('WMI query');
-$data[0] .= ui_print_help_icon('wmiquery', true);
 $data[1] = html_print_input_text(
     'snmp_oid',
     $snmp_oid,

pandora_console/godmode/alerts/alert_commands.php

@@ -84,9 +84,7 @@ if (is_ajax()) {
                 // If the field is the number one, print the help message.
                 if ($i == 1) {
                     // If our context is snmpconsole, show snmp_alert helps.
-                    if ((isset($_SERVER['HTTP_REFERER'])) && ( preg_match('/snmp_alert/', $_SERVER['HTTP_REFERER']) > 0 )) {
+                    if ((!isset($_SERVER['HTTP_REFERER'])) && ( preg_match('/snmp_alert/', $_SERVER['HTTP_REFERER']) > 0 )) {
-                        $fdesc .= ui_print_help_icon('snmp_alert_field1', true);
-                    } else {
                         $fdesc .= ui_print_help_icon('alert_config', true);
                     }
                 }

pandora_console/godmode/alerts/alert_list.builder.php

@@ -37,14 +37,10 @@ $table->head = [];
 $table->data = [];
 $table->size = [];
 $table->size = [];
-$table->size[0] = '5%';
+$table->style[0] = 'font-weight: bold;';
-$table->size[1] = '25%';
+$table->style[1] = 'font-weight: bold;display: flex;align-items: baseline;';
-$table->size[2] = '5%';
+$table->style[2] = 'font-weight: bold;';
-$table->size[3] = '20%';
+$table->style[3] = 'font-weight: bold;';
-$table->style[0] = 'font-weight: bold; ';
-$table->style[1] = 'font-weight: bold; ';
-$table->style[2] = 'font-weight: bold; ';
-$table->style[3] = 'font-weight: bold; ';
 
 // This is because if this view is reused after list alert view then
 // styles in the previous view can affect this table.
@@ -89,7 +85,7 @@ $table->data[0][1] = html_print_select(
     true,
     '',
     ($id_agente == 0),
-    'width: 250px;'
+    'min-width: 250px;margin-right: 0.5em;'
 );
 $table->data[0][1] .= ' <span id="latest_value" class="invisible">'.__('Latest value').': ';
 $table->data[0][1] .= '<span id="value">&nbsp;</span></span>';
@@ -117,7 +113,7 @@ $table->data[1][1] = html_print_select(
     true,
     '',
     false,
-    'width: 250px;'
+    'min-width: 250px;'
 );
 $table->data[1][1] .= '<span id="advanced_action" class="advanced_actions invisible"><br>';
 $table->data[1][1] .= __('Number of alerts match from').' ';
@@ -127,9 +123,9 @@ $table->data[1][1] .= html_print_input_text('fires_max', '', '', 4, 10, true);
 
 $table->data[1][1] .= '</span>';
 if (check_acl($config['id_user'], 0, 'LM')) {
-    $table->data[1][1] .= '<a style="margin-left:5px;" href="index.php?sec=galertas&sec2=godmode/alerts/configure_alert_action&pure='.$pure.'">';
+    $table->data[1][1] .= '<a href="index.php?sec=galertas&sec2=godmode/alerts/configure_alert_action&pure='.$pure.'">';
     $table->data[1][1] .= html_print_image('images/add.png', true);
-    $table->data[1][1] .= '<span style="margin-left:5px;vertical-align:middle;">'.__('Create Action').'</span>';
+    $table->data[1][1] .= '<span style="margin-left:0.5em;">'.__('Create Action').'</span>';
     $table->data[1][1] .= '</a>';
 }
 
@@ -162,13 +158,13 @@ if ($own_info['is_admin'] || check_acl($config['id_user'], 0, 'PM')) {
     if (check_acl($config['id_user'], 0, 'LM')) {
         $table->data[2][1] .= '<a href="index.php?sec=galertas&sec2=godmode/alerts/configure_alert_template&pure='.$pure.'">';
         $table->data[2][1] .= html_print_image('images/add.png', true);
-        $table->data[2][1] .= '<span style="margin-left:5px;vertical-align:middle;">'.__('Create Template').'</span>';
+        $table->data[2][1] .= '<span style="margin-left:0.5em;">'.__('Create Template').'</span>';
         $table->data[2][1] .= '</a>';
     }
 
     $table->data[3][0] = __('Threshold');
     $table->data[3][1] = html_print_input_text('module_action_threshold', '0', '', 5, 7, true);
-    $table->data[3][1] .= ' '.__('seconds');
+    $table->data[3][1] .= '<span style="margin-left:0.5em;">'.__('seconds').'</span>';
 
     if (!isset($step)) {
         echo '<form class="add_alert_form" method="post">';

pandora_console/godmode/alerts/alert_list.list.php

@@ -438,11 +438,11 @@ if (! $id_agente) {
     $table->style = [];
     $table->style[0] = 'font-weight: bold;';
     $table->head[0] = __('Agent').ui_get_sorting_arrows($url_up_agente, $url_down_agente, $selectAgentUp, $selectAgentDown);
-    $table->size[0] = '4%';
+    $table->headstyle[0] = 'width: 100%; min-width: 12em;';
-    $table->size[1] = '8%';
+    $table->headstyle[1] = 'min-width: 15em;';
-    $table->size[2] = '8%';
+    $table->headstyle[2] = 'min-width: 20em;';
-    $table->size[3] = '4%';
+    $table->headstyle[3] = 'min-width: 1em;';
-    $table->size[4] = '4%';
+    $table->headstyle[4] = 'min-width: 15em;';
 
     /*
         if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) {
@@ -450,16 +450,11 @@ if (! $id_agente) {
     }*/
 } else {
     $table->head[0] = __('Module').ui_get_sorting_arrows($url_up_module, $url_down_module, $selectModuleUp, $selectModuleDown);
-    // Different sizes or the layout screws up
+    $table->headstyle[0] = 'width: 100%; min-width: 15em;';
-    $table->size[0] = '0%';
+    $table->headstyle[1] = 'min-width: 15em;';
-    $table->size[1] = '10%';
+    $table->headstyle[2] = 'min-width: 20em;';
-    $table->size[2] = '30%';
+    $table->headstyle[3] = 'min-width: 1em;';
-    /*
+    $table->headstyle[4] = 'min-width: 15em;';
-        if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) {
-        $table->size[4] = '25%';
-    }  */
-    $table->size[3] = '1%';
-    $table->size[4] = '1%';
 }
 
 $table->head[1] = __('Template').ui_get_sorting_arrows($url_up_template, $url_down_template, $selectTemplateUp, $selectTemplateDown);

pandora_console/godmode/alerts/alert_view.php

@@ -386,7 +386,7 @@ if (count($actions) == 1 && isset($actions[0])) {
             $table->data[$kaction][($k + 1)] = human_time_description_raw($action_threshold, true, 'tiny');
         }
 
-        $table->head[($k + 1)] = __('Threshold').'<span style="float: right;">'.ui_print_help_icon('action_threshold', true, '', 'images/header_help.png').'</span>';
+        $table->head[($k + 1)] = __('Threshold');
     }
 }
 

pandora_console/godmode/events/custom_events.php

@@ -60,96 +60,12 @@ $fields_selected = explode(',', $config['event_fields']);
 
 $result_selected = [];
 
-// show list of fields selected.
+// Show list of fields selected.
 if ($fields_selected[0] != '') {
     foreach ($fields_selected as $field_selected) {
-        switch ($field_selected) {
+        $result_selected[$field_selected] = events_get_column_name(
-            case 'id_evento':
+            $field_selected
-                $result = __('Event Id');
+        );
-            break;
-
-            case 'evento':
-                $result = __('Event Name');
-            break;
-
-            case 'id_agente':
-                $result = __('Agent Name');
-            break;
-
-            case 'id_usuario':
-                $result = __('User');
-            break;
-
-            case 'id_grupo':
-                $result = __('Group');
-            break;
-
-            case 'estado':
-                $result = __('Status');
-            break;
-
-            case 'timestamp':
-                $result = __('Timestamp');
-            break;
-
-            case 'event_type':
-                $result = __('Event Type');
-            break;
-
-            case 'id_agentmodule':
-                $result = __('Module Name');
-            break;
-
-            case 'id_alert_am':
-                $result = __('Alert');
-            break;
-
-            case 'criticity':
-                $result = __('Severity');
-            break;
-
-            case 'user_comment':
-                $result = __('Comment');
-            break;
-
-            case 'tags':
-                $result = __('Tags');
-            break;
-
-            case 'source':
-                $result = __('Source');
-            break;
-
-            case 'id_extra':
-                $result = __('Extra Id');
-            break;
-
-            case 'owner_user':
-                $result = __('Owner');
-            break;
-
-            case 'ack_utimestamp':
-                $result = __('ACK Timestamp');
-            break;
-
-            case 'instructions':
-                $result = __('Instructions');
-            break;
-
-            case 'server_name':
-                $result = __('Server Name');
-            break;
-
-            case 'data':
-                $result = __('Data');
-            break;
-
-            case 'module_status':
-                $result = __('Module Status');
-            break;
-        }
-
-        $result_selected[$field_selected] = $result;
     }
 }
 
@@ -177,7 +93,8 @@ $fields_available = [];
 
 $fields_available['id_evento'] = __('Event Id');
 $fields_available['evento'] = __('Event Name');
-$fields_available['id_agente'] = __('Agent Name');
+$fields_available['id_agente'] = __('Agent ID');
+$fields_available['agent_name'] = __('Agent Name');
 $fields_available['id_usuario'] = __('User');
 $fields_available['id_grupo'] = __('Group');
 $fields_available['estado'] = __('Status');
@@ -197,12 +114,10 @@ $fields_available['server_name'] = __('Server Name');
 $fields_available['data'] = __('Data');
 $fields_available['module_status'] = __('Module Status');
 
-// remove fields already selected
+// Remove fields already selected.
 foreach ($fields_available as $key => $available) {
-    foreach ($result_selected as $selected) {
+    if (isset($result_selected[$key])) {
-        if ($selected == $available) {
+        unset($fields_available[$key]);
-            unset($fields_available[$key]);
-        }
     }
 }
 

pandora_console/godmode/gis_maps/configure_gis_map.php

@@ -357,8 +357,8 @@ function addConnectionMap() {
     for (var index in connectionMaps) {
         if (isInt(index)) {
             if (connectionMaps[index] == idConnectionMap) {
-                alert("<?php echo __('The connection'); ?> "' + connectionMapName + '" <?php echo __('just added previously.'); ?>");
+                alert("<?php echo __('The connection'); ?> " + connectionMapName + " <?php echo __('just added previously.'); ?>");
-                
+
                 return;
             }
         }

pandora_console/godmode/groups/group_list.php

@@ -516,14 +516,22 @@ if ($tab == 'tree') {
         $table = new StdClass();
         $table->width = '100%';
         $table->class = 'info_table';
+        $table->headstyle = [];
         $table->head = [];
         $table->head[0] = __('ID');
+        $table->headstyle[0] = 'min-width: 100px;';
         $table->head[1] = __('Name');
+        $table->headstyle[1] = 'min-width: 100px;';
         $table->head[2] = __('Icon');
+        $table->headstyle[2] = 'min-width: 100px;';
         $table->head[3] = __('Alerts');
+        $table->headstyle[3] = 'min-width: 100px;';
         $table->head[4] = __('Parent');
+        $table->headstyle[4] = 'min-width: 100px;';
         $table->head[5] = __('Description');
+        $table->headstyle[5] = 'min-width: 100px;';
         $table->head[6] = __('Actions');
+        $table->headstyle[6] = 'min-width: 100px;';
         $table->align = [];
         $table->align[0] = 'left';
         $table->align[2] = 'left';

pandora_console/godmode/massive/massive_add_action_alerts.php

@@ -215,7 +215,6 @@ $table->data[3][1] .= __('Number of alerts match from').' ';
 $table->data[3][1] .= html_print_input_text('fires_min', 0, '', 4, 10, true);
 $table->data[3][1] .= ' '.__('to').' ';
 $table->data[3][1] .= html_print_input_text('fires_max', 0, '', 4, 10, true);
-$table->data[3][1] .= ui_print_help_icon('alert-matches', true);
 $table->data[3][1] .= '</span>';
 
 echo '<form method="post" id="form_alerts" action="index.php?sec=gmassive&sec2=godmode/massive/massive_operations&option=add_action_alerts">';

pandora_console/godmode/massive/massive_copy_modules.php

@@ -125,7 +125,7 @@ echo '<form '.'action="index.php?'.'sec=gmassive&'.'sec2=godmode/massive/massive
 
 echo '<fieldset id="fieldset_source">';
 echo '<legend>';
-echo '<span>'.__('Source').ui_print_help_icon('manageconfig', true).'</span>';
+echo '<span>'.__('Source');
 echo '</legend>';
 html_print_table($table);
 echo '</fieldset>';

pandora_console/godmode/massive/massive_edit_modules.php

@@ -695,7 +695,7 @@ $table->data['edit1'][1] = '<table width="100%">';
                 true
             );
 
-            $table->data['edit3'][0] = __('Post process').ui_print_help_icon('postprocess', true);
+            $table->data['edit3'][0] = __('Post process');
 
             $table->data['edit3'][1] = html_print_extended_select_for_post_process(
                 'post_process',
@@ -846,10 +846,6 @@ $table->data['edit1'][1] = '<table width="100%">';
 
             // FF stands for Flip-flop.
             $table->data['edit7'][0] = __('FF threshold').' ';
-            $table->data['edit7'][0] .= ui_print_help_icon(
-                'ff_threshold',
-                true
-            );
 
             $table->colspan['edit7'][1] = 3;
             $table->data['edit7'][1] = __('Mode').' ';
@@ -1060,26 +1056,26 @@ $table->data['edit1'][1] = '<table width="100%">';
                 true
             );
 
-            $table->data['edit22'][0] = __('Web checks').ui_print_help_icon('web_checks', true);
+            $table->data['edit22'][0] = __('Web checks');
             ;
             $table->data['edit22'][1] = '<textarea id="textarea_plugin_parameter" name="plugin_parameter_text" cols="65" rows="15"></textarea>';
 
             $table->data['edit16'][2] = __('Port');
             $table->data['edit16'][3] = html_print_input_text('tcp_port', '', '', 5, 20, true);
 
-            $table->data['edit17'][0] = __('TCP send').' '.ui_print_help_icon('tcp_send', true);
+            $table->data['edit17'][0] = __('TCP send');
             $table->data['edit17'][1] = html_print_textarea('tcp_send2', 2, 65, '', '', true);
 
             $table->data['edit17'][2] = __('TCP receive');
             $table->data['edit17'][3] = html_print_textarea('tcp_rcv', 2, 65, '', '', true);
 
-            $table->data['edit18'][0] = __('WMI query').ui_print_help_icon('wmiquery', true);
+            $table->data['edit18'][0] = __('WMI query');
             $table->data['edit18'][1] = html_print_input_text('wmi_query', '', '', 35, 255, true);
 
             $table->data['edit18'][2] = __('Key string');
             $table->data['edit18'][3] = html_print_input_text('key_string', '', '', 20, 60, true);
 
-            $table->data['edit19'][0] = __('Field number').ui_print_help_icon('wmifield', true);
+            $table->data['edit19'][0] = __('Field number');
             $table->data['edit19'][1] = html_print_input_text('field_number', '', '', 5, 15, true);
 
             $table->data['edit20'][0] = __('Plugin').ui_print_help_icon('plugin_macros', true);

pandora_console/godmode/massive/massive_edit_plugins.php

@@ -725,7 +725,6 @@ echo '</form>';
             }
         });
         
-        $modulesSelect.change();
     }
     
     var processGet = function (params, callback) {

pandora_console/godmode/massive/massive_operations.php

@@ -72,6 +72,7 @@ if (! check_acl($config['id_user'], 0, 'AW')) {
 
 $options_policies = [];
 $policies_options = enterprise_hook('massive_policies_options');
+$policies_options = array_unique($policies_options);
 
 if ($policies_options != ENTERPRISE_NOT_HOOK) {
     $options_policies = array_merge($options_policies, $policies_options);

pandora_console/godmode/menu.php

@@ -418,9 +418,11 @@ if (is_array($config['extensions'])) {
     $sub['godmode/extensions']['type'] = 'direct';
     $sub['godmode/extensions']['subtype'] = 'nolink';
 
-    $submenu = array_merge($menu_godmode['gextensions']['sub'], $sub);
+    if (is_array($menu_godmode['gextensions']['sub'])) {
-    if ($menu_godmode['gextensions']['sub'] != null) {
+        $submenu = array_merge($menu_godmode['gextensions']['sub'], $sub);
-        $menu_godmode['gextensions']['sub'] = $submenu;
+        if ($menu_godmode['gextensions']['sub'] != null) {
+            $menu_godmode['gextensions']['sub'] = $submenu;
+        }
     }
 }
 
@@ -457,19 +459,6 @@ if (check_acl($config['id_user'], 0, 'PM') && $config['enable_update_manager'])
     $sub['godmode/update_manager/update_manager&tab=setup']['text'] = __('Update Manager options');
     $sub['godmode/update_manager/update_manager&tab=setup']['id'] = 'Options';
 
-    if (license_free() && is_user_admin($config['id_user'])) {
-        include_once 'include/functions_update_manager.php';
-        // If there are unread messages, display the notification icon
-        $number_total_messages;
-        $number_unread_messages = update_manager_get_unread_messages();
-        if ($number_unread_messages > 0) {
-            $menu_godmode['messages']['notification'] = $number_unread_messages;
-        }
-
-        $sub['godmode/update_manager/update_manager&tab=messages']['text'] = __('Messages');
-        $sub['godmode/update_manager/update_manager&tab=messages']['id'] = 'Messages';
-    }
-
     $menu_godmode['messages']['sub'] = $sub;
 }
 

pandora_console/godmode/modules/manage_network_components.php

@@ -36,6 +36,9 @@ require_once $config['homedir'].'/include/functions_component_groups.php';
 if (defined('METACONSOLE')) {
     components_meta_print_header();
     $sec = 'advanced';
+
+    $id_modulo = (int) get_parameter('id_component_type');
+    $new_component = (bool) get_parameter('new_component');
 } else {
     /*
         Hello there! :)

pandora_console/godmode/modules/manage_network_components_form_common.php

@@ -154,7 +154,7 @@ $table->data[2][1] = html_print_select(
 $table->data[2][2] = __('Interval');
 $table->data[2][3] = html_print_extended_select_for_time('module_interval', $module_interval, '', '', '0', false, true);
 
-$table->data[3][0] = __('Dynamic Interval').' '.ui_print_help_icon('dynamic_threshold', true);
+$table->data[3][0] = __('Dynamic Interval');
 $table->data[3][1] = html_print_extended_select_for_time('dynamic_interval', $dynamic_interval, '', 'None', '0', 10, true, 'width:150px', false);
 $table->data[3][1] .= '<a onclick=advanced_option_dynamic()>'.html_print_image('images/cog.png', true, ['title' => __('Advanced options Dynamic Threshold')]).'</a>';
 
@@ -165,7 +165,7 @@ $table->data[3][2] .= html_print_input_text('dynamic_max', $dynamic_max, '', 10,
 $table->data[3][3] = '<span><em>'.__('Dynamic Two Tailed: ').'</em>';
 $table->data[3][3] .= html_print_checkbox('dynamic_two_tailed', 1, $dynamic_two_tailed, true);
 
-$table->data[4][0] = __('Warning status').' '.ui_print_help_icon('warning_status', true);
+$table->data[4][0] = __('Warning status');
 $table->data[4][1] = '<span id="minmax_warning"><em>'.__('Min.').'&nbsp;</em>&nbsp;';
 $table->data[4][1] .= html_print_input_text(
     'min_warning',
@@ -200,7 +200,7 @@ $table->data[4][2] = '<svg id="svg_dinamic" width="500" height="300"> </svg>';
 $table->colspan[4][2] = 2;
 $table->rowspan[4][2] = 3;
 
-$table->data[5][0] = __('Critical status').' '.ui_print_help_icon('critical_status', true);
+$table->data[5][0] = __('Critical status');
 $table->data[5][1] = '<span id="minmax_critical"><em>'.__('Min.').'&nbsp;</em>&nbsp;';
 $table->data[5][1] .= html_print_input_text(
     'min_critical',
@@ -231,7 +231,7 @@ $table->data[5][1] .= html_print_input_text(
 $table->data[5][1] .= '<br /><em>'.__('Inverse interval').'</em>';
 $table->data[5][1] .= html_print_checkbox('critical_inverse', 1, $critical_inverse, true);
 
-$table->data[6][0] = __('FF threshold').' '.ui_print_help_icon('ff_threshold', true);
+$table->data[6][0] = __('FF threshold');
 $table->colspan[6][1] = 3;
 
 $table->data[6][1] = __('Keep counters');

pandora_console/godmode/modules/manage_network_components_form_network.php

@@ -57,16 +57,16 @@ $data = [];
 $data[0] = __('SNMP Enterprise String');
 $data[1] = html_print_input_text('snmp_oid', $snmp_oid, '', 30, 400, true);
 // $table->colspan['snmp_2'][1] = 3;
-$data[2] = __('SNMP community').ui_print_help_icon('column_macros', true);
+$data[2] = __('SNMP community');
 $data[3] = html_print_input_text('snmp_community', $snmp_community, '', 15, 60, true);
 
 push_table_row($data, 'snmp_2');
 
 
 $data = [];
-$data[0] = __('Auth user').ui_print_help_icon('column_macros', true);
+$data[0] = __('Auth user');
 $data[1] = html_print_input_text('snmp3_auth_user', $snmp3_auth_user, '', 15, 60, true);
-$data[2] = __('Auth password').ui_print_help_icon('column_macros', true);
+$data[2] = __('Auth password');
 $data[3] = html_print_input_password('snmp3_auth_pass', $snmp3_auth_pass, '', 15, 60, true);
 $data[3] .= html_print_input_hidden_extended('active_snmp_v3', 0, 'active_snmp_v3_mncfn', true);
 push_table_row($data, 'field_snmpv3_row1');
@@ -74,7 +74,7 @@ push_table_row($data, 'field_snmpv3_row1');
 $data = [];
 $data[0] = __('Privacy method');
 $data[1] = html_print_select(['DES' => __('DES'), 'AES' => __('AES')], 'snmp3_privacy_method', $snmp3_privacy_method, '', '', '', true);
-$data[2] = __('Privacy pass').ui_print_help_icon('column_macros', true);
+$data[2] = __('Privacy pass');
 $data[3] = html_print_input_password('snmp3_privacy_pass', $snmp3_privacy_pass, '', 15, 60, true);
 push_table_row($data, 'field_snmpv3_row2');
 
@@ -98,7 +98,7 @@ $data[3] = html_print_select(
 push_table_row($data, 'field_snmpv3_row3');
 
 $data = [];
-$data[0] = __('Post process').' '.ui_print_help_icon('postprocess', true);
+$data[0] = __('Post process');
 $data[1] = html_print_extended_select_for_post_process(
     'post_process',
     $post_process,
@@ -117,7 +117,7 @@ push_table_row($data, 'field_process');
 
 // Advanced stuff
 $data = [];
-$data[0] = __('TCP send').' '.ui_print_help_icon('tcp_send', true);
+$data[0] = __('TCP send');
 $data[1] = html_print_textarea('tcp_send', 2, 65, $tcp_send, '', true);
 $table->colspan['tcp_send'][1] = 3;
 

pandora_console/godmode/modules/manage_network_components_form_plugin.php

@@ -31,7 +31,7 @@ $data[1] = html_print_select_from_sql(
 );
 // Store the macros in base64 into a hidden control to move between pages
 $data[1] .= html_print_input_hidden('macros', base64_encode($macros), true);
-$data[2] = __('Post process').' '.ui_print_help_icon('postprocess', true, ui_get_full_url(false, false, false, false));
+$data[2] = __('Post process');
 $data[3] = html_print_extended_select_for_post_process(
     'post_process',
     $post_process,

pandora_console/godmode/modules/manage_network_components_form_wmi.php

@@ -30,29 +30,29 @@ require_once $config['homedir'].'/include/functions_modules.php';
 $data = [];
 $data[0] = __('WMI query').' '.ui_print_help_icon('wmi_query_tab', true);
 $data[1] = html_print_input_text('snmp_oid', $snmp_oid, '', 25, 255, true);
-$data[2] = __('Key string').' '.ui_print_help_icon('wmikey', true, ui_get_full_url(false, false, false, false));
+$data[2] = __('Key string');
 $data[3] = html_print_input_text('snmp_community', $snmp_community, '', 25, 255, true);
 
 push_table_row($data, 'wmi_1');
 
 $data = [];
-$data[0] = __('Field number').' '.ui_print_help_icon('wmifield', true, ui_get_full_url(false, false, false, false));
+$data[0] = __('Field number');
 $data[1] = html_print_input_text('tcp_port', $tcp_port, '', 5, 25, true);
-$data[2] = __('Namespace').' '.ui_print_help_icon('wminamespace', true, ui_get_full_url(false, false, false, false));
+$data[2] = __('Namespace');
 $data[3] = html_print_input_text('tcp_send', $tcp_send, '', 25, 255, true);
 
 push_table_row($data, 'wmi_2');
 
 $data = [];
-$data[0] = __('Username').ui_print_help_icon('column_macros', true);
+$data[0] = __('Username');
 $data[1] = html_print_input_text('plugin_user', $plugin_user, '', 15, 255, true);
-$data[2] = __('Password').ui_print_help_icon('column_macros', true);
+$data[2] = __('Password');
 $data[3] = html_print_input_password('plugin_pass', $plugin_pass, '', 25, 255, true);
 
 push_table_row($data, 'wmi_3');
 
 $data = [];
-$data[0] = __('Post process').' '.ui_print_help_icon('postprocess', true, ui_get_full_url(false, false, false, false));
+$data[0] = __('Post process');
 $data[1] = html_print_extended_select_for_post_process(
     'post_process',
     $post_process,

pandora_console/godmode/reporting/create_container.php

@@ -414,7 +414,7 @@ if ($edit_container) {
     echo "<table width='100%' cellpadding=4 cellspacing=4 class='databox filters'>";
         echo '<tr>';
             echo '<td>';
-                echo ui_toggle($single_table, 'Simple module graph', '', true, true);
+                echo ui_toggle($single_table, 'Simple module graph', '', '', true);
             echo '</td>';
         echo '</tr>';
     echo '</table>';
@@ -466,7 +466,7 @@ if ($edit_container) {
     echo "<table width='100%' cellpadding=4 cellspacing=4 class='databox filters'>";
         echo '<tr>';
             echo '<td>';
-                echo ui_toggle(html_print_table($table, true), 'Custom graph', '', true, true);
+                echo ui_toggle(html_print_table($table, true), 'Custom graph', '', '', true);
             echo '</td>';
         echo '</tr>';
     echo '</table>';
@@ -561,7 +561,7 @@ if ($edit_container) {
     echo "<table width='100%' cellpadding=4 cellspacing=4 class='databox filters'>";
         echo '<tr>';
             echo '<td>';
-                echo ui_toggle(html_print_table($table, true), 'Dynamic rules for simple module graph', '', true, true);
+                echo ui_toggle(html_print_table($table, true), 'Dynamic rules for simple module graph', '', '', true);
             echo '</td>';
         echo '</tr>';
     echo '</table>';

pandora_console/godmode/reporting/graph_builder.graph_editor.php

@@ -356,9 +356,35 @@ echo "<td style='vertical-align: top;'>".__('Agents').'</td>';
 echo '<td></td>';
 echo "<td style='vertical-align: top;'>".__('Modules').'</td>';
 echo '</tr><tr>';
-echo '<td>'.html_print_select(agents_get_group_agents(), 'id_agents[]', 0, false, '', '', true, true, true, '', false, '').'</td>';
+echo '<td style="width: 50%;">'.html_print_select(
-echo "<td style='vertical-align: center; text-align: center;'>".html_print_image('images/darrowright.png', true).'</td>';
+    agents_get_group_agents(),
-echo '<td>'.html_print_select([], 'module[]', 0, false, '', 0, true, true, true, '', false, '').'</td>';
+    'id_agents[]',
+    0,
+    false,
+    '',
+    '',
+    true,
+    true,
+    true,
+    'w100p',
+    false,
+    ''
+).'</td>';
+echo "<td style='width: 3em;vertical-align: center; text-align: center;'>".html_print_image('images/darrowright.png', true).'</td>';
+echo '<td style="width: 50%;">'.html_print_select(
+    [],
+    'module[]',
+    0,
+    false,
+    '',
+    0,
+    true,
+    true,
+    true,
+    'w100p',
+    false,
+    ''
+).'</td>';
 echo '</tr><tr>';
 echo "<td colspan='3'>";
 echo "<table cellpadding='4'><tr>";

pandora_console/godmode/reporting/reporting_builder.item_editor.php

@@ -221,7 +221,7 @@ switch ($action) {
             $server_name = $item['server_name'];
 
             // Metaconsole db connection.
-            if ($meta && $server_name != '') {
+            if ($meta && !empty($server_name)) {
                 $connection = metaconsole_get_connection($server_name);
                 if (metaconsole_load_external_db($connection) != NOERR) {
                     continue;
@@ -547,8 +547,43 @@ switch ($action) {
                 break;
 
                 case 'event_report_agent':
-                case 'event_report_group':
+                    $description = $item['description'];
+                    $period = $item['period'];
+                    $group = $item['id_group'];
                     $recursion = $item['recursion'];
+                    $idAgent = $item['id_agent'];
+                    $idAgentModule = $item['id_agent_module'];
+
+
+                    $show_summary_group    = $style['show_summary_group'];
+                    $filter_event_severity = json_decode($style['filter_event_severity'], true);
+                    $filter_event_status   = json_decode($style['filter_event_status'], true);
+                    $filter_event_type     = json_decode($style['filter_event_type'], true);
+
+                    $event_graph_by_user_validator = $style['event_graph_by_user_validator'];
+                    $event_graph_by_criticity = $style['event_graph_by_criticity'];
+                    $event_graph_validated_vs_unvalidated = $style['event_graph_validated_vs_unvalidated'];
+                    $include_extended_events = $item['show_extended_events'];
+
+                    $filter_search = $style['event_filter_search'];
+
+                break;
+
+                case 'event_report_group':
+                    $description = $item['description'];
+                    $period = $item['period'];
+                    $group = $item['id_group'];
+                    $recursion = $item['recursion'];
+
+                    $event_graph_by_agent = $style['event_graph_by_agent'];
+                    $event_graph_by_user_validator = $style['event_graph_by_user_validator'];
+                    $event_graph_by_criticity = $style['event_graph_by_criticity'];
+                    $event_graph_validated_vs_unvalidated = $style['event_graph_validated_vs_unvalidated'];
+
+                    $filter_search = $style['event_filter_search'];
+
+
+
                     $include_extended_events = $item['show_extended_events'];
                 break;
 
@@ -877,7 +912,7 @@ $class = 'databox filters';
         <tr id="row_label" style="" class="datos">
             <td style="font-weight:bold;">
                 <?php
-                echo __('Label').ui_print_help_icon('reports_label_field', true);
+                echo __('Label');
                 ?>
             </td>
             <td style="">
@@ -981,11 +1016,6 @@ $class = 'databox filters';
             <td style="font-weight:bold;">
                 <?php
                 echo __('Period');
-                if ($type == 'projection_graph') {
-                    echo ui_print_help_icon('projection_graph', true);
-                } else {
-                    echo ui_print_help_icon('prediction_date', true);
-                }
                 ?>
             </td>
             <td style="">
@@ -1004,10 +1034,7 @@ $class = 'databox filters';
         <tr id="row_estimate" style="" class="datos">
             <td style="font-weight:bold;">
                 <?php
-                echo __('Projection period').ui_print_help_icon(
+                echo __('Projection period');
-                    'projection_graph',
-                    true
-                );
                 ?>
             </td>
             <td style="">
@@ -1026,10 +1053,7 @@ $class = 'databox filters';
         <tr id="row_interval" style="" class="datos">
             <td style="font-weight:bold;">
             <?php
-            echo __('Data range').ui_print_help_icon(
+            echo __('Data range');
-                'prediction_date',
-                true
-            );
             ?>
             </td>
             <td>
@@ -2816,7 +2840,7 @@ function print_SLA_list($width, $action, $idItem=null)
                     foreach ($itemsSLA as $item) {
                         $server_name = $item['server_name'];
                         // Metaconsole db connection.
-                        if ($meta && $server_name != '') {
+                        if ($meta && !empty($server_name)) {
                             $connection = metaconsole_get_connection(
                                 $server_name
                             );
@@ -3144,7 +3168,7 @@ function print_General_list($width, $action, $idItem=null, $type='general')
                     foreach ($itemsGeneral as $item) {
                         $server_name = $item['server_name'];
                         // Metaconsole db connection.
-                        if ($meta && $server_name != '') {
+                        if ($meta && !empty($server_name)) {
                             $connection = metaconsole_get_connection(
                                 $server_name
                             );
@@ -3502,6 +3526,7 @@ $(document).ready (function () {
 
     $("#submit-create_item").click(function () {
         var type = $('#type').val();
+        var name = $('#text-name').val();
         switch (type){
             case 'alert_report_module':
             case 'alert_report_agent':
@@ -3532,6 +3557,13 @@ $(document).ready (function () {
             default:
                 break;
         }
+
+        if($('#text-name').val() == ''){
+            alert( <?php echo "'".__('Please insert a name')."'"; ?> );
+                return false;
+        }
+
+
     });
 
     $("#submit-edit_item").click(function () {
@@ -4865,7 +4897,6 @@ function chooseType() {
     switch (type) {
         case 'event_report_agent':
         case 'simple_graph':
-        case 'agent_configuration':
         case 'event_report_module':
         case 'alert_report_agent':
         case 'alert_report_module':
@@ -4876,8 +4907,6 @@ function chooseType() {
         case 'min_value':
         case 'max_value':
         case 'avg_value':
-        case 'projection_graph':
-        case 'prediction_date':
         case 'TTRT':
         case 'TTO':
         case 'MTBF':

pandora_console/godmode/reporting/reporting_builder.list_items.php

@@ -745,7 +745,12 @@ function message_check_delete_items() {
 }
 
 function added_ids_deleted_items_to_hidden_input() {
-    message_check_delete_items();
+   var success = message_check_delete_items();
+
+   if(success === false){
+    $(".check_delete").prop("checked", false);
+       return false;
+   }
     
     var ids = '';
     var first = true;

pandora_console/godmode/reporting/reporting_builder.php

@@ -45,6 +45,9 @@
                     .parent()
                     .addClass('checkselected');
                 $(".check_delete").prop("checked", true);
+                $('.check_delete').each(function(){
+                    $('#hidden-id_report_'+$(this).val()).prop("disabled", false);    
+                });
             }
             else{
                 $('[id^=checkbox-massive_report_check]')
@@ -760,6 +763,9 @@ switch ($action) {
 
             $table->head = [];
             $table->align = [];
+            $table->headstyle = [];
+            $table->style = [];
+
             $table->align[2] = 'left';
             $table->align[3] = 'left';
             $table->align[4] = 'left';
@@ -768,21 +774,28 @@ switch ($action) {
             $table->head[1] = __('Description');
             $table->head[2] = __('HTML');
             $table->head[3] = __('XML');
-            $table->size[0] = '20%';
+            $table->size[0] = '60%';
-            $table->size[1] = '30%';
+            $table->size[1] = '20%';
             $table->size[2] = '2%';
+            $table->headstyle[2] = 'min-width: 35px;text-align: center;';
             $table->size[3] = '2%';
+            $table->headstyle[3] = 'min-width: 35px;text-align: center;';
             $table->size[4] = '2%';
-            $table->size[5] = '2%';
+            $table->headstyle[4] = 'min-width: 35px;text-align: center;';
-            $table->size[6] = '2%';
-            $table->size['csv'] = '5%';
 
             $next = 4;
             // Calculate dinamically the number of the column.
-            if (enterprise_hook('load_custom_reporting_1') !== ENTERPRISE_NOT_HOOK) {
+            if (enterprise_hook('load_custom_reporting_1', [$table]) !== ENTERPRISE_NOT_HOOK) {
                 $next = 7;
             }
 
+            $table->size[$next] = '2%';
+            $table->style[$next] = 'text-align: center;';
+
+            $table->headstyle[($next + 2)] = 'min-width: 100px;';
+            $table->style[($next + 2)] = 'text-align: center;';
+
+
             // Admin options only for RM flag.
             if (check_acl($config['id_user'], 0, 'RM')) {
                 $table->head[$next] = __('Private');
@@ -814,7 +827,6 @@ switch ($action) {
                 // $table->size = array ();
                 $table->size[$next] = '10%';
                 $table->align[$next] = 'left';
-                $table->headstyle[$next] = 'text-align:left;';
             }
 
             $columnview = false;
@@ -996,7 +1008,6 @@ switch ($action) {
                         $table->head[$next] = '<span title="Operations">'.__('Op.').'</span>'.html_print_checkbox('all_delete', 0, false, true, false);
                         $table->size = [];
                         // $table->size[$next] = '80px';
-                        $table->style[$next] = 'text-align:left;';
                     }
 
                     if ($edit) {
@@ -1334,6 +1345,8 @@ switch ($action) {
                         $values['description'] = get_parameter('description');
                         $values['type'] = get_parameter('type', null);
                         $values['recursion'] = get_parameter('recursion', null);
+                        $values['show_extended_events'] = get_parameter('include_extended_events', null);
+
                         $label = get_parameter('label', '');
 
                         // Add macros name.
@@ -1889,8 +1902,8 @@ switch ($action) {
                                 $style['event_graph_by_user_validator'] = $event_graph_by_user_validator;
                                 $style['event_graph_by_criticity'] = $event_graph_by_criticity;
                                 $style['event_graph_validated_vs_unvalidated'] = $event_graph_validated_vs_unvalidated;
-
                                 $style['event_filter_search'] = $event_filter_search;
+
                                 if ($label != '') {
                                     $style['label'] = $label;
                                 } else {
@@ -1996,6 +2009,7 @@ switch ($action) {
                         );
                         $name_it = (string) get_parameter('name');
                         $values['recursion'] = get_parameter('recursion', null);
+                        $values['show_extended_events'] = get_parameter('include_extended_events', null);
                         $values['name'] = reporting_label_macro(
                             $items_label,
                             $name_it
@@ -2407,6 +2421,7 @@ switch ($action) {
                             case 'event_report_agent':
                             case 'event_report_group':
                             case 'event_report_module':
+
                                 $show_summary_group = get_parameter(
                                     'show_summary_group',
                                     0
@@ -2462,22 +2477,11 @@ switch ($action) {
                                 $style['event_graph_by_user_validator'] = $event_graph_by_user_validator;
                                 $style['event_graph_by_criticity'] = $event_graph_by_criticity;
                                 $style['event_graph_validated_vs_unvalidated'] = $event_graph_validated_vs_unvalidated;
-
+                                $style['event_filter_search'] = $event_filter_search;
-
+                                if ($label != '') {
-                                switch ($values['type']) {
+                                    $style['label'] = $label;
-                                    case 'event_report_group':
+                                } else {
-                                    case 'event_report_agent':
+                                    $style['label'] = '';
-                                        $style['event_filter_search'] = $event_filter_search;
-                                        if ($label != '') {
-                                            $style['label'] = $label;
-                                        } else {
-                                            $style['label'] = '';
-                                        }
-                                    break;
-
-                                    default:
-                                        // Default.
-                                    break;
                                 }
                             break;
 

pandora_console/godmode/reporting/visual_console_builder.editor.js

@@ -1,3 +1,5 @@
+/* globals $ */
+
 // Pandora FMS - http://pandorafms.com
 // ==================================================
 // Copyright (c) 2005-2009 Artica Soluciones Tecnologicas
@@ -31,6 +33,8 @@ var SIZE_GRID = 16; //Const the size (for width and height) of grid.
 var img_handler_start;
 var img_handler_end;
 
+var default_cache_expiration = null;
+
 function toggle_advance_options_palette(close) {
   if ($("#advance_options").css("display") == "none") {
     $("#advance_options").css("display", "");
@@ -250,7 +254,12 @@ function update_button_palette_callback() {
   var values = {};
 
   values = readFields();
-
+  if (values["map_linked"] == 0) {
+    if (values["agent"] == "" || values["agent"] == "none") {
+      dialog_message("#message_alert_no_agent");
+      return false;
+    }
+  }
   // TODO VALIDATE DATA
   switch (selectedItem) {
     case "background":
@@ -1183,6 +1192,10 @@ function readFields() {
   values["timezone"] = $("select[name=timezone]").val();
   values["clock_animation"] = $("select[name=clock_animation]").val();
   values["show_last_value"] = $("select[name=last_value]").val();
+  values["cache_expiration"] =
+    typeof $("#hidden-cache_expiration").val() !== "undefined"
+      ? $("#hidden-cache_expiration").val()
+      : $("#cache_expiration").val();
 
   // Color Cloud values
   if (selectedItem == "color_cloud" || creationItem == "color_cloud") {
@@ -1226,7 +1239,6 @@ function readFields() {
 
 function create_button_palette_callback() {
   var values = readFields();
-
   //VALIDATE DATA
   var validate = true;
   switch (creationItem) {
@@ -1253,6 +1265,7 @@ function create_button_palette_callback() {
         dialog_message("#message_alert_max_height");
         validate = false;
       }
+
       break;
     case "group_item":
       if (values["height"] == "") {
@@ -1316,6 +1329,12 @@ function create_button_palette_callback() {
         dialog_message("#message_alert_no_image");
         validate = false;
       }
+      if (values["map_linked"] == 0) {
+        if (values["agent"] == "" || values["agent"] == "none") {
+          dialog_message("#message_alert_no_agent");
+          validate = false;
+        }
+      }
 
       break;
     case "auto_sla_graph":
@@ -2219,6 +2238,26 @@ function loadFieldsFromDB(item) {
           });
         }
 
+        if (key == "cache_expiration") {
+          var intoCacheExpSelect = false;
+          var cacheExpId = $("#hidden-cache_expiration").attr("class");
+          $("#" + cacheExpId + "_select option").each(function() {
+            if ($(this).val() == val) {
+              $(this).prop("selected", true);
+              $(this).trigger("change");
+              intoCacheExpSelect = true;
+            }
+          });
+          if (intoCacheExpSelect == false) {
+            $("#" + cacheExpId + "_select").val(0);
+            $("#" + cacheExpId + "_units").val(1);
+            $("#hidden-cache_expiration").val(val);
+            $("#text-" + cacheExpId + "_text").val(val);
+            $("#" + cacheExpId + "_default").hide();
+            $("#" + cacheExpId + "_manual").show();
+          }
+        }
+
         if (key == "value_show") {
           $("select[name=value_show]").val(val);
         }
@@ -2595,6 +2634,9 @@ function hiddenFields(item) {
   $("#line_case").css("display", "none");
   $("#line_case." + item).css("display", "");
 
+  $("#cache_expiration_row").css("display", "none");
+  $("#cache_expiration_row." + item).css("display", "");
+
   // Color cloud rows
   $("#color_cloud_diameter_row").hide();
   $("#color_cloud_diameter_row." + item).show();
@@ -2668,6 +2710,44 @@ function cleanFields(item) {
   $("table.color-range-creation input[type=color]").val("#FFFFFF");
   $("table.color-range:not(table.color-range-creation)").remove();
 
+  // Clean the cache expiration selection.
+  if (default_cache_expiration === null) {
+    var cacheExpVal = $("#hidden-cache_expiration").val();
+    if (!Number.isNaN(Number.parseInt(cacheExpVal))) {
+      cacheExpVal = Number.parseInt(cacheExpVal);
+    } else {
+      cacheExpVal = 0;
+    }
+
+    default_cache_expiration = cacheExpVal;
+  }
+  var cacheExpId = $("#hidden-cache_expiration").attr("class");
+  $("#hidden-cache_expiration").val(default_cache_expiration);
+
+  var intoCacheExpSelect = false;
+  $("#" + cacheExpId + "_select option").each(function() {
+    if ($(this).val() == default_cache_expiration) {
+      $(this).prop("selected", true);
+      $(this).trigger("change");
+      intoCacheExpSelect = true;
+    }
+  });
+  if (!intoCacheExpSelect) {
+    // Show input.
+    $("#" + cacheExpId + "_select").val(0);
+    $("#" + cacheExpId + "_units").val(1);
+    $("#text-" + cacheExpId + "_text").val(default_cache_expiration);
+    $("#" + cacheExpId + "_default").hide();
+    $("#" + cacheExpId + "_manual").show();
+  } else {
+    // Show select.
+    $("#" + cacheExpId + "_select").val(default_cache_expiration);
+    $("#" + cacheExpId + "_units").val(0);
+    $("#text-" + cacheExpId + "_text").val("");
+    $("#" + cacheExpId + "_default").show();
+    $("#" + cacheExpId + "_manual").hide();
+  }
+
   $("#preview").empty();
 
   if (item == "simple_value") {

pandora_console/godmode/reporting/visual_console_builder.editor.php

@@ -25,6 +25,8 @@ if (empty($visualConsole)) {
     exit;
 }
 
+ui_require_css_file('visual_maps');
+
 // ACL for the existing visual console
 // if (!isset($vconsole_read))
 // $vconsole_read = check_acl ($config['id_user'], $visualConsole['id_group'], "VR");
@@ -170,6 +172,7 @@ echo "<div id='delete_in_progress_dialog' style='display: none; text-align: cent
 // CSS
 ui_require_css_file('color-picker', 'include/styles/js/');
 ui_require_css_file('jquery-ui.min', 'include/styles/js/');
+ui_require_jquery_file('jquery-ui_custom');
 
 // Javascript
 ui_require_jquery_file('colorpicker');

pandora_console/godmode/servers/servers.build_table.php

@@ -51,11 +51,11 @@ $table->style[0] = 'font-weight: bold';
 $table->align = [];
 $table->align[1] = 'center';
 $table->align[3] = 'center';
-$table->align[8] = 'center';
+$table->align[8] = 'right';
 
 $table->headstyle[1] = 'text-align:center';
 $table->headstyle[3] = 'text-align:center';
-$table->headstyle[8] = 'text-align:center';
+$table->headstyle[8] = 'text-align:right;width: 120px;';
 
 // $table->title = __('Tactical server information');
 $table->titleclass = 'tabletitle';
@@ -231,7 +231,13 @@ if ($tiny) {
 }
 
 if ($tiny) {
-    ui_toggle(html_print_table($table, true), __('Tactical server information'), false, $hidden_toggle);
+    ui_toggle(
+        html_print_table($table, true),
+        __('Tactical server information'),
+        '',
+        '',
+        $hidden_toggle
+    );
 } else {
     html_print_table($table);
 }

pandora_console/godmode/setup/license.php

@@ -1,15 +1,32 @@
 <?php
-// Pandora FMS- http://pandorafms.com
+/**
-// ==================================================
+ * License form.
-// Copyright (c) 2005-2011 Artica Soluciones Tecnologicas
+ *
-// This program is free software; you can redistribute it and/or
+ * @category   Form
-// modify it under the terms of the GNU General Public License
+ * @package    Pandora FMS
-// as published by the Free Software Foundation for version 2.
+ * @subpackage Enterprise
-// This program is distributed in the hope that it will be useful,
+ * @version    1.0.0
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * @license    See below
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *
-// GNU General Public License for more details.
+ *    ______                 ___                    _______ _______ ________
-// Load global vars
+ *   |   __ \.-----.--.--.--|  |.-----.----.-----. |    ___|   |   |     __|
+ *  |    __/|  _  |     |  _  ||  _  |   _|  _  | |    ___|       |__     |
+ * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
+ *
+ * ============================================================================
+ * Copyright (c) 2005-2019 Artica Soluciones Tecnologicas
+ * Please see http://pandorafms.org for full contribution list
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation for version 2.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * ============================================================================
+ */
+
+// File begin.
 global $config;
 
 check_login();
@@ -22,22 +39,38 @@ if (! check_acl($config['id_user'], 0, 'PM')) {
 
 $update_settings = (bool) get_parameter_post('update_settings');
 
-ui_print_page_header(__('License management'), 'images/extensions.png', false, '', true);
+if (is_metaconsole()) {
+    // Metaconsole.
+    ui_require_javascript_file_enterprise('load_enterprise', true);
+    enterprise_include_once('include/functions_license.php');
+} else {
+    ui_print_page_header(
+        __('License management'),
+        'images/extensions.png',
+        false,
+        '',
+        true
+    );
 
-if ($update_settings) {
+    ui_require_javascript_file_enterprise('load_enterprise');
-    foreach ($_POST['keys'] as $key => $value) {
+    enterprise_include_once('include/functions_license.php');
-        db_process_sql_update(
+}
-            'tupdate_settings',
+
-            [db_escape_key_identifier('value') => $value],
+if ($update_settings) {
-            [db_escape_key_identifier('key') => $key]
+    if (!is_metaconsole()) {
-        );
+        // Node.
-    }
+        foreach ($_POST['keys'] as $key => $value) {
-
+            db_process_sql_update(
-    ui_print_success_message(__('License updated'));
+                'tupdate_settings',
+                [db_escape_key_identifier('value') => $value],
+                [db_escape_key_identifier('key') => $key]
+            );
+        }
+
+        ui_print_success_message(__('License updated'));
+    }
 }
 
-ui_require_javascript_file_enterprise('load_enterprise');
-enterprise_include_once('include/functions_license.php');
 $license = enterprise_hook('license_get_info');
 
 $rows = db_get_all_rows_in_table('tupdate_settings');
@@ -55,11 +88,20 @@ if (enterprise_installed()) {
 echo '</script>';
 
 echo '<form method="post">';
+// Retrieve UM url configured (or default).
+$url = get_um_url();
 
 $table = new stdClass();
 $table->width = '100%';
 $table->class = 'databox filters';
 
+if (is_metaconsole()) {
+    $table->head[0] = __('Licence');
+    $table->head_colspan[0] = 3;
+    $table->headstyle[0] = 'text-align: center';
+    $table->style[0] = 'font-weight: bold;';
+}
+
 $table->data = [];
 
 $table->data[0][0] = '<strong>'.__('Customer key').'</strong>';
@@ -93,39 +135,52 @@ $table->data[9][0] = '<strong>'.__('Licensed to').'</strong>';
 $table->data[9][1] = html_print_input_text('licensed_to', $license['licensed_to'], '', 64, 255, true, true);
 
 html_print_table($table);
-if (enterprise_installed()) {
+
+// If DESTDIR is defined the enterprise license is expired.
+if (enterprise_installed() || defined('DESTDIR')) {
     echo '<div class="action-buttons" style="width: '.$table->width.'">';
     html_print_input_hidden('update_settings', 1);
     html_print_submit_button(__('Validate'), 'update_button', false, 'class="sub upd"');
     echo '&nbsp;&nbsp;';
-    html_print_button(__('Request new license'), '', false, 'generate_request_code()', 'class="ui-button-dialog ui-widget ui-state-default ui-corner-all ui-button-text-only sub next"');
+    html_print_button(__('Request new license'), '', false, 'generate_request_code()', 'class="sub next"');
     echo '</div>';
 }
 
-echo '</form>';
+if (is_metaconsole()) {
-echo '<div id="code_license_dialog" style="display: none; text-align: left;" title="'.__('Request new license').'">';
+    ui_require_css_file('pandora_enterprise', '../../'.ENTERPRISE_DIR.'/include/styles/');
-echo '<div id="logo">';
+    ui_require_css_file('register', '../../include/styles/');
-html_print_image(ui_get_custom_header_logo(true));
+} else {
-echo '</div>';
+    ui_require_css_file('pandora');
-echo ''.__('To get your <b>%s Enterprise License</b>:', get_product_name()).'<br />';
+    ui_require_css_file('pandora_enterprise', ENTERPRISE_DIR.'/include/styles/');
-echo '<ul>';
+    ui_require_css_file('register');
-echo '<li>';
+}
-echo ''.sprintf(__('Go to %s'), '<a target="_blank" href="https://licensing.artica.es/pandoraupdate7/index.php?section=generate_key_client">https://licensing.artica.es/pandoraupdate7/index.php?section=generate_key_client</a>');
+
-echo '</li>';
+if (enterprise_hook('print_activate_licence_dialog') == ENTERPRISE_NOT_HOOK) {
-echo '<li>';
+    echo '</form>';
-echo ''.__('Enter the <b>auth key</b> and the following <b>request key</b>:');
+    echo '<div id="code_license_dialog" style="display: none; text-align: left;" title="'.__('Request new license').'">';
-echo '</li>';
+    echo '<div id="logo">';
-echo '</ul>';
+    html_print_image(ui_get_custom_header_logo(true));
-echo '<div id="code"></div>';
+    echo '</div>';
-echo '<ul>';
+    echo ''.__('To get your <b>%s Enterprise License</b>:', get_product_name()).'<br />';
-echo '<li>';
+    echo '<ul>';
-echo ''.__('Enter your name (or a company name) and a contact email address.');
+    echo '<li>';
-echo '</li>';
+    echo ''.sprintf(__('Go to %s'), '<a target="_blank" href="'.$url.'/index.php?section=generate_key_client">'.$url.'index.php?section=generate_key_client</a>');
-echo '<li>';
+    echo '</li>';
-echo ''.__('Click on <b>Generate</b>.');
+    echo '<li>';
-echo '</li>';
+    echo ''.__('Enter the <b>auth key</b> and the following <b>request key</b>:');
-echo '<li>';
+    echo '</li>';
-echo ''.__('Click <a href="javascript: close_code_license_dialog();">here</a>, enter the generated license key and click on <b>Validate</b>.');
+    echo '</ul>';
-echo '</li>';
+    echo '<div id="code"></div>';
-echo '</ul>';
+    echo '<ul>';
-echo '</div>';
+    echo '<li>';
+    echo ''.__('Enter your name (or a company name) and a contact email address.');
+    echo '</li>';
+    echo '<li>';
+    echo ''.__('Click on <b>Generate</b>.');
+    echo '</li>';
+    echo '<li>';
+    echo ''.__('Click <a href="javascript: close_code_license_dialog();">here</a>, enter the generated license key and click on <b>Validate</b>.');
+    echo '</li>';
+    echo '</ul>';
+    echo '</div>';
+}

pandora_console/godmode/setup/performance.php

@@ -247,8 +247,7 @@ $table->style[0] = 'font-weight: bold';
 $table->size[0] = '70%';
 $table->size[1] = '30%';
 
-enterprise_hook('enterprise_warnings_history_days');
+// enterprise_hook('enterprise_warnings_history_days');
-
 $table->data[1][0] = __('Max. days before delete events');
 $table->data[1][0] .= ui_print_help_tip(
     __('If the compaction or purge of the data is more frequent than the events deletion, anomalies in module graphs could appear'),

pandora_console/godmode/setup/setup_ehorus.php

@@ -66,6 +66,12 @@ $table_remote->class = 'databox filters';
 $table_remote->size['name'] = '30%';
 $table_remote->style['name'] = 'font-weight: bold';
 
+// Enable eHorus user configuration.
+$row = [];
+$row['name'] = ('eHorus configuration at user level');
+$row['control'] = html_print_checkbox_switch('ehorus_user_level_conf', 1, $config['ehorus_user_level_conf'], true);
+$table_remote->data['ehorus_user_level_conf'] = $row;
+
 // User.
 $row = [];
 $row['name'] = __('User');
@@ -163,9 +169,19 @@ echo '</div>';
 ?>
 
 <script type="text/javascript">
-if(!$('input:checkbox[name="ehorus_enabled"]').is(':checked')){
+
- $('#form_remote').hide();
+if(!$('input:checkbox[name="ehorus_enabled"]').is(':checked'))
+{
+    $('#form_remote').hide();
 }
+
+if($('input:checkbox[name="ehorus_user_level_conf"]').is(':checked'))
+{
+    $('#ehorus-remote-setup-ehorus_user').hide();
+    $('#ehorus-remote-setup-ehorus_pass').hide()
+}
+
+
  $('#form_enable').css('margin-bottom','20px');
     var showFields = function () {
         $('#form_remote').show();
@@ -173,6 +189,17 @@ if(!$('input:checkbox[name="ehorus_enabled"]').is(':checked')){
     var hideFields = function () {
         $('#form_remote').hide();
     }
+
+    var hideUserPass = function () {
+        $('#ehorus-remote-setup-ehorus_user').hide();
+        $('#ehorus-remote-setup-ehorus_pass').hide();
+    }
+
+    var showUserPass = function () {
+        $('#ehorus-remote-setup-ehorus_user').show();
+        $('#ehorus-remote-setup-ehorus_pass').show();
+    }
+
     var handleEnable = function (event) {
         var is_checked = $('input:checkbox[name="ehorus_enabled"]').is(':checked');
         if (event.target.value == '1' && is_checked) {
@@ -184,15 +211,32 @@ if(!$('input:checkbox[name="ehorus_enabled"]').is(':checked')){
             $('input:checkbox[name="ehorus_enabled"]').attr('checked', false);
         };
     }
+
+    var handleUserLevel = function(event) {
+        var is_checked = $('input:checkbox[name="ehorus_enabled"]').is(':checked');
+        var is_checked_userlevel = $('input:checkbox[name="ehorus_user_level_conf"]').is(':checked');
+        
+        if (event.target.value == '1' && is_checked && !is_checked_userlevel) {
+            showUserPass();
+            $('input:checkbox[name="ehorus_user_level_conf"]').attr('checked', true);
+        }
+        else {
+            hideUserPass();
+            $('input:checkbox[name="ehorus_user_level_conf"]').attr('checked', false);
+        };
+    }
+
     $('input:checkbox[name="ehorus_enabled"]').change(handleEnable);
-    
+    $('input:checkbox[name="ehorus_user_level_conf"]').change(handleUserLevel);
+
     var handleTest = function (event) {
         var user = $('input#text-ehorus_user').val();
         var pass = $('input#password-ehorus_pass').val();
         var host = $('input#text-ehorus_hostname').val();
         var port = $('input#text-ehorus_port').val();
         var timeout = Number.parseInt($('input#text-ehorus_req_timeout').val(), 10);
-        
+        var is_checked_user_level = $('input:checkbox[name="ehorus_user_level_conf"]').is(':checked');
+    
         var timeoutMessage = '<?php echo __('Connection timeout'); ?>';
         var badRequestMessage = '<?php echo __('Empty user or password'); ?>';
         var notFoundMessage = '<?php echo __('User not found'); ?>';
@@ -230,7 +274,7 @@ if(!$('input:checkbox[name="ehorus_enabled"]').is(':checked')){
         hideFailureImage();
         hideMessage();
         showLoadingImage();
-
+       
         $.ajax({
             url: 'https://' + host + ':' + port + '/login',
             type: 'POST',
@@ -245,9 +289,11 @@ if(!$('input:checkbox[name="ehorus_enabled"]').is(':checked')){
             showSuccessImage();
         })
         .fail(function(xhr, textStatus, errorThrown) {
-            showFailureImage();
+            if((xhr.status === 400 || xhr.status === 403) && is_checked_user_level)
-            
+            {
-            if (xhr.status === 400) {
+                showSuccessImage();
+                return;
+            }else if (xhr.status === 400) {
                 changeTestMessage(badRequestMessage);
             }
             else if (xhr.status === 401 || xhr.status === 403) {
@@ -262,6 +308,8 @@ if(!$('input:checkbox[name="ehorus_enabled"]').is(':checked')){
             else {
                 changeTestMessage(errorThrown);
             }
+                        
+            showFailureImage();
             showMessage();
         })
         .always(function(xhr, textStatus) {
@@ -269,4 +317,7 @@ if(!$('input:checkbox[name="ehorus_enabled"]').is(':checked')){
         });
     }
     $('input#button-test-ehorus').click(handleTest);
+    
+
+
 </script>

pandora_console/godmode/setup/setup_notifications.php

@@ -160,6 +160,20 @@ if (get_parameter('get_notifications_dropdown', 0)) {
     return;
 }
 
+if (get_parameter('get_notification', 0)) {
+    $msg_id = get_parameter('id', 0);
+
+    if ($msg_id > 0) {
+        $msg = messages_get_message($msg_id);
+
+        $msg['mensaje'] = io_safe_output($msg['mensaje']);
+        $msg['subject'] = io_safe_output($msg['subject']);
+        echo json_encode($msg);
+    }
+
+    return;
+}
+
 // Notification table. It is just a wrapper.
 $table_content = new StdClass();
 $table_content->data = [];

pandora_console/godmode/setup/setup_visuals.php

@@ -918,6 +918,32 @@ $row++;
     );
     $row++;
 
+    $intervals = [
+        10   => '10 '.__('seconds'),
+        30   => '30 '.__('seconds'),
+        60   => '1 '.__('minutes'),
+        300  => '5 '.__('minutes'),
+        900  => '15 '.__('minutes'),
+        1800 => '30 '.__('minutes'),
+        3600 => '1 '.__('hour'),
+    ];
+    $table_vc->data[$row][0] = __('Default cache expiration');
+    $table_vc->data[$row][1] = html_print_extended_select_for_time(
+        'vc_default_cache_expiration',
+        $config['vc_default_cache_expiration'],
+        '',
+        __('No cache'),
+        0,
+        false,
+        true,
+        false,
+        false,
+        '',
+        false,
+        $intervals
+    );
+    $row++;
+
     $table_vc->data[$row][0] = __('Default interval for refresh on Visual Console').ui_print_help_tip(__('This interval will affect to Visual Console pages'), true);
     $table_vc->data[$row][1] = html_print_select($values, 'vc_refr', (int) $config['vc_refr'], '', 'N/A', 0, true, false, false);
     $row++;
@@ -1394,6 +1420,15 @@ tinyMCE.init({
 });
 
 $(document).ready (function () {
+
+    // Show the cache expiration conf or not.
+    $("input[name=legacy_vc]").change(function (e) {
+        if ($(this).prop("checked") === true) {
+            $("select#vc_default_cache_expiration_select").closest("tr").hide();
+        } else {
+            $("select#vc_default_cache_expiration_select").closest("tr").show();
+        }
+    }).change();
     
     var comfort = 0;
     

pandora_console/godmode/snmpconsole/snmp_alert.php

@@ -1275,7 +1275,7 @@ if ($create_alert || $update_alert) {
     $table->align[7] = 'left';
 
     $table->head[8] = __('Action');
-    $table->size[8] = '90px';
+    $table->size[8] = '120px';
     $table->align[8] = 'left';
 
     $table->head[9] = html_print_checkbox('all_delete_box', '1', false, true);

pandora_console/godmode/update_manager/update_manager.css

@@ -34,7 +34,7 @@
   float: none;
 }
 #drop_file a {
-  background-color: #80ba27;
+  background-color: #82b92e;
   border-radius: 2px;
   color: #ffffff;
   cursor: pointer;
@@ -101,7 +101,7 @@
   width: 15px;
 }
 .fileupload_form ul li div {
-  display: block !important;
+  display: block;
 }
 .fileupload_form ul li.working span {
   background-position: 0 -12px;
@@ -183,39 +183,22 @@ div#box_online * {
 
 .update_text a {
   font-size: 11pt;
-  color: #82b92e !important;
+  color: #82b92e;
 }
 
 .ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset {
-  float: left !important;
+  float: left;
   padding-left: 19px;
   padding-bottom: 5px;
 }
 
-.ui-dialog-buttonset > button.ui-button.ui-corner-all.ui-widget {
-  background-color: #cecece !important;
-  border: none !important;
-  border-radius: 2px !important;
-  text-transform: uppercase !important;
-  font-weight: bold !important;
-}
-
-.ui-dialog-buttonset > button.success_button.ui-button.ui-corner-all.ui-widget,
-.update_manager_button {
-  background-color: #82b92e !important;
-  color: #fff !important;
-  border-radius: 2px !important;
-  text-transform: uppercase !important;
-  font-weight: bold !important;
-}
-
 a.update_manager_button {
   padding: 10px 12px;
   margin-top: 10px;
   display: inline-flex;
   align-items: center;
-  font-size: 16px !important;
+  font-size: 16px;
-  border-radius: 4px !important;
+  border-radius: 4px;
   text-decoration: none;
   font-family: "Open Sans", sans-serif;
 }
@@ -231,7 +214,7 @@ a.update_manager_button:after {
 
 .ui-draggable,
 .ui-draggable .ui-dialog-titlebar {
-  cursor: default !important;
+  cursor: default;
 }
 
 #box_online #pkg_version {
@@ -242,10 +225,10 @@ a.update_manager_button:after {
 
 /* METACONSOLE */
 .box_online_meta {
-  background: none !important;
+  background: none;
-  min-height: 400px !important;
+  min-height: 400px;
   text-align: center;
-  border: none !important;
+  border: none;
 }
 
 div#box_online.box_online_meta * {
@@ -277,7 +260,7 @@ div#box_online.box_online_meta * {
 }
 
 .update_manager_warning p {
-  font-size: 10pt !important;
+  font-size: 10pt;
 }
 
 .update_manager_warning img {
@@ -287,8 +270,8 @@ div#box_online.box_online_meta * {
 
 a.update_manager_button_open {
   padding: 5px 10px;
-  font-size: 16px !important;
+  font-size: 16px;
-  border-radius: 4px !important;
+  border-radius: 4px;
   text-decoration: none;
   border: 1px solid #82b92e;
   color: #82b92e;

pandora_console/godmode/update_manager/update_manager.messages.php

@@ -1,340 +0,0 @@
-<?php
-
-// Pandora FMS - http://pandorafms.com
-// ==================================================
-// Copyright (c) 2005-2011 Artica Soluciones Tecnologicas
-// Please see http://pandorafms.org for full contribution list
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; version 2
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-global $config;
-require_once 'include/functions_update_manager.php';
-check_login();
-
-if (! check_acl($config['id_user'], 0, 'PM') && ! is_user_admin($config['id_user'])) {
-    db_pandora_audit('ACL Violation', 'Trying to access Setup Management');
-    include 'general/noaccess.php';
-    return;
-}
-
-if (is_ajax()) {
-    $not_read_single = get_parameter('not_read_single', 0);
-
-    if ($not_read_single) {
-        $message_id = get_parameter('message_id', 0);
-        update_manger_set_read_message($message_id, 1);
-        update_manager_remote_read_messages($message_id);
-    }
-
-    return;
-}
-
-$not_read_action = get_parameter('not_read_button', false);
-$read_action = get_parameter('read_button', false);
-$delete_action = get_parameter('delete_button', false);
-
-if ($not_read_action !== false) {
-    $selected = get_parameter('select_multiple', false);
-    foreach ($selected as $k => $message_id) {
-        update_manger_set_read_message($message_id, 0);
-    }
-}
-
-if ($read_action !== false) {
-    $selected = get_parameter('select_multiple', false);
-    foreach ($selected as $k => $message_id) {
-        update_manger_set_read_message($message_id, 1);
-    }
-}
-
-if ($delete_action !== false) {
-    $selected = get_parameter('select_multiple', false);
-    foreach ($selected as $k => $message_id) {
-        update_manger_set_deleted_message($message_id);
-    }
-}
-
-$offset = (int) get_parameter('offset', 0);
-
-$total_messages = update_manager_get_not_deleted_messages();
-if ($total_messages) {
-    // Get all messages
-    $sql = 'SELECT data, svn_version, filename, data_rollback, db_field_value FROM tupdate ';
-    $sql .= 'WHERE description NOT LIKE \'%"'.$config['id_user'].'":1%\' ';
-    $sql .= 'OR description IS NULL ';
-    $sql .= 'ORDER BY svn_version DESC ';
-    $sql .= 'LIMIT '.$offset.','.$config['block_size'].' ';
-    $um_messages = [];
-    $um_messages = db_get_all_rows_sql($sql);
-
-    echo '<form method="post" action="index.php?sec=gsetup&sec2=godmode/update_manager/update_manager&tab=setup">';
-
-    html_print_input_hidden('tab', 'messages');
-    html_print_input_hidden('offset', $offset);
-    echo '<div class="action-buttons" style="float:right; padding: 10px 5px">';
-    html_print_submit_button(
-        __('Delete'),
-        'delete_button',
-        false,
-        'class="sub delete"'
-    );
-    echo '</div>';
-
-    echo '<div class="action-buttons" style="float:right; padding: 10px 5px">';
-    html_print_submit_button(
-        __('Mark as not read'),
-        'not_read_button',
-        false,
-        'class="sub wand"'
-    );
-    echo '</div>';
-
-    echo '<div class="action-buttons" style="float:right; padding: 10px 5px">';
-    html_print_submit_button(
-        __('Mark as read'),
-        'read_button',
-        false,
-        'class="sub upd"'
-    );
-    echo '</div>';
-
-    // Pagination
-    if ($total_messages > $config['block_size']) {
-        ui_pagination(update_manager_get_total_messages(), false, 0);
-    }
-
-    $table = new stdClass();
-        $table->width = '100%';
-        $table->class = 'databox data';
-        $table->cellpadding = 4;
-        $table->cellspacing = 4;
-        $table->head = [];
-        $table->data = [];
-        $table->align = [];
-        $table->size = [];
-        $table->id = 'um_messages_table';
-
-        $table->align[0] = 'left';
-        $table->align[1] = 'left';
-        $table->align[2] = 'left';
-        $table->align[3] = 'left';
-        $table->align[4] = 'left';
-
-        $table->size[0] = '30px';
-        $table->size[1] = '100px';
-        $table->size[3] = '80px';
-        $table->size[4] = '60px';
-
-        $table->style[0] = 'padding-left: 20px';
-        $table->style[1] = 'display: none';
-
-        $table->head[0] = html_print_checkbox_extended('all_selection[]', 0, false, false, '', '', true);
-        $table->head[2] = __('Subject');
-
-
-        $i = 0;
-    foreach ($um_messages as $message) {
-        $data[0] = html_print_checkbox_extended('select_multiple[]', $message['svn_version'], false, false, '', 'class="check_selection"', true);
-        $table->cellclass[count($table->data)][0] = 'um_individual_check';
-
-        $data[1] = $message['svn_version'];
-        $table->cellclass[count($table->data)][1] = 'um_individual_info';
-
-        $data[2] = io_safe_output($message['db_field_value']);
-        $table->cellclass[count($table->data)][2] = 'um_individual_subject';
-
-
-        // Change row class if message is read or not by this user
-        if (update_manger_get_read_message($message['svn_version'], $message['data_rollback'])) {
-            $table->rowclass[count($table->data)] = 'um_read_message';
-        } else {
-            $table->rowclass[count($table->data)] = 'um_not_read_message';
-        }
-
-        array_push($table->data, $data);
-    }
-
-    html_print_table($table);
-
-    echo '<div class="action-buttons" style="float:right; padding: 0 5px;">';
-    html_print_submit_button(
-        __('Delete'),
-        'delete_button',
-        false,
-        'class="sub delete"'
-    );
-    echo '</div>';
-
-    echo '<div class="action-buttons" style="float:right; padding: 0 5px;">';
-    html_print_submit_button(
-        __('Mark as not read'),
-        'not_read_button',
-        false,
-        'class="sub wand"'
-    );
-    echo '</div>';
-
-    echo '<div class="action-buttons" style="float:right; padding: 0 5px;">';
-    html_print_submit_button(
-        __('Mark as read'),
-        'read_button',
-        false,
-        'class="sub upd"'
-    );
-    echo '</div>';
-    echo '</form>';
-
-    // Get unread messages to update the notification ball.
-    // Clean the cache because the unread messages can be different.
-    db_clean_cache();
-    $total_unread_messages = update_manager_get_unread_messages();
-} else {
-    ui_print_info_message([ 'no_close' => true, 'message' => __('There is not any update manager messages.') ]);
-}
-?>
-
-<script type="text/javascript">
-    
-    var total_unread_messages = <?php echo json_encode($total_unread_messages); ?>;
-    
-    $("#checkbox-all_selection").click( function() {
-        if ($("#checkbox-all_selection").is(':checked')) {
-            $(".check_selection").prop('checked', true);
-            $(".check_selection").parent().parent().css('background', "#FFFFEE");
-        } else {
-            $(".check_selection").prop('checked', false);
-            $(".check_selection").parent().parent().css('background', "inherit");
-        }
-    });
-    
-    $("#um_messages_table").click( function (event) {
-        
-        //Get all position information required
-        var target = (event.target.id);
-        
-        //If header is clicked, return
-        if (target == '') return;
-        
-        var raw_position = (event.target.id).replace(/.*table-/ig,"");
-        var row = raw_position.replace(/-.*/ig, "");
-        var column = raw_position.replace(/.*-/ig, "");
-        
-        // Delete and mark as not read column will do not open the message
-        if (column == 0) return;
-            
-        // Class where object will be displayed
-        var current_class = ".um_message_" + row;
-        var message_id = $("#"+target).parent().find(":nth-child(2)").html();
-        var className = $("#"+target).parent().attr('class');
-        
-        if (className == 'um_not_read_message'){
-                
-            jQuery.post ("ajax.php",
-                {"page": "godmode/update_manager/update_manager.messages",
-                 "not_read_single": 1,
-                 "message_id": message_id},
-                function (data) {}
-            );
-            
-            $("#"+target).parent().children().each(function(){
-                var full_class = $(this).attr('class');
-                full_class = full_class.replace (/um_not_read_message/g, "um_read_message");
-                $(this).attr('class', full_class);
-            });
-            
-            var unread = $("#icon_god-um_messages").find(".notification_ball").html();
-            unread--;
-            if (unread == 0) {
-                    $("#icon_god-um_messages").find(".notification_ball").hide();
-                }
-                else {
-                    $("#icon_god-um_messages").find(".notification_ball").html(unread);
-                }
-        }
-        
-        // Display message
-        $("#container").append('<div class="id_wizard"></div>');
-        jQuery.get ("ajax.php",
-            {"page": "general/last_message",
-             "message_id": message_id},
-            function (data) {
-                $(".id_wizard").hide ()
-                    .empty ()
-                    .append (data);
-            },
-            "html"
-        );
-        
-    });
-    
-    $(".check_selection").click(function (event) {
-        
-        if ($("#" + event.target.id).is(':checked')) {
-            $("#" + event.target.id).parent().parent().css('background', "#FFFFEE");
-        } else {
-            $("#" + event.target.id).parent().parent().css('background', 'inherit');
-        }
-    });
-    
-    $(".um_individual_info, .um_individual_subject").hover(
-        function () {
-            $(this).parent().css('background', '#F2F2F2');
-        },
-        function () {
-            if ($(this).parent().find(":first-child").is(':checked')) {
-                $(this).parent().css('background', "#FFFFEE");
-            } else {
-                $(this).parent().css('background', 'inherit');
-            }
-        }
-    );
-    
-    $(document).ready (function () {
-        
-        // Rewrite the notification ball
-        if (total_unread_messages == 0) {
-            $("#icon_god-um_messages").find(".notification_ball").hide();
-        }
-        else {
-            $("#icon_god-um_messages").find(".notification_ball").html(total_unread_messages);
-        }
-    });
-    
-</script>
-
-<style type="text/css">
-
-    .um_not_read_message{
-        font-weight: 900;
-    }
-    .um_read_message{
-        font-weight: 500;
-        color: #909090;
-    }
-    
-    .um_individual_info, .um_individual_subject {
-        cursor: pointer;
-    }
-    
-    .databox td {
-        padding-top: 15px;
-        padding-bottom: 15px;
-    }
-    
-    td input[type=checkbox] {
-        ms-transform: scale(1);
-        moz-transform: scale(1);
-        o-transform: scale(1);
-        webkit-transform: scale(1);
-        transform: scale(1);
-    }
-    
-    .c0 {
-        padding-left: 17px !important;
-    }
-    
-</style>

pandora_console/godmode/update_manager/update_manager.online.php

@@ -1,22 +1,32 @@
 <?php
-
 /**
-    Pandora FMS - http://pandorafms.com
+ * Extension to self monitor Pandora FMS Console
- * ==================================================
+ *
+ * @category   Update Manager
+ * @package    Pandora FMS
+ * @subpackage Update Manager Online
+ * @version    1.0.0
+ * @license    See below
+ *
+ *    ______                 ___                    _______ _______ ________
+ *   |   __ \.-----.--.--.--|  |.-----.----.-----. |    ___|   |   |     __|
+ *  |    __/|  _  |     |  _  ||  _  |   _|  _  | |    ___|       |__     |
+ * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
+ *
+ * ============================================================================
  * Copyright (c) 2005-2019 Artica Soluciones Tecnologicas
  * Please see http://pandorafms.org for full contribution list
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; version 2
+ * as published by the Free Software Foundation for version 2.
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * ============================================================================
- * @package    category
- * @subpackage category
  */
 
+// Begin.
 global $config;
 
 check_login();
@@ -28,154 +38,193 @@ if (! check_acl($config['id_user'], 0, 'PM') && ! is_user_admin($config['id_user
 }
 
 ui_require_css_file('update_manager', 'godmode/update_manager/');
-if (!is_metaconsole()) {
+require_once __DIR__.'/../../include/functions_update_manager.php';
-    include_once 'include/functions_update_manager.php';
-} else {
-    include_once '../../include/functions_update_manager.php';
-}
 
 enterprise_include_once('include/functions_update_manager.php');
 
-$current_package = update_manager_get_current_package();
+require_once __DIR__.'/../../include/functions_config.php';
 
-if (!enterprise_installed()) {
+$memory_limit_min = '500M';
-    $open = true;
+$post_max_size_min = '800M';
-}
+$upload_max_filesize_min = '800M';
 
-$memory_limit = ini_get('memory_limit');
+$PHPmemory_limit_min = config_return_in_bytes($memory_limit_min);
-$memory_limit = str_replace('M', '', $memory_limit);
+$PHPpost_max_size_min = config_return_in_bytes($post_max_size);
-$memory_limit = (int) $memory_limit;
+$PHPupload_max_filesize_min = config_return_in_bytes($upload_max_filesize_min);
-if ($memory_limit < 500) {
+
+$php_settings_fine = 0;
+$PHP_SETTINGS_REQUIRED = 3;
+
+$memory_limit = config_return_in_bytes(ini_get('memory_limit'));
+if ($memory_limit < $PHPmemory_limit_min) {
     ui_print_error_message(
-        sprintf(__('Your PHP has set memory limit in %s. For avoid problems with big updates please set to 500M'), ini_get('memory_limit'))
+        sprintf(
+            __('Your PHP has set memory limit in %s. To use Update Manager Online, please set it to %s'),
+            ini_get('memory_limit'),
+            $memory_limit_min
+        )
     );
-}
-
-$post_max_size = ini_get('post_max_size');
-$post_max_size = str_replace('M', '', $post_max_size);
-if ($memory_limit < 100) {
-    ui_print_error_message(
-        sprintf(__('Your PHP has set post parameter max size limit in %s. For avoid problems with big updates please set to 100M'), ini_get('post_max_size'))
-    );
-}
-
-$upload_max_filesize = ini_get('upload_max_filesize');
-$upload_max_filesize = str_replace('M', '', $upload_max_filesize);
-if ($memory_limit < 100) {
-    ui_print_error_message(
-        sprintf(__('Your PHP has set maximum allowed size for uploaded files limit in %s. For avoid problems with big updates please set to 100M'), ini_get('upload_max_filesize'))
-    );
-}
-
-// Translators: Do not translade Update Manager, it's the name of the program.
-if (is_metaconsole()) {
-    echo "<style type='text/css' media='screen'>
-  		@import 'styles/meta_pandora.css';
-	</style>";
-}
-
-if (is_metaconsole()) {
-    $baseurl = ui_get_full_url(false, false, false, false);
-    echo ' <link rel="stylesheet" type="text/css" href="'.$baseurl.'/godmode/update_manager/update_manager.css">';
-    echo "<div id='box_online' class='box_online_meta'>";
 } else {
-    echo "<div id='box_online'>";
+    $php_settings_fine++;
 }
 
-echo "<span class='loading' style='font-size:18pt;'>";
+$post_max_size = config_return_in_bytes(ini_get('post_max_size'));
-echo "<img src='images/wait.gif' />";
+if ($post_max_size < $PHPpost_max_size_min) {
-echo '</span>';
+    ui_print_error_message(
-
+        sprintf(
-echo '<p style="font-weight: 600;">'.__('The latest version of package installed is:').'</p>';
+            __('Your PHP has post_max_size limited to %s. To use Update Manager Online, please set it to %s'),
-if ($open) {
+            ini_get('post_max_size'),
-    echo '<div id="pkg_version" style="font-size:40pt;">'.$build_version.'</div>';
+            $post_max_size_min
+        )
+    );
 } else {
-    echo '<div id="pkg_version">'.$current_package.'</div>';
+    $php_settings_fine++;
 }
 
-    echo "<div class='checking_package' style='font-size:18pt;width:100%; display: none;'>";
+$upload_max_filesize = config_return_in_bytes(ini_get('upload_max_filesize'));
-        echo __('Checking for the newest package.');
+if ($upload_max_filesize < $PHPupload_max_filesize_min) {
-    echo '</div>';
+    ui_print_error_message(
+        sprintf(
+            __('Your PHP has set maximum allowed size for uploaded files limit in %s. To use Update Manager Online, please set it to %s'),
+            ini_get('upload_max_filesize'),
+            $upload_max_filesize_min
+        )
+    );
+} else {
+    $php_settings_fine++;
+}
 
-    echo "<div class='downloading_package' style='font-size:18pt;width:100%; display: none;'>";
+// Verify registry.
-        echo __('Downloading for the newest package.');
+if (update_manager_verify_registration() === false) {
-    echo '</div>';
+    ui_require_css_file('register');
+    registration_wiz_modal(false, true, 'location.reload()');
+    ui_print_error_message(
+        __('Update Manager Online requires registration')
+    );
+} else {
+    // Console registered.
+    $current_package = update_manager_get_current_package();
 
-    echo "<div class='content'></div>";
+    if (!enterprise_installed()) {
+        $open = true;
+    }
 
-    echo "<div class='progressbar' style='display: none;'><img class='progressbar_img' src='' /></div>";
+    // Translators: Do not translade Update Manager, it's the name of the program.
+    if (is_metaconsole()) {
+        echo "<style type='text/css' media='screen'>
+            @import 'styles/meta_pandora.css';
+        </style>";
+    }
+
+    if (is_metaconsole()) {
+        $baseurl = ui_get_full_url(false, false, false, false);
+        echo ' <link rel="stylesheet" type="text/css" href="'.$baseurl.'/godmode/update_manager/update_manager.css">';
+        echo "<div id='box_online' class='box_online_meta'>";
+    } else {
+        echo "<div id='box_online'>";
+    }
+
+    if ($php_settings_fine >= $PHP_SETTINGS_REQUIRED) {
+        echo "<span class='loading' style='font-size:18pt;'>";
+        echo "<img src='images/wait.gif' />";
+        echo '</span>';
+    }
+
+    echo '<p style="font-weight: 600;">'.__('The latest version of package installed is:').'</p>';
+    if ($open) {
+        echo '<div id="pkg_version" style="font-size:40pt;">'.$build_version.'</div>';
+    } else {
+        echo '<div id="pkg_version">'.$current_package.'</div>';
+    }
+
+        echo "<div class='checking_package' style='font-size:18pt;width:100%; display: none;'>";
+            echo __('Checking for the newest package.');
+        echo '</div>';
+
+        echo "<div class='downloading_package' style='font-size:18pt;width:100%; display: none;'>";
+            echo __('Downloading for the newest package.');
+        echo '</div>';
+
+        echo "<div class='content'></div>";
+
+        echo "<div class='progressbar' style='display: none;'><img class='progressbar_img' src='' /></div>";
 
 
     /*
-        -------------------------------------------------------------------------
+     * -------------------------------------------------------------------------
+     * Hello there! :)
+     * We added some of what seems to be "buggy" messages to the openSource
+     * version recently. This is not to force open-source users to move to the
+     * enterprise version, this is just to inform people using Pandora FMS open
+     * source that it requires skilled people to maintain and keep it running
+     * smoothly without professional support. This does not imply open-source
+     * version is limited in any way. If you check the recently added code, it
+     * contains only warnings and messages, no limitations except one:
+     * we removed the option to add custom logo in header.
+     *
+     * In the Update Manager section, it warns about the 'danger’ of applying
+     * automated updates without a proper backup, remembering in the process
+     * that the Enterprise version comes with a human-tested package.
+     *
+     * Maintaining an OpenSource version with more than 500 agents is not so
+     * easy, that's why someone using a Pandora with 8000 agents should consider
+     * asking for support. It's not a joke, we know of many setups with a huge
+     * number of agents, and we hate to hear that “its becoming unstable and
+     * slow” :(
+     *
+     * You can of course remove the warnings, that's why we include the source
+     * and do not use any kind of trick. And that's why we added here this
+     * comment, to let you know this does not reflect any change in our
+     * opensource mentality of does the last 14 years.
+     * -------------------------------------------------------------------------
+     */
 
-        Hello there! :)
+    if ($open) {
+            echo "<div class='update_manager_open'>
+            <div class='update_manager_warning'>
+                <div><img src='images/icono_info.png'></div>
+            <div><p>".__('WARNING: You are just one click away from an automated update. This may result in a damaged system, including loss of data and operativity. Check you have a recent backup. OpenSource updates are automatically created packages, and there is no WARRANTY or SUPPORT. If you need professional support and warranty, please upgrade to Enterprise Version.')."</p></div>
+            </div>
+            <div style='text-align:center; margin-top:10px;'>
+                <a class='update_manager_button_open' href='https://pandorafms.com/pandora-fms-enterprise/' target='_blank'>About Enterprise</a>
+            </div>
+        </div>";
+    }
 
-        We added some of what seems to be "buggy" messages to the openSource version
-        recently. This is not to force open-source users to move to the enterprise
-        version, this is just to inform people using Pandora FMS open source that it
-        requires skilled people to maintain and keep it running smoothly without
-        professional support. This does not imply open-source version is limited
-        in any way. If you check the recently added code, it contains only warnings
-        and messages, no limitations except one: we removed the option to add custom
-        logo in header. In the Update Manager section, it warns about the 'danger’
-        of applying automated updates without a proper backup, remembering in the
-        process that the Enterprise version comes with a human-tested package.
-        Maintaining an OpenSource version with more than 500 agents is not so
-        easy, that's why someone using a Pandora with 8000 agents should consider
-        asking for support. It's not a joke, we know of many setups with a huge
-        number of agents, and we hate to hear that “its becoming unstable and slow” :(
 
-        You can of course remove the warnings, that's why we include the source and
+    if ($php_settings_fine >= $PHP_SETTINGS_REQUIRED) {
-        do not use any kind of trick. And that's why we added here this comment, to
+        $enterprise = enterprise_hook('update_manager_enterprise_main');
-        let you know this does not reflect any change in our opensource mentality of
-        does the last 14 years.
 
-        -------------------------------------------------------------------------
+        if ($enterprise == ENTERPRISE_NOT_HOOK) {
-    */
+            // Open view.
+            update_manager_main();
+        }
+        ?>
 
-if ($open) {
+        <script type="text/javascript">
-    echo "<div class='update_manager_open'>
+        var isopen = "<?php echo $open; ?>";
-        <div class='update_manager_warning'>
+        if(isopen){
-            <div><img src='images/icono_info.png'></div>
+            $(document).ready(function() {
-        <div><p>".__('WARNING: You are just one click away from an automated update. This may result in a damaged system, including loss of data and operativity. Check you have a recent backup. OpenSource updates are automatically created packages, and there is no WARRANTY or SUPPORT. If you need professional support and warranty, please upgrade to Enterprise Version.')."</p></div>
+            $('body').append( "<div id='opacidad' style='position:fixed;background:black;opacity:0.6;z-index:1'></div>" );
-        </div>
+            jQuery.post ("ajax.php",
-        <div style='text-align:center; margin-top:10px;'>
+                {
-            <a class='update_manager_button_open' href='https://pandorafms.com/pandora-fms-enterprise/' target='_blank'>About Enterprise</a>
+            "page": "general/alert_enterprise",
-        </div>
+            "message":"infomodal"},
-    </div>";
+                function (data, status) {
+                    $("#alert_messages").hide ()
+                        .css ("opacity", 1)
+                        .empty ()
+                        .append (data)
+                        .show ();
+                },
+                "html"
+            );
+
+        return false;
+
+        });
+        }
+        </script>
+        <?php
+    }
 }
-
-
-$enterprise = enterprise_hook('update_manager_enterprise_main');
-
-if ($enterprise == ENTERPRISE_NOT_HOOK) {
-    // Open view.
-    update_manager_main();
-}
-?>
-
-<script>
-var isopen = "<?php echo $open; ?>";
-if(isopen){
-    $(document).ready(function() {
-    $('body').append( "<div id='opacidad' style='position:fixed;background:black;opacity:0.6;z-index:1'></div>" );
-    jQuery.post ("ajax.php",
-        {
-    "page": "general/alert_enterprise",
-    "message":"infomodal"},
-        function (data, status) {
-            $("#alert_messages").hide ()
-                .css ("opacity", 1)
-                .empty ()
-                .append (data)
-                .show ();
-        },
-        "html"
-    );
-
-return false;
-
-});
-}
-</script>

pandora_console/godmode/update_manager/update_manager.php

@@ -45,12 +45,6 @@ $buttons = [
     ],
 ];
 
-if (license_free()) {
-    $buttons['messages'] = [
-        'active' => ($tab == 'messages') ? true : false,
-        'text'   => '<a href="index.php?sec=gsetup&sec2=godmode/update_manager/update_manager&tab=messages">'.html_print_image('images/email_mc.png', true, ['title' => __('Update manager messages')]).'</a>',
-    ];
-}
 
 switch ($tab) {
     case 'setup':
@@ -66,10 +60,6 @@ switch ($tab) {
         $title = __('Update manager » Online');
         $help_header = 'update_manager_online_tab';
     break;
-
-    case 'messages':
-        $title = __('Update manager » Messages');
-    break;
 }
 
 ui_print_page_header(
@@ -90,10 +80,6 @@ switch ($tab) {
         include $config['homedir'].'/godmode/update_manager/update_manager.offline.php';
     break;
 
-    case 'messages':
-        include $config['homedir'].'/godmode/update_manager/update_manager.messages.php';
-    break;
-
     case 'online':
     default:
         include $config['homedir'].'/godmode/update_manager/update_manager.online.php';

pandora_console/godmode/update_manager/update_manager.setup.php

@@ -1,18 +1,36 @@
 <?php
+/**
+ * Update manager client options.
+ *
+ * @category   Update Manager
+ * @package    Pandora FMS
+ * @subpackage Community
+ * @version    1.0.0
+ * @license    See below
+ *
+ *    ______                 ___                    _______ _______ ________
+ *   |   __ \.-----.--.--.--|  |.-----.----.-----. |    ___|   |   |     __|
+ *  |    __/|  _  |     |  _  ||  _  |   _|  _  | |    ___|       |__     |
+ * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
+ *
+ * ============================================================================
+ * Copyright (c) 2005-2019 Artica Soluciones Tecnologicas
+ * Please see http://pandorafms.org for full contribution list
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation for version 2.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * ============================================================================
+ */
 
-// Pandora FMS - http://pandorafms.com
+// Begin.
-// ==================================================
-// Copyright (c) 2005-2011 Artica Soluciones Tecnologicas
-// Please see http://pandorafms.org for full contribution list
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; version 2
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
 global $config;
 
+require_once __DIR__.'/../../include/functions_users.php';
+
 check_login();
 
 if (! check_acl($config['id_user'], 0, 'PM') && ! is_user_admin($config['id_user'])) {
@@ -27,12 +45,38 @@ $action_update_url_update_manager = (bool) get_parameter(
     0
 );
 
+if (users_is_admin()) {
+    $update_manager_disconnect = get_parameter(
+        'um_disconnect_console',
+        0
+    );
+
+    if ($update_manager_disconnect) {
+        config_update_value(
+            'pandora_uid',
+            'OFFLINE'
+        );
+    }
+}
+
 if (!$action_update_url_update_manager) {
     $url_update_manager = get_parameter('url_update_manager', $config['url_update_manager']);
-    $update_manager_proxy_server = get_parameter('update_manager_proxy_server', $config['update_manager_proxy_server']);
+    $update_manager_proxy_server = get_parameter(
-    $update_manager_proxy_port = get_parameter('update_manager_proxy_port', $config['update_manager_proxy_port']);
+        'update_manager_proxy_server',
-    $update_manager_proxy_user = get_parameter('update_manager_proxy_user', $config['update_manager_proxy_user']);
+        $config['update_manager_proxy_server']
-    $update_manager_proxy_password = get_parameter('update_manager_proxy_password', $config['update_manager_proxy_password']);
+    );
+    $update_manager_proxy_port = get_parameter(
+        'update_manager_proxy_port',
+        $config['update_manager_proxy_port']
+    );
+    $update_manager_proxy_user = get_parameter(
+        'update_manager_proxy_user',
+        $config['update_manager_proxy_user']
+    );
+    $update_manager_proxy_password = get_parameter(
+        'update_manager_proxy_password',
+        $config['update_manager_proxy_password']
+    );
 
 
     if ($action_update_url_update_manager) {
@@ -69,7 +113,10 @@ if (!$action_update_url_update_manager) {
         }
 
         if ($result && license_free()) {
-            $result = config_update_value('identification_reminder', $identification_reminder);
+            $result = config_update_value(
+                'identification_reminder',
+                $identification_reminder
+            );
         }
 
         ui_print_result_message(
@@ -189,11 +236,26 @@ $table->data[4][1] = html_print_input_password(
     true
 );
 
+
+$table->data[5][0] = __('Registration ID:');
+$table->data[5][1] = '<i>'.$config['pandora_uid'].'</i>';
+
+if (update_manager_verify_registration() === true && users_is_admin()) {
+    $table->data[6][0] = __('Cancel registration:');
+    $table->data[6][1] = '<a href="';
+    $table->data[6][1] .= ui_get_full_url(
+        'index.php?sec=messages&sec2=godmode/update_manager/update_manager&tab=setup&um_disconnect_console=1'
+    );
+    $table->data[6][1] .= '" onclick="if(confirm(\'Are you sure?\')) {return true;} else { return false; }">'.__('Unregister').'</a>';
+}
+
+
+
 if (license_free()) {
     $config['identification_reminder'] = isset($config['identification_reminder']) ? $config['identification_reminder'] : 1;
-    $table->data[6][0] = __('Pandora FMS community reminder').ui_print_help_tip(__('Every 8 days, a message is displayed to admin users to remember to register this Pandora instance'), true);
+    $table->data[7][0] = __('Pandora FMS community reminder').ui_print_help_tip(__('Every 8 days, a message is displayed to admin users to remember to register this Pandora instance'), true);
-    $table->data[6][1] = __('Yes').'&nbsp;&nbsp;&nbsp;'.html_print_radio_button('identification_reminder', 1, '', $config['identification_reminder'], true).'&nbsp;&nbsp;';
+    $table->data[7][1] = __('Yes').'&nbsp;&nbsp;&nbsp;'.html_print_radio_button('identification_reminder', 1, '', $config['identification_reminder'], true).'&nbsp;&nbsp;';
-    $table->data[6][1] .= __('No').'&nbsp;&nbsp;&nbsp;'.html_print_radio_button('identification_reminder', 0, '', $config['identification_reminder'], true);
+    $table->data[7][1] .= __('No').'&nbsp;&nbsp;&nbsp;'.html_print_radio_button('identification_reminder', 0, '', $config['identification_reminder'], true);
 }
 
 html_print_input_hidden('action_update_url_update_manager', 1);