Config Own/Group getrennt

5 files changed, 304 insertions, 187 deletions

diff --git a/application/modules/user/views/scripts/bootiso/index.phtml b/application/modules/user/views/scripts/bootiso/index.phtml
index 1c0c5fe..d0e8dd1 100644
--- a/application/modules/user/views/scripts/bootiso/index.phtml
+++ b/application/modules/user/views/scripts/bootiso/index.phtml
@@ -1,19 +1,26 @@
 <h1>BootMedien</h1>
 <?php if($this->notification != ''){echo $this->notification;} ?>
 <?php echo $this->searchform; ?>
+
+<?php if(Pbs_Acl::checkRight('bc')): ?>
 <?php echo $this->formButton('createbootiso', 'Create BootISO', array(
 							'onclick' => 'self.location="/user/bootiso/createbootiso/page/'.$this->page.'"',
 							'class' => 'addbutton'))?>
+<?php endif;?>
 <div class='searchvars'>
 	<div class='head'>Available searchfilter:</div>
-	<div class='code'>bootosID</div>
+	<?php if(Pbs_Acl::checkRight('bai')): ?>
+		<div class='code'>bootmediumID</div>
+		<div class='code'>serialnumber</div>
+		<div class='code'>public</div>
+	<?php endif; ?>
+	<div class='code'>prebootID</div>	
 	<div class='code'>title</div>
 	<div class='code'>groupID</div>
-	<div class='code'>prebootID</div>
-	<div class='code'>serialnumber</div>
 	<div class='code'>created</div>
 	<div class='code'>expires</div>
-	<div class='code'>public</div>
+	
+	
 </div>	
 						
 <div class='listelement'>
@@ -24,48 +31,68 @@
   		<div class='number'><?php echo $k+1; ?></div>
   		<div class='content'>  			
 	  		<div class='actions'>
-	  			<a href="<?php echo $this->url(
-					array(
-						'module'	=> 'user',
-						'controller' => 'bootiso',
-						'action'     => 'downloadbootiso',
-						'bootisoID' => $bootiso->getID(),
-						'page'		=> $this->page
-					),
-					'default',
-					true, false) ?>"><img src='/media/img/download.png' alt='Download BootMedium' /></a>
-		  		<a href="<?php echo $this->url(
-					array(
-						'module'	=> 'user',
-						'controller' => 'bootiso',
-						'action'     => 'editbootiso',
-						'bootisoID'   =>  $bootiso->getID(),
-						'page'		=> $this->page
-					),
-					'default',
-					true, false) ?>"><img src='/media/img/edit.png' alt='Edit BootISO' /></a>
-	  			<a href="<?php echo $this->url(
-					array(
-						'module'	=> 'user',
-						'controller' => 'bootiso',
-						'action'     => 'deletebootiso',
-						'bootisoID'   =>  $bootiso->getID(),
-						'page'		=> $this->page
-					),
-					'default',
-					true) ?>"><img src='/media/img/delete.png' alt='Delete BootISO'/></a>
+	  			<?php if(Pbs_Acl::checkRight('bdld')): ?>
+		  			<a href="<?php echo $this->url(
+						array(
+							'module'	=> 'user',
+							'controller' => 'bootiso',
+							'action'     => 'downloadbootiso',
+							'bootisoID' => $bootiso->getID(),
+							'page'		=> $this->page
+						),
+						'default',
+						true, false) ?>"><img src='/media/img/download.png' alt='Download BootMedium' /></a>
+				<?php endif; ?>
+				<?php if(Pbs_Acl::checkRight('be') || Pbs_Acl::checkRight('bem')): ?>
+			  		<a href="<?php echo $this->url(
+						array(
+							'module'	=> 'user',
+							'controller' => 'bootiso',
+							'action'     => 'editbootiso',
+							'bootisoID'   =>  $bootiso->getID(),
+							'page'		=> $this->page
+						),
+						'default',
+						true, false) ?>"><img src='/media/img/edit.png' alt='Edit BootISO' /></a>
+				<?php endif; ?>
+				<?php if(Pbs_Acl::checkRight('bd')): ?>
+		  			<a href="<?php echo $this->url(
+						array(
+							'module'	=> 'user',
+							'controller' => 'bootiso',
+							'action'     => 'deletebootiso',
+							'bootisoID'   =>  $bootiso->getID(),
+							'page'		=> $this->page
+						),
+						'default',
+						true) ?>"><img src='/media/img/delete.png' alt='Delete BootISO'/></a>
+				<?php endif; ?>
 	  		</div>  
