Index: /changelog
===================================================================
--- /changelog	(revision 5796)
+++ /changelog	(revision 5799)
@@ -839,4 +839,6 @@
  - Bugfix - korrekte Lieferzeitanzeige bei individuellen Lieferzeiten
  - Bugfix - Export von Produktveriantenpreisen korrigiert
+ - Bugfix - Seite fÃŒr Streitbeilegung wird bei Neuinstatllation nicht angelegt
+ - Bugfix - Darstellungsoptionen werden nur bei aktivem Anfragemodul angezeigt
 
 #4.0.0 / 5259
Index: /controller/wpsg_ShopController.class.php
===================================================================
--- /controller/wpsg_ShopController.class.php	(revision 5796)
+++ /controller/wpsg_ShopController.class.php	(revision 5799)
@@ -240,5 +240,7 @@
 			), "`ID` = '".wpsg_q($page)."'");
 			 
-			if ($this->get_option('wpsg_page_request') === false) $this->createPage(__('Anfrageliste', 'wpsg'), 'wpsg_page_request', '-1');				
+			if ($this->hasMod('wpsg_mod_request') == '1') {
+				if ($this->get_option('wpsg_page_request') === false) $this->createPage(__('Anfrageliste', 'wpsg'), 'wpsg_page_request', '-1');				
+			}
 			if ($this->get_option('wpsg_page_basket') === false) $this->createPage(__('Warenkorb', 'wpsg'), 'wpsg_page_basket', '-1');				
 			if ($this->get_option('wpsg_page_versand') === false) $this->createPage(__('Versandkosten', 'wpsg'), 'wpsg_page_versand', '-1');
@@ -247,5 +249,5 @@
 			if ($this->get_option('wpsg_page_widerrufsbelehrung') === false) $this->createPage(__('Widerrufsbelehrung', 'wpsg'), 'wpsg_page_widerrufsbelehrung', '-1');				
 			if ($this->get_option('wpsg_page_impressum') === false) $this->createPage(__('Impressum', 'wpsg'), 'wpsg_page_impressum', '-1');
-			if ($this->get_option('wpsg_page_onlinedisputeresolution') === false) $this->createPage(__('Online Streitbeilegung', 'wpsg'), 'wpsg_page_onlinedisputeresolution', '-1');
+			//if ($this->get_option('wpsg_page_onlinedisputeresolution') === false) $this->createPage(__('Online Streitbeilegung', 'wpsg'), 'wpsg_page_onlinedisputeresolution', '-1');
  			
 			// Bestellbedingungen aktivieren
Index: /lib/wpsg_basket_widget.class.php
===================================================================
--- /lib/wpsg_basket_widget.class.php	(revision 5796)
+++ /lib/wpsg_basket_widget.class.php	(revision 5799)
@@ -60,12 +60,14 @@
 	  		<span style="font-weight:bold;"><?php echo __("Seiten unterhalb des Widgets", "wpsg"); ?>:</span><br />
 	  		
