From 281a9a40960403b4483af33eec5cebab10e32684 Mon Sep 17 00:00:00 2001
From: Simon
Date: Mon, 18 Apr 2011 12:42:30 +0200
Subject: Role Controller geändert

---
 .../modules/user/controllers/PersonController.php  |   3 +
 .../modules/user/controllers/RoleController.php    |  65 ++++++----
 .../modules/user/views/scripts/role/index.phtml    | 138 ++++++++++-----------
 .../modules/user/views/scripts/role/show.phtml     |  10 +-
 4 files changed, 112 insertions(+), 104 deletions(-)

(limited to 'application/modules/user')

diff --git a/application/modules/user/controllers/PersonController.php b/application/modules/user/controllers/PersonController.php
index 4f6b975..d70067a 100644
--- a/application/modules/user/controllers/PersonController.php
+++ b/application/modules/user/controllers/PersonController.php
@@ -411,6 +411,9 @@ class user_PersonController extends Zend_Controller_Action
 
 	public function deleterequestAction()
 	{
+		if(!Pbs_Acl::checkRight('gdm')) {
+			$this->_redirect('/user');
+		}		
 		$grouprequestID = $this->_request->getParam('grouprequestID');
 		$grouprequest = $this->groupRequestMapper->find($grouprequestID);
 		try {
diff --git a/application/modules/user/controllers/RoleController.php b/application/modules/user/controllers/RoleController.php
index 2c22031..8d2b044 100644
--- a/application/modules/user/controllers/RoleController.php
+++ b/application/modules/user/controllers/RoleController.php
@@ -3,6 +3,8 @@
 class User_RoleController extends Zend_Controller_Action
 {
 	protected $userIDsNamespace = null;
+	protected $membership;
+	protected $membershipMapper;
 
 	public function init()
 	{
@@ -15,9 +17,17 @@ class User_RoleController extends Zend_Controller_Action
 			$this->roleMapper = new Application_Model_RoleMapper();
 			$this->rightMapper = new Application_Model_RightMapper();
 			$this->rightRolesMapper = new Application_Model_RightRolesMapper();
+			$this->membershipMapper = new Application_Model_MembershipMapper();
+			
+			$userIDsNamespace = Zend_Session::namespaceGet('userIDs');
+			$this->membership = new Application_Model_Membership();
+			$this->membershipMapper->find($userIDsNamespace['membershipID'],$this->membership);
 		} else {
 			$this->_helper->redirector('login', 'auth');
 		}
+		if($this->membership->getGroupID() == ''){
+			$this->_helper->redirector('selectmembership', 'person');
+		}
 	}
 
 	public function indexAction()
@@ -25,9 +35,33 @@ class User_RoleController extends Zend_Controller_Action
 		if(!Pbs_Acl::checkRight('ro')) {
 			$this->_redirect('/user');
 		}
-		if(isset($this->userIDsNamespace['groupID'])) {
-			$this->view->roleList = $this->roleMapper->findBy(array('groupID' => $this->userIDsNamespace['groupID']),true);
-
+			$this->view->membership = $this->membership;
+			$groupID = $this->membership->getGroupID();
+			$this->view->roleList = $this->roleMapper->findBy(array('groupID' => $groupID),true);
+			
+			$roles = array();
+			$groupGroupsMapper = new Application_Model_GroupGroupsMapper();
+			$parents = $groupGroupsMapper->getParentGroups($groupID);
+			$groupMapper = new Application_Model_GroupMapper();
+			$roleMapper = new Application_Model_RoleMapper();
+			$crawled = array();
+			foreach($parents as $p){				
+				foreach($p as $a){
+					if(!in_array($a,$crawled)){
+						$crawled[] = $a;
+						$group = $groupMapper->find($a);
+						if($groupID != $a)
+							$r = $roleMapper->findBy(array('groupID' => $a,'inheritance'=>"1"));
+						else
+							$r = $roleMapper->findBy(array('groupID' => $a));
+						foreach($r as $d){
+							$roles[$group->getTitle()][] = $d;
+						}
+					}
+				}
+			}
+			$this->view->roleList = $roles;
+			
 			// Search
 			$search = $this->_request->getParam('search');
 			$mySearch = new Pbs_Search();
@@ -54,10 +88,7 @@ class User_RoleController extends Zend_Controller_Action
 			$this->view->deleteRight = Pbs_Acl::checkRight('rd');
 			$this->view->detailsRight = Pbs_Acl::checkRight('rdd');
 			$this->view->userIDsNamespace = $this->userIDsNamespace;
-		} else {
-			$this->_helper->redirector('selectmembership', 'person');
-			return;
-		}
+		
 	}
 
 	public function searchAction(){
@@ -72,7 +103,7 @@ class User_RoleController extends Zend_Controller_Action
 		if(!Pbs_Acl::checkRight('ra')) {
 			$this->_redirect('/user');
 		}
-		if(isset($this->userIDsNamespace['groupID'])) {
+		
 			$roleID = $this->userIDsNamespace['roleID'];
 			$rights = $this->rightMapper->fetchAll();
 			if(count($rights) > 0) {
@@ -119,10 +150,6 @@ class User_RoleController extends Zend_Controller_Action
 				}
 			}
 			$this->view->addForm = $addForm;
-		} else {
-			$this->_helper->redirector('selectmembership', 'person');
-			return;
-		}
 	}
 
 	public function editAction()