+	  		<?php if(!Pbs_Acl::checkRight('bai')){
+  				$bootiso->setPrebootID(preg_replace("!^\[[0-9]+\]\s!",'',$bootiso->getPrebootID()));
+  				$bootiso->setGroupID(preg_replace("!^\[[0-9]+\]\s!",'',$bootiso->getGroupID()));
+  			} ?>
 	  		<div class='title'><?php echo $this->escape($bootiso->getTitle()); ?></div>
-	  		<div class='subtitle'><?php echo $this->escape($bootiso->getGroupID()); ?> - Serialnumber: <?php echo $this->escape($bootiso->getSerialnumber()); ?></div>
+	  		<div class='subtitle'><?php echo $this->escape($bootiso->getGroupID()); ?> 
+	  		<?php if(Pbs_Acl::checkRight('bai')): ?>
+	  			- Serialnumber: <?php echo $this->escape($bootiso->getSerialnumber()); ?>
+	  		<?php endif; ?>
+	  		</div>
 	  		<div class='details dispnone'>
-	  			<label>PreebootID</label>
-	  				<div class='item'><?php echo $this->escape($bootiso->getPrebootID()); ?></div>
-	  			<label>Created</label>
+	  			<?php if(Pbs_Acl::checkRight('bai')): ?>
+		  			<label>BootmediumID</label>
+		  				<div class='item'><?php echo $this->escape($bootiso->getID()); ?></div>
+	  			<?php endif; ?>
+	  			<label>PrebootID</label>
+		  			<div class='item'><?php echo $this->escape($bootiso->getPrebootID()); ?></div>
+	  			<label>Changed</label>
 	  				<div class='item'><?php echo $this->escape($bootiso->getCreated()); ?></div>
 	  			<label>Expires</label>
-	  				<div class='item'><?php echo $this->escape($bootiso->getExpires()); ?></div>	  				
-	  			<label>Public</label>
-	  				<div class='item'><?php echo $this->escape($bootiso->getPublic()); ?></div>
+	  				<div class='item'><?php echo $this->escape($bootiso->getExpires()); ?></div>
+	  			<?php if(Pbs_Acl::checkRight('bai')): ?>	  				
+	  				<label>Public</label>
+	  					<div class='item'><?php echo $this->escape($bootiso->getPublic()); ?></div>
+	  			<?php endif; ?>
 	  		</div>
   		</div>
   		<div class='clear'></div>
diff --git a/application/modules/user/views/scripts/bootmenu/index.phtml b/application/modules/user/views/scripts/bootmenu/index.phtml
index 0b4b12f..751b648 100644
--- a/application/modules/user/views/scripts/bootmenu/index.phtml
+++ b/application/modules/user/views/scripts/bootmenu/index.phtml
@@ -2,30 +2,35 @@
 <?php if($this->notification != ''){echo $this->notification;} ?>
 <div id='notification' style='display:none;'></div>
 <?php echo $this->searchform; ?>
+
+<?php if(Pbs_Acl::checkRight('booc')): ?>
 <?php echo $this->formButton('createbootmenu', 'Create BootMenu', array(
 							'onclick' => 'self.location="/user/bootmenu/createbootmenu/page/'.$this->page.'"',
 							'class' => 'addbutton'))?>
-
+<?php endif;?>
 <div class='searchvars'>
 	<div class='head'>Available searchfilter:</div>
-	<div class='code'>bootmenuID</div>
+	<?php if(Pbs_Acl::checkRight('booai')): ?>
+		<div class='code'>bootmenuID</div>
+	<?php endif; ?>
 	<div class='code'>title</div>
-	<div class='code'>created</div>	
+	<div class='code'>changed</div>	
 </div>
 
 <div class='listelement'>
 	<?php if(count($this->bootmenulist)==0)
 		echo "There are no BootMenus to display." ?>
-	<?php foreach ($this->bootmenulist as $bootmenu): ?>
+	<?php foreach ($this->bootmenulist as $k => $bootmenu): ?>
 	<?php 
 		$class='';
 		if($bootmenu->getDefaultbootmenu() == true)
 			$class= 'highlight';
 	?>
 	<div class='element<?php echo " $class";?>'>
