summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Geiger2011-10-20 16:58:37 +0200
committerBjörn Geiger2011-10-20 16:58:37 +0200
commitd72dc62d5b5d0f93ac7936d0ffc533e4a962354d (patch)
tree6dc5f2d577df0cd159e11f2fd5f5bd3ae203ac8c
parentkleine Korrekturen (diff)
downloadpbs2-d72dc62d5b5d0f93ac7936d0ffc533e4a962354d.tar.gz
pbs2-d72dc62d5b5d0f93ac7936d0ffc533e4a962354d.tar.xz
pbs2-d72dc62d5b5d0f93ac7936d0ffc533e4a962354d.zip
Korrektur
-rwxr-xr-xapplication/controllers/ResourceController.php14
-rwxr-xr-xsetup/pbs.sql9
2 files changed, 17 insertions, 6 deletions
diff --git a/application/controllers/ResourceController.php b/application/controllers/ResourceController.php
index 954ba3b..a7c80b1 100755
--- a/application/controllers/ResourceController.php
+++ b/application/controllers/ResourceController.php
@@ -919,8 +919,11 @@ class ResourceController extends Zend_Controller_Action
if(isset($params['bootosid'])) {
$bootos = array($bootosMapper->find($params['bootosid']));
if($bootos[0]->getGroupID() != $groupID) {
- header('HTTP/1.0 403 No Right to Show this Bootos');
- die();
+ list($rightroles1) = $this->rightrolesMapper->findBy(array('rightID' => '110', 'roleID' => $this->membership->getRoleID()));
+ if($rightroles1 == null){
+ header('HTTP/1.0 403 No Right to Show this Bootos');
+ die();
+ }
}
} else {
$groupgroupsMapper = new Application_Model_GroupGroupsMapper();
@@ -1020,8 +1023,11 @@ class ResourceController extends Zend_Controller_Action
$pool = array(new Application_Model_Pool());
$poolMapper->find($params['poolid'], $pool[0]);
if($pool[0]->getGroupID() != $groupID) {
- header('HTTP/1.0 403 No Right to Show this Pool');
- die();
+ list($rightroles1) = $this->rightrolesMapper->findBy(array('rightID' => '109', 'roleID' => $this->membership->getRoleID()));
+ if($rightroles1 == null){
+ header('HTTP/1.0 403 No Right to Show this Pool');
+ die();
+ }
}
} else {
$pool = $poolMapper->findBy(array('groupid' => $groupID));
diff --git a/setup/pbs.sql b/setup/pbs.sql
index 6c0f1d5..6f92e5c 100755
--- a/setup/pbs.sql
+++ b/setup/pbs.sql
@@ -672,13 +672,18 @@ INSERT INTO `pbs_right` (`rightID`, `rightcategoryID`, `shortcut`, `title`, `des
-- Events ausführen
(NULL, '13', 'er', 'Run Events', NULL);
+
+(NULL, '13', 'psoo', 'Show Pool of other Group', NULL),
+ -- Events ausführen
+(NULL, '13', 'bsoo', 'Show Bootos of others', NULL);
+
-- Adding Super-User
INSERT INTO `pbs_group` (`groupID` ,`title` ,`description`)VALUES
(1, 'OpenSLX', 'This is the OpenSLX-Group');
INSERT INTO `pbs_role` (`roleID`, `groupID`, `title`, `description`, `inheritance`) VALUES
(1, '1', 'SuperAdmin', 'The SuperAdmin', 0);
INSERT INTO `pbs_rightroles` (`roleID`, `rightID`) VALUES
-(1, 1),(1, 2),(1, 3),(1, 4),(1, 5),(1, 6),(1, 7),(1, 8),(1, 9),(1, 10),(1, 11),(1, 12),(1, 13),(1, 14),(1, 15),(1, 16),(1, 17),(1, 18),(1, 19),(1, 20),(1, 21),(1, 22),(1, 23),(1, 24),(1, 25),(1, 26),(1, 27),(1, 28),(1, 29),(1, 30),(1, 31),(1, 32),(1, 33),(1, 34),(1, 35),(1, 36),(1, 37),(1, 38),(1, 39),(1, 40),(1, 41),(1, 42),(1, 43),(1, 44),(1, 45),(1, 46),(1, 47),(1, 48),(1, 49),(1, 50),(1, 51),(1, 52),(1, 53),(1, 54),(1, 55),(1, 56),(1, 57),(1, 58),(1, 59),(1, 60),(1, 61),(1, 62),(1, 63),(1, 64),(1, 65),(1, 66),(1, 67),(1, 68),(1, 69),(1, 70),(1, 71),(1, 72),(1, 73),(1, 74),(1, 75),(1, 76),(1, 77),(1, 78),(1, 79),(1, 80),(1, 81),(1, 82),(1, 83),(1, 84),(1, 85),(1, 86),(1, 87),(1, 88),(1, 89),(1, 90),(1, 91),(1, 92),(1, 93),(1, 94),(1, 95),(1, 96),(1, 97),(1, 98),(1, 99),(1, 100),(1, 101),(1, 102),(1, 103),(1, 104),(1, 105),(1, 106),(1, 107),(1, 108);
+(1, 1),(1, 2),(1, 3),(1, 4),(1, 5),(1, 6),(1, 7),(1, 8),(1, 9),(1, 10),(1, 11),(1, 12),(1, 13),(1, 14),(1, 15),(1, 16),(1, 17),(1, 18),(1, 19),(1, 20),(1, 21),(1, 22),(1, 23),(1, 24),(1, 25),(1, 26),(1, 27),(1, 28),(1, 29),(1, 30),(1, 31),(1, 32),(1, 33),(1, 34),(1, 35),(1, 36),(1, 37),(1, 38),(1, 39),(1, 40),(1, 41),(1, 42),(1, 43),(1, 44),(1, 45),(1, 46),(1, 47),(1, 48),(1, 49),(1, 50),(1, 51),(1, 52),(1, 53),(1, 54),(1, 55),(1, 56),(1, 57),(1, 58),(1, 59),(1, 60),(1, 61),(1, 62),(1, 63),(1, 64),(1, 65),(1, 66),(1, 67),(1, 68),(1, 69),(1, 70),(1, 71),(1, 72),(1, 73),(1, 74),(1, 75),(1, 76),(1, 77),(1, 78),(1, 79),(1, 80),(1, 81),(1, 82),(1, 83),(1, 84),(1, 85),(1, 86),(1, 87),(1, 88),(1, 89),(1, 90),(1, 91),(1, 92),(1, 93),(1, 94),(1, 95),(1, 96),(1, 97),(1, 98),(1, 99),(1, 100),(1, 101),(1, 102),(1, 103),(1, 104),(1, 105),(1, 106),(1, 107),(1, 108),(1, 109),(1, 110);
-- Adding Community-Admin
INSERT INTO `pbs_role` (`roleID`, `groupID`, `title`, `description`, `inheritance`) VALUES
@@ -690,7 +695,7 @@ INSERT INTO `pbs_rightroles` (`roleID`, `rightID`) VALUES
INSERT INTO `pbs_role` (`roleID`, `groupID`, `title`, `description`, `inheritance`) VALUES
(3, 1, 'Monitor-Admin', 'This role can monitor all details of the pbs-server', 1);
INSERT INTO `pbs_rightroles` (`roleID`, `rightID`) VALUES
-(3, 1),(3, 9),(3, 10),(3, 11),(3, 12),(3, 16),(3, 23),(3, 25),(3, 32),(3, 39),(3, 45),(3, 50),(3, 51),(3, 52),(3, 56),(3, 62),(3, 71),(3, 72),(3, 73),(3, 75),(3, 79),(3, 86),(3, 94),(3, 101);
+(3, 1),(3, 9),(3, 10),(3, 11),(3, 12),(3, 16),(3, 23),(3, 25),(3, 32),(3, 39),(3, 45),(3, 50),(3, 51),(3, 52),(3, 56),(3, 62),(3, 71),(3, 72),(3, 73),(3, 75),(3, 79),(3, 86),(3, 94),(3, 101),(1, 109),(1, 110);
-- Adding Default-Admin
INSERT INTO `pbs_role` (`roleID`, `groupID`, `title`, `description`, `inheritance`) VALUES