Index: /controller/wpsg_BasketController.class.php
===================================================================
--- /controller/wpsg_BasketController.class.php	(revision 6301)
+++ /controller/wpsg_BasketController.class.php	(revision 6303)
@@ -230,5 +230,7 @@
 			$this->shop->view['basket'] = $this->shop->basket->toArray();
 			$this->shop->view['laender'] = $this->db->fetchAssoc("SELECT * FROM `".WPSG_TBL_LAND."` ORDER BY `name` ASC");			
-			 
+			
+			$this->shop->view['arAnrede']= explode('|', $this->shop->get_option('wpsg_admin_pflicht')['anrede_auswahl']);
+			
 			$content = $this->shop->render(WPSG_PATH_VIEW.'/warenkorb/checkout.phtml', false);
 						
Index: /mods/wpsg_mod_voucherproduct.class.php
===================================================================
--- /mods/wpsg_mod_voucherproduct.class.php	(revision 6301)
+++ /mods/wpsg_mod_voucherproduct.class.php	(revision 6303)
@@ -373,15 +373,18 @@
 				}
 				
+				$this->shop->view['basket'] = $this->shop->cache->loadBasketArray($_REQUEST['order_id']);
+				
 				$arGSFiles = array();
+				$i = 0;
 				foreach ($arGS as $gs)
 				{
 					
 					$arGSFiles[] = array(
-						'file' => $this->getFilePath($_REQUEST['order_id']).'voucher_'.$gs['code'].'.pdf',
+						'file' => $this->getFilePath($_REQUEST['order_id']).'gutschein_'.$gs['code'].'.pdf',
 						'code' => $gs['code'],
-						'product_id' => -1,
-						'product_data' => array()
+						'product_id' => $this->shop->view['basket']['produkte'][$i]['id'],
+						'product_data' => array('name' => $this->shop->view['basket']['produkte'][$i]['name'])
 					);
-					
+					$i++;
 				}
 								
@@ -390,5 +393,4 @@
 				$this->shop->view['order_id'] = $_REQUEST['order_id'];					
 				$this->shop->view['customer'] = $this->shop->cache->loadKunden($this->shop->view['order']['k_id']); 
-				$this->shop->view['basket'] = $this->shop->cache->loadBasketArray($_REQUEST['order_id']);
 				
 				$mail_text = $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_voucherproduct/gutschein_mail.phtml', false);
@@ -419,5 +421,5 @@
 					"o_id" => wpsg_q($_REQUEST['order_id']),
 					"title" => wpsg_translate(__("Gutscheinmail an: #1#", "wpsg"), $empfaenger),
-					"mailtext" => $nachricht
+					"mailtext" => $mail_text
 				));
 
@@ -434,5 +436,5 @@
 				if ($gs_data['id'] <= 0) die(__('Gutschein nicht gefunden!', 'wpsg'));
 				
-				$filename = $this->getFilePath($_REQUEST['order_id']).'voucher_'.$gs_data['code'].'.pdf';
+				$filename = $this->getFilePath($_REQUEST['order_id']).'gutschein_'.$gs_data['code'].'.pdf';
 				
 				if (!file_exists($filename)) die(__('Gutscheindokument nicht gefunden!', 'wpsg'));
@@ -441,4 +443,8 @@
 				header("Expires: Sat, 26 Jul 1997 05:00:00 GMT"); 
 				header('Content-type: application/pdf');
+				
+				$farr = pathinfo($filename);
+				$filename2 = $farr['basename'];
+				header('Content-Disposition: attachment; filename="'.$filename2.'"');
 				
 				die(file_get_contents($filename));
@@ -535,5 +541,5 @@
 			if ($gs_data['id'] <= 0) return false;
 			
-			if (file_exists($this->getFilePath($order_id).'voucher_'.$gs_data['code'].'.pdf')) return true;
+			if (file_exists($this->getFilePath($order_id).'gutschein_'.$gs_data['code'].'.pdf')) return true;
 						
 			return false;
@@ -604,5 +610,5 @@
 			
 			$this->shop->view['preview'] = $preview;
-			$this->shop->view['filename'] = $this->getFilePath($order_id).'voucher_'.$code.'.pdf';
+			$this->shop->view['filename'] = $this->getFilePath($order_id).'gutschein_'.$code.'.pdf';
 			
 			$this->shop->view['product_id'] = $product_id;
Index: /views/mods/mod_kundenverwaltung/checkout_logout.phtml
===================================================================
--- /views/mods/mod_kundenverwaltung/checkout_logout.phtml	(revision 6301)
+++ /views/mods/mod_kundenverwaltung/checkout_logout.phtml	(revision 6303)
@@ -9,5 +9,5 @@
 <div class="wpsg_checkout wpsg_logout_box">
 		<?php echo __('Hallo','wpsg');?>
-		<?php echo wpsg_hspc(($this->view['basket']['checkout']['title'] != '' && $this->view['basket']['checkout']['title'] != '-1')?$this->view['basket']['checkout']['title']:''); ?> <?php echo wpsg_hspc($this->view['basket']['checkout']['vname']); ?> <?php echo wpsg_hspc($this->view['basket']['checkout']['name']); ?>	
+		<?php echo wpsg_hspc(($this->view['basket']['checkout']['title'] != '' && $this->view['basket']['checkout']['title'] != '-1')?$this->view['arAnrede'][$this->view['basket']['checkout']['title']]:''); ?> <?php echo wpsg_hspc($this->view['basket']['checkout']['vname']); ?> <?php echo wpsg_hspc($this->view['basket']['checkout']['name']); ?>	
 		<a href="<?php echo $this->getUrl(wpsg_ShopController::URL_LOGOUT); ?>"><?php echo __('Abmelden', 'wpsg'); ?></a>