@@ -194,7 +221,7 @@ class User_RoleController extends Zend_Controller_Action
 			$roleMapper = new Application_Model_RoleMapper();
 			$role = $roleMapper->find($roleID);
 			$roleGroupID = $role->getGroupID();
-			if($this->userIDsNamespace['groupID'] == $roleGroupID) {
+			if($this->userIDsNamespace['groupID'] == $roleGroupID || $role->getInheritance() == 1) {
 				$rightroles = $this->rightRolesMapper->findBy(array('roleID' => $roleID),true);
 				if(count($rightroles) > 0) {
 					foreach($rightroles as $rightrole) {
@@ -434,15 +461,3 @@ class User_RoleController extends Zend_Controller_Action
 
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/application/modules/user/views/scripts/role/index.phtml b/application/modules/user/views/scripts/role/index.phtml
index edf03eb..580238f 100644
--- a/application/modules/user/views/scripts/role/index.phtml
+++ b/application/modules/user/views/scripts/role/index.phtml
@@ -1,6 +1,4 @@
-<?php
-if($this->userIDsNamespace['groupID']) {
-	?>
+
 <h1>Roles</h1>
 	<?php
 	echo $this->searchform;
@@ -9,82 +7,74 @@ if($this->userIDsNamespace['groupID']) {
 							'class' => 'addbutton'));
 	?>
 <div class='searchvars'>
-<div class='head'>Available searchfilter:</div>
-<div class='code'>title</div>
-<div class='code'>description</div>
+	<div class='head'>Available searchfilter:</div>
+	<div class='code'>title</div>
+	<div class='code'>description</div>
 </div>
 
-<div class='listelement'><?php
-if(count($this->roleList)==0)
-echo "There are no roles" ?> <?php foreach($this->roleList as $k => $role): ?>
-<?php
-$class='';
-if($role['roleID'] == $this->userIDsNamespace['roleID'])
-$class= 'highlight checked';
-?>
-	<div class='element<?php echo " $class";?>'>
-	<?php if($role['roleID'] != $this->userIDsNamespace['roleID']) {	?>
-		<div class='number'>	
-			<div class='smallnumber'>Role</div>
-			<?php echo $role['roleID']; ?>
-		</div>
+<div class='listelement'>
+<?php if(count($this->roleList)==0)
+	echo "There are no roles" ?>
+<?php foreach($this->roleList as $i => $grouproleList): ?>
+	<?php foreach($grouproleList as $k => $role): ?>
 	<?php
-	}
-	?>
-	<div class='content'>
-	<div class='actions'><?php if($this->detailsRight) {?> 
-		<a href="<?php echo $this->url(
-					array(
-						'module'	=> 'user',
-						'controller' => 'role',
-						'action'     => 'show',
-						'roleID'   =>  $role['roleID']
-					),
-					'default',
-					true) ?>"> <img src='/media/img/show.png' alt='Show Group' /></a> <?php
-	}
-	if($this->editRight) { ?>
-		<a href="<?php echo $this->url(
-					array(
-						'module'	=> 'user',
-						'controller' => 'role',
-						'action'     => 'edit',
-						'roleID'   =>  $role['roleID']
-					),
-					'default',
-					true) ?>"> <img src='/media/img/edit.png' alt='Edit Group' /></a> <?php
-	}
-if($this->deleteRight) { ?>
-	<a href="<?php echo $this->url(
-					array(
-						'module'	=> 'user',
-						'controller' => 'role',
-						'action'     => 'delete',
-						'roleID'   =>  $role['roleID']
-					),
-					'default',
-					true) ?>"> <img src='/media/img/delete.png' alt='Delete Group' /></a>
-
-<?php } ?>
-</div>
-<div class='title'><?php echo $role['title'] ?></div>
-					<?php if($role['description']) {
-						?>
-<div class='subtitle'><?php echo $role['description']; ?></div>
-						<?php
-					} else {
-						?>
-<div class='subtitle'>&nbsp;</div>
-						<?php
-					}
 
+		$class='';
+		if($role->getID() == $this->membership->getRoleID())
+			$class= 'highlight checked';
+		?>
+		<div class='element<?php echo " $class";?>'>
+			<?php if($role->getID() != $this->userIDsNamespace['roleID']) {	?>
+				<div class='number'>	
+					<div class='smallnumber'>Role</div>
+					<?php echo $role->getID(); ?>
+				</div>
+			<?php
+		}
+		?>
+		<div class='content'>
+		<div class='actions'><?php if($this->detailsRight) {?> 
+			<a href="<?php echo $this->url(
+						array(
+							'module'	=> 'user',
+							'controller' => 'role',
+							'action'     => 'show',
+							'roleID'   =>  $role->getID()
+						),
+						'default',
+						true) ?>"> <img src='/media/img/show.png' alt='Show Group' /></a> <?php
+			}
+			if($this->editRight && $this->membership->getGroupID() == $role->getGroupID()) { ?>
+			<a href="<?php echo $this->url(
+						array(
+							'module'	=> 'user',
+							'controller' => 'role',
+							'action'     => 'edit',
+							'roleID'   =>  $role->getID()
+						),
+						'default',
+						true) ?>"> <img src='/media/img/edit.png' alt='Edit Group' /></a> <?php
+			}
+			if($this->deleteRight && $this->membership->getGroupID() == $role->getGroupID()) { ?>
+			<a href="<?php echo $this->url(
+						array(
+							'module'	=> 'user',
+							'controller' => 'role',
+							'action'     => 'delete',
+							'roleID'   =>  $role->getID()
+						),
+						'default',
+						true) ?>"> <img src='/media/img/delete.png' alt='Delete Group' /></a>
 
