Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2

11 files changed, 56 insertions, 37 deletions

diff --git a/application/modules/user/controllers/AuthController.php b/application/modules/user/controllers/AuthController.php
index 8160104..bb16e94 100644
--- a/application/modules/user/controllers/AuthController.php
+++ b/application/modules/user/controllers/AuthController.php
@@ -45,8 +45,6 @@ class User_AuthController extends Zend_Controller_Action
 
                                         		            $result = $auth->authenticate($adapter);
 
-                                        		            // TODO: erweiterte fehlerbeschreibung des Users
-
                                         		            if ($result->isValid()) {
                                         		            	$this->personmapper = new Application_Model_PersonMapper();
                                         		            	$result = $this->personmapper->findBy(array('email' => Zend_Auth::getInstance()->getIdentity()),true);
@@ -58,7 +56,8 @@ class User_AuthController extends Zend_Controller_Action
                                         		            	$this->_helper->redirector('selectmembership', 'person');
                                         		            	return;
                                         		            } else {
-                                        		            	echo "Wrong Email or Password.";
+                                        		            	$pbsNotifier = new Pbs_Notifier();
+                                        		            	$this->view->notification = $pbsNotifier->notify('Wrong Email or Password', 'error');
                                         		            }
 				}
 			}
@@ -80,34 +79,34 @@ class User_AuthController extends Zend_Controller_Action
 	public function registerAction()
 	{
 		if (Zend_Auth::getInstance()->hasIdentity()) {
-			print_a('Already logged in.');
+			$pbsNotifier = new Pbs_Notifier();
+			$this->view->notification = $pbsNotifier->notify('Already logged in.', 'error');
 		} else {
 			if (!isset($_POST["register"])){
 				$registerForm = new user_Form_Register();
 			} else {
-				$registerForm = new user_Form_Register($_POST);
-
+				foreach($_POST as $k => $v) {
+					if($v != '') {
+						$data[$k] = $v;
+					}
+				}
+				$registerForm = new user_Form_Register($data);
 				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..";
+						$pbsNotifier = new Pbs_Notifier();
+						$this->view->notification = $pbsNotifier->notify('Email already registered', 'error');
+						$this->view->registerForm = $registerForm;
 						return;
 					}
-					echo "Successfully registered. <br/>";
-					echo "Continue to Login: <a href=\""."/dev/auth/login"."\">Login</a>";
 					$this->_helper->redirector('login', 'auth');
 					return;
 				}
diff --git a/application/modules/user/controllers/BootmenuController.php b/application/modules/user/controllers/BootmenuController.php
index 30e4098..d2e3508 100644
--- a/application/modules/user/controllers/BootmenuController.php
+++ b/application/modules/user/controllers/BootmenuController.php
@@ -127,7 +127,7 @@ class user_BootmenuController extends Zend_Controller_Action
 		$pagination->setPageUrl('/user/bootmenu/index/type/'.$this->type.((isset($this->view->search))?'/search/'.$this->view->search:''));
 		$bootmenu = $pagination->getElements();				
 		
-		$this->view->pagination = $pagination->pagination($pageurl);
+		$this->view->pagination = $pagination->pagination();
 		$this->view->page 		= $pagination->getRequestPage();
 		
 		$this->view->bootmenulist = $bootmenu; 
@@ -147,10 +147,10 @@ class user_BootmenuController extends Zend_Controller_Action
     		$this->_redirect('/user/bootmenu/index/type/'.$this->type.'/page/'.$this->page.'/addresult/forbidden');
     		    	
         if (!isset($_POST["createbootmenu"])){
-    	    $bootmenuForm = new user_Form_Bootmenu(array('action' => 'createbootmenu','page' => $this->page));
+    	    $bootmenuForm = new user_Form_Bootmenu(array('action' => 'createbootmenu','page' => $this->page, 'type'=>$this->type));
     	} else {
     			
-    	    $bootmenuForm = new user_Form_Bootmenu(array('action' => 'createbootmenu','page' => $this->page),$_POST);
+    	    $bootmenuForm = new user_Form_Bootmenu(array('action' => 'createbootmenu','page' => $this->page, 'type'=>$this->type),$_POST);
     			    			
     		if ($bootmenuForm->isValid($_POST)) {
 
@@ -192,11 +192,11 @@ class user_BootmenuController extends Zend_Controller_Action
     		
     	if (!isset($_POST["editbootmenu"])){
 
-    		$bootmenuForm = new user_Form_Bootmenu(array('action' => 'editbootmenu','page' => $this->page));
+    		$bootmenuForm = new user_Form_Bootmenu(array('action' => 'editbootmenu','page' => $this->page, 'type'=>$this->type));
     		$bootmenuForm->populate($bootmenu->toArray()); 
     		
     	}else{
-    		$bootmenuForm = new user_Form_Bootmenu(array('action' => 'editbootmenu','page' => $this->page),$_POST);
+    		$bootmenuForm = new user_Form_Bootmenu(array('action' => 'editbootmenu','page' => $this->page, 'type'=>$this->type),$_POST);
     			    			
     		if ($bootmenuForm->isValid($_POST)) {
 
@@ -350,6 +350,7 @@ class user_BootmenuController extends Zend_Controller_Action
     	    	'maxorder'=> $maxorder, 
     	    	'configlist'=> $configlist,
     	    	'page' => $this->page,
+    	    	'type' => $this->type,
     	    	'action' => 'addbootmenuentry',
     	    ));  
     	    
@@ -366,6 +367,7 @@ class user_BootmenuController extends Zend_Controller_Action
     	        	'maxorder'=> $maxorder, 
     	        	'configlist'=>$configlist, 
     	        	'page' => $this->page, 
+    	       		'type' => $this->type,
     	        	'action' => 'addbootmenuentry',
      	        	),$_POST);
     	        
@@ -451,7 +453,8 @@ class user_BootmenuController extends Zend_Controller_Action
 	    }
     	
     	if (!isset($_POST["editbootmenuentry"])){
-	   	
+	   		if(!isset($_POST['bootosID']))
+	   			$_POST['bootosID'] = $bootmenuentry->getBootosID();
     		if(!isset($_POST['kcl']))
     			$_POST['kcl'] = $bootmenuentry->getKcl();
     			
@@ -461,6 +464,7 @@ class user_BootmenuController extends Zend_Controller_Action
     	    	'maxorder'=> $maxorder-1, 
     	    	'configlist'=> $configlist,
     	    	'page' => $this->page,
+    			'type' => $this->type,
     	    	'action' => 'editbootmenuentry', 
     		));  
 
