Merge branch 'develop' into ent-639-add-user-defined-timezones

This commit is contained in:
Alejandro Gallardo Escobar 2018-06-11 17:42:02 +02:00
commit f6184b52da
407 changed files with 42263 additions and 22858 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -1,5 +1,5 @@
package: pandorafms-agent-unix
Version: 7.0NG.722-180522
Version: 7.0NG.723-180610
Architecture: all
Priority: optional
Section: admin

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -41,8 +41,8 @@ my $Sem = undef;
# Semaphore used to control the number of threads
my $ThreadSem = undef;
use constant AGENT_VERSION => '7.0NG.722';
use constant AGENT_BUILD => '180522';
use constant AGENT_VERSION => '7.0NG.723';
use constant AGENT_BUILD => '180610';
# Agent log default file size maximum and instances
use constant DEFAULT_MAX_LOG_SIZE => 600000;

View File

@ -2,8 +2,8 @@
#Pandora FMS Linux Agent
#
%define name pandorafms_agent_unix
%define version 7.0NG.722
%define release 180522
%define version 7.0NG.723
%define release 180610
Summary: Pandora FMS Linux agent, PERL version
Name: %{name}

View File

@ -2,8 +2,8 @@
#Pandora FMS Linux Agent
#
%define name pandorafms_agent_unix
%define version 7.0NG.722
%define release 180522
%define version 7.0NG.723
%define release 180610
Summary: Pandora FMS Linux agent, PERL version
Name: %{name}

View File

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

View File

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

View File

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

View File

@ -30,7 +30,7 @@ using namespace Pandora;
using namespace Pandora_Strutils;
#define PATH_SIZE _MAX_PATH+1
#define PANDORA_VERSION ("7.0NG.722(Build 180522)")
#define PANDORA_VERSION ("7.0NG.723(Build 180610)")
string pandora_path;
string pandora_dir;

View File

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

View File

@ -1,5 +1,5 @@
package: pandorafms-console
Version: 7.0NG.722-180522
Version: 7.0NG.723-180610
Architecture: all
Priority: optional
Section: admin

View File

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

View File

