Application in 3 Modules gesplittet, Dev = unsere entwicklungsumgebung, user = die weboberfläche fr anwender mit acl etc, fbgui = für die fbgui truppe - links in dev müssen noch angepasst werden

15 files changed, 0 insertions, 2748 deletions

diff --git a/application/controllers/AuthController.php b/application/controllers/AuthController.php
deleted file mode 100644
index 097417b..0000000
--- a/application/controllers/AuthController.php
+++ /dev/null
@@ -1,169 +0,0 @@
-<?php
-
-class AuthController extends Zend_Controller_Action
-{
-	protected $personmapper;
-	private $db = null;
-
-	public function init()
-	{
-		$this->db = Zend_Db_Table::getDefaultAdapter();
-		$this->personmapper = new Application_Model_PersonMapper();
-	}
-
-	public function indexAction()
-	{
-		$this->_helper->redirector('login', 'auth');
-	}
-
-	public function loginAction()
-	{
-		if (Zend_Auth::getInstance()->hasIdentity()) {
-			print_a('Already logged in.');
-		} else {
-			if (!isset($_POST["login"])){
-				$loginForm = new Application_Form_AuthLogin();
-			} else {
-				$loginForm = new Application_Form_AuthLogin($_POST);
-
-				if ($loginForm->isValid($_POST)) {
-
-					$auth = Zend_Auth::getInstance();
-
-					$adapter = new Zend_Auth_Adapter_DbTable(
-					$this->db,
-        		            'pbs_person',
-        		            'email',
-        		            'password',
-        		            'MD5(CONCAT(?, password_salt))'
-        		            );
-        		             
-
-        		            $adapter->setIdentity($loginForm->getValue('email'));
-        		            $adapter->setCredential($loginForm->getValue('password'));
-
-        		            $result = $auth->authenticate($adapter);
-
-        		            // TODO: erweiterte fehlerbeschreibung des Users
-
-        		            if ($result->isValid()) {
-        		            	$this->personmapper = new Application_Model_PersonMapper();
-        		            	$result = $this->personmapper->findBy('email', Zend_Auth::getInstance()->getIdentity());
-        		            	$person = new Application_Model_Person($result[0]);
-        		            	$person->setID($result[0]['personID']);
-        		            	$date = new DateTime();
-        		            	$person->setLogindate($date->getTimestamp());
-        		            	$this->personmapper->save($person);
-        		            	$this->_redirect('/');
-        		            	return;
-        		            } else {
-        		            	echo "Wrong Email or Password.";
-        		            }
-				}
-			}
-
-			$this->view->loginForm = $loginForm;
-		}
-	}
-
-	public function registerAction()
-	{
-		if (Zend_Auth::getInstance()->hasIdentity()) {
-			print_a('Already logged in.');
-		} else {
-			if (!isset($_POST["register"])){
-				$registerForm = new Application_Form_AuthRegister();
-			} else {
-				$registerForm = new Application_Form_AuthRegister($_POST);
-
-				if ($registerForm->isValid($_POST)) {
-
-					$person = new Application_Model_Person($_POST);
-					$this->personmapper = new Application_Model_PersonMapper();
-
-					$date = new DateTime();
-					$person->setRegisterdate($date->getTimestamp());
-					$person->setPasswordSalt(MD5($date->getTimestamp()));
-					$person->setPassword(MD5($person->getPassword() . $person->getPasswordSalt()));
-					print_a($person);
-					try {
-						$this->personmapper->save($person);
-					}catch(Zend_Exception $e)
-					{
-						echo "Caught exception: " . get_class($e) . "<br/>";
-						echo "Message: " . $e->getMessage() . "<br/>";
-						echo "Email Address already existing..";
-						return;
-					}
-					echo "Successfully registered. <br/>";
-					echo "Continue to Login: <a href=\""."/auth/login"."\">Login</a>";
-					$this->_helper->redirector('login', 'auth');
-					return;
-				}
-			}
-
-			$this->view->registerForm = $registerForm;
-		}
-	}
-
-	public function logoutAction()
-	{
-		$auth = Zend_Auth::getInstance();
-		$auth->clearIdentity();
-		$this->_helper->redirector('login', 'auth');
-	}
-
-	public function recoverpasswordAction()
-	{
-		if (!isset($_POST["recoverPassword"])){
-			$recoverPasswordForm = new Application_Form_AuthRecoverPassword();
-		} else {
-			$recoverPasswordForm = new Application_Form_AuthRecoverPassword($_POST);
-			# Wiederherstellung funktioniert noch nicht!!!
-			/*if ($recoverPasswordForm->isValid($_POST)) {
-			$recoverPasswordForm->getView()->url();
-			$person = new Application_Model_Person($_POST);
-			$this->personmapper = new Application_Model_PersonMapper();
-
-			$result = $this->personmapper->findBy('email', $_POST['email']);
-			$email = $result[0]['email'];
-			$name = $result[0]['firstname'] . ' ' . $result[0]['name'];
-			$url = $this->getRequest()->getScheme() . '://' . $this->getRequest()->getHttpHost() . $this->view->url();
-			$recoverid = $this->random(100);
-			$mailbody = 'Um das Passwort zu ändern klicken Sie auf folgenden Link<br /><br /><a href="'. $url . '/auth/recoverpassword/?recoverid='. $recoverid . '">Passwort ändern</a>';		
-			$mail = new Zend_Mail();
-			$mail->setBodyHtml($mailbody, 'utf8');
-			$mail->getBodyHtml()->getContent();
-			$mail->setFrom('admin@local', 'Admin');
-			$mail->addTo($email, $name);
-			$mail->setSubject('Password Wiederherstellung Preboot Server');
-			$mail->send();
-			}
-			*/
-		}
-
-		$this->view->recoverPasswordForm = $recoverPasswordForm;
-	}
-
-	public function deleteAction()
-	{
-		$result = $this->personmapper->findBy('email', Zend_Auth::getInstance()->getIdentity());
-		$person = $result[0];
-		$personID = $person["personID"];
-		if (isset($personID)){
-			$this->personmapper = new Application_Model_PersonMapper();
-			$person = $this->personmapper->find($personID);
-			try {
-				$this->personmapper->delete($person);
-			}catch(Zend_Exception $e)
-			{
-				echo "Caught exception: " . get_class($e) . "<br/>";
-				echo "Message: " . $e->getMessage() . "<br/>";
-				return;
-			}
-			$auth = Zend_Auth::getInstance();
-			$auth->clearIdentity();
-			$this->_helper->redirector('login', 'auth');
-		}
-	}
-}
\ No newline at end of file
diff --git a/application/controllers/BootisoController.php b/application/controllers/BootisoController.php
deleted file mode 100644
index 078c962..0000000
--- a/application/controllers/BootisoController.php
+++ /dev/null
@@ -1,125 +0,0 @@
-<?php
-
-class BootisoController extends Zend_Controller_Action
-{
-
-    public function init()
-    {
-   		$db = Zend_Db_Table::getDefaultAdapter();
-    }
-
-    public function indexAction()
-    {
-    	$bootisomapper = new Application_Model_BootIsoMapper();
-    	$groupmapper = new Application_Model_GroupMapper();
-    	$membershipmapper = new Application_Model_MembershipMapper();
-    	$personmapper = new Application_Model_PersonMapper();
-    	
-    	$this->view->bootisolist = $bootisomapper->fetchAll();
-    	    
-    	foreach ($this->view->bootisolist as $bootiso){
-    		  $bootiso->setGroupID("[".$bootiso->getGroupID()."] ".$groupmapper->find($bootiso->getGroupID())->getTitle());
-    		  $bootiso->setMembershipID("[".$bootiso->getMembershipID()."] ".$personmapper->find($membershipmapper->find($bootiso->getMembershipID())->getPersonID())->getFirstname());
-    	}
-    
-    }
-
-    public function createbootisoAction()
-    {
-    		$groupmapper = new Application_Model_GroupMapper();
-    	
-           	if (!isset($_POST["createbootiso"])){
-    	        $createbootisoForm = new Application_Form_BootisoCreate(array('grouplist' => $groupmapper->fetchAll()));
-    		} else {
-    			
-    	        $createbootisoForm = new Application_Form_BootisoCreate(array('grouplist' => $groupmapper->fetchAll()),$_POST);
-    			    			
-    		    if ($createbootisoForm->isValid($_POST)) {
-
-    		    	$bootiso = new Application_Model_BootIso($_POST);
-    		    	$bootiso->setMembershipID('1');
-    		        $bootisomapper = new Application_Model_BootIsoMapper();
-    		        $bootiso->setCreated(time()); 
-    		        
-    		    	try {  
-    		            $bootisomapper->save($bootiso);
-    		        }catch(Zend_Exception $e)
-    		        {
-    		            echo "Caught exception: " . get_class($e) . "<br/>";
-    					echo "Message: " . $e->getMessage() . "<br/>";
-    					
-    		        }
-					$this->_redirect('/bootiso');
-    		     }
-    		}
-    
-            $this->view->createbootisoForm = $createbootisoForm;
-    }
-
-    public function editbootisoAction()
-    {
-    	$bootisoID = $this->_request->getParam('bootisoID');
-    	$groupmapper = new Application_Model_GroupMapper();
-    	
-    	if (!isset($_POST["editbootiso"])){
-    		$bootisoID = $this->_request->getParam('bootisoID');
-     		if (!isset($bootisoID) || !is_numeric($bootisoID)){
-   				$this->_redirect('/bootiso');
-    		} else {
-    		   $bootiso = new Application_Model_BootIso();
-    		   $bootisomapper = new Application_Model_BootIsoMapper();
-    		   $bootisomapper->find($bootisoID, $bootiso);
-    		   
-    		   $editbootisoForm = new Application_Form_BootisoEdit(array('grouplist' => $groupmapper->fetchAll()));
-    		   $editbootisoForm->populate($bootiso->toArray()); 
-    		}
-    	}else{
-    		$editbootisoForm = new Application_Form_BootisoEdit(array('grouplist' => $groupmapper->fetchAll()),$_POST);
-    			    			
-    		if ($editbootisoForm->isValid($_POST)) {
-
-    			$bootiso = new Application_Model_BootIso($_POST);
-    			$bootiso->setMembershipID('1');
-    		    $bootisomapper = new Application_Model_BootIsoMapper();
-    		    $bootiso->setCreated(time());
-    		    $bootiso->setID($bootisoID);
-    		        
-    		   	try {  
-    		       	$bootisomapper->save($bootiso);
-    		    }catch(Zend_Exception $e)
-    		    {
-    		    	echo "Caught exception: " . get_class($e) . "<br/>";
-    				echo "Message: " . $e->getMessage() . "<br/>";	
-    		    }
-    		    
-				$this->_redirect('/bootiso');
-    		}
-    			
-    	}
-    	
-    	$this->view->editbootisoForm = $editbootisoForm;
-    }
-
-    public function deletebootisoAction()
-    {
-   		$bootisoID = $this->_request->getParam('bootisoID');
-     	if (!isset($bootisoID)){
-   			$this->_redirect('/bootiso');
-    	} else {
-    		   $bootiso = new Application_Model_BootIso();
-    		   $bootiso->setID($bootisoID);
-    		   $bootisomapper = new Application_Model_BootIsoMapper();
-    		   $bootisomapper->delete($bootiso);
-    	}
-    	$this->_redirect('/bootiso');
-    }
-
-
-}
-
-
-
-
-
-
-
diff --git a/application/controllers/BootmenuController.php b/application/controllers/BootmenuController.php
deleted file mode 100644
index 641b547..0000000
--- a/application/controllers/BootmenuController.php
+++ /dev/null
@@ -1,328 +0,0 @@
-<?php
-
-class BootmenuController extends Zend_Controller_Action
-{
-	
-    public function init()
-    {
-   		$db = Zend_Db_Table::getDefaultAdapter();
-   	}
-
-    public function indexAction()
-    {
-    	$bootmenumapper = new Application_Model_BootMenuMapper();
-	    $bootmenuentriesmapper = new Application_Model_BootMenuEntriesMapper();
-	    $bootosmapper = new Application_Model_BootOsMapper();
-	    $configmapper = new Application_Model_ConfigMapper();
-	    $membershipmapper = new Application_Model_MembershipMapper();
-	    $groupmapper = new Application_Model_GroupMapper();
-	    $personmapper = new Application_Model_PersonMapper();
-	    
-	   	$this->view->bootosmapper = $bootosmapper;
-	    $this->view->configmapper = $configmapper;
-	   
-	    $bootmenuID = $this->_request->getParam('bootmenuid');
-	    $preboot =  $this->_request->getParam('preboot');
-	    
-	    if($preboot=="")
-	    {
-	    	if($bootmenuID == "")
-	    	{
-	    		$this->view->bootmenulist = $bootmenumapper->fetchAll();
-		    	$bootmenuentries = array();
-		    	foreach ($this->view->bootmenulist as $bootmenu){
-		    		  $bootmenuentries[$bootmenu->getID()] = $bootmenuentriesmapper->findBy('bootmenuID',$bootmenu->getID());
-		    		  $bootmenu->setGroupID("[".$bootmenu->getGroupID()."] ".$groupmapper->find($bootmenu->getGroupID())->getTitle());
-		    		  $bootmenu->setMembershipID("[".$bootmenu->getMembershipID()."] ".$personmapper->find($membershipmapper->find($bootmenu->getMembershipID())->getPersonID())->getFirstname());
-		    	}	
-	    	}else{
-	    		$bootmenu = new Application_Model_BootMenu();
-	    		$bootmenumapper->find($bootmenuID, $bootmenu);
-	    		
-	    		$bootmenuentries = array();
-		    	$bootmenuentries[$bootmenuID] = $bootmenuentriesmapper->findBy('bootmenuID',$bootmenuID);
-		    	$bootmenu->setGroupID("[".$bootmenu->getGroupID()."] ".$groupmapper->find($bootmenu->getGroupID())->getTitle());
-		    	$bootmenu->setMembershipID("[".$bootmenu->getMembershipID()."] ".$personmapper->find($membershipmapper->find($bootmenu->getMembershipID())->getPersonID())->getFirstname());
-				
-		    	$this->view->bootmenulist = array($bootmenu);
-				
-	    	}
-	    		
-	    	$this->view->bootmenuentrylist = $bootmenuentries;
-	    	
-	    }else{
-	    	$this->_helper->layout->disableLayout();
-       		$this->_helper->viewRenderer->setNoRender();
-       		
-       		if($bootmenuID == "")
-    		{
-	    		$this->view->bootmenulist = $bootmenumapper->fetchAll();
-		    	$bootmenuentries = array();
-		    	foreach ($this->view->bootmenulist as $bootmenu){
-		    		  $bootmenuentries[$bootmenu->getID()] = $bootmenuentriesmapper->findBy('bootmenuID',$bootmenu->getID());
-		    		  $bootmenu->setGroupID("[".$bootmenu->getGroupID()."] ".$groupmapper->find($bootmenu->getGroupID())->getTitle());
-		    		  $bootmenu->setMembershipID("[".$bootmenu->getMembershipID()."] ".$personmapper->find($membershipmapper->find($bootmenu->getMembershipID())->getPersonID())->getFirstname());
-		    }	
-    		}else{
-	    		$bootmenu = new Application_Model_BootMenu();
-	    		$bootmenumapper->find($bootmenuID, $bootmenu);
-	    	
-	    		$cc['title'] = $bootmenu->getTitle();
-	    		
-	    		$bootmenuentries = array();
-		    	$bootmenuentries = $bootmenuentriesmapper->findBy('bootmenuID',$bootmenuID);
-		    	
-		    	foreach($bootmenuentries as $bootmenuentry){
-		    		$ar = array();
-		    		$ar['title'] = $bootmenuentry->getTitle();
-		    		$ar['id'] = $bootmenuentry->getID();		    	
-		    		$cc['data'][] = $ar;
-		    	}
-		    	
-		    	echo json_encode($cc);
-		    	
-		    	//print_a($cc);
-
-    		}
-    		
-	    }
-    }
-
-    public function addbootmenuentryAction()
-    {
-    	$bootmenuID = $this->_request->getParam('bootmenuID');
-    	$bootosmapper = new Application_Model_BootOsMapper();
-    	$configmapper = new Application_Model_ConfigMapper();
-
-    	if (!isset($_POST["addbootmenuentry"])){
-    	    $addbootmenuentryForm = new Application_Form_BootmenuEntriesAdd(array('bootoslist'=>$bootosmapper->fetchAll(), 'maxorder'=> $this->_request->getParam('maxorder'), 'configlist'=>$configmapper->fetchAll()));  
-    	    $addbootmenuentryForm->populate(array('order' => $this->_request->getParam('maxorder')));
-    	    unset($_POST['kcl']);
-    	    unset($_POST['configID']);
-    	    $addbootmenuentryForm->populate($_POST);
-    		} else {
-    			
-    	        $addbootmenuentryForm = new Application_Form_BootmenuEntriesAdd(array('bootoslist'=>$bootosmapper->fetchAll(), 'maxorder'=> $this->_request->getParam('maxorder'), 'configlist'=>$configmapper->fetchAll()),$_POST);
-    	        
-    		    if ($addbootmenuentryForm->isValid($_POST)) {
-
-    		    	$bootmenuentry = new Application_Model_BootMenuEntries($_POST);
-    		    	$bootmenuentry->setBootmenuID($bootmenuID);
-    		    	    		    	
-    		        $bootmenuentrymapper = new Application_Model_BootMenuEntriesMapper();
-
-    		    	try {  
-    		    	    if($bootmenuentry->getOrder() < $this->_request->getParam('maxorder')){
-    		    			$bootmenuentry->setOrder($bootmenuentry->getOrder());
- 							$bootmenuentrymapper->order($bootmenuentry);
-    		    		}
-    		            $bootmenuentrymapper->save($bootmenuentry);
-    		        }catch(Zend_Exception $e)
-    		        {
-    		            echo "Caught exception: " . get_class($e) . "<br/>";
-    					echo "Message: " . $e->getMessage() . "<br/>";
-    					
-    		        }
-					$this->_redirect('/bootmenu');
-    		     }
-    		}
-    
-            $this->view->addbootmenuentryForm = $addbootmenuentryForm;
-    	
-    }
-
-    public function createbootmenuAction()
-    {
-   		$groupmapper = new Application_Model_GroupMapper();
-    	
-            if (!isset($_POST["createbootmenu"])){
-    	        $createbootmenuForm = new Application_Form_BootmenuCreate(array('grouplist' => $groupmapper->fetchAll()));
-    		} else {
-    			
-    	        $createbootmenuForm = new Application_Form_BootmenuCreate(array('grouplist' => $groupmapper->fetchAll()),$_POST);
-    			    			
-    		    if ($createbootmenuForm->isValid($_POST)) {
-
-    		    	$bootmenu = new Application_Model_BootMenu($_POST);
-    		    	$bootmenu->setMembershipID('1');
-    		    	$bootmenu->setCreated(time());
-    		        $bootmenumapper = new Application_Model_BootMenuMapper();
-    		        
-    		    	try {  
-    		            $bootmenumapper->save($bootmenu);
-    		        }catch(Zend_Exception $e)
-    		        {
-    		            echo "Caught exception: " . get_class($e) . "<br/>";
-    					echo "Message: " . $e->getMessage() . "<br/>";
-    					
-    		        }
-					$this->_redirect('/bootmenu');
-    		     }
-    		}
-    
-            $this->view->createbootmenuForm = $createbootmenuForm;
-    }
-
-    public function editbootmenuAction()
-    {
-        $bootmenuID = $this->_request->getParam('bootmenuID');
-        $groupmapper = new Application_Model_GroupMapper();
-        
-    	if (!isset($_POST["editbootmenu"])){
-    		$bootmenuID = $this->_request->getParam('bootmenuID');
-     		if (!isset($bootmenuID) || !is_numeric($bootmenuID)){
-   				$this->_redirect('/bootmenu');
-    		} else {
-    		   $bootmenu = new Application_Model_BootMenu();
-    		   $bootmenumapper = new Application_Model_BootMenuMapper();
-    		   $bootmenumapper->find($bootmenuID, $bootmenu);
-    		   
-    		   $editbootmenuForm = new Application_Form_BootmenuEdit(array('grouplist' => $groupmapper->fetchAll()));
-    		   $editbootmenuForm->populate($bootmenu->toArray()); 
-    		}
-    	}else{
-    		$editbootmenuForm = new Application_Form_BootmenuEdit(array('grouplist' => $groupmapper->fetchAll()),$_POST);
-    			    			
-    		if ($editbootmenuForm->isValid($_POST)) {
-
-    			$bootmenu = new Application_Model_BootMenu($_POST);
-    			$bootmenu->setMembershipID('1');
-    		   	$bootmenu->setCreated(time());
-    		    $bootmenumapper = new Application_Model_BootMenuMapper();
-    		    
-    		    $bootmenu->setID($bootmenuID);
-    		        
-    		   	try {  
-    		   		
-    		       	$bootmenumapper->save($bootmenu);
-    		    }catch(Zend_Exception $e)
-    		    {
-    		    	echo "Caught exception: " . get_class($e) . "<br/>";
-    				echo "Message: " . $e->getMessage() . "<br/>";	
-    		    }
-    		    
-				$this->_redirect('/bootmenu');
-    		}
-    			
-    	}
-    	
-    	$this->view->editbootmenuForm = $editbootmenuForm;
-    }
-
-    public function editbootmenuentryAction()
-    {
-        $bootmenuentryID = $this->_request->getParam('bootmenuentryID');
-        $bootmenuID = $this->_request->getParam('bootmenuID');
-        $bootosmapper = new Application_Model_BootOsMapper();
-        $configmapper = new Application_Model_ConfigMapper();
-    	$bootmenuentry = new Application_Model_BootMenuEntries();
-    	$bootmenuentrymapper = new Application_Model_BootMenuEntriesMapper();
-    	
-    	if (!isset($_POST["editbootmenuentry"])){
-    		$bootmenuentryID = $this->_request->getParam('bootmenuentryID');
-     		if (!isset($bootmenuentryID) || !is_numeric($bootmenuentryID)){
-   				$this->_redirect('/bootmenu');
-    		} else {
-    		   	
-    		   	$bootmenuentrymapper->find($bootmenuentryID, $bootmenuentry);
-    		   	
-    		  	$editbootmenuentryForm = new Application_Form_BootmenuEntriesEdit(array('bootoslist'=>$bootosmapper->fetchAll(), 'maxorder' => $this->_request->getParam('maxorder'), 'configlist'=>$configmapper->fetchAll()));  
-				if(!isset($_POST['kcl'])){	
-    		  		$editbootmenuentryForm->populate($bootmenuentry->toArray()); 
-				}
-    		  	else{ 
-    		  		unset($_POST['kcl']);
-    		  		unset($_POST['configID']);
-    		  		$editbootmenuentryForm->populate($_POST);
-    		  	}
-    		}
-    	}else{
-    		$editbootmenuentryForm = new Application_Form_BootmenuEntriesEdit(array('bootoslist'=>$bootosmapper->fetchAll(), 'maxorder'=> $this->_request->getParam('maxorder'), 'configlist'=>$configmapper->fetchAll()),$_POST);
-    			    			
-    		if ($editbootmenuentryForm->isValid($_POST)) {
-
-    			$bootmenuentry = new Application_Model_BootMenuEntries($_POST);
-    			
-    			$bootmenuentry->setBootmenuID($bootmenuID);
-    			$bootmenuentry->setID($bootmenuentryID);
- 
-    		    $bootmenuentrymapper = new Application_Model_BootMenuEntriesMapper();
-    		        
-    		   	try {  
-    		   		if($bootmenuentry->getOrder() < $this->_request->getParam('oldorder'))
-    		   			$bootmenuentrymapper->orderbefore($bootmenuentry, $this->_request->getParam('oldorder'));
-    		   		else 
-    		   			$bootmenuentrymapper->orderafter($bootmenuentry, $this->_request->getParam('oldorder'));
-    		   			
-    		       	$bootmenuentrymapper->save($bootmenuentry);
-    		       	
-    		    }catch(Zend_Exception $e)
-    		    {
-    		    	echo "Caught exception: " . get_class($e) . "<br/>";
-    				echo "Message: " . $e->getMessage() . "<br/>";	
-    		    }
-    		    
-				$this->_redirect('/bootmenu');
-    		}
-    			
-    	}
-    	
-    	$this->view->editbootmenuentryForm = $editbootmenuentryForm;
-    	
-    }
-
-    public function removebootmenuentryAction()
-    {
-        $bootmenuentryID = $this->_request->getParam('bootmenuentryID');
-     	if (!isset($bootmenuentryID) || !is_numeric($bootmenuentryID)){
-   			$this->_redirect('/bootmenu');
-    	} else {
-    		   $bootmenuentry = new Application_Model_BootMenuEntries();
-    		   $bootmenuentrymapper = new Application_Model_BootMenuEntriesMapper();
-    		   $bootmenuentrymapper->find($bootmenuentryID, $bootmenuentry);
-    		   $bootmenuentrymapper->delete($bootmenuentry);
-    		   $bootmenuentrymapper->orderremove($bootmenuentry);
-    	}
-    	$this->_redirect('/bootmenu');
-    }
-
-    public function deletebootmenuAction()
-    {
-    	$bootmenuID = $this->_request->getParam('bootmenuID');
-     	if (!isset($bootmenuID) || !is_numeric($bootmenuID)){
-   			$this->_redirect('/bootmenu');
-    	} else {
-    		   $bootmenu = new Application_Model_BootMenu();
-    		   $bootmenu->setID($bootmenuID);
-    		   $bootmenumapper = new Application_Model_BootMenuMapper();
-    		   $bootmenumapper->delete($bootmenu);
-    	}
-    	$this->_redirect('/bootmenu');
-    }
-
-    private function arrayDiff($a, $b){
-		foreach($a as $k1 => $i1){
-			foreach($b as $k2 => $i2){
-				if($i1->getID() == $i2->getBootosID()){
-					unset($a[$k1]);
-				}
-			}
-		}
-		return $a;
-	}
-	
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/application/controllers/BootosController.php b/application/controllers/BootosController.php
deleted file mode 100644
index 3a7ab90..0000000
--- a/application/controllers/BootosController.php
+++ /dev/null
@@ -1,147 +0,0 @@
-<?php
-
-class BootosController extends Zend_Controller_Action
-{
-
-    public function init()
-    {
-   		$db = Zend_Db_Table::getDefaultAdapter();
-    }
-
-    public function indexAction()
-    {
-    	
-    	$bootosmapper = new Application_Model_BootOsMapper();
-    	
-        $groupmapper = new Application_Model_GroupMapper();
-    	$membershipmapper = new Application_Model_MembershipMapper();
-    	$personmapper = new Application_Model_PersonMapper();
-    	$configmapper = new Application_Model_ConfigMapper();
-    	
-    	$this->view->bootoslist = $bootosmapper->fetchAll();
-    	if(count($this->view->bootoslist)>0){
-			foreach ($this->view->bootoslist as $bootos){
-				  $bootos->setGroupID("[".$bootos->getGroupID()."] ".$groupmapper->find($bootos->getGroupID())->getTitle());
-				  $bootos->setMembershipID("[".$bootos->getMembershipID()."] ".$personmapper->find($membershipmapper->find($bootos->getMembershipID())->getPersonID())->getFirstname());
-				  $bootos->setConfigID("[".$bootos->getConfigID()."] ".$configmapper->find($bootos->getConfigID())->getTitle());
-				  
-			}
-		}
-    	
-    }
-
-    public function createbootosAction()
-    {
-    	$groupmapper = new Application_Model_GroupMapper();
-    	$configmapper = new Application_Model_ConfigMapper();    	
-    	
-    	if (!isset($_POST["createbootos"])){
-    	        $createbootosForm = new Application_Form_BootosCreate(array('grouplist' => $groupmapper->fetchAll() ,'configlist'=>$configmapper->fetchAll()));
-    		} else {
-    			
-    	        $createbootosForm = new Application_Form_BootosCreate(array('grouplist' => $groupmapper->fetchAll() ,'configlist'=>$configmapper->fetchAll()),$_POST);
-    			    			
-    		    if ($createbootosForm->isValid($_POST)) {
-
-    		    	$bootos = new Application_Model_BootOs($_POST);
-    		    	$bootos->setMembershipID('1');
-    		    	if($bootos->getConfigID() == '')
-    		    		$bootos->setConfigID(NULL);
-    		        $bootosmapper = new Application_Model_BootOsMapper();
-    		        $bootos->setCreated(time());
-    		        
-    		    	try {  
-    		            $bootosID = $bootosmapper->save($bootos);
-						
-    		            $initpath = "../resources/bootos/".$bootosID."/initramfs/";
-    		            $kernelpath = "../resources/bootos/".$bootosID."/kernel/";
-    		              
-    		      		exec("wget -P  ".$kernelpath." ".$bootos->getPath_kernel());
-    		      		exec("wget -P  ".$initpath." ".$bootos->getPath_init());    		            
-    		            
-    		        }catch(Zend_Exception $e)
-    		        {
-    		            echo "Caught exception: " . get_class($e) . "<br/>";
-    					echo "Message: " . $e->getMessage() . "<br/>";
-    					
-    		        }
-    		        
-					$this->_redirect('/bootos');
-    		     }
-    		}
-    
-            $this->view->createbootosForm = $createbootosForm;
-    }
-
-    public function editbootosAction()
-    {
-    	$bootosID = $this->_request->getParam('bootosID');
-    	$groupmapper = new Application_Model_GroupMapper();
-    	$configmapper = new Application_Model_ConfigMapper();
-    	
-    	if (!isset($_POST["editbootos"])){
-    		$bootosID = $this->_request->getParam('bootosID');
-     		if (!isset($bootosID) || !is_numeric($bootosID)){
-   				$this->_redirect('/bootos');
-    		} else {
-    		   $bootos = new Application_Model_BootOs();
-    		   $bootosmapper = new Application_Model_BootOsMapper();
-    		   $bootos = $bootosmapper->find($bootosID);
-    		   
-    		   $editbootosForm = new Application_Form_BootosEdit(array('grouplist' => $groupmapper->fetchAll() ,'configlist'=>$configmapper->fetchAll()));
-    		   $editbootosForm->populate($bootos->toArray()); 
-    		}
-    	}else{
-    		$editbootosForm = new Application_Form_BootosEdit(array('grouplist' => $groupmapper->fetchAll() ,'configlist'=>$configmapper->fetchAll()),$_POST);
-    			    			
-    		if ($editbootosForm->isValid($_POST)) {
-
-    			$bootos = new Application_Model_BootOs($_POST);
-    			$bootos->setMembershipID('1');
-    		   	if($bootos->getConfigID() == '')
-    		    	$bootos->setConfigID(NULL);
-    		    $bootosmapper = new Application_Model_BootOsMapper();
-    		    $bootos->setCreated(time());
-    		    $bootos->setID($bootosID);
-    		        
-    		   	try {  
-    		       	$bootosmapper->save($bootos);
-    		    }catch(Zend_Exception $e)
-    		    {
-    		    	echo "Caught exception: " . get_class($e) . "<br/>";
-    				echo "Message: " . $e->getMessage() . "<br/>";	
-    		    }
-    		    
-				$this->_redirect('/bootos');
-    		}
-    			
-    	}
-    	
-    	$this->view->editbootosForm = $editbootosForm;
-    	
-    }
-
-    public function deletebootosAction()
-    {
-    	$bootosID = $this->_request->getParam('bootosID');
-     	if (!isset($bootosID)){
-   			$this->_redirect('/bootos');
-    	} else {
-    		   $bootos = new Application_Model_BootOs();
-    		   $bootos->setID($bootosID);
-    		   $bootosmapper = new Application_Model_BootOsMapper();
-    		   $bootosmapper->delete($bootos);
-    	}
-    	$this->_redirect('/bootos');
-    		
-    }
-
-
-}
-
-
-
-
-
-
-
diff --git a/application/controllers/ClientController.php b/application/controllers/ClientController.php
deleted file mode 100644
index affa780..0000000
--- a/application/controllers/ClientController.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-
-class ClientController extends Zend_Controller_Action
-{
-
-    public function init()
-    {
-        /* Initialize action controller here */
-    }
-
-    public function indexAction()
-    {
-        $clientMapper = new Application_Model_ClientMapper();
-        $this->view->clients = $clientMapper->fetchAll();
-    }
-
-    public function addclientAction()
-    {	
-		$mac = $this->_request->getParam('mac');
-		$hh = $this->_request->getParam('hh');
-
-		if (!isset($_POST["add"])){
-			$addclient = new Application_Form_Client(array('buttontext' => 'Create Client'));    		
-			$this->view->addclient = $addclient;		
-		}
-		else{
-			$addfilterform = new Application_Form_Client(array('buttontext' => 'Create Client'),$_POST);
-			if ($addfilterform->isValid($_POST) || ($mac != '' && $hh != '') ) {	
-    			$client = new Application_Model_Client();
-				$mac = ($mac!='')?$mac:$_POST['macadress'];
-				$hh = ($hh!='')?$hh:$_POST['hardwarehash'];
-    			$client->setMacadress($mac);
-    			$client->setHardwarehash($hh);
-    			$clientmapper = new Application_Model_ClientMapper();
-    			$clientmapper->save($client);
-    			print_a('inserted');
-				$this->_redirect('/client');
-    		}
-			$this->view->addclient = $addclient;
-		}
-    }
-
-    public function removeclientAction()
-    {
-        $clientID = $this->_request->getParam('clientID');
-        		// TODO: ACL implementieren ob er den filter löschen darf
-        		if(is_numeric($clientID)){
-        			$removeClient = new Application_Model_Client();
-        			$removeClient->setID($clientID);
-        			$clientMapper = new Application_Model_ClientMapper();
-        			$clientMapper->delete($removeClient);
-        		}
-        		$this->_redirect('/client');
-    }
-
-    public function editclientAction()
-    {
-		if (!isset($_POST["add"])){	
-			$clientID = $this->_request->getParam('clientID');
-			$data = new Application_Model_Client();
-			$mapper = new Application_Model_ClientMapper();
-			$mapper->find($clientID,$data);	
-
-       		$editclient = new Application_Form_Client(array('buttontext' => 'Edit Client'));
-			$editclient->populate($data->toArray());
-      	  	$this->view->editclient = $editclient;
-		}
-		else{
-			$editclient = new Application_Form_Client(array('buttontext' => 'Edit Client'),$_POST);
-			if ($editclient->isValid($_POST) || ($mac != '' && $hh != '') ) {	
-    			$client = new Application_Model_Client($_POST);
-				$client->setID($this->_request->getParam('clientID'));
-    			$clientmapper = new Application_Model_ClientMapper();
-    			$clientmapper->save($client);
-    			print_a('updated');
-				$this->_redirect('/client');
-    		}
-			$this->view->editclient = $editclient;
-		}
-    }
-
-
-}
-
-
-
-
-
-
-
diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
deleted file mode 100644
index 3eff0cc..0000000
--- a/application/controllers/ConfigController.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-
-class ConfigController extends Zend_Controller_Action
-{
-
-    public function init()
-    {
-   		$db = Zend_Db_Table::getDefaultAdapter();
-   	}
-
-    public function indexAction()
-    {
-        $configmapper = new Application_Model_ConfigMapper();
-    	
-    	$groupmapper = new Application_Model_GroupMapper();
-    	$membershipmapper = new Application_Model_MembershipMapper();
-    	$personmapper = new Application_Model_PersonMapper();
-    	
-		$this->view->configlist = $configmapper->fetchAll();
-    	    
-    	foreach ($this->view->configlist as $config){
-    		  $config->setGroupID("[".$config->getGroupID()."] ".$groupmapper->find($config->getGroupID())->getTitle());
-    		  $config->setMembershipID("[".$config->getMembershipID()."] ".$personmapper->find($membershipmapper->find($config->getMembershipID())->getPersonID())->getFirstname());
-    	}
-    	
-    }
-
-    public function createconfigAction()
-    {
-    	$groupmapper = new Application_Model_GroupMapper();
-        if (!isset($_POST["createconfig"])){
-    	        $createconfigForm = new Application_Form_ConfigCreate(array('grouplist' => $groupmapper->fetchAll()));
-    		} else {
-    			
-    	        $createconfigForm = new Application_Form_ConfigCreate(array('grouplist' => $groupmapper->fetchAll()),$_POST);
-    			    			
-    		    if ($createconfigForm->isValid($_POST)) {
-
-    		    	$config = new Application_Model_Config($_POST);
-    		    	$config->setCreated(time());
-    		    	$config->setMembershipID('1');
-    		    	
-    		        $configmapper = new Application_Model_ConfigMapper();
-    		        
-    		    	try {  
-    		            $configmapper->save($config);
-    		        }catch(Zend_Exception $e)
-    		        {
-    		            echo "Caught exception: " . get_class($e) . "<br/>";
-    					echo "Message: " . $e->getMessage() . "<br/>";
-    					
-    		        }
-					$this->_redirect('/config');
-    		     }
-    		}
-    
-            $this->view->createconfigForm = $createconfigForm;
-    }
-
-    public function editconfigAction()
-    {
-        $configID = $this->_request->getParam('configID');
-    	$groupmapper = new Application_Model_GroupMapper();
-        
-    	if (!isset($_POST["editconfig"])){
-    		$configID = $this->_request->getParam('configID');
-     		if (!isset($configID) || !is_numeric($configID)){
-   				$this->_redirect('/config');
-    		} else {
-    		   $config = new Application_Model_Config();
-    		   $configmapper = new Application_Model_ConfigMapper();
-    		   $config = $configmapper->find($configID);
-    		   
-    		   $editconfigForm = new Application_Form_ConfigEdit(array('grouplist' => $groupmapper->fetchAll()));
-    		   $editconfigForm->populate($config->toArray()); 
-    		}
-    	}else{
-    		$editconfigForm = new Application_Form_ConfigEdit(array('grouplist' => $groupmapper->fetchAll()),$_POST);
-    			    			
-    		if ($editconfigForm->isValid($_POST)) {
-
-    			$config = new Application_Model_Config($_POST); 	
-    		    $configmapper = new Application_Model_ConfigMapper();
-    		    $config->setCreated(time());
-    		    $config->setMembershipID('1');
-    		    $config->setID($configID);
-    		        
-    		   	try {  
-    		       	$configmapper->save($config);
-    		    }catch(Zend_Exception $e)
-    		    {
-    		    	echo "Caught exception: " . get_class($e) . "<br/>";
-    				echo "Message: " . $e->getMessage() . "<br/>";	
-    		    }
-    		    
-				$this->_redirect('/config');
-    		}
-    			
-    	}
-    	
-    	$this->view->editconfigForm = $editconfigForm;
-    }
-
-    public function deleteconfigAction()
-    {
-        $configID = $this->_request->getParam('configID');
-     	if (!isset($configID)){
-   			$this->_redirect('/config');
-    	} else {
-    		   $config = new Application_Model_Config();
-    		   $config->setID($configID);
-    		   $configmapper = new Application_Model_ConfigMapper();
-    		   $configmapper->delete($config);
-    	}
-    	$this->_redirect('/config');
-    }
-
-
-}
-
-
-
-
-
-
-
diff --git a/application/controllers/ErrorController.php b/application/controllers/ErrorController.php
deleted file mode 100644
index 5bb2749..0000000
--- a/application/controllers/ErrorController.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-class ErrorController extends Zend_Controller_Action
-{
-
-    public function errorAction()
-    {
-        $errors = $this->_getParam('error_handler');
-        
-        switch ($errors->type) {
-            case Zend_Controller_Plugin_ErrorHandler::EXCEPTION_NO_ROUTE:
-            case Zend_Controller_Plugin_ErrorHandler::EXCEPTION_NO_CONTROLLER:
-            case Zend_Controller_Plugin_ErrorHandler::EXCEPTION_NO_ACTION:
-        
-                // 404 error -- controller or action not found
-                $this->getResponse()->setHttpResponseCode(404);
-                $this->view->message = 'Page not found';
-                break;
-            default:
-                // application error
-                $this->getResponse()->setHttpResponseCode(500);
-                $this->view->message = 'Application error';
-                break;
-        }
-        
-        // Log exception, if logger available
-        if ($log = $this->getLog()) {
-            $log->crit($this->view->message, $errors->exception);
-        }
-        
-        // conditionally display exceptions
-        if ($this->getInvokeArg('displayExceptions') == true) {
-            $this->view->exception = $errors->exception;
-        }
-        
-        $this->view->request   = $errors->request;
-    }
-
-    public function getLog()
-    {
-        $bootstrap = $this->getInvokeArg('bootstrap');
-        if (!$bootstrap->hasPluginResource('Log')) {
-            return false;
-        }
-        $log = $bootstrap->getResource('Log');
-        return $log;
-    }
-
-
-}
-
diff --git a/application/controllers/FilterController.php b/application/controllers/FilterController.php
deleted file mode 100644
index da52c34..0000000
--- a/application/controllers/FilterController.php
+++ /dev/null
@@ -1,680 +0,0 @@
-<?php
-
-class FilterController extends Zend_Controller_Action
-{
-
-    private $_filtermapper = null;
-
-    private $db = null;
-
-    public function init()
-    {
-        try{		 
-                	 
-                	$this->_filtermapper = new Application_Model_FilterMapper();
-                		}catch (Zend_Exception $e) {  
-                	echo "Error message 1: " . $e->getMessage() . "\n";
-        		}
-        		$this->db = Zend_Db_Table::getDefaultAdapter();
-    }
-
-    public function indexAction()
-    {
-        try{			
-        			$this->_filtermapper = new Application_Model_FilterMapper();
-               		$this->view->filters = $this->_filtermapper->fetchAll();
-            	}catch (Zend_Exception $e) {  
-        			echo "Error message 2: " . $e->getMessage() . "\n";
-    		}
-	}
-
-    public function addfilterAction()
-    {
-        $bmmapper = new Application_Model_BootMenuMapper();
-		//TODO get bootmenu by group
-		$bootmenus = $bmmapper->fetchAll();
-        if (!isset($_POST["add"])){		
-    		$addfilterform = new Application_Form_FilterAdd(array('buttontext' => 'Create Filter','bootmenus'=>$bootmenus));    		
-			$this->view->addfilterform = $addfilterform;			
-		}else {
-			$addfilterform = new Application_Form_FilterAdd(array('buttontext' => 'Create Filter','bootmenus'=>$bootmenus),$_POST);
-			if ($addfilterform->isValid($_POST)) {			
-				try{
-					$newfilter = new Application_Model_Filter($_POST);
-					$newfilter->setCreated(time());
-
-					// TODO: Ändere mit ACL
-					$newfilter->setGroupID('1');
-					$newfilter->setMembershipID('1');			
-
-					$newfilter2 = new Application_Model_FilterMapper();
-					$newfilter2->save($newfilter);
-
-					$this->_redirect('/filter');
-			    	return;
-				}catch (Zend_Exception $e) {  
-        			echo "Error message 2: " . $e->getMessage() . "\n";  
-        		}
-			}
-			$this->view->addfilterform = $addfilterform;
-		}
-    }
-
-    public function removefilterAction()
-    {
-        $filterID = $this->_request->getParam('filterID');
-        		// TODO: ACL implementieren ob er den filter löschen darf
-        		if(is_numeric($filterID)){
-        			$deletefilter = new Application_Model_Filter();
-        			$deletefilter->setID($filterID);
-        			$filtermapper = new Application_Model_FilterMapper();
-        			$filtermapper->delete($deletefilter);
-        		}
-        		$this->_redirect('/filter');
-    }
-
-    public function editfilterAction()
-    {
-        $bmmapper = new Application_Model_BootMenuMapper();
-        		//TODO get bootmenu by group
-        		$bootmenus = $bmmapper->fetchAll();
-        		if (!isset($_POST["add"])){
-        		    // TODO: ACL implementieren ob er editieren darf
-        			$filterID = $this->_request->getParam('filterID');
-        			$filter = new Application_Model_Filter();
-        			
-        
-        			$filtermapper = new Application_Model_FilterMapper();
-        			$filtermapper->find($filterID,$filter);		
-        			$filter2 = $filter->toArray();
-        
-        			$editfilterform = new Application_Form_FilterAdd(array('buttontext' => 'Edit Filter','bootmenus'=>$bootmenus));  
-        			$editfilterform->populate($filter2);
-        			$this->view->editfilterform = $editfilterform;
-        		
-        		} else{
-        			try{
-        				$filterID = $this->_request->getParam('filterID');	
-        				
-        				$editfilterform = new Application_Form_FilterAdd(array('buttontext' => 'Edit Filter','bootmenus'=>$bootmenus),$_POST);
-        				//TODO: ACL integrieren				
-        				$_POST['groupID'] = 1;
-        				$_POST['membershipID'] = 1;
-        				$_POST['created'] = time();
-        
-        				if ($editfilterform->isValid($_POST)) {	
-        					$newfilterenty = new Application_Model_Filter($_POST);
-        					$newfilterenty->setID($this->_request->getParam('filterID'));
-        					$newfilter2 = new Application_Model_FilterMapper();				
-        					$newfilter2->save($newfilterenty);
-        					echo 'valid';	
-        					$this->_redirect('/filter');				
-        				}		
-        				$this->view->editfilterform = $editfilterform;
-        			}catch (Zend_Exception $e) {  
-            			echo "Error message 2: " . $e->getMessage() . "\n";  
-            		}
-        		}
-    }
-
-    public function addfilterentryAction()
-    {
-        // TODO: ACL implementieren ob er editieren darf   
-		if (!isset($_POST["add"])){
-			try{
-				$editfilterform = new Application_Form_FilterEntriesAdd(
-									array(	'buttontext' => 'Add Filterentry',
-											'filterID' => $this->_request->getParam('filterID'),
-											'data' => $_POST
-										));
-				$editfilterform->populate($_POST);
-				$this->view->editfilterform = $editfilterform;
-			}catch (Zend_Exception $e) {  
-				echo "Error message 2: " . $e->getMessage() . "\n";  
-			}
-		} else{
-			$editfilterform = new Application_Form_FilterEntriesAdd(array('buttontext' => 'Add Filterentry'),$_POST);			
-			if ($editfilterform->isValid($_POST)) {							
-				$newfilterenty = new Application_Model_FilterEntries();
-				$newfilterenty->setFilterID($_POST['filterID']);
-				$newfilterenty->setFiltertypeID($_POST['filtertypeID']);
-
-				if($_POST['filtertypeID'] == 1){
-					$newfilterenty->setFiltervalue($this->fillIP($_POST['filtervalue']));
-					$newfilterenty->setFiltervalue2($this->fillIP($_POST['filtervalue2']));
-				}
-				else{				
-					$newfilterenty->setFiltervalue($_POST['filtervalue']);
-					$newfilterenty->setFiltervalue2($_POST['filtervalue2']);	
-				}
-				
-				$newfilter2 = new Application_Model_FilterEntriesMapper();
-				$newfilter2->save($newfilterenty);					
-				#print_a($newfilterenty);
-				$this->_redirect('/filter');
-			}
-			$this->view->editfilterform = $editfilterform;
-		}
-    }
-
-    public function editfilterentryAction()
-    {
-        if (!isset($_POST["add"])){
-			try{
-				$filterentriesID = $this->_request->getParam('filterentriesID');
-								
-				$filterentry = new Application_Model_FilterEntries();
-
-				$filterentriesmapper = new Application_Model_FilterEntriesMapper();
-				$filterentriesmapper->find($filterentriesID,$filterentry);		
-			
-				
-				
-				#$editfilterform->setFilterID($filterID);
-				if(isset($_POST['filtertypeID']) && $_POST['filtertypeID'] != $filterentry->getFiltertypeID()){
-					$filterentry->setFiltertypeID($_POST['filtertypeID']) ;
-				}
-				$data = $filterentry->toArray();
-				print_a($data);
-				$editfilterform = new Application_Form_FilterEntriesAdd(
-												array('buttontext' => 'Edit Filterentry',
-														'data' => $data));
-				
-				$editfilterform->populate($filterentry->toArray());
-				$this->view->editfilterform = $editfilterform;
-
-			}catch (Zend_Exception $e) {  
-				echo "Error message 2: " . $e->getMessage() . "\n";  
-			}
-		} else{
-			try{
-				$filterentriesID = $this->_request->getParam('filterentriesID');	
-				$editfilterform = new Application_Form_FilterEntriesAdd(array('buttontext' => 'Edit Filterentry'),$_POST);	
-				if ($editfilterform->isValid($_POST)) {	
-					if($_POST['filterID'] == '')
-						unset($_POST['filterID']);
-					$newfilterenty = new Application_Model_FilterEntries($_POST);					
-					$newfilterenty->setID($filterentriesID);				
-					if($_POST['filtertypeID'] == 1){
-						$newfilterenty->setFiltervalue($this->fillIP($_POST['filtervalue']));
-						$newfilterenty->setFiltervalue2($this->fillIP($_POST['filtervalue2']));
-					}
-					else{				
-						$newfilterenty->setFiltervalue($_POST['filtervalue']);
-						$newfilterenty->setFiltervalue2($_POST['filtervalue2']);	
-					}
-					$newfilter2 = new Application_Model_FilterEntriesMapper();				
-					$newfilter2->save($newfilterenty);
-					#print_a($newfilterenty);
-					$this->_redirect('/filter');
-								
-				}
-				$this->view->editfilterform = $editfilterform;
-			}catch (Zend_Exception $e) {  
-				echo "Error message 2: " . $e->getMessage() . "\n";  
-			}				
-		}
-    }
-
-    public function removefilterentryAction()
-    {
-        try{    		
-    			$filterentriesID = $this->_request->getParam('filterentriesID');
-    
-    			// TODO: ACL implementieren ob er den filter löschen darf
-    			if(is_numeric($filterentriesID)){
-    				$deletefilterentry = new Application_Model_FilterEntries();
-    				$deletefilterentry->setID($filterentriesID);
-    				echo "<pre style='border:1px solid black;background-color:#F5B800'>";
-    				print_r($deletefilterentry);
-    				echo "</pre>";
-    
-    				$filterentriesmapper = new Application_Model_FilterEntriesMapper();
-    				$filterentriesmapper->delete($deletefilterentry);
-    				echo "ok";
-    			}
-    			$this->_redirect('/filter');
-    		}catch (Zend_Exception $e) {  
-    			echo "Error message 2: " . $e->getMessage() . "\n";
-		}
-    }
-
-    private function fillIP($ip)
-    {
-        $ar = explode(".",$ip);
-        		$representation = array();
-        		foreach($ar as $part){
-        			$representation[] = sprintf("%03s",$part);
-        		}
-        		return implode(".",$representation);
-    }
-
-    private function fillMac($ip)
-    {
-        $ar = explode(":",$ip);
-        		$representation = array();
-        		foreach($ar as $part){
-        			$representation[] = sprintf("%02s",$part);
-        		}
-        		return implode(":",$representation);
-    }
-
-    public function evaluateAction()
-    {
-        $db = $this->db;	
-		$showPartResults = false;
-		// For Testing Filters
-		
-
-		$testFilter = (isset($_POST['submit']))?true:false;
-		
-		if($testFilter){
-			$ipAdress = $_POST['ip'];
-			$macAdress = $_POST['mac'];
-			$poolID = $_POST['poolID'];
-			$bootisoID = $_POST['bootisoID'];
-			$membershipID = $_POST['membershipID'];
-			$groupID = $_POST['groupID'];
-			$time = ($_POST['time']);
-			$clientID = $_POST['clientID'];
-			$weekday = $_POST['weekday'];		
-			$date = $_POST['date'];
-			print_a('Input',
-				array('ipAdress'=>$ipAdress,
-					'macAdress'=>$macAdress,
-					'poolID' => $poolID,
-					'bootisoID' => $bootisoID,
-					'membershipID'=>$membershipID,
-					'groupID'=>$groupID,
-					'time'=> $time." - ".date('d.m.Y H:i:s',$time),
-					'clientID' => $clientID,
-					'hardwarehash' => $hardwarehash,
-					'weekday' => $weekday,
-					'date' => $date));
-		}
-		
-		
-		try{ 			
-			$mysession = '1';
-			$set = array();
-
-			
-			$session = new Application_Model_Session();
-			$sessionmapper = new Application_Model_SessionMapper();
-			$sessionmapper->find($mysession,$session);
-			#########################################################
-			// IP Adress
-			$filtertypID = 1;
-			// get it from session_table with session_id from the session
-			if(!$testFilter){
-				$ipAdress = $session->getIp();
-			}
-			$ipAdress = str_replace(".","",$this->fillIP($ipAdress));
-
-			$select = $db->select()
-			     ->from(array('pbs_filterentries')
-					)
-				->where('filtertypeID  = ?',$filtertypID)
-				->where('REPLACE(filtervalue,".","") <= ?',$ipAdress)
-				->where('? <= REPLACE(filtervalue2,".","")',$ipAdress);
-	
-			$stmt = $select->query();
-			$result = $stmt->fetchAll();
-			foreach($result as $r){
-				$set[$filtertypID][] = $r['filterID'];	
-			}
-
-			if($showPartResults)
-				print_a('ipAdress',$result,$set[$filtertypID]);	
-
-			#########################################################
-			// Mac range
-			$filtertypID = 2;
-			// get it from session_table with session_id from the session
-			if(!$testFilter){
-				$client = new Application_Model_Client();
-				$clientmapper = new Application_Model_ClientMapper();
-				$clientmapper->find($session->getClientID(),$client);
-				$macAdress = $client->getMacadress();
-			}
-			try{
-				$macAdress = $this->fillMac($macAdress);			
-				$stmt = $db->query("SELECT * FROM pbs_filterentries WHERE 
-								filtertypeID  = ".$filtertypID." AND
-								filtervalue <= '".$macAdress."' AND
-								'".$macAdress."' <= filtervalue2");
-				$result = $stmt->fetchAll();
-				foreach($result as $r){
-					$set[$filtertypID][] = $r['filterID'];	
-				}
-			}
-			catch(Exception $e){}
-			if($showPartResults)
-				print_a('macAdress',$result,$set[$filtertypID]);
-
-			#########################################################
-			// PoolID
-			$filtertypID = 3;
-				// get PoolID from client_ID from session_id from the session
-			if(!$testFilter){			
-				$poolentry = new Application_Model_PoolEntries();
-				$poolentrymapper = new Application_Model_PoolEntriesMapper();
-				$poolentry = $poolentrymapper->findby('clientID',$client->getID());
-				$poolentry = $poolentry[0];		
-			
-				$poolID = $poolentry['poolID'];
-			}			
-			
-			try{
-				$stmt = $db->query("SELECT * FROM pbs_filterentries WHERE 
-								filtertypeID  = ".$filtertypID." AND
-								filtervalue = ".$poolID." ");			
-				$result = $stmt->fetchAll();
-				if(count($result)>0){
-					foreach($result as $r){
-						$set[$filtertypID][] = $r['filterID'];	
-					}
-				}
-			}
-			catch(Exception $e){}
-
-			if($showPartResults)
-				print_a('poolID',$result,$set[$filtertypID]);
-			#########################################################
-			// ClientID		
-			$filtertypID = 8;	
-			// get client_ID from session_id from the session
-			
-			if(!$testFilter){
-				$clientID = $session->getClientID();
-			}
-			try{
-				$stmt = $db->query("SELECT * FROM pbs_filterentries WHERE 
-								filtertypeID  = ".$filtertypID." AND
-								filtervalue = ".$clientID." ");
-				$result = $stmt->fetchAll();
-				foreach($result as $r){
-					$set[$filtertypID][] = $r['filterID'];	
-				}
-			}
-			catch(Exception $e){}
-
-			if($showPartResults)
-				print_a('clientID',$result,$set[$filtertypID]);
-			#########################################################
-			// BootIsoID
-			$filtertypID = 4;
-				// get BootIsoID from client_ID from session_id from the session	
-			if(!$testFilter){		
-				$bootisoID = $session->getBootisoID();
-			}
-			try{
-				$stmt = $db->query("SELECT * FROM pbs_filterentries WHERE 
-								filtertypeID  = ".$filtertypID." AND
-								filtervalue = ".$bootisoID." ");
-				$result = $stmt->fetchAll();
-				foreach($result as $r){
-					$set[$filtertypID][] = $r['filterID'];	
-				}
-			}
-			catch(Exception $e){}
-
-			if($showPartResults)
-				print_a('bootisoID',$result,$set[$filtertypID]);
-			#########################################################
-			// MembershipID
-			$filtertypID = 5;
-
-			if(!$testFilter){		
-				// get membership from the session
-				//TODO: GET MEMBERSHIP from SESSION
-				$membershipID = 1;
-			}
-			try{
-				$stmt = $db->query("SELECT * FROM pbs_filterentries WHERE 
-								filtertypeID  = ".$filtertypID." AND
-								filtervalue = ".$membershipID." ");
-				$result = $stmt->fetchAll();
-				foreach($result as $r){
-					$set[$filtertypID][] = $r['filterID'];	
-				}
-			}
-			catch(Exception $e){}
-
-			if($showPartResults)
-				print_a('membership',$result,$set[$filtertypID]);
-			#########################################################
-			// GroupID
-			$filtertypID = 6;
-
-			if(!$testFilter){		
-				// get membership from the session
-				//TODO: GET GROUP from SESSION
-				$groupID = 1;	
-			}
-			try{
-				$stmt = $db->query("SELECT * FROM pbs_filterentries WHERE 
-								filtertypeID  = ".$filtertypID." AND
-								filtervalue = ".$groupID." ");
-				$result = $stmt->fetchAll();
-				foreach($result as $r){
-					$set[$filtertypID][] = $r['filterID'];	
-				}
-			}
-			catch(Exception $e){}
-
-			if($showPartResults)
-				print_a('membership',$result,$set[$filtertypID]);
-			#########################################################
-			// Time
-			$filtertypID = 7;
-			if(!$testFilter){
-				$time = time("H:i");
-			}
-
-			$nowShort = $time;
-
-			$nowShort = str_replace(":","",$nowShort);
-			try{
-				$select = $db->select()
-					 ->from(array('pbs_filterentries')
-						)
-					->where('filtertypeID  = ?',$filtertypID)
-					->where('REPLACE(filtervalue,":","") <= ? AND ? <= REPLACE(filtervalue2,":","")',$nowShort);
-	
-				$stmt = $select->query();
-				$result = $stmt->fetchAll();
-				foreach($result as $r){
-					$set[$filtertypID][] = $r['filterID'];	
-				}
-			}
-			catch(Exception $e){}
-
-			if($showPartResults)
-				print_a('time',$result,$set[$filtertypID]);	
-			#########################################################
-			// Hardwarehash
-			$filtertypID = 9;
-			if(!$testFilter){
-				// get hardwarehash from session
-				$hardwarehash = 'aaaa';
-			}
-
-			try{
-				$select = $db->select()
-					 ->from(array('pbs_filterentries')
-						)
-					->where('filtertypeID  = ?',$filtertypID)
-					->where('`filtervalue` = ?',$hardwarehash);	
-				$stmt = $select->query();
-				$result = $stmt->fetchAll();
-				foreach($result as $r){
-					$set[$filtertypID][] = $r['filterID'];	
-				}
-			}
-			catch(Exception $e){}
-
-			if($showPartResults)
-				print_a('hardwarehash',$result,$set[$filtertypID]);	
-			#########################################################
-			// weekday
-			$filtertypID = 10;
-			if(!$testFilter){
-				$weekday = date('N');
-			}
-
-			try{
-				$select = $db->select()
-					 ->from(array('pbs_filterentries')
-						)
-					->where('filtertypeID  = ?',$filtertypID)
-					->where('filtervalue = ? ',$weekday);
-	
-				$stmt = $select->query();
-				$result = $stmt->fetchAll();
-				foreach($result as $r){
-					$set[$filtertypID][] = $r['filterID'];	
-				}
-			}
-			catch(Exception $e){}
-
-			if($showPartResults)
-				print_a('weekday',$result,$set[$filtertypID]);	
-			#########################################################
-			// weekday
-			$filtertypID = 11;
-			if(!$testFilter){
-				$date = date('d.m.Y');
-			}
-
-			try{
-				$select = $db->select()
-					 ->from(array('pbs_filterentries')
-						)
-					->where('filtertypeID  = ?',$filtertypID)
-					->where('REPLACE(filtervalue,".","") <= ? AND ? <= REPLACE(filtervalue2,".","")',$date);
-	
-				$stmt = $select->query();
-				$result = $stmt->fetchAll();
-				foreach($result as $r){
-					$set[$filtertypID][] = $r['filterID'];	
-				}
-			}
-			catch(Exception $e){}
-
-			if($showPartResults)
-				print_a('weekday',$result,$set[$filtertypID]);	
-			########################################
-			// ErgebnisSet auswerten
-			print_a('the result sets of the filtertypes',$set);			
-		
-			// Merging of the resultsets of the filter
-			$kk = array();
-			foreach($set as $myset){
-				$kk = array_merge($kk,$myset);
-			}
-			$set = $kk;
-			// counting how often a filter is evaluated at database
-			$a = array();
-			foreach($set as $k=> $s){
-				$a[$s] += 1;
-			}	
-			print_a('Übereinstimmungen pro Filter',$a);
-			// Get the number of filtertypes every filter has
-			$stmt = $db->query('SELECT filterID, COUNT(filtertypeID) as num FROM pbs_filterentries GROUP BY filterID');			 
-			$resultset = $stmt->fetchAll();
-			foreach($resultset as $d){
-				$database[$d['filterID']] = $d['num'];
-			}
-			print_a('Anzahl Filterentries in Datenbank',$database);
-		
-			// remove all filters from resultset, which to few filtertypes satisfied
-			$result = array();
-			foreach($a as $i=>$b){
-				if($a[$i] < $database[$i]){
-					unset($a[$i]);
-				}
-				else{
-					$result[] = $i;
-				}
-			}
-		
-			print_a('True Filters',$result);
-			// now selecting the filter with the highest priority
-			$query = 'SELECT filterID, bootmenuID, priority 
-				FROM pbs_filter WHERE ';
-			foreach($result as $e){
-				$queryTmp[] = "filterID = '$e'";
-			}
-			$query .= implode(" OR ", $queryTmp);
-			$query .= 'ORDER BY priority DESC LIMIT 0,1';
-			$bootmenuID = 'null';
-			try{
-				$stmt = $db->query($query);
-				$resultset = $stmt->fetchAll();
-				$bootmenuID = $resultset[0]['bootmenuID'];
-			}
-			catch(Exception $e){				
-			}
-			if($bootmenuID != 'null'){
-				$bm = new Application_Model_BootMenu();
-				$bmmapper = new Application_Model_BootMenuMapper();
-				$bmmapper->find($bootmenuID,$bm);
-				echo "<h1><a href='/bootmenu/index/bootmenuid/".$bootmenuID."'>Goto BootmenuID: ".$bootmenuID."</a></h1>";
-			}
-			else{
-			echo "<h1>No Result :-(</h1>";
-			}
-			
-		}catch (Zend_Exception $e) {  
-				echo "class: ".get_class($e)."<br>\n";
-				echo "Error message 2: " . $e->getMessage() . "\n";
-		}
-    }
-
-    public function testevaluateAction()
-    {		
-		$pm = new Application_Model_PoolMapper();
-		$pools = $pm->fetchAll();
-
-		$bim = new Application_Model_BootIsoMapper();
-		$bootisos = $bim->fetchAll();
-
-		$mm = new Application_Model_MembershipMapper();
-		$memberships = $mm->fetchAll();
-
-		$gm = new Application_Model_GroupMapper();
-		$groups = $gm->fetchAll();
-
-		$cm = new Application_Model_ClientMapper();
-		$clients = $cm->fetchAll();
-
-		$filterevaluate = new Application_Form_FilterEvaluate(
-			array(	'pools' 		=>	$pools,
-					'bootisos' 		=>	$bootisos,
-					'memberships'	=>	$memberships,
-					'groups'		=>	$groups,
-					'clients'		=>	$clients,
-					
-			));
-		$filterevaluate->populate(array(
-							'ip'  => '132.230.5.6',
-							'mac' => '08:00:20:ae:fd:7e',
-							'time'=>date('d.m.Y H:i'))
-							);
-        $this->view->filterevaluate = $filterevaluate;
-    }
-
-
-}
-
-
-
-
-
-
-
-
-
-
-
diff --git a/application/controllers/GroupController.php b/application/controllers/GroupController.php
deleted file mode 100644
index fbc7943..0000000
--- a/application/controllers/GroupController.php
+++ /dev/null
@@ -1,242 +0,0 @@
-<?php
-
-class GroupController extends Zend_Controller_Action
-{
-	protected $groupMapper;
-	protected $groupGroupsMapper;
-	protected $membershipMapper;
-	protected $groupRequestMapper;
-	protected $personmapper;
-	protected $rolemapper;
-	protected $groupList;
-
-	public function init()
-	{
-		if (Zend_Auth::getInstance()->hasIdentity()) {
-			$this->groupMapper = new Application_Model_GroupMapper();
-			$this->groupGroupsMapper = new Application_Model_GroupGroupsMapper();
-			$this->membershipMapper = new Application_Model_MembershipMapper();
-			$this->groupRequestMapper = new Application_Model_GroupRequestMapper();
-			$this->personmapper = new Application_Model_PersonMapper();
-			$this->rolemapper = new Application_Model_RoleMapper();
-			$this->groupList = $this->groupMapper->fetchAll();
-		} else {
-			$this->_helper->redirector('login', 'auth');
-		}
-	}
-
-	public function indexAction()
-	{
-		$this->view->groupList = $this->groupList;
-	}
-
-	public function addAction()
-	{
-		if (!isset($_POST["add"])){
-			$addForm = new Application_Form_GroupAdd(array('grouplist' => $this->groupList));
-		} else {
-			$addForm = new Application_Form_GroupAdd(array('grouplist' => $this->groupList),$_POST);
-
-			if ($addForm->isValid($_POST)) {
-				$group = new Application_Model_Group($_POST);
-				try {
-					$this->groupMapper->save($group);
-				} catch(Zend_Exception $e)
-				{
-					echo "Caught exception: " . get_class($e) . "<br/>";
-					echo "Message: " . $e->getMessage() . "<br/>";
-					return;
-				}
-				if($_POST['superordinatedGroupID'] != -1) {
-					$lastID = $this->groupMapper->getDbTable()->getDefaultAdapter()->lastInsertId();
-					$groupgroups = new Application_Model_GroupGroups();
-					$groupgroups->setParentID($_POST['superordinatedGroupID']);
-					$groupgroups->setGroupID($lastID);
-					try {
-						$this->groupGroupsMapper->save($groupgroups);
-					} catch(Zend_Exception $e)
-					{
-						echo "Caught exception: " . get_class($e) . "<br/>";
-						echo "Message: " . $e->getMessage() . "<br/>";
-						return;
-					}
-
-				}
-				echo "Group successfully added. <br/>";
-			}
-		}
-
-		$this->view->addForm = $addForm;
-	}
-
-	public function editAction()
-	{
-		if(!isset($_POST['groupID'])) {
-			$addForm = new Application_Form_GroupAdd(array('grouplist' => $this->groupList));
-			$this->view->addForm = $addForm;
-			return;
-		}
-		if (!isset($_POST["save"])){
-			$group = $this->groupMapper->find($_POST['groupID']);
-			$_POST['title'] = $group->getTitle();
-			$_POST['description'] = $group->getDescription();
-			$editForm = new Application_Form_GroupEdit();
-		} else {
-			$editForm = new Application_Form_GroupEdit($_POST);
-			if ($editForm->isValid($_POST)) {
-				$group = new Application_Model_Group($_POST);
-				try {
-					$this->groupMapper->save($group);
-				} catch(Zend_Exception $e)
-				{
-					echo "Email Address already existing.";
-					echo "Caught exception: " . get_class($e) . "<br/>";
-					echo "Message: " . $e->getMessage() . "<br/>";
-					return;
-				}
-				echo "Successfully saved. <br/>";
-			}
-		}
-
-		$this->view->editForm = $editForm;
-	}
-
-	public function showAction()
-	{
-		if($_POST['groupID']) {
-			$groupRequests = $this->groupRequestMapper->findBy('groupID', $_POST['groupID']);
-			if(isset($groupRequests)) {
-				foreach($groupRequests as $groupRequest) {
-					$person = $this->personmapper->find($groupRequest['personID']);
-					$groupRequestList[] = array(
-					'grouprequestID' => $groupRequest['grouprequestID'],
-					'person' => $person
-					);
-				}
-				$this->view->groupRequestList = $groupRequestList;
-				$this->view->roleList = $this->rolemapper->findBy('groupID', $_POST['groupID']);
-			}
-			$members = $this->membershipMapper->findBy('groupID', $_POST['groupID']);
-			if(isset($members)) {
-				foreach($members as $member) {
-					$person = $this->personmapper->find($member['personID']);
-					$membersList[] = array(
-					'membershipID' => $member['membershipID'],
-					'person' => $person
-					);
-				}
-				$this->view->memberslist = $membersList;
-			}
-			$groupgroups = $this->groupGroupsMapper->findBy('groupID', $_POST['groupID']);
-			if(is_object($groupgroups)) {
-				$parentGroup = $this->groupMapper->find($groupgroups->getParentID());
-				$this->view->$parentGroup = $parentGroup;
-			}
-			$group = $this->groupMapper->find($_POST['groupID']);
-			$this->view->group = $group;
-		}
-	}
-
-	public function linkAction()
-	{
-		if (!isset($_POST["link"])){
-			$linkForm = new Application_Form_GroupLink(array('grouplist' => $this->groupList));
-		} else {
-			$linkForm = new Application_Form_GroupLink(array('grouplist' => $this->groupList),$_POST);
-
-			if ($linkForm->isValid($_POST)) {
-				$groupgroups = new Application_Model_GroupGroups();
-				$groupgroups->setParentID($_POST['superordinatedGroupID']);
-				$groupgroups->setGroupID($_POST['groupID']);
-				try {
-					$this->groupGroupsMapper->save($groupgroups);
-				} catch(Zend_Exception $e)
-				{
-					echo "Caught exception: " . get_class($e) . "<br/>";
-					echo "Message: " . $e->getMessage() . "<br/>";
-					return;
-				}
-				echo "Groups successfully linked. <br/>";
-			}
-		}
-
-		$this->view->linkForm = $linkForm;
-	}
-
-	public function deleteAction()
-	{
-		if (isset($_POST["groupID"])){
-			$group = $this->groupMapper->find($_POST["groupID"]);
-			try {
-				$this->groupMapper->delete($group);
-			} catch(Zend_Exception $e)
-			{
-				echo "Caught exception: " . get_class($e) . "<br/>";
-				echo "Message: " . $e->getMessage() . "<br/>";
-				return;
-			}
-			echo "Group successfully deleted. <br/>";
-		}
-	}
-
-	public function grantpersonAction()
-	{
-		if(isset($_POST['grouprequestID']) && isset($_POST['roleID'])) {
-			$groupRequest = $this->groupRequestMapper->find($_POST['grouprequestID']);
-			try {
-				$this->groupRequestMapper->delete($groupRequest);
-			} catch(Zend_Exception $e)
-			{
-				echo "Caught exception: " . get_class($e) . "<br/>";
-				echo "Message: " . $e->getMessage() . "<br/>";
-				return;
-			}
-			$membership = new Application_Model_Membership();
-			$membership->setGroupID($groupRequest->getGroupID());
-			$membership->setPersonID($groupRequest->getPersonID());
-			$membership->setRoleID($_POST['roleID']);
-			try {
-				$this->membershipMapper->save($membership);
-			} catch(Zend_Exception $e)
-			{
-				echo "Caught exception: " . get_class($e) . "<br/>";
-				echo "Message: " . $e->getMessage() . "<br/>";
-				return;
-			}
-			echo "Chosen Person has been successfully added to the chosen group. <br />";
-		}
-	}
-
-	public function revokepersonAction()
-	{
-		if(isset($_POST['membershipID'])) {
-			$membership = $this->membershipMapper->find($_POST['membershipID']);
-			if(isset($membership)) {
-				try {
-					$this->membershipMapper->delete($membership);
-				} catch(Zend_Exception $e)
-				{
-					echo "Caught exception: " . get_class($e) . "<br/>";
-					echo "Message: " . $e->getMessage() . "<br/>";
-					return;
-				}
-				echo "Chosen Person has been successfully removed from the chosen group. <br />";
-			}
-
-		}
-	}
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/application/controllers/IndexController.php b/application/controllers/IndexController.php
deleted file mode 100644
index df2f91c..0000000
--- a/application/controllers/IndexController.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-class IndexController extends Zend_Controller_Action
-{
-
-    public function init()
-    {
-        /* Initialize action controller here */
-    }
-
-    public function indexAction()
-    {
-        // action body
-    } 
-
-
-}
-
-
-
-
-
diff --git a/application/controllers/PersonController.php b/application/controllers/PersonController.php
deleted file mode 100644
index 0b6db2e..0000000
--- a/application/controllers/PersonController.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<?php
-
-class PersonController extends Zend_Controller_Action
-{
-	protected $person;
-	protected $personmapper;
-	protected $membershipMapper;
-	protected $memberships;
-	protected $groupMapper;
-	protected $groups;
-	protected $groupRequestMapper;
-
-	public function init() {
-		if (Zend_Auth::getInstance()->hasIdentity()) {
-			$this->personmapper = new Application_Model_PersonMapper();
-			$result = $this->personmapper->findBy('email', Zend_Auth::getInstance()->getIdentity());
-			$this->person = new Application_Model_Person($result[0]);
-			$this->person->setID($result[0]['personID']);
-			$this->groupMapper = new Application_Model_GroupMapper();
-			$this->groupRequestMapper = new Application_Model_GroupRequestMapper();
-			$this->membershipMapper = new Application_Model_MembershipMapper();
-			$this->memberships = $this->membershipMapper->findBy("personID",$this->person->getID());
-			if(isset($this->memberships)) {
-				foreach($this->memberships as $membership) {
-					$group = $this->groupMapper->find($membership['groupID']);
-					$this->groups[] = array (
-					'id'  => $group->getID(),	
-					'title' => $group->getTitle()
-					);
-				}
-			}
-		} else {
-			$this->_helper->redirector('login', 'auth');
-		}
-	}
-
-	public function indexAction()
-	{
-		$this->_helper->redirector('show', 'person');
-	}
-
-	public function showAction()
-	{
-		$this->view->person = $this->person;
-		$this->view->groups = $this->groups;
-	}
-
-	public function editAction()
-	{
-		$this->view->person = $this->person;
-		if (!isset($_POST["save"])){
-			$editForm = new Application_Form_PersonEdit();
-		} else {
-			$editForm = new Application_Form_PersonEdit($_POST);
-			if ($editForm->isValid($_POST)) {
-				if(isset($_POST['newpassword'])) {
-					$date = new DateTime();
-					$this->person->setPassword($_POST['newpassword']);
-					$this->person->setPasswordSalt(MD5($date->getTimestamp()));
-					$this->person->setPassword(MD5($this->person->getPassword() . $this->person->getPasswordSalt()));
-				}
-				$this->person->setOptions($_POST);
-				try {
-					$this->personmapper->save($this->person);
-				} catch(Zend_Exception $e)
-				{
-					echo "Caught exception: " . get_class($e) . "<br/>";
-					echo "Message: " . $e->getMessage() . "<br/>";
-					echo "Email Address already existing.";
-					return;
-				}
-				echo "Successfully saved. <br/>";
-			}
-		}
-
-		$this->view->editForm = $editForm;
-	}
-
-	public function requestAction()
-	{
-		$this->view->person = $this->person;
-		$allgroups = $this->groupMapper->fetchAll();
-		$groupRequests = $this->groupRequestMapper->findBy('personID', $this->person->getID());
-		$count = 0;
-		foreach($allgroups as $group) {
-			foreach($groupRequests as $groupRequest) {
-				if($groupRequest['groupID'] == $group->getID()) {
-					unset($allgroups[$count]);
-				}
-			}
-			$count++;
-		}
-		if (!isset($_POST["request"])){
-			if(count($allgroups) <= 0) {
-				echo "No Groups to choose.";
-			}
-			$requestForm = new Application_Form_GroupRequest(array('grouplist' => $allgroups));
-		} else {
-			$requestForm = new Application_Form_GroupRequest(array('grouplist' => $allgroups), $_POST);
-			if ($requestForm->isValid($_POST)) {
-				$groupRequestMapper = new Application_Model_GroupRequestMapper();
-				$groupRequest = new Application_Model_GroupRequest();
-				$groupRequest->setGroupID($_POST['groupID']);
-				$date = new DateTime();
-				$groupRequest->setTime($date->getTimestamp());
-				$groupRequest->setPersonID($this->person->getID());
-				try {
-					$groupRequestMapper->save($groupRequest);
-				} catch(Zend_Exception $e)
-				{
-					echo "Caught exception: " . get_class($e) . "<br/>";
-					echo "Message: " . $e->getMessage() . "<br/>";
-					return;
-				}
-				echo "Successfully requested. <br />";
-			}
-		}
-		$this->view->requestForm = $requestForm;
-	}
-
-	public function leaveAction()
-	{
-		$this->view->person = $this->person;
-		if(isset($_POST['groupID'])) {
-			if(isset($this->memberships)) {
-				foreach($this->memberships as $membership) {
-					if($membership['groupID'] == $_POST['groupID']) {
-						$membershipObject = $this->membershipMapper->find($membership['membershipID']);
-						try {
-							$this->membershipMapper->delete($membershipObject);
-						} catch(Zend_Exception $e)
-						{
-							echo "Caught exception: " . get_class($e) . "<br/>";
-							echo "Message: " . $e->getMessage() . "<br/>";
-							return;
-						}
-						echo "You have been successfully removed from the chosen group. <br />";
-					}
-				}
-			}
-		}
-	}
-}
-
-
-
-
-
-
-
-
-
-
-
diff --git a/application/controllers/PoolController.php b/application/controllers/PoolController.php
deleted file mode 100644
index f27ee45..0000000
--- a/application/controllers/PoolController.php
+++ /dev/null
@@ -1,176 +0,0 @@
-<?php
-
-class PoolController extends Zend_Controller_Action
-{
-
-    public function init()
-    {
-        /* Initialize action controller here */
-    }
-
-    public function indexAction()
-    {
-        $poolMapper = new Application_Model_PoolMapper();
-        $this->view->pools = $poolMapper->fetchAll();
-		
-		$clientmapper = new Application_Model_ClientMapper();
-			$clients = $clientmapper->fetchAll();
-			foreach($clients as $c){
-				#$client = new Application_Model_Client($c);
-				$clientsArray[] = $c->toArray();
-			}
-			$assignedclientmapper = new Application_Model_PoolEntriesMapper();
-			$assignedclients = $assignedclientmapper->fetchAll();
-			foreach($assignedclients as $c){
-				$assignedclientsArray[] = $c->toArray();
-			}			
-			$freeclients  = $this->arrayDiff($clientsArray,$assignedclientsArray);
-		
-		$this->view->freeclients = $freeclients;	
-		
-    }
-
-    public function createpoolAction()
-    {
-		if (!isset($_POST["add"])){
-    		$addfilterform = new Application_Form_Pool(array('buttontext' => 'Create Pool'));    		
-			$this->view->addpool = $addfilterform;		
-		}else {
-			$addpoolform = new Application_Form_Pool(array('buttontext' => 'Create Pool'),$_POST);
-			if ($addpoolform->isValid($_POST)) {			
-				try{
-					$pool = new Application_Model_Pool($_POST);
-					$poolmapper = new Application_Model_PoolMapper();
-					$poolmapper->save($pool);
-					$this->_redirect('/pool');
-			    	return;
-				}catch (Zend_Exception $e) {  
-        			echo "Error message 2: " . $e->getMessage() . "\n";  
-        		}
-			}
-			$this->view->addpool = $addfilterform;		
-		}
-    }
-
-    public function deletepoolAction()
-    {
-       $poolID = $this->_request->getParam('poolID');
-		// TODO: ACL implementieren ob er den pool löschen darf
-		if(is_numeric($poolID)){
-			$deletepool = new Application_Model_Pool();
-			$deletepool->setID($poolID);
-			$poolmapper = new Application_Model_PoolMapper();
-			$poolmapper->delete($deletepool);
-		}
-		$this->_redirect('/pool');
-    }
-
-    public function editpoolAction()
-    {
-       	if (!isset($_POST["add"])){
-			$poolID = $this->_request->getParam('poolID');
-
-			$pool = new Application_Model_Pool();
-			$poolmapper = new Application_Model_PoolMapper();
-			$poolmapper->find($poolID,$pool);		
-			$poolArray = $pool->toArray();
-
-			$editpool = new Application_Form_Pool(array('buttontext' => 'Edit Pool'));
-			$editpool->populate($poolArray);
-			$this->view->editpoolform = $editpool;
-		
-		}else {
-			$editpoolform = new Application_Form_Pool(array('buttontext' => 'Edit Pool'),$_POST);
-			if ($editpoolform->isValid($_POST)) {			
-				try{
-					$pool = new Application_Model_Pool($_POST);
-					$pool->setID($this->_request->getParam('poolID'));
-					$poolmapper = new Application_Model_PoolMapper();
-					$poolmapper->save($pool);
-					$this->_redirect('/pool');			    	
-				}catch (Zend_Exception $e) {  
-        			echo "Error message 2: " . $e->getMessage() . "\n";  
-        		}
-			}
-			$this->view->editpoolform = $editpoolform;
-		}
-    }
-
-    public function linkclientAction()
-    {
-		$clientID = $this->_request->getParam('clientID');
-		$poolID = $this->_request->getParam('poolID');
-		if(!isset($_POST['clientID']) && ($clientID == '')){			
-			$clientmapper = new Application_Model_ClientMapper();
-			$clients = $clientmapper->fetchAll();
-			foreach($clients as $c){
-				$clientsArray[] = $c->toArray();
-			}			
-			$assignedclientmapper = new Application_Model_PoolEntriesMapper();
-			$assignedclients = $assignedclientmapper->fetchAll();
-			foreach($assignedclients as $c){
-				$assignedclientsArray[] = $c->toArray();
-			}
-			$freeclients  = $this->arrayDiff($clientsArray,$assignedclientsArray);
-			
-			$poolclient = new Application_Form_PoolClient(array('buttontext' => 'Link Client','clients'=> $freeclients)); 		
-			$this->view->poolclient = $poolclient;
-		}else {	
-			$poolclient = new Application_Form_PoolClient(array('buttontext' => 'Link Client'),$_POST);						
-			try{
-				$pool = new Application_Model_PoolEntries($_POST);
-				$pool->setPoolID($this->_request->getParam('poolID'));
-				if($pool->getClientID() == ''){
-					$pool->setClientID($this->_request->getParam('clientID'));
-				}				
-				$poolmapper = new Application_Model_PoolEntriesMapper();
-				$poolmapper->save($pool);
-				$this->_redirect('/pool');			    	
-			}catch (Zend_Exception $e) {  
-    			echo "Error message 2: " . $e->getMessage() . "\n";  
-    		}
-			$this->view->poolclient = $poolclient;
-			
-		}
-    }
-	private function arrayDiff($a, $b){
-		foreach($a as $k1 => $i1){
-			foreach($b as $k2 => $i2){
-				if($i1['clientID'] == $i2['clientID']){
-					unset($a[$k1]);
-				}
-			}
-		}
-		return $a;
-	}
-	
-
-    public function unlinkclientAction()
-    {
-        $poolentriesID = $this->_request->getParam('poolentriesID');
-
-			// TODO: ACL implementieren ob er den filter löschen darf
-			if(is_numeric($poolentriesID)){
-				$deletepoolentries = new Application_Model_PoolEntries();
-				$deletepoolentries->setID($poolentriesID);
-
-				$deletepoolentriesmapper = new Application_Model_PoolEntriesMapper();
-				$deletepoolentriesmapper->delete($deletepoolentries);
-				echo "ok";
-			}
-			$this->_redirect('/pool');
-    }
-
-
-}
-
-
-
-
-
-
-
-
-
-
-
diff --git a/application/controllers/ResourceController.php b/application/controllers/ResourceController.php
deleted file mode 100644
index aef8649..0000000
--- a/application/controllers/ResourceController.php
+++ /dev/null
@@ -1,192 +0,0 @@
-<?php
-
-class ResourceController extends Zend_Controller_Action
-{
-
-	
-    public function init()
-    {
-    	
-    }
-
-    public function indexAction()
-    {
-    	
-    	
-    }
-
-    public function getinitramfsAction()
-    {
-        $this->_helper->layout->disableLayout();
-        $this->_helper->viewRenderer->setNoRender();    
-        
-		$alphasessionID = $this->_request->getParam('alpha');
-		$session = new Application_Model_Session();
-		$sm = new Application_Model_SessionMapper();
-		$result = $sm->findBy('alphasessionID',$alphasessionID);
-		# print_a($result);
-		$thisSession = $result[0];
-		$bootosID = $thisSession['bootosID'];
-
-                if(is_dir("../resources/bootos/$bootosID/initramfs/") && is_numeric($bootosID)){
-                                            		        	                                	    	
-        	       	header('Content-Type: application/x-gzip');
-        	        $content_disp = ( ereg('MSIE ([0-9].[0-9]{1,2})', $HTTP_USER_AGENT) == 'IE') ? 'inline' : 'attachment';
-        	        header('Content-Disposition:  ' . $content_disp . '; filename="initramfs.tar.gz"');
-        	      	header('Pragma: no-cache');
-        	      	header('Expires: 0');
-        	                                		  
-        	       	// create the gzipped tarfile.
-        	       	chdir("../resources/bootos/$bootosID/initramfs/");
-        	       	passthru( "tar cz ./");
-                }
-    }
-
-    public function getconfigAction()
-    {
-    	
-        $this->_helper->layout->disableLayout();
-        $this->_helper->viewRenderer->setNoRender(); 
-        
-		$alphasessionID = $this->_request->getParam('alpha');
-		$session = new Application_Model_Session();
-		$sm = new Application_Model_SessionMapper();
-		$result = $sm->findBy('alphasessionID',$alphasessionID);
-		# print_a($result);
-		$thisSession = $result[0];
-		$bootmenuentryID = $thisSession['bootmenuentryID'];
-		$bootmenuentry = new Application_Model_BootMenuEntries();
-		$bmm = new Application_Model_BootMenuEntriesMapper();
-		$bmm->find($bootmenuentryID,$bootmenuentry);
-		# print_a($bootmenuentry);
-		$configID = $bootmenuentry->getConfigID();
-                                            	
-                if(is_dir("../resources/config/$configID/config/") && is_numeric($configID)){
-                                            		                         	    	
-        	       	header('Content-Type: application/x-gzip');
-        	        $content_disp = ( ereg('MSIE ([0-9].[0-9]{1,2})', $HTTP_USER_AGENT) == 'IE') ? 'inline' : 'attachment';
-        	        header('Content-Disposition:  ' . $content_disp . '; filename="config.tar.gz"');
-        	      	header('Pragma: no-cache');
-        	      	header('Expires: 0');
-        	                                		  
-        	       	// create the gzipped tarfile.
-        	       	chdir("../resources/config/$configID/config/");
-        	       	passthru( "tar cz ./");
-                }
-    }
-
-    public function getkernelAction()
-    {
-    	$this->_helper->layout->disableLayout();
-        $this->_helper->viewRenderer->setNoRender();
-        
-		$alphasessionID = $this->_request->getParam('alpha');
-		$session = new Application_Model_Session();
-		$sm = new Application_Model_SessionMapper();
-		$result = $sm->findBy('alphasessionID',$alphasessionID);
-		# print_a($result);
-		$thisSession = $result[0];
-		$bootosID = $thisSession['bootosID'];
-
-
-                if(is_dir("../resources/bootos/$bootosID/kernel/") && is_numeric($bootosID)){
-                                            		               	    	
-        	       	header('Content-Type: application/x-gzip');
-        	        $content_disp = ( ereg('MSIE ([0-9].[0-9]{1,2})', $HTTP_USER_AGENT) == 'IE') ? 'inline' : 'attachment';
-        	        header('Content-Disposition:  ' . $content_disp . '; filename="kernel.tar.gz"');
-        	      	header('Pragma: no-cache');
-        	      	header('Expires: 0');
-        	                                		  
-        	       	// create the gzipped tarfile.
-        	       	chdir("../resources/bootos/$bootosID/kernel/");
-        	       	passthru( "tar cz ./");
-                }
-    }
-
-    public function getkclAction()
-    {
-    	$this->_helper->layout->disableLayout();
-    	$this->_helper->viewRenderer->setNoRender();
-    	
-        $alphasessionID = $this->_request->getParam('alpha');
-		$session = new Application_Model_Session();
-		$sm = new Application_Model_SessionMapper();
-		$result = $sm->findBy('alphasessionID',$alphasessionID);
-		# print_a($result);
-		$thisSession = $result[0];
-		$bmeID = $thisSession['bootmenuentryID'];
-		
-        if(is_numeric($bmeID)){
-        	$bmemapper = new Application_Model_BootMenuEntriesMapper();
-			$bme = new Application_Model_BootMenuEntries();
-			$bmemapper->find($bmeID,$bme);
-			
-			if($bme->getKcl() != null){
-				header('Content-Type: text/html');
-    	        $content_disp = ( ereg('MSIE ([0-9].[0-9]{1,2})', $HTTP_USER_AGENT) == 'IE') ? 'inline' : 'attachment';
-    	        header('Content-Disposition:  ' . $content_disp . '; filename="kcl.txt"');
-    	      	header('Pragma: no-cache');
-    	      	header('Expires: 0');
-				echo $bme->getKcl();   	
-			}
-	
-        }
-
-    }
-    
-    public function getbootmenuentryAction()
-    {
-    	// obsolete function (now only for debugging)
-    	// after selecting the BootOS it will be saved in session
-    	// so getkclAction, getkernelAction, getconfigAction and getinitramfsAction
-    	// can be called with session-identifier
-    	
-    	$this->_helper->layout->disableLayout();
-    	$this->_helper->viewRenderer->setNoRender();
-    	
-	    $bmeID = $this->_request->getParam('bootmenuentryID');
-	    $bmeID = 4;
-
-	    if(isset($_SESSION['alphasessionID'])){
-		   	$sessionmapper = new Application_Model_SessionMapper();	   	
-		   	$session = $sessionmapper->findBy('alphasessionID',$_SESSION['alphasessionID']);
-		   	$session = $session[0];
-		   	if($session['bootmenuentryID'] != null){		   		
-		   		$return_val = 
-		   			array(
-		   					'info' => 'This function is for debugging purpose only',
-		   					'kernel' => $this->generateURL('getkernel', 'alpha', $_SESSION['alphasessionID']), 
-		   					'initramfs' => $this->generateURL('getinitramfs', 'alpha', $_SESSION['alphasessionID']),
-		   					'kcl' => $this->generateURL('getkcl', 'alpha', $_SESSION['alphasessionID']),
-		   					'config' => $_SESSION['alphasessionID']
-		   			);		   		
-		   		echo json_encode($return_val);
-		   	}
-		   	else{
-		   		echo json_encode(
-		   			array(	'info' => 'This function is for debugging purpose only',
-		   					'error'=>'your session is out of date')
-		   		);
-		   	}
-	    }
-	    	
-    }
-    
-    function generateURL($action, $varname, $varvalue){
-   		$path = '/resource/'. $action .'/' . $varname .'/' . $varvalue;
-   		$path = "http://" . $_SERVER['SERVER_NAME'] . $path;
-    	return $path;
-    }
-
-}
-
-
-
-
-
-
-
-
-
-
-
diff --git a/application/controllers/RoleController.php b/application/controllers/RoleController.php
deleted file mode 100644
index 7a6c304..0000000
--- a/application/controllers/RoleController.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-class RoleController extends Zend_Controller_Action
-{
-
-	public function init()
-	{
-		if (Zend_Auth::getInstance()->hasIdentity()) {
-				
-		} else {
-			$this->_helper->redirector('login', 'auth');
-		}
-	}
-
-	public function indexAction()
-	{
-
-	}
-
-	public function addAction()
-	{
-
-	}
-
-	public function editAction()
-	{
-
-	}
-
-	public function showAction()
-	{
-
-	}
-
-	public function deleteAction()
-	{
-
-	}
-
-	public function linkrightAction()
-	{
-		// action body
-	}
-
-	public function unlinkrightAction()
-	{
-		// action body
-	}
-
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/application/controllers/SessionController.php b/application/controllers/SessionController.php
deleted file mode 100644
index ddb6fac..0000000
--- a/application/controllers/SessionController.php
+++ /dev/null
@@ -1,182 +0,0 @@
-<?php
-
-class SessionController extends Zend_Controller_Action
-{
-
-    public function init()
-    {
-        /* Initialize action controller here */
-    }
-
-    public function indexAction()
-    {
-        $mapper = new Application_Model_SessionMapper();
-		$this->view->sessions = $mapper->fetchAll();
-		#print_a($_SESSION);
-    }
-	private function getUniqueCode($length = "")
-	{	
-		$code = md5(uniqid(rand(), true));
-		if ($length != "") return substr($code, 0, $length);
-		else return $code;
-	}
-
-    public function createsessionAction()
-    {
-		$cm = new Application_Model_ClientMapper();
-		$clients = $cm->fetchAll();
-
-		$bm = new Application_Model_BootOsMapper();
-		$bootos = $bm->fetchAll();
-
-		$bi = new Application_Model_BootIsoMapper();
-		$bootisos = $bi->fetchAll();
-
-		$bmem = new Application_Model_BootMenuEntriesMapper();
-		$bootmenuentries = $bmem->fetchAll();
-		
-		$mm = new Application_Model_MembershipMapper();
-		$memberships = $mm->fetchAll();
-		
-
-		if (!isset($_POST["add"])){
-    		$createsession = new Application_Form_Session(array('buttontext' => 'Create Session','bootmenuentries'=>$bootmenuentries,'clients'=>$clients,'bootos'=>$bootos,'bootisos'=>$bootisos,'memberships'=>$memberships)); 		
-			$this->view->createsession = $createsession;		
-		}else {
-			// TODO extend with normal function not only with post
-			$createsession = new Application_Form_Session(array('buttontext' => 'Create Session','bootmenuentries'=>$bootmenuentries,'clients'=>$clients,'bootos'=>$bootos,'bootisos'=>$bootisos),$_POST);
-			#print_a($_POST);
-			if ($createsession->isValid($_POST)) {			
-				try{
-					$uniqid = $this->getUniqueCode(10);
-					$sm = new Application_Model_SessionMapper();
-					while(count($sm->findBy('alphasessionID',$uniqid))>0){
-						$uniqid = $this->getUniqueCode(16);
-					}
-
-					$session = new Application_Model_Session($_POST);
-					$session->setTime(strtotime($_POST['time']));
-					$session->setAlphasessionID($uniqid);
-
-					// UNIQUE ID IN SESSION SPEICHERN:
-					$_SESSION['alphasessionID'] = $uniqid;
-
-					if($session->getClientID() == ''){
-						$session->setClientID(null);
-					}
-					if($session->getBootosID() == ''){
-						$session->setBootosID(null);
-					}
-					if($session->getBootmenuentryID() == ''){
-						$session->setBootmenuentryID(null);
-					}
-					if($session->getMembershipID() == ''){
-						$session->setMembershipID(null);
-					}
-					$sessionmapper = new Application_Model_SessionMapper();
-					$sessionmapper->save($session);
-				
-					$this->_redirect('/session');
-			    	
-				}catch (Zend_Exception $e) {  
-        			echo "Error message 2: " . $e->getMessage() . "\n";  
-        		}				
-			}
-			$this->view->createsession = $createsession;
-		}
-    }
-
-    public function editsessionAction()
-    {
-		$cm = new Application_Model_ClientMapper();
-		$clients = $cm->fetchAll();
-
-		$bm = new Application_Model_BootOsMapper();
-		$bootos = $bm->fetchAll();
-
-		$bi = new Application_Model_BootIsoMapper();
-		$bootisos = $bi->fetchAll();
-
-		$bmem = new Application_Model_BootMenuEntriesMapper();
-		$bootmenuentries = $bmem->fetchAll();
-		
-		$mm = new Application_Model_MembershipMapper();
-		$memberships = $mm->fetchAll();
-
-       if (!isset($_POST["add"])){
-		    // TODO: ACL implementieren ob er editieren darf
-			$sessionID = $this->_request->getParam('sessionID');
-			$session = new Application_Model_Session();
-			try{
-
-			$sessionmapper = new Application_Model_SessionMapper();
-			$sessionmapper->find($sessionID,$session);				
-			$session->setTime(date('d.m.Y H:i',$session->getTime()));	
-			$session2 = $session->toArray();
-			#print_a($session2);
-
-			$editsession = new Application_Form_Session(array('buttontext' => 'Edit Session','bootmenuentries'=>$bootmenuentries,'clients'=>$clients,'bootos'=>$bootos,'bootisos'=>$bootisos,'memberships'=>$memberships)); 
-			$editsession->populate($session2);
-			$this->view->editsession = $editsession;
-			}catch (Zend_Exception $e) {  
-    			echo "Error message 2: " . $e->getMessage() . "\n";  
-    		}
-		
-		} else{
-			try{
-				$sessionID = $this->_request->getParam('sessionID');	
-				
-				$editsession = new Application_Form_Session(array('buttontext' => 'Edit Session','bootmenuentries'=>$bootmenuentries,'clients'=>$clients,'bootos'=>$bootos,'bootisos'=>$bootisos,'memberships'=>$memberships),$_POST);
-
-				if ($editsession->isValid($_POST)) {	
-					$session = new Application_Model_Session($_POST);
-					$session->setID($this->_request->getParam('sessionID'));
-					$session->setTime(strtotime($_POST['time']));
-					if($session->getClientID() == ''){
-						$session->setClientID(null);
-					}
-					if($session->getBootosID() == ''){
-						$session->setBootosID(null);
-					}
-					if($session->getBootmenuentryID() == ''){
-						$session->setBootmenuentryID(null);
-					}
-					if($session->getMembershipID() == ''){
-						$session->setMembershipID(null);
-					}
-					$sessionmapper = new Application_Model_SessionMapper();				
-					$sessionmapper->save($session);
-					echo 'valid';					
-				}
-				else
-				{
-					echo 'not valid';
-				}
-			}catch (Zend_Exception $e) {  
-    			echo "Error message 2: " . $e->getMessage() . "\n";  
-    		}
-			$this->_redirect('/session');
-		}		
-    }
-
-    public function deletesessionAction()
-    {
-       $sessionID = $this->_request->getParam('sessionID');
-		if(is_numeric($sessionID)){
-			$deletesession = new Application_Model_Session();
-			$deletesession->setID($sessionID);
-			$sessionmapper = new Application_Model_SessionMapper();
-			$sessionmapper->delete($deletesession);
-		}
-		$this->_redirect('/session');
-    }
-
-
-}
-
-
-
-
-
-
-