';
$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] = '
'.html_print_image('images/darrowright.png', true, ['title' => __('Add to modules list')]).'
';
- // Services arrow
- $table->data[2][1] .= '
'.html_print_image('images/darrowright.png', true, ['title' => __('Add to modules list')]).'
';
- // Processes arrow
- $table->data[2][1] .= '
'.html_print_image('images/darrowright.png', true, ['title' => __('Add to modules list')]).'
';
- // Disks arrow
- $table->data[2][1] .= '
'.html_print_image('images/darrowright.png', true, ['title' => __('Add to modules list')]).'
';
+ // Components arrow.
+ $table->data[2][1] = '
+ '.html_print_image(
+ 'images/darrowright.png',
+ true,
+ ['title' => __('Add to modules list')]
+ ).'
';
+ // Services arrow.
+ $table->data[2][1] .= '
+ '.html_print_image(
+ 'images/darrowright.png',
+ true,
+ ['title' => __('Add to modules list')]
+ ).'
';
+ // Processes arrow.
+ $table->data[2][1] .= '
+ '.html_print_image(
+ 'images/darrowright.png',
+ true,
+ ['title' => __('Add to modules list')]
+ ).'
';
+ // Disks arrow.
+ $table->data[2][1] .= '
+ '.html_print_image(
+ 'images/darrowright.png',
+ true,
+ ['title' => __('Add to modules list')]
+ ).'
';
- $table->data[2][1] .= '
'.html_print_image('images/cross.png', true, ['title' => __('Remove from modules list')]).'
';
+ $table->data[2][1] .= '
+
+ '.html_print_image(
+ 'images/cross.png',
+ true,
+ ['title' => __('Remove from modules list')]
+ ).'
';
$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 "
";
- 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 '
';
unset($table);
@@ -650,5 +843,4 @@ $(document).ready (function () {
});
/* ]]> */
-
-
+
\ No newline at end of file
diff --git a/pandora_console/godmode/agentes/module_manager_editor_network.php b/pandora_console/godmode/agentes/module_manager_editor_network.php
index a5763e101a..0ce82eddd9 100644
--- a/pandora_console/godmode/agentes/module_manager_editor_network.php
+++ b/pandora_console/godmode/agentes/module_manager_editor_network.php
@@ -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');
}
});
diff --git a/pandora_console/godmode/reporting/reporting_builder.item_editor.php b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
index d06e17b12a..4bfe60814b 100755
--- a/pandora_console/godmode/reporting/reporting_builder.item_editor.php
+++ b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
@@ -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';
|
|
-
- |
-
- |
-
-
- |
-
-
|
|
+
+ |
+
+ |
+ |
+
+
+
+ |
+
+ |
+ |
+
+
@@ -3501,6 +3506,30 @@ function print_General_list($width, $action, $idItem=null, $type='general')
}
+echo "
";
+echo "
".__('Please select a name.').'
';
+echo '
';
+
+echo "
";
+echo "
".__('Please select an agent.').'
';
+echo '
';
+
+echo "
";
+echo "
".__('Please select a module.').'
';
+echo '
';
+
+echo "
";
+echo "
".__('Please insert a SQL query.').'
';
+echo '
';
+
+echo "
";
+echo "
".__('Please insert a URL.').'
';
+echo '
';
+
+echo "
";
+echo "
".__('Please checked a custom interval option.').'
';
+echo '
';
+
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( );
+ 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( );
- 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( );
+ 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");
+ }
+ }
+ });
+}
diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php
index 823713877b..e5e7121b10 100755
--- a/pandora_console/godmode/reporting/reporting_builder.php
+++ b/pandora_console/godmode/reporting/reporting_builder.php
@@ -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
diff --git a/pandora_console/godmode/setup/setup_visuals.php b/pandora_console/godmode/setup/setup_visuals.php
index fab43724b5..9fce3076d8 100755
--- a/pandora_console/godmode/setup/setup_visuals.php
+++ b/pandora_console/godmode/setup/setup_visuals.php
@@ -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 '';
// ----------------------------------------------------------------------
- // 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] = "
";
+ $table_report->data[$row][0] = __('PDF font size');
+ $table_report->data[$row][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] = '
'.html_print_image($config['custom_report_front_logo'], true).'';
+ $table_report->data['custom_report_front-preview'][1] = '
'.html_print_image($config['custom_report_front_logo'], true).'';
// 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 '
';
+
+
+ // ----------------------------------------------------------------------
+ // 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] .= '
'.__('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] = '
';
+ $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] .= '
';
$row++;
diff --git a/pandora_console/include/chart_generator.php b/pandora_console/include/chart_generator.php
index 0d1d138ae6..6ca2caa53b 100644
--- a/pandora_console/include/chart_generator.php
+++ b/pandora_console/include/chart_generator.php
@@ -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 '
';
switch ($type_graph_pdf) {
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 00241732be..fae97667d2 100644
--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@@ -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();
diff --git a/pandora_console/include/fonts/COPYRIGHT.txt b/pandora_console/include/fonts/COPYRIGHT.txt
new file mode 100644
index 0000000000..a7ef69930c
--- /dev/null
+++ b/pandora_console/include/fonts/COPYRIGHT.txt
@@ -0,0 +1 @@
+Copyright 2011 Google Inc. All Rights Reserved.
\ No newline at end of file
diff --git a/pandora_console/include/fonts/FreeSansBold.ttf b/pandora_console/include/fonts/FreeSans-Bold.ttf
similarity index 100%
rename from pandora_console/include/fonts/FreeSansBold.ttf
rename to pandora_console/include/fonts/FreeSans-Bold.ttf
diff --git a/pandora_console/include/fonts/LICENSE.txt b/pandora_console/include/fonts/LICENSE.txt
new file mode 100644
index 0000000000..75b52484ea
--- /dev/null
+++ b/pandora_console/include/fonts/LICENSE.txt
@@ -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.
diff --git a/pandora_console/include/fonts/OpenSans-Bold.ttf b/pandora_console/include/fonts/OpenSans-Bold.ttf
new file mode 100644
index 0000000000..7b52945603
Binary files /dev/null and b/pandora_console/include/fonts/OpenSans-Bold.ttf differ
diff --git a/pandora_console/include/fonts/OpenSans-Italic.ttf b/pandora_console/include/fonts/OpenSans-Italic.ttf
new file mode 100644
index 0000000000..e6c5414173
Binary files /dev/null and b/pandora_console/include/fonts/OpenSans-Italic.ttf differ
diff --git a/pandora_console/include/fonts/Tinos-Bold.ttf b/pandora_console/include/fonts/Tinos-Bold.ttf
new file mode 100644
index 0000000000..ba009aac25
Binary files /dev/null and b/pandora_console/include/fonts/Tinos-Bold.ttf differ
diff --git a/pandora_console/include/fonts/Tinos-Italic.ttf b/pandora_console/include/fonts/Tinos-Italic.ttf
new file mode 100644
index 0000000000..851621eae8
Binary files /dev/null and b/pandora_console/include/fonts/Tinos-Italic.ttf differ
diff --git a/pandora_console/include/fonts/opensans.ttf b/pandora_console/include/fonts/opensans.ttf
new file mode 100644
index 0000000000..2e31d02424
Binary files /dev/null and b/pandora_console/include/fonts/opensans.ttf differ
diff --git a/pandora_console/include/fonts/tinos.ttf b/pandora_console/include/fonts/tinos.ttf
new file mode 100644
index 0000000000..5af0b9e274
Binary files /dev/null and b/pandora_console/include/fonts/tinos.ttf differ
diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php
index 720caefc58..f2e350dc8f 100644
--- a/pandora_console/include/functions.php
+++ b/pandora_console/include/functions.php
@@ -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.
diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index 429c740dfd..0e4dd9940d 100644
--- a/pandora_console/include/functions_config.php
+++ b/pandora_console/include/functions_config.php
@@ -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;
}
diff --git a/pandora_console/include/functions_io.php b/pandora_console/include/functions_io.php
index baddb18531..f0e2037cf2 100755
--- a/pandora_console/include/functions_io.php
+++ b/pandora_console/include/functions_io.php
@@ -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);
}
diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php
index a5e76eabf3..3dd290e59e 100755
--- a/pandora_console/include/functions_reporting.php
+++ b/pandora_console/include/functions_reporting.php
@@ -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'] = '
,
+ $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'] = '
;
+ $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 = '
.')
';
+ }
+
$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'] = '
;
+ $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'] = '
';
+ }
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 .= '
';
+ $result_pdf = '';
$result_pdf .= '