-	  		<label><input type="checkbox" value="1" <?php echo (($wpsg_requestpage == '1')?'checked="checked"':''); ?> name="<?php echo $this->get_field_name('wpsg_requestpage'); ?>" id="<?php echo $this->get_field_id('wpsg_requestpage'); ?>" />&nbsp;<?php echo __('Anfrageliste', 'wpsg'); ?><br /></label>	  		
-	  		<label><input type="checkbox" value="1" <?php echo (($wpsg_agbpage == '1')?'checked="checked"':''); ?> name="<?php echo $this->get_field_name('wpsg_agbpage'); ?>" id="<?php echo $this->get_field_id('wpsg_agbpage'); ?>" />&nbsp;<?php echo __('AGB', 'wpsg'); ?><br /></label>	  		
+	  		<?php // if ($this->hasMod('wpsg_mod_request') == '1') { ?>
+	  			<label><input type="checkbox" value="1" <?php echo (($wpsg_requestpage == '1')?'checked="checked"':''); ?> name="<?php echo $this->get_field_name('wpsg_requestpage'); ?>" id="<?php echo $this->get_field_id('wpsg_requestpage'); ?>" />&nbsp;<?php echo __('Anfrageliste', 'wpsg'); ?><br /></label>	  		
+	  		<?php // } ?>
+	  		
+	  		<label><input type="checkbox" value="1" <?php echo (($wpsg_agbpage == '1')?'checked="checked"':''); ?> name="<?php echo $this->get_field_name('wpsg_agbpage'); ?>" id="<?php echo $this->get_field_id('wpsg_agbpage'); ?>" />&nbsp;<?php echo __('AGB', 'wpsg'); ?><br /></label>	  	
+	  		<label><input type="checkbox" value="1" <?php echo (($wpsg_dspage == '1')?'checked="checked"':''); ?> name="<?php echo $this->get_field_name('wpsg_dspage'); ?>" id="<?php echo $this->get_field_id('wpsg_dspage'); ?>" />&nbsp;<?php echo __('Datenschutzrichtlinien', 'wpsg'); ?><br /></label>
+	  		<label><input type="checkbox" value="1" <?php echo (($wpsg_imppage == '1')?'checked="checked"':''); ?> name="<?php echo $this->get_field_name('wpsg_imppage'); ?>" id="<?php echo $this->get_field_id('wpsg_imppage'); ?>" />&nbsp;<?php echo __('Impressum', 'wpsg'); ?><br /></label>
+	  		<label><input type="checkbox" value="1" <?php echo (($wpsg_odrpage == '1')?'checked="checked"':''); ?> name="<?php echo $this->get_field_name('wpsg_odrpage'); ?>" id="<?php echo $this->get_field_id('wpsg_odrpage'); ?>" />&nbsp;<?php echo __('Online Streitbeilegung', 'wpsg'); ?><br /></label>
+	  		<label><input type="checkbox" value="1" <?php echo (($wpsg_vkpage == '1')?'checked="checked"':''); ?> name="<?php echo $this->get_field_name('wpsg_vkpage'); ?>" id="<?php echo $this->get_field_id('wpsg_vkpage'); ?>" />&nbsp;<?php echo __('Versandkosten', 'wpsg'); ?><br /></label>	  			  			
 	  		<label><input type="checkbox" value="1" <?php echo (($wpsg_wrpage == '1')?'checked="checked"':''); ?> name="<?php echo $this->get_field_name('wpsg_wrpage'); ?>" id="<?php echo $this->get_field_id('wpsg_wrpage'); ?>" />&nbsp;<?php echo __('Widerrufsbelehrung', 'wpsg'); ?><br /></label>
-	  		<label><input type="checkbox" value="1" <?php echo (($wpsg_dspage == '1')?'checked="checked"':''); ?> name="<?php echo $this->get_field_name('wpsg_dspage'); ?>" id="<?php echo $this->get_field_id('wpsg_dspage'); ?>" />&nbsp;<?php echo __('Datenschutzrichtlinien', 'wpsg'); ?><br /></label>
-	  		<label><input type="checkbox" value="1" <?php echo (($wpsg_vkpage == '1')?'checked="checked"':''); ?> name="<?php echo $this->get_field_name('wpsg_vkpage'); ?>" id="<?php echo $this->get_field_id('wpsg_vkpage'); ?>" />&nbsp;<?php echo __('Versandkosten', 'wpsg'); ?><br /></label>
-	  		<label><input type="checkbox" value="1" <?php echo (($wpsg_odrpage == '1')?'checked="checked"':''); ?> name="<?php echo $this->get_field_name('wpsg_odrpage'); ?>" id="<?php echo $this->get_field_id('wpsg_odrpage'); ?>" />&nbsp;<?php echo __('Online Streitbeilegung', 'wpsg'); ?><br /></label>
-	  		<label><input type="checkbox" value="1" <?php echo (($wpsg_imppage == '1')?'checked="checked"':''); ?> name="<?php echo $this->get_field_name('wpsg_imppage'); ?>" id="<?php echo $this->get_field_id('wpsg_imppage'); ?>" />&nbsp;<?php echo __('Impressum', 'wpsg'); ?><br /></label>
-	  		
 	  		<br /> 
 	  		<span style="font-weight:bold;"><?php echo __("Versandhinweis", "wpsg"); ?>:</span><br />
