Auch beim hinzufügen von weiteren Rechten nun Checkboxliste

1 files changed, 46 insertions, 55 deletions

diff --git a/application/modules/user/layouts/user.phtml b/application/modules/user/layouts/user.phtml
index edbe209..b27b747 100644
--- a/application/modules/user/layouts/user.phtml
+++ b/application/modules/user/layouts/user.phtml
@@ -29,60 +29,52 @@ echo $this->headScript()."\n";
 	<li class='navTreeItem'><a href='/user/'>user</a></li>
 	<li>
 	<ul class='navTreeLevel1'>
-		<?php if (Zend_Auth::getInstance()->hasIdentity() && count(Zend_Session::namespaceGet('userIDs')) > 0) {		
-			# This should be splitted
-			if(Pbs_Acl::checkRight('psod'))
-				echo "<li class='navTreeItem'><a href='/user/person'>Own Details</a></li>";
-			if(Pbs_Acl::checkRight('pso'))
-				echo "<li class='navTreeItem'><a href='/user/person/showall'>Personlist</a></li>";
-			if(Pbs_Acl::checkRight('gsdo'))
-				echo "<li class='navTreeItem'><a href='/user/group'>Own Group</a></li>";
-			if(Pbs_Acl::checkRight('gso'))
-				echo "<li class='navTreeItem'><a href='/user/group/showall'>Grouplist</a></li>";
-				if(Pbs_Acl::checkRight('ro'))
-				echo "<li class='navTreeItem'><a href='/user/role'>Role</a></li>";
-			if(Pbs_Acl::checkRight('bai') || Pbs_Acl::checkRight('bui'))
-				echo "<li class='navTreeItem'><a href='/user/bootiso'>BootIso</a></li>";
-			if(Pbs_Acl::checkRight('pro'))
-				echo "<li class='navTreeItem'><a href='/user/preboot'>PreBoot</a></li>";
-			if(Pbs_Acl::checkRight('booai') || Pbs_Acl::checkRight('booui'))
-				echo "<li class='navTreeItem'><a href='/user/bootmenu'>BootMenu</a></li>";
-			if(Pbs_Acl::checkRight('csai') || Pbs_Acl::checkRight('csui'))
-				echo "<li class='navTreeItem'><a href='/user/config'>Config</a></li>";
-			if(Pbs_Acl::checkRight('boai') || Pbs_Acl::checkRight('boui'))
-				echo "<li class='navTreeItem'><a href='/user/bootos'>BootOs</a></li>";
-			if(Pbs_Acl::checkRight('clo'))
-				echo "<li class='navTreeItem'><a href='/user/client'>Client</a></li>";
-			if(Pbs_Acl::checkRight('fo'))
-				echo "<li class='navTreeItem'><a href='/user/filter'>Filter</a></li>";
-			if(Pbs_Acl::checkRight('poo'))
-				echo "<li class='navTreeItem'><a href='/user/pool'>Pool</a></li>";
-			if(Pbs_Acl::checkRight('so'))
-				echo "<li class='navTreeItem'><a href='/user/session'>Session</a></li>";		
-		}
-		?>
-		<?php if (!Zend_Auth::getInstance()->hasIdentity()) {?>
-		<li class='navTreeItem'><a href='/user/auth/login'>Login</a></li>
-		<li class='navTreeItem'><a href='/user/auth/register'>Register</a></li>
-		<?php
-		} else {
+	<?php if (Zend_Auth::getInstance()->hasIdentity() && count(Zend_Session::namespaceGet('userIDs')) > 0) {
+		# This should be splitted
+		if(Pbs_Acl::checkRight('psod'))
+		echo "<li class='navTreeItem'><a href='/user/person'>Own Details</a></li>";
+		if(Pbs_Acl::checkRight('pso'))
+		echo "<li class='navTreeItem'><a href='/user/person/showall'>Personlist</a></li>";
+		if(Pbs_Acl::checkRight('gsdo'))
+		echo "<li class='navTreeItem'><a href='/user/group'>Own Group</a></li>";
+		if(Pbs_Acl::checkRight('gso'))
+		echo "<li class='navTreeItem'><a href='/user/group/showall'>Grouplist</a></li>";
+		if(Pbs_Acl::checkRight('ro'))
+		echo "<li class='navTreeItem'><a href='/user/role'>Rolelist</a></li>";
+		if(Pbs_Acl::checkRight('bai') || Pbs_Acl::checkRight('bui'))
+		echo "<li class='navTreeItem'><a href='/user/bootiso'>BootIso</a></li>";
+		if(Pbs_Acl::checkRight('pro'))
+		echo "<li class='navTreeItem'><a href='/user/preboot'>PreBoot</a></li>";
+		if(Pbs_Acl::checkRight('booai') || Pbs_Acl::checkRight('booui'))
+		echo "<li class='navTreeItem'><a href='/user/bootmenu'>BootMenu</a></li>";
+		if(Pbs_Acl::checkRight('csai') || Pbs_Acl::checkRight('csui'))
+		echo "<li class='navTreeItem'><a href='/user/config'>Config</a></li>";
+		if(Pbs_Acl::checkRight('boai') || Pbs_Acl::checkRight('boui'))
+		echo "<li class='navTreeItem'><a href='/user/bootos'>BootOs</a></li>";
+		if(Pbs_Acl::checkRight('clo'))
+		echo "<li class='navTreeItem'><a href='/user/client'>Client</a></li>";
+		if(Pbs_Acl::checkRight('fo'))
+		echo "<li class='navTreeItem'><a href='/user/filter'>Filter</a></li>";
+		if(Pbs_Acl::checkRight('poo'))
+		echo "<li class='navTreeItem'><a href='/user/pool'>Pool</a></li>";
+		if(Pbs_Acl::checkRight('so'))
+		echo "<li class='navTreeItem'><a href='/user/session'>Session</a></li>";
+	}
+	?>
+	<?php if (!Zend_Auth::getInstance()->hasIdentity()) {
+		echo "<li class='navTreeItem'><a href='/user/auth/login'>Login</a></li>";
+		echo "<li class='navTreeItem'><a href='/user/auth/register'>Register</a></li>";
+	} else {
 		if(count(Zend_Session::namespaceGet('userIDs')) > 0) {
-			?>
-		<li class='navTreeItem'><a href='/user/person/changemembership'>Change
-		Membership</a></li>
-		<?php
+			echo "<li class='navTreeItem'><a href='/user/person/changemembership'>Change Membership</a></li>";
 		} else {
-			?>
-		<li class='navTreeItem'><a href='/user/person/selectmembership'>Select
-		Membership</a></li>
-		<?php
+			echo "<li class='navTreeItem'><a href='/user/person/selectmembership'>Select Membership</a></li>";
 		}
-		?>
-		<li class='navTreeItem'><a href='/user/auth/delete'>Delete Account</a></li>
-		<li class='navTreeItem'><a href='/user/auth/logout'>Logout</a></li>
-		<?php
-		}
-		?>
+		if(Pbs_Acl::checkRight('pdo'))
+		echo "<li class='navTreeItem'><a href='/user/auth/delete'>Delete Account</a></li>";
+		echo "<li class='navTreeItem'><a href='/user/auth/logout'>Logout</a></li>";
+	}
+	?>
 	</ul>
 	</li>
 </ul>
@@ -97,11 +89,11 @@ echo $this->headScript()."\n";
 </div>
 <div id="logo-bar-red"></div>
 <div id="head-titlebar">
-<div style='float:right'><?php 
+<div style='float: right'><?php 
 if(Zend_Auth::getInstance()->hasIdentity()){
 	echo 'Angemeldet als ';
 	$userIDsNamespace = Zend_Session::namespaceGet('userIDs');
-	
+
 	if(isset($userIDsNamespace['membershipID'])){
 		$membershipMapper = new Application_Model_MembershipMapper();
 		$membership = new Application_Model_Membership();
@@ -122,8 +114,7 @@ if(Zend_Auth::getInstance()->hasIdentity()){
 		echo "<b><i>".$role->getTitle()."</i></b>";
 	}
 }
-?>
-</div>
+?></div>
 <?php
 echo ucwords($request->getControllerName()) . " > " . ucwords($request->getActionName());
 ?></div>