@ -49,7 +49,7 @@ if (isset ($_GET["loginhash"])) {
$public_hash = get_parameter('hash', false);
// Check user
if ($public_hash === false) {
if ($public_hash == false) {
check_login();
} else {
enterprise_include_once('include/functions_dashboard.php');

View File

@ -101,7 +101,7 @@ function extension_api_checker() {
$table->data[] = $row;
$row = array();
$row[] = __("Pandora Console URL");
$row[] = __("%s Console URL", get_product_name());
$row[] = html_print_input_text('pandora_url', $pandora_url, '', 50, 255, true);
$table->data[] = $row;

View File

@ -180,10 +180,10 @@ function extension_db_check_tables_differences($connection_test,
$diff_tables = array_diff($tables_test, $tables_system);
ui_print_result_message(
empty($diff_tables),
__('Successful the DB Pandora has all tables'),
__('Pandora DB could not retrieve all tables. The missing tables are (%s)',
implode(", ", $diff_tables)));
!empty($diff_tables),
__('Success! %s DB contains all tables', get_product_name()),
__('%s DB could not retrieve all tables. The missing tables are (%s)',
get_product_name(), implode(", ", $diff_tables)));
if (!empty($diff_tables)) {
foreach ($diff_tables as $table) {

View File

@ -134,7 +134,13 @@ function dbmgr_extension_main () {
ui_print_page_header (__('Database interface'), "images/gm_db.png", false, false, true);
echo '<div class="notify">';
echo "This is an advanced extension to interface with Pandora FMS database directly from WEB console using native SQL sentences. Please note that <b>you can damage</b> your Pandora FMS installation if you don't know </b>exactly</b> what are you are doing, this means that you can severily damage your setup using this extension. This extension is intended to be used <b>only by experienced users</b> with a depth knowledge of Pandora FMS internals.";
echo __("This is an advanced extension to interface with %s database directly from WEB console
using native SQL sentences. Please note that <b>you can damage</b> your %s installation
if you don't know </b>exactly</b> what are you are doing,
this means that you can severily damage your setup using this extension.
This extension is intended to be used <b>only by experienced users</b>
with a depth knowledge of %s internals.",
get_product_name(), get_product_name(), get_product_name());
echo '</div>';
echo "<br />";

View File

@ -173,11 +173,11 @@ function mainInsertData() {
$table->data[1][0] = __('Module');
$modules = array ();
if ($id_agente){
$modules = agents_get_modules ($id_agente, false, array("delete_pending" => 0));
if ($agent_id){
$modules = agents_get_modules ($agent_id, false, array("delete_pending" => 0));
}
$table->data[1][1] = html_print_select ($modules, 'id_agent_module', $id_agent_module, true,
__('Select'), 0, true, false, true, '', ($id_agente === ''));
__('Select'), 0, true, false, true, '', empty($agent_id));
$table->data[2][0] = __('Data');
$table->data[2][1] = html_print_input_text('data', $data, __('Data'), 40, 60, true);
$table->data[3][0] = __('Date');

View File

@ -313,23 +313,23 @@ function godmode_net_tools() {
$table->data = array();
$table->data[0][0] = __("Traceroute path");
$table->data[0][0] .= ui_print_help_tip(__('If it is empty, Pandora searchs the traceroute system.'), true);
$table->data[0][0] .= ui_print_help_tip(__('If empty, %s will search the traceroute system.', get_product_name()), true);
$table->data[0][1] = html_print_input_text('traceroute_path', $traceroute_path, '', 40, 255, true);
$table->data[1][0] = __("Ping path");
$table->data[1][0] .= ui_print_help_tip(__('If it is empty, Pandora searchs the ping system.'), true);
$table->data[1][0] .= ui_print_help_tip(__('If empty, %s will search the ping system.', get_product_name()), true);
$table->data[1][1] = html_print_input_text('ping_path', $ping_path, '', 40, 255, true);
$table->data[2][0] = __("Nmap path");
$table->data[2][0] .= ui_print_help_tip(__('If it is empty, Pandora searchs the nmap system.'), true);
$table->data[2][0] .= ui_print_help_tip(__('If empty, %s will search the nmap system.', get_product_name()), true);
$table->data[2][1] = html_print_input_text('nmap_path', $nmap_path, '', 40, 255, true);
$table->data[3][0] = __("Dig path");
$table->data[3][0] .= ui_print_help_tip(__('If it is empty, Pandora searchs the dig system.'), true);
$table->data[3][0] .= ui_print_help_tip(__('If empty, %s will search the dig system', get_product_name()), true);
$table->data[3][1] = html_print_input_text('dig_path', $dig_path, '', 40, 255, true);
$table->data[4][0] = __("Snmpget path");
$table->data[4][0] .= ui_print_help_tip(__('If it is empty, Pandora searchs the snmpget system.'), true);
$table->data[4][0] .= ui_print_help_tip(__('If empty, %s will search the snmpget system.', get_product_name()), true);
$table->data[4][1] = html_print_input_text('snmpget_path', $snmpget_path, '', 40, 255, true);
echo '<form id="form_setup" method="post" >';

View File

@ -69,7 +69,7 @@ function pandoralogs_extension_main () {
ui_print_page_header (__("System logfile viewer"), "images/extensions.png", false, "", true, "" );
echo "<p>" . __('Use this tool to view your Pandora FMS logfiles directly on the console') . "</p>";
echo "<p>" . __('Use this tool to view your %s logfiles directly on the console', get_product_name()) . "</p>";
echo "<p>" . __('You can choose the amount of information shown in general setup (Log size limit in system logs viewer extension), ' . $config['max_log_size'] * 1000 . 'B at the moment') . "</p>";

View File

@ -16,6 +16,8 @@
function pluginreg_extension_main () {
global $config;
check_login();
if (! check_acl ($config['id_user'], 0, "PM") && ! is_user_admin ($config['id_user'])) {
db_pandora_audit("ACL Violation", "Trying to access Setup Management");
@ -31,10 +33,10 @@ function pluginreg_extension_main () {
echo '</div>';
echo '<div class="text_task">';
echo '<h3>' . __("Plugin registration") . '</h3>';
echo '<p id="description_task">' .
__("This extension makes registration of server plugins more easy.
Here you can upload a server plugin in Pandora FMS 3.x zipped format (.pspz).
Please refer to documentation on how to obtain and use Pandora FMS Server Plugins.
echo '<p id="description_task">' .
__("This extension makes registering server plugins an easier task.
Here you can upload a server plugin in .pspz zipped format.
Please refer to the official documentation on how to obtain and use Server Plugins.
<br><br>You can get more plugins in our <a href='http://pandorafms.com/Library/Library/'>Public Resource Library</a> ") . '</p>';
// Upload form
echo "<form name='submit_plugin' method='post' enctype='multipart/form-data'>";

View File

@ -39,14 +39,40 @@ function pandora_realtime_graphs () {
$legend = '';
$long_index = array();
$no_data_image = '';
$canvas = '<div id="graph_container">';
$canvas .= '<div id="chartLegend"></div>';
$canvas .= area_graph($interactive_graph, $chart, 800, 300, $color, $legend, $long_index, $no_data_image, "", "", "",
"", '', '', '', 1, array(), array(), 0, 0, '', false, '', false);
$width = 800;
$height = 300;
$data_array['realtime']['data'][0][0] = time() - 10;
$data_array['realtime']['data'][0][1] = 0;
$data_array['realtime']['data'][1][0] = time();
$data_array['realtime']['data'][1][1] = 0;
$data_array['realtime']['color'] = 'green';
$params =array(
'agent_module_id' => false,
'period' => 300,
'width' => $width,
'height' => $height,
'unit' => $unit,
'only_image' => $only_image,
'homeurl' => $homeurl,
'type_graph' => 'area',
'font' => $config['fontpath'],
'font-size' => $config['font_size'],
'array_data_create' => $data_array,
'show_legend' => false,
'show_menu' => false
);
$canvas .= grafico_modulo_sparse($params);
$canvas .= '</div>';
echo $canvas;
$table->width = '100%';
$table->id = 'table-form';
$table->class = 'databox filters';
@ -62,27 +88,27 @@ function pandora_realtime_graphs () {
$table->style['snmp_oid'] = 'font-weight: bold;';
$table->style['snmp_oid'] = 'font-weight: bold;';
$table->data = array ();
$graph_fields['cpu_load'] = __('Pandora Server CPU');
$graph_fields['pending_packets'] = __('Pandora Server Pending packets');
$graph_fields['disk_io_wait'] = __('Pandora Server Disk IO Wait');
$graph_fields['apache_load'] = __('Pandora Server Apache load');
$graph_fields['mysql_load'] = __('Pandora Server MySQL load');
$graph_fields['server_load'] = __('Pandora Server load');
$graph_fields['cpu_load'] = __('%s Server CPU', get_product_name());
$graph_fields['pending_packets'] = __('Pending packages from %s Server', get_product_name());
$graph_fields['disk_io_wait'] = __('%s Server Disk IO Wait', get_product_name());
$graph_fields['apache_load'] = __('%s Server Apache load', get_product_name());
$graph_fields['mysql_load'] = __('%s Server MySQL load', get_product_name());
$graph_fields['server_load'] = __('%s Server load', get_product_name());
$graph_fields['snmp_interface'] = __('SNMP Interface throughput');
$graph = get_parameter('graph', 'cpu_load');
$refresh = get_parameter('refresh', '1000');
if ($graph != 'snmp_module') {
$data['graph'] = __('Graph') . '&nbsp;&nbsp;' . html_print_select ($graph_fields, 'graph', $graph, '', '', 0, true);
}
$refresh_fields[1000] = human_time_description_raw(1, true, 'large');
$refresh_fields[5000] = human_time_description_raw(5, true, 'large');
$refresh_fields[1000] = human_time_description_raw(1, true, 'large');
$refresh_fields[5000] = human_time_description_raw(5, true, 'large');
$refresh_fields[10000] = human_time_description_raw(10, true, 'large');
$refresh_fields[30000] = human_time_description_raw(30, true, 'large');
if ($graph == 'snmp_module') {
$agent_alias = get_parameter('agent_alias', '');
$module_name = get_parameter('module_name', '');
@ -109,7 +135,7 @@ function pandora_realtime_graphs () {
$snmp_ver = get_parameter('snmp_ver', '');
$data = array();
$data['snmp_address'] = __('Target IP') . '&nbsp;&nbsp;' . html_print_input_text ('ip_target', $snmp_address, '', 50, 255, true);
$table->colspan[1]['snmp_address'] = 2;
@ -122,7 +148,7 @@ function pandora_realtime_graphs () {
$snmp_versions['1'] = '1';
$snmp_versions['2'] = '2';
$snmp_versions['2c'] = '2c';
$data = array();
$data['snmp_oid'] = __('OID') . '&nbsp;&nbsp;' . html_print_input_text ('snmp_oid', $snmp_oid, '', 100, 255, true);
$table->colspan[2]['snmp_oid'] = 2;
@ -140,7 +166,7 @@ function pandora_realtime_graphs () {
}
snmp_browser_print_container (false, '100%', '60%', 'none');
}
// Print the relative path to AJAX calls:
html_print_input_hidden('rel_path', get_parameter('rel_path', ''));
@ -148,7 +174,7 @@ function pandora_realtime_graphs () {
echo '<form id="realgraph" method="post">';
html_print_table($table);
echo '</form>';
// Define a custom action to save the OID selected in the SNMP browser to the form
html_print_input_hidden ('custom_action', urlencode (base64_encode('&nbsp;<a href="javascript:setOID()"><img src="' . ui_get_full_url("images") . '/input_filter.disabled.png" title="' . __("Use this OID") . '" style="vertical-align: middle;"></img></a>')), false);
html_print_input_hidden ('incremental_base', '0');
@ -156,7 +182,7 @@ function pandora_realtime_graphs () {
echo '<script type="text/javascript" src="'.ui_get_full_url("extensions/realtime_graphs/realtime_graphs.js").'"></script>';
echo '<script type="text/javascript" src="'.ui_get_full_url("include/javascript/pandora_snmp_browser.js").'"></script>';
echo '<link rel="stylesheet" type="text/css" href="'.ui_get_full_url("extensions/realtime_graphs/realtime_graphs.css").'"></style>';
// Store servers timezone offset to be retrieved from js
set_js_value('timezone_offset', date('Z', time()));
}

View File

@ -247,12 +247,10 @@ function output_xml_visual_console($id) {
echo "<other_id>" . $item['id'] . "</other_id>\n"; //OLD ID USE FOR parent item
$agent = '';
if ($item['id_agent'] != 0) {
$agent = db_get_value ("alias","tagente","id_agente",$item['id_agent']);
$agent = db_get_value ("nombre","tagente","id_agente",$item['id_agent']);
}
if (!empty($item['label'])) {
$aux = explode("-",$item['label']);
$label = $agent .' -'. $aux[1];
echo "<label><![CDATA[" . io_safe_output($label) . "]]></label>\n";
echo "<label><![CDATA[" . io_safe_output($item['label']) . "]]></label>\n";
}
echo "<x>" . $item['pos_x'] . "</x>\n";
echo "<y>" . $item['pos_y'] . "</y>\n";
@ -273,7 +271,7 @@ function output_xml_visual_console($id) {
if ($item['id_agente_modulo'] != 0) {
$module = db_get_value('nombre', 'tagente_modulo', 'id_agente_modulo', $item['id_agente_modulo']);
$id_agent = db_get_value('id_agente', 'tagente_modulo', 'id_agente_modulo', $item['id_agente_modulo']);
$agent = db_get_value ("alias","tagente","id_agente",$id_agent);
$agent = db_get_value ("nombre","tagente","id_agente",$id_agent);
echo "<module><![CDATA[" . io_safe_output($module) . "]]></module>\n";
}
@ -287,6 +285,27 @@ function output_xml_visual_console($id) {
if ($item['parent_item'] != 0) {
echo "<parent_item>" . $item['parent_item'] . "</parent_item>\n";
}
if (!empty($item['clock_animation'])) {
echo "<clock_animation>" . $item['clock_animation'] . "</clock_animation>\n";
}
if (!empty($item['fill_color'])) {
echo "<fill_color>" . $item['fill_color'] . "</fill_color>\n";
}
if (!empty($item['type_graph'])) {
echo "<type_graph>" . $item['type_graph'] . "</type_graph>\n";
}
if (!empty($item['time_format'])) {
echo "<time_format>" . $item['time_format'] . "</time_format>\n";
}
if (!empty($item['timezone'])) {
echo "<timezone>" . $item['timezone'] . "</timezone>\n";
}
if (!empty($item['border_width'])) {
echo "<border_width>" . $item['border_width'] . "</border_width>\n";
}
if (!empty($item['border_color'])) {
echo "<border_color>" . $item['border_color'] . "</border_color>\n";
}
echo "</item>\n";
}
echo "</visual_map>\n";
@ -338,8 +357,9 @@ function resource_exportation_extension_main() {
ui_print_page_header (__('Resource exportation'), "images/extensions.png", false, "", true, "" );
echo "<div class=notify>";
echo __("This extension makes exportation of resource template more easy. " .
"Here you can export as a resource template in Pandora FMS 3.x format (.ptr). ");
echo __("This extension makes exportation of resource template more easy.") .
" " .
__("You can export resource templates in .ptr format.");
echo "</div>";
echo "<br /><br />";

View File

@ -455,13 +455,13 @@ function process_upload_xml_visualmap($xml, $filter_group = 0) {
$agents_in_item = array();
foreach ($agents as $id => $agent) {
if ($regular_expresion) {
if ((bool)preg_match("/" . $agent_clean . "/", io_safe_input($agent))) {
if ((bool)preg_match("/" . $agent_clean . "/", io_safe_output($agent))) {
$agents_in_item[$id]['name'] = $agent;
$no_agents = false;
}
}
else {
if ($agent_clean == io_safe_input($agent)) {
if ($agent_clean == io_safe_output($agent)) {
$agents_in_item[$id]['name'] = $agent;
$no_agents = false;
break;
@ -482,13 +482,13 @@ function process_upload_xml_visualmap($xml, $filter_group = 0) {
$modules_in_item = array();
foreach ($modules as $module) {
if ($regular_expresion) {
if ((bool)preg_match("/" . $module_clean . "/", io_safe_input($module['nombre']))) {
if ((bool)preg_match("/" . $module_clean . "/", io_safe_output($module['nombre']))) {
$modules_in_item[$module['id_agente_modulo']] = $module['nombre'];
$no_modules = false;
}
}
else {
if ($module_clean == io_safe_input($module['nombre'])) {
if ($module_clean == io_safe_output($module['nombre'])) {
$modules_in_item[$module['id_agente_modulo']] = $module['nombre'];
$no_modules = false;
break;
@ -527,6 +527,34 @@ function process_upload_xml_visualmap($xml, $filter_group = 0) {
$values['id_layout_linked'] = (string)$item->map_linked;
if (isset($item->type))
$values['type'] = (string)$item->type;
if (isset($item->clock_animation)) {
$values['clock_animation'] = (string)$item->clock_animation;
}
if (isset($item->fill_color)) {
$values['fill_color'] = (string)$item->fill_color;
}
if (isset($item->type_graph)) {
$values['type_graph'] = (string)$item->type_graph;
}
if (isset($item->time_format)) {
$values['time_format'] = (string)$item->time_format;
}
if (isset($item->timezone)) {
$values['timezone'] = (string)$item->timezone;
}
if (isset($item->border_width)) {
$values['border_width'] = (string)$item->border_width;
}
if (isset($item->border_color)) {
$values['border_color'] = (string)$item->border_color;
}
if ($no_agents) {
$id_item = db_process_sql_insert('tlayout_data', $values);
@ -855,11 +883,12 @@ function resource_registration_extension_main() {
}
echo "<div class=notify>";
printf(__("This extension makes registration of resource template more easy. " .
"Here you can upload a resource template in Pandora FMS 3.x format (.ptr). " .
"Please refer to documentation on how to obtain and use Pandora FMS resources. " .
"<br><br>You can get more resurces in our <a href='%s'>Public Resource Library</a>") ,
"http://pandorafms.org/index.php?sec=community&sec2=repository&lng=en");
echo __("This extension makes registering resource templates easier.") . " " .
__("Here you can upload a resource template in .ptr format.") . " " .
__("Please refer to our documentation for more information on how to obtain and use %s resources.", get_product_name()) . " " .
"<br> <br>" .
__("You can get more resurces in our <a href='http://pandorafms.com/Library/Library/'>Public Resource Library</a>")
;
echo "</div>";
echo "<br /><br />";

View File

@ -0,0 +1,9 @@
START TRANSACTION;
INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_docs_logo', 'default_docs.png');
INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_support_logo', 'default_support.png');
INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_logo_white_bg_preview', 'pandora_logo_head_white_bg.png');
UPDATE talert_actions SET name='Monitoring&#x20;Event' WHERE name='Pandora&#x20;FMS&#x20;Event';
COMMIT;

View File

@ -1123,6 +1123,7 @@ UPDATE talert_actions SET `field4` = 'integria',
`field9` = 'admin',
`field10` = '_alert_description_'
WHERE `id` = 4 AND `id_alert_command` = 11;
UPDATE talert_actions SET name='Monitoring&#x20;Event' WHERE name='Pandora&#x20;FMS&#x20;Event';
ALTER TABLE talert_actions ADD COLUMN `field11` TEXT NOT NULL DEFAULT "";
ALTER TABLE talert_actions ADD COLUMN `field12` TEXT NOT NULL DEFAULT "";
ALTER TABLE talert_actions ADD COLUMN `field13` TEXT NOT NULL DEFAULT "";
@ -1159,10 +1160,13 @@ ALTER TABLE titem MODIFY `source_data` int(10) unsigned;
INSERT INTO `tconfig` (`token`, `value`) VALUES ('big_operation_step_datos_purge', '100');
INSERT INTO `tconfig` (`token`, `value`) VALUES ('small_operation_step_datos_purge', '1000');
INSERT INTO `tconfig` (`token`, `value`) VALUES ('days_autodisable_deletion', '30');
INSERT INTO `tconfig` (`token`, `value`) VALUES ('MR', 13);
INSERT INTO `tconfig` (`token`, `value`) VALUES ('MR', 16);
INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_docs_logo', 'default_docs.png');
INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_support_logo', 'default_support.png');
INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_logo_white_bg_preview', 'pandora_logo_head_white_bg.png');
UPDATE tconfig SET value = 'https://licensing.artica.es/pandoraupdate7/server.php' WHERE token='url_update_manager';
DELETE FROM `tconfig` WHERE `token` = 'current_package_enterprise';
INSERT INTO `tconfig` (`token`, `value`) VALUES ('current_package_enterprise', '720');
INSERT INTO `tconfig` (`token`, `value`) VALUES ('current_package_enterprise', '723');
-- ---------------------------------------------------------------------
-- Table `tconfig_os`

View File

@ -93,15 +93,17 @@ switch ($tipo) {
case "helpmodal":
echo __("This is the online help for Pandora FMS console. This help is -in best cases- just a brief contextual help, not intented to teach you how to use Pandora FMS. Official documentation of Pandora FMS is about 900 pages, and you probably don't need to read it entirely, but sure, you should download it and take a look.<br><br>
<a href='https://pandorafms.org/en/docs/monitoring-documentation/' target='_blanck' style='color: #82b92e; font-size: 10pt; text-decoration: underline;'>Download the official documentation</a>");
echo __("This is the online help for %s console. This help is -in best cases- just a brief contextual help, not intented to teach you how to use %s. Official documentation of %s is about 900 pages, and you probably don't need to read it entirely, but sure, you should download it and take a look.<br><br>
<a href='%s' target='_blanck' style='color: #82b92e; font-size: 10pt; text-decoration: underline;'>Download the official documentation</a>",
get_product_name(), get_product_name(), get_product_name(), $config['custom_docs_url']);
break;
case "noaccess":
echo __('Access to this page is restricted to authorized users only, please contact system administrator if you need assistance. <br/> <br/>
Please know that all attempts to access this page are recorded in security logs of Pandora System Database');
echo __('Access to this page is restricted to authorized users only, please contact system administrator if you need assistance. <br> <br>
Please know that all attempts to access this page are recorded in security logs of %s System Database.',
get_product_name());
break;
@ -111,13 +113,13 @@ switch ($tipo) {
echo
'<p>' .
__('The Update Manager client is included on Pandora FMS. It helps system administrators update their Pandora FMS automatically, since the Update Manager retrieves new modules, new plugins and new features (even full migrations tools for future versions) automatically.') .
__('The Update Manager client is included on %s. It helps system administrators update their %s automatically, since the Update Manager retrieves new modules, new plugins and new features (even full migrations tools for future versions) automatically.', get_product_name(), get_product_name()) .
'</p>' .
'<p>' .
__('<b>OpenSource version updates are automated packages generated each week. These updates come WITHOUT ANY warranty or support. If your system is corrupted or a feature stops working properly, you will need to recover a backup by yourself.</b>') .
'</p>' .
'<p>' .
__('The Enterprise version comes with a different update system, with fully tested, professionally-supported packages, and our support team is there to help you in case of problems or queries. Update Manager is another feature present in the Enterprise version and not included in the OpenSource version. There are lots of advanced business-oriented features contained in Pandora FMS Enterprise Edition. For more information visit <a href="http://pandorafms.com">pandorafms.com</a>') .
__('The Enterprise version comes with a different update system, with fully tested, professionally-supported packages, and our support team is there to help you in case of problems or queries. Update Manager is another feature present in the Enterprise version and not included in the OpenSource version. There are lots of advanced business-oriented features contained in %s Enterprise Edition. For more information visit <a href="http://pandorafms.com">pandorafms.com</a>', get_product_name()) .
'</p>'
;
@ -125,13 +127,13 @@ switch ($tipo) {
echo
'<p>' .
__('The new <a href="http://updatemanager.sourceforge.net">Update Manager</a> client is shipped with Pandora FMS It helps system administrators to update their Pandora FMS automatically, since the Update Manager does the task of getting new modules, new plugins and new features (even full migrations tools for future versions) automatically.') .
__('The new <a href="http://updatemanager.sourceforge.net">Update Manager</a> client is included on %s. It helps system administrators update their %s automatically, since the Update Manager retrieves new modules, new plugins and new features (even full migrations tools for future versions) automatically.', get_product_name(), get_product_name()) .
'</p>' .
'<p>' .
__('Update Manager is one of the most advanced features of Pandora FMS Enterprise version, for more information visit <a href="http://pandorafms.com">http://pandorafms.com</a>.') .
__('The Update Manager is one of the most advanced features on the %s Enterprise Edition. For more information visit <a href="http://pandorafms.com">http://pandorafms.com</a>.', get_product_name()) .
'</p>' .
'<p>' .
__('Update Manager sends anonymous information about Pandora FMS usage (number of agents and modules running). To disable it, please remove the remote server address from the Update Manager plugin setup.') .
__('Update Manager sends anonymous information about %s usage (number of agents and modules running). To disable it, please remove the remote server address from the Update Manager plugin setup.', get_product_name()) .
'</p>'
;
}
@ -142,13 +144,13 @@ switch ($tipo) {
<br><br><img style='width:105px' src='".$config['homeurl']."images/logo_oracle.png'><img style='width:105px' src='".$config['homeurl']."images/logo_citrix.png'><img style='width:105px' src='".$config['homeurl']."images/logo_sap.png'><img style='width:105px' src='".$config['homeurl']."images/logo_exchange.png'><br><br><span style='font-style:italic;'>* Todos los logotipos pertenecen a marcas registradas</span>");
break;
case "massivemodal":
echo __("Do you want to consolidate all your system monitoring? Do you have many systems, making it difficult to manage them in a comprehensive manner? Would you like to deploy monitoring, alerts and even local plugins with a single click? Pandora FMS Enterprise Policies are exactly what you need; you'll save time, effort and annoyances. More information <a href='pandorafms.com'>pandorafms.com</a>");
echo __("Do you want to consolidate all your system monitoring? Do you have many systems, making it difficult to manage them in a comprehensive manner? Would you like to deploy monitoring, alerts and even local plugins with a single click? %s Enterprise Policies are exactly what you need; you'll save time, effort and annoyances. More information <a href='pandorafms.com'>pandorafms.com</a>", get_product_name());
break;
case "eventsmodal":
echo __("Pandora FMS Enterprise also features event correlation. Through correlation you can generate realtime alerts and / or new events based on logical rules. This allows you to automate troubleshooting. If you know the value of working with events, event correlation will take you to a new level.");
echo __("%s Enterprise also features event correlation. Through correlation you can generate realtime alerts and / or new events based on logical rules. This allows you to automate troubleshooting. If you know the value of working with events, event correlation will take you to a new level.", get_product_name());
break;
case "reportingmodal":
echo __("Report generating on the Enterprise version is also more powerful: it has wizards, you can schedule emails in PDF to be sent according to the schedule you decide, and it has a template system to create personalized reports quickly for each of your customers. It will even allow your customers to generate their own reports from templates created by you. If reports are key to your business, Pandora FMS Enterprise version is for you.");
echo __("Report generating on the Enterprise version is also more powerful: it has wizards, you can schedule emails in PDF to be sent according to the schedule you decide, and it has a template system to create personalized reports quickly for each of your customers. It will even allow your customers to generate their own reports from templates created by you. If reports are key to your business, %s Enterprise version is for you.", get_product_name());
break;
case "visualmodal":
echo __("These options are only effective on the Enterprise version.");

View File

@ -29,9 +29,10 @@ ui_print_info_message ( array('no_close'=>true, 'message'=> __('There are no cu
</div>
<div class="text_task">
<h3> <?php echo __('Create Custom Graph'); ?></h3>
<p id="description_task"> <?php echo __("Graphs are designed to show the data collected by Pandora FMS in a temporary scale defined by the user.
Pandora FMS Graphs display data in real time. They are generated every time the operator requires any of them and display the up-to-date state.
There are two types of graphs: The agent's automated graphs and the graphs the user customizes by using one or more modules to do so."); ?></p>
<p id="description_task"> <?php echo __("Graphs are designed to show the data collected by %s in a temporary scale defined by the user.
%s Graphs display data in real time. They are generated every time the operator requires any of them and display the up-to-date state.
There are two types of graphs: The agent's automated graphs and the graphs the user customizes by using one or more modules to do so.",
get_product_name(), get_product_name()); ?></p>
<form action="index.php?sec=reporting&sec2=godmode/reporting/graph_builder" method="post">
<input type="submit" class="button_task" value="<?php echo __('Create Custom Graph'); ?>" />
</form>

View File

@ -33,13 +33,13 @@ if ($incident_w || $incident_m) {
</div>
<div class="text_task">
<h3> <?php echo __('Create Incidents'); ?></h3>
<p id="description_task"> <?php echo __("Besides receiving and processing data to monitor systems or applications,
you're also required to monitor possible incidents which might take place on these systems within the system monitoring process.
For it, the Pandora FMS team has designed an incident manager within which any user is able to open incidents,
explaining what's happened on the network and to update them with comments and files any time in case there is a need to do so.
This system allows the users to work as a team, along with different roles and work-flow systems which allows an incident to be
moved from one group to another, and that members from different groups and different people could work on the same incident, sharing information and files.
"); ?></p>
<p id="description_task"> <?php echo __("Besides receiving and processing data to monitor systems or applications,
you're also required to monitor possible incidents which might take place on these subsystems within the system's monitoring process.
For it, the %s team has designed an incident manager from which any user is able to open incidents,
that explain what's happened on the network, and update them with comments and files, at any time, in case there is a need to do so.
This system allows users to work as a team, along with different roles and work-flow systems which allow an incident to be
moved from one group to another, and members from different groups and different people could work on the same incident, sharing information and files.
", get_product_name()); ?></p>
<form action="index.php?sec=workspace&amp;sec2=operation/incidents/incident_detail&amp;insert_form=1" method="post">
<input type="submit" class="button_task" value="<?php echo __('Create Incidents'); ?>" />
</form>

View File

@ -33,11 +33,15 @@ if ($vconsoles_write || $vconsoles_manage) {
</div>
<div class="text_task">
<h3> <?php echo __('Create Visual Console'); ?></h3>
<p id="description_task"> <?php echo __("Pandora FMS allows you to create visual maps in which each user is able to create his own monitoring map.
The new visual console editor is much more practical, although the old visual console editor had its advantages.
Within the new visual console, we've been successful in imitating the sensation and touch of a drawing application like GIMP.
We've also simplified the editor by dividing it into several subject-matter tabs named 'Data', 'Preview', 'Wizard', 'List of Elements' and 'Editor'.
The elements the Pandora FMS Visual Map was designed to handle are 'static image', 'percentage bar', 'module graph' and 'simple value'. "); ?></p>
<p id="description_task"> <?php echo __(
"%s allows users to create visual maps on which each user is able to create his or her " .
"own monitoring map. The new visual console editor is much more practical, although the prior " .
"visual console editor had its advantages. On the new visual console, we've been successful in " .
"imitating the sensation and touch of a drawing application like GIMP. We've also simplified the " .
"editor by dividing it into several subject-divided tabs named 'Data', 'Preview', 'Wizard', 'List of " .
"Elements' and 'Editor'. The items the %s Visual Map was designed to handle are " .
"'static images', 'percentage bars', 'module graphs' and 'simple values'.",
get_product_name(), get_product_name()); ?></p>
<form action="index.php?sec=network&amp;sec2=godmode/reporting/visual_console_builder" method="post">
<?php html_print_input_hidden ('edit_layout', 1); ?>
<input type="submit" class="button_task" value="<?php echo __('Create Visual Console'); ?>" />

View File

@ -26,10 +26,11 @@ ui_require_css_file ('firts_task');
</div>
<div class="text_task">
<h3> <?php echo __('Create Planned Downtime'); ?></h3>
<p id="description_task"> <?php echo __("Pandora FMS contains a scheduled downtime management system.
This system was designed to deactivate the alerts in the intervals whenever there is down time by deactivating the agent.
If an agent is deactivated, it doesn't collect information. In a down time, the down-time intervals aren't taken into
account for most of the metrics or types of reports, because the agents don't contain any data within those intervals. "); ?></p>
<p id="description_task"> <?php echo __("%s contains a scheduled downtime management system.
This system was designed to deactivate alerts during specific intervals whenever there is down time by deactivating the agent.
If an agent is deactivated, it doesn't gather information. During down time, down-time intervals aren't taken into
account for most metrics or report types, because agents don't contain any data within those intervals.",
get_product_name()); ?></p>
<form action="index.php?sec=estado&amp;sec2=godmode/agentes/planned_downtime.editor" method="post">
<input type="submit" class="button_task" value="<?php echo __('Create Planned Downtime'); ?>" />
</form>

View File

@ -26,9 +26,9 @@ ui_require_css_file ('firts_task');
</div>
<div class="text_task">
<h3> <?php echo __('Create Tags'); ?></h3>
<p id="description_task"> <?php echo __("From Pandora FMS versions 5 and above, the access to modules can be configured by a tags system.
Tags are configured on the system and be assigned to the chosen modules.
The user's access can be limited to modules with certain tags in this way. "); ?></p>
<p id="description_task"> <?php echo __("Access to modules can be configured by a tagging system.
Tags are configured on the system and are assigned to the chosen modules.
A user's access can therefore be restricted to modules with certain tags."); ?></p>
<form action="index.php?sec=gmodules&sec2=godmode/tag/edit_tag&action=new" method="post">
<input type="submit" class="button_task" value="<?php echo __('Create Tags'); ?>" />
</form>

View File

@ -45,11 +45,11 @@ else{
$build_package_version = $current_package;
}
echo sprintf(__('Pandora FMS %s - Build %s - MR %s', $pandora_version, $build_package_version, $config["MR"]));
echo sprintf(__('%s %s - Build %s - MR %s', get_product_name(), $pandora_version, $build_package_version, $config["MR"]));
echo '</a><br />';
echo '<a class="white footer">'. __('Page generated at') . ' '. date('F j, Y h:i a'); //Always use timestamp here
echo '</a><br /><span style="color:#eff">'.__("&reg; Ártica ST").'</span>';
echo '</a><br /><span style="color:#eff">&reg; '.get_copyright_notice().'</span>';
if (isset ($config['debug'])) {
$cache_info = array();

View File

@ -31,14 +31,14 @@ config_check();
$custom_logo = 'images/custom_logo/' . $config['custom_logo'];
if (!defined ('PANDORA_ENTERPRISE')) {
$logo_title = 'Pandora FMS Opensource';
$logo_title = get_product_name() . ' Opensource';
$custom_logo = 'images/custom_logo/pandora_logo_head_3.png';
}
else {
if (file_exists(ENTERPRISE_DIR . '/' . $custom_logo)) {
$custom_logo = ENTERPRISE_DIR . '/' . $custom_logo;
}
$logo_title = 'Pandora FMS Enterprise';
$logo_title = get_product_name() . ' Enterprise';
}
echo html_print_image($custom_logo, true,
@ -158,7 +158,7 @@ config_check();
</script>
<?php
if ($config['tutorial_mode'] !== 'expert') {
if ($config['tutorial_mode'] !== 'expert' && !$config['disable_help']) {
$table->data[0]['clippy'] =
'<a href="javascript: show_clippy();">' .
html_print_image(
@ -166,8 +166,8 @@ config_check();
true,
array("id" => 'clippy',
"class" => 'clippy',
"alt" => __('Pandora FMS assistant'),
'title' => __('Pandora FMS assistant'))) .
"alt" => __('%s assistant', get_product_name()),
'title' => __('%s assistant', get_product_name()))) .
'</a>';
}
@ -307,11 +307,15 @@ config_check();
$table->data[0][3] = $maintenance_img;
// Main help icon
$table->data[0][4] = '<a href="#" class="modalpopup" id="helpmodal">'.html_print_image("images/header_help.png",
true, array(
"title" => __('Main help'),
"id" => "helpmodal",
"class" => "modalpopup")).'</a>';
if (!$config['disable_help']) {
$table->data[0][4] =
'<a href="#" class="modalpopup" id="helpmodal">' .
html_print_image("images/header_help.png", true, array(
"title" => __('Main help'),
"id" => "helpmodal",
"class" => "modalpopup")) .
'</a>';
}
// Logout
$table->data[0][5] = '<a class="white" href="' . ui_get_full_url('index.php?bye=bye') . '">';

View File

@ -36,10 +36,11 @@ if (is_ajax()) {
// Prints help dialog information
echo '<div id="login_help_dialog" title="' .
__('Welcome to Pandora FMS') . '" style="">';
__('Welcome to %s', get_product_name()) . '" style="">';
echo '<div style="font-size: 10pt; margin: 20px;">';
echo __('If this is your first time with Pandora FMS, we propose you a few links to learn more about Pandora FMS. Monitoring could be overwhelm, but take your time to learn how to use the power of Pandora FMS!');
echo __("If this is your first time using %s, we suggest a few links that'll help you learn more about the software. Monitoring can be overwhelming, but take your time to learn how to harness the power of %s!",
get_product_name(), get_product_name());
echo '</div>';
echo '<div style="">';
@ -70,11 +71,11 @@ echo '<div id="login_help_dialog" title="' .
echo '</td>';
echo '<td style="border:1px solid #FFF; text-align:center;">';
echo '<a href="http://pandorafms.com/pandora/doc/en" target="_blank" style="text-decoration:none;">' .
echo '<a href="' . $config['custom_docs_url'] . '" target="_blank" style="text-decoration:none;">' .
html_print_image('images/documentation.png', true,
array("alt" => __('Documentation'), "border" => 0)) . '</a>';
echo '<br style="margin-bottom: 40px;" />';
echo '<a style="font-size: 9pt;" href="http://pandorafms.com/pandora/doc/en" target="_blank">' . __('Documentation') . '</span></a>';
echo '<a style="font-size: 9pt;" href="' . $config['custom_docs_url'] . '" target="_blank">' . __('Documentation') . '</span></a>';
echo '</td>';
echo '</tr>';
echo '</table>';

View File

@ -138,17 +138,17 @@ if ($email == 'admin@example.com') $email = '';
// Prints accept register license
echo '<div id="login_accept_register" title="' .
__('The Pandora FMS community wizard') . '" style="">';
__('The %s community wizard', get_product_name()) . '" style="">';
echo '<div style="margin: 5px 0 10px; float: left; padding-left: 15px;">';
echo html_print_image ('images/pandora_circle_big.png', true);
echo '</div>';
echo '<div style="font-size: 12pt; margin: 5px 20px; float: left; padding-top: 23px;">';
echo __('Stay up to date with the Pandora FMS community') . ".";
echo __('Stay up to date with the %s community', get_product_name()) . ".";
echo '</div>';
echo '<div id="license_newsletter">';
echo '<p>' . __("When you subscribe to the Pandora FMS Update Manager service, you accept that we register your Pandora instance as an identifier on the database owned by Artica TS. This data will solely be used to provide you with information about Pandora FMS and will not be conceded to third parties. You'll be able to unregister from said database at any time from the Update Manager options") . '.</p>';
echo '<p>' . __("In the same fashion, when subscribed to the newsletter you accept that your email will pass on to a database property of Artica TS. This data will solely be used to provide you with information about Pandora FMS and will not be conceded to third parties. You'll be able to unregister from said database at any time from the newsletter subscription options") . '.</p>';
echo '<p>' . __("When you subscribe to the %s Update Manager service, you accept that we register your %s instance as an identifier on the database owned by Artica TS. This data will solely be used to provide you with information about %s and will not be conceded to third parties. You can unregister from said database at any time from the Update Manager options.", get_product_name(), get_product_name(), get_product_name()) . '</p>';
echo '<p>' . __("In the same fashion, when subscribed to the newsletter you accept that your email will pass on to a database property of Artica TS. This data will solely be used to provide you with information about %s and will not be conceded to third parties. You can unregister from said database at any time from the newsletter subscription options.", get_product_name()) . '</p>';
echo '</div>';
echo '<div style="position:absolute; margin: 0 auto; bottom: 0px; padding-top:10px; position:relative; border: 1px solid #FFF;">';
@ -161,7 +161,7 @@ echo '<div id="login_accept_register" title="' .
echo '</div>';
echo '<div style="float: left; margin-left: 0px; width: 50%; text-align: left;">';
html_print_checkbox('register', 1, false, false, false, 'cursor: \'pointer\'');
echo '&nbsp;<span style="font-size: 12px;" id="label-register">' .__("Join the Pandora FMS community") . '!</span><br>';
echo '&nbsp;<span style="font-size: 12px;" id="label-register">' .__('Join the %s community!', get_product_name()) . '!</span><br>';
html_print_checkbox('newsletter', 1, false, false, false, 'cursor: \'pointer\'');
echo '&nbsp;<span style="font-size: 12px;" id="label-newsletter">' .__("Subscribe to our newsletter") . '</span>';
echo "<br>";
@ -176,7 +176,7 @@ echo '</div>';
// Print yes or not dialog
echo '<div id="login_registration_yesno" title="' .
__('Pandora FMS instance identification wizard') . '" style="">';
__("%s instance identification wizard", get_product_name()) . '" style="">';
echo '<div style="font-size: 12pt; margin: 20px;">';
echo __("Do you want to continue without any registration") . "?";
echo '</div>';

View File

@ -50,7 +50,7 @@ if (!isset($login_screen)) {
switch ($login_screen) {
case 'login':
$logo_link = 'http://www.pandorafms.com';
$logo_title = __('Go to Pandora FMS Website');
$logo_title = __('Go to %s Website', get_product_name());
break;
case 'logout':
case 'double_auth':
@ -86,31 +86,39 @@ if (!empty($config['login_background'])) {
$background_url = "images/backgrounds/" . $config['login_background'];
$login_body_style = "style=\"background-image: url('$background_url');\"";
}
// Get the custom icons
$docs_logo = ui_get_docs_logo();
$support_logo = ui_get_support_logo();
echo '<div id="login_body" ' . $login_body_style . '>';
echo '<div id="header_login">';
echo '<div id="icon_custom_pandora">';
if (file_exists (ENTERPRISE_DIR . "/load_enterprise.php")) {
if(isset ($config['custom_logo'])){
echo '<img src="enterprise/images/custom_logo/' . $config['custom_logo'] .'" alt="pandora_console">';
echo '<img src="enterprise/images/custom_logo/' . $config['custom_logo'] .'" alt="monitoring_console">';
}
else{
echo '<img src="images/custom_logo/pandora_logo_head_4.png" alt="pandora_console">';
echo '<img src="images/custom_logo/pandora_logo_head_4.png" alt="monitoring_console">';
}
}
else{
echo '<img src="images/custom_logo/pandora_logo_head_3.png" alt="pandora_console">';
echo '<img src="images/custom_logo/pandora_logo_head_3.png" alt="monitoring_console">';
}
echo '</div>';
echo '<div id="list_icon_docs_support"><ul>';
echo '<li><a href="'.$config['custom_docs_url'].'" target="_blank"><img src="images/icono_docs.png" alt="docs pandora"></a></li>';
echo '<li>' . __('Docs') . '</li>';
if (file_exists (ENTERPRISE_DIR . "/load_enterprise.php")) {
echo '<li id="li_margin_left"><a href="'.$config['custom_support_url'].'" target="_blank"><img src="images/icono_support.png" alt="support pandora"></a></li>';
} else {
echo '<li id="li_margin_left"><a href="https://pandorafms.com/monitoring-services/support/" target="_blank"><img src="images/icono_support.png" alt="support pandora"></a></li>';
echo '<div id="list_icon_docs_support"><ul style="line-height: 36px;">';
if ($docs_logo !== false) {
echo '<li><a href="'.$config['custom_docs_url'].'" target="_blank"><img src="' . $docs_logo . '" alt="docs"></a></li>';
}
echo '<li><a style="color: white; font-size:inherit;" href="'.$config['custom_docs_url'].'" target="_blank">' . __('Docs') . '</li>';
if (file_exists (ENTERPRISE_DIR . "/load_enterprise.php")) {
if ($support_logo !== false) {
echo '<li id="li_margin_left"><a href="'.$config['custom_support_url'].'" target="_blank"><img src="' . $support_logo .'" alt="support"></a></li>';
}
echo '<li><a style="color: white; font-size:inherit;" href="'.$config['custom_support_url'].'" target="_blank">' . __('Support') . '</li>';
} else {
echo '<li id="li_margin_left"><a href="https://pandorafms.com/monitoring-services/support/" target="_blank"><img src="' . $support_logo .'" alt="support"></a></li>';
echo '<li>' . __('Support') . '</li>';
}
echo '<li>' . __('Support') . '</li>';
echo '</ul></div>';
@ -250,17 +258,17 @@ echo '<div class="login_page">';
echo '</form></div>';
echo '<div class="login_data">';
echo '<div class ="text_banner_login">';
echo '<div><span class="span1">';
echo '<div><span class="span1 pandora_upper">';
if(file_exists (ENTERPRISE_DIR . "/load_enterprise.php")){
if($config['custom_title1_login']){
echo io_safe_output($config['custom_title1_login']);
}
else{
echo __('WELCOME TO PANDORA FMS');
echo __('WELCOME TO %s', get_product_name());
}
}
else{
echo __('WELCOME TO PANDORA FMS');
echo __('WELCOME TO %s', get_product_name());
}
echo '</span></div>';
echo '<div><span class="span2">';
@ -380,7 +388,7 @@ if ($login_screen == 'logout'){
echo '<div class="content_message_alert">';
echo '<div class="text_message_alert">';
echo '<h1>'. __('Logged out') .'</h1>';
echo '<p>' . __('Your session is over. Please close your browser window to close this Pandora session.') .'</p>';
echo '<p>' . __('Your session has ended. Please close your browser window to close this %s session.', get_product_name()) .'</p>';
echo '</div>';
echo '<div class="button_message_alert">';
html_print_submit_button("Ok", 'hide-login-logout', false);
@ -393,7 +401,7 @@ if ($login_screen == 'logout'){
switch ($login_screen) {
case 'error_authconfig':
case 'error_dbconfig':
$title = __('Problem with Pandora FMS database');
$title = __('Problem with %s database', get_product_name());
$message = __('Cannot connect to the database, please check your database setup in the <b>include/config.php</b> file.<i><br/><br/>
Probably your database, hostname, user or password values are incorrect or
the database server is not running.').'<br /><br />';
@ -404,21 +412,22 @@ switch ($login_screen) {
if ($error_code == 'error_authconfig') {
$message .= '<br/><br/>';
$message .= __('If you have modified auth system, this problem could be because Pandora cannot override authorization variables from the config database. Remove them from your database by executing:<br><pre>DELETE FROM tconfig WHERE token = "auth";</pre>');
$message .= __('If you have modified the auth system, the origin of this problem could be that %s cannot override the authorization variables from the config database. Please remove them from your database by executing:<br><pre>DELETE FROM tconfig WHERE token = "auth";</pre>', get_product_name());
}
break;
case 'error_emptyconfig':
$title = __('Empty configuration table');
$message = __('Cannot load configuration variables from database. Please check your database setup in the
<b>include/config.php</b> file.<i><br><br>
Most likely your database schema has been created but there are is no data in it, you have a problem with the database access credentials or your schema is out of date.
<br><br>Pandora FMS Console cannot find <i>include/config.php</i> or this file has invalid
permissions and HTTP server cannot read it. Please read documentation to fix this problem.</i>').'<br /><br />';
<b>include/config.php</b> file.<i><br><br>
Most likely your database schema has been created but there are is no data in it, you have a problem with the database access credentials or your schema is out of date.
<br><br>%s Console cannot find <i>include/config.php</i> or this file has invalid
permissions and HTTP server cannot read it. Please read documentation to fix this problem.</i>',
get_product_name()).'<br /><br />';
break;
case 'error_noconfig':
$title = __('No configuration file found');
$message = __('Pandora FMS Console cannot find <i>include/config.php</i> or this file has invalid
permissions and HTTP server cannot read it. Please read documentation to fix this problem.').'<br /><br />';
$message = __('%s Console cannot find <i>include/config.php</i> or this file has invalid
permissions and HTTP server cannot read it. Please read documentation to fix this problem.', get_product_name()).'<br /><br />';
if (file_exists('install.php')) {
$link_start = '<a href="install.php">';
$link_end = '</a>';
@ -433,7 +442,7 @@ switch ($login_screen) {
case 'error_install':
$title = __('Installer active');
$message = __('For security reasons, normal operation is not possible until you delete installer file.
Please delete the <i>./install.php</i> file before running Pandora FMS Console.');
Please delete the <i>./install.php</i> file before running %s Console.', get_product_name());
break;
case 'error_perms':
$title = __('Bad permission for include/config.php');

View File

@ -66,10 +66,10 @@ if ($email == 'admin@example.com') $email = '';
// Prints first step pandora registration
echo '<div id="login_id_dialog" title="' .
__('Pandora FMS instance identification wizard') . '" style="display: none;">';
__('%s instance identification wizard', get_product_name()) . '" style="display: none;">';
echo '<div style="font-size: 10pt; margin: 20px;">';
echo __('Please fill the following information in order to configure your Pandora FMS instance successfully') . '.';
echo __('Please fill the following information in order to configure your %s instance successfully', get_product_name()) . '.';
echo '</div>';
echo '<div style="">';
@ -83,7 +83,7 @@ echo '<div id="login_id_dialog" title="' .
$table->size[1] = '60%';
$table->border = '5px solid';
$table->data[0][0] = __('Language code for Pandora');
$table->data[0][0] = __('Language code');
$table->data[0][1] = html_print_select_from_sql (
'SELECT id_language, name FROM tlanguage',
'language', $config['language'] , '', '', '', true);

View File

@ -29,8 +29,6 @@ require_once ("include/functions_reporting.php");
require_once ("include/functions_tactical.php");
require_once ($config["homedir"] . '/include/functions_graph.php');
//ui_print_page_header (__('Welcome to Pandora FMS Web Console'),'',false,"",false);
if (tags_has_user_acl_tags()) {
ui_print_tags_warning();
}
@ -111,7 +109,7 @@ if (!empty($all_data)) {
$table->data = array ();
$table->headstyle[0] = 'text-align:center;';
$table->width = "100%";
$table->head[0] = '<span>' . __('Pandora FMS Overview') . '</span>';
$table->head[0] = '<span>' . __('%s Overview', get_product_name()) . '</span>';
$table->head_colspan[0] = 4;
// Indicators
@ -226,7 +224,7 @@ if (!empty($all_data)) {
$table->head[2] = __('Date');
$table->head[3] = __('Source IP');
$table->head[4] = __('Comments');
$table->title = '<span>' . __('This is your last activity in Pandora FMS console') . '</span>';
$table->title = '<span>' . __('This is your last activity performed on the %s console', get_product_name()) . '</span>';
switch ($config["dbtype"]) {
case "mysql":
@ -296,198 +294,3 @@ if (!empty($all_data)) {
</tr>
</table>
<?php
return;
// ---------------------------------------------------------------------
// Site news !
// ---------------------------------------------------------------------
//echo '<div id="left_column_logon_ok" id="leftcolumn">';
echo '<div style="width:30%; float:left;" id="leftcolumn">';
///////////////
// Overview Table
///////////////
$table->class = "databox";
$table->cellpadding = 4;
$table->cellspacing = 4;
$table->head = array ();
$table->data = array ();
$table->style[0] = 'text-align:center;';
$table->width = "100%";
$table->head[0] = '<span>' . __('Pandora FMS Overview') . '</span>';
$table->head_colspan[0] = 4;
// Indicators
$tdata = array();
$tdata[0] = reporting_get_stats_indicators($data);
$table->rowclass[] = '';
$table->data[] = $tdata;
// Alerts
$tdata = array();
$tdata[0] = reporting_get_stats_alerts($data);
$table->rowclass[] = '';
$table->data[] = $tdata;
// Modules by status
$tdata = array();
$tdata[0] = reporting_get_stats_modules_status($data);
$table->rowclass[] = '';
$table->data[] = $tdata;
// Total agents and modules
$tdata = array();
$tdata[0] = reporting_get_stats_agents_monitors($data);
$table->rowclass[] = '';
$table->data[] = $tdata;
// Users
$tdata = array();
$tdata[0] = reporting_get_stats_users($data);
$table->rowclass[] = '';
$table->data[] = $tdata;
html_print_table($table);
unset($table);
echo '</div>';
// ---------------------------------------------------------------------------
// Site stats (global!)
// ---------------------------------------------------------------------------
//echo '<div id="right_column_logon_ok" id="rightcolumn">';
echo '<div style="width: 50%; float:left;" id="rightcolumn">';
$options = array();
$options['id_user'] = $config['id_user'];
$options['modal'] = false;
$options['limit'] = 3;
$news = get_news($options);
if (!empty($news)) {
//////////////////NEWS BOARD/////////////////////////////
echo '<div id="news_board">';
echo '<table cellpadding="4" cellspacing="4" class="databox">';
echo '<tr><th><span>' . __('News board') . '</span></th></tr>';
if ($config["prominent_time"] == "timestamp") {
$comparation_suffix = "";
}
else {
$comparation_suffix = __('ago');
}
foreach ($news as $article) {
$text = io_safe_output($article["text"]);
echo '<tr><th><b>'.$article["subject"].'</b></th></tr>';
echo '<tr><td>' . __('by') . ' <b>' .
$article["author"] . '</b> <i>' . ui_print_timestamp ($article["timestamp"], true).'</i> ' . $comparation_suffix . '</td></tr>';
echo '<tr><td class="datos">';
echo nl2br($text);
echo '</td></tr>';
}
echo '</table>';
echo '</div>'; // News board
echo '<br><br>';
//////////////////END OF NEWS BOARD/////////////////////////////
}
//////////////////LAST ACTIVITY/////////////////////////////
// Show last activity from this user
echo '<div id="activity">';
$table->width = '100%'; //Don't specify px
$table->data = array ();
$table->size = array ();
$table->size[2] = '150px';
$table->size[3] = '130px';
$table->size[5] = '200px';
$table->head = array ();
$table->head[0] = __('User');
$table->head[1] = '';
$table->head[2] = __('Action');
$table->head[3] = __('Date');
$table->head[4] = __('Source IP');
$table->head[5] = __('Comments');
$table->title = '<span>' . __('This is your last activity in Pandora FMS console') . '</span>';
switch ($config["dbtype"]) {
case "mysql":
$sql = sprintf ("SELECT id_usuario,accion,ip_origen,descripcion,utimestamp
FROM tsesion
WHERE (`utimestamp` > UNIX_TIMESTAMP(NOW()) - " . SECONDS_1WEEK . ")
AND `id_usuario` = '%s' ORDER BY `utimestamp` DESC LIMIT 10", $config["id_user"]);
break;
case "postgresql":
$sql = sprintf ("SELECT \"id_usuario\", accion, \"ip_origen\", descripcion, utimestamp
FROM tsesion
WHERE (\"utimestamp\" > ceil(date_part('epoch', CURRENT_TIMESTAMP)) - " . SECONDS_1WEEK . ")
AND \"id_usuario\" = '%s' ORDER BY \"utimestamp\" DESC LIMIT 10", $config["id_user"]);
break;
case "oracle":
$sql = sprintf ("SELECT id_usuario, accion, ip_origen, descripcion, utimestamp
FROM tsesion
WHERE ((utimestamp > ceil((sysdate - to_date('19700101000000','YYYYMMDDHH24MISS')) * (" . SECONDS_1DAY . ")) - " . SECONDS_1WEEK . ")
AND id_usuario = '%s') AND rownum <= 10 ORDER BY utimestamp DESC", $config["id_user"]);
break;
}
$sessions = db_get_all_rows_sql ($sql);
if ($sessions === false)
$sessions = array ();
foreach ($sessions as $session) {
$data = array ();
switch ($config["dbtype"]) {
case "mysql":
case "oracle":
$session_id_usuario = $session['id_usuario'];
$session_ip_origen = $session['ip_origen'];
break;
case "postgresql":
$session_id_usuario = $session['id_usuario'];
$session_ip_origen = $session['ip_origen'];
break;
}
$data[0] = '<strong>' . $session_id_usuario . '</strong>';
$data[1] = ui_print_session_action_icon ($session['accion'], true);
$data[2] = $session['accion'];
$data[3] = ui_print_help_tip(date($config["date_format"], $session['utimestamp']), true)
. human_time_comparation($session['utimestamp'], 'tiny');
$data[4] = $session_ip_origen;
$data[5] = io_safe_output ($session['descripcion']);
array_push ($table->data, $data);
}
echo "<div style='width:100%; overflow-x:auto;'>";
html_print_table ($table);
unset($table);
echo "</div>";
echo "</div>"; // activity
//////////////////END OF LAST ACTIVIYY/////////////////////////////
echo "</div>";
echo "<div style='clear:both'></div>";
?>

View File

@ -119,6 +119,17 @@ $(document).ready( function() {
$('div#menu')
.css('position', 'fixed')
.css('z-index', '9000')
.css('top','80px')
}else{
$('div#menu')
.css('z-index', '9000')
}
if (fixed_header) {
$('div#menu')
.css('position', 'fixed')
.css('z-index', '9000')
.css('top','80px')
$('#menu_tab_frame_view').css('margin-top','20px')
}
//Daniel maya 02/06/2016 Fixed menu position--END
/*
@ -244,6 +255,7 @@ $(document).ready( function() {
openTimeMenu = new Date().getTime();
$('#menu').css('width', '145px');
$('#menu').css('position', 'block');
$('div#menu').css('top', '80px');
$('li.menu_icon').addClass( " no_hidden_menu" );
$('ul.submenu').css('left', '144px');

View File

@ -112,7 +112,7 @@ position:absolute;background:black;opacity:0.6;z-index:-1;left:0px;top:0px;width
<div class='modalheade'>
<span class='modalheadertex'>
You don't have access to this page
<?php echo __("You don't have access to this page");?>
</span>
<img class='modalclose cerrar' src='<?php echo $config['homeurl'];?>images/icono_cerrar.png'>
@ -121,8 +121,11 @@ position:absolute;background:black;opacity:0.6;z-index:-1;left:0px;top:0px;width
<div class='modalconten'>
<img class='modalcontentim' src='<?php echo $config['homeurl'];?>images/access_denied.png'>
<div class='modalcontenttex'>
Access to this page is restricted to authorized users only, please contact system administrator if you need assistance. <br/> <br/>
Please know that all attempts to access this page are recorded in security logs of Pandora System Database
<?php
echo __("Access to this page is restricted to authorized users only, please contact system administrator if you need assistance.");
echo "<br/> <br/>";
echo __("Please know that all attempts to access this page are recorded in security logs of %s System Database", get_product_name());
?>
</div>

View File

@ -21,7 +21,7 @@ require_once ("../include/functions_html.php");
?>
<html style="height:100%; margin-top: 25px; margin-left: 15px; margin-right: 15px; background-color: #333;"><head><title>
<?php
echo __('Pandora FMS help system');
echo __('%s help system', get_product_name());
?>
</title>
<meta http-equiv="content-type" content="text/html; charset=utf-8">
@ -61,11 +61,12 @@ foreach ($files as $file) {
}
}
$logo = ui_get_custom_header_logo(true);
if (! $id || ! file_exists ($help_file)) {
echo '<div id="main_help" style="background-color: #fff;text-align:center; padding-top: 15px; padding-bottom: 15px; ">';
if (!is_metaconsole()) {
echo html_print_image('images/pandora_tinylogo.png', true, array("border" => '0'));
echo html_print_image($logo, true, array("border" => '0'));
}
echo '</div>';
echo '<div style="font-family: verdana, arial; font-size: 11px; text-align:left; background-color: #fff;">';
@ -77,7 +78,7 @@ if (! $id || ! file_exists ($help_file)) {
echo "<div style='text-align: center; background-color: #fff'>";
echo "</div>";
echo '<div class="msg" style="padding-left: 30px;padding-right: 30px;padding-bottom: 15px;">'.__('Pandora FMS help system has been called with a help reference that currently don\'t exist. There is no help content to show.').'</div></div></div>';
echo '<div class="msg" style="padding-left: 30px;padding-right: 30px;padding-bottom: 15px;">'.__("%s help system has been called with a help reference that currently don't exist. There is no help content to show.", get_product_name()).'</div></div></div>';
echo '<br /><br />';
echo '<div style="text-align: center; padding: 5px; font-family: verdana, arial; font-size: 11px;">';
include ('footer.php');
@ -86,16 +87,11 @@ if (! $id || ! file_exists ($help_file)) {
/* Show help */
echo '<div id="main_help_new" style="background-color: #fff">';
if (empty($config['enterprise_installed'])) {
echo html_print_image('images/pandora_tinylogo_open.png', true, array("border" => '0'));
if (!empty($config['enterprise_installed']) && is_metaconsole()) {
echo '<img src="' . $config["homeurl"] . $logo . '">';
}
else {
if (is_metaconsole()) {
echo '<img src="'.$config["homeurl"].'images/pandora_tinylogo.png">';
}
else{
echo html_print_image('images/pandora_tinylogo.png', true, array("border" => '0'));
}
echo html_print_image($logo, true, array("border" => '0'));
}
echo '</div>';
echo '<div id="main_help_new_content" style="height: auto ! important;overfloat: auto;">';

View File

@ -54,7 +54,7 @@ $header_buttons = array(
)
);
ui_print_page_header(__('Pandora audit') . " &raquo; " . __('Review Logs'), "images/gm_log.png", false, "", true, $header_buttons);
ui_print_page_header(__('%s audit', get_product_name()) . " &raquo; " . __('Review Logs'), "images/gm_log.png", false, "", true, $header_buttons);
$table = new stdClass();
$table->class = "databox filters";

View File

@ -106,6 +106,7 @@ if (is_ajax ()) {
$id_agent = get_parameter('id_agent');
$groups_to_add = get_parameter('groups');
if (enterprise_installed()) {
if (empty($groups_to_add)) return 0;
enterprise_include('include/functions_agents.php');
$ret = enterprise_hook(
'agents_update_secondary_groups',
@ -409,8 +410,8 @@ if($id_agente){
}
$table->data[2][0] = __('Safe operation mode')
. ui_print_help_tip(__('This mode allow Pandora FMS to disable all modules
of this agent while the selected module is on CRITICAL status'), true);
. ui_print_help_tip(__('This mode allow %s to disable all modules
of this agent while the selected module is on CRITICAL status', get_product_name()), true);
$table->data[2][1] = html_print_checkbox('safe_mode', 1, $safe_mode, true);
$table->data[2][1] .= "&nbsp;&nbsp;" . __('Module') . "&nbsp;" . html_print_select ($safe_mode_modules, "safe_mode_module", $safe_mode_module, "", "", 0, true);
}
@ -542,7 +543,7 @@ foreach ($fields as $field) {
. '.<br />'
. __('The format is: [url=\'url to navigate\']\'text to show\'[/url]')
. '.<br /><br />'
. __('e.g.: [url=pandorafms.org]Pandora FMS Community[/url]')
. __('e.g.: [url=google.com]Google web search[/url]')
, true);
$custom_value = db_get_value_filter('description',

View File

@ -284,8 +284,9 @@ if ($create_agent) {
"Url description":"' . $url_description .'",
"Quiet":"' . (int)$quiet.'"}';
$unsafe_alias = io_safe_output($alias);
db_pandora_audit("Agent management",
"Created agent $alias", false, true, $info);
"Created agent $unsafe_alias", false, true, $info);
}
else {
$id_agente = 0;
@ -391,7 +392,7 @@ if ($id_agente) {
$grouptab['active'] = false;
$gistab = "";
$gistab = array();
/* GIS tab */
if ($config['activate_gis']) {
@ -1264,7 +1265,6 @@ if ($update_module || $create_module) {
if ($update_module) {
$id_agent_module = (int) get_parameter ('id_agent_module');
$values = array (
'id_agente_modulo' => $id_agent_module,
'descripcion' => $description,
@ -1791,7 +1791,7 @@ if ($updateGIS) {
"altitude" => $previusAgentGISData['stored_altitude'],
"start_timestamp" => $previusAgentGISData['start_timestamp'],
"end_timestamp" => date( 'Y-m-d H:i:s'),
"description" => __('Save by Pandora Console'),
"description" => __('Save by %s Console', get_product_name()),
"manual_placement" => $previusAgentGISData['manual_placement'],
"number_of_packages" => $previusAgentGISData['number_of_packages'],
"tagente_id_agente" => $previusAgentGISData['tagente_id_agente']
@ -1806,7 +1806,7 @@ if ($updateGIS) {
"stored_altitude" => $lastAltitude,
"start_timestamp" => date( 'Y-m-d H:i:s'),
"manual_placement" => 1,
"description" => __('Update by Pandora Console')),
"description" => __('Update by %s Console', get_product_name())),
array("tagente_id_agente" => $idAgente));
}
else {
@ -1819,7 +1819,7 @@ if ($updateGIS) {
"stored_latitude" => $lastLatitude,
"stored_altitude" => $lastAltitude,
"manual_placement" => 1,
"description" => __('Insert by Pandora Console')
"description" => __('Insert by %s Console', get_product_name())
));
}
}
@ -1895,10 +1895,81 @@ switch ($tab) {
var wizard_tab_showed = 0;
$(document).ready (function () {
$('body').append('<div id="dialog"></div>');
// Control the tab and subtab hover. When mouse leave one,
// check if is hover the other before hide the subtab
$('.agent_wizard_tab').hover(agent_wizard_tab_show, agent_wizard_tab_hide);
$('#module_form').submit(function() {
var aget_id_os = '<?php echo agents_get_os(modules_get_agentmodule_agent(get_parameter("id_agent_module"))); ?>';
if('<?php echo modules_get_agentmodule_name(get_parameter("id_agent_module")); ?>' != $('#text-name').val() &&
'<?php echo agents_get_os(modules_get_agentmodule_agent(get_parameter("id_agent_module"))); ?>' == 19){
event.preventDefault();
$("#dialog").dialog({
resizable: true,
draggable: true,
modal: true,
height: 220,
width: 600,
title: 'Changing the module name of a satellite agent',
open: function(){
$('#dialog').html('<br><img src="images/icono-warning-triangulo.png" style="float:left;margin-left:25px;"><p style="float:right;font-style:nunito;font-size:11pt;margin-right:50px;"><span style="font-weight:bold;font-size:12pt;">Warning</span> <br>The names of the modules of a satellite should not be <br> altered manually. Unless you are absolutely certain of <br> the process, do not alter these names.</p>');
},
buttons: [{
text: "Ok",
click: function() {
$('#module_form').submit();
}
},
{
text: "Cancel",
click: function() {
$( this ).dialog( "close" );
return false;
}
}]
});
}
var module_type_snmp = '<?php echo modules_get_agentmodule_type(get_parameter("id_agent_module")); ?>';
if('<?php echo modules_get_agentmodule_name(get_parameter("id_agent_module")); ?>' != $('#text-name').val() && (
module_type_snmp == 15 || module_type_snmp == 16 || module_type_snmp == 17 || module_type_snmp == 18)){
event.preventDefault();
$("#dialog").dialog({
resizable: true,
draggable: true,
modal: true,
height: 260,
width: 600,
title: 'Changing snmp module name',
open: function(){
$('#dialog').html('<br><img src="images/icono-warning-triangulo.png" style="float:left;margin-left:25px;margin-top:30px;"><p style="float:right;font-style:nunito;font-size:11pt;margin-right:50px;"><span style="font-weight:bold;font-size:12pt;">Warning</span> <br> If you change the name of this module, various features <br> associated with this module, such as network maps, <br> interface graphs or other network modules, may no longer <br> work. If you are not completely sure of the process, please <br> do not change the name of the module. </p>');
},
buttons: [{
text: "Ok",
click: function() {
$('#module_form').submit();
}
},
{
text: "Cancel",
click: function() {
$( this ).dialog( "close" );
return false;
}
}]
});
}
});
});
// Set the position and width of the subtab

View File

@ -60,7 +60,7 @@ $viewtab['active'] = false;
$onheader = array('view' => $viewtab);
// Header
ui_print_page_header (__('Agents defined in Pandora'), "images/agent_mc.png", false, "", true, $onheader);
ui_print_page_header (__('Agents defined in %s', get_product_name()), "images/agent_mc.png", false, "", true, $onheader);
// Perform actions
$agent_to_delete = (int)get_parameter('borrar_agente');

View File

@ -151,12 +151,13 @@ if (($policy_page) || (isset($agent))) {
echo "</table>";
echo '<div style="text-align: right; width: 100%;padding-top:10px;padding-bottom:10px">';
echo "<strong>";
echo "<a style='color: #373737;' target='_blank' href='http://pandorafms.com/Library/Library/'>".__("Get more modules in Pandora FMS Library")."</a>";
echo "</strong>";
echo '</div>';
if (!$config['disable_help']) {
echo '<div style="text-align: right; width: 100%;padding-top:10px;padding-bottom:10px">';
echo "<strong>";
echo "<a style='color: #373737;' target='_blank' href='http://pandorafms.com/Library/Library/'>".__("Get more modules on Monitoring Library")."</a>";
echo "</strong>";
echo '</div>';
}
if (! isset ($id_agente))
return;

View File

@ -493,12 +493,7 @@ switch ($moduletype) {
/* WARNING: type 7 is reserved on enterprise */
default:
if (enterprise_include ('godmode/agentes/module_manager_editor.php') === ENTERPRISE_NOT_HOOK) {
ui_print_error_message(sprintf(__('DEBUG: Invalid module type specified in %s:%s'), __FILE__, __LINE__));
echo __('Most likely you have recently upgraded from an earlier version of Pandora and either <br />
1) forgot to use the database converter<br />
2) used a bad version of the database converter (see Bugreport #2124706 for the solution)<br />
3) found a new bug - please report a way to duplicate this error');
ui_print_error_message(sprintf(__('Invalid module type')));
return;
}
break;

View File

@ -526,9 +526,9 @@ $table->data[5][1] = "
"</td>
<td>".
html_print_input_text ('once_date_from', $once_date_from, '', 10, 10, true, $disabled_in_execution) .
ui_print_help_tip(__('Date format in Pandora is year/month/day'), true) .
ui_print_help_tip(__('Date format is YY/MM/DD'), true) .
html_print_input_text ('once_time_from', $once_time_from, '', 9, 9, true, $disabled_in_execution) .
ui_print_help_tip(__('Time format in Pandora is hours(24h):minutes:seconds'), true) .
ui_print_help_tip(__('Watch format is hours (24h):minutes:seconds'), true) .
"</td>
</tr>
<tr>
@ -537,9 +537,9 @@ $table->data[5][1] = "
"</td>
<td>".
html_print_input_text ('once_date_to', $once_date_to, '', 10, 10, true) .
ui_print_help_tip(__('Date format in Pandora is year/month/day'), true) .
ui_print_help_tip(__('Date format is YY/MM/DD'), true) .
html_print_input_text ('once_time_to', $once_time_to, '', 9, 9, true) .
ui_print_help_tip(__('Time format in Pandora is hours(24h):minutes:seconds'), true) .
ui_print_help_tip(__('Watch format is hours (24h):minutes:seconds'), true) .
"</td>
</tr>
</table>
@ -608,7 +608,7 @@ $table->data[5][1] = "
html_print_input_text (
'periodically_time_from',
$periodically_time_from, '', 7, 7, true, $disabled_in_execution) .
ui_print_help_tip(__('Time format in Pandora is hours(24h):minutes:seconds').
ui_print_help_tip(__('Watch format is hours (24h):minutes:seconds.').
".<br>".__('The end time must be higher than the start time'), true) .
"</td>
<td>" . __('To hour:') . "</td>
@ -616,7 +616,7 @@ $table->data[5][1] = "
html_print_input_text (
'periodically_time_to',
$periodically_time_to, '', 7, 7, true, $disabled_in_execution) .
ui_print_help_tip(__('Time format in Pandora is hours(24h):minutes:seconds').
ui_print_help_tip(__('Watch format is hours (24h):minutes:seconds.').
".<br>".__('The end time must be higher than the start time'), true) .
"</td>
</tr>

View File

@ -90,14 +90,17 @@ if ($create_alert) {
"tagente_modulo","id_agente_modulo", $id_agent_module));
// Audit the creation only when the alert creation is correct
$unsafe_alert_template_name = io_safe_output($alert_template_name);
$unsafe_module_name = io_safe_output($module_name);
$unsafe_agent_alias = io_safe_output($agent_alias);
if ($id) {
db_pandora_audit("Alert management",
"Added alert '$alert_template_name' for module '$module_name' in agent '$agent_alias'",
"Added alert '$unsafe_alert_template_name' for module '$unsafe_module_name' in agent '$unsafe_agent_alias'",
false, false, 'ID: ' . $id);
}
else {
db_pandora_audit("Alert management",
"Fail Added alert '$alert_template_name' for module '$module_name' in agent '$agent_alias'");
"Fail Added alert '$unsafe_alert_template_name' for module '$unsafe_module_name' in agent '$unsafe_agent_alias'");
}
$messageAction = ui_print_result_message ($id,

View File

@ -111,6 +111,13 @@ $table->size[0] = '20%';
$table->data = array ();
$table->data[0][0] = __('Name');
$table->data[0][1] = html_print_input_text ('name', $name, '', 35, 255, true);
if (io_safe_output($name) == "Monitoring Event") {
$table->data[0][1] .= '&nbsp;&nbsp;' . ui_print_help_tip(
__("This action may stop working, if you change its name."),
true,
"images/header_yellow.png"
);
}
$table->colspan[0][1] = 2;
$table->data[1][0] = __('Group');

View File

@ -538,11 +538,11 @@ if ($step == 2) {
$table->data[0][3] = html_print_checkbox ('special_day', 1, $special_day, true);
$table->data[1][0] = __('Time from') . ' ' .
ui_print_help_tip(__('Time format in Pandora is hours(24h):minutes:seconds'), true);
ui_print_help_tip(__('Watch format is hours (24h):minutes:seconds'), true);
$table->data[1][1] = html_print_input_text ('time_from', $time_from, '', 7, 8,
true);
$table->data[1][2] = __('Time to') . ' ' .
ui_print_help_tip(__('Time format in Pandora is hours(24h):minutes:seconds'), true);
ui_print_help_tip(__('Watch format is hours (24h):minutes:seconds'), true);
$table->data[1][3] = html_print_input_text ('time_to', $time_to, '', 7, 8,
true);

View File

@ -197,7 +197,7 @@ echo "</td></tr>";
echo '<tr><td colspan=2>';
echo '<div align="justify"><br><hr width=100%>';
echo '(*) '.__('Please check your Pandora Server setup and be sure that database maintenance daemon is running. It\'s very important to keep up-to-date database to get the best performance and results in Pandora');
echo '(*) '.__("Please make sure your %s Server settings are correct and that the database maintenance daemon is running. It's very important to keep your database up to date in order to get the best performance and results from %s.", get_product_name(), get_product_name());
echo '</div>';
echo '</td></tr></table>';
?>

View File

@ -193,7 +193,7 @@ if (defined('METACONSOLE')) {
}
else {
ui_print_page_header (__("Groups defined in Pandora"),
ui_print_page_header (__("Groups defined in %s", get_product_name()),
"images/group.png", false, "", true, "");
$sec = 'gagente';

View File

@ -52,7 +52,7 @@ if (is_ajax ()) {
if (!is_metaconsole()) {
// Header
ui_print_page_header (__("Module groups defined in Pandora"), "images/module_group.png", false, "", true, "");
ui_print_page_header (__("Module groups defined in %s", get_product_name()), "images/module_group.png", false, "", true, "");
}
$create_group = (bool) get_parameter ('create_group');
$update_group = (bool) get_parameter ('update_group');

View File

@ -507,7 +507,7 @@ foreach ($fields as $field) {
. '.<br />'
. __('The format is: [url=\'url to navigate\']\'text to show\'[/url]')
. '.<br /><br />'
. __('e.g.: [url=pandorafms.org]Pandora FMS Community[/url]')
. __('e.g.: [url=google.com]Google web search[/url]')
, true);
$custom_value = db_get_value_filter('description', 'tagent_custom_data', array('id_field' => $field['id_field'], 'id_agent' => $id_agente));

View File

@ -109,6 +109,7 @@ if (is_ajax()) {
'nombre' => $module_names
);
$module_plugin_macros = db_get_all_rows_filter('tagente_modulo', $filter, $fields);
$module_plugin_macros = io_safe_output($module_plugin_macros);
if (empty($module_plugin_macros)) $module_plugin_macros = array();
$module_plugin_macros = array_reduce($module_plugin_macros, function($carry, $item) {

View File

@ -435,7 +435,7 @@ foreach ($rows as $row) {
$menu_godmode["links"]["sub"] = $sub;
// Update Manager
if (check_acl ($config['id_user'], 0, "PM")) {
if (check_acl ($config['id_user'], 0, "PM") && $config['enable_update_manager']) {
$menu_godmode["messages"]["text"] = __('Update manager');
$menu_godmode["messages"]["sec2"] = "";
$menu_godmode["messages"]["id"] = "god-um_messages";

View File

@ -59,8 +59,6 @@ if ($edit_graph) {
$graphInTgraph = db_get_row_sql("SELECT * FROM tgraph WHERE id_graph = " . $id_graph);
$stacked = $graphInTgraph['stacked'];
$period = $graphInTgraph['period'];
$name = $graphInTgraph['name'];
$description = $graphInTgraph['description'];
$id_group = $graphInTgraph['id_group'];
$width = $graphInTgraph['width'];
$height = $graphInTgraph['height'];
@ -80,7 +78,6 @@ else {
$id_agent = 0;
$id_module = 0;
$id_group = 0;
$name = "Pandora FMS combined graph";
$width = 550;
$height = 210;
$period = SECONDS_1DAY;
@ -119,11 +116,8 @@ if ($edit_graph) {
echo ">";
$own_info = get_user_info ($config['id_user']);
if ($own_info['is_admin'] || check_acl ($config['id_user'], 0, "PM"))
$return_all_groups = true;
else
$return_all_groups = false;
$return_all_groups = $own_info['is_admin'] || users_can_manage_group_all("RR");
echo "<td><b>".__('Group')."</b></td><td>";
if (check_acl ($config['id_user'], 0, "RW"))
echo html_print_select_groups($config['id_user'], 'RW', $return_all_groups, 'graph_id_group', $id_group, '', '', '', true);
@ -173,7 +167,8 @@ $stackeds = array(
CUSTOM_GRAPH_GAUGE => __('Gauge'),
CUSTOM_GRAPH_HBARS => __('Horizontal bars'),
CUSTOM_GRAPH_VBARS => __('Vertical bars'),
CUSTOM_GRAPH_PIE => __('Pie')
CUSTOM_GRAPH_PIE => __('Pie'),
CUSTOM_GRAPH_THERMOMETER => __('Thermometer')
);
html_print_select ($stackeds, 'stacked', $stacked);

View File

@ -23,7 +23,7 @@ check_login ();
$report_r = check_acl ($config['id_user'], 0, "RR");
$report_w = check_acl ($config['id_user'], 0, "RW");
$report_m = check_acl ($config['id_user'], 0, "RM");
$access = ($report_r == true) ? 'RR' : (($report_w == true) ? 'RW' : (($report_m == true) ? 'RM' : 'RR'));
if (!$report_r && !$report_w && !$report_m) {
db_pandora_audit("ACL Violation",
"Trying to access Inventory Module Management");
@ -31,6 +31,9 @@ if (!$report_r && !$report_w && !$report_m) {
return;
}
$access = ($report_r == true) ? 'RR' : (($report_w == true) ? 'RW' : (($report_m == true) ? 'RM' : 'RR'));
$manage_group_all = users_can_manage_group_all($access);
$activeTab = get_parameter('tab', 'main');
$enterpriseEnable = false;
@ -185,20 +188,21 @@ if (!empty ($graphs)) {
$data[2] = $graph["graphs_count"];
$data[3] = ui_print_group_icon($graph['id_group'],true);
if (($report_w || $report_m) && users_can_manage_group_all($access)) {
$data[4] = '';
if (($report_w || $report_m) && $manage_group_all) {
$data[4] = '<a href="index.php?sec=reporting&sec2=godmode/reporting/graph_builder&edit_graph=1&id='.
$graph['id_graph'].'">'.html_print_image("images/config.png", true).'</a>';
$data[4] .= '&nbsp;';
}
$data[4] .= '&nbsp;';
if ($report_m && $manage_group_all) {
$data[4] .= '<a href="index.php?sec=reporting&sec2=godmode/reporting/graphs&delete_graph=1&id='
.$graph['id_graph'].'" onClick="if (!confirm(\''.__('Are you sure?').'\'))
return false;">' . html_print_image("images/cross.png", true, array('alt' => __('Delete'), 'title' => __('Delete'))) . '</a>' .
html_print_checkbox_extended ('delete_multiple[]', $graph['id_graph'], false, false, '', 'class="check_delete" style="margin-left:2px;"', true);
} else {
if($op_column) $data[4] = '';
}
array_push ($table->data, $data);
}

View File

@ -889,7 +889,7 @@ You can of course remove the warnings, that's why we include the source and do n
<td>
<?php
echo __('Time from') .
ui_print_help_tip(__('Time format in Pandora is hours(24h):minutes:seconds'), true);
ui_print_help_tip(__('Watch format is hours (24h):minutes:seconds'), true);
?>
</td>
<td colspan="6"><?php html_print_input_text ('time_from', $time_from, '', 7, 8);?></td>
@ -898,7 +898,7 @@ You can of course remove the warnings, that's why we include the source and do n
<td>
<?php
echo __('Time to') .
ui_print_help_tip(__('Time format in Pandora is hours(24h):minutes:seconds'), true);
ui_print_help_tip(__('Watch format is hours (24h):minutes:seconds'), true);
?>
</td>
<td colspan="6"><?php html_print_input_text ('time_to', $time_to, '', 7, 8);?></td>
@ -931,10 +931,10 @@ You can of course remove the warnings, that's why we include the source and do n
$agents = agents_get_group_agents($group);
if ((empty($agents)) || $agents == -1) $agents = array();
$sql_log = 'SELECT source
$sql_log = 'SELECT source AS k, source AS v
FROM tagente,tagent_module_log
WHERE tagente.id_agente = tagent_module_log.id_agent ';
WHERE tagente.id_agente = tagent_module_log.id_agent AND tagente.disabled = 0';
if (!empty($agents)) {
$index = 0;
foreach ($agents as $key => $a) {
@ -948,7 +948,7 @@ You can of course remove the warnings, that's why we include the source and do n
}
$sql_log .= ")";
}
html_print_select_from_sql ($sql_log, 'source', $source, '', __('All'), '', false, false, false);
html_print_select_from_sql ($sql_log, 'source', $source, 'onselect=source_change_agents();', __('All'), '', false, false, false);
?>
</td>
</tr>
@ -1067,9 +1067,15 @@ You can of course remove the warnings, that's why we include the source and do n
<td style="font-weight:bold;"><?php echo __('Agents'); ?></td>
<td>
<?php
$sql_log_report = 'SELECT id_agente, alias
FROM tagente, tagent_module_log
WHERE tagente.id_agente = tagent_module_log.id_agent';
if ($source) {
$sql_log_report = 'SELECT id_agente, alias
FROM tagente, tagent_module_log
WHERE tagente.id_agente = tagent_module_log.id_agent AND tagente.disabled = 0 AND tagent_module_log.source like "'. $source.'"';
} else {
$sql_log_report = 'SELECT id_agente, alias
FROM tagente, tagent_module_log
WHERE tagente.id_agente = tagent_module_log.id_agent AND tagente.disabled = 0';
}
$all_agent_log = db_get_all_rows_sql($sql_log_report);
foreach ($all_agent_log as $key => $value) {
@ -1090,6 +1096,7 @@ You can of course remove the warnings, that's why we include the source and do n
}
}
html_print_select($agents2, 'id_agents2[]', $agents_select, $script = '', "", 0, false, true, true, '', false, "min-width: 180px");
echo "<span id='spinner_hack' style='display:none;'>" . html_print_image('images/spinner.gif', true) . "</span>";
?>
</td>
</tr>
@ -2913,7 +2920,7 @@ function chooseType() {
case 'simple_graph':
$("#row_time_compare_overlapped").show();
$("#row_only_avg").show();
// $("#row_only_avg").show();
$("#row_fullscale").show();
if ($("#checkbox-percentil").prop("checked"))
$("#row_percentil").show();
@ -2924,7 +2931,6 @@ function chooseType() {
$("#row_agent").show();
$("#row_module").show();
$("#row_period").show();
$("#row_show_in_two_columns").show();
$("#row_show_in_landscape").show();
$("#row_time_compare_overlapped").show();
$("#row_historical_db_check").hide();
@ -3523,4 +3529,22 @@ function set_last_value_period() {
$("#row_period").show();
}
}
function source_change_agents() {
$("#id_agents2").empty();
$("#spinner_hack").show();
jQuery.post ("ajax.php",
{"page" : "operation/agentes/ver_agente",
"get_agents_source_json" : 1,
"source" : $("#source").val()
},
function (data, status) {
for (var clave in data) {
$("#id_agents2").append('<option value="'+clave+'">'+data[clave]+'</option>');
}
$("#spinner_hack").hide();
},
"json"
);
}
</script>

View File

@ -690,25 +690,18 @@ switch ($action) {
switch ($type_access_selected) {
case 'group_view':
$edit = check_acl($config['id_user'],
$report['id_group'], "RW");
if ($config['id_user'] == $report['id_user'] || is_user_admin ($config["id_user"])) {
$delete = true; //owner can delete
} else {
$delete = false;
}
$edit = check_acl($config['id_user'], $report['id_group'], "RW");
$delete =
$edit ||
is_user_admin ($config["id_user"]) ||
$config['id_user'] == $report['id_user'];
break;
case 'group_edit':
$edit = check_acl($config['id_user'],
$report['id_group_edit'], "RW");
if ($config['id_user'] == $report['id_user'] || is_user_admin ($config["id_user"])) {
$delete = true; //owner can delete
} else {
$delete = check_acl($config['id_user'],
$report['id_group'], "RM");
}
$edit = check_acl($config['id_user'], $report['id_group_edit'], "RW");
$delete =
$edit ||
is_user_admin ($config["id_user"]) ||
$config['id_user'] == $report['id_user'];
break;
case 'user_edit':
if ($config['id_user'] == $report['id_user'] ||

View File

@ -328,7 +328,7 @@ $table->data["all_8"][2] = '<span id="parent_column_2_item_in_visual_map">' .
__('Item in the map') . '</span>' .
'<span id="parent_column_2_relationship">' .
ui_print_help_tip(
__('The parent relationships in Pandora will be drawn in the map.'), true) .
__('The parenting relationships in %s will be drawn on the map.', get_product_name()), true) .
'</span>';
$table->data["all_8"][3] = '<span id="parent_column_3_item_in_visual_map">' .
html_print_select($parents, 'item_in_the_map', 0, '',

View File

@ -186,11 +186,10 @@ if (!$modify){
ui_print_page_header (__('Manage recontask'), "", false, "recontask", true);
}
$is_windows = strtoupper(substr(PHP_OS, 0, 3)) == 'WIN';
if ($is_windows) {
echo '<div class="notify">';
echo __('Warning') . ": " . __("By default, in Windows, Pandora FMS only support Standard network sweep, not custom scripts");
echo __('Warning') . ": " . __("By default, in Windows, %s only support Standard network sweep, not custom scripts", get_product_name());
echo '</div>';
}

View File

@ -82,7 +82,7 @@ elseif (isset($_GET["server_remote"])) {
}
else {
// Header
ui_print_page_header (__('Pandora servers'), "images/gm_servers.png", false, "servers", true);
ui_print_page_header (__('%s servers', get_product_name()), "images/gm_servers.png", false, "servers", true);
// Move SNMP modules back to the enterprise server
if (isset($_GET["server_reset_snmp_enterprise"])) {

View File

@ -561,7 +561,7 @@ else {
$sec = 'advanced';
}
else {
ui_print_page_header (__('Plugins registered in Pandora FMS'), "images/gm_servers.png", false, "", true);
ui_print_page_header (__('Plug-ins registered on %s', get_product_name()), "images/gm_servers.png", false, "", true);
$is_windows = strtoupper(substr(PHP_OS, 0, 3)) == 'WIN';
if ($is_windows) {

View File

@ -225,7 +225,7 @@ if (($create != "") OR ($view != "")) {
echo '</form></table>';
}
else {
ui_print_page_header (__('Recon scripts registered in Pandora FMS'), "images/gm_servers.png", false, "", true);
ui_print_page_header (__('Recon scripts registered on %s', get_product_name()), "images/gm_servers.png", false, "", true);
// Update reconscript
if (isset($_GET["update_reconscript"])) { // if modified any parameter

View File

@ -103,9 +103,9 @@ if (enterprise_installed()) {
echo '</form>';
echo '<div id="code_license_dialog" style="display: none; text-align: left;" title="' . __('Request new license') . '">';
echo '<div id="logo">';
html_print_image('images/pandora_tinylogo.png');
html_print_image(ui_get_custom_header_logo(true));
echo '</div>';
echo '' . __('To get your <b>Pandora FMS Enterprise License</b>:') . '<br />';
echo '' . __('To get your <b>%s Enterprise License</b>:', get_product_name()) . '<br />';
echo '<ul>';
echo '<li>';
echo '' . sprintf(__('Go to %s'), "<a target=\"_blank\" href=\"https://licensing.artica.es/pandoraupdate7/index.php?section=generate_key_client\">https://licensing.artica.es/pandoraupdate7/index.php?section=generate_key_client</a>");

View File

@ -185,7 +185,7 @@ $no_autocreate_rows = array();
$ldap_rows = array();
// Method
$auth_methods = array ('mysql' => __('Local Pandora FMS'), 'ldap' => __('ldap'));
$auth_methods = array ('mysql' => __('Local %s', get_product_name()), 'ldap' => __('ldap'));
if (enterprise_installed()) {
add_enterprise_auth_methods($auth_methods);
}

View File

@ -49,7 +49,7 @@ if ($current_system_lang == "") {
$current_system_lang = "en";
}
$table->data[0][0] = __('Language code for Pandora');
$table->data[0][0] = __('Language code');
$table->data[0][1] = html_print_select_from_sql (
'SELECT id_language, name FROM tlanguage',
'language', $current_system_lang , '', '', '', true);
@ -72,7 +72,7 @@ $table->data[10][1] = __('Yes').'&nbsp;&nbsp;&nbsp;'.html_print_radio_button ('a
$table->data[10][1] .= __('No').'&nbsp;&nbsp;&nbsp;'.html_print_radio_button ('autoupdate', 0, '', $config["autoupdate"], true);
$table->data[11][0] = __('Enforce https');
$table->data[11][1] = __('Yes').'&nbsp;&nbsp;&nbsp;'.html_print_radio_button_extended ('https', 1, '', $config["https"], false, "if (! confirm ('" . __('If SSL is not properly configured you will lose access to Pandora FMS Console. Do you want to continue?') . "')) return false", '', true) .'&nbsp;&nbsp;';
$table->data[11][1] = __('Yes').'&nbsp;&nbsp;&nbsp;'.html_print_radio_button_extended ('https', 1, '', $config["https"], false, "if (! confirm ('" . __('If SSL is not properly configured you will lose access to %s Console. Do you want to continue?', get_product_name()) . "')) return false", '', true) .'&nbsp;&nbsp;';
$table->data[11][1] .= __('No').'&nbsp;&nbsp;&nbsp;'.html_print_radio_button ('https', 0, '', $config["https"], true);
$table->data[12][0] = __('Use cert of SSL');
@ -99,7 +99,7 @@ $table->data[16][0] = __('API password') .
ui_print_help_tip (__("Please be careful if you put a password put https access."), true);
$table->data[16][1] = html_print_input_password('api_password', io_output_password($config['api_password']), '', 25, 255, true);
$table->data[17][0] = __('Enable GIS features in Pandora Console');
$table->data[17][0] = __('Enable GIS features');
$table->data[17][1] = __('Yes').'&nbsp;&nbsp;&nbsp;'.html_print_radio_button ('activate_gis', 1, '', $config["activate_gis"], true).'&nbsp;&nbsp;';
$table->data[17][1] .= __('No').'&nbsp;&nbsp;&nbsp;'.html_print_radio_button ('activate_gis', 0, '', $config["activate_gis"], true);
@ -141,7 +141,6 @@ $table->data[23][1] .= '<a id="change_timezone">'.html_print_image ('images/penc
$table->data[23][1] .= "&nbsp;&nbsp;". html_print_select($zone_name, 'zone', $zone_selected, 'show_timezone();', '', '', true);
$table->data[23][1] .= "&nbsp;&nbsp;". html_print_select($timezone_n, 'timezone', $config["timezone"], '', '', '', true);
$sounds = get_sounds();
$table->data[24][0] = __('Sound for Alert fired');
$table->data[24][1] = html_print_select($sounds, 'sound_alert', $config['sound_alert'], 'replaySound(\'alert\');', '', '', true);
@ -159,12 +158,12 @@ $table->data[26][1] .= ' <a href="javascript: toggleButton(\'warning\');">' . ht
$table->data[26][1] .= '<div id="layer_sound_warning"></div>';
$table->data[28][0] = __('Public URL');
$table->data[28][0] .= ui_print_help_tip(__('Set this value when your PandoraFMS across inverse proxy or for example with mod_proxy of Apache.') .
' '.__('Without the index.php such as http://domain/pandora_url/'), true);
$table->data[28][0] .= ui_print_help_tip(__('Set this value when your %s across inverse proxy or for example with mod_proxy of Apache.', get_product_name()) .
' '.__('Without the index.php such as http://domain/console_url/'), true);
$table->data[28][1] = html_print_input_text ('public_url', $config['public_url'], '', 40, 255, true);
$table->data[29][0] = __('Referer security');
$table->data[29][0] .= ui_print_help_tip(__('When it is set as "yes" in some important sections check if the user have gone from url Pandora.'), true);
$table->data[29][0] .= ui_print_help_tip(__("If enabled, actively checks if the user comes from %s's URL", get_product_name()), true);
$table->data[29][1] = __('Yes') . '&nbsp;&nbsp;&nbsp;' .
html_print_radio_button ('referer_security', 1, '', $config["referer_security"], true) .
'&nbsp;&nbsp;';
@ -281,20 +280,10 @@ function show_timezone () {
}
$(document).ready (function () {
$("#zone").attr("hidden", true);
$("#timezone").attr("hidden", true);
$("input[name='acl_enterprise']").click(function() {
flag = $(this).is(':checked');
if (flag == true) {
<?php
echo "if (! confirm ('" . __('If Enterprise ACL System is enabled without rules you will lose access to Pandora FMS Console (even admin). Do you want to continue?') . "')) return false;";
?>
}
});
$("#change_timezone").click(function () {
$("#zone").attr("hidden", false);
$("#timezone").attr("hidden", false);

View File

@ -163,7 +163,7 @@ $iconsets["color_text"] = __('Colors and text');
$table_styles->data[$row][1] = html_print_select($iconsets,
'status_images_set', $config["status_images_set"], '', '', '', true);
$table_styles->data[$row][1] .= "&nbsp;" .
html_print_button(__("View"), 'status_set_preview', false, '', '', true);
html_print_button(__("View"), 'status_set_preview', false, '', 'class="sub camera logo_preview"', true);
$row++;
$table_styles->data[$row][0] = __('Login background') .
@ -179,15 +179,40 @@ if(!enterprise_installed()){
$open=true;
}
// Custom favicon
$files = list_files('images/custom_favicon', "ico", 1, 0);
$table_styles->data[$row][0] = __('Custom favicon');
$table_styles->data[$row][0] .= ui_print_help_tip(__('You can place your favicon into the folder images/custom_favicon/. This file should be in .ico format with a size of 16x16.'), true);
$table_styles->data[$row][1] = html_print_select(
$files,
'custom_favicon',
$config["custom_favicon"],
'setup_visuals_change_favicon();',
__('Default'),
'',
true,
false,
true,
'',
false,
'width:240px'
);
$table_styles->data[$row][1] .= "&nbsp;&nbsp;&nbsp;" . html_print_image(
ui_get_favicon(),
true,
array('id' => 'favicon_preview')
);
$row++;
$table_styles->data[$row][0] = __('Custom background logo');
$table_styles->data[$row][1] = html_print_select ($backgrounds_list,
'login_background', $config["login_background"], '', __('Default'),
'', true,false,true,'',false,'width:240px');
$table_styles->data[$row][1] .= "&nbsp;" .
html_print_button(__("View"), 'login_background_preview', false, '', 'class="sub camera"', true);
html_print_button(__("View"), 'login_background_preview', false, '', 'class="sub camera logo_preview"', true);
$row++;
$table_styles->data[$row][0] = __('Custom logo (header)') . ui_print_help_icon("custom_logo", true);
if(enterprise_installed()){
$ent_files = list_files('enterprise/images/custom_logo', "png", 1, 0);
$open_files = list_files('images/custom_logo', "png", 1, 0);
@ -201,8 +226,24 @@ else{
list_files('images/custom_logo', "png", 1, 0), 'custom_logo',
$config["custom_logo"], '', '', '',true,false,true,'',$open,'width:240px');
}
$table_styles->data[$row][1] .= "&nbsp;" . html_print_button(__("View"), 'custom_logo_preview', $open, '', 'class="sub camera logo_preview"', true,false,$open,'visualmodal');
$row++;
$table_styles->data[$row][0] = __('Custom logo (header white background)');
if(enterprise_installed()){
$ent_files = list_files('enterprise/images/custom_logo', "png", 1, 0);
$open_files = list_files('images/custom_logo', "png", 1, 0);
$table_styles->data[$row][1] .= "&nbsp;" . html_print_button(__("View"), 'custom_logo_preview', $open, '', 'class="sub camera"', true,false,$open,'visualmodal');
$table_styles->data[$row][1] = html_print_select(
array_merge($open_files, $ent_files), 'custom_logo_white_bg',
$config["custom_logo_white_bg"], '', '', '',true,false,true,'',$open,'width:240px');
}
else{
$table_styles->data[$row][1] = html_print_select(
list_files('images/custom_logo', "png", 1, 0), 'custom_logo_white_bg',
$config["custom_logo_white_bg"], '', '', '',true,false,true,'',$open,'width:240px');
}
$table_styles->data[$row][1] .= "&nbsp;" . html_print_button(__("View"), 'custom_logo_white_bg_preview', $open, '', 'class="sub camera logo_preview"', true,false,$open,'visualmodal');
$row++;
$table_styles->data[$row][0] = __('Custom logo (login)') . ui_print_help_icon("custom_logo", true);
@ -218,7 +259,7 @@ else {
$config["custom_logo_login"], '', '', '',true,false,true,'',$open,'width:240px');
}
$table_styles->data[$row][1] .= "&nbsp;" . html_print_button(__("View"), 'custom_logo_login_preview', $open, '', 'class="sub camera"', true,false,$open,'visualmodal');
$table_styles->data[$row][1] .= "&nbsp;" . html_print_button(__("View"), 'custom_logo_login_preview', $open, '', 'class="sub camera logo_preview"', true,false,$open,'visualmodal');
$row++;
//Splash login
@ -229,8 +270,93 @@ if(enterprise_installed()) {
list_files('enterprise/images/custom_splash_login', "png", 1, 0), 'custom_splash_login',
$config["custom_splash_login"], '', '', '',true,false,true,'',$open,'width:240px');
$table_styles->data[$row][1] .= "&nbsp;" . html_print_button(__("View"), 'custom_splash_login_preview', $open, '', 'class="sub camera"', true,false,$open,'visualmodal');
$table_styles->data[$row][1] .= "&nbsp;" . html_print_button(__("View"), 'custom_splash_login_preview', $open, '', 'class="sub camera logo_preview"', true,false,$open,'visualmodal');
$row++;
}
if(enterprise_installed()){
// Get all the custom logos
$files = list_files('enterprise/images/custom_general_logos', "png", 1, 0);
// Custom docs icon
$table_styles->data[$row][0] = __('Custom documentation logo');
$table_styles->data[$row][0] .= ui_print_help_tip(__('You can place your custom logos into the folder enterprise/images/custom_general_logos/'), true);
$table_styles->data[$row][1] = html_print_select(
$files,
'custom_docs_logo',
$config["custom_docs_logo"],
'',
__('None'),
'',
true,
false,
true,
'',
false,
'width:240px'
);
$table_styles->data[$row][1] .= "&nbsp;" . html_print_button(__("View"), 'custom_docs_logo_preview', $open, '', 'class="sub camera logo_preview"', true,false,$open,'visualmodal');
$row++;
// Custom support icon
$table_styles->data[$row][0] = __('Custom support logo');
$table_styles->data[$row][0] .= ui_print_help_tip(__('You can place your custom logos into the folder enterprise/images/custom_general_logos/'), true);
$table_styles->data[$row][1] = html_print_select(
$files,
'custom_support_logo',
$config["custom_support_logo"],
'',
__('None'),
'',
true,
false,
true,
'',
false,
'width:240px'
);
$table_styles->data[$row][1] .= "&nbsp;" . html_print_button(__("View"), 'custom_support_logo_preview', $open, '', 'class="sub camera logo_preview"', true,false,$open,'visualmodal');
$row++;
// Custom center networkmap icon
$table_styles->data[$row][0] = __('Custom networkmap center logo');
$table_styles->data[$row][0] .= ui_print_help_tip(__('You can place your custom logos into the folder enterprise/images/custom_general_logos/'), true);
$table_styles->data[$row][1] = html_print_select(
$files,
'custom_network_center_logo',
$config["custom_network_center_logo"],
'',
__('Default'),
'',
true,
false,
true,
'',
false,
'width:240px'
);
$table_styles->data[$row][1] .= "&nbsp;" . html_print_button(__("View"), 'custom_network_center_logo_preview', $open, '', 'class="sub camera logo_preview"', true,false,$open,'visualmodal');
$row++;
// Custom center mobile console icon
$table_styles->data[$row][0] = __('Custom mobile console icon');
$table_styles->data[$row][0] .= ui_print_help_tip(__('You can place your custom logos into the folder enterprise/images/custom_general_logos/'), true);
$table_styles->data[$row][1] = html_print_select(
$files,
'custom_mobile_console_logo',
$config["custom_mobile_console_logo"],
'',
__('Default'),
'',
true,
false,
true,
'',
false,
'width:240px'
);
$table_styles->data[$row][1] .= "&nbsp;" . html_print_button(__("View"), 'custom_mobile_console_logo_preview', $open, '', 'class="sub camera logo_preview"', true,false,$open,'visualmodal');
$row++;
}
@ -258,7 +384,19 @@ if(enterprise_installed()) {
$table_styles->data[$row][0] = __('Support URL (login)');
$table_styles->data[$row][1] = html_print_input_text ('custom_support_url', $config["custom_support_url"], '', 50, 50, true);
$row++;
}
}
if(enterprise_installed()) {
$table_styles->data[$row][0] = __('Product name');
$table_styles->data[$row][1] = html_print_input_text('rb_product_name', get_product_name(), '', 30, 255, true);
$row++;
}
if(enterprise_installed()) {
$table_styles->data[$row][0] = __('Copyright notice');
$table_styles->data[$row][1] = html_print_input_text('rb_copyright_notice', get_copyright_notice(), '', 30, 255, true);
$row++;
}
$table_styles->data[$row][0] = __('Disable logo in graphs');
$table_styles->data[$row][1] = __('Yes') . '&nbsp;' .
@ -273,6 +411,13 @@ $table_styles->data[$row][1] .= __('No') . '&nbsp;' .
html_print_radio_button_extended ('fixed_graph', 0, '', $config["fixed_graph"], $open, '','',true, $open,'visualmodal');
$row++;
$table_styles->data[$row][0] = __('Disable helps');
$table_styles->data[$row][1] = __('Yes') . '&nbsp;' .
html_print_radio_button ('disable_help', 1, '', $config["disable_help"], true) .
'&nbsp;&nbsp;';
$table_styles->data[$row][1] .= __('No') . '&nbsp;' .
html_print_radio_button ('disable_help', 0, '', $config["disable_help"], true);
$row++;
$table_styles->data[$row][0] = __('Fixed header');
$table_styles->data[$row][1] = __('Yes') . '&nbsp;' .
@ -336,7 +481,7 @@ $table_gis->data[$row][1] = html_print_select($arraySelectIcon,
"gis_default_icon", $config["gis_default_icon"], "", __('Agent icon group'),
'', true);
$table_gis->data[$row][1] .= "&nbsp;" .
html_print_button(__("View"), 'gis_icon_preview', false, '', '', true);
html_print_button(__("View"), 'gis_icon_preview', false, '', 'class="sub camera logo_preview"', true);
$row++;
echo "<fieldset>";
@ -386,7 +531,7 @@ $table_font->data[$row][1] = html_print_select($font_size_array, 'font_size',
$row++;
$table_font->data[$row][0] = __('Agent size text') .
ui_print_help_tip(__('When the agent name have a lot of characters, in some places in Pandora Console it is necesary truncate to N characters.'), true);
ui_print_help_tip(__('When the agent name has a lot of characters, it is needed to truncate it into N characters in some sections in %s Console', get_product_name()), true);
$table_font->data[$row][1] = __('Small:') .
html_print_input_text ('agent_size_text_small', $config["agent_size_text_small"], '', 3, 3, true);
$table_font->data[$row][1] .= ' ' . __('Normal:') .
@ -394,19 +539,19 @@ $table_font->data[$row][1] .= ' ' . __('Normal:') .
$row++;
$table_font->data[$row][0] = __('Module size text') .
ui_print_help_tip(__('When the module name have a lot of characters, in some places in Pandora Console it is necesary truncate to N characters.'), true);
ui_print_help_tip(__('When the module name has a lot of characters, it is needed to truncate it into N characters in some sections in %s Console', get_product_name()), true);
$table_font->data[$row][1] = __('Small:') .
html_print_input_text ('module_size_text_small', $config["module_size_text_small"], '', 3, 3, true);
$table_font->data[$row][1] .= ' ' . __('Normal:') .
html_print_input_text ('module_size_text_medium', $config["module_size_text_medium"], '', 3, 3, true);
$row++;
$table_font->data[$row][0] = __('Description size text') . ui_print_help_tip(__('When the description name have a lot of characters, in some places in Pandora Console it is necesary truncate to N characters.'), true);
$table_font->data[$row][0] = __('Description size text') . ui_print_help_tip(__('If the description name has a lot of characters, in some places in %s Console it is necessary to truncate it to N characters.', get_product_name()), true);
$table_font->data[$row][1] = html_print_input_text ('description_size_text', $config["description_size_text"], '', 3, 3, true);
$row++;
$table_font->data[$row][0] = __('Item title size text') .
ui_print_help_tip(__('When the item title name have a lot of characters, in some places in Pandora Console it is necesary truncate to N characters.'), true);
ui_print_help_tip(__('When the item title name has a lot of characters, it is needed to truncate it into N characters in some sections in %s Console.', get_product_name()), true);
$table_font->data[$row][1] = html_print_input_text('item_title_size_text',
$config["item_title_size_text"], '', 3, 3, true);
$row++;
@ -488,7 +633,7 @@ if (!enterprise_installed()) {
$disabled_graph_precision = true;
}
$table_chars->data[$row][0] = __('Data precision in PandoraFMS');
$table_chars->data[$row][0] = __('Data precision');
$table_chars->data[$row][0] .= ui_print_help_tip(__('Number of decimals shown. It must be a number between 0 and 5, except in graphs.'), true);
$table_chars->data[$row][1] = html_print_input_text ('graph_precision', $config["graph_precision"], '', 5, 5, true, $disabled_graph_precision, false, "onChange=\"change_precision()\"");
$row++;
@ -665,7 +810,7 @@ $table_other->data['custom_report_front-font'][1] = html_print_select ($_fonts,
$table_other->data['custom_report_front-logo'][0] = __('Custom report front') . ' - ' .
__('Custom logo') .
ui_print_help_tip(
__("The dir of custom logos is in your www Pandora Console in \"images/custom_logo\". You can upload more files (ONLY JPEG AND PNG) in upload tool in console."), true);
__("The dir of custom logos is in your www Console in 'images/custom_logo'. You can upload more files (ONLY JPEG AND PNG) in upload tool in console."), true);
$table_other->data['custom_report_front-logo'][1] = html_print_select(
$customLogos,
'custom_report_front_logo',
@ -874,6 +1019,7 @@ function load_fonts() {
}
ui_require_javascript_file('tiny_mce', 'include/javascript/tiny_mce/');
ui_require_javascript_file('pandora');
?>
<script language="javascript" type="text/javascript">
@ -1056,167 +1202,73 @@ $(document).ready (function () {
});
});
// Change the favicon preview when is changed
function setup_visuals_change_favicon() {
var icon_name = $("select#custom_favicon option:selected").val();
var icon_path = (icon_name == "")
? "images/pandora.ico"
: "images/custom_favicon/" + icon_name;
$("#favicon_preview").attr("src", "<?php echo $config['homeurl'];?>" + icon_path);
}
// Dialog loaders for the images previews
$(".logo_preview").click (function(e) {
// Init the vars
var icon_name = '';
var icon_path = '';
var options = {
title: "<?php echo __('Logo preview'); ?>"
};
$("#button-custom_logo_preview").click (function (e) {
var icon_name = $("select#custom_logo option:selected").val();
var icon_path = "<?php echo $config['homeurl']; if(enterprise_installed){ echo 'enterprise/'; } ?>images/custom_logo/" + icon_name;
if (icon_name == "")
return;
$dialog = $("<div></div>");
$image = $("<div style='background-color:grey'><img src=\"" + icon_path + "\"></div>");
$image
.css('max-width', '500px')
.css('max-height', '500px');
try {
$dialog
.hide()
.html($image)
.dialog({
title: "<?php echo __('Logo preview'); ?>",
resizable: true,
draggable: true,
modal: true,
overlay: {
opacity: 0.5,
background: "black"
},
minHeight: 1,
width: $image.width,
close: function () {
$dialog
.empty()
.remove();
}
}).show();
// Fill it seing the target has been clicked
switch (e.target.id) {
case 'button-custom_logo_preview':
icon_name = $("select#custom_logo option:selected").val();
icon_path = "<?php echo $config['homeurl']; if(enterprise_installed){ echo 'enterprise/'; } ?>images/custom_logo/" + icon_name;
options.grayed = true;
break;
case 'button-custom_logo_white_bg_preview':
icon_name = $("select#custom_logo_white_bg option:selected").val();
icon_path = "<?php echo $config['homeurl']; if(enterprise_installed){ echo 'enterprise/'; } ?>images/custom_logo/" + icon_name;
break;
case 'button-custom_logo_login_preview':
icon_name = $("select#custom_logo_login option:selected").val();
icon_path = "<?php echo $config['homeurl']; if(enterprise_installed){ echo 'enterprise/'; } ?>images/custom_logo_login/" + icon_name;
options.grayed = true;
break;
case 'button-custom_splash_login_preview':
icon_name = $("select#custom_splash_login option:selected").val();
icon_path = "<?php echo $config['homeurl']; if(enterprise_installed){ echo 'enterprise/'; } ?>images/custom_splash_login/" + icon_name;
options.title = "<?php echo __('Splash Preview'); ?>";
break;
case 'button-custom_docs_logo_preview':
icon_name = $("select#custom_docs_logo option:selected").val();
icon_path = "<?php echo $config['homeurl']; ?>enterprise/images/custom_general_logos/" + icon_name;
options.grayed = true;
break;
case 'button-custom_support_logo_preview':
icon_name = $("select#custom_support_logo option:selected").val();
icon_path = "<?php echo $config['homeurl']; ?>enterprise/images/custom_general_logos/" + icon_name;
options.grayed = true;
break;
case 'button-custom_network_center_logo_preview':
icon_name = $("select#custom_network_center_logo option:selected").val();
icon_path = "<?php echo $config['homeurl']; ?>enterprise/images/custom_general_logos/" + icon_name;
break;
case 'button-custom_mobile_console_logo_preview':
icon_name = $("select#custom_mobile_console_logo option:selected").val();
icon_path = "<?php echo $config['homeurl']; ?>enterprise/images/custom_general_logos/" + icon_name;
options.title = "<?php echo __('Mobile console logo preview'); ?>";
break;
case 'button-login_background_preview':
icon_name = $("select#login_background option:selected").val();
icon_path = "<?php echo $config['homeurl']; ?>/images/backgrounds/" + icon_name;
options.title = "<?php echo __('Background preview'); ?>";
break;
}
catch (err) {
// console.log(err);
}
});
$("#button-custom_logo_login_preview").click (function (e) {
var icon_name = $("select#custom_logo_login option:selected").val();
var icon_path = "<?php echo $config['homeurl']; if(enterprise_installed){ echo 'enterprise/'; } ?>images/custom_logo_login/" + icon_name;
if (icon_name == "")
return;
$dialog = $("<div></div>");
$image = $("<div style='background-color:grey'><img src=\"" + icon_path + "\"></div>");
$image
.css('max-width', '500px')
.css('max-height', '500px');
try {
$dialog
.hide()
.html($image)
.dialog({
title: "<?php echo __('Logo preview'); ?>",
resizable: true,
draggable: true,
modal: true,
overlay: {
opacity: 0.5,
background: "black"
},
minHeight: 1,
width: $image.width,
close: function () {
$dialog
.empty()
.remove();
}
}).show();
}
catch (err) {
// console.log(err);
}
});
$("#button-custom_splash_login_preview").click (function (e) {
var icon_name = $("select#custom_splash_login option:selected").val();
var icon_path = "<?php echo $config['homeurl']; if(enterprise_installed){ echo 'enterprise/'; } ?>images/custom_splash_login/" + icon_name;
if (icon_name == "")
return;
$dialog = $("<div></div>");
$image = $("<img src=\"" + icon_path + "\">");
$image
.css('max-width', '500px')
.css('max-height', '500px');
try {
$dialog
.hide()
.html($image)
.dialog({
title: "<?php echo __('Splash Preview'); ?>",
resizable: true,
draggable: true,
modal: true,
overlay: {
opacity: 0.5,
background: "black"
},
minHeight: 1,
width: $image.width,
close: function () {
$dialog
.empty()
.remove();
}
}).show();
}
catch (err) {
// console.log(err);
}
});
$("#button-login_background_preview").click (function (e) {
var icon_name = $("select#login_background option:selected").val();
var icon_path = "<?php echo $config['homeurl']; ?>/images/backgrounds/" + icon_name;
if (icon_name == "")
return;
$dialog = $("<div></div>");
$image = $("<img src=\"" + icon_path + "\">");
$image
.css('max-width', '500px')
.css('max-height', '500px');
try {
$dialog
.hide()
.html($image)
.dialog({
title: "<?php echo __('Background preview'); ?>",
resizable: true,
draggable: true,
modal: true,
overlay: {
opacity: 0.5,
background: "black"
},
minHeight: 1,
width: $image.width,
close: function () {
$dialog
.empty()
.remove();
}
}).show();
}
catch (err) {
// console.log(err);
}
// Display the preview
logo_preview (icon_name, icon_path, options);
});
$("#button-gis_icon_preview").click (function (e) {

View File

@ -37,7 +37,7 @@ $baseurl = ui_get_full_url(false, false, false, false);
var drop_the_package_here_or = "<?php echo __('Drop the package here or'); ?>\n";
var browse_it = "<?php echo __('browse it'); ?>\n";
var the_package_has_been_uploaded_successfully = "<?php echo __('The package has been uploaded successfully.'); ?>\n";
var remember_that_this_package_will = "<?php echo __('Remember that this package will override the actual Pandora FMS files and it is recommended to do a backup before continue with the update.'); ?>\n";
var remember_that_this_package_will = "<?php echo __("Please keep in mind that this package is going to override your actual %s files and that it's recommended to conduct a backup before continuing the updating process.", get_product_name()); ?>\n";
var click_on_the_file_below_to_begin = "<?php echo __('Click on the file below to begin.'); ?>\n";
var updating = "<?php echo __('Updating'); ?>\n";
var package_updated_successfully = "<?php echo __('Package updated successfully.'); ?>\n";

View File

@ -46,7 +46,7 @@ if (!is_metaconsole()) {
$buttons[$tab]['active'] = true;
ui_print_page_header (__('User management').' &raquo; '.__('Profiles defined in Pandora'), "images/gm_users.png", false, "", true, $buttons);
ui_print_page_header (__('User management').' &raquo; '.__('Profiles defined on %s', get_product_name()), "images/gm_users.png", false, "", true, $buttons);
$sec2 = 'gusuarios';
}
else {
@ -211,8 +211,8 @@ if ($id_profile || $new_profile) {
' Visual console edit: ' . $vconsole_edit .
' Visual console management: ' . $vconsole_management .
' Pandora Management: ' . $pandora_management;
' ' . get_product_name() . ' Management: ' . $pandora_management;
enterprise_hook('audit_pandora_enterprise', array($id_audit, $info));
@ -361,7 +361,7 @@ if ($id_profile || $new_profile) {
// Pandora
$row = array();
$row['name'] = __('Pandora management');
$row['name'] = __('%s management', get_product_name());
$row['input'] = html_print_checkbox ('pandora_management', 1, $pandora_management, true);
$table->data['PM'] = $row;
$table->data[] = '<hr>';

View File

@ -149,7 +149,7 @@ if ($new_user && $config['admin_can_add_user']) {
if ($create_user) {
if (! $config['admin_can_add_user']) {
ui_print_error_message (__('The current authentication scheme doesn\'t support creating users from Pandora FMS'));
ui_print_error_message (__('The current authentication scheme doesn\'t support creating users on %s', get_product_name()));
return;
}

View File

@ -50,7 +50,7 @@ if (!defined('METACONSOLE')) {
$buttons[$tab]['active'] = true;
ui_print_page_header (__('User management').' &raquo; '.__('Profiles defined in Pandora'), "images/gm_users.png", false, "profile", true, $buttons);
ui_print_page_header (__('User management').' &raquo; '.__('Profiles defined on %s', get_product_name()), "images/gm_users.png", false, "profile", true, $buttons);
$sec = 'gusuarios';
}
else {
@ -205,7 +205,7 @@ if ($update_profile) {
"Visual console view":"'.$vconsole_view.'",
"Visual console edit":"'.$vconsole_edit.'",
"Visual console management":"'.$vconsole_management.'",
"Pandora Management":"'.$pandora_management.'"}';
"'.get_product_name().' Management":"'.$pandora_management.'"}';
db_pandora_audit("User management",
"Update profile ". $name, false, false, $info);
@ -252,7 +252,7 @@ if ($create_profile) {
"Visual console view":"'.$vconsole_view.'",
"Visual console edit":"'.$vconsole_edit.'",
"Visual console management":"'.$vconsole_management.'",
"Pandora Management":"'.$pandora_management.'"}';
"'.get_product_name().' Management":"'.$pandora_management.'"}';
db_pandora_audit("User management",
"Created profile ". $name, false, false, $info);

View File

@ -118,7 +118,7 @@ else {
$buttons[$tab]['active'] = true;
ui_print_page_header (__('User management').' &raquo; '.__('Users defined in Pandora'), "images/gm_users.png", false, "", true, $buttons);
ui_print_page_header (__('User management').' &raquo; '.__('Users defined on %s', get_product_name()), "images/gm_users.png", false, "", true, $buttons);
$sec = 'gusuarios';
@ -486,7 +486,7 @@ if ($config["admin_can_add_user"] !== false) {
echo '</form>';
}
else {
echo '<i>'.__('The current authentication scheme doesn\'t support creating users from Pandora FMS').'</i>';
echo '<i>'.__("The current authentication scheme doesn't support creating users on %s", get_product_name()).'</i>';
}
echo '</div>';

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 KiB

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