config fertig

6 files changed, 178 insertions, 16 deletions

diff --git a/application/models/BootOsUserMapper.php b/application/models/BootOsUserMapper.php
new file mode 100644
index 0000000..a50fd02
--- /dev/null
+++ b/application/models/BootOsUserMapper.php
@@ -0,0 +1,146 @@
+<?php
+/*
+ * Copyright (c) 2011 - OpenSLX GmbH, RZ Uni Freiburg
+ * This program is free software distributed under the GPL version 2.
+ * See http://gpl.openslx.org/
+ *
+ * If you have any feedback please consult http://feedback.openslx.org/ and
+ * send your suggestions, praise, or complaints to feedback@openslx.org
+ *
+ * General information about OpenSLX can be found at http://openslx.org/
+ */
+
+class Application_Model_BootOsUserMapper
+{
+	
+	protected $_dbTable;
+
+	public function findBy($where, $array=false, $order=false) 
+	{		
+		foreach($where as $k => $v){
+			if($v != null)
+				$where2[] = "$k = '$v'"; 
+			else 
+				$where2[] = "$k IS NULL"; 
+		}
+		$where = implode(" AND " ,$where2);
+		
+		try{ 
+			$db = Zend_Db_Table::getDefaultAdapter();
+			$select = $this->getDbTable()->select() 
+				->from($this->_dbTable) 
+				->where($where); 
+			
+			if(is_array($order)){
+				foreach ($order as $k => $v)
+					$a[] = "$k $v";
+				$select->order($a);
+			}		
+				
+			$stmt = $select->query();
+			$result = $stmt->fetchAll();
+			
+			if(!$array){
+				$entries = array();
+				foreach ($result as $row) {
+					$entry = new Application_Model_BootOsUser($row);
+					$entry->setID($row['bootosuserID']);
+					$entries[] = $entry;
+				}
+				return $entries;
+			}else{
+				return $result;
+			}
+			
+		}catch (Zend_Exception $e) {  
+			echo "Error message 2: " . $e->getMessage() . "\n";  
+		}
+	} 
+
+	public function setDbTable($dbTable)
+	{
+		if (is_string($dbTable)) {
+			$dbTable = new $dbTable();
+		}
+
+		if (!$dbTable instanceof Zend_Db_Table_Abstract) {
+			throw new Exception('Invalid table data gateway provided');
+		}
+
+		$this->_dbTable = $dbTable;
+		
+		return $this;
+	}
+
+	public function getDbTable()
+	{
+		if (null === $this->_dbTable) {
+			$this->setDbTable('Application_Model_DbTable_BootOsUser');
+		}
+		
+		return $this->_dbTable;
+	}
+
+	public function save(Application_Model_BootOsUser $user)
+	{
+		$data = array('bootosuserID'=> $user->getID() ,'configID'=> $user->getConfigID() ,'login'=> $user->getLogin(), 'password'=> $user->getPassword(),'homepath'=> $user->getHomepath() ,'hometypeID'=> $user->getHometypeID());
+		if (null === ($id = $user->getID()) ) {
+			unset($data['bootosuserID']);
+			return $this->getDbTable()->insert($data);
+		} else {
+			$this->getDbTable()->update($data, array('bootosID = ?' => $id));
+		}
+	}
+	
+	public function delete(Application_Model_BootOsUser $user)
+	{
+		if (null === ($id = $user->getID()) ) {
+			return;
+		} else {
+			$this->getDbTable()->delete(array('bootosuserID = ?' => $id));
+		}
+	}
+
+	public function find($id, Application_Model_BootOsUser $user = null)
+	{
+		$result = $this->getDbTable()->find($id);
+		if (0 == count($result)) {
+			return;
+		}
+
+		$row = $result->current();
+		
+		if($user == null){
+			$user = new Application_Model_BootOsUser();
+			$user->setID($row->bootosuserID)->setconfigID($row->configID)->setLogin($row->login)->setPassword($row->password)->setHomepath($row->homepath)->setHometypeID($row->hometypeID);
+			return $user;
+		}else{
+			$user->setID($row->bootosuserID)->setconfigID($row->configID)->setLogin($row->login)->setPassword($row->password)->setHomepath($row->homepath)->setHometypeID($row->hometypeID);
+		}	
+		
+	}
+
+	public function fetchAll()
+	{
+		$resultSet = $this->getDbTable()->fetchAll();
+		$entries   = array();
+		foreach ($resultSet as $row) {
+			$entry = new Application_Model_BootOsUser();
+			
+			$user->setID($row->bootosuserID)->setconfigID($row->configID)->setLogin($row->login)->setPassword($row->password)->setHomepath($row->homepath)->setHometypeID($row->hometypeID);
+
+			$entries[$row->bootosuserID] = $entry;
+		}
+		return $entries;
+	}
+	
+	public function compare(Application_Model_BootOsUser $v1,Application_Model_BootOsUser $v2){
+		$vv1 = $v1->toArray();
+		$vv2 = $v2->toArray();
+		return array_diff($vv1,$vv2);
+	}
+
+
+	
+}
+
diff --git a/application/models/Config.php b/application/models/Config.php
index 3b609af..295f922 100644
--- a/application/models/Config.php
+++ b/application/models/Config.php
@@ -128,6 +128,7 @@ class Application_Model_Config
 	}
 	public function setBootosID($_bootosID)
 	{
+		$this->_bootosID = $_bootosID;
 		return $this;
 	}
 	
