tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-29 16:55:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pandora_6.0' of https://github.com/pandorafms/pandorafms into pandora_6.0

Browse Source
This commit is contained in:
m-lopez-f 2016-06-02 12:57:46 +02:00
commit 4f9ea2a456
29 changed files with 35 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_agents/unix/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-agent-unix package: pandorafms-agent-unix
Version: 6.0SP2-160601 Version: 6.0SP2-160602
Architecture: all Architecture: all
Priority: optional Priority: optional
Section: admin Section: admin

2
pandora_agents/unix/DEBIAN/make_deb_package.sh
View File

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # 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." echo "Test if you has the tools for to make the packages."
whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null

2
pandora_agents/unix/pandora_agent
View File

@ -41,7 +41,7 @@ my $Sem = undef;
my $ThreadSem = undef; my $ThreadSem = undef;
use constant AGENT_VERSION => '6.0SP2'; use constant AGENT_VERSION => '6.0SP2';
use constant AGENT_BUILD => '160601'; use constant AGENT_BUILD => '160602';
# Commands to retrieve total memory information in kB # Commands to retrieve total memory information in kB
use constant TOTALMEMORY_CMDS => { use constant TOTALMEMORY_CMDS => {

2
pandora_agents/unix/pandora_agent.redhat.spec
View File

@ -3,7 +3,7 @@
# #
%define name pandorafms_agent_unix %define name pandorafms_agent_unix
%define version 6.0SP2 %define version 6.0SP2
%define release 160601 %define release 160602
Summary: Pandora FMS Linux agent, PERL version Summary: Pandora FMS Linux agent, PERL version
Name: %{name} Name: %{name}

2
pandora_agents/unix/pandora_agent.spec
View File

@ -3,7 +3,7 @@
# #
%define name pandorafms_agent_unix %define name pandorafms_agent_unix
%define version 6.0SP2 %define version 6.0SP2
%define release 160601 %define release 160602
Summary: Pandora FMS Linux agent, PERL version Summary: Pandora FMS Linux agent, PERL version
Name: %{name} Name: %{name}

2
pandora_agents/unix/pandora_agent_installer
View File

@ -10,7 +10,7 @@
# ********************************************************************** # **********************************************************************
PI_VERSION="6.0SP2" PI_VERSION="6.0SP2"
PI_BUILD="160601" PI_BUILD="160602"
OS_NAME=`uname -s` OS_NAME=`uname -s`
FORCE=0 FORCE=0

2
pandora_agents/win32/installer/pandora.mpi
View File

@ -186,7 +186,7 @@ UpgradeApplicationID
{} {}
Version Version
{160601} {160602}
ViewReadme ViewReadme
{Yes} {Yes}

2
pandora_agents/win32/pandora.cc
View File

@ -30,7 +30,7 @@ using namespace Pandora;
using namespace Pandora_Strutils; using namespace Pandora_Strutils;
#define PATH_SIZE _MAX_PATH+1 #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_path;
string pandora_dir; string pandora_dir;

2
pandora_agents/win32/versioninfo.rc
View File

@ -11,7 +11,7 @@ BEGIN
VALUE "LegalCopyright", "Artica ST" VALUE "LegalCopyright", "Artica ST"
VALUE "OriginalFilename", "PandoraAgent.exe" VALUE "OriginalFilename", "PandoraAgent.exe"
VALUE "ProductName", "Pandora FMS Windows Agent" VALUE "ProductName", "Pandora FMS Windows Agent"
VALUE "ProductVersion", "(6.0SP2(Build 160601))" VALUE "ProductVersion", "(6.0SP2(Build 160602))"
VALUE "FileVersion", "1.0.0.0" VALUE "FileVersion", "1.0.0.0"
END END
END END

2
pandora_console/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-console package: pandorafms-console
Version: 6.0SP2-160601 Version: 6.0SP2-160602
Architecture: all Architecture: all
Priority: optional Priority: optional
Section: admin Section: admin

2
pandora_console/DEBIAN/make_deb_package.sh
View File

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
pandora_version="6.0SP2-160601" pandora_version="6.0SP2-160602"
package_pear=0 package_pear=0
package_pandora=1 package_pandora=1

2
pandora_console/godmode/events/event_edit_filter.php
View File

@ -277,7 +277,7 @@ if ($strict_user) {
} }
else { else {
$users = users_get_user_users($config['id_user'], "ER", $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", $table->data[10][1] = html_print_select($users, "id_user_ack",

2
pandora_console/godmode/reporting/reporting_builder.main.php
View File

@ -69,7 +69,7 @@ $table->data['name'][1] = html_print_input_text('name', $reportName,
$table->data['group'][0] = __('Group'); $table->data['group'][0] = __('Group');
$write_groups = users_get_groups_for_select(false, "RW", $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 the report group is not among the RW groups (special permission) we add it
if (!isset($write_groups[$idGroupReport]) && $idGroupReport) { if (!isset($write_groups[$idGroupReport]) && $idGroupReport) {

22
pandora_console/godmode/reporting/reporting_builder.php
View File

@ -373,9 +373,7 @@ switch ($action) {
$delete = true; //owner can delete $delete = true; //owner can delete
} else { } else {
$delete = check_acl($config['id_user'], $delete = check_acl($config['id_user'],
$report['id_group'], "RM") $report['id_group'], "RM");
&&
users_can_manage_group_all($report["id_group"], "RM");
} }
break; break;
case 'group_edit': case 'group_edit':
@ -383,9 +381,7 @@ switch ($action) {
$delete = true; //owner can delete $delete = true; //owner can delete
} else { } else {
$delete = check_acl($config['id_user'], $delete = check_acl($config['id_user'],
$report['id_group'], "RM") $report['id_group'], "RM");
&&
users_can_manage_group_all($report["id_group"], "RM");
} }
break; break;
case 'user_edit': case 'user_edit':
@ -591,7 +587,7 @@ switch ($action) {
$data = array (); $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] = '<a href="' . $config['homeurl'] . 'index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&action=edit&id_report='. $data[0] = '<a href="' . $config['homeurl'] . 'index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&action=edit&id_report='.
$report['id_report'].'&pure='.$pure.'">'.$report['name'].'</a>'; $report['id_report'].'&pure='.$pure.'">'.$report['name'].'</a>';
} }
@ -652,9 +648,7 @@ switch ($action) {
switch ($type_access_selected) { switch ($type_access_selected) {
case 'group_view': case 'group_view':
$edit = check_acl($config['id_user'], $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"])) { if ($config['id_user'] == $report['id_user'] || is_user_admin ($config["id_user"])) {
$delete = true; //owner can delete $delete = true; //owner can delete
@ -664,17 +658,13 @@ switch ($action) {
break; break;
case 'group_edit': case 'group_edit':
$edit = check_acl($config['id_user'], $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"])) { if ($config['id_user'] == $report['id_user'] || is_user_admin ($config["id_user"])) {
$delete = true; //owner can delete $delete = true; //owner can delete
} else { } else {
$delete = check_acl($config['id_user'], $delete = check_acl($config['id_user'],
$report['id_group'], "RM") $report['id_group'], "RM");
&&
users_can_manage_group_all($report["id_group"], "RM");
} }
break; break;
case 'user_edit': case 'user_edit':

2
pandora_console/include/config_process.php
View File

@ -22,7 +22,7 @@
/** /**
* Pandora build version and version * Pandora build version and version
*/ */
$build_version = 'PC160601'; $build_version = 'PC160602';
$pandora_version = 'v6.0SP2'; $pandora_version = 'v6.0SP2';
// Do not overwrite default timezone set if defined. // Do not overwrite default timezone set if defined.

6
pandora_console/include/functions_users.php
View File

@ -821,13 +821,9 @@ function users_check_users() {
// Check if a user can manage a group when group is all // Check if a user can manage a group when group is all
// This function dont check acls of the group, only if the // This function dont check acls of the group, only if the
// user is admin or pandora manager and the group is all // 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; global $config;
if ($id_group != 0) {
return true;
}
$is_admin = db_get_value('is_admin', 'tusuario', 'id_user', $config['id_user']); $is_admin = db_get_value('is_admin', 'tusuario', 'id_user', $config['id_user']);
if (check_acl ($config['id_user'], 0, $access) || $is_admin) { if (check_acl ($config['id_user'], 0, $access) || $is_admin) {

2
pandora_console/install.php
View File

@ -63,7 +63,7 @@
<div style='height: 10px'> <div style='height: 10px'>
<?php <?php
$version = '6.0SP2'; $version = '6.0SP2';
$build = '160601'; $build = '160602';
$banner = "v$version Build $build"; $banner = "v$version Build $build";
error_reporting(0); error_reporting(0);

4
pandora_console/operation/events/events_list.php
View File

@ -427,7 +427,7 @@ $data[0] = __('User ack.') . $jump;
if ($strict_user) { if ($strict_user) {
$user_users = array($config['id_user']=>$config['id_user']); $user_users = array($config['id_user']=>$config['id_user']);
} else { } 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, '', $data[0] .= html_print_select($user_users, "id_user_ack", $id_user_ack, '',
@ -467,7 +467,7 @@ $table_advanced->rowclass[] = '';
$data = array(); $data = array();
$data[0] = __('Date from') . $jump; $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); $data[0] .= html_print_input_text ('date_from', $date_from, '', 15, 10, true);

2
pandora_console/pandora_console.redhat.spec
View File

@ -3,7 +3,7 @@
# #
%define name pandorafms_console %define name pandorafms_console
%define version 6.0SP2 %define version 6.0SP2
%define release 160601 %define release 160602
# User and Group under which Apache is running # User and Group under which Apache is running
%define httpd_name httpd %define httpd_name httpd

2
pandora_console/pandora_console.spec
View File

@ -3,7 +3,7 @@
# #
%define name pandorafms_console %define name pandorafms_console
%define version 6.0SP2 %define version 6.0SP2
%define release 160601 %define release 160602
%define httpd_name httpd %define httpd_name httpd
# User and Group under which Apache is running # User and Group under which Apache is running
%define httpd_name apache2 %define httpd_name apache2

2
pandora_console/pandoradb.data.oracle.sql
View File

@ -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 ('step_compact','1');
INSERT INTO tconfig (token, value) VALUES ('db_scheme_first_version','6.0orc'); 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_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_unknown','0');
INSERT INTO tconfig (token, value) VALUES ('show_lastalerts','1'); INSERT INTO tconfig (token, value) VALUES ('show_lastalerts','1');
INSERT INTO tconfig (token, value) VALUES ('style','pandora'); INSERT INTO tconfig (token, value) VALUES ('style','pandora');

2
pandora_server/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-server package: pandorafms-server
Version: 6.0SP2-160601 Version: 6.0SP2-160602
Architecture: all Architecture: all
Priority: optional Priority: optional
Section: admin Section: admin

2
pandora_server/DEBIAN/make_deb_package.sh
View File

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
pandora_version="6.0SP2-160601" pandora_version="6.0SP2-160602"
package_cpan=0 package_cpan=0
package_pandora=1 package_pandora=1

2
pandora_server/lib/PandoraFMS/Config.pm
View File

@ -43,7 +43,7 @@ our @EXPORT = qw(
# version: Defines actual version of Pandora Server for this module only # version: Defines actual version of Pandora Server for this module only
my $pandora_version = "6.0SP2"; my $pandora_version = "6.0SP2";
my $pandora_build = "160601"; my $pandora_build = "160602";
our $VERSION = $pandora_version." ".$pandora_build; our $VERSION = $pandora_version." ".$pandora_build;
# Setup hash # Setup hash

2
pandora_server/pandora_server.redhat.spec
View File

@ -3,7 +3,7 @@
# #
%define name pandorafms_server %define name pandorafms_server
%define version 6.0SP2 %define version 6.0SP2
%define release 160601 %define release 160602
Summary: Pandora FMS Server Summary: Pandora FMS Server
Name: %{name} Name: %{name}

2
pandora_server/pandora_server.spec
View File

@ -3,7 +3,7 @@
# #
%define name pandorafms_server %define name pandorafms_server
%define version 6.0SP2 %define version 6.0SP2
%define release 160601 %define release 160602
Summary: Pandora FMS Server Summary: Pandora FMS Server
Name: %{name} Name: %{name}

2
pandora_server/pandora_server_installer
View File

@ -9,7 +9,7 @@
# ********************************************************************** # **********************************************************************
PI_VERSION="6.0SP2" PI_VERSION="6.0SP2"
PI_BUILD="160601" PI_BUILD="160602"
MODE=$1 MODE=$1
if [ $# -gt 1 ]; then if [ $# -gt 1 ]; then

2
pandora_server/util/pandora_db.pl
View File

@ -33,7 +33,7 @@ use PandoraFMS::Tools;
use PandoraFMS::DB; use PandoraFMS::DB;
# version: define current version # version: define current version
my $version = "6.0SP2 PS160601"; my $version = "6.0SP2 PS160602";
# Pandora server configuration # Pandora server configuration
my %conf; my %conf;

2
pandora_server/util/pandora_manage.pl
View File

@ -35,7 +35,7 @@ use Encode::Locale;
Encode::Locale::decode_argv; Encode::Locale::decode_argv;
# version: define current version # version: define current version
my $version = "6.0SP2 PS160601"; my $version = "6.0SP2 PS160602";
# save program name for logging # save program name for logging
my $progname = basename($0); my $progname = basename($0);