Index: /changelog
===================================================================
--- /changelog	(revision 7828)
+++ /changelog	(revision 7829)
@@ -425,2 +425,3 @@
 - Feature: Template je Variante fÃŒr Downloadplus anpassbar
 - Feature: parallele Erstellung eines Dokumentes ohne Vorlage (Briefbogenfunktion)
+- Bugfix: Anzeige von Name/Titel in den Passwort Vergessen Mails
Index: /mods/wpsg_mod_kundenverwaltung.class.php
===================================================================
--- /mods/wpsg_mod_kundenverwaltung.class.php	(revision 7828)
+++ /mods/wpsg_mod_kundenverwaltung.class.php	(revision 7829)
@@ -672,4 +672,6 @@
 					$pwd_hash = $this->hashString($_REQUEST['wpsg']['mod_kundenverwaltung']['password']);
 
+					die($pwd_hash.":".$_REQUEST['wpsg']['mod_kundenverwaltung']['password']);
+
 					$strQuery = "
 						SELECT
@@ -687,6 +689,5 @@
 					$kunde_id = $this->db->fetchOne($strQuery);
 										
-					if ($kunde_id > 0) 
-					{
+					if ($kunde_id > 0)  {
 						
 						$this->login(
@@ -698,7 +699,5 @@
 						$this->shop->addFrontendMessage(__('Sie wurden erfolgreich angemeldet.', 'wpsg'));
 						
-					}
-					else 
-					{
+					} else {
 					
 						$this->shop->addFrontendError(__('Es wurde kein Kunde mit diesen Zugangsdaten gefunden!', 'wpsg'));
@@ -753,7 +752,8 @@
 				$hash_gen = $this->hashString($kunde['id']);
 				
-				if ($hash_gen == $_REQUEST['hash'] && $kunde['id'] > 0)
-				{
-					
+				if ($hash_gen == $_REQUEST['hash'] && $kunde['id'] > 0) {
+
+					$oCustomer = wpsg_customer::getInstance(intval($kunde['id']));
+
 					// Passwort generieren
 					$new_pwd = $this->createPasswort(10);
@@ -765,4 +765,5 @@
 					
 					$this->shop->view['kunde'] = $kunde;
+					$this->shop->view['oCustomer'] = $oCustomer;
 					
 					$this->shop->callMods('customer_updatePwd', array(&$kunde['id'], &$new_pwd));
@@ -770,12 +771,9 @@
 					$mail_text = $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_kundenverwaltung/mail_pwdsend.phtml', false);
 											
-					if ($this->shop->get_option('wpsg_htmlmail') === '1')
-					{
+					if ($this->shop->get_option('wpsg_htmlmail') === '1') {
 						
 						$mail_html = $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_kundenverwaltung/mail_pwdsend_html.phtml', false);
 						
-					}
-					else
-					{
+					} else {
 						
 						$mail_html = false;
@@ -814,8 +812,10 @@
 
 					$kunde = $this->db->fetchRow("SELECT * FROM `".WPSG_TBL_KU."` AS K WHERE K.`email` = '".wpsg_q($_REQUEST['wpsg']['sendpwd']['email'])."'");
-					
-					if ($kunde['id'] > 0)
-					{
-						
+
+					if ($kunde['id'] > 0) {
+
+						$oCustomer = wpsg_customer::getInstance($kunde['id']);
+
+						$this->shop->view['oCustomer'] = $oCustomer;
 						$this->shop->view['kunde'] = $kunde;
 						$this->shop->view['strLink'] = html_entity_decode($this->getPwdVergessenURL().'&hash='.$this->hashString($kunde['id']).'&email='.$kunde['email']);												
@@ -823,12 +823,9 @@
 						$mail_text = $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_kundenverwaltung/mail_pwdrequest.phtml', false);						
 						
-						if ($this->shop->get_option('wpsg_htmlmail') === '1')
-						{
+						if ($this->shop->get_option('wpsg_htmlmail') === '1') {
 							
 							$mail_html = $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_kundenverwaltung/mail_pwdrequest_html.phtml', false);
 							
-						}
-						else
-						{
+						} else {
 							
 							$mail_html = false;
@@ -1220,5 +1217,5 @@
 					{
 						
-						$this->shop->view['error'] = $_SESSION['wpsg']['errorFields'];
+						$this->shop->view['error'] = wpsg_getArray($_SESSION['wpsg']['errorFields']);
 						$this->shop->view['pflicht'] = $this->shop->loadPflichtFeldDaten();
 						
Index: /views/mods/mod_kundenverwaltung/mail_pwdrequest.phtml
===================================================================
--- /views/mods/mod_kundenverwaltung/mail_pwdrequest.phtml	(revision 7828)
+++ /views/mods/mod_kundenverwaltung/mail_pwdrequest.phtml	(revision 7829)
@@ -5,10 +5,10 @@
 	 */
 
-    $arPflicht = $this->loadPflichtFeldDaten();
-    $arTitle = explode('|', $arPflicht['anrede_auswahl']);
+    /** @var $oCustomer wpsg_customer */
+	$oCustomer = $this->view['oCustomer'];
 
-?><?php echo wpsg_translate(__('Hallo #1# #2# #3#,', 'wpsg'), @$arTitle[$this->view['basket']['checkout']['title']], $this->view['basket']['checkout']['vname'], $this->view['basket']['checkout']['name']); ?>
- 
- 
+?><?php echo wpsg_translate(__('Hallo #1# #2#,', 'wpsg'), $oCustomer->getTitle(), $oCustomer->getName()); ?>
+
+
 <?php echo __('Sie haben eine neues Passwort angefragt.', 'wpsg'); ?> 
  
Index: /views/mods/mod_kundenverwaltung/mail_pwdrequest_html.phtml
===================================================================
--- /views/mods/mod_kundenverwaltung/mail_pwdrequest_html.phtml	(revision 7828)
+++ /views/mods/mod_kundenverwaltung/mail_pwdrequest_html.phtml	(revision 7829)
@@ -5,6 +5,9 @@
 	 */
 
+	/** @var $oCustomer wpsg_customer */
+	$oCustomer = $this->view['oCustomer'];
+
 ?>
-<p><?php echo wpsg_translate(__('Hallo #1# #2#,', 'wpsg'), $this->view['kunde']['vname'], $this->view['kunde']['name']); ?></p>  
+<p><?php echo wpsg_translate(__('Hallo #1# #2#,', 'wpsg'), $oCustomer->getTitle(), $oCustomer->getName()); ?></p>
  
 <p><?php echo __('Sie haben eine neues Passwort angefragt.', 'wpsg'); ?></p> 
Index: /views/mods/mod_kundenverwaltung/mail_pwdsend.phtml
===================================================================
--- /views/mods/mod_kundenverwaltung/mail_pwdsend.phtml	(revision 7828)
+++ /views/mods/mod_kundenverwaltung/mail_pwdsend.phtml	(revision 7829)
@@ -5,8 +5,8 @@
 	 */
 
-    $arPflicht = $this->loadPflichtFeldDaten();
-    $arTitle = explode('|', $arPflicht['anrede_auswahl']);
+	/** @var $oCustomer wpsg_customer */
+	$oCustomer = $this->view['oCustomer'];
 
-?><?php echo wpsg_translate(__('Hallo #1# #2# #3#,', 'wpsg'), @$arTitle[$this->view['basket']['checkout']['title']], $this->view['basket']['checkout']['vname'], $this->view['basket']['checkout']['name']); ?>
+?><?php echo wpsg_translate(__('Hallo #1# #2#,', 'wpsg'), $oCustomer->getTitle(), $oCustomer->getName()); ?>
  
  
Index: /views/mods/mod_kundenverwaltung/mail_pwdsend_html.phtml
===================================================================
--- /views/mods/mod_kundenverwaltung/mail_pwdsend_html.phtml	(revision 7828)
+++ /views/mods/mod_kundenverwaltung/mail_pwdsend_html.phtml	(revision 7829)
@@ -5,5 +5,8 @@
 	 */
 
-?><p><?php echo wpsg_translate(__('Hallo #1# #2#,', 'wpsg'), $this->view['kunde']['vname'], $this->view['kunde']['name']); ?></p>  
+	/** @var $oCustomer wpsg_customer */
+	$oCustomer = $this->view['oCustomer'];
+
+?><p><?php echo wpsg_translate(__('Hallo #1# #2#,', 'wpsg'), $oCustomer->getTitle(), $oCustomer->getName()); ?></p>
  
 <p><?php echo __('Sie haben eine neues Passwort angefragt.', 'wpsg'); ?></p>