diff --git a/application/models/ConfigMapper.php b/application/models/ConfigMapper.php
index 1fcbe45..f46bd72 100644
--- a/application/models/ConfigMapper.php
+++ b/application/models/ConfigMapper.php
@@ -87,7 +87,7 @@ class Application_Model_ConfigMapper
 
 		if (null === ($id = $config->getID()) ) {
 			unset($data['configID']);
-			$this->getDbTable()->insert($data);
+			return $this->getDbTable()->insert($data);
 		} else {
 			$this->getDbTable()->update($data, array('configID = ?' => $id));
 		}
@@ -104,12 +104,7 @@ class Application_Model_ConfigMapper
 
 	public function find($id, Application_Model_Config $config = null)
 	{
-		if($config == null){
-			$return = true;
-		}
-		if($return){
-			$config = new Application_Model_Config();
-		}
+		
 		$result = $this->getDbTable()->find($id);
 		if (0 == count($result)) {
 			return;
@@ -117,10 +112,14 @@ class Application_Model_ConfigMapper
 
 		$row = $result->current();
 		
-		$config->setID($row->configID)->setGroupID($row->groupID)->setMembershipID($row->membershipID)->setCreated($row->created)->setTitle($row->title)->setDescription($row->description)->setVisible($row->visible)->setBootosID($row->bootosID);
-		if($return){		
+		if($config == null){
+			$config = new Application_Model_Config();
+			$config->setID($row->configID)->setGroupID($row->groupID)->setMembershipID($row->membershipID)->setCreated($row->created)->setTitle($row->title)->setDescription($row->description)->setVisible($row->visible)->setBootosID($row->bootosID);
 			return $config;
-		}
+		}else{
+			$config->setID($row->configID)->setGroupID($row->groupID)->setMembershipID($row->membershipID)->setCreated($row->created)->setTitle($row->title)->setDescription($row->description)->setVisible($row->visible)->setBootosID($row->bootosID);
+		}	
+
 	}
 
 	public function fetchAll()
diff --git a/application/models/HomeTypeMapper.php b/application/models/HomeTypeMapper.php
index 6bccceb..d795941 100644
--- a/application/models/HomeTypeMapper.php
+++ b/application/models/HomeTypeMapper.php
@@ -102,7 +102,7 @@ class Application_Model_HomeTypeMapper
 		}
 	}
 
-	public function find($id, Application_Model_HomeType $hometype)
+	public function find($id, Application_Model_HomeType $hometype = null)
 	{
 		$result = $this->getDbTable()->find($id);
 		if (0 == count($result)) {
@@ -111,8 +111,14 @@ class Application_Model_HomeTypeMapper
 
 		$row = $result->current();
 		
-		$hometype->setID($row->hometypeID)
-			->setName($row->name);
+		if($hometype == null){
+			$hometype = new Application_Model_HomeType();
+			$hometype->setID($row->hometypeID)->setName($row->name);
+			return $hometype;
+		}else{
+			$hometype->setID($row->hometypeID)->setName($row->name);
+		}	
+		
 	}
 
 	public function fetchAll()
diff --git a/application/models/Person.php b/application/models/Person.php
index 2312f65..4d4a000 100644
--- a/application/models/Person.php
+++ b/application/models/Person.php
@@ -26,6 +26,7 @@ class Application_Model_Person
 	protected $_login;
 	protected $_password;
 	protected $_password_salt;
+	protected $_loginpassword;
 	protected $_suspended;
 
 	public function __construct(array $options = null)
@@ -185,6 +186,15 @@ class Application_Model_Person
 		$this->_password = $_password;
 		return $this;
 	}
