tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into ent-12905-deprecar-eliminar-discovery-legacy

This commit is contained in:
Daniel Cebrian 2024-03-04 10:11:42 +01:00
parent f6f41efc85 355652eb52
commit 57a7774075
160 changed files with 1547 additions and 556 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
extras/deploy-scripts/pandora_deploy_community_ubuntu_2204.sh
View File

@ -850,6 +850,11 @@ systemctl enable postfix --now &>> "$LOGFILE"
systemctl disable --now snmptrapd &>> "$LOGFILE"
systemctl disable --now snmptrapd.socket &>> "$LOGFILE"
# Adding legacy to openssl
sed -i '/default = default_sect/a legacy = legacy_sect' /etc/ssl/openssl.cnf
sed -i 's/# activate = 1/activate = 1/' /etc/ssl/openssl.cnf
sed -i '/activate = 1/a [legacy_sect]\nactivate = 1' /etc/ssl/openssl.cnf
#SSH banner
[ "$(curl -s ifconfig.me)" ] && ipplublic=$(curl -s ifconfig.me)

1
pandora_agents/pc/Win32/pandora_agent.conf
View File

@ -122,6 +122,7 @@ module_min_critical 91
module_max_critical 0
module_end
# Number processes
module_begin
module_name Number processes

2
pandora_agents/unix/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-agent-unix
Version: 7.0NG.775-240221
Version: 7.0NG.775-240227
Architecture: all
Priority: optional
Section: admin

2
pandora_agents/unix/DEBIAN/make_deb_package.sh
View File

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
pandora_version="7.0NG.775-240221"
pandora_version="7.0NG.775-240227"
echo "Test if you has the tools for to make the packages."
whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null

2
pandora_agents/unix/pandora_agent
View File

@ -1039,7 +1039,7 @@ my $Sem = undef;
my $ThreadSem = undef;
use constant AGENT_VERSION => '7.0NG.775';
use constant AGENT_BUILD => '240221';
use constant AGENT_BUILD => '240227';
# Agent log default file size maximum and instances
use constant DEFAULT_MAX_LOG_SIZE => 600000;

2
pandora_agents/unix/pandora_agent.redhat.spec
View File

@ -4,7 +4,7 @@
%global __os_install_post %{nil}
%define name pandorafms_agent_linux
%define version 7.0NG.775
%define release 240221
%define release 240227
Summary: Pandora FMS Linux agent, PERL version
Name: %{name}

2
pandora_agents/unix/pandora_agent.redhat_bin.el8.spec
View File

@ -5,7 +5,7 @@
%define name pandorafms_agent_linux_bin
%define source_name pandorafms_agent_linux
%define version 7.0NG.775
%define release 240221
%define release 240227
%define debug_package %{nil}
Summary: Pandora FMS Linux agent, binary version

2
pandora_agents/unix/pandora_agent.redhat_bin.el9.spec
View File

@ -5,7 +5,7 @@
%define name pandorafms_agent_linux_bin
%define source_name pandorafms_agent_linux
%define version 7.0NG.775
%define release 240221
%define release 240227
%define debug_package %{nil}
Summary: Pandora FMS Linux agent, binary version

2
pandora_agents/unix/pandora_agent.redhat_bin.spec
View File

@ -5,7 +5,7 @@
%define name pandorafms_agent_linux_bin
%define source_name pandorafms_agent_linux
%define version 7.0NG.775
%define release 240221
%define release 240227
Summary: Pandora FMS Linux agent, binary version
Name: %{name}

2
pandora_agents/unix/pandora_agent.spec
View File

@ -4,7 +4,7 @@
%global __os_install_post %{nil}
%define name pandorafms_agent_linux
%define version 7.0NG.775
%define release 240221
%define release 240227
Summary: Pandora FMS Linux agent, PERL version
Name: %{name}

2
pandora_agents/unix/pandora_agent_installer
View File

@ -10,7 +10,7 @@
# **********************************************************************
PI_VERSION="7.0NG.775"
PI_BUILD="240221"
PI_BUILD="240227"
OS_NAME=`uname -s`
FORCE=0

6
pandora_agents/win32/bin/pandora_agent.conf
View File

@ -157,8 +157,8 @@ ehorus_conf "C:\Program Files\ehorus_agent\ehorus_agent.conf"
module_begin
module_name CPU Load
module_type generic_data
module_wmiquery SELECT LoadPercentage FROM Win32_Processor
module_wmicolumn LoadPercentage
module_wmiquery SELECT PercentProcessorTime FROM Win32_PerfFormattedData_PerfOS_Processor where name like '_Total'
module_wmicolumn PercentProcessorTime
module_max 100
module_min 0
module_description User CPU Usage (%)
@ -526,7 +526,7 @@ module_plugin "%PROGRAMFILES%\Pandora_Agent\util\autodiscover.exe" --default
# Hardening plugin for security compliance analysis.
#module_begin
#module_plugin "%PROGRAMFILES%\Pandora_Agent\util\pandora_hardening.exe -t 150"
#module_plugin "%PROGRAMFILES%\Pandora_Agent\util\pandora_hardening.exe" -t 150
#module_absoluteinterval 7d
#module_end

4
pandora_agents/win32/bin/util/pandora_hardening.exe
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:db207ef67053764be7e9b42cd04ea5509cc2a023548aab1c037745ca277b68a3
size 4858753
oid sha256:520619d823dd5396cc90de59e745d9ab3872d25d85358c9abb4890987b5f5426
size 4859595

2
pandora_agents/win32/installer/pandora.mpi
View File

@ -186,7 +186,7 @@ UpgradeApplicationID
{}
Version
{240221}
{240227}
ViewReadme
{Yes}

2
pandora_agents/win32/pandora.cc
View File

@ -30,7 +30,7 @@ using namespace Pandora;
using namespace Pandora_Strutils;
#define PATH_SIZE _MAX_PATH+1
#define PANDORA_VERSION ("7.0NG.775 Build 240221")
#define PANDORA_VERSION ("7.0NG.775 Build 240227")
string pandora_path;
string pandora_dir;

2
pandora_agents/win32/versioninfo.rc
View File

@ -11,7 +11,7 @@ BEGIN
VALUE "LegalCopyright", "Pandora FMS"
VALUE "OriginalFilename", "PandoraAgent.exe"
VALUE "ProductName", "Pandora FMS Windows Agent"
VALUE "ProductVersion", "(7.0NG.775(Build 240221))"
VALUE "ProductVersion", "(7.0NG.775(Build 240227))"
VALUE "FileVersion", "1.0.0.0"
END
END

2
pandora_console/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-console
Version: 7.0NG.775-240221
Version: 7.0NG.775-240227
Architecture: all
Priority: optional
Section: admin

2
pandora_console/DEBIAN/make_deb_package.sh
View File

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
pandora_version="7.0NG.775-240221"
pandora_version="7.0NG.775-240227"
package_pear=0
package_pandora=1

4
pandora_console/extensions/agents_modules.php
View File

