Index: /controller/wpsg_AdminController.class.php
===================================================================
--- /controller/wpsg_AdminController.class.php	(revision 7417)
+++ /controller/wpsg_AdminController.class.php	(revision 7418)
@@ -2399,5 +2399,5 @@
 				if ($this->shop->isMultiBlog() && $this->shop->get_option('wpsg_multiblog_standalone', true) != '1') $global = true;
 
-				$_REQUEST['aktiv'] = wpsg_sinput("key", $_REQUEST['aktiv']);
+				$_REQUEST['aktiv'] = wpsg_sinput("wpsg_in_array", $_REQUEST['aktiv'], ['0', '1']);
 
 				if ($this->get_option($_REQUEST['modul'], $global) > 0 && $_REQUEST['aktiv'] == '1' && array_key_exists($_REQUEST['modul'], $this->shop->arModule))
Index: /controller/wpsg_SystemController.class.php
===================================================================
--- /controller/wpsg_SystemController.class.php	(revision 7417)
+++ /controller/wpsg_SystemController.class.php	(revision 7418)
@@ -97,5 +97,5 @@
  
 				$value = call_user_func_array("wpsg_sanitize", $sanitize_params);
-
+				
 				if ($value === false) {
 
@@ -105,12 +105,20 @@
 					$_SESSION['sanitization_err_fields'][$key] = 0;
 
+					// Ich breche das speichern ab, wenn das Feld nicht valide ist
+					return false;
+					
 				}
 
 			}
 
-			if ($force_global)
+			if ($force_global) {
+				
 				update_site_option($key, $value);
-			else
+				
+			} else {
+				
 				update_option($key, $value);
+				
+			}
 			
 			if ($addTrans === true) $GLOBALS['wpsg_sc']->addTranslationString($key, $value);
Index: /lib/functions.inc.php
===================================================================
--- /lib/functions.inc.php	(revision 7417)
+++ /lib/functions.inc.php	(revision 7418)
@@ -547,9 +547,9 @@
 			"wpsg_txt_tbl" => "txt_tbl"			
 		);
- 		 
+		
 		if (!array_key_exists($type, $validTypes)) return wpsg_xss($primary);
 		if (!function_exists($type) && strpos($type, "wpsg_") === false)
 			throw new \wpsg\Exception("Function $type does not exists in the WordPress function pool.");
-				 
+		
 		# Validation (and Sanitization for type txt_tbl)
 		switch($validTypes[$type])
@@ -568,5 +568,5 @@
 			
 			case 'checkbox':
