summaryrefslogtreecommitdiffstats
path: root/application/modules/user/controllers/GroupController.php
diff options
context:
space:
mode:
Diffstat (limited to 'application/modules/user/controllers/GroupController.php')
-rw-r--r--application/modules/user/controllers/GroupController.php47
1 files changed, 24 insertions, 23 deletions
diff --git a/application/modules/user/controllers/GroupController.php b/application/modules/user/controllers/GroupController.php
index 561f116..3f7fde0 100644
--- a/application/modules/user/controllers/GroupController.php
+++ b/application/modules/user/controllers/GroupController.php
@@ -38,7 +38,7 @@ class User_GroupController extends Zend_Controller_Action
$userIDsNamespace = Zend_Session::namespaceGet('userIDs');
$this->membership = new Application_Model_Membership();
$this->membershipMapper->find($userIDsNamespace['membershipID'],$this->membership);
-
+
$this->page = $this->_request->getParam('page');
} else {
$this->_helper->redirector('login', 'auth');
@@ -51,7 +51,7 @@ class User_GroupController extends Zend_Controller_Action
// ACL show overview
if(!Pbs_Acl::checkRight('gso'))
$this->_redirect('/user');
-
+
$result = $this->_request->getParam('deleteresult');
if($result != ""){
$pbsNotifier = new Pbs_Notifier();
@@ -126,7 +126,7 @@ class User_GroupController extends Zend_Controller_Action
$membership->setID();
$membership->setGroupID($groupID);
$membership->setRoleID($roleID);
-
+
try {
$this->membershipMapper->save($membership);
} catch(Zend_Exception $e)
@@ -173,7 +173,7 @@ class User_GroupController extends Zend_Controller_Action
{
// ACL edit a group
if(!Pbs_Acl::checkRight('geo') && !Pbs_Acl::checkRight('ge'))
- $this->_redirect('/user');
+ $this->_redirect('/user');
$groupID = $this->_request->getParam('groupID');
if(!isset($groupID)) {
@@ -186,7 +186,7 @@ class User_GroupController extends Zend_Controller_Action
return;
}
if((!Pbs_Acl::checkRight('geo') && $groupID == $this->membership->getGroupID()) || ( !Pbs_Acl::checkRight('ge') && $groupID != $this->membership->getGroupID() ))
- $this->_redirect('/user/group/index/page/'.$this->page.'/deleteresult/forbidden');
+ $this->_redirect('/user/group/index/page/'.$this->page.'/deleteresult/forbidden');
if (!isset($_POST["save"])){
$group = $this->groupMapper->find($groupID);
$_POST['title'] = $group->getTitle();
@@ -194,9 +194,9 @@ class User_GroupController extends Zend_Controller_Action
$editForm = new user_Form_GroupEdit(array('groupID' => $groupID));
} else {
$editForm = new user_Form_GroupEdit(array('groupID' => $groupID), $_POST);
- if ($editForm->isValid($_POST)) {
+ if ($editForm->isValid($_POST)) {
$group = new Application_Model_Group($_POST);
- $group->setID($groupID);
+ $group->setID($groupID);
try {
$this->groupMapper->save($group);
} catch(Zend_Exception $e)
@@ -225,12 +225,13 @@ class User_GroupController extends Zend_Controller_Action
}
}
if($groupID == $this->membership->getGroupID() && !Pbs_Acl::checkRight('gsdo'))
- $this->_redirect('/user');
+ $this->_redirect('/user');
$this->view->usergroup = $this->membership->getGroupID();
$this->view->requestgroup = $groupID;
$groupRequests = $this->groupRequestMapper->findBy(array('groupID' => $groupID),true);
if(isset($groupRequests)) {
+ $groupRequestList = array();
foreach($groupRequests as $groupRequest) {
$person = $this->personmapper->find($groupRequest['personID']);
$groupRequestList[] = array(
@@ -238,7 +239,7 @@ class User_GroupController extends Zend_Controller_Action
'person' => $person
);
}
- if(is_array($groupRequestList)) {
+ if(count($groupRequestList) > 0) {
$this->view->groupRequestList = $groupRequestList;
}
// Search all inherit Roles
@@ -247,15 +248,15 @@ class User_GroupController extends Zend_Controller_Action
$parents = $groupGroupsMapper->getParentGroups($groupID);
$groupMapper = new Application_Model_GroupMapper();
$crawled = array();
- foreach($parents as $p){
+ foreach($parents as $p){
foreach($p as $a){
if(!in_array($a,$crawled)){
$crawled[] = $a;
$group = $groupMapper->find($a);
if($groupID != $a)
- $r = $this->rolemapper->findBy(array('groupID' => $a,'inheritance'=>"1"));
+ $r = $this->rolemapper->findBy(array('groupID' => $a,'inheritance'=>"1"));
else
- $r = $this->rolemapper->findBy(array('groupID' => $a));
+ $r = $this->rolemapper->findBy(array('groupID' => $a));
foreach($r as $d){
$roles[$group->getTitle()][] = $d;
}
@@ -265,7 +266,7 @@ class User_GroupController extends Zend_Controller_Action
$this->view->roleList = $roles;
}
- if(Pbs_Acl::checkRight('gsmg') || Pbs_Acl::checkRight('gsmgo')){
+ if(Pbs_Acl::checkRight('gsmg') || Pbs_Acl::checkRight('gsmgo')){
$members = $this->membershipMapper->findBy(array('groupID' => $groupID),true);
if(isset($members)) {
foreach($members as $member) {
@@ -291,7 +292,7 @@ class User_GroupController extends Zend_Controller_Action
$memberPagination->setPageUrl('/user/group/show'.((isset($this->view->search))?'/search/'.$this->view->search:''));
}
$this->view->membersList = $memberPagination->getElements();
- $this->view->memberPagination = $memberPagination->pagination($pageurl);
+ $this->view->memberPagination = $memberPagination->pagination();
$this->view->page = $memberPagination->getRequestPage();
}
}
@@ -310,12 +311,12 @@ class User_GroupController extends Zend_Controller_Action
public function linkAction()
{
if(!Pbs_Acl::checkRight('glk'))
- $this->_redirect('/user');
+ $this->_redirect('/user');
$linkableGroups = $this->groupList;
- $groupGroupsMapper = new Application_Model_GroupGroupsMapper();
+ $groupGroupsMapper = new Application_Model_GroupGroupsMapper();
$childs = array();
- $parents = array();
+ $parents = array();
$childs = $groupGroupsMapper->getChildGroups($this->membership->getGroupID());
$parents = $groupGroupsMapper->getParentGroups($this->membership->getGroupID());
#print_a($childs,$parents);
@@ -365,7 +366,7 @@ class User_GroupController extends Zend_Controller_Action
{
// ACL delete a group
if(!Pbs_Acl::checkRight('gd'))
- $this->_redirect('/user');
+ $this->_redirect('/user');
$this->_helper->viewRenderer->setNoRender();
$groupID = $this->_request->getParam('groupID');
@@ -404,7 +405,7 @@ class User_GroupController extends Zend_Controller_Action
{
// ACL grant a membership to request
if(!Pbs_Acl::checkRight('gam'))
- $this->_redirect('/user');
+ $this->_redirect('/user');
$this->_helper->viewRenderer->setNoRender();
if(isset($_POST['grouprequestID']) && isset($_POST['roleID'])) {
@@ -419,13 +420,13 @@ class User_GroupController extends Zend_Controller_Action
}
$membership = new Application_Model_Membership();
$membership->setGroupID($groupRequest->getGroupID());
- $membership->setPersonID($groupRequest->getPersonID());
+ $membership->setPersonID($groupRequest->getPersonID());
$membership->setRoleID($_POST['roleID']);
- $membership->setSuspended(0);
+ $membership->setSuspended(0);
$apikey = randomString(32);
$membership->setApikey($apikey);
-
-
+
+
try {
$id = $this->membershipMapper->save($membership);