Index: /controller/wpsg_BasketController.class.php
===================================================================
--- /controller/wpsg_BasketController.class.php	(revision 6871)
+++ /controller/wpsg_BasketController.class.php	(revision 6872)
@@ -229,4 +229,6 @@
 			
 			$this->shop->view['basket'] = $this->shop->basket->toArray();
+			$this->shop->view['basket']['checkout']['geb'] = wpsg_fromDate($this->shop->view['basket']['checkout']['geb'], true);
+			
 			$this->shop->view['laender'] = $this->db->fetchAssoc("SELECT * FROM `".WPSG_TBL_LAND."` ORDER BY `name` ASC");			
 			
Index: /controller/wpsg_ShopController.class.php
===================================================================
--- /controller/wpsg_ShopController.class.php	(revision 6871)
+++ /controller/wpsg_ShopController.class.php	(revision 6872)
@@ -3783,4 +3783,23 @@
 			$arPflicht = $this->get_option('wpsg_admin_pflicht');
 
+			if (!wpsg_isSizedArray($arPflicht)) {
+				$arPflicht = array();
+				$arPflicht['anrede'] = '1';
+				$arPflicht['anrede_auswahl'] = 'Herr|Frau';
+				$arPflicht['firma'] = '1';
+				$arPflicht['vname'] = '1';
+				$arPflicht['name'] = '1';
+				$arPflicht['geb'] = '1';
+				$arPflicht['email'] = '1';
+				$arPflicht['emailconfirm'] = '1';
+				$arPflicht['tel'] = '1';
+				$arPflicht['fax'] = '1';
+				$arPflicht['strasse'] = '1';
+				$arPflicht['plz'] = '1';
+				$arPflicht['ort'] = '1';
+				$arPflicht['land'] = '1';
+				$arPflicht['ustidnr'] = '1';
+				
+			}
 			// Mann|Frau usw. ÃŒbersetzen
 			$arPflicht['anrede_auswahl'] = __($arPflicht['anrede_auswahl'], 'wpsg');
Index: /lib/wpsg_basket.class.php
===================================================================
--- /lib/wpsg_basket.class.php	(revision 6871)
+++ /lib/wpsg_basket.class.php	(revision 6872)
@@ -1150,5 +1150,5 @@
 
 				// Anrede ÃŒberprÃŒfen