-				
+				 
 				if (!in_array($primary, ['0', '1'])) {
 					
@@ -604,5 +604,5 @@
 				
 				$sanitized_val = wpsg_tf($primary);
-								
+						 
 				break;
 
@@ -621,6 +621,21 @@
 				break;
 				
+			case "int":
+				
+				$nPrimary = (int)$primary;
+				
+				if ($nPrimary !== $primary) {
+					
+					$GLOBALS['wpsg_sc']->addBackendError(__('1UngÃŒltige Eingaben, bitte ÃŒberprÃŒfen Sie die markierten Felder.', 'wpsg'));
+					
+					return false;
+					
+				}
+				
+				break;
+								
 			// Asked for an integer
-			case "int":
+			/*case "int":
+				
 				if($primary[0] === "-")
 				{
@@ -655,6 +670,7 @@
 				else
 				{
-
+					
 					$nPrimary = (int)$primary;
+					
 					if(
 						gettype($nPrimary) !== "integer" ||
@@ -662,8 +678,9 @@
 						wpsg_isSizedString($primary) && !wpsg_isSizedInt($nPrimary) && $primary !== "0"
 					) $err = __("Bitte ÃŒberprÃŒfen sie folgende Eingabe: ");
-
+					
 				}
 				break;
-
+			*/
+			
 			case "txt_tbl":
 				$returnArr = array();
Index: /mods/wpsg_mod_amazon.class.php
===================================================================
--- /mods/wpsg_mod_amazon.class.php	(revision 7417)
+++ /mods/wpsg_mod_amazon.class.php	(revision 7418)
@@ -1,4 +1,4 @@
 <?php
-
+	
 	/**
 	 * Modul fÃŒr "Bezahlen mit Amazon"
@@ -58,20 +58,22 @@
 		{
 			
-			$this->shop->update_option('wpsg_mod_amazon_seller_id', $_REQUEST['wpsg_mod_amazon_seller_id'], false, false, "key");
-			$this->shop->update_option('wpsg_mod_amazon_mws_access_key_id', $_REQUEST['wpsg_mod_amazon_mws_access_key_id'], false, false, "key");
-			$this->shop->update_option('wpsg_mod_amazon_mws_access_key', $_REQUEST['wpsg_mod_amazon_mws_access_key'], false, false, "key");
-			$this->shop->update_option('wpsg_mod_amazon_lwa_client_id', $_REQUEST['wpsg_mod_amazon_lwa_client_id'], false, false, "key");
-			$this->shop->update_option('wpsg_mod_amazon_lwa_client_secret', $_REQUEST['wpsg_mod_amazon_lwa_client_secret'], false, false, "key");
-			$this->shop->update_option('wpsg_mod_amazon_sandbox', $_REQUEST['wpsg_mod_amazon_sandbox'], false, false, "key");
-			
-			$this->shop->update_option('wpsg_mod_amazon_aktiv', $_REQUEST['wpsg_mod_amazon_aktiv'], false, false, "key");
+			$this->shop->update_option('wpsg_mod_amazon_sandbox', $_REQUEST['wpsg_mod_amazon_sandbox'], false, false, "wpsg_checkbox");
+						
+			$this->shop->update_option('wpsg_mod_amazon_seller_id', $_REQUEST['wpsg_mod_amazon_seller_id'], false, false, "text_field");
+			$this->shop->update_option('wpsg_mod_amazon_mws_access_key_id', $_REQUEST['wpsg_mod_amazon_mws_access_key_id'], false, false, "text_field");
+			$this->shop->update_option('wpsg_mod_amazon_mws_access_key', $_REQUEST['wpsg_mod_amazon_mws_access_key'], false, false, "text_field");
+			$this->shop->update_option('wpsg_mod_amazon_lwa_client_id', $_REQUEST['wpsg_mod_amazon_lwa_client_id'], false, false, "text_field");
+			$this->shop->update_option('wpsg_mod_amazon_lwa_client_secret', $_REQUEST['wpsg_mod_amazon_lwa_client_secret'], false, false, "text_field");
+			$this->shop->update_option('wpsg_mod_amazon_sandbox', $_REQUEST['wpsg_mod_amazon_sandbox'], false, false, "wpsg_checkbox");
+			
+			$this->shop->update_option('wpsg_mod_amazon_aktiv', $_REQUEST['wpsg_mod_amazon_aktiv'], false, false, "wspg_checkbox");
 			$this->shop->update_option('wpsg_mod_amazon_name', $_REQUEST['wpsg_mod_amazon_name'], false, true, "text_field");
 			$this->shop->update_option('wpsg_mod_amazon_subject', $_REQUEST['wpsg_mod_amazon_subject'], false, true, "text_field");
 			$this->shop->update_option('wpsg_mod_amazon_hint', $_REQUEST['wpsg_mod_amazon_hint'], false, true, "text_field");
-			$this->shop->update_option('wpsg_mod_amazon_basket', $_REQUEST['wpsg_mod_amazon_basket'], false, false, "key");
-						
-			$this->shop->update_option('wpsg_mod_amazon_gebuehr', $_REQUEST['wpsg_mod_amazon_gebuehr'], false, false, "key", ["isFloat"]);
-			$this->shop->update_option('wpsg_mod_amazon_mwst', $_REQUEST['wpsg_mod_amazon_mwst'], false, false, "key");
-			$this->shop->update_option('wpsg_mod_amazon_mwstland', $_REQUEST['wpsg_mod_amazon_mwstland'], false, false, "key");
+			$this->shop->update_option('wpsg_mod_amazon_basket', $_REQUEST['wpsg_mod_amazon_basket'], false, false, "wspg_checkbox");
+						
+			$this->shop->update_option('wpsg_mod_amazon_gebuehr', $_REQUEST['wpsg_mod_amazon_gebuehr'], false, false, "wpsg_tf");
+			$this->shop->update_option('wpsg_mod_amazon_mwst', $_REQUEST['wpsg_mod_amazon_mwst'], false, false, "wpsg_taxkey");
+			$this->shop->update_option('wpsg_mod_amazon_mwstland', $_REQUEST['wpsg_mod_amazon_mwstland'], false, false, "wspg_checkbox");
 						
 		} // public function settings_save()