Index: /views/admin/seiten.phtml
===================================================================
--- /views/admin/seiten.phtml	(revision 5796)
+++ /views/admin/seiten.phtml	(revision 5799)
@@ -22,4 +22,8 @@
 		<?php echo wpsg_drawForm_AdminboxStart(__('Seitenkonfiguration', 'wpsg')); ?>
 			
+			<?php if ($this->hasMod('wpsg_mod_request') == '1') { ?>
+				<?php echo wpsg_drawForm_Select('wpsg_page_request', __('Anfrageliste', 'wpsg'), $this->view['pages'], $this->get_option('wpsg_page_request'), array('help' => 'wpsg_page_request')); ?>
+			<?php } ?>
+			
 			<?php echo wpsg_drawForm_Select('wpsg_page_basket', __('Warenkorbseite', 'wpsg'), $this->view['pages'], $this->get_option('wpsg_page_basket'), array('help' => 'wpsg_page_basket')); ?>
             <?php echo wpsg_drawForm_Select('wpsg_page_product', __('Produktdetail', 'wpsg'), $this->view['pages'], $this->get_option('wpsg_page_product'), array('help' => 'wpsg_page_product')); ?>
@@ -28,5 +32,5 @@
 			<?php echo wpsg_drawForm_Select('wpsg_page_datenschutz', __('Datenschutz', 'wpsg'), $this->view['pages'], $this->get_option('wpsg_page_datenschutz'), array('help' => 'wpsg_page_datenschutz')); ?>
 			<?php echo wpsg_drawForm_Select('wpsg_page_widerrufsbelehrung', __('Widerrufsbelehrung', 'wpsg'), $this->view['pages'], $this->get_option('wpsg_page_widerrufsbelehrung'), array('help' => 'wpsg_page_widerrufsbelehrung')); ?>
-			<?php echo wpsg_drawForm_Input('wpsg_page_onlinedisputeresolution', __('Online Streitbeilegung', 'wpsg'), $this->get_option('wpsg_page_onlinedisputeresolution'), array('help' => 'wpsg_page_onlinedisputeresolution')); ?>
+			<?php // echo wpsg_drawForm_Input('wpsg_page_onlinedisputeresolution', __('Online Streitbeilegung', 'wpsg'), $this->get_option('wpsg_page_onlinedisputeresolution'), array('help' => 'wpsg_page_onlinedisputeresolution')); ?>
 			<?php echo wpsg_drawForm_Select('wpsg_page_impressum', __('Impressum', 'wpsg'), $this->view['pages'], $this->get_option('wpsg_page_impressum'), array('help' => 'wpsg_page_impressum')); ?>
 			
Index: /views/warenkorb/index.phtml
===================================================================
--- /views/warenkorb/index.phtml	(revision 5796)
+++ /views/warenkorb/index.phtml	(revision 5799)
@@ -95,25 +95,27 @@
 	
 	<ul>
-		<?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 if ($this->hasMod('wpsg_mod_request') == '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 } ?>
 		<?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>
+			<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['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>
+			<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['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>
+			<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['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>
+			<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['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>
+			<li class="page_item"><a href="http://ec.europa.eu/consumers/odr/"><?php echo __('Online Streitbeilegung', 'wpsg'); ?></a></li>
 		<?php } ?>
 		<?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>
+			<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 } ?>
 	</ul>