-				if ($custom_config['anrede'] != '1' && $this->arCheckout['title'] == '-1')
+				if ($custom_config['anrede'] != '2' && $custom_config['anrede'] != '1' && $this->arCheckout['title'] == '-1')
 				{
 
@@ -1160,5 +1160,5 @@
 
 				// Firma
-				if ($custom_config['firma'] != '1' && trim($this->arCheckout['firma']) == '')
+				if ($custom_config['firma'] != '2' && $custom_config['firma'] != '1' && trim($this->arCheckout['firma']) == '')
 				{
 
@@ -1170,5 +1170,5 @@
 
 				// Vorname
-				if ($custom_config['vname'] != '1' && trim(wpsg_getStr($this->arCheckout['vname'])) == '')
+				if ($custom_config['vname'] != '2' && $custom_config['vname'] != '1' && trim(wpsg_getStr($this->arCheckout['vname'])) == '')
 				{
 
@@ -1180,5 +1180,5 @@
 
 				// Name
-				if ($custom_config['name'] != '1' && trim(wpsg_getStr($this->arCheckout['name'])) == '')
+				if ($custom_config['name'] != '2' && $custom_config['name'] != '1' && trim(wpsg_getStr($this->arCheckout['name'])) == '')
 				{
 
@@ -1191,5 +1191,5 @@
 				// Geburtsdatum
 				if (
-						($custom_config['geb'] != '1' && !wpsg_isValidGeb($this->arCheckout['geb'])) ||
+						($custom_config['geb'] != '2' && $custom_config['geb'] != '1' && !wpsg_isValidGeb($this->arCheckout['geb'])) ||
 						(wpsg_isSizedString($this->arCheckout['geb']) && !wpsg_isValidGeb($this->arCheckout['geb']))
 
@@ -1205,5 +1205,5 @@
 				// E-Mail Adresse
 				if (
-						($custom_config['email'] != '1' && !wpsg_isValidEMail($this->arCheckout['email'])) ||
+						($custom_config['email'] != '2' && $custom_config['email'] != '1' && !wpsg_isValidEMail($this->arCheckout['email'])) ||
 						(wpsg_isSizedString($this->arCheckout['email']) && !wpsg_isValidEMail($this->arCheckout['email']))
 					)
@@ -1235,5 +1235,5 @@
 
 				// Telefonnummer validieren
-				if ($custom_config['tel'] != '1' && $this->arCheckout['tel'] == '')
+				if ($custom_config['tel'] != '2' && $custom_config['tel'] != '1' && $this->arCheckout['tel'] == '')
 				{
 
@@ -1245,5 +1245,5 @@
 
 				// Straße prÃŒfen
-				if ($custom_config['strasse'] != '1' && wpsg_getStr($this->arCheckout['strasse']) == '')
+				if ($custom_config['strasse'] != '2' && $custom_config['strasse'] != '1' && wpsg_getStr($this->arCheckout['strasse']) == '')
 				{
 
@@ -1255,5 +1255,5 @@
 
 				// Fax prÃŒfen
-				if ($custom_config['fax'] != '1' && $this->arCheckout['fax'] == '')
+				if ($custom_config['fax'] != '2' && $custom_config['fax'] != '1' && $this->arCheckout['fax'] == '')
 				{
 
@@ -1265,5 +1265,5 @@
 
 				// PLZ ÃŒberprÃŒfen
-				if ($custom_config['plz'] != '1' && wpsg_getStr($this->arCheckout['plz']) == '')
+				if ($custom_config['plz'] != '2' && $custom_config['plz'] != '1' && wpsg_getStr($this->arCheckout['plz']) == '')
 				{
 
@@ -1275,5 +1275,5 @@
 
 				// Ort ÃŒberprÃŒfen
-				if ($custom_config['ort'] != '1' && wpsg_getStr($this->arCheckout['ort']) == '')
+				if ($custom_config['ort'] != '2' && $custom_config['ort'] != '1' && wpsg_getStr($this->arCheckout['ort']) == '')
 				{
 
@@ -1285,5 +1285,5 @@
 
 				// Land ÃŒberprÃŒfen
-				if ($custom_config['land'] != '1' && $this->arCheckout['land'] <= 0)
+				if ($custom_config['land'] != '2' && $custom_config['land'] != '1' && $this->arCheckout['land'] <= 0)
 				{
 
@@ -1295,5 +1295,5 @@
 
 				// UStIdNr prÃŒfen
-				if ($custom_config['ustidnr'] != '1' && !preg_match("/^[a-zA-Z]+\d+/", $this->arCheckout['ustidnr']))
+				if ($custom_config['ustidnr'] != '2' && $custom_config['ustidnr'] != '1' && !preg_match("/^[a-zA-Z]+\d+/", $this->arCheckout['ustidnr']))
 				{
 
Index: /mods/wpsg_mod_shippingadress.class.php
===================================================================
--- /mods/wpsg_mod_shippingadress.class.php	(revision 6871)
+++ /mods/wpsg_mod_shippingadress.class.php	(revision 6872)
@@ -106,12 +106,12 @@
 			{
 
-				$data['shipping_title'] 	= wpsg_q($checkout['shipping_title']);
-				$data['shipping_vname'] 	= wpsg_q($checkout['shipping_vname']);
-				$data['shipping_name'] 		= wpsg_q($checkout['shipping_name']);
-				$data['shipping_strasse'] 	= wpsg_q($checkout['shipping_strasse']); 
-				$data['shipping_plz'] 		= wpsg_q($checkout['shipping_plz']);
-				$data['shipping_ort'] 		= wpsg_q($checkout['shipping_ort']);
-				$data['shipping_firma'] 	= wpsg_q($checkout['shipping_firma']);
-				$data['shipping_land'] 		= wpsg_q($checkout['shipping_land']);
+				$data['shipping_title'] 	= wpsg_q(wpsg_getStr($checkout['shipping_title']));
+				$data['shipping_vname'] 	= wpsg_q(wpsg_getStr($checkout['shipping_vname']));
+				$data['shipping_name'] 		= wpsg_q(wpsg_getStr($checkout['shipping_name']));
+				$data['shipping_strasse'] 	= wpsg_q(wpsg_getStr($checkout['shipping_strasse'])); 
+				$data['shipping_plz'] 		= wpsg_q(wpsg_getStr($checkout['shipping_plz']));
+				$data['shipping_ort'] 		= wpsg_q(wpsg_getStr($checkout['shipping_ort']));
+				$data['shipping_firma'] 	= wpsg_q(wpsg_getStr($checkout['shipping_firma']));
+				$data['shipping_land'] 		= wpsg_q(wpsg_getStr($checkout['shipping_land']));
 				 
 			}
@@ -119,12 +119,12 @@
 			{
 				
-				$data['shipping_title']		= wpsg_q($checkout['title']);
-				$data['shipping_vname'] 	= wpsg_q($checkout['vname']);
-				$data['shipping_name'] 		= wpsg_q($checkout['name']);
-				$data['shipping_strasse'] 	= wpsg_q($checkout['strasse']); 
-				$data['shipping_plz'] 		= wpsg_q($checkout['plz']);
-				$data['shipping_ort'] 		= wpsg_q($checkout['ort']);
-				$data['shipping_firma'] 	= wpsg_q($checkout['firma']);
-				$data['shipping_land'] 		= wpsg_q($checkout['land']);				
+				$data['shipping_title']		= wpsg_q(wpsg_getStr($checkout['title']));
+				$data['shipping_vname'] 	= wpsg_q(wpsg_getStr($checkout['vname']));
+				$data['shipping_name'] 		= wpsg_q(wpsg_getStr($checkout['name']));
+				$data['shipping_strasse'] 	= wpsg_q(wpsg_getStr($checkout['strasse'])); 
+				$data['shipping_plz'] 		= wpsg_q(wpsg_getStr($checkout['plz']));
+				$data['shipping_ort'] 		= wpsg_q(wpsg_getStr($checkout['ort']));
+				$data['shipping_firma'] 	= wpsg_q(wpsg_getStr($checkout['firma']));
+				$data['shipping_land'] 		= wpsg_q(wpsg_getStr($checkout['land']));				
 				
 			}
@@ -144,18 +144,18 @@
 					
 					$arCheckout['diff_shippingadress'] = 1;
-					if ($pflicht['anrede'] != '1' && $this->arCheckout['title'] == '-1')
-						($arCheckout['shipping_title'] == '')?$_SESSION['wpsg']['errorFields'][] = 'shipping_title':'';
-					if ($pflicht['plz'] != '1')
-						($arCheckout['shipping_plz'] == '')?$_SESSION['wpsg']['errorFields'][] = 'shipping_plz':'';
-					if ($pflicht['vname'] != '1')
-						($arCheckout['shipping_vname'] == '')?$_SESSION['wpsg']['errorFields'][] = 'shipping_vname':'';
-					if ($pflicht['name'] != '1')
-						($arCheckout['shipping_name'] == '')?$_SESSION['wpsg']['errorFields'][] = 'shipping_name':'';
-					if ($pflicht['strasse'] != '1')
-						($arCheckout['shipping_strasse'] == '')?$_SESSION['wpsg']['errorFields'][] = 'shipping_strasse':'';
-					if ($pflicht['ort'] != '1')
-						($arCheckout['shipping_ort'] == '')?$_SESSION['wpsg']['errorFields'][] = 'shipping_ort':'';
-					if ($pflicht['land'] != '1')
-						(!wpsg_isSizedInt($arCheckout['shipping_land']))?$_SESSION['wpsg']['errorFields'][] = 'shipping_land':'';
+					if (($pflicht['anrede'] != '2') && ($pflicht['anrede'] != '1') && ($arCheckout['shipping_title'] == '-1'))
+						$_SESSION['wpsg']['errorFields'][] = 'shipping_title';
+					if (($pflicht['plz'] != '2') && ($pflicht['plz'] != '1') && ($arCheckout['shipping_plz'] == ''))
+						$_SESSION['wpsg']['errorFields'][] = 'shipping_plz';
+					if (($pflicht['vname'] != '2') && ($pflicht['vname'] != '1') && ($arCheckout['shipping_vname'] == ''))
+						$_SESSION['wpsg']['errorFields'][] = 'shipping_vname';
+					if (($pflicht['name'] != '2') && ($pflicht['name'] != '1') && ($arCheckout['shipping_name'] == ''))
+						$_SESSION['wpsg']['errorFields'][] = 'shipping_name';
+					if (($pflicht['strasse'] != '2') && ($pflicht['strasse'] != '1') && ($arCheckout['shipping_strasse'] == ''))
+						$_SESSION['wpsg']['errorFields'][] = 'shipping_strasse';
+					if (($pflicht['ort'] != '2') && ($pflicht['ort'] != '1') && ($arCheckout['shipping_ort'] == ''))
+						$_SESSION['wpsg']['errorFields'][] = 'shipping_ort';
+					if (($pflicht['land'] != '2') && ($pflicht['land'] != '1') && (!wpsg_isSizedInt($arCheckout['shipping_land'])))
+						$_SESSION['wpsg']['errorFields'][] = 'shipping_land';
 					
 					if (count($_SESSION['wpsg']['errorFields']) > 0)
Index: /views/mods/mod_onepagecheckout/onepage.phtml
===================================================================
--- /views/mods/mod_onepagecheckout/onepage.phtml	(revision 6871)
+++ /views/mods/mod_onepagecheckout/onepage.phtml	(revision 6872)
@@ -117,4 +117,5 @@
 			<div class="wpsg_inner">
 		
+				<?php if ($this->view['pflicht']['firma'] != '2') { ?>
 				<div class="wpsg_checkoutblock">
 					<label for="wpsg_firma"><?php echo __("Firma", "wpsg"); ?>
@@ -123,5 +124,7 @@
 					<input class="<?php echo (($this->view['pflicht']['firma'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("firma", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="wpsg_firma" name="wpsg[checkout][firma]" value="<?php echo htmlspecialchars($this->view['basket']['checkout']['firma']); ?>" />
 				</div>
-			
+				<?php } ?>
+			
+				<?php if ($this->view['pflicht']['anrede'] != '2') { ?>
 				<div class="wpsg_checkoutblock">
 					<label for="wpsg_title"><?php echo __('Anrede', 'wpsg'); ?>
@@ -134,5 +137,7 @@
 					</select>
 				</div>
-			
+				<?php } ?>
+			
+				<?php if ($this->view['pflicht']['vname'] != '2') { ?>
 				<div class="wpsg_checkoutblock">
 					<label for="vname" class="wpsg_checkout"><?php echo __("Vorname", "wpsg"); ?> 
@@ -141,5 +146,7 @@
 					<input class="<?php echo (($this->view['pflicht']['vname'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("vname", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="vname" name="wpsg[checkout][vname]" value="<?php echo htmlspecialchars($this->view['basket']['checkout']['vname']); ?>" />		
 				</div>
-				
+				<?php } ?>
+				
+				<?php if ($this->view['pflicht']['name'] != '2') { ?>
 				<div class="wpsg_checkoutblock">
 					<label for="name" class="wpsg_checkout"><?php echo __("Name", "wpsg"); ?>
@@ -148,5 +155,7 @@
 					<input class="<?php echo (($this->view['pflicht']['name'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("name", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="name" name="wpsg[checkout][name]" value="<?php echo htmlspecialchars($this->view['basket']['checkout']['name']); ?>" />
 				</div>
-				
+				<?php } ?>
+				
+				<?php if ($this->view['pflicht']['email'] != '2') { ?>
 				<div class="wpsg_checkoutblock">
 					<label for="email" class="wpsg_checkout"><?php echo __("E-Mail Adresse", "wpsg"); ?> 
@@ -155,4 +164,5 @@
 					<input class="wpsg_input_text <?php echo (($this->view['pflicht']['email'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("email", (array)$this->view['error']))?'wpsg_error':''); ?>" type="email" id="email" name="wpsg[checkout][email]" value="<?php echo htmlspecialchars($this->view['basket']['checkout']['email']); ?>" />
 				</div>
+				<?php } ?>
 				
 				<?php if (isset($this->view['pflicht']['emailconfirm']) && $this->view['pflicht']['emailconfirm'] == '1') { ?>
@@ -165,4 +175,5 @@
 				<?php } ?>
 				
+				<?php if ($this->view['pflicht']['geb'] != '2') { ?>
 				<div class="wpsg_checkoutblock">
 					<label for="geb" class="wpsg_checkout"><?php echo __('Geburtsdatum (Format: TT.MM.JJJJ)',"wpsg"); ?>
@@ -171,5 +182,7 @@
 					<input class="wpsg_input_text <?php echo (($this->view['pflicht']['geb'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("geb", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="geb" name="wpsg[checkout][geb]" value="<?php echo htmlspecialchars($this->view['basket']['checkout']['geb']); ?>" />
 				</div>
+				<?php } ?>
 						
+				<?php if ($this->view['pflicht']['fax'] != '2') { ?>
 				<div class="wpsg_checkoutblock">
 					<label for="fax" class="wpsg_checkout"><?php echo __("Fax.", "wpsg"); ?>
@@ -178,5 +191,7 @@
 					<input class="wpsg_input_text <?php echo (($this->view['pflicht']['fax'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("fax", (array)$this->view['error']))?'wpsg_error':''); ?>" type="tel" id="fax" name="wpsg[checkout][fax]" value="<?php echo htmlspecialchars($this->view['basket']['checkout']['fax']); ?>" />
 				</div>
-				
+				<?php } ?>
+				
+				<?php if ($this->view['pflicht']['tel'] != '2') { ?>
 				<div class="wpsg_checkoutblock">
 					<label for="tel" class="wpsg_checkout"><?php echo __("Tel.", "wpsg"); ?>
@@ -185,5 +200,7 @@
 					<input class="wpsg_input_text <?php echo (($this->view['pflicht']['tel'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("tel", (array)$this->view['error']))?'wpsg_error':''); ?>" type="tel" id="tel" name="wpsg[checkout][tel]" value="<?php echo htmlspecialchars($this->view['basket']['checkout']['tel']); ?>" />
 				</div>
-			
+				<?php } ?>
+			
+				<?php if ($this->view['pflicht']['strasse'] != '2') { ?>
 				<div class="wpsg_checkoutblock">
 					<label for="strasse" class="wpsg_checkout"><?php echo __("Straße Nr.", "wpsg"); ?> 
@@ -192,5 +209,7 @@
 					<input class="<?php echo (($this->view['pflicht']['strasse'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("strasse", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="strasse" name="wpsg[checkout][strasse]" value="<?php echo htmlspecialchars($this->view['basket']['checkout']['strasse']); ?>" />		
 				</div>
-			
+				<?php } ?>
+			
+				<?php if ($this->view['pflicht']['plz'] != '2') { ?>
 				<div class="wpsg_checkoutblock">
 					<label for="plz" class="wpsg_checkout"><?php echo __("Postleitzahl", "wpsg"); ?> 
@@ -199,5 +218,7 @@
 					<input class="wpsg_input_text <?php echo (($this->view['pflicht']['plz'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("plz", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="plz" name="wpsg[checkout][plz]" value="<?php echo htmlspecialchars($this->view['basket']['checkout']['plz']); ?>" />
 				</div>
-				
+				<?php } ?>
+				
+				<?php if ($this->view['pflicht']['ort'] != '2') { ?>
 				<div class="wpsg_checkoutblock">
 					<label for="ort" class="wpshopgermany_checkout"><?php echo __("Ort", "wpsg"); ?> 
@@ -206,4 +227,5 @@
 					<input class="<?php echo (($this->view['pflicht']['ort'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("ort", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="ort" name="wpsg[checkout][ort]" value="<?php echo htmlspecialchars($this->view['basket']['checkout']['ort']); ?>" />
 				</div>
+				<?php } ?>
 				
 				<?php
@@ -214,4 +236,5 @@
 				?>
 				
+				<?php if ($this->view['pflicht']['land'] != '2') { ?>
 				<div class="wpsg_checkoutblock" <?php echo $lhidden;?>>
 					<label for="wpsg_land" class="wpsg_checkout"><?php echo __("Land", "wpsg"); ?> 
@@ -225,5 +248,7 @@
 					</select>
 				</div>
-				
+				<?php } ?>
+				
+				<?php if ($this->view['pflicht']['ustidnr'] != '2') { ?>
 				<div class="wpsg_checkoutblock">
 					<label for="wpsg_ustidnr" class="wpshopgermany_checkout"><?php echo __("UStIdNr.", "wpsg"); ?> 
@@ -232,4 +257,5 @@
 					<input class="<?php echo (($this->view['pflicht']['ustidnr'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("ustidnr", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="wpsg_ustidnr" name="wpsg[checkout][ustidnr]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['basket']['checkout']['ustidnr'])); ?>" />
 				</div>
+				<?php } ?>
 				
 				<?php /* Automatische Einbindung der benutzerdefinierten Felder */ ?>
Index: /views/mods/mod_shippingadress/checkout_inner_prebutton.phtml
===================================================================
--- /views/mods/mod_shippingadress/checkout_inner_prebutton.phtml	(revision 6871)
+++ /views/mods/mod_shippingadress/checkout_inner_prebutton.phtml	(revision 6872)
@@ -18,4 +18,5 @@
 		<div class="checkout_shippingadress" style="display:none;"> 
 		
+			<?php if ($this->view['pflicht']['firma'] != '2') { ?>
 			<div class="wpsg_checkoutblock">
 				<label for="firma" class="wpsg_checkout"><?php echo __("Firma:", "wpsg"); ?>
@@ -24,5 +25,7 @@
 				<input class="<?php echo (($this->view['pflicht']['firma'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("name", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="shipping_name" name="wpsg[checkout][shipping_firma]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['basket']['checkout']['shipping_firma'])); ?>" />
 			</div>
+			<?php } ?>
 		
+			<?php if ($this->view['pflicht']['anrede'] != '2') { ?>
 			<div class="wpsg_checkoutblock">
 				<label for="title" class="wpsg_checkout"><?php echo __("Anrede:", "wpsg"); ?>
@@ -36,5 +39,7 @@
 				</select>
 			</div>
+			<?php } ?>
 			
+			<?php if ($this->view['pflicht']['vname'] != '2') { ?>
 			<div class="wpsg_checkoutblock">
 				<label for="vname" class="wpsg_checkout"><?php echo __("Vorname:", "wpsg"); ?>
@@ -43,5 +48,7 @@
 				<input class="<?php echo (($this->view['pflicht']['vname'] != '1')?'validate[required_shipping]':''); ?> wpsg_checkout <?php echo ((in_array("shipping_vname", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="shipping_vname" name="wpsg[checkout][shipping_vname]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['basket']['checkout']['shipping_vname'])); ?>" />
 			</div>
+			<?php } ?>
 				
+			<?php if ($this->view['pflicht']['name'] != '2') { ?>
 			<div class="wpsg_checkoutblock">
 				<label for="name" class="wpsg_checkout"><?php echo __("Name:", "wpsg"); ?>
@@ -50,5 +57,7 @@
 				<input class="<?php echo (($this->view['pflicht']['name'] != '1')?'validate[required_shipping]':''); ?> wpsg_checkout <?php echo ((in_array("shipping_name", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="shipping_name" name="wpsg[checkout][shipping_name]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['basket']['checkout']['shipping_name'])); ?>" />
 			</div>
+			<?php } ?>
 				
+			<?php if ($this->view['pflicht']['strasse'] != '2') { ?>
 			<div class="wpsg_checkoutblock">
 				<label for="strasse" class="wpsg_checkout"><?php echo __("Straße, Nr.:", "wpsg"); ?>
@@ -57,5 +66,7 @@
 				<input class="<?php echo (($this->view['pflicht']['strasse'] != '1')?'validate[required_shipping]':''); ?> wpsg_checkout <?php echo ((in_array("shipping_strasse", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="shipping_strasse" name="wpsg[checkout][shipping_strasse]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['basket']['checkout']['shipping_strasse'])); ?>" />		
 			</div>
+			<?php } ?>
 			
+			<?php if ($this->view['pflicht']['plz'] != '2') { ?>
 			<div class="wpsg_checkoutblock">
 				<label for="plz" class="wpsg_checkout"><?php echo __("Postleitzahl:", "wpsg"); ?> 
@@ -64,5 +75,7 @@
 				<input class="<?php echo (($this->view['pflicht']['plz'] != '1')?'validate[required_shipping]':''); ?> wpsg_checkout <?php echo ((in_array("shipping_plz", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="shipping_plz" name="wpsg[checkout][shipping_plz]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['basket']['checkout']['shipping_plz'])); ?>" />
 			</div>
+			<?php } ?>
 				
