diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index d48173512f..7d9cee8f9c 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-230307
+Version: 7.0NG.769-230308
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 cb6b963504..53c9f200aa 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-230307"
+pandora_version="7.0NG.769-230308"
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 012a228cd2..492ec37320 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 => '230307';
+use constant AGENT_BUILD => '230308';
# 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 26931473af..77859b1dde 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 230307
+%define release 230308
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 329768dfa7..857f141c94 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 230307
+%define release 230308
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 1a32864bd8..79cc3133b3 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="230307"
+PI_BUILD="230308"
OS_NAME=`uname -s`
FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 48912e2ff3..a78a35121f 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
{}
Version
-{230307}
+{230308}
ViewReadme
{Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 11a3383389..d7ef085547 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 230307")
+#define PANDORA_VERSION ("7.0NG.769 Build 230308")
string pandora_path;
string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 3c842ed958..76b5c3540e 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 230307))"
+ VALUE "ProductVersion", "(7.0NG.769(Build 230308))"
VALUE "FileVersion", "1.0.0.0"
END
END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index d71a8ffb94..b3ce245f17 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
package: pandorafms-console
-Version: 7.0NG.769-230307
+Version: 7.0NG.769-230308
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 ecb6a40251..0a19d7c0e3 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-230307"
+pandora_version="7.0NG.769-230308"
package_pear=0
package_pandora=1
diff --git a/pandora_console/extensions/users_connected.php b/pandora_console/extensions/users_connected.php
index 40b17f4903..ad6282c598 100644
--- a/pandora_console/extensions/users_connected.php
+++ b/pandora_console/extensions/users_connected.php
@@ -1,16 +1,33 @@
'',
+ 'label' => __('Workspace'),
+ ],
+ [
+ 'link' => '',
+ 'label' => __('Users connected'),
+ ],
+ ]
+ );
$check_profile = db_get_row('tusuario_perfil', 'id_usuario', $config['id_user'], 'id_up');
if ($check_profile === false && !users_is_admin()) {
diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php
index 9fd9c02f7e..12d5266f34 100755
--- a/pandora_console/godmode/reporting/reporting_builder.php
+++ b/pandora_console/godmode/reporting/reporting_builder.php
@@ -509,11 +509,11 @@ switch ($action) {
'list_reports' => [
'active' => false,
'text' => ''.html_print_image(
- 'images/report_list.png',
+ 'images/logs@svg.svg',
true,
[
'title' => __('Reports list'),
- 'class' => 'invert_filter',
+ 'class' => 'main_menu_icon invert_filter',
]
).'',
],
diff --git a/pandora_console/godmode/servers/plugin.php b/pandora_console/godmode/servers/plugin.php
index 43fad7d3be..688e898c9d 100644
--- a/pandora_console/godmode/servers/plugin.php
+++ b/pandora_console/godmode/servers/plugin.php
@@ -632,7 +632,7 @@ if (empty($create) === false || empty($view) === false) {
$delete_macro_style = 'display:none;';
}
- $datam[2] = '
';
- if ($create != '') {
- $button = html_print_submit_button(
+ $buttons = '';
+
+ if (empty($create) === false) {
+ $buttons .= html_print_submit_button(
__('Create'),
'crtbutton',
false,
@@ -674,7 +676,7 @@ if (empty($create) === false || empty($view) === false) {
true
);
} else {
- $button = html_print_submit_button(
+ $buttons .= html_print_submit_button(
__('Update'),
'uptbutton',
false,
@@ -683,8 +685,14 @@ if (empty($create) === false || empty($view) === false) {
);
}
+ $buttons .= html_print_go_back_button(
+ 'index.php?sec=gservers&sec2=godmode/servers/plugin',
+ ['button_class' => ''],
+ true
+ );
+
html_print_action_buttons(
- $button
+ $buttons
);
echo '';
diff --git a/pandora_console/include/class/SnmpConsole.class.php b/pandora_console/include/class/SnmpConsole.class.php
index c84775d4ed..5999479c64 100644
--- a/pandora_console/include/class/SnmpConsole.class.php
+++ b/pandora_console/include/class/SnmpConsole.class.php
@@ -183,29 +183,29 @@ class SnmpConsole extends HTML
if (!isset($config['pure']) || $config['pure'] === false) {
$statistics['text'] = ''.html_print_image(
- 'images/op_reporting.png',
+ 'images/logs@svg.svg',
true,
[
'title' => __('Statistics'),
- 'class' => 'invert_filter',
+ 'class' => 'main_menu_icon invert_filter',
]
).'';
$list['text'] = ''.html_print_image(
- 'images/op_snmp.png',
+ 'images/SNMP-network-numeric-data@svg.svg',
true,
[
'title' => __('List'),
- 'class' => 'invert_filter',
+ 'class' => 'main_menu_icon invert_filter',
]
).'';
$list['active'] = true;
$screen['text'] = ''.html_print_image(
- 'images/full_screen.png',
+ 'images/fullscreen@svg.svg',
true,
[
- 'title' => __('List'),
- 'class' => 'invert_filter',
+ 'title' => __('View in full screen'),
+ 'class' => 'main_menu_icon invert_filter',
]
).'';
@@ -242,11 +242,11 @@ class SnmpConsole extends HTML
echo '';
echo html_print_image(
- 'images/normal_screen.png',
+ 'images/exit_fullscreen@svg.svg',
true,
[
'title' => __('Exit fullscreen'),
- 'class' => 'invert_filter',
+ 'class' => 'main_menu_icon invert_filter',
]
);
echo '';
@@ -844,7 +844,7 @@ class SnmpConsole extends HTML
$tmp->snmp_agent .= ''.$tmp->source.'';
} else {
$tmp->snmp_agent .= '';
}
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 75b110fd90..e4b91d9635 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 = 'PC230307';
+$build_version = 'PC230308';
$pandora_version = 'v7.0NG.769';
// Do not overwrite default timezone set if defined.
diff --git a/pandora_console/include/functions_filemanager.php b/pandora_console/include/functions_filemanager.php
index 1f1f57c832..0012804398 100644
--- a/pandora_console/include/functions_filemanager.php
+++ b/pandora_console/include/functions_filemanager.php
@@ -744,8 +744,7 @@ function filemanager_file_explorer(
// Actions buttons
// Delete button.
- $data[4] = '';
- $data[4] .= '';
+ $data[4] = '';
array_push($table->data, $data);
}
@@ -983,7 +982,7 @@ function filemanager_file_explorer(
";
if (isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] == 'on' || $_SERVER['SERVER_NAME'] == 'localhost' || $_SERVER['SERVER_NAME'] == '127.0.0.1') {
- $modal_real_path .= " ".html_print_submit_button(__('Copy'), 'submit', false, 'class="sub next"', true).' ';
+ $modal_real_path .= "".html_print_submit_button(__('Copy'), 'submit', false, ['icon' => 'wand', 'mode' => 'mini'], true).' ';
}
html_print_div(
@@ -997,7 +996,7 @@ function filemanager_file_explorer(
echo '';
} else {
echo "";
- echo "".__('The directory is read-only');
+ echo "".__('The directory is read-only');
echo ' ';
}
}
diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php
index e9e60f3418..be9ed5d1a8 100644
--- a/pandora_console/include/functions_html.php
+++ b/pandora_console/include/functions_html.php
@@ -4903,7 +4903,8 @@ function html_print_autocomplete_modules(
$filter=[],
$return=false,
$id_agent_module=0,
- $size='30'
+ $size='30',
+ $underInputTip=false
) {
global $config;
@@ -4960,7 +4961,11 @@ function html_print_autocomplete_modules(
html_print_input_hidden($name.'_hidden', $id_agent_module);
if (is_metaconsole() === false) {
- ui_print_help_tip(__('Type at least two characters to search the module.'), false);
+ if ($underInputTip === true) {
+ ui_print_input_placeholder(__('Type at least two characters to search the module.'), false);
+ } else {
+ ui_print_help_tip(__('Type at least two characters to search the module.'), false);
+ }
}
$javascript_ajax_page = ui_get_full_url('ajax.php', false, false, false);
diff --git a/pandora_console/include/javascript/pandora.js b/pandora_console/include/javascript/pandora.js
index 30da9745eb..8bfdee500c 100644
--- a/pandora_console/include/javascript/pandora.js
+++ b/pandora_console/include/javascript/pandora.js
@@ -2400,3 +2400,10 @@ function topFunction() {
500
);
}
+
+function menuActionButtonResizing() {
+ $(".action_buttons_right_content").attr(
+ "style",
+ "left: " + $("#menu_full").width() + "px;"
+ );
+}
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index ee4a24d5f5..4837f18d08 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -86,43 +86,6 @@
font-weight: 900;
}
-/*
-@font-face {
- font-family: "lato-italic";
- src: url("../fonts/Lato-Italic.woff") format("woff");
- font-weight: 400;
- font-style: italic;
-}
-
-@font-face {
- font-family: "lato";
- src: url("../fonts/Lato-LightItalic.woff") format("woff");
- font-weight: 300;
- font-style: italic;
-}
-
-@font-face {
- font-family: "lato";
- src: url("../fonts/Lato-ThinItalic.woff") format("woff");
- font-weight: 100;
- font-style: italic;
-}
-
-@font-face {
- font-family: "lato";
- src: url("../fonts/Lato-BoldItalic.woff") format("woff");
- font-weight: 700;
- font-style: italic;
-}
-
-@font-face {
- font-family: "lato";
- src: url("../fonts/Lato-BlackItalic.woff") format("woff");
- font-weight: 900;
- font-style: italic;
-}
-*/
-
@font-face {
font-family: "source-code";
src: url("../fonts/SourceCodePro.woff") format("woff");
diff --git a/pandora_console/include/styles/tables.css b/pandora_console/include/styles/tables.css
index 7fbf593d16..4383e02ea5 100644
--- a/pandora_console/include/styles/tables.css
+++ b/pandora_console/include/styles/tables.css
@@ -235,7 +235,8 @@
.table_action_buttons > a,
.table_action_buttons > img,
-.table_action_buttons > button {
+.table_action_buttons > button,
+.table_action_buttons > form {
visibility: hidden;
}
.info_table > tbody > tr:hover {
@@ -246,7 +247,8 @@
.info_table > tbody > tr:hover .table_action_buttons > a,
.info_table > tbody > tr:hover .table_action_buttons > img,
-.info_table > tbody > tr:hover .table_action_buttons > button {
+.info_table > tbody > tr:hover .table_action_buttons > button,
+.info_table > tbody > tr:hover .table_action_buttons > form {
visibility: visible;
}
diff --git a/pandora_console/index.php b/pandora_console/index.php
index 78de0734b4..a78d97d926 100755
--- a/pandora_console/index.php
+++ b/pandora_console/index.php
@@ -1524,17 +1524,6 @@ require 'include/php_to_js_values.php';
}
}
- //$('.button_collapse').on('click', menuActionButtonResizing());
-
- // Cursor change for show a spinner. Experimental.
- /*
- $('.buttonButton').not('.dialog_opener').on('click', function(){
- $('*').css('cursor', 'wait');
- });
- $('.submitButton').not('.dialog_opener').on('click', function(){
- $('*').css('cursor', 'wait');
- });
-*/
// When the user scrolls down 400px from the top of the document, show the
// button.
window.onscroll = function() {
@@ -1545,10 +1534,6 @@ require 'include/php_to_js_values.php';
scrollFunction()
};
- function menuActionButtonResizing() {
- $('.action_buttons_right_content').attr('style', 'left: '+($('#menu_full').width())+'px;');
- }
-
function first_time_identification() {
jQuery.post("ajax.php", {
"page": "general/register",
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 2a7bde9bb0..68d69a23d6 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -131,7 +131,7 @@
'',
+ 'label' => __('Tools'),
+ ],
+ [
+ 'link' => '',
+ 'label' => __('Export data'),
+ ],
+ ]
+);
$group = get_parameter_post('group', 0);
$agentName = get_parameter_post('agent', 0);
@@ -220,48 +242,10 @@ if (!empty($export_btn) && !empty($module)) {
}
if (empty($export_btn) || $show_form) {
- echo ' ';
diff --git a/pandora_console/operation/messages/message_edit.php b/pandora_console/operation/messages/message_edit.php
index 105a9560de..0e232788e7 100644
--- a/pandora_console/operation/messages/message_edit.php
+++ b/pandora_console/operation/messages/message_edit.php
@@ -14,7 +14,7 @@
* |___| |___._|__|__|_____||_____|__| |___._| |___| |__|_|__|_______|
*
* ============================================================================
- * Copyright (c) 2005-2022 Artica Soluciones Tecnologicas
+ * Copyright (c) 2005-2023 Artica Soluciones Tecnologicas
* Please see http://pandorafms.org for full contribution list
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -52,7 +52,7 @@ $buttons['message_list'] = [
true,
[
'title' => __('Received messages'),
- 'class' => 'invert_filter',
+ 'class' => 'main_menu_icon invert_filter',
]
).'',
];
@@ -64,7 +64,7 @@ $buttons['sent_messages'] = [
true,
[
'title' => __('Sent messages'),
- 'class' => 'invert_filter',
+ 'class' => 'main_menu_icon invert_filter',
]
).'',
];
@@ -76,7 +76,7 @@ $buttons['create_message'] = [
true,
[
'title' => __('Create message'),
- 'class' => 'invert_filter',
+ 'class' => 'main_menu_icon invert_filter',
]
).'',
];
@@ -218,11 +218,8 @@ if ($read_message) {
true
);
- html_print_div(
- [
- 'class' => 'action-buttons',
- 'content' => $outputButtons,
- ],
+ html_print_action_buttons(
+ $outputButtons
);
return;
@@ -264,18 +261,6 @@ if ($send_mes === true) {
// User info.
$own_info = get_user_info($config['id_user']);
-$table = new stdClass();
-$table->width = '100%';
-$table->class = 'databox filters';
-
-$table->data = [];
-
-$table->data[0][0] = __('Sender');
-
-$table->data[0][1] = (empty($own_info['fullname']) === false) ? $own_info['fullname'] : $config['id_user'];
-
-$table->data[1][0] = __('Destination');
-
$is_admin = (bool) db_get_value(
'is_admin',
'tusuario',
@@ -305,15 +290,29 @@ foreach ($users_full as $user_id => $user_info) {
$users[$user_info['id_user']] = (empty($user_info['fullname']) === true) ? $user_info['id_user'] : $user_info['fullname'];
}
+$table = new stdClass();
+$table->id = 'send_message_table';
+$table->width = '100%';
+$table->class = 'databox max_floating_element_size filter-table-adv';
+$table->style = [];
+$table->style[0] = 'width: 30%';
+$table->style[1] = 'width: 70%';
+$table->data = [];
+
+$table->data[0][] = html_print_label_input_block(
+ __('Sender'),
+ ' '.((empty($own_info['fullname']) === false) ? $own_info['fullname'] : $config['id_user']).''
+);
+
// Check if the user to reply is in the list, if not add reply user.
if ($reply === true) {
- $table->data[1][1] = (array_key_exists($dst_user, $users) === true) ? $users[$dst_user] : $dst_user;
- $table->data[1][1] .= html_print_input_hidden(
+ $destinationInputs = (array_key_exists($dst_user, $users) === true) ? $users[$dst_user] : $dst_user;
+ $destinationInputs .= html_print_input_hidden(
'dst_user',
$dst_user,
true
);
- $table->data[1][1] .= html_print_input_hidden(
+ $destinationInputs .= html_print_input_hidden(
'replied',
'1',
true
@@ -324,21 +323,27 @@ if ($reply === true) {
$groups = users_get_groups($config['id_user'], 'AR');
// Get a list of all groups.
- $table->data[1][1] = html_print_select(
- $users,
- 'dst_user',
- $dst_user,
- 'changeStatusOtherSelect(\'dst_user\', \'dst_group\')',
- __('Select user'),
- false,
- true,
- false,
- ''
- );
- $table->data[1][1] .= ' '.__('OR').' ';
- $table->data[1][1] .= html_print_div(
+ $destinationInputs = html_print_div(
[
- 'class' => 'w250px inline',
+ 'class' => 'select_users mrgn_right_5px',
+ 'content' => html_print_select(
+ $users,
+ 'dst_user',
+ $dst_user,
+ 'changeStatusOtherSelect(\'dst_user\', \'dst_group\')',
+ __('Select user'),
+ false,
+ true,
+ false,
+ ''
+ ),
+ ],
+ true
+ );
+ $destinationInputs .= __('OR');
+ $destinationInputs .= html_print_div(
+ [
+ 'class' => 'mrgn_lft_5px',
'content' => html_print_select_groups(
$config['id_user'],
'AR',
@@ -355,24 +360,41 @@ if ($reply === true) {
);
}
-$table->data[2][0] = __('Subject');
-$table->data[2][1] = html_print_input_text(
- 'subject',
- $subject,
- '',
- 50,
- 70,
- true
+$table->data[0][] = html_print_label_input_block(
+ __('Destination'),
+ html_print_div(
+ [
+ 'class' => 'flex-content-left',
+ 'content' => $destinationInputs,
+ ],
+ true
+ )
);
-$table->data[3][0] = __('Message');
-$table->data[3][1] = html_print_textarea(
- 'message',
- 15,
- 255,
- $message,
- '',
- true
+$table->colspan[1][] = 2;
+$table->data[1][] = html_print_label_input_block(
+ __('Subject'),
+ html_print_input_text(
+ 'subject',
+ $subject,
+ '',
+ 50,
+ 70,
+ true
+ )
+);
+
+$table->colspan[2][] = 2;
+$table->data[2][] = html_print_label_input_block(
+ __('Message'),
+ html_print_textarea(
+ 'message',
+ 15,
+ 50,
+ $message,
+ '',
+ true
+ )
);
$jsOutput = '';
@@ -396,17 +418,14 @@ echo ' ';
- html_print_div(
- [
- 'class' => 'action-buttons',
- 'content' => $outputButton,
- ]
+ html_print_action_buttons(
+ $outputButton
);
?>
diff --git a/pandora_console/operation/snmpconsole/snmp_browser.php b/pandora_console/operation/snmpconsole/snmp_browser.php
index 3bcb2be975..9831d7ba64 100644
--- a/pandora_console/operation/snmpconsole/snmp_browser.php
+++ b/pandora_console/operation/snmpconsole/snmp_browser.php
@@ -50,11 +50,11 @@ if ($config['pure']) {
// Windowed.
$link['text'] = ' ';
$link['text'] .= html_print_image(
- 'images/normal_screen.png',
+ 'images/exit_fullscreen@svg.svg',
true,
[
'title' => __('Normal screen'),
- 'class' => 'invert_filter',
+ 'class' => 'main_menu_icon invert_filter',
]
);
$link['text'] .= '';
@@ -62,11 +62,11 @@ if ($config['pure']) {
// Fullscreen.
$link['text'] = ' ';
$link['text'] .= html_print_image(
- 'images/full_screen.png',
+ 'images/fullscreen@svg.svg',
true,
[
'title' => __('Full screen'),
- 'class' => 'invert_filter',
+ 'class' => 'main_menu_icon invert_filter',
]
);
$link['text'] .= '';
diff --git a/pandora_console/operation/snmpconsole/snmp_statistics.php b/pandora_console/operation/snmpconsole/snmp_statistics.php
index 56109aa04c..0ebc548496 100755
--- a/pandora_console/operation/snmpconsole/snmp_statistics.php
+++ b/pandora_console/operation/snmpconsole/snmp_statistics.php
@@ -39,20 +39,20 @@ $refr = (int) get_parameter('refr', 0);
$fullscreen = [];
if ($config['pure']) {
$fullscreen['text'] = ' '.html_print_image(
- 'images/normal_screen.png',
+ 'images/exit_fullscreen@svg.svg',
true,
[
'title' => __('Normal screen'),
- 'class' => 'invert_filter',
+ 'class' => 'main_menu_icon invert_filter',
]
).'';
} else {
$fullscreen['text'] = ' '.html_print_image(
- 'images/full_screen.png',
+ 'images/fullscreen@svg.svg',
true,
[
'title' => __('Full screen'),
- 'class' => 'invert_filter',
+ 'class' => 'main_menu_icon invert_filter',
]
).'';
}
@@ -60,11 +60,11 @@ if ($config['pure']) {
// List
$list = [];
$list['text'] = ' '.html_print_image(
- 'images/op_snmp.png',
+ 'images/SNMP-network-numeric-data@svg.svg',
true,
[
'title' => __('List'),
- 'class' => 'invert_filter',
+ 'class' => 'main_menu_icon invert_filter',
]
).'';
@@ -72,11 +72,11 @@ $list['text'] = ' '.html_print_image(
- 'images/op_reporting.png',
+ 'images/logs@svg.svg',
true,
[
'title' => __('Statistics'),
- 'class' => 'invert_filter',
+ 'class' => 'main_menu_icon invert_filter',
]
).'';
diff --git a/pandora_console/operation/snmpconsole/snmp_view.php b/pandora_console/operation/snmpconsole/snmp_view.php
index 9f0f9e44f8..f5c967972c 100755
--- a/pandora_console/operation/snmpconsole/snmp_view.php
+++ b/pandora_console/operation/snmpconsole/snmp_view.php
@@ -14,7 +14,7 @@
* |___| |___._|__|__|_____||_____|__| |___._| |___| |__|_|__|_______|
*
* ============================================================================
- * Copyright (c) 2005-2022 Artica Soluciones Tecnologicas
+ * Copyright (c) 2005-2023 Artica Soluciones Tecnologicas
* Please see http://pandorafms.org for full contribution list
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
diff --git a/pandora_console/operation/users/user_edit_header.php b/pandora_console/operation/users/user_edit_header.php
index ea698e1355..50cb5c52fc 100644
--- a/pandora_console/operation/users/user_edit_header.php
+++ b/pandora_console/operation/users/user_edit_header.php
@@ -77,28 +77,28 @@ if (is_metaconsole()) {
user_meta_print_header();
$urls['main'] = 'index.php?sec=advanced&sec2=advanced/users_setup&tab=user_edit';
} else {
- $urls['main'] = 'index.php?sec=workspace&sec2=operation/users/user_edit';
+ $urls['main'] = 'index.php?sec=gusuarios&sec2=godmode/users/user_list';
$urls['notifications'] = 'index.php?sec=workspace&sec2=operation/users/user_edit_notifications';
$buttons = [
'main' => [
- 'active' => $_GET['sec2'] === 'operation/users/user_edit',
+ 'active' => $_GET['sec2'] === 'godmode/users/user_list&tab=user&pure=0',
'text' => " ".html_print_image(
- 'images/user.png',
+ 'images/user.svg',
true,
[
'title' => __('User management'),
- 'class' => 'invert_filter',
+ 'class' => 'main_menu_icon invert_filter',
]
).'',
],
'notifications' => [
'active' => $_GET['sec2'] === 'operation/users/user_edit_notifications',
'text' => " ".html_print_image(
- 'images/alerts_template.png',
+ 'images/alert@svg.svg',
true,
[
'title' => __('User notifications'),
- 'class' => 'invert_filter',
+ 'class' => 'main_menu_icon invert_filter',
]
).'',
],
diff --git a/pandora_console/operation/users/user_edit_notifications.php b/pandora_console/operation/users/user_edit_notifications.php
index 4228c16543..e511eb0b92 100644
--- a/pandora_console/operation/users/user_edit_notifications.php
+++ b/pandora_console/operation/users/user_edit_notifications.php
@@ -15,7 +15,7 @@
* |___| |___._|__|__|_____||_____|__| |___._| |___| |__|_|__|_______|
*
* ============================================================================
- * Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
+ * Copyright (c) 2005-2023 Artica Soluciones Tecnologicas
* Please see http://pandorafms.org for full contribution list
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -58,7 +58,7 @@ if (get_parameter('change_label', 0)) {
}
-echo '
+echo '
'.__('Enable').'
@@ -91,8 +91,9 @@ foreach ($sources as $source) {
}
if ((bool) $disabled_flag === true) {
- $s = __('Controls have been disabled by the system administrator');
- echo ' '.$s.'';
+ ui_print_warning_message(
+ __('Controls have been disabled by the system administrator')
+ );
}
echo ' ';
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index d4d603403c..eb62c05265 100644
--- a/pandora_console/pandora_console.redhat.spec
+++ b/pandora_console/pandora_console.redhat.spec
@@ -3,7 +3,7 @@
#
%define name pandorafms_console
%define version 7.0NG.769
-%define release 230307
+%define release 230308
# User and Group under which Apache is running
%define httpd_name httpd
diff --git a/pandora_console/pandora_console.rhel7.spec b/pandora_console/pandora_console.rhel7.spec
index 77dfd3a0de..abdbaf546a 100644
--- a/pandora_console/pandora_console.rhel7.spec
+++ b/pandora_console/pandora_console.rhel7.spec
@@ -3,7 +3,7 @@
#
%define name pandorafms_console
%define version 7.0NG.769
-%define release 230307
+%define release 230308
# User and Group under which Apache is running
%define httpd_name httpd
diff --git a/pandora_console/pandora_console.spec b/pandora_console/pandora_console.spec
index 8010510fa4..dfc00451f9 100644
--- a/pandora_console/pandora_console.spec
+++ b/pandora_console/pandora_console.spec
@@ -3,7 +3,7 @@
#
%define name pandorafms_console
%define version 7.0NG.769
-%define release 230307
+%define release 230308
%define httpd_name httpd
# User and Group under which Apache is running
%define httpd_name apache2
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index 18f8e0b57b..cb6fda43f4 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
package: pandorafms-server
-Version: 7.0NG.769-230307
+Version: 7.0NG.769-230308
Architecture: all
Priority: optional
Section: admin
diff --git a/pandora_server/DEBIAN/make_deb_package.sh b/pandora_server/DEBIAN/make_deb_package.sh
index 4e6df8422b..c99e58931e 100644
--- a/pandora_server/DEBIAN/make_deb_package.sh
+++ b/pandora_server/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-230307"
+pandora_version="7.0NG.769-230308"
package_cpan=0
package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index d9be514599..7bf9e9f9c6 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -46,7 +46,7 @@ our @EXPORT = qw(
# version: Defines actual version of Pandora Server for this module only
my $pandora_version = "7.0NG.769";
-my $pandora_build = "230307";
+my $pandora_build = "230308";
our $VERSION = $pandora_version." ".$pandora_build;
# Setup hash
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index fdd2825106..2bfc545a3f 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -34,7 +34,7 @@ our @ISA = qw(Exporter);
# version: Defines actual version of Pandora Server for this module only
my $pandora_version = "7.0NG.769";
-my $pandora_build = "230307";
+my $pandora_build = "230308";
our $VERSION = $pandora_version." ".$pandora_build;
our %EXPORT_TAGS = ( 'all' => [ qw() ] );
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index 205a8ef850..a4738c6552 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 230307
+%define release 230308
Summary: Pandora FMS Server
Name: %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 2cc1e07821..b108390a3d 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 230307
+%define release 230308
Summary: Pandora FMS Server
Name: %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 6479a6943a..2a76611dde 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
# **********************************************************************
PI_VERSION="7.0NG.769"
-PI_BUILD="230307"
+PI_BUILD="230308"
MODE=$1
if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 3ddb47ab77..ce08881710 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 230307";
+my $version = "7.0NG.769 Build 230308";
# Pandora server configuration
my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index e5eec498f7..0b193ab6c6 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 230307";
+my $version = "7.0NG.769 Build 230308";
# save program name for logging
my $progname = basename($0);
|