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' of brutus.artica.es:artica/pandorafms into ent-6280-firmar-instalador-de-agente-macos

This commit is contained in:
Kevin 2021-06-01 15:47:59 +02:00
parent 9ca770beb6 b0e3b0aa24
commit a64360d25f
83 changed files with 1432 additions and 603 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_agents/unix/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-agent-unix package: pandorafms-agent-unix
Version: 7.0NG.754-210527 Version: 7.0NG.754-210601
Architecture: all Architecture: all
Priority: optional Priority: optional
Section: admin 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 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
pandora_version="7.0NG.754-210527" pandora_version="7.0NG.754-210601"
echo "Test if you has the tools for to make the packages." echo "Test if you has the tools for to make the packages."
whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null

2
pandora_agents/unix/pandora_agent
View File

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

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

@ -3,7 +3,7 @@
# #
%define name pandorafms_agent_unix %define name pandorafms_agent_unix
%define version 7.0NG.754 %define version 7.0NG.754
%define release 210527 %define release 210601
Summary: Pandora FMS Linux agent, PERL version Summary: Pandora FMS Linux agent, PERL version
Name: %{name} Name: %{name}

2
pandora_agents/unix/pandora_agent.spec
View File

@ -3,7 +3,7 @@
# #
%define name pandorafms_agent_unix %define name pandorafms_agent_unix
%define version 7.0NG.754 %define version 7.0NG.754
%define release 210527 %define release 210601
Summary: Pandora FMS Linux agent, PERL version Summary: Pandora FMS Linux agent, PERL version
Name: %{name} Name: %{name}

2
pandora_agents/unix/pandora_agent_installer
View File

@ -10,7 +10,7 @@
# ********************************************************************** # **********************************************************************
PI_VERSION="7.0NG.754" PI_VERSION="7.0NG.754"
PI_BUILD="210527" PI_BUILD="210601"
OS_NAME=`uname -s` OS_NAME=`uname -s`
FORCE=0 FORCE=0

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

@ -186,7 +186,7 @@ UpgradeApplicationID
{} {}
Version Version
{210527} {210601}
ViewReadme ViewReadme
{Yes} {Yes}

2
pandora_agents/win32/pandora.cc
View File

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

2
pandora_agents/win32/versioninfo.rc
View File

@ -11,7 +11,7 @@ BEGIN
VALUE "LegalCopyright", "Artica ST" VALUE "LegalCopyright", "Artica ST"
VALUE "OriginalFilename", "PandoraAgent.exe" VALUE "OriginalFilename", "PandoraAgent.exe"
VALUE "ProductName", "Pandora FMS Windows Agent" VALUE "ProductName", "Pandora FMS Windows Agent"
VALUE "ProductVersion", "(7.0NG.754(Build 210527))" VALUE "ProductVersion", "(7.0NG.754(Build 210601))"
VALUE "FileVersion", "1.0.0.0" VALUE "FileVersion", "1.0.0.0"
END END
END END

2
pandora_console/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-console package: pandorafms-console
Version: 7.0NG.754-210527 Version: 7.0NG.754-210601
Architecture: all Architecture: all
Priority: optional Priority: optional
Section: admin 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 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
pandora_version="7.0NG.754-210527" pandora_version="7.0NG.754-210601"
package_pear=0 package_pear=0
package_pandora=1 package_pandora=1

50
pandora_console/extensions/agents_modules.php
View File

@ -1,16 +1,29 @@
<?php <?php
/** /**
* Pandora FMS - http://pandorafms.com * Agents/Modules Monitoring view.
* ================================================== *
* Copyright (c) 2005-2021 Artica Soluciones Tecnologicas * @category Operations
* Please see http://pandorafms.org for full contribution list * @package Pandora FMS
* This program is free software; you can redistribute it and/or * @subpackage Opensource
* modify it under the terms of the GNU General Public License * @version 1.0.0
* as published by the Free Software Foundation; version 2 * @license See below
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * ______ ___ _______ _______ ________
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * | __ \.-----.--.--.--| |.-----.----.-----. | ___| | | __|
* GNU General Public License for more details. * | __/| _ | | _ || _ | _| _ | | ___| |__ |
* |___| |___._|__|__|_____||_____|__| |___._| |___| |__|_|__|_______|
*
* ============================================================================
* Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
* Please see http://pandorafms.org for full contribution list
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation for version 2.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* ============================================================================
*/ */
// Begin. // Begin.
@ -435,14 +448,25 @@ function mainAgentsModules()
if ($config['pure'] == 0) { if ($config['pure'] == 0) {
// Header. // Header.
ui_print_page_header( ui_print_standard_header(
__('Agents/Modules'), __('Agents/Modules'),
'images/module.png', 'images/module.png',
false, false,
'', '',
false, false,
$updated_time (array) $updated_time,
[
[
'link' => '',
'label' => __('Monitoring'),
],
[
'link' => '',
'label' => __('Views'),
],
]
); );
echo '<table class="w100p">'; echo '<table class="w100p">';
echo '<tr>'; echo '<tr>';
echo "<td> <span class='float-right'>".$fullscreen['text'].'</span> </td>'; echo "<td> <span class='float-right'>".$fullscreen['text'].'</span> </td>';

15
pandora_console/extensions/module_groups.php
View File

@ -246,13 +246,24 @@ function mainModuleGroups()
$array_data[$value['id_grupo']][$value['id_mg']] = $value; $array_data[$value['id_grupo']][$value['id_mg']] = $value;
} }
ui_print_page_header( // Header.
ui_print_standard_header(
__('Combined table of agent group and module group'), __('Combined table of agent group and module group'),
'images/module_group.png', 'images/module_group.png',
false, false,
'', '',
false, false,
'' [],
[
[
'link' => '',
'label' => __('Monitoring'),
],
[
'link' => '',
'label' => __('Views'),
],
]
); );
echo "<table cellpadding='4' cellspacing='4' class='databox filters bolder margin-bottom-10' width='100%'> echo "<table cellpadding='4' cellspacing='4' class='databox filters bolder margin-bottom-10' width='100%'>

15
pandora_console/extensions/realtime_graphs.php
View File

@ -53,13 +53,24 @@ function pandora_realtime_graphs()
$hide_header = get_parameter('hide_header', 0); $hide_header = get_parameter('hide_header', 0);
if ($hide_header === 0) { if ($hide_header === 0) {
ui_print_page_header( // Header.
ui_print_standard_header(
__('Realtime graphs'), __('Realtime graphs'),
'images/extensions.png', 'images/extensions.png',
false, false,
'real_time_view', 'real_time_view',
false, false,
$onheader $onheader,
[
[
'link' => '',
'label' => __('Monitoring'),
],
[
'link' => '',
'label' => __('Views'),
],
]
); );
} }

63
pandora_console/extensions/resource_registration.php
View File