-  		<div class='number'><?php echo $this->escape($bootmenu->getID()); ?></div>
+  		<div class='number'><?php echo $k+1 ?></div>
   		<div class='content'>  			
-	  		<div class='actions'>	  			 
+	  		<div class='actions'>	  
+	  			<?php if(Pbs_Acl::checkRight('booai')): ?>			 
 					<?php if($bootmenu->getDefaultbootmenu() == true): ?>
 						<a><img src='/media/img/default.png' alt='Checked as default'/></a>
 					<?php else: ?>
@@ -41,16 +46,20 @@
 						true, false) ?>">
 						<img src='/media/img/default_grey.png' alt='Not checked as default' /></a>	
 					<?php endif; ?>
-	  			<a href="<?php echo $this->url(
-					array(
-						'module'	=> 'user',
-						'controller' => 'bootmenu',
-						'action'     => 'editbootmenu',
-						'bootmenuID'   =>  $bootmenu->getID(),
-						'page'		=> $this->page
-					),
-					'default',
-					true, false) ?>"><img src='/media/img/edit.png' alt='Edit Bootmenu'/></a>
+				<?php endif; ?>
+				<?php if(Pbs_Acl::checkRight('booe')): ?>
+		  			<a href="<?php echo $this->url(
+						array(
+							'module'	=> 'user',
+							'controller' => 'bootmenu',
+							'action'     => 'editbootmenu',
+							'bootmenuID'   =>  $bootmenu->getID(),
+							'page'		=> $this->page
+						),
+						'default',
+						true, false) ?>"><img src='/media/img/edit.png' alt='Edit Bootmenu'/></a>
+				<?php endif; ?>
+				<?php if(Pbs_Acl::checkRight('bood')): ?>
 				<a href="<?php echo $this->url(
 					array(
 						'module'	=> 'user',
@@ -61,61 +70,82 @@
 					),
 					'default',
 					true) ?>"><img src='/media/img/delete.png' alt='Delete Bootmenu'/></a>
-				<a href="<?php echo $this->url(
-					array(
-						'module'	=> 'user',
-						'controller' => 'bootmenu',
-						'action'     => 'addbootmenuentry',
-						'bootmenuID'   =>  $bootmenu->getID(),
-						'maxorder' => count($this->bootmenuentrylist[$bootmenu->getID()]),
-						'page'		=> $this->page
-					),
-					'default',
-					true) ?>"><img src='/media/img/add.png' alt='Add Entry'/></a>
+				<?php endif; ?>
+				<?php if(Pbs_Acl::checkRight('booae')): ?>
+					<a href="<?php echo $this->url(
+						array(
+							'module'	=> 'user',
+							'controller' => 'bootmenu',
+							'action'     => 'addbootmenuentry',
+							'bootmenuID'   =>  $bootmenu->getID(),
+							'maxorder' => count($this->bootmenuentrylist[$bootmenu->getID()]),
+							'page'		=> $this->page
+						),
+						'default',
+						true) ?>"><img src='/media/img/add.png' alt='Add Entry'/></a>
+				<?php endif; ?>
 	  		</div>  
 	  		<div class='title'><?php echo $this->escape($bootmenu->getTitle()); ?></div>
 	  		<div class='subtitle'><?php echo count($this->bootmenuentrylist[$bootmenu->getID()]);?> Entrys - <?php echo $this->escape($bootmenu->getCreated()); ?></div>
 	  		<div class='details dispnone'>
-	  			<?php foreach ($this->bootmenuentrylist[$bootmenu->getID()] as $bootmenuentry): ?>
+	  			<?php if(Pbs_Acl::checkRight('booai')): ?>
+  					<label>BootmenuID</label>
+			  			<div class='item'><?php echo $this->escape($bootmenu->getID()); ?></div>
+			  	<?php endif; ?>
+	  			<?php foreach ($this->bootmenuentrylist[$bootmenu->getID()] as $k => $bootmenuentry): ?>
 	  			<div class='element'>
-			  		<div class='number'><?php echo $this->escape($bootmenuentry->getID()); ?></div>
+			  		<div class='number'><?php echo $k+1 ?></div>
 			  		<div class='content'>  			
 				  		<div class='actions'>