@@ -480,6 +484,7 @@ class user_BootmenuController extends Zend_Controller_Action
     	    	'maxorder'=> $maxorder-1, 
     	    	'configlist'=> $configlist,
     	    	'page' => $this->page,
+    			'type' => $this->type,
     	    	'action' => 'editbootmenuentry'),$_POST);
     			    			
     		if ($bootmenuentryForm->isValid($_POST)) {
diff --git a/application/modules/user/controllers/ConfigController.php b/application/modules/user/controllers/ConfigController.php
index a38af00..2491c0e 100644
--- a/application/modules/user/controllers/ConfigController.php
+++ b/application/modules/user/controllers/ConfigController.php
@@ -30,7 +30,8 @@ class user_ConfigController extends Zend_Controller_Action
 		} else {
 			$this->_helper->redirector('login', 'auth');
 		}
-		$this->page = $this->_request->getParam('page');   	}
+		$this->page = $this->_request->getParam('page');   	
+    }
 
     public function indexAction()
     {
@@ -106,9 +107,9 @@ class user_ConfigController extends Zend_Controller_Action
     		$this->_redirect('/user/config/index/type/'.$this->type.'/page/'.$this->page.'/addresult/forbidden');
     		
         if (!isset($_POST["createconfig"])){
-    	        $configForm = new user_Form_Config(array('action' => 'createconfig','page'=>$this->page));
+    	        $configForm = new user_Form_Config(array('action' => 'createconfig','page'=>$this->page, 'type'=>$this->type));
     		} else {
-    	        $configForm = new user_Form_Config(array('action' => 'createconfig','page'=>$this->page),$_POST);
+    	        $configForm = new user_Form_Config(array('action' => 'createconfig','page'=>$this->page, 'type'=>$this->type),$_POST);
     			    			
     		    if ($configForm->isValid($_POST)) {
 
@@ -162,11 +163,11 @@ class user_ConfigController extends Zend_Controller_Action
     	        
     	if (!isset($_POST["editconfig"])){
 
-    		$configForm = new user_Form_Config(array('action' => 'editconfig','page'=>$this->page));
+    		$configForm = new user_Form_Config(array('action' => 'editconfig','page'=>$this->page, 'type'=>$this->type));
     		$configForm->populate($config->toArray()); 
     	
     	}else{
-    		$configForm = new user_Form_Config(array('action' => 'editconfig','page'=>$this->page),$_POST);
+    		$configForm = new user_Form_Config(array('action' => 'editconfig','page'=>$this->page, 'type'=>$this->type),$_POST);
     			    			
     		if ($configForm->isValid($_POST)) {
 
diff --git a/application/modules/user/forms/Bootiso.php b/application/modules/user/forms/Bootiso.php
index 7a3547e..3f5431c 100644
--- a/application/modules/user/forms/Bootiso.php
+++ b/application/modules/user/forms/Bootiso.php
@@ -26,7 +26,7 @@ class user_Form_Bootiso extends Zend_Form
         $this->setName($this->action);
 		$this->setMethod('post');
 
-		if (!Pbs_Acl::checkRight('be'))
+		if (!Pbs_Acl::checkRight('be') && $this->action == 'editbootiso')
 			$meta = true;
 		else 
 			$meta = null;
diff --git a/application/modules/user/forms/Bootmenu.php b/application/modules/user/forms/Bootmenu.php
index 8389fa8..73791fd 100644
--- a/application/modules/user/forms/Bootmenu.php
+++ b/application/modules/user/forms/Bootmenu.php
@@ -4,6 +4,7 @@ class user_Form_Bootmenu extends Zend_Form
 {
 	private $action;
 	private $page;
+	private $type;	
 	
     public function setAction($action){
     	$this->action = $action;
@@ -17,13 +18,16 @@ class user_Form_Bootmenu extends Zend_Form
 	public function setPage($page){
 		$this->page = $page;
 	}
-    
+	public function setType($type){
+		$this->type = $type;
+	}
+	
     public function init()
     {
         $this->setName($this->action);
 		$this->setMethod('post');
 		
-		if (!Pbs_Acl::checkRight('booee'))
+		if (!Pbs_Acl::checkRight('booee') && $this->action == 'editbootmenu')
 			$meta = true;
 		else 
 			$meta = null;
@@ -49,7 +53,7 @@ class user_Form_Bootmenu extends Zend_Form
         ));  
         
         $this->addElement('button', 'Cancel', array(
-            'onclick' => 'self.location="/user/bootmenu/index/page/'.$this->page.'"'
+            'onclick' => 'self.location="/user/bootmenu/index/type/'.$this->type.'/page/'.$this->page.'"'
         ));  
 
     }
diff --git a/application/modules/user/forms/BootmenuEntries.php b/application/modules/user/forms/BootmenuEntries.php
index 58a2820..3168bee 100644
--- a/application/modules/user/forms/BootmenuEntries.php
+++ b/application/modules/user/forms/BootmenuEntries.php
@@ -8,6 +8,7 @@ class user_Form_BootmenuEntries extends Zend_Form
 	private $maxorder;
 	private $action;
 	private $page;	
+	private $type;	
 	
     public function setAction($action){
     	$this->action = $action;
@@ -30,6 +31,10 @@ class user_Form_BootmenuEntries extends Zend_Form
     	$this->configlist = $configlist;    	
     }
     
+	public function setType($type){
+		$this->type = $type;
+	}
+    
 	public function setPage($page){
 		$this->page = $page;
 	}
@@ -48,7 +53,7 @@ class user_Form_BootmenuEntries extends Zend_Form
         $this->setName($this->action);
 		$this->setMethod('post');
 		
-		if (!Pbs_Acl::checkRight('booee'))
+		if (!Pbs_Acl::checkRight('booee') && $this->action == 'editbootmenuentry')
 			$meta = true;
 		else 
 			$meta = null;
@@ -152,7 +157,7 @@ class user_Form_BootmenuEntries extends Zend_Form
         ));  
         
         $this->addElement('button', 'Cancel', array(
-            'onclick' => 'self.location="/user/bootmenu/index/page/'.$this->page.'"'
+            'onclick' => 'self.location="/user/bootmenu/index/type/'.$this->type.'/page/'.$this->page.'"'
         ));  
 
     }
diff --git a/application/modules/user/forms/Bootos.php b/application/modules/user/forms/Bootos.php
index 6edc7eb..5420a83 100644
--- a/application/modules/user/forms/Bootos.php
+++ b/application/modules/user/forms/Bootos.php
@@ -28,7 +28,7 @@ class user_Form_Bootos extends Zend_Form
         $this->setName("BootOsCreate");
 		$this->setMethod('post');
 		
-		if (!Pbs_Acl::checkRight('boe'))
+		if (!Pbs_Acl::checkRight('boe') && $this->action == 'editbootos')
 			$meta = true;
 		else 
 			$meta = null;
diff --git a/application/modules/user/forms/Config.php b/application/modules/user/forms/Config.php
index 2ee221d..a9f4c62 100644
--- a/application/modules/user/forms/Config.php
+++ b/application/modules/user/forms/Config.php
@@ -5,6 +5,7 @@ class user_Form_Config extends Zend_Form
 
 	private $action;
 	private $page;
+	private $type;
 	
     public function setAction($action){
     	$this->action = $action;
@@ -12,13 +13,15 @@ class user_Form_Config extends Zend_Form
 	public function setPage($p){
     	$this->page = $p;	
     }    
-    
+	public function setType($type){
+		$this->type = $type;
+	}
     public function init()
     {
         $this->setName($this->action);
 		$this->setMethod('post');
 		
-		if (!Pbs_Acl::checkRight('ce'))
+		if (!Pbs_Acl::checkRight('ce') && $this->action == 'editconfig')
 			$meta = true;
 		else 
 			$meta = null;
@@ -57,7 +60,7 @@ class user_Form_Config extends Zend_Form
         ));  
         
         $this->addElement('button', 'Cancel', array(
-            'onclick' => 'self.location="/user/config/index/page/'.$this->page.'"'
+            'onclick' => 'self.location="/user/config/index/type/'.$this->type.'/page/'.$this->page.'"'
         ));  
 
     }
diff --git a/application/modules/user/forms/Preboot.php b/application/modules/user/forms/Preboot.php
index 9d2f3aa..404a559 100644
--- a/application/modules/user/forms/Preboot.php
+++ b/application/modules/user/forms/Preboot.php
@@ -18,7 +18,7 @@ class user_Form_Preboot extends Zend_Form
         $this->setName($this->action);
 		$this->setMethod('post');
 
-		if ((!Pbs_Acl::checkRight('pre') && $this->action == 'editpreboot'))
+		if (!Pbs_Acl::checkRight('pre') && $this->action == 'editpreboot')
 			$meta = true;
 		else 
 			$meta = null;
diff --git a/application/modules/user/views/scripts/auth/login.phtml b/application/modules/user/views/scripts/auth/login.phtml
index 899c6e7..cc2a3ef 100644
--- a/application/modules/user/views/scripts/auth/login.phtml
+++ b/application/modules/user/views/scripts/auth/login.phtml
@@ -1,6 +1,7 @@
 <h1>Login</h1>
 <?php
 $this->loginForm->setAction($this->url());
+echo $this->notification;
 echo $this->loginForm;
 ?>
 <div><button onclick="location.href='/user/auth/recoverpassword'">Recover Password</button></div>
\ No newline at end of file
diff --git a/application/modules/user/views/scripts/auth/register.phtml b/application/modules/user/views/scripts/auth/register.phtml
index 6217e06..eb59c68 100644
--- a/application/modules/user/views/scripts/auth/register.phtml
+++ b/application/modules/user/views/scripts/auth/register.phtml
@@ -1,5 +1,6 @@
 <h1>New Account</h1>
 <?php
+echo $this->notification;
 $this->registerForm->setAction($this->url());
 echo $this->registerForm;
-?>
\ No newline at end of file
+?>