diff options
| -rw-r--r-- | .zfproject.xml | 1 | ||||
| -rw-r--r-- | application/models/Membership.php | 60 | ||||
| -rw-r--r-- | application/models/MembershipMapper.php | 62 | ||||
| -rw-r--r-- | application/modules/user/controllers/GroupController.php | 141 | ||||
| -rw-r--r-- | application/modules/user/views/scripts/group/show.phtml | 233 | ||||
| -rw-r--r-- | pbs.sql | 1 |
6 files changed, 310 insertions, 188 deletions
diff --git a/.zfproject.xml b/.zfproject.xml index 09c216a..a81689c 100644 --- a/.zfproject.xml +++ b/.zfproject.xml @@ -139,6 +139,7 @@ <actionMethod actionName="revokeperson"/> <actionMethod actionName="decline"/> <actionMethod actionName="suspendmembership"/> + <actionMethod actionName="resumemembership"/> </controllerFile> <controllerFile controllerName="Role"> <actionMethod actionName="index"/> diff --git a/application/models/Membership.php b/application/models/Membership.php index eaa1f97..8a18d11 100644 --- a/application/models/Membership.php +++ b/application/models/Membership.php @@ -6,6 +6,7 @@ class Application_Model_Membership protected $_groupID; protected $_roleID; protected $_personID; + protected $_suspended; public function __construct(array $options = null) { @@ -81,39 +82,48 @@ class Application_Model_Membership $this->_personID = $_personID; return $this; } - /** - * Returns current data as associative array using ReflectionClass - * - * @return array Returns associative array containing model data + public function getSuspended() + { + return $this->_suspended; + } + public function setSuspended($_suspended) + { + $this->_suspended = $_suspended; + return $this; + } + /** + * Returns current data as associative array using ReflectionClass + * + * @return array Returns associative array containing model data * If "get"-method not available (our primary keys) the function getID() is called - */ - public function toArray() - { - $reflectionClass = new ReflectionClass($this); - $properties = $reflectionClass->getProperties(); - $result = array(); - foreach ($properties as $property) { - $key = $property->name; - if (substr($key, 0, 1) != '_' && $this->$key !== null) { - $method = 'get' . ucfirst($key); - if ($reflectionClass->hasMethod($method)) { - $result[$key] = $this->$method(); - } else { - $result[$key] = $this->$key; - } - } + */ + public function toArray() + { + $reflectionClass = new ReflectionClass($this); + $properties = $reflectionClass->getProperties(); + $result = array(); + foreach ($properties as $property) { + $key = $property->name; + if (substr($key, 0, 1) != '_' && $this->$key !== null) { + $method = 'get' . ucfirst($key); + if ($reflectionClass->hasMethod($method)) { + $result[$key] = $this->$method(); + } else { + $result[$key] = $this->$key; + } + } elseif(substr($key, 0, 1) == '_' && $this->$key !== null) { $key = substr($key, 1); - $method = 'get' . ucfirst($key); + $method = 'get' . ucfirst($key); if ($reflectionClass->hasMethod($method)) { $result[$key] = $this->$method(); }else{ $result[$key] = $this->getID(); } - + } - } - return $result; - } + } + return $result; + } } diff --git a/application/models/MembershipMapper.php b/application/models/MembershipMapper.php index 94f5236..68d6db8 100644 --- a/application/models/MembershipMapper.php +++ b/application/models/MembershipMapper.php @@ -2,34 +2,34 @@ class Application_Model_MembershipMapper { - + protected $_dbTable; - - public function findBy($where, $array=false, $order=false) - { + + public function findBy($where, $array=false, $order=false) + { foreach($where as $k => $v){ if($v != null) - $where2[] = "$k = '$v'"; - else - $where2[] = "$k IS NULL"; + $where2[] = "$k = '$v'"; + else + $where2[] = "$k IS NULL"; } $where = implode(" AND " ,$where2); - - try{ + + try{ $db = Zend_Db_Table::getDefaultAdapter(); - $select = $this->getDbTable()->select() - ->from($this->_dbTable) - ->where($where); - + $select = $this->getDbTable()->select() + ->from($this->_dbTable) + ->where($where); + if(is_array($order)){ foreach ($order as $k => $v) - $a[] = "$k $v"; + $a[] = "$k $v"; $select->order($a); } - + $stmt = $select->query(); $result = $stmt->fetchAll(); - + if(!$array){ $entries = array(); foreach ($result as $row) { @@ -41,11 +41,11 @@ class Application_Model_MembershipMapper }else{ return $result; } - - }catch (Zend_Exception $e) { - echo "Error message 2: " . $e->getMessage() . "\n"; + + }catch (Zend_Exception $e) { + echo "Error message 2: " . $e->getMessage() . "\n"; } - } + } public function setDbTable($dbTable) { @@ -58,7 +58,7 @@ class Application_Model_MembershipMapper } $this->_dbTable = $dbTable; - + return $this; } @@ -67,14 +67,14 @@ class Application_Model_MembershipMapper if (null === $this->_dbTable) { $this->setDbTable('Application_Model_DbTable_Membership'); } - + return $this->_dbTable; } public function save(Application_Model_Membership $membership) { - - $data = array('membershipID'=> $membership->getID() ,'groupID'=> $membership->getGroupID() ,'roleID'=> $membership->getRoleID() ,'personID'=> $membership->getPersonID() ); + + $data = array('membershipID'=> $membership->getID() ,'groupID'=> $membership->getGroupID() ,'roleID'=> $membership->getRoleID() ,'personID'=> $membership->getPersonID() ,'suspended'=> $membership->getSuspended() ); if (null === ($id = $membership->getID()) ) { unset($data['membershipID']); @@ -83,7 +83,7 @@ class Application_Model_MembershipMapper $this->getDbTable()->update($data, array('membershipID = ?' => $id)); } } - + public function delete(Application_Model_Membership $membership) { if (null === ($id = $membership->getID()) ) { @@ -108,8 +108,8 @@ class Application_Model_MembershipMapper } $row = $result->current(); - - $membership->setID($row->membershipID)->setGroupID($row->groupID)->setRoleID($row->roleID)->setPersonID($row->personID); + + $membership->setID($row->membershipID)->setGroupID($row->groupID)->setRoleID($row->roleID)->setPersonID($row->personID)->setSuspended($row->suspended); if($return){ return $membership; } @@ -121,14 +121,14 @@ class Application_Model_MembershipMapper $entries = array(); foreach ($resultSet as $row) { $entry = new Application_Model_Membership(); - - $entry->setID($row->membershipID)->setGroupID($row->groupID)->setRoleID($row->roleID)->setPersonID($row->personID); + + $entry->setID($row->membershipID)->setGroupID($row->groupID)->setRoleID($row->roleID)->setPersonID($row->personID)->setSuspended($row->suspended); $entries[] = $entry; } return $entries; } - + public function compare(Application_Model_Membership $v1,Application_Model_Membership $v2){ $vv1 = $v1->toArray(); $vv2 = $v2->toArray(); @@ -136,6 +136,6 @@ class Application_Model_MembershipMapper } - + } diff --git a/application/modules/user/controllers/GroupController.php b/application/modules/user/controllers/GroupController.php index 9a5380a..e76286b 100644 --- a/application/modules/user/controllers/GroupController.php +++ b/application/modules/user/controllers/GroupController.php @@ -23,11 +23,11 @@ class User_GroupController extends Zend_Controller_Action $this->personmapper = new Application_Model_PersonMapper(); $this->rolemapper = new Application_Model_RoleMapper(); $this->groupList = $this->groupMapper->fetchAll(); - + $userIDsNamespace = Zend_Session::namespaceGet('userIDs'); $this->membership = new Application_Model_Membership(); $this->membershipMapper->find($userIDsNamespace['membershipID'],$this->membership); - + } else { $this->_helper->redirector('login', 'auth'); return; @@ -38,8 +38,8 @@ class User_GroupController extends Zend_Controller_Action { // ACL show overview if(!Pbs_Acl::checkRight('gso')) - $this->_redirect('/user'); - + $this->_redirect('/user'); + $this->view->groupList = $this->groupList; // Search @@ -74,7 +74,7 @@ class User_GroupController extends Zend_Controller_Action { // ACL create new group if(!Pbs_Acl::checkRight('gc')) - $this->_redirect('/user'); + $this->_redirect('/user'); if (!isset($_POST["add"])){ $addForm = new user_Form_GroupAdd(array('grouplist' => $this->groupList)); @@ -197,7 +197,7 @@ class User_GroupController extends Zend_Controller_Action { // ACL create new group if(!Pbs_Acl::checkRight('gsdo') && !Pbs_Acl::checkRight('gsdog')) - $this->_redirect('/user'); + $this->_redirect('/user'); $groupID = $this->_request->getParam('groupID'); if($groupID == '' || !Pbs_Acl::checkRight('gsdog')) { @@ -206,30 +206,30 @@ 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; // ACL is he allowed to see the requests of a group ? // TODO: THERE IS NO RIGHT TO EDIT A GROUP - # if(Pbs_Acl::checkRight('')){ - $groupRequests = $this->groupRequestMapper->findBy(array('groupID' => $groupID),true); - if(isset($groupRequests)) { - foreach($groupRequests as $groupRequest) { - $person = $this->personmapper->find($groupRequest['personID']); - $groupRequestList[] = array( + # if(Pbs_Acl::checkRight('')){ + $groupRequests = $this->groupRequestMapper->findBy(array('groupID' => $groupID),true); + if(isset($groupRequests)) { + foreach($groupRequests as $groupRequest) { + $person = $this->personmapper->find($groupRequest['personID']); + $groupRequestList[] = array( 'grouprequestID' => $groupRequest['grouprequestID'], 'person' => $person - ); - } - if(is_array($groupRequestList)) { - $this->view->groupRequestList = $groupRequestList; - } - // TODO: expand with al inherit roles - $this->view->roleList = $this->rolemapper->findBy(array('groupID' => $groupID),true); + ); } + if(is_array($groupRequestList)) { + $this->view->groupRequestList = $groupRequestList; + } + // TODO: expand with al inherit roles + $this->view->roleList = $this->rolemapper->findBy(array('groupID' => $groupID),true); + } # } - + if(Pbs_Acl::checkRight('gsmg')){ $members = $this->membershipMapper->findBy(array('groupID' => $groupID),true); if(isset($members)) { @@ -239,6 +239,7 @@ class User_GroupController extends Zend_Controller_Action $role = $this->rolemapper->find($membership_tmp->getRoleID()); $membersList[] = array( 'membershipID' => $member['membershipID'], + 'suspended' => $member['suspended'], 'person' => $person, 'role' => $role ); @@ -302,8 +303,8 @@ 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'); if(!isset($groupID)) { @@ -341,7 +342,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'])) { @@ -377,11 +378,11 @@ class User_GroupController extends Zend_Controller_Action public function revokepersonAction() { - + $this->_helper->viewRenderer->setNoRender(); $membershipID = $this->_request->getParam('membershipID'); $rr = $this->membershipMapper->find($membershipID); - + if(($rr->getGroupID() == $this->membership->getGroupID && Pbs_Acl::checkRight('gdmo') ) || ( $rr->getGroupID() != $this->membership->getGroupID && Pbs_Acl::checkRight('gdmog'))){ if(isset($membershipID)) { $membership = $this->membershipMapper->find($membershipID); @@ -396,7 +397,91 @@ class User_GroupController extends Zend_Controller_Action } $this->_redirect("/user/group/show/groupID/" . $membership->getGroupID()); } - } + } + } + } + + public function declineAction() + { + if(!Pbs_Acl::checkRight('gdm')) { + $this->_redirect('/user'); + } + $this->_helper->viewRenderer->setNoRender(); + $grouprequestID = $this->_request->getParam('grouprequestID'); + if(isset($grouprequestID)) { + $groupRequest = $this->groupRequestMapper->find($grouprequestID); + if($groupRequest->getGroupID() != $this->userIDsNamespace['groupID']) { + $pbsNotifier = new Pbs_Notifier(); + $this->view->notification = $pbsNotifier->notify('Not allowed to decline this grouprequest', 'forbidden'); + return; + } + try { + $this->groupRequestMapper->delete($groupRequest); + } catch(Zend_Exception $e) + { + echo "Caught exception: " . get_class($e) . "<br/>"; + echo "Message: " . $e->getMessage() . "<br/>"; + return; + } + $this->_redirect("/user/group/show/groupID"); + } + } + + public function suspendmembershipAction() + { + if(!Pbs_Acl::checkRight('gsm')) { + $this->_redirect('/user'); + } + $this->_helper->viewRenderer->setNoRender(); + $membershipID = $this->_request->getParam('membershipID'); + if(isset($membershipID)) { + $membership = $this->membershipMapper->find($membershipID); + $membership->setSuspended(1); + if(isset($membership)) { + if($membership->getGroupID() != $this->userIDsNamespace['groupID']) { + $pbsNotifier = new Pbs_Notifier(); + $this->view->notification = $pbsNotifier->notify('Not allowed to suspend this membership', 'forbidden'); + return; + } + try { + $this->membershipMapper->save($membership); + } catch(Zend_Exception $e) + { + echo "Caught exception: " . get_class($e) . "<br/>"; + echo "Message: " . $e->getMessage() . "<br/>"; + return; + } + $this->_redirect("/user/group/show/"); + } + } + } + + public function resumemembershipAction() + { + if(!Pbs_Acl::checkRight('gsm')) { + $this->_redirect('/user'); + } + $this->_helper->viewRenderer->setNoRender(); + $membershipID = $this->_request->getParam('membershipID'); + if(isset($membershipID)) { + $membership = $this->membershipMapper->find($membershipID); + $membership->setSuspended(0); + if(isset($membership)) { + if($membership->getGroupID() != $this->userIDsNamespace['groupID']) { + $pbsNotifier = new Pbs_Notifier(); + $this->view->notification = $pbsNotifier->notify('Not allowed to resume this membership', 'forbidden'); + return; + } + try { + $this->membershipMapper->save($membership); + } catch(Zend_Exception $e) + { + echo "Caught exception: " . get_class($e) . "<br/>"; + echo "Message: " . $e->getMessage() . "<br/>"; + return; + } + $this->_redirect("/user/group/show/"); + } } } } diff --git a/application/modules/user/views/scripts/group/show.phtml b/application/modules/user/views/scripts/group/show.phtml index b2a85ac..b01ade4 100644 --- a/application/modules/user/views/scripts/group/show.phtml +++ b/application/modules/user/views/scripts/group/show.phtml @@ -1,6 +1,6 @@ <h1>Groupdetails - <?php echo $this->group->getTitle();?></h1> -<?php -if($this->usergroup == $this->requestgroup){ +<?php +if($this->usergroup == $this->requestgroup){ echo $this->formButton('deletegroup', 'Delete', array( 'onclick' => 'self.location="/user/group/delete/"', 'class' => 'rightbutton')); @@ -18,111 +18,105 @@ else{ } ?> <div class='listelement'> - <div class='element'> - <div class='number'> - <?php - if($this->usergroup == $this->requestgroup){ ?> - <div class='smallnumber'>Your Group</div> - <?php }else{ ?> - <div class='smallnumber'>Group</div> - <?php echo $this->group->getID(); ?> - <?php } ?> - </div> - <div class='content'> - <div class='title'><?php echo $this->group->getTitle(); ?></div> - <div class='subtitle'><?php echo $this->group->getDescription(); ?></div> - <?php if(isset($parentGroup) && is_object($parentGroup)): ?> - <div class='details'> - <label>Superordinated Group:</label><div class='item'><?php echo $this->parentGroup->getTitle(); ?></div> - </div> - <?php endif ;?> - </div> - <div class='clear'></div> - </div> +<div class='element'> +<div class='number'><?php +if($this->usergroup == $this->requestgroup){ ?> +<div class='smallnumber'>Your Group</div> +<?php }else{ ?> +<div class='smallnumber'>Group</div> +<?php echo $this->group->getID(); ?> <?php } ?></div> +<div class='content'> +<div class='title'><?php echo $this->group->getTitle(); ?></div> +<div class='subtitle'><?php echo $this->group->getDescription(); ?></div> +<?php if(isset($parentGroup) && is_object($parentGroup)): ?> +<div class='details'><label>Superordinated Group:</label> +<div class='item'><?php echo $this->parentGroup->getTitle(); ?></div> +</div> +<?php endif ;?></div> +<div class='clear'></div> +</div> </div> <?php // Show Request List if(isset($this->groupRequestList)){ -?> + ?> <br /> <h2>Requests:</h2> -<div class='listelement'> - <?php - foreach($this->groupRequestList as $grouprequest) { +<div class='listelement'><?php +foreach($this->groupRequestList as $grouprequest) { $grouprequestID = $grouprequest['grouprequestID']; $person = $grouprequest['person']; ?> - <div class='element'> - <div class='content'> - <?php - if($this->usergroup == $this->requestgroup && (Pbs_Acl::checkRight('gam') || Pbs_Acl::checkRight('gdm'))){ - ?> - <div class='actions'> - <?php if(Pbs_Acl::checkRight('gam')): ?> - <form action="/user/group/grantperson" method="post"> - <input type="hidden" name="grouprequestID" value="<?php echo $grouprequestID; ?>" /> <?php printRoleSelect($this->roleList); ?> - <input type="image" src='/media/img/save.png' alt='Grant Person' name="confirm" value="confirm" /> - </form> - <?php endif; ?> - <?php if(Pbs_Acl::checkRight('gdm')): ?> - TODO - <?php endif; ?> - </div> - <?php - } - ?> - <div class='title'><?php echo $person->getTitle(); ?> <?php echo $person->getFirstname(); ?> <?php echo $person->getName(); ?></div> - <div class='subtitle'><?php echo $person->getCity(); ?></div> - <div class='details dispnone'> - <label>Email</label> - <div class='item'><?php echo $person->getEmail(); ?></div> - </div> - </div> - </div> - <?php - } +<div class='element'> +<div class='content'><?php +if($this->usergroup == $this->requestgroup && (Pbs_Acl::checkRight('gam') || Pbs_Acl::checkRight('gdm'))){ ?> +<div class='actions'><?php if(Pbs_Acl::checkRight('gam')): ?> +<form action="/user/group/grantperson" method="post"><input + type="hidden" name="grouprequestID" + value="<?php echo $grouprequestID; ?>" /> <?php printRoleSelect($this->roleList); ?> +<input type="image" src='/media/img/save.png' alt='Grant Person' + name="confirm" value="confirm" /> <?php endif; ?> <?php if(Pbs_Acl::checkRight('gdm')): ?> <a + href="<?php echo $this->url( + array( + 'module' => 'user', + 'controller' => 'group', + 'action' => 'decline', + 'grouprequestID' => $grouprequestID, + ), + 'default', + true) ?>"> <img src='/media/img/delete.png' + alt='Decline Membership' /></a> <?php endif; ?></form> +</div> + <?php +} +?> + +<div class='title'><?php echo $person->getTitle(); ?> <?php echo $person->getFirstname(); ?> <?php echo $person->getName(); ?></div> +<div class='subtitle'><?php echo $person->getCity(); ?></div> +<div class='details dispnone'><label>Email</label> +<div class='item'><?php echo $person->getEmail(); ?></div> +</div> </div> +</div> +<?php +} +?></div> <?php } // Show Memberlist if(isset($this->membersList) && Pbs_Acl::checkRight('gsmg')){ -?> + ?> <br /> <h2>Members:</h2> -<div class='listelement'> -<?php +<div class='listelement'><?php if(count($this->membersList)==0) - echo "This hroup has no members." +echo "This hroup has no members." +?> <?php foreach ($this->membersList as $k => $member): ?> <?php +$membershipID = $member['membershipID']; +$suspended = $member['suspended']; +$person = $member['person']; +$role = $member['role']; +$class=''; +if($person->getID() == $this->userIDsNamespace['personID']) +$class= 'highlight checked'; ?> -<?php foreach ($this->membersList as $k => $member): ?> - <?php - $membershipID = $member['membershipID']; - $person = $member['person']; - $role = $member['role']; - $class=''; - if($person->getID() == $this->userIDsNamespace['personID']) - $class= 'highlight checked'; +<div class='element<?php echo " $class";?>'><?php +if($person->getID() != $this->userIDsNamespace['personID']) { ?> - <div class='element<?php echo " $class";?>'> - <?php - if($person->getID() != $this->userIDsNamespace['personID']) { - ?> - <div class='number'> - <div class='smallnumber'>Person</div> - <?php echo $k+1; ?> - </div> - <?php - } - ?> - <div class='content'> - <div class='actions'> - <?php - if((Pbs_Acl::checkRight('gdmo') && $this->usergroup == $this->requestgroup) || (Pbs_Acl::checkRight('gdmog') && $this->usergroup != $this->requestgroup)): - ?> - <a href="<?php echo $this->url( +<div class='number'> +<div class='smallnumber'>Person</div> + <?php echo $k+1; ?></div> + <?php +} +?> +<div class='content'> +<div class='actions'><?php +if((Pbs_Acl::checkRight('gdmo') && $this->usergroup == $this->requestgroup) || (Pbs_Acl::checkRight('gdmog') && $this->usergroup != $this->requestgroup)): +?> <a + href="<?php echo $this->url( array( 'module' => 'user', 'controller' => 'group', @@ -130,26 +124,57 @@ if(count($this->membersList)==0) 'membershipID' => $membershipID, ), 'default', - true) ?>"> <img src='/media/img/delete.png' alt='Revoke Membership' /></a> - <?php - endif; - ?> - </div> - <div class='title'><?php echo $person->getFirstname(); ?> <?php echo $person->getName(); ?></div> - <div class='subtitle'>Role: <?php echo $role->getTitle(); ?></div> - <div class='details dispnone'> - <label>Email</label> - <div class='item'><?php echo $person->getEmail(); ?></div> - <label>City</label> - <div class='item'><?php echo $person->getCity(); ?></div> - </div> - </div> - <div class='clear'></div> - </div> -<?php endforeach ?> + true) ?>"> <img src='/media/img/delete.png' + alt='Revoke Membership' /></a> <?php + endif; + if(Pbs_Acl::checkRight('gsm')) { + if($suspended == 1) + { + ?> <a + href=" <?php echo $this->url( + array( + 'module' => 'user', + 'controller' => 'group', + 'action' => 'resumemembership', + 'membershipID' => $membershipID + ), + 'default', + true); ?>"> <img src='/media/img/resume.png' + alt='Resume Membership' /></a> <?php + } else { + ?> <a + href=" <?php echo $this->url( + array( + 'module' => 'user', + 'controller' => 'group', + 'action' => 'suspendmembership', + 'membershipID' => $membershipID + ), + 'default', + true); ?>"> <img src='/media/img/suspend.png' + alt='Suspend Membership' /></a> <?php + } + } + ?></div> +<div class='title'><?php echo $person->getFirstname(); ?> <?php echo $person->getName(); ?></div> +<div class='subtitle'>Role: <?php echo $role->getTitle(); ?></div> +<div class='details dispnone'><label>Email</label> +<div class='item'><?php echo $person->getEmail(); ?></div> +<label>City</label> +<div class='item'><?php echo $person->getCity(); ?></div> + <?php + if(Pbs_Acl::checkRight('gsm')) { + ?> <label>Membership suspended</label> +<div class='item'><?php if($suspended == 1) echo "yes"; else echo "no"; ?></div> + <?php + } + ?></div> </div> -<?php echo $this->memberPagination; ?> -<?php +<div class='clear'></div> +</div> + <?php endforeach ?></div> + <?php echo $this->memberPagination; ?> + <?php } @@ -104,6 +104,7 @@ CREATE TABLE IF NOT EXISTS `pbs_membership` ( `groupID` int(11) NOT NULL, `roleID` int(11) NOT NULL, `personID` int(11) NOT NULL, + `suspended` tinyint(1) NOT NULL, PRIMARY KEY (`membershipID`), KEY `groupID` (`groupID`), KEY `roleID` (`roleID`), |