Index: /controller/wpsg_BasketController.class.php
===================================================================
--- /controller/wpsg_BasketController.class.php	(revision 5590)
+++ /controller/wpsg_BasketController.class.php	(revision 5593)
@@ -76,6 +76,6 @@
 
 			// Sollte es nur eine Versand/Zahlungsart geben, dann diese verwenden
-			if (sizeof($this->shop->arShipping) == 1) $_SESSION['wpsg']['checkout']['shipping'] = array_shift(array_keys($this->shop->arShipping));
-			if (sizeof($this->shop->arPayment) == 1) $_SESSION['wpsg']['checkout']['payment'] = array_shift(array_keys($this->shop->arPayment));
+			if (sizeof($this->shop->arShipping) == 1) $_SESSION['wpsg']['checkout']['shipping'] = array_keys($this->shop->arShipping)[0];
+			if (sizeof($this->shop->arPayment) == 1) $_SESSION['wpsg']['checkout']['payment'] = array_keys($this->shop->arPayment)[0];
 			
 			if (sizeof($this->shop->arShipping) == 1 || sizeof($this->shop->arPayment) == 1)
Index: /lib/wpsg_basket.class.php
===================================================================
--- /lib/wpsg_basket.class.php	(revision 5590)
+++ /lib/wpsg_basket.class.php	(revision 5593)
@@ -574,17 +574,17 @@
 				// Eintrag in Kundentabelle
 				$data = array(
-					'title' 	=> wpsg_q($this->arCheckout['title']),
-					'name' 		=> wpsg_q($this->arCheckout['name']),
-					'vname' 	=> wpsg_q($this->arCheckout['vname']),
-					'email' 	=> wpsg_q($this->arCheckout['email']),
-					'firma' 	=> wpsg_q($this->arCheckout['firma']),
-					'fax' 		=> wpsg_q($this->arCheckout['fax']),
-					'strasse' 	=> wpsg_q($this->arCheckout['strasse']),
-					'plz' 		=> wpsg_q($this->arCheckout['plz']),
-					'ort' 		=> wpsg_q($this->arCheckout['ort']),
-					'land' 		=> wpsg_q($this->arCheckout['land']),
-					'tel' 		=> wpsg_q($this->arCheckout['tel']),
-					'geb' 		=> wpsg_q(wpsg_toDate($this->arCheckout['geb'])),
-					'ustidnr' 	=> wpsg_q($this->arCheckout['ustidnr'])
+					'title' 	=> wpsg_q(wpsg_getStr($this->arCheckout['title'])),
+					'name' 		=> wpsg_q(wpsg_getStr($this->arCheckout['name'])),
+					'vname' 	=> wpsg_q(wpsg_getStr($this->arCheckout['vname'])),
+					'email' 	=> wpsg_q(wpsg_getStr($this->arCheckout['email'])),
+					'firma' 	=> wpsg_q(wpsg_getStr($this->arCheckout['firma'])),
+					'fax' 		=> wpsg_q(wpsg_getStr($this->arCheckout['fax'])),
+					'strasse' 	=> wpsg_q(wpsg_getStr($this->arCheckout['strasse'])),
+					'plz' 		=> wpsg_q(wpsg_getStr($this->arCheckout['plz'])),
+					'ort' 		=> wpsg_q(wpsg_getStr($this->arCheckout['ort'])),
+					'land' 		=> wpsg_q(wpsg_getStr($this->arCheckout['land'])),
+					'tel' 		=> wpsg_q(wpsg_getStr($this->arCheckout['tel'])),
+					'geb' 		=> wpsg_q(wpsg_toDate(wpsg_getStr($this->arCheckout['geb']))),
+					'ustidnr' 	=> wpsg_q(wpsg_getStr($this->arCheckout['ustidnr']))
 				);	
 							
@@ -708,5 +708,5 @@
 					'ip' 				=> wpsg_q($_SERVER['REMOTE_ADDR']),
 					'useragent' 		=> wpsg_q($_SERVER['HTTP_USER_AGENT']),
-					'comment' 			=> wpsg_q($this->arCheckout['comment']),
+					'comment' 			=> wpsg_q(wpsg_getStr($this->arCheckout['comment'])),
 					'price_gesamt' 		=> wpsg_tf(round($arBasket['sum']['preis_gesamt_brutto'], 2)),
 					'price_gesamt_netto' 		=> wpsg_tf(round($arBasket['sum']['preis_gesamt_netto'], 2)),
@@ -719,6 +719,6 @@
 					'price_payment_brutto' 	=> wpsg_tf($arBasket['sum']['preis_payment_brutto']),
 					'price_rabatt' 		=> wpsg_tf($arBasket['sum']['preis_rabatt']),				
-					'mwst_payment' 		=> wpsg_tf($arBasket['payment']['preis_payment_brutto'] - $arBasket['payment']['preis_payment_netto']),
-					'mwst_shipping' 	=> wpsg_tf($arBasket['shipping']['preis_shipping_brutto'] - $arBasket['shipping']['preis_shipping_netto']),
+					'mwst_payment' 		=> wpsg_tf(wpsg_getFloat($arBasket['payment']['preis_payment_brutto']) - wpsg_getFloat($arBasket['payment']['preis_payment_netto'])),
+					'mwst_shipping' 	=> wpsg_tf(wpsg_getFloat($arBasket['shipping']['preis_shipping_brutto']) - wpsg_getFloat($arBasket['shipping']['preis_shipping_netto'])),
 					'type_shipping' 	=> wpsg_q($this->arCheckout['shipping']),
 					'type_payment' 		=> wpsg_q($this->arCheckout['payment']),
Index: /model/wpsg_product.class.php
===================================================================
--- /model/wpsg_product.class.php	(revision 5590)
+++ /model/wpsg_product.class.php	(revision 5593)
@@ -130,11 +130,11 @@
 		public function getProductName($detailname = false)
 		{
-				 
-			$product_detailname = $this->detailname;
-			
-			if (wpsg_isSizedString($detailname) && $detailname === true)
-			{
-				
-				$strName = $this->detailname;
+
+			$strDetailname = $this->detailname;
+
+			if (wpsg_isSizedString($strDetailname) && $detailname === true)
+			{
+				
+				$strName = $strDetailname;
 				
 			}
Index: /mods/wpsg_mod_shippingadress.class.php
===================================================================
--- /mods/wpsg_mod_shippingadress.class.php	(revision 5590)
+++ /mods/wpsg_mod_shippingadress.class.php	(revision 5593)
@@ -80,5 +80,5 @@
 		{ 
  
-			if ($checkout['diff_shippingadress'] == '1')
+			if (wpsg_getStr($checkout['diff_shippingadress']) == '1')
 			{