Index: /lib/filter_functions.inc.php
===================================================================
--- /lib/filter_functions.inc.php	(revision 7550)
+++ /lib/filter_functions.inc.php	(revision 7551)
@@ -502,5 +502,5 @@
         
         if (is_object($wpsg_update_data['updateData']) && $scalar !== false && $noUpdate !== true) $data->response[WPSG_SLUG] = $wpsg_update_data['updateData'];
-        else unset($data->response[WPSG_SLUG]);
+        else if (is_object($data)) unset($data->response[WPSG_SLUG]);
     
         return $data;
Index: /lib/functions.inc.php
===================================================================
--- /lib/functions.inc.php	(revision 7550)
+++ /lib/functions.inc.php	(revision 7551)
@@ -602,4 +602,5 @@
 				break;
 				
+			case WPSG_SANITIZE_DOMAIN:
 			case WPSG_SANITIZE_TEXTFIELD:
 				
Index: /mods/wpsg_mod_statistics.class.php
===================================================================
--- /mods/wpsg_mod_statistics.class.php	(revision 7550)
+++ /mods/wpsg_mod_statistics.class.php	(revision 7551)
@@ -674,56 +674,62 @@
 		}
 		
-		public function settings_save() 
-		{
-
-			$this->shop->update_option('wpsg_mod_statistics_piwik_url', $_REQUEST['wpsg_mod_statistics_piwik_url'], false, false, "text_field");
-			
-			$this->shop->update_option('wpsg_mod_statistics_piwik_generel', $_REQUEST['wpsg_mod_statistics_piwik_generel'], false, false, "key");
-			$this->shop->update_option('wpsg_mod_statistics_piwik_SiteId', $_REQUEST['wpsg_mod_statistics_piwik_SiteId'], false, false, "key");
-			$this->shop->update_option('wpsg_mod_statistics_piwik_ecommerce', $_REQUEST['wpsg_mod_statistics_piwik_ecommerce'], false, false, "key");
-			
-			$this->shop->update_option('wpsg_mod_statistics_piwik_basket', $_REQUEST['wpsg_mod_statistics_piwik_basket'], false, false, "key");
-			$this->shop->update_option('wpsg_mod_statistics_piwik_basket_target', $_REQUEST['wpsg_mod_statistics_piwik_basket_target'], false, false, "key");
-			
-			$this->shop->update_option('wpsg_mod_statistics_piwik_checkout', $_REQUEST['wpsg_mod_statistics_piwik_checkout'], false, false, "key");
-			$this->shop->update_option('wpsg_mod_statistics_piwik_checkout_target', $_REQUEST['wpsg_mod_statistics_piwik_checkout_target'], false, false, "key");
-			
-			$this->shop->update_option('wpsg_mod_statistics_piwik_checkout2', $_REQUEST['wpsg_mod_statistics_piwik_checkout2'], false, false, "key");
-			$this->shop->update_option('wpsg_mod_statistics_piwik_checkout2_target', $_REQUEST['wpsg_mod_statistics_piwik_checkout2_target'], false, false, "key");
-			
-			$this->shop->update_option('wpsg_mod_statistics_piwik_overview', $_REQUEST['wpsg_mod_statistics_piwik_overview'], false, false, "key");
-			$this->shop->update_option('wpsg_mod_statistics_piwik_overview_target', $_REQUEST['wpsg_mod_statistics_piwik_overview_target'], false, false, "key");
-			
-			$this->shop->update_option('wpsg_mod_statistics_piwik_done', $_REQUEST['wpsg_mod_statistics_piwik_done'], false, false, "key");
-			$this->shop->update_option('wpsg_mod_statistics_piwik_done_target', $_REQUEST['wpsg_mod_statistics_piwik_done_target'], false, false, "key");
-			
-			$this->shop->update_option('wpsg_mod_statistics_google_active', $_REQUEST['wpsg_mod_statistics_google_active'], false, false, "key");
-			$this->shop->update_option('wpsg_mod_statistics_google_domainname', $_REQUEST['wpsg_mod_statistics_google_domainname'], false, false, "text_field");
-			$this->shop->update_option('wpsg_mod_statistics_google_tracking_code', $_REQUEST['wpsg_mod_statistics_google_tracking_code'], false, false, "text_field");
-			$this->shop->update_option('wpsg_mod_statistics_google_anonymise_ip_address', $_REQUEST['wpsg_mod_statistics_google_anonymise_ip_address'], false, false, "key");
-			$this->shop->update_option('wpsg_mod_statistics_google_opt_out', $_REQUEST['wpsg_mod_statistics_google_opt_out'], false, false, "key");
-			$this->shop->update_option('wpsg_mod_statistics_google_enhanced_tracking_code', $_REQUEST['wpsg_mod_statistics_google_enhanced_tracking_code'], false, false, "key");
-
-			$this->shop->update_option('wpsg_mod_statistics_google_track_page_load_time', $_REQUEST['wpsg_mod_statistics_google_track_page_load_time'], false, false, "key");
-			$this->shop->update_option('wpsg_mod_statistics_google_done', $_REQUEST['wpsg_mod_statistics_google_done'], false, false, "text_field");
-			$this->shop->update_option('wpsg_mod_statistics_google_basket', $_REQUEST['wpsg_mod_statistics_google_basket'], false, false, "text_field");
-			$this->shop->update_option('wpsg_mod_statistics_google_checkout', $_REQUEST['wpsg_mod_statistics_google_checkout'], false, false, "text_field");
-			$this->shop->update_option('wpsg_mod_statistics_google_checkout2', $_REQUEST['wpsg_mod_statistics_google_checkout2'], false, false, "text_field");
-			$this->shop->update_option('wpsg_mod_statistics_google_overview', $_REQUEST['wpsg_mod_statistics_google_overview'], false, false, "text_field");
-
-			$this->shop->update_option('wpsg_mod_statistics_socialmedia_fb_px', $_REQUEST['wpsg_mod_statistics_socialmedia_fb_px'], false, false, "key");
-			
-			$this->shop->update_option('wpsg_mod_statistics_line_chart_width', $_REQUEST['wpsg_mod_statistics_line_chart_width'], false, false, "key");
-			$this->shop->update_option('wpsg_mod_statistics_line_chart_height', $_REQUEST['wpsg_mod_statistics_line_chart_height'], false, false, "key");
-			$this->shop->update_option('wpsg_mod_statistics_pie_chart_width', $_REQUEST['wpsg_mod_statistics_pie_chart_width'], false, false, "key");
-			$this->shop->update_option('wpsg_mod_statistics_pie_chart_height', $_REQUEST['wpsg_mod_statistics_pie_chart_height'], false, false, "key");
-			$this->shop->update_option('wpsg_mod_statistics_bar_chart_width', $_REQUEST['wpsg_mod_statistics_bar_chart_width'], false, false, "key");
-			$this->shop->update_option('wpsg_mod_statistics_bar_chart_height', $_REQUEST['wpsg_mod_statistics_bar_chart_height'], false, false, "key");
-			$this->shop->update_option('wpsg_mod_statistics_topproductcount', $_REQUEST['wpsg_mod_statistics_topproductcount'], false, false, "key");
-			$this->shop->update_option('wpsg_mod_statistics_status', implode(',', array_keys(array_filter((array)$_REQUEST['wpsg_mod_statistics_status'], create_function('$a','return $a != 0;')))));
-			// Todo: Function "create_function()" is deprecated PHP 7.2
-
-			$this->shop->update_option('wpsg_mod_statistics_googlekey', $_REQUEST['wpsg_mod_statistics_googlekey'], false, false, "text_field");
-			$this->shop->update_option('wpsg_mod_statistics_productinterval', $_REQUEST['wpsg_mod_statistics_productinterval'], false, false, "key");
+		public function settings_save() {
+			
+			$this->shop->update_option('wpsg_mod_statistics_piwik_url', $_REQUEST['wpsg_mod_statistics_piwik_url'], false, false, WPSG_SANITIZE_URL);
+			
+			$this->shop->update_option('wpsg_mod_statistics_piwik_generel', $_REQUEST['wpsg_mod_statistics_piwik_generel'], false, false, WPSG_SANITIZE_CHECKBOX);
+			$this->shop->update_option('wpsg_mod_statistics_piwik_SiteId', $_REQUEST['wpsg_mod_statistics_piwik_SiteId'], false, false, WPSG_SANITIZE_INT);
+			$this->shop->update_option('wpsg_mod_statistics_piwik_ecommerce', $_REQUEST['wpsg_mod_statistics_piwik_ecommerce'], false, false, WPSG_SANITIZE_CHECKBOX);
+			
+			$this->shop->update_option('wpsg_mod_statistics_piwik_basket', $_REQUEST['wpsg_mod_statistics_piwik_basket'], false, false, WPSG_SANITIZE_CHECKBOX);
+			$this->shop->update_option('wpsg_mod_statistics_piwik_basket_target', $_REQUEST['wpsg_mod_statistics_piwik_basket_target'], false, false, WPSG_SANITIZE_INT, ['allowEmpty' => true]);
+			
+			$this->shop->update_option('wpsg_mod_statistics_piwik_checkout', $_REQUEST['wpsg_mod_statistics_piwik_checkout'], false, false, WPSG_SANITIZE_CHECKBOX);
+			$this->shop->update_option('wpsg_mod_statistics_piwik_checkout_target', $_REQUEST['wpsg_mod_statistics_piwik_checkout_target'], false, false, WPSG_SANITIZE_INT, ['allowEmpty' => true]);
+			
+			$this->shop->update_option('wpsg_mod_statistics_piwik_checkout2', $_REQUEST['wpsg_mod_statistics_piwik_checkout2'], false, false, WPSG_SANITIZE_CHECKBOX);
+			$this->shop->update_option('wpsg_mod_statistics_piwik_checkout2_target', $_REQUEST['wpsg_mod_statistics_piwik_checkout2_target'], false, false, WPSG_SANITIZE_INT, ['allowEmpty' => true]);
+			
+			$this->shop->update_option('wpsg_mod_statistics_piwik_overview', $_REQUEST['wpsg_mod_statistics_piwik_overview'], false, false, WPSG_SANITIZE_CHECKBOX);
+			$this->shop->update_option('wpsg_mod_statistics_piwik_overview_target', $_REQUEST['wpsg_mod_statistics_piwik_overview_target'], false, false, WPSG_SANITIZE_INT, ['allowEmpty' => true]);
+			
+			$this->shop->update_option('wpsg_mod_statistics_piwik_done', $_REQUEST['wpsg_mod_statistics_piwik_done'], false, false, WPSG_SANITIZE_CHECKBOX);
+			$this->shop->update_option('wpsg_mod_statistics_piwik_done_target', $_REQUEST['wpsg_mod_statistics_piwik_done_target'], false, false, WPSG_SANITIZE_INT, ['allowEmpty' => true]);
+			
+			$this->shop->update_option('wpsg_mod_statistics_google_active', $_REQUEST['wpsg_mod_statistics_google_active'], false, false, WPSG_SANITIZE_CHECKBOX);
+			$this->shop->update_option('wpsg_mod_statistics_google_domainname', $_REQUEST['wpsg_mod_statistics_google_domainname'], false, false, WPSG_SANITIZE_DOMAIN);
+			$this->shop->update_option('wpsg_mod_statistics_google_tracking_code', $_REQUEST['wpsg_mod_statistics_google_tracking_code'], false, false, WPSG_SANITIZE_TEXTFIELD);
+			$this->shop->update_option('wpsg_mod_statistics_google_anonymise_ip_address', $_REQUEST['wpsg_mod_statistics_google_anonymise_ip_address'], false, false, WPSG_SANITIZE_CHECKBOX);
+			$this->shop->update_option('wpsg_mod_statistics_google_opt_out', $_REQUEST['wpsg_mod_statistics_google_opt_out'], false, false, WPSG_SANITIZE_CHECKBOX);
+			$this->shop->update_option('wpsg_mod_statistics_google_enhanced_tracking_code', $_REQUEST['wpsg_mod_statistics_google_enhanced_tracking_code'], false, false, WPSG_SANITIZE_CHECKBOX);
+
+			$this->shop->update_option('wpsg_mod_statistics_google_track_page_load_time', $_REQUEST['wpsg_mod_statistics_google_track_page_load_time'], false, false, WPSG_SANITIZE_CHECKBOX);
+			$this->shop->update_option('wpsg_mod_statistics_google_done', $_REQUEST['wpsg_mod_statistics_google_done'], false, false, WPSG_SANITIZE_TEXTFIELD);
+			$this->shop->update_option('wpsg_mod_statistics_google_basket', $_REQUEST['wpsg_mod_statistics_google_basket'], false, false, WPSG_SANITIZE_TEXTFIELD);
+			$this->shop->update_option('wpsg_mod_statistics_google_checkout', $_REQUEST['wpsg_mod_statistics_google_checkout'], false, false, WPSG_SANITIZE_TEXTFIELD);
+			$this->shop->update_option('wpsg_mod_statistics_google_checkout2', $_REQUEST['wpsg_mod_statistics_google_checkout2'], false, false, WPSG_SANITIZE_TEXTFIELD);
+			$this->shop->update_option('wpsg_mod_statistics_google_overview', $_REQUEST['wpsg_mod_statistics_google_overview'], false, false, WPSG_SANITIZE_TEXTFIELD);
+
+			$this->shop->update_option('wpsg_mod_statistics_socialmedia_fb_px', $_REQUEST['wpsg_mod_statistics_socialmedia_fb_px'], false, false, WPSG_SANITIZE_URL);
+			
+			$this->shop->update_option('wpsg_mod_statistics_line_chart_width', $_REQUEST['wpsg_mod_statistics_line_chart_width'], false, false, WPSG_SANITIZE_INT, ['allowEmpty' => true]);
+			$this->shop->update_option('wpsg_mod_statistics_line_chart_height', $_REQUEST['wpsg_mod_statistics_line_chart_height'], false, false, WPSG_SANITIZE_INT, ['allowEmpty' => true]);
+			$this->shop->update_option('wpsg_mod_statistics_pie_chart_width', $_REQUEST['wpsg_mod_statistics_pie_chart_width'], false, false, WPSG_SANITIZE_INT, ['allowEmpty' => true]);
+			$this->shop->update_option('wpsg_mod_statistics_pie_chart_height', $_REQUEST['wpsg_mod_statistics_pie_chart_height'], false, false, WPSG_SANITIZE_INT, ['allowEmpty' => true]);
+			$this->shop->update_option('wpsg_mod_statistics_bar_chart_width', $_REQUEST['wpsg_mod_statistics_bar_chart_width'], false, false, WPSG_SANITIZE_INT, ['allowEmpty' => true]);
+			$this->shop->update_option('wpsg_mod_statistics_bar_chart_height', $_REQUEST['wpsg_mod_statistics_bar_chart_height'], false, false, WPSG_SANITIZE_INT, ['allowEmpty' => true]);
+			$this->shop->update_option('wpsg_mod_statistics_topproductcount', $_REQUEST['wpsg_mod_statistics_topproductcount'], false, false, WPSG_SANITIZE_INT, ['allowEmpty' => true]);
+						
+			$arStatus = [];
+			if (wpsg_isSizedArray($_REQUEST['wpsg_mod_statistics_status'])) foreach ($_REQUEST['wpsg_mod_statistics_status'] as $k => $v) {
+				
+				if ($v === '1') $arStatus[] = $k;
+				
+			}
+			
+			$this->shop->update_option('wpsg_mod_statistics_status', implode(',', $arStatus), false, false, WPSG_SANITIZE_TEXTFIELD);
+
+			$this->shop->update_option('wpsg_mod_statistics_googlekey', $_REQUEST['wpsg_mod_statistics_googlekey'], false, false, WPSG_SANITIZE_TEXTFIELD);
+			$this->shop->update_option('wpsg_mod_statistics_productinterval', $_REQUEST['wpsg_mod_statistics_productinterval'], false, false, WPSG_SANITIZE_INT);
 				
 		}
Index: /wpshopgermany.php
===================================================================
--- /wpshopgermany.php	(revision 7550)
+++ /wpshopgermany.php	(revision 7551)
@@ -60,5 +60,5 @@
  	define('WPSG_TBL_SCALEPRICE', $prefix.'wpsg_scaleprice');
  	define('WPSG_TBL_DELIVERYNOTE', $prefix.'wpsg_deliverynote');
-	
+ 		
 	// WPML Tabellen
 	define('WPSG_TBL_WPML_ICL_STRINGS', $prefix.'icl_strings');
@@ -94,4 +94,5 @@
 	define('WPSG_SANITIZE_USTIDNR', 20);
 	define('WPSG_SANITIZE_ZIP', 21);
+	define('WPSG_SANITIZE_DOMAIN', 22);
  	
 	// Ist in Multiblog manchma nicht definiert :? Sonst ist hier das Verzeichnis drin