-				  			<a class='play' href="<?php echo $this->url(
-								array(						
-									'controller' => 'resource',
-									'action'     => 'getbootmenuentry',
-									'bootmenuentryID'   =>  $bootmenuentry->getID(),
-									'page'		=> $this->page
-								),
-								'default',
-								true, false) ?>"><img src='/media/img/play.gif'></a>
-				  			<a href="<?php echo $this->url(
-								array(
-									'module'	=> 'user',
-									'controller' => 'bootmenu',
-									'action'     => 'editbootmenuentry',
-									'bootmenuentryID'   =>  $bootmenuentry->getID(),
-									'maxorder' => count($this->bootmenuentrylist[$bootmenu->getID()]),
-									'oldorder' => $bootmenuentry->getOrder(),
-									'page'		=> $this->page
-								),
-								'default',
-								true, false) ?>"><img src='/media/img/edit.png' alt='Edit Entry'/></a>
-					  		<a href="<?php echo $this->url(
-								array(
-									'module'	=> 'user',
-									'controller' => 'bootmenu',
-									'action'     => 'removebootmenuentry',
-									'bootmenuentryID'   =>  $bootmenuentry->getID(),
-									'page'		=> $this->page
-								),
-								'default',
-								true) ?>"><img src='/media/img/delete.png' alt='Remove Entry'/></a>
+				  			<?php if(Pbs_Acl::checkRight('booai')): ?>
+					  			<a class='play' href="<?php echo $this->url(
+									array(						
+										'controller' => 'resource',
+										'action'     => 'getbootmenuentry',
+										'bootmenuentryID'   =>  $bootmenuentry->getID(),
+										'page'		=> $this->page
+									),
+									'default',
+									true, false) ?>"><img src='/media/img/play.gif'></a>
+							<?php endif; ?>
+							<?php if(Pbs_Acl::checkRight('booee') || Pbs_Acl::checkRight('booeem')): ?>
+					  			<a href="<?php echo $this->url(
+									array(
+										'module'	=> 'user',
+										'controller' => 'bootmenu',
+										'action'     => 'editbootmenuentry',
+										'bootmenuentryID'   =>  $bootmenuentry->getID(),
+										'maxorder' => count($this->bootmenuentrylist[$bootmenu->getID()]),
+										'oldorder' => $bootmenuentry->getOrder(),
+										'page'		=> $this->page
+									),
+									'default',
+									true, false) ?>"><img src='/media/img/edit.png' alt='Edit Entry'/></a>
+							<?php endif; ?>
+							<?php if(Pbs_Acl::checkRight('boode')): ?>
+						  		<a href="<?php echo $this->url(
+									array(
+										'module'	=> 'user',
+										'controller' => 'bootmenu',
+										'action'     => 'removebootmenuentry',
+										'bootmenuentryID'   =>  $bootmenuentry->getID(),
+										'page'		=> $this->page
+									),
+									'default',
+									true) ?>"><img src='/media/img/delete.png' alt='Remove Entry'/></a>
+							<?php endif; ?>
 				  		</div>  
+				  		<?php if(!Pbs_Acl::checkRight('booai')){
+  							$bootmenuentry->setBootosID(preg_replace("!^\[[0-9]+\]\s!",'',$bootmenuentry->getBootosID()));
+  							$bootmenuentry->setConfigID(preg_replace("!^\[[0-9]+\]\s!",'',$bootmenuentry->getConfigID()));
+  						} ?>
 				  		<div class='title'><?php echo $this->escape($bootmenuentry->getTitle()); ?></div>
 				  		<div class='subtitle'><?php echo $this->escape($bootmenuentry->getBootosID()) ?></div>
 				  		<div class='details dispnone'>
+				  			<?php if(Pbs_Acl::checkRight('booai')): ?>
+				  				<label>BootmenuentryID</label>
+				  					<div class='item'><?php echo $this->escape($bootmenuentry->getID()); ?></div>
+				  			<?php endif; ?>
 				  			<label>Default KCL</label>
 				  				<div class='item'><?php echo $this->escape($bootmenuentry->getKcl()); ?></div>
 				  			<label>KCL-Append</label>
diff --git a/application/modules/user/views/scripts/bootos/index.phtml b/application/modules/user/views/scripts/bootos/index.phtml
index 99ddfc3..d135ed3 100644
--- a/application/modules/user/views/scripts/bootos/index.phtml
+++ b/application/modules/user/views/scripts/bootos/index.phtml
@@ -1,89 +1,114 @@
 <h1>BootOS</h1>
 <?php if($this->notification != ''){echo $this->notification;} ?>
 <?php echo $this->searchform; ?>