+	public function getLoginPassword()
+	{
+		return $this->_loginpassword;
+	}
+	public function setLoginPassword($_loginpassword)
+	{
+		$this->_loginpassword = $_loginpassword;
+		return $this;
+	}
 	public function setPasswordSalt($_password_salt)
 	{
 		$this->_password_salt = $_password_salt;
diff --git a/application/models/PersonMapper.php b/application/models/PersonMapper.php
index f073d07..c123bdc 100644
--- a/application/models/PersonMapper.php
+++ b/application/models/PersonMapper.php
@@ -84,7 +84,7 @@ class Application_Model_PersonMapper
 	public function save(Application_Model_Person $person)
 	{
 		
-		$data = array('personID'=> $person->getID() ,'title'=> $person->getTitle() ,'name'=> $person->getName() ,'firstname'=> $person->getFirstname() ,'street'=> $person->getStreet() ,'housenumber'=> $person->getHousenumber() ,'city'=> $person->getCity() ,'postalcode'=> $person->getPostalcode() ,'logindate'=> $person->getLogindate() ,'registerdate'=> $person->getRegisterdate() ,'email'=> $person->getEmail() ,'login'=> $person->getLogin() ,'password'=> $person->getPassword() ,'password_salt'=> $person->getPasswordSalt() ,'suspended'=> $person->getSuspended() );
+		$data = array('personID'=> $person->getID() ,'title'=> $person->getTitle() ,'name'=> $person->getName() ,'firstname'=> $person->getFirstname() ,'street'=> $person->getStreet() ,'housenumber'=> $person->getHousenumber() ,'city'=> $person->getCity() ,'postalcode'=> $person->getPostalcode() ,'logindate'=> $person->getLogindate() ,'registerdate'=> $person->getRegisterdate() ,'email'=> $person->getEmail() ,'login'=> $person->getLogin() ,'password'=> $person->getPassword(), 'loginpassword'=> $person->getLoginPassword() ,'password_salt'=> $person->getPasswordSalt() ,'suspended'=> $person->getSuspended() );
 
 		if (null === ($id = $person->getID()) ) {
 			unset($data['personID']);
@@ -120,7 +120,7 @@ class Application_Model_PersonMapper
 
 		$row = $result->current();
 		
-		$person->setID($row->personID)->setTitle($row->title)->setName($row->name)->setFirstname($row->firstname)->setStreet($row->street)->setHousenumber($row->housenumber)->setCity($row->city)->setPostalcode($row->postalcode)->setLogindate($row->logindate)->setRegisterdate($row->registerdate)->setEmail($row->email)->setLogin($row->login)->setPassword($row->password)->setPasswordSalt($row->password_salt)->setSuspended($row->suspended);
+		$person->setID($row->personID)->setTitle($row->title)->setName($row->name)->setFirstname($row->firstname)->setStreet($row->street)->setHousenumber($row->housenumber)->setCity($row->city)->setPostalcode($row->postalcode)->setLogindate($row->logindate)->setRegisterdate($row->registerdate)->setEmail($row->email)->setLogin($row->login)->setPassword($row->password)->setLoginPassword($row->loginpassword)->setPasswordSalt($row->password_salt)->setSuspended($row->suspended);
 		if($return){
 			return $person;
 		}
@@ -133,7 +133,7 @@ class Application_Model_PersonMapper
 		foreach ($resultSet as $row) {
 			$entry = new Application_Model_Person();
 			
-			$entry->setID($row->personID)->setTitle($row->title)->setName($row->name)->setFirstname($row->firstname)->setStreet($row->street)->setHousenumber($row->housenumber)->setCity($row->city)->setPostalcode($row->postalcode)->setLogindate($row->logindate)->setRegisterdate($row->registerdate)->setEmail($row->email)->setLogin($row->login)->setPassword($row->password)->setPasswordSalt($row->password_salt)->setSuspended($row->suspended);	
+			$entry->setID($row->personID)->setTitle($row->title)->setName($row->name)->setFirstname($row->firstname)->setStreet($row->street)->setHousenumber($row->housenumber)->setCity($row->city)->setPostalcode($row->postalcode)->setLogindate($row->logindate)->setRegisterdate($row->registerdate)->setEmail($row->email)->setLogin($row->login)->setPassword($row->password)->setLoginPassword($row->loginpassword)->setPasswordSalt($row->password_salt)->setSuspended($row->suspended);	
 
 			$entries[] = $entry;
 		}