Merge remote-tracking branch 'origin/develop' into ent-5108-ws-cookie-parser
This commit is contained in:
fbsanchez
commit
ded6dcb41a
|
|
@ -1,5 +1,5 @@
|
|||
# Base config file for Pandora FMS agents
|
||||
# Version 7.0NG.741, AIX version
|
||||
# Version 7.0NG.742, AIX version
|
||||
# Licensed under GPL license v2,
|
||||
# Copyright (c) 2003-2010 Artica Soluciones Tecnologicas
|
||||
# http://www.pandorafms.com
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# Base config file for Pandora FMS agents
|
||||
# Version 7.0NG.741, FreeBSD Version
|
||||
# Version 7.0NG.742, FreeBSD Version
|
||||
# Licensed under GPL license v2,
|
||||
# Copyright (c) 2003-2010 Artica Soluciones Tecnologicas
|
||||
# http://www.pandorafms.com
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# Base config file for Pandora FMS agents
|
||||
# Version 7.0NG.741, HP-UX Version
|
||||
# Version 7.0NG.742, HP-UX Version
|
||||
# Licensed under GPL license v2,
|
||||
# Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
|
||||
# http://www.pandorafms.com
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# Base config file for Pandora FMS agents
|
||||
# Version 7.0NG.741, GNU/Linux
|
||||
# Version 7.0NG.742, GNU/Linux
|
||||
# Licensed under GPL license v2,
|
||||
# Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
|
||||
# http://www.pandorafms.com
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# Base config file for Pandora FMS agents
|
||||
# Version 7.0NG.741, GNU/Linux
|
||||
# Version 7.0NG.742, GNU/Linux
|
||||
# Licensed under GPL license v2,
|
||||
# Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
|
||||
# http://www.pandorafms.com
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# Base config file for Pandora FMS agents
|
||||
# Version 7.0NG.741, Solaris Version
|
||||
# Version 7.0NG.742, Solaris Version
|
||||
# Licensed under GPL license v2,
|
||||
# Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
|
||||
# http://www.pandorafms.com
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Base config file for Pandora FMS Windows Agent
|
||||
# (c) 2006-2010 Artica Soluciones Tecnologicas
|
||||
# Version 7.0NG.741
|
||||
# Version 7.0NG.742
|
||||
|
||||
# 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
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Fichero de configuracion base de agentes de Pandora
|
||||
# Base config file for Pandora agents
|
||||
# Version 7.0NG.741, AIX version
|
||||
# Version 7.0NG.742, AIX version
|
||||
|
||||
# General Parameters
|
||||
# ==================
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Fichero de configuracion base de agentes de Pandora
|
||||
# Base config file for Pandora agents
|
||||
# Version 7.0NG.741
|
||||
# Version 7.0NG.742
|
||||
# FreeBSD/IPSO version
|
||||
# Licenced under GPL licence, 2003-2007 Sancho Lerena
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Fichero de configuracion base de agentes de Pandora
|
||||
# Base config file for Pandora agents
|
||||
# Version 7.0NG.741, HPUX Version
|
||||
# Version 7.0NG.742, HPUX Version
|
||||
|
||||
# General Parameters
|
||||
# ==================
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# Base config file for Pandora FMS agents
|
||||
# Version 7.0NG.741
|
||||
# Version 7.0NG.742
|
||||
# Licensed under GPL license v2,
|
||||
# (c) 2003-2010 Artica Soluciones Tecnologicas
|
||||
# please visit http://pandora.sourceforge.net
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# Base config file for Pandora FMS agents
|
||||
# Version 7.0NG.741
|
||||
# Version 7.0NG.742
|
||||
# Licensed under GPL license v2,
|
||||
# (c) 2003-2009 Artica Soluciones Tecnologicas
|
||||
# please visit http://pandora.sourceforge.net
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# Base config file for Pandora FMS agents
|
||||
# Version 7.0NG.741
|
||||
# Version 7.0NG.742
|
||||
# Licensed under GPL license v2,
|
||||
# please visit http://pandora.sourceforge.net
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Fichero de configuracion base de agentes de Pandora
|
||||
# Base config file for Pandora agents
|
||||
# Version 7.0NG.741, Solaris version
|
||||
# Version 7.0NG.742, Solaris version
|
||||
|
||||
# General Parameters
|
||||
# ==================
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# Base config file for Pandora FMS agents
|
||||
# Version 7.0NG.741, AIX version
|
||||
# Version 7.0NG.742, AIX version
|
||||
# Licensed under GPL license v2,
|
||||
# Copyright (c) 2003-2010 Artica Soluciones Tecnologicas
|
||||
# http://www.pandorafms.com
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
package: pandorafms-agent-unix
|
||||
Version: 7.0NG.741-191211
|
||||
Version: 7.0NG.742
|
||||
Architecture: all
|
||||
Priority: optional
|
||||
Section: admin
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
|
||||
pandora_version="7.0NG.741-191211"
|
||||
pandora_version="7.0NG.742"
|
||||
|
||||
echo "Test if you has the tools for to make the packages."
|
||||
whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# Base config file for Pandora FMS agents
|
||||
# Version 7.0NG.741, GNU/Linux
|
||||
# Version 7.0NG.742, GNU/Linux
|
||||
# Licensed under GPL license v2,
|
||||
# Copyright (c) 2003-2012 Artica Soluciones Tecnologicas
|
||||
# http://www.pandorafms.com
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# Base config file for Pandora FMS agents
|
||||
# Version 7.0NG.741, FreeBSD Version
|
||||
# Version 7.0NG.742, FreeBSD Version
|
||||
# Licensed under GPL license v2,
|
||||
# Copyright (c) 2003-2016 Artica Soluciones Tecnologicas
|
||||
# http://www.pandorafms.com
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# Base config file for Pandora FMS agents
|
||||
# Version 7.0NG.741, HP-UX Version
|
||||
# Version 7.0NG.742, HP-UX Version
|
||||
# Licensed under GPL license v2,
|
||||
# Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
|
||||
# http://www.pandorafms.com
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# Base config file for Pandora FMS agents
|
||||
# Version 7.0NG.741, GNU/Linux
|
||||
# Version 7.0NG.742, GNU/Linux
|
||||
# Licensed under GPL license v2,
|
||||
# Copyright (c) 2003-2014 Artica Soluciones Tecnologicas
|
||||
# http://www.pandorafms.com
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# Base config file for Pandora FMS agents
|
||||
# Version 7.0NG.741, GNU/Linux
|
||||
# Version 7.0NG.742, GNU/Linux
|
||||
# Licensed under GPL license v2,
|
||||
# Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
|
||||
# http://www.pandorafms.com
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# Base config file for Pandora FMS agents
|
||||
# Version 7.0NG.741, NetBSD Version
|
||||
# Version 7.0NG.742, NetBSD Version
|
||||
# Licensed under GPL license v2,
|
||||
# Copyright (c) 2003-2010 Artica Soluciones Tecnologicas
|
||||
# http://www.pandorafms.com
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# Base config file for Pandora FMS agents
|
||||
# Version 7.0NG.741, Solaris Version
|
||||
# Version 7.0NG.742, Solaris Version
|
||||
# Licensed under GPL license v2,
|
||||
# Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
|
||||
# http://www.pandorafms.com
|
||||
|
|
|
|||
|
|
@ -54,8 +54,8 @@ my $Sem = undef;
|
|||
# Semaphore used to control the number of threads
|
||||
my $ThreadSem = undef;
|
||||
|
||||
use constant AGENT_VERSION => '7.0NG.741';
|
||||
use constant AGENT_BUILD => '191211';
|
||||
use constant AGENT_VERSION => '7.0NG.742';
|
||||
use constant AGENT_BUILD => '191216';
|
||||
|
||||
# Agent log default file size maximum and instances
|
||||
use constant DEFAULT_MAX_LOG_SIZE => 600000;
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
#Pandora FMS Linux Agent
|
||||
#
|
||||
%define name pandorafms_agent_unix
|
||||
%define version 7.0NG.741
|
||||
%define release 191211
|
||||
%define version 7.0NG.742
|
||||
%define release 1
|
||||
|
||||
Summary: Pandora FMS Linux agent, PERL version
|
||||
Name: %{name}
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
#Pandora FMS Linux Agent
|
||||
#
|
||||
%define name pandorafms_agent_unix
|
||||
%define version 7.0NG.741
|
||||
%define release 191211
|
||||
%define version 7.0NG.742
|
||||
%define release 1
|
||||
|
||||
Summary: Pandora FMS Linux agent, PERL version
|
||||
Name: %{name}
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@
|
|||
# Please see http://www.pandorafms.org. This code is licensed under GPL 2.0 license.
|
||||
# **********************************************************************
|
||||
|
||||
PI_VERSION="7.0NG.741"
|
||||
PI_BUILD="191211"
|
||||
PI_VERSION="7.0NG.742"
|
||||
PI_BUILD="191216"
|
||||
OS_NAME=`uname -s`
|
||||
|
||||
FORCE=0
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Base config file for Pandora FMS Windows Agent
|
||||
# (c) 2006-2017 Artica Soluciones Tecnologicas
|
||||
# Version 7.0NG.741
|
||||
# Version 7.0NG.742
|
||||
|
||||
# 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
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ AllowLanguageSelection
|
|||
{Yes}
|
||||
|
||||
AppName
|
||||
{Pandora FMS Windows Agent v7.0NG.741}
|
||||
{Pandora FMS Windows Agent v7.0NG.742}
|
||||
|
||||
ApplicationID
|
||||
{17E3D2CF-CA02-406B-8A80-9D31C17BD08F}
|
||||
|
|
@ -186,7 +186,7 @@ UpgradeApplicationID
|
|||
{}
|
||||
|
||||
Version
|
||||
{191211}
|
||||
{191216}
|
||||
|
||||
ViewReadme
|
||||
{Yes}
|
||||
|
|
@ -2387,7 +2387,7 @@ Windows,BuildSeparateArchives
|
|||
{No}
|
||||
|
||||
Windows,Executable
|
||||
{<%AppName%>-<%Version%>-Setup<%Ext%>}
|
||||
{<%AppName%>-Setup<%Ext%>}
|
||||
|
||||
Windows,FileDescription
|
||||
{<%AppName%> <%Version%> Setup}
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ using namespace Pandora;
|
|||
using namespace Pandora_Strutils;
|
||||
|
||||
#define PATH_SIZE _MAX_PATH+1
|
||||
#define PANDORA_VERSION ("7.0NG.741(Build 191211)")
|
||||
#define PANDORA_VERSION ("7.0NG.742(Build 191216)")
|
||||
|
||||
string pandora_path;
|
||||
string pandora_dir;
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ BEGIN
|
|||
VALUE "LegalCopyright", "Artica ST"
|
||||
VALUE "OriginalFilename", "PandoraAgent.exe"
|
||||
VALUE "ProductName", "Pandora FMS Windows Agent"
|
||||
VALUE "ProductVersion", "(7.0NG.741(Build 191211))"
|
||||
VALUE "ProductVersion", "(7.0NG.742(Build 191216))"
|
||||
VALUE "FileVersion", "1.0.0.0"
|
||||
END
|
||||
END
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
package: pandorafms-console
|
||||
Version: 7.0NG.741-191211
|
||||
Version: 7.0NG.742
|
||||
Architecture: all
|
||||
Priority: optional
|
||||
Section: admin
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
|
||||
pandora_version="7.0NG.741-191211"
|
||||
pandora_version="7.0NG.742"
|
||||
|
||||
package_pear=0
|
||||
package_pandora=1
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
START TRANSACTION;
|
||||
|
||||
ALTER TABLE `treport_content` ADD COLUMN `landscape` tinyint(1) UNSIGNED NOT NULL default 0;
|
||||
ALTER TABLE `treport_content` ADD COLUMN `pagebreak` tinyint(1) UNSIGNED NOT NULL default 0;
|
||||
ALTER TABLE `treport_content_template` ADD COLUMN `landscape` tinyint(1) UNSIGNED NOT NULL default 0;
|
||||
ALTER TABLE `treport_content_template` ADD COLUMN `pagebreak` tinyint(1) UNSIGNED NOT NULL default 0;
|
||||
|
||||
ALTER TABLE `tevent_response` ADD COLUMN `command_timeout` int(5) unsigned NOT NULL DEFAULT 90;
|
||||
|
||||
COMMIT;
|
||||
|
|
|
|||
|
|
@ -842,6 +842,8 @@ ALTER TABLE `treport_content_template` MODIFY COLUMN `historical_db` tinyint(1)
|
|||
MODIFY COLUMN `lapse_calc` tinyint(1) unsigned NOT NULL DEFAULT '0',
|
||||
MODIFY COLUMN `lapse` int(11) unsigned NOT NULL DEFAULT '300',
|
||||
MODIFY COLUMN `visual_format` tinyint(1) unsigned NOT NULL DEFAULT '0';
|
||||
ALTER TABLE `treport_content_template` ADD COLUMN `landscape` tinyint(1) UNSIGNED NOT NULL default 0;
|
||||
ALTER TABLE `treport_content_template` ADD COLUMN `pagebreak` tinyint(1) UNSIGNED NOT NULL default 0;
|
||||
|
||||
-- ----------------------------------------------------------------------
|
||||
-- Table `tnews`
|
||||
|
|
@ -1330,13 +1332,13 @@ ALTER TABLE `tmap` MODIFY COLUMN `id_user` varchar(250) NOT NULL DEFAULT '';
|
|||
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', 33);
|
||||
INSERT INTO `tconfig` (`token`, `value`) VALUES ('MR', 34);
|
||||
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', '741');
|
||||
INSERT INTO `tconfig` (`token`, `value`) VALUES ('current_package_enterprise', '742');
|
||||
INSERT INTO `tconfig` (`token`, `value`) VALUES ('status_monitor_fields', 'policy,agent,data_type,module_name,server_type,interval,status,graph,warn,data,timestamp');
|
||||
UPDATE `tconfig` SET `value` = 'mini_severity,evento,id_agente,estado,timestamp' WHERE `token` LIKE 'event_fields';
|
||||
DELETE FROM `tconfig` WHERE `token` LIKE 'integria_api_password';
|
||||
|
|
@ -1601,6 +1603,8 @@ ALTER TABLE `treport_content` MODIFY COLUMN `historical_db` tinyint(1) unsigned
|
|||
MODIFY COLUMN `visual_format` tinyint(1) unsigned NOT NULL DEFAULT '0',
|
||||
MODIFY COLUMN `failover_mode` tinyint(1) NULL DEFAULT '1',
|
||||
MODIFY COLUMN `failover_type` tinyint(1) NULL DEFAULT '1';
|
||||
ALTER TABLE `treport_content` ADD COLUMN `landscape` tinyint(1) UNSIGNED NOT NULL default 0;
|
||||
ALTER TABLE `treport_content` ADD COLUMN `pagebreak` tinyint(1) UNSIGNED NOT NULL default 0;
|
||||
|
||||
-- ---------------------------------------------------------------------
|
||||
-- Table `tmodule_relationship`
|
||||
|
|
|
|||
|
|
@ -546,7 +546,7 @@ if ($create_modules) {
|
|||
$module_values = $common_values;
|
||||
|
||||
$module_values['descripcion'] = sprintf(__('Check if the process %s is running or not'), $process);
|
||||
$module_values['id_tipo_modulo'] = modules_get_type_id('remote_snmp_proc');
|
||||
$module_values['id_tipo_modulo'] = modules_get_type_id('generic_proc');
|
||||
$module_values['id_modulo'] = MODULE_PLUGIN;
|
||||
$module_values['id_plugin'] = $plugin['id'];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,16 +1,18 @@
|
|||
<?php
|
||||
/**
|
||||
* Pandora FMS - http://pandorafms.com.
|
||||
* * ==================================================
|
||||
* * Copyright (c) 2005-2011 Artica Soluciones Tecnologicas
|
||||
* * Please see http://pandorafms.org for full contribution list
|
||||
* * This program is free software; you can redistribute it and/or
|
||||
* * modify it under the terms of the GNU General Public License
|
||||
* * as published by the Free Software Foundation; version 2
|
||||
* * This program is distributed in the hope that it will be useful,
|
||||
* * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* * GNU General Public License for more details.
|
||||
*/
|
||||
|
||||
// Pandora FMS - http://pandorafms.com
|
||||
// ==================================================
|
||||
// Copyright (c) 2005-2011 Artica Soluciones Tecnologicas
|
||||
// Please see http://pandorafms.org for full contribution list
|
||||
// This program is free software; you can redistribute it and/or
|
||||
// modify it under the terms of the GNU General Public License
|
||||
// as published by the Free Software Foundation; version 2
|
||||
// This program is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
global $config;
|
||||
require_once $config['homedir'].'/include/functions_agents.php';
|
||||
require_once 'include/functions_modules.php';
|
||||
|
|
@ -23,19 +25,19 @@ require_once 'include/graphs/functions_utils.php';
|
|||
check_login();
|
||||
|
||||
$ip_target = (string) get_parameter('ip_target', $ipAgent);
|
||||
// Host
|
||||
// Host.
|
||||
$plugin_user = (string) get_parameter('plugin_user', 'Administrator');
|
||||
// Username
|
||||
// Username.
|
||||
$plugin_pass = io_safe_output(get_parameter('plugin_pass', ''));
|
||||
// Password
|
||||
// Password.
|
||||
$tcp_send = (string) get_parameter('tcp_send');
|
||||
// Namespace
|
||||
// Namespace.
|
||||
$server_to_exec = get_parameter('server_to_exec', 0);
|
||||
|
||||
// See if id_agente is set (either POST or GET, otherwise -1
|
||||
// See if id_agente is set (either POST or GET, otherwise -1.
|
||||
$id_agent = $idAgent;
|
||||
|
||||
// Get passed variables
|
||||
// Get passed variables.
|
||||
$wmiexplore = (int) get_parameter('wmiexplore', 0);
|
||||
$create_modules = (int) get_parameter('create_modules', 0);
|
||||
|
||||
|
|
@ -44,24 +46,30 @@ $interfaces = [];
|
|||
$wmi_client = 'wmic';
|
||||
|
||||
if ($wmiexplore) {
|
||||
$wmi_command = wmi_compose_query($wmi_client, $plugin_user, $plugin_pass, $ip_target, $tcp_send);
|
||||
$wmi_command = wmi_compose_query(
|
||||
$wmi_client,
|
||||
$plugin_user,
|
||||
$plugin_pass,
|
||||
$ip_target,
|
||||
$tcp_send
|
||||
);
|
||||
|
||||
$processes = [];
|
||||
$services = [];
|
||||
$disks = [];
|
||||
$network_component_groups = [];
|
||||
|
||||
// Processes
|
||||
// Processes.
|
||||
$wmi_processes = $wmi_command.' "select Name from Win32_Process"';
|
||||
$processes_name_field = 1;
|
||||
|
||||
if (enterprise_installed()) {
|
||||
if ($server_to_exec != 0) {
|
||||
$server_data = db_get_row('tserver', 'id_server', $server_to_exec);
|
||||
exec('ssh pandora_exec_proxy@'.$server_data['ip_address']." '".$wmi_processes."'", $output, $rc);
|
||||
} else {
|
||||
exec($wmi_processes, $output);
|
||||
}
|
||||
if (enterprise_installed() && (int) $server_to_exec != 0) {
|
||||
$server_data = db_get_row('tserver', 'id_server', $server_to_exec);
|
||||
exec(
|
||||
'ssh pandora_exec_proxy@'.$server_data['ip_address']."
|
||||
'".$wmi_processes."'",
|
||||
$output,
|
||||
$rc
|
||||
);
|
||||
} else {
|
||||
exec($wmi_processes, $output);
|
||||
}
|
||||
|
|
@ -73,7 +81,7 @@ if ($wmiexplore) {
|
|||
|
||||
if (!$fail) {
|
||||
foreach ($output as $index => $row) {
|
||||
// First and second rows are Class and column names, ignore it
|
||||
// First and second rows are Class and column names, ignore it.
|
||||
if ($index < 2) {
|
||||
continue;
|
||||
}
|
||||
|
|
@ -81,60 +89,74 @@ if ($wmiexplore) {
|
|||
$row_exploded = explode('|', $row);
|
||||
|
||||
if (!in_array($row_exploded[$processes_name_field], $processes)) {
|
||||
$processes[$row_exploded[$processes_name_field]] = $row_exploded[$processes_name_field];
|
||||
if (preg_match('/ERROR/', $row_exploded[$processes_name_field])) {
|
||||
$processes[$row_exploded[$prouycesses_name_field]] = __('None');
|
||||
} else {
|
||||
$processes[$row_exploded[$prouycesses_name_field]] = $row_exploded[$processes_name_field];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
unset($output);
|
||||
|
||||
// Services
|
||||
// Services.
|
||||
$wmi_services = $wmi_command.' "select Name from Win32_Service"';
|
||||
$services_name_field = 0;
|
||||
$services_check_field = 1;
|
||||
|
||||
if (enterprise_installed()) {
|
||||
if ($server_to_exec != 0) {
|
||||
$server_data = db_get_row('tserver', 'id_server', $server_to_exec);
|
||||
exec('ssh pandora_exec_proxy@'.$server_data['ip_address']." '".$wmi_services."'", $output, $rc);
|
||||
} else {
|
||||
exec($wmi_services, $output);
|
||||
}
|
||||
if (enterprise_installed() && (int) $server_to_exec != 0) {
|
||||
$server_data = db_get_row(
|
||||
'tserver',
|
||||
'id_server',
|
||||
$server_to_exec
|
||||
);
|
||||
exec(
|
||||
'ssh pandora_exec_proxy@'.$server_data['ip_address']."
|
||||
'".$wmi_services."'",
|
||||
$output,
|
||||
$rc
|
||||
);
|
||||
} else {
|
||||
exec($wmi_services, $output);
|
||||
}
|
||||
|
||||
foreach ($output as $index => $row) {
|
||||
// First and second rows are Class and column names, ignore it
|
||||
// First and second rows are Class and column names, ignore it.
|
||||
if ($index < 2) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$row_exploded = explode('|', $row);
|
||||
$row_exploded = explode('|', $row);
|
||||
|
||||
if (!in_array($row_exploded[$services_name_field], $services)) {
|
||||
$services[$row_exploded[$services_name_field]] = $row_exploded[$services_name_field];
|
||||
if (preg_match('/ERROR/', $row_exploded[$services_name_field])) {
|
||||
$services[$row_exploded[$services_name_field]] = __('None');
|
||||
} else {
|
||||
$services[$row_exploded[$services_name_field]] = $row_exploded[$services_name_field];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
unset($output);
|
||||
|
||||
// Disks
|
||||
// Disks.
|
||||
$wmi_disks = $wmi_command.' "Select DeviceID from Win32_LogicalDisk"';
|
||||
$disks_name_field = 0;
|
||||
|
||||
if (enterprise_installed()) {
|
||||
if ($server_to_exec != 0) {
|
||||
$server_data = db_get_row('tserver', 'id_server', $server_to_exec);
|
||||
exec('ssh pandora_exec_proxy@'.$server_data['ip_address']." '".$wmi_disks."'", $output, $rc);
|
||||
} else {
|
||||
exec($wmi_disks, $output);
|
||||
}
|
||||
if (enterprise_installed() && (int) $server_to_exec != 0) {
|
||||
$server_data = db_get_row('tserver', 'id_server', $server_to_exec);
|
||||
exec(
|
||||
'ssh pandora_exec_proxy@'.$server_data['ip_address']."
|
||||
'".$wmi_disks."'",
|
||||
$output,
|
||||
$rc
|
||||
);
|
||||
} else {
|
||||
exec($wmi_disks, $output);
|
||||
}
|
||||
|
||||
foreach ($output as $index => $row) {
|
||||
// First and second rows are Class and column names, ignore it
|
||||
// First and second rows are Class and column names, ignore it.
|
||||
if ($index < 2) {
|
||||
continue;
|
||||
}
|
||||
|
|
@ -142,14 +164,21 @@ if ($wmiexplore) {
|
|||
$row_exploded = explode('|', $row);
|
||||
|
||||
if (!in_array($row_exploded[$disks_name_field], $services)) {
|
||||
$disk_string = sprintf(__('Free space on %s'), $row_exploded[$disks_name_field]);
|
||||
$disks[$row_exploded[$disks_name_field]] = $disk_string;
|
||||
if (preg_match('/ERROR/', $row_exploded[$disks_name_field])) {
|
||||
$disks[$row_exploded[$disks_name_field]] = __('None');
|
||||
} else {
|
||||
$disk_string = sprintf(
|
||||
__('Free space on %s'),
|
||||
$row_exploded[$disks_name_field]
|
||||
);
|
||||
$disks[$row_exploded[$disks_name_field]] = $disk_string;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
unset($output);
|
||||
|
||||
// WMI Components
|
||||
// WMI Components.
|
||||
$network_component_groups = network_components_get_groups(MODULE_WMI);
|
||||
}
|
||||
}
|
||||
|
|
@ -163,14 +192,14 @@ if ($create_modules) {
|
|||
$components = [];
|
||||
|
||||
foreach ($modules as $module) {
|
||||
// Split module data to get type
|
||||
// Split module data to get type.
|
||||
$module_exploded = explode('_', $module);
|
||||
$type = $module_exploded[0];
|
||||
|
||||
// Delete type from module data
|
||||
// Delete type from module data.
|
||||
unset($module_exploded[0]);
|
||||
|
||||
// Rebuild module data
|
||||
// Rebuild module data.
|
||||
$module = implode('_', $module_exploded);
|
||||
|
||||
switch ($type) {
|
||||
|
|
@ -189,10 +218,14 @@ if ($create_modules) {
|
|||
case 'component':
|
||||
$components[] = $module;
|
||||
break;
|
||||
|
||||
default:
|
||||
// Default.
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
// Common values for WMI modules
|
||||
// Common values for WMI modules.
|
||||
$values = [
|
||||
'ip_target' => $ip_target,
|
||||
'tcp_send' => $tcp_send,
|
||||
|
|
@ -202,7 +235,10 @@ if ($create_modules) {
|
|||
];
|
||||
|
||||
if ($server_to_exec != 0) {
|
||||
$sql = sprintf('SELECT server_type FROM tserver WHERE id_server = %d', $server_to_exec);
|
||||
$sql = sprintf(
|
||||
'SELECT server_type FROM tserver WHERE id_server = %d',
|
||||
$server_to_exec
|
||||
);
|
||||
$row = db_get_row_sql($sql);
|
||||
|
||||
if ($row['server_type'] == 13) {
|
||||
|
|
@ -210,89 +246,146 @@ if ($create_modules) {
|
|||
}
|
||||
}
|
||||
|
||||
// Create Service modules
|
||||
// Create Service modules.
|
||||
$services_values = $values;
|
||||
|
||||
$services_values['snmp_community'] = 'Running';
|
||||
// Key string
|
||||
// Key string.
|
||||
$services_values['tcp_port'] = 1;
|
||||
// Field number (Running/Stopped)
|
||||
// Field number (Running/Stopped).
|
||||
$services_values['id_tipo_modulo'] = 2;
|
||||
// Generic boolean
|
||||
$services_result = wmi_create_wizard_modules($id_agent, $services, 'services', $services_values, 0, 0, $server_to_exec);
|
||||
// Generic boolean.
|
||||
$services_result = wmi_create_wizard_modules(
|
||||
$id_agent,
|
||||
$services,
|
||||
'services',
|
||||
$services_values,
|
||||
0,
|
||||
0,
|
||||
$server_to_exec
|
||||
);
|
||||
|
||||
// Create Process modules
|
||||
// Create Process modules.
|
||||
$processes_values = $values;
|
||||
|
||||
$processes_values['tcp_port'] = 0;
|
||||
// Field number (OID)
|
||||
// Field number (OID).
|
||||
$processes_values['id_tipo_modulo'] = 2;
|
||||
// Generic boolean
|
||||
$processes_result = wmi_create_wizard_modules($id_agent, $processes, 'processes', $processes_values, 0, 0, $server_to_exec);
|
||||
// Generic boolean.
|
||||
$processes_result = wmi_create_wizard_modules(
|
||||
$id_agent,
|
||||
$processes,
|
||||
'processes',
|
||||
$processes_values,
|
||||
0,
|
||||
0,
|
||||
$server_to_exec
|
||||
);
|
||||
|
||||
// Create Space on disk modules
|
||||
// Create Space on disk modules.
|
||||
$disks_values = $values;
|
||||
|
||||
$disks_values['tcp_port'] = 1;
|
||||
// Free space in bytes
|
||||
// Free space in bytes.
|
||||
$disks_values['id_tipo_modulo'] = 1;
|
||||
// Generic numeric
|
||||
// Generic numeric.
|
||||
$disks_values['unit'] = 'Bytes';
|
||||
// Unit
|
||||
$disks_result = wmi_create_wizard_modules($id_agent, $disks, 'disks', $disks_values, 0, 0, $server_to_exec);
|
||||
// Unit.
|
||||
$disks_result = wmi_create_wizard_modules(
|
||||
$id_agent,
|
||||
$disks,
|
||||
'disks',
|
||||
$disks_values,
|
||||
0,
|
||||
0,
|
||||
$server_to_exec
|
||||
);
|
||||
|
||||
// Create modules from component
|
||||
// Create modules from component.
|
||||
$components_values = $values;
|
||||
|
||||
$components_values['id_agente'] = $id_agent;
|
||||
|
||||
$components_result = wmi_create_module_from_components($components, $components_values, 0, 0, $server_to_exec);
|
||||
$components_result = wmi_create_module_from_components(
|
||||
$components,
|
||||
$components_values,
|
||||
0,
|
||||
0,
|
||||
$server_to_exec
|
||||
);
|
||||
|
||||
|
||||
// Errors/Success messages
|
||||
// Errors/Success messages.
|
||||
$success_message = '';
|
||||
$error_message = '';
|
||||
if (!empty($services_result)) {
|
||||
if (count($services_result[NOERR]) > 0) {
|
||||
$success_message .= sprintf(__('%s service modules created succesfully'), count($services_result[NOERR])).'<br>';
|
||||
$success_message .= sprintf(
|
||||
__('%s service modules created succesfully'),
|
||||
count($services_result[NOERR])
|
||||
).'<br>';
|
||||
}
|
||||
|
||||
if (count($services_result[ERR_GENERIC]) > 0) {
|
||||
$error_message .= sprintf(__('Error creating %s service modules'), count($services_result[ERR_GENERIC])).'<br>';
|
||||
$error_message .= sprintf(
|
||||
__('Error creating %s service modules'),
|
||||
count($services_result[ERR_GENERIC])
|
||||
).'<br>';
|
||||
}
|
||||
}
|
||||
|
||||
if (!empty($processes_result)) {
|
||||
if (count($processes_result[NOERR]) > 0) {
|
||||
$success_message .= sprintf(__('%s process modules created succesfully'), count($processes_result[NOERR])).'<br>';
|
||||
$success_message .= sprintf(
|
||||
__('%s process modules created succesfully'),
|
||||
count($processes_result[NOERR])
|
||||
).'<br>';
|
||||
}
|
||||
|
||||
if (count($processes_result[ERR_GENERIC]) > 0) {
|
||||
$error_message .= sprintf(__('Error creating %s process modules'), count($processes_result[ERR_GENERIC])).'<br>';
|
||||
$error_message .= sprintf(
|
||||
__('Error creating %s process modules'),
|
||||
count($processes_result[ERR_GENERIC])
|
||||
).'<br>';
|
||||
}
|
||||
}
|
||||
|
||||
if (!empty($disks_result)) {
|
||||
if (count($disks_result[NOERR]) > 0) {
|
||||
$success_message .= sprintf(__('%s disk space modules created succesfully'), count($disks_result[NOERR])).'<br>';
|
||||
$success_message .= sprintf(
|
||||
__('%s disk space modules created succesfully'),
|
||||
count($disks_result[NOERR])
|
||||
).'<br>';
|
||||
}
|
||||
|
||||
if (count($disks_result[ERR_GENERIC]) > 0) {
|
||||
$error_message .= sprintf(__('Error creating %s disk space modules'), count($disks_result[ERR_GENERIC])).'<br>';
|
||||
$error_message .= sprintf(
|
||||
__('Error creating %s disk space modules'),
|
||||
count($disks_result[ERR_GENERIC])
|
||||
).'<br>';
|
||||
}
|
||||
}
|
||||
|
||||
if (!empty($components_result)) {
|
||||
if (count($components_result[NOERR]) > 0) {
|
||||
$success_message .= sprintf(__('%s modules created from components succesfully'), count($components_result[NOERR])).'<br>';
|
||||
$success_message .= sprintf(
|
||||
__('%s modules created from components succesfully'),
|
||||
count($components_result[NOERR])
|
||||
).'<br>';
|
||||
}
|
||||
|
||||
if (count($components_result[ERR_GENERIC]) > 0) {
|
||||
$error_message .= sprintf(__('Error creating %s modules from components'), count($components_result[ERR_GENERIC])).'<br>';
|
||||
$error_message .= sprintf(
|
||||
__('Error creating %s modules from components'),
|
||||
count($components_result[ERR_GENERIC])
|
||||
).'<br>';
|
||||
}
|
||||
|
||||
if (count($components_result[ERR_EXIST]) > 0) {
|
||||
$error_message .= sprintf(__('%s modules already exist'), count($components_result[ERR_EXIST])).'<br>';
|
||||
$error_message .= sprintf(
|
||||
__('%s modules already exist'),
|
||||
count($components_result[ERR_EXIST])
|
||||
).'<br>';
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -306,7 +399,9 @@ if ($create_modules) {
|
|||
}
|
||||
|
||||
echo '<span id ="none_text" style="display: none;">'.__('None').'</span>';
|
||||
echo "<form method='post' id='wmi_form' action='index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=agent_wizard&wizard_section=wmi_explorer&id_agente=$id_agent'>";
|
||||
echo "<form method='post' id='wmi_form'
|
||||
action='index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&
|
||||
tab=agent_wizard&wizard_section=wmi_explorer&id_agente=$id_agent'>";
|
||||
|
||||
$table->width = '100%';
|
||||
$table->cellpadding = 0;
|
||||
|
|
@ -314,18 +409,47 @@ $table->cellspacing = 0;
|
|||
$table->class = 'databox filters';
|
||||
|
||||
$table->data[0][0] = '<b>'.__('Target IP').'</b>';
|
||||
$table->data[0][1] = html_print_input_text('ip_target', $ip_target, '', 15, 60, true);
|
||||
$table->data[0][1] = html_print_input_text(
|
||||
'ip_target',
|
||||
$ip_target,
|
||||
'',
|
||||
15,
|
||||
60,
|
||||
true
|
||||
);
|
||||
|
||||
$table->data[0][2] = '<b>'.__('Namespace').'</b>';
|
||||
$table->data[0][3] = html_print_input_text('tcp_send', $tcp_send, '', 15, 60, true);
|
||||
$table->data[0][3] = html_print_input_text(
|
||||
'tcp_send',
|
||||
$tcp_send,
|
||||
'',
|
||||
15,
|
||||
60,
|
||||
true
|
||||
);
|
||||
|
||||
$table->data[1][0] = '<b>'.__('Username').'</b>';
|
||||
$table->data[1][1] = html_print_input_text('plugin_user', $plugin_user, '', 15, 60, true);
|
||||
$table->data[1][1] = html_print_input_text(
|
||||
'plugin_user',
|
||||
$plugin_user,
|
||||
'',
|
||||
15,
|
||||
60,
|
||||
true
|
||||
);
|
||||
|
||||
$table->data[1][2] = '<b>'.__('Password').'</b>';
|
||||
$table->data[1][3] = html_print_input_password('plugin_pass', $plugin_pass, '', 15, 60, true);
|
||||
$table->data[1][3] = html_print_input_password(
|
||||
'plugin_pass',
|
||||
$plugin_pass,
|
||||
'',
|
||||
15,
|
||||
60,
|
||||
true
|
||||
);
|
||||
|
||||
$table->data[1][3] .= '<div id="spinner_modules" style="float: left; display: none;">'.html_print_image('images/spinner.gif', true).'</div>';
|
||||
$table->data[1][3] .= '<div id="spinner_modules" style="float: left; display: none;">
|
||||
'.html_print_image('images/spinner.gif', true).'</div>';
|
||||
html_print_input_hidden('wmiexplore', 1);
|
||||
|
||||
$servers_to_exec = [];
|
||||
|
|
@ -346,13 +470,27 @@ if (enterprise_installed()) {
|
|||
}
|
||||
|
||||
$table->data[2][0] = '<b>'.__('Server to execute command').'</b>';
|
||||
$table->data[2][1] = html_print_select($servers_to_exec, 'server_to_exec', $server_to_exec, '', '', '', true);
|
||||
$table->data[2][1] = html_print_select(
|
||||
$servers_to_exec,
|
||||
'server_to_exec',
|
||||
$server_to_exec,
|
||||
'',
|
||||
'',
|
||||
'',
|
||||
true
|
||||
);
|
||||
|
||||
html_print_table($table);
|
||||
|
||||
echo "<div style='text-align:right; width:".$table->width."'>";
|
||||
echo '<span id="oid_loading" class="invisible">'.html_print_image('images/spinner.gif', true).'</span>';
|
||||
html_print_submit_button(__('WMI Explore'), 'wmi_explore', false, ['class' => 'sub next']);
|
||||
echo '<span id="oid_loading" class="invisible">
|
||||
'.html_print_image('images/spinner.gif', true).'</span>';
|
||||
html_print_submit_button(
|
||||
__('WMI Explore'),
|
||||
'wmi_explore',
|
||||
false,
|
||||
['class' => 'sub next']
|
||||
);
|
||||
echo '</div><br>';
|
||||
|
||||
if ($wmiexplore && $fail) {
|
||||
|
|
@ -365,23 +503,25 @@ echo '</form>';
|
|||
|
||||
if ($wmiexplore && !$fail) {
|
||||
echo '<br><span id ="none_text" style="display: none;">'.__('None').'</span>';
|
||||
echo "<form method='post' action='index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=agent_wizard&wizard_section=wmi_explorer&id_agente=$id_agent'>";
|
||||
echo "<form method='post'
|
||||
action='index.php?sec=gagente&sec2=godmode/agentes/configurar_agente
|
||||
&tab=agent_wizard&wizard_section=wmi_explorer&id_agente=$id_agent'>";
|
||||
echo '<span id="form_interfaces">';
|
||||
|
||||
html_print_input_hidden('create_modules', 1);
|
||||
html_print_input_hidden('ip_target', $ip_target);
|
||||
// Host
|
||||
// Host.
|
||||
html_print_input_hidden('plugin_user', $plugin_user);
|
||||
// User
|
||||
// User.
|
||||
html_print_input_hidden('plugin_pass', $plugin_pass);
|
||||
// Password
|
||||
// Password.
|
||||
html_print_input_hidden('tcp_send', $tcp_send);
|
||||
// Namespace
|
||||
// Namespace.
|
||||
html_print_input_hidden('server_to_exec', $server_to_exec);
|
||||
|
||||
$table->width = '100%';
|
||||
|
||||
// Mode selector
|
||||
// Mode selector.
|
||||
$modes = [];
|
||||
$modes['services'] = __('Services');
|
||||
$modes['processes'] = __('Processes');
|
||||
|
|
@ -406,7 +546,7 @@ if ($wmiexplore && !$fail) {
|
|||
$table->data[1][2] = '<b>'.__('Modules').'</b>';
|
||||
$table->cellstyle[1][2] = 'text-align: center;';
|
||||
|
||||
// Components list
|
||||
// Components list.
|
||||
$table->data[2][0] = '<div class="wizard_mode_form wizard_mode_components">';
|
||||
$table->data[2][0] .= __('Filter by group').'<br>';
|
||||
$table->data[2][0] .= html_print_select(
|
||||
|
|
@ -439,7 +579,7 @@ if ($wmiexplore && !$fail) {
|
|||
);
|
||||
$table->data[2][0] .= '</div>';
|
||||
|
||||
// Services list
|
||||
// Services list.
|
||||
$table->data[2][0] .= '<div class="wizard_mode_form wizard_mode_services">';
|
||||
$table->data[2][0] .= html_print_select(
|
||||
$services,
|
||||
|
|
@ -456,8 +596,7 @@ if ($wmiexplore && !$fail) {
|
|||
'width: 300px;'
|
||||
);
|
||||
$table->data[2][0] .= '</div>';
|
||||
|
||||
// Processes list
|
||||
// Processes list.
|
||||
$table->data[2][0] .= '<div class="wizard_mode_form wizard_mode_processes">';
|
||||
$table->data[2][0] .= html_print_select(
|
||||
$processes,
|
||||
|
|
@ -474,11 +613,13 @@ if ($wmiexplore && !$fail) {
|
|||
'width: 300px;'
|
||||
);
|
||||
$table->data[2][0] .= '</div>';
|
||||
$table->data[2][0] .= '<span id="no_component" class="invisible error wizard_mode_form wizard_mode_components">';
|
||||
$table->data[2][0] .= '<span id="no_component"
|
||||
class="invisible error wizard_mode_form wizard_mode_components">';
|
||||
|
||||
$table->data[2][0] .= __('No component was found');
|
||||
$table->data[2][0] .= '</span>';
|
||||
|
||||
// Disks list
|
||||
// Disks list.
|
||||
$table->data[2][0] .= '<div class="wizard_mode_form wizard_mode_disks">';
|
||||
$table->data[2][0] .= html_print_select(
|
||||
$disks,
|
||||
|
|
@ -498,27 +639,79 @@ if ($wmiexplore && !$fail) {
|
|||
$table->cellstyle[2][0] = 'vertical-align: bottom; text-align: center;';
|
||||
|
||||
|
||||
// Components arrow
|
||||
$table->data[2][1] = '<div class="wizard_mode_form wizard_mode_components wizard_mode_components_arrow clickable">'.html_print_image('images/darrowright.png', true, ['title' => __('Add to modules list')]).'</div>';
|
||||
// Services arrow
|
||||
$table->data[2][1] .= '<div class="wizard_mode_form wizard_mode_services wizard_mode_services_arrow clickable">'.html_print_image('images/darrowright.png', true, ['title' => __('Add to modules list')]).'</div>';
|
||||
// Processes arrow
|
||||
$table->data[2][1] .= '<div class="wizard_mode_form wizard_mode_processes wizard_mode_processes_arrow clickable">'.html_print_image('images/darrowright.png', true, ['title' => __('Add to modules list')]).'</div>';
|
||||
// Disks arrow
|
||||
$table->data[2][1] .= '<div class="wizard_mode_form wizard_mode_disks wizard_mode_disks_arrow clickable">'.html_print_image('images/darrowright.png', true, ['title' => __('Add to modules list')]).'</div>';
|
||||
// Components arrow.
|
||||
$table->data[2][1] = '<div
|
||||
class="wizard_mode_form wizard_mode_components wizard_mode_components_arrow clickable">
|
||||
'.html_print_image(
|
||||
'images/darrowright.png',
|
||||
true,
|
||||
['title' => __('Add to modules list')]
|
||||
).'</div>';
|
||||
// Services arrow.
|
||||
$table->data[2][1] .= '<div
|
||||
class="wizard_mode_form wizard_mode_services wizard_mode_services_arrow clickable">
|
||||
'.html_print_image(
|
||||
'images/darrowright.png',
|
||||
true,
|
||||
['title' => __('Add to modules list')]
|
||||
).'</div>';
|
||||
// Processes arrow.
|
||||
$table->data[2][1] .= '<div
|
||||
class="wizard_mode_form wizard_mode_processes wizard_mode_processes_arrow clickable">
|
||||
'.html_print_image(
|
||||
'images/darrowright.png',
|
||||
true,
|
||||
['title' => __('Add to modules list')]
|
||||
).'</div>';
|
||||
// Disks arrow.
|
||||
$table->data[2][1] .= '<div
|
||||
class="wizard_mode_form wizard_mode_disks wizard_mode_disks_arrow clickable">
|
||||
'.html_print_image(
|
||||
'images/darrowright.png',
|
||||
true,
|
||||
['title' => __('Add to modules list')]
|
||||
).'</div>';
|
||||
|
||||
|
||||
$table->data[2][1] .= '<br><br><div class="wizard_mode_delete_arrow clickable">'.html_print_image('images/cross.png', true, ['title' => __('Remove from modules list')]).'</div>';
|
||||
$table->data[2][1] .= '<br><br>
|
||||
<div class="wizard_mode_delete_arrow clickable">
|
||||
'.html_print_image(
|
||||
'images/cross.png',
|
||||
true,
|
||||
['title' => __('Remove from modules list')]
|
||||
).'</div>';
|
||||
$table->cellstyle[2][1] = 'vertical-align: middle; text-align: center;';
|
||||
|
||||
$table->data[2][2] = html_print_select([], 'module[]', 0, false, '', 0, true, true, true, '', false, 'width:300px; height: 100%;');
|
||||
$table->data[2][2] .= html_print_input_hidden('agent', $id_agent, true);
|
||||
$table->data[2][2] = html_print_select(
|
||||
[],
|
||||
'module[]',
|
||||
0,
|
||||
false,
|
||||
'',
|
||||
0,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
'',
|
||||
false,
|
||||
'width:300px; height: 100%;'
|
||||
);
|
||||
$table->data[2][2] .= html_print_input_hidden(
|
||||
'agent',
|
||||
$id_agent,
|
||||
true
|
||||
);
|
||||
$table->cellstyle[2][2] = 'vertical-align: top; text-align: center;';
|
||||
|
||||
html_print_table($table);
|
||||
|
||||
echo "<div style='text-align:right; width:".$table->width."'>";
|
||||
html_print_submit_button(__('Create modules'), 'create_modules_btn', false, ['class' => 'sub add']);
|
||||
html_print_submit_button(
|
||||
__('Create modules'),
|
||||
'create_modules_btn',
|
||||
false,
|
||||
['class' => 'sub add']
|
||||
);
|
||||
echo '</div>';
|
||||
unset($table);
|
||||
|
||||
|
|
@ -650,5 +843,4 @@ $(document).ready (function () {
|
|||
});
|
||||
|
||||
/* ]]> */
|
||||
</script>
|
||||
|
||||
</script>
|
||||
|
|
@ -466,11 +466,11 @@ $data[1] = html_print_select(
|
|||
|
||||
$array_os = [
|
||||
'inherited' => __('Inherited'),
|
||||
'linux' => __('Linux'),
|
||||
'windows' => __('Windows'),
|
||||
'linux' => __('SSH'),
|
||||
'windows' => __('Windows remote'),
|
||||
];
|
||||
|
||||
$data[2] = __('Target OS');
|
||||
$data[2] = __('Connection method');
|
||||
$data[3] = html_print_select(
|
||||
$array_os,
|
||||
'command_os',
|
||||
|
|
@ -541,14 +541,12 @@ $(document).ready (function () {
|
|||
$("#simple-field_snmpv3_row2").attr("style", "");
|
||||
$("#simple-field_snmpv3_row3").attr("style", "");
|
||||
$("input[name=active_snmp_v3]").val(1);
|
||||
$("input[name=snmp_community]").attr("disabled", true);
|
||||
}
|
||||
else {
|
||||
$("#simple-field_snmpv3_row1").css("display", "none");
|
||||
$("#simple-field_snmpv3_row2").css("display", "none");
|
||||
$("#simple-field_snmpv3_row3").css("display", "none");
|
||||
$("input[name=active_snmp_v3]").val(0);
|
||||
$("input[name=snmp_community]").removeAttr('disabled');
|
||||
}
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -163,7 +163,6 @@ switch ($action) {
|
|||
$description = null;
|
||||
$sql = null;
|
||||
$show_in_same_row = 0;
|
||||
$show_in_landscape = 0;
|
||||
$hide_notinit_agents = 0;
|
||||
$priority_mode = REPORT_PRIORITY_MODE_OK;
|
||||
$failover_mode = 0;
|
||||
|
|
@ -171,6 +170,8 @@ switch ($action) {
|
|||
$server_name = '';
|
||||
$server_id = 0;
|
||||
$dyn_height = 230;
|
||||
$landscape = false;
|
||||
$pagebreak = false;
|
||||
break;
|
||||
|
||||
case 'save':
|
||||
|
|
@ -208,7 +209,6 @@ switch ($action) {
|
|||
$description = null;
|
||||
$sql = null;
|
||||
$show_in_same_row = 0;
|
||||
$show_in_landscape = 0;
|
||||
$hide_notinit_agents = 0;
|
||||
$server_name = '';
|
||||
$server_id = 0;
|
||||
|
|
@ -236,12 +236,18 @@ switch ($action) {
|
|||
$name_from_template = $style['name_label'];
|
||||
|
||||
$show_in_same_row = $style['show_in_same_row'];
|
||||
$show_in_landscape = $style['show_in_landscape'];
|
||||
$hide_notinit_agents = $style['hide_notinit_agents'];
|
||||
$dyn_height = $style['dyn_height'];
|
||||
$type = $item['type'];
|
||||
$name = $style['name_label'];
|
||||
|
||||
if ($name === null || $name === '') {
|
||||
$name = $item['name'];
|
||||
}
|
||||
|
||||
$landscape = $item['landscape'];
|
||||
$pagebreak = $item['pagebreak'];
|
||||
|
||||
switch ($type) {
|
||||
case 'event_report_log':
|
||||
$period = $item['period'];
|
||||
|
|
@ -2198,7 +2204,7 @@ $class = 'databox filters';
|
|||
<tr id="row_show_address_agent" style="" class="datos">
|
||||
<td style="font-weight:bold;">
|
||||
<?php
|
||||
echo __('Show address instead module name.').ui_print_help_tip(
|
||||
echo __('Show address instead module name').ui_print_help_tip(
|
||||
__('Show the main address of agent.'),
|
||||
true
|
||||
);
|
||||
|
|
@ -2554,25 +2560,6 @@ $class = 'databox filters';
|
|||
</td>
|
||||
</tr>
|
||||
|
||||
<tr id="row_show_in_landscape" style="" class="datos">
|
||||
<td style="font-weight:bold;">
|
||||
<?php
|
||||
echo __('Show in landscape');
|
||||
?>
|
||||
</td>
|
||||
<td>
|
||||
<?php
|
||||
html_print_checkbox(
|
||||
'show_in_landscape',
|
||||
1,
|
||||
$show_in_landscape,
|
||||
false,
|
||||
false
|
||||
);
|
||||
?>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr id="row_priority_mode" style="" class="datos">
|
||||
<td style="font-weight:bold;">
|
||||
<?php
|
||||
|
|
@ -2779,6 +2766,24 @@ $class = 'databox filters';
|
|||
</td>
|
||||
</tr>
|
||||
|
||||
<tr id="row_landscape" style="" class="datos">
|
||||
<td style="font-weight:bold;">
|
||||
<?php
|
||||
echo __('Show item in landscape format (only PDF)');
|
||||
?>
|
||||
</td>
|
||||
<td><?php html_print_checkbox('landscape', 1, $landscape); ?></td>
|
||||
</tr>
|
||||
|
||||
<tr id="row_pagebreak" style="" class="datos">
|
||||
<td style="font-weight:bold;">
|
||||
<?php
|
||||
echo __('Page break at the end of the item (only PDF)');
|
||||
?>
|
||||
</td>
|
||||
<td><?php html_print_checkbox('pagebreak', 1, $pagebreak); ?></td>
|
||||
</tr>
|
||||
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
|
|
@ -3501,6 +3506,30 @@ function print_General_list($width, $action, $idItem=null, $type='general')
|
|||
}
|
||||
|
||||
|
||||
echo "<div id='message_no_name' title='".__('Item Editor Information')."' style='display:none;'>";
|
||||
echo "<p style='text-align: center;font-weight: bold;'>".__('Please select a name.').'</p>';
|
||||
echo '</div>';
|
||||
|
||||
echo "<div id='message_no_agent' title='".__('Item Editor Information')."' style='display:none;'>";
|
||||
echo "<p style='text-align: center;font-weight: bold;'>".__('Please select an agent.').'</p>';
|
||||
echo '</div>';
|
||||
|
||||
echo "<div id='message_no_module' title='".__('Item Editor Information')."' style='display:none;'>";
|
||||
echo "<p style='text-align: center;font-weight: bold;'>".__('Please select a module.').'</p>';
|
||||
echo '</div>';
|
||||
|
||||
echo "<div id='message_no_sql_query' title='".__('Item Editor Information')."' style='display:none;'>";
|
||||
echo "<p style='text-align: center;font-weight: bold;'>".__('Please insert a SQL query.').'</p>';
|
||||
echo '</div>';
|
||||
|
||||
echo "<div id='message_no_url' title='".__('Item Editor Information')."' style='display:none;'>";
|
||||
echo "<p style='text-align: center;font-weight: bold;'>".__('Please insert a URL.').'</p>';
|
||||
echo '</div>';
|
||||
|
||||
echo "<div id='message_no_interval_option' title='".__('Item Editor Information')."' style='display:none;'>";
|
||||
echo "<p style='text-align: center;font-weight: bold;'>".__('Please checked a custom interval option.').'</p>';
|
||||
echo '</div>';
|
||||
|
||||
ui_require_javascript_file(
|
||||
'pandora_inventory',
|
||||
ENTERPRISE_DIR.'/include/javascript/'
|
||||
|
|
@ -3700,6 +3729,12 @@ $(document).ready (function () {
|
|||
$("#submit-create_item").click(function () {
|
||||
var type = $('#type').val();
|
||||
var name = $('#text-name').val();
|
||||
|
||||
if($('#text-name').val() == ''){
|
||||
dialog_message('#message_no_name');
|
||||
return false;
|
||||
}
|
||||
|
||||
switch (type){
|
||||
case 'alert_report_module':
|
||||
case 'alert_report_agent':
|
||||
|
|
@ -3718,25 +3753,108 @@ $(document).ready (function () {
|
|||
case 'historical_data':
|
||||
case 'agent_configuration':
|
||||
case 'module_histogram_graph':
|
||||
case 'increment':
|
||||
if ($("#hidden-id_agent").val() == 0) {
|
||||
alert( <?php echo "'".__('Please select Agent')."'"; ?> );
|
||||
dialog_message('#message_no_agent');
|
||||
return false;
|
||||
}
|
||||
break;
|
||||
case 'agent_module':
|
||||
if ($("select#id_agents2>option:selected").val() == undefined) {
|
||||
dialog_message('#message_no_agent');
|
||||
return false;
|
||||
}
|
||||
break;
|
||||
case 'inventory':
|
||||
case 'inventory_changes':
|
||||
if ($("select#id_agents>option:selected").val() == undefined) {
|
||||
dialog_message('#message_no_agent');
|
||||
return false;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
if($('#text-name').val() == ''){
|
||||
alert( <?php echo "'".__('Please insert a name')."'"; ?> );
|
||||
return false;
|
||||
switch (type){
|
||||
case 'alert_report_module':
|
||||
case 'event_report_module':
|
||||
case 'simple_graph':
|
||||
case 'simple_baseline_graph':
|
||||
case 'prediction_date':
|
||||
case 'projection_graph':
|
||||
case 'monitor_report':
|
||||
case 'module_histogram_graph':
|
||||
case 'avg_value':
|
||||
case 'max_value':
|
||||
case 'min_value':
|
||||
case 'database_serialized':
|
||||
case 'sumatory':
|
||||
case 'historical_data':
|
||||
case 'increment':
|
||||
|
||||
if ($("#id_agent_module").val() == 0) {
|
||||
dialog_message('#message_no_module');
|
||||
return false;
|
||||
}
|
||||
break;
|
||||
case 'agent_module':
|
||||
if ($("select#module>option:selected").val() == undefined) {
|
||||
dialog_message('#message_no_module');
|
||||
return false;
|
||||
}
|
||||
break;
|
||||
case 'inventory':
|
||||
case 'inventory_changes':
|
||||
if ($("select#inventory_modules>option:selected").val() == 0) {
|
||||
dialog_message('#message_no_module');
|
||||
return false;
|
||||
}
|
||||
break;
|
||||
case 'sql':
|
||||
if ($("#textarea_sql").val() == ''
|
||||
&& $("select#id_custom>option:selected").val() == 0) {
|
||||
dialog_message('#message_no_sql_query');
|
||||
return false;
|
||||
}
|
||||
break;
|
||||
case 'sql_graph_pie':
|
||||
case 'sql_graph_hbar':
|
||||
case 'sql_graph_vbar':
|
||||
if ($("#textarea_sql").val() == '') {
|
||||
dialog_message('#message_no_sql_query');
|
||||
return false;
|
||||
}
|
||||
break;
|
||||
case 'url':
|
||||
if ($("#text-url").val() == '') {
|
||||
dialog_message('#message_no_url');
|
||||
return false;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
if (type == 'avg_value' || type == 'max_value' || type == 'min_value') {
|
||||
if (($('input:radio[name=visual_format]:checked').val() != 1
|
||||
&& $('input:radio[name=visual_format]:checked').val() != 2
|
||||
&& $('input:radio[name=visual_format]:checked').val() != 3)
|
||||
&& $("#checkbox-lapse_calc").is(":checked")) {
|
||||
dialog_message('#message_no_interval_option');
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
$("#submit-edit_item").click(function () {
|
||||
var type = $('#type').val();
|
||||
|
||||
if($('#text-name').val() == ''){
|
||||
dialog_message('#message_no_name');
|
||||
return false;
|
||||
}
|
||||
switch (type){
|
||||
case 'alert_report_module':
|
||||
case 'alert_report_agent':
|
||||
|
|
@ -3755,14 +3873,97 @@ $(document).ready (function () {
|
|||
case 'historical_data':
|
||||
case 'agent_configuration':
|
||||
case 'module_histogram_graph':
|
||||
case 'increment':
|
||||
if ($("#hidden-id_agent").val() == 0) {
|
||||
alert( <?php echo "'".__('Please select Agent')."'"; ?> );
|
||||
dialog_message('#message_no_agent');
|
||||
return false;
|
||||
}
|
||||
break;
|
||||
case 'agent_module':
|
||||
if ($("select#id_agents2>option:selected").val() == undefined) {
|
||||
dialog_message('#message_no_agent');
|
||||
return false;
|
||||
}
|
||||
break;
|
||||
case 'inventory':
|
||||
if ($("select#id_agents>option:selected").val() == undefined) {
|
||||
dialog_message('#message_no_agent');
|
||||
return false;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
switch (type){
|
||||
case 'alert_report_module':
|
||||
case 'event_report_module':
|
||||
case 'simple_graph':
|
||||
case 'simple_baseline_graph':
|
||||
case 'prediction_date':
|
||||
case 'projection_graph':
|
||||
case 'monitor_report':
|
||||
case 'module_histogram_graph':
|
||||
case 'avg_value':
|
||||
case 'max_value':
|
||||
case 'min_value':
|
||||
case 'database_serialized':
|
||||
case 'sumatory':
|
||||
case 'historical_data':
|
||||
case 'increment':
|
||||
|
||||
if ($("#id_agent_module").val() == 0) {
|
||||
dialog_message('#message_no_module');
|
||||
return false;
|
||||
}
|
||||
break;
|
||||
case 'agent_module':
|
||||
if ($("select#module>option:selected").val() == undefined) {
|
||||
dialog_message('#message_no_module');
|
||||
return false;
|
||||
}
|
||||
break;
|
||||
case 'inventory':
|
||||
if ($("select#inventory_modules>option:selected").val() == 0) {
|
||||
dialog_message('#message_no_module');
|
||||
return false;
|
||||
}
|
||||
break;
|
||||
case 'sql':
|
||||
if ($("#textarea_sql").val() == ''
|
||||
&& $("select#id_custom>option:selected").val() == 0) {
|
||||
dialog_message('#message_no_sql_query');
|
||||
return false;
|
||||
}
|
||||
break;
|
||||
case 'sql_graph_pie':
|
||||
case 'sql_graph_hbar':
|
||||
case 'sql_graph_vbar':
|
||||
if ($("#textarea_sql").val() == '') {
|
||||
dialog_message('#message_no_sql_query');
|
||||
return false;
|
||||
}
|
||||
break;
|
||||
case 'url':
|
||||
if ($("#text-url").val() == '') {
|
||||
dialog_message('#message_no_url');
|
||||
return false;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
if (type == 'avg_value' || type == 'max_value' || type == 'min_value') {
|
||||
if (($('input:radio[name=visual_format]:checked').val() != 1
|
||||
&& $('input:radio[name=visual_format]:checked').val() != 2
|
||||
&& $('input:radio[name=visual_format]:checked').val() != 3)
|
||||
&& $("#checkbox-lapse_calc").is(":checked")) {
|
||||
dialog_message('#message_no_interval_option');
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
$("#checkbox-lapse_calc").change(function () {
|
||||
|
|
@ -4472,7 +4673,6 @@ function chooseType() {
|
|||
$("#row_lapse_calc").hide();
|
||||
$("#row_lapse").hide();
|
||||
$("#row_visual_format").hide();
|
||||
$("#row_show_in_landscape").hide();
|
||||
$('#row_hide_notinit_agents').hide();
|
||||
$('#row_priority_mode').hide();
|
||||
$("#row_module_group").hide();
|
||||
|
|
@ -5190,4 +5390,20 @@ function source_change_agents() {
|
|||
"json"
|
||||
);
|
||||
}
|
||||
|
||||
function dialog_message(message_id) {
|
||||
$(message_id)
|
||||
.css("display", "inline")
|
||||
.dialog({
|
||||
modal: true,
|
||||
show: "blind",
|
||||
hide: "blind",
|
||||
width: "400px",
|
||||
buttons: {
|
||||
Close: function() {
|
||||
$(this).dialog("close");
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -147,7 +147,7 @@ if (enterprise_include_once('include/functions_reporting.php') !== ENTERPRISE_NO
|
|||
}
|
||||
|
||||
// Constant with fonts directory.
|
||||
define('_MPDF_TTFONTPATH', 'include/fonts/');
|
||||
define('_MPDF_TTFONTPATH', $config['homedir'].'/include/fonts/');
|
||||
|
||||
$activeTab = get_parameter('tab', 'main');
|
||||
$action = get_parameter('action', 'list');
|
||||
|
|
@ -1415,6 +1415,9 @@ switch ($action) {
|
|||
$name_it
|
||||
);
|
||||
|
||||
$values['landscape'] = get_parameter('landscape');
|
||||
$values['pagebreak'] = get_parameter('pagebreak');
|
||||
|
||||
/*
|
||||
Added support for projection graphs,
|
||||
prediction date and SLA reports
|
||||
|
|
@ -1924,10 +1927,6 @@ switch ($action) {
|
|||
'show_in_same_row',
|
||||
0
|
||||
);
|
||||
$style['show_in_landscape'] = get_parameter(
|
||||
'show_in_landscape',
|
||||
0
|
||||
);
|
||||
$style['hide_notinit_agents'] = get_parameter(
|
||||
'hide_notinit_agents',
|
||||
0
|
||||
|
|
@ -2100,6 +2099,9 @@ switch ($action) {
|
|||
$name_it
|
||||
);
|
||||
|
||||
$values['landscape'] = get_parameter('landscape');
|
||||
$values['pagebreak'] = get_parameter('pagebreak');
|
||||
|
||||
// Support for projection graph, prediction date
|
||||
// and SLA reports 'top_n_value', 'top_n' and 'text'
|
||||
// fields will be reused for these types of report.
|
||||
|
|
@ -2490,10 +2492,6 @@ switch ($action) {
|
|||
'show_in_same_row',
|
||||
0
|
||||
);
|
||||
$style['show_in_landscape'] = get_parameter(
|
||||
'show_in_landscape',
|
||||
0
|
||||
);
|
||||
$style['hide_notinit_agents'] = get_parameter(
|
||||
'hide_notinit_agents',
|
||||
0
|
||||
|
|
|
|||
|
|
@ -632,8 +632,24 @@ $row++;
|
|||
$table_font->size[0] = '50%';
|
||||
$table_font->data = [];
|
||||
|
||||
$table_font->data[$row][0] = __('Font path');
|
||||
$fonts = load_fonts();
|
||||
$table_font->data[$row][0] = __('Graphs font family');
|
||||
|
||||
// Load font families.
|
||||
$fonts = [];
|
||||
$dirFonts = scandir(_MPDF_TTFONTPATH);
|
||||
foreach ($dirFonts as $entryDir) {
|
||||
if (strstr($entryDir, '.ttf') !== false) {
|
||||
$explode = explode('-', $entryDir);
|
||||
if (count($explode) === 1) {
|
||||
$fonts[$entryDir] = substr($entryDir, 0, (strlen($entryDir) - 4));
|
||||
}
|
||||
|
||||
if ($explode[1] === 'Regular.ttf') {
|
||||
$fonts[$explode[0].'.ttf'] = $explode[0];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$table_font->data[$row][1] = html_print_select(
|
||||
$fonts,
|
||||
'fontpath',
|
||||
|
|
@ -646,7 +662,7 @@ $row++;
|
|||
|
||||
$row++;
|
||||
|
||||
$table_font->data[$row][0] = __('Font size');
|
||||
$table_font->data[$row][0] = __('Graphs font size');
|
||||
|
||||
$font_size_array = [
|
||||
1 => 1,
|
||||
|
|
@ -882,14 +898,6 @@ $row++;
|
|||
$table_chars->data[$row][1] = html_print_select($options_zoom_graphs, 'zoom_graph', $config['zoom_graph'], '', '', 0, true, false, false);
|
||||
$row++;
|
||||
|
||||
$table_chars->data[$row][0] = __('Graph image height');
|
||||
$table_chars->data[$row][0] .= ui_print_help_tip(
|
||||
__('This is the height in pixels of the module graph or custom graph in the reports (both: HTML and PDF)'),
|
||||
true
|
||||
);
|
||||
$table_chars->data[$row][1] = html_print_input_text('graph_image_height', $config['graph_image_height'], '', 20, 20, true);
|
||||
$row++;
|
||||
|
||||
/*
|
||||
$table_font->data[$row][0] = __('Font path');
|
||||
$fonts = load_fonts();
|
||||
|
|
@ -996,21 +1004,20 @@ $row++;
|
|||
echo '</fieldset>';
|
||||
|
||||
// ----------------------------------------------------------------------
|
||||
// OTHER CONFIGURATION
|
||||
// Reports
|
||||
// ----------------------------------------------------------------------
|
||||
$table_other = new stdClass();
|
||||
$table_other->width = '100%';
|
||||
$table_other->class = 'databox filters';
|
||||
$table_other->style[0] = 'font-weight: bold;';
|
||||
$table_other->size[0] = '50%';
|
||||
$table_other->data = [];
|
||||
$table_report = new stdClass();
|
||||
$table_report->width = '100%';
|
||||
$table_report->class = 'databox filters';
|
||||
$table_report->style[0] = 'font-weight: bold;';
|
||||
$table_report->size[0] = '50%';
|
||||
$table_report->data = [];
|
||||
|
||||
// Enrique (27/01/2017) New feature: Show report info on top of reports
|
||||
$table_other->data[$row][0] = __('Show report info with description').ui_print_help_tip(
|
||||
$table_report->data[$row][0] = __('Show report info with description').ui_print_help_tip(
|
||||
__('Custom report description info. It will be applied to all reports and templates by default.'),
|
||||
true
|
||||
);
|
||||
$table_other->data[$row][1] = html_print_checkbox_switch(
|
||||
$table_report->data[$row][1] = html_print_checkbox_switch(
|
||||
'custom_report_info',
|
||||
1,
|
||||
$config['custom_report_info'],
|
||||
|
|
@ -1018,13 +1025,11 @@ $row++;
|
|||
);
|
||||
$row++;
|
||||
|
||||
// ----------------------------------------------------------------------
|
||||
// Juanma (07/05/2014) New feature: Table for custom front page for reports
|
||||
$table_other->data[$row][0] = __('Custom report front page').ui_print_help_tip(
|
||||
$table_report->data[$row][0] = __('Custom report front page').ui_print_help_tip(
|
||||
__('Custom report front page. It will be applied to all reports and templates by default.'),
|
||||
true
|
||||
);
|
||||
$table_other->data[$row][1] = html_print_checkbox_switch(
|
||||
$table_report->data[$row][1] = html_print_checkbox_switch(
|
||||
'custom_report_front',
|
||||
1,
|
||||
$config['custom_report_front'],
|
||||
|
|
@ -1033,11 +1038,19 @@ $row++;
|
|||
|
||||
$row++;
|
||||
|
||||
$table_other->data[$row][0] = __('Font size for items reports');
|
||||
$table_other->data[$row][1] = "<input type ='number' value=".$config['font_size_item_report']." size='1' name='font_size_item_report' min='1' max='9' step='0.1'>";
|
||||
$table_report->data[$row][0] = __('PDF font size');
|
||||
$table_report->data[$row][1] = "<input type ='number' value=".$config['font_size_item_report']." size='1' name='font_size_item_report' min='1' max='9' step='0.1'>";
|
||||
|
||||
$row++;
|
||||
|
||||
$table_report->data[$row][0] = __('Graph image height for HTML reports');
|
||||
$table_report->data[$row][0] .= ui_print_help_tip(
|
||||
__('This is the height in pixels of the module graph or custom graph in the reports (only: HTML)'),
|
||||
true
|
||||
);
|
||||
$table_report->data[$row][1] = html_print_input_text('graph_image_height', $config['graph_image_height'], '', 20, 20, true);
|
||||
$row++;
|
||||
|
||||
// ----------------------------------------------------------------------
|
||||
$dirItems = scandir($config['homedir'].'/images/custom_logo');
|
||||
foreach ($dirItems as $entryDir) {
|
||||
|
|
@ -1046,18 +1059,10 @@ $row++;
|
|||
}
|
||||
}
|
||||
|
||||
$_fonts = [];
|
||||
$dirFonts = scandir(_MPDF_TTFONTPATH);
|
||||
foreach ($dirFonts as $entryDir) {
|
||||
if (strstr($entryDir, '.ttf') !== false) {
|
||||
$_fonts[$entryDir] = $entryDir;
|
||||
}
|
||||
}
|
||||
|
||||
// Font
|
||||
$table_other->data['custom_report_front-font'][0] = __('Custom report front').' - '.__('Font family');
|
||||
$table_other->data['custom_report_front-font'][1] = html_print_select(
|
||||
$_fonts,
|
||||
$table_report->data['custom_report_front-font'][0] = __('Custom report front').' - '.__('Font family');
|
||||
$table_report->data['custom_report_front-font'][1] = html_print_select(
|
||||
$fonts,
|
||||
'custom_report_front_font',
|
||||
$config['custom_report_front_font'],
|
||||
false,
|
||||
|
|
@ -1067,11 +1072,11 @@ $row++;
|
|||
);
|
||||
|
||||
// Logo
|
||||
$table_other->data['custom_report_front-logo'][0] = __('Custom report front').' - '.__('Custom logo').ui_print_help_tip(
|
||||
$table_report->data['custom_report_front-logo'][0] = __('Custom report front').' - '.__('Custom logo').ui_print_help_tip(
|
||||
__("The dir of custom logos is in your www Console in 'images/custom_logo'. You can upload more files (ONLY JPEG AND PNG) in upload tool in console."),
|
||||
true
|
||||
);
|
||||
$table_other->data['custom_report_front-logo'][1] = html_print_select(
|
||||
$table_report->data['custom_report_front-logo'][1] = html_print_select(
|
||||
$customLogos,
|
||||
'custom_report_front_logo',
|
||||
io_safe_output($config['custom_report_front_logo']),
|
||||
|
|
@ -1081,16 +1086,16 @@ $row++;
|
|||
true
|
||||
);
|
||||
// Preview
|
||||
$table_other->data['custom_report_front-preview'][0] = __('Custom report front').' - '.'Preview';
|
||||
$table_report->data['custom_report_front-preview'][0] = __('Custom report front').' - '.'Preview';
|
||||
if (empty($config['custom_report_front_logo'])) {
|
||||
$config['custom_report_front_logo'] = 'images/pandora_logo_white.jpg';
|
||||
}
|
||||
|
||||
$table_other->data['custom_report_front-preview'][1] = '<span id="preview_image">'.html_print_image($config['custom_report_front_logo'], true).'</span>';
|
||||
$table_report->data['custom_report_front-preview'][1] = '<span id="preview_image">'.html_print_image($config['custom_report_front_logo'], true).'</span>';
|
||||
|
||||
// Header
|
||||
$table_other->data['custom_report_front-header'][0] = __('Custom report front').' - '.__('Header');
|
||||
$table_other->data['custom_report_front-header'][1] = html_print_textarea(
|
||||
$table_report->data['custom_report_front-header'][0] = __('Custom report front').' - '.__('Header');
|
||||
$table_report->data['custom_report_front-header'][1] = html_print_textarea(
|
||||
'custom_report_front_header',
|
||||
5,
|
||||
15,
|
||||
|
|
@ -1100,13 +1105,13 @@ $row++;
|
|||
);
|
||||
|
||||
// First page
|
||||
$table_other->data['custom_report_front-first_page'][0] = __('Custom report front').' - '.__('First page');
|
||||
$table_report->data['custom_report_front-first_page'][0] = __('Custom report front').' - '.__('First page');
|
||||
$custom_report_front_firstpage = str_replace(
|
||||
'(_URLIMAGE_)',
|
||||
ui_get_full_url(false, true, false, false),
|
||||
$config['custom_report_front_firstpage']
|
||||
);
|
||||
$table_other->data['custom_report_front-first_page'][1] = html_print_textarea(
|
||||
$table_report->data['custom_report_front-first_page'][1] = html_print_textarea(
|
||||
'custom_report_front_firstpage',
|
||||
15,
|
||||
15,
|
||||
|
|
@ -1116,8 +1121,8 @@ $row++;
|
|||
);
|
||||
|
||||
// Footer
|
||||
$table_other->data['custom_report_front-footer'][0] = __('Custom report front').' - '.__('Footer');
|
||||
$table_other->data['custom_report_front-footer'][1] = html_print_textarea(
|
||||
$table_report->data['custom_report_front-footer'][0] = __('Custom report front').' - '.__('Footer');
|
||||
$table_report->data['custom_report_front-footer'][1] = html_print_textarea(
|
||||
'custom_report_front_footer',
|
||||
5,
|
||||
15,
|
||||
|
|
@ -1126,6 +1131,22 @@ $row++;
|
|||
true
|
||||
);
|
||||
|
||||
echo '<fieldset>';
|
||||
echo '<legend>'.__('Reports configuration').'</legend>';
|
||||
html_print_table($table_report);
|
||||
echo '</fieldset>';
|
||||
|
||||
|
||||
// ----------------------------------------------------------------------
|
||||
// OTHER CONFIGURATION
|
||||
// ----------------------------------------------------------------------
|
||||
$table_other = new stdClass();
|
||||
$table_other->width = '100%';
|
||||
$table_other->class = 'databox filters';
|
||||
$table_other->style[0] = 'font-weight: bold;';
|
||||
$table_other->size[0] = '50%';
|
||||
$table_other->data = [];
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -1175,16 +1196,23 @@ $row++;
|
|||
if ($config['prominent_time'] == 'comparation') {
|
||||
$timestamp = false;
|
||||
$comparation = true;
|
||||
$compact = false;
|
||||
} else if ($config['prominent_time'] == 'timestamp') {
|
||||
$timestamp = true;
|
||||
$comparation = false;
|
||||
$compact = false;
|
||||
} else if ($config['prominent_time'] == 'compact') {
|
||||
$timestamp = false;
|
||||
$comparation = false;
|
||||
$compact = true;
|
||||
}
|
||||
|
||||
$table_other->data[$row][0] = __('Timestamp or time comparation');
|
||||
$table_other->data[$row][1] = __('Comparation in rollover').' ';
|
||||
$table_other->data[$row][1] .= html_print_radio_button('prominent_time', 'comparation', '', $comparation, true);
|
||||
$table_other->data[$row][1] .= '<br />'.__('Timestamp in rollover').' ';
|
||||
$table_other->data[$row][1] .= html_print_radio_button('prominent_time', 'timestamp', '', $timestamp, true);
|
||||
$table_other->data[$row][0] = __('Timestamp, time comparison, or compact mode');
|
||||
$table_other->data[$row][1] = '<div class="switch_radio_button">';
|
||||
$table_other->data[$row][1] .= html_print_radio_button('prominent_time', 'comparation', __('Comparation in rollover'), $comparation, true);
|
||||
$table_other->data[$row][1] .= html_print_radio_button('prominent_time', 'timestamp', __('Timestamp in rollover'), $timestamp, true);
|
||||
$table_other->data[$row][1] .= html_print_radio_button('prominent_time', 'compact', __('Compact mode'), $compact, true);
|
||||
$table_other->data[$row][1] .= '</div>';
|
||||
|
||||
$row++;
|
||||
|
||||
|
|
|
|||
|
|
@ -101,7 +101,7 @@ $params = json_decode($_REQUEST['data'], true);
|
|||
// Metaconsole connection to the node.
|
||||
$server_id = $params['server_id'];
|
||||
|
||||
if ($config['metaconsole'] && !empty($server_id)) {
|
||||
if (is_metaconsole() && !empty($server_id)) {
|
||||
$server = metaconsole_get_connection_by_id($server_id);
|
||||
// Error connecting.
|
||||
if (metaconsole_connect($server) !== NOERR) {
|
||||
|
|
@ -164,15 +164,23 @@ if (file_exists('languages/'.$user_language.'.mo') === true) {
|
|||
$params['width'] = (int) $_REQUEST['viewport_width'];
|
||||
$params['menu'] = false;
|
||||
|
||||
$params_combined = json_decode($_REQUEST['data_combined'], true);
|
||||
$module_list = json_decode($_REQUEST['data_module_list'], true);
|
||||
$type_graph_pdf = $_REQUEST['type_graph_pdf'];
|
||||
|
||||
if ((isset($params['width']) === false
|
||||
|| ($params['width'] <= 0))
|
||||
) {
|
||||
$params['width'] = 650;
|
||||
}
|
||||
if ((int) $params['landscape'] === 1) {
|
||||
$params['width'] = 850;
|
||||
}
|
||||
|
||||
$params_combined = json_decode($_REQUEST['data_combined'], true);
|
||||
$module_list = json_decode($_REQUEST['data_module_list'], true);
|
||||
$type_graph_pdf = $_REQUEST['type_graph_pdf'];
|
||||
if ($type_graph_pdf === 'slicebar') {
|
||||
$params['width'] = 150;
|
||||
$params['height'] = 70;
|
||||
}
|
||||
}
|
||||
|
||||
echo '<div>';
|
||||
switch ($type_graph_pdf) {
|
||||
|
|
|
|||
|
|
@ -20,8 +20,8 @@
|
|||
/**
|
||||
* Pandora build version and version
|
||||
*/
|
||||
$build_version = 'PC191211';
|
||||
$pandora_version = 'v7.0NG.741';
|
||||
$build_version = 'PC191216';
|
||||
$pandora_version = 'v7.0NG.742';
|
||||
|
||||
// Do not overwrite default timezone set if defined.
|
||||
$script_tz = @date_default_timezone_get();
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
Copyright 2011 Google Inc. All Rights Reserved.
|
||||
|
|
@ -0,0 +1,202 @@
|
|||
|
||||
Apache License
|
||||
Version 2.0, January 2004
|
||||
http://www.apache.org/licenses/
|
||||
|
||||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||
|
||||
1. Definitions.
|
||||
|
||||
"License" shall mean the terms and conditions for use, reproduction,
|
||||
and distribution as defined by Sections 1 through 9 of this document.
|
||||
|
||||
"Licensor" shall mean the copyright owner or entity authorized by
|
||||
the copyright owner that is granting the License.
|
||||
|
||||
"Legal Entity" shall mean the union of the acting entity and all
|
||||
other entities that control, are controlled by, or are under common
|
||||
control with that entity. For the purposes of this definition,
|
||||
"control" means (i) the power, direct or indirect, to cause the
|
||||
direction or management of such entity, whether by contract or
|
||||
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
||||
outstanding shares, or (iii) beneficial ownership of such entity.
|
||||
|
||||
"You" (or "Your") shall mean an individual or Legal Entity
|
||||
exercising permissions granted by this License.
|
||||
|
||||
"Source" form shall mean the preferred form for making modifications,
|
||||
including but not limited to software source code, documentation
|
||||
source, and configuration files.
|
||||
|
||||
"Object" form shall mean any form resulting from mechanical
|
||||
transformation or translation of a Source form, including but
|
||||
not limited to compiled object code, generated documentation,
|
||||
and conversions to other media types.
|
||||
|
||||
"Work" shall mean the work of authorship, whether in Source or
|
||||
Object form, made available under the License, as indicated by a
|
||||
copyright notice that is included in or attached to the work
|
||||
(an example is provided in the Appendix below).
|
||||
|
||||
"Derivative Works" shall mean any work, whether in Source or Object
|
||||
form, that is based on (or derived from) the Work and for which the
|
||||
editorial revisions, annotations, elaborations, or other modifications
|
||||
represent, as a whole, an original work of authorship. For the purposes
|
||||
of this License, Derivative Works shall not include works that remain
|
||||
separable from, or merely link (or bind by name) to the interfaces of,
|
||||
the Work and Derivative Works thereof.
|
||||
|
||||
"Contribution" shall mean any work of authorship, including
|
||||
the original version of the Work and any modifications or additions
|
||||
to that Work or Derivative Works thereof, that is intentionally
|
||||
submitted to Licensor for inclusion in the Work by the copyright owner
|
||||
or by an individual or Legal Entity authorized to submit on behalf of
|
||||
the copyright owner. For the purposes of this definition, "submitted"
|
||||
means any form of electronic, verbal, or written communication sent
|
||||
to the Licensor or its representatives, including but not limited to
|
||||
communication on electronic mailing lists, source code control systems,
|
||||
and issue tracking systems that are managed by, or on behalf of, the
|
||||
Licensor for the purpose of discussing and improving the Work, but
|
||||
excluding communication that is conspicuously marked or otherwise
|
||||
designated in writing by the copyright owner as "Not a Contribution."
|
||||
|
||||
"Contributor" shall mean Licensor and any individual or Legal Entity
|
||||
on behalf of whom a Contribution has been received by Licensor and
|
||||
subsequently incorporated within the Work.
|
||||
|
||||
2. Grant of Copyright License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
copyright license to reproduce, prepare Derivative Works of,
|
||||
publicly display, publicly perform, sublicense, and distribute the
|
||||
Work and such Derivative Works in Source or Object form.
|
||||
|
||||
3. Grant of Patent License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
(except as stated in this section) patent license to make, have made,
|
||||
use, offer to sell, sell, import, and otherwise transfer the Work,
|
||||
where such license applies only to those patent claims licensable
|
||||
by such Contributor that are necessarily infringed by their
|
||||
Contribution(s) alone or by combination of their Contribution(s)
|
||||
with the Work to which such Contribution(s) was submitted. If You
|
||||
institute patent litigation against any entity (including a
|
||||
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
||||
or a Contribution incorporated within the Work constitutes direct
|
||||
or contributory patent infringement, then any patent licenses
|
||||
granted to You under this License for that Work shall terminate
|
||||
as of the date such litigation is filed.
|
||||
|
||||
4. Redistribution. You may reproduce and distribute copies of the
|
||||
Work or Derivative Works thereof in any medium, with or without
|
||||
modifications, and in Source or Object form, provided that You
|
||||
meet the following conditions:
|
||||
|
||||
(a) You must give any other recipients of the Work or
|
||||
Derivative Works a copy of this License; and
|
||||
|
||||
(b) You must cause any modified files to carry prominent notices
|
||||
stating that You changed the files; and
|
||||
|
||||
(c) You must retain, in the Source form of any Derivative Works
|
||||
that You distribute, all copyright, patent, trademark, and
|
||||
attribution notices from the Source form of the Work,
|
||||
excluding those notices that do not pertain to any part of
|
||||
the Derivative Works; and
|
||||
|
||||
(d) If the Work includes a "NOTICE" text file as part of its
|
||||
distribution, then any Derivative Works that You distribute must
|
||||
include a readable copy of the attribution notices contained
|
||||
within such NOTICE file, excluding those notices that do not
|
||||
pertain to any part of the Derivative Works, in at least one
|
||||
of the following places: within a NOTICE text file distributed
|
||||
as part of the Derivative Works; within the Source form or
|
||||
documentation, if provided along with the Derivative Works; or,
|
||||
within a display generated by the Derivative Works, if and
|
||||
wherever such third-party notices normally appear. The contents
|
||||
of the NOTICE file are for informational purposes only and
|
||||
do not modify the License. You may add Your own attribution
|
||||
notices within Derivative Works that You distribute, alongside
|
||||
or as an addendum to the NOTICE text from the Work, provided
|
||||
that such additional attribution notices cannot be construed
|
||||
as modifying the License.
|
||||
|
||||
You may add Your own copyright statement to Your modifications and
|
||||
may provide additional or different license terms and conditions
|
||||
for use, reproduction, or distribution of Your modifications, or
|
||||
for any such Derivative Works as a whole, provided Your use,
|
||||
reproduction, and distribution of the Work otherwise complies with
|
||||
the conditions stated in this License.
|
||||
|
||||
5. Submission of Contributions. Unless You explicitly state otherwise,
|
||||
any Contribution intentionally submitted for inclusion in the Work
|
||||
by You to the Licensor shall be under the terms and conditions of
|
||||
this License, without any additional terms or conditions.
|
||||
Notwithstanding the above, nothing herein shall supersede or modify
|
||||
the terms of any separate license agreement you may have executed
|
||||
with Licensor regarding such Contributions.
|
||||
|
||||
6. Trademarks. This License does not grant permission to use the trade
|
||||
names, trademarks, service marks, or product names of the Licensor,
|
||||
except as required for reasonable and customary use in describing the
|
||||
origin of the Work and reproducing the content of the NOTICE file.
|
||||
|
||||
7. Disclaimer of Warranty. Unless required by applicable law or
|
||||
agreed to in writing, Licensor provides the Work (and each
|
||||
Contributor provides its Contributions) on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||
implied, including, without limitation, any warranties or conditions
|
||||
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
||||
PARTICULAR PURPOSE. You are solely responsible for determining the
|
||||
appropriateness of using or redistributing the Work and assume any
|
||||
risks associated with Your exercise of permissions under this License.
|
||||
|
||||
8. Limitation of Liability. In no event and under no legal theory,
|
||||
whether in tort (including negligence), contract, or otherwise,
|
||||
unless required by applicable law (such as deliberate and grossly
|
||||
negligent acts) or agreed to in writing, shall any Contributor be
|
||||
liable to You for damages, including any direct, indirect, special,
|
||||
incidental, or consequential damages of any character arising as a
|
||||
result of this License or out of the use or inability to use the
|
||||
Work (including but not limited to damages for loss of goodwill,
|
||||
work stoppage, computer failure or malfunction, or any and all
|
||||
other commercial damages or losses), even if such Contributor
|
||||
has been advised of the possibility of such damages.
|
||||
|
||||
9. Accepting Warranty or Additional Liability. While redistributing
|
||||
the Work or Derivative Works thereof, You may choose to offer,
|
||||
and charge a fee for, acceptance of support, warranty, indemnity,
|
||||
or other liability obligations and/or rights consistent with this
|
||||
License. However, in accepting such obligations, You may act only
|
||||
on Your own behalf and on Your sole responsibility, not on behalf
|
||||
of any other Contributor, and only if You agree to indemnify,
|
||||
defend, and hold each Contributor harmless for any liability
|
||||
incurred by, or claims asserted against, such Contributor by reason
|
||||
of your accepting any such warranty or additional liability.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
APPENDIX: How to apply the Apache License to your work.
|
||||
|
||||
To apply the Apache License to your work, attach the following
|
||||
boilerplate notice, with the fields enclosed by brackets "[]"
|
||||
replaced with your own identifying information. (Don't include
|
||||
the brackets!) The text should be enclosed in the appropriate
|
||||
comment syntax for the file format. We also recommend that a
|
||||
file or class name and description of purpose be included on the
|
||||
same "printed page" as the copyright notice for easier
|
||||
identification within third-party archives.
|
||||
|
||||
Copyright [yyyy] [name of copyright owner]
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -3851,14 +3851,26 @@ function generator_chart_to_pdf($type_graph_pdf, $params, $params_combined=false
|
|||
$file_js = $config['homedir'].'/include/web2image.js';
|
||||
$url = ui_get_full_url(false).$hack_metaconsole.'/include/chart_generator.php';
|
||||
|
||||
$img_file = 'img_'.uniqid().'.png';
|
||||
$img_path = $config['homedir'].'/attachment/'.$img_file;
|
||||
$img_url = ui_get_full_url(false).$hack_metaconsole.'/attachment/'.$img_file;
|
||||
if (!$params['return_img_base_64']) {
|
||||
$img_file = 'img_'.uniqid().'.png';
|
||||
$img_path = $config['homedir'].'/attachment/'.$img_file;
|
||||
$img_url = ui_get_full_url(false).$hack_metaconsole.'/attachment/'.$img_file;
|
||||
}
|
||||
|
||||
$width_img = 500;
|
||||
$height_img = (isset($config['graph_image_height'])) ? $config['graph_image_height'] : 280;
|
||||
|
||||
$params['height'] = $height_img;
|
||||
// Set height image.
|
||||
$height_img = 170;
|
||||
$params['height'] = 170;
|
||||
if ((int) $params['landscape'] === 1) {
|
||||
$height_img = 150;
|
||||
$params['height'] = 150;
|
||||
}
|
||||
|
||||
if ($type_graph_pdf === 'slicebar') {
|
||||
$height_img = 90;
|
||||
$params['height'] = 90;
|
||||
}
|
||||
|
||||
$params_encode_json = urlencode(json_encode($params));
|
||||
|
||||
|
|
@ -3882,7 +3894,6 @@ function generator_chart_to_pdf($type_graph_pdf, $params, $params_combined=false
|
|||
|
||||
if ($params['return_img_base_64']) {
|
||||
// To be used in alerts.
|
||||
$width_img = 500;
|
||||
return $img_content;
|
||||
} else {
|
||||
// to be used in PDF files.
|
||||
|
|
|
|||
|
|
@ -1911,14 +1911,6 @@ function config_process_config()
|
|||
* Parse the ACL IP list for access API
|
||||
*/
|
||||
|
||||
$temp_list_ACL_IPs_for_API = [];
|
||||
if (isset($config['list_ACL_IPs_for_API'])) {
|
||||
if (!empty($config['list_ACL_IPs_for_API'])) {
|
||||
$temp_list_ACL_IPs_for_API = explode(';', $config['list_ACL_IPs_for_API']);
|
||||
}
|
||||
}
|
||||
|
||||
$config['list_ACL_IPs_for_API'] = $temp_list_ACL_IPs_for_API;
|
||||
$keysConfig = array_keys($config);
|
||||
|
||||
/*
|
||||
|
|
@ -2976,6 +2968,15 @@ function config_process_config()
|
|||
|
||||
// Finally, check if any value was overwritten in a form.
|
||||
config_update_config();
|
||||
|
||||
$temp_list_ACL_IPs_for_API = [];
|
||||
if (isset($config['list_ACL_IPs_for_API'])) {
|
||||
if (!empty($config['list_ACL_IPs_for_API'])) {
|
||||
$temp_list_ACL_IPs_for_API = explode(';', $config['list_ACL_IPs_for_API']);
|
||||
}
|
||||
}
|
||||
|
||||
$config['list_ACL_IPs_for_API'] = $temp_list_ACL_IPs_for_API;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -455,7 +455,7 @@ function __($string /*, variable arguments */)
|
|||
return $string;
|
||||
}
|
||||
|
||||
return $l10n->translate($string);
|
||||
return str_replace('\'', '`', $l10n->translate($string));
|
||||
}
|
||||
|
||||
$args = func_get_args();
|
||||
|
|
@ -465,7 +465,7 @@ function __($string /*, variable arguments */)
|
|||
return vsprintf($string, $args);
|
||||
}
|
||||
|
||||
return vsprintf($l10n->translate($string), $args);
|
||||
return vsprintf(str_replace('\'', '`', $l10n->translate($string)), $args);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -291,16 +291,18 @@ function reporting_make_reporting_data(
|
|||
$agents_to_macro = $content['id_agent'];
|
||||
}
|
||||
|
||||
// Metaconsole connection.
|
||||
if (is_metaconsole()) {
|
||||
$server = metaconsole_get_connection_names();
|
||||
$connection = metaconsole_get_connection($server);
|
||||
if (metaconsole_connect($connection) != NOERR) {
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
if (isset($content['style']['name_label'])) {
|
||||
$server_name = $content['server_name'];
|
||||
$metaconsole_on = is_metaconsole();
|
||||
|
||||
// Metaconsole connection.
|
||||
if ($metaconsole_on && $server_name != '') {
|
||||
$connection = metaconsole_get_connection($server_name);
|
||||
if (!metaconsole_load_external_db($connection)) {
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
// Add macros name.
|
||||
$items_label = [];
|
||||
$items_label['type'] = $content['type'];
|
||||
|
|
@ -309,8 +311,6 @@ function reporting_make_reporting_data(
|
|||
$items_label['modules'] = $modules_to_macro;
|
||||
$items_label['agents'] = $agents_to_macro;
|
||||
$items_label['visual_format'] = $visual_format;
|
||||
$metaconsole_on = is_metaconsole();
|
||||
$server_name = $content['server_name'];
|
||||
|
||||
$items_label['agent_description'] = agents_get_description(
|
||||
$content['id_agent']
|
||||
|
|
@ -859,6 +859,8 @@ function reporting_SLA(
|
|||
}
|
||||
|
||||
$return['title'] = $content['name'];
|
||||
$return['landscape'] = $content['landscape'];
|
||||
$return['pagebreak'] = $content['pagebreak'];
|
||||
$return['description'] = $content['description'];
|
||||
$return['date'] = reporting_get_date_text($report, $content);
|
||||
|
||||
|
|
@ -885,6 +887,10 @@ function reporting_SLA(
|
|||
$edge_interval = 10;
|
||||
|
||||
if (empty($content['subitems'])) {
|
||||
if (is_metaconsole()) {
|
||||
metaconsole_restore_db();
|
||||
}
|
||||
|
||||
$slas = db_get_all_rows_field_filter(
|
||||
'treport_content_sla_combined',
|
||||
'id_report_content',
|
||||
|
|
@ -1359,6 +1365,8 @@ function reporting_event_top_n(
|
|||
}
|
||||
|
||||
$return['title'] = $content['name'];
|
||||
$return['landscape'] = $content['landscape'];
|
||||
$return['pagebreak'] = $content['pagebreak'];
|
||||
$top_n = $content['top_n'];
|
||||
|
||||
switch ($top_n) {
|
||||
|
|
@ -1389,6 +1397,10 @@ function reporting_event_top_n(
|
|||
$return['top_n'] = $content['top_n_value'];
|
||||
|
||||
if (empty($content['subitems'])) {
|
||||
if (is_metaconsole()) {
|
||||
metaconsole_restore_db();
|
||||
}
|
||||
|
||||
// Get all the related data.
|
||||
$sql = sprintf(
|
||||
'SELECT id_agent_module, server_name
|
||||
|
|
@ -1737,6 +1749,8 @@ function reporting_event_report_group(
|
|||
}
|
||||
|
||||
$return['title'] = $content['name'];
|
||||
$return['landscape'] = $content['landscape'];
|
||||
$return['pagebreak'] = $content['pagebreak'];
|
||||
$return['subtitle'] = groups_get_name($content['id_group'], true);
|
||||
if (!empty($content['style']['event_filter_search'])) {
|
||||
$return['subtitle'] .= ' ('.$content['style']['event_filter_search'].')';
|
||||
|
|
@ -1996,6 +2010,8 @@ function reporting_event_report_module(
|
|||
];
|
||||
|
||||
$return['title'] = $content['name'];
|
||||
$return['landscape'] = $content['landscape'];
|
||||
$return['pagebreak'] = $content['pagebreak'];
|
||||
$return['subtitle'] = $agent_alias.' - '.io_safe_output($module_name);
|
||||
$return['label'] = (isset($content['style']['label'])) ? $content['style']['label'] : '';
|
||||
|
||||
|
|
@ -2102,6 +2118,8 @@ function reporting_inventory_changes($report, $content, $type)
|
|||
}
|
||||
|
||||
$return['title'] = $content['name'];
|
||||
$return['landscape'] = $content['landscape'];
|
||||
$return['pagebreak'] = $content['pagebreak'];
|
||||
$return['subtitle'] = agents_get_alias($content['id_agent']);
|
||||
$return['description'] = $content['description'];
|
||||
$return['date'] = reporting_get_date_text($report, $content);
|
||||
|
|
@ -2169,6 +2187,8 @@ function reporting_inventory($report, $content, $type)
|
|||
}
|
||||
|
||||
$return['title'] = $content['name'];
|
||||
$return['landscape'] = $content['landscape'];
|
||||
$return['pagebreak'] = $content['pagebreak'];
|
||||
$return['description'] = $content['description'];
|
||||
$return['date'] = reporting_get_date_text($report, $content);
|
||||
|
||||
|
|
@ -2238,6 +2258,8 @@ function reporting_agent_module($report, $content)
|
|||
}
|
||||
|
||||
$return['title'] = $content['name'];
|
||||
$return['landscape'] = $content['landscape'];
|
||||
$return['pagebreak'] = $content['pagebreak'];
|
||||
$group_name = groups_get_name($content['id_group'], true);
|
||||
if ($content['id_module_group'] == 0) {
|
||||
$module_group_name = __('All');
|
||||
|
|
@ -2326,6 +2348,8 @@ function reporting_exception(
|
|||
}
|
||||
|
||||
$return['title'] = $content['name'];
|
||||
$return['landscape'] = $content['landscape'];
|
||||
$return['pagebreak'] = $content['pagebreak'];
|
||||
$exception_condition = $content['exception_condition'];
|
||||
switch ($exception_condition) {
|
||||
case REPORT_EXCEPTION_CONDITION_EVERYTHING:
|
||||
|
|
@ -2412,6 +2436,9 @@ function reporting_exception(
|
|||
WHERE id_report_content = %d',
|
||||
$content['id_rc']
|
||||
);
|
||||
if (is_metaconsole()) {
|
||||
metaconsole_restore_db();
|
||||
}
|
||||
|
||||
$exceptions = db_process_sql($sql);
|
||||
} else {
|
||||
|
|
@ -2804,6 +2831,8 @@ function reporting_group_report($report, $content)
|
|||
|
||||
$return['server_name'] = $server[0];
|
||||
$return['title'] = $content['name'];
|
||||
$return['landscape'] = $content['landscape'];
|
||||
$return['pagebreak'] = $content['pagebreak'];
|
||||
$return['subtitle'] = groups_get_name($content['id_group'], true);
|
||||
$return['description'] = $content['description'];
|
||||
$return['date'] = reporting_get_date_text($report, $content);
|
||||
|
|
@ -2906,6 +2935,8 @@ function reporting_event_report_agent(
|
|||
|
||||
$return['label'] = $label;
|
||||
$return['title'] = $content['name'];
|
||||
$return['landscape'] = $content['landscape'];
|
||||
$return['pagebreak'] = $content['pagebreak'];
|
||||
$return['subtitle'] = io_safe_output($agent_alias);
|
||||
$return['description'] = $content['description'];
|
||||
$return['date'] = reporting_get_date_text($report, $content);
|
||||
|
|
@ -3115,6 +3146,8 @@ function reporting_historical_data($report, $content)
|
|||
];
|
||||
|
||||
$return['title'] = $content['name'];
|
||||
$return['landscape'] = $content['landscape'];
|
||||
$return['pagebreak'] = $content['pagebreak'];
|
||||
$return['subtitle'] = $agent_alias.' - '.$module_name;
|
||||
$return['description'] = $content['description'];
|
||||
$return['date'] = reporting_get_date_text($report, $content);
|
||||
|
|
@ -3238,6 +3271,8 @@ function reporting_database_serialized($report, $content)
|
|||
];
|
||||
|
||||
$return['title'] = $content['name'];
|
||||
$return['landscape'] = $content['landscape'];
|
||||
$return['pagebreak'] = $content['pagebreak'];
|
||||
$return['subtitle'] = $agent_alias.' - '.$module_name;
|
||||
$return['description'] = $content['description'];
|
||||
$return['date'] = reporting_get_date_text($report, $content);
|
||||
|
|
@ -3374,6 +3409,8 @@ function reporting_group_configuration($report, $content)
|
|||
$group_name = groups_get_name($content['id_group'], true);
|
||||
|
||||
$return['title'] = $content['name'];
|
||||
$return['landscape'] = $content['landscape'];
|
||||
$return['pagebreak'] = $content['pagebreak'];
|
||||
$return['subtitle'] = $group_name;
|
||||
$return['description'] = $content['description'];
|
||||
$return['date'] = reporting_get_date_text($report, $content);
|
||||
|
|
@ -3447,6 +3484,8 @@ function reporting_network_interfaces_report($report, $content, $type='dinamic',
|
|||
$group_name = groups_get_name($content['id_group']);
|
||||
|
||||
$return['title'] = $content['name'];
|
||||
$return['landscape'] = $content['landscape'];
|
||||
$return['pagebreak'] = $content['pagebreak'];
|
||||
$return['subtitle'] = $group_name;
|
||||
$return['description'] = $content['description'];
|
||||
$return['date'] = reporting_get_date_text($report, $content);
|
||||
|
|
@ -3462,6 +3501,7 @@ function reporting_network_interfaces_report($report, $content, $type='dinamic',
|
|||
$return['data'] = [];
|
||||
|
||||
if (is_metaconsole()) {
|
||||
metaconsole_restore_db();
|
||||
$server_names = metaconsole_get_connection_names();
|
||||
if (isset($server_names) && is_array($server_names)) {
|
||||
foreach ($server_names as $key => $value) {
|
||||
|
|
@ -3532,15 +3572,17 @@ function agents_get_network_interfaces_array(
|
|||
$width = null;
|
||||
|
||||
$params = [
|
||||
'period' => $content['period'],
|
||||
'width' => $width,
|
||||
'unit_name' => array_fill(0, count($interface['traffic']), __('bytes/s')),
|
||||
'date' => $report['datetime'],
|
||||
'only_image' => $pdf,
|
||||
'homeurl' => $config['homeurl'],
|
||||
'fullscale' => $fullscale,
|
||||
'server_id' => $id_meta,
|
||||
'height' => $config['graph_image_height'],
|
||||
'period' => $content['period'],
|
||||
'width' => $width,
|
||||
'unit_name' => array_fill(0, count($interface['traffic']), __('bytes/s')),
|
||||
'date' => $report['datetime'],
|
||||
'only_image' => $pdf,
|
||||
'homeurl' => $config['homeurl'],
|
||||
'fullscale' => $fullscale,
|
||||
'server_id' => $id_meta,
|
||||
'height' => $config['graph_image_height'],
|
||||
'landscape' => $content['landscape'],
|
||||
'return_img_base_64' => true,
|
||||
];
|
||||
|
||||
$params_combined = [
|
||||
|
|
@ -3552,11 +3594,21 @@ function agents_get_network_interfaces_array(
|
|||
case 'dinamic':
|
||||
case 'static':
|
||||
if (!empty($interface['traffic'])) {
|
||||
$row_interface['chart'] = graphic_combined_module(
|
||||
array_values($interface['traffic']),
|
||||
$params,
|
||||
$params_combined
|
||||
);
|
||||
if ($pdf === false) {
|
||||
$row_interface['chart'] = graphic_combined_module(
|
||||
array_values($interface['traffic']),
|
||||
$params,
|
||||
$params_combined
|
||||
);
|
||||
} else {
|
||||
$row_interface['chart'] = '<img src="data:image/jpg;base64,';
|
||||
$row_interface['chart'] .= graphic_combined_module(
|
||||
array_values($interface['traffic']),
|
||||
$params,
|
||||
$params_combined
|
||||
);
|
||||
$row_interface['chart'] .= '" />';
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
|
|
@ -3647,6 +3699,8 @@ function reporting_alert_report_group($report, $content)
|
|||
$group_name = groups_get_name($content['id_group'], true);
|
||||
|
||||
$return['title'] = $content['name'];
|
||||
$return['landscape'] = $content['landscape'];
|
||||
$return['pagebreak'] = $content['pagebreak'];
|
||||
$return['subtitle'] = $group_name;
|
||||
$return['description'] = $content['description'];
|
||||
$return['date'] = reporting_get_date_text($report, $content);
|
||||
|
|
@ -3832,6 +3886,8 @@ function reporting_alert_report_agent($report, $content)
|
|||
];
|
||||
|
||||
$return['title'] = $content['name'];
|
||||
$return['landscape'] = $content['landscape'];
|
||||
$return['pagebreak'] = $content['pagebreak'];
|
||||
$return['subtitle'] = $agent_alias;
|
||||
$return['description'] = $content['description'];
|
||||
$return['date'] = reporting_get_date_text($report, $content);
|
||||
|
|
@ -4000,6 +4056,8 @@ function reporting_alert_report_module($report, $content)
|
|||
];
|
||||
|
||||
$return['title'] = $content['name'];
|
||||
$return['landscape'] = $content['landscape'];
|
||||
$return['pagebreak'] = $content['pagebreak'];
|
||||
$return['subtitle'] = $agent_alias.' - '.$module_name;
|
||||
$return['description'] = $content['description'];
|
||||
$return['date'] = reporting_get_date_text($report, $content);
|
||||
|
|
@ -4161,6 +4219,8 @@ function reporting_sql_graph(
|
|||
}
|
||||
|
||||
$return['title'] = $content['name'];
|
||||
$return['landscape'] = $content['landscape'];
|
||||
$return['pagebreak'] = $content['pagebreak'];
|
||||
$return['description'] = $content['description'];
|
||||
$return['date'] = reporting_get_date_text();
|
||||
|
||||
|
|
@ -4264,6 +4324,8 @@ function reporting_monitor_report($report, $content)
|
|||
];
|
||||
|
||||
$return['title'] = $content['name'];
|
||||
$return['landscape'] = $content['landscape'];
|
||||
$return['pagebreak'] = $content['pagebreak'];
|
||||
$return['subtitle'] = $agent_alias.' - '.$module_name;
|
||||
$return['description'] = $content['description'];
|
||||
$return['date'] = reporting_get_date_text($report, $content);
|
||||
|
|
@ -4371,6 +4433,8 @@ function reporting_netflow(
|
|||
}
|
||||
|
||||
$return['title'] = $content['name'];
|
||||
$return['landscape'] = $content['landscape'];
|
||||
$return['pagebreak'] = $content['pagebreak'];
|
||||
$return['description'] = $content['description'];
|
||||
$return['date'] = reporting_get_date_text($report, $content);
|
||||
|
||||
|
|
@ -4452,6 +4516,8 @@ function reporting_prediction_date($report, $content)
|
|||
$agent_name_db = io_safe_output(modules_get_agentmodule_agent_name($content['id_agent_module']));
|
||||
|
||||
$return['title'] = $content['name'];
|
||||
$return['landscape'] = $content['landscape'];
|
||||
$return['pagebreak'] = $content['pagebreak'];
|
||||
$return['subtitle'] = $agent_name.' - '.$module_name;
|
||||
$return['description'] = $content['description'];
|
||||
$return['date'] = reporting_get_date_text($report, $content);
|
||||
|
|
@ -4519,27 +4585,38 @@ function reporting_projection_graph(
|
|||
case 'dinamic':
|
||||
case 'static':
|
||||
$params = [
|
||||
'period' => $content['period'],
|
||||
'width' => $width,
|
||||
'date' => $report['datetime'],
|
||||
'unit' => '',
|
||||
'only_image' => $pdf,
|
||||
'homeurl' => ui_get_full_url(false, false, false, false).'/',
|
||||
'ttl' => $ttl,
|
||||
'server_id' => $id_meta,
|
||||
'height' => $config['graph_image_height'],
|
||||
'period' => $content['period'],
|
||||
'width' => $width,
|
||||
'date' => $report['datetime'],
|
||||
'unit' => '',
|
||||
'only_image' => $pdf,
|
||||
'homeurl' => ui_get_full_url(false, false, false, false).'/',
|
||||
'ttl' => $ttl,
|
||||
'server_id' => $id_meta,
|
||||
'height' => $config['graph_image_height'],
|
||||
'landscape' => $content['landscape'],
|
||||
'return_img_base_64' => true,
|
||||
];
|
||||
|
||||
$params_combined = [
|
||||
'projection' => $content['top_n_value'],
|
||||
];
|
||||
|
||||
$return['chart'] = graphic_combined_module(
|
||||
[$content['id_agent_module']],
|
||||
$params,
|
||||
$params_combined
|
||||
);
|
||||
|
||||
if ($pdf === true) {
|
||||
$return['chart'] = '<img src="data:image/jpg;base64,';
|
||||
$return['chart'] .= graphic_combined_module(
|
||||
[$content['id_agent_module']],
|
||||
$params,
|
||||
$params_combined
|
||||
);
|
||||
$return['chart'] .= '" />';
|
||||
} else {
|
||||
$return['chart'] = graphic_combined_module(
|
||||
[$content['id_agent_module']],
|
||||
$params,
|
||||
$params_combined
|
||||
);
|
||||
}
|
||||
break;
|
||||
|
||||
case 'data':
|
||||
|
|
@ -4573,6 +4650,8 @@ function reporting_agent_configuration($report, $content)
|
|||
}
|
||||
|
||||
$return['title'] = $content['name'];
|
||||
$return['landscape'] = $content['landscape'];
|
||||
$return['pagebreak'] = $content['pagebreak'];
|
||||
$return['description'] = $content['description'];
|
||||
$return['date'] = reporting_get_date_text($report, $content);
|
||||
$return['label'] = (isset($content['style']['label'])) ? $content['style']['label'] : '';
|
||||
|
|
@ -4751,6 +4830,8 @@ function reporting_value($report, $content, $type, $pdf=false)
|
|||
);
|
||||
|
||||
$return['title'] = $content['name'];
|
||||
$return['landscape'] = $content['landscape'];
|
||||
$return['pagebreak'] = $content['pagebreak'];
|
||||
$return['subtitle'] = $agent_name.' - '.$module_name;
|
||||
$return['description'] = $content['description'];
|
||||
$return['date'] = reporting_get_date_text($report, $content);
|
||||
|
|
@ -4768,19 +4849,21 @@ function reporting_value($report, $content, $type, $pdf=false)
|
|||
}
|
||||
|
||||
$params = [
|
||||
'agent_module_id' => $content['id_agent_module'],
|
||||
'period' => $content['period'],
|
||||
'width' => '600px',
|
||||
'pure' => false,
|
||||
'date' => $report['datetime'],
|
||||
'only_image' => $only_image,
|
||||
'homeurl' => ui_get_full_url(false, false, false, false),
|
||||
'ttl' => 1,
|
||||
'type_graph' => $config['type_module_charts'],
|
||||
'time_interval' => $content['lapse'],
|
||||
'server_id' => $id_meta,
|
||||
'height' => $config['graph_image_height'],
|
||||
'fullscale' => true,
|
||||
'agent_module_id' => $content['id_agent_module'],
|
||||
'period' => $content['period'],
|
||||
'width' => '600px',
|
||||
'pure' => false,
|
||||
'date' => $report['datetime'],
|
||||
'only_image' => $only_image,
|
||||
'homeurl' => ui_get_full_url(false, false, false, false),
|
||||
'ttl' => 1,
|
||||
'type_graph' => $config['type_module_charts'],
|
||||
'time_interval' => $content['lapse'],
|
||||
'server_id' => $id_meta,
|
||||
'height' => $config['graph_image_height'],
|
||||
'fullscale' => true,
|
||||
'landscape' => $content['landscape'],
|
||||
'return_img_base_64' => true,
|
||||
];
|
||||
|
||||
switch ($type) {
|
||||
|
|
@ -4846,7 +4929,12 @@ function reporting_value($report, $content, $type, $pdf=false)
|
|||
];
|
||||
|
||||
if ($content['visual_format'] != 1) {
|
||||
$graph = grafico_modulo_sparse($params);
|
||||
if ($only_image === false) {
|
||||
$graph = grafico_modulo_sparse($params);
|
||||
} else {
|
||||
$graph = '<img src="data:image/jpg;base64,'.grafico_modulo_sparse($params).'" />';
|
||||
}
|
||||
|
||||
$return['data'][] = ['value' => $graph];
|
||||
}
|
||||
|
||||
|
|
@ -4927,6 +5015,8 @@ function reporting_url($report, $content, $type='dinamic')
|
|||
}
|
||||
|
||||
$return['title'] = $content['name'];
|
||||
$return['landscape'] = $content['landscape'];
|
||||
$return['pagebreak'] = $content['pagebreak'];
|
||||
$return['description'] = $content['description'];
|
||||
$return['date'] = reporting_get_date_text();
|
||||
|
||||
|
|
@ -4964,6 +5054,8 @@ function reporting_text($report, $content)
|
|||
}
|
||||
|
||||
$return['title'] = $content['name'];
|
||||
$return['landscape'] = $content['landscape'];
|
||||
$return['pagebreak'] = $content['pagebreak'];
|
||||
$return['description'] = $content['description'];
|
||||
$return['date'] = reporting_get_date_text();
|
||||
|
||||
|
|
@ -4985,6 +5077,8 @@ function reporting_sql($report, $content)
|
|||
}
|
||||
|
||||
$return['title'] = $content['name'];
|
||||
$return['landscape'] = $content['landscape'];
|
||||
$return['pagebreak'] = $content['pagebreak'];
|
||||
$return['description'] = $content['description'];
|
||||
$return['date'] = reporting_get_date_text();
|
||||
|
||||
|
|
@ -5058,6 +5152,10 @@ function reporting_sql($report, $content)
|
|||
$historical_db = $content['historical_db'];
|
||||
}
|
||||
|
||||
if (is_metaconsole()) {
|
||||
metaconsole_restore_db();
|
||||
}
|
||||
|
||||
$result = db_get_all_rows_sql($sql, $historical_db);
|
||||
if ($result !== false) {
|
||||
foreach ($result as $row) {
|
||||
|
|
@ -6132,6 +6230,8 @@ function reporting_availability($report, $content, $date=false, $time=false)
|
|||
}
|
||||
|
||||
$return['title'] = $content['name'];
|
||||
$return['landscape'] = $content['landscape'];
|
||||
$return['pagebreak'] = $content['pagebreak'];
|
||||
$return['description'] = $content['description'];
|
||||
$return['date'] = reporting_get_date_text(
|
||||
$report,
|
||||
|
|
@ -6147,6 +6247,10 @@ function reporting_availability($report, $content, $date=false, $time=false)
|
|||
}
|
||||
|
||||
if (empty($content['subitems'])) {
|
||||
if (is_metaconsole()) {
|
||||
metaconsole_restore_db();
|
||||
}
|
||||
|
||||
$sql = sprintf(
|
||||
'
|
||||
SELECT id_agent_module,
|
||||
|
|
@ -6397,6 +6501,8 @@ function reporting_availability_graph($report, $content, $pdf=false)
|
|||
}
|
||||
|
||||
$return['title'] = $content['name'];
|
||||
$return['landscape'] = $content['landscape'];
|
||||
$return['pagebreak'] = $content['pagebreak'];
|
||||
$return['description'] = $content['description'];
|
||||
$return['failover_type'] = $content['failover_type'];
|
||||
$return['date'] = reporting_get_date_text($report, $content);
|
||||
|
|
@ -6416,6 +6522,10 @@ function reporting_availability_graph($report, $content, $pdf=false)
|
|||
$edge_interval = 10;
|
||||
|
||||
if (empty($content['subitems'])) {
|
||||
if (is_metaconsole()) {
|
||||
metaconsole_restore_db();
|
||||
}
|
||||
|
||||
$slas = io_safe_output(
|
||||
db_get_all_rows_field_filter(
|
||||
'treport_content_sla_combined',
|
||||
|
|
@ -7001,6 +7111,8 @@ function reporting_increment($report, $content)
|
|||
}
|
||||
|
||||
$return['title'] = $content['name'];
|
||||
$return['landscape'] = $content['landscape'];
|
||||
$return['pagebreak'] = $content['pagebreak'];
|
||||
$return['description'] = $content['description'];
|
||||
$return['id_agent_module'] = $content['id_agent_module'];
|
||||
$return['id_agent'] = $content['id_agent'];
|
||||
|
|
@ -7018,6 +7130,7 @@ function reporting_increment($report, $content)
|
|||
AND utimestamp <= '.(time() - $period).' ORDER BY utimestamp DESC';
|
||||
$sql2 = 'SELECT datos FROM tagente_datos WHERE id_agente_modulo = '.$id_agent_module.' ORDER BY utimestamp DESC';
|
||||
|
||||
metaconsole_restore_db();
|
||||
$servers = db_get_all_rows_sql(
|
||||
'SELECT *
|
||||
FROM tmetaconsole_setup
|
||||
|
|
@ -7100,6 +7213,8 @@ function reporting_general($report, $content)
|
|||
}
|
||||
|
||||
$return['title'] = $content['name'];
|
||||
$return['landscape'] = $content['landscape'];
|
||||
$return['pagebreak'] = $content['pagebreak'];
|
||||
$return['description'] = $content['description'];
|
||||
$return['date'] = reporting_get_date_text(
|
||||
$report,
|
||||
|
|
@ -7121,6 +7236,10 @@ function reporting_general($report, $content)
|
|||
$return['show_in_same_row'] = $content['style']['show_in_same_row'];
|
||||
|
||||
if (empty($content['subitems'])) {
|
||||
if (is_metaconsole()) {
|
||||
metaconsole_restore_db();
|
||||
}
|
||||
|
||||
$generals = db_get_all_rows_filter(
|
||||
'treport_content_item',
|
||||
['id_report_content' => $content['id_rc']]
|
||||
|
|
@ -7432,12 +7551,10 @@ function reporting_custom_graph(
|
|||
|
||||
if ($type_report == 'custom_graph') {
|
||||
if (is_metaconsole()) {
|
||||
$servers = metaconsole_get_connection_names();
|
||||
foreach ($servers as $server) {
|
||||
$connection = metaconsole_get_connection($server);
|
||||
if (metaconsole_connect($connection) != NOERR) {
|
||||
continue;
|
||||
}
|
||||
$id_meta = metaconsole_get_id_server($content['server_name']);
|
||||
$server = metaconsole_get_connection_by_id($id_meta);
|
||||
if (metaconsole_connect($server) != NOERR) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -7515,6 +7632,8 @@ function reporting_custom_graph(
|
|||
);
|
||||
|
||||
$return['title'] = $content['name'];
|
||||
$return['landscape'] = $content['landscape'];
|
||||
$return['pagebreak'] = $content['pagebreak'];
|
||||
$return['subtitle'] = io_safe_output($graph['name']);
|
||||
$return['agent_name'] = $agent_alias;
|
||||
$return['module_name'] = $module_name;
|
||||
|
|
@ -7532,16 +7651,18 @@ function reporting_custom_graph(
|
|||
case 'dinamic':
|
||||
case 'static':
|
||||
$params = [
|
||||
'period' => $content['period'],
|
||||
'width' => $width,
|
||||
'date' => $report['datetime'],
|
||||
'only_image' => $pdf,
|
||||
'homeurl' => ui_get_full_url(false, false, false, false),
|
||||
'ttl' => $ttl,
|
||||
'percentil' => $graphs[0]['percentil'],
|
||||
'fullscale' => $graphs[0]['fullscale'],
|
||||
'server_id' => $id_meta,
|
||||
'height' => $config['graph_image_height'],
|
||||
'period' => $content['period'],
|
||||
'width' => $width,
|
||||
'date' => $report['datetime'],
|
||||
'only_image' => $pdf,
|
||||
'homeurl' => ui_get_full_url(false, false, false, false),
|
||||
'ttl' => $ttl,
|
||||
'percentil' => $graphs[0]['percentil'],
|
||||
'fullscale' => $graphs[0]['fullscale'],
|
||||
'server_id' => $id_meta,
|
||||
'height' => $config['graph_image_height'],
|
||||
'landscape' => $content['landscape'],
|
||||
'return_img_base_64' => true,
|
||||
];
|
||||
|
||||
$params_combined = [
|
||||
|
|
@ -7554,12 +7675,21 @@ function reporting_custom_graph(
|
|||
'labels' => $content['style']['label'],
|
||||
];
|
||||
|
||||
$return['chart'] = graphic_combined_module(
|
||||
$modules,
|
||||
$params,
|
||||
$params_combined
|
||||
);
|
||||
|
||||
if ($pdf === true) {
|
||||
$return['chart'] = '<img src="data:image/jpg;base64,';
|
||||
$return['chart'] .= graphic_combined_module(
|
||||
$modules,
|
||||
$params,
|
||||
$params_combined
|
||||
);
|
||||
$return['chart'] .= '" />';
|
||||
} else {
|
||||
$return['chart'] = graphic_combined_module(
|
||||
$modules,
|
||||
$params,
|
||||
$params_combined
|
||||
);
|
||||
}
|
||||
break;
|
||||
|
||||
case 'data':
|
||||
|
|
@ -7657,6 +7787,8 @@ function reporting_simple_graph(
|
|||
}
|
||||
|
||||
$return['title'] = $content['name'];
|
||||
$return['landscape'] = $content['landscape'];
|
||||
$return['pagebreak'] = $content['pagebreak'];
|
||||
$return['subtitle'] = $agent_alias.' - '.$module_name;
|
||||
$return['agent_name_db'] = agents_get_name($id_agent);
|
||||
$return['agent_name'] = $agent_alias;
|
||||
|
|
@ -7701,28 +7833,34 @@ function reporting_simple_graph(
|
|||
}
|
||||
|
||||
$params = [
|
||||
'agent_module_id' => $content['id_agent_module'],
|
||||
'period' => $content['period'],
|
||||
'title' => $label,
|
||||
'pure' => false,
|
||||
'date' => $report['datetime'],
|
||||
'only_image' => $only_image,
|
||||
'homeurl' => ui_get_full_url(
|
||||
'agent_module_id' => $content['id_agent_module'],
|
||||
'period' => $content['period'],
|
||||
'title' => $label,
|
||||
'pure' => false,
|
||||
'date' => $report['datetime'],
|
||||
'only_image' => $only_image,
|
||||
'homeurl' => ui_get_full_url(
|
||||
false,
|
||||
false,
|
||||
false,
|
||||
false
|
||||
),
|
||||
'ttl' => $ttl,
|
||||
'compare' => $time_compare_overlapped,
|
||||
'show_unknown' => true,
|
||||
'percentil' => ($content['style']['percentil'] == 1) ? $config['percentil'] : null,
|
||||
'fullscale' => $fullscale,
|
||||
'server_id' => $id_meta,
|
||||
'height' => $config['graph_image_height'],
|
||||
'ttl' => $ttl,
|
||||
'compare' => $time_compare_overlapped,
|
||||
'show_unknown' => true,
|
||||
'percentil' => ($content['style']['percentil'] == 1) ? $config['percentil'] : null,
|
||||
'fullscale' => $fullscale,
|
||||
'server_id' => $id_meta,
|
||||
'height' => $config['graph_image_height'],
|
||||
'landscape' => $content['landscape'],
|
||||
'return_img_base_64' => true,
|
||||
];
|
||||
|
||||
$return['chart'] = grafico_modulo_sparse($params);
|
||||
if ($only_image === false) {
|
||||
$return['chart'] = grafico_modulo_sparse($params);
|
||||
} else {
|
||||
$return['chart'] = '<img src="data:image/jpg;base64,'.grafico_modulo_sparse($params).'" />';
|
||||
}
|
||||
break;
|
||||
|
||||
case 'data':
|
||||
|
|
@ -7866,13 +8004,8 @@ function reporting_set_conf_charts(
|
|||
case 'static':
|
||||
$ttl = 2;
|
||||
$only_image = true;
|
||||
if ($content['style']['show_in_landscape']) {
|
||||
$height = 1100;
|
||||
$width = 1700;
|
||||
} else {
|
||||
$height = 360;
|
||||
$width = 780;
|
||||
}
|
||||
$height = 360;
|
||||
$width = 780;
|
||||
break;
|
||||
|
||||
case 'data':
|
||||
|
|
@ -12050,7 +12183,7 @@ function reporting_translate_sla_status_for_graph($status)
|
|||
*/
|
||||
function reporting_header_table_for_pdf($title='', $description='')
|
||||
{
|
||||
$result_pdf .= '<pagebreak>';
|
||||
$result_pdf = '<pagebreak>';
|
||||
$result_pdf .= '<table class="header_table databox">';
|
||||
$result_pdf .= '<thead class="header_tr"><tr>';
|
||||
$result_pdf .= '<th class="th_first" colspan="2">';
|
||||
|
|
@ -12078,6 +12211,8 @@ function reporting_nt_top_n_report($period, $content, $pdf)
|
|||
$return = [];
|
||||
$return['type'] = 'nt_top_n';
|
||||
$return['title'] = $content['name'];
|
||||
$return['landscape'] = $content['landscape'];
|
||||
$return['pagebreak'] = $content['pagebreak'];
|
||||
$return['description'] = $content['description'];
|
||||
|
||||
// Get the data sent and received
|
||||
|
|
|
|||
|
|
@ -160,11 +160,11 @@ function reporting_html_print_report($report, $mini=false, $report_info=1)
|
|||
$table->width = '100%';
|
||||
$table->class = 'databox filters';
|
||||
$table->rowclass = [];
|
||||
$table->rowclass[0] = 'datos3';
|
||||
$table->rowclass[0] = 'datos5';
|
||||
$table->data = [];
|
||||
$table->head = [];
|
||||
$table->colspan = [];
|
||||
$table->rowstyle = [];
|
||||
$table->rowstyle = ['background-color: #686868'];
|
||||
|
||||
if (isset($item['label']) && $item['label'] != '') {
|
||||
$id_agent = $item['id_agent'];
|
||||
|
|
|
|||
|
|
@ -810,30 +810,30 @@ function reports_get_report_types($template=false, $not_editor=false)
|
|||
|
||||
$types['alert_report_module'] = [
|
||||
'optgroup' => __('Alerts'),
|
||||
'name' => __('Alert report module'),
|
||||
'name' => __('Module alert report'),
|
||||
];
|
||||
$types['alert_report_agent'] = [
|
||||
'optgroup' => __('Alerts'),
|
||||
'name' => __('Alert report agent'),
|
||||
'name' => __('Agent alert report '),
|
||||
];
|
||||
if (!$template) {
|
||||
$types['alert_report_group'] = [
|
||||
'optgroup' => __('Alerts'),
|
||||
'name' => __('Alert report group'),
|
||||
'name' => __('Group alert report'),
|
||||
];
|
||||
}
|
||||
|
||||
$types['event_report_agent'] = [
|
||||
'optgroup' => __('Events'),
|
||||
'name' => __('Event report agent'),
|
||||
];
|
||||
$types['event_report_module'] = [
|
||||
'optgroup' => __('Events'),
|
||||
'name' => __('Event report module'),
|
||||
'name' => __('Module event report'),
|
||||
];
|
||||
$types['event_report_agent'] = [
|
||||
'optgroup' => __('Events'),
|
||||
'name' => __('Agent event report'),
|
||||
];
|
||||
$types['event_report_group'] = [
|
||||
'optgroup' => __('Events'),
|
||||
'name' => __('Event report group'),
|
||||
'name' => __('Group event report'),
|
||||
];
|
||||
|
||||
if ($config['enterprise_installed']) {
|
||||
|
|
@ -879,10 +879,12 @@ function reports_get_report_types($template=false, $not_editor=false)
|
|||
];
|
||||
}
|
||||
|
||||
$types['nt_top_n'] = [
|
||||
'optgroup' => __('Network traffic'),
|
||||
'name' => __('Network Traffic Top N'),
|
||||
];
|
||||
if (!is_metaconsole()) {
|
||||
$types['nt_top_n'] = [
|
||||
'optgroup' => __('Network traffic'),
|
||||
'name' => __('Network Traffic Top N'),
|
||||
];
|
||||
}
|
||||
|
||||
return $types;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -545,6 +545,10 @@ function ui_print_timestamp($unixtime, $return=false, $option=[])
|
|||
date2strftime_format($config['date_format']),
|
||||
$unixtime
|
||||
);
|
||||
} else if ($prominent == 'compact') {
|
||||
$units = 'tiny';
|
||||
$title = date($config['date_format'], $unixtime);
|
||||
$data = human_time_comparation($unixtime, $units);
|
||||
} else {
|
||||
$title = date($config['date_format'], $unixtime);
|
||||
$units = 'large';
|
||||
|
|
|
|||
|
|
@ -760,27 +760,32 @@ function flot_slicesbar_graph(
|
|||
|
||||
if ($ttl == 2) {
|
||||
$params = [
|
||||
'graph_data' => $graph_data,
|
||||
'period' => $period,
|
||||
'width' => $width,
|
||||
'height' => $height,
|
||||
'legend' => $legend,
|
||||
'colors' => $colors,
|
||||
'fontpath' => $fontpath,
|
||||
'round_corner' => $round_corner,
|
||||
'homeurl' => $homeurl,
|
||||
'watermark' => $watermark,
|
||||
'adapt_key' => $adapt_key,
|
||||
'stat_win' => $stat_win,
|
||||
'id_agent' => $id_agent,
|
||||
'full_legend_date' => $full_legend_date,
|
||||
'not_interactive' => $not_interactive,
|
||||
'ttl' => 1,
|
||||
'widgets' => $widgets,
|
||||
'show' => $show,
|
||||
'graph_data' => $graph_data,
|
||||
'period' => $period,
|
||||
'width' => $width,
|
||||
'height' => $height,
|
||||
'legend' => $legend,
|
||||
'colors' => $colors,
|
||||
'fontpath' => $fontpath,
|
||||
'round_corner' => $round_corner,
|
||||
'homeurl' => $homeurl,
|
||||
'watermark' => $watermark,
|
||||
'adapt_key' => $adapt_key,
|
||||
'stat_win' => $stat_win,
|
||||
'id_agent' => $id_agent,
|
||||
'full_legend_date' => $full_legend_date,
|
||||
'not_interactive' => $not_interactive,
|
||||
'ttl' => 1,
|
||||
'widgets' => $widgets,
|
||||
'show' => $show,
|
||||
'return_img_base_64' => true,
|
||||
];
|
||||
|
||||
return generator_chart_to_pdf('slicebar', $params);
|
||||
$graph = '<img src="data:image/jpg;base64,';
|
||||
$graph .= generator_chart_to_pdf('slicebar', $params);
|
||||
$graph .= '" />';
|
||||
|
||||
return $graph;
|
||||
}
|
||||
|
||||
// Get a unique identifier to graph
|
||||
|
|
|
|||
|
|
@ -1169,7 +1169,7 @@ function createGauges(data, width, height, font_size, no_data_image, font) {
|
|||
maxinum,
|
||||
valor;
|
||||
|
||||
for (key in data) {
|
||||
for (var key in data) {
|
||||
nombre = data[key].gauge;
|
||||
|
||||
label = data[key].label;
|
||||
|
|
@ -1189,8 +1189,8 @@ function createGauges(data, width, height, font_size, no_data_image, font) {
|
|||
mininum = round_with_decimals(parseFloat(data[key].min));
|
||||
maxinum = round_with_decimals(parseFloat(data[key].max));
|
||||
|
||||
critical_inverse = parseInt(data[key].critical_inverse);
|
||||
warning_inverse = parseInt(data[key].warning_inverse);
|
||||
var critical_inverse = parseInt(data[key].critical_inverse);
|
||||
var warning_inverse = parseInt(data[key].warning_inverse);
|
||||
|
||||
valor = round_with_decimals(data[key].value);
|
||||
|
||||
|
|
|
|||
|
|
@ -1763,7 +1763,7 @@ function round_with_decimals(value, multiplier) {
|
|||
if (typeof multiplier === "undefined") multiplier = 1;
|
||||
|
||||
// Return non numeric types without modification
|
||||
if (typeof value !== "number" || Number.isNaN(value)) {
|
||||
if (typeof value !== "number" || isNaN(value)) {
|
||||
return value;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@
|
|||
var id_modules_icmp = Array(6, 7);
|
||||
var id_modules_tcp = Array(8, 9, 10, 11);
|
||||
var id_modules_snmp = Array(15, 16, 17, 18);
|
||||
var id_modules_exec = Array(34, 35, 36, 37);
|
||||
|
||||
function configure_modules_form() {
|
||||
$("#id_module_type").change(function() {
|
||||
|
|
@ -23,6 +24,10 @@ function configure_modules_form() {
|
|||
$("tr#simple-snmp_1, tr#simple-snmp_2").hide();
|
||||
$("tr#simple-tcp_send, tr#simple-tcp_receive").show();
|
||||
$("#text-tcp_port").removeAttr("disabled");
|
||||
} else if (id_modules_exec.in_array(this.value)) {
|
||||
$("tr#simple-tcp_send, tr#simple-tcp_receive").hide();
|
||||
$("tr#simple-snmp_1, tr#simple-snmp_2").hide();
|
||||
$("#text-tcp_port").attr("disabled", false);
|
||||
}
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -1,219 +1,794 @@
|
|||
/* Reset */
|
||||
.defaultSkin table, .defaultSkin tbody, .defaultSkin a, .defaultSkin img, .defaultSkin tr, .defaultSkin div, .defaultSkin td, .defaultSkin iframe, .defaultSkin span, .defaultSkin *, .defaultSkin .mceText {border:0; margin:0; padding:0; background:transparent; white-space:nowrap; text-decoration:none; font-weight:normal; cursor:default; color:#000; vertical-align:baseline; width:auto; border-collapse:separate; text-align:left}
|
||||
.defaultSkin a:hover, .defaultSkin a:link, .defaultSkin a:visited, .defaultSkin a:active {text-decoration:none; font-weight:normal; cursor:default; color:#000}
|
||||
.defaultSkin table td {vertical-align:middle}
|
||||
.defaultSkin table,
|
||||
.defaultSkin tbody,
|
||||
.defaultSkin a,
|
||||
.defaultSkin img,
|
||||
.defaultSkin tr,
|
||||
.defaultSkin div,
|
||||
.defaultSkin td,
|
||||
.defaultSkin iframe,
|
||||
.defaultSkin span,
|
||||
.defaultSkin *,
|
||||
.defaultSkin .mceText {
|
||||
border: 0;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
background: transparent;
|
||||
white-space: nowrap;
|
||||
text-decoration: none;
|
||||
font-weight: normal;
|
||||
cursor: default;
|
||||
color: #000;
|
||||
vertical-align: baseline;
|
||||
width: auto;
|
||||
border-collapse: separate;
|
||||
text-align: left;
|
||||
}
|
||||
.defaultSkin a:hover,
|
||||
.defaultSkin a:link,
|
||||
.defaultSkin a:visited,
|
||||
.defaultSkin a:active {
|
||||
text-decoration: none;
|
||||
font-weight: normal;
|
||||
cursor: default;
|
||||
color: #000;
|
||||
}
|
||||
.defaultSkin table td {
|
||||
vertical-align: middle;
|
||||
}
|
||||
|
||||
/* Containers */
|
||||
.defaultSkin table {direction:ltr;background:transparent}
|
||||
.defaultSkin iframe {display:block;}
|
||||
.defaultSkin .mceToolbar {height:26px}
|
||||
.defaultSkin .mceLeft {text-align:left}
|
||||
.defaultSkin .mceRight {text-align:right}
|
||||
.defaultSkin table {
|
||||
direction: ltr;
|
||||
background: transparent;
|
||||
}
|
||||
.defaultSkin iframe {
|
||||
display: block;
|
||||
}
|
||||
.defaultSkin .mceToolbar {
|
||||
height: 26px;
|
||||
}
|
||||
.defaultSkin .mceLeft {
|
||||
text-align: left;
|
||||
}
|
||||
.defaultSkin .mceRight {
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
/* External */
|
||||
.defaultSkin .mceExternalToolbar {position:absolute; border:1px solid #CCC; border-bottom:0; display:none;}
|
||||
.defaultSkin .mceExternalToolbar td.mceToolbar {padding-right:13px;}
|
||||
.defaultSkin .mceExternalClose {position:absolute; top:3px; right:3px; width:7px; height:7px; background:url(../../img/icons.gif) -820px 0}
|
||||
.defaultSkin .mceExternalToolbar {
|
||||
position: absolute;
|
||||
border: 1px solid #ccc;
|
||||
border-bottom: 0;
|
||||
display: none;
|
||||
}
|
||||
.defaultSkin .mceExternalToolbar td.mceToolbar {
|
||||
padding-right: 13px;
|
||||
}
|
||||
.defaultSkin .mceExternalClose {
|
||||
position: absolute;
|
||||
top: 3px;
|
||||
right: 3px;
|
||||
width: 7px;
|
||||
height: 7px;
|
||||
background: url(../../img/icons.gif) -820px 0;
|
||||
}
|
||||
|
||||
/* Layout */
|
||||
.defaultSkin table.mceLayout {border:0; border-left:1px solid #CCC; border-right:1px solid #CCC; margin-bottom:10px;}
|
||||
.defaultSkin table.mceLayout tr.mceFirst td {border-top:1px solid #CCC}
|
||||
.defaultSkin table.mceLayout tr.mceLast td {border-bottom:1px solid #CCC}
|
||||
.defaultSkin table.mceToolbar, .defaultSkin tr.mceFirst .mceToolbar tr td, .defaultSkin tr.mceLast .mceToolbar tr td {border:0; margin:0; padding:0;}
|
||||
.defaultSkin td.mceToolbar {background:#F0F0EE; padding-top:1px; vertical-align:top}
|
||||
.defaultSkin .mceIframeContainer {border-top:1px solid #CCC; border-bottom:1px solid #CCC}
|
||||
.defaultSkin .mceStatusbar {background:#F0F0EE; font-family:'MS Sans Serif',sans-serif,Verdana,Arial; font-size:9pt; line-height:16px; overflow:visible; color:#000; display:block; height:10px;}
|
||||
.defaultSkin .mceStatusbar div {float:left; margin:2px}
|
||||
.defaultSkin .mceStatusbar a.mceResize {display:block; float:right; background:url(../../img/icons.gif) -800px 0; width:20px; height:20px; cursor:se-resize; outline:0}
|
||||
.defaultSkin .mceStatusbar a:hover {text-decoration:underline}
|
||||
.defaultSkin table.mceToolbar {margin-left:3px}
|
||||
.defaultSkin span.mceIcon, .defaultSkin img.mceIcon {display:block; width:20px; height:20px}
|
||||
.defaultSkin .mceIcon {background:url(../../img/icons.gif) no-repeat 20px 20px}
|
||||
.defaultSkin td.mceCenter {text-align:center;}
|
||||
.defaultSkin td.mceCenter table {margin:0 auto; text-align:left;}
|
||||
.defaultSkin td.mceRight table {margin:0 0 0 auto;}
|
||||
.defaultSkin table.mceLayout {
|
||||
border: 0;
|
||||
border-left: 1px solid #ccc;
|
||||
border-right: 1px solid #ccc;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
.defaultSkin table.mceLayout tr.mceFirst td {
|
||||
border-top: 1px solid #ccc;
|
||||
}
|
||||
.defaultSkin table.mceLayout tr.mceLast td {
|
||||
border-bottom: 1px solid #ccc;
|
||||
display: none;
|
||||
}
|
||||
.defaultSkin table.mceToolbar,
|
||||
.defaultSkin tr.mceFirst .mceToolbar tr td,
|
||||
.defaultSkin tr.mceLast .mceToolbar tr td {
|
||||
border: 0;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
.defaultSkin td.mceToolbar {
|
||||
background: #f0f0ee;
|
||||
padding-top: 1px;
|
||||
vertical-align: top;
|
||||
}
|
||||
.defaultSkin .mceIframeContainer {
|
||||
border-top: 1px solid #ccc;
|
||||
border-bottom: 1px solid #ccc;
|
||||
}
|
||||
.defaultSkin .mceStatusbar {
|
||||
background: #f0f0ee;
|
||||
font-family: "MS Sans Serif", sans-serif, Verdana, Arial;
|
||||
font-size: 9pt;
|
||||
line-height: 16px;
|
||||
overflow: visible;
|
||||
color: #000;
|
||||
display: block;
|
||||
height: 10px;
|
||||
}
|
||||
.defaultSkin .mceStatusbar div {
|
||||
float: left;
|
||||
margin: 2px;
|
||||
}
|
||||
.defaultSkin .mceStatusbar a.mceResize {
|
||||
display: block;
|
||||
float: right;
|
||||
background: url(../../img/icons.gif) -800px 0;
|
||||
width: 20px;
|
||||
height: 20px;
|
||||
cursor: se-resize;
|
||||
outline: 0;
|
||||
}
|
||||
.defaultSkin .mceStatusbar a:hover {
|
||||
text-decoration: underline;
|
||||
}
|
||||
.defaultSkin table.mceToolbar {
|
||||
margin-left: 3px;
|
||||
}
|
||||
.defaultSkin span.mceIcon,
|
||||
.defaultSkin img.mceIcon {
|
||||
display: block;
|
||||
width: 20px;
|
||||
height: 20px;
|
||||
}
|
||||
.defaultSkin .mceIcon {
|
||||
background: url(../../img/icons.gif) no-repeat 20px 20px;
|
||||
}
|
||||
.defaultSkin td.mceCenter {
|
||||
text-align: center;
|
||||
}
|
||||
.defaultSkin td.mceCenter table {
|
||||
margin: 0 auto;
|
||||
text-align: left;
|
||||
}
|
||||
.defaultSkin td.mceRight table {
|
||||
margin: 0 0 0 auto;
|
||||
}
|
||||
|
||||
/* Button */
|
||||
.defaultSkin .mceButton {display:block; border:1px solid #F0F0EE; width:20px; height:20px; margin-right:1px}
|
||||
.defaultSkin a.mceButtonEnabled:hover {border:1px solid #0A246A; background-color:#B2BBD0}
|
||||
.defaultSkin a.mceButtonActive, .defaultSkin a.mceButtonSelected {border:1px solid #0A246A; background-color:#C2CBE0}
|
||||
.defaultSkin .mceButtonDisabled .mceIcon {opacity:0.3; -ms-filter:'alpha(opacity=30)'; filter:alpha(opacity=30)}
|
||||
.defaultSkin .mceButtonLabeled {width:auto}
|
||||
.defaultSkin .mceButtonLabeled span.mceIcon {float:left}
|
||||
.defaultSkin span.mceButtonLabel {display:block; font-size:10px; padding:4px 6px 0 22px; font-family:Tahoma,Verdana,Arial,Helvetica}
|
||||
.defaultSkin .mceButtonDisabled .mceButtonLabel {color:#888}
|
||||
.defaultSkin .mceButton {
|
||||
display: block;
|
||||
border: 1px solid #f0f0ee;
|
||||
width: 20px;
|
||||
height: 20px;
|
||||
margin-right: 1px;
|
||||
}
|
||||
.defaultSkin a.mceButtonEnabled:hover {
|
||||
border: 1px solid #0a246a;
|
||||
background-color: #b2bbd0;
|
||||
}
|
||||
.defaultSkin a.mceButtonActive,
|
||||
.defaultSkin a.mceButtonSelected {
|
||||
border: 1px solid #0a246a;
|
||||
background-color: #c2cbe0;
|
||||
}
|
||||
.defaultSkin .mceButtonDisabled .mceIcon {
|
||||
opacity: 0.3;
|
||||
-ms-filter: "alpha(opacity=30)";
|
||||
filter: alpha(opacity=30);
|
||||
}
|
||||
.defaultSkin .mceButtonLabeled {
|
||||
width: auto;
|
||||
}
|
||||
.defaultSkin .mceButtonLabeled span.mceIcon {
|
||||
float: left;
|
||||
}
|
||||
.defaultSkin span.mceButtonLabel {
|
||||
display: block;
|
||||
font-size: 10px;
|
||||
padding: 4px 6px 0 22px;
|
||||
font-family: Tahoma, Verdana, Arial, Helvetica;
|
||||
}
|
||||
.defaultSkin .mceButtonDisabled .mceButtonLabel {
|
||||
color: #888;
|
||||
}
|
||||
|
||||
/* Separator */
|
||||
.defaultSkin .mceSeparator {display:block; background:url(../../img/icons.gif) -180px 0; width:2px; height:20px; margin:2px 2px 0 4px}
|
||||
.defaultSkin .mceSeparator {
|
||||
display: block;
|
||||
background: url(../../img/icons.gif) -180px 0;
|
||||
width: 2px;
|
||||
height: 20px;
|
||||
margin: 2px 2px 0 4px;
|
||||
}
|
||||
|
||||
/* ListBox */
|
||||
.defaultSkin .mceListBox, .defaultSkin .mceListBox a {display:block}
|
||||
.defaultSkin .mceListBox .mceText {padding-left:4px; width:70px; text-align:left; border:1px solid #CCC; border-right:0; background:#FFF; font-family:Tahoma,Verdana,Arial,Helvetica; font-size:11px; height:20px; line-height:20px; overflow:hidden}
|
||||
.defaultSkin .mceListBox .mceOpen {width:9px; height:20px; background:url(../../img/icons.gif) -741px 0; margin-right:2px; border:1px solid #CCC;}
|
||||
.defaultSkin table.mceListBoxEnabled:hover .mceText, .defaultSkin .mceListBoxHover .mceText, .defaultSkin .mceListBoxSelected .mceText {border:1px solid #A2ABC0; border-right:0; background:#FFF}
|
||||
.defaultSkin table.mceListBoxEnabled:hover .mceOpen, .defaultSkin .mceListBoxHover .mceOpen, .defaultSkin .mceListBoxSelected .mceOpen {background-color:#FFF; border:1px solid #A2ABC0}
|
||||
.defaultSkin .mceListBoxDisabled a.mceText {color:gray; background-color:transparent;}
|
||||
.defaultSkin .mceListBoxMenu {overflow:auto; overflow-x:hidden}
|
||||
.defaultSkin .mceOldBoxModel .mceListBox .mceText {height:22px}
|
||||
.defaultSkin .mceOldBoxModel .mceListBox .mceOpen {width:11px; height:22px;}
|
||||
.defaultSkin select.mceNativeListBox {font-family:'MS Sans Serif',sans-serif,Verdana,Arial; font-size:7pt; background:#F0F0EE; border:1px solid gray; margin-right:2px;}
|
||||
.defaultSkin .mceListBox,
|
||||
.defaultSkin .mceListBox a {
|
||||
display: block;
|
||||
}
|
||||
.defaultSkin .mceListBox .mceText {
|
||||
padding-left: 4px;
|
||||
width: 70px;
|
||||
text-align: left;
|
||||
border: 1px solid #ccc;
|
||||
border-right: 0;
|
||||
background: #fff;
|
||||
font-family: Tahoma, Verdana, Arial, Helvetica;
|
||||
font-size: 11px;
|
||||
height: 20px;
|
||||
line-height: 20px;
|
||||
overflow: hidden;
|
||||
}
|
||||
.defaultSkin .mceListBox .mceOpen {
|
||||
width: 9px;
|
||||
height: 20px;
|
||||
background: url(../../img/icons.gif) -741px 0;
|
||||
margin-right: 2px;
|
||||
border: 1px solid #ccc;
|
||||
}
|
||||
.defaultSkin table.mceListBoxEnabled:hover .mceText,
|
||||
.defaultSkin .mceListBoxHover .mceText,
|
||||
.defaultSkin .mceListBoxSelected .mceText {
|
||||
border: 1px solid #a2abc0;
|
||||
border-right: 0;
|
||||
background: #fff;
|
||||
}
|
||||
.defaultSkin table.mceListBoxEnabled:hover .mceOpen,
|
||||
.defaultSkin .mceListBoxHover .mceOpen,
|
||||
.defaultSkin .mceListBoxSelected .mceOpen {
|
||||
background-color: #fff;
|
||||
border: 1px solid #a2abc0;
|
||||
}
|
||||
.defaultSkin .mceListBoxDisabled a.mceText {
|
||||
color: gray;
|
||||
background-color: transparent;
|
||||
}
|
||||
.defaultSkin .mceListBoxMenu {
|
||||
overflow: auto;
|
||||
overflow-x: hidden;
|
||||
}
|
||||
.defaultSkin .mceOldBoxModel .mceListBox .mceText {
|
||||
height: 22px;
|
||||
}
|
||||
.defaultSkin .mceOldBoxModel .mceListBox .mceOpen {
|
||||
width: 11px;
|
||||
height: 22px;
|
||||
}
|
||||
.defaultSkin select.mceNativeListBox {
|
||||
font-family: "MS Sans Serif", sans-serif, Verdana, Arial;
|
||||
font-size: 7pt;
|
||||
background: #f0f0ee;
|
||||
border: 1px solid gray;
|
||||
margin-right: 2px;
|
||||
}
|
||||
|
||||
/* SplitButton */
|
||||
.defaultSkin .mceSplitButton {width:32px; height:20px; direction:ltr}
|
||||
.defaultSkin .mceSplitButton a, .defaultSkin .mceSplitButton span {height:20px; display:block}
|
||||
.defaultSkin .mceSplitButton a.mceAction {width:20px; border:1px solid #F0F0EE; border-right:0;}
|
||||
.defaultSkin .mceSplitButton span.mceAction {width:20px; background-image:url(../../img/icons.gif);}
|
||||
.defaultSkin .mceSplitButton a.mceOpen {width:9px; background:url(../../img/icons.gif) -741px 0; border:1px solid #F0F0EE;}
|
||||
.defaultSkin .mceSplitButton span.mceOpen {display:none}
|
||||
.defaultSkin table.mceSplitButtonEnabled:hover a.mceAction, .defaultSkin .mceSplitButtonHover a.mceAction, .defaultSkin .mceSplitButtonSelected a.mceAction {border:1px solid #0A246A; border-right:0; background-color:#B2BBD0}
|
||||
.defaultSkin table.mceSplitButtonEnabled:hover a.mceOpen, .defaultSkin .mceSplitButtonHover a.mceOpen, .defaultSkin .mceSplitButtonSelected a.mceOpen {background-color:#B2BBD0; border:1px solid #0A246A;}
|
||||
.defaultSkin .mceSplitButtonDisabled .mceAction, .defaultSkin .mceSplitButtonDisabled a.mceOpen {opacity:0.3; -ms-filter:'alpha(opacity=30)'; filter:alpha(opacity=30)}
|
||||
.defaultSkin .mceSplitButtonActive a.mceAction {border:1px solid #0A246A; background-color:#C2CBE0}
|
||||
.defaultSkin .mceSplitButtonActive a.mceOpen {border-left:0;}
|
||||
.defaultSkin .mceSplitButton {
|
||||
width: 32px;
|
||||
height: 20px;
|
||||
direction: ltr;
|
||||
}
|
||||
.defaultSkin .mceSplitButton a,
|
||||
.defaultSkin .mceSplitButton span {
|
||||
height: 20px;
|
||||
display: block;
|
||||
}
|
||||
.defaultSkin .mceSplitButton a.mceAction {
|
||||
width: 20px;
|
||||
border: 1px solid #f0f0ee;
|
||||
border-right: 0;
|
||||
}
|
||||
.defaultSkin .mceSplitButton span.mceAction {
|
||||
width: 20px;
|
||||
background-image: url(../../img/icons.gif);
|
||||
}
|
||||
.defaultSkin .mceSplitButton a.mceOpen {
|
||||
width: 9px;
|
||||
background: url(../../img/icons.gif) -741px 0;
|
||||
border: 1px solid #f0f0ee;
|
||||
}
|
||||
.defaultSkin .mceSplitButton span.mceOpen {
|
||||
display: none;
|
||||
}
|
||||
.defaultSkin table.mceSplitButtonEnabled:hover a.mceAction,
|
||||
.defaultSkin .mceSplitButtonHover a.mceAction,
|
||||
.defaultSkin .mceSplitButtonSelected a.mceAction {
|
||||
border: 1px solid #0a246a;
|
||||
border-right: 0;
|
||||
background-color: #b2bbd0;
|
||||
}
|
||||
.defaultSkin table.mceSplitButtonEnabled:hover a.mceOpen,
|
||||
.defaultSkin .mceSplitButtonHover a.mceOpen,
|
||||
.defaultSkin .mceSplitButtonSelected a.mceOpen {
|
||||
background-color: #b2bbd0;
|
||||
border: 1px solid #0a246a;
|
||||
}
|
||||
.defaultSkin .mceSplitButtonDisabled .mceAction,
|
||||
.defaultSkin .mceSplitButtonDisabled a.mceOpen {
|
||||
opacity: 0.3;
|
||||
-ms-filter: "alpha(opacity=30)";
|
||||
filter: alpha(opacity=30);
|
||||
}
|
||||
.defaultSkin .mceSplitButtonActive a.mceAction {
|
||||
border: 1px solid #0a246a;
|
||||
background-color: #c2cbe0;
|
||||
}
|
||||
.defaultSkin .mceSplitButtonActive a.mceOpen {
|
||||
border-left: 0;
|
||||
}
|
||||
|
||||
/* ColorSplitButton */
|
||||
.defaultSkin div.mceColorSplitMenu table {background:#FFF; border:1px solid gray}
|
||||
.defaultSkin .mceColorSplitMenu td {padding:2px}
|
||||
.defaultSkin .mceColorSplitMenu a {display:block; width:9px; height:9px; overflow:hidden; border:1px solid #808080}
|
||||
.defaultSkin .mceColorSplitMenu td.mceMoreColors {padding:1px 3px 1px 1px}
|
||||
.defaultSkin .mceColorSplitMenu a.mceMoreColors {width:100%; height:auto; text-align:center; font-family:Tahoma,Verdana,Arial,Helvetica; font-size:11px; line-height:20px; border:1px solid #FFF}
|
||||
.defaultSkin .mceColorSplitMenu a.mceMoreColors:hover {border:1px solid #0A246A; background-color:#B6BDD2}
|
||||
.defaultSkin a.mceMoreColors:hover {border:1px solid #0A246A}
|
||||
.defaultSkin .mceColorPreview {margin-left:2px; width:16px; height:4px; overflow:hidden; background:#9a9b9a}
|
||||
.defaultSkin .mce_forecolor span.mceAction, .defaultSkin .mce_backcolor span.mceAction {overflow:hidden; height:16px}
|
||||
.defaultSkin div.mceColorSplitMenu table {
|
||||
background: #fff;
|
||||
border: 1px solid gray;
|
||||
}
|
||||
.defaultSkin .mceColorSplitMenu td {
|
||||
padding: 2px;
|
||||
}
|
||||
.defaultSkin .mceColorSplitMenu a {
|
||||
display: block;
|
||||
width: 9px;
|
||||
height: 9px;
|
||||
overflow: hidden;
|
||||
border: 1px solid #808080;
|
||||
}
|
||||
.defaultSkin .mceColorSplitMenu td.mceMoreColors {
|
||||
padding: 1px 3px 1px 1px;
|
||||
}
|
||||
.defaultSkin .mceColorSplitMenu a.mceMoreColors {
|
||||
width: 100%;
|
||||
height: auto;
|
||||
text-align: center;
|
||||
font-family: Tahoma, Verdana, Arial, Helvetica;
|
||||
font-size: 11px;
|
||||
line-height: 20px;
|
||||
border: 1px solid #fff;
|
||||
}
|
||||
.defaultSkin .mceColorSplitMenu a.mceMoreColors:hover {
|
||||
border: 1px solid #0a246a;
|
||||
background-color: #b6bdd2;
|
||||
}
|
||||
.defaultSkin a.mceMoreColors:hover {
|
||||
border: 1px solid #0a246a;
|
||||
}
|
||||
.defaultSkin .mceColorPreview {
|
||||
margin-left: 2px;
|
||||
width: 16px;
|
||||
height: 4px;
|
||||
overflow: hidden;
|
||||
background: #9a9b9a;
|
||||
}
|
||||
.defaultSkin .mce_forecolor span.mceAction,
|
||||
.defaultSkin .mce_backcolor span.mceAction {
|
||||
overflow: hidden;
|
||||
height: 16px;
|
||||
}
|
||||
|
||||
/* Menu */
|
||||
.defaultSkin .mceMenu {position:absolute; left:0; top:0; z-index:1000; border:1px solid #D4D0C8; direction:ltr}
|
||||
.defaultSkin .mceNoIcons span.mceIcon {width:0;}
|
||||
.defaultSkin .mceNoIcons a .mceText {padding-left:10px}
|
||||
.defaultSkin .mceMenu table {background:#FFF}
|
||||
.defaultSkin .mceMenu a, .defaultSkin .mceMenu span, .defaultSkin .mceMenu {display:block}
|
||||
.defaultSkin .mceMenu td {height:20px}
|
||||
.defaultSkin .mceMenu a {position:relative;padding:3px 0 4px 0}
|
||||
.defaultSkin .mceMenu .mceText {position:relative; display:block; font-family:Tahoma,Verdana,Arial,Helvetica; color:#000; cursor:default; margin:0; padding:0 25px 0 25px; display:block}
|
||||
.defaultSkin .mceMenu span.mceText, .defaultSkin .mceMenu .mcePreview {font-size:11px}
|
||||
.defaultSkin .mceMenu pre.mceText {font-family:Monospace}
|
||||
.defaultSkin .mceMenu .mceIcon {position:absolute; top:0; left:0; width:22px;}
|
||||
.defaultSkin .mceMenu .mceMenuItemEnabled a:hover, .defaultSkin .mceMenu .mceMenuItemActive {background-color:#dbecf3}
|
||||
.defaultSkin td.mceMenuItemSeparator {background:#DDD; height:1px}
|
||||
.defaultSkin .mceMenuItemTitle a {border:0; background:#EEE; border-bottom:1px solid #DDD}
|
||||
.defaultSkin .mceMenuItemTitle span.mceText {color:#000; font-weight:bold; padding-left:4px}
|
||||
.defaultSkin .mceMenuItemDisabled .mceText {color:#888}
|
||||
.defaultSkin .mceMenuItemSelected .mceIcon {background:url(img/menu_check.gif)}
|
||||
.defaultSkin .mceNoIcons .mceMenuItemSelected a {background:url(img/menu_arrow.gif) no-repeat -6px center}
|
||||
.defaultSkin .mceMenu span.mceMenuLine {display:none}
|
||||
.defaultSkin .mceMenuItemSub a {background:url(img/menu_arrow.gif) no-repeat top right;}
|
||||
.defaultSkin .mceMenuItem td, .defaultSkin .mceMenuItem th {line-height: normal}
|
||||
.defaultSkin .mceMenu {
|
||||
position: absolute;
|
||||
left: 0;
|
||||
top: 0;
|
||||
z-index: 1000;
|
||||
border: 1px solid #d4d0c8;
|
||||
direction: ltr;
|
||||
}
|
||||
.defaultSkin .mceNoIcons span.mceIcon {
|
||||
width: 0;
|
||||
}
|
||||
.defaultSkin .mceNoIcons a .mceText {
|
||||
padding-left: 10px;
|
||||
}
|
||||
.defaultSkin .mceMenu table {
|
||||
background: #fff;
|
||||
}
|
||||
.defaultSkin .mceMenu a,
|
||||
.defaultSkin .mceMenu span,
|
||||
.defaultSkin .mceMenu {
|
||||
display: block;
|
||||
}
|
||||
.defaultSkin .mceMenu td {
|
||||
height: 20px;
|
||||
}
|
||||
.defaultSkin .mceMenu a {
|
||||
position: relative;
|
||||
padding: 3px 0 4px 0;
|
||||
}
|
||||
.defaultSkin .mceMenu .mceText {
|
||||
position: relative;
|
||||
display: block;
|
||||
font-family: Tahoma, Verdana, Arial, Helvetica;
|
||||
color: #000;
|
||||
cursor: default;
|
||||
margin: 0;
|
||||
padding: 0 25px 0 25px;
|
||||
display: block;
|
||||
}
|
||||
.defaultSkin .mceMenu span.mceText,
|
||||
.defaultSkin .mceMenu .mcePreview {
|
||||
font-size: 11px;
|
||||
}
|
||||
.defaultSkin .mceMenu pre.mceText {
|
||||
font-family: Monospace;
|
||||
}
|
||||
.defaultSkin .mceMenu .mceIcon {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
width: 22px;
|
||||
}
|
||||
.defaultSkin .mceMenu .mceMenuItemEnabled a:hover,
|
||||
.defaultSkin .mceMenu .mceMenuItemActive {
|
||||
background-color: #dbecf3;
|
||||
}
|
||||
.defaultSkin td.mceMenuItemSeparator {
|
||||
background: #ddd;
|
||||
height: 1px;
|
||||
}
|
||||
.defaultSkin .mceMenuItemTitle a {
|
||||
border: 0;
|
||||
background: #eee;
|
||||
border-bottom: 1px solid #ddd;
|
||||
}
|
||||
.defaultSkin .mceMenuItemTitle span.mceText {
|
||||
color: #000;
|
||||
font-weight: bold;
|
||||
padding-left: 4px;
|
||||
}
|
||||
.defaultSkin .mceMenuItemDisabled .mceText {
|
||||
color: #888;
|
||||
}
|
||||
.defaultSkin .mceMenuItemSelected .mceIcon {
|
||||
background: url(img/menu_check.gif);
|
||||
}
|
||||
.defaultSkin .mceNoIcons .mceMenuItemSelected a {
|
||||
background: url(img/menu_arrow.gif) no-repeat -6px center;
|
||||
}
|
||||
.defaultSkin .mceMenu span.mceMenuLine {
|
||||
display: none;
|
||||
}
|
||||
.defaultSkin .mceMenuItemSub a {
|
||||
background: url(img/menu_arrow.gif) no-repeat top right;
|
||||
}
|
||||
.defaultSkin .mceMenuItem td,
|
||||
.defaultSkin .mceMenuItem th {
|
||||
line-height: normal;
|
||||
}
|
||||
|
||||
/* Progress,Resize */
|
||||
.defaultSkin .mceBlocker {position:absolute; left:0; top:0; z-index:1000; opacity:0.5; -ms-filter:'alpha(opacity=50)'; filter:alpha(opacity=50); background:#FFF}
|
||||
.defaultSkin .mceProgress {position:absolute; left:0; top:0; z-index:1001; background:url(img/progress.gif) no-repeat; width:32px; height:32px; margin:-16px 0 0 -16px}
|
||||
.defaultSkin .mceBlocker {
|
||||
position: absolute;
|
||||
left: 0;
|
||||
top: 0;
|
||||
z-index: 1000;
|
||||
opacity: 0.5;
|
||||
-ms-filter: "alpha(opacity=50)";
|
||||
filter: alpha(opacity=50);
|
||||
background: #fff;
|
||||
}
|
||||
.defaultSkin .mceProgress {
|
||||
position: absolute;
|
||||
left: 0;
|
||||
top: 0;
|
||||
z-index: 1001;
|
||||
background: url(img/progress.gif) no-repeat;
|
||||
width: 32px;
|
||||
height: 32px;
|
||||
margin: -16px 0 0 -16px;
|
||||
}
|
||||
|
||||
/* Rtl */
|
||||
.mceRtl .mceListBox .mceText {text-align: right; padding: 0 4px 0 0}
|
||||
.mceRtl .mceMenuItem .mceText {text-align: right}
|
||||
.mceRtl .mceListBox .mceText {
|
||||
text-align: right;
|
||||
padding: 0 4px 0 0;
|
||||
}
|
||||
.mceRtl .mceMenuItem .mceText {
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
/* Formats */
|
||||
.defaultSkin .mce_formatPreview a {font-size:10px}
|
||||
.defaultSkin .mce_p span.mceText {}
|
||||
.defaultSkin .mce_address span.mceText {font-style:italic}
|
||||
.defaultSkin .mce_pre span.mceText {font-family:monospace}
|
||||
.defaultSkin .mce_h1 span.mceText {font-weight:bolder; font-size: 2em}
|
||||
.defaultSkin .mce_h2 span.mceText {font-weight:bolder; font-size: 1.5em}
|
||||
.defaultSkin .mce_h3 span.mceText {font-weight:bolder; font-size: 1.17em}
|
||||
.defaultSkin .mce_h4 span.mceText {font-weight:bolder; font-size: 1em}
|
||||
.defaultSkin .mce_h5 span.mceText {font-weight:bolder; font-size: .83em}
|
||||
.defaultSkin .mce_h6 span.mceText {font-weight:bolder; font-size: .75em}
|
||||
.defaultSkin .mce_formatPreview a {
|
||||
font-size: 10px;
|
||||
}
|
||||
.defaultSkin .mce_p span.mceText {
|
||||
}
|
||||
.defaultSkin .mce_address span.mceText {
|
||||
font-style: italic;
|
||||
}
|
||||
.defaultSkin .mce_pre span.mceText {
|
||||
font-family: monospace;
|
||||
}
|
||||
.defaultSkin .mce_h1 span.mceText {
|
||||
font-weight: bolder;
|
||||
font-size: 2em;
|
||||
}
|
||||
.defaultSkin .mce_h2 span.mceText {
|
||||
font-weight: bolder;
|
||||
font-size: 1.5em;
|
||||
}
|
||||
.defaultSkin .mce_h3 span.mceText {
|
||||
font-weight: bolder;
|
||||
font-size: 1.17em;
|
||||
}
|
||||
.defaultSkin .mce_h4 span.mceText {
|
||||
font-weight: bolder;
|
||||
font-size: 1em;
|
||||
}
|
||||
.defaultSkin .mce_h5 span.mceText {
|
||||
font-weight: bolder;
|
||||
font-size: 0.83em;
|
||||
}
|
||||
.defaultSkin .mce_h6 span.mceText {
|
||||
font-weight: bolder;
|
||||
font-size: 0.75em;
|
||||
}
|
||||
|
||||
/* Theme */
|
||||
.defaultSkin span.mce_bold {background-position:0 0}
|
||||
.defaultSkin span.mce_italic {background-position:-60px 0}
|
||||
.defaultSkin span.mce_underline {background-position:-140px 0}
|
||||
.defaultSkin span.mce_strikethrough {background-position:-120px 0}
|
||||
.defaultSkin span.mce_undo {background-position:-160px 0}
|
||||
.defaultSkin span.mce_redo {background-position:-100px 0}
|
||||
.defaultSkin span.mce_cleanup {background-position:-40px 0}
|
||||
.defaultSkin span.mce_bullist {background-position:-20px 0}
|
||||
.defaultSkin span.mce_numlist {background-position:-80px 0}
|
||||
.defaultSkin span.mce_justifyleft {background-position:-460px 0}
|
||||
.defaultSkin span.mce_justifyright {background-position:-480px 0}
|
||||
.defaultSkin span.mce_justifycenter {background-position:-420px 0}
|
||||
.defaultSkin span.mce_justifyfull {background-position:-440px 0}
|
||||
.defaultSkin span.mce_anchor {background-position:-200px 0}
|
||||
.defaultSkin span.mce_indent {background-position:-400px 0}
|
||||
.defaultSkin span.mce_outdent {background-position:-540px 0}
|
||||
.defaultSkin span.mce_link {background-position:-500px 0}
|
||||
.defaultSkin span.mce_unlink {background-position:-640px 0}
|
||||
.defaultSkin span.mce_sub {background-position:-600px 0}
|
||||
.defaultSkin span.mce_sup {background-position:-620px 0}
|
||||
.defaultSkin span.mce_removeformat {background-position:-580px 0}
|
||||
.defaultSkin span.mce_newdocument {background-position:-520px 0}
|
||||
.defaultSkin span.mce_image {background-position:-380px 0}
|
||||
.defaultSkin span.mce_help {background-position:-340px 0}
|
||||
.defaultSkin span.mce_code {background-position:-260px 0}
|
||||
.defaultSkin span.mce_hr {background-position:-360px 0}
|
||||
.defaultSkin span.mce_visualaid {background-position:-660px 0}
|
||||
.defaultSkin span.mce_charmap {background-position:-240px 0}
|
||||
.defaultSkin span.mce_paste {background-position:-560px 0}
|
||||
.defaultSkin span.mce_copy {background-position:-700px 0}
|
||||
.defaultSkin span.mce_cut {background-position:-680px 0}
|
||||
.defaultSkin span.mce_blockquote {background-position:-220px 0}
|
||||
.defaultSkin .mce_forecolor span.mceAction {background-position:-720px 0}
|
||||
.defaultSkin .mce_backcolor span.mceAction {background-position:-760px 0}
|
||||
.defaultSkin span.mce_forecolorpicker {background-position:-720px 0}
|
||||
.defaultSkin span.mce_backcolorpicker {background-position:-760px 0}
|
||||
.defaultSkin span.mce_bold {
|
||||
background-position: 0 0;
|
||||
}
|
||||
.defaultSkin span.mce_italic {
|
||||
background-position: -60px 0;
|
||||
}
|
||||
.defaultSkin span.mce_underline {
|
||||
background-position: -140px 0;
|
||||
}
|
||||
.defaultSkin span.mce_strikethrough {
|
||||
background-position: -120px 0;
|
||||
}
|
||||
.defaultSkin span.mce_undo {
|
||||
background-position: -160px 0;
|
||||
}
|
||||
.defaultSkin span.mce_redo {
|
||||
background-position: -100px 0;
|
||||
}
|
||||
.defaultSkin span.mce_cleanup {
|
||||
background-position: -40px 0;
|
||||
}
|
||||
.defaultSkin span.mce_bullist {
|
||||
background-position: -20px 0;
|
||||
}
|
||||
.defaultSkin span.mce_numlist {
|
||||
background-position: -80px 0;
|
||||
}
|
||||
.defaultSkin span.mce_justifyleft {
|
||||
background-position: -460px 0;
|
||||
}
|
||||
.defaultSkin span.mce_justifyright {
|
||||
background-position: -480px 0;
|
||||
}
|
||||
.defaultSkin span.mce_justifycenter {
|
||||
background-position: -420px 0;
|
||||
}
|
||||
.defaultSkin span.mce_justifyfull {
|
||||
background-position: -440px 0;
|
||||
}
|
||||
.defaultSkin span.mce_anchor {
|
||||
background-position: -200px 0;
|
||||
}
|
||||
.defaultSkin span.mce_indent {
|
||||
background-position: -400px 0;
|
||||
}
|
||||
.defaultSkin span.mce_outdent {
|
||||
background-position: -540px 0;
|
||||
}
|
||||
.defaultSkin span.mce_link {
|
||||
background-position: -500px 0;
|
||||
}
|
||||
.defaultSkin span.mce_unlink {
|
||||
background-position: -640px 0;
|
||||
}
|
||||
.defaultSkin span.mce_sub {
|
||||
background-position: -600px 0;
|
||||
}
|
||||
.defaultSkin span.mce_sup {
|
||||
background-position: -620px 0;
|
||||
}
|
||||
.defaultSkin span.mce_removeformat {
|
||||
background-position: -580px 0;
|
||||
}
|
||||
.defaultSkin span.mce_newdocument {
|
||||
background-position: -520px 0;
|
||||
}
|
||||
.defaultSkin span.mce_image {
|
||||
background-position: -380px 0;
|
||||
}
|
||||
.defaultSkin span.mce_help {
|
||||
background-position: -340px 0;
|
||||
}
|
||||
.defaultSkin span.mce_code {
|
||||
background-position: -260px 0;
|
||||
}
|
||||
.defaultSkin span.mce_hr {
|
||||
background-position: -360px 0;
|
||||
}
|
||||
.defaultSkin span.mce_visualaid {
|
||||
background-position: -660px 0;
|
||||
}
|
||||
.defaultSkin span.mce_charmap {
|
||||
background-position: -240px 0;
|
||||
}
|
||||
.defaultSkin span.mce_paste {
|
||||
background-position: -560px 0;
|
||||
}
|
||||
.defaultSkin span.mce_copy {
|
||||
background-position: -700px 0;
|
||||
}
|
||||
.defaultSkin span.mce_cut {
|
||||
background-position: -680px 0;
|
||||
}
|
||||
.defaultSkin span.mce_blockquote {
|
||||
background-position: -220px 0;
|
||||
}
|
||||
.defaultSkin .mce_forecolor span.mceAction {
|
||||
background-position: -720px 0;
|
||||
}
|
||||
.defaultSkin .mce_backcolor span.mceAction {
|
||||
background-position: -760px 0;
|
||||
}
|
||||
.defaultSkin span.mce_forecolorpicker {
|
||||
background-position: -720px 0;
|
||||
}
|
||||
.defaultSkin span.mce_backcolorpicker {
|
||||
background-position: -760px 0;
|
||||
}
|
||||
|
||||
/* Plugins */
|
||||
.defaultSkin span.mce_advhr {background-position:-0px -20px}
|
||||
.defaultSkin span.mce_ltr {background-position:-20px -20px}
|
||||
.defaultSkin span.mce_rtl {background-position:-40px -20px}
|
||||
.defaultSkin span.mce_emotions {background-position:-60px -20px}
|
||||
.defaultSkin span.mce_fullpage {background-position:-80px -20px}
|
||||
.defaultSkin span.mce_fullscreen {background-position:-100px -20px}
|
||||
.defaultSkin span.mce_iespell {background-position:-120px -20px}
|
||||
.defaultSkin span.mce_insertdate {background-position:-140px -20px}
|
||||
.defaultSkin span.mce_inserttime {background-position:-160px -20px}
|
||||
.defaultSkin span.mce_absolute {background-position:-180px -20px}
|
||||
.defaultSkin span.mce_backward {background-position:-200px -20px}
|
||||
.defaultSkin span.mce_forward {background-position:-220px -20px}
|
||||
.defaultSkin span.mce_insert_layer {background-position:-240px -20px}
|
||||
.defaultSkin span.mce_insertlayer {background-position:-260px -20px}
|
||||
.defaultSkin span.mce_movebackward {background-position:-280px -20px}
|
||||
.defaultSkin span.mce_moveforward {background-position:-300px -20px}
|
||||
.defaultSkin span.mce_media {background-position:-320px -20px}
|
||||
.defaultSkin span.mce_nonbreaking {background-position:-340px -20px}
|
||||
.defaultSkin span.mce_pastetext {background-position:-360px -20px}
|
||||
.defaultSkin span.mce_pasteword {background-position:-380px -20px}
|
||||
.defaultSkin span.mce_selectall {background-position:-400px -20px}
|
||||
.defaultSkin span.mce_preview {background-position:-420px -20px}
|
||||
.defaultSkin span.mce_print {background-position:-440px -20px}
|
||||
.defaultSkin span.mce_cancel {background-position:-460px -20px}
|
||||
.defaultSkin span.mce_save {background-position:-480px -20px}
|
||||
.defaultSkin span.mce_replace {background-position:-500px -20px}
|
||||
.defaultSkin span.mce_search {background-position:-520px -20px}
|
||||
.defaultSkin span.mce_styleprops {background-position:-560px -20px}
|
||||
.defaultSkin span.mce_table {background-position:-580px -20px}
|
||||
.defaultSkin span.mce_cell_props {background-position:-600px -20px}
|
||||
.defaultSkin span.mce_delete_table {background-position:-620px -20px}
|
||||
.defaultSkin span.mce_delete_col {background-position:-640px -20px}
|
||||
.defaultSkin span.mce_delete_row {background-position:-660px -20px}
|
||||
.defaultSkin span.mce_col_after {background-position:-680px -20px}
|
||||
.defaultSkin span.mce_col_before {background-position:-700px -20px}
|
||||
.defaultSkin span.mce_row_after {background-position:-720px -20px}
|
||||
.defaultSkin span.mce_row_before {background-position:-740px -20px}
|
||||
.defaultSkin span.mce_merge_cells {background-position:-760px -20px}
|
||||
.defaultSkin span.mce_table_props {background-position:-980px -20px}
|
||||
.defaultSkin span.mce_row_props {background-position:-780px -20px}
|
||||
.defaultSkin span.mce_split_cells {background-position:-800px -20px}
|
||||
.defaultSkin span.mce_template {background-position:-820px -20px}
|
||||
.defaultSkin span.mce_visualchars {background-position:-840px -20px}
|
||||
.defaultSkin span.mce_abbr {background-position:-860px -20px}
|
||||
.defaultSkin span.mce_acronym {background-position:-880px -20px}
|
||||
.defaultSkin span.mce_attribs {background-position:-900px -20px}
|
||||
.defaultSkin span.mce_cite {background-position:-920px -20px}
|
||||
.defaultSkin span.mce_del {background-position:-940px -20px}
|
||||
.defaultSkin span.mce_ins {background-position:-960px -20px}
|
||||
.defaultSkin span.mce_pagebreak {background-position:0 -40px}
|
||||
.defaultSkin span.mce_restoredraft {background-position:-20px -40px}
|
||||
.defaultSkin span.mce_spellchecker {background-position:-540px -20px}
|
||||
.defaultSkin span.mce_visualblocks {background-position: -40px -40px}
|
||||
.defaultSkin span.mce_advhr {
|
||||
background-position: -0px -20px;
|
||||
}
|
||||
.defaultSkin span.mce_ltr {
|
||||
background-position: -20px -20px;
|
||||
}
|
||||
.defaultSkin span.mce_rtl {
|
||||
background-position: -40px -20px;
|
||||
}
|
||||
.defaultSkin span.mce_emotions {
|
||||
background-position: -60px -20px;
|
||||
}
|
||||
.defaultSkin span.mce_fullpage {
|
||||
background-position: -80px -20px;
|
||||
}
|
||||
.defaultSkin span.mce_fullscreen {
|
||||
background-position: -100px -20px;
|
||||
}
|
||||
.defaultSkin span.mce_iespell {
|
||||
background-position: -120px -20px;
|
||||
}
|
||||
.defaultSkin span.mce_insertdate {
|
||||
background-position: -140px -20px;
|
||||
}
|
||||
.defaultSkin span.mce_inserttime {
|
||||
background-position: -160px -20px;
|
||||
}
|
||||
.defaultSkin span.mce_absolute {
|
||||
background-position: -180px -20px;
|
||||
}
|
||||
.defaultSkin span.mce_backward {
|
||||
background-position: -200px -20px;
|
||||
}
|
||||
.defaultSkin span.mce_forward {
|
||||
background-position: -220px -20px;
|
||||
}
|
||||
.defaultSkin span.mce_insert_layer {
|
||||
background-position: -240px -20px;
|
||||
}
|
||||
.defaultSkin span.mce_insertlayer {
|
||||
background-position: -260px -20px;
|
||||
}
|
||||
.defaultSkin span.mce_movebackward {
|
||||
background-position: -280px -20px;
|
||||
}
|
||||
.defaultSkin span.mce_moveforward {
|
||||
background-position: -300px -20px;
|
||||
}
|
||||
.defaultSkin span.mce_media {
|
||||
background-position: -320px -20px;
|
||||
}
|
||||
.defaultSkin span.mce_nonbreaking {
|
||||
background-position: -340px -20px;
|
||||
}
|
||||
.defaultSkin span.mce_pastetext {
|
||||
background-position: -360px -20px;
|
||||
}
|
||||
.defaultSkin span.mce_pasteword {
|
||||
background-position: -380px -20px;
|
||||
}
|
||||
.defaultSkin span.mce_selectall {
|
||||
background-position: -400px -20px;
|
||||
}
|
||||
.defaultSkin span.mce_preview {
|
||||
background-position: -420px -20px;
|
||||
}
|
||||
.defaultSkin span.mce_print {
|
||||
background-position: -440px -20px;
|
||||
}
|
||||
.defaultSkin span.mce_cancel {
|
||||
background-position: -460px -20px;
|
||||
}
|
||||
.defaultSkin span.mce_save {
|
||||
background-position: -480px -20px;
|
||||
}
|
||||
.defaultSkin span.mce_replace {
|
||||
background-position: -500px -20px;
|
||||
}
|
||||
.defaultSkin span.mce_search {
|
||||
background-position: -520px -20px;
|
||||
}
|
||||
.defaultSkin span.mce_styleprops {
|
||||
background-position: -560px -20px;
|
||||
}
|
||||
.defaultSkin span.mce_table {
|
||||
background-position: -580px -20px;
|
||||
}
|
||||
.defaultSkin span.mce_cell_props {
|
||||
background-position: -600px -20px;
|
||||
}
|
||||
.defaultSkin span.mce_delete_table {
|
||||
background-position: -620px -20px;
|
||||
}
|
||||
.defaultSkin span.mce_delete_col {
|
||||
background-position: -640px -20px;
|
||||
}
|
||||
.defaultSkin span.mce_delete_row {
|
||||
background-position: -660px -20px;
|
||||
}
|
||||
.defaultSkin span.mce_col_after {
|
||||
background-position: -680px -20px;
|
||||
}
|
||||
.defaultSkin span.mce_col_before {
|
||||
background-position: -700px -20px;
|
||||
}
|
||||
.defaultSkin span.mce_row_after {
|
||||
background-position: -720px -20px;
|
||||
}
|
||||
.defaultSkin span.mce_row_before {
|
||||
background-position: -740px -20px;
|
||||
}
|
||||
.defaultSkin span.mce_merge_cells {
|
||||
background-position: -760px -20px;
|
||||
}
|
||||
.defaultSkin span.mce_table_props {
|
||||
background-position: -980px -20px;
|
||||
}
|
||||
.defaultSkin span.mce_row_props {
|
||||
background-position: -780px -20px;
|
||||
}
|
||||
.defaultSkin span.mce_split_cells {
|
||||
background-position: -800px -20px;
|
||||
}
|
||||
.defaultSkin span.mce_template {
|
||||
background-position: -820px -20px;
|
||||
}
|
||||
.defaultSkin span.mce_visualchars {
|
||||
background-position: -840px -20px;
|
||||
}
|
||||
.defaultSkin span.mce_abbr {
|
||||
background-position: -860px -20px;
|
||||
}
|
||||
.defaultSkin span.mce_acronym {
|
||||
background-position: -880px -20px;
|
||||
}
|
||||
.defaultSkin span.mce_attribs {
|
||||
background-position: -900px -20px;
|
||||
}
|
||||
.defaultSkin span.mce_cite {
|
||||
background-position: -920px -20px;
|
||||
}
|
||||
.defaultSkin span.mce_del {
|
||||
background-position: -940px -20px;
|
||||
}
|
||||
.defaultSkin span.mce_ins {
|
||||
background-position: -960px -20px;
|
||||
}
|
||||
.defaultSkin span.mce_pagebreak {
|
||||
background-position: 0 -40px;
|
||||
}
|
||||
.defaultSkin span.mce_restoredraft {
|
||||
background-position: -20px -40px;
|
||||
}
|
||||
.defaultSkin span.mce_spellchecker {
|
||||
background-position: -540px -20px;
|
||||
}
|
||||
.defaultSkin span.mce_visualblocks {
|
||||
background-position: -40px -40px;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20268,7 +20268,7 @@ msgid ""
|
|||
"The alert would fire when the value matches <span id=\"value\"></span>"
|
||||
msgstr ""
|
||||
"سيتم إطلاق التنبيه عندما تتطابق القيمة مع ما يلي <span id=\\\"value\\"
|
||||
"\"></span"
|
||||
"\"></span>"
|
||||
|
||||
#: ../../include/functions_ui.php:1003 ../../godmode/alerts/alert_view.php:147
|
||||
msgid ""
|
||||
|
|
@ -20284,9 +20284,7 @@ msgid ""
|
|||
"The alert would fire when the value is between <span id=\"min\"></span> and "
|
||||
"<span id=\"max\"></span>"
|
||||
msgstr ""
|
||||
"سيتم إطلاق التنبيه عندما تكون القيمة بين <span id=\\\"min\\\"></span> and "
|
||||
"\"\r\n"
|
||||
"\"<span id=\\\"max\\\"></span>"
|
||||
"سيتم إطلاق التنبيه عندما تكون القيمة بين <span id=\\\"min\\\"></span> and <span id=\\\"max\\\"></span>"
|
||||
|
||||
#: ../../include/functions_ui.php:1012
|
||||
#: ../../godmode/alerts/configure_alert_template.php:808
|
||||
|
|
@ -20295,9 +20293,7 @@ msgid ""
|
|||
"The alert would fire when the value is not between <span id=\"min\"></span> "
|
||||
"and <span id=\"max\"></span>"
|
||||
msgstr ""
|
||||
"\" سيتم إطلاق التنبيه عندما لا تكون القيمة بين <span id=\\\"min\\\"></span> "
|
||||
"\" \r\n"
|
||||
"\"and <span id=\\\"max\\\"></span>"
|
||||
"سيتم إطلاق التنبيه عندما لا تكون القيمة بين <span id=\\\"min\\\"></span> and <span id=\\\"max\\\"></span>"
|
||||
|
||||
#: ../../include/functions_ui.php:1016
|
||||
msgid "The alert would fire when the value is over <span id=\"max\"></span>"
|
||||
|
|
|
|||
|
|
@ -388,7 +388,7 @@ select:-internal-list-box {
|
|||
|
||||
@font-face {
|
||||
font-family: "FreeSansBoldFont";
|
||||
src: url("../fonts/FreeSansBold.ttf") format("truetype");
|
||||
src: url("../fonts/FreeSans-Bold.ttf") format("truetype");
|
||||
}
|
||||
|
||||
.FreeSansBold {
|
||||
|
|
@ -6001,3 +6001,13 @@ form#modal_form_feedback ul.wizard li > textarea {
|
|||
.pandora_green_bg {
|
||||
background-color: #82b92e;
|
||||
}
|
||||
|
||||
/*
|
||||
* ---------------------------------------------------------------------
|
||||
* - REPORTING VIEWER
|
||||
* ---------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
#controls_table > tbody > tr > td input {
|
||||
margin-left: 3px;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -80,3 +80,63 @@ th.title_table_pdf {
|
|||
table.table_agent_module tr td {
|
||||
padding: 5px;
|
||||
}
|
||||
|
||||
/* TABLE OF CONTENTS */
|
||||
div.mpdf_toc {
|
||||
font-family: sans-serif;
|
||||
line-height: normal;
|
||||
}
|
||||
|
||||
a.mpdf_toc_a {
|
||||
text-decoration: none;
|
||||
color: #363636;
|
||||
}
|
||||
|
||||
div.mpdf_toc_level_0 {
|
||||
/* Whole line level 0 */
|
||||
line-height: 1.5;
|
||||
margin-left: 0;
|
||||
padding-right: 0em; /* should match the outdent specified for ToC; 0 is default; suggested value 2em */
|
||||
}
|
||||
|
||||
span.mpdf_toc_t_level_0 {
|
||||
/* Title level 0 - may be inside <a> */
|
||||
font-weight: normal;
|
||||
}
|
||||
|
||||
span.mpdf_toc_p_level_0 {
|
||||
/* Page no. level 0 - may be inside <a> */
|
||||
}
|
||||
|
||||
div.mpdf_toc_level_1 {
|
||||
/* Whole line level 1 */
|
||||
margin-left: 2em;
|
||||
text-indent: -2em;
|
||||
padding-right: 1em;
|
||||
padding-bottom: 1em;
|
||||
}
|
||||
|
||||
span.mpdf_toc_t_level_1 {
|
||||
/* Title level 1 */
|
||||
font-style: normal;
|
||||
font-weight: normal;
|
||||
}
|
||||
|
||||
span.mpdf_toc_p_level_1 {
|
||||
/* Page no. level 1 - may be inside <a> */
|
||||
}
|
||||
|
||||
div.mpdf_toc_level_2 {
|
||||
/* Whole line level 2 */
|
||||
margin-left: 4em;
|
||||
text-indent: -2em;
|
||||
padding-right: 0em; /* should match the outdent specified for ToC; 0 is default; suggested value 2em */
|
||||
}
|
||||
|
||||
span.mpdf_toc_t_level_2 {
|
||||
/* Title level 2 */
|
||||
}
|
||||
|
||||
span.mpdf_toc_p_level_2 {
|
||||
/* Page no. level 2 - may be inside <a> */
|
||||
}
|
||||
|
|
|
|||
|
|
@ -239,6 +239,10 @@
|
|||
padding: 1.3em 0;
|
||||
}
|
||||
|
||||
.datos5 * {
|
||||
color: #ffffff;
|
||||
}
|
||||
|
||||
/*td.datos_id {
|
||||
color: #1a313a;
|
||||
}*/
|
||||
|
|
|
|||
|
|
@ -94,7 +94,8 @@ page.onCallback = function() {
|
|||
if (!base_64) {
|
||||
page.render(output_filename, { format: "png" });
|
||||
} else {
|
||||
var base64 = page.renderBase64("png");
|
||||
page.settings.loadImages = false;
|
||||
var base64 = page.renderBase64("jpg");
|
||||
// do not remove this console.output
|
||||
console.log(base64);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -128,8 +128,8 @@
|
|||
</div>
|
||||
<div style='height: 10px'>
|
||||
<?php
|
||||
$version = '7.0NG.741';
|
||||
$build = '191211';
|
||||
$version = '7.0NG.742';
|
||||
$build = '191216';
|
||||
$banner = "v$version Build $build";
|
||||
|
||||
error_reporting(0);
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
# Pandora FMS Console
|
||||
#
|
||||
%define name pandorafms_console
|
||||
%define version 7.0NG.741
|
||||
%define release 191211
|
||||
%define version 7.0NG.742
|
||||
%define release 1
|
||||
|
||||
# User and Group under which Apache is running
|
||||
%define httpd_name httpd
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
# Pandora FMS Console
|
||||
#
|
||||
%define name pandorafms_console
|
||||
%define version 7.0NG.741
|
||||
%define release 191211
|
||||
%define version 7.0NG.742
|
||||
%define release 1
|
||||
|
||||
# User and Group under which Apache is running
|
||||
%define httpd_name httpd
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
# Pandora FMS Console
|
||||
#
|
||||
%define name pandorafms_console
|
||||
%define version 7.0NG.741
|
||||
%define release 191211
|
||||
%define version 7.0NG.742
|
||||
%define release 1
|
||||
%define httpd_name httpd
|
||||
# User and Group under which Apache is running
|
||||
%define httpd_name apache2
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
# This code is licensed under GPL 2.0 license.
|
||||
# **********************************************************************
|
||||
|
||||
PI_VERSION="7.0NG.741"
|
||||
PI_VERSION="7.0NG.742"
|
||||
FORCE=0
|
||||
DESTDIR=""
|
||||
LOG_TIMESTAMP=`date +"%Y/%m/%d %H:%M:%S"`
|
||||
|
|
|
|||
|
|
@ -1457,6 +1457,8 @@ CREATE TABLE IF NOT EXISTS `treport_content` (
|
|||
`failover_mode` tinyint(1) DEFAULT '1',
|
||||
`failover_type` tinyint(1) DEFAULT '1',
|
||||
`uncompressed_module` TINYINT DEFAULT '0',
|
||||
`landscape` tinyint(1) UNSIGNED NOT NULL default 0,
|
||||
`pagebreak` tinyint(1) UNSIGNED NOT NULL default 0,
|
||||
PRIMARY KEY(`id_rc`),
|
||||
FOREIGN KEY (`id_report`) REFERENCES treport(`id_report`)
|
||||
ON UPDATE CASCADE ON DELETE CASCADE
|
||||
|
|
@ -3023,6 +3025,8 @@ CREATE TABLE IF NOT EXISTS `treport_content_template` (
|
|||
`failover_mode` tinyint(1) DEFAULT '1',
|
||||
`failover_type` tinyint(1) DEFAULT '1',
|
||||
`uncompressed_module` TINYINT DEFAULT '0',
|
||||
`landscape` tinyint(1) UNSIGNED NOT NULL default 0,
|
||||
`pagebreak` tinyint(1) UNSIGNED NOT NULL default 0,
|
||||
PRIMARY KEY(`id_rc`)
|
||||
) ENGINE = InnoDB DEFAULT CHARSET=utf8;
|
||||
|
||||
|
|
|
|||
|
|
@ -109,10 +109,10 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES
|
|||
('custom_report_front_logo', 'images/pandora_logo_white.jpg'),
|
||||
('custom_report_front_header', ''),
|
||||
('custom_report_front_footer', ''),
|
||||
('MR', 33),
|
||||
('MR', 34),
|
||||
('identification_reminder', 1),
|
||||
('identification_reminder_timestamp', 0),
|
||||
('current_package_enterprise', '741'),
|
||||
('current_package_enterprise', '742'),
|
||||
('post_process_custom_values', '{"0.00000038580247":"Seconds to months","0.00000165343915":"Seconds to weeks","0.00001157407407":"Seconds to days","0.01666666666667":"Seconds to minutes","0.00000000093132":"Bytes to Gigabytes","0.00000095367432":"Bytes to Megabytes","0.0009765625":"Bytes to Kilobytes","0.00000001653439":"Timeticks to weeks","0.00000011574074":"Timeticks to days"}'),
|
||||
('custom_docs_logo', 'default_docs.png'),
|
||||
('custom_support_logo', 'default_support.png'),
|
||||
|
|
|
|||
|
|
@ -329,4 +329,4 @@ class FontVariables
|
|||
return $this->defaults;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
Binary file not shown.
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
|||
package: pandorafms-server
|
||||
Version: 7.0NG.741-191211
|
||||
Version: 7.0NG.742
|
||||
Architecture: all
|
||||
Priority: optional
|
||||
Section: admin
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
|
||||
pandora_version="7.0NG.741-191211"
|
||||
pandora_version="7.0NG.742"
|
||||
|
||||
package_cpan=0
|
||||
package_pandora=1
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#############################################################################
|
||||
# Pandora FMS Server Parameters
|
||||
# Pandora FMS, the Flexible Monitoring System.
|
||||
# Version 7.0NG.741
|
||||
# Version 7.0NG.742
|
||||
# Licensed under GPL license v2,
|
||||
# (c) 2003-2017 Artica Soluciones Tecnologicas
|
||||
# http://www.pandorafms.com
|
||||
|
|
|
|||
|
|
@ -44,8 +44,8 @@ our @EXPORT = qw(
|
|||
);
|
||||
|
||||
# version: Defines actual version of Pandora Server for this module only
|
||||
my $pandora_version = "7.0NG.741";
|
||||
my $pandora_build = "191211";
|
||||
my $pandora_version = "7.0NG.742";
|
||||
my $pandora_build = "191216";
|
||||
our $VERSION = $pandora_version." ".$pandora_build;
|
||||
|
||||
# Setup hash
|
||||
|
|
|
|||
|
|
@ -31,8 +31,8 @@ use base 'Exporter';
|
|||
our @ISA = qw(Exporter);
|
||||
|
||||
# version: Defines actual version of Pandora Server for this module only
|
||||
my $pandora_version = "7.0NG.741";
|
||||
my $pandora_build = "191211";
|
||||
my $pandora_version = "7.0NG.742";
|
||||
my $pandora_build = "191216";
|
||||
our $VERSION = $pandora_version." ".$pandora_build;
|
||||
|
||||
our %EXPORT_TAGS = ( 'all' => [ qw() ] );
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
# Pandora FMS Server
|
||||
#
|
||||
%define name pandorafms_server
|
||||
%define version 7.0NG.741
|
||||
%define release 191211
|
||||
%define version 7.0NG.742
|
||||
%define release 1
|
||||
|
||||
Summary: Pandora FMS Server
|
||||
Name: %{name}
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
# Pandora FMS Server
|
||||
#
|
||||
%define name pandorafms_server
|
||||
%define version 7.0NG.741
|
||||
%define release 191211
|
||||
%define version 7.0NG.742
|
||||
%define release 1
|
||||
|
||||
Summary: Pandora FMS Server
|
||||
Name: %{name}
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@
|
|||
# This code is licensed under GPL 2.0 license.
|
||||
# **********************************************************************
|
||||
|
||||
PI_VERSION="7.0NG.741"
|
||||
PI_BUILD="191211"
|
||||
PI_VERSION="7.0NG.742"
|
||||
PI_BUILD="191216"
|
||||
|
||||
MODE=$1
|
||||
if [ $# -gt 1 ]; then
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ use PandoraFMS::Config;
|
|||
use PandoraFMS::DB;
|
||||
|
||||
# version: define current version
|
||||
my $version = "7.0NG.741 PS191211";
|
||||
my $version = "7.0NG.742 PS191216";
|
||||
|
||||
# Pandora server configuration
|
||||
my %conf;
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ use Encode::Locale;
|
|||
Encode::Locale::decode_argv;
|
||||
|
||||
# version: define current version
|
||||
my $version = "7.0NG.741 PS191211";
|
||||
my $version = "7.0NG.742 PS191216";
|
||||
|
||||
# save program name for logging
|
||||
my $progname = basename($0);
|
||||
|
|
|
|||
Loading…
Reference in New Issue