+
+<?php if(Pbs_Acl::checkRight('bou')): ?>
 <?php echo $this->formButton('checkupdate', 'Check for Updates', array(
 							'onclick' => 'self.location="/user/bootos/index/page/'.$this->page.'/checkupdate/true"',
 							'class' => 'updatebutton',
 							))?>
+<?php endif;?>
+<?php if(Pbs_Acl::checkRight('boc')): ?>			
 <?php echo $this->formButton('createbootos', 'Create BootOS', array(
 							'onclick' => 'self.location="/user/bootos/createbootos/page/'.$this->page.'"',
 							'class' => 'addbutton'))?>
-
+<?php endif;?>
 <div class='searchvars'>
 	<div class='head'>Available searchfilter:</div>
-	<div class='code'>bootosID</div>
+	<?php if(Pbs_Acl::checkRight('boai')): ?>
+		<div class='code'>bootosID</div>
+		<div class='code'>public</div>
+		<div class='code'>kernel</div>
+		<div class='code'>kcl</div>
+		<div class='code'>init</div>
+	<?php endif; ?>
+	
 	<div class='code'>title</div>
 	<div class='code'>groupID</div>
 	<div class='code'>configID</div>
-	<div class='code'>init</div>
-	<div class='code'>kernel</div>
-	<div class='code'>kcl</div>
 	<div class='code'>description</div>
-	<div class='code'>changed</div>
+	<div class='code'>created</div>
 	<div class='code'>expires</div>
-	<div class='code'>public</div>
 </div>
 
 <div class='listelement'>
 	<?php if(count($this->bootoslist)==0)
 		echo "There are no BootOs's to display." ?>
-	<?php foreach ($this->bootoslist as $bootos): ?>
+	<?php foreach ($this->bootoslist as $k => $bootos): ?>
 	<div class='element'>
-  		<div class='number'><?php echo $this->escape($bootos->getID()); ?></div>
+  		<div class='number'><?php echo $k+1 ?></div>
   		<div class='content'>  			
 	  		<div class='actions'>
-	  			<?php if($this->update[$bootos->getID()]==true): ?>
-				<a href="<?php echo $this->url(
+	  			<?php if(Pbs_Acl::checkRight('bou')): ?>
+		  			<?php if($this->update[$bootos->getID()]==true): ?>
+						<a href="<?php echo $this->url(
+							array(
+								'module'	=> 'user',
+								'controller' => 'bootos',
+								'action'     => 'updatebootos',
+								'bootosID'   =>  $bootos->getID(),
+								'page'		=> $this->page
+							),
+							'default',
+							true, false) ?>"><img src='/media/img/update.png' alt='Updates available' /></a></td>
+					<?php else: ?>
+						<a><img src='/media/img/update_grey.png' alt='No updates available' /></a>	
+					<?php endif; ?>		
+				<?php endif; ?>
+				<?php if(Pbs_Acl::checkRight('boe') || Pbs_Acl::checkRight('boem')): ?>
+			  		<a href="<?php echo $this->url(
+						array(
+							'module'	=> 'user',
+							'controller' => 'bootos',
+							'action'     => 'editbootos',
+							'bootosID'   =>  $bootos->getID(),
+							'page'		=> $this->page
+						),
+						'default',
+						true, false) ?>"><img src='/media/img/edit.png' alt='Edit BootOS' /></a>
+				<?php endif; ?>	
+				<?php if(Pbs_Acl::checkRight('bod')): ?>
+		  			<a href="<?php echo $this->url(
 						array(
 							'module'	=> 'user',
 							'controller' => 'bootos',
-							'action'     => 'updatebootos',
+							'action'     => 'deletebootos',
 							'bootosID'   =>  $bootos->getID(),
 							'page'		=> $this->page
 						),
 						'default',
