1 files changed, 21 insertions, 15 deletions

diff --git a/application/modules/user/controllers/ClientController.php b/application/modules/user/controllers/ClientController.php
index c9bfd84..5827d03 100644
--- a/application/modules/user/controllers/ClientController.php
+++ b/application/modules/user/controllers/ClientController.php
@@ -3,6 +3,7 @@
 class User_ClientController extends Zend_Controller_Action
 {
 	private $membership;
+	protected $page;
 	
 	public function init()
 	{
@@ -19,6 +20,7 @@ class User_ClientController extends Zend_Controller_Action
 		} else {
 			$this->_helper->redirector('login', 'auth');
 		}
+		$this->page = $this->_request->getParam('page');	
 	}
 
 	public function indexAction()
@@ -75,11 +77,15 @@ class User_ClientController extends Zend_Controller_Action
 			$this->_redirect('/user');
 			
 		if (!isset($_POST["add"])){
-			$addclient = new user_Form_Client(array('buttontext' => 'Create Client'));
+			$addclient = new user_Form_Client(array(
+										'buttontext' => 'Create Client',
+										'page' => $this->page));
 			$this->view->addclient = $addclient;
 		}
 		else{ 
-			$addclient = new user_Form_Client(array('buttontext' => 'Create Client'),$_POST);			
+			$addclient = new user_Form_Client(array(
+										'buttontext' => 'Create Client',
+										'page' => $this->page),$_POST);			
 			if ($addclient->isValid($_POST) || ($mac != '' && $hh != '') ) {
 				$client = new Application_Model_Client($_POST);
 				$mac = ($mac!='')?$mac:$_POST['macadress'];
@@ -98,7 +104,6 @@ class User_ClientController extends Zend_Controller_Action
 	public function removeclientAction()
 	{
 		$clientID = $this->_request->getParam('clientID');
-		$page = $this->_request->getParam('page');
 		
 		// ACL: is he authorized to delete clients?
 		if(!Pbs_Acl::checkRight('cld'))
@@ -111,13 +116,13 @@ class User_ClientController extends Zend_Controller_Action
 			if($client->getGroupID() == $this->membership->getGroupID()){
 				$clientMapper = new Application_Model_ClientMapper();
 				$clientMapper->delete($client);
-				$this->_redirect('/user/client/index/page/'.$page.'/deleteresult/ok');
+				$this->_redirect('/user/client/index/page/'.$this->page.'/deleteresult/ok');
 			}
 			else{
-				$this->_redirect('/user/client/index/page/'.$page.'/deleteresult/forbidden');
+				$this->_redirect('/user/client/index/page/'.$this->page.'/deleteresult/forbidden');
 			}
 		}
-		$this->_redirect('/user/client/index/page/'.$page.'/deleteresult/error');
+		$this->_redirect('/user/client/index/page/'.$this->page.'/deleteresult/error');
 	}
 
 	public function editclientAction(){
@@ -127,27 +132,28 @@ class User_ClientController extends Zend_Controller_Action
 			
 		if (!isset($_POST["add"])){
 			$clientID = $this->_request->getParam('clientID');
-			$page = $this->_request->getParam('page');
 			$client = new Application_Model_Client();
 			$mapper = new Application_Model_ClientMapper();
 			$mapper->find($clientID,$client);
 				
 			if($client->getGroupID() == $this->membership->getGroupID()){
-				$editclient = new user_Form_Client(array('buttontext' => 'Edit Client'));
+				$editclient = new user_Form_Client(array(
+											'buttontext' => 'Edit Client',
+											'page' => $this->page));
 				$editclient->populate($client->toArray());
-				$editclient->setPage($page);
 				$this->view->editclient = $editclient;
 			}
 			else{
-				$this->_redirect('/user/client/index/page/'.$page.'/modifyresult/error');
+				$this->_redirect('/user/client/index/page/'.$this->page.'/modifyresult/error');
 			}
 		}
 		else{
-			$editclient = new user_Form_Client(array('buttontext' => 'Edit Client'),$_POST);
+			$editclient = new user_Form_Client(array(
+											'buttontext' => 'Edit Client',
+											'page' => $this->page),$_POST);
 			if ($editclient->isValid($_POST) || ($mac != '' && $hh != '') ) {
 				$client = new Application_Model_Client($_POST);
-				$client->setID($this->_request->getParam('clientID'));		
-				$page = $this->_request->getParam('page');
+				$client->setID($this->_request->getParam('clientID'));	
 
 				$dbclient = new Application_Model_Client();
 				$clientMapper = new Application_Model_ClientMapper();
@@ -157,10 +163,10 @@ class User_ClientController extends Zend_Controller_Action
 					$client->setGroupID($this->membership->getGroupID());
 					$clientmapper = new Application_Model_ClientMapper();
 					$clientmapper->save($client);
-					$this->_redirect('/user/client/index/page/'.$page.'/modifyresult/ok');
+					$this->_redirect('/user/client/index/page/'.$this->page.'/modifyresult/ok');
 				}
 				else{
-					$this->_redirect('/user/client/index/page/'.$page.'/modifyresult/error');
+					$this->_redirect('/user/client/index/page/'.$this->page.'/modifyresult/error');
 				}
 			}
 			$this->view->editclient = $editclient;