suspended fix

4 files changed, 65 insertions, 19 deletions

diff --git a/application/models/Membership.php b/application/models/Membership.php
index c445338..a455848 100644
--- a/application/models/Membership.php
+++ b/application/models/Membership.php
@@ -16,7 +16,7 @@ class Application_Model_Membership
 	protected $_groupID;
 	protected $_roleID;
 	protected $_personID;
-	protected $_suspended;
+	protected $_suspend;
 	protected $_apikey;
 
 	public function __construct(array $options = null)
@@ -93,13 +93,13 @@ class Application_Model_Membership
 		$this->_personID = $_personID;
 		return $this;
 	}
-	public function getSuspended()
+	public function getSuspend()
 	{
-		return $this->_suspended;
+		return $this->_suspend;
 	}
-	public function setSuspended($_suspended)
+	public function setSuspend($_suspend)
 	{
-		$this->_suspended = $_suspended;
+		$this->_suspend = $_suspend;
 		return $this;
 	}
 	public function getApikey()
diff --git a/application/models/MembershipMapper.php b/application/models/MembershipMapper.php
index a721453..6786c92 100644
--- a/application/models/MembershipMapper.php
+++ b/application/models/MembershipMapper.php
@@ -84,7 +84,7 @@ class Application_Model_MembershipMapper
 	public function save(Application_Model_Membership $membership)
 	{
 
-		$data = array('membershipID'=> $membership->getID() ,'groupID'=> $membership->getGroupID() ,'roleID'=> $membership->getRoleID() ,'personID'=> $membership->getPersonID() ,'suspended'=> $membership->getSuspended(), 'apikey'=> $membership->getApikey() );
+		$data = array('membershipID'=> $membership->getID() ,'groupID'=> $membership->getGroupID() ,'roleID'=> $membership->getRoleID() ,'personID'=> $membership->getPersonID() ,'suspend'=> $membership->getSuspend(), 'apikey'=> $membership->getApikey() );
 
 		if (null === ($id = $membership->getID()) ) {
 			unset($data['membershipID']);
@@ -119,7 +119,7 @@ class Application_Model_MembershipMapper
 
 		$row = $result->current();
 
-		$membership->setID($row->membershipID)->setGroupID($row->groupID)->setRoleID($row->roleID)->setPersonID($row->personID)->setSuspended($row->suspended)->setApikey($row->apikey);
+		$membership->setID($row->membershipID)->setGroupID($row->groupID)->setRoleID($row->roleID)->setPersonID($row->personID)->setSuspend($row->suspend)->setApikey($row->apikey);
 		if($return){
 			return $membership;
 		}
@@ -132,7 +132,7 @@ class Application_Model_MembershipMapper
 		foreach ($resultSet as $row) {
 			$entry = new Application_Model_Membership();
 				
-			$entry->setID($row->membershipID)->setGroupID($row->groupID)->setRoleID($row->roleID)->setPersonID($row->personID)->setSuspended($row->suspended)->setApikey($row->apikey);
+			$entry->setID($row->membershipID)->setGroupID($row->groupID)->setRoleID($row->roleID)->setPersonID($row->personID)->setSuspend($row->suspend)->setApikey($row->apikey);
 
 			$entries[] = $entry;
 		}
diff --git a/application/models/Person.php b/application/models/Person.php
index 4d4a000..637eb7d 100644
--- a/application/models/Person.php
+++ b/application/models/Person.php
@@ -27,7 +27,7 @@ class Application_Model_Person
 	protected $_password;
 	protected $_password_salt;
 	protected $_loginpassword;
-	protected $_suspended;
+	protected $_suspend;
 
 	public function __construct(array $options = null)
 	{
@@ -186,11 +186,11 @@ class Application_Model_Person
 		$this->_password = $_password;
 		return $this;
 	}
-	public function getLoginPassword()
+	public function getLoginpassword()
 	{
 		return $this->_loginpassword;
 	}
-	public function setLoginPassword($_loginpassword)
+	public function setLoginpassword($_loginpassword)
 	{
 		$this->_loginpassword = $_loginpassword;
 		return $this;
@@ -204,13 +204,13 @@ class Application_Model_Person
 	{
 		return $this->_password_salt;
 	}
-	public function getSuspended()
+	public function getSuspend()
 	{
-		return $this->_suspended;
+		return $this->_suspend;
 	}
-	public function setSuspended($_suspended)
+	public function setSuspend($_suspend)
 	{
-		$this->_suspended = $_suspended;
+		$this->_suspend = $_suspend;
 		return $this;
 	}
 	/**
diff --git a/application/models/PersonMapper.php b/application/models/PersonMapper.php
index c123bdc..9330e7e 100644
--- a/application/models/PersonMapper.php
+++ b/application/models/PersonMapper.php
@@ -36,8 +36,9 @@ class Application_Model_PersonMapper
 					$a[] = "$k $v";
 				$select->order($a);
 			}	
-				
+		#	print_a($select);
 			$stmt = $select->query();
+		#	print_a($stmt);
 			$result = $stmt->fetchAll();
 			
 			if(!$array){
@@ -84,7 +85,22 @@ 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(), 'loginpassword'=> $person->getLoginPassword() ,'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() ,
+		'suspend'=> $person->getSuspend() );
 
 		if (null === ($id = $person->getID()) ) {
 			unset($data['personID']);
@@ -120,7 +136,22 @@ 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)->setLoginPassword($row->loginpassword)->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)
+				->setPasswordSalt($row->password_salt)
+				->setLoginpassword($row->loginpassword)
+				->setSuspend($row->suspend);
 		if($return){
 			return $person;
 		}
@@ -133,7 +164,22 @@ 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)->setLoginPassword($row->loginpassword)->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)
+					->setPasswordSalt($row->password_salt)
+					->setSuspend($row->suspend)
+					->setLoginpassword($row->loginpassword);	
 
 			$entries[] = $entry;
 		}