-						true, false) ?>"><img src='/media/img/update.png' alt='Updates available' /></a></td>
-				<?php else: ?>
-					<a><img src='/media/img/update_grey.png' alt='No updates available' /></a>	
-				<?php endif; ?>		
-		  		<a href="<?php echo $this->url(
-					array(
-						'module'	=> 'user',
-						'controller' => 'bootos',
-						'action'     => 'editbootos',
-						'bootosID'   =>  $bootos->getID(),
-						'page'		=> $this->page
-					),
-					'default',
-					true, false) ?>"><img src='/media/img/edit.png' alt='Edit BootOS' /></a>
-	  			<a href="<?php echo $this->url(
-					array(
-						'module'	=> 'user',
-						'controller' => 'bootos',
-						'action'     => 'deletebootos',
-						'bootosID'   =>  $bootos->getID(),
-						'page'		=> $this->page
-					),
-					'default',
-					true) ?>"><img src='/media/img/delete.png' alt='Delete BootOS' /></a>
+						true) ?>"><img src='/media/img/delete.png' alt='Delete BootOS' /></a>
+				<?php endif; ?>
 	  		</div>  
+  			<?php if(!Pbs_Acl::checkRight('boai')){
+  				$bootos->setConfigID(preg_replace("!^\[[0-9]+\]\s!",'',$bootos->getConfigID()));
+  				$bootos->setGroupID(preg_replace("!^\[[0-9]+\]\s!",'',$bootos->getGroupID()));
+  			} ?>
 	  		<div class='title'><?php echo $this->escape($bootos->getTitle()); ?></div>
 	  		<div class='subtitle'><?php echo $this->escape($bootos->getGroupID()); ?> - <?php echo $this->escape($bootos->getDescription()); ?></div>
 	  		<div class='details dispnone'>
+	  			<?php if(Pbs_Acl::checkRight('boai')): ?>
+	  		  		<label>BootosID</label>
+	  					<div class='item'><?php echo $this->escape($bootos->getID()); ?></div>
+	  			<?php endif; ?>	
 	  			<label>ConfigID</label>
 	  				<div class='item'><?php echo $this->escape($bootos->getConfigID()); ?></div>
-	  			<label>initPath</label>
-	  				<div class='item'><?php echo $this->escape($bootos->getPath_init()); ?></div>
-	  			<label>kernelPath</label>
-	  				<div class='item'><?php echo $this->escape($bootos->getPath_kernel()); ?></div>
-	  			<label>Default KCL</label>
-	  				<div class='item'><?php echo $this->escape($bootos->getDefaultkcl()); ?></div>
-	  			<label>Created</label>
+	  			<?php if(Pbs_Acl::checkRight('boai')): ?>
+	  				<label>initPath</label>
+	  					<div class='item'><?php echo $this->escape($bootos->getPath_init()); ?></div>
+	  				<label>kernelPath</label>
+	  					<div class='item'><?php echo $this->escape($bootos->getPath_kernel()); ?></div>
+	  				<label>Default KCL</label>
+	  					<div class='item'><?php echo $this->escape($bootos->getDefaultkcl()); ?></div>
+	  			<?php endif; ?>
+	  			<label>Changed</label>
 	  				<div class='item'><?php echo $this->escape($bootos->getCreated()); ?></div>
 	  			<label>Expires</label>
 	  				<div class='item'><?php echo $this->escape($bootos->getExpires()); ?></div>
-	  			<label>Public</label>
-	  				<div class='item'><?php echo $this->escape($bootos->getPublic()); ?></div>
+	  			<?php if(Pbs_Acl::checkRight('boai')): ?>
+	  				<label>Public</label>
+	  					<div class='item'><?php echo $this->escape($bootos->getPublic()); ?></div>
+	  			<?php endif; ?>
 	  				
 	  		</div>
   		</div>
diff --git a/application/modules/user/views/scripts/config/index.phtml b/application/modules/user/views/scripts/config/index.phtml
index 28200e2..7966a3e 100644
--- a/application/modules/user/views/scripts/config/index.phtml
+++ b/application/modules/user/views/scripts/config/index.phtml
@@ -2,11 +2,25 @@
 <?php if($this->notification != ''){echo $this->notification;} ?>
 <?php echo $this->searchform; ?>
 
