summaryrefslogtreecommitdiffstats
path: root/application/modules
diff options
context:
space:
mode:
Diffstat (limited to 'application/modules')
-rw-r--r--application/modules/user/controllers/BootisoController.php35
-rw-r--r--application/modules/user/controllers/BootmenuController.php18
-rw-r--r--application/modules/user/controllers/BootosController.php39
-rw-r--r--application/modules/user/controllers/ConfigController.php48
-rw-r--r--application/modules/user/controllers/PrebootController.php41
5 files changed, 84 insertions, 97 deletions
diff --git a/application/modules/user/controllers/BootisoController.php b/application/modules/user/controllers/BootisoController.php
index 877cb65..5c3acaa 100644
--- a/application/modules/user/controllers/BootisoController.php
+++ b/application/modules/user/controllers/BootisoController.php
@@ -58,8 +58,8 @@ class user_BootisoController extends Zend_Controller_Action
$groupID = $this->membership->getGroupID();
- //TODO ACL Darf er BootISOMenu sehen?
- if(false)
+ //ACL Darf er BootISOMenu sehen?
+ if(!Pbs_Acl::checkRight('bai') && !Pbs_Acl::checkRight('bui'))
$this->_redirect('/user/index');
$groupgroupsMapper = new Application_Model_GroupGroupsMapper();
@@ -101,9 +101,8 @@ class user_BootisoController extends Zend_Controller_Action
$this->view->pagination = $pagination->pagination($pageurl);
$this->view->page = $pagination->getRequestPage();
$this->view->bootisolist= $this->view->bootisolist;
-
-
-
+
+
$prebootMapper = new Application_Model_PreBootMapper();
$this->view->prebootlist = array();
@@ -126,8 +125,8 @@ class user_BootisoController extends Zend_Controller_Action
- //TODO ACL Darf er BootISOs downloaden?
- if(false)
+ //ACL Darf er BootISOs downloaden?
+ if(!Pbs_Acl::checkRight('bdld'))
$this->_redirect('/user/bootiso/index/page/'.$this->page.'/downloadresult/forbidden');
$prebootID = $this->_request->getParam('prebootID');
@@ -159,8 +158,8 @@ class user_BootisoController extends Zend_Controller_Action
public function createbootisoAction()
{
- //TODO ACL Darf er BootISOs erstellen?
- if(false)
+ //ACL Darf er BootISOs erstellen?
+ if(!Pbs_Acl::checkRight('bc'))
$this->_redirect('/user/bootiso/index/page/'.$this->page.'/addresult/forbidden');
$groupgroupsMapper = new Application_Model_GroupGroupsMapper();
@@ -176,7 +175,6 @@ class user_BootisoController extends Zend_Controller_Action
'action' => 'createbootiso',
'prebootlist' => $prebootlist,
'groupdepth' => $childgroups,
- 'rights' => null,
'page'=>$this->page));
} else {
@@ -184,14 +182,12 @@ class user_BootisoController extends Zend_Controller_Action
'action' => 'createbootiso',
'prebootlist' => $prebootlist,
'groupdepth' => $childgroups,
- 'rights' => null,
'page'=>$this->page),$_POST);
if ($bootisoForm->isValid($_POST)) {
$bootiso = new Application_Model_BootIso($_POST);
- $bootiso->setMembershipID($this->membership->getID());
$bootiso->setGroupID($this->membership->getGroupID());
$bootiso->setCreated(time());
@@ -227,8 +223,8 @@ class user_BootisoController extends Zend_Controller_Action
public function editbootisoAction()
{
- //TODO ACL Darf er BootISOs editieren?
- if(false)
+ //ACL Darf er BootISOs editieren?
+ if(!Pbs_Acl::checkRight('be'))
$this->_redirect('/user/bootiso/index/page/'.$this->page.'/modifyresult/forbidden');
$bootisoID = $this->_request->getParam('bootisoID');
@@ -255,7 +251,6 @@ class user_BootisoController extends Zend_Controller_Action
'action' => 'editbootiso',
'prebootlist' => $prebootlist,
'groupdepth' => $childgroups,
- 'rights' => 'meta',
'page' => $this->page));
$bootisoForm->populate($bootiso->toArray());
@@ -264,7 +259,6 @@ class user_BootisoController extends Zend_Controller_Action
'action' => 'editbootiso',
'prebootlist' => $prebootlist,
'groupdepth' => $childgroups,
- 'rights' => 'meta',
'page' => $this->page),$_POST);
if ($bootisoForm->isValid($_POST)) {
@@ -272,7 +266,6 @@ class user_BootisoController extends Zend_Controller_Action
$bootisoold = $bootiso;
$bootiso = new Application_Model_BootIso($_POST);
- $bootiso->setMembershipID($this->membership->getID());
$bootiso->setGroupID($this->membership->getGroupID());
$bootiso->setCreated(time());
$bootiso->setID($bootisoID);
@@ -282,8 +275,8 @@ class user_BootisoController extends Zend_Controller_Action
$bootiso->getExpires() != $bootisoold->getExpires() ||
$bootiso->getPublic() != $bootisoold->getPublic() ||
$bootiso->getSerialnumber() != $bootisoold->getSerialnumber()){
- //TODO ACL Is he allowed to edit other than Metadata?
- if(false)
+ //ACL Is he allowed to edit other than Metadata?
+ if(Pbs_Acl::checkRight('bem'))
$this->_redirect('/user/bootiso/index/page/'.$this->page.'/modifyresult/forbidden');
}
@@ -317,8 +310,8 @@ class user_BootisoController extends Zend_Controller_Action
public function deletebootisoAction()
{
- //TODO ACL Darf er BootISOs löschen?
- if(false)
+ //ACL Darf er BootISOs löschen?
+ if(!Pbs_Acl::checkRight('bd'))
$this->_redirect('/user/bootiso/index/page/'.$this->page.'/deleteresult/forbidden');
try{
diff --git a/application/modules/user/controllers/BootmenuController.php b/application/modules/user/controllers/BootmenuController.php
index dfe9f20..84c31ff 100644
--- a/application/modules/user/controllers/BootmenuController.php
+++ b/application/modules/user/controllers/BootmenuController.php
@@ -57,8 +57,8 @@ class user_BootmenuController extends Zend_Controller_Action
}
- //TODO ACL Darf er Bootmenus sehen?
- if(false)
+ //ACL Darf er Bootmenus sehen?
+ if(!Pbs_Acl::checkRight('booai') && !Pbs_Acl::checkRight('booui'))
$this->_redirect('/user/index');
$this->bootMenumapper = new Application_Model_BootMenuMapper();
@@ -66,8 +66,7 @@ class user_BootmenuController extends Zend_Controller_Action
$bootosMapper = new Application_Model_BootOsMapper();
$configMapper = new Application_Model_ConfigMapper();
- if(true){
- //TODO nur Bootmenus von Admins
+ if(Pbs_Acl::checkRight('booai')){
$bootmenu = $this->bootmenuMapper->findBy(array('groupID' => $this->membership->getGroupID()));
foreach ($bootmenu as $bm){
$bootmenuID = $bm->getID();
@@ -122,22 +121,23 @@ class user_BootmenuController extends Zend_Controller_Action
public function createbootmenuAction()
{
- //TODO ACL Darf er BootMenus erstellen?
- if(false)
+ //ACL Darf er BootMenus erstellen?
+ if(!Pbs_Acl::checkRight('booc'))
$this->_redirect('/user/bootmenu/index/page/'.$this->page.'/addresult/forbidden');
if (!isset($_POST["createbootmenu"])){
- $bootmenuForm = new user_Form_Bootmenu(array('action' => 'createbootmenu', 'rights' => 'all','page' => $this->page));
+ $bootmenuForm = new user_Form_Bootmenu(array('action' => 'createbootmenu','page' => $this->page));
} else {
- $bootmenuForm = new user_Form_Bootmenu(array('action' => 'createbootmenu', 'rights' => 'all','page' => $this->page),$_POST);
+ $bootmenuForm = new user_Form_Bootmenu(array('action' => 'createbootmenu','page' => $this->page),$_POST);
if ($bootmenuForm->isValid($_POST)) {
$bootmenu = new Application_Model_BootMenu($_POST);
+ $bootmenu->setCreated(time());
+
$bootmenu->setMembershipID($this->membership->getID());
$bootmenu->setGroupID($this->membership->getGroupID());
- $bootmenu->setCreated(time());
try{
$this->bootmenuMapper->save($bootmenu);
diff --git a/application/modules/user/controllers/BootosController.php b/application/modules/user/controllers/BootosController.php
index e1b4f7b..eeb60a7 100644
--- a/application/modules/user/controllers/BootosController.php
+++ b/application/modules/user/controllers/BootosController.php
@@ -57,8 +57,8 @@ class user_BootosController extends Zend_Controller_Action
$groupID = $this->membership->getGroupID();
- //TODO ACL Darf er BootOsMenu sehen?
- if(false)
+ //ACL Darf er BootOs sehen?
+ if(!Pbs_Acl::checkRight('boai') && !Pbs_Acl::checkRight('boui'))
$this->_redirect('/user/index');
$configMapper = new Application_Model_ConfigMapper();
@@ -110,8 +110,8 @@ class user_BootosController extends Zend_Controller_Action
public function createbootosAction()
{
- //TODO ACL Darf er BootISOs erstellen?
- if(false)
+ //ACL Darf er BootISOs erstellen?
+ if(!Pbs_Acl::checkRight('boc'))
$this->_redirect('/user/bootos/index/page/'.$this->page.'/addresult/forbidden');
$groupID = $this->membership->getGroupID();
@@ -119,7 +119,6 @@ class user_BootosController extends Zend_Controller_Action
$groupgroupsMapper = new Application_Model_GroupGroupsMapper();
$childgroups = count($groupgroupsMapper->getChildGroups($groupID));
- //TODO nur configs von admins
$configMapper = new Application_Model_ConfigMapper();
$configlist = $configMapper->findBy(array("groupID" => $groupID));
@@ -128,7 +127,6 @@ class user_BootosController extends Zend_Controller_Action
'action' => 'createbootos',
'groupdepth' => $childgroups,
'configlist'=>$configlist,
- 'rights' => 'all',
'page' => $this->page));
} else {
@@ -136,14 +134,12 @@ class user_BootosController extends Zend_Controller_Action
'action' => 'createbootos',
'groupdepth' => $childgroups,
'configlist'=>$configlist,
- 'rights' => 'all',
'page' => $this->page),$_POST);
if ($bootosForm->isValid($_POST)) {
$bootos = new Application_Model_BootOs($_POST);
- $bootos->setMembershipID($this->membership->getID());
$bootos->setGroupID($this->membership->getGroupID());
$bootos->setCreated(time());
@@ -194,8 +190,8 @@ class user_BootosController extends Zend_Controller_Action
public function checkupdateAction($bootos)
{
- //TODO ACL Is he allowed to update Preboots?
- if(false)
+ //ACL Is he allowed to update Preboots?
+ if(!Pbs_Acl::checkRight('bou'))
$this->_redirect('/user/preboot/index/page/'.$this->page.'/updateresult/forbidden');
$bootosID = $bootos->getID();
@@ -231,8 +227,8 @@ class user_BootosController extends Zend_Controller_Action
public function updatebootosAction()
{
- //TODO ACL Is he allowed to update Preboots?
- if(false)
+ //ACL Is he allowed to update Preboots?
+ if(!Pbs_Acl::checkRight('bou'))
$this->_redirect('/user/bootiso/index/page/'.$this->page.'/updateresult/forbidden');
$bootosID = $this->_request->getParam('bootosID');
@@ -266,8 +262,8 @@ class user_BootosController extends Zend_Controller_Action
public function editbootosAction()
{
- //TODO ACL Is he allowed to edit Preboots?
- if(false)
+ //ACL Is he allowed to edit Preboots?
+ if(!Pbs_Acl::checkRight('boe'))
$this->_redirect('/user/bootos/index/page/'.$this->page.'/modifyresult/forbidden');
$bootosID = $this->_request->getParam('bootosID');
@@ -294,7 +290,6 @@ class user_BootosController extends Zend_Controller_Action
'action' => 'editbootos',
'groupdepth' => $childgroups,
'configlist'=>$configlist,
- 'rights' => 'meta',
'page' => $this->page));
$bootosForm->populate($bootos->toArray());
@@ -304,7 +299,6 @@ class user_BootosController extends Zend_Controller_Action
'action' => 'editbootos',
'groupdepth' => $childgroups,
'configlist'=>$configlist,
- 'rights' => 'meta',
'page' => $this->page),$_POST);
if ($bootosForm->isValid($_POST)) {
@@ -312,7 +306,6 @@ class user_BootosController extends Zend_Controller_Action
$bootosold = $bootos;
$bootos = new Application_Model_BootOs($_POST);
- $bootos->setMembershipID($this->membership->getID());
$bootos->setGroupID($this->membership->getGroupID());
$bootos->setCreated(time());
if($bootos->getConfigID() == '')
@@ -323,14 +316,14 @@ class user_BootosController extends Zend_Controller_Action
$bootos->getDefaultkcl() != $bootosold->getDefaultkcl() ||
$bootos->getExpires() != $bootosold->getExpires() ||
$bootos->getPublic() != $bootosold->getPublic() ){
- //TODO ACL Is he allowed to edit this?
- if(false)
+ //ACL Is he allowed to edit this?
+ if(Pbs_Acl::checkRight('boem'))
$this->_redirect('/user/bootos/index/page/'.$this->page.'/modifyresult/forbidden');
}
if($bootos->getPath_kernel() != $bootosold->getPath_kernel() || $bootos->getPath_init() != $bootosold->getPath_init()){
- //TODO ACL Is he allowed to edit the Kernel/Init Path?
- if(false)
+ //ACL Is he allowed to edit the Kernel/Init Path?
+ if(Pbs_Acl::checkRight('boem'))
$this->_redirect('/user/bootos/index/page/'.$this->page.'/modifyresult/forbidden');
$path_tmp = "../resources/bootos/";
@@ -380,8 +373,8 @@ class user_BootosController extends Zend_Controller_Action
public function deletebootosAction()
{
- //TODO ACL Is he allowed to delete Bootos?
- if(false)
+ //ACL Is he allowed to delete Bootos?
+ if(!Pbs_Acl::checkRight('bod'))
$this->_redirect('/user/bootos/index/page/'.$this->page.'/deleteresult/forbidden');
try{
diff --git a/application/modules/user/controllers/ConfigController.php b/application/modules/user/controllers/ConfigController.php
index 4bc2526..ecc3c65 100644
--- a/application/modules/user/controllers/ConfigController.php
+++ b/application/modules/user/controllers/ConfigController.php
@@ -48,15 +48,14 @@ class user_ConfigController extends Zend_Controller_Action
$groupID = $this->membership->getGroupID();
- //TODO ACL Darf er Configs sehen?
- if(false)
+ //ACL Darf er Configs sehen?
+ if(!Pbs_Acl::checkRight('csai') && !Pbs_Acl::checkRight('csui'))
$this->_redirect('/user/index');
$this->configMapper = new Application_Model_ConfigMapper();
$groupMapper = new Application_Model_GroupMapper();
- if(true){
- //TODO nur Configs von Admins
+ if(Pbs_Acl::checkRight('csai')){
$this->view->configlist = $this->configMapper->findBy(array('groupID' => $this->membership->getGroupID()));
}else{
$this->view->configlist = $this->configMapper->findBy(array('membershipID' => $this->membership->getID()));
@@ -97,22 +96,25 @@ class user_ConfigController extends Zend_Controller_Action
public function createconfigAction()
{
- //TODO ACL Darf er Configs erstellen?
- if(false)
+ //ACL Darf er Configs erstellen?
+ if(!Pbs_Acl::checkRight('cc'))
$this->_redirect('/user/config/index/page/'.$this->page.'/addresult/forbidden');
if (!isset($_POST["createconfig"])){
- $configForm = new user_Form_Config(array('action' => 'createconfig','rights' => null,'page'=>$this->page));
+ $configForm = new user_Form_Config(array('action' => 'createconfig','page'=>$this->page));
} else {
- $configForm = new user_Form_Config(array('action' => 'createconfig','rights' => null,'page'=>$this->page),$_POST);
+ $configForm = new user_Form_Config(array('action' => 'createconfig','page'=>$this->page),$_POST);
if ($configForm->isValid($_POST)) {
$config = new Application_Model_Config($_POST);
$config->setCreated(time());
- $config->setMembershipID($this->membership->getID());
- $config->setGroupID($this->membership->getGroupID());
-
+
+ if(Pbs_Acl::checkRight('csai'))
+ $config->setGroupID($this->membership->getGroupID());
+ else
+ $config->setMembershipID($this->membership->getID());
+
try {
$this->configMapper->save($config);
}catch(Zend_Exception $e)
@@ -130,8 +132,8 @@ class user_ConfigController extends Zend_Controller_Action
public function editconfigAction()
{
- //TODO ACL Darf er Configs editieren?
- if(false)
+ //ACL Darf er Configs editieren?
+ if(!Pbs_Acl::checkRight('ce'))
$this->_redirect('/user/config/index/page/'.$this->page.'/modifyresult/forbidden');
$configID = $this->_request->getParam('configID');
@@ -153,11 +155,11 @@ class user_ConfigController extends Zend_Controller_Action
if (!isset($_POST["editconfig"])){
- $configForm = new user_Form_Config(array('action' => 'editconfig','rights' => 'meta','page'=>$this->page));
+ $configForm = new user_Form_Config(array('action' => 'editconfig','page'=>$this->page));
$configForm->populate($config->toArray());
}else{
- $configForm = new user_Form_Config(array('action' => 'editconfig','rights' => 'meta','page'=>$this->page),$_POST);
+ $configForm = new user_Form_Config(array('action' => 'editconfig','page'=>$this->page),$_POST);
if ($configForm->isValid($_POST)) {
@@ -165,13 +167,17 @@ class user_ConfigController extends Zend_Controller_Action
$config = new Application_Model_Config($_POST);
$config->setCreated(time());
- $config->setMembershipID($this->membership->getID());
- $config->setGroupID($this->membership->getGroupID());
+
+ if(Pbs_Acl::checkRight('csai'))
+ $config->setGroupID($this->membership->getGroupID());
+ else
+ $config->setMembershipID($this->membership->getID());
+
$config->setID($configID);
if($configold->getShellscript() != $config->getShellscript()){
- //TODO ACL Is he allowed to edit other than Metadata?
- if(false)
+ //ACL Is he allowed to edit other than Metadata?
+ if(Pbs_Acl::checkRight('cem'))
$this->_redirect('/user/config/index/page/'.$this->page.'/modifyresult/forbidden');
}
@@ -195,8 +201,8 @@ class user_ConfigController extends Zend_Controller_Action
public function deleteconfigAction()
{
- //TODO ACL Darf er Configs löschen?
- if(false)
+ //ACL Darf er Configs löschen?
+ if(!Pbs_Acl::checkRight('cd'))
$this->_redirect('/user/config/index/page/'.$this->page.'/deleteresult/forbidden');
try{
diff --git a/application/modules/user/controllers/PrebootController.php b/application/modules/user/controllers/PrebootController.php
index 43cbf8a..94759f6 100644
--- a/application/modules/user/controllers/PrebootController.php
+++ b/application/modules/user/controllers/PrebootController.php
@@ -58,8 +58,8 @@ class User_PrebootController extends Zend_Controller_Action
$groupID = $this->membership->getGroupID();
- //TODO ACL Darf er PrebootMenu sehen?
- if(false)
+ //ACL Darf er PrebootMenu sehen?
+ if(!Pbs_Acl::checkRight('pro'))
$this->_redirect('/user/index');
$this->view->prebootlist = $this->prebootMapper->findBy(array("groupID" => $groupID));
@@ -87,8 +87,7 @@ class User_PrebootController extends Zend_Controller_Action
$this->view->page = $pagination->getRequestPage();
$this->view->prebootlist= $this->view->prebootlist;
-
-
+
$this->view->update = array();
$update = $this->_request->getParam('checkupdate');
@@ -107,8 +106,8 @@ class User_PrebootController extends Zend_Controller_Action
public function createprebootAction()
{
- //TODO ACL Is he allowed to create Preboots?
- if(false)
+ //ACL Is he allowed to create Preboots?
+ if(!Pbs_Acl::checkRight('prc'))
$this->_redirect('/user/preboot/index/page/'.$this->page.'/addresult/forbidden');
if (!isset($_POST["createpreboot"])){
@@ -124,8 +123,7 @@ class User_PrebootController extends Zend_Controller_Action
if ($prebootForm->isValid($_POST)) {
$preboot = new Application_Model_PreBoot($_POST);
- $preboot->setMembershipID($this->membership->getID());
- $preboot->setGroupID($this->membership->getGroupID());
+ $preboot->setGroupID($this->membership->getGroupID());
try {
@@ -168,8 +166,8 @@ class User_PrebootController extends Zend_Controller_Action
public function checkupdateAction($preboot)
{
- //TODO ACL Is he allowed to update Preboots?
- if(false)
+ //ACL Is he allowed to update Preboots?
+ if(!Pbs_Acl::checkRight('pru'))
$this->_redirect('/user/preboot/index/page/'.$this->page.'/updateresult/forbidden');
$prebootID = $preboot->getID();
@@ -199,8 +197,8 @@ class User_PrebootController extends Zend_Controller_Action
public function updateprebootAction()
{
- //TODO ACL Is he allowed to update Preboots?
- if(false)
+ //ACL Is he allowed to update Preboots?
+ if(!Pbs_Acl::checkRight('pru'))
$this->_redirect('/user/preboot/index/page/'.$this->page.'/updateresult/forbidden');
$prebootID = $this->_request->getParam('prebootID');
@@ -258,8 +256,8 @@ class User_PrebootController extends Zend_Controller_Action
public function editprebootAction()
{
- //TODO ACL Is he allowed to edit Preboots?
- if(false)
+ //ACL Is he allowed to edit Preboots?
+ if(!Pbs_Acl::checkRight('pre'))
$this->_redirect('/user/preboot/index/page/'.$this->page.'/modifyresult/forbidden');
$prebootID = $this->_request->getParam('prebootID');
@@ -277,16 +275,14 @@ class User_PrebootController extends Zend_Controller_Action
if (!isset($_POST["editpreboot"])){
$prebootForm = new user_Form_Preboot(array(
- 'action' => 'editpreboot',
- 'rights' => 'meta',
+ 'action' => 'editpreboot',
'page' => $this->page));
$prebootForm->populate($preboot->toArray());
}else{
$prebootForm = new user_Form_Preboot(array(
- 'action' => 'editpreboot',
- 'rights' => 'meta',
+ 'action' => 'editpreboot',
'page' => $this->page),$_POST);
if ($prebootForm->isValid($_POST)) {
@@ -294,7 +290,6 @@ class User_PrebootController extends Zend_Controller_Action
$prebootold = $preboot;
$preboot = new Application_Model_PreBoot($_POST);
- $preboot->setMembershipID($this->membership->getID());
$preboot->setGroupID($this->membership->getGroupID());
$preboot->setID($prebootID);
@@ -302,8 +297,8 @@ class User_PrebootController extends Zend_Controller_Action
if($preboot->getPath_preboot() != $prebootold->getPath_preboot()){
- //TODO ACL Is he allowed to edit the Preboot Path?
- if(false)
+ //ACL Is he allowed to edit the Preboot Path?
+ if(Pbs_Acl::checkRight('prem'))
$this->_redirect('/user/preboot/index/page/'.$this->page.'/modifyresult/forbidden');
exec("wget -O '".$path_preboot."preboot.zip' ".escapeshellcmd($preboot->getPath_preboot()) ." 2>&1 | grep 'saved'" , $status);
@@ -365,8 +360,8 @@ class User_PrebootController extends Zend_Controller_Action
public function deleteprebootAction()
{
- //TODO ACL Is he allowed to delete Preboots?
- if(false)
+ //ACL Is he allowed to delete Preboots?
+ if(!Pbs_Acl::checkRight('prd'))
$this->_redirect('/user/preboot/index/page/'.$this->page.'/deleteresult/forbidden');
try{