From a063c7a0ace8da23f025cd9c80bd2a38091567ff Mon Sep 17 00:00:00 2001 From: Jonathan Date: Wed, 22 Mar 2023 14:21:56 +0100 Subject: [PATCH 01/11] Fix header and menu --- .../godmode/alerts/alert_list.builder.php | 22 ++++- pandora_console/godmode/alerts/alert_list.php | 76 ++++++++--------- .../godmode/gis_maps/configure_gis_map.php | 56 ++++++++----- .../godmode/massive/massive_operations.php | 82 ++++++++++++------- pandora_console/godmode/setup/news.php | 21 ++++- pandora_console/include/functions_menu.php | 6 ++ .../operation/gis_maps/gis_map.php | 19 ++++- .../operation/gis_maps/render_view.php | 24 ++++-- pandora_console/views/cluster/edit.php | 4 +- pandora_console/views/cluster/list.php | 17 +++- 10 files changed, 223 insertions(+), 104 deletions(-) diff --git a/pandora_console/godmode/alerts/alert_list.builder.php b/pandora_console/godmode/alerts/alert_list.builder.php index 4844e5c443..af380c396c 100644 --- a/pandora_console/godmode/alerts/alert_list.builder.php +++ b/pandora_console/godmode/alerts/alert_list.builder.php @@ -187,7 +187,7 @@ $table->data[2][0] = html_print_label_input_block( ); if (isset($step) === false) { - echo '
'; + echo ''; html_print_table($table); } @@ -216,6 +216,26 @@ if (isset($step) === false) { true ); + if ($_GET['sec2'] === 'operation/cluster/cluster') { + html_print_div( + [ + 'content' => html_print_submit_button( + __('Add alert'), + 'add', + false, + [ + 'icon' => 'wand', + 'form' => 'form_alerts', + 'mode' => 'secondary', + ], + true + ), + 'style' => 'display:none', + 'id' => 'add_alert_div', + ] + ); + } + html_print_action_buttons($actionButtons, ['right_content' => $pagination]); html_print_input_hidden('create_alert', 1); diff --git a/pandora_console/godmode/alerts/alert_list.php b/pandora_console/godmode/alerts/alert_list.php index 23371066c4..ce42dd1675 100644 --- a/pandora_console/godmode/alerts/alert_list.php +++ b/pandora_console/godmode/alerts/alert_list.php @@ -497,45 +497,47 @@ if (is_metaconsole() === false) { $buttons = ''; } - if ($tab !== 'alert') { - if ($tab === 'list') { - ui_print_standard_header( - __('Alerts'), - 'images/gm_alerts.png', - false, - '', - true, - $buttons, - [ + if ($_GET['sec2'] !== 'operation/cluster/cluster') { + if ($tab !== 'alert') { + if ($tab === 'list') { + ui_print_standard_header( + __('Alerts'), + 'images/gm_alerts.png', + false, + '', + true, + $buttons, [ - 'link' => '', - 'label' => __('Manage alerts'), - ], + [ + 'link' => '', + 'label' => __('Manage alerts'), + ], + [ + 'link' => '', + 'label' => __('List'), + ], + ] + ); + } else { + ui_print_standard_header( + __('Alerts'), + 'images/gm_alerts.png', + false, + '', + true, + $buttons, [ - 'link' => '', - 'label' => __('List'), - ], - ] - ); - } else { - ui_print_standard_header( - __('Alerts'), - 'images/gm_alerts.png', - false, - '', - true, - $buttons, - [ - [ - 'link' => '', - 'label' => __('Manage alerts'), - ], - [ - 'link' => '', - 'label' => __('Create'), - ], - ] - ); + [ + 'link' => '', + 'label' => __('Manage alerts'), + ], + [ + 'link' => '', + 'label' => __('Create'), + ], + ] + ); + } } } } else { diff --git a/pandora_console/godmode/gis_maps/configure_gis_map.php b/pandora_console/godmode/gis_maps/configure_gis_map.php index 92e9e043b3..38b67a7c4e 100644 --- a/pandora_console/godmode/gis_maps/configure_gis_map.php +++ b/pandora_console/godmode/gis_maps/configure_gis_map.php @@ -84,7 +84,7 @@ $buttons['gis_maps_list'] = [ true, [ 'title' => __('GIS Maps list'), - 'class' => 'invert_filter', + 'class' => 'invert_filter main_menu_icon', ] ).'', ]; @@ -96,19 +96,30 @@ if ($idMap) { true, [ 'title' => __('View GIS'), - 'class' => 'invert_filter', + 'class' => 'invert_filter main_menu_icon', ] ).'', ]; } -ui_print_page_header( +// Header. +ui_print_standard_header( __('GIS Maps builder'), 'images/gm_gis.png', false, 'configure_gis_map_edit', - true, - $buttons + false, + $buttons, + [ + [ + 'link' => '', + 'label' => __('Topology maps'), + ], + [ + 'link' => '', + 'label' => __('GIS Maps'), + ], + ] ); switch ($action) { @@ -480,7 +491,7 @@ $table->data[1][1] = "".html_print_image( 'images/add.png', true, - ['class' => 'invert_filter'] + ['class' => 'invert_filter main_menu_icon'] )." @@ -583,7 +594,7 @@ $table->data[1][1] = ' @@ -660,21 +671,19 @@ $table->data[1][1] .= ' html_print_table($table); - -echo '
'; switch ($action) { case 'save_new': case 'edit_map': case 'update_saved': if (empty($invalidFields) === true) { - html_print_submit_button(_('Save map'), 'save_button', false, 'class="sub wand"'); + $action_button = html_print_submit_button(_('Save map'), 'save_button', false, ['mode' => 'primary', 'icon' => 'next'], true); } else { - html_print_submit_button(_('Update map'), 'update_button', false, 'class="sub upd"'); + $action_button = html_print_submit_button(_('Update map'), 'update_button', false, ['mode' => 'primary', 'icon' => 'next'], true); } break; case 'new_map': - html_print_submit_button(_('Save map'), 'save_button', false, 'class="sub wand"'); + $action_button = html_print_submit_button(_('Save map'), 'save_button', false, ['mode' => 'primary', 'icon' => 'next'], true); break; default: @@ -682,7 +691,10 @@ switch ($action) { break; } -echo '
'; +html_print_action_buttons( + $action_button, + ['type' => 'form_action'] +); echo ''; @@ -702,7 +714,7 @@ echo ''; false, [ 'alt' => '', - 'class' => 'invert_filter', + 'class' => 'invert_filter main_menu_icon', ] ); ?> @@ -899,7 +911,7 @@ function setLayerEditorData (data) { var $layerFormVisibleCheckbox = $("input#checkbox-layer_visible_form"); var $layerFormAgentsFromGroupSelect = $("#layer_group_form"); var $layerFormAgentInput = $("input#text-agent_alias"); - var $layerFormAgentButton = $("input#button-add_agent"); + var $layerFormAgentButton = $("button#button-add_agent"); var $layerFormAgentsListItems = $("tr.agents_list_item"); var $layerFormGroupsListItems = $("tr.groups_list_item"); @@ -1005,7 +1017,7 @@ function getAgentRow (layerId, agentId, agentAlias) { var $deleteCol = $("
"); var $agentAlias = $("" + agentAlias + ""); - var $removeBtn = $(' 'invert_filter']); ?> '); + var $removeBtn = $(' 'invert_filter main_menu_icon']); ?> '); $removeBtn.click(function (event) { var $layerRow = $("tr#layer_row_" + layerId); @@ -1061,7 +1073,7 @@ function getGroupRow (layerId, groupId, groupName, agentId, agentAlias) { + "" + agentAlias + "" + ")" + ""); - var $removeBtn = $(' 'invert_filter']); ?>'); + var $removeBtn = $(' 'invert_filter main_menu_icon']); ?>'); $removeBtn.click(function (event) { var $layerRow = $("tr#layer_row_" + layerId); @@ -1139,8 +1151,8 @@ function getLayerRow (layerId, layerData) { var $layerName = $("" + layerData.name + ""); var $sortUpBtn = $(""); var $sortDownBtn = $(""); - var $editBtn = $(' 'invert_filter']); ?>'); - var $removeBtn = $(' 'invert_filter']); ?>'); + var $editBtn = $(' 'invert_filter main_menu_icon']); ?>'); + var $removeBtn = $(' 'invert_filter main_menu_icon']); ?>'); $sortUpBtn.click(moveLayerRowUpOnClick); $sortDownBtn.click(moveLayerRowDownOnClick); @@ -1231,9 +1243,9 @@ function onLayerGroupIdChange (event) { // Bind events $("form#form_setup").submit(onFormSubmit); -$("input#button-add_agent").click(addAgentClick); +$("button#button-add_agent").click(addAgentClick); $("select#layer_group_id").change(onLayerGroupIdChange); -$("input#button-add_group").click(addGroupClick); +$("button#button-add_group").click(addGroupClick); // Populate layer list var layers = ; diff --git a/pandora_console/godmode/massive/massive_operations.php b/pandora_console/godmode/massive/massive_operations.php index 04a2a20a2f..864382bd78 100755 --- a/pandora_console/godmode/massive/massive_operations.php +++ b/pandora_console/godmode/massive/massive_operations.php @@ -220,7 +220,7 @@ $alertstab = [ true, [ 'title' => __('Alerts operations'), - 'class' => 'invert_filter', + 'class' => 'invert_filter main_menu_icon', ] ).'', 'active' => $tab == 'massive_alerts', @@ -232,7 +232,7 @@ $userstab = [ true, [ 'title' => __('Users operations'), - 'class' => 'invert_filter', + 'class' => 'invert_filter main_menu_icon', ] ).'', 'active' => $tab == 'massive_users', @@ -244,7 +244,7 @@ $agentstab = [ true, [ 'title' => __('Agents operations'), - 'class' => 'invert_filter', + 'class' => 'invert_filter main_menu_icon', ] ).'', 'active' => $tab == 'massive_agents', @@ -256,7 +256,7 @@ $modulestab = [ true, [ 'title' => __('Modules operations'), - 'class' => 'invert_filter', + 'class' => 'invert_filter main_menu_icon', ] ).'', 'active' => $tab == 'massive_modules', @@ -268,7 +268,7 @@ $pluginstab = [ true, [ 'title' => __('Plugins operations'), - 'class' => 'invert_filter', + 'class' => 'invert_filter main_menu_icon', ] ).'', 'active' => $tab == 'massive_plugins', @@ -308,34 +308,58 @@ $onheader['services'] = $servicestab; // Header. -ui_print_standard_header( - __('Bulk operations').' - '.$options[$option], - 'images/gm_massive_operations.png', - false, - $help_header, - false, - [ - $agentstab, - $modulestab, - $pluginstab, - $userstab, - $alertstab, - $policiestab, - $snmptab, - $satellitetab, - $servicestab, - ], - [ +if (is_metaconsole() === false) { + ui_print_standard_header( + __('Bulk operations').' - '.$options[$option], + 'images/gm_massive_operations.png', + false, + $help_header, + false, [ - 'link' => '', - 'label' => __('Configuration'), + $agentstab, + $modulestab, + $pluginstab, + $userstab, + $alertstab, + $policiestab, + $snmptab, + $satellitetab, + $servicestab, ], [ - 'link' => '', - 'label' => __('Bulk operations'), + [ + 'link' => '', + 'label' => __('Configuration'), + ], + [ + 'link' => '', + 'label' => __('Bulk operations'), + ], + ] + ); +} else { + ui_print_standard_header( + __('Bulk operations').' - '.$options[$option], + 'images/gm_massive_operations.png', + false, + $help_header, + false, + [ + $userstab, + $agentstab, ], - ] -); + [ + [ + 'link' => '', + 'label' => __('Configuration'), + ], + [ + 'link' => '', + 'label' => __('Bulk operations'), + ], + ] + ); +} // Checks if the PHP configuration is correctly. diff --git a/pandora_console/godmode/setup/news.php b/pandora_console/godmode/setup/news.php index ee4b47d930..e388d8034c 100644 --- a/pandora_console/godmode/setup/news.php +++ b/pandora_console/godmode/setup/news.php @@ -25,8 +25,25 @@ if (! check_acl($config['id_user'], 0, 'PM')) { exit; } -// Header -ui_print_page_header(__('Site news management'), '', false, '', true); +// Header. +ui_print_standard_header( + __('Site news management'), + 'images/custom_field.png', + false, + '', + true, + [], + [ + [ + 'link' => '', + 'label' => __('Admin tools'), + ], + [ + 'link' => '', + 'label' => __('Site news'), + ], + ] +); diff --git a/pandora_console/include/functions_menu.php b/pandora_console/include/functions_menu.php index 14c43a5c14..5a5e7c74ce 100644 --- a/pandora_console/include/functions_menu.php +++ b/pandora_console/include/functions_menu.php @@ -68,6 +68,12 @@ function menu_print_menu(&$menu) $sec2 = 'godmode/alerts/alert_commands'; } else if ($sec2 === 'enterprise/godmode/setup/edit_skin') { $sec2 = 'enterprise/godmode/setup/setup_skins'; + } else if ($sec2 === 'godmode/gis_maps/configure_gis_map') { + $map_id = (string) get_parameter('map_id'); + $sec2 = 'operation/gis_maps/render_view&map_id='.$map_id; + } else if ($sec2 === 'operation/gis_maps/render_view') { + $map_id = (string) get_parameter('map_id'); + $sec2 = 'operation/gis_maps/render_view&map_id='.$map_id; } else if ($sec2 === 'godmode/servers/discovery') { $wiz = (string) get_parameter('wiz'); $sec2 = 'godmode/servers/discovery&wiz='.$wiz; diff --git a/pandora_console/operation/gis_maps/gis_map.php b/pandora_console/operation/gis_maps/gis_map.php index 4a9f56dd7a..34bcc597ab 100644 --- a/pandora_console/operation/gis_maps/gis_map.php +++ b/pandora_console/operation/gis_maps/gis_map.php @@ -31,13 +31,24 @@ $buttons['gis_maps_list'] = [ ).'', ]; -ui_print_page_header( - __('GIS Maps'), +// Header. +ui_print_standard_header( + __('List of GIS maps'), 'images/op_gis.png', false, '', false, - $buttons + $buttons, + [ + [ + 'link' => '', + 'label' => __('Topology maps'), + ], + [ + 'link' => '', + 'label' => __('GIS Maps'), + ], + ] ); $own_info = get_user_info($config['id_user']); @@ -187,7 +198,7 @@ if ($maps !== false) { } $table->cellclass[]['op'] = 'table_action_buttons'; - $data['op'] = ''.html_print_image('images/edit.svg', true, ['title' => __('Edit')]).''.''.html_print_image('images/delete.svg', true, ['title' => __('Delete'), 'class' => 'invert_filter']).''; + $data['op'] = ''.html_print_image('images/edit.svg', true, ['title' => __('Edit')]).''.''.html_print_image('images/delete.svg', true, ['title' => __('Delete'), 'class' => 'invert_filter main_menu_icon']).''; } array_push($table->data, $data); diff --git a/pandora_console/operation/gis_maps/render_view.php b/pandora_console/operation/gis_maps/render_view.php index 6ecb1ed6a4..6394beb614 100644 --- a/pandora_console/operation/gis_maps/render_view.php +++ b/pandora_console/operation/gis_maps/render_view.php @@ -174,13 +174,24 @@ if ($has_management_acl) { $buttons['setup']['godmode'] = 1; } -ui_print_page_header( - __('Map').' » '.__('Map').' '.$map['map_name'], - 'images/op_gis.png', +// Header. +ui_print_standard_header( + __('Map').': '.$map['map_name'], + 'images/op_snmp.png', false, - 'render_view_tab', + 'snmp_console', false, - $buttons + $buttons, + [ + [ + 'link' => '', + 'label' => __('Topology maps'), + ], + [ + 'link' => '', + 'label' => __('GIS Maps'), + ], + ] ); $map_inline_style = 'width: 100%; min-height:500px; height: calc(100vh - 80px);'; @@ -320,5 +331,8 @@ if ($layers != false) { $(document).ready(function() { var $map = $("#map"); $map.css("height", "calc(100vh - " + $map.offset().top + "px - 20px)"); + + $('#select2-show_status-container').parent().parent().parent().removeClass('select2'); + $('#select2-refresh_time-container').parent().parent().parent().removeClass('select2'); }); diff --git a/pandora_console/views/cluster/edit.php b/pandora_console/views/cluster/edit.php index eb144c5e72..b3c062977e 100644 --- a/pandora_console/views/cluster/edit.php +++ b/pandora_console/views/cluster/edit.php @@ -143,7 +143,9 @@ html_print_action_buttons( var buttonback = $('#button-submit').parent().html(); $('#button-submit').hide(); var buttonback = buttonback.replace('button-submit','button-submit_copy'); - $('.action_buttons_right_content').parent().html(buttonnext+buttonback); + var buttonalert = $('#button-add').parent().html(); + var buttonalert = buttonalert.replace('button-add','button-add_copy'); + $('.action_buttons_right_content').parent().html(buttonnext+buttonback+buttonalert); var style = $('#principal_action_buttons').attr('style'); $('#principal_action_buttons').attr('style',style+' justify-content: unset;'); diff --git a/pandora_console/views/cluster/list.php b/pandora_console/views/cluster/list.php index 44af135532..bcfc0743b6 100644 --- a/pandora_console/views/cluster/list.php +++ b/pandora_console/views/cluster/list.php @@ -27,12 +27,23 @@ */ // Header. -\ui_print_page_header( - __('Monitoring').' » '.__('Clusters'), +ui_print_standard_header( + __('Cluster view'), 'images/chart.png', false, '', - false + true, + [], + [ + [ + 'link' => '', + 'label' => __('Monitoring'), + ], + [ + 'link' => '', + 'label' => __('Clusters'), + ], + ] ); if (empty($message) === false) { From bcf3f1ba1f77fe1276a6509bd5f3a79c9417faa4 Mon Sep 17 00:00:00 2001 From: artica Date: Sat, 25 Mar 2023 01:00:19 +0100 Subject: [PATCH 02/11] 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 bd7e44f37a..52b2e2e809 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.769-230324 +Version: 7.0NG.769-230325 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 6af4fc0951..976a8b6fc8 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.769-230324" +pandora_version="7.0NG.769-230325" 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 fe535fde4b..9891f606bb 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -1023,7 +1023,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.769'; -use constant AGENT_BUILD => '230324'; +use constant AGENT_BUILD => '230325'; # 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 b34f8e5e7a..f924cd5df8 100644 --- a/pandora_agents/unix/pandora_agent.redhat.spec +++ b/pandora_agents/unix/pandora_agent.redhat.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_agent_linux %define version 7.0NG.769 -%define release 230324 +%define release 230325 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 312f82e77b..256cc0f726 100644 --- a/pandora_agents/unix/pandora_agent.spec +++ b/pandora_agents/unix/pandora_agent.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_agent_linux %define version 7.0NG.769 -%define release 230324 +%define release 230325 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 164e6cccbb..4b388c933d 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.769" -PI_BUILD="230324" +PI_BUILD="230325" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 7594f6100c..d21a2aef02 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{230324} +{230325} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 9f545ca5ac..c01aecd363 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.769 Build 230324") +#define PANDORA_VERSION ("7.0NG.769 Build 230325") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 95dac1d456..0e37931fe7 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.769(Build 230324))" + VALUE "ProductVersion", "(7.0NG.769(Build 230325))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index a99c6b0dcc..6186b27799 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.769-230324 +Version: 7.0NG.769-230325 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 1ee725ca30..58fb56964a 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.769-230324" +pandora_version="7.0NG.769-230325" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index eb4b3f8d0d..73ec3c4be0 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 = 'PC230324'; +$build_version = 'PC230325'; $pandora_version = 'v7.0NG.769'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 6c9019f652..c70e104167 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -131,7 +131,7 @@
[ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index db6ad0ee04..dbc01b193f 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_server %define version 7.0NG.769 -%define release 230324 +%define release 230325 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 32f50745ec..2891490b6d 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_server %define version 7.0NG.769 -%define release 230324 +%define release 230325 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 74f8e14254..e0b230ed4f 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.769" -PI_BUILD="230324" +PI_BUILD="230325" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 1f58bc2b79..4a85702e6c 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.769 Build 230324"; +my $version = "7.0NG.769 Build 230325"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 43d19662eb..5cc3f72fd5 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.769 Build 230324"; +my $version = "7.0NG.769 Build 230325"; # save program name for logging my $progname = basename($0); From 9528f59af982209b2e7b01609552a64c2d30150a Mon Sep 17 00:00:00 2001 From: artica Date: Sun, 26 Mar 2023 01:00:17 +0100 Subject: [PATCH 03/11] 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 52b2e2e809..0847ae89e8 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.769-230325 +Version: 7.0NG.769-230326 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 976a8b6fc8..80b2a0cd6b 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.769-230325" +pandora_version="7.0NG.769-230326" 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 9891f606bb..302c15a0f7 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -1023,7 +1023,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.769'; -use constant AGENT_BUILD => '230325'; +use constant AGENT_BUILD => '230326'; # 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 f924cd5df8..37b532484e 100644 --- a/pandora_agents/unix/pandora_agent.redhat.spec +++ b/pandora_agents/unix/pandora_agent.redhat.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_agent_linux %define version 7.0NG.769 -%define release 230325 +%define release 230326 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 256cc0f726..8dfba1f9e2 100644 --- a/pandora_agents/unix/pandora_agent.spec +++ b/pandora_agents/unix/pandora_agent.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_agent_linux %define version 7.0NG.769 -%define release 230325 +%define release 230326 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 4b388c933d..8baeff0e43 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.769" -PI_BUILD="230325" +PI_BUILD="230326" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index d21a2aef02..ebee989dbf 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{230325} +{230326} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index c01aecd363..f95af5b1ff 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.769 Build 230325") +#define PANDORA_VERSION ("7.0NG.769 Build 230326") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 0e37931fe7..5e74238c9a 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.769(Build 230325))" + VALUE "ProductVersion", "(7.0NG.769(Build 230326))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 6186b27799..0429c122db 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.769-230325 +Version: 7.0NG.769-230326 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 58fb56964a..a8d40ac8b6 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.769-230325" +pandora_version="7.0NG.769-230326" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 73ec3c4be0..3a09bd482e 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 = 'PC230325'; +$build_version = 'PC230326'; $pandora_version = 'v7.0NG.769'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index c70e104167..11df4915aa 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -131,7 +131,7 @@
[ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index dbc01b193f..1779c10a68 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_server %define version 7.0NG.769 -%define release 230325 +%define release 230326 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 2891490b6d..9267c8729e 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_server %define version 7.0NG.769 -%define release 230325 +%define release 230326 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index e0b230ed4f..b1b52772ee 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.769" -PI_BUILD="230325" +PI_BUILD="230326" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 4a85702e6c..7d3fd52c69 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.769 Build 230325"; +my $version = "7.0NG.769 Build 230326"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 5cc3f72fd5..3b59f08149 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.769 Build 230325"; +my $version = "7.0NG.769 Build 230326"; # save program name for logging my $progname = basename($0); From 75af4a2ca9c4ebfe4e8a62a2730ee4882bbb502d Mon Sep 17 00:00:00 2001 From: artica Date: Mon, 27 Mar 2023 01:00:39 +0200 Subject: [PATCH 04/11] 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 0847ae89e8..9e048e84a4 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.769-230326 +Version: 7.0NG.769-230327 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 80b2a0cd6b..17fcae64c0 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.769-230326" +pandora_version="7.0NG.769-230327" 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 302c15a0f7..7089ac9511 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -1023,7 +1023,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.769'; -use constant AGENT_BUILD => '230326'; +use constant AGENT_BUILD => '230327'; # 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 37b532484e..eed962e5b8 100644 --- a/pandora_agents/unix/pandora_agent.redhat.spec +++ b/pandora_agents/unix/pandora_agent.redhat.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_agent_linux %define version 7.0NG.769 -%define release 230326 +%define release 230327 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 8dfba1f9e2..229f71b1c6 100644 --- a/pandora_agents/unix/pandora_agent.spec +++ b/pandora_agents/unix/pandora_agent.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_agent_linux %define version 7.0NG.769 -%define release 230326 +%define release 230327 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 8baeff0e43..214af8e331 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.769" -PI_BUILD="230326" +PI_BUILD="230327" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index ebee989dbf..377b644ec2 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{230326} +{230327} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index f95af5b1ff..8711ea0e4a 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.769 Build 230326") +#define PANDORA_VERSION ("7.0NG.769 Build 230327") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 5e74238c9a..374b0124fd 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.769(Build 230326))" + VALUE "ProductVersion", "(7.0NG.769(Build 230327))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 0429c122db..ae8b6409d3 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.769-230326 +Version: 7.0NG.769-230327 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 a8d40ac8b6..b786af407a 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.769-230326" +pandora_version="7.0NG.769-230327" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 3a09bd482e..02a28f295e 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 = 'PC230326'; +$build_version = 'PC230327'; $pandora_version = 'v7.0NG.769'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 11df4915aa..0453049a7c 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -131,7 +131,7 @@
[ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index 1779c10a68..278e8e7d4d 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_server %define version 7.0NG.769 -%define release 230326 +%define release 230327 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 9267c8729e..05c8861c2b 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_server %define version 7.0NG.769 -%define release 230326 +%define release 230327 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index b1b52772ee..af10c66bae 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.769" -PI_BUILD="230326" +PI_BUILD="230327" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 7d3fd52c69..e6301bd73b 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.769 Build 230326"; +my $version = "7.0NG.769 Build 230327"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 3b59f08149..6d3bcafef5 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.769 Build 230326"; +my $version = "7.0NG.769 Build 230327"; # save program name for logging my $progname = basename($0); From 0ae76307145f7dcbc3581241d93d0f341570af97 Mon Sep 17 00:00:00 2001 From: Jonathan Date: Mon, 27 Mar 2023 08:44:45 +0200 Subject: [PATCH 05/11] Gis map fix view --- pandora_console/include/functions_menu.php | 6 +++++- pandora_console/operation/gis_maps/gis_map.php | 14 +++++++++++--- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/pandora_console/include/functions_menu.php b/pandora_console/include/functions_menu.php index 8e101a5d99..e425f2363a 100644 --- a/pandora_console/include/functions_menu.php +++ b/pandora_console/include/functions_menu.php @@ -70,7 +70,11 @@ function menu_print_menu(&$menu) $sec2 = 'enterprise/godmode/setup/setup_skins'; } else if ($sec2 === 'godmode/gis_maps/configure_gis_map') { $map_id = (string) get_parameter('map_id'); - $sec2 = 'operation/gis_maps/render_view&map_id='.$map_id; + if (empty($map_id) === false) { + $sec2 = 'operation/gis_maps/render_view&map_id='.$map_id; + } else { + $sec2 = 'operation/gis_maps/gis_map'; + } } else if ($sec2 === 'operation/gis_maps/render_view') { $map_id = (int) get_parameter('map_id'); if (empty($map_id) === false) { diff --git a/pandora_console/operation/gis_maps/gis_map.php b/pandora_console/operation/gis_maps/gis_map.php index 58250df773..028678e395 100644 --- a/pandora_console/operation/gis_maps/gis_map.php +++ b/pandora_console/operation/gis_maps/gis_map.php @@ -214,12 +214,20 @@ if (!empty($table->data)) { } if ($edit_gis_maps) { - echo '
'; echo '
'; html_print_input_hidden('action', 'new_map'); - html_print_submit_button(__('Create'), '', false, 'class="sub next"'); + $ActionButton = html_print_submit_button( + __('Create'), + 'create', + false, + [ + 'class' => 'sub ok submitButton', + 'icon' => 'next', + ], + true + ); + echo '
'.html_print_action_buttons($ActionButton, ['type' => 'form_action'], true).'
'; echo '
'; - echo '
'; } unset($table); From 665976e011fdbbbfb90d6b34949f49abae73f183 Mon Sep 17 00:00:00 2001 From: Jonathan Date: Mon, 27 Mar 2023 11:10:51 +0200 Subject: [PATCH 06/11] Bulks masive visual action buttons --- .../massive/massive_add_action_alerts.php | 2 +- .../godmode/massive/massive_add_alerts.php | 2 +- .../godmode/massive/massive_add_profiles.php | 2 +- .../godmode/massive/massive_copy_modules.php | 2 +- .../massive/massive_delete_action_alerts.php | 2 +- .../godmode/massive/massive_delete_agents.php | 2 +- .../godmode/massive/massive_delete_alerts.php | 2 +- .../massive/massive_delete_modules.php | 2 +- .../massive/massive_delete_profiles.php | 2 +- .../godmode/massive/massive_edit_agents.php | 2 +- .../godmode/massive/massive_edit_modules.php | 2 +- .../godmode/massive/massive_edit_plugins.php | 2 +- .../godmode/massive/massive_edit_users.php | 2 +- .../godmode/massive/massive_operations.php | 25 ++++++++--------- pandora_console/godmode/setup/gis_step_2.php | 28 ++++++++++++++++--- .../include/functions_massive_operations.php | 5 ++-- pandora_console/include/functions_menu.php | 4 +++ 17 files changed, 55 insertions(+), 33 deletions(-) diff --git a/pandora_console/godmode/massive/massive_add_action_alerts.php b/pandora_console/godmode/massive/massive_add_action_alerts.php index fcc9957bdb..4b6c333468 100755 --- a/pandora_console/godmode/massive/massive_add_action_alerts.php +++ b/pandora_console/godmode/massive/massive_add_action_alerts.php @@ -270,7 +270,7 @@ $agents_with_templates_json = json_encode($agents_with_templates_json); echo ""; -attachActionButton('add', 'create', $table->width); +attachActionButton('add', 'create', $table->width, false, $SelectAction); echo ''; diff --git a/pandora_console/godmode/massive/massive_add_alerts.php b/pandora_console/godmode/massive/massive_add_alerts.php index 92027c3529..8fbb307e97 100755 --- a/pandora_console/godmode/massive/massive_add_alerts.php +++ b/pandora_console/godmode/massive/massive_add_alerts.php @@ -293,7 +293,7 @@ $table->data[2][3] = ''; echo '
'; html_print_table($table); -attachActionButton('add', 'add', $table->width); +attachActionButton('add', 'add', $table->width, false, $SelectAction); echo '
'; diff --git a/pandora_console/godmode/massive/massive_add_profiles.php b/pandora_console/godmode/massive/massive_add_profiles.php index 9e84c44b71..38657bdf1c 100644 --- a/pandora_console/godmode/massive/massive_add_profiles.php +++ b/pandora_console/godmode/massive/massive_add_profiles.php @@ -295,7 +295,7 @@ array_push($table->data, $data); html_print_table($table); -attachActionButton('create_profiles', 'update', $table->width); +attachActionButton('create_profiles', 'update', $table->width, false, $SelectAction); echo ''; diff --git a/pandora_console/godmode/massive/massive_copy_modules.php b/pandora_console/godmode/massive/massive_copy_modules.php index 4bccfa6007..c3a65ad624 100755 --- a/pandora_console/godmode/massive/massive_copy_modules.php +++ b/pandora_console/godmode/massive/massive_copy_modules.php @@ -310,7 +310,7 @@ echo ''.__('To agent(s)').''; html_print_table($table); echo ''; -attachActionButton('do_operation', 'copy', $table->width); +attachActionButton('do_operation', 'copy', $table->width, false, $SelectAction); echo ''; diff --git a/pandora_console/godmode/massive/massive_delete_action_alerts.php b/pandora_console/godmode/massive/massive_delete_action_alerts.php index c19823fc57..1df2809c75 100644 --- a/pandora_console/godmode/massive/massive_delete_action_alerts.php +++ b/pandora_console/godmode/massive/massive_delete_action_alerts.php @@ -298,7 +298,7 @@ $agents_with_templates_json = json_encode($agents_with_templates_json); echo ""; -attachActionButton('delete', 'delete', $table->width); +attachActionButton('delete', 'delete', $table->width, false, $SelectAction); echo ''; diff --git a/pandora_console/godmode/massive/massive_delete_agents.php b/pandora_console/godmode/massive/massive_delete_agents.php index bb0dd1799d..f5b194f3cc 100755 --- a/pandora_console/godmode/massive/massive_delete_agents.php +++ b/pandora_console/godmode/massive/massive_delete_agents.php @@ -188,7 +188,7 @@ $params = [ echo get_table_inputs_masive_agents($params); if (is_metaconsole() === true || is_management_allowed() === true) { - attachActionButton('delete', 'delete', '100%'); + attachActionButton('delete', 'delete', '100%', false, $SelectAction); } echo ''; diff --git a/pandora_console/godmode/massive/massive_delete_alerts.php b/pandora_console/godmode/massive/massive_delete_alerts.php index 7e899e7f9f..1c4117828e 100755 --- a/pandora_console/godmode/massive/massive_delete_alerts.php +++ b/pandora_console/godmode/massive/massive_delete_alerts.php @@ -358,7 +358,7 @@ $table->data[2][3] = html_print_select([], 'module[]', '', false, '', '', true, echo '
'; html_print_table($table); -attachActionButton('delete', 'delete', $table->width); +attachActionButton('delete', 'delete', $table->width, false, $SelectAction); echo '
'; diff --git a/pandora_console/godmode/massive/massive_delete_modules.php b/pandora_console/godmode/massive/massive_delete_modules.php index f54a127b19..cb885e7ec2 100755 --- a/pandora_console/godmode/massive/massive_delete_modules.php +++ b/pandora_console/godmode/massive/massive_delete_modules.php @@ -583,7 +583,7 @@ $table->data['form_agents_3'][3] = html_print_select( echo '
'; html_print_table($table); -attachActionButton('delete', 'delete', $table->width); +attachActionButton('delete', 'delete', $table->width, false, $SelectAction); echo '
'; diff --git a/pandora_console/godmode/massive/massive_delete_profiles.php b/pandora_console/godmode/massive/massive_delete_profiles.php index 7c45b2a285..46824e90ba 100644 --- a/pandora_console/godmode/massive/massive_delete_profiles.php +++ b/pandora_console/godmode/massive/massive_delete_profiles.php @@ -246,7 +246,7 @@ array_push($table->data, $data); html_print_table($table); -attachActionButton('delete_profiles', 'delete', $table->width); +attachActionButton('delete_profiles', 'delete', $table->width, false, $SelectAction); echo ''; diff --git a/pandora_console/godmode/massive/massive_edit_agents.php b/pandora_console/godmode/massive/massive_edit_agents.php index b5da8ca9ae..a6bb7a9322 100755 --- a/pandora_console/godmode/massive/massive_edit_agents.php +++ b/pandora_console/godmode/massive/massive_edit_agents.php @@ -1257,7 +1257,7 @@ echo ''; html_print_input_hidden('id_agente', $id_agente); -attachActionButton('update_agents', 'update', $table->width); +attachActionButton('update_agents', 'update', $table->width, false, $SelectAction); // Shown and hide div. echo '
'; diff --git a/pandora_console/godmode/massive/massive_edit_modules.php b/pandora_console/godmode/massive/massive_edit_modules.php index a03e278957..2aa4fe00e0 100755 --- a/pandora_console/godmode/massive/massive_edit_modules.php +++ b/pandora_console/godmode/massive/massive_edit_modules.php @@ -1265,7 +1265,7 @@ $table->data['edit1'][1] = ''; echo ''; html_print_table($table); - attachActionButton('update', 'update', $table->width); + attachActionButton('update', 'update', $table->width, false, $SelectAction); echo ''; diff --git a/pandora_console/godmode/massive/massive_edit_plugins.php b/pandora_console/godmode/massive/massive_edit_plugins.php index 2e91eafaf8..192c893f00 100644 --- a/pandora_console/godmode/massive/massive_edit_plugins.php +++ b/pandora_console/godmode/massive/massive_edit_plugins.php @@ -391,7 +391,7 @@ echo 'width); +attachActionButton('update', 'update', $table->width, false, $SelectAction); echo ''; diff --git a/pandora_console/godmode/massive/massive_edit_users.php b/pandora_console/godmode/massive/massive_edit_users.php index ddbd45c440..928b761694 100644 --- a/pandora_console/godmode/massive/massive_edit_users.php +++ b/pandora_console/godmode/massive/massive_edit_users.php @@ -556,7 +556,7 @@ echo sprintf( ); echo ''; -attachActionButton('edit_users', 'update', '100%'); +attachActionButton('edit_users', 'update', '100%', false, $SelectAction); echo ''; diff --git a/pandora_console/godmode/massive/massive_operations.php b/pandora_console/godmode/massive/massive_operations.php index 864382bd78..fb2331a5dd 100755 --- a/pandora_console/godmode/massive/massive_operations.php +++ b/pandora_console/godmode/massive/massive_operations.php @@ -443,29 +443,26 @@ if (is_management_allowed() === false) { ); } -echo '
'; -echo ''; -echo '
'; -echo __('Action'); -echo ''; -html_print_select( +$tip = ''; +if ($option === 'edit_agents' || $option === 'edit_modules') { + $tip = ui_print_help_tip(__('The blank fields will not be updated'), true); +} + +$SelectAction = ''; +$SelectAction .= ''._('Action').''; +$SelectAction .= html_print_select( $options, 'option', $option, 'this.form.submit()', '', 0, - false, + true, false, false -); -if ($option === 'edit_agents' || $option === 'edit_modules') { - ui_print_help_tip(__('The blank fields will not be updated')); -} +).$tip; -echo '
'; -echo ''; -echo '
'; +$SelectAction .= ''; switch ($option) { case 'delete_alerts': diff --git a/pandora_console/godmode/setup/gis_step_2.php b/pandora_console/godmode/setup/gis_step_2.php index 486ec90265..26d5c16f68 100644 --- a/pandora_console/godmode/setup/gis_step_2.php +++ b/pandora_console/godmode/setup/gis_step_2.php @@ -50,13 +50,23 @@ echo '
'; + $data[7] = ''; $data[7] .= html_print_image( 'images/edit.svg', true, @@ -926,8 +923,7 @@ function cron_list_table() } if ($manage_pandora) { - $data[7] .= ''; + $data[7] .= ''; $data[7] .= html_print_image( 'images/delete.svg', true, @@ -940,8 +936,7 @@ function cron_list_table() } } else { if ($write_perms || $manage_pandora) { - $data[7] = ''; + $data[7] = ''; $data[7] .= html_print_image( 'images/edit.svg', true, @@ -994,5 +989,7 @@ function cron_list_table() } html_print_table($table); + } else { + ui_print_info_message(['no_close' => true, 'message' => __('There are no jobs') ]); } } From 3beec9bfab13c246fb09f840c2d575f3cd12f169 Mon Sep 17 00:00:00 2001 From: daniel Date: Mon, 27 Mar 2023 11:47:08 +0200 Subject: [PATCH 08/11] fixed styles --- pandora_console/godmode/groups/configure_group.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/godmode/groups/configure_group.php b/pandora_console/godmode/groups/configure_group.php index 0f3f61d5a6..8d81d44540 100644 --- a/pandora_console/godmode/groups/configure_group.php +++ b/pandora_console/godmode/groups/configure_group.php @@ -118,7 +118,7 @@ if (is_metaconsole() === true) { // Data before table. -$files = list_files('images/', '@groups.svg', 1, 0); +$files = list_files(((is_metaconsole() === true) ? '../../' : '').'images/', '@groups.svg', 1, 0); $table = new stdClass(); $table->width = '100%'; From ea6aa8629b2e8688948480e8ae07271ede6127b1 Mon Sep 17 00:00:00 2001 From: Jonathan Date: Mon, 27 Mar 2023 14:07:36 +0200 Subject: [PATCH 09/11] Module check force --- pandora_console/include/ajax/module.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pandora_console/include/ajax/module.php b/pandora_console/include/ajax/module.php index e079369b3a..296971bfc5 100755 --- a/pandora_console/include/ajax/module.php +++ b/pandora_console/include/ajax/module.php @@ -1279,16 +1279,18 @@ if (check_login()) { if ((int) $module['flag'] === 0) { $additionalLinkAction = '&flag=1'; $linkCaption = __('Force checks'); + $imgaction = 'images/target.png'; } else { $additionalLinkAction = ''; $linkCaption = __('Refresh'); + $imgaction = 'images/go-back@svg.svg'; } $moduleActionButtons[] = html_print_anchor( [ - 'href' => 'index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente='.$id_agente.'&id_agente_modulo='.$module['id_agente_modulo'].'&refr=60'.$addedLinkParams.'"', + 'href' => 'index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente='.$id_agente.'&id_agente_modulo='.$module['id_agente_modulo'].'&refr=60'.$additionalLinkAction.'"', 'content' => html_print_image( - 'images/go-back@svg.svg', + $imgaction, true, [ 'class' => 'main_menu_icon' ] ), From 48a254c4b2b1351f513f4a67db5cb3dc168923cf Mon Sep 17 00:00:00 2001 From: daniel Date: Mon, 27 Mar 2023 14:34:05 +0200 Subject: [PATCH 10/11] fixed styles --- .../godmode/agentes/agent_manager.php | 14 ++++++------- .../godmode/agentes/configure_field.php | 16 ++++++++------- .../VisualConsole/Items/ModuleGraph.php | 2 +- pandora_console/include/styles/pandora.css | 11 +++++----- .../include/styles/visual_maps.css | 2 +- .../include/visual-console-client/vc.main.css | 4 ++-- .../visual-console-client/vc.main.css.map | 2 +- .../agentes/estado_generalagente.php | 20 +++++-------------- .../operation/visual_console/view.php | 2 +- visual_console_client/src/main.css | 4 ++-- 10 files changed, 35 insertions(+), 42 deletions(-) diff --git a/pandora_console/godmode/agentes/agent_manager.php b/pandora_console/godmode/agentes/agent_manager.php index 06ec4a5308..d84800e984 100644 --- a/pandora_console/godmode/agentes/agent_manager.php +++ b/pandora_console/godmode/agentes/agent_manager.php @@ -966,9 +966,9 @@ foreach ($fields as $field) { $link_url = ''; } - $data_field[1] = ''.__('Link text:').''; - $data_field[1] .= '
'; - $data_field[1] .= html_print_textarea( + $customContent = ''.__('Link text:').''; + $customContent .= '
'; + $customContent .= html_print_textarea( 'customvalue_'.$field['id_field'].'[]', 2, 1000, @@ -976,10 +976,10 @@ foreach ($fields as $field) { 'class="min-height-30px w100p"', true ); - $data_field[1] .= '
'; - $data_field[1] .= ''.__('Link URL:').''; - $data_field[1] .= '
'; - $data_field[1] .= html_print_textarea( + $customContent .= '
'; + $customContent .= ''.__('Link URL:').''; + $customContent .= '
'; + $customContent .= html_print_textarea( 'customvalue_'.$field['id_field'].'[]', 2, 1000, diff --git a/pandora_console/godmode/agentes/configure_field.php b/pandora_console/godmode/agentes/configure_field.php index 33aac95ccf..8a3a6b2f45 100755 --- a/pandora_console/godmode/agentes/configure_field.php +++ b/pandora_console/godmode/agentes/configure_field.php @@ -229,7 +229,6 @@ echo '';