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/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/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/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/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 @@
$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); diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec index bf19c6932e..88b5a6a0ac 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 6.0SP2 -%define release 160601 +%define release 160602 # 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 c61c072c4b..05c5126bb0 100644 --- a/pandora_console/pandora_console.spec +++ b/pandora_console/pandora_console.spec @@ -3,7 +3,7 @@ # %define name pandorafms_console %define version 6.0SP2 -%define release 160601 +%define release 160602 %define httpd_name httpd # User and Group under which Apache is running %define httpd_name apache2 diff --git a/pandora_console/pandoradb.data.oracle.sql b/pandora_console/pandoradb.data.oracle.sql index 73e3eaf0a6..b9170b9dda 100644 --- a/pandora_console/pandoradb.data.oracle.sql +++ b/pandora_console/pandoradb.data.oracle.sql @@ -65,7 +65,7 @@ INSERT INTO tconfig (token, value) VALUES ('graph_res','5'); INSERT INTO tconfig (token, value) VALUES ('step_compact','1'); INSERT INTO tconfig (token, value) VALUES ('db_scheme_first_version','6.0orc'); INSERT INTO tconfig (token, value) VALUES('db_scheme_version','6.0SP2'); -INSERT INTO tconfig (token, value) VALUES('db_scheme_build','PD160601'); +INSERT INTO tconfig (token, value) VALUES('db_scheme_build','PD160602'); INSERT INTO tconfig (token, value) VALUES ('show_unknown','0'); INSERT INTO tconfig (token, value) VALUES ('show_lastalerts','1'); INSERT INTO tconfig (token, value) VALUES ('style','pandora'); diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control index e43de35725..b665f5a990 100644 --- a/pandora_server/DEBIAN/control +++ b/pandora_server/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-server -Version: 6.0SP2-160601 +Version: 6.0SP2-160602 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 4d9ddf2106..775a302f6a 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="6.0SP2-160601" +pandora_version="6.0SP2-160602" package_cpan=0 package_pandora=1 diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm index 916fe10bbb..dbba2b8a99 100644 --- a/pandora_server/lib/PandoraFMS/Config.pm +++ b/pandora_server/lib/PandoraFMS/Config.pm @@ -43,7 +43,7 @@ our @EXPORT = qw( # version: Defines actual version of Pandora Server for this module only my $pandora_version = "6.0SP2"; -my $pandora_build = "160601"; +my $pandora_build = "160602"; our $VERSION = $pandora_version." ".$pandora_build; # Setup hash diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index 30d87d192e..f70892d4b9 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 6.0SP2 -%define release 160601 +%define release 160602 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index fc2f815cbd..50f94a609d 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 6.0SP2 -%define release 160601 +%define release 160602 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index f8d017702b..f44d5445bd 100644 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="6.0SP2" -PI_BUILD="160601" +PI_BUILD="160602" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 3e220bac8f..c1761c4566 100644 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -33,7 +33,7 @@ use PandoraFMS::Tools; use PandoraFMS::DB; # version: define current version -my $version = "6.0SP2 PS160601"; +my $version = "6.0SP2 PS160602"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 7638cceee4..d0c256aef9 100644 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -35,7 +35,7 @@ use Encode::Locale; Encode::Locale::decode_argv; # version: define current version -my $version = "6.0SP2 PS160601"; +my $version = "6.0SP2 PS160602"; # save program name for logging my $progname = basename($0);