-?></div>
-<div class='clear'></div>
+			<?php } ?>
+		</div>
+		<div class='title'><?php echo "[".$i."] ";?><?php echo $role->getTitle();?></div>	
+		<div class='subtitle'><?php echo $role->getDescription(); ?>&nbsp;</div></div>
+		<div class='clear'></div>
+	</div>
+	<?php endforeach ?>
+<?php endforeach ?>
 </div>
-<?php endforeach ?></div>
-<?php echo $this->pagination;
-}
-?>
+<?php echo $this->pagination; ?>
 <br />
 <br />
diff --git a/application/modules/user/views/scripts/role/show.phtml b/application/modules/user/views/scripts/role/show.phtml
index 43ae781..765153f 100644
--- a/application/modules/user/views/scripts/role/show.phtml
+++ b/application/modules/user/views/scripts/role/show.phtml
@@ -9,10 +9,10 @@ if($this->roleID) {
 <h1>Role Details</h1>
 		<?php
 	}
-	if($this->deleteRight) echo $this->formButton('deleterole', 'Delete', array(
+	if($this->deleteRight && $this->roleID == $this->userIDsNamespace['roleID']) echo $this->formButton('deleterole', 'Delete', array(
 							'onclick' => 'self.location="/user/role/delete/roleID/' . $this->role->getID() .'"',
 							'class' => 'rightbutton'));
-	if($this->editRight) echo $this->formButton('editrole', 'Edit', array(
+	if($this->editRight && $this->roleID == $this->userIDsNamespace['roleID']) echo $this->formButton('editrole', 'Edit', array(
 							'onclick' => 'self.location="/user/role/edit/roleID/' . $this->role->getID() .'"',
 							'class' => 'rightbutton'));
 	?>
@@ -38,7 +38,7 @@ if($this->roleID) {
 <h2>Rights:</h2>
 <?php
 if($this->rightsAvailable === true) {
-	if($this->addRightToRoleRight) {
+	if($this->addRightToRoleRight && $this->roleID == $this->userIDsNamespace['roleID']) {
 		echo $this->formButton('linkright', 'Add Rights', array(
 							'onclick' => 'self.location="/user/role/linkright/roleID/' . $this->role->getID() .'"',
 							'class' => 'addbutton'))?>
@@ -48,7 +48,7 @@ if($this->rightsAvailable === true) {
 if(count($this->rightsList)==0) {
 	echo "There are no Rights to display.";
 } else {
-	if($this->removeRightOfRoleRight) echo $this->formButton('deleteallrights', 'Delete All Rights', array(
+	if($this->removeRightOfRoleRight && $this->roleID == $this->userIDsNamespace['roleID']) echo $this->formButton('deleteallrights', 'Delete All Rights', array(
 							'onclick' => 'self.location="/user/role/unlinkright/rightrolesID/' .  $this->roleID . '-all"',
 							'class' => 'rightbutton'));?>
 <br />
@@ -63,7 +63,7 @@ if(count($this->rightsList)==0) {
 foreach($rights as $right):
 ?>
 <div class='element'>
-<div class='content'><?php if($this->removeRightOfRoleRight) {
+<div class='content'><?php if($this->removeRightOfRoleRight && $this->roleID == $this->userIDsNamespace['roleID']) {
 	?>
 <div class='actions'><a
 	href="<?php echo $this->url(
-- 
cgit v1.2.3-55-g7522


From 5d621c6ce29d2059480b3283daf14162c74365db Mon Sep 17 00:00:00 2001
From: Simon
Date: Mon, 18 Apr 2011 13:16:23 +0200
Subject: Rechte in PersonController korrigiert

---
 application/modules/user/controllers/PersonController.php |  6 +++---
 application/modules/user/controllers/RoleController.php   |  1 +
 application/modules/user/views/scripts/auth/delete.phtml  |  5 +++--
 application/modules/user/views/scripts/role/show.phtml    | 13 ++++++++-----
 library/Pbs/NewMember.php                                 |  2 +-
 5 files changed, 16 insertions(+), 11 deletions(-)

(limited to 'application/modules/user')

diff --git a/application/modules/user/controllers/PersonController.php b/application/modules/user/controllers/PersonController.php
index d70067a..76cd958 100644
--- a/application/modules/user/controllers/PersonController.php
+++ b/application/modules/user/controllers/PersonController.php
@@ -58,11 +58,11 @@ class user_PersonController extends Zend_Controller_Action
 			$this->_redirect('/user');
 		}
 		$this->view->showRight = Pbs_Acl::checkRight('psod');
-		$this->view->editRight = Pbs_Acl::checkRight('peoa');
-		$this->view->deleteRight = Pbs_Acl::checkRight('pd');
+		$this->view->editRight = Pbs_Acl::checkRight('peod');
+		$this->view->deleteRight = Pbs_Acl::checkRight('pdo');
 		$this->view->showOtherRight = Pbs_Acl::checkRight('psood');
 		$this->view->editOtherRight = Pbs_Acl::checkRight('peoa');
-		$this->view->deleteOtherRight = Pbs_Acl::checkRight('pdo');
+		$this->view->deleteOtherRight = Pbs_Acl::checkRight('pd');
 		$this->view->suspendRight = Pbs_Acl::checkRight('psa');
 		$this->view->userIDsNamespace = $this->userIDsNamespace;
 
diff --git a/application/modules/user/controllers/RoleController.php b/application/modules/user/controllers/RoleController.php
index 8d2b044..93a2cfa 100644
--- a/application/modules/user/controllers/RoleController.php
+++ b/application/modules/user/controllers/RoleController.php
@@ -217,6 +217,7 @@ class User_RoleController extends Zend_Controller_Action
 				$roleID = $this->userIDsNamespace['roleID'];
 			}
 		}
+		$this->view->membership = $this->membership;
 		if($roleID) {
 			$roleMapper = new Application_Model_RoleMapper();
 			$role = $roleMapper->find($roleID);
diff --git a/application/modules/user/views/scripts/auth/delete.phtml b/application/modules/user/views/scripts/auth/delete.phtml
index 83afc80..75d9ef6 100644
--- a/application/modules/user/views/scripts/auth/delete.phtml
+++ b/application/modules/user/views/scripts/auth/delete.phtml
@@ -1,6 +1,7 @@
 <h1>Delete Account</h1>
-Do you really want to delete account?
+Do you really want to delete account?<br/>
+This will delete all of your data on the server.
 <?php
 $this->deleteconfirmform->setAction($this->url());
 echo $this->deleteconfirmform;
-?>
\ No newline at end of file
+?>
diff --git a/application/modules/user/views/scripts/role/show.phtml b/application/modules/user/views/scripts/role/show.phtml
index 765153f..0e440f2 100644
--- a/application/modules/user/views/scripts/role/show.phtml
+++ b/application/modules/user/views/scripts/role/show.phtml
@@ -9,10 +9,12 @@ if($this->roleID) {
 <h1>Role Details</h1>
 		<?php
 	}
-	if($this->deleteRight && $this->roleID == $this->userIDsNamespace['roleID']) echo $this->formButton('deleterole', 'Delete', array(
+	if($this->deleteRight && $this->role->getGroupID() == $this->membership->getGroupID()) 
+		echo $this->formButton('deleterole', 'Delete', array(
 							'onclick' => 'self.location="/user/role/delete/roleID/' . $this->role->getID() .'"',
 							'class' => 'rightbutton'));
-	if($this->editRight && $this->roleID == $this->userIDsNamespace['roleID']) echo $this->formButton('editrole', 'Edit', array(
+	if($this->editRight && $this->role->getGroupID() == $this->membership->getGroupID()) 
+		echo $this->formButton('editrole', 'Edit', array(
 							'onclick' => 'self.location="/user/role/edit/roleID/' . $this->role->getID() .'"',
 							'class' => 'rightbutton'));
 	?>
@@ -38,7 +40,7 @@ if($this->roleID) {
 <h2>Rights:</h2>
 <?php
 if($this->rightsAvailable === true) {
-	if($this->addRightToRoleRight && $this->roleID == $this->userIDsNamespace['roleID']) {
+	if($this->addRightToRoleRight && $this->role->getGroupID() == $this->membership->getGroupID()) {
 		echo $this->formButton('linkright', 'Add Rights', array(
 							'onclick' => 'self.location="/user/role/linkright/roleID/' . $this->role->getID() .'"',
 							'class' => 'addbutton'))?>
@@ -48,7 +50,8 @@ if($this->rightsAvailable === true) {
 if(count($this->rightsList)==0) {
 	echo "There are no Rights to display.";
 } else {
-	if($this->removeRightOfRoleRight && $this->roleID == $this->userIDsNamespace['roleID']) echo $this->formButton('deleteallrights', 'Delete All Rights', array(
+	if($this->removeRightOfRoleRight && $this->role->getGroupID() == $this->membership->getGroupID()) 
+			echo $this->formButton('deleteallrights', 'Delete All Rights', array(
 							'onclick' => 'self.location="/user/role/unlinkright/rightrolesID/' .  $this->roleID . '-all"',
 							'class' => 'rightbutton'));?>
 <br />
@@ -63,7 +66,7 @@ if(count($this->rightsList)==0) {
 foreach($rights as $right):
 ?>
 <div class='element'>
-<div class='content'><?php if($this->removeRightOfRoleRight && $this->roleID == $this->userIDsNamespace['roleID']) {
+<div class='content'><?php if($this->removeRightOfRoleRight && $this->role->getGroupID() == $this->membership->getGroupID()) {
 	?>
 <div class='actions'><a
 	href="<?php echo $this->url(
diff --git a/library/Pbs/NewMember.php b/library/Pbs/NewMember.php
index 2865ef9..9800d04 100644
--- a/library/Pbs/NewMember.php
+++ b/library/Pbs/NewMember.php
@@ -28,7 +28,7 @@ class Pbs_NewMember{
 		$userBootmenu->setID($userBootmenuID);
 		
 		# print_a('userbootmenu',$userBootmenu);
-		if($defaultBootmenu->getID() != ''){
+		if($defaultBootmenu != ''){
 			$bootmenuentries = $bootmenuentriesMapper->findBy(array('bootmenuID'=>$defaultBootmenu->getID()));
 			foreach($bootmenuentries as $bme){
 				$bme->setID(null);
-- 
cgit v1.2.3-55-g7522


From 15e113fbad5cafdac2a1f9e5f5a196aa919f77d7 Mon Sep 17 00:00:00 2001
From: Simon
Date: Mon, 18 Apr 2011 13:18:44 +0200
Subject: PersonController Eigene DEtails dürfen immer angezeigt werden

---
 application/modules/user/controllers/PersonController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'application/modules/user')

diff --git a/application/modules/user/controllers/PersonController.php b/application/modules/user/controllers/PersonController.php
index 76cd958..9d18a93 100644
--- a/application/modules/user/controllers/PersonController.php
+++ b/application/modules/user/controllers/PersonController.php
@@ -57,7 +57,7 @@ class user_PersonController extends Zend_Controller_Action
 		if(!Pbs_Acl::checkRight('pso')) {
 			$this->_redirect('/user');
 		}
-		$this->view->showRight = Pbs_Acl::checkRight('psod');
+		$this->view->showRight = true;//Pbs_Acl::checkRight('psod');
 		$this->view->editRight = Pbs_Acl::checkRight('peod');
 		$this->view->deleteRight = Pbs_Acl::checkRight('pdo');
 		$this->view->showOtherRight = Pbs_Acl::checkRight('psood');
-- 
cgit v1.2.3-55-g7522