+<?php $conflabel = $this->type == 'own'?'group':'own';?>
+
+<?php if((Pbs_Acl::checkRight('cc') &&  $this->type == 'group') || (Pbs_Acl::checkRight('cco') &&  $this->type == 'own')): ?>
 <?php echo $this->formButton('createconfig', 'Create Config', array(
-							'onclick' => 'self.location="/user/config/createconfig/page/'.$this->page.'"',
+							'onclick' => 'self.location="/user/config/createconfig/type/'.$this->type.'/page/'.$this->page.'"',
+							'class' => 'addbutton'))?>
+<?php endif;?>
+
+<?php if(Pbs_Acl::checkRight('csui')): ?>
+<?php echo $this->formButton('ownconfig', 'Show '.$conflabel.' configs', array(
+							'onclick' => 'self.location="/user/config/index/type/'.$conflabel.'/page/'.$this->page.'"',
 							'class' => 'addbutton'))?>
+<?php endif;?>
+
 <div class='searchvars'>
 	<div class='head'>Available searchfilter:</div>
+	<?php if(Pbs_Acl::checkRight('csai')): ?>
+		<div class='code'>configID</div>
+	<?php endif; ?>
 	<div class='code'>title</div>
 	<div class='code'>shellscript</div>
 	<div class='code'>created</div>
@@ -15,36 +29,44 @@
 <div class='listelement'>
 	<?php if(count($this->configlist)==0)
 		echo "There are no Config's to display." ?>
-	<?php foreach ($this->configlist as $config): ?>
+	<?php foreach ($this->configlist as $k => $config): ?>
 	<div class='element'>
-		<?php if(Pbs_Acl::checkRight('csai')): ?>
-  			<div class='number'><?php echo $this->escape($config->getID()); ?></div>
-  		<?php endif; ?>
+  		<div class='number'><?php echo $k+1; ?></div>
   		<div class='content'>  			
 	  		<div class='actions'>
+	  			<?php if(((Pbs_Acl::checkRight('ce') || Pbs_Acl::checkRight('cem')) && $this->type == 'group') || ($this->type == 'own' && Pbs_Acl::checkRight('ceo'))): ?>
 	  			<a href="<?php echo $this->url(
 					array(
 						'module'	=> 'user',
 						'controller' => 'config',
 						'action'     => 'editconfig',
+						'type'		=> $this->type,
 						'configID'   =>  $config->getID(),
 						'page'		=> $this->page
 					),
 					'default',
 					true, false) ?>"><img src='/media/img/edit.png' alt='Edit Config'/></a>
+				<?php endif; ?>
+				<?php if((Pbs_Acl::checkRight('cd') && $this->type == 'group') || ($this->type == 'own' && Pbs_Acl::checkRight('cdo'))): ?>
 		  		<a href="<?php echo $this->url(
 					array(
 						'module'	=> 'user',
 						'controller' => 'config',
 						'action'     => 'deleteconfig',
+						'type'		=> $this->type,
 						'configID'   =>  $config->getID(),
 						'page'		=> $this->page
 					),
 					'default',
 					true) ?>"><img src='/media/img/delete.png' alt='Delete Config'/></a>
+				<?php endif; ?>	
 	  		</div>  
 	  		<div class='title'><?php echo $this->escape($config->getTitle()); ?></div>
 	  		<div class='details'>
+	  			<?php if(Pbs_Acl::checkRight('csai')): ?>
+	  				<label>ConfigID</label>
+	  					<div class='item'><?php echo $this->escape($config->getID()); ?></div>
+				<?php endif; ?>
 	  			<label>Shellscript</label>
 	  				<div class='item'><?php echo $this->escape($config->getShellscript()); ?></div>
 	  			<label>Created</label>
diff --git a/application/modules/user/views/scripts/preboot/index.phtml b/application/modules/user/views/scripts/preboot/index.phtml
index fc0d07d..dba956c 100644
--- a/application/modules/user/views/scripts/preboot/index.phtml
+++ b/application/modules/user/views/scripts/preboot/index.phtml
@@ -1,13 +1,18 @@
 <h1>Preboot</h1>
 <?php if($this->notification != ''){echo $this->notification;} ?>
 <?php echo $this->searchform; ?>
+
+<?php if(Pbs_Acl::checkRight('pru')): ?>
 <?php echo $this->formButton('checkupdate', 'Check for Updates', array(
 							'onclick' => 'self.location="/user/preboot/index/checkupdate/true"',
 							'class' => 'updatebutton',
 							))?>
+<?php endif;?>							
+<?php if(Pbs_Acl::checkRight('prc')): ?>
 <?php echo $this->formButton('createpreboot', 'Create PreBoot', array(
 							'onclick' => 'self.location="/user/preboot/createpreboot/page/'.$this->page.'"',
 							'class' => 'addbutton'))?>