@ -1,29 +1,43 @@
<?php <?php
/**
* Resource registration.
*
* @category Extensions
* @package Pandora FMS
* @subpackage Community
* @version 1.0.0
* @license See below
*
* ______ ___ _______ _______ ________
* | __ \.-----.--.--.--| |.-----.----.-----. | ___| | | __|
* | __/| _ | | _ || _ | _| _ | | ___| |__ |
* |___| |___._|__|__|_____||_____|__| |___._| |___| |__|_|__|_______|
*
* ============================================================================
* Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
* Please see http://pandorafms.org for full contribution list
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation for version 2.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* ============================================================================
*/
// Pandora FMS - http://pandorafms.com /**
// ================================================== * Remember the hard-coded values.
// Copyright (c) 2005-2021 Artica Soluciones Tecnologicas * -- id_modulo now uses tmodule.
// Please see http://pandorafms.org for full contribution list * -- ---------------------------.
// This program is free software; you can redistribute it and/or * -- 1 - Data server modules (agent related modules)
// modify it under the terms of the GNU General Public License * -- 2 - Network server modules
// as published by the Free Software Foundation; version 2 * -- 4 - Plugin server
// This program is distributed in the hope that it will be useful, * -- 5 - Predictive server
// but WITHOUT ANY WARRANTY; without even the implied warranty of * -- 6 - WMI server
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * -- 7 - WEB Server (enteprise)
// GNU General Public License for more details. * In the xml is the tag "module_source"
// Remember the hard-coded values */
/*
-- id_modulo now uses tmodule
-- ---------------------------
-- 1 - Data server modules (agent related modules)
-- 2 - Network server modules
-- 4 - Plugin server
-- 5 - Predictive server
-- 6 - WMI server
-- 7 - WEB Server (enteprise)
In the xml is the tag "module_source"
*/
require_once $config['homedir'].'/include/functions_agents.php'; require_once $config['homedir'].'/include/functions_agents.php';
enterprise_include_once('include/functions_local_components.php'); enterprise_include_once('include/functions_local_components.php');
@ -1096,6 +1110,7 @@ function resource_registration_extension_main()
} }
$xml = simplexml_load_file($_FILES['resource_upload']['tmp_name'], null, LIBXML_NOCDATA); $xml = simplexml_load_file($_FILES['resource_upload']['tmp_name'], null, LIBXML_NOCDATA);
if ($xml === false) { if ($xml === false) {
ui_print_error_message( ui_print_error_message(
__('Error uploading resource. Check if the selected file is a valid resource template in .ptr format') __('Error uploading resource. Check if the selected file is a valid resource template in .ptr format')

6
pandora_console/general/alert_enterprise.php
View File

@ -192,15 +192,15 @@ if (check_login()) {
echo " echo "
</div> </div>
<div class='right height_30px'> <div class='btn_update_online_open height_30px'>
</div>
<div class='modalokbutton cerrar'> <div class='modalokbutton cerrar'>
<span class='modalokbuttontext'>OK</span> <span class='modalokbuttontext'>OK</span>
</div>"; </div>";
if ($open) { if ($open) {
echo "<div class='modalgobutton gopandora'> echo "<div class='modalgobutton gopandora'>
<span class='modalgobuttontext'>About Enterprise</span> <span class='modalgobuttontext'>About Enterprise</span>
</div>"; </div></div>";
} }
} }

14
pandora_console/general/first_task/cluster_builder.php
View File

@ -24,12 +24,20 @@ if (! check_acl($config['id_user'], 0, 'AR') && ! check_acl($config['id_user'],
return; return;
} }
\ui_print_page_header( // Header.
__('Monitoring').' &raquo; '.__('Clusters'), ui_print_standard_header(
__('Clusters'),
'images/chart.png', 'images/chart.png',
false, false,
'', '',
false false,
[],
[
[
'link' => '',
'label' => __('Monitoring'),
],
]
); );
ui_require_css_file('first_task'); ui_require_css_file('first_task');

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

@ -1668,47 +1668,30 @@ if ($update_module) {
'module_macros' => $module_macros, 'module_macros' => $module_macros,
]; ];
if (preg_match('/http_auth_user/m', $values['plugin_parameter'])) {
$http_user_conf = true;
}
if (preg_match('/http_auth_pass/m', $values['plugin_parameter'])) { if ($id_module_type == 30 || $id_module_type == 31 || $id_module_type == 32 || $id_module_type == 33) {
$http_pass_conf = true; $plugin_parameter_split = explode('&#x0a;', $values['plugin_parameter']);
}
$values['plugin_parameter'] = '';
if (!$http_user_conf || !$http_pass_conf) { foreach ($plugin_parameter_split as $key => $value) {
if ($id_module_type == 30 || $id_module_type == 31 || $id_module_type == 32 || $id_module_type == 33) { if ($key == 1) {
$plugin_parameter_split = explode('&#x0a;', $values['plugin_parameter']); if ($http_user) {
$values['plugin_parameter'] .= 'http_auth_user&#x20;'.$http_user.'&#x0a;';
$values['plugin_parameter'] = '';
foreach ($plugin_parameter_split as $key => $value) {
if ($key == 1) {
if ($http_user) {
if ($http_user_conf) {
continue;
}
$values['plugin_parameter'] .= 'http_auth_user&#x20;'.$http_user.'&#x0a;';
}
if ($http_pass) {
if ($http_user_pass) {
continue;
}
$values['plugin_parameter'] .= 'http_auth_pass&#x20;'.$http_pass.'&#x0a;';
}
$values['plugin_parameter'] .= $value.'&#x0a;';
} else {
$values['plugin_parameter'] .= $value.'&#x0a;';
} }
if ($http_pass) {
$values['plugin_parameter'] .= 'http_auth_pass&#x20;'.$http_pass.'&#x0a;';
}
$values['plugin_parameter'] .= $value.'&#x0a;';
} else {
$values['plugin_parameter'] .= $value.'&#x0a;';
} }
} }
} }
// In local modules, the interval is updated by agent. // In local modules, the interval is updated by agent.
$module_kind = (int) get_parameter('moduletype'); $module_kind = (int) get_parameter('moduletype');
if ($module_kind == MODULE_DATA) { if ($module_kind == MODULE_DATA) {

53
pandora_console/godmode/agentes/modificar_agente.php
View File

@ -1,17 +1,32 @@
<?php <?php
/**
* Agents defined view.
*
* @category Manage Agents.
* @package Pandora FMS
* @subpackage Resources.
* @version 1.0.0
* @license See below
*
* ______ ___ _______ _______ ________
* | __ \.-----.--.--.--| |.-----.----.-----. | ___| | | __|
* | __/| _ | | _ || _ | _| _ | | ___| |__ |
* |___| |___._|__|__|_____||_____|__| |___._| |___| |__|_|__|_______|
*
* ============================================================================
* Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
* Please see http://pandorafms.org for full contribution list
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation for version 2.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* ============================================================================
*/
// Pandora FMS - http://pandorafms.com // Begin.
// ==================================================
// Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
// Please see http://pandorafms.org for full contribution list
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation for version 2.
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// Load global vars
check_login(); check_login();
// Take some parameters (GET). // Take some parameters (GET).
@ -76,13 +91,23 @@ $viewtab['active'] = false;
$onheader = ['view' => $viewtab]; $onheader = ['view' => $viewtab];
// Header. // Header.
ui_print_page_header( ui_print_standard_header(
__('Agents defined in %s', get_product_name()), __('Agents defined in %s', get_product_name()),
'images/agent.png', 'images/agent.png',
false, false,
'', '',
true, true,
$onheader $onheader,
[
[
'link' => '',
'label' => __('Resources'),
],
[
'link' => '',
'label' => __('Manage agents'),
],
]
); );
if (is_central_policies_on_node()) { if (is_central_policies_on_node()) {

1
pandora_console/godmode/agentes/module_manager.php
View File

@ -1130,7 +1130,6 @@ foreach ($modules as $module) {
[ [
'alt' => __('Enable module'), 'alt' => __('Enable module'),
'title' => __('Enable module'), 'title' => __('Enable module'),
'class' => 'invert_filter_important',
] ]
).'</a>'; ).'</a>';
} else { } else {

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

@ -1,17 +1,32 @@
<?php <?php
/**
* Common editor fields.
*
* @category Module manager
* @package Pandora FMS
* @subpackage Community
* @version 1.0.0
* @license See below
*
* ______ ___ _______ _______ ________
* | __ \.-----.--.--.--| |.-----.----.-----. | ___| | | __|
* | __/| _ | | _ || _ | _| _ | | ___| |__ |
* |___| |___._|__|__|_____||_____|__| |___._| |___| |__|_|__|_______|
*
* ============================================================================
* Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
* Please see http://pandorafms.org for full contribution list
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation for version 2.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* ============================================================================
*/
// Begin
// Pandora FMS - http://pandorafms.com
// ==================================================
// Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
// Please see http://pandorafms.org for full contribution list
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation for version 2.
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
require_once $config['homedir'].'/include/functions_modules.php'; require_once $config['homedir'].'/include/functions_modules.php';
require_once $config['homedir'].'/include/functions_categories.php'; require_once $config['homedir'].'/include/functions_categories.php';
require_once $config['homedir'].'/include/graphs/functions_d3.php'; require_once $config['homedir'].'/include/graphs/functions_d3.php';
@ -19,7 +34,9 @@ require_once $config['homedir'].'/include/graphs/functions_d3.php';
include_javascript_d3(); include_javascript_d3();
global $config;function prepend_table_simple($row, $id=false) global $config;
function prepend_table_simple($row, $id=false)
{ {
global $table_simple; global $table_simple;

90
pandora_console/godmode/agentes/module_manager_editor_web.php
View File

@ -101,12 +101,29 @@ if ($id_policy_module) {
$plugin_parameter = $module['plugin_parameter']; $plugin_parameter = $module['plugin_parameter'];
} }
$plugin_parameter_split = explode('&#x0a;', $plugin_parameter);
$plugin_parameter_final_split = '';
foreach ($plugin_parameter_split as $key => $value) {
if (strpos($value, 'http_auth_user') === false && strpos($value, 'http_auth_pass') === false) {
$plugin_parameter_final_split .= $value.'&#x0a;';
}
if (strpos($value, 'http_auth_user') !== false) {
$plugin_parameter_http_user = str_replace('http_auth_user&#x20;', '', $value);
}
if (strpos($value, 'http_auth_pass') !== false) {
$plugin_parameter_http_pass = str_replace('http_auth_pass&#x20;', '', $value);
}
}
if ((bool) $adopt === false) { if ((bool) $adopt === false) {
$data[1] = html_print_textarea( $data[1] = html_print_textarea(
'plugin_parameter', 'plugin_parameter',
15, 15,
65, 65,
$plugin_parameter, $plugin_parameter_final_split,
$disabledTextBecauseInPolicy, $disabledTextBecauseInPolicy,
true, true,
'resizev' 'resizev'
@ -116,7 +133,7 @@ if ((bool) $adopt === false) {
'plugin_parameter', 'plugin_parameter',
15, 15,
65, 65,
$plugin_parameter, $plugin_parameter_final_split,
false, false,
true true
); );
@ -259,16 +276,12 @@ foreach ($texts as $code => $text) {
"get_content", "get_content",
"debug", "debug",
"task_end", "task_end",
"head", "head"
"http_auth_user",
"http_auth_pass"
]; ];
$(document).ready(function() { $(document).ready(function() {
var plugin_parameter = $("#textarea_plugin_parameter"); var plugin_parameter = $("#textarea_plugin_parameter");
var http_auth_user = $('#text-http_user');
var http_auth_pass = $('#password-http_pass');
$(plugin_parameter).keyup(function() { $(plugin_parameter).keyup(function() {
@ -278,18 +291,6 @@ foreach ($texts as $code => $text) {
} else { } else {
$('#button-btn_loadbasic').attr('disabled', 'disabled'); $('#button-btn_loadbasic').attr('disabled', 'disabled');
} }
// Update http_auth_user from conf data
var http_auth_user_value = get_module_token_from_config('http_auth_user', plugin_parameter, "\n");
if (http_auth_user_value != "") {
http_auth_user.val(http_auth_user_value);
}
// Update http_auth_pass from conf data
var http_auth_pass_value = get_module_token_from_config('http_auth_pass', plugin_parameter, "\n");
if (http_auth_pass_value != "") {
http_auth_pass.val(http_auth_pass_value);
}
}); });
$('#button-btn_loadbasic').click(function() { $('#button-btn_loadbasic').click(function() {
@ -413,57 +414,6 @@ foreach ($texts as $code => $text) {
}); });
$(plugin_parameter).trigger('keyup'); $(plugin_parameter).trigger('keyup');
http_auth_user.keyup(function() {
config = plugin_parameter.val();
if (config.search("http_auth_user") == -1) {
var http_auth_user_end =
"http_auth_user " + this.value + "\n" + "task_end" + "\n";
plugin_parameter.val(config.replace(/^task_end.*$/m, http_auth_user_end));
} else {
plugin_parameter.val(
config.replace(/^http_auth_user.*$/m, "http_auth_user " + this.value)
);
// Hide success and error indicators
$(".checks").hide();
}
});
http_auth_pass.keyup(function() {
config = plugin_parameter.val();
if (config.search("http_auth_pass") == -1) {
var http_auth_pass_end =
"http_auth_pass " + this.value + "\n" + "task_end" + "\n";
plugin_parameter.val(config.replace(/^task_end.*$/m, http_auth_pass_end));
} else {
plugin_parameter.val(
config.replace(/^http_auth_pass.*$/m, "http_auth_pass " + this.value)
);
// Hide success and error indicators
$(".checks").hide();
}
});
}); });
function get_module_token_from_config(token_name, plugin_parameter, separator) {
var return_var = "";
if(token_name == null || token_name == '') {
return '';
}
data = plugin_parameter.val().split(separator);
len = data.length;
for (i = 0; i < len; i++) {
if (data[i][0] == "#") continue;
tokens = data[i].split(" ");
if (tokens.length == 0) continue;
token = tokens.shift();
if (token == token_name ) return_var = tokens.join(" ");
}
return_var = $.trim(return_var);
return return_var;
}
</script> </script>

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

@ -95,7 +95,7 @@ if ($id_group) {
} }
// Header // Header
if (defined('METACONSOLE')) { if (is_metaconsole() === true) {
agents_meta_print_header(); agents_meta_print_header();
$sec = 'advanced'; $sec = 'advanced';
} else { } else {
@ -105,13 +105,24 @@ if (defined('METACONSOLE')) {
$title_in_header = __('Create group'); $title_in_header = __('Create group');
} }
ui_print_page_header( // Header.
ui_print_standard_header(
$title_in_header, $title_in_header,
'images/group.png', 'images/group.png',
false, false,
'', '',
true, false,
'' [],
[
[
'link' => '',
'label' => __('Profiles'),
],
[
'link' => '',
'label' => __('Manage agents group'),
],
]
); );
$sec = 'gagente'; $sec = 'gagente';
} }

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

@ -333,6 +333,7 @@ $title = __('Groups defined in %s', get_product_name());
switch ($tab) { switch ($tab) {
case 'tree': case 'tree':
$buttons['tree']['active'] = true; $buttons['tree']['active'] = true;
$title .= sprintf(' &raquo; %s', __('Tree view'));
break; break;
case 'credbox': case 'credbox':
@ -343,23 +344,38 @@ switch ($tab) {
case 'groups': case 'groups':
default: default:
$buttons['groups']['active'] = true; $buttons['groups']['active'] = true;
$title .= sprintf(' &raquo; %s', __('Table view'));
break; break;
} }
// Header. // Header.
if (is_metaconsole() === true) { if (is_metaconsole() === true) {
agents_meta_print_header(); agents_meta_print_header();
echo '<div class="notify">'; html_print_div(
echo __('Edit or delete groups can cause problems with synchronization'); [
echo '</div>'; 'class' => 'notify',
'content' => __('Edit or delete groups can cause problems with synchronization'),
]
);
} else { } else {
ui_print_page_header( // Header.
ui_print_standard_header(
$title, $title,
'images/group.png', 'images/group.png',
false, false,
'', '',
true, false,
$buttons $buttons,
[
[
'link' => '',
'label' => __('Profiles'),
],
[
'link' => '',
'label' => __('Manage agents group'),
],
]
); );
} }
@ -471,7 +487,7 @@ if ($update_group) {
$values = [ $values = [
'nombre' => $name, 'nombre' => $name,
'icon' => empty($icon) ? '' : substr($icon, 0, -4), 'icon' => empty($icon) ? '' : substr($icon, 0, -4),
'parent' => $id_parent == -1 ? 0 : $id_parent, 'parent' => ($id_parent == -1) ? 0 : $id_parent,
'disabled' => !$alerts_enabled, 'disabled' => !$alerts_enabled,
'custom_id' => $custom_id, 'custom_id' => $custom_id,
'id_skin' => $skin, 'id_skin' => $skin,

19
pandora_console/godmode/module_library/module_library_view.php
View File

@ -58,12 +58,27 @@ $buttons['view'] = [
$tab = get_parameter('tab', 'view'); $tab = get_parameter('tab', 'view');
if ($tab != 'search_module') { if ($tab !== 'search_module') {
$buttons[$tab]['active'] = true; $buttons[$tab]['active'] = true;
} }
ui_print_page_header(__('Module Library').' &raquo; '.__('View'), '', false, 'module_library', true, $buttons); $headerTitle = ($tab === 'categories') ? __('Categories') : __('Main view');
// Header.
ui_print_standard_header(
$headerTitle,
'',
false,
'module_library',
true,
$buttons,
[
[
'link' => '',
'label' => __('Module library'),
],
]
);
// Styles. // Styles.
ui_require_css_file('module_library'); ui_require_css_file('module_library');

60
pandora_console/godmode/reporting/graph_builder.php
View File

@ -26,10 +26,9 @@
* ============================================================================ * ============================================================================
*/ */
// Begin.
global $config; global $config;
if (is_ajax()) { if (is_ajax()) {
$search_agents = (bool) get_parameter('search_agents'); $search_agents = (bool) get_parameter('search_agents');
@ -340,37 +339,43 @@ if ($edit_graph) {
$head = __('Graph builder'); $head = __('Graph builder');
if (isset($name)) { if (isset($name) === true) {
$head .= ' - '.$name; $head .= ' &raquo; '.$name;
} }
// Header. // Header.
$tab = get_parameter('tab', ''); $tab = get_parameter('tab');
switch ($tab) { switch ($tab) {
default: case 'graph_editor':
case 'main': $headerHelp = '';
ui_print_page_header(
$head,
'images/chart.png',
false,
'graph_builder',
false,
$buttons
);
break; break;
case 'graph_editor': case 'main':
ui_print_page_header( default:
$head, $headerHelp = 'graph_builder';
'images/chart.png',
false,
'',
false,
$buttons
);
break; break;
} }
// Header.
ui_print_standard_header(
$head,
'images/chart.png',
false,
$headerHelp,
false,
[$buttons],
[
[
'link' => '',
'label' => __('Reporting'),
],
[
'link' => '',
'label' => __('Custom graphs'),
],
]
);
if ($add_graph) { if ($add_graph) {
ui_print_result_message( ui_print_result_message(
$id_graph, $id_graph,
@ -418,7 +423,8 @@ if (!$delete_module) {
$chunk1 = explode('|', $chunkdata); $chunk1 = explode('|', $chunkdata);
$modules = ''; $modules = '';
$weights = ''; $weights = '';
for ($a = 0; $a < count($chunk1); $a++) { $chunkCount = count($chunk1);
for ($a = 0; $a < $chunkCount; $a++) {
$chunk2[$a] = []; $chunk2[$a] = [];
$chunk2[$a] = explode(',', $chunk1[$a]); $chunk2[$a] = explode(',', $chunk1[$a]);
if (strpos($modules, $chunk2[$a][1]) == 0) { if (strpos($modules, $chunk2[$a][1]) == 0) {
@ -450,4 +456,8 @@ switch ($active_tab) {
case 'graph_editor': case 'graph_editor':
include_once 'godmode/reporting/graph_builder.graph_editor.php'; include_once 'godmode/reporting/graph_builder.graph_editor.php';
break; break;
default:
// Nothing to do.
break;
} }

64
pandora_console/godmode/reporting/graph_container.php
View File

@ -1,19 +1,35 @@
<?php <?php
// Pandora FMS - http://pandorafms.com /**
// ================================================== * Custom graph containers
// Copyright (c) 2005-2021 Artica Soluciones Tecnologicas *
// Please see http://pandorafms.org for full contribution list * @category Reporting
// This program is free software; you can redistribute it and/or * @package Pandora FMS
// modify it under the terms of the GNU General Public License * @subpackage Community
// as published by the Free Software Foundation for version 2. * @version 1.0.0
// This program is distributed in the hope that it will be useful, * @license See below
// but WITHOUT ANY WARRANTY; without even the implied warranty of *
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * ______ ___ _______ _______ ________
// GNU General Public License for more details. * | __ \.-----.--.--.--| |.-----.----.-----. | ___| | | __|
// Load global variables * | __/| _ | | _ || _ | _| _ | | ___| |__ |
* |___| |___._|__|__|_____||_____|__| |___._| |___| |__|_|__|_______|
*
* ============================================================================
* Copyright (c) 2007-2021 Artica Soluciones Tecnologicas
* Please see http://pandorafms.org for full contribution list
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation for version 2.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* ============================================================================
*/
// Begin.
global $config; global $config;
// Check user credentials // Check user credentials.
check_login(); check_login();
if (! check_acl($config['id_user'], 0, 'RR') || enterprise_installed() === false) { if (! check_acl($config['id_user'], 0, 'RR') || enterprise_installed() === false) {
@ -87,8 +103,26 @@ $buttons['graph_container'] = [
] ]
).'</a>', ).'</a>',
]; ];
// Header
ui_print_page_header(__('Graph container'), '', false, '', false, $buttons); // Header.
ui_print_standard_header(
__('Graph container'),
'',
false,
'',
false,
$buttons,
[
[
'link' => '',
'label' => __('Reporting'),
],
[
'link' => '',
'label' => __('Custom graphs'),
],
]
);
$container = folder_get_folders(); $container = folder_get_folders();

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

@ -1,16 +1,32 @@
<?php <?php
// Pandora FMS - http://pandorafms.com /**
// ================================================== * Reporting graphs.
// Copyright (c) 2005-2021 Artica Soluciones Tecnologicas *
// Please see http://pandorafms.org for full contribution list * @category Reporting
// This program is free software; you can redistribute it and/or * @package Pandora FMS
// modify it under the terms of the GNU General Public License * @subpackage Community
// as published by the Free Software Foundation for version 2. * @version 1.0.0
// This program is distributed in the hope that it will be useful, * @license See below
// but WITHOUT ANY WARRANTY; without even the implied warranty of *
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * ______ ___ _______ _______ ________
// GNU General Public License for more details. * | __ \.-----.--.--.--| |.-----.----.-----. | ___| | | __|
// Load global variables * | __/| _ | | _ || _ | _| _ | | ___| |__ |
* |___| |___._|__|__|_____||_____|__| |___._| |___| |__|_|__|_______|
*
* ============================================================================
* Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
* Please see http://pandorafms.org for full contribution list
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation for version 2.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* ============================================================================
*/
// Begin.
global $config; global $config;
require_once 'include/functions_custom_graphs.php'; require_once 'include/functions_custom_graphs.php';
@ -99,8 +115,25 @@ $view_graph = (bool) get_parameter('view_graph');
$id = (int) get_parameter('id'); $id = (int) get_parameter('id');
$multiple_delete = (bool) get_parameter('multiple_delete', 0); $multiple_delete = (bool) get_parameter('multiple_delete', 0);
// Header // Header.
ui_print_page_header(__('Reporting').' &raquo; '.__('Custom graphs'), 'images/chart.png', false, '', false, $buttons); ui_print_standard_header(
__('List of custom graphs'),
'images/chart.png',
false,
'',
false,
$buttons,
[
[
'link' => '',
'label' => __('Reporting'),
],
[
'link' => '',
'label' => __('Custom graphs'),
],
]
);
// Delete module SQL code // Delete module SQL code
if ($delete_graph) { if ($delete_graph) {

62
pandora_console/godmode/reporting/map_builder.php
View File

@ -1,16 +1,32 @@
<?php <?php
/**
* Map builder console.
*
* @category Topology maps
* @package Pandora FMS
* @subpackage Visual consoles
* @version 1.0.0
* @license See below
*
* ______ ___ _______ _______ ________
* | __ \.-----.--.--.--| |.-----.----.-----. | ___| | | __|
* | __/| _ | | _ || _ | _| _ | | ___| |__ |
* |___| |___._|__|__|_____||_____|__| |___._| |___| |__|_|__|_______|
*
* ============================================================================
* Copyright (c) 2007-2021 Artica Soluciones Tecnologicas
* Please see http://pandorafms.org for full contribution list
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation for version 2.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* ============================================================================
*/
// Pandora FMS - http://pandorafms.com // Begin.
// ==================================================
// Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
// Please see http://pandorafms.org for full contribution list
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation for version 2.
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
global $config; global $config;
require_once $config['homedir'].'/include/functions_visual_map.php'; require_once $config['homedir'].'/include/functions_visual_map.php';
@ -32,9 +48,7 @@ if (!$vconsoles_read && !$vconsoles_write && !$vconsoles_manage) {
exit; exit;
} }
if ($is_metaconsole === false) {
if (!$is_metaconsole) {
$url_visual_console = 'index.php?sec=network&sec2=godmode/reporting/map_builder'; $url_visual_console = 'index.php?sec=network&sec2=godmode/reporting/map_builder';
$url_visual_console_favorite = 'index.php?sec=network&sec2=godmode/reporting/visual_console_favorite'; $url_visual_console_favorite = 'index.php?sec=network&sec2=godmode/reporting/visual_console_favorite';
$url_visual_console_template = 'index.php?sec=network&sec2=enterprise/godmode/reporting/visual_console_template'; $url_visual_console_template = 'index.php?sec=network&sec2=enterprise/godmode/reporting/visual_console_template';
@ -102,14 +116,24 @@ if ($is_enterprise !== ENTERPRISE_NOT_HOOK && $vconsoles_manage) {
]; ];
} }
if (!$is_metaconsole) { if ($is_metaconsole === false) {
ui_print_page_header( ui_print_standard_header(
__('Reporting').' &raquo; '.__('Visual Console'), __('Visual Console List'),
'images/op_reporting.png', 'images/op_reporting.png',
false, false,
'', '',
false, true,
$buttons $buttons,
[
[
'link' => '',
'label' => __('Topology maps'),
],
[
'link' => '',
'label' => __('Visual console'),
],
]
); );
} else { } else {
ui_meta_print_header( ui_meta_print_header(

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

@ -567,17 +567,24 @@ switch ($action) {
// Print header. // Print header.
ui_meta_print_header(__('Reporting'), '', $buttons); ui_meta_print_header(__('Reporting'), '', $buttons);
} else { } else {
// Page header for normal console. // Header.
ui_print_page_header( ui_print_standard_header(
__('Custom reporting'), __('List of reports'),
'images/op_reporting.png', 'images/op_reporting.png',
false, false,
'', '',
false, false,
$buttons, $buttons,
false, [
'', [
60 'link' => '',
'label' => __('Reporting'),
],
[
'link' => '',
'label' => __('Custom reports'),
],
]
); );
} }
@ -2486,7 +2493,7 @@ switch ($action) {
0 0
); );
$values['exception_condition'] = (int) get_parameter( $values['exception_condition'] = (int) get_parameter(
'radiobutton_exception_condition', 'exception_condition',
0 0
); );
$values['exception_condition_value'] = get_parameter( $values['exception_condition_value'] = get_parameter(
@ -3145,17 +3152,24 @@ switch ($action) {
// Print header. // Print header.
ui_meta_print_header(__('Reporting'), '', $buttons); ui_meta_print_header(__('Reporting'), '', $buttons);
} else { } else {
// Page header for normal console. // Header.
ui_print_page_header( ui_print_standard_header(
$subsection, $subsection,
'images/op_reporting.png', 'images/op_reporting.png',
false, false,
'', '',
false, false,
$buttons, $buttons,
false, [
'', [
60 'link' => '',
'label' => __('Reporting'),
],
[
'link' => '',
'label' => __('Custom reports'),
],
]
); );
} }
@ -3251,17 +3265,25 @@ if ($enterpriseEnable && defined('METACONSOLE')) {
} else { } else {
$tab_builder = ($activeTab === 'item_editor') ? 'reporting_item_editor_tab' : ''; $tab_builder = ($activeTab === 'item_editor') ? 'reporting_item_editor_tab' : '';
if ($action !== 'update' && !is_metaconsole()) { if ($action !== 'update' && is_metaconsole() === false) {
ui_print_page_header( // Header.
ui_print_standard_header(
$textReportName, $textReportName,
'images/op_reporting.png', 'images/op_reporting.png',
false, false,
$tab_builder, $tab_builder,
false, false,
$buttons, $buttons,
false, [
'', [
60 'link' => '',
'label' => __('Reporting'),
],
[
'link' => '',
'label' => __('Custom reports'),
],
]
); );
} }
} }
@ -3291,17 +3313,25 @@ if ($resultOperationDB !== null) {
$activeTab = 'list_items'; $activeTab = 'list_items';
$buttons[$activeTab]['active'] = true; $buttons[$activeTab]['active'] = true;
if (!is_metaconsole()) { if (is_metaconsole() === false) {
ui_print_page_header( // Header.
ui_print_standard_header(
$textReportName, $textReportName,
'images/op_reporting.png', 'images/op_reporting.png',
false, false,
$helpers, $helpers,
false, false,
$buttons, $buttons,
false, [
'', [
60 'link' => '',
'label' => __('Reporting'),
],
[
'link' => '',
'label' => __('Custom reports'),
],
]
); );
} }
} }

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

@ -1,16 +1,33 @@
<?php <?php
// Pandora FMS - http://pandorafms.com /**
// ================================================== * Extension to manage a list of gateways and the node address where they should
// Copyright (c) 2005-2021 Artica Soluciones Tecnologicas * point to.
// Please see http://pandorafms.org for full contribution list *
// This program is free software; you can redistribute it and/or * @category Extensions
// modify it under the terms of the GNU General Public License * @package Pandora FMS
// as published by the Free Software Foundation for version 2. * @subpackage Community
// This program is distributed in the hope that it will be useful, * @version 1.0.0
// but WITHOUT ANY WARRANTY; without even the implied warranty of * @license See below
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
// GNU General Public License for more details. * ______ ___ _______ _______ ________
// Login check * | __ \.-----.--.--.--| |.-----.----.-----. | ___| | | __|
* | __/| _ | | _ || _ | _| _ | | ___| |__ |
* |___| |___._|__|__|_____||_____|__| |___._| |___| |__|_|__|_______|
*
* ============================================================================
* Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
* Please see http://pandorafms.org for full contribution list
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation for version 2.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* ============================================================================
*/
// Begin.
global $config; global $config;
global $statusProcessInDB; global $statusProcessInDB;
@ -812,14 +829,25 @@ $buttons[$activeTab]['active'] = true;
$tab_builder = ($activeTab === 'editor') ? 'visual_console_editor_editor_tab' : ''; $tab_builder = ($activeTab === 'editor') ? 'visual_console_editor_editor_tab' : '';
if (!defined('METACONSOLE')) { if (is_metaconsole() === false) {
ui_print_page_header( // Header.
ui_print_standard_header(
$visualConsoleName, $visualConsoleName,
'images/visual_console.png', 'images/visual_console.png',
false, false,
$tab_builder, $tab_builder,
false, false,
$buttons $buttons,
[
[
'link' => '',
'label' => __('Topology maps'),
],
[
'link' => '',
'label' => __('Visual console'),
],
]
); );
} }

65
pandora_console/godmode/reporting/visual_console_favorite.php
View File

@ -1,19 +1,38 @@
<?php <?php
// Pandora FMS - http://pandorafms.com /**
// ================================================== * Favorite visual console.
// Copyright (c) 2005-2021 Artica Soluciones Tecnologicas *
// Please see http://pandorafms.org for full contribution list * @category Topology maps
// This program is free software; you can redistribute it and/or * @package Pandora FMS
// modify it under the terms of the GNU General Public License * @subpackage Visual consoles
// as published by the Free Software Foundation for version 2. * @version 1.0.0
// This program is distributed in the hope that it will be useful, * @license See below
// but WITHOUT ANY WARRANTY; without even the implied warranty of *
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * ______ ___ _______ _______ ________
// GNU General Public License for more details. * | __ \.-----.--.--.--| |.-----.----.-----. | ___| | | __|
* | __/| _ | | _ || _ | _| _ | | ___| |__ |
* |___| |___._|__|__|_____||_____|__| |___._| |___| |__|_|__|_______|
*
* ============================================================================
* Copyright (c) 2007-2021 Artica Soluciones Tecnologicas
* Please see http://pandorafms.org for full contribution list
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation for version 2.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* ============================================================================
*/
// Begin.
global $config; global $config;
require_once $config['homedir'].'/include/functions_visual_map.php'; require_once $config['homedir'].'/include/functions_visual_map.php';
// Breadcrumb.
require_once $config['homedir'].'/include/class/HTML.class.php';
ui_require_css_file('discovery');
// ACL for the general permission // ACL for the general permission
$vconsoles_read = check_acl($config['id_user'], 0, 'VR'); $vconsoles_read = check_acl($config['id_user'], 0, 'VR');
$vconsoles_write = check_acl($config['id_user'], 0, 'VW'); $vconsoles_write = check_acl($config['id_user'], 0, 'VW');
@ -32,7 +51,7 @@ if (!$vconsoles_read && !$vconsoles_write && !$vconsoles_manage) {
} }
if (!$is_metaconsole) { if ($is_metaconsole === false) {
$url_visual_console = 'index.php?sec=network&sec2=godmode/reporting/map_builder'; $url_visual_console = 'index.php?sec=network&sec2=godmode/reporting/map_builder';
$url_visual_console_favorite = 'index.php?sec=network&sec2=godmode/reporting/visual_console_favorite'; $url_visual_console_favorite = 'index.php?sec=network&sec2=godmode/reporting/visual_console_favorite';
$url_visual_console_template = 'index.php?sec=network&sec2=enterprise/godmode/reporting/visual_console_template'; $url_visual_console_template = 'index.php?sec=network&sec2=enterprise/godmode/reporting/visual_console_template';
@ -94,14 +113,24 @@ if ($is_enterprise !== ENTERPRISE_NOT_HOOK && $vconsoles_manage) {
]; ];
} }
if (!$is_metaconsole) { if ($is_metaconsole === false) {
ui_print_page_header( ui_print_standard_header(
__('Reporting').' &raquo; '.__('Visual Favourite Console'), __('Favourite Visual Console'),
'images/op_reporting.png', 'images/op_reporting.png',
false, false,
'', '',
false, true,
$buttons $buttons,
[
[
'link' => '',
'label' => __('Topology maps'),
],
[
'link' => '',
'label' => __('Visual console'),
],
]
); );
} else { } else {
ui_meta_print_header( ui_meta_print_header(

74
pandora_console/godmode/setup/os.php
View File

@ -1,17 +1,32 @@
<?php <?php
/**
* OS Edition
*
* @category Server
* @package Pandora FMS
* @subpackage Godmode
* @version 1.0.0
* @license See below
*
* ______ ___ _______ _______ ________
* | __ \.-----.--.--.--| |.-----.----.-----. | ___| | | __|
* | __/| _ | | _ || _ | _| _ | | ___| |__ |
* |___| |___._|__|__|_____||_____|__| |___._| |___| |__|_|__|_______|
*
* ============================================================================
* Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
* Please see http://pandorafms.org for full contribution list
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation for version 2.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* ============================================================================
*/
// Pandora FMS - http://pandorafms.com // Begin.
// ==================================================
// Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
// Please see http://pandorafms.org for full contribution list
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation for version 2.
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// Load global vars
global $config; global $config;
check_login(); check_login();
@ -45,8 +60,8 @@ if ($idOS) {
$message = ''; $message = '';
switch ($action) { switch ($action) {
default:
case 'new': case 'new':
default:
$actionHidden = 'save'; $actionHidden = 'save';
$textButton = __('Create'); $textButton = __('Create');
$classButton = 'class="sub next"'; $classButton = 'class="sub next"';
@ -183,12 +198,31 @@ $buttons = [
$buttons[$tab]['active'] = true; $buttons[$tab]['active'] = true;
if (!is_metaconsole()) { $headerTitle = ($tab === 'builder') ? __('Edit OS') : __('List of OS');
if (is_metaconsole() === false) {
// Header. // Header.
ui_print_page_header(__('Edit OS'), '', false, '', true, $buttons); ui_print_standard_header(
$headerTitle,
'',
false,
'',
true,
$buttons,
[
[
'link' => '',
'label' => __('Servers'),
],
[
'link' => '',
'label' => __('Edit OS'),
],
]
);
} }
if (!empty($id_message)) { if (empty($id_message) === false) {
switch ($id_message) { switch ($id_message) {
case 1: case 1:
echo ui_print_success_message(__('Success creating OS'), '', true); echo ui_print_success_message(__('Success creating OS'), '', true);
@ -226,13 +260,11 @@ if (!empty($id_message)) {
switch ($tab) { switch ($tab) {
case 'list': case 'list':
default:
include_once $config['homedir'].'/godmode/setup/os.list.php'; include_once $config['homedir'].'/godmode/setup/os.list.php';
return; break;
break;
case 'builder': case 'builder':
include_once $config['homedir'].'/godmode/setup/os.builder.php'; include_once $config['homedir'].'/godmode/setup/os.builder.php';
return; break;
break;
} }

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

@ -1257,7 +1257,14 @@ if ($create_alert || $update_alert) {
foreach ($other_actions as $action) { foreach ($other_actions as $action) {
$data[1] .= '<tr>'; $data[1] .= '<tr>';
$data[1] .= '<td>'.alerts_get_alert_action_name($action['alert_type']).'</td>'; $data[1] .= '<td>'.alerts_get_alert_action_name($action['alert_type']).'</td>';
$data[1] .= '<td> <a href="index.php?sec=snmpconsole&sec2=godmode/snmpconsole/snmp_alert&delete_action=1&action_id='.$action['id'].'" onClick="javascript:return confirm(\''.__('Are you sure?').'\')">'.html_print_image('images/cross.png', true, ['border' => '0', 'alt' => __('Delete')]).'</a> </td>'; $data[1] .= '<td> <a href="index.php?sec=snmpconsole&sec2=godmode/snmpconsole/snmp_alert&delete_action=1&action_id='.$action['id'].'" onClick="javascript:return confirm(\''.__('Are you sure?').'\')">'.html_print_image(
'images/cross.png',
true,
[
'border' => '0',
'alt' => __('Delete'),
]
).'</a> </td>';
$data[1] .= '</tr>'; $data[1] .= '</tr>';
} }
} }
@ -1278,7 +1285,34 @@ if ($create_alert || $update_alert) {
} }
if (check_acl_restricted_all($config['id_user'], $row['id_group'], 'LW')) { if (check_acl_restricted_all($config['id_user'], $row['id_group'], 'LW')) {
$data[8] = '<a href="index.php?'.'sec=snmpconsole&'.'sec2=godmode/snmpconsole/snmp_alert&'.'duplicate_alert=1&'.'id_alert_snmp='.$row['id_as'].'">'.html_print_image('images/copy.png', true, ['alt' => __('Duplicate'), 'title' => __('Duplicate'), 'class' => 'invert_filter']).'</a>'.'<a href="index.php?'.'sec=snmpconsole&'.'sec2=godmode/snmpconsole/snmp_alert&'.'update_alert=1&'.'id_alert_snmp='.$row['id_as'].'">'.html_print_image('images/config.png', true, ['border' => '0', 'alt' => __('Update'), 'class' => 'invert_filter']).'</a>'.'<a href="javascript:show_add_action_snmp(\''.$row['id_as'].'\');">'.html_print_image('images/add.png', true, ['title' => __('Add action'), 'class' => 'invert_filter']).'</a>'.'<a href="index.php?sec=snmpconsole&sec2=godmode/snmpconsole/snmp_alert&delete_alert='.$row['id_as'].'" onClick="javascript:return confirm(\''.__('Are you sure?').'\')">'.html_print_image('images/cross.png', true, ['border' => '0', 'class' => 'invert_filter', 'alt' => __('Delete')]).'</a>'; $data[8] = '<a href="index.php?'.'sec=snmpconsole&'.'sec2=godmode/snmpconsole/snmp_alert&'.'duplicate_alert=1&'.'id_alert_snmp='.$row['id_as'].'">'.html_print_image(
'images/copy.png',
true,
[
'alt' => __('Duplicate'),
'title' => __('Duplicate'),
]
).'</a>'.'<a href="index.php?'.'sec=snmpconsole&'.'sec2=godmode/snmpconsole/snmp_alert&'.'update_alert=1&'.'id_alert_snmp='.$row['id_as'].'">'.html_print_image(
'images/config.png',
true,
[
'border' => '0',
'alt' => __('Update'),
]
).'</a>'.'<a href="javascript:show_add_action_snmp(\''.$row['id_as'].'\');">'.html_print_image(
'images/add.png',
true,
[
'title' => __('Add action'),
]
).'</a>'.'<a href="index.php?sec=snmpconsole&sec2=godmode/snmpconsole/snmp_alert&delete_alert='.$row['id_as'].'" onClick="javascript:return confirm(\''.__('Are you sure?').'\')">'.html_print_image(
'images/cross.png',
true,
[
'border' => '0',
'alt' => __('Delete'),
]
).'</a>';
$data[9] = html_print_checkbox_extended( $data[9] = html_print_checkbox_extended(
@ -1409,7 +1443,7 @@ if ($create_alert || $update_alert) {
echo '<div class="right mrgn_lft_10px;">'; echo '<div class="right mrgn_lft_10px;">';
html_print_input_hidden('multiple_delete', 1); html_print_input_hidden('multiple_delete', 1);
html_print_submit_button(__('Delete selected'), 'delete_button', false, 'class="sub delete"'); html_print_submit_button(__('Delete selected'), 'delete_button', false, 'class="sub delete mrgn_btn_10px"');
echo '</div>'; echo '</div>';
echo '</form>'; echo '</form>';
} }

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

@ -32,15 +32,36 @@ $index_post = (int) get_parameter('index_post', 0);
// Create/update header // Create/update header
if ($edit_filter > -2) { if ($edit_filter > -2) {
if ($edit_filter > -1) { if ($edit_filter > -1) {
ui_print_page_header(__('SNMP Console').' &raquo; '.__('Update filter'), 'images/op_snmp.png', false, '', false); $activeFilterCaption = ' &raquo; '.__('Update filter');
} else { } else {
ui_print_page_header(__('SNMP Console').' &raquo; '.__('Create filter'), 'images/op_snmp.png', false, '', false); $activeFilterCaption = ' &raquo; '.__('Create filter');
} }
} else { } else {
// Overview header // Overview header
ui_print_page_header(__('SNMP Console').' &raquo; '.__('Filter overview'), 'images/op_snmp.png', false, '', false); $activeFilterCaption = ' &raquo; '.__('Filter overview');
} }
// Header.
ui_print_standard_header(
__('SNMP Console').$activeFilterCaption,
'images/op_snmp.png',
false,
'',
false,
[],
[
[
'link' => '',
'label' => __('Monitoring'),
],
[
'link' => '',
'label' => __('SMNP'),
],
]
);
// Create/update filter // Create/update filter
if ($update_filter > -2) { if ($update_filter > -2) {
// UPDATE // UPDATE

17
pandora_console/godmode/snmpconsole/snmp_trap_generator.php
View File

@ -33,14 +33,27 @@ $snmp_type = (int) get_parameter('snmp_type', 0);
$snmp_value = (string) get_parameter('snmp_value', ''); $snmp_value = (string) get_parameter('snmp_value', '');
$generate_trap = (bool) get_parameter('generate_trap', 0); $generate_trap = (bool) get_parameter('generate_trap', 0);
ui_print_page_header( // Header.
ui_print_standard_header(
__('SNMP Trap generator'), __('SNMP Trap generator'),
'images/op_snmp.png', 'images/op_snmp.png',
false, false,
'snmp_trap_generator_view', 'snmp_trap_generator_view',
false false,
[],
[
[
'link' => '',
'label' => __('Monitoring'),
],
[
'link' => '',
'label' => __('SMNP'),
],
]
); );
if ($generate_trap) { if ($generate_trap) {
$result = true; $result = true;
$error = ''; $error = '';

59
pandora_console/include/class/AgentWizard.class.php
View File

@ -312,7 +312,7 @@ class AgentWizard extends HTML
$this->idPolicy = get_parameter('id', ''); $this->idPolicy = get_parameter('id', '');
$this->targetIp = get_parameter('targetIp', ''); $this->targetIp = get_parameter('targetIp', '');
if (!empty($this->idAgent)) { if (empty($this->idAgent) === false) {
$array_aux = db_get_all_rows_sql( $array_aux = db_get_all_rows_sql(
sprintf( sprintf(
'SELECT ip FROM taddress ta 'SELECT ip FROM taddress ta
@ -1582,6 +1582,10 @@ class AgentWizard extends HTML
if ($candidate['execution_type'] === 0 if ($candidate['execution_type'] === 0
|| $candidate['execution_type'] === EXECUTION_TYPE_NETWORK || $candidate['execution_type'] === EXECUTION_TYPE_NETWORK
) { ) {
if (substr($candidate['value'], 0, 1) !== '.') {
$candidate['value'] = '.'.$candidate['value'];
}
if ($this->serverType === SERVER_TYPE_ENTERPRISE_SATELLITE) { if ($this->serverType === SERVER_TYPE_ENTERPRISE_SATELLITE) {
$values['id_module'] = MODULE_DATA; $values['id_module'] = MODULE_DATA;
$values['module_interval'] = 1; $values['module_interval'] = 1;
@ -1687,28 +1691,43 @@ class AgentWizard extends HTML
) )
); );
if ($fieldsPlugin !== false) { if ($this->wizardSection === 'snmp_interfaces_explorer'
$fieldsPlugin = json_decode($fieldsPlugin, true); && empty($candidate['macros']) === false
$i = 1; ) {
foreach ($infoMacros as $key => $value) { // Use definition provided.
if (empty(preg_match('/_snmp_field/', $key)) === false) { $values['id_plugin'] = $candidate['id_plugin'];
$new_macros = []; $values['macros'] = base64_decode($candidate['macros']);
foreach ($fieldsPlugin as $k => $v) { } else {
if ($v['macro'] === preg_replace('/_snmp_field/', '', $key)) { $fieldsPlugin = db_get_value_sql(
$fieldsPlugin[$k]['value'] = $this->replacementMacrosPlugin( sprintf(
$value, 'SELECT macros FROM tplugin WHERE id=%d',
$infoMacros['macros'] (int) $infoMacros['server_plugin']
); )
$i++; );
continue;
if ($fieldsPlugin !== false) {
$fieldsPlugin = json_decode($fieldsPlugin, true);
$i = 1;
foreach ($infoMacros as $key => $value) {
if (empty(preg_match('/_snmp_field/', $key)) === false) {
$new_macros = [];
foreach ($fieldsPlugin as $k => $v) {
if ($v['macro'] === preg_replace('/_snmp_field/', '', $key)) {
$fieldsPlugin[$k]['value'] = $this->replacementMacrosPlugin(
$value,
$infoMacros['macros']
);
$i++;
continue;
}
} }
} }
} }
} }
}
$values['id_plugin'] = $infoMacros['server_plugin']; $values['id_plugin'] = $infoMacros['server_plugin'];
$values['macros'] = json_encode($fieldsPlugin); $values['macros'] = json_encode($fieldsPlugin);
}
} }
} }
} else if ($this->protocol === 'wmi') { } else if ($this->protocol === 'wmi') {
@ -1947,6 +1966,10 @@ class AgentWizard extends HTML
|| $candidate['execution_type'] === EXECUTION_TYPE_NETWORK || $candidate['execution_type'] === EXECUTION_TYPE_NETWORK
) { ) {
if ($this->serverType === SERVER_TYPE_ENTERPRISE_SATELLITE) { if ($this->serverType === SERVER_TYPE_ENTERPRISE_SATELLITE) {
if (substr($candidate['value'], 0, 1) !== '.') {
$candidate['value'] = '.'.$candidate['value'];
}
$tmp->module_interval(300); $tmp->module_interval(300);
$tmp->id_modulo(MODULE_DATA); $tmp->id_modulo(MODULE_DATA);
$tmp->updateConfigurationData( $tmp->updateConfigurationData(

39
pandora_console/include/class/AgentsAlerts.class.php
View File

@ -729,37 +729,24 @@ class AgentsAlerts extends HTML
public function loadHeader() public function loadHeader()
{ {
if ($this->pure == 0) { if ($this->pure == 0) {
// Breadcrums. // Header.
$this->setBreadcrum([]); ui_print_standard_header(
$this->prepareBreadcrum(
[
[
'link' => '',
'label' => __('Monitoring'),
'selected' => false,
],
[
'link' => '',
'label' => __('Views'),
'selected' => true,
],
],
true
);
ui_print_page_header(
__('Agents/Alerts'), __('Agents/Alerts'),
'', '',
false, false,
'', '',
true,
'',
false, false,
'', [],
GENERIC_SIZE_TEXT, [
'', [
$this->printHeader(true) 'link' => '',
'label' => __('Monitoring'),
],
[
'link' => '',
'label' => __('Views'),
],
]
); );
} }

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

@ -279,8 +279,10 @@ class Tree
protected function getTagJoin() protected function getTagJoin()
{ {
return 'INNER JOIN ttag_module ttm return 'INNER JOIN tagente_modulo tam
ON tam.id_agente_modulo = ttm.id_agente_modulo'; ON ta.id_agente = tam.id_agente
INNER JOIN ttag_module ttm
ON tam.id_agente_modulo = ttm.id_agente_modulo';
} }
@ -931,11 +933,16 @@ class Tree
$agent_status_filter = $this->getAgentStatusFilter(); $agent_status_filter = $this->getAgentStatusFilter();
$module_search_filter = $this->getModuleSearchFilter(); $module_search_filter = $this->getModuleSearchFilter();
$module_status_inner = ''; $module_status_inner = '';
$module_status_filter = $this->getModuleStatusFilterFromTestado(); $module_search_inner = '';
if (!empty($module_status_filter)) { $module_search_filter = '';
$module_status_inner = ' if (!empty($this->filter['searchModule'])) {
INNER JOIN tagente_estado tae $module_search_inner = '
ON tae.id_agente_modulo = tam.id_agente_modulo'; INNER JOIN tagente_modulo tam
ON ta.id_agente = tam.id_agente
INNER JOIN tagente_estado tae
ON tae.id_agente_modulo = tam.id_agente_modulo';
$module_search_filter = "AND tam.disabled = 0
AND tam.nombre LIKE '%%".$this->filter['searchModule']."%%' ".$this->getModuleStatusFilterFromTestado();
} }
$sql_model = "SELECT %s FROM $sql_model = "SELECT %s FROM
@ -944,13 +951,11 @@ class Tree
FROM tagente ta FROM tagente ta
LEFT JOIN tagent_secondary_group tasg LEFT JOIN tagent_secondary_group tasg
ON ta.id_agente = tasg.id_agent ON ta.id_agente = tasg.id_agent
INNER JOIN tagente_modulo tam
ON ta.id_agente = tam.id_agente
$inner_inside $inner_inside
$module_status_inner $module_status_inner
$group_inner $group_inner
$module_search_inner
WHERE ta.disabled = 0 WHERE ta.disabled = 0
AND tam.disabled = 0
%s %s
$agent_search_filter $agent_search_filter
$agent_status_filter $agent_status_filter
@ -973,6 +978,7 @@ class Tree
$inner $inner
GROUP BY g GROUP BY g
ORDER BY $order_by_final"; ORDER BY $order_by_final";
hd($sql, true);
return $sql; return $sql;
} }
@ -1020,7 +1026,7 @@ class Tree
$agent_search_filter = $this->getAgentSearchFilter(); $agent_search_filter = $this->getAgentSearchFilter();
$agent_status_filter = $this->getAgentStatusFilter(); $agent_status_filter = $this->getAgentStatusFilter();
$module_search_filter = $this->getModuleSearchFilter(); $module_search_filter = $this->getModuleSearchFilter();
$module_status_filter = $this->getModuleStatusFilterFromTestado($this->filter['statusModule']); $module_status_filter = $this->getModuleStatusFilter();
$condition = $this->L2condition; $condition = $this->L2condition;
$condition_inside = $this->L2conditionInside; $condition_inside = $this->L2conditionInside;

2
pandora_console/include/class/TreeModuleGroup.class.php
View File

@ -31,6 +31,8 @@ class TreeModuleGroup extends Tree
'tmg.id_mg AS id', 'tmg.id_mg AS id',
]; ];
$this->L1inner = 'INNER JOIN tmodule_group tmg ON tmg.id_mg = x2.g'; $this->L1inner = 'INNER JOIN tmodule_group tmg ON tmg.id_mg = x2.g';
$this->L1innerInside = 'INNER JOIN tagente_modulo tam
ON ta.id_agente = tam.id_agente';
$this->L1orderByFinal = 'tmg.name'; $this->L1orderByFinal = 'tmg.name';
$this->L2condition = 'AND tam.id_module_group = '.$this->rootID; $this->L2condition = 'AND tam.id_module_group = '.$this->rootID;

2
pandora_console/include/class/TreeTag.class.php
View File

@ -27,6 +27,8 @@ class TreeTag extends Tree
$this->L1fieldName = 'id_tag'; $this->L1fieldName = 'id_tag';
$this->L1fieldNameSql = 'ttm.id_tag'; $this->L1fieldNameSql = 'ttm.id_tag';
$this->L1innerInside = ' $this->L1innerInside = '
INNER JOIN tagente_modulo tam
ON ta.id_agente = tam.id_agente
INNER JOIN ttag_module ttm INNER JOIN ttag_module ttm
ON ttm.id_agente_modulo = tam.id_agente_modulo ON ttm.id_agente_modulo = tam.id_agente_modulo
'; ';

2
pandora_console/include/config_process.php
View File

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

2
pandora_console/include/functions_db.php
View File

@ -374,7 +374,7 @@ function db_get_value_filter($field, $table, $filter, $where_join='AND', $search
* *
* @param string SQL select statement to execute. * @param string SQL select statement to execute.
* *
* @return the first value of the first row of a table result from query. * @return mixed the first value of the first row of a table result from query.
*/ */
function db_get_value_sql($sql, $dbconnection=false) function db_get_value_sql($sql, $dbconnection=false)
{ {

1
pandora_console/include/functions_reporting.php
View File

@ -2711,6 +2711,7 @@ function reporting_exception(
// Metaconsole connection. // Metaconsole connection.
$server_name = $exc['server_name']; $server_name = $exc['server_name'];
if (($config['metaconsole'] == 1) && $server_name != '' && is_metaconsole()) { if (($config['metaconsole'] == 1) && $server_name != '' && is_metaconsole()) {
metaconsole_restore_db();
$connection = metaconsole_get_connection($server_name); $connection = metaconsole_get_connection($server_name);
if (metaconsole_load_external_db($connection) != NOERR) { if (metaconsole_load_external_db($connection) != NOERR) {
// ui_print_error_message ("Error connecting to ".$server_name); // ui_print_error_message ("Error connecting to ".$server_name);

97
pandora_console/include/functions_ui.php
View File

@ -27,6 +27,8 @@
*/ */
// Begin. // Begin.
global $config;
// Check to avoid error when load this library in error screen situations. // Check to avoid error when load this library in error screen situations.
if (isset($config['homedir'])) { if (isset($config['homedir'])) {
include_once $config['homedir'].'/include/functions_agents.php'; include_once $config['homedir'].'/include/functions_agents.php';
@ -4302,6 +4304,101 @@ function ui_get_full_url($url='', $no_proxy=false, $add_name_php_file=false, $me
} }
/**
* Generates the Pandora 75x Standard views header.
* This function should be the standard for
* generating the headers of all PFMS views.
*
* @param string $title The title of this view.
* @param string $icon Icon for show.
* @param boolean $return If true, the string with the formed header is returned.
* @param string $help String for attach at end a link for help.
* @param boolean $godmode If false, it will created like operation mode.
* @param array $options Tabs allowed
* @param array $breadcrumbs Breadcrumbs with the walk.
*
* EXAMPLE:
* ```
* $buttons['option_1'] = [
* 'active' => false,
* 'text' => '<a href="'.$url.'">'.html_print_image(
* 'images/wand.png',
* true,
* [ 'title' => __('Option 1 for show'), 'class' => 'invert_filter' ]
* ).'</a>',
* ];
*
* ui_print_standard_header(
* __('Favorites'),
* 'images/op_reporting.png',
* false,
* '',
* true,
* $buttons,
* [
* [ 'link' => '', 'label' => __('Topology maps') ],
* [ 'link' => '', 'label' => __('Visual console') ],
* ]
* );
* ```
*
* @return string If apply
*/
function ui_print_standard_header(
string $title,
string $icon='',
bool $return=false,
string $help='',
bool $godmode=false,
array $options=[],
array $breadcrumbs=[]
) {
// For standard breadcrumbs.
ui_require_css_file('discovery');
// Create the breadcrumb.
$headerInformation = new HTML();
$headerInformation->setBreadcrum([]);
// Prepare the breadcrumbs.
$countBreadcrumbs = count($breadcrumbs);
$countUnitBreadcrumb = 0;
$applyBreadcrumbs = [];
foreach ($breadcrumbs as $unitBreadcrumb) {
// Count new breadcrumb.
$countUnitBreadcrumb++;
// Apply selected if is the last.
$unitBreadcrumb['selected'] = ($countBreadcrumbs === $countUnitBreadcrumb);
// Apply for another breadcrumb.
$applyBreadcrumbs[] = $unitBreadcrumb;
}
// Attach breadcrumbs.
$headerInformation->prepareBreadcrum(
$applyBreadcrumbs,
true
);
// Create the header.
$output = ui_print_page_header(
$title,
$icon,
true,
$help,
$godmode,
$options,
false,
'',
GENERIC_SIZE_TEXT,
'',
$headerInformation->printHeader(true)
);
if ($return !== true) {
echo $output;
} else {
return $output;
}
}
/** /**
* Return a standard page header (Pandora FMS 3.1 version) * Return a standard page header (Pandora FMS 3.1 version)
* *

9
pandora_console/include/styles/pandora.css
View File

@ -8511,3 +8511,12 @@ div.stat-win-spinner img {
width: 100px !important; width: 100px !important;
margin-left: 20px; margin-left: 20px;
} }
.btn_update_online_open {
float: right;
margin-bottom: 20px;
}
.align-left-important {
text-align: left !important;
}

8
pandora_console/include/styles/pandora_black.css
View File

@ -1019,3 +1019,11 @@ li.ui-tabs-tab.ui-corner-top.ui-state-default.ui-tab {
margin: 20px auto; margin: 20px auto;
border-radius: 3px; border-radius: 3px;
} }
table.alternate tr:nth-child(2n + 1) td {
background-color: #222;
}
table.alternate tr:nth-child(2n) td {
background-color: #111;
}

1
pandora_console/index.php
View File

@ -1277,6 +1277,7 @@ if ($config['pure'] == 0) {
// Container div. // Container div.
echo '</div>'; echo '</div>';
echo '<div id="both"></div>'; echo '<div id="both"></div>';
echo '</div>';
echo '<div id="foot">'; echo '<div id="foot">';
include 'general/footer.php'; include 'general/footer.php';

2
pandora_console/install.php
View File

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

19
pandora_console/operation/agentes/alerts_status.php
View File

@ -188,12 +188,25 @@ if ($idAgent != 0) {
$print_agent = true; $print_agent = true;
if (!is_metaconsole()) { if (is_metaconsole() === false) {
ui_print_page_header( // Header.
ui_print_standard_header(
__('Alert detail'), __('Alert detail'),
'images/op_alerts.png', 'images/op_alerts.png',
false, false,
'' '',
false,
[],
[
[
'link' => '',
'label' => __('Monitoring'),
],
[
'link' => '',
'label' => __('Views'),
],
]
); );
} else { } else {
ui_meta_print_header(__('Alerts view')); ui_meta_print_header(__('Alerts view'));

54
pandora_console/operation/agentes/estado_agente.php
View File

@ -1,17 +1,32 @@
<?php <?php
/**
* Agent Status View.
*
* @category View
* @package Pandora FMS
* @subpackage Monitoring.
* @version 1.0.0
* @license See below
*
* ______ ___ _______ _______ ________
* | __ \.-----.--.--.--| |.-----.----.-----. | ___| | | __|
* | __/| _ | | _ || _ | _| _ | | ___| |__ |
* |___| |___._|__|__|_____||_____|__| |___._| |___| |__|_|__|_______|
*
* ============================================================================
* Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
* Please see http://pandorafms.org for full contribution list
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation for version 2.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* ============================================================================
*/
// Pandora FMS - http://pandorafms.com // Begin.
// ==================================================
// Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
// Please see http://pandorafms.org for full contribution list
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation for version 2.
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// Load global vars
global $config; global $config;
ob_start(); ob_start();
@ -192,13 +207,24 @@ if (check_acl($config['id_user'], 0, 'AW')) {
$onheader = ['setup' => $setuptab]; $onheader = ['setup' => $setuptab];
} }
ui_print_page_header( // Header.
ui_print_standard_header(
__('Agent detail'), __('Agent detail'),
'images/agent.png', 'images/agent.png',
false, false,
'', '',
false, false,
$onheader $onheader,
[
[
'link' => '',
'label' => __('Monitoring'),
],
[
'link' => '',
'label' => __('Views'),
],
]
); );
if (!$strict_user) { if (!$strict_user) {

56
pandora_console/operation/agentes/group_view.php
View File

@ -1,16 +1,32 @@
<?php <?php
// Pandora FMS - http://pandorafms.com /**
// ================================================== * Group View.
// Copyright (c) 2005-2021 Artica Soluciones Tecnologicas *
// Please see http://pandorafms.org for full contribution list * @category View
// This program is free software; you can redistribute it and/or * @package Pandora FMS
// modify it under the terms of the GNU General Public License * @subpackage Monitoring.
// as published by the Free Software Foundation for version 2. * @version 1.0.0
// This program is distributed in the hope that it will be useful, * @license See below
// but WITHOUT ANY WARRANTY; without even the implied warranty of *
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * ______ ___ _______ _______ ________
// GNU General Public License for more details. * | __ \.-----.--.--.--| |.-----.----.-----. | ___| | | __|
// Load global vars * | __/| _ | | _ || _ | _| _ | | ___| |__ |
* |___| |___._|__|__|_____||_____|__| |___._| |___| |__|_|__|_______|
*
* ============================================================================
* Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
* Please see http://pandorafms.org for full contribution list
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation for version 2.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* ============================================================================
*/
// Begin.
require_once 'include/config.php'; require_once 'include/config.php';
require_once 'include/functions_reporting.php'; require_once 'include/functions_reporting.php';
require_once $config['homedir'].'/include/functions_agents.php'; require_once $config['homedir'].'/include/functions_agents.php';
@ -62,17 +78,27 @@ if ($config['realtimestats'] == 0) {
$updated_time .= '</a>'; $updated_time .= '</a>';
} else { } else {
// $updated_info = __("Updated at realtime"); // $updated_info = __("Updated at realtime");
$updated_info = ''; $updated_info = '';
} }
// Header. // Header.
ui_print_page_header( ui_print_standard_header(
__('Group view'), __('Group view'),
'images/group.png', 'images/group.png',
false, false,
'', '',
false, false,
$updated_time (array) $updated_time,
[
[
'link' => '',
'label' => __('Monitoring'),
],
[
'link' => '',
'label' => __('Views'),
],
]
); );
$total_agentes = 0; $total_agentes = 0;

51
pandora_console/operation/agentes/interface_view.php
View File

@ -1,18 +1,32 @@
<?php <?php
/** /**
* Pandora FMS - http://pandorafms.com * Interfaces view.
* ================================================== *
* Copyright (c) 2005-2021 Artica Soluciones Tecnologicas * @category Monitoring
* Please see http://pandorafms.org for full contribution list * @package Pandora FMS
* This program is free software; you can redistribute it and/or * @subpackage Community
* modify it under the terms of the GNU General Public License * @version 1.0.0
* as published by the Free Software Foundation; version 2 * @license See below
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * ______ ___ _______ _______ ________
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * | __ \.-----.--.--.--| |.-----.----.-----. | ___| | | __|
* GNU General Public License for more details. * | __/| _ | | _ || _ | _| _ | | ___| |__ |
* |___| |___._|__|__|_____||_____|__| |___._| |___| |__|_|__|_______|
*
* ============================================================================
* Copyright (c) 2007-2021 Artica Soluciones Tecnologicas
* Please see http://pandorafms.org for full contribution list
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation for version 2.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* ============================================================================
*/ */
// Begin.
global $config; global $config;
check_login(); check_login();
@ -45,12 +59,23 @@ $sec = (string) get_parameter('sec', 'view');
$agent_id = (int) get_parameter('id_agente', 0); $agent_id = (int) get_parameter('id_agente', 0);
if ($sec === 'view') { if ($sec === 'view') {
ui_print_page_header( ui_print_standard_header(
__('Interface view').$subpage, __('Interface view').$subpage,
'', '',
false, false,
'', '',
true true,
[],
[
[
'link' => '',
'label' => __('Monitoring'),
],
[
'link' => '',
'label' => __('Views'),
],
]
); );
} }

24
pandora_console/operation/agentes/pandora_networkmap.editor.php
View File

@ -1,9 +1,8 @@
<?php <?php
/** /**
* Extension to manage a list of gateways and the node address where they should * Empty Network editor.
* point to.
* *
* @category Extensions * @category View
* @package Pandora FMS * @package Pandora FMS
* @subpackage Community * @subpackage Community
* @version 1.0.0 * @version 1.0.0
@ -27,6 +26,7 @@
* ============================================================================ * ============================================================================
*/ */
// Begin.
global $config; global $config;
// Check user credentials. // Check user credentials.
@ -203,12 +203,24 @@ if ($edit_networkmap) {
} }
} }
ui_print_page_header( // Header.
__('Networkmap'), ui_print_standard_header(
__('Network maps editor'),
'images/bricks.png', 'images/bricks.png',
false, false,
'network_map_enterprise_edit', 'network_map_enterprise_edit',
false false,
[],
[
[
'link' => '',
'label' => __('Topology maps'),
],
[
'link' => '',
'label' => __('Networkmap'),
],
]
); );
$id_snmp_l2_recon = db_get_value( $id_snmp_l2_recon = db_get_value(

57
pandora_console/operation/agentes/pandora_networkmap.php
View File

@ -1,15 +1,32 @@
<?php <?php
// ______ __ _______ _______ _______ /**
// | __ \.---.-.-----.--| |.-----.----.---.-. | ___| | | __| * Network map.
// | __/| _ | | _ || _ | _| _ | | ___| |__ | *
// |___| |___._|__|__|_____||_____|__| |___._| |___| |__|_|__|_______| * @category View
// * @package Pandora FMS
// ============================================================================ * @subpackage Community
// Copyright (c) 2007-2021 Artica Soluciones Tecnologicas, http://www.artica.es * @version 1.0.0
// This code is NOT free software. This code is NOT licenced under GPL2 licence * @license See below
// You cannnot redistribute it without written permission of copyright holder. *
// ============================================================================ * ______ ___ _______ _______ ________
// Load global variables * | __ \.-----.--.--.--| |.-----.----.-----. | ___| | | __|
* | __/| _ | | _ || _ | _| _ | | ___| |__ |
* |___| |___._|__|__|_____||_____|__| |___._| |___| |__|_|__|_______|
*
* ============================================================================
* Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
* Please see http://pandorafms.org for full contribution list
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation for version 2.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* ============================================================================
*/
// Begin.
global $config; global $config;
// Check user credentials. // Check user credentials.
@ -645,12 +662,24 @@ switch ($tab) {
<?php <?php
} }
ui_print_page_header( // Header.
__('Networkmap'), ui_print_standard_header(
__('List of network maps'),
'images/op_network.png', 'images/op_network.png',
false, false,
'', '',
false false,
[],
[
[
'link' => '',
'label' => __('Topology maps'),
],
[
'link' => '',
'label' => __('Networkmap'),
],
]
); );
echo $result_txt; echo $result_txt;

60
pandora_console/operation/agentes/status_monitor.php
View File

@ -1,17 +1,32 @@
<?php <?php
// This file is an example on how things must NEVER be done. /**
// Pandora FMS - http://pandorafms.com * Monitor Status View.
// ================================================== *
// Copyright (c) 2005-2021 Artica Soluciones Tecnologicas * @category View
// Please see http://pandorafms.org for full contribution list * @package Pandora FMS
// This program is free software; you can redistribute it and/or * @subpackage Monitoring.
// modify it under the terms of the GNU General Public License * @version 1.0.0
// as published by the Free Software Foundation for version 2. * @license See below
// This program is distributed in the hope that it will be useful, *
// but WITHOUT ANY WARRANTY; without even the implied warranty of * ______ ___ _______ _______ ________
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * | __ \.-----.--.--.--| |.-----.----.-----. | ___| | | __|
// GNU General Public License for more details. * | __/| _ | | _ || _ | _| _ | | ___| |__ |
// Load global vars * |___| |___._|__|__|_____||_____|__| |___._| |___| |__|_|__|_______|
*
* ============================================================================
* Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
* Please see http://pandorafms.org for full contribution list
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation for version 2.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* ============================================================================
*/
// Begin.
global $config; global $config;
check_login(); check_login();
@ -67,7 +82,7 @@ if (! defined('METACONSOLE')) {
switch ($section) { switch ($section) {
case 'fields': case 'fields':
$buttons['fields']['active'] = true; $buttons['fields']['active'] = true;
$subpage = ' - '.__('Custom fields'); $subpage = ' &raquo; '.__('Custom fields');
break; break;
default: default:
@ -75,13 +90,24 @@ if (! defined('METACONSOLE')) {
break; break;
} }
ui_print_page_header( // Header.
ui_print_standard_header(
__('Monitor detail').$subpage, __('Monitor detail').$subpage,
'', 'images/agent.png',
false, false,
'', '',
true, true,
$buttons $buttons,
[
[
'link' => '',
'label' => __('Monitoring'),
],
[
'link' => '',
'label' => __('Views'),
],
]
); );
if ($section == 'fields') { if ($section == 'fields') {

55
pandora_console/operation/agentes/tactical.php
View File

@ -1,17 +1,32 @@
<?php <?php
/**
* Tactical View.
*
* @category View
* @package Pandora FMS
* @subpackage Monitoring.
* @version 1.0.0
* @license See below
*
* ______ ___ _______ _______ ________
* | __ \.-----.--.--.--| |.-----.----.-----. | ___| | | __|
* | __/| _ | | _ || _ | _| _ | | ___| |__ |
* |___| |___._|__|__|_____||_____|__| |___._| |___| |__|_|__|_______|
*
* ============================================================================
* Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
* Please see http://pandorafms.org for full contribution list
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation for version 2.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* ============================================================================
*/
// Pandora FMS - http://pandorafms.com // Begin.
// ==================================================
// Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
// Please see http://pandorafms.org for full contribution list
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation for version 2.
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// Load global vars
global $config; global $config;
require_once 'include/functions_events.php'; require_once 'include/functions_events.php';
@ -46,17 +61,27 @@ if ($config['realtimestats'] == 0) {
$updated_time .= '</a>'; $updated_time .= '</a>';
} else { } else {
// $updated_info = __("Updated at realtime"); // $updated_info = __("Updated at realtime");
$updated_info = ''; $updated_info = '';
} }
// Header. // Header.
ui_print_page_header( ui_print_standard_header(
__('Tactical view'), __('Tactical view'),
'', '',
false, false,
'', '',
false, false,
$updated_time (array) $updated_time,
[
[
'link' => '',
'label' => __('Monitoring'),
],
[
'link' => '',
'label' => __('Views'),
],
]
); );
// Currently this function makes loading this page is impossible. Change // Currently this function makes loading this page is impossible. Change

4
pandora_console/operation/dashboard/dashboard.php
View File

@ -1,7 +1,6 @@
<?php <?php
/** /**
* Extension to manage a list of gateways and the node address where they should * Dashboards.
* point to.
* *
* @category Dashboards * @category Dashboards
* @package Pandora FMS * @package Pandora FMS
@ -27,6 +26,7 @@
* ============================================================================ * ============================================================================
*/ */
// Begin.
global $config; global $config;
require $config['homedir'].'/vendor/autoload.php'; require $config['homedir'].'/vendor/autoload.php';

2
pandora_console/operation/incidents/list_integriaims_incidents.php
View File

@ -275,7 +275,7 @@ foreach ($incidents_paginated as $key => $value) {
$table->data[$i][0] = '#'.$array_get_incidents[$key][0]; $table->data[$i][0] = '#'.$array_get_incidents[$key][0];
$table->data[$i][1] = '<a href="'.ui_get_full_url('index.php?sec=incident&sec2=operation/incidents/dashboard_detail_integriaims_incident&incident_id='.$array_get_incidents[$key][0]).'">'; $table->data[$i][1] = '<a href="'.ui_get_full_url('index.php?sec=incident&sec2=operation/incidents/dashboard_detail_integriaims_incident&incident_id='.$array_get_incidents[$key][0]).'">';
$table->data[$i][1] .= $array_get_incidents[$key][3]; $table->data[$i][1] .= ui_print_truncate_text($array_get_incidents[$key][3], 160, false);
$table->data[$i][1] .= '</a>'; $table->data[$i][1] .= '</a>';
$table->data[$i][2] = $group_incident[$array_get_incidents[$key][8]]; $table->data[$i][2] = $group_incident[$array_get_incidents[$key][8]];
$table->data[$i][3] = $status_incident[$array_get_incidents[$key][6]].' / '.$resolution_incident[$array_get_incidents[$key][12]]; $table->data[$i][3] = $status_incident[$array_get_incidents[$key][6]].' / '.$resolution_incident[$array_get_incidents[$key][12]];

18
pandora_console/operation/messages/message_edit.php
View File

@ -1,6 +1,6 @@
<?php <?php
/** /**
* Message Edition. * Compose message view
* *
* @category Workspace * @category Workspace
* @package Pandora FMS * @package Pandora FMS
@ -82,13 +82,23 @@ $buttons['create_message'] = [
]; ];
// Header. // Header.
ui_print_page_header( ui_print_standard_header(
__('Messages'), __('Compose message'),
'images/email_mc.png', 'images/email_mc.png',
false, false,
'', '',
false, false,
$buttons $buttons,
[
[
'link' => '',
'label' => __('Workspace'),
],
[
'link' => '',
'label' => __('Messages'),
],
]
); );
// Read a message. // Read a message.

55
pandora_console/operation/messages/message_list.php
View File

@ -1,9 +1,8 @@
<?php <?php
/** /**
* Extension to manage a list of gateways and the node address where they should * Sent / Received messages view.
* point to.
* *
* @category Extensions * @category Workspace
* @package Pandora FMS * @package Pandora FMS
* @subpackage Community * @subpackage Community
* @version 1.0.0 * @version 1.0.0
@ -27,23 +26,24 @@
* ============================================================================ * ============================================================================
*/ */
// Begin.
require_once 'include/functions_messages.php'; require_once 'include/functions_messages.php';
global $config; global $config;
$delete_msg = get_parameter('delete_message', 0); $delete_msg = get_parameter('delete_message', 0);
$multiple_delete = get_parameter('multiple_delete', 0); $multiple_delete = get_parameter('multiple_delete', 0);
$show_sent = get_parameter('show_sent', 0); $show_sent = (bool) get_parameter('show_sent', false);
$mark_unread = get_parameter('mark_unread', 0); $mark_unread = get_parameter('mark_unread', 0);
$active_list = true; $active_list = true;
$active_sent = false; $active_sent = false;
if ($show_sent !== 0) { if ($show_sent === true) {
$active_list = false; $active_list = false;
$active_sent = true; $active_sent = true;
} }
$tabSelectedMessage = ($show_sent === true) ? __('Sent messages') : __('Received messages');
$buttons['message_list'] = [ $buttons['message_list'] = [
'active' => $active_list, 'active' => $active_list,
@ -67,14 +67,25 @@ $buttons['create_message'] = [
).'</a>', ).'</a>',
]; ];
if (!is_ajax()) { if (is_ajax() === false) {
ui_print_page_header( // Header.
__('Messages'), ui_print_standard_header(
$tabSelectedMessage,
'images/email_mc.png', 'images/email_mc.png',
false, false,
'', '',
false, false,
$buttons $buttons,
[
[
'link' => '',
'label' => __('Workspace'),
],
[
'link' => '',
'label' => __('Messages'),
],
]
); );
} }
@ -86,7 +97,7 @@ if ($mark_unread) {
if ($delete_msg) { if ($delete_msg) {
$id = (int) get_parameter('id'); $id = (int) get_parameter('id');
if ($show_sent) { if ($show_sent === true) {
$result = messages_delete_message_sent($id); $result = messages_delete_message_sent($id);
} else { } else {
$result = messages_delete_message($id); $result = messages_delete_message($id);
@ -104,7 +115,7 @@ if ($multiple_delete) {
$ids = (array) get_parameter('delete_multiple_messages', []); $ids = (array) get_parameter('delete_multiple_messages', []);
foreach ($ids as $id) { foreach ($ids as $id) {
if ($show_sent) { if ($show_sent === true) {
$result = messages_delete_message_sent($id); $result = messages_delete_message_sent($id);
} else { } else {
$result = messages_delete_message($id); $result = messages_delete_message($id);
@ -122,7 +133,7 @@ if ($multiple_delete) {
); );
} }
if ($show_sent) { if ($show_sent === true) {
// Sent view. // Sent view.
$num_messages = messages_get_count_sent($config['id_user']); $num_messages = messages_get_count_sent($config['id_user']);
if ($num_messages > 0 && !is_ajax()) { if ($num_messages > 0 && !is_ajax()) {
@ -142,7 +153,7 @@ if ($show_sent) {
} }
} }
if (empty($messages)) { if (empty($messages) === true) {
ui_print_info_message( ui_print_info_message(
[ [
'no_close' => true, 'no_close' => true,
@ -175,7 +186,7 @@ if (empty($messages)) {
$table->head[5] = html_print_checkbox('all_delete_messages', 0, false, true, false); $table->head[5] = html_print_checkbox('all_delete_messages', 0, false, true, false);
$table->head[0] = __('Status'); $table->head[0] = __('Status');
if ($show_sent) { if ($show_sent === true) {
$table->head[1] = __('Destination'); $table->head[1] = __('Destination');
} else { } else {
$table->head[1] = __('Sender'); $table->head[1] = __('Sender');
@ -194,7 +205,7 @@ if (empty($messages)) {
$data[0] = ''; $data[0] = '';
if ($message['read'] == 1) { if ($message['read'] == 1) {
if ($show_sent) { if ($show_sent === true) {
$data[0] .= '<a href="index.php?sec=message_list&amp;sec2=operation/messages/message_edit&read_message=1&amp;show_sent=1&amp;id_message='.$message_id.'">'; $data[0] .= '<a href="index.php?sec=message_list&amp;sec2=operation/messages/message_edit&read_message=1&amp;show_sent=1&amp;id_message='.$message_id.'">';
$data[0] .= html_print_image('images/email_inbox.png', true, ['border' => 0, 'title' => __('Click to read'), 'class' => 'invert_filter']); $data[0] .= html_print_image('images/email_inbox.png', true, ['border' => 0, 'title' => __('Click to read'), 'class' => 'invert_filter']);
$data[0] .= '</a>'; $data[0] .= '</a>';
@ -204,7 +215,7 @@ if (empty($messages)) {
$data[0] .= '</a>'; $data[0] .= '</a>';
} }
} else { } else {
if ($show_sent) { if ($show_sent === true) {
$data[0] .= '<a href="index.php?sec=message_list&amp;sec2=operation/messages/message_edit&amp;read_message=1&amp;show_sent=1&amp;id_message='.$message_id.'">'; $data[0] .= '<a href="index.php?sec=message_list&amp;sec2=operation/messages/message_edit&amp;read_message=1&amp;show_sent=1&amp;id_message='.$message_id.'">';
$data[0] .= html_print_image('images/email_inbox.png', true, ['border' => 0, 'title' => __('Message unread - click to read'), 'class' => 'invert_filter']); $data[0] .= html_print_image('images/email_inbox.png', true, ['border' => 0, 'title' => __('Message unread - click to read'), 'class' => 'invert_filter']);
$data[0] .= '</a>'; $data[0] .= '</a>';
@ -215,7 +226,7 @@ if (empty($messages)) {
} }
} }
if ($show_sent) { if ($show_sent === true) {
$dest_user = get_user_fullname($message['dest']); $dest_user = get_user_fullname($message['dest']);
if (!$dest_user) { if (!$dest_user) {
$dest_user = $message['dest']; $dest_user = $message['dest'];
@ -231,7 +242,7 @@ if (empty($messages)) {
$data[1] = $orig_user; $data[1] = $orig_user;
} }
if ($show_sent) { if ($show_sent === true) {
$data[2] = '<a href="index.php?sec=message_list&amp;sec2=operation/messages/message_edit&amp;read_message=1&show_sent=1&amp;id_message='.$message_id.'">'; $data[2] = '<a href="index.php?sec=message_list&amp;sec2=operation/messages/message_edit&amp;read_message=1&show_sent=1&amp;id_message='.$message_id.'">';
} else { } else {
$data[2] = '<a href="index.php?sec=message_list&amp;sec2=operation/messages/message_edit&amp;read_message=1&amp;id_message='.$message_id.'">'; $data[2] = '<a href="index.php?sec=message_list&amp;sec2=operation/messages/message_edit&amp;read_message=1&amp;id_message='.$message_id.'">';
@ -252,7 +263,7 @@ if (empty($messages)) {
); );
$table->cellclass[][4] = 'action_buttons'; $table->cellclass[][4] = 'action_buttons';
if ($show_sent) { if ($show_sent === true) {
$data[4] = '<a href="index.php?sec=message_list&amp;sec2=operation/messages/message_list&show_sent=1&delete_message=1&id='.$message_id.'" $data[4] = '<a href="index.php?sec=message_list&amp;sec2=operation/messages/message_list&show_sent=1&delete_message=1&id='.$message_id.'"
onClick="javascript:if (!confirm(\''.__('Are you sure?').'\')) return false;">'.html_print_image('images/cross.png', true, ['title' => __('Delete'), 'class' => 'invert_filter']).'</a>'; onClick="javascript:if (!confirm(\''.__('Are you sure?').'\')) return false;">'.html_print_image('images/cross.png', true, ['title' => __('Delete'), 'class' => 'invert_filter']).'</a>';
} else { } else {
@ -264,8 +275,8 @@ if (empty($messages)) {
} }
} }
if (!empty($messages)) { if (empty($messages) === false) {
if ($show_sent) { if ($show_sent === true) {
echo '<form method="post" action="index.php?sec=message_list&amp;sec2=operation/messages/message_list&show_sent=1">'; echo '<form method="post" action="index.php?sec=message_list&amp;sec2=operation/messages/message_list&show_sent=1">';
} else { } else {
echo '<form method="post" action="index.php?sec=message_list&amp;sec2=operation/messages/message_list">'; echo '<form method="post" action="index.php?sec=message_list&amp;sec2=operation/messages/message_list">';

16
pandora_console/operation/reporting/reporting_viewer.php
View File

@ -173,16 +173,24 @@ if (is_metaconsole()) {
// Print header // Print header
ui_meta_print_header(__('Reporting'), '', $options); ui_meta_print_header(__('Reporting'), '', $options);
} else { } else {
ui_print_page_header( // Header.
ui_print_standard_header(
reporting_get_name($id_report), reporting_get_name($id_report),
'images/op_reporting.png', 'images/op_reporting.png',
false, false,
'', '',
false, false,
$options, $options,
false, [
'', [
55 'link' => '',
'label' => __('Reporting'),
],
[
'link' => '',
'label' => __('Custom reports'),
],
]
); );
} }

22
pandora_console/operation/snmpconsole/snmp_browser.php
View File

@ -1,9 +1,8 @@
<?php <?php
/** /**
* Extension to manage a list of gateways and the node address where they should * SMNP Browser view
* point to.
* *
* @category Extensions * @category Monitoring
* @package Pandora FMS * @package Pandora FMS
* @subpackage Community * @subpackage Community
* @version 1.0.0 * @version 1.0.0
@ -27,6 +26,7 @@
* ============================================================================ * ============================================================================
*/ */
// Begin.
global $config; global $config;
require_once $config['homedir'].'/include/functions_snmp_browser.php'; require_once $config['homedir'].'/include/functions_snmp_browser.php';
ui_require_javascript_file('pandora_snmp_browser'); ui_require_javascript_file('pandora_snmp_browser');
@ -42,7 +42,6 @@ if (!check_acl($config['id_user'], 0, 'AR')) {
// Header.
$url = 'index.php?sec=snmpconsole&sec2=operation/snmpconsole/snmp_browser&pure='.$config['pure']; $url = 'index.php?sec=snmpconsole&sec2=operation/snmpconsole/snmp_browser&pure='.$config['pure'];
if ($config['pure']) { if ($config['pure']) {
// Windowed. // Windowed.
@ -70,13 +69,24 @@ if ($config['pure']) {
$link['text'] .= '</a>'; $link['text'] .= '</a>';
} }
ui_print_page_header( // Header.
ui_print_standard_header(
__('SNMP Browser'), __('SNMP Browser'),
'images/op_snmp.png', 'images/op_snmp.png',
false, false,
'snmp_browser_view', 'snmp_browser_view',
false, false,
[$link] [$link],
[
[
'link' => '',
'label' => __('Monitoring'),
],
[
'link' => '',
'label' => __('SMNP'),
],
]
); );
// SNMP tree container. // SNMP tree container.

61
pandora_console/operation/snmpconsole/snmp_mib_uploader.php
View File

@ -1,17 +1,32 @@
<?php <?php
/**
* MIB Uploader view
*
* @category Monitoring
* @package Pandora FMS
* @subpackage Community
* @version 1.0.0
* @license See below
*
* ______ ___ _______ _______ ________
* | __ \.-----.--.--.--| |.-----.----.-----. | ___| | | __|
* | __/| _ | | _ || _ | _| _ | | ___| |__ |
* |___| |___._|__|__|_____||_____|__| |___._| |___| |__|_|__|_______|
*
* ============================================================================
* Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
* Please see http://pandorafms.org for full contribution list
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation for version 2.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* ============================================================================
*/
// Pandora FMS - http://pandorafms.com // Begin.
// ==================================================
// Copyright (c) 2013-2021 Artica Soluciones Tecnologicas
// Please see http://pandorafms.org for full contribution list
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation for version 2.
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// Load global vars
global $config; global $config;
check_login(); check_login();
@ -24,8 +39,26 @@ if (! check_acl($config['id_user'], 0, 'PM')) {
require_once 'include/functions_filemanager.php'; require_once 'include/functions_filemanager.php';
// Header // Header.
ui_print_page_header(__('MIB uploader'), 'images/op_snmp.png', false, '', false); ui_print_standard_header(
__('MIB uploader'),
'images/op_snmp.png',
false,
'',
false,
[],
[
[
'link' => '',
'label' => __('Monitoring'),
],
[
'link' => '',
'label' => __('SMNP'),
],
]
);
if (isset($config['filemanager']['message'])) { if (isset($config['filemanager']['message'])) {
echo $config['filemanager']['message']; echo $config['filemanager']['message'];

14
pandora_console/operation/snmpconsole/snmp_statistics.php
View File

@ -81,8 +81,8 @@ $statistics['text'] = '<a href="index.php?sec=estado&sec2=operation/snmpconsole/
).'</a>'; ).'</a>';
// Header // Header
ui_print_page_header( ui_print_standard_header(
__('SNMP Console'), __('SNMP Statistics'),
'images/op_snmp.png', 'images/op_snmp.png',
false, false,
'', '',
@ -91,6 +91,16 @@ ui_print_page_header(
$fullscreen, $fullscreen,
$list, $list,
$statistics, $statistics,
],
[
[
'link' => '',
'label' => __('Monitoring'),
],
[
'link' => '',
'label' => __('SNMP'),
],
] ]
); );

28
pandora_console/operation/snmpconsole/snmp_view.php
View File

@ -676,8 +676,8 @@ $trapcount = (int) db_get_value_sql($sql_count);
// No traps. // No traps.
if (empty($traps)) { if (empty($traps)) {
// Header. // Header
ui_print_page_header( ui_print_standard_header(
__('SNMP Console'), __('SNMP Console'),
'images/op_snmp.png', 'images/op_snmp.png',
false, false,
@ -686,6 +686,16 @@ if (empty($traps)) {
[ [
$list, $list,
$statistics, $statistics,
],
[
[
'link' => '',
'label' => __('Monitoring'),
],
[
'link' => '',
'label' => __('SNMP'),
],
] ]
); );
@ -774,8 +784,8 @@ if (empty($traps)) {
ui_require_javascript_file('wz_jsgraphics'); ui_require_javascript_file('wz_jsgraphics');
ui_require_javascript_file('pandora_visual_console'); ui_require_javascript_file('pandora_visual_console');
} else { } else {
// Header. // Header
ui_print_page_header( ui_print_standard_header(
__('SNMP Console'), __('SNMP Console'),
'images/op_snmp.png', 'images/op_snmp.png',
false, false,
@ -785,6 +795,16 @@ if (empty($traps)) {
$fullscreen, $fullscreen,
$list, $list,
$statistics, $statistics,
],
[
[
'link' => '',
'label' => __('Monitoring'),
],
[
'link' => '',
'label' => __('SNMP'),
],
] ]
); );
} }

23
pandora_console/operation/tree.php
View File

@ -147,12 +147,29 @@ switch ($tab) {
break; break;
} }
if (!is_metaconsole()) { if (is_metaconsole() === false) {
if (!$strict_acl) { if (!$strict_acl) {
$header_title = $header_title.' - '.$header_sub_title; $header_title = $header_title.' &raquo; '.$header_sub_title;
} }
ui_print_page_header($header_title, 'images/extensions.png', false, 'tree_view', false, $tabs); ui_print_standard_header(
$header_title,
'images/extensions.png',
false,
'tree_view',
false,
$tabs,
[
[
'link' => '',
'label' => __('Monitoring'),
],
[
'link' => '',
'label' => __('View'),
],
]
);
} }
// ---------------------Tabs ------------------------------------------- // ---------------------Tabs -------------------------------------------

6
pandora_console/operation/users/user_edit.php
View File

@ -1,9 +1,8 @@
<?php <?php
/** /**
* Extension to manage a list of gateways and the node address where they should * User edition.
* point to.
* *
* @category Extensions * @category Operation
* @package Pandora FMS * @package Pandora FMS
* @subpackage Community * @subpackage Community
* @version 1.0.0 * @version 1.0.0
@ -29,6 +28,7 @@
global $config; global $config;
$headerTitle = __('User detail editor');
// Load the header. // Load the header.
require $config['homedir'].'/operation/users/user_edit_header.php'; require $config['homedir'].'/operation/users/user_edit_header.php';

20
pandora_console/operation/users/user_edit_header.php
View File

@ -113,17 +113,23 @@ if (is_metaconsole()) {
$tab_name = 'User Notifications'; $tab_name = 'User Notifications';
} }
ui_print_page_header( // Header.
__('User detail editor'), ui_print_standard_header(
$headerTitle,
'images/user.png', 'images/user.png',
false, false,
$helpers, $helpers,
false, false,
$buttons, $buttons,
false, [
'', [
GENERIC_SIZE_TEXT, 'link' => '',
'', 'label' => __('Workspace'),
__('Workspace').ui_print_breadcrums($tab_name) ],
[
'link' => '',
'label' => __('Edit user'),
],
]
); );
} }

1
pandora_console/operation/users/user_edit_notifications.php
View File

@ -33,6 +33,7 @@ global $config;
require_once $config['homedir'].'/include/functions_notifications.php'; require_once $config['homedir'].'/include/functions_notifications.php';
// Load the header. // Load the header.
$headerTitle = __('User notifications');
require $config['homedir'].'/operation/users/user_edit_header.php'; require $config['homedir'].'/operation/users/user_edit_header.php';
if (get_parameter('change_label', 0)) { if (get_parameter('change_label', 0)) {

20
pandora_console/operation/visual_console/view.php
View File

@ -198,7 +198,7 @@ $options['view']['text'] = '<a href="index.php?sec=network&sec2=operation/visual
).'</a>'; ).'</a>';
$options['view']['active'] = true; $options['view']['active'] = true;
if (!is_metaconsole()) { if (is_metaconsole() === false) {
if (!$config['pure']) { if (!$config['pure']) {
$options['pure']['text'] = '<a href="index.php?sec=network&sec2=operation/visual_console/render_view&id='.$visualConsoleId.'&pure=1&refr='.$refr.'">'.html_print_image( $options['pure']['text'] = '<a href="index.php?sec=network&sec2=operation/visual_console/render_view&id='.$visualConsoleId.'&pure=1&refr='.$refr.'">'.html_print_image(
'images/full_screen.png', 'images/full_screen.png',
@ -208,13 +208,25 @@ if (!is_metaconsole()) {
'class' => 'invert_filter', 'class' => 'invert_filter',
] ]
).'</a>'; ).'</a>';
ui_print_page_header(
// Header.
ui_print_standard_header(
$visualConsoleName, $visualConsoleName,
'images/visual_console.png', 'images/visual_console.png',
false, false,
'visual_console_view', 'visual_console_view',
false, false,
$options $options,
[
[
'link' => '',
'label' => __('Topology maps'),
],
[
'link' => '',
'label' => __('Visual console'),
],
]
); );
} }
@ -465,7 +477,7 @@ if ($pure === true) {
// Check groups can access user. // Check groups can access user.
$aclUserGroups = []; $aclUserGroups = [];
if (!users_can_manage_group_all('AR')) { if (users_can_manage_group_all('AR') === false) {
$aclUserGroups = array_keys(users_get_groups(false, 'AR')); $aclUserGroups = array_keys(users_get_groups(false, 'AR'));
} }

2
pandora_console/pandora_console.redhat.spec
View File

@ -3,7 +3,7 @@
# #
%define name pandorafms_console %define name pandorafms_console
%define version 7.0NG.754 %define version 7.0NG.754
%define release 210527 %define release 210601
# User and Group under which Apache is running # User and Group under which Apache is running
%define httpd_name httpd %define httpd_name httpd

2
pandora_console/pandora_console.rhel7.spec
View File

@ -3,7 +3,7 @@
# #
%define name pandorafms_console %define name pandorafms_console
%define version 7.0NG.754 %define version 7.0NG.754
%define release 210527 %define release 210601
# User and Group under which Apache is running # User and Group under which Apache is running
%define httpd_name httpd %define httpd_name httpd

2
pandora_console/pandora_console.spec
View File

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

2
pandora_server/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-server package: pandorafms-server
Version: 7.0NG.754-210527 Version: 7.0NG.754-210601
Architecture: all Architecture: all
Priority: optional Priority: optional
Section: admin Section: admin

2
pandora_server/DEBIAN/make_deb_package.sh
View File

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

2
pandora_server/lib/PandoraFMS/Config.pm
View File

@ -45,7 +45,7 @@ our @EXPORT = qw(
# version: Defines actual version of Pandora Server for this module only # version: Defines actual version of Pandora Server for this module only
my $pandora_version = "7.0NG.754"; my $pandora_version = "7.0NG.754";
my $pandora_build = "210527"; my $pandora_build = "210601";
our $VERSION = $pandora_version." ".$pandora_build; our $VERSION = $pandora_version." ".$pandora_build;
# Setup hash # Setup hash

2
pandora_server/lib/PandoraFMS/PluginTools.pm
View File

@ -34,7 +34,7 @@ our @ISA = qw(Exporter);
# version: Defines actual version of Pandora Server for this module only # version: Defines actual version of Pandora Server for this module only
my $pandora_version = "7.0NG.754"; my $pandora_version = "7.0NG.754";
my $pandora_build = "210527"; my $pandora_build = "210601";
our $VERSION = $pandora_version." ".$pandora_build; our $VERSION = $pandora_version." ".$pandora_build;
our %EXPORT_TAGS = ( 'all' => [ qw() ] ); our %EXPORT_TAGS = ( 'all' => [ qw() ] );

2
pandora_server/pandora_server.redhat.spec
View File

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

2
pandora_server/pandora_server.spec
View File

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

2
pandora_server/pandora_server_installer
View File

@ -9,7 +9,7 @@
# ********************************************************************** # **********************************************************************
PI_VERSION="7.0NG.754" PI_VERSION="7.0NG.754"
PI_BUILD="210527" PI_BUILD="210601"
MODE=$1 MODE=$1
if [ $# -gt 1 ]; then if [ $# -gt 1 ]; then

2
pandora_server/util/pandora_db.pl
View File

@ -35,7 +35,7 @@ use PandoraFMS::Config;
use PandoraFMS::DB; use PandoraFMS::DB;
# version: define current version # version: define current version
my $version = "7.0NG.754 Build 210527"; my $version = "7.0NG.754 Build 210601";
# Pandora server configuration # Pandora server configuration
my %conf; my %conf;

2
pandora_server/util/pandora_manage.pl
View File

@ -36,7 +36,7 @@ use Encode::Locale;
Encode::Locale::decode_argv; Encode::Locale::decode_argv;
# version: define current version # version: define current version
my $version = "7.0NG.754 Build 210527"; my $version = "7.0NG.754 Build 210601";
# save program name for logging # save program name for logging
my $progname = basename($0); my $progname = basename($0);