@ -496,6 +496,10 @@ function mainAgentsModules()
$agents = [];
}
if (isset($agents_id) === false) {
$agents_id = '';
}
$filter_agents = html_print_label_input_block(
__('Agents'),
html_print_select(

8
pandora_console/extensions/module_groups.php
View File

@ -91,7 +91,7 @@ function mainModuleGroups()
$module_group_search = get_parameter('module_group_search', '');
// Check the user's group permissions.
$user_groups = users_get_groups($config['user'], 'AR');
$user_groups = users_get_groups($config['id_user'], 'AR');
$info = array_filter(
$info,
function ($v) use ($user_groups) {
@ -112,7 +112,7 @@ function mainModuleGroups()
);
if (empty($info) === false) {
$groups_view = ($is_not_paginated) ? $info : array_slice(
$groups_view = (isset($is_not_paginated) === true) ? $info : array_slice(
$info,
$offset,
$config['block_size']
@ -374,6 +374,10 @@ function mainModuleGroups()
'…'
);
$j = 1;
if (isset($background_color) === false) {
$background_color = 'none';
}
if (isset($array_data[$key])) {
foreach ($value['gm'] as $k => $v) {
if (isset($array_data[$key][$k])) {

39
pandora_console/extensions/quick_shell.php
View File

@ -273,6 +273,14 @@ function buildConnectionURL($method)
{
global $config;
if (isset($config['gotty_ssh_use_ssl']) === false) {
$config['gotty_ssh_use_ssl'] = '';
}
if (isset($config['gotty_telnet_use_ssl']) === false) {
$config['gotty_telnet_use_ssl'] = '';
}
$address = (empty($config['gotty_addr']) === true) ? $_SERVER['SERVER_ADDR'] : $config['gotty_addr'];
$use_ssl = ($method === 'ssh') ? $config['gotty_ssh_use_ssl'] : $config['gotty_telnet_use_ssl'];
$protocol = ((bool) $use_ssl === true) ? 'https://' : 'http://';
@ -353,6 +361,18 @@ function quickShellSettings()
config_update_value('gotty_telnet_enabled', $gotty_telnet_enabled);
}
if (isset($config['gotty_addr']) === false) {
$config['gotty_addr'] = '';
}
if (isset($config['gotty_ssh_use_ssl']) === false) {
$config['gotty_ssh_use_ssl'] = '';
}
if (isset($config['gotty_telnet_use_ssl']) === false) {
$config['gotty_telnet_use_ssl'] = '';
}
if ($config['gotty_addr'] != $gotty_addr) {
config_update_value('gotty_addr', $gotty_addr);
}
@ -389,6 +409,25 @@ function quickShellSettings()
$general_table->data = [];
$general_table->style = [];
$general_table->style[0] = 'width: 50%;';
if (isset($config['gotty_addr']) === false) {
$config['gotty_addr'] = '';
}
if (isset($config['gotty_ssh_enabled']) === false) {
$config['gotty_ssh_enabled'] = '';
}
if (isset($config['gotty_ssh_use_ssl']) === false) {
$config['gotty_ssh_use_ssl'] = '';
}
if (isset($disable_agentaccess) === false) {
$disable_agentaccess = '';
}
if (isset($config['gotty_telnet_use_ssl']) === false) {
$config['gotty_telnet_use_ssl'] = '';
}
$general_table->data[0][] = html_print_label_input_block(
__('Address'),

2
pandora_console/extensions/users_connected.php
View File

@ -229,7 +229,7 @@ function users_extension_main_god($god=true)
$data = [];
$data[0] = '<a href="index.php?sec=gusuarios&amp;sec2=godmode/users/configure_user&amp;id='.$row['id_user'].'">'.$row['id_user'].'</a>';
$data[1] = $last_login_data['ip_origin'];
$data[1] = $last_login_data['ip_origen'];
$data[2] = date($config['date_format'], $last_login_data['utimestamp']);
$data[3] = date($config['date_format'], $row['last_connect']);
array_push($table->data, $data);

19
pandora_console/extras/mr/68.sql
View File

@ -1,5 +1,14 @@
START TRANSACTION;
-- Watch out! The following field migration must be done before altering the corresponding table.
UPDATE `tevent_filter`
SET `search` = `regex`,
`regex` = '1'
WHERE `regex` IS NOT NULL AND `regex` != '';
-- Watch out! The following alter command must be done after the previous update of this table.
ALTER TABLE `tevent_filter` MODIFY COLUMN `regex` TINYINT unsigned NOT NULL DEFAULT 0;
CREATE TABLE IF NOT EXISTS `tmerge_error` (
`id` int(10) NOT NULL auto_increment,
`id_node` int(10) default 0,
@ -7771,4 +7780,14 @@ UPDATE `trecon_task`
;
-- END MIGRATION SAP DESET --
ALTER TABLE `tdatabase` ADD COLUMN `disabled` TINYINT NOT NULL DEFAULT 0;
CREATE TABLE IF NOT EXISTS `tmetaconsole_ha_databases` (
`node_id` int NOT NULL,
`host` varchar(255) DEFAULT '',
`master` tinyint unsigned DEFAULT '0',
PRIMARY KEY (`node_id`, `host`)
) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
COMMIT;

4
pandora_console/general/header.php
View File

@ -161,6 +161,10 @@ echo sprintf('<div id="header_table" class="header_table_%s">', $menuTypeClass);
'code' => false,
];
if (isset($_GET['sec']) === false) {
$_GET['sec'] = '';
}
if (!isset($_GET['sec2'])) {
$_GET['sec2'] = '';
}

8
pandora_console/general/noaccess.php
View File

@ -152,9 +152,11 @@
echo __('Access to this page is restricted to authorized users only, please contact system administrator if you need assistance.');
echo '<br/> <br/>';
echo __('Please know that all attempts to access this page are recorded in security logs of %s System Database', get_product_name());
if ($config['logged'] == false) {
if (session_status() === PHP_SESSION_ACTIVE) {
session_destroy();
if (isset($config['logged']) === true) {
if ($config['logged'] == false) {
if (session_status() === PHP_SESSION_ACTIVE) {
session_destroy();
}
}
}
?>

21
pandora_console/godmode/agentes/agent_manager.php
View File

@ -246,6 +246,7 @@ if ($new_agent === true) {
// QR Code table.
$CodeQRContent = '';
if ($new_agent === false) {
$CodeQRContent .= html_print_div(['id' => 'qr_container_image'], true);
$CodeQRContent .= html_print_anchor(
@ -354,7 +355,7 @@ $tableAgent->rowspan = [];
// Agent name.
if ($new_agent === false) {
$tableAgent->data['caption_name'][0] = __('Agent name');
$tableAgent->data['caption_name'][0] = __('Agent name').ui_print_help_tip(__('The agent name is a unique identifier (which is automatically generated in software agents). If you set it manually, make sure it is not duplicated. Although it accepts spaces, we do not recommend you to use them in the agent name, you may use them in the agent alias. The agent name is not displayed in the interface, it is an internal name.'), true);
$tableAgent->rowclass['name'] = 'w540px';
$tableAgent->cellstyle['name'][0] = 'width: 100%;';
$tableAgent->data['name'][0] = html_print_input_text(
@ -404,7 +405,7 @@ if ($new_agent === false) {
}
// Alias.
$tableAgent->data['caption_alias'][0] = __('Alias');
$tableAgent->data['caption_alias'][0] = __('Alias').ui_print_help_tip(__('This will be the text label that will represent the agent on all types of screens and reports. It may be duplicated, contain spaces and non-ASCII characters.'), true);
$tableAgent->rowclass['alias'] = 'w540px';
$tableAgent->data['alias'][0] = html_print_input_text('alias', $alias, '', 50, 100, true, false, true, '', 'w540px');
if ($new_agent === true) {
@ -487,7 +488,7 @@ if ($new_agent === false) {
}
// Select primary group.
$tableAgent->data['caption_primary_group'][0] = __('Primary group');
$tableAgent->data['caption_primary_group'][0] = __('Primary group').ui_print_help_tip(__('Although an agent can belong to multiple groups, it can only have a parent group.'), true);
if (isset($groups[$grupo]) === true || $new_agent === true) {
$tableAgent->rowclass['primary_group'] = 'w540px';
// Cannot change primary group if user have not permission for that group.
@ -554,7 +555,7 @@ if (enterprise_installed()) {
}
if ($broker === false) {
$tableAgent->data['caption_interval'][0] = __('Interval');
$tableAgent->data['caption_interval'][0] = __('Interval').ui_print_help_tip(__('Time that elapses when updating data in the agent. Remote modules have their own interval, but this time is used to find out if an agent stopped responding (unknown state). When twice the time interval defined in an agent goes by, it is considered to be in unknown state (or also if all its remote modules are in unknown state). An agent may be in unknown state if all of its local (software agent-based) modules have a last contact time longer than twice the agent interval, even if it has updated remote modules.'), true);
// $tableAgent->rowstyle['interval'] = 'width: 260px';
$tableAgent->rowclass['interval'] = 'w540px';
$tableAgent->data['interval'][0] = html_print_extended_select_for_time(
@ -618,7 +619,7 @@ $tableAgent->data['os_version'][0] = html_print_input_text(
'w540px'
);
$tableAgent->data['caption_server'][0] = __('Server');
$tableAgent->data['caption_server'][0] = __('Server').ui_print_help_tip(__('Server that will preferentially execute remote tasks.'), true);
$tableAgent->rowclass['server'] = 'w540px';
$tableAgent->data['server'][0] = html_print_select(
$servers,
@ -935,7 +936,7 @@ $switchButtons[] = html_print_radio_button_extended(
);
$tableAdvancedAgent->data['module_definition'][] = html_print_label_input_block(
__('Module definition'),
__('Module definition').ui_print_help_tip(__('Three working modes can be selected for module definition. Learning mode: Default mode, if an XML arrives with new modules, they will be created automatically; it is a learning behavior. Normal mode: If an XML arrives with new modules, they will only be created if they are previously declared in the Console. Autodisable mode: It is the same as learning mode, but if all modules go into unknown, the agent will be disabled until information arrives again.'), true),
html_print_div(
[
'class' => 'switch_radio_button',
@ -947,7 +948,7 @@ $tableAdvancedAgent->data['module_definition'][] = html_print_label_input_block(
// CPS - Cascade Protection Services.
$tableAdvancedAgent->data['cps_value'][] = html_print_label_input_block(
__('Cascade protection services'),
__('Cascade protection services').ui_print_help_tip(__('To avoid an avalanche of cascading alerts. You may choose any agent module (any) or a specific module. In the first case, when there is at least one module in critical, that event/alert will be launched, but no other of another module of the same agent. In the second case, when the specified module is in critical, the agent will not generate alerts/events.'), true),
html_print_checkbox_switch('cps', $cps_val, ($cps >= 0), true)
);
@ -1036,7 +1037,7 @@ $tableAdvancedAgent->data['url_description'][] = html_print_label_input_block(
// Agent status.
$tableAdvancedAgent->data['agent_status'][] = html_print_label_input_block(
__('Disabled mode'),
__('Disabled mode').ui_print_help_tip(__('A deactivated agent does not generate activity (or issue events/alerts) or process data or actively generate monitoring. In many listings it does not even appear.'), true),
html_print_checkbox_switch(
'disabled',
1,
@ -1047,7 +1048,7 @@ $tableAdvancedAgent->data['agent_status'][] = html_print_label_input_block(
// Quiet mode.
$tableAdvancedAgent->data['agent_quiet'][] = html_print_label_input_block(
__('Quiet'),
__('Quiet').ui_print_help_tip(__('A \'silent\' agent continues to process monitoring data, but does not generate events or alerts.'), true),
html_print_checkbox_switch('quiet', 1, $quiet, true)
);
@ -1113,7 +1114,7 @@ $safeOperationElements[] = html_print_select(
);
$tableAdvancedAgent->data['safe_operation'][] = html_print_label_input_block(
__('Safe operation mode'),
__('Safe operation mode').ui_print_help_tip(__('When the module set in this option goes into critical state, the other modules of the agent are automatically deactivated. This option can be very useful to avoid wasting resources, especially in remote checks. For example, if a Host alive module is chosen, SNMP checks will not be performed on the device when there is no connectivity with it.'), true),
html_print_div(
[
'class' => 'flex-row-center',

42
pandora_console/godmode/agentes/configurar_agente.php
View File

@ -816,6 +816,23 @@ if ($id_agente) {
$helper = ($help_header === 'main_tab') ? 'main_tab' : '';
$pure = (int) get_parameter('pure');
$menu_tabs = [];
// Agent details.
$menu_tab_url = '<a href="index.php?sec=gsetup&sec2=godmode/setup/setup&section=general">'.__('General setup').'</a>';
array_push($menu_tabs, $menu_tab_url);
// Agent details.
$menu_tab_url = '<a href="index.php?sec=view&sec2=operation/agentes/estado_agente">'.__('Agent detail').'</a>';
array_push($menu_tabs, $menu_tab_url);
// Manage agents.
$menu_tab_url = '<a href="index.php?sec=gagente&sec2=godmode/agentes/modificar_agente">'.__('Manage agents').'</a>';
array_push($menu_tabs, $menu_tab_url);
// Events.
$menu_tab_url = '<a href="index.php?sec=eventos&sec2=operation/events/events">'.__('View events').'</a>';
array_push($menu_tabs, $menu_tab_url);
// Events.
$menu_tab_url = '<a href="index.php?sec=reporting&sec2=godmode/reporting/reporting_builder">'.__('Custom reports').'</a>';
array_push($menu_tabs, $menu_tab_url);
$dots = dot_tab($menu_tabs);
if ($pure === 0) {
ui_print_standard_header(
__('Agent setup view').' ( '.strtolower(agents_get_alias($id_agente)).' )',
@ -837,7 +854,9 @@ if ($id_agente) {
'link' => '',
'label' => $tab_name,
],
]
],
[],
$dots
);
}
} else {
@ -857,7 +876,9 @@ if ($id_agente) {
'link' => 'index.php?sec=gagente&sec2=godmode/agentes/modificar_agente',
'label' => __('Manage agents'),
],
]
],
[],
$dots
);
}
@ -2334,6 +2355,23 @@ if ($delete_module) {
exit;
}
// Check if module is used by agent for Safe mode.
$is_safe_mode_module = modules_check_safe_mode($id_borrar_modulo);
if ($is_safe_mode_module === true && isset($id_agente) === true) {
db_process_sql_update('tagente', ['safe_mode_module' => '0'], ['id_agente' => $id_agente]);
db_process_sql_update(
'tagente_modulo',
[
'disabled' => 0,
'disabled_by_safe_mode' => 0,
],
[
'id_agente' => $id_agente,
'disabled_by_safe_mode' => 1,
]
);
}
// Before delete the main module, check and delete the childrens from the original module.
module_check_childrens_and_delete($id_borrar_modulo);

6
pandora_console/godmode/agentes/configure_field.php
View File

@ -55,7 +55,7 @@ if ($id_field) {
$display_on_front = $field['display_on_front'];
$is_password_type = $field['is_password_type'];
$combo_values = $field['combo_values'] ? $field['combo_values'] : '';
$is_combo_enable = $config['is_combo_enable'];
$is_combo_enable = (isset($config['is_combo_enable']) === true) ? $config['is_combo_enable'] : false;
$is_link_enabled = $field['is_link_enabled'];
$header_title = __('Update agent custom field');
} else {
@ -162,6 +162,10 @@ $table->data[2][0] = html_print_label_input_block(
)
);
if (isset($config['is_combo_enable']) === false) {
$config['is_combo_enable'] = false;
}
$table->data[2][1] = html_print_label_input_block(
__('Enabled combo'),
html_print_checkbox_switch_extended(

4
pandora_console/godmode/agentes/module_manager_editor.php
View File

@ -765,7 +765,7 @@ $outputForm .= ui_toggle(
$outputForm .= ui_toggle(
html_print_table($table_macros, true),
'<span class="subsection_header_title">'.__('Custom macros').'</span>',
'<span class="subsection_header_title">'.__('Custom macros').ui_print_help_tip(__('Allows you to set custom macros for this module (e.g. name \'_location_\', value \'Office\'). These macros can then be used in alerts to provide additional information about the module in question.'), true).'</span>',
'',
'',
true,
@ -784,7 +784,7 @@ if ((int) $moduletype !== 13) {
$table_relations,
true
),
'<span class="subsection_header_title">'.__('Module relations').'<span>',
'<span class="subsection_header_title">'.__('Module relations').ui_print_help_tip(__('Used to replace the module in SLA reports, either directly () or in Failover mode ().'), true).'<span>',
'',
'',
true,

38
pandora_console/godmode/agentes/module_manager_editor_common.php
View File

@ -446,7 +446,9 @@ $tableBasicThresholds->rowclass['caption_warning_threshold'] = 'field_half_width
$tableBasicThresholds->rowclass['warning_threshold'] = 'field_half_width';
$tableBasicThresholds->data['caption_warning_threshold'][0] .= __('Warning threshold').'&nbsp;';
$tableBasicThresholds->data['caption_warning_threshold'][0] .= '<span class="font_11" id="caption_minmax_warning">('.__('Min / Max').')</span>';
$tableBasicThresholds->data['caption_warning_threshold'][0] .= '<div id="caption_warning_minmax"><span class="font_11" id="caption_minmax_warning">('.__('Min / Max').')</span></div>';
$tableBasicThresholds->data['caption_warning_threshold'][0] .= '<div id="caption_warning_crease" class="invisible"><span class="font_11" id="$_warning">('.__('Decrease / Increase').')</span></div>';
$tableBasicThresholds->data['caption_warning_threshold'][0] .= ui_print_help_tip(__('Normal: Any value within the specified range will cause a state change. Inverse interval: Any value outside the specified range will cause a state change. Percentage: This mode takes into account the module variation percentage (regarding its previous value), and will cause a change of state if it complies with the indicated increase or decrease values. A value that matches the Warning and Critical thresholds will trigger the Critical status. In numeric modules, a Max 0 value represents infinity.'), true);
$tableBasicThresholds->data['warning_threshold'][0] .= html_print_input_text(
'min_warning',
$min_warning,
@ -534,7 +536,9 @@ $tableBasicThresholds->data['warning_time'][1] .= '&nbsp;&nbsp;<b>'.__('interval
$tableBasicThresholds->rowclass['caption_critical_threshold'] = 'field_half_width pdd_t_10px';
$tableBasicThresholds->rowclass['critical_threshold'] = 'field_half_width';
$tableBasicThresholds->data['caption_critical_threshold'][0] .= __('Critical threshold').'&nbsp;';
$tableBasicThresholds->data['caption_critical_threshold'][0] .= '<span class="font_11" id="caption_minmax_critical">('.__('Min / Max').')</span>';
$tableBasicThresholds->data['caption_critical_threshold'][0] .= '<div id="caption_critical_minmax"><span class="font_11" id="caption_minmax_critical">('.__('Min / Max').')</span></div>';
$tableBasicThresholds->data['caption_critical_threshold'][0] .= '<div id="caption_critical_crease" class="invisible"><span class="font_11" id="$_warning">('.__('Decrease / Increase').')</span></div>';
$tableBasicThresholds->data['caption_critical_threshold'][0] .= ui_print_help_tip(__('Normal: Any value within the specified range will cause a state change.\nInverse interval: Any value outside the specified range will cause a state change. Percentage: This mode takes into account the module variation percentage (regarding its previous value), and will cause a change of state if it complies with the indicated increase or decrease values. A value that matches the Warning and Critical thresholds will trigger the Critical status. In numeric modules, a Max 0 value represents infinity.'), true).'</div>';
$tableBasicThresholds->data['critical_threshold'][0] .= html_print_input_text(
'min_critical',
$min_critical,
@ -622,7 +626,7 @@ if (modules_is_string_type($id_module_type) === false || (bool) $edit === true)
}
$table_simple->rowclass['caption_historical_data'] = 'mrgn_top_10px';
$table_simple->data['caption_historical_data'][0] = __('Historical data');
$table_simple->data['caption_historical_data'][0] = __('Historical data').ui_print_help_tip(__('If disabled, it will only save the last known data, being unable to display graphs. It is useful to save DB space. It should be disabled only in those cases where it is necessary for the system to flow faster and save resources.'), true);
if ($disabledBecauseInPolicy) {
// If is disabled, we send a hidden in his place and print a false
// checkbox because HTML dont send disabled fields
@ -1134,7 +1138,7 @@ if (isset($id_agente) === true && (int) $moduletype === MODULE_DATA) {
$table_advanced->rowclass['cron_section'] = 'table_section full_section mrgn_top_mod_0px';
$table_advanced->data['cron_section'] = html_print_table($tableCron, true);
$table_advanced->data['title_3'] = html_print_subtitle_table(__('Thresholds and state changes'));
$table_advanced->data['title_3'] = html_print_subtitle_table(__('Thresholds and state changes').ui_print_help_tip(__('It indicates the minimum and maximum values accepted by the module. Any value outside this range will be discarded. For example, with a Max. value of 100, a data value of 200 will not be saved in a database.'), true));
$table_advanced->rowclass['caption_min_max_values'] = 'w50p pdd_t_10px';
$table_advanced->rowclass['min_max_values'] = 'w50p pdd_b_10px';
@ -1152,7 +1156,7 @@ $tableDynamicThreshold->style = [];
$tableDynamicThreshold->rowclass = [];
$tableDynamicThreshold->data = [];
$tableDynamicThreshold->data['caption_dynamic_threshold_interval'][0] = __('Dynamic Threshold Interval');
$tableDynamicThreshold->data['caption_dynamic_threshold_interval'][0] = __('Dynamic Threshold Interval').ui_print_help_tip(__('If this option is enabled, the module thresholds will be automatically adjusted based on the mean and standard deviation of their values in the specified time interval.'), true);
$tableDynamicThreshold->rowclass['dynamic_threshold_interval'] = 'w540px';
$tableDynamicThreshold->data['dynamic_threshold_interval'][0] = html_print_extended_select_for_time(
'dynamic_interval',
@ -1174,8 +1178,8 @@ $tableDynamicThreshold->cellclass['caption_adv_dynamic_threshold_interval'][0] =
$tableDynamicThreshold->cellclass['caption_adv_dynamic_threshold_interval'][1] = 'w33p';
$tableDynamicThreshold->cellclass['adv_dynamic_threshold_interval'][0] = 'w33p';
$tableDynamicThreshold->cellclass['adv_dynamic_threshold_interval'][1] = 'w33p';
$tableDynamicThreshold->data['caption_adv_dynamic_threshold_interval'][0] = __('Min.');
$tableDynamicThreshold->data['caption_adv_dynamic_threshold_interval'][1] = __('Max.');
$tableDynamicThreshold->data['caption_adv_dynamic_threshold_interval'][0] = __('Min.').ui_print_help_tip(__('It allows to adjust the lower limit of the dynamic threshold, in percentage. For example, if the module average value is 60 and the lower critical state threshold was set to 80, a Dynamic Threshold Max to 10 would set the threshold to 88, 10% lower than what was set.'), true);
$tableDynamicThreshold->data['caption_adv_dynamic_threshold_interval'][1] = __('Max.').ui_print_help_tip(__('It allows to adjust the upper limit of the dynamic threshold, in percentage. For example, if the module average value is 60 and the upper critical state threshold has been set to 80, a Dynamic Threshold Max to 10 would set the threshold to 88, 10% higher than what was set.'), true);
$tableDynamicThreshold->data['adv_dynamic_threshold_interval'][0] = html_print_input_text(
'dynamic_min',
$dynamic_min,
@ -1205,7 +1209,7 @@ $tableDynamicThreshold->rowclass['caption_adv_dynamic_threshold_twotailed'] = 'p
$tableDynamicThreshold->rowclass['adv_dynamic_threshold_twotailed'] = 'w100p';
$tableDynamicThreshold->cellclass['caption_adv_dynamic_threshold_twotailed'][0] = 'w33p';
$tableDynamicThreshold->cellclass['adv_dynamic_threshold_twotailed'][0] = 'w33p';
$tableDynamicThreshold->data['caption_adv_dynamic_threshold_twotailed'][0] = __('Two Tailed');
$tableDynamicThreshold->data['caption_adv_dynamic_threshold_twotailed'][0] = __('Two Tailed').ui_print_help_tip(__('It allows to set a lower threshold in addition to the upper one by default. If enabled, both very high and very low values will cause a state change.'), true);
$tableDynamicThreshold->data['adv_dynamic_threshold_twotailed'][0] = html_print_checkbox_switch(
'dynamic_two_tailed',
1,
@ -1224,7 +1228,7 @@ $tableFFThreshold->style = [];
$tableFFThreshold->rowclass = [];
$tableFFThreshold->data = [];
// FF stands for Flip-flop.
$tableFFThreshold->data['caption_ff_main_thresholds'][0] = __('FF threshold');
$tableFFThreshold->data['caption_ff_main_thresholds'][0] = __('FF threshold').ui_print_help_tip(__('It indicates the number of consecutive values at a threshold that must be received for the module to change state. For example, with a value 0 (default) the module will change state as soon as it receives a data within the critical threshold, but with a value 2 the module must receive two more critical data (consecutively) to change to critical state. It is possible to set the same \'tolerance\' for all status changes or choose a different value for each one. This option is especially useful in unstable environments, as it helps prevent false positives.'), true);
$tableFFThreshold->rowclass['ff_main_thresholds'] = 'w100p';
$tableFFThreshold->data['ff_main_thresholds'][0] = html_print_switch_radio_button(
[
@ -1366,7 +1370,7 @@ $table_advanced->data['title_4'] = html_print_subtitle_table(__('Data and their
$table_advanced->rowclass['caption_process_unit'] = 'w50p';
$table_advanced->rowclass['process_unit'] = 'w50p';
$table_advanced->data['caption_process_unit'][0] = __('Unit');
$table_advanced->data['caption_process_unit'][1] = __('Post process');
$table_advanced->data['caption_process_unit'][1] = __('Post process').ui_print_help_tip(__('It allows you to change the unit of the received data. To do this, multiply the data received by the value set in this option (e.g. Seconds * 0.016666666667 = Minutes). The data is saved already transformed in the database, so changing this parameter when the module has data can cause anomalies in graphs and other elements.'), true);
$table_advanced->data['process_unit'][0] = html_print_extended_select_for_unit(
'unit',
$unit,
@ -1449,7 +1453,7 @@ $table_advanced->data['discard_unknown'][0] = html_print_checkbox_switch(
$disabledBecauseInPolicy
);
$table_advanced->data['caption_quiet'][0] = __('Quiet');
$table_advanced->data['caption_quiet'][0] = __('Quiet').ui_print_help_tip(__('A module in silent mode will continue to receive and store data, but will not trigger alerts or generate events.'), true);
$table_advanced->data['quiet'][0] = html_print_checkbox_switch(
'quiet_module',
1,
@ -1458,7 +1462,7 @@ $table_advanced->data['quiet'][0] = html_print_checkbox_switch(
$disabledBecauseInPolicy
);
$table_advanced->data['caption_cascade_protection'][0] = __('Cascade Protection Services');
$table_advanced->data['caption_cascade_protection'][0] = __('Cascade Protection Services').ui_print_help_tip(__('To avoid an avalanche of cascading alerts. You may choose any agent module (any) or a specific module. In the first case, when there is at least one module in critical, that event/alert will be launched, but no other of another module of the same agent. In the second case, when the specified module is in critical, the agent will not generate alerts/events.'), true);
$table_advanced->data['cascade_protection'][0] = html_print_select($cps_array, 'cps_module', $cps_module, '', '', 0, true, false, true, '', $disabledBecauseInPolicy);
@ -2377,11 +2381,21 @@ ui_require_jquery_file('json');
if ($('#radius-percentage_warning').is(':checked') === true){
min_w = 0;
max_w = 0;
$('#caption_warning_minmax').addClass('invisible');
$('#caption_warning_crease').removeClass('invisible');
} else {
$('#caption_warning_minmax').removeClass('invisible');
$('#caption_warning_crease').addClass('invisible');
}
if ($('#radius-percentage_critical').is(':checked') === true){
min_c = 0;
max_c = 0;
$('#caption_critical_minmax').addClass('invisible');
$('#caption_critical_crease').removeClass('invisible');
} else {
$('#caption_critical_minmax').removeClass('invisible');
$('#caption_critical_crease').addClass('invisible');
}
paint_graph_status(

2
pandora_console/godmode/alerts/alert_commands.php
View File

@ -109,7 +109,7 @@ if (is_ajax()) {
for ($i = 1; $i <= $config['max_macro_fields']; $i++) {
$field_description = $fields_descriptions[($i - 1)];
$field_value = $fields_values[($i - 1)];
$field_hidden = $fields_hidden_checked[($i - 1)];
$field_hidden = (isset($fields_hidden_checked[($i - 1)]) === true) ? $fields_hidden_checked[($i - 1)] : '';
if (!empty($field_description)) {

4
pandora_console/godmode/alerts/alert_list.list.php
View File

@ -253,7 +253,7 @@ if (is_metaconsole() === true) {
echo '<br>';
}
if (!$id_cluster) {
if (isset($id_cluster) === false) {
ui_toggle(
$form_filter,
'<span class="subsection_header_title">'.__('Alert control filter').'</span>',
@ -1115,7 +1115,7 @@ if (isset($dont_display_alert_create_bttn)) {
}
}
if ($display_create && (check_acl($config['id_user'], 0, 'LW') || check_acl($config['id_user'], $template_group, 'LM')) && !$id_cluster) {
if ($display_create && (check_acl($config['id_user'], 0, 'LW') || check_acl($config['id_user'], $template_group, 'LM')) && isset($id_cluster) === false) {
echo '<form method="post" action="index.php?sec='.$sec.'&sec2=godmode/alerts/alert_list&tab=builder&pure='.$pure.'">';
$actionButtons = html_print_submit_button(
__('Create'),

1
pandora_console/godmode/category/category.php
View File

@ -242,6 +242,7 @@ if (empty($result) === false) {
html_print_table($table);
$tablePagination = ui_pagination($total_categories, $url, $offset, 0, true, 'offset', false);
} else {
$tablePagination = '';
// No categories available or selected.
ui_print_info_message(['no_close' => true, 'message' => __('No categories found') ]);
}

10
pandora_console/godmode/extensions.php
View File

@ -195,13 +195,13 @@ foreach ($extensions as $file => $extension) {
$data[] = '<i class="grey">'.$file.'</i>';
// Get version of this extensions
if ($config['extensions'][$file]['operation_menu']) {
if (isset($config['extensions'][$file]['operation_menu']) === true) {
$data[] = $config['extensions'][$file]['operation_menu']['version'];
} else if ($config['extensions'][$file]['godmode_menu']) {
} else if (isset($config['extensions'][$file]['godmode_menu']) === true) {
$data[] = $config['extensions'][$file]['godmode_menu']['version'];
} else if ($config['extensions'][$file]['extension_ope_tab']) {
} else if (isset($config['extensions'][$file]['extension_ope_tab']) === true) {
$data[] = $config['extensions'][$file]['extension_ope_tab']['version'];
} else if ($config['extensions'][$file]['extension_god_tab']) {
} else if (isset($config['extensions'][$file]['extension_god_tab']) === true) {
$data[] = $config['extensions'][$file]['extension_god_tab']['version'];
} else {
$data[] = __('N/A');
@ -216,7 +216,7 @@ foreach ($extensions as $file => $extension) {
$data[] = $config['extensions'][$file]['godmode_menu']['version'];
} else if (isset($config['extensions'][$file]['extension_ope_tab'])) {
$data[] = $config['extensions'][$file]['extension_ope_tab']['version'];
} else if ($config['extensions'][$file]['extension_god_tab']) {
} else if (isset($config['extensions'][$file]['extension_god_tab']) === true) {
$data[] = $config['extensions'][$file]['extension_god_tab']['version'];
} else {
$data[] = __('N/A');

4
pandora_console/godmode/groups/configure_group.php
View File

@ -234,7 +234,7 @@ $table->data[1][0] = html_print_label_input_block(
if ((bool) $config['enterprise_installed'] === true) {
$table->data[1][1] .= html_print_label_input_block(
__('Group Password'),
__('Group Password').ui_print_help_tip(__('If a group is password protected, it will only accept XML from those software agents that have a group password configured with the same name. Do not use spaces or symbols.'), true),
html_print_input_password('group_pass', $group_pass, '', 16, 255, true)
);
}
@ -250,7 +250,7 @@ $table->data[2][1] = html_print_label_input_block(
);
$table->data[3][0] = html_print_label_input_block(
__('Custom ID'),
__('Custom ID').ui_print_help_tip(__('It is an external ID used for integrations. Do not use spaces or symbols.'), true),
html_print_input_text('custom_id', $custom_id, '', 16, 255, true)
);

6
pandora_console/godmode/groups/group_list.php
View File

@ -1205,9 +1205,9 @@ $tab = 'group_edition';
<script type="text/javascript">
let show_full_hirearchy = "<?php echo $show_full_hirearchy; ?>";
let show_not_init_agents = "<?php echo $show_not_init_agents; ?>";
let show_not_init_modules = "<?php echo $show_not_init_modules; ?>";
let show_full_hirearchy = "<?php echo (isset($show_full_hirearchy) === true) ? $show_full_hirearchy : ''; ?>";
let show_not_init_agents = "<?php echo (isset($show_not_init_agents) === true) ? $show_not_init_agents : ''; ?>";
let show_not_init_modules = "<?php echo (isset($show_not_init_modules) === true) ? $show_not_init_modules : ''; ?>";
$('#checkbox-show_full_hirearchy').on("change", function() {
if (show_full_hirearchy == 1) {

2
pandora_console/godmode/massive/massive_add_policies_alerts.php
View File

@ -134,7 +134,7 @@ $table->data[0][0] = html_print_label_input_block(
$table->data[0][1] = html_print_label_input_block(
__('Group recursion'),
html_print_checkbox('recursion', 1, $recursion, true, false, '', true)
html_print_checkbox('recursion', 1, ($recursion ?? false), true, false, '', true)
);
$arr_policies = policies_get_policies();

2
pandora_console/godmode/massive/massive_add_policies_alerts_action_external.php
View File

@ -138,7 +138,7 @@ $table->data[0][0] = html_print_label_input_block(
$table->data[0][1] = html_print_label_input_block(
__('Group recursion'),
html_print_checkbox('recursion', 1, $recursion, true, false, '', true)
html_print_checkbox('recursion', 1, ($recursion ?? false), true, false, '', true)
);
$arr_policies = policies_get_policies();

14
pandora_console/godmode/massive/massive_edit_agents.php
View File

@ -631,8 +631,8 @@ if (is_metaconsole() === true) {
echo '<form method="post" autocomplete="off" id="form_agent" action="'.$url.'">';
echo html_print_avoid_autocomplete();
$params = [
'id_group' => $id_group,
'recursion' => $recursion,
'id_group' => ($id_group ?? ''),
'recursion' => ($recursion ?? ''),
];
echo get_table_inputs_masive_agents($params);
@ -712,9 +712,9 @@ if (is_metaconsole() === false) {
$table->data[0][1] .= '&nbsp;&nbsp;'.__('Module').'&nbsp;';
$table->data[0][1] .= html_print_select(
$modules,
($modules ?? ''),
'cascade_protection_module',
$cascade_protection_module,
($cascade_protection_module ?? ''),
'',
'',
0,
@ -1162,7 +1162,7 @@ $table->data[7][0] = __('Safe operation mode').': '.ui_print_help_tip(
),
true
);
$table->data[7][1] .= html_print_select(
$table->data[7][1] = html_print_select(
[
1 => __('Enabled'),
0 => __('Disabled'),
@ -1229,7 +1229,7 @@ if ($fields === false) {
foreach ($fields as $field) {
$data[0] = '<b>'.$field['name'].'</b>';
$combo = [];
$combo = $field['combo_values'];
$combo = ($field['combo_values'] ?? '');
$combo = explode(',', $combo);
$combo_values = [];
foreach ($combo as $value) {
@ -1258,7 +1258,7 @@ foreach ($fields as $field) {
'',
30,
100,
$view_mode,
($view_mode ?? ''),
'',
'',
true,

6
pandora_console/godmode/massive/massive_edit_modules.php
View File

@ -421,7 +421,7 @@ $table->data[4][0] = html_print_label_input_block(
html_print_select(
$tags,
'tags[]',
$tags_name,
($tags_name ?? ''),
false,
__('Any'),
-1,
@ -537,7 +537,7 @@ $table->data[8][0] = html_print_label_input_block(
html_print_select(
$tags,
'tags[]',
$tags_name,
($tags_name ?? ''),
false,
__('Any'),
-1,
@ -1304,7 +1304,7 @@ $table->data[29][0] = html_print_label_input_block(
html_print_select_from_sql(
'SELECT id_tag, name FROM ttag ORDER BY name',
'id_tag[]',
$id_tag,
($id_tag ?? ''),
'',
__('None'),
'0',

6
pandora_console/godmode/massive/massive_edit_users.php
View File

@ -476,12 +476,12 @@ if (is_metaconsole() === false) {
$timezone_name = 'Asia/Shanghai';
}
$area_data_timezone_polys .= '';
$area_data_timezone_polys = '';
foreach ($tz['polys'] as $coords) {
$area_data_timezone_polys .= '<area data-timezone="'.$timezone_name.'" data-country="'.$tz['country'].'" data-pin="'.implode(',', $tz['pin']).'" data-offset="'.$tz['offset'].'" shape="poly" coords="'.implode(',', $coords).'" />';
}
$area_data_timezone_rects .= '';
$area_data_timezone_rects = '';
foreach ($tz['rects'] as $coords) {
$area_data_timezone_rects .= '<area data-timezone="'.$timezone_name.'" data-country="'.$tz['country'].'" data-pin="'.implode(',', $tz['pin']).'" data-offset="'.$tz['offset'].'" shape="rect" coords="'.implode(',', $coords).'" />';
}
@ -543,7 +543,7 @@ echo sprintf(
'<div class="edit_user_options">%s %s %s %s %s %s %s %s %s %s</div>',
$language,
$size_pagination,
$skin,
($skin ?? ''),
$home_screen,
$event_filter,
$autorefresh_show,

4
pandora_console/godmode/massive/massive_operations.php
View File

@ -348,6 +348,10 @@ if (check_acl($config['id_user'], 0, 'UM')) {
$onheader['user_agents'] = $userstab;
}
if (isset($servicestab) === false) {
$servicestab = '';
}
$onheader['massive_alerts'] = $alertstab;
$onheader['massive_policies_alerts'] = $policiesalertstab;
$onheader['massive_policies_alerts_external'] = $policiesalertsexternaltab;

10
pandora_console/godmode/menu.php
View File

@ -507,10 +507,12 @@ if ($access_console_node === true) {
if ((bool) check_acl($config['id_user'], 0, 'AW') === true) {
$show_ipam = false;
$ipam = db_get_all_rows_sql('SELECT users_operator FROM tipam_network');
foreach ($ipam as $row) {
if (str_contains($row['users_operator'], '-1') || str_contains($row['users_operator'], $config['id_user'])) {
$show_ipam = true;
break;
if ($ipam !== false) {
foreach ($ipam as $row) {
if (str_contains($row['users_operator'], '-1') || str_contains($row['users_operator'], $config['id_user'])) {
$show_ipam = true;
break;
}
}
}
}

8
pandora_console/godmode/modules/manage_network_components.php
View File

@ -686,6 +686,12 @@ $table->data[0][] = html_print_label_input_block(
)
);
if (isset($component) === false) {
$component = [];
$component['id'] = '';
$component['id_nc'] = '';
}
$filter_action_url = 'index.php?sec='.$sec.'&sec2=godmode/modules/manage_network_components&id='.$component['id_nc'].'&search_string='.urlencode(io_safe_output($search_string)).'&search_id_group'.$search_id_group.'&pure='.$pure;
$toggleFilters = '<form class="filters_form" method="POST" action="'.$filter_action_url.'">';
$toggleFilters .= html_print_table($table, true);
@ -824,7 +830,7 @@ foreach ($components as $component) {
$data[0] = io_safe_output($component['name']);
}
$data[1] .= ui_print_servertype_icon((int) $component['id_modulo']);
$data[1] = ui_print_servertype_icon((int) $component['id_modulo']);
$data[2] = ui_print_moduletype_icon($component['type'], true);
$data[3] = "<span class='font_8px'>".mb_strimwidth(io_safe_output($component['description']), 0, 60, '...').'</span>';

9
pandora_console/godmode/reporting/graphs.php
View File

@ -221,6 +221,9 @@ $search = trim(get_parameter('search', ''));
$graphs = custom_graphs_get_user($config['id_user'], false, true, $access);
$offset = (int) get_parameter('offset');
$table_aux = new stdClass();
if (isset($strict_user) === false) {
$strict_user = false;
}
$table_aux->width = '100%';
if (is_metaconsole() === true) {
@ -273,7 +276,11 @@ if (is_metaconsole() === true) {
html_print_input_text('search', $search, '', 30, '', true)
);
$searchForm .= '<form action="index.php?sec=reporting&sec2=godmode/reporting/graphs&id_group='.$id_group.'&pure='.$pure.'"method="post">';
if (isset($pure) === false) {
$pure = '';
}
$searchForm = '<form action="index.php?sec=reporting&sec2=godmode/reporting/graphs&id_group='.$id_group.'&pure='.$pure.'"method="post">';
$searchForm .= html_print_table($table_aux, true);
$searchForm .= html_print_div(

2
pandora_console/godmode/reporting/reporting_builder.php
View File

@ -750,7 +750,7 @@ switch ($action) {
true
),
html_print_input_text(
__('search'),
'search',
$search,
'',
30,

8
pandora_console/godmode/reporting/visual_console_builder.data.php
View File

@ -130,6 +130,14 @@ if ($action === 'new') {
$backgroundPreviewImages[] = html_print_image('', true, ['id' => 'imagen', 'class' => 'invisible']);
if (isset($formAction) === false) {
$formAction = 'POST';
}
if (isset($formHidden) === false) {
$formHidden = '';
}
// Form.
echo '<form id="back" class="max_floating_element_size" method="POST" action="'.$formAction.'" enctype="multipart/form-data">';
echo $formHidden;

6
pandora_console/godmode/reporting/visual_console_builder.php
View File

@ -285,7 +285,11 @@ switch ($activeTab) {
}
// If the background is changed the size is reseted
$background_now = $visualConsole['background'];
if (isset($visualConsole['background']) === true) {
$background_now = $visualConsole['background'];
} else {
$background_now = '';
}
$values['width'] = $width;
$values['height'] = $height;

4
pandora_console/godmode/resources/resources_export_import.php
View File

@ -268,8 +268,8 @@ echo '</div>';
if (msg.status === true) {
title = "<?php echo __('Importation successfully completed'); ?>";
message = "<?php echo __('PRD import successfull:'); ?>";
const name = "<?php echo $name; ?>";
const type = "<?php echo $type; ?>";
const name = "<?php echo ($name ?? ''); ?>";
const type = "<?php echo ($type ?? ''); ?>";
message += ` ${type} - ${name}`;
} else {
title = "<?php echo __('Import failure'); ?>";

4
pandora_console/godmode/servers/modificar_server.php
View File

@ -496,8 +496,8 @@ if (isset($_GET['server']) === true) {
<script language="javascript" type="text/javascript">
$(document).ready (function () {
var id_server = '<?php echo $id_server; ?>';
var server_type = '<?php echo $row['server_type']; ?>';
var id_server = '<?php echo ($id_server ?? ''); ?>';
var server_type = '<?php echo ($row['server_type'] ?? ''); ?>';
$("#check_exec_server img").on("click", function () {
$("#check_exec_server img").attr("src", "images/spinner.gif");

4
pandora_console/godmode/servers/plugin.php
View File

@ -1172,6 +1172,10 @@ if (empty($create) === false || empty($view) === false) {
}
ui_require_javascript_file('pandora_modules');
if (isset($locked) === false) {
$locked = '';
}
?>
<script type="text/javascript">

38
pandora_console/godmode/servers/plugin_registration.php
View File

@ -523,27 +523,29 @@ if ($error === null) {
}
}
if (file_exists($uploaded_filename) === true) {
if (is_metaconsole() === true && is_management_allowed() === true) {
// Keep uploaded file to be transferred to nodes.
if (is_dir($config['attachment_store'].'/downloads/') === false) {
mkdir($config['attachment_store'].'/downloads/');
}
if (isset($uploaded_filename) === true) {
if (file_exists($uploaded_filename) === true) {
if (is_metaconsole() === true && is_management_allowed() === true) {
// Keep uploaded file to be transferred to nodes.
if (is_dir($config['attachment_store'].'/downloads/') === false) {
mkdir($config['attachment_store'].'/downloads/');
}
$keep = move_uploaded_file(
$uploaded_filename,
$config['attachment_store'].'/downloads/'.$filename
);
if ($keep === false) {
$error = __(
'Cannot move uploaded file to %s.',
$config['attachment_store'].'/downloads/'
$keep = move_uploaded_file(
$uploaded_filename,
$config['attachment_store'].'/downloads/'.$filename
);
if ($keep === false) {
$error = __(
'Cannot move uploaded file to %s.',
$config['attachment_store'].'/downloads/'
);
}
} else {
// Clean temporary files.
unlink($uploaded_filename);
}
} else {
// Clean temporary files.
unlink($uploaded_filename);
}
}

4
pandora_console/godmode/servers/servers.build_table.php
View File

@ -146,9 +146,9 @@ foreach ($servers as $server) {
// Type.
$data[2] = '<span class="nowrap">'.$server['img'].'&nbsp;&nbsp;&nbsp;&nbsp;'.$server['server_name'];
if ($server['master'] == $master) {
$data[3] .= __('Yes', true);
$data[3] = __('Yes', true);
} else {
$data[3] .= __('-');
$data[3] = __('-');
}
if ((int) $server['exec_proxy'] === 1) {

4
pandora_console/godmode/setup/demo.php
View File

@ -116,6 +116,10 @@ if ($display_loading === true || $running_create === true || $running_delete) {
$table_load->size = [];
$table_load->size[0] = '50%';
$table_load->size[1] = '50%';
$list_mkup = '';
if (isset($operation['id']) === false) {
$operation['id'] = 0;
}
$table_load->data['row0'][] = progress_bar(
0,

11
pandora_console/godmode/setup/file_manager.php
View File

@ -70,6 +70,10 @@ if (isset($config['filemanager']['message']) === true) {
// Add custom directories here.
$fallback_directory = 'images';
// Get directory.
if (isset($text) === false) {
$text = '';
}
$directory = (string) get_parameter('directory');
$directory = str_replace('&lt;', '', $text);
$directory = str_replace('&gt;', '', $text);
@ -90,7 +94,12 @@ $create_text_file = (bool) get_parameter('create_text_file');
$default_real_directory = realpath($config['homedir'].'/');
// Remove double dot in filename path.
$file_name = $_FILES['file']['name'];
if (isset($_FILES['file']) === true) {
$file_name = $_FILES['file']['name'];
} else {
$file_name = '';
}
$path_parts = explode('/', $file_name);
$stripped_parts = array_filter(

8
pandora_console/godmode/setup/license.php
View File

@ -399,7 +399,7 @@ $table->data[0][0] = html_print_label_input_block(
__('Total Agents'),
html_print_input_text(
'total_agents',
$total_agents,
($total_agents ?? ''),
'',
30,
255,
@ -412,7 +412,7 @@ $table->data[0][1] = html_print_label_input_block(
__('Network & other devices'),
html_print_input_text(
'type_network',
$network_others,
($network_others ?? ''),
'',
30,
255,
@ -425,7 +425,7 @@ $table->data[1][0] = html_print_label_input_block(
__('Workstations'),
html_print_input_text(
'type_workstation',
$workstations,
($workstations ?? ''),
'',
30,
255,
@ -438,7 +438,7 @@ $table->data[1][1] = html_print_label_input_block(
__('Servers'),
html_print_input_text(
'type_server',
$servers,
($servers ?? ''),
'',
30,
255,

4
pandora_console/godmode/setup/news.php
View File

@ -389,6 +389,10 @@ if ((isset($_GET['form_add'])) || (isset($_GET['form_edit']))) {
echo '<td>'.__('No').'</b></td>';
}
if (isset($tdcolor) === false) {
$tdcolor = '';
}
echo '<td class="'.$tdcolor.' table_action_buttons"><a href="index.php?sec=gsetup&sec2=godmode/setup/news&id_news='.$row['id_news'].'&borrar='.$row['id_news'].'" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">'.html_print_image('images/delete.svg', true, ['border' => '0', 'class' => 'invert_filter main_menu_icon']).'</a></td></tr>';
}

5
pandora_console/godmode/setup/os.list.php
View File

@ -164,9 +164,8 @@ if (is_metaconsole() === true) {
html_print_action_buttons(
$buttons,
[
'type' => 'data_table',
'class' => 'fixed_action_buttons',
'right_content' => $tablePagination,
'type' => 'data_table',
'class' => 'fixed_action_buttons',
]
);

42
pandora_console/godmode/setup/setup.php
View File

@ -386,6 +386,28 @@ switch ($section) {
break;
}
$menu_tabs = [];
// Agent details.
$menu_tab_url = '<a href="index.php?sec=gsetup&sec2=godmode/setup/setup&section=general">'.__('General setup').'</a>';
array_push($menu_tabs, $menu_tab_url);
// Agent details.
$menu_tab_url = '<a href="index.php?sec=view&sec2=operation/agentes/estado_agente">'.__('Agent detail').'</a>';
array_push($menu_tabs, $menu_tab_url);
// Manage agents.
$menu_tab_url = '<a href="index.php?sec=gagente&sec2=godmode/agentes/modificar_agente">'.__('Manage agents').'</a>';
array_push($menu_tabs, $menu_tab_url);
// Events.
$menu_tab_url = '<a href="index.php?sec=eventos&sec2=operation/events/events">'.__('View events').'</a>';
array_push($menu_tabs, $menu_tab_url);
// Events.
$menu_tab_url = '<a href="index.php?sec=reporting&sec2=godmode/reporting/reporting_builder">'.__('Custom reports').'</a>';
array_push($menu_tabs, $menu_tab_url);
$dots = dot_tab($menu_tabs);
// Header.
ui_print_standard_header(
__('Setup').' &raquo; '.$subpage,
@ -403,7 +425,9 @@ ui_print_standard_header(
'link' => '',
'label' => $subpage,
],
]
],
[],
$dots
);
if (isset($config['error_config_update_config'])) {
@ -413,15 +437,19 @@ if (isset($config['error_config_update_config'])) {
ui_print_success_message(__('Correct update the setup options'));
}
if (is_array($config['error_config_update_config']['errors']) === true) {
foreach ($config['error_config_update_config']['errors'] as $msg) {
ui_print_error_message($msg);
if (isset($config['error_config_update_config']['errors']) === true) {
if (is_array($config['error_config_update_config']['errors']) === true) {
foreach ($config['error_config_update_config']['errors'] as $msg) {
ui_print_error_message($msg);
}
}
}
if (is_array($config['error_config_update_config']['warnings']) === true) {
foreach ($config['error_config_update_config']['warnings'] as $msg) {
ui_print_warning_message($msg);
if (isset($config['error_config_update_config']['warnings']) === true) {
if (is_array($config['error_config_update_config']['warnings']) === true) {
foreach ($config['error_config_update_config']['warnings'] as $msg) {
ui_print_warning_message($msg);
}
}
}

4
pandora_console/godmode/setup/setup_ITSM.php
View File

@ -137,6 +137,10 @@ $row['hostname'] = html_print_label_input_block(
['div_class' => 'ITSM-remote-setup-ITSM_hostname']
);
if (isset($config['ITSM_token']) === false) {
$config['ITSM_token'] = '';
}
// ITSM token.
$row['password'] = html_print_label_input_block(
__('Token'),

4
pandora_console/godmode/setup/setup_auth.php
View File

@ -390,7 +390,7 @@ if (is_ajax() === true) {
set_unless_defined($config['double_auth_enabled'], false);
$row = [];
$row['name'] = __('Double authentication');
$row['control'] .= html_print_checkbox_switch(
$row['control'] = html_print_checkbox_switch(
'double_auth_enabled',
1,
$config['double_auth_enabled'],
@ -405,7 +405,7 @@ if (is_ajax() === true) {
set_unless_defined($config['2FA_all_users'], false);
$row = [];
$row['name'] = __('Force 2FA for all users is enabled');
$row['control'] .= html_print_checkbox_switch(
$row['control'] = html_print_checkbox_switch(
'2FA_all_users',
1,
$config['2FA_all_users'],

12
pandora_console/godmode/setup/setup_ehorus.php
View File

@ -78,6 +78,18 @@ $table_remote->class = 'databox filters filter-table-adv';
$table_remote->size['ehorus_hostname'] = '50%';
$table_remote->size['ehorus_port'] = '50%';
if (isset($config['ehorus_user_level_conf']) === false) {
$config['ehorus_user_level_conf'] = '';
}
if (isset($config['ehorus_user']) === false) {
$config['ehorus_user'] = '';
}
if (isset($config['ehorus_pass']) === false) {
$config['ehorus_pass'] = '';
}
// Enable eHorus user configuration.
$row = [];
$row['ehorus_user_level_conf'] = html_print_label_input_block(

49
pandora_console/godmode/setup/setup_general.php
View File

@ -405,7 +405,7 @@ $table->data[$i++][] = html_print_label_input_block(
$table->data[$i][] = html_print_label_input_block(
__('General network path'),
__('General network path').ui_print_help_tip(__('Base directory where the netflow and sflow subdirectories will be located to store the corresponding data.'), true),
html_print_input_text(
'general_network_path',
$config['general_network_path'],
@ -417,7 +417,7 @@ $table->data[$i][] = html_print_label_input_block(
);
$table->data[$i++][] = html_print_label_input_block(
__('Enable Feedback'),
__('Enable Feedback').ui_print_help_tip(__(' It enables the \'give feedback\' window in the help menu at the top right.'), true),
html_print_checkbox_switch_extended(
'activate_feedback',
true,
@ -477,7 +477,7 @@ $table->data[$i++][] = html_print_label_input_block(
);
$table->data[$i][] = html_print_label_input_block(
__('Public URL'),
__('Public URL').ui_print_help_tip(__('It is useful to complete this field when you have a reverse proxy, for example, with the mod_proxy mode of the Apache web server.'), true),
html_print_input_text(
'public_url',
$config['public_url'],
@ -488,6 +488,10 @@ $table->data[$i][] = html_print_label_input_block(
)
);
if (isset($config['force_public_url']) === false) {
$config['force_public_url'] = '';
}
$table->data[$i++][] = html_print_label_input_block(
__('Force use Public URL'),
html_print_switch(
@ -498,6 +502,10 @@ $table->data[$i++][] = html_print_label_input_block(
)
);
if (isset($config['public_url_exclusions']) === false) {
$config['public_url_exclusions'] = '';
}
$table->data[$i++][] = html_print_label_input_block(
__('Public URL host exclusions'),
html_print_textarea(
@ -512,7 +520,7 @@ $table->data[$i++][] = html_print_label_input_block(
// Inventory changes blacklist.
$table->data[$i][] = html_print_label_input_block(
__('Inventory changes blacklist'),
__('Inventory changes blacklist').ui_print_help_tip(__('Inventory modules included within the denied list will not generate events when they change.'), true),
$table_ichanges
);
@ -528,7 +536,7 @@ $table->data[$i++][] = html_print_label_input_block(
)
);
$help_tip = ui_print_help_tip(
__('No events or alerts will be generated, but data will still be received.'),
__('While this option is enabled, no events or alerts will be generated, but data will continue to be received.'),
true
);
$table->data[$i][] = html_print_label_input_block(
@ -542,7 +550,7 @@ $table->data[$i][] = html_print_label_input_block(
);
$table->data[$i++][] = html_print_label_input_block(
__('Command Snapshot'),
__('Command Snapshot').ui_print_help_tip(__('String modules that return more than one line will display their content as formatted text in the form of a command console.'), true),
html_print_checkbox_switch(
'command_snapshot',
1,
@ -552,7 +560,7 @@ $table->data[$i++][] = html_print_label_input_block(
);
$table->data[$i][] = html_print_label_input_block(
__('Change remote config encoding'),
__('Change remote config encoding').ui_print_help_tip(__('Enabling this parameter uses encoding of the configuration files generated by the agents instead of converting everything to UTF-8.'), true),
html_print_checkbox_switch(
'use_custom_encoding',
1,
@ -561,7 +569,7 @@ $table->data[$i][] = html_print_label_input_block(
)
);
$table->data[$i++][] = html_print_label_input_block(
__('Referer security'),
__('Referer security').ui_print_help_tip(__('When it is active, the source of the requests is checked. If the user comes from a URL external to Pandora FMS, the source of the activity will be considered suspicious.'), true),
html_print_checkbox_switch(
'referer_security',
1,
@ -605,7 +613,7 @@ $table->data[$i++][] = html_print_label_input_block(
);
$table->data[$i][] = html_print_label_input_block(
__('Allow create scheduled downtimes in the past'),
__('Allow create scheduled downtimes in the past').ui_print_help_tip(__('It allows the possibility to create scheduled downtimes on past dates and thus modify SLA reports retroactively.'), true),
html_print_checkbox_switch(
'past_planned_downtimes',
1,
@ -614,7 +622,7 @@ $table->data[$i][] = html_print_label_input_block(
)
);
$table->data[$i++][] = html_print_label_input_block(
__('Limit for bulk operations'),
__('Limit for bulk operations').ui_print_help_tip(__('Limit of elements that can be modified by one-time bulk operations. The limit prevents the operation from failing due to lack of memory.'), true),
html_print_input(
[
'type' => 'number',
@ -630,7 +638,7 @@ $table->data[$i++][] = html_print_label_input_block(
);
$table->data[$i][] = html_print_label_input_block(
__('Include agents manually disabled'),
__('Include agents manually disabled').ui_print_help_tip(__('It enables the display of manually disabled agents in certain Console views.'), true),
html_print_checkbox_switch(
'include_agents',
1,
@ -639,7 +647,7 @@ $table->data[$i][] = html_print_label_input_block(
)
);
$table->data[$i++][] = html_print_label_input_block(
__('Set alias as name by default in agent creation'),
__('Set alias as name by default in agent creation').ui_print_help_tip(__('When this parameter is activated, the selection box of the agent creation menu collects the alias entered in the form and also saves it as the name of the agent (unique identifier).'), true),
html_print_checkbox_switch(
'alias_as_name',
1,
@ -649,7 +657,7 @@ $table->data[$i++][] = html_print_label_input_block(
);
$table->data[$i][] = html_print_label_input_block(
__('Unique IP'),
__('Unique IP').ui_print_help_tip(__('By activating this parameter, the console will prevent users from creating an agent with the same IP address as another one.'), true),
html_print_checkbox_switch(
'unique_ip',
1,
@ -659,7 +667,7 @@ $table->data[$i][] = html_print_label_input_block(
);
$table->data[$i++][] = html_print_label_input_block(
__('Module custom ID readonly'),
__('Module custom ID readonly').ui_print_help_tip(__('It blocks the editing of the module custom ID from the Console, but editing from CLI and API is allowed. This is useful for integrations with third-party tools that manage the value of this field automatically.'), true),
html_print_checkbox_switch(
'module_custom_id_ro',
1,
@ -701,8 +709,9 @@ $table->data[$i++][] = html_print_label_input_block(
)
);
$url = 'https://pandorafms.com/manual/!772/en/documentation/04_using/12_console_setup#dedicated_console_for_reports';
$table->data[$i][] = html_print_label_input_block(
__('Enable console report'),
__('Console dedicated to report generation').ui_print_help_tip(__('It allows you to enable the Web Console in dedicated reporting mode, see section \'Dedicated Console for Reports\' for more information.'), true),
html_print_checkbox_switch(
'reporting_console_enable',
1,
@ -712,7 +721,7 @@ $table->data[$i][] = html_print_label_input_block(
);
$table->data[$i++][] = html_print_label_input_block(
__('Check conexion interval'),
__('Check conexion interval').ui_print_help_tip(__('Time interval (in seconds) to check the connection to the database server. Default 180, minimum value 60.'), true),
html_print_input_number(
[
'name' => 'check_conexion_interval',
@ -723,7 +732,7 @@ $table->data[$i++][] = html_print_label_input_block(
);
$help_tip = ui_print_help_tip(
__('If there are any &#x22;In process&#x22; events with a specific Extra ID and a New event with that Extra ID is received, it will be created as &#x22;In process&#x22; instead. The new events also inherit Event Custom ID'),
__('If there is any event “In process” with a specific additional ID and a “New” event with that additional ID is received, it will be created as “In process.” New events will also inherit the Event Custom ID from the old event.'),
true
);
@ -738,7 +747,7 @@ $table->data[$i][] = html_print_label_input_block(
);
$table->data[$i++][] = html_print_label_input_block(
__('Max. hours old events comments'),
__('Max. hours old events comments').ui_print_help_tip(__('When the grouped events are displayed, the comments of all the grouped identical events are displayed, but limiting it to the last N hours.'), true),
html_print_input_number(
[
'name' => 'max_hours_old_event_comment',
@ -919,6 +928,10 @@ echo '<legend>'.__('Mail configuration').'</legend>';
$table_ncm_config->size[0] = '50%';
$table_ncm_config->data = [];
if (isset($config['tftp_server_ip']) === false) {
$config['tftp_server_ip'] = '';
}
$table_ncm_config->data[0][] = html_print_label_input_block(
__('FTP server IP').ui_print_help_tip(__('This value will be used by TFTP_SERVER_IP macro in NCM scripts.'), true),
html_print_input_text(

2
pandora_console/godmode/setup/setup_netflow.php
View File

@ -101,7 +101,7 @@ $table->data[4][] = html_print_label_input_block(
);
$table->data[4][] = html_print_label_input_block(
__('Enable Sflow'),
__('Enable Sflow').ui_print_help_tip(__('SFLow uses a different protocol and needs an alternative collector that must be activated with this switch'), true),
html_print_checkbox_switch_extended(
'activate_sflow',
1,

42
pandora_console/godmode/setup/setup_visuals.php
View File

@ -109,7 +109,7 @@ $table_behaviour->data[$row][] = html_print_label_input_block(
);
$table_behaviour->data[$row][] = html_print_label_input_block(
__('Click to display lateral menus'),
__('Click to display lateral menus').ui_print_help_tip(__('When the side menu is collapsed, it allows you to define whether it is displayed by hovering the mouse over it or you need to click to display it.'), true),
html_print_checkbox_switch(
'click_display',
1,
@ -130,7 +130,7 @@ $table_behaviour->data[$row][] = html_print_label_input_block(
)
);
$table_behaviour->data[$row][] = html_print_label_input_block(
__('Display data of proc modules in other format'),
__('Display data of proc modules in other format').ui_print_help_tip(__('It allows to define the message that appears when you hover over a color box that shows the status of an agent or a module. If you want to change what the default color box looks like, choose another form of visual representation in the "Status icon set" option.'), true),
html_print_checkbox_switch(
'render_proc',
1,
@ -358,7 +358,7 @@ $table_styles->data[$row][] = html_print_label_input_block(
);
$table_styles->data[$row][] = html_print_label_input_block(
__('Status icon set'),
__('Status icon set').ui_print_help_tip(__('It changes the appearance of the agent or module status icon. Useful for people with problems when discriminating colors, you may overlay a text in the box or add an emoji (that icon can be replaced by a custom one, replacing the files on disk).'), true),
html_print_div(
[
'class' => 'select-with-sibling',
@ -1047,7 +1047,7 @@ $table_font->data[$row][] = html_print_label_input_block(
$row++;
$table_font->data[$row][] = html_print_label_input_block(
__('Agent size text'),
__('Agent size text').ui_print_help_tip(__('In the lists or sections where the agent name is displayed, the name will be shortened if its extension is greater than the number indicated here. If the text is in a small area it can have a maximum length and if it is in a larger section, it can have another size.'), true),
html_print_div(
[
'class' => 'filter-table-adv-manual',
@ -1069,7 +1069,7 @@ $table_font->data[$row][] = html_print_label_input_block(
)
);
$table_font->data[$row][] = html_print_label_input_block(
__('Module size text'),
__('Module size text').ui_print_help_tip(__('In the lists or sections where the agent name is displayed, the name will be shortened if its extension is greater than the number indicated here. If the text is in a small area it can have a maximum length and if it is in a larger section, it can have another size.'), true),
html_print_div(
[
'class' => 'filter-table-adv-manual',
@ -1170,12 +1170,12 @@ for ($i = 1; $i <= $graphColorAmount; $i++) {
}
$tip = ui_print_help_tip(
__('Decimal data resolution setting for SLA and other reports is not available in the Community version.'),
__('Number of decimals to display in reports and visual consoles. It must be between 0 and 5.'),
true
);
$table_chars->data[$row][] = html_print_label_input_block(
($disabled_graph_precision) ? __('Data precision').$tip : __('Data precision'),
__('Data precision').$tip,
html_print_input(
[
'type' => 'number',
@ -1212,7 +1212,7 @@ $table_chars->data[$row][] = html_print_label_input_block(
$row++;
$table_chars->data[$row][] = html_print_label_input_block(
__('Value to interface graphics'),
__('Value to interface graphics').ui_print_help_tip(__('Name of the drives for network interface graphics (SNMP).'), true),
html_print_input_text(
'interface_unit',
$config['interface_unit'],
@ -1262,7 +1262,7 @@ $table_chars->data[$row][] = html_print_label_input_block(
$row++;
$table_chars->data[$row][] = html_print_label_input_block(
__('Chart fit to content'),
__('Chart fit to content').ui_print_help_tip(__('There are graphs whose values are percentages and the top of the graph exceeds the maximum value one hundred, you may configure the graphs to stop adding a proportional upper margin by activating this option.'), true),
html_print_checkbox_switch(
'maximum_y_axis',
1,
@ -1320,7 +1320,7 @@ $table_chars->data[$row][] = html_print_label_input_block(
);
$table_chars->data[$row][] = html_print_label_input_block(
__('Graph TIP view'),
__('Graph TIP view').ui_print_help_tip(__('TIP graphs show the full data resolution, they are much more expensive in BD/CPU time, but they allow to "zoom" interactively and show all the data, without compacting the information in fewer points. By default (off), TIPs can be seen, but manually, if this mode is selected in each graph, but you may also define that they always come out as TIP or also define that this is so, but only for those of Boolean data.'), true),
html_print_select(
$options_full_escale,
'full_scale_option',
@ -1336,7 +1336,7 @@ $table_chars->data[$row][] = html_print_label_input_block(
$row++;
$table_chars->data[$row][] = html_print_label_input_block(
__('Graph mode'),
__('Graph mode').ui_print_help_tip(__('It displays the default graphs with three overlapping data series (Maximum, Average, and Minimum) or with only one data series (Average).'), true),
html_print_select(
$options_soft_graphs,
'type_mode_graph',
@ -1467,7 +1467,7 @@ $table_vc->data[$row][] = html_print_label_input_block(
$row++;
$table_vc->data[$row][] = html_print_label_input_block(
__('Display item frame on alert triggered'),
__('Display item frame on alert triggered').ui_print_help_tip(__('It displays an orange box around items that have triggered an alert.'), true),
html_print_checkbox_switch(
'display_item_frame',
1,
@ -1587,7 +1587,7 @@ $row++;
// Logo.
$table_report->data['custom_report_front-logo'][] = html_print_label_input_block(
__('Custom report front').' - '.__('Custom logo').ui_print_help_tip(
__("The dir of custom logos is in your www Console in 'images/custom_logo'. You can upload more files (ONLY JPEG AND PNG) in upload tool in console."),
__('You may use the following macros: _REPORT_NAME_ indicating the name of the report, _DATETIME_END_ indicates the end of the period (if it is a periodic report), _DATETIME_ date/time of the generation of the report.'),
true
),
html_print_select(
@ -1601,13 +1601,13 @@ $table_report->data['custom_report_front-logo'][] = html_print_label_input_block
)
);
$table_report->data['custom_report_front-preview'][] = html_print_label_input_block(
__('Custom report front').' - '.__('Preview'),
__('Custom report front').' - '.__('Preview').ui_print_help_tip(__('You may use the following macros: _REPORT_NAME_ indicating the name of the report, _DATETIME_END_ indicates the end of the period (if it is a periodic report), _DATETIME_ date/time of the generation of the report.'), true),
'<span id="preview_image">'.html_print_image($config['custom_report_front_logo'], true).'</span>'
);
$table_report->colspan['custom_report_front-header'][] = 2;
$table_report->data['custom_report_front-header'][] = html_print_label_input_block(
__('Custom report front').' - '.__('Header'),
__('Custom report front').' - '.__('Header').ui_print_help_tip(__('You may use the following macros: _REPORT_NAME_ indicating the name of the report, _DATETIME_END_ indicates the end of the period (if it is a periodic report), _DATETIME_ date/time of the generation of the report.'), true),
html_print_textarea(
'custom_report_front_header',
5,
@ -1620,7 +1620,7 @@ $table_report->data['custom_report_front-header'][] = html_print_label_input_blo
$table_report->colspan['custom_report_front-first_page'][] = 2;
$table_report->data['custom_report_front-first_page'][] = html_print_label_input_block(
__('Custom report front').' - '.__('First page'),
__('Custom report front').' - '.__('First page').ui_print_help_tip(__('You may use the following macros: _REPORT_NAME_ indicating the name of the report, _DATETIME_END_ indicates the end of the period (if it is a periodic report), _DATETIME_ date/time of the generation of the report.'), true),
html_print_textarea(
'custom_report_front_firstpage',
15,
@ -1634,7 +1634,7 @@ $table_report->data['custom_report_front-first_page'][] = html_print_label_input
// Do not remove io_safe_output in textarea. TinyMCE avoids XSS injection.
$table_report->colspan['custom_report_front-footer'][] = 2;
$table_report->data['custom_report_front-footer'][] = html_print_label_input_block(
__('Custom report front').' - '.__('Footer'),
__('Custom report front').' - '.__('Footer').ui_print_help_tip(__('You may use the following macros: _REPORT_NAME_ indicating the name of the report, _DATETIME_END_ indicates the end of the period (if it is a periodic report), _DATETIME_ date/time of the generation of the report.'), true),
html_print_textarea(
'custom_report_front_footer',
5,
@ -1788,7 +1788,7 @@ $table_other->data[$row][] = html_print_label_input_block(
);
$table_other->data[$row][] = html_print_label_input_block(
__('Show only the group name'),
__('Show only the group name').ui_print_help_tip(__('The name of the group will be displayed instead of displaying its icon.'), true),
html_print_checkbox_switch(
'show_group_name',
1,
@ -1809,7 +1809,7 @@ $table_other->data[$row][] = html_print_label_input_block(
);
$table_other->data[$row][] = html_print_label_input_block(
__('Date format string'),
__('Date format string').ui_print_help_tip(__('It uses a unix datetime format definition string.'), true),
html_print_input_text(
'date_format',
$config['date_format'],
@ -1870,7 +1870,7 @@ $row++;
// ----------------------------------------------------------------------
$count_custom_postprocess = post_process_get_custom_values();
$table_other->data[$row][] = html_print_label_input_block(
__('Custom values post process'),
__('Custom values post process').ui_print_help_tip(__('Custom conversion values for post-processing. It updates a table in the database to have custom conversions from one unit to another.'), true),
html_print_div(
[
'class' => 'filter-table-adv-manual',
@ -2126,7 +2126,7 @@ $table_other->data[$row][] = html_print_label_input_block(
$row++;
$table_other->data[$row][] = html_print_label_input_block(
__('Data multiplier to use in graphs/data'),
__('Data multiplier to use in graphs/data').ui_print_help_tip(__('Value by which it will multiply the data shown to represent them in graphs. This is useful in case the value unit is bytes; for other conversions use Custom value post processing.'), true),
html_print_select($options_data_multiplier, 'use_data_multiplier', $config['use_data_multiplier'], '', '', 1, true, false, false)
);
$table_other->data[$row][] = html_print_label_input_block(

2
pandora_console/godmode/setup/welcome_tips.php
View File

@ -74,6 +74,8 @@ if ($view === 'create' || $view === 'edit') {
if (count($errors) === 0) {
if (count($files) > 0) {
$uploadImages = $tipsWindow->uploadImages($files);
} else {
$uploadImages = '';
}
$response = $tipsWindow->createTip($id_lang, $id_profile, $title, $text, $url, $enable, $uploadImages);

44
pandora_console/godmode/snmpconsole/snmp_alert.php
View File

@ -2087,7 +2087,7 @@ if ($create_alert || $update_alert) {
FROM talert_actions
ORDER BY name',
'alert_type',
$alert_type,
($alert_type ?? ''),
'',
'',
0,
@ -2100,26 +2100,26 @@ if ($create_alert || $update_alert) {
echo '</tr>';
$al = [
'al_field1' => $al_field1,
'al_field2' => $al_field2,
'al_field3' => $al_field3,
'al_field4' => $al_field4,
'al_field5' => $al_field5,
'al_field6' => $al_field6,
'al_field7' => $al_field7,
'al_field8' => $al_field8,
'al_field9' => $al_field9,
'al_field10' => $al_field10,
'al_field11' => $al_field11,
'al_field12' => $al_field12,
'al_field13' => $al_field13,
'al_field14' => $al_field14,
'al_field15' => $al_field15,
'al_field16' => $al_field16,
'al_field17' => $al_field17,
'al_field18' => $al_field18,
'al_field19' => $al_field19,
'al_field20' => $al_field20,
'al_field1' => ($al_field1 ?? ''),
'al_field2' => ($al_field2 ?? ''),
'al_field3' => ($al_field3 ?? ''),
'al_field4' => ($al_field4 ?? ''),
'al_field5' => ($al_field5 ?? ''),
'al_field6' => ($al_field6 ?? ''),
'al_field7' => ($al_field7 ?? ''),
'al_field8' => ($al_field8 ?? ''),
'al_field9' => ($al_field9 ?? ''),
'al_field10' => ($al_field10 ?? ''),
'al_field11' => ($al_field11 ?? ''),
'al_field12' => ($al_field12 ?? ''),
'al_field13' => ($al_field13 ?? ''),
'al_field14' => ($al_field14 ?? ''),
'al_field15' => ($al_field15 ?? ''),
'al_field16' => ($al_field16 ?? ''),
'al_field17' => ($al_field17 ?? ''),
'al_field18' => ($al_field18 ?? ''),
'al_field19' => ($al_field19 ?? ''),
'al_field20' => ($al_field20 ?? ''),
];
for ($i = 1; $i <= $config['max_macro_fields']; $i++) {
@ -2287,7 +2287,7 @@ $(document).ready (function () {
});
values.push({
name: "content_type",
value: "<?php echo $al_field4; ?>"
value: "<?php echo ($al_field4 ?? ''); ?>"
})
jQuery.post (<?php echo "'".ui_get_full_url('ajax.php', false, false, false)."'"; ?>,

6
pandora_console/godmode/snmpconsole/snmp_filters.php
View File

@ -377,11 +377,15 @@ if ($edit_filter > -2) {
echo '</form></div>';
}
if (isset($index) === false) {
$index = 0;
}
?>
<script type="text/javascript">
// +1 because there is already a defined 'filter' field.
var id = parseInt("<?php echo $index; ?>")+1;
var id = parseInt("<?php echo $index; ?>")+1;
var homeurl = "<?php echo $config['homeurl']; ?>";
$(document).ready (function () {

2
pandora_console/godmode/update_manager/update_manager.setup.php
View File

@ -99,7 +99,7 @@ if (!$action_update_url_update_manager) {
);
$allow_offline_patches = get_parameter_switch(
'allow_offline_patches',
$config['allow_offline_patches']
($config['allow_offline_patches'] ?? '')
);
$lts_updates = get_parameter_switch(
'lts_updates',

6
pandora_console/godmode/users/configure_user.php
View File

@ -1113,11 +1113,15 @@ if (!$new_user) {
$user_id .= $apiTokenContent;
$CodeQRContent .= html_print_div(['id' => 'qr_container_image', 'class' => 'scale-0-8'], true);
$CodeQRContent = html_print_div(['id' => 'qr_container_image', 'class' => 'scale-0-8'], true);
$CodeQRContent .= html_print_anchor(
['id' => 'qr_code_agent_view'],
true
);
if (isset($custom_id_div) === false) {
$custom_id_div = '';
}
$CodeQRContent .= '<br/>'.$custom_id_div;
// QR code div.

28
pandora_console/godmode/users/user_management.php
View File

@ -64,6 +64,16 @@ if ($dashboards === false) {
}
}
$layouts = visual_map_get_user_layouts($config['id_user'], true);
$layouts_aux = [];
if ($layouts === false) {
$layouts_aux = ['None' => 'None'];
} else {
foreach ($layouts as $layout) {
$layouts_aux[$layout] = $layout;
}
}
// Custom Home Screen controls.
$customHomeScreenAddition = [];
// Home screen. Dashboard.
@ -81,21 +91,12 @@ $customHomeScreenAddition[HOME_SCREEN_DASHBOARD] = html_print_select(
false,
'width: 100%'
);
// Home screen. Visual consoles.
$customHomeScreenAddition[HOME_SCREEN_VISUAL_CONSOLE] = html_print_select($layouts_aux, 'visual_console', $user_info['data_section'], '', '', '', true, false, true, 'w100p', false, 'width: 100%');
// Home screen. External link and Other.
$customHomeScreenAddition[HOME_SCREEN_EXTERNAL_LINK] = html_print_input_text('data_section', $user_info['data_section'], '', 60, 400, true);
$layouts = visual_map_get_user_layouts($config['id_user'], true);
$layouts_aux = [];
if ($layouts === false) {
$layouts_aux = ['None' => 'None'];
} else {
foreach ($layouts as $layout) {
$layouts_aux[$layout] = $layout;
}
}
// Home screen. Visual consoles.
$customHomeScreenAddition[HOME_SCREEN_VISUAL_CONSOLE] = html_print_select(
$layouts_aux,
@ -248,7 +249,7 @@ $userManagementTable->data['fields_fullname'][0] = html_print_input_text_extende
// User Email.
$userManagementTable->rowclass['captions_email'] = 'field_half_width';
$userManagementTable->rowclass['fields_email'] = 'field_half_width';
$userManagementTable->data['captions_email'][0] = __('Email');
$userManagementTable->data['captions_email'][0] = __('Email').ui_print_help_tip(__('This will be the email used in those alert actions that the email makes use of. It will also be the email used for user notifications that wer configured in this way.'), true);
$userManagementTable->data['fields_email'][0] = html_print_input_text_extended(
'email',
$user_info['email'],
@ -295,7 +296,7 @@ if (empty($doubleAuthentication) === false) {
if (users_is_admin() === true) {
$globalProfileContent = [];
$globalProfileContent[] = '<span>'.__('Administrator user').'</span>';
$globalProfileContent[] = '<span>'.__('Administrator user').ui_print_help_tip(__('This type of \'superadmin\' has no restrictions whatsoever. If you want to create partial administrators, use the profile and group-based privilege system.'), true).'</span>';
$globalProfileContent[] = html_print_checkbox_switch(
'is_admin',
0,
@ -889,7 +890,7 @@ if (users_is_admin($config['id_user']) === true || (bool) check_acl($config['id_
true
);
$userManagementTable->data['fields_addSettings'][1] .= html_print_div(
$userManagementTable->data['fields_addSettings'][1] = html_print_div(
[
'class' => 'edit_user_allowed_ip '.(((int) $user_info['allowed_ip_active'] === 1) ? '' : 'invisible'),
'content' => html_print_textarea(
@ -914,6 +915,7 @@ if (users_is_admin($config['id_user']) === true || (bool) check_acl($config['id_
);
}
$ITSM_host = '';
if ($config['ITSM_enabled'] && $config['ITSM_user_level_conf']) {
// Pandora ITSM user remote login.
$table_ITSM = new StdClass();

3
pandora_console/godmode/wizards/Applications.class.php
View File

@ -66,7 +66,8 @@ class Applications extends Wizard
int $page=0,
string $msg='Default message. Not set.',
string $icon='images/wizard/applications.png',
string $label='Applications'
string $label='Applications',
string $class_style='',
) {
$this->setBreadcrum([]);

10
pandora_console/godmode/wizards/Cloud.class.php
View File

@ -251,7 +251,7 @@ class Cloud extends Wizard
ui_print_error_message($this->msg);
}
if ($empty_account === true) {
if (isset($empty_account) === true) {
ui_print_error_message($this->msg);
}
@ -287,7 +287,7 @@ class Cloud extends Wizard
'name' => 'account_identifier',
'type' => 'select',
'fields' => CredentialStore::getKeys($this->keyStoreType),
'selected' => $this->keyIdentifier,
'selected' => (isset($this->keyIdentifier) === true) ? $this->keyIdentifier : '',
'return' => true,
],
],
@ -338,7 +338,7 @@ class Cloud extends Wizard
{
global $config;
$pandora = io_safe_output($config['cloud_util_path']);
$pandora = io_safe_output(($config['cloud_util_path'] ?? ''));
if (isset($pandora) === false) {
config_update_value('cloud_util_path', '/usr/bin/pandora-cm-api');
@ -349,7 +349,7 @@ class Cloud extends Wizard
return false;
}
if ($this->keyIdentifier === null) {
if (isset($this->keyIdentifier) === false) {
// Ask user for available credentials.
$this->msg = __('Select a set of credentials from the list');
$this->status = null;
@ -426,7 +426,7 @@ class Cloud extends Wizard
*/
public function getCredentials()
{
return CredentialStore::getKey($this->keyIdentifier);
return CredentialStore::getKey((isset($this->keyIdentifier) === true) ? $this->keyIdentifier : '');
}

3
pandora_console/godmode/wizards/Custom.class.php
View File

@ -66,7 +66,8 @@ class Custom extends Wizard
int $page=0,
string $msg='Default message. Not set.',
string $icon='/images/wizard/Custom_apps@svg.svg',
string $label='Custom'
string $label='Custom',
string $class_style='',
) {
$this->setBreadcrum([]);

6
pandora_console/godmode/wizards/DiscoveryTaskList.class.php
View File

@ -625,7 +625,7 @@ class DiscoveryTaskList extends HTML
// Updated at.
$table->headstyle[8] .= 'min-width: 50px; width: 150px;';
// Operations.
$table->headstyle[9] .= 'min-width: 150px; width: 250px;';
$table->headstyle[9] = 'min-width: 150px; width: 250px;';
if (check_acl($config['id_user'], 0, 'AW')) {
$table->head[0] = __('Force');
@ -1131,6 +1131,10 @@ class DiscoveryTaskList extends HTML
array_push($table->data, $data);
}
if (isset($server_name) === false) {
$server_name = '';
}
if (empty($table->data)) {
$content = '<div class="nf">'.__('Server').' '.$server_name.' '.__('has no discovery tasks assigned').'</div>';
$return = false;

32
pandora_console/godmode/wizards/HostDevices.class.php
View File

@ -813,8 +813,36 @@ class HostDevices extends Wizard
// Interval and schedules.
$interv_manual = 0;
if ((int) $this->task['interval_sweep'] == 0) {
$interv_manual = 1;
if (isset($this->task['interval_sweep']) === true) {
if ((int) $this->task['interval_sweep'] == 0) {
$interv_manual = 1;
}
} else {
$this->task['interval_sweep'] = '';
}
if (isset($this->task['name']) === false) {
$this->task['name'] = '';
}
if (isset($this->task['id_recon_server']) === false) {
$this->task['id_recon_server'] = '';
}
if (isset($this->task['subnet_csv']) === false) {
$this->task['subnet_csv'] = '';
}
if (isset($this->task['subnet']) === false) {
$this->task['subnet'] = '';
}
if (isset($this->task['id_group']) === false) {
$this->task['id_group'] = 0;
}
if (isset($this->task['description']) === false) {
$this->task['description'] = '';
}
$form['rows'][0]['new_form_block'] = true;

3
pandora_console/godmode/wizards/ManageExtensions.class.php
View File

@ -214,7 +214,8 @@ class ManageExtensions extends HTML
break;
default:
continue;
// Nothing.
break;
}
}

18
pandora_console/godmode/wizards/Wizard.main.php
View File

@ -104,6 +104,20 @@ class Wizard
*/
public $rootUrl;
/**
* Task.
*
* @var mixed
*/
public $task;
/**
* Max pages net scan.
*
* @var mixed
*/
public $maxPagesNetScan;
/**
* Setter for breadcrum
@ -221,6 +235,10 @@ class Wizard
$i = 0;
foreach ($urls as $url) {
if (isset($url['selected']) === false) {
$url['selected'] = 0;
}
if ($url['selected'] == 1) {
$class = 'selected';
} else {

8
pandora_console/include/ajax/alert_list.ajax.php
View File

@ -431,6 +431,10 @@ if ($get_agent_alerts_datatable === true) {
if (empty($filter_alert['free_search']) === false) {
$free_search_alert = $filter_alert['free_search'];
} else {
if (isset($filter_alert['free_search_alert']) === false) {
$filter_alert['free_search_alert'] = '';
}
$free_search_alert = $filter_alert['free_search_alert'];
}
@ -635,6 +639,10 @@ if ($get_agent_alerts_datatable === true) {
}
$alerts = [];
if (isset($agent_view_page) === false) {
$agent_view_page = false;
}
if ($agent_view_page === true) {
$options_simple = ['order' => $order];
} else {

2
pandora_console/include/ajax/consoles.ajax.php
View File

@ -71,7 +71,7 @@ if ($get_all_datatables_formatted === true) {
// Datatables format: RecordsTotal && recordsfiltered.
echo json_encode(
[
'data' => $data,
'data' => ($data ?? ''),
'recordsTotal' => $count,
'recordsFiltered' => $count,
]

4
pandora_console/include/ajax/custom_fields.php
View File

@ -58,6 +58,10 @@ if (check_login()) {
if ($check_csv_button) {
if (check_acl($config['id_user'], 0, 'PM')) {
if (isset($permission) === false) {
$permission = '';
}
echo json_encode($permission);
return;
} else {

40
pandora_console/include/ajax/demo_data.ajax.php
View File

@ -186,9 +186,9 @@ if ($action === 'create_demo_data') {
}
$modules_data = $ini_agent_data['modules'];
$inventory = $ini_agent_data['inventory'];
$inventory_values = $ini_agent_data['inventory_values'];
$traps = $ini_agent_data['traps'];
$inventory = (isset($ini_agent_data['inventory']) === true) ? $ini_agent_data['inventory'] : '';
$inventory_values = (isset($ini_agent_data['inventory_values']) === true) ? $ini_agent_data['inventory_values'] : '';
$traps = (isset($ini_agent_data['traps']) === true) ? $ini_agent_data['traps'] : '';
$address_network = $agent_data['address_network'];
@ -435,11 +435,15 @@ if ($action === 'create_demo_data') {
$module_description = '';
if (isset($modules_array['description']) === true && is_string($modules_array['description']) === true) {
if (isset($mac) === false) {
$mac = '';
}
$module_description = str_replace('_mac_', $mac, $modules_array['description']);
}
$values = [
'unit' => $modules_array['unit'],
'unit' => (isset($modules_array['unit']) === true) ? $modules_array['unit'] : '',
'descripcion' => $module_description,
'id_tipo_modulo' => $id_tipo,
'id_module_group' => ($modules_array['group'] ?? 0),
@ -597,8 +601,12 @@ if ($action === 'create_demo_data') {
while (1) {
// Insert in tmodule_inventory.
$modules_array = [];
foreach ($inventory as $key => $value) {
$modules_array[$key] = ($value[$module_access_idx] ?? null);
if (isset($inventory) === true) {
if ($inventory !== '') {
foreach ($inventory as $key => $value) {
$modules_array[$key] = ($value[$module_access_idx] ?? null);
}
}
}
$module_access_idx++;
@ -3307,6 +3315,26 @@ if ($action === 'create_demo_data') {
$module_values['module_interval'] = $interval;
$module_values['id_modulo'] = 4;
$module_values['id_plugin'] = $created_plugin_id;
if (isset($traps_target_ip) === false) {
$traps_target_ip = '';
}
if (isset($traps_community) === false) {
$traps_community = '';
}
if (isset($tentacle_target_ip) === false) {
$tentacle_target_ip = '';
}
if (isset($tentacle_port) === false) {
$tentacle_port = '';
}
if (isset($tentacle_extra_options) === false) {
$tentacle_extra_options = '';
}
$module_values['macros'] = '{"1":{"macro":"_field1_","desc":"Agents&#x20;files&#x20;folder&#x20;path","help":"","value":"/usr/share/pandora_server/util/plugin/demodata_agents","hide":""},"2":{"macro":"_field2_","desc":"Number&#x20;of&#x20;agents","help":"","value":"'.$total_agents_to_create.'","hide":""},"3":{"macro":"_field3_","desc":"Traps&#x20;target&#x20;IP","help":"","value":"'.$traps_target_ip.'","hide":""},"4":{"macro":"_field4_","desc":"Traps&#x20;community","help":"","value":"'.$traps_community.'","hide":""},"5":{"macro":"_field5_","desc":"Tentacle&#x20;target&#x20;IP","help":"","value":"'.$tentacle_target_ip.'","hide":""},"6":{"macro":"_field6_","desc":"Tentacle&#x20;port","help":"","value":"'.$tentacle_port.'","hide":""},"7":{"macro":"_field7_","desc":"Tentacle&#x20;extra&#x20;options","help":"","value":"'.$tentacle_extra_options.'","hide":""}}';
$id_plugin_module = modules_create_agent_module(

7
pandora_console/include/ajax/events.php
View File

@ -646,7 +646,7 @@ function load_form_filter() {
if (i == 'search')
$('#text-search').val(val);
if (i == 'regex')
$('#text-regex').val(val);
$('#checkbox-regex').val(val);
if (i == 'not_search')
$('#checkbox-not_search').val(val);
if (i == 'text_agent')
@ -977,7 +977,7 @@ function save_new_filter() {
"severity" : $("#severity").val(),
"status" : $("#status").val(),
"search" : $("#text-search").val(),
"regex" : $('#text-regex').val(),
"regex" : $('#checkbox-regex').val(),
"not_search" : $("#checkbox-not_search").val(),
"text_agent" : $("#text_id_agent").val(),
"id_agent" : $('input:hidden[name=id_agent]').val(),
@ -1058,7 +1058,7 @@ function save_update_filter() {
"severity" : $("#severity").val(),
"status" : $("#status").val(),
"search" : $("#text-search").val(),
"regex" : $('#text-regex').val(),
"regex" : $('#checkbox-regex').val(),
"not_search" : $("#checkbox-not_search").val(),
"text_agent" : $("#text_id_agent").val(),
"id_agent" : $('input:hidden[name=id_agent]').val(),
@ -2596,6 +2596,7 @@ if ($get_events_fired) {
'severity' => -1,
'status' => -1,
'search' => '',
'regex' => 0,
'not_search' => 0,
'text_agent' => '',
'id_agent' => 0,

16
pandora_console/include/class/CustomNetScan.class.php
View File

@ -452,7 +452,7 @@ class CustomNetScan extends Wizard
'label' => __('Task name'),
'arguments' => [
'name' => 'taskname',
'value' => $this->task['name'],
'value' => (isset($this->task['name']) === true) ? $this->task['name'] : '',
'type' => 'text',
'size' => 50,
],
@ -474,7 +474,7 @@ class CustomNetScan extends Wizard
'label' => __('Comment'),
'arguments' => [
'name' => 'comment',
'value' => $this->task['description'],
'value' => (isset($this->task['description']) === true) ? $this->task['description'] : '',
'type' => 'text',
'size' => 50,
],
@ -496,7 +496,7 @@ class CustomNetScan extends Wizard
SERVER_TYPE_DISCOVERY
),
'name' => 'id_recon_server',
'selected' => $this->task['id_recon_server'],
'selected' => (isset($this->task['id_recon_server']) === true) ? $this->task['id_recon_server'] : '',
'return' => true,
],
];
@ -509,7 +509,7 @@ class CustomNetScan extends Wizard
'returnAllGroup' => false,
'privilege' => $this->access,
'type' => 'select_groups',
'selected' => $this->task['id_group'],
'selected' => (isset($this->task['id_group']) === true) ? $this->task['id_group'] : '',
'return' => true,
'size' => '400px',
],
@ -517,8 +517,10 @@ class CustomNetScan extends Wizard
// Interval and schedules.
$interv_manual = 0;
if ((int) $this->task['interval_sweep'] == 0) {
$interv_manual = 1;
if (isset($this->task['interval_sweep']) === true) {
if ((int) $this->task['interval_sweep'] == 0) {
$interv_manual = 1;
}
}
// Schedule.
@ -541,7 +543,7 @@ class CustomNetScan extends Wizard
],
'extra' => '<span id="interval_manual_container">'.html_print_extended_select_for_time(
'interval',
$this->task['interval_sweep'],
(isset($this->task['interval_sweep']) === true) ? $this->task['interval_sweep'] : '',
'check_period_warning(this, \''.__('Warning').'\', \''.__('Displaying items with extended historical data can have an impact on system performance. We do not recommend that you use intervals longer than 30 days, especially if you combine several of them in a report, dashboard or visual console.').'\')',
'',
'0',

14
pandora_console/include/class/Diagnostics.class.php
View File

@ -410,7 +410,7 @@ class Diagnostics extends Wizard
],
];
$return .= '<div class="title-self-monitoring">';
$return = '<div class="title-self-monitoring">';
$return .= __(
'Graphs modules that represent the self-monitoring system'
);
@ -423,7 +423,7 @@ class Diagnostics extends Wizard
$return .= '</div>';
}
return $return;
return ($return ?? '');
}
@ -694,7 +694,7 @@ class Diagnostics extends Wizard
WHERE tagente_estado.estado = 4';
$notInitAgents = db_get_sql($sqlNotInitAgents);
$dateDbMantenaince = $config['db_maintance'];
$dateDbMantenaince = ($config['db_maintance'] ?? '');
$currentTime = time();
@ -1059,6 +1059,10 @@ class Diagnostics extends Wizard
$tFragmentationStatus = 1;
}
if (isset($config['thousand_separator']) === false) {
$config['thousand_separator'] = '';
}
$result = [
'error' => false,
'data' => [
@ -1844,6 +1848,10 @@ class Diagnostics extends Wizard
$sizeServerLog = number_format($fileSize);
$sizeServerLog = (0 + str_replace(',', '', $sizeServerLog));
if (isset($config['thousand_separator']) === false) {
$config['thousand_separator'] = '';
}
$value = number_format(($fileSize / $mega), 3, $config['decimal_separator'], $config['thousand_separator']);
$message = __('You have more than 10 MB of logs');
$status = 0;

48
pandora_console/include/class/EventSound.class.php
View File

@ -427,30 +427,32 @@ class EventSound extends HTML
);
$data = db_get_all_rows_sql($sql);
foreach ($data as $key => $row) {
if ($row['active'] === '1') {
$img = 'images/lightbulb.png';
$action = __('Disable sound');
$new_action = 0;
} else {
$img = 'images/lightbulb_off.png';
$action = __('Enable sound');
$new_action = 1;
if ($data !== false) {
foreach ($data as $key => $row) {
if ($row['active'] === '1') {
$img = 'images/lightbulb.png';
$action = __('Disable sound');
$new_action = 0;
} else {
$img = 'images/lightbulb_off.png';
$action = __('Enable sound');
$new_action = 1;
}
$options = '<a href="index.php?sec=eventos&sec2=godmode/events/configuration_sounds';
$options .= '&action=change_action&id='.$row['id'].'&set_action='.$new_action.'">';
$options .= html_print_image(
$img,
true,
[
'title' => $action,
'class' => 'main_menu_icon invert_filter',
]
);
$options .= '</a>';
$data[$key]['options'] = $options;
}
$options = '<a href="index.php?sec=eventos&sec2=godmode/events/configuration_sounds';
$options .= '&action=change_action&id='.$row['id'].'&set_action='.$new_action.'">';
$options .= html_print_image(
$img,
true,
[
'title' => $action,
'class' => 'main_menu_icon invert_filter',
]
);
$options .= '</a>';
$data[$key]['options'] = $options;
}
echo json_encode(

16
pandora_console/include/class/ExtensionsDiscovery.class.php
View File

@ -186,9 +186,11 @@ class ExtensionsDiscovery extends Wizard
private function loadConfig()
{
$row = db_get_row('tdiscovery_apps', 'short_name', $this->mode);
$this->id = $row['id_app'];
$this->name = $row['name'];
$this->description = $row['description'];
if ($row !== false) {
$this->id = $row['id_app'];
$this->name = $row['name'];
$this->description = $row['description'];
}
}
@ -415,7 +417,10 @@ class ExtensionsDiscovery extends Wizard
public function loadIni()
{
global $config;
$iniFile = parse_ini_file($config['homedir'].$this->path.'/'.$this->mode.'/discovery_definition.ini', true, INI_SCANNER_TYPED);
$iniFile = false;
if (file_exists($config['homedir'].$this->path.'/'.$this->mode.'/discovery_definition.ini') === true) {
$iniFile = parse_ini_file($config['homedir'].$this->path.'/'.$this->mode.'/discovery_definition.ini', true, INI_SCANNER_TYPED);
}
return $iniFile;
}
@ -2190,7 +2195,8 @@ class ExtensionsDiscovery extends Wizard
break;
default:
continue;
// Nothing.
break;
}
if ($value !== false) {

200
pandora_console/include/class/HTML.class.php
View File

@ -208,12 +208,20 @@ class HTML
$i = 0;
foreach ($urls as $url) {
if (isset($url['selected']) === false) {
$url['selected'] = 0;
}
if ($url['selected'] == 1) {
$class = 'selected';
} else {
$class = '';
}
if (isset($url['link']) === false) {
$url['link'] = '';
}
$bc[$i] = '';
$bc[$i] .= '<span><a class="breadcrumb_link '.$class.'" href="'.$url['link'].'">';
$bc[$i] .= $url['label'];
@ -618,6 +626,10 @@ class HTML
public static function printBlockAsGrid(array $input, bool $return=false)
{
$output = '';
if (isset($input['hidden']) === false) {
$input['hidden'] = 0;
}
if ($input['hidden'] == 1) {
$class = ' hidden';
} else {
@ -628,6 +640,14 @@ class HTML
$class = $input['class'].$class;
}
if (isset($input['block_content']) === false) {
$input['block_content'] = '';
}
if (isset($input['block_class']) === false) {
$input['block_class'] = '';
}
if (is_array($input['block_content']) === true) {
if (empty($input['label']) === false) {
$output .= '<div class="label_select">';
@ -637,13 +657,29 @@ class HTML
// Print independent block of inputs.
$output .= '<ul class="wizard '.$input['block_class'].'">';
$output .= '<li id="'.$input['block_id'].'" class="'.$class.'">';
$output .= '<li id="'.($input['block_id'] ?? '').'" class="'.$class.'">';
foreach ($input['block_content'] as $input) {
$output .= self::printBlockAsGrid($input, $return);
}
$output .= '</ul></li>';
} else {
if (isset($input['arguments']['inline']) === false) {
$input['arguments']['inline'] = '';
}
if (isset($input['extra']) === false) {
$input['extra'] = '';
}
if (isset($input['arguments']) === false) {
$input['arguments'] = '';
}
if (isset($input['arguments']['type']) === false) {
$input['arguments']['type'] = '';
}
if ($input['arguments']['type'] != 'hidden'
&& $input['arguments']['type'] != 'hidden_extended'
) {
@ -729,6 +765,10 @@ class HTML
public static function printBlockAsList(array $input, bool $return=false)
{
$output = '';
if (isset($input['hidden']) === false) {
$input['hidden'] = 0;
}
if ($input['hidden'] == 1) {
$class = ' hidden';
} else {
@ -739,6 +779,10 @@ class HTML
$class = $input['class'].$class;
}
if (isset($input['block_content']) === false) {
$input['block_content'] = '';
}
if (is_array($input['block_content']) === true) {
// Print independent block of inputs.
$output .= '<li id="'.$input['block_id'].'" class="'.$class.'">';
@ -749,6 +793,14 @@ class HTML
$output .= '</ul></li>';
} else {
if (isset($input['id']) === false) {
$input['id'] = '';
}
if (isset($input['extra']) === false) {
$input['extra'] = '';
}
if ($input['arguments']['type'] != 'hidden'
&& $input['arguments']['type'] != 'hidden_extended'
) {
@ -949,6 +1001,46 @@ class HTML
{
$form = $data['form'];
if (isset($data['rows']) === false) {
$data['rows'] = '';
}
if (isset($data['rawInputs']) === false) {
$data['rawInputs'] = '';
}
if (isset($data['js']) === false) {
$data['js'] = '';
}
if (isset($data['js_block']) === false) {
$data['js_block'] = '';
}
if (isset($data['cb_function']) === false) {
$data['cb_function'] = null;
}
if (isset($data['cb_args']) === false) {
$data['cb_args'] = [];
}
if (isset($form['class']) === false) {
$form['class'] = '';
}
if (isset($form['onsubmit']) === false) {
$form['onsubmit'] = '';
}
if (isset($form['extra']) === false) {
$form['extra'] = '';
}
if (isset($form['enctype']) === false) {
$form['enctype'] = '';
}
$rows = $data['rows'];
$rawInputs = $data['rawInputs'];
$js = $data['js'];
@ -987,7 +1079,15 @@ class HTML
if (is_array($rows)) {
foreach ($rows as $row) {
if ($row['new_form_block'] == true) {
if (isset($row['class']) === false) {
$row['class'] = '';
}
if (isset($row['style']) === false) {
$row['style'] = '';
}
if (isset($row['new_form_block']) === true) {
if ($first_block_printed === true) {
// If first form block has been placed, then close it before starting a new one.
$output .= '</div>';
@ -1015,30 +1115,38 @@ class HTML
// Toggle option.
foreach ($column['inputs'] as $input) {
if (is_array($input)) {
if ($input['arguments']['type'] != 'submit') {
if ($input['toggle'] === true) {
$output .= ui_print_toggle(
[
'name' => (isset($input['toggle_name']) ? $input['toggle_name'] : 'toggle_'.uniqid()),
'title' => $input['toggle_title'],
'id' => $input['toggle_id'],
'hidden_default' => $input['toggle_hidden_default'],
'content' => self::printBlockAsGrid(
$input,
true
),
'return' => true,
'name' => (isset($input['toggle_name']) ? $input['toggle_name'] : 'toggle_'.uniqid()),
'toggle_class' => $input['toggle_toggle_class'],
'main_class' => $input['toggle_main_class'],
'container_class' => $input['toggle_container_class'],
'img_a' => $input['toggle_img_a'],
'img_b' => $input['toggle_img_b'],
'clean' => (isset($input['toggle_clean']) ? $input['toggle_clean'] : true),
]
);
if (isset($input['arguments']) === true) {
if ($input['arguments']['type'] != 'submit') {
if (isset($input['toggle']) === true) {
if ($input['toggle'] === true) {
$output .= ui_print_toggle(
[
'name' => (isset($input['toggle_name']) ? $input['toggle_name'] : 'toggle_'.uniqid()),
'title' => $input['toggle_title'],
'id' => $input['toggle_id'],
'hidden_default' => $input['toggle_hidden_default'],
'content' => self::printBlockAsGrid(
$input,
true
),
'return' => true,
'name' => (isset($input['toggle_name']) ? $input['toggle_name'] : 'toggle_'.uniqid()),
'toggle_class' => $input['toggle_toggle_class'],
'main_class' => $input['toggle_main_class'],
'container_class' => $input['toggle_container_class'],
'img_a' => $input['toggle_img_a'],
'img_b' => $input['toggle_img_b'],
'clean' => (isset($input['toggle_clean']) ? $input['toggle_clean'] : true),
]
);
} else {
$output .= self::printBlockAsGrid($input, true);
}
} else {
$output .= self::printBlockAsGrid($input, true);
}
} else {
$output .= self::printBlockAsGrid($input, true);
$output_submit .= self::printBlockAsGrid($input, true);
}
} else {
$output_submit .= self::printBlockAsGrid($input, true);
@ -1089,6 +1197,34 @@ class HTML
*/
public static function printFormAsList(array $data, bool $return=false)
{
if (isset($data['rows']) === false) {
$data['rows'] = '';
}
if (isset($data['rawInputs']) === false) {
$data['rawInputs'] = '';
}
if (isset($data['js']) === false) {
$data['js'] = '';
}
if (isset($data['js_block']) === false) {
$data['js_block'] = '';
}
if (isset($data['cb_function']) === false) {
$data['cb_function'] = null;
}
if (isset($data['cb_args']) === false) {
$data['cb_args'] = [];
}
if (isset($form['class']) === false) {
$form['class'] = '';
}
$form = $data['form'];
$inputs = $data['inputs'];
$rawInputs = $data['rawInputs'];
@ -1097,6 +1233,18 @@ class HTML
$cb_function = $data['cb_function'];
$cb_args = $data['cb_args'];
if (isset($form['onsubmit']) === false) {
$form['onsubmit'] = '';
}
if (isset($form['extra']) === false) {
$form['extra'] = '';
}
if (isset($form['enctype']) === false) {
$form['enctype'] = '';
}
$output_head = '<form class="discovery max_floating_element_size" id="'.$form['id'].'" onsubmit="'.$form['onsubmit'].'" enctype="'.$form['enctype'].'" action="'.$form['action'].'" method="'.$form['method'];
$output_head .= '" '.$form['extra'].'>';
@ -1117,7 +1265,7 @@ class HTML
$output = '<div class="white_box pdd_15px">';
$output .= '<ul class="wizard">';
$output_submit = '';
foreach ($inputs as $input) {
if ($input['arguments']['type'] != 'submit') {
$output .= self::printBlockAsList($input, true);

9
pandora_console/include/class/ModuleTemplates.class.php
View File

@ -780,8 +780,13 @@ class ModuleTemplates extends HTML
private function setNetworkProfile()
{
$profileInfo = db_get_row('tnetwork_profile', 'id_np', $this->id_np);
$this->name = $profileInfo['name'];
$this->description = $profileInfo['description'];
if ($profileInfo !== false) {
$this->name = $profileInfo['name'];
$this->description = $profileInfo['description'];
} else {
$this->name = '';
$this->description = '';
}
$penInfo = db_get_all_rows_filter('tnetwork_profile_pen', ['id_np' => $this->id_np]);
$penList = [];

4
pandora_console/include/class/SnmpConsole.class.php
View File

@ -199,6 +199,10 @@ class SnmpConsole extends HTML
).'</a>';
$list['active'] = true;
if (isset($screen) === false) {
$screen = '';
}
// Header.
ui_print_standard_header(
__('SNMP Console'),

4
pandora_console/include/class/TipsWindow.class.php
View File

@ -646,7 +646,7 @@ class TipsWindow
['class' => 'main_menu_icon']
);
$data[$key]['edit'] .= '</a>';
$data[$key]['delete'] .= '<form name="grupo" method="post" class="rowPair table_action_buttons" action="index.php?sec=gsetup&sec2=godmode/setup/setup&section=welcome_tips&action=delete">';
$data[$key]['delete'] = '<form name="grupo" method="post" class="rowPair table_action_buttons" action="index.php?sec=gsetup&sec2=godmode/setup/setup&section=welcome_tips&action=delete">';
$data[$key]['delete'] .= html_print_input_image(
'button_delete_tip',
'images/delete.svg',
@ -1087,7 +1087,7 @@ class TipsWindow
return false;
}
if ($images !== null) {
if ($images !== '') {
foreach ($images as $key => $image) {
$res = db_process_sql_insert(
'twelcome_tip_file',

16
pandora_console/include/class/Tree.class.php
View File

@ -738,6 +738,22 @@ class Tree
if ($module['showGraphs']) {
$tresholds = true;
if (isset($module['min_warning']) === false) {
$module['min_warning'] = '';
}
if (isset($module['max_warning']) === false) {
$module['max_warning'] = '';
}
if (isset($module['min_critical']) === false) {
$module['min_critical'] = '';
}
if (isset($module['max_critical']) === false) {
$module['max_critical'] = '';
}
if (empty((float) $module['min_warning']) === true
&& empty((float) $module['max_warning']) === true
&& empty($module['warning_inverse']) === true

4
pandora_console/include/class/TreeGroup.class.php
View File

@ -621,6 +621,10 @@ class TreeGroup extends Tree
protected function getDisplayHierarchy()
{
if (isset($this->filter['searchHirearchy']) === false) {
$this->filter['searchHirearchy'] = '';
}
return $this->filter['searchHirearchy'] ||
(empty($this->filter['searchAgent']) && empty($this->filter['searchModule']));
}

12
pandora_console/include/class/WelcomeWindow.class.php
View File

@ -376,10 +376,6 @@ class WelcomeWindow extends Wizard
'class' => 'modal',
];
if (enterprise_installed() === true) {
$logo_url = ENTERPRISE_DIR.'/'.$logo_url;
}
if (check_acl($config['id_user'], 0, 'PM')) {
$flag_um = false;
$flag_cm = false;
@ -768,6 +764,10 @@ class WelcomeWindow extends Wizard
],
true
);
if (isset($agents_num) === false) {
$agents_num = '';
}
echo html_print_label_input_block(
__('Number of agents to be created'),
html_print_div(
@ -1214,6 +1214,10 @@ class WelcomeWindow extends Wizard
__('Agent'),
ui_print_agent_autocomplete_input($params)
);
if (isset($modules) === false) {
$modules = '';
}
echo html_print_label_input_block(
__('Module'),
html_print_select(

2
pandora_console/include/config_process.php
View File

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

2
pandora_console/include/functions_agents.php
View File

@ -1279,7 +1279,7 @@ function agents_get_group_agents(
}
if (is_array($search) === true) {
if (!$search['all_agents']) {
if (isset($search['all_agents']) === false) {
$filter['disabled'] = 0;
if (isset($search['disabled']) === true) {
$filter['disabled'] = (int) $search['disabled'];

8
pandora_console/include/functions_cron.php
View File

@ -593,7 +593,7 @@ function cron_list_table()
// Check ACL in reports_get_report return false.
if ($report === false) {
continue;
break;
}
$email = ui_print_truncate_text($args[1], 120);
@ -656,7 +656,7 @@ function cron_list_table()
// Check ACL in reports_get_report return false.
if ($template === false) {
continue;
break;
}
if (empty($args[1]) === false && (string) $args[1] !== '0') {
@ -777,7 +777,7 @@ function cron_list_table()
// Check ACL in reports_get_report return false.
if ($report === false) {
continue;
break;
}
$path = $args[1];
@ -817,7 +817,7 @@ function cron_list_table()
// Check ACL in reports_get_report return false.
if ($report === false) {
continue;
break;
}
$path = $args[1];

13
pandora_console/include/functions_custom_fields.php
View File

@ -289,6 +289,10 @@ function agent_counters_custom_fields($filters)
}
}
if (isset($groups_and) === false) {
$groups_and = '';
}
// Filter by status module.
$empty_agents_count = "UNION ALL
SELECT ta.id_agente,
@ -616,6 +620,10 @@ function agent_counters_custom_fields($filters)
$result_meta = [];
$data = [];
if (isset($and_module_search) === false) {
$and_module_search = '';
}
$query = sprintf(
"SELECT tcd.description AS name_data,
SUM(IF($agent_state_total, 1, 0)) AS a_agents,
@ -677,6 +685,11 @@ function agent_counters_custom_fields($filters)
$result_meta[] = db_get_all_rows_sql($query);
if (isset($server_data) === false) {
$server_data = [];
$server_data['id'] = '';
}
$query_data = sprintf(
"SELECT
tcd.description,

7
pandora_console/include/functions_events.php
View File

@ -1147,7 +1147,7 @@ function events_get_all(
}
// Free search.
if (empty($filter['search']) === false) {
if (empty($filter['search']) === false && (bool) $filter['regex'] === false) {
if (isset($config['dbconnection']->server_version) === true
&& $config['dbconnection']->server_version > 50600
) {
@ -1177,14 +1177,13 @@ function events_get_all(
$array_search[] = 'lower(ta.alias)';
}
// Disregard repeated whitespaces in search string.
// Disregard repeated whitespaces when searching.
$collapsed_spaces_search = preg_replace('/(&#x20;)+/', '&#x20;', $filter['search']);
$sql_search = ' AND (';
foreach ($array_search as $key => $field) {
// Disregard repeated whitespaces in query searched string.
$sql_search .= sprintf(
'%s REGEXP_REPLACE(%s, "(&#x20;\\s*)+", "&#x20;") %s like lower("%%%s%%")',
'%s LOWER(REGEXP_REPLACE(%s, "(&#x20;)+", "&#x20;")) %s like LOWER("%%%s%%")',
($key === 0) ? '' : $nexo,
$field,
$not_search,

21
pandora_console/include/functions_filemanager.php
View File

@ -151,8 +151,13 @@ function upload_file($upload_file_or_zip, $default_real_directory, $destination_
// Copy file to directory and change name.
$nombre_archivo = sprintf('%s/%s', $real_directory, $filename);
try {
$ext = strtolower(pathinfo($_FILES['file']['name'], PATHINFO_EXTENSION));
if (empty($filterFilesType) === true || in_array($ext, $filterFilesType) === true) {
if (isset($_FILES['file']['type']) === true && empty($_FILES['file']['type']) === false) {
$type = $_FILES['file']['type'];
} else {
$type = strtolower(pathinfo($_FILES['file']['name'], PATHINFO_EXTENSION));
}
if (empty($filterFilesType) === true || in_array($type, $filterFilesType) === true) {
$result = copy($_FILES['file']['tmp_name'], $nombre_archivo);
} else {
$types_allowed = implode(', ', $filterFilesType);
@ -526,8 +531,10 @@ function filemanager_file_explorer(
$allowCreateText = (isset($options['all']) === true) || ((isset($options['allowCreateText']) === true) && ($options['allowCreateText'] === true));
$allowCreateFolder = (isset($options['allowCreateFolder'])) ? false : true;
if ($options['denyCreateText'] === true) {
$allowCreateText = false;
if (isset($options['denyCreateText']) === true) {
if ($options['denyCreateText'] === true) {
$allowCreateText = false;
}
}
if ($homedir_filemanager === false) {
@ -1065,8 +1072,10 @@ function filemanager_file_explorer(
$modal_real_path = "<div><b>Real path to plugin execution is:</b></div>
<div id='real_path'></div>";
if (isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] == 'on' || $_SERVER['SERVER_NAME'] == 'localhost' || $_SERVER['SERVER_NAME'] == '127.0.0.1') {
$modal_real_path .= "<div style='float:right;margin: 5em 0 0 auto';>".html_print_submit_button(__('Copy'), 'submit', false, ['icon' => 'wand', 'mode' => 'mini'], true).'</div>';
if (isset($_SERVER['HTTPS']) === true) {
if ($_SERVER['HTTPS'] == 'on' || $_SERVER['SERVER_NAME'] == 'localhost' || $_SERVER['SERVER_NAME'] == '127.0.0.1') {
$modal_real_path .= "<div style='float:right;margin: 5em 0 0 auto';>".html_print_submit_button(__('Copy'), 'submit', false, ['icon' => 'wand', 'mode' => 'mini'], true).'</div>';
}
}
html_print_div(

Some files were not shown because too many files have changed in this diff Show More