diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index e4bda14889..db3931c124 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.754-210603 +Version: 7.0NG.754-210604 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 71ea38f64a..cfd9534706 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.754-210603" +pandora_version="7.0NG.754-210604" 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 6bffa81ccc..8212deeba8 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.754'; -use constant AGENT_BUILD => '210603'; +use constant AGENT_BUILD => '210604'; # 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 ebd0dc0be5..b059de269b 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.754 -%define release 210603 +%define release 210604 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 a65fc51b69..3ae2ff2321 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.754 -%define release 210603 +%define release 210604 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 09b8240352..de625729d1 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.754" -PI_BUILD="210603" +PI_BUILD="210604" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index d8c829b235..3343b3722e 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{210603} +{210604} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 0e8912fdfe..7933cc9853 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.754 Build 210603") +#define PANDORA_VERSION ("7.0NG.754 Build 210604") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 7c7b85903f..e498f9c547 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.754(Build 210603))" + VALUE "ProductVersion", "(7.0NG.754(Build 210604))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index ed4adaf3a3..0f4a59a873 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.754-210603 +Version: 7.0NG.754-210604 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 f9054b3399..cb1816b938 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.754-210603" +pandora_version="7.0NG.754-210604" package_pear=0 package_pandora=1 diff --git a/pandora_console/extensions/agents_modules.php b/pandora_console/extensions/agents_modules.php index f93dec02a4..e668e35179 100644 --- a/pandora_console/extensions/agents_modules.php +++ b/pandora_console/extensions/agents_modules.php @@ -383,7 +383,7 @@ function mainAgentsModules() &full_agents_id='.$full_agents.'&selection_agent_module='.$selection_a_m.'">'.html_print_image('images/full_screen.png', true, ['title' => __('Full screen mode'), 'class' => 'invert_filter']).''; } else { $fullscreen['text'] = ''.html_print_image('images/full_screen.png', true, ['title' => __('Full screen mode')]).''; + offset='.$offset.'&group_id='.$group_id.'&modulegroup='.$modulegroup.'&refresh='.$refr.'">'.html_print_image('images/full_screen.png', true, ['title' => __('Full screen mode'), 'class' => 'invert_filter']).''; } } diff --git a/pandora_console/godmode/agentes/module_manager.php b/pandora_console/godmode/agentes/module_manager.php index 6f2747de19..45149c5e6a 100644 --- a/pandora_console/godmode/agentes/module_manager.php +++ b/pandora_console/godmode/agentes/module_manager.php @@ -238,7 +238,7 @@ echo ''; if (!$config['disable_help']) { echo '
'; echo ''; - echo "".__('Get more modules on Monitoring Library').''; + echo "".__('Get more modules on Monitoring Library').''; echo ''; echo '
'; } diff --git a/pandora_console/godmode/alerts/alert_list.list.php b/pandora_console/godmode/alerts/alert_list.list.php index da85133c7f..399bb55cfd 100644 --- a/pandora_console/godmode/alerts/alert_list.list.php +++ b/pandora_console/godmode/alerts/alert_list.list.php @@ -810,7 +810,8 @@ foreach ($simple_alerts as $alert) { 'images/lightbulb_off.png', 1, 'padding:0px', - true + true, + ['class' => 'invert_filter'] ); $data[4] .= html_print_input_hidden('enable_alert', 1, true); } else { @@ -879,7 +880,10 @@ foreach ($simple_alerts as $alert) { $data[4] .= html_print_image( 'images/add.disabled.png', true, - ['title' => __('Add action')] + [ + 'title' => __('Add action'), + 'class' => 'invert_filter', + ] ); } else { if ((int) $alert['id_policy_alerts'] === 0) { diff --git a/pandora_console/godmode/alerts/alert_view.php b/pandora_console/godmode/alerts/alert_view.php index d6bbaa5d32..cc467b99f8 100644 --- a/pandora_console/godmode/alerts/alert_view.php +++ b/pandora_console/godmode/alerts/alert_view.php @@ -224,31 +224,31 @@ $table_days->data[0] = array_fill(0, 7, html_print_image('images/blade.png', tru $days = []; if ($template['monday']) { - $table_days->data[0][0] = html_print_image('images/tick.png', true); + $table_days->data[0][0] = html_print_image('images/tick.png', true, ['class' => 'invert_filter']); } if ($template['tuesday']) { - $table_days->data[0][1] = html_print_image('images/tick.png', true); + $table_days->data[0][1] = html_print_image('images/tick.png', true, ['class' => 'invert_filter']); } if ($template['wednesday']) { - $table_days->data[0][2] = html_print_image('images/tick.png', true); + $table_days->data[0][2] = html_print_image('images/tick.png', true, ['class' => 'invert_filter']); } if ($template['thursday']) { - $table_days->data[0][3] = html_print_image('images/tick.png', true); + $table_days->data[0][3] = html_print_image('images/tick.png', true, ['class' => 'invert_filter']); } if ($template['friday']) { - $table_days->data[0][4] = html_print_image('images/tick.png', true); + $table_days->data[0][4] = html_print_image('images/tick.png', true, ['class' => 'invert_filter']); } if ($template['saturday']) { - $table_days->data[0][5] = html_print_image('images/tick.png', true); + $table_days->data[0][5] = html_print_image('images/tick.png', true, ['class' => 'invert_filter']); } if ($template['sunday']) { - $table_days->data[0][6] = html_print_image('images/tick.png', true); + $table_days->data[0][6] = html_print_image('images/tick.png', true, ['class' => 'invert_filter']); } $data[0] = html_print_table($table_days, true); @@ -265,7 +265,7 @@ $table_time->styleTable = 'padding: 1px; margin: 0px; text-align: center; height // $data[0] = __('Time from') . ' / ' . __('Time to'); if ($template['time_from'] == $template['time_to']) { $table_time->head[0] = '00:00:00
-
23:59:59'; - $table_time->data[0][0] = html_print_image('images/tick.png', true); + $table_time->data[0][0] = html_print_image('images/tick.png', true, ['class' => 'invert_filter']); } else { $from_array = explode(':', $template['time_from']); $from = ($from_array[0] * SECONDS_1HOUR + $from_array[1] * SECONDS_1MINUTE + $from_array[2]); @@ -278,7 +278,7 @@ if ($template['time_from'] == $template['time_to']) { } $table_time->head[1] = $template['time_from'].'
-
'.$template['time_to']; - $table_time->data[0][1] = html_print_image('images/tick.png', true); + $table_time->data[0][1] = html_print_image('images/tick.png', true, ['class' => 'invert_filter']); if ($template['time_to'] != '23:59:59') { $table_time->head[2] = $template['time_to'].'
-
23:59:59'; @@ -287,15 +287,15 @@ if ($template['time_from'] == $template['time_to']) { } else { if ($template['time_to'] != '00:00:00') { $table_time->head[0] = '00:00:00
-
'.$template['time_to']; - $table_time->data[0][0] = html_print_image('images/tick.png', true); + $table_time->data[0][0] = html_print_image('images/tick.png', true, ['class' => 'invert_filter']); } $table_time->head[1] = $template['time_to'].'
-
'.$template['time_from']; - $table_time->data[0][1] = html_print_image('images/blade.png', true); + $table_time->data[0][1] = html_print_image('images/blade.png', true, ['class' => 'invert_filter']); if ($template['time_from'] != '23:59:59') { $table_time->head[2] = $template['time_from'].'
-
23:59:59'; - $table_time->data[0][2] = html_print_image('images/tick.png', true); + $table_time->data[0][2] = html_print_image('images/tick.png', true, ['class' => 'invert_filter']); } } @@ -354,7 +354,7 @@ $table->style[0] = 'font-weight: bold; text-align: left;'; if (count($actions) == 1 && isset($actions[0])) { $table->head[1] = __('Every time that the alert is fired'); $table->data[0][0] = $actions[0]['name']; - $table->data[0][1] = html_print_image('images/tick.png', true); + $table->data[0][1] = html_print_image('images/tick.png', true, ['class' => 'invert_filter']); } else { foreach ($actions as $kaction => $action) { $table->data[$kaction][0] = $action['name']; @@ -364,7 +364,7 @@ if (count($actions) == 1 && isset($actions[0])) { foreach ($action['escalation'] as $k => $v) { if ($v > 0) { - $table->data[$kaction][$k] = html_print_image('images/tick.png', true); + $table->data[$kaction][$k] = html_print_image('images/tick.png', true, ['class' => 'invert_filter']); } else { $table->data[$kaction][$k] = html_print_image('images/blade.png', true); } diff --git a/pandora_console/godmode/massive/massive_add_alerts.php b/pandora_console/godmode/massive/massive_add_alerts.php index 6471421295..ad81def654 100755 --- a/pandora_console/godmode/massive/massive_add_alerts.php +++ b/pandora_console/godmode/massive/massive_add_alerts.php @@ -261,7 +261,10 @@ $table->data[1][2] .= html_print_select( ); $table->data[1][3] = html_print_select([], 'module[]', '', false, '', '', true, true, false, '', false, 'width:180px;'); -$templates = alerts_get_alert_templates(false, ['id', 'name']); +$usr_groups = users_get_groups($config['id_user'], 'LW', true); +$filter_groups = ''; +$filter_groups = implode(',', array_keys($usr_groups)); +$templates = alerts_get_alert_templates(['id_group IN ('.$filter_groups.')'], ['id', 'name']); $table->data[2][0] = __('Alert template'); $table->data[2][1] = html_print_select( index_array($templates, 'id', 'name'), diff --git a/pandora_console/godmode/massive/massive_delete_alerts.php b/pandora_console/godmode/massive/massive_delete_alerts.php index 1e125acaa5..2256405eb7 100755 --- a/pandora_console/godmode/massive/massive_delete_alerts.php +++ b/pandora_console/godmode/massive/massive_delete_alerts.php @@ -252,7 +252,10 @@ $table->size[3] = '40%'; $table->data = []; -$templates = alerts_get_alert_templates(false, ['id', 'name']); +$usr_groups = users_get_groups($config['id_user'], 'LW', true); +$filter_groups = ''; +$filter_groups = implode(',', array_keys($usr_groups)); +$templates = alerts_get_alert_templates(['id_group IN ('.$filter_groups.')'], ['id', 'name']); $table->data[0][0] = __('Alert template'); $table->data[0][1] = html_print_select( index_array($templates, 'id', 'name'), diff --git a/pandora_console/godmode/reporting/graph_builder.main.php b/pandora_console/godmode/reporting/graph_builder.main.php index 23cfc010c8..3b77ed932f 100644 --- a/pandora_console/godmode/reporting/graph_builder.main.php +++ b/pandora_console/godmode/reporting/graph_builder.main.php @@ -73,7 +73,7 @@ if (! check_acl($config['id_user'], 0, 'RW') exit; } -if ($edit_graph) { +if ($edit_graph === true) { $graphInTgraph = db_get_row_sql( 'SELECT * FROM tgraph WHERE id_graph = '.$id_graph ); @@ -113,18 +113,18 @@ if ($edit_graph) { // ----------------------- // CREATE/EDIT GRAPH FORM // ----------------------- -$url = 'index.php?sec=reporting&sec2=godmode/reporting/graph_builder'; -if ($edit_graph) { - $output = "
"; +$url = 'index.php?sec=reporting&sec2=godmode/reporting/graph_builder&edit_graph=1'; +if ($edit_graph === true) { + $output = ""; } else { - $output = ""; + $output = ""; } $output .= ""; $output .= ''; $output .= "'; $output .= "'; $output .= "
".__('Name').'