+<?php endif;?>
 <div class='searchvars'>
 	<div class='head'>Available searchfilter:</div>
 	<div class='code'>prebootID</div>
@@ -18,48 +23,56 @@
 <div class='listelement'>
 	<?php if(count($this->prebootlist)==0)
   		echo "There are no Preboot entries to display." ?>
-  <?php foreach ($this->prebootlist as $preboot): ?>
+  <?php foreach ($this->prebootlist as $k => $preboot): ?>
 	<div class='element'>
-  		<div class='number'><?php echo $this->escape($preboot->getID()); ?></div>
+  		<div class='number'><?php echo $k+1 ?></div>
   		<div class='content'>  			
 	  		<div class='actions'>
-	  			<?php if($this->update[$preboot->getID()]==true): ?><a href="<?php echo $this->url(
-					array(
-						'module'	=> 'user',
-						'controller' => 'preboot',
-						'action'     => 'updatepreboot',
-						'prebootID'   =>  $preboot->getID(),
-						'page'		=> $this->page
-					),
-					'default',
-					true, false) ?>"><img src='/media/img/update.png' alt='Updates available' /></a>
-				<?php else: ?>
-					<a><img src='/media/img/update_grey.png' alt='No updates available' /></a>	
-				<?php endif; ?>	
-		  		<a href="<?php echo $this->url(
-					array(
-						'module'	=> 'user',
-						'controller' => 'preboot',
-						'action'     => 'editpreboot',
-						'prebootID'   =>  $preboot->getID(),
-						'page'		=> $this->page
-					),
-					'default',
-					true, false) ?>"><img src='/media/img/edit.png' alt='Edit Preboot' /></a>
-				<a href="<?php echo $this->url(
-					array(
-						'module'	=> 'user',
-						'controller' => 'preboot',
-						'action'     => 'deletepreboot',
-						'prebootID'   =>  $preboot->getID(),
-						'page'		=> $this->page
-					),
-					'default',
-					true) ?>"><img src='/media/img/delete.png' alt='Delete Preboot'/></a>
+	  			<?php if(Pbs_Acl::checkRight('pru')): ?>
+		  			<?php if($this->update[$preboot->getID()]==true): ?><a href="<?php echo $this->url(
+						array(
+							'module'	=> 'user',
+							'controller' => 'preboot',
+							'action'     => 'updatepreboot',
+							'prebootID'   =>  $preboot->getID(),
+							'page'		=> $this->page
+						),
+						'default',
+						true, false) ?>"><img src='/media/img/update.png' alt='Updates available' /></a>
+					<?php else: ?>
+						<a><img src='/media/img/update_grey.png' alt='No updates available' /></a>	
+					<?php endif; ?>	
+				<?php endif; ?>
+				<?php if(Pbs_Acl::checkRight('pre') || Pbs_Acl::checkRight('prem')): ?>
+			  		<a href="<?php echo $this->url(
+						array(
+							'module'	=> 'user',
+							'controller' => 'preboot',
+							'action'     => 'editpreboot',
+							'prebootID'   =>  $preboot->getID(),
+							'page'		=> $this->page
+						),
+						'default',
+						true, false) ?>"><img src='/media/img/edit.png' alt='Edit Preboot' /></a>
+				<?php endif; ?>
+				<?php if(Pbs_Acl::checkRight('prd')): ?>
+					<a href="<?php echo $this->url(
+						array(
+							'module'	=> 'user',
+							'controller' => 'preboot',
+							'action'     => 'deletepreboot',
+							'prebootID'   =>  $preboot->getID(),
+							'page'		=> $this->page
+						),
+						'default',
+						true) ?>"><img src='/media/img/delete.png' alt='Delete Preboot'/></a>
+				<?php endif; ?>
 	  		</div>  
 	  		<div class='title'><?php echo $this->escape($preboot->getTitle()); ?></div>
 	  		<div class='details'>
-	  			<label>Prebootpath:</label>
+		  		<label>PrebootID</label>
+		  			<div class='item'><?php echo $this->escape($preboot->getID()); ?></div>
+	  			<label>Prebootpath</label>
 	  				<div class='item'><?php echo $this->escape($preboot->getPath_preboot()); ?></div>
 	  		</div>
   		</div>