From 8eb3a982e1f785ed4e22aac3c8398391004ccf1a Mon Sep 17 00:00:00 2001 From: Daniel Barbero Martin Date: Mon, 1 Jun 2020 14:48:53 +0200 Subject: [PATCH 1/9] Fixed error in gauges --- pandora_console/include/chart_generator.php | 1 + pandora_console/include/functions_graph.php | 9 +++++- pandora_console/include/graphs/fgraph.php | 6 ++-- .../include/graphs/functions_d3.php | 5 +-- pandora_console/include/graphs/pandora.d3.js | 32 +++++++++++-------- 5 files changed, 34 insertions(+), 19 deletions(-) diff --git a/pandora_console/include/chart_generator.php b/pandora_console/include/chart_generator.php index edd8208b05..7a61677b85 100644 --- a/pandora_console/include/chart_generator.php +++ b/pandora_console/include/chart_generator.php @@ -189,6 +189,7 @@ if (file_exists('languages/'.$user_language.'.mo') === true) { echo '
'; switch ($type_graph_pdf) { case 'combined': + $params['pdf'] = true; echo graphic_combined_module( $module_list, $params, diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php index 5a1d482e1d..1f45714edb 100644 --- a/pandora_console/include/functions_graph.php +++ b/pandora_console/include/functions_graph.php @@ -2003,6 +2003,12 @@ function graphic_combined_module( } } + if (isset($params['pdf']) === true && $params['pdf'] === true) { + $transitionDuration = 0; + } else { + $transitionDuration = 500; + } + $output = stacked_gauge( $graph_values, $new_width, @@ -2018,7 +2024,8 @@ function graphic_combined_module( $config['fontpath'], $fixed_font_size, '', - $homeurl + $homeurl, + $transitionDuration ); break; diff --git a/pandora_console/include/graphs/fgraph.php b/pandora_console/include/graphs/fgraph.php index 1d79129610..6f341381c5 100644 --- a/pandora_console/include/graphs/fgraph.php +++ b/pandora_console/include/graphs/fgraph.php @@ -638,7 +638,8 @@ function stacked_gauge( $font='', $font_size='', $unit='', - $homeurl='' + $homeurl='', + $transitionDuration=500 ) { include_once 'functions_d3.php'; @@ -656,7 +657,8 @@ function stacked_gauge( $unit, $font, ($font_size + 2), - $no_data_image + $no_data_image, + $transitionDuration ); } diff --git a/pandora_console/include/graphs/functions_d3.php b/pandora_console/include/graphs/functions_d3.php index 659270744a..8719531abc 100644 --- a/pandora_console/include/graphs/functions_d3.php +++ b/pandora_console/include/graphs/functions_d3.php @@ -294,7 +294,8 @@ function d3_gauges( $unit, $font, $font_size, - $no_data_image + $no_data_image, + $transitionDuration ) { global $config; @@ -310,7 +311,7 @@ function d3_gauges( $output .= ""; return $output; diff --git a/pandora_console/include/graphs/pandora.d3.js b/pandora_console/include/graphs/pandora.d3.js index bfebebe99c..d308514ce3 100644 --- a/pandora_console/include/graphs/pandora.d3.js +++ b/pandora_console/include/graphs/pandora.d3.js @@ -1005,7 +1005,8 @@ function createGauge( critical_inverse, font_size, height, - font + font, + transitionDuration ) { var gauges; @@ -1014,7 +1015,8 @@ function createGauge( label: etiqueta, min: undefined != min ? min : 0, max: undefined != max ? max : 100, - font_size: font_size + font_size: font_size, + transitionDuration: transitionDuration }; if (value == null) { @@ -1128,7 +1130,7 @@ function createGauge( gauges = new Gauge(name, config, font); gauges.render(); - gauges.redraw(value); + gauges.redraw(value, config.transitionDuration); $(".gauge>text").each(function() { label = $(this).text(); @@ -1155,12 +1157,17 @@ function createGauge( $(this).text(text); } }); - config = false; - max_warning2 = false; - min_warning2 = false; } -function createGauges(data, width, height, font_size, no_data_image, font) { +function createGauges( + data, + width, + height, + font_size, + no_data_image, + font, + transitionDuration +) { var nombre, label, minimun_warning, @@ -1211,7 +1218,8 @@ function createGauges(data, width, height, font_size, no_data_image, font) { critical_inverse, font_size, height, - font + font, + transitionDuration ); } } @@ -1247,7 +1255,7 @@ function Gauge(placeholderName, configuration, font) { this.config.yellowColor = configuration.yellowColor || "#FF9900"; this.config.redColor = configuration.redColor || "#DC3912"; - this.config.transitionDuration = configuration.transitionDuration || 500; + this.config.transitionDuration = configuration.transitionDuration; }; this.render = function() { @@ -1481,11 +1489,7 @@ function Gauge(placeholderName, configuration, font) { var pointer = pointerContainer.selectAll("path"); pointer .transition() - .duration( - undefined != transitionDuration - ? transitionDuration - : this.config.transitionDuration - ) + .duration(undefined != transitionDuration ? transitionDuration : 0) //.delay(0) //.ease("linear") //.attr("transform", function(d) From 4904718c414aa961778017af198e47c29476556e Mon Sep 17 00:00:00 2001 From: marcos Date: Thu, 4 Jun 2020 11:08:51 +0200 Subject: [PATCH 2/9] add confirm dialog when delete one item in events table --- .../include/javascript/pandora_events.js | 25 +++++++++++++++---- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/pandora_console/include/javascript/pandora_events.js b/pandora_console/include/javascript/pandora_events.js index e176b863ad..c9af47ed2b 100644 --- a/pandora_console/include/javascript/pandora_events.js +++ b/pandora_console/include/javascript/pandora_events.js @@ -712,7 +712,7 @@ function update_event(table, id_evento, type, event_rep, row) { values[this.name] = $(this).val(); }); var t1 = new Date(); - + console.log("al ajax directo"); // Update events matching current filters and id_evento selected. $.ajax({ async: true, @@ -791,10 +791,25 @@ function delete_event(table, id_evento, event_rep, row) { processed += 1; return; } - - button.children[0]; - button.children[0].src = "images/spinner.gif"; - return update_event(table, id_evento, { delete_event: 1 }, event_rep, row); + confirmDialog({ + title: "ATTENTION", + message: + "

Are you sure?

", + cancel: "Cancel", + ok: "Ok", + onAccept: function() { + // Continue execution. + button.children[0]; + button.children[0].src = "images/spinner.gif"; + return update_event( + table, + id_evento, + { delete_event: 1 }, + event_rep, + row + ); + } + }); } // Imported from old files. From 67d5a2834646bfbcd5582590a0646d93dc563cff Mon Sep 17 00:00:00 2001 From: marcos Date: Thu, 4 Jun 2020 13:50:36 +0200 Subject: [PATCH 3/9] add confirm dialog on meta and node recursive --- .../include/javascript/pandora_events.js | 245 ++++++++++-------- 1 file changed, 140 insertions(+), 105 deletions(-) diff --git a/pandora_console/include/javascript/pandora_events.js b/pandora_console/include/javascript/pandora_events.js index c9af47ed2b..ddd2f42578 100644 --- a/pandora_console/include/javascript/pandora_events.js +++ b/pandora_console/include/javascript/pandora_events.js @@ -712,8 +712,7 @@ function update_event(table, id_evento, type, event_rep, row) { values[this.name] = $(this).val(); }); var t1 = new Date(); - console.log("al ajax directo"); - // Update events matching current filters and id_evento selected. + $.ajax({ async: true, type: "POST", @@ -751,6 +750,7 @@ function update_event(table, id_evento, type, event_rep, row) { } }); } +// Update events matching current filters and id_evento selected. function validate_event(table, id_evento, event_rep, row) { var button = document.getElementById("val-" + id_evento); @@ -791,14 +791,16 @@ function delete_event(table, id_evento, event_rep, row) { processed += 1; return; } + button.children[0]; + button.children[0].src = "images/spinner.gif"; + var message = + "

Are you sure?

"; confirmDialog({ title: "ATTENTION", - message: - "

Are you sure?

", + message: message, cancel: "Cancel", ok: "Ok", onAccept: function() { - // Continue execution. button.children[0]; button.children[0].src = "images/spinner.gif"; return update_event( @@ -808,116 +810,149 @@ function delete_event(table, id_evento, event_rep, row) { event_rep, row ); + }, + onDeny: function() { + button.children[0]; + button.children[0].src = "images/cross.png"; + return; } }); } -// Imported from old files. -function execute_event_response(event_list_btn) { - processed = 0; - $("#max_custom_event_resp_msg").hide(); - $("#max_custom_selected").hide(); - - var response_id = $("select[name=response_id]").val(); - - var total_checked = $(".chk_val:checked").length; - - // Check select an event. - if (total_checked == 0) { - $("#max_custom_selected").show(); +function execute_delete_event_reponse(table, id_evento, event_rep, row) { + var button = document.getElementById("del-" + id_evento); + if (!button) { + // Button does not exist. Ignore. + processed += 1; return; } + button.children[0]; + button.children[0].src = "images/spinner.gif"; + return update_event(table, id_evento, { delete_event: 1 }, event_rep, row); +} - if (!isNaN(response_id)) { - // It is a custom response - var response = get_response(response_id); +// Imported from old files. +function execute_event_response(event_list_btn) { + var message = + "

Are you sure?

"; + confirmDialog({ + title: "ATTENTION", + message: message, + cancel: "Cancel", + ok: "Ok", + onAccept: function() { + // Continue execution. + processed = 0; + $("#max_custom_event_resp_msg").hide(); + $("#max_custom_selected").hide(); - // If cannot get response abort it - if (response == null) { + var response_id = $("select[name=response_id]").val(); + + var total_checked = $(".chk_val:checked").length; + + // Check select an event. + if (total_checked == 0) { + $("#max_custom_selected").show(); + return; + } + + if (!isNaN(response_id)) { + // It is a custom response + var response = get_response(response_id); + + // If cannot get response abort it + if (response == null) { + return; + } + + // Limit number of events to apply custom responses + // due performance reasons. + if (total_checked > $("#max_execution_event_response").val()) { + $("#max_custom_event_resp_msg").show(); + return; + } + + var response_command = []; + $(".response_command_input").each(function() { + response_command[$(this).attr("name")] = $(this).val(); + }); + + if (event_list_btn) { + $("#button-submit_event_response").hide(function() { + $("#response_loading_dialog").show(function() { + var check_params = get_response_params(response_id); + + if (check_params[0] !== "") { + show_event_response_command_dialog( + response_id, + response, + total_checked + ); + } else { + check_massive_response_event( + response_id, + response, + total_checked, + response_command + ); + } + }); + }); + } else { + $("#button-btn_str").hide(function() { + $("#execute_again_loading").show(function() { + check_massive_response_event( + response_id, + response, + total_checked, + response_command + ); + }); + }); + } + } else { + // It is not a custom response + switch (response_id) { + case "in_progress_selected": + $(".chk_val:checked").each(function() { + // Parent: TD. GrandParent: TR. + in_process_event( + dt_events, + $(this).val(), + $(this).attr("event_rep"), + this.parentElement.parentElement + ); + }); + break; + case "validate_selected": + $(".chk_val:checked").each(function() { + validate_event( + dt_events, + $(this).val(), + $(this).attr("event_rep"), + this.parentElement.parentElement + ); + }); + break; + case "delete_selected": + console.log($(this)); + $(".chk_val:checked").each(function() { + execute_delete_event_reponse( + dt_events, + $(this).val(), + $(this).attr("event_rep"), + this.parentElement.parentElement + ); + }); + break; + } + } + }, + onDeny: function() { + processed += 1; return; } - - // Limit number of events to apply custom responses - // due performance reasons. - if (total_checked > $("#max_execution_event_response").val()) { - $("#max_custom_event_resp_msg").show(); - return; - } - - var response_command = []; - $(".response_command_input").each(function() { - response_command[$(this).attr("name")] = $(this).val(); - }); - - if (event_list_btn) { - $("#button-submit_event_response").hide(function() { - $("#response_loading_dialog").show(function() { - var check_params = get_response_params(response_id); - - if (check_params[0] !== "") { - show_event_response_command_dialog( - response_id, - response, - total_checked - ); - } else { - check_massive_response_event( - response_id, - response, - total_checked, - response_command - ); - } - }); - }); - } else { - $("#button-btn_str").hide(function() { - $("#execute_again_loading").show(function() { - check_massive_response_event( - response_id, - response, - total_checked, - response_command - ); - }); - }); - } - } else { - // It is not a custom response - switch (response_id) { - case "in_progress_selected": - $(".chk_val:checked").each(function() { - // Parent: TD. GrandParent: TR. - in_process_event( - dt_events, - $(this).val(), - $(this).attr("event_rep"), - this.parentElement.parentElement - ); - }); - break; - case "validate_selected": - $(".chk_val:checked").each(function() { - validate_event( - dt_events, - $(this).val(), - $(this).attr("event_rep"), - this.parentElement.parentElement - ); - }); - break; - case "delete_selected": - $(".chk_val:checked").each(function() { - delete_event( - dt_events, - $(this).val(), - $(this).attr("event_rep"), - this.parentElement.parentElement - ); - }); - break; - } - } + }); } function check_massive_response_event( From 07593e446625cb2e5069a6ab31aee09ecbc2139f Mon Sep 17 00:00:00 2001 From: marcos Date: Thu, 4 Jun 2020 14:00:30 +0200 Subject: [PATCH 4/9] fixed code --- pandora_console/include/javascript/pandora_events.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/pandora_console/include/javascript/pandora_events.js b/pandora_console/include/javascript/pandora_events.js index ddd2f42578..a5e5b0c36e 100644 --- a/pandora_console/include/javascript/pandora_events.js +++ b/pandora_console/include/javascript/pandora_events.js @@ -791,8 +791,6 @@ function delete_event(table, id_evento, event_rep, row) { processed += 1; return; } - button.children[0]; - button.children[0].src = "images/spinner.gif"; var message = "

Are you sure?

"; confirmDialog({ From daa0df8895dc35ba5f32e112252992fbf27ace9e Mon Sep 17 00:00:00 2001 From: Jose Gonzalez Date: Thu, 11 Jun 2020 12:23:30 +0200 Subject: [PATCH 5/9] Restored autoHide for controls modal in visual console with full screen --- pandora_console/operation/visual_console/legacy_view.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pandora_console/operation/visual_console/legacy_view.php b/pandora_console/operation/visual_console/legacy_view.php index 19e18503ac..a11dd3cdeb 100644 --- a/pandora_console/operation/visual_console/legacy_view.php +++ b/pandora_console/operation/visual_console/legacy_view.php @@ -321,8 +321,8 @@ $ignored_params['refr'] = ''; startCountDown(refr, false); var controls = document.getElementById('vc-controls'); - // autoHideElement(controls, 1000); - + autoHideElement(controls, 1000); + $('select#refr').change(function (event) { refr = Number.parseInt(event.target.value, 10); new_count = event.target.value; From e56a787ba8b67371edc2f68b065f1d481466a8d4 Mon Sep 17 00:00:00 2001 From: Luis Calvo Date: Thu, 18 Jun 2020 20:41:14 +0200 Subject: [PATCH 6/9] WIP: Connection lost warn --- pandora_console/include/javascript/pandora.js | 72 +++++++++++++++++++ .../include/javascript/pandora_ui.js | 40 +++++++++++ 2 files changed, 112 insertions(+) diff --git a/pandora_console/include/javascript/pandora.js b/pandora_console/include/javascript/pandora.js index 871853cfa0..ad950825c9 100644 --- a/pandora_console/include/javascript/pandora.js +++ b/pandora_console/include/javascript/pandora.js @@ -1865,3 +1865,75 @@ function ajaxRequest(id, settings) { } }); } + +var checkConnection = setInterval(handleConnection, 5000); + +window.addEventListener("online", handleConnection); +window.addEventListener("offline", handleConnection); + +function handleConnection() { + var connected; + var msg = "online"; + + if (navigator.onLine) { + isReachable(getServerUrl()) + .then(function(online) { + if (online) { + // handle online status + connected = true; + showConnectionMessage(connected, msg); + } else { + connected = false; + msg = "No connectivity with server"; + showConnectionMessage(connected, msg); + } + }) + .catch(function(err) { + connected = false; + msg = err; + showConnectionMessage(connected, msg); + }); + } else { + // handle offline status + connected = false; + msg = "Connection offline"; + showConnectionMessage(connected, msg); + } +} + +function isReachable(url) { + /** + * Note: fetch() still "succeeds" for 404s on subdirectories, + * which is ok when only testing for domain reachability. + * + * Example: + * https://google.com/noexist does not throw + * https://noexist.com/noexist does throw + */ + return fetch(url, { method: "HEAD", mode: "no-cors" }) + .then(function(resp) { + return resp && (resp.ok || resp.type === "opaque"); + }) + .catch(function(error) { + console.warn("[conn test failure]:", error); + }); +} + +function getServerUrl() { + return $("#php_to_js_value_absolute_homeurl").val() || window.location.origin; +} + +function showConnectionMessage(conn = true, msg = "") { + var data = {}; + if (conn) { + $("div#msg_connection") + .closest(".ui-dialog-content") + .dialog("close"); + $("div#msg_connection").remove(); + } else { + data.title = "Connection with server has been lost"; + data.text = "Connection status: " + msg; + + infoMessage(data, "msg_connection"); + } +} diff --git a/pandora_console/include/javascript/pandora_ui.js b/pandora_console/include/javascript/pandora_ui.js index 70ffd40f7f..c60c889d03 100644 --- a/pandora_console/include/javascript/pandora_ui.js +++ b/pandora_console/include/javascript/pandora_ui.js @@ -478,3 +478,43 @@ function generalShowMsg(data, idMsg) { ] }); } + +function infoMessage(data, idMsg) { + var title = data.title; + var text = data.text; + + var html = + '' + + text; + + if (idMsg == null) { + idMsg = uniqId(); + } + + if ($("#" + idMsg).length === 0) { + $("body").append('
' + text + "
"); + } + + $("#" + idMsg).empty(); + $("#" + idMsg).html(html); + $("#" + idMsg) + .dialog({ + width: 450, + opacity: 1, + modal: true, + position: { + my: "center", + at: "center", + of: window, + collision: "fit" + }, + title: data.title, + open: function(event, ui) { + $(".ui-widget-overlay").addClass("modal-opened"); + }, + close: function(event, ui) { + $(".ui-widget-overlay").removeClass("modal-opened"); + } + }) + .show(); +} From d346c763229c9a5d50a3cb022a8b13f7969d4fea Mon Sep 17 00:00:00 2001 From: Luis Calvo Date: Fri, 19 Jun 2020 23:03:37 +0200 Subject: [PATCH 7/9] Connection error dialog working --- pandora_console/include/functions_ui.php | 23 +++++++++ pandora_console/include/javascript/pandora.js | 49 +++++++++++++++--- .../include/javascript/pandora_ui.js | 40 +++++++++++---- pandora_console/include/styles/pandora.css | 50 +++++++++++++++++++ pandora_console/index.php | 6 +++ .../operation/gis_maps/public_console.php | 5 ++ .../visual_console/legacy_public_view.php | 12 +++++ .../operation/visual_console/public_view.php | 11 ++++ 8 files changed, 179 insertions(+), 17 deletions(-) diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php index c67091f47f..ba1fdb492b 100755 --- a/pandora_console/include/functions_ui.php +++ b/pandora_console/include/functions_ui.php @@ -6010,3 +6010,26 @@ function ui_get_full_external_url(string $url) return $url; } + + +function ui_print_message_dialog($title, $text, $id='', $img='', $text_button='', $hidden=true) +{ + if ($hidden == true) { + $style = 'display:none'; + } + + echo '
'; + echo '
'; + echo '
'; + echo html_print_image($img, true, ['alt' => $title, 'border' => 0]); + echo '
'; + echo '
'; + echo '
'; + echo '

'.$title.'

'; + echo '

'.$text.'

'; + echo '
'; + echo '
'; + echo '
'; + echo '
'; + echo '
'; +} diff --git a/pandora_console/include/javascript/pandora.js b/pandora_console/include/javascript/pandora.js index ad950825c9..d6acb45ee7 100644 --- a/pandora_console/include/javascript/pandora.js +++ b/pandora_console/include/javascript/pandora.js @@ -1866,11 +1866,33 @@ function ajaxRequest(id, settings) { }); } -var checkConnection = setInterval(handleConnection, 5000); +/** + * ------------------------------------- + * Connection Check + * -------------------------------------- + */ -window.addEventListener("online", handleConnection); -window.addEventListener("offline", handleConnection); +checkConnection(1); +/** + * Performs connection tests every minutes and add connection listeners + * @param {integer} time in minutes + */ + +function checkConnection(minutes) { + var cicle = minutes * 60 * 1000; + var checkConnection = setInterval(handleConnection, cicle); + + // Connection listeters. + window.addEventListener("online", handleConnection); + window.addEventListener("offline", handleConnection); +} + +/** + * Handle connection status test. + * + * Test conectivity with server and shows modal message. + */ function handleConnection() { var connected; var msg = "online"; @@ -1901,6 +1923,13 @@ function handleConnection() { } } +/** + * Test server reachibilty and get response. + * + * @param {String} url + * + * Return {promise} + */ function isReachable(url) { /** * Note: fetch() still "succeeds" for 404s on subdirectories, @@ -1919,21 +1948,29 @@ function isReachable(url) { }); } +/** + * Gets server origin url + */ function getServerUrl() { return $("#php_to_js_value_absolute_homeurl").val() || window.location.origin; } +/** + * Shows or hide connection infoMessage. + * + * @param {bool} conn + * @param {string} msg + */ function showConnectionMessage(conn = true, msg = "") { var data = {}; if (conn) { - $("div#msg_connection") + $("div#message_dialog_connection") .closest(".ui-dialog-content") .dialog("close"); - $("div#msg_connection").remove(); } else { data.title = "Connection with server has been lost"; data.text = "Connection status: " + msg; - infoMessage(data, "msg_connection"); + infoMessage(data, "message_dialog_connection"); } } diff --git a/pandora_console/include/javascript/pandora_ui.js b/pandora_console/include/javascript/pandora_ui.js index c60c889d03..6667b21b1a 100644 --- a/pandora_console/include/javascript/pandora_ui.js +++ b/pandora_console/include/javascript/pandora_ui.js @@ -481,25 +481,24 @@ function generalShowMsg(data, idMsg) { function infoMessage(data, idMsg) { var title = data.title; - var text = data.text; - - var html = - '' + - text; + var err_messge = data.text; if (idMsg == null) { idMsg = uniqId(); } if ($("#" + idMsg).length === 0) { - $("body").append('
' + text + "
"); + $("body").append('
'); + $("#" + idMsg).empty(); } - $("#" + idMsg).empty(); - $("#" + idMsg).html(html); + $("#err_msg").empty(); + $("#err_msg").html("\n\n" + err_messge); + $("#" + idMsg) .dialog({ - width: 450, + height: 250, + width: 528, opacity: 1, modal: true, position: { @@ -509,11 +508,30 @@ function infoMessage(data, idMsg) { collision: "fit" }, title: data.title, + buttons: [ + { + class: + "ui-widget ui-state-default ui-corner-all ui-button-text-only sub ok submit-next", + text: "Retry", + click: function(e) { + handleConnection(); + } + }, + { + class: + "ui-widget ui-state-default ui-corner-all ui-button-text-only sub ok submit-cancel", + text: "Close", + click: function() { + $(this).dialog("close"); + } + } + ], + open: function(event, ui) { - $(".ui-widget-overlay").addClass("modal-opened"); + $(".ui-widget-overlay").addClass("error-modal-opened"); }, close: function(event, ui) { - $(".ui-widget-overlay").removeClass("modal-opened"); + $(".ui-widget-overlay").removeClass("error-modal-opened"); } }) .show(); diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index eabdea9ecf..5f0160ed1a 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -6040,3 +6040,53 @@ form#modal_form_feedback ul.wizard li > textarea { #controls_table > tbody > tr > td input { margin-left: 3px; } + +/* + * --------------------------------------------------------------------- + * - ERROR CONNECTION + * --------------------------------------------------------------------- + */ + +/*background dim */ + +.ui-widget-overlay.error-modal-opened { + background: rgb(0, 0, 0); + opacity: 0.5; + filter: Alpha(Opacity=50); +} + +/* --- Login page - modal windows --- */ +div.content_dialog { + width: 98%; + margin-top: 20px; +} + +div.icon_message_dialog { + float: left; + width: 25%; + text-align: center; +} + +div.icon_message_dialog img { + width: 85px; +} + +div.content_message_dialog { + width: 75%; + float: right; +} + +div.text_message_dialog { + width: 100%; + margin-top: 10px; +} + +div.text_message_dialog h1 { + margin: 0px; +} + +div.text_message_dialog p { + margin: 0px; + font-size: 10.3pt; + line-height: 14pt; +} diff --git a/pandora_console/index.php b/pandora_console/index.php index e272fb14a7..84cb0836ff 100755 --- a/pandora_console/index.php +++ b/pandora_console/index.php @@ -1239,6 +1239,12 @@ echo '
'; echo '
'; echo '
'; + +// Connection lost alert. +$conn_title = __('Connection with server has been lost'); +$conn_text = __('Connection to the server has been lost. Please check your internet connection or contact with administrator.'); +ui_print_message_dialog($conn_title, $conn_text, 'connection', '/images/error_1.png'); + if ($config['pure'] == 0) { echo ''; // Container div. diff --git a/pandora_console/operation/gis_maps/public_console.php b/pandora_console/operation/gis_maps/public_console.php index cfbcff3e99..ba5b99633c 100755 --- a/pandora_console/operation/gis_maps/public_console.php +++ b/pandora_console/operation/gis_maps/public_console.php @@ -271,6 +271,11 @@ if ($layers != false) { gis_activate_select_control(); gis_activate_ajax_refresh($layers, $timestampLastOperation, 1, $idMap); + + // Connection lost alert. + $conn_title = __('Connection with server has been lost'); + $conn_text = __('Connection to the server has been lost. Please check your internet connection or contact with administrator.'); + ui_print_message_dialog($conn_title, $conn_text, 'connection', '/images/error_1.png'); } // Resize GIS map on fullscreen diff --git a/pandora_console/operation/visual_console/legacy_public_view.php b/pandora_console/operation/visual_console/legacy_public_view.php index 4a316eee60..cf85425229 100644 --- a/pandora_console/operation/visual_console/legacy_public_view.php +++ b/pandora_console/operation/visual_console/legacy_public_view.php @@ -43,6 +43,13 @@ enterprise_include('index.php'); $url_css = ui_get_full_url('include/styles/visual_maps.css', false, false, false); echo ''; +$url_css_modal = ui_get_full_url('include/styles/register.css', false, false, false); +echo ''; +// Connection lost alert. +$conn_title = __('Connection with server has been lost'); +$conn_text = __('Connection to the server has been lost. Please check your internet connection or contact with administrator.'); +ui_print_message_dialog($conn_title, $conn_text, 'connection', '/images/error_1.png'); + require_once 'include/functions_visual_map.php'; $hash = get_parameter('hash'); @@ -148,6 +155,11 @@ echo ''; echo ''; +// Connection lost alert. +$conn_title = __('Connection with server has been lost'); +$conn_text = __('Connection to the server has been lost. Please check your internet connection or contact with administrator.'); +ui_print_message_alert($conn_title, $conn_text, 'connection', '/images/error_1.png'); + ui_require_jquery_file('countdown', 'include/javascript/', true); ui_require_javascript_file('wz_jsgraphics', 'include/javascript/', true); ui_require_javascript_file('pandora_visual_console', 'include/javascript/', true); diff --git a/pandora_console/operation/visual_console/public_view.php b/pandora_console/operation/visual_console/public_view.php index 7e899c3718..1127614eed 100644 --- a/pandora_console/operation/visual_console/public_view.php +++ b/pandora_console/operation/visual_console/public_view.php @@ -29,6 +29,12 @@ if (file_exists(ENTERPRISE_DIR.'/include/functions_login.php')) { require_once $config['homedir'].'/vendor/autoload.php'; ui_require_css_file('visual_maps'); +ui_require_css_file('register'); + +// Connection lost alert. +$conn_title = __('Connection with server has been lost'); +$conn_text = __('Connection to the server has been lost. Please check your internet connection or contact with administrator.'); +ui_print_message_dialog($conn_title, $conn_text, 'connection', '/images/error_1.png'); echo ''."\n"; echo ''."\n"; @@ -132,6 +138,11 @@ echo ''; echo ''; +// Connection lost alert. +$conn_title = __('Connection with server has been lost'); +$conn_text = __('Connection to the server has been lost. Please check your internet connection or contact with administrator.'); +ui_print_message_dialog($conn_title, $conn_text, 'connection', '/images/error_1.png'); + // Check groups can access user. $aclUserGroups = []; if (!users_can_manage_group_all('AR')) { From 593ed43f10df647af88e2abea5e5dce387587430 Mon Sep 17 00:00:00 2001 From: artica Date: Wed, 15 Jul 2020 01:00:17 +0200 Subject: [PATCH 8/9] Auto-updated build strings. --- pandora_agents/unix/DEBIAN/control | 2 +- pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +- pandora_agents/unix/pandora_agent | 2 +- pandora_agents/unix/pandora_agent.redhat.spec | 2 +- pandora_agents/unix/pandora_agent.spec | 2 +- pandora_agents/unix/pandora_agent_installer | 2 +- pandora_agents/win32/installer/pandora.mpi | 2 +- pandora_agents/win32/pandora.cc | 2 +- pandora_agents/win32/versioninfo.rc | 2 +- pandora_console/DEBIAN/control | 2 +- pandora_console/DEBIAN/make_deb_package.sh | 2 +- pandora_console/include/config_process.php | 2 +- pandora_console/install.php | 2 +- pandora_console/pandora_console.redhat.spec | 2 +- pandora_console/pandora_console.rhel7.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/lib/PandoraFMS/PluginTools.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 534f6d7cf7..a5dd958f58 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.747-200714 +Version: 7.0NG.747-200715 Architecture: all Priority: optional Section: admin diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh index b904194dc1..8ea1fe6214 100644 --- a/pandora_agents/unix/DEBIAN/make_deb_package.sh +++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh @@ -14,7 +14,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -pandora_version="7.0NG.747-200714" +pandora_version="7.0NG.747-200715" echo "Test if you has the tools for to make the packages." whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent index 89268c6d22..e74f0262b0 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -55,7 +55,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.747'; -use constant AGENT_BUILD => '200714'; +use constant AGENT_BUILD => '200715'; # Agent log default file size maximum and instances use constant DEFAULT_MAX_LOG_SIZE => 600000; diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec index 4d81c061a5..0ccdd4d144 100644 --- a/pandora_agents/unix/pandora_agent.redhat.spec +++ b/pandora_agents/unix/pandora_agent.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_agent_unix %define version 7.0NG.747 -%define release 200714 +%define release 200715 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec index adc17caca9..65cdfc8815 100644 --- a/pandora_agents/unix/pandora_agent.spec +++ b/pandora_agents/unix/pandora_agent.spec @@ -3,7 +3,7 @@ # %define name pandorafms_agent_unix %define version 7.0NG.747 -%define release 200714 +%define release 200715 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer index 8f5a0c0ded..4041238f5b 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.747" -PI_BUILD="200714" +PI_BUILD="200715" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index bbaf77855b..b59456788d 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{200714} +{200715} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 29d1d3adea..80019ff81a 100644 --- a/pandora_agents/win32/pandora.cc +++ b/pandora_agents/win32/pandora.cc @@ -30,7 +30,7 @@ using namespace Pandora; using namespace Pandora_Strutils; #define PATH_SIZE _MAX_PATH+1 -#define PANDORA_VERSION ("7.0NG.747(Build 200714)") +#define PANDORA_VERSION ("7.0NG.747(Build 200715)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index ebd9e55a52..30fd086283 100644 --- a/pandora_agents/win32/versioninfo.rc +++ b/pandora_agents/win32/versioninfo.rc @@ -11,7 +11,7 @@ BEGIN VALUE "LegalCopyright", "Artica ST" VALUE "OriginalFilename", "PandoraAgent.exe" VALUE "ProductName", "Pandora FMS Windows Agent" - VALUE "ProductVersion", "(7.0NG.747(Build 200714))" + VALUE "ProductVersion", "(7.0NG.747(Build 200715))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 32229addf8..12c672341b 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.747-200714 +Version: 7.0NG.747-200715 Architecture: all Priority: optional Section: admin diff --git a/pandora_console/DEBIAN/make_deb_package.sh b/pandora_console/DEBIAN/make_deb_package.sh index 85d55170b8..25fd60cf4a 100644 --- a/pandora_console/DEBIAN/make_deb_package.sh +++ b/pandora_console/DEBIAN/make_deb_package.sh @@ -14,7 +14,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -pandora_version="7.0NG.747-200714" +pandora_version="7.0NG.747-200715" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 40612336ca..7722c6bb86 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -20,7 +20,7 @@ /** * Pandora build version and version */ -$build_version = 'PC200714'; +$build_version = 'PC200715'; $pandora_version = 'v7.0NG.747'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index da49edc41e..13838e2a1a 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -129,7 +129,7 @@
[ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index 7ac50aaff8..c6fee1007c 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.747 -%define release 200714 +%define release 200715 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 61d11d7ec2..ef726af6b3 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.747 -%define release 200714 +%define release 200715 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index bbc9ee03ce..d2bcdee824 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.747" -PI_BUILD="200714" +PI_BUILD="200715" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 6cf564d4d9..f9a9d5c6b6 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -35,7 +35,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.747 PS200714"; +my $version = "7.0NG.747 PS200715"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index b524d6d91e..175369612c 100755 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -36,7 +36,7 @@ use Encode::Locale; Encode::Locale::decode_argv; # version: define current version -my $version = "7.0NG.747 PS200714"; +my $version = "7.0NG.747 PS200715"; # save program name for logging my $progname = basename($0); From 8b85bba6310bc8072140ab27bc670da3d38e0ff5 Mon Sep 17 00:00:00 2001 From: artica Date: Thu, 16 Jul 2020 01:00:20 +0200 Subject: [PATCH 9/9] Auto-updated build strings. --- pandora_agents/unix/DEBIAN/control | 2 +- pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +- pandora_agents/unix/pandora_agent | 2 +- pandora_agents/unix/pandora_agent.redhat.spec | 2 +- pandora_agents/unix/pandora_agent.spec | 2 +- pandora_agents/unix/pandora_agent_installer | 2 +- pandora_agents/win32/installer/pandora.mpi | 2 +- pandora_agents/win32/pandora.cc | 2 +- pandora_agents/win32/versioninfo.rc | 2 +- pandora_console/DEBIAN/control | 2 +- pandora_console/DEBIAN/make_deb_package.sh | 2 +- pandora_console/include/config_process.php | 2 +- pandora_console/install.php | 2 +- pandora_console/pandora_console.redhat.spec | 2 +- pandora_console/pandora_console.rhel7.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/lib/PandoraFMS/PluginTools.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index a5dd958f58..514fdb6bf8 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.747-200715 +Version: 7.0NG.747-200716 Architecture: all Priority: optional Section: admin diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh index 8ea1fe6214..c0e52fdb69 100644 --- a/pandora_agents/unix/DEBIAN/make_deb_package.sh +++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh @@ -14,7 +14,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -pandora_version="7.0NG.747-200715" +pandora_version="7.0NG.747-200716" echo "Test if you has the tools for to make the packages." whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent index e74f0262b0..12802ca9e3 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -55,7 +55,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.747'; -use constant AGENT_BUILD => '200715'; +use constant AGENT_BUILD => '200716'; # Agent log default file size maximum and instances use constant DEFAULT_MAX_LOG_SIZE => 600000; diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec index 0ccdd4d144..6c8530073c 100644 --- a/pandora_agents/unix/pandora_agent.redhat.spec +++ b/pandora_agents/unix/pandora_agent.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_agent_unix %define version 7.0NG.747 -%define release 200715 +%define release 200716 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec index 65cdfc8815..fba0f66c63 100644 --- a/pandora_agents/unix/pandora_agent.spec +++ b/pandora_agents/unix/pandora_agent.spec @@ -3,7 +3,7 @@ # %define name pandorafms_agent_unix %define version 7.0NG.747 -%define release 200715 +%define release 200716 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer index 4041238f5b..2906e6f659 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.747" -PI_BUILD="200715" +PI_BUILD="200716" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index b59456788d..2bd57d6c83 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{200715} +{200716} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 80019ff81a..7239b191f1 100644 --- a/pandora_agents/win32/pandora.cc +++ b/pandora_agents/win32/pandora.cc @@ -30,7 +30,7 @@ using namespace Pandora; using namespace Pandora_Strutils; #define PATH_SIZE _MAX_PATH+1 -#define PANDORA_VERSION ("7.0NG.747(Build 200715)") +#define PANDORA_VERSION ("7.0NG.747(Build 200716)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 30fd086283..c375677c54 100644 --- a/pandora_agents/win32/versioninfo.rc +++ b/pandora_agents/win32/versioninfo.rc @@ -11,7 +11,7 @@ BEGIN VALUE "LegalCopyright", "Artica ST" VALUE "OriginalFilename", "PandoraAgent.exe" VALUE "ProductName", "Pandora FMS Windows Agent" - VALUE "ProductVersion", "(7.0NG.747(Build 200715))" + VALUE "ProductVersion", "(7.0NG.747(Build 200716))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 12c672341b..4042650114 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.747-200715 +Version: 7.0NG.747-200716 Architecture: all Priority: optional Section: admin diff --git a/pandora_console/DEBIAN/make_deb_package.sh b/pandora_console/DEBIAN/make_deb_package.sh index 25fd60cf4a..8cef851478 100644 --- a/pandora_console/DEBIAN/make_deb_package.sh +++ b/pandora_console/DEBIAN/make_deb_package.sh @@ -14,7 +14,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -pandora_version="7.0NG.747-200715" +pandora_version="7.0NG.747-200716" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 7722c6bb86..1756c8f4c1 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -20,7 +20,7 @@ /** * Pandora build version and version */ -$build_version = 'PC200715'; +$build_version = 'PC200716'; $pandora_version = 'v7.0NG.747'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 13838e2a1a..9e6af3b018 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -129,7 +129,7 @@
[ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index c6fee1007c..2ff57c9e23 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.747 -%define release 200715 +%define release 200716 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index ef726af6b3..842490267c 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.747 -%define release 200715 +%define release 200716 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index d2bcdee824..c9b0d997dc 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.747" -PI_BUILD="200715" +PI_BUILD="200716" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index f9a9d5c6b6..77710c5e76 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -35,7 +35,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.747 PS200715"; +my $version = "7.0NG.747 PS200716"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 175369612c..8e39e757d7 100755 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -36,7 +36,7 @@ use Encode::Locale; Encode::Locale::decode_argv; # version: define current version -my $version = "7.0NG.747 PS200715"; +my $version = "7.0NG.747 PS200716"; # save program name for logging my $progname = basename($0);