+			<?php if ($this->view['pflicht']['ort'] != '2') { ?>
 			<div class="wpsg_checkoutblock">
 				<label for="ort" class="wpshopgermany_checkout"><?php echo __("Ort:", "wpsg"); ?> 
@@ -71,5 +84,7 @@
 				<input class="<?php echo (($this->view['pflicht']['ort'] != '1')?'validate[required_shipping]':''); ?> wpsg_checkout <?php echo ((in_array("shipping_ort", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="shipping_ort" name="wpsg[checkout][shipping_ort]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['basket']['checkout']['shipping_ort'])); ?>" />
 			</div>
+			<?php } ?>
 				
+			<?php if ($this->view['pflicht']['land'] != '2') { ?>
 			<div class="wpsg_checkoutblock">
 				<label for="shipping_land" class="wpsg_checkout"><?php echo __("Land:", "wpsg"); ?>
@@ -83,4 +98,5 @@
 				</select>
 			</div>
+			<?php } ?>
 		 
 			<script type="text/javascript">/* <![CDATA[ */
Index: /views/warenkorb/checkout.phtml
===================================================================
--- /views/warenkorb/checkout.phtml	(revision 6871)
+++ /views/warenkorb/checkout.phtml	(revision 6872)
@@ -71,5 +71,5 @@
 	<form id="form-step2" method="post" action="<?php echo $this->getURL(wpsg_ShopController::URL_BASKET); ?>" enctype="multipart/form-data">
 
