Index: /mods/wpsg_mod_abo.class.php
===================================================================
--- /mods/wpsg_mod_abo.class.php	(revision 7542)
+++ /mods/wpsg_mod_abo.class.php	(revision 7543)
@@ -307,18 +307,18 @@
 		{
 
-			$this->shop->update_option('wpsg_mod_abo_url', $_REQUEST['wpsg_mod_abo_url'], false, false, "text_field");
-			$this->shop->update_option('wpsg_mod_abo_perpage', $_REQUEST['wpsg_mod_abo_perpage'], false, false, "key");
-
-			$this->shop->update_option('wpsg_mod_abo_wpsgmodabofirstbuy', $_REQUEST['wpsg_mod_abo_wpsgmodabofirstbuy'], false, false, "key");
-			$this->shop->update_option('wpsg_mod_abo_wpsgmodaboexpiration', $_REQUEST['wpsg_mod_abo_wpsgmodaboexpiration'], false, false, "key");
-			$this->shop->update_option('wpsg_mod_abo_wpsgmodabrebuy', $_REQUEST['wpsg_mod_abo_wpsgmodabrebuy'], false, false, "key");
-			$this->shop->update_option('wpsg_mod_abo_expiremode', $_REQUEST['wpsg_mod_abo_expiremode'], false, false, "key");
-            
-			$this->shop->update_option('wpsg_mod_abo_autoexpire_payment', $_REQUEST['wpsg_mod_abo_autoexpire_payment'], false, false, "key");
-			$this->shop->update_option('wpsg_mod_abo_autoexpire_customermail', $_REQUEST['wpsg_mod_abo_autoexpire_customermail'], false, false, "key");
-			$this->shop->update_option('wpsg_mod_abo_autoexpire_adminmail', $_REQUEST['wpsg_mod_abo_autoexpire_adminmail'], false, false, "key");
-			$this->shop->update_option('wpsg_mod_abo_autoexpire_customer', $_REQUEST['wpsg_mod_abo_autoexpire_customer'], false, false, "key");
-			$this->shop->update_option('wpsg_mod_abo_autoexpire_information', $_REQUEST['wpsg_mod_abo_autoexpire_information'], false, false, "key");
-			$this->shop->update_option('wpsg_mod_abo_autoexpire_informationtime', wpsg_xss($_REQUEST['wpsg_mod_abo_autoexpire_informationtime']));
+			$this->shop->update_option('wpsg_mod_abo_url', $_REQUEST['wpsg_mod_abo_url'], false, false, WPSG_SANITIZE_URL);
+			$this->shop->update_option('wpsg_mod_abo_perpage', $_REQUEST['wpsg_mod_abo_perpage'], false, false, WPSG_SANITIZE_INT);
+
+			$this->shop->update_option('wpsg_mod_abo_wpsgmodabofirstbuy', $_REQUEST['wpsg_mod_abo_wpsgmodabofirstbuy'], false, false, WPSG_SANITIZE_CHECKBOX);
+			$this->shop->update_option('wpsg_mod_abo_wpsgmodaboexpiration', $_REQUEST['wpsg_mod_abo_wpsgmodaboexpiration'], false, false, WPSG_SANITIZE_CHECKBOX);
+			$this->shop->update_option('wpsg_mod_abo_wpsgmodabrebuy', $_REQUEST['wpsg_mod_abo_wpsgmodabrebuy'], false, false, WPSG_SANITIZE_CHECKBOX);
+			$this->shop->update_option('wpsg_mod_abo_expiremode', $_REQUEST['wpsg_mod_abo_expiremode'], false, false, WPSG_SANITIZE_VALUES, [wpsg_mod_abo::EXPIRE_AUTO, wpsg_mod_abo::EXPIRE_MAIL]);
+            
+			$this->shop->update_option('wpsg_mod_abo_autoexpire_payment', $_REQUEST['wpsg_mod_abo_autoexpire_payment'], false, false, WPSG_SANITIZE_VALUES, array_keys($this->shop->arPayment));
+			$this->shop->update_option('wpsg_mod_abo_autoexpire_customermail', $_REQUEST['wpsg_mod_abo_autoexpire_customermail'], false, false, WPSG_SANITIZE_CHECKBOX);
+			$this->shop->update_option('wpsg_mod_abo_autoexpire_adminmail', $_REQUEST['wpsg_mod_abo_autoexpire_adminmail'], false, false, WPSG_SANITIZE_CHECKBOX);
+			$this->shop->update_option('wpsg_mod_abo_autoexpire_customer', $_REQUEST['wpsg_mod_abo_autoexpire_customer'], false, false, WPSG_SANITIZE_VALUES, [wpsg_mod_abo::CUSTOMER_AUTO_DIRECT, wpsg_mod_abo::CUSTOMER_AUTO_MAIL, wpsg_mod_abo::CUSTOMER_AUTO_NOTHING]);
+			$this->shop->update_option('wpsg_mod_abo_autoexpire_information', $_REQUEST['wpsg_mod_abo_autoexpire_information'], false, false, WPSG_SANITIZE_CHECKBOX);
+			$this->shop->update_option('wpsg_mod_abo_autoexpire_informationtime', wpsg_xss($_REQUEST['wpsg_mod_abo_autoexpire_informationtime']), false, false, WPSG_SANITIZE_TEXTFIELD);
             
 		} // public function settings_save()
Index: /mods/wpsg_mod_wirecard.class.php
===================================================================
--- /mods/wpsg_mod_wirecard.class.php	(revision 7542)
+++ /mods/wpsg_mod_wirecard.class.php	(revision 7543)
@@ -128,21 +128,25 @@
 
         } // public function wpsg_deinstall_sites()
-
-		public function checkGeneralBackendError()
-		{
-				
-			if (( !wpsg_isSizedString($this->shop->get_option('wpsg_mod_wirecard_secret')) || !wpsg_isSizedString($this->shop->get_option('wpsg_mod_wirecard_customerid')) ) && wpsg_isSizedInt($this->shop->get_option('wpsg_mod_wirecard_activ')))
-			{
-		
-				$this->shop->addBackendError('nohspc_'.wpsg_translate(
-					wpsg_translate(
-						__('Das Modul "wirecard" ist aktiviert und es wurde kein geheimer SchlÃŒssel und keine Kunden ID hinterlegt. Gehen Sie in die <a href="#1#">Einstellungen</a> des Moduls um den geheimen SchlÃŒssel zu hinterlegen.', 'wpsg'),
-						WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_wirecard'
-					)
-				));
-		
-			}
-				
-		} // public function checkGeneralBackendError()
+ 
+		public function systemcheck(&$arData) {
+			
+			if ($this->shop->get_option('wpsg_mod_wirecard_activ') === '1') {
+				
+				if (!wpsg_isSizedString($this->shop->get_option('wpsg_mod_wirecard_secret')) || !wpsg_isSizedString($this->shop->get_option('wpsg_mod_wirecard_customerid'))) {
+					
+					$arData[] = array(
+						'wpsg_mod_wirecard_apidata',
+						wpsg_ShopController::CHECK_ERROR,
+						wpsg_translate(
+							__('Das Modul "wirecard" ist aktiviert und es wurde kein geheimer SchlÃŒssel und keine Kunden ID hinterlegt. Gehen Sie in die <a href="#1#">Einstellungen</a> des Moduls um den geheimen SchlÃŒssel zu hinterlegen.', 'wpsg'),
+							WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_wirecard'
+						)
+					);
+					
+				}
+				
+			}
+			
+		}
 		
 		public function addPayment(&$arPayment) {