diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 32d267048b..b1b8c7b878 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.757-211006 +Version: 7.0NG.757-211008 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 b2e8057bcf..b1d2bef79b 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.757-211006" +pandora_version="7.0NG.757-211008" 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 48db91be62..b2f49f9eee 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -1015,7 +1015,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.757'; -use constant AGENT_BUILD => '211006'; +use constant AGENT_BUILD => '211008'; # 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 f309ced369..5acf20da9d 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.757 -%define release 211006 +%define release 211008 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 6367193d42..8f431e6d9c 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.757 -%define release 211006 +%define release 211008 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 88c0fb5349..93ddc6652a 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.757" -PI_BUILD="211006" +PI_BUILD="211008" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index a96743449b..d45532091c 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{211006} +{211008} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 30d0f3eb34..eadd363ef0 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.757 Build 211006") +#define PANDORA_VERSION ("7.0NG.757 Build 211008") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 3da33595bd..4b1a95e9cb 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.757(Build 211006))" + VALUE "ProductVersion", "(7.0NG.757(Build 211008))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 92005396b4..9c50fc6685 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.757-211006 +Version: 7.0NG.757-211008 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 1dd9b5ea84..e91afcab24 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.757-211006" +pandora_version="7.0NG.757-211008" package_pear=0 package_pandora=1 diff --git a/pandora_console/godmode/agentes/modificar_agente.php b/pandora_console/godmode/agentes/modificar_agente.php index 34c9481f58..e2aca5017f 100644 --- a/pandora_console/godmode/agentes/modificar_agente.php +++ b/pandora_console/godmode/agentes/modificar_agente.php @@ -910,7 +910,7 @@ if ($agents !== false) { echo ' onClick="if (!confirm(\' '.__('You are going to enable a cluster agent. Are you sure?').'\')) return false;">'; } - echo html_print_image('images/lightbulb_off.png', true, ['alt' => __('Enable agent'), 'title' => __('Enable agent')]).''; + echo html_print_image('images/lightbulb_off.png', true, ['alt' => __('Enable agent'), 'title' => __('Enable agent'), 'class' => 'filter_none']).''; } else { echo " __('Enable module'), 'title' => __('Enable module'), + 'class' => 'filter_none', ] ).''; } else { @@ -1139,7 +1140,6 @@ foreach ($modules as $module) { [ 'alt' => __('Disable module'), 'title' => __('Disable module'), - 'class' => 'invert_filter', ] ).''; } diff --git a/pandora_console/godmode/alerts/alert_list.list.php b/pandora_console/godmode/alerts/alert_list.list.php index 8e2e01aa2d..2b1c07ae6a 100644 --- a/pandora_console/godmode/alerts/alert_list.list.php +++ b/pandora_console/godmode/alerts/alert_list.list.php @@ -811,7 +811,7 @@ foreach ($simple_alerts as $alert) { 1, 'padding:0px', true, - ['class' => 'invert_filter'] + ['class' => 'filter_none'] ); $data[4] .= html_print_input_hidden('enable_alert', 1, true); } else { @@ -998,7 +998,7 @@ if (! $id_agente) { echo '"'.html_print_image( 'images/lightbulb_off.png', true, - false, + ['class' => 'filter_none'], true ).'"'; ?> @@ -1037,7 +1037,7 @@ if (! $id_agente) { echo '"'.html_print_image( 'images/lightbulb_off.png', true, - false, + ['class' => 'filter_none'], true ).'"'; ?> diff --git a/pandora_console/godmode/extensions.php b/pandora_console/godmode/extensions.php index 6a46795322..6e036827aa 100644 --- a/pandora_console/godmode/extensions.php +++ b/pandora_console/godmode/extensions.php @@ -254,7 +254,7 @@ foreach ($extensions as $file => $extension) { if ($file != 'update_manager.php') { $table->cellclass[][10] = 'action_buttons'; if (!$extension['enabled']) { - $data[] = ''.html_print_image('images/cross.disabled.png', true).''.' '.html_print_image('images/lightbulb_off.png', true).''; + $data[] = ''.html_print_image('images/cross.disabled.png', true, ['class' => 'filter_none']).''.' '.html_print_image('images/lightbulb_off.png', true, ['class' => 'filter_none']).''; } else { $data[] = ''.html_print_image('images/cross.png', true, ['class' => 'invert_filter']).''.' '.html_print_image('images/lightbulb.png', true).''; } diff --git a/pandora_console/godmode/users/configure_user.php b/pandora_console/godmode/users/configure_user.php index f362b1a973..2757af500e 100644 --- a/pandora_console/godmode/users/configure_user.php +++ b/pandora_console/godmode/users/configure_user.php @@ -721,6 +721,7 @@ if ($update_user) { ); } + if ($values['strict_acl']) { $count_groups = 0; $count_tags = 0; @@ -1226,7 +1227,10 @@ $session_time .= html_print_input_text( 'class="input_line_small"' ).''; -$event_filter_data = db_get_all_rows_sql('SELECT id_name, id_filter FROM tevent_filter'); + +$user_groups = implode(',', array_keys((users_get_groups($id, 'AR', $display_all_group)))); + +$event_filter_data = db_get_all_rows_sql('SELECT id_name, id_filter FROM tevent_filter WHERE id_group_filter IN ('.$user_groups.')'); if ($event_filter_data === false) { $event_filter_data = []; } diff --git a/pandora_console/godmode/users/user_list.php b/pandora_console/godmode/users/user_list.php index aca2686e59..e146bf9646 100644 --- a/pandora_console/godmode/users/user_list.php +++ b/pandora_console/godmode/users/user_list.php @@ -716,10 +716,12 @@ foreach ($info as $user_id => $user_info) { $toDoString = __('Disable'); $toDoAction = '1'; $toDoImage = 'images/lightbulb.png'; + $toDoClass = ''; } else { $toDoString = __('Enable'); $toDoAction = '0'; $toDoImage = 'images/lightbulb_off.png'; + $toDoClass = 'filter_none'; } $data[6] = '
'; diff --git a/pandora_console/godmode/wizards/DiscoveryTaskList.class.php b/pandora_console/godmode/wizards/DiscoveryTaskList.class.php index 245c2ae876..3235e2dd6a 100644 --- a/pandora_console/godmode/wizards/DiscoveryTaskList.class.php +++ b/pandora_console/godmode/wizards/DiscoveryTaskList.class.php @@ -961,7 +961,10 @@ class DiscoveryTaskList extends HTML ).'" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">'.html_print_image( 'images/lightbulb_off.png', true, - ['title' => __('enable task')] + [ + 'title' => __('enable task'), + 'class' => 'filter_none', + ] ).''; } else if ($task['disabled'] == 0) { $data[9] .= '' + + '' + element.name.substring(0, 42) + (element.name.length > 42 ? "..." : "") + "" diff --git a/pandora_console/include/styles/pandora_black.css b/pandora_console/include/styles/pandora_black.css index b824c3efbb..d158d6db99 100644 --- a/pandora_console/include/styles/pandora_black.css +++ b/pandora_console/include/styles/pandora_black.css @@ -1202,3 +1202,11 @@ a.pandora_pagination, .bg_ccc { background-color: #50505050 !important; } + +.filter_none { + filter: brightness(0) contrast(50%) !important; +} + +input[type="image"] { + background-color: transparent !important; +} \ No newline at end of file diff --git a/pandora_console/install.php b/pandora_console/install.php index df478ac3fa..3dda7e29cc 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -129,7 +129,7 @@'.__('Event filter').'
'; + $user_groups = implode(',', array_keys((users_get_groups($config['id_user'], 'AR', $display_all_group)))); $event_filter .= html_print_select_from_sql( - 'SELECT id_filter, id_name FROM tevent_filter', + 'SELECT id_filter, id_name FROM tevent_filter WHERE id_group_filter IN ('.$user_groups.')', 'event_filter', $user_info['default_event_filter'], '', diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec index bff8d129ed..07b0c1f39d 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.757 -%define release 211006 +%define release 211008 # 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 8e0f0e58c8..46938ee627 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.757 -%define release 211006 +%define release 211008 # 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 0780679495..7c2f983951 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.757 -%define release 211006 +%define release 211008 %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 d79e86f7b4..f3b1765537 100644 --- a/pandora_server/DEBIAN/control +++ b/pandora_server/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-server -Version: 7.0NG.757-211006 +Version: 7.0NG.757-211008 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 8caf09a04e..2caf0b9458 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.757-211006" +pandora_version="7.0NG.757-211008" package_cpan=0 package_pandora=1 diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm index dc49549f06..b73e60ef31 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.757"; -my $pandora_build = "211006"; +my $pandora_build = "211008"; 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 c33186f2d5..c4f2796a1d 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.757"; -my $pandora_build = "211006"; +my $pandora_build = "211008"; 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 a30592333a..ecaa23d778 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.757 -%define release 211006 +%define release 211008 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 330d0e5669..4e048d2712 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.757 -%define release 211006 +%define release 211008 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index b001ef8613..a9745ee169 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.757" -PI_BUILD="211006" +PI_BUILD="211008" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 8f5e938fbb..39f7635e1f 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.757 Build 211006"; +my $version = "7.0NG.757 Build 211008"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 92bfe6e4e4..d7d987b6f8 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.757 Build 211006"; +my $version = "7.0NG.757 Build 211008"; # save program name for logging my $progname = basename($0);