Index: /controller/wpsg_BasketController.class.php
===================================================================
--- /controller/wpsg_BasketController.class.php	(revision 7719)
+++ /controller/wpsg_BasketController.class.php	(revision 7720)
@@ -822,5 +822,5 @@
 				
 				// Warenkorb aktualisieren
-				
+
 				foreach ($_REQUEST['wpsg']['menge'] as $product_index => $produkt_menge) {
 					
Index: /lib/wpsg_basket.class.php
===================================================================
--- /lib/wpsg_basket.class.php	(revision 7719)
+++ /lib/wpsg_basket.class.php	(revision 7720)
@@ -77,13 +77,10 @@
 			$product_data = $this->shop->cache->loadProduct($this->shop->getProduktId($produkt_key));
 			
-			if ($product_data['basket_multiple'] == 1)
-			{
+			if ($product_data['basket_multiple'] == 1) {
 				
 				// Nur einmal mit beliebiger Menge
 				// Hier nichts machen, es wird weiter unten hinzugefÃŒgt
 
-			}
-			else if ($product_data['basket_multiple'] == 2)
-			{
+			} else if ($product_data['basket_multiple'] == 2) {
 				
 				// Mehrfach mit Menge 1
@@ -259,9 +256,7 @@
 		 * Aktualisiert den Warenkorb in der Session
 		 */
-		public function updateProduktFromSession($product_index, $produkt_menge)
-		{
-			
-			if (intval($produkt_menge) <= 0)
-			{
+		public function updateProduktFromSession($product_index, $produkt_menge) {
+			
+			if (intval($produkt_menge) <= 0) {
 				
 				$this->removeProduktFromSession($product_index);
@@ -269,15 +264,12 @@
 				
 			}
-			
-			
-			foreach ($_SESSION['wpsg']['basket'] as $k => $p)
-			{
-				
-				if ($k == $product_index)
-				{
-					
+
+			foreach ($_SESSION['wpsg']['basket'] as $k => $p) {
+				
+				if ($k == $product_index) {
+
 					$this->shop->callMods('basket_updateProduktFromSession', array(&$product_index, &$produkt_menge));
 					$_SESSION['wpsg']['basket'][$k]['menge'] = intval($produkt_menge);
-					
+
 					if (!wpsg_isSizedInt($_SESSION['wpsg']['basket'][$k]['menge'])) unset($_SESSION['wpsg']['basket'][$k]);
 					
@@ -298,5 +290,5 @@
 			if (!isset($_SESSION['wpsg']['basket'])) return;
 			if ($this->loadFromSession === true && $rebuild === false) return;
-			
+
 			$this->arProdukte = array();
 			
@@ -1267,8 +1259,6 @@
 		 * Wandelt die in der Session gespeicherten Produkte in einen aufgewerteten Array
 		 */
-		public function toArray($backend = false, $clearVK = false)
-		{
-			
-							
+		public function toArray($backend = false, $clearVK = false) {
+
 			$arReturn = array();
 			
@@ -1308,12 +1298,9 @@
 				WPSG_BRUTTO => array()
 			);
-			
-			foreach ($this->arProdukte as $product_index => &$b)
-			{
+
+			foreach ($this->arProdukte as $product_index => &$b) {
 				
 				$produkt_id = $this->shop->getProduktID($b['id']);
-				
-				wpsg_addSet($arReturn['menge'], $b['menge']);
-				
+
 				$country = $this->shop->getDefaultCountry();
 				
@@ -1331,5 +1318,5 @@
 					$b = $this->shop->loadProduktArray($produkt_id, $b, true);
 					//$this->shop->country = 0;
-					
+
 					if (wpsg_isSizedInt($b['euleistungsortregel']))
 					{
@@ -1348,8 +1335,8 @@
 					
 				}
-				
+
 				$this->shop->callMods('basket_toArray', array(&$b, $backend, $noMwSt));
 				$this->checkMwSt($b['mwst_key'], $country, $arReturn);
-				
+
 				if ($noMwSt)
 				{
@@ -1399,5 +1386,5 @@
 				
 			} // foreach Produkte
-							
+
 			// Die Basis der Preisberechnung, wenn Brutto, dann wird Netto berechnet
 			if ($this->shop->getFrontendTaxview() == WPSG_NETTO)
Index: /lib/wpsg_calculation.class.php
===================================================================
--- /lib/wpsg_calculation.class.php	(revision 7719)
+++ /lib/wpsg_calculation.class.php	(revision 7720)
@@ -1506,4 +1506,22 @@
 		}
 
+        /**
+         * Gibt die Anzahl an Produkten zurÃŒck
+         * @return int
+         */
+		public function getProductCount() {
+
+		    $sum = 0;
+
+		    foreach ($this->getCalculationArray()['product'] as $p) {
+
+		        $sum += $p['amount'];
+
+            }
+
+		    return $sum;
+
+        }
+
 		public function getSum($bruttonetto = WPSG_NETTO) {
 			
@@ -1535,5 +1553,5 @@
 	
 		/**
-		 * return \wpsg\wpsg_calculation
+         * @return wpsg_calculation
 		 */
 		public static function getSessionCalculation($no_cache = false) {
Index: /model/wpsg_product.class.php
===================================================================
--- /model/wpsg_product.class.php	(revision 7719)
+++ /model/wpsg_product.class.php	(revision 7720)
@@ -204,20 +204,18 @@
 				{
 
-					$basket_url = $this->shop->getURL(wpsg_ShopController::URL_BASKET);
-
-					if (strpos($basket_url, "?") > 0)
-					{
-
-						$basket_url .= "&wpsg_action=showProdukt&produkt_id=".$this->id;
+                    if ($this->shop->get_option('wpsg_page_product') > 0) $product_url = $this->shop->getURL(wpsg_ShopController::URL_PRODUCTDETAIL);
+                    else $product_url = $this->shop->getURL(wpsg_ShopController::URL_BASKET);
+
+					if (strpos($product_url, "?") > 0) {
+
+                        $product_url .= "&wpsg_action=showProdukt&produkt_id=".$this->id;
+
+					} else {
+
+                        $product_url .= "?wpsg_action=showProdukt&produkt_id=".$this->id;
 
 					}
-					else
-					{
-
-						$basket_url .= "?wpsg_action=showProdukt&produkt_id=".$this->id;
-
-					}
-
-					return $basket_url;
+
+					return $product_url;
 
 				}
Index: /mods/wpsg_mod_basic.class.php
===================================================================
--- /mods/wpsg_mod_basic.class.php	(revision 7719)
+++ /mods/wpsg_mod_basic.class.php	(revision 7720)
@@ -98,6 +98,6 @@
 			5100    => 'wpsg_mod_productview', // Produktansicht 
 			5300	=> 'wpsg_mod_converter', // Konverter von wpsg3 auf wpsg4
-			5400 	=> 'wpsg_mod_surfaceproduct', // Druckerei	
-            5500    => 'wpsg_mod_datainformation' // Datenauskunft	
+            5500    => 'wpsg_mod_datainformation', // Datenauskunft
+            5501 	=> 'wpsg_mod_printshop', // Druckerei
 		);