From 417b3faba57a028bd24aa83cc5e927eb6e5524bf Mon Sep 17 00:00:00 2001 From: fermin831 Date: Wed, 1 Jun 2016 18:00:14 +0200 Subject: [PATCH 1/4] Reformuled users_can_manage_group_all Tickets #3680 --- .../godmode/events/event_edit_filter.php | 2 +- .../reporting/reporting_builder.main.php | 2 +- .../godmode/reporting/reporting_builder.php | 22 ++------ pandora_console/include/functions_users.php | 6 +- .../operation/events/events_list.php | 55 ++++++------------- 5 files changed, 25 insertions(+), 62 deletions(-) diff --git a/pandora_console/godmode/events/event_edit_filter.php b/pandora_console/godmode/events/event_edit_filter.php index 02384c17ec..50461f9bbd 100644 --- a/pandora_console/godmode/events/event_edit_filter.php +++ b/pandora_console/godmode/events/event_edit_filter.php @@ -277,7 +277,7 @@ if ($strict_user) { } else { $users = users_get_user_users($config['id_user'], "ER", - users_can_manage_group_all(0)); + users_can_manage_group_all()); } $table->data[10][1] = html_print_select($users, "id_user_ack", diff --git a/pandora_console/godmode/reporting/reporting_builder.main.php b/pandora_console/godmode/reporting/reporting_builder.main.php index 65f1eec4e1..37e32d8621 100755 --- a/pandora_console/godmode/reporting/reporting_builder.main.php +++ b/pandora_console/godmode/reporting/reporting_builder.main.php @@ -69,7 +69,7 @@ $table->data['name'][1] = html_print_input_text('name', $reportName, $table->data['group'][0] = __('Group'); $write_groups = users_get_groups_for_select(false, "RW", - users_can_manage_group_all(0, "RW"), true, false, 'id_grupo'); + users_can_manage_group_all("RW"), true, false, 'id_grupo'); // If the report group is not among the RW groups (special permission) we add it if (!isset($write_groups[$idGroupReport]) && $idGroupReport) { diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php index 113bac230b..55cede0f66 100755 --- a/pandora_console/godmode/reporting/reporting_builder.php +++ b/pandora_console/godmode/reporting/reporting_builder.php @@ -373,9 +373,7 @@ switch ($action) { $delete = true; //owner can delete } else { $delete = check_acl($config['id_user'], - $report['id_group'], "RM") - && - users_can_manage_group_all($report["id_group"], "RM"); + $report['id_group'], "RM"); } break; case 'group_edit': @@ -383,9 +381,7 @@ switch ($action) { $delete = true; //owner can delete } else { $delete = check_acl($config['id_user'], - $report['id_group'], "RM") - && - users_can_manage_group_all($report["id_group"], "RM"); + $report['id_group'], "RM"); } break; case 'user_edit': @@ -591,7 +587,7 @@ switch ($action) { $data = array (); - if (check_acl ($config["id_user"], $report["id_group"], "RW") && users_can_manage_group_all($report["id_group"])) { + if (check_acl ($config["id_user"], $report["id_group"], "RW")) { $data[0] = ''.$report['name'].''; } @@ -652,9 +648,7 @@ switch ($action) { switch ($type_access_selected) { case 'group_view': $edit = check_acl($config['id_user'], - $report['id_group'], "RW") - && - users_can_manage_group_all($report["id_group"], "RW"); + $report['id_group'], "RW"); if ($config['id_user'] == $report['id_user'] || is_user_admin ($config["id_user"])) { $delete = true; //owner can delete @@ -664,17 +658,13 @@ switch ($action) { break; case 'group_edit': $edit = check_acl($config['id_user'], - $report['id_group_edit'], "RW") - && - users_can_manage_group_all($report["id_group_edit"], "RW"); + $report['id_group_edit'], "RW"); if ($config['id_user'] == $report['id_user'] || is_user_admin ($config["id_user"])) { $delete = true; //owner can delete } else { $delete = check_acl($config['id_user'], - $report['id_group'], "RM") - && - users_can_manage_group_all($report["id_group"], "RM"); + $report['id_group'], "RM"); } break; case 'user_edit': diff --git a/pandora_console/include/functions_users.php b/pandora_console/include/functions_users.php index 8a5f4ca61f..c3717cb12b 100755 --- a/pandora_console/include/functions_users.php +++ b/pandora_console/include/functions_users.php @@ -821,13 +821,9 @@ function users_check_users() { // Check if a user can manage a group when group is all // This function dont check acls of the group, only if the // user is admin or pandora manager and the group is all -function users_can_manage_group_all($id_group = 0, $access = "PM") { +function users_can_manage_group_all($access = "PM") { global $config; - if ($id_group != 0) { - return true; - } - $is_admin = db_get_value('is_admin', 'tusuario', 'id_user', $config['id_user']); if (check_acl ($config['id_user'], 0, $access) || $is_admin) { diff --git a/pandora_console/operation/events/events_list.php b/pandora_console/operation/events/events_list.php index 371041eff0..e544485395 100644 --- a/pandora_console/operation/events/events_list.php +++ b/pandora_console/operation/events/events_list.php @@ -427,7 +427,7 @@ $data[0] = __('User ack.') . $jump; if ($strict_user) { $user_users = array($config['id_user']=>$config['id_user']); } else { - $user_users = users_get_user_users($config['id_user'], "ER", users_can_manage_group_all(0)); + $user_users = users_get_user_users($config['id_user'], "ER", users_can_manage_group_all()); } $data[0] .= html_print_select($user_users, "id_user_ack", $id_user_ack, '', @@ -467,7 +467,7 @@ $table_advanced->rowclass[] = ''; $data = array(); $data[0] = __('Date from') . $jump; -$user_users = users_get_user_users($config['id_user'], "ER", users_can_manage_group_all(0)); +$user_users = users_get_user_users($config['id_user'], "ER", users_can_manage_group_all()); $data[0] .= html_print_input_text ('date_from', $date_from, '', 15, 10, true); @@ -494,13 +494,13 @@ if (defined('METACONSOLE')) ''; } else { - $data[0] = '
' . + $data[0] = '
' . '' . __('Events with following tags') . '' . html_print_table($tabletags_with, true) . '
'; - $data[1] = '
' . + $data[1] = '
' . '' . __('Events without following tags') . '' . @@ -560,7 +560,6 @@ $data[1] .= html_print_input_text ('event_view_hr', $event_view_hr, '', 5, 255, $data[2] = __("Repeated") . $jump; $repeated_sel[0] = __("All events"); $repeated_sel[1] = __("Group events"); -$repeated_sel[2] = __("Group agents"); $data[2] .= html_print_select ($repeated_sel, "group_rep", $group_rep, '', '', 0, true); $table->data[] = $data; $table->rowclass[] = ''; @@ -681,7 +680,7 @@ if ($group_rep == 0) { //Extract the events by filter (or not) from db $result = db_get_all_rows_sql ($sql); } -elseif ($group_rep == 1) { +else { $result = events_get_events_grouped( $sql_post, $offset, @@ -689,14 +688,6 @@ elseif ($group_rep == 1) { $meta, $history); } -elseif ($group_rep == 2) { - $result = events_get_events_grouped_by_agent( - $sql_post, - $offset, - $pagination, - $meta, - $history); -} if (!empty($result)) { if ($group_rep == 0) { @@ -704,7 +695,7 @@ if (!empty($result)) { FROM $event_table WHERE 1=1 " . $sql_post; } - elseif ($group_rep == 1) { + else { switch ($config["dbtype"]) { case "mysql": case "postgresql": @@ -722,10 +713,6 @@ if (!empty($result)) { GROUP BY to_char(evento), id_agentmodule) t"; break; } - } - elseif ($group_rep == 2) { - - } $limit = (int) db_get_sql ($sql); @@ -758,26 +745,20 @@ if (!empty($result)) { //Extract the events by filter (or not) from db $results_graph = db_get_all_rows_sql ($sql); } - elseif ($group_rep == 1) { + else { $results_graph = events_get_events_grouped($sql_post, 0, $limit, $meta, $history); } - elseif ($group_rep == 2) { - - - } - - if (($group_rep == 1) OR ($group_rep == 0)) { - $graph = '
' . - grafico_eventos_agente(350, 185, - $results_graph, $meta, $history, $tags_acls_condition,$limit) . - '
'; - html_print_div(array('id' => 'events_graph', - 'hidden' => true, 'content' => $graph)); - } + + $graph = '
' . + grafico_eventos_agente(350, 185, + $results_graph, $meta, $history, $tags_acls_condition,$limit) . + '
'; + html_print_div(array('id' => 'events_graph', + 'hidden' => true, 'content' => $graph)); } @@ -808,7 +789,7 @@ if ($group_rep == 0) { FROM $event_table WHERE 1=1 $sql_post"; } -elseif ($group_rep == 1) { +else { switch ($config["dbtype"]) { case "mysql": case "postgresql": @@ -827,13 +808,9 @@ elseif ($group_rep == 1) { break; } } -elseif ($group_rep == 2) { - $sql = "SELECT COUNT(*) FROM (select id_agente as total from $event_table WHERE id_agente > 0 - $sql_post GROUP BY id_agente ORDER BY id_agente ) AS t"; -} + $total_events = (int) db_get_sql ($sql); - if (empty ($result)) { $result = array (); } From 16869aa3a495023e56141a8db63d361fd7a3acec Mon Sep 17 00:00:00 2001 From: fermin831 Date: Wed, 1 Jun 2016 18:02:49 +0200 Subject: [PATCH 2/4] Revert "Reformuled users_can_manage_group_all Tickets #3680" This reverts commit 417b3faba57a028bd24aa83cc5e927eb6e5524bf. --- .../godmode/events/event_edit_filter.php | 2 +- .../reporting/reporting_builder.main.php | 2 +- .../godmode/reporting/reporting_builder.php | 22 ++++++-- pandora_console/include/functions_users.php | 6 +- .../operation/events/events_list.php | 55 +++++++++++++------ 5 files changed, 62 insertions(+), 25 deletions(-) diff --git a/pandora_console/godmode/events/event_edit_filter.php b/pandora_console/godmode/events/event_edit_filter.php index 50461f9bbd..02384c17ec 100644 --- a/pandora_console/godmode/events/event_edit_filter.php +++ b/pandora_console/godmode/events/event_edit_filter.php @@ -277,7 +277,7 @@ if ($strict_user) { } else { $users = users_get_user_users($config['id_user'], "ER", - users_can_manage_group_all()); + users_can_manage_group_all(0)); } $table->data[10][1] = html_print_select($users, "id_user_ack", diff --git a/pandora_console/godmode/reporting/reporting_builder.main.php b/pandora_console/godmode/reporting/reporting_builder.main.php index 37e32d8621..65f1eec4e1 100755 --- a/pandora_console/godmode/reporting/reporting_builder.main.php +++ b/pandora_console/godmode/reporting/reporting_builder.main.php @@ -69,7 +69,7 @@ $table->data['name'][1] = html_print_input_text('name', $reportName, $table->data['group'][0] = __('Group'); $write_groups = users_get_groups_for_select(false, "RW", - users_can_manage_group_all("RW"), true, false, 'id_grupo'); + users_can_manage_group_all(0, "RW"), true, false, 'id_grupo'); // If the report group is not among the RW groups (special permission) we add it if (!isset($write_groups[$idGroupReport]) && $idGroupReport) { diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php index 55cede0f66..113bac230b 100755 --- a/pandora_console/godmode/reporting/reporting_builder.php +++ b/pandora_console/godmode/reporting/reporting_builder.php @@ -373,7 +373,9 @@ switch ($action) { $delete = true; //owner can delete } else { $delete = check_acl($config['id_user'], - $report['id_group'], "RM"); + $report['id_group'], "RM") + && + users_can_manage_group_all($report["id_group"], "RM"); } break; case 'group_edit': @@ -381,7 +383,9 @@ switch ($action) { $delete = true; //owner can delete } else { $delete = check_acl($config['id_user'], - $report['id_group'], "RM"); + $report['id_group'], "RM") + && + users_can_manage_group_all($report["id_group"], "RM"); } break; case 'user_edit': @@ -587,7 +591,7 @@ switch ($action) { $data = array (); - if (check_acl ($config["id_user"], $report["id_group"], "RW")) { + if (check_acl ($config["id_user"], $report["id_group"], "RW") && users_can_manage_group_all($report["id_group"])) { $data[0] = ''.$report['name'].''; } @@ -648,7 +652,9 @@ switch ($action) { switch ($type_access_selected) { case 'group_view': $edit = check_acl($config['id_user'], - $report['id_group'], "RW"); + $report['id_group'], "RW") + && + users_can_manage_group_all($report["id_group"], "RW"); if ($config['id_user'] == $report['id_user'] || is_user_admin ($config["id_user"])) { $delete = true; //owner can delete @@ -658,13 +664,17 @@ switch ($action) { break; case 'group_edit': $edit = check_acl($config['id_user'], - $report['id_group_edit'], "RW"); + $report['id_group_edit'], "RW") + && + users_can_manage_group_all($report["id_group_edit"], "RW"); if ($config['id_user'] == $report['id_user'] || is_user_admin ($config["id_user"])) { $delete = true; //owner can delete } else { $delete = check_acl($config['id_user'], - $report['id_group'], "RM"); + $report['id_group'], "RM") + && + users_can_manage_group_all($report["id_group"], "RM"); } break; case 'user_edit': diff --git a/pandora_console/include/functions_users.php b/pandora_console/include/functions_users.php index c3717cb12b..8a5f4ca61f 100755 --- a/pandora_console/include/functions_users.php +++ b/pandora_console/include/functions_users.php @@ -821,9 +821,13 @@ function users_check_users() { // Check if a user can manage a group when group is all // This function dont check acls of the group, only if the // user is admin or pandora manager and the group is all -function users_can_manage_group_all($access = "PM") { +function users_can_manage_group_all($id_group = 0, $access = "PM") { global $config; + if ($id_group != 0) { + return true; + } + $is_admin = db_get_value('is_admin', 'tusuario', 'id_user', $config['id_user']); if (check_acl ($config['id_user'], 0, $access) || $is_admin) { diff --git a/pandora_console/operation/events/events_list.php b/pandora_console/operation/events/events_list.php index e544485395..371041eff0 100644 --- a/pandora_console/operation/events/events_list.php +++ b/pandora_console/operation/events/events_list.php @@ -427,7 +427,7 @@ $data[0] = __('User ack.') . $jump; if ($strict_user) { $user_users = array($config['id_user']=>$config['id_user']); } else { - $user_users = users_get_user_users($config['id_user'], "ER", users_can_manage_group_all()); + $user_users = users_get_user_users($config['id_user'], "ER", users_can_manage_group_all(0)); } $data[0] .= html_print_select($user_users, "id_user_ack", $id_user_ack, '', @@ -467,7 +467,7 @@ $table_advanced->rowclass[] = ''; $data = array(); $data[0] = __('Date from') . $jump; -$user_users = users_get_user_users($config['id_user'], "ER", users_can_manage_group_all()); +$user_users = users_get_user_users($config['id_user'], "ER", users_can_manage_group_all(0)); $data[0] .= html_print_input_text ('date_from', $date_from, '', 15, 10, true); @@ -494,13 +494,13 @@ if (defined('METACONSOLE')) '
'; } else { - $data[0] = '
' . + $data[0] = '
' . '' . __('Events with following tags') . '' . html_print_table($tabletags_with, true) . '
'; - $data[1] = '
' . + $data[1] = '
' . '' . __('Events without following tags') . '' . @@ -560,6 +560,7 @@ $data[1] .= html_print_input_text ('event_view_hr', $event_view_hr, '', 5, 255, $data[2] = __("Repeated") . $jump; $repeated_sel[0] = __("All events"); $repeated_sel[1] = __("Group events"); +$repeated_sel[2] = __("Group agents"); $data[2] .= html_print_select ($repeated_sel, "group_rep", $group_rep, '', '', 0, true); $table->data[] = $data; $table->rowclass[] = ''; @@ -680,7 +681,7 @@ if ($group_rep == 0) { //Extract the events by filter (or not) from db $result = db_get_all_rows_sql ($sql); } -else { +elseif ($group_rep == 1) { $result = events_get_events_grouped( $sql_post, $offset, @@ -688,6 +689,14 @@ else { $meta, $history); } +elseif ($group_rep == 2) { + $result = events_get_events_grouped_by_agent( + $sql_post, + $offset, + $pagination, + $meta, + $history); +} if (!empty($result)) { if ($group_rep == 0) { @@ -695,7 +704,7 @@ if (!empty($result)) { FROM $event_table WHERE 1=1 " . $sql_post; } - else { + elseif ($group_rep == 1) { switch ($config["dbtype"]) { case "mysql": case "postgresql": @@ -713,6 +722,10 @@ if (!empty($result)) { GROUP BY to_char(evento), id_agentmodule) t"; break; } + } + elseif ($group_rep == 2) { + + } $limit = (int) db_get_sql ($sql); @@ -745,20 +758,26 @@ if (!empty($result)) { //Extract the events by filter (or not) from db $results_graph = db_get_all_rows_sql ($sql); } - else { + elseif ($group_rep == 1) { $results_graph = events_get_events_grouped($sql_post, 0, $limit, $meta, $history); } - - $graph = '
' . - grafico_eventos_agente(350, 185, - $results_graph, $meta, $history, $tags_acls_condition,$limit) . - '
'; - html_print_div(array('id' => 'events_graph', - 'hidden' => true, 'content' => $graph)); + elseif ($group_rep == 2) { + + + } + + if (($group_rep == 1) OR ($group_rep == 0)) { + $graph = '
' . + grafico_eventos_agente(350, 185, + $results_graph, $meta, $history, $tags_acls_condition,$limit) . + '
'; + html_print_div(array('id' => 'events_graph', + 'hidden' => true, 'content' => $graph)); + } } @@ -789,7 +808,7 @@ if ($group_rep == 0) { FROM $event_table WHERE 1=1 $sql_post"; } -else { +elseif ($group_rep == 1) { switch ($config["dbtype"]) { case "mysql": case "postgresql": @@ -808,9 +827,13 @@ else { break; } } - +elseif ($group_rep == 2) { + $sql = "SELECT COUNT(*) FROM (select id_agente as total from $event_table WHERE id_agente > 0 + $sql_post GROUP BY id_agente ORDER BY id_agente ) AS t"; +} $total_events = (int) db_get_sql ($sql); + if (empty ($result)) { $result = array (); } From 54cc99140cc077c6dc9783e0baadd91dfa22e1e0 Mon Sep 17 00:00:00 2001 From: fermin831 Date: Wed, 1 Jun 2016 18:09:24 +0200 Subject: [PATCH 3/4] Reformuled users_can_manage_group_all Tickets #3680 --- .../godmode/events/event_edit_filter.php | 2 +- .../reporting/reporting_builder.main.php | 2 +- .../godmode/reporting/reporting_builder.php | 22 +++++-------------- pandora_console/include/functions_users.php | 6 +---- .../operation/events/events_list.php | 4 ++-- 5 files changed, 11 insertions(+), 25 deletions(-) diff --git a/pandora_console/godmode/events/event_edit_filter.php b/pandora_console/godmode/events/event_edit_filter.php index 02384c17ec..50461f9bbd 100644 --- a/pandora_console/godmode/events/event_edit_filter.php +++ b/pandora_console/godmode/events/event_edit_filter.php @@ -277,7 +277,7 @@ if ($strict_user) { } else { $users = users_get_user_users($config['id_user'], "ER", - users_can_manage_group_all(0)); + users_can_manage_group_all()); } $table->data[10][1] = html_print_select($users, "id_user_ack", diff --git a/pandora_console/godmode/reporting/reporting_builder.main.php b/pandora_console/godmode/reporting/reporting_builder.main.php index 65f1eec4e1..37e32d8621 100755 --- a/pandora_console/godmode/reporting/reporting_builder.main.php +++ b/pandora_console/godmode/reporting/reporting_builder.main.php @@ -69,7 +69,7 @@ $table->data['name'][1] = html_print_input_text('name', $reportName, $table->data['group'][0] = __('Group'); $write_groups = users_get_groups_for_select(false, "RW", - users_can_manage_group_all(0, "RW"), true, false, 'id_grupo'); + users_can_manage_group_all("RW"), true, false, 'id_grupo'); // If the report group is not among the RW groups (special permission) we add it if (!isset($write_groups[$idGroupReport]) && $idGroupReport) { diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php index 113bac230b..55cede0f66 100755 --- a/pandora_console/godmode/reporting/reporting_builder.php +++ b/pandora_console/godmode/reporting/reporting_builder.php @@ -373,9 +373,7 @@ switch ($action) { $delete = true; //owner can delete } else { $delete = check_acl($config['id_user'], - $report['id_group'], "RM") - && - users_can_manage_group_all($report["id_group"], "RM"); + $report['id_group'], "RM"); } break; case 'group_edit': @@ -383,9 +381,7 @@ switch ($action) { $delete = true; //owner can delete } else { $delete = check_acl($config['id_user'], - $report['id_group'], "RM") - && - users_can_manage_group_all($report["id_group"], "RM"); + $report['id_group'], "RM"); } break; case 'user_edit': @@ -591,7 +587,7 @@ switch ($action) { $data = array (); - if (check_acl ($config["id_user"], $report["id_group"], "RW") && users_can_manage_group_all($report["id_group"])) { + if (check_acl ($config["id_user"], $report["id_group"], "RW")) { $data[0] = ''.$report['name'].''; } @@ -652,9 +648,7 @@ switch ($action) { switch ($type_access_selected) { case 'group_view': $edit = check_acl($config['id_user'], - $report['id_group'], "RW") - && - users_can_manage_group_all($report["id_group"], "RW"); + $report['id_group'], "RW"); if ($config['id_user'] == $report['id_user'] || is_user_admin ($config["id_user"])) { $delete = true; //owner can delete @@ -664,17 +658,13 @@ switch ($action) { break; case 'group_edit': $edit = check_acl($config['id_user'], - $report['id_group_edit'], "RW") - && - users_can_manage_group_all($report["id_group_edit"], "RW"); + $report['id_group_edit'], "RW"); if ($config['id_user'] == $report['id_user'] || is_user_admin ($config["id_user"])) { $delete = true; //owner can delete } else { $delete = check_acl($config['id_user'], - $report['id_group'], "RM") - && - users_can_manage_group_all($report["id_group"], "RM"); + $report['id_group'], "RM"); } break; case 'user_edit': diff --git a/pandora_console/include/functions_users.php b/pandora_console/include/functions_users.php index 8a5f4ca61f..c3717cb12b 100755 --- a/pandora_console/include/functions_users.php +++ b/pandora_console/include/functions_users.php @@ -821,13 +821,9 @@ function users_check_users() { // Check if a user can manage a group when group is all // This function dont check acls of the group, only if the // user is admin or pandora manager and the group is all -function users_can_manage_group_all($id_group = 0, $access = "PM") { +function users_can_manage_group_all($access = "PM") { global $config; - if ($id_group != 0) { - return true; - } - $is_admin = db_get_value('is_admin', 'tusuario', 'id_user', $config['id_user']); if (check_acl ($config['id_user'], 0, $access) || $is_admin) { diff --git a/pandora_console/operation/events/events_list.php b/pandora_console/operation/events/events_list.php index 371041eff0..3bbdaa0184 100644 --- a/pandora_console/operation/events/events_list.php +++ b/pandora_console/operation/events/events_list.php @@ -427,7 +427,7 @@ $data[0] = __('User ack.') . $jump; if ($strict_user) { $user_users = array($config['id_user']=>$config['id_user']); } else { - $user_users = users_get_user_users($config['id_user'], "ER", users_can_manage_group_all(0)); + $user_users = users_get_user_users($config['id_user'], "ER", users_can_manage_group_all()); } $data[0] .= html_print_select($user_users, "id_user_ack", $id_user_ack, '', @@ -467,7 +467,7 @@ $table_advanced->rowclass[] = ''; $data = array(); $data[0] = __('Date from') . $jump; -$user_users = users_get_user_users($config['id_user'], "ER", users_can_manage_group_all(0)); +$user_users = users_get_user_users($config['id_user'], "ER", users_can_manage_group_all()); $data[0] .= html_print_input_text ('date_from', $date_from, '', 15, 10, true); From 8844ac8d0fecddd4e751ba5449c258d55d6727aa Mon Sep 17 00:00:00 2001 From: artica Date: Thu, 2 Jun 2016 00:01:23 +0200 Subject: [PATCH 4/4] 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.spec | 2 +- pandora_console/pandoradb.data.oracle.sql | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.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 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 6a1cd3f9b2..5d987a8655 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 6.0SP2-160601 +Version: 6.0SP2-160602 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 d4734870a6..a1081885d4 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="6.0SP2-160601" +pandora_version="6.0SP2-160602" 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 51cff85d2d..4081c4f750 100644 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -41,7 +41,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '6.0SP2'; -use constant AGENT_BUILD => '160601'; +use constant AGENT_BUILD => '160602'; # Commands to retrieve total memory information in kB use constant TOTALMEMORY_CMDS => { diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec index 12bf45dcc3..114fb90709 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 6.0SP2 -%define release 160601 +%define release 160602 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 968ac801ba..e371b2ef12 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 6.0SP2 -%define release 160601 +%define release 160602 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 a5ba737382..8ad6d01f40 100644 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="6.0SP2" -PI_BUILD="160601" +PI_BUILD="160602" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 954028d90d..dcf58b0c71 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{160601} +{160602} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index ebc816b8e9..ff465ea29b 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 ("6.0SP2(Build 160601)") +#define PANDORA_VERSION ("6.0SP2(Build 160602)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index b78ca99055..8de6906ad8 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", "(6.0SP2(Build 160601))" + VALUE "ProductVersion", "(6.0SP2(Build 160602))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 7bac8b5d6a..4edec9ca3a 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 6.0SP2-160601 +Version: 6.0SP2-160602 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 ac96306f83..d621b96b3e 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="6.0SP2-160601" +pandora_version="6.0SP2-160602" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index bab7ddfc46..dae9955cf7 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -22,7 +22,7 @@ /** * Pandora build version and version */ -$build_version = 'PC160601'; +$build_version = 'PC160602'; $pandora_version = 'v6.0SP2'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index db3f5ad98e..87d9e85e7a 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -63,7 +63,7 @@