summaryrefslogtreecommitdiffstats
path: root/application/modules
diff options
context:
space:
mode:
authormichael pereira2011-04-01 13:56:31 +0200
committermichael pereira2011-04-01 13:56:31 +0200
commitc6ba86b7bb05519d32296e62c1bce0fd2225e90a (patch)
treeeee0a011813b3dec8e8d05f49246b37551cb7e26 /application/modules
parentbootmenu (diff)
parentMerge branch 'master' of ssh://git.openslx.org/lsfks/master-teamprojekt/pbs2 (diff)
downloadpbs2-c6ba86b7bb05519d32296e62c1bce0fd2225e90a.tar.gz
pbs2-c6ba86b7bb05519d32296e62c1bce0fd2225e90a.tar.xz
pbs2-c6ba86b7bb05519d32296e62c1bce0fd2225e90a.zip
Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2
Diffstat (limited to 'application/modules')
-rw-r--r--application/modules/fbgui/controllers/IndexController.php1
-rw-r--r--application/modules/user/controllers/BootisoController.php1
-rw-r--r--application/modules/user/controllers/ClientController.php21
-rw-r--r--application/modules/user/controllers/FilterController.php109
-rw-r--r--application/modules/user/controllers/PoolController.php52
-rw-r--r--application/modules/user/controllers/RoleController.php34
-rw-r--r--application/modules/user/forms/Bootiso.php7
-rw-r--r--application/modules/user/forms/Bootos.php6
-rw-r--r--application/modules/user/forms/Client.php14
-rw-r--r--application/modules/user/forms/Filter.php15
-rw-r--r--application/modules/user/forms/FilterEntry.php6
-rw-r--r--application/modules/user/forms/Pool.php10
-rw-r--r--application/modules/user/forms/PoolClient.php4
-rw-r--r--application/modules/user/forms/RoleAdd.php23
-rw-r--r--application/modules/user/views/scripts/client/index.phtml6
-rw-r--r--application/modules/user/views/scripts/filter/index.phtml17
-rw-r--r--application/modules/user/views/scripts/pool/index.phtml13
-rw-r--r--application/modules/user/views/scripts/role/show.phtml8
18 files changed, 232 insertions, 115 deletions
diff --git a/application/modules/fbgui/controllers/IndexController.php b/application/modules/fbgui/controllers/IndexController.php
index 505c68b..be84e58 100644
--- a/application/modules/fbgui/controllers/IndexController.php
+++ b/application/modules/fbgui/controllers/IndexController.php
@@ -102,7 +102,6 @@ class Fbgui_IndexController extends Zend_Controller_Action
echo "fbgui.startDownload('http://132.230.4.27/dev/resource/getkernel/alpha/".$_SESSION['alphasessionID']."/file/kernel');\n";
echo "fbgui.startDownload('http://132.230.4.27/dev/resource/getinitramfs/alpha/".$_SESSION['alphasessionID']."/file/initramfs');\n";
echo "fbgui.startDownload('http://132.230.4.27/dev/resource/getkcl/alpha/".$_SESSION['alphasessionID']."/file/kcl');\n";
- echo "fbgui.getSession('".$_SESSION['alphasessionID']."');\n";
echo "function foo(){
fbgui.quit();
}";
diff --git a/application/modules/user/controllers/BootisoController.php b/application/modules/user/controllers/BootisoController.php
index 57062e0..1b7f1c4 100644
--- a/application/modules/user/controllers/BootisoController.php
+++ b/application/modules/user/controllers/BootisoController.php
@@ -9,6 +9,7 @@ class user_BootisoController extends Zend_Controller_Action
public function init()
{
+ error_reporting(E_ALL);
if (Zend_Auth::getInstance()->hasIdentity()) {
$userIDsNamespace = Zend_Session::namespaceGet('userIDs');
if($userIDsNamespace['membershipID'] ==''){
diff --git a/application/modules/user/controllers/ClientController.php b/application/modules/user/controllers/ClientController.php
index b9399b2..c9bfd84 100644
--- a/application/modules/user/controllers/ClientController.php
+++ b/application/modules/user/controllers/ClientController.php
@@ -60,6 +60,7 @@ class User_ClientController extends Zend_Controller_Action
$pagination = new Pbs_Pagination();
$this->view->pagination = $pagination->pagination('/user/client/index',$req_page,$numpages);
+ $this->view->page = $req_page;
$this->view->clients = array_slice($clientsInGroup,$startitem,$perpage);
}
@@ -77,7 +78,7 @@ class User_ClientController extends Zend_Controller_Action
$addclient = new user_Form_Client(array('buttontext' => 'Create Client'));
$this->view->addclient = $addclient;
}
- else{
+ else{
$addclient = new user_Form_Client(array('buttontext' => 'Create Client'),$_POST);
if ($addclient->isValid($_POST) || ($mac != '' && $hh != '') ) {
$client = new Application_Model_Client($_POST);
@@ -97,6 +98,7 @@ class User_ClientController extends Zend_Controller_Action
public function removeclientAction()
{
$clientID = $this->_request->getParam('clientID');
+ $page = $this->_request->getParam('page');
// ACL: is he authorized to delete clients?
if(!Pbs_Acl::checkRight('cld'))
@@ -109,13 +111,13 @@ class User_ClientController extends Zend_Controller_Action
if($client->getGroupID() == $this->membership->getGroupID()){
$clientMapper = new Application_Model_ClientMapper();
$clientMapper->delete($client);
- $this->_redirect('/user/client/index/deleteresult/ok');
+ $this->_redirect('/user/client/index/page/'.$page.'/deleteresult/ok');
}
else{
- $this->_redirect('/user/client/index/deleteresult/forbidden');
+ $this->_redirect('/user/client/index/page/'.$page.'/deleteresult/forbidden');
}
}
- $this->_redirect('/user/client/index/deleteresult/error');
+ $this->_redirect('/user/client/index/page/'.$page.'/deleteresult/error');
}
public function editclientAction(){
@@ -125,6 +127,7 @@ class User_ClientController extends Zend_Controller_Action
if (!isset($_POST["add"])){
$clientID = $this->_request->getParam('clientID');
+ $page = $this->_request->getParam('page');
$client = new Application_Model_Client();
$mapper = new Application_Model_ClientMapper();
$mapper->find($clientID,$client);
@@ -132,17 +135,19 @@ class User_ClientController extends Zend_Controller_Action
if($client->getGroupID() == $this->membership->getGroupID()){
$editclient = new user_Form_Client(array('buttontext' => 'Edit Client'));
$editclient->populate($client->toArray());
+ $editclient->setPage($page);
$this->view->editclient = $editclient;
}
else{
- $this->_redirect('/user/client/index/modifyresult/error');
+ $this->_redirect('/user/client/index/page/'.$page.'/modifyresult/error');
}
}
else{
$editclient = new user_Form_Client(array('buttontext' => 'Edit Client'),$_POST);
if ($editclient->isValid($_POST) || ($mac != '' && $hh != '') ) {
$client = new Application_Model_Client($_POST);
- $client->setID($this->_request->getParam('clientID'));
+ $client->setID($this->_request->getParam('clientID'));
+ $page = $this->_request->getParam('page');
$dbclient = new Application_Model_Client();
$clientMapper = new Application_Model_ClientMapper();
@@ -152,10 +157,10 @@ class User_ClientController extends Zend_Controller_Action
$client->setGroupID($this->membership->getGroupID());
$clientmapper = new Application_Model_ClientMapper();
$clientmapper->save($client);
- $this->_redirect('/user/client/index/modifyresult/ok');
+ $this->_redirect('/user/client/index/page/'.$page.'/modifyresult/ok');
}
else{
- $this->_redirect('/user/client/index/modifyresult/error');
+ $this->_redirect('/user/client/index/page/'.$page.'/modifyresult/error');
}
}
$this->view->editclient = $editclient;
diff --git a/application/modules/user/controllers/FilterController.php b/application/modules/user/controllers/FilterController.php
index c8cd2e5..eaeaba1 100644
--- a/application/modules/user/controllers/FilterController.php
+++ b/application/modules/user/controllers/FilterController.php
@@ -53,8 +53,21 @@ class User_FilterController extends Zend_Controller_Action
$ff->setID($filter['filterID']);
$allFilter[] = $ff;
}
+ $perpage = 2;
+ $req_page = $this->_request->getParam('page');
+ $all = count($allFilter);
+ $numpages = ceil($all/$perpage);
+ if($req_page < 0 || !is_numeric($req_page) )
+ $req_page = 0;
+ if($req_page >= $numpages)
+ $req_page = $numpages-1;
+ $startitem = $req_page * $perpage;
+
+ $pagination = new Pbs_Pagination();
+ $this->view->pagination = $pagination->pagination('/user/filter/index',$req_page,$numpages);
+ $this->view->page = $req_page;
- $this->view->filters = $allFilter;
+ $this->view->filters = array_slice($allFilter,$startitem,$perpage);
}
public function addfilterAction()
@@ -63,36 +76,26 @@ class User_FilterController extends Zend_Controller_Action
if(!Pbs_Acl::checkRight('fa'))
$this->_redirect('/user');
- $rr = new Application_Model_GroupGroupsMapper();
- $groupMapper = new Application_Model_GroupMapper();
- $parentGroups = $rr->getParentGroups($this->membership->getGroupID());
- $bootmenus = array();
- foreach($parentGroups as $parentGroup){
- foreach($parentGroup as $p){
- $bmmapper = new Application_Model_BootMenuMapper();
- $result = $bmmapper->findBy('groupID',$p);
- foreach($result as $rr){
- $bm = new Application_Model_BootMenu();
- $bm->setOptions($rr);
- $bm->setID($rr['bootmenuID']);
- if($bm->getMembershipID() == null){
- $group = new Application_Model_Group();
- $groupMapper->find($bm->getGroupID(),$group);
-
- $name = $group->getTitle();
- $bootmenus[$name][$bm->getID()] = $bm->getTitle();
- }
- }
- }
- }
+ $bmmapper = new Application_Model_BootMenuMapper();
+ $result = $bmmapper->findBy('groupID',$this->membership->getGroupID());
+ $page = $this->_request->getParam('page');
+
+ foreach($result as $rr){
+ $bm = new Application_Model_BootMenu();
+ $bm->setOptions($rr);
+ $bm->setID($rr['bootmenuID']);
+ $bootmenus[] = $bm;
+ }
$this->view->bootmenus = $bootmenus;
if (!isset($_POST["add"])){
$addfilterform = new user_Form_Filter(array('buttontext' => 'Create Filter','bootmenus'=>$bootmenus));
+ $addfilterform->setPage($page);
$this->view->addfilterform = $addfilterform;
}else {
$addfilterform = new user_Form_Filter(array('buttontext' => 'Create Filter','bootmenus'=>$bootmenus),$_POST);
+ $addfilterform->setPage($page);
if ($addfilterform->isValid($_POST)) {
try{
$newfilter = new Application_Model_Filter($_POST);
@@ -109,10 +112,10 @@ class User_FilterController extends Zend_Controller_Action
$filterentry->setFiltervalue($this->membership->getGroupID());
$filterentriesMapper->save($filterentry);
- $this->_redirect('/user/filter/index/addresult/ok');
+ $this->_redirect('/user/filter/index/page/'.$page.'/addresult/ok');
}catch (Zend_Exception $e) {
echo "Error message 2: " . $e->getMessage() . "\n";
- $this->_redirect('/user/filter/index/addresult/error');
+ $this->_redirect('/user/filter/index/page/'.$page.'/addresult/error');
}
}
$this->view->addfilterform = $addfilterform;
@@ -122,6 +125,7 @@ class User_FilterController extends Zend_Controller_Action
public function removefilterAction()
{
$filterID = $this->_request->getParam('filterID');
+ $page = $this->_request->getParam('page');
$filtermapper = new Application_Model_FilterMapper();
// ACL: Is he allowed to remove the filter
@@ -135,14 +139,14 @@ class User_FilterController extends Zend_Controller_Action
$deletefilter = new Application_Model_Filter();
$deletefilter->setID($filterID);
$filtermapper->delete($deletefilter);
- $this->_redirect('/user/filter/index/deleteresult/ok');
+ $this->_redirect('/user/filter/index/page/'.$page.'/deleteresult/ok');
}
else{
- $this->_redirect('/user/filter/index/deleteresult/forbidden');
+ $this->_redirect('/user/filter/index/page/'.$page.'/deleteresult/forbidden');
}
}
else{
- $this->_redirect('/user/filter/index/deleteresult/error');
+ $this->_redirect('/user/filter/index/page/'.$page.'/deleteresult/error');
}
}
@@ -150,6 +154,7 @@ class User_FilterController extends Zend_Controller_Action
{
$bmmapper = new Application_Model_BootMenuMapper();
$result = $bmmapper->findBy('groupID',$this->membership->getGroupID());
+ $page = $this->_request->getParam('page');
foreach($result as $rr){
$bm = new Application_Model_BootMenu();
$bm->setOptions($rr);
@@ -170,10 +175,11 @@ class User_FilterController extends Zend_Controller_Action
$filter2 = $filter->toArray();
$editfilterform = new user_Form_Filter(array('buttontext' => 'Edit Filter','bootmenus'=>$bootmenus));
$editfilterform->populate($filter2);
+ $editfilterform->setPage($page);
$this->view->editfilterform = $editfilterform;
}
else{
- $this->_redirect('/user/filter/index/modifyresult/forbidden');
+ $this->_redirect('/user/filter/index/page/'.$page.'/modifyresult/forbidden');
}
} else{
try{
@@ -183,6 +189,7 @@ class User_FilterController extends Zend_Controller_Action
$filtermapper->find($filterID,$filter);
if($filter->getGroupID() == $this->membership->getGroupID()){
$editfilterform = new user_Form_Filter(array('buttontext' => 'Edit Filter','bootmenus'=>$bootmenus),$_POST);
+ $editfilterform->setPage($page);
if ($editfilterform->isValid($_POST)) {
$filtermapper = new Application_Model_FilterMapper();
@@ -192,33 +199,33 @@ class User_FilterController extends Zend_Controller_Action
$newfilterentry->setMembershipID(null);
// ACL: if he is only allowed to edit filterpriority
- if(Pbs_Acl::checkRight('fefp')){
+ if(Pbs_Acl::checkRight('fefp') && !Pbs_Acl::checkRight('fe')){
$DBfilterentry = new Application_Model_Filter();
$filtermapper->find($this->_request->getParam('filterID'),$DBfilterentry);
$compareresult = $filtermapper->compare($newfilterentry,$DBfilterentry);
if(isset($compareresult['priority']) && count($compareresult) == 1){
$filtermapper->save($newfilterentry);
- $this->_redirect('/user/filter/index/modifyresult/ok');
+ $this->_redirect('/user/filter/index/page/'.$page.'/modifyresult/ok');
}
else{
- $this->_redirect('/user/filter/index/modifyresult/forbidden');
+ $this->_redirect('/user/filter/index/page/'.$page.'/modifyresult/forbidden');
}
}
// ACL: he is allowed to edit the filter
elseif(Pbs_Acl::checkRight('fe')){
$filtermapper->save($newfilterentry);
- $this->_redirect('/user/filter/index/modifyresult/ok');
+ $this->_redirect('/user/filter/index/page/'.$page.'/modifyresult/ok');
}
}
$this->view->editfilterform = $editfilterform;
}
else{
- $this->_redirect('/user/filter/index/modifyresult/forbidden');
+ $this->_redirect('/user/filter/index/page/'.$page.'/modifyresult/forbidden');
}
}catch (Zend_Exception $e) {
echo "Error message 2: " . $e->getMessage() . "\n";
- $this->_redirect('/user/filter/index/modifyresult/error');
+ $this->_redirect('/user/filter/index/page/'.$page.'/modifyresult/error');
}
}
}
@@ -257,6 +264,7 @@ class User_FilterController extends Zend_Controller_Action
$this->_redirect('/user');
$filterID = $this->_request->getParam('filterID');
+ $page = $this->_request->getParam('page');
$filterMapper = new Application_Model_FilterMapper();
$filter = new Application_Model_Filter();
$filterMapper->find($filterID,$filter);
@@ -272,16 +280,18 @@ class User_FilterController extends Zend_Controller_Action
'data' => $_POST
));
$addform->populate($_POST);
+ $addform->setPage($page);
$this->view->addform = $addform;
}catch (Zend_Exception $e) {
echo "Error message 2: " . $e->getMessage() . "\n";
- $this->_redirect('/user/filter/index/addresult/error');
+ $this->_redirect('/user/filter/index/page/'.$page.'/addresult/error');
}
} else{
$addform = new user_Form_FilterEntry(array('buttontext' => 'Add Filterentry',
'selectData' => $selectData,
'data'=>$_POST
));
+ $addform->setPage($page);
if ($addform->isValid($_POST)) {
print_a('valid');
$newfilterenty = new Application_Model_FilterEntries();
@@ -305,13 +315,13 @@ class User_FilterController extends Zend_Controller_Action
$newfilter2 = new Application_Model_FilterEntriesMapper();
$newfilter2->save($newfilterenty);
- $this->_redirect('/user/filter/index/addresult/ok');
+ $this->_redirect('/user/filter/index/page/'.$page.'/addresult/ok');
}
$this->view->addform = $addform;
}
}
else{
- $this->_redirect('/user/filter/index/addresult/forbidden');
+ $this->_redirect('/user/filter/index/page/'.$page.'/addresult/forbidden');
}
}
@@ -320,7 +330,7 @@ class User_FilterController extends Zend_Controller_Action
//ACL: is he allowed to edit filterentrys ?
if(!Pbs_Acl::checkRight('ffe'))
$this->_redirect('/user');
-
+ $page = $this->_request->getParam('page');
$selectData = $this->prepareFormData();
if (!isset($_POST["add"])){
try{
@@ -342,16 +352,17 @@ class User_FilterController extends Zend_Controller_Action
'selectData' => $selectData,
'data' => $data
));
+ $editfilterform->setPage($page);
$editfilterform->populate($filterentry->toArray());
$this->view->editfilterform = $editfilterform;
}
else{
- $this->_redirect('/user/filter/index/modifyresult/forbidden');
+ $this->_redirect('/user/filter/index/page/'.$page.'/modifyresult/forbidden');
}
}catch (Zend_Exception $e) {
echo "Error message 2: " . $e->getMessage() . "\n";
- $this->_redirect('/user/filter/index/modifyresult/error');
+ $this->_redirect('/user/filter/index/page/'.$page.'/modifyresult/error');
}
} else{
try{
@@ -360,6 +371,7 @@ class User_FilterController extends Zend_Controller_Action
'selectData' => $selectData,
'data' => $_POST
));
+ $editfilterform->setPage($page);
if ($editfilterform->isValid($_POST)) {
$filterentry = new Application_Model_FilterEntries();
$filterentriesmapper = new Application_Model_FilterEntriesMapper();
@@ -390,17 +402,17 @@ class User_FilterController extends Zend_Controller_Action
$newfilter2 = new Application_Model_FilterEntriesMapper();
$newfilter2->save($newfilterenty);
- $this->_redirect('/user/filter/index/modifyresult/ok');
+ $this->_redirect('/user/filter/index/page/'.$page.'/modifyresult/ok');
}
else{
- $this->_redirect('/user/filter/index/modifyresult/forbidden');
+ $this->_redirect('/user/filter/index/page/'.$page.'/modifyresult/forbidden');
}
}
$this->view->editfilterform = $editfilterform;
}catch (Zend_Exception $e) {
echo "Error message 2: " . $e->getMessage() . "\n";
- $this->_redirect('/user/filter/index/modifyresult/error');
+ $this->_redirect('/user/filter/index/page/'.$page.'/modifyresult/error');
}
}
}
@@ -412,6 +424,7 @@ class User_FilterController extends Zend_Controller_Action
$this->_redirect('/user');
$filterentriesID = $this->_request->getParam('filterentriesID');
+ $page = $this->_request->getParam('page');
if(is_numeric($filterentriesID)){
$filterentriesmapper = new Application_Model_FilterEntriesMapper();
$filterentry = new Application_Model_FilterEntries();
@@ -429,19 +442,19 @@ class User_FilterController extends Zend_Controller_Action
$filterentriesmapper = new Application_Model_FilterEntriesMapper();
$filterentriesmapper->delete($deletefilterentry);
- $this->_redirect('/user/filter/index/deleteresult/ok');
+ $this->_redirect('/user/filter/index/page/'.$page.'/deleteresult/ok');
}catch (Zend_Exception $e) {
echo "Error message 2: " . $e->getMessage() . "\n";
- $this->_redirect('/user/filter/index/deleteresult/error');
+ $this->_redirect('/user/filter/index/page/'.$page.'/deleteresult/error');
}
}
else{
- $this->_redirect('/user/filter/index/deleteresult/forbidden');
+ $this->_redirect('/user/filter/index/page/'.$page.'/deleteresult/forbidden');
}
}
else{
- $this->_redirect('/user/filter/index/deleteresult/error');
+ $this->_redirect('/user/filter/index/page/'.$page.'/deleteresult/error');
}
}
private function fillup($string, $length, $seperator=':',$sign='0'){
diff --git a/application/modules/user/controllers/PoolController.php b/application/modules/user/controllers/PoolController.php
index ab6a078..5584b85 100644
--- a/application/modules/user/controllers/PoolController.php
+++ b/application/modules/user/controllers/PoolController.php
@@ -62,7 +62,7 @@ class User_PoolController extends Zend_Controller_Action
$ff->setID($pool['poolID']);
$yourpools[] = $ff;
}
- $perpage = 5;
+ $perpage = 4;
$req_page = $this->_request->getParam('page');
$all = count($yourpools);
$numpages = ceil($all/$perpage);
@@ -74,6 +74,7 @@ class User_PoolController extends Zend_Controller_Action
$pagination = new Pbs_Pagination();
$this->view->pagination = $pagination->pagination('/user/pool/index',$req_page,$numpages);
+ $this->view->page = $req_page;
$this->view->pools = array_slice($yourpools,$startitem,$perpage);
// Get all Clients from this group
@@ -99,12 +100,16 @@ class User_PoolController extends Zend_Controller_Action
// ACL: is he allowed to create a pool?
if(!Pbs_Acl::checkRight('poc'))
$this->_redirect('/user');
-
+
+ $page = $this->_request->getParam('page');
+
if (!isset($_POST["add"])){
- $addfilterform = new user_Form_Pool(array('buttontext' => 'Create Pool'));
+ $addfilterform = new user_Form_Pool(array('buttontext' => 'Create Pool'));
+ $addfilterform->setPage($page);
$this->view->addpool = $addfilterform;
}else {
- $addpoolform = new user_Form_Pool(array('buttontext' => 'Create Pool'),$_POST);
+ $addpoolform = new user_Form_Pool(array('buttontext' => 'Create Pool'),$_POST);
+ $addpoolform->setPage($page);
if ($addpoolform->isValid($_POST)) {
try{
$pool = new Application_Model_Pool($_POST);
@@ -124,6 +129,7 @@ class User_PoolController extends Zend_Controller_Action
public function deletepoolAction()
{
$poolID = $this->_request->getParam('poolID');
+ $page = $this->_request->getParam('page');
// ACL: is he allowed to delete a pool?
if(!Pbs_Acl::checkRight('pod'))
@@ -137,13 +143,13 @@ class User_PoolController extends Zend_Controller_Action
$deletepool = new Application_Model_Pool();
$deletepool->setID($poolID);
$poolmapper->delete($deletepool);
- $this->_redirect('/user/pool/index/deleteresult/ok');
+ $this->_redirect('/user/pool/index/page/'.$page.'/deleteresult/ok');
}
else{
- $this->_redirect('/user/pool/index/deleteresult/forbidden');
+ $this->_redirect('/user/pool/index/page/'.$page.'/deleteresult/forbidden');
}
}
- $this->_redirect('/user/pool/index/deleteresult/error');
+ $this->_redirect('/user/pool/index/page/'.$page.'/deleteresult/error');
}
public function editpoolAction()
@@ -152,26 +158,30 @@ class User_PoolController extends Zend_Controller_Action
if(!Pbs_Acl::checkRight('poe'))
$this->_redirect('/user');
+ $page = $this->_request->getParam('page');
if (!isset($_POST["add"])){
- $poolID = $this->_request->getParam('poolID');
+ $poolID = $this->_request->getParam('poolID');
$pool = new Application_Model_Pool();
$poolmapper = new Application_Model_PoolMapper();
$poolmapper->find($poolID,$pool);
if($pool->getGroupID() == $this->membership->getGroupID()){
$poolArray = $pool->toArray();
$editpool = new user_Form_Pool(array('buttontext' => 'Edit Pool'));
+ $editpool->setPage($page);
$editpool->populate($poolArray);
$this->view->editpool = $editpool;
}
else{
- $this->_redirect('/user/pool/index/modifyresult/forbidden');
+ $this->_redirect('/user/pool/index/page/'.$page.'/modifyresult/forbidden');
}
}else {
$editpoolform = new user_Form_Pool(array('buttontext' => 'Edit Pool'),$_POST);
+ $editpoolform->setPage($page);
if ($editpoolform->isValid($_POST)) {
try{
$poolmapper = new Application_Model_PoolMapper();
$poolID = $this->_request->getParam('poolID');
+ $page = $this->_request->getParam('page');
$pooldb = new Application_Model_Pool();
$poolmapper->find($poolID,$pooldb);
print_a($pooldb->getGroupID(), $this->membership->getGroupID());
@@ -180,14 +190,14 @@ class User_PoolController extends Zend_Controller_Action
$pool->setID($poolID);
$pool->setGroupID($this->membership->getGroupID());
$poolmapper->save($pool);
- $this->_redirect('/user/pool/index/modifyresult/ok');
+ $this->_redirect('/user/pool/index/page/'.$page.'/modifyresult/ok');
}
else{
- $this->_redirect('/user/pool/index/modifyresult/forbidden');
+ $this->_redirect('/user/pool/index/page/'.$page.'/modifyresult/forbidden');
}
}catch (Zend_Exception $e) {
echo "Error message 2: " . $e->getMessage() . "\n";
- $this->_redirect('/user/pool/index/modifyresult/error');
+ $this->_redirect('/user/pool/index/page/'.$page.'/modifyresult/error');
}
}
$this->view->editpool = $editpoolform;
@@ -198,6 +208,7 @@ class User_PoolController extends Zend_Controller_Action
{
$clientID = $this->_request->getParam('clientID');
$poolID = $this->_request->getParam('poolID');
+ $page = $this->_request->getParam('page');
// ACL: Is he allowed to link clients to pools?
if(!Pbs_Acl::checkRight('polc'))
@@ -214,9 +225,11 @@ class User_PoolController extends Zend_Controller_Action
$freeclients = $this->arrayDiff($clients,$assignedclientsArray);
$poolclient = new user_Form_PoolClient(array('buttontext' => 'Link Client','clients'=> $freeclients));
+ $poolclient->setPage($page);
$this->view->poolclient = $poolclient;
}else {
- $poolclient = new dev_Form_PoolClient(array('buttontext' => 'Link Client'),$_POST);
+ $poolclient = new user_Form_PoolClient(array('buttontext' => 'Link Client'),$_POST);
+ $poolclient->setPage($page);
try{
$poolID = $this->_request->getParam('poolID');
$poolmapper = new Application_Model_PoolMapper();
@@ -234,14 +247,14 @@ class User_PoolController extends Zend_Controller_Action
$poolentry->setClientID($clientID);
}
$poolentriesmapper->save($poolentry);
- $this->_redirect('/user/pool/index/linkresult/ok');
+ $this->_redirect('/user/pool/index/page/'.$page.'/linkresult/ok');
}
else{
- $this->_redirect('/user/pool/index/linkresult/forbidden');
+ $this->_redirect('/user/pool/index/page/'.$page.'/linkresult/forbidden');
}
}catch (Zend_Exception $e) {
echo "Error message 2: " . $e->getMessage() . "\n";
- $this->_redirect('/user/pool/index/linkresult/error');
+ $this->_redirect('/user/pool/index/page/'.$page.'/linkresult/error');
}
$this->view->poolclient = $poolclient;
}
@@ -250,6 +263,7 @@ class User_PoolController extends Zend_Controller_Action
public function unlinkclientAction()
{
$poolentriesID = $this->_request->getParam('poolentriesID');
+ $page = $this->_request->getParam('page');
// ACL: Is he allowed to unlink clients from pools?
if(!Pbs_Acl::checkRight('pouc'))
@@ -274,14 +288,14 @@ class User_PoolController extends Zend_Controller_Action
$deletepoolentries->setID($poolentriesID);
$deletepoolentriesmapper = new Application_Model_PoolEntriesMapper();
$deletepoolentriesmapper->delete($deletepoolentries);
- $this->_redirect('/user/pool/index/unlinkresult/ok');
+ $this->_redirect('/user/pool/index/page/'.$page.'/unlinkresult/ok');
}
else{
- $this->_redirect('/user/pool/index/unlinkresult/forbidden');
+ $this->_redirect('/user/pool/index/page/'.$page.'/unlinkresult/forbidden');
}
}
else{
- $this->_redirect('/user/pool/index/unlinkresult/error');
+ $this->_redirect('/user/pool/index/page/'.$page.'/unlinkresult/error');
}
}
diff --git a/application/modules/user/controllers/RoleController.php b/application/modules/user/controllers/RoleController.php
index d8ed9e6..6246c9d 100644
--- a/application/modules/user/controllers/RoleController.php
+++ b/application/modules/user/controllers/RoleController.php
@@ -35,23 +35,49 @@ class User_RoleController extends Zend_Controller_Action
public function addAction()
{
if(isset($this->userIDsNamespace['groupID'])) {
+ $roleID = $this->userIDsNamespace['roleID'];
+ $rights = $this->rightMapper->fetchAll();
+ if(count($rights) > 0) {
+ $rightCategoryMapper = new Application_Model_RightCategoryMapper();
+ foreach($rights as $right) {
+ $rightCategory = $rightCategoryMapper->find($right->getRightcategoryID());
+ $rightlist[$rightCategory->getTitle()][$right->getID()] = $right->getTitle();
+ }
+ }
if (!isset($_POST["add"])){
- $addForm = new user_Form_RoleAdd(array('rightlist' => $rightList));
+ $addForm = new user_Form_RoleAdd(array('rightlist' => $rightlist));
} else {
- $addForm = new user_Form_RoleAdd(array('rightlist' => $rightList),$_POST);
+ $addForm = new user_Form_RoleAdd(array('rightlist' => $rightlist),$_POST);
if ($addForm->isValid($_POST)) {
$_POST['groupID'] = $this->userIDsNamespace['groupID'];
$role = new Application_Model_Role($_POST);
try {
$this->roleMapper->save($role);
+ $db = Zend_Db_Table::getDefaultAdapter();
+ $insertedRoleID = $db->lastInsertId();
} catch(Zend_Exception $e)
{
echo "Caught exception: " . get_class($e) . "<br/>";
echo "Message: " . $e->getMessage() . "<br/>";
return;
}
- $this->_helper->redirector('', 'role');
- return;
+ foreach($_POST['rights'] as $rightID => $bool) {
+ if($bool == 1) {
+ $rightrole = new Application_Model_RightRoles();
+ $rightrole->setRightID($rightID);
+ $rightrole->setRoleID($insertedRoleID);
+ try {
+ $this->rightRolesMapper->save($rightrole);
+ } catch(Zend_Exception $e)
+ {
+ echo "Caught exception: " . get_class($e) . "<br/>";
+ echo "Message: " . $e->getMessage() . "<br/>";
+ return;
+ }
+ }
+ }
+ //$this->_helper->redirector('', 'role');
+ //return;
}
}
diff --git a/application/modules/user/forms/Bootiso.php b/application/modules/user/forms/Bootiso.php
index 3aba0af..7c472c0 100644
--- a/application/modules/user/forms/Bootiso.php
+++ b/application/modules/user/forms/Bootiso.php
@@ -120,12 +120,13 @@ class user_Form_Bootiso extends Zend_Form
});
function changeDepth(){
i = $("#depth option:selected").val();
- $('#depthimg').attr('src','/stats/graphgroup/level/' + i);
- }</script>
+ $('#depthimg').attr('src','/stats/graphgroup/level/' + i);
+ }
+ </script>
<div id='groups' style='text-align: center;'>
<div class='v1'>
- <img id='depthimg' src='/stats/graphgroup/' />
+ <img alt='Please select a public level' id='depthimg' src='/stats/graphgroup/level/0' />
</div>
</div>
diff --git a/application/modules/user/forms/Bootos.php b/application/modules/user/forms/Bootos.php
index f56761b..5fa890a 100644
--- a/application/modules/user/forms/Bootos.php
+++ b/application/modules/user/forms/Bootos.php
@@ -144,7 +144,11 @@ class user_Form_Bootos extends Zend_Form
?>
- <script>changeDepth();
+ <script>
+ $(document).ready(function(){
+ changeDepth();
+ $('#groups .v1').show();
+ });
function changeDepth(){
i = $("#depth option:selected").val();
$('#depthimg').attr('src','/stats/graphgroup/level/' + i);
diff --git a/application/modules/user/forms/Client.php b/application/modules/user/forms/Client.php
index 9f3926c..aa8d478 100644
--- a/application/modules/user/forms/Client.php
+++ b/application/modules/user/forms/Client.php
@@ -42,17 +42,25 @@ class user_Form_Client extends Zend_Form
'required' => false,
'ignore' => true,
'label' => $this->buttontext,
- ));
+ ));
$this->addElement('button', 'Cancel', array(
- 'onclick' => 'self.location="/user/client"'
- ));
+ 'onclick' => 'self.location="/user/client/index/page/'.$this->page.'"'
+ ));
+
+ $this->addElement('hidden','page', array(
+ 'value' => $this->page
+ ));
}
private $buttontext = 'Save';
private $groups;
function setButtontext($v){
$this->buttontext = $v;
}
+ private $page;
+ function setPage($page){
+ $this->page = $page;
+ }
}
diff --git a/application/modules/user/forms/Filter.php b/application/modules/user/forms/Filter.php
index 4526a61..a7a2555 100644
--- a/application/modules/user/forms/Filter.php
+++ b/application/modules/user/forms/Filter.php
@@ -27,14 +27,13 @@ class user_Form_Filter extends Zend_Form
$bootmenufield = $this->createElement('select','bootmenuID');
$bootmenufield ->setLabel('Bootmenu:');
- /*if(count($this->bootmenus)>0){
- foreach($this->bootmenus as $bm){
- foreach($bm as $id => $g){
- $bootmenufield->addMultiOption($g->getID(), $g->getTitle());
- }
+ if(count($this->bootmenus)>0){
+ foreach($this->bootmenus as $g){
+ $bootmenufield->addMultiOption($g->getID(), $g->getTitle());
+
}
- }*/
- $bootmenufield->setMultioptions($this->bootmenus);
+ }
+
$bootmenufield->setRegisterInArrayValidator(false);
$this->addElement($bootmenufield);
@@ -53,7 +52,7 @@ class user_Form_Filter extends Zend_Form
));
$this->addElement('button', 'Cancel', array(
- 'onclick' => 'self.location="/user/filter"'
+ 'onclick' => 'self.location="/user/filter/index/page/'.$this->page.'"'
));
$this->addElement('hidden', 'created', array(
diff --git a/application/modules/user/forms/FilterEntry.php b/application/modules/user/forms/FilterEntry.php
index c2581c2..33453d7 100644
--- a/application/modules/user/forms/FilterEntry.php
+++ b/application/modules/user/forms/FilterEntry.php
@@ -330,7 +330,7 @@ class user_Form_FilterEntry extends Zend_Form
));
$this->addElement('button', 'Cancel', array(
- 'onclick' => 'self.location="/user/filter"'
+ 'onclick' => 'self.location="/user/filter/index/page/'.$this->page.'"'
));
$this->addElement('hidden', 'filterID', array(
@@ -355,6 +355,10 @@ class user_Form_FilterEntry extends Zend_Form
function setSelectData($v){
$this->selectData = $v;
}
+ private $page;
+ function setPage($page){
+ $this->page = $page;
+ }
}
?>
diff --git a/application/modules/user/forms/Pool.php b/application/modules/user/forms/Pool.php
index 909bdd6..055d0a7 100644
--- a/application/modules/user/forms/Pool.php
+++ b/application/modules/user/forms/Pool.php
@@ -42,13 +42,21 @@ class user_Form_Pool extends Zend_Form
));
$this->addElement('button', 'Cancel', array(
- 'onclick' => 'self.location="/user/pool"'
+ 'onclick' => 'self.location="/user/pool/index/page/'.$this->page.'"'
));
+
+ $this->addElement('hidden','page', array(
+ 'value' => $this->page
+ ));
}
private $buttontext = 'Save';
function setButtontext($v){
$this->buttontext = $v;
}
+ private $page;
+ function setPage($page){
+ $this->page = $page;
+ }
}
diff --git a/application/modules/user/forms/PoolClient.php b/application/modules/user/forms/PoolClient.php
index 52ba7d8..c4c6e7f 100644
--- a/application/modules/user/forms/PoolClient.php
+++ b/application/modules/user/forms/PoolClient.php
@@ -26,5 +26,9 @@ class user_Form_PoolClient extends Zend_Form
$this->clients = $clients;
return $this;
}
+ private $buttontext = 'Save';
+ function setButtontext($v){
+ $this->buttontext = $v;
+ }
}
diff --git a/application/modules/user/forms/RoleAdd.php b/application/modules/user/forms/RoleAdd.php
index e8e99a5..9a9570c 100644
--- a/application/modules/user/forms/RoleAdd.php
+++ b/application/modules/user/forms/RoleAdd.php
@@ -22,15 +22,32 @@ class user_Form_RoleAdd extends Zend_Form
'label' => 'Title:',
));
- $this->addElement('text', 'description', array(
+ $this->addElement('text', 'title', array(
'filters' => array('StringTrim'),
'validators' => array(
- array('StringLength', false, array(0, 140)),
+ array('StringLength', false, array(0, 50)),
),
'required' => false,
- 'label' => 'Description:',
+ 'label' => 'Title:',
));
+ $sform = new Zend_Form_SubForm(array('legend' => 'Rights:'));
+ if(count($this->rightlist) > 0) {
+ foreach($this->rightlist as $rightcategory => $rights) {
+ foreach($rights as $rightID => $rightTitle) {
+ $element = $this->createElement('checkbox', "$rightID", array(
+ 'label' => $rightTitle . ':',
+ 'belongsTo' => 'rights',
+ ));
+ $elements[] = $rightID;
+ $sform->addElement($element);
+ }
+ $sform->addDisplayGroup($elements, "$rightcategory", array("legend" => $rightcategory . ":"));
+ unset($elements);
+ }
+ }
+ $this->addSubForm($sform, 'rights');
+
$this->addElement('checkbox', 'inheritance', array(
'label' => 'Inheritance:',
));
diff --git a/application/modules/user/views/scripts/client/index.phtml b/application/modules/user/views/scripts/client/index.phtml
index dd7aad2..1e3345e 100644
--- a/application/modules/user/views/scripts/client/index.phtml
+++ b/application/modules/user/views/scripts/client/index.phtml
@@ -20,7 +20,8 @@
'module' => 'user',
'controller' => 'client',
'action' => 'editclient',
- 'clientID' => $client['clientID']
+ 'clientID' => $client['clientID'],
+ 'page' => $this->page
),
'default',
true) ?>"><img src='/media/img/edit.png' alt='Edit Client'/></a></td>
@@ -29,7 +30,8 @@
'module' => 'user',
'controller' => 'client',
'action' => 'removeclient',
- 'clientID' => $client['clientID']
+ 'clientID' => $client['clientID'],
+ 'page' => $this->page
),
'default',
true) ?>"><img src='/media/img/delete.png' alt='Delete Client'/></a></td>
diff --git a/application/modules/user/views/scripts/filter/index.phtml b/application/modules/user/views/scripts/filter/index.phtml
index 8ca6174..bb7f11a 100644
--- a/application/modules/user/views/scripts/filter/index.phtml
+++ b/application/modules/user/views/scripts/filter/index.phtml
@@ -26,7 +26,8 @@
'module' => 'user',
'controller' => 'filter',
'action' => 'editfilter',
- 'filterID' => $filter->getID()
+ 'filterID' => $filter->getID(),
+ 'page' => $this->page
),
'default',
true) ?>"><img src='/media/img/edit.png' alt='Edit Filter'/></a></td>
@@ -35,7 +36,8 @@
'module' => 'user',
'controller' => 'filter',
'action' => 'removefilter',
- 'filterID' => $filter->getID()
+ 'filterID' => $filter->getID(),
+ 'page' => $this->page
),
'default',
true) ?>"><img src='/media/img/delete.png' alt='Delete Filter'/></a></td>
@@ -44,7 +46,8 @@
'module' => 'user',
'controller' => 'filter',
'action' => 'addfilterentry',
- 'filterID' => $filter->getID()
+ 'filterID' => $filter->getID(),
+ 'page' => $this->page
),
'default',
true) ?>"><img src='/media/img/add.png' alt='Add Filterentry'/></a></td>
@@ -89,7 +92,8 @@
'module' => 'user',
'controller' => 'filter',
'action' => 'editfilterentry',
- 'filterentriesID' => $filterentry['filterentriesID']
+ 'filterentriesID' => $filterentry['filterentriesID'],
+ 'page' => $this->page
),
'default',
true) ?>"><img src='/media/img/edit.png' alt='Edit Filterentry'/></a>
@@ -98,7 +102,8 @@
'module' => 'user',
'controller' => 'filter',
'action' => 'removefilterentry',
- 'filterentriesID' => $filterentry['filterentriesID']
+ 'filterentriesID' => $filterentry['filterentriesID'],
+ 'page' => $this->page
),
'default',
true) ?>"><img src='/media/img/delete.png' alt='Delete Filterentry'/></a>
@@ -111,7 +116,7 @@
<?php endif;?>
<?php endforeach ?>
</table>
-
+ <?php echo $this->pagination; ?>
<?php else: ?>
diff --git a/application/modules/user/views/scripts/pool/index.phtml b/application/modules/user/views/scripts/pool/index.phtml
index 7e6e400..36934f6 100644
--- a/application/modules/user/views/scripts/pool/index.phtml
+++ b/application/modules/user/views/scripts/pool/index.phtml
@@ -24,7 +24,8 @@
'module' => 'user',
'controller' => 'pool',
'action' => 'editpool',
- 'poolID' => $pool->getID()
+ 'poolID' => $pool->getID(),
+ 'page' => $this->page
),
'default',
true) ?>"><img src='/media/img/edit.png' alt='Edit Pool'/></a></td>
@@ -33,7 +34,8 @@
'module' => 'user',
'controller' => 'pool',
'action' => 'deletepool',
- 'poolID' => $pool->getID()
+ 'poolID' => $pool->getID(),
+ 'page' => $this->page
),
'default',
true) ?>"><img src='/media/img/delete.png' alt='Delete Pool'/></a></td>
@@ -42,7 +44,8 @@
'module' => 'user',
'controller' => 'pool',
'action' => 'linkclient',
- 'poolID' => $pool->getID()
+ 'poolID' => $pool->getID(),
+ 'page' => $this->page
),
'default',
true) ?>"><img src='/media/img/add.png' alt='Link Client'/></a></td>
@@ -78,7 +81,8 @@
'module' => 'user',
'controller' => 'pool',
'action' => 'unlinkclient',
- 'poolentriesID' => $client['poolentriesID']
+ 'poolentriesID' => $client['poolentriesID'],
+ 'page' => $this->page
),
'default',
true) ?>"><img src='/media/img/delete.png' alt='Unlink Client'/></a></td>
@@ -117,6 +121,7 @@ foreach ($this->freeclients as $client): ?>
'action' => 'linkclient',
'clientID' => $client['clientID'],
'poolID' => $pool->getID(),
+ 'page' => $this->page
),
'default',
true) ?>"><?php echo $pool->getTitle(); ?></option>
diff --git a/application/modules/user/views/scripts/role/show.phtml b/application/modules/user/views/scripts/role/show.phtml
index 408dcc4..6c6f8f5 100644
--- a/application/modules/user/views/scripts/role/show.phtml
+++ b/application/modules/user/views/scripts/role/show.phtml
@@ -44,7 +44,8 @@ if($this->roleID) {
if(isset($this->rightcategorieslist)) {
foreach($this->rightcategorieslist as $k => $v) {
$rights = $this->rightsList[$k];
- ?>
+ if(count($rights) > 0) {
+ ?>
<h3><?php echo $v; ?></h3>
<table>
<tr>
@@ -76,6 +77,7 @@ if($this->roleID) {
?>
</table>
<?php
+ }
}
}
} else {
@@ -84,6 +86,6 @@ if($this->roleID) {
<center>
<h3>No Rights have been added!</h3>
</center>
-<?php
-}
+ <?php
+ }
} \ No newline at end of file