-		<?php /* Einbindung des Logins im Checokut */ ?>	
+		<?php /* Einbindung des Logins im Checkout */ ?>	
 		<?php $this->callMod('wpsg_mod_kundenverwaltung', 'checkout_login'); ?>
 	
@@ -87,4 +87,5 @@
 			<div class="wpsg_inner">
 		
+				<?php if ($this->view['pflicht']['firma'] != '2') { ?>
 				<div class="wpsg_checkoutblock" id="wpsg_firma">
 					<label for="wpsg_firma"><?php echo __("Firma:", "wpsg"); ?>
@@ -93,5 +94,7 @@
 					<input class="<?php echo (($this->view['pflicht']['firma'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("firma", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="wpsg_firma" name="wpsg[checkout][firma]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['basket']['checkout']['firma'])); ?>" />
 				</div>
-			
+				<?php } ?>
+			
+				<?php if ($this->view['pflicht']['anrede'] != '2') { ?>
 				<div class="wpsg_checkoutblock" id="wpsg_anrede">
 					<label for="wpsg_title"><?php echo __('Anrede:', 'wpsg'); ?>
@@ -104,5 +107,7 @@
 					</select>
 				</div>
-			
+				<?php } ?>
+			
+				<?php if ($this->view['pflicht']['vname'] != '2') { ?>
 				<div class="wpsg_checkoutblock" id="wpsg_vorname">
 					<label for="vname" class="wpsg_checkout"><?php echo __("Vorname:", "wpsg"); ?> 
@@ -111,5 +116,7 @@
 					<input class="<?php echo (($this->view['pflicht']['vname'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("vname", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="vname" name="wpsg[checkout][vname]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['basket']['checkout']['vname'])); ?>" />		
 				</div>
-				
+				<?php } ?>
+				
+				<?php if ($this->view['pflicht']['name'] != '2') { ?>
 				<div class="wpsg_checkoutblock" id="wpsg_name">
 					<label for="name" class="wpsg_checkout"><?php echo __("Name:", "wpsg"); ?>
@@ -118,5 +125,7 @@
 					<input class="<?php echo (($this->view['pflicht']['name'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("name", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="name" name="wpsg[checkout][name]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['basket']['checkout']['name'])); ?>" />
 				</div>
-				
+				<?php } ?>
+				
+				<?php if ($this->view['pflicht']['email'] != '2') { ?>
 				<div class="wpsg_checkoutblock" id="wpsg_email">
 					<label for="email" class="wpsg_checkout"><?php echo __("E-Mail Adresse:", "wpsg"); ?> 
@@ -125,5 +134,7 @@
 					<input class="wpsg_input_text <?php echo (($this->view['pflicht']['email'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("email", (array)$this->view['error']))?'wpsg_error':''); ?>" type="email" id="email" name="wpsg[checkout][email]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['basket']['checkout']['email'])); ?>" />
 				</div>
-				
+				<?php } ?>
+				
+				<?php if ($this->view['pflicht']['email'] != '2') { ?>
 				<?php if (isset($this->view['pflicht']['emailconfirm']) && $this->view['pflicht']['emailconfirm'] == '1') { ?>
 				<div class="wpsg_checkoutblock" id="wpsg_email2">
@@ -134,5 +145,7 @@
 				</div>
 				<?php } ?>
-				
+				<?php } ?>
+				
+				<?php if ($this->view['pflicht']['geb'] != '2') { ?>
 				<div class="wpsg_checkoutblock" id="wpsg_geburtsdatum">
 					<label for="geb" class="wpsg_checkout"><?php echo __('Geburtsdatum (Format: TT.MM.JJJJ):',"wpsg"); ?>
@@ -141,5 +154,7 @@
 					<input class="wpsg_input_text <?php echo (($this->view['pflicht']['geb'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("geb", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="geb" name="wpsg[checkout][geb]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['basket']['checkout']['geb'])); ?>" />
 				</div>
+				<?php } ?>
 						
+				<?php if ($this->view['pflicht']['fax'] != '2') { ?>
 				<div class="wpsg_checkoutblock" id="wpsg_fax">
 					<label for="fax" class="wpsg_checkout"><?php echo __("Fax.:", "wpsg"); ?>
@@ -148,5 +163,7 @@
 					<input class="wpsg_input_text <?php echo (($this->view['pflicht']['fax'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("fax", (array)$this->view['error']))?'wpsg_error':''); ?>" type="tel" id="fax" name="wpsg[checkout][fax]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['basket']['checkout']['fax'])); ?>" />
 				</div>
-				
+				<?php } ?>
+				
+				<?php if ($this->view['pflicht']['tel'] != '2') { ?>
 				<div class="wpsg_checkoutblock" id="wpsg_telefon">
 					<label for="tel" class="wpsg_checkout"><?php echo __("Tel.:", "wpsg"); ?>
@@ -155,5 +172,7 @@
 					<input class="wpsg_input_text <?php echo (($this->view['pflicht']['tel'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("tel", (array)$this->view['error']))?'wpsg_error':''); ?>" type="tel" id="tel" name="wpsg[checkout][tel]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['basket']['checkout']['tel'])); ?>" />
 				</div>
-			
+				<?php } ?>
+			
+				<?php if ($this->view['pflicht']['strasse'] != '2') { ?>
 				<div class="wpsg_checkoutblock" id="wpsg_strasse">
 					<label for="strasse" class="wpsg_checkout"><?php echo __("Straße, Nr.:", "wpsg"); ?> 
@@ -162,5 +181,7 @@
 					<input class="<?php echo (($this->view['pflicht']['strasse'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("strasse", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="strasse" name="wpsg[checkout][strasse]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['basket']['checkout']['strasse'])); ?>" />		
 				</div>
-			
+				<?php } ?>
+			
+				<?php if ($this->view['pflicht']['plz'] != '2') { ?>
 				<div class="wpsg_checkoutblock" id="wpsg_postleitzahl">
 					<label for="plz" class="wpsg_checkout"><?php echo __("Postleitzahl:", "wpsg"); ?> 
@@ -169,5 +190,7 @@
 					<input class="wpsg_input_text <?php echo (($this->view['pflicht']['plz'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("plz", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="plz" name="wpsg[checkout][plz]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['basket']['checkout']['plz'])); ?>" />
 				</div>
-				
+				<?php } ?>
+				
+				<?php if ($this->view['pflicht']['ort'] != '2') { ?>
 				<div class="wpsg_checkoutblock" id="wpsg_ort">
 					<label for="ort" class="wpsg_checkout"><?php echo __("Ort:", "wpsg"); ?> 
@@ -176,5 +199,7 @@
 					<input class="<?php echo (($this->view['pflicht']['ort'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("ort", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="ort" name="wpsg[checkout][ort]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['basket']['checkout']['ort'])); ?>" />
 				</div>
-				
+				<?php } ?>
+				
+				<?php if ($this->view['pflicht']['land'] != '2') { ?>
 				<div class="wpsg_checkoutblock" id="wpsg_land">
 					<label for="wpsg_land" class="wpsg_checkout"><?php echo __("Land:", "wpsg"); ?> 
@@ -188,5 +213,7 @@
 					</select>
 				</div>
-				
+				<?php } ?>
+				
+				<?php if ($this->view['pflicht']['ustidnr'] != '2') { ?>
 				<div class="wpsg_checkoutblock" id="wpsg_ustidnr">
 					<label for="wpsg_ustidnr" class="wpshopgermany_checkout"><?php echo __("UStIdNr.:", "wpsg"); ?> 
@@ -195,4 +222,5 @@
 					<input class="<?php echo (($this->view['pflicht']['ustidnr'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("ustidnr", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="wpsg_ustidnr" name="wpsg[checkout][ustidnr]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['basket']['checkout']['ustidnr'])); ?>" />
 				</div>
+				<?php } ?>
 				
 				<?php /* Automatische Einbindung der benutzerdefinierten Felder */ ?>
@@ -209,5 +237,5 @@
                         <option value="-1"><?php echo __('Bitte auswÀhlen', 'wpsg'); ?></option>
                         <?php foreach ((array)$arAuswahl as $a) { ?>
-                        <option value="<?php echo wpsg_hspc($a); ?>" <?php echo (($a == $this->view['basket']['checkout']['custom'][$c_id])?'selected="selected"':''); ?>><?php echo wpsg_hspc($a); ?></option>
+                        <option value="<?php echo wpsg_hspc($a); ?>" <?php echo (($a == @$this->view['basket']['checkout']['custom'][$c_id])?'selected="selected"':''); ?>><?php echo wpsg_hspc($a); ?></option>
                         <?php } ?>
                     </select>