Index: /lib/wpsg_basket_widget.class.php
===================================================================
--- /lib/wpsg_basket_widget.class.php	(revision 5637)
+++ /lib/wpsg_basket_widget.class.php	(revision 5639)
@@ -25,5 +25,5 @@
 	  		$GLOBALS['wpsg_sc']->basket->initFromSession();
 	  		$GLOBALS['wpsg_sc']->view['basket'] = $GLOBALS['wpsg_sc']->basket->toArray();
-	  		 		
+
 	  		if (is_array($GLOBALS['wpsg_sc']->view['basket']) && sizeof($GLOBALS['wpsg_sc']->view['basket']['produkte']) > 0)
 	  		{
@@ -36,6 +36,8 @@
 	  		
 	  		$GLOBALS['wpsg_sc']->view['wpsg_versandhinweis'] = $settings['wpsg_versandhinweis'];
-	  		$GLOBALS['wpsg_sc']->view['wpsg_widgetsettings'] = $settings;	  		
-	  		
+
+            $GLOBALS['wpsg_sc']->view['widget_args'] = $args;
+		    $GLOBALS['wpsg_sc']->view['widget_settings'] = $settings;
+
 	  		$GLOBALS['wpsg_sc']->render(WPSG_PATH_VIEW.'/warenkorb/index.phtml');
 	  	 	
Index: /mods/mod_kundenverwaltung/wpsg_kundenverwaltung_widget.class.php
===================================================================
--- /mods/mod_kundenverwaltung/wpsg_kundenverwaltung_widget.class.php	(revision 5637)
+++ /mods/mod_kundenverwaltung/wpsg_kundenverwaltung_widget.class.php	(revision 5639)
@@ -21,4 +21,7 @@
 	  	{
 
+		    $GLOBALS['wpsg_sc']->view['widget_args'] = $args;
+		    $GLOBALS['wpsg_sc']->view['widget_settings'] = $settings;
+
 	  		$GLOBALS['wpsg_sc']->render(WPSG_PATH_VIEW.'/mods/mod_kundenverwaltung/widget.phtml');
 	  		
Index: /mods/mod_topseller/wpsg_mod_topseller_widget.class.php
===================================================================
--- /mods/mod_topseller/wpsg_mod_topseller_widget.class.php	(revision 5637)
+++ /mods/mod_topseller/wpsg_mod_topseller_widget.class.php	(revision 5639)
@@ -20,5 +20,8 @@
 	  		$template = false; if (wpsg_isSizedString($settings['wpsg_mod_topseller_template'])) $template = $settings['wpsg_mod_topseller_template'];
 	  		$limit = $GLOBALS['wpsg_sc']->get_option('wpsg_mod_topseller_limit'); if (wpsg_isSizedString($settings['wpsg_mod_topseller_limit'])) $limit = $settings['wpsg_mod_topseller_limit'];
-	  			  		
+		    
+            $GLOBALS['wpsg_sc']->view['widget_args'] = $args;
+		    $GLOBALS['wpsg_sc']->view['widget_settings'] = $settings;
+		    
 			$GLOBALS['wpsg_sc']->callMod('wpsg_mod_topseller', 'renderTopSeller', array($template, $limit));
 	  		
Index: /mods/mod_trustedshops/wpsg_mod_trustedshops_widget.class.php
===================================================================
--- /mods/mod_trustedshops/wpsg_mod_trustedshops_widget.class.php	(revision 5637)
+++ /mods/mod_trustedshops/wpsg_mod_trustedshops_widget.class.php	(revision 5639)
@@ -24,5 +24,8 @@
 	  		$GLOBALS['wpsg_sc']->view['widget'] = &$this;	  		
   			$GLOBALS['wpsg_sc']->view['siegelURL'] = $GLOBALS['wpsg_sc']->callMod('wpsg_mod_trustedshops', 'getSiegelURL');
-	  		$GLOBALS['wpsg_sc']->view['settings'] = $settings;
+
+            $GLOBALS['wpsg_sc']->view['widget_args'] = $args;
+		    $GLOBALS['wpsg_sc']->view['widget_settings'] = $settings;
+
 	  		$GLOBALS['wpsg_sc']->render(WPSG_PATH_VIEW.'/mods/mod_trustedshops/widget.phtml');
 	  		
Index: ds/wpsg_mod_productfilter.class.php
===================================================================
--- /mods/wpsg_mod_productfilter.class.php	(revision 5637)
+++ 	(revision )
@@ -1,250 +1,0 @@
-<?php
-
-	/**
-	 * Mit diesem Modul können die Produkte im Frontend per Ajax gefiltert werden
-	 * @author daniel
-	 */
-	class wpsg_mod_productfilter extends wpsg_mod_basic
-	{
-		
-		var $lizenz = 2;
-		var $id = 1850;
-		
-		/**
-		 * Costructor
-		 */
-		public function __construct()
-		{
-				
-			parent::__construct();
-				
-			$this->name = __('Frontend Produktfilter', 'wpsg');
-			$this->group = __('Produkte', 'wpsg');
-			$this->desc = __('Ermöglicht die Filter der Produkte im Frontend nach Produktattributen, Varianten und Preisen.', 'wpsg');
-		
-		} // public function __construct()
-		
-		public function settings_edit()
-		{
-			
-			$arSet = $this->shop->get_option('wpsg_mod_productfilter_show');
-
-			// Produktattribute?
-			if ($this->shop->hasMod('wpsg_mod_produktattribute'))
-			{
-				
-				$this->shop->view['wpsg_mod_productfilter']['arPA'] = $this->db->fetchAssoc("
-					SELECT * FROM `".WPSG_TBL_AT."` AS A 
-				");
-				
-				// Gesetzt?
-				if (wpsg_isSizedArray($arSet['pa']))
-				{
-					
-					foreach ($this->shop->view['wpsg_mod_productfilter']['arPA'] as $k => $pa)
-					{
-						
-						if (in_array($pa['id'], $arSet['pa']))
-						{
-						
-							$this->shop->view['wpsg_mod_productfilter']['arPA'][$k]['set'] = '1';
-							
-						}
-						
-					}
-					
-				}
-								
-			}
-
-			// Varianten
-			if ($this->shop->hasMod('wpsg_mod_varianten'))
-			{
-				
-				$arVariantenProducts = $this->db->fetchAssocField("
-					SELECT P.`id` FROM `".WPSG_TBL_PRODUCTS."` AS P WHERE LENGTH(P.`mod_varianten`) > 0  
-				", "id");
-				
-				if (wpsg_isSizedArray($arVariantenProducts))
-				{
-								
-					$this->shop->view['wpsg_mod_productfilter']['arVarianten'] = array();
-					
-					foreach ($arVariantenProducts as $product_id)
-					{
-						
-						$arVariInfo = $this->shop->callMod('wpsg_mod_varianten', 'loadVarianten', array($product_id));
-						
-						if (wpsg_isSizedArray($arVariInfo))
-						{
-							
-							foreach ($arVariInfo as $var_id => $var)
-							{
-								
-								if ($var['aktiv'] == '1')
-								{
-								
-									if (!array_key_exists($var['name'], $this->shop->view['wpsg_mod_productfilter']['arVarianten']))
-									{
-										
-										$this->shop->view['wpsg_mod_productfilter']['arVarianten'][$var['name']] = in_array($var['name'], $arSet['varianten']);
-										
-									}
-									
-								}
-								
-							}
-							
-						}
-						
-					}
-					
-				}
-				
-			}
-			
-			// Seiten
-			$pages = get_pages();
-				
-			$arPages = array(
-					'-1' => __('Neu anlegen und zuordnen', 'wpsg')
-			);
-				
-			foreach ($pages as $k => $v)
-			{
-				$arPages[$v->ID] = $v->post_title.' (ID:'.$v->ID.')';
-			}
-			
-			$this->shop->view['wpsg_mod_productfilter']['pages'] = $arPages;
-			
-			$this->shop->render(WPSG_PATH_VIEW.'/mods/mod_productfilter/settings_edit.phtml');
-			
-		} // public function settings_edit()
-		
-		public function settings_save()
-		{
-			
-			$arSave = array();
-			
-			// Produktattribute 
-			if ($this->shop->hasMod('wpsg_mod_produktattribute'))
-			{
-			
-				$arSave['pa'] = array();
-				if (wpsg_isSizedArray($_REQUEST['wpsg_mod_productfilter']['pa']))
-				{
-
-					foreach ($_REQUEST['wpsg_mod_productfilter']['pa'] as $k => $v)
-					{
-						
-						if ($v > 0) $arSave['pa'][] = $v;
-						
-					}
-					
-				}
-				
-			}
-			
-			// Varianten
-			if ($this->shop->hasMod('wpsg_mod_varianten'))
-			{
-				
-				$arSave['varianten'] = array();
-				$arSave['variationenCache'] = array();
-				
-				if (wpsg_isSizedArray($_REQUEST['wpsg_mod_productfilter']['varianten']))
-				{
-					
-					foreach ($_REQUEST['wpsg_mod_productfilter']['varianten'] as $k => $v)
-					{
-						
-						if ($v != '0') 
-						{
-														
-							$arSave['varianten'][] = $v;
-							
-							$arVariantenProducts = $this->db->fetchAssocField("
-								SELECT P.`id` FROM `".WPSG_TBL_PRODUCTS."` AS P WHERE LENGTH(P.`mod_varianten`) > 0  
-							", "id");
-							
-							foreach ($arVariantenProducts as $product_id)
-							{
-							
-								$this->addVariationen($product_id, $v, $arSave['variationenCache']);
-								
-							}
-							
-						}
-						
-					} 
-					
-				}
-				
-			} 
-			
-			// Seite fÃŒr Übersicht anlegen 
-			$this->shop->createPage(__('Produkte', 'wpsg'), 'wpsg_mod_productfilter_page', $_REQUEST['wpsg_mod_productfilter_page']);
-			 
-			$this->shop->update_option('wpsg_mod_productfilter_show', $arSave);
-			$this->shop->update_option('wpsg_mod_productfilter_pricefilter', $_REQUEST['wpsg_mod_productfilter_pricefilter']);
-						
-		} // public function settings_save()
-
-		public function load() 
-		{ 
-
-			require_once(dirname(__FILE__).'/mod_productfilter/wpsg_mod_productfilter_widget.class.php');
-			add_action('widgets_init', create_function('', 'return register_widget("wpsg_mod_productfilter_widget");'));
-			
-		} // public function load()
-		
-		/** Modulfunktionen */
-		
-		/**
-		 * LÀdt die Variationen der Variante fÌr die spÀtere Anzeige im Filter
-		 * @param $product_id
-		 * @param $var_name
-		 * @param $variationenCache
-		 */
-		function addVariationen($product_id, $var_name, &$variationenCache)
-		{
-			
-			$arVariInfo = $this->shop->callMod('wpsg_mod_varianten', 'loadVarianten', array($product_id));
-			
-			foreach ($arVariInfo as $var_id => $var)
-			{
-				
-				if ($var['aktiv'] == '1' && $var['name'] == $var_name)
-				{
-					
-					if (!array_key_exists($var_name, $variationenCache))
-					{
-						
-						$variationenCache[$var_name] = array(
-							'typ' => $var['typ'],
-							'vari' => array()
-						);	
-						
-					}
-					
-					foreach ((array)$var['vari'] as $vari_id => $vari)
-					{
-						
-						if (!in_array($vari['name'], $variationenCache[$var_name]['vari']))
-						{
-						
-							if ($vari['aktiv'] == '1') $variationenCache[$var_name]['vari'][] = $vari['name'];
-
-						}
-						
-					}
-					
-				}
-				
-			}
-			
-		} // function addVariationen($product_id, $var_name, &$variationenCache)
-		
-	} // class wpsg_mod_productfilter extends wpsg_mod_basic
-
-?>
Index: /views/mods/mod_trustedshops/widget.phtml
===================================================================
--- /views/mods/mod_trustedshops/widget.phtml	(revision 5637)
+++ /views/mods/mod_trustedshops/widget.phtml	(revision 5639)
@@ -7,5 +7,5 @@
 ?>
 
-<?php if ($this->view['settings']['wpsg_mod_trustedshops_siegel'] == '1') { ?>
+<?php if ($this->view['widget_settings']['wpsg_mod_trustedshops_siegel'] == '1') { ?>
 <div class="wpsg_mod_trustedshops_siegel">
 	
@@ -13,5 +13,5 @@
 <?php } ?>
 
-<?php if ($this->view['settings']['wpsg_mod_trustedshops_vote'] == '1') { ?>
+<?php if ($this->view['widget_settings']['wpsg_mod_trustedshops_vote'] == '1') { ?>
 <div class="wpsg_mod_trustedshops_vote">
 	<a target="_blank" href="https://www.trustedshops.de/bewertung/info_<?php echo $this->get_option('wpsg_mod_trustedshops_shopid'); ?>.html" title="<?php echo wpsg_hspc($this->get_option('wpsg_mod_trustedshops_siegeltitle')); ?>">
@@ -21,5 +21,5 @@
 <?php } ?>
 
-<?php if ($this->view['settings']['wpsg_mod_trustedshops_badge'] == '1') { ?>
+<?php if ($this->view['widget_settings']['wpsg_mod_trustedshops_badge'] == '1') { ?>
 <script type="text/javascript">/* <![CDATA[ */
 	
Index: /views/warenkorb/index.phtml
===================================================================
--- /views/warenkorb/index.phtml	(revision 5637)
+++ /views/warenkorb/index.phtml	(revision 5639)
@@ -95,24 +95,24 @@
 	
 	<ul>
-		<?php if ($this->view['wpsg_widgetsettings']['wpsg_requestpage'] == 1) { ?>
+		<?php if ($this->view['widget_settings']['wpsg_requestpage'] == 1) { ?>
 		<li class="page_item"><a href="<?php echo $this->getURL(wpsg_ShopController::URL_REQUEST); ?>"><?php echo get_the_title($this->get_option('wpsg_page_request')); ?></a></li>
 		<?php } ?>
-		<?php if ($this->view['wpsg_widgetsettings']['wpsg_agbpage'] == 1) { ?>
+		<?php if ($this->view['widget_settings']['wpsg_agbpage'] == 1) { ?>
 		<li class="page_item"><a href="<?php echo $this->getURL(wpsg_ShopController::URL_AGB); ?>"><?php echo get_the_title($this->get_option('wpsg_page_agb')); ?></a></li>
 		<?php } ?>
-		<?php if ($this->view['wpsg_widgetsettings']['wpsg_wrpage'] == 1) { ?>
+		<?php if ($this->view['widget_settings']['wpsg_wrpage'] == 1) { ?>
 		<li class="page_item"><a href="<?php echo $this->getURL(wpsg_ShopController::URL_WIDERRUF); ?>"><?php echo get_the_title($this->get_option('wpsg_page_widerrufsbelehrung')); ?></a></li>
 		<?php } ?>
-		<?php if ($this->view['wpsg_widgetsettings']['wpsg_dspage'] == 1) { ?>
+		<?php if ($this->view['widget_settings']['wpsg_dspage'] == 1) { ?>
 		<li class="page_item"><a href="<?php echo $this->getURL(wpsg_ShopController::URL_DATENSCHUTZ); ?>"><?php echo get_the_title($this->get_option('wpsg_page_datenschutz')); ?></a></li>
 		<?php } ?>
 		
-		<?php if ($this->view['wpsg_widgetsettings']['wpsg_vkpage'] == 1) { ?>
+		<?php if ($this->view['widget_settings']['wpsg_vkpage'] == 1) { ?>
 		<li class="page_item"><a href="<?php echo $this->getURL(wpsg_ShopController::URL_VERSANDKOSTEN); ?>"><?php echo get_the_title($this->get_option('wpsg_page_versand')); ?></a></li>
 		<?php } ?>
-		<?php if ($this->view['wpsg_widgetsettings']['wpsg_odrpage'] == 1) { ?>
+		<?php if ($this->view['widget_settings']['wpsg_odrpage'] == 1) { ?>
 		<li class="page_item"><a href="<?php echo $this->getURL(wpsg_ShopController::URL_ONLINE_DISPUTE_RESOLUTION); ?>"><?php echo __('Online Streitbeilegung', 'wpsg'); ?></a></li>
 		<?php } ?>
-		<?php if ($this->view['wpsg_widgetsettings']['wpsg_imppage'] == 1) { ?>
+		<?php if ($this->view['widget_settings']['wpsg_imppage'] == 1) { ?>
 		<li class="page_item"><a href="<?php echo $this->getURL(wpsg_ShopController::URL_IMPRESSUM); ?>"><?php echo get_the_title($this->get_option('wpsg_page_impressum')); ?></a></li>
 		<?php } ?>