Index: /controller/wpsg_AdminController.class.php =================================================================== --- /controller/wpsg_AdminController.class.php (revision 7436) +++ /controller/wpsg_AdminController.class.php (revision 7437) @@ -273,47 +273,47 @@ { - $this->shop->update_option('wpsg_shopdata_name', $_REQUEST['wpsg_shopdata_name'], false, true, "text_field"); - $this->shop->update_option('wpsg_shopdata_owner', $_REQUEST['wpsg_shopdata_owner'], false, true, "user"); - $this->shop->update_option('wpsg_shopdata_tel', $_REQUEST['wpsg_shopdata_tel'], false, true, "key"); - $this->shop->update_option('wpsg_shopdata_fax', $_REQUEST['wpsg_shopdata_fax'], false, true, "key"); - $this->shop->update_option('wpsg_shopdata_email', $_REQUEST['wpsg_shopdata_email'], false, true, "email"); - $this->shop->update_option('wpsg_shopdata_taxnr', $_REQUEST['wpsg_shopdata_taxnr'], false, true, "key"); - $this->shop->update_option('wpsg_shopdata_ustidnr', $_REQUEST['wpsg_shopdata_ustidnr'], false, true, "text_field"); - - $this->shop->update_option('wpsg_shopdata_street', $_REQUEST['wpsg_shopdata_street'], false, true, "text_field"); - $this->shop->update_option('wpsg_shopdata_zip', $_REQUEST['wpsg_shopdata_zip'], false, true, "key"); - $this->shop->update_option('wpsg_shopdata_city', $_REQUEST['wpsg_shopdata_city'], false, true, "text_field"); - - $this->shop->update_option('wpsg_shopdata_2', $_REQUEST['wpsg_shopdata_2'], false, true, "key"); - $this->shop->update_option('wpsg_shopdata_2_street', $_REQUEST['wpsg_shopdata_2_street'], false, true, "text_field"); - $this->shop->update_option('wpsg_shopdata_2_zip', $_REQUEST['wpsg_shopdata_2_zip'], false, true, "key"); - $this->shop->update_option('wpsg_shopdata_2_city', $_REQUEST['wpsg_shopdata_2_city'], false, true, "text_field"); - $this->shop->update_option('wpsg_shopdata_2_country', $_REQUEST['wpsg_shopdata_2_country'], false, true, "text_field"); - $this->shop->update_option('wpsg_shopdata_2_tel', $_REQUEST['wpsg_shopdata_2_tel'], false, true, "key"); - $this->shop->update_option('wpsg_shopdata_2_fax', $_REQUEST['wpsg_shopdata_2_fax'], false, true, "key"); - $this->shop->update_option('wpsg_shopdata_2_email', $_REQUEST['wpsg_shopdata_2_email'], false, true, "email"); - - $this->shop->update_option('wpsg_shopdata_eu', $_REQUEST['wpsg_shopdata_eu'], false, true, "key"); - $this->shop->update_option('wpsg_shopdata_eu_name', $_REQUEST['wpsg_shopdata_eu_name'], false, true, "user"); - $this->shop->update_option('wpsg_shopdata_eu_tel', $_REQUEST['wpsg_shopdata_eu_tel'], false, true, "key"); - $this->shop->update_option('wpsg_shopdata_eu_fax', $_REQUEST['wpsg_shopdata_eu_fax'], false, true, "key"); - $this->shop->update_option('wpsg_shopdata_eu_email', $_REQUEST['wpsg_shopdata_eu_email'], false, true, "email"); - $this->shop->update_option('wpsg_shopdata_eu_street', $_REQUEST['wpsg_shopdata_eu_street'], false, true, "text_field"); - $this->shop->update_option('wpsg_shopdata_eu_zip', $_REQUEST['wpsg_shopdata_eu_zip'], false, true, "key"); - $this->shop->update_option('wpsg_shopdata_eu_city', $_REQUEST['wpsg_shopdata_eu_city'], false, true, "text_field"); - $this->shop->update_option('wpsg_shopdata_eu_country', $_REQUEST['wpsg_shopdata_eu_country'], false, true, "text_field"); - - $this->shop->update_option('dataprotectioncommissioner', $_REQUEST['dataprotectioncommissioner'], false, true, "key"); - $this->shop->update_option('dataprotectioncommissioner_name', $_REQUEST['dataprotectioncommissioner_name'], false, true, "user"); - $this->shop->update_option('dataprotectioncommissioner_tel', $_REQUEST['dataprotectioncommissioner_tel'], false, true, "key"); - $this->shop->update_option('dataprotectioncommissioner_email', $_REQUEST['dataprotectioncommissioner_email'], false, true, "email"); - $this->shop->update_option('dataprotectioncommissioner_baskettext', $_REQUEST['dataprotectioncommissioner_baskettext'], false, true, "text_field"); - $this->shop->update_option('dataprotectioncommissioner_mailtext', $_REQUEST['dataprotectioncommissioner_mailtext'], false, true, "text_field"); - $this->shop->update_option('dataprotectioncommissioner_texts', $_REQUEST['dataprotectioncommissioner_texts'], false, true, "text_field"); + $this->shop->update_option('wpsg_shopdata_name', $_REQUEST['wpsg_shopdata_name'], false, true, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_shopdata_owner', $_REQUEST['wpsg_shopdata_owner'], false, true, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_shopdata_tel', $_REQUEST['wpsg_shopdata_tel'], false, true, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_shopdata_fax', $_REQUEST['wpsg_shopdata_fax'], false, true, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_shopdata_email', $_REQUEST['wpsg_shopdata_email'], false, true, WSPG_SANITIZE_EMAIL); + $this->shop->update_option('wpsg_shopdata_taxnr', $_REQUEST['wpsg_shopdata_taxnr'], false, true, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_shopdata_ustidnr', $_REQUEST['wpsg_shopdata_ustidnr'], false, true, WPSG_SANITIZE_TEXTFIELD); + + $this->shop->update_option('wpsg_shopdata_street', $_REQUEST['wpsg_shopdata_street'], false, true, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_shopdata_zip', $_REQUEST['wpsg_shopdata_zip'], false, true, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_shopdata_city', $_REQUEST['wpsg_shopdata_city'], false, true, WPSG_SANITIZE_TEXTFIELD); + + $this->shop->update_option('wpsg_shopdata_2', $_REQUEST['wpsg_shopdata_2'], false, true, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_shopdata_2_street', $_REQUEST['wpsg_shopdata_2_street'], false, true, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_shopdata_2_zip', $_REQUEST['wpsg_shopdata_2_zip'], false, true, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_shopdata_2_city', $_REQUEST['wpsg_shopdata_2_city'], false, true, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_shopdata_2_country', $_REQUEST['wpsg_shopdata_2_country'], false, true, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_shopdata_2_tel', $_REQUEST['wpsg_shopdata_2_tel'], false, true, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_shopdata_2_fax', $_REQUEST['wpsg_shopdata_2_fax'], false, true, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_shopdata_2_email', $_REQUEST['wpsg_shopdata_2_email'], false, true, WSPG_SANITIZE_EMAIL); + + $this->shop->update_option('wpsg_shopdata_eu', $_REQUEST['wpsg_shopdata_eu'], false, true, WPSG_SANITIZE_VALUES, [0, 1, 2]); + $this->shop->update_option('wpsg_shopdata_eu_name', $_REQUEST['wpsg_shopdata_eu_name'], false, true, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_shopdata_eu_tel', $_REQUEST['wpsg_shopdata_eu_tel'], false, true, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_shopdata_eu_fax', $_REQUEST['wpsg_shopdata_eu_fax'], false, true, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_shopdata_eu_email', $_REQUEST['wpsg_shopdata_eu_email'], false, true, WSPG_SANITIZE_EMAIL); + $this->shop->update_option('wpsg_shopdata_eu_street', $_REQUEST['wpsg_shopdata_eu_street'], false, true, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_shopdata_eu_zip', $_REQUEST['wpsg_shopdata_eu_zip'], false, true, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_shopdata_eu_city', $_REQUEST['wpsg_shopdata_eu_city'], false, true, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_shopdata_eu_country', $_REQUEST['wpsg_shopdata_eu_country'], false, true, WPSG_SANITIZE_TEXTFIELD); + + $this->shop->update_option('dataprotectioncommissioner', $_REQUEST['dataprotectioncommissioner'], false, true, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('dataprotectioncommissioner_name', $_REQUEST['dataprotectioncommissioner_name'], false, true, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('dataprotectioncommissioner_tel', $_REQUEST['dataprotectioncommissioner_tel'], false, true, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('dataprotectioncommissioner_email', $_REQUEST['dataprotectioncommissioner_email'], false, true, WSPG_SANITIZE_EMAIL); + $this->shop->update_option('dataprotectioncommissioner_baskettext', $_REQUEST['dataprotectioncommissioner_baskettext'], false, true, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('dataprotectioncommissioner_mailtext', $_REQUEST['dataprotectioncommissioner_mailtext'], false, true, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('dataprotectioncommissioner_texts', $_REQUEST['dataprotectioncommissioner_texts'], false, true, WPSG_SANITIZE_TEXTFIELD); - $this->shop->update_option('wpsg_shopdata_bank_name', $_REQUEST['wpsg_shopdata_bank_name'], false, true, "user"); - $this->shop->update_option('wpsg_shopdata_bank_owner', $_REQUEST['wpsg_shopdata_bank_owner'], false, true, "user"); - $this->shop->update_option('wpsg_shopdata_bank_iban', $_REQUEST['wpsg_shopdata_bank_iban'], false, true, "text_field"); - $this->shop->update_option('wpsg_shopdata_bank_bic', $_REQUEST['wpsg_shopdata_bank_bic'], false, true, "text_field"); + $this->shop->update_option('wpsg_shopdata_bank_name', $_REQUEST['wpsg_shopdata_bank_name'], false, true, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_shopdata_bank_owner', $_REQUEST['wpsg_shopdata_bank_owner'], false, true, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_shopdata_bank_iban', $_REQUEST['wpsg_shopdata_bank_iban'], false, true, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_shopdata_bank_bic', $_REQUEST['wpsg_shopdata_bank_bic'], false, true, WPSG_SANITIZE_TEXTFIELD); $this->addBackendMessage(__('Shopdaten erfolgreich gespeichert.', 'wpsg')); @@ -1525,10 +1525,10 @@ { - $this->shop->update_option('wpsg_customerpreset_shipping', $_REQUEST['wpsg_customerpreset_shipping'], false, false, "key"); - $this->shop->update_option('wpsg_customerpreset_payment', $_REQUEST['wpsg_customerpreset_payment'], false, false, "key"); - $this->shop->update_option('wpsg_defaultland', $_REQUEST['wpsg_defaultland'], false, false, "key"); - $this->shop->update_option('wpsg_customerpreset_title', $_REQUEST['wpsg_customerpreset_title'], false, false, "key"); - - $this->update_option('wpsg_kundenvariablen_show', $_REQUEST['wpsg_kundenvariablen_show'], false, false, "key"); + $this->shop->update_option('wpsg_customerpreset_shipping', $_REQUEST['wpsg_customerpreset_shipping'], false, false, WPSG_SANITIZE_INT); + $this->shop->update_option('wpsg_customerpreset_payment', $_REQUEST['wpsg_customerpreset_payment'], false, false, WPSG_SANITIZE_INT); + $this->shop->update_option('wpsg_defaultland', $_REQUEST['wpsg_defaultland'], false, false, WPSG_SANITIZE_INT); + $this->shop->update_option('wpsg_customerpreset_title', $_REQUEST['wpsg_customerpreset_title'], false, false, WPSG_SANITIZE_INT); + + $this->update_option('wpsg_kundenvariablen_show', $_REQUEST['wpsg_kundenvariablen_show'], false, false, WPSG_SANITIZE_INT); foreach ($_REQUEST['pflicht'] as $k => $v) @@ -1830,5 +1830,5 @@ \check_admin_referer('wpsg-save-revocation'); - $this->shop->update_option('wpsg_ps_mailwiderruf', $_REQUEST['wpsg_ps_mailwiderruf'], false, false, "text_field"); + $this->shop->update_option('wpsg_ps_mailwiderruf', $_REQUEST['wpsg_ps_mailwiderruf'], false, false, WPSG_SANITIZE_TEXTAREA); $this->shop->addTranslationString('wpsg_ps_mailwiderruf', wpsg_sinput("text_field", $_REQUEST['wpsg_ps_mailwiderruf'])); @@ -1859,10 +1859,10 @@ } - $this->shop->update_option('wpsg_widerrufsformular_kundenmail', $_REQUEST['wpsg_widerrufsformular_kundenmail'], false, false, "key"); + $this->shop->update_option('wpsg_widerrufsformular_kundenmail', $_REQUEST['wpsg_widerrufsformular_kundenmail'], false, false, WPSG_SANITIZE_CHECKBOX); if ($this->shop->hasMod('wpsg_mod_rechnungen')) { - $this->shop->update_option('wpsg_widerrufsformular_invoice', $_REQUEST['wpsg_widerrufsformular_invoice'], false, false, "key"); + $this->shop->update_option('wpsg_widerrufsformular_invoice', $_REQUEST['wpsg_widerrufsformular_invoice'], false, false, WPSG_SANITIZE_CHECKBOX); } @@ -1871,5 +1871,5 @@ { - $this->shop->update_option('wpsg_widerrufsformular_orderconfirm', $_REQUEST['wpsg_widerrufsformular_orderconfirm'], false, false, "key"); + $this->shop->update_option('wpsg_widerrufsformular_orderconfirm', $_REQUEST['wpsg_widerrufsformular_orderconfirm'], false, false, WPSG_SANITIZE_CHECKBOX); } @@ -2083,18 +2083,18 @@ { - $this->update_option('dataprotectioncommissioner', $_REQUEST['dataprotectioncommissioner'], false, false, "key"); - $this->update_option('dataprotectioncommissioner_name', $_REQUEST['dataprotectioncommissioner_name'], false, false, "user"); - $this->update_option('dataprotectioncommissioner_tel', $_REQUEST['dataprotectioncommissioner_tel'], false, false, "key"); - $this->update_option('dataprotectioncommissioner_email', $_REQUEST['dataprotectioncommissioner_email'], false, false, "email"); - $this->update_option('dataprotectioncommissioner_mailtext', $_REQUEST['dataprotectioncommissioner_mailtext'], false, false, "text_field"); + $this->update_option('dataprotectioncommissioner', $_REQUEST['dataprotectioncommissioner'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->update_option('dataprotectioncommissioner_name', $_REQUEST['dataprotectioncommissioner_name'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->update_option('dataprotectioncommissioner_tel', $_REQUEST['dataprotectioncommissioner_tel'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->update_option('dataprotectioncommissioner_email', $_REQUEST['dataprotectioncommissioner_email'], false, false, WSPG_SANITIZE_EMAIL); + $this->update_option('dataprotectioncommissioner_mailtext', $_REQUEST['dataprotectioncommissioner_mailtext'], false, false, WPSG_SANITIZE_TEXTFIELD); # TODO: @ThoGoe // $this->update_option('dataprotectioncommissioner_baskettext', $_REQUEST['dataprotectioncommissioner_baskettext'], false, false, "text_field"); // $this->update_option('dataprotectioncommissioner_mailtext', $_REQUEST['dataprotectioncommissioner_mailtext'], false, false, "text_field"); - $this->update_option('dataprotectioncommissioner_cookie', $_REQUEST['dataprotectioncommissioner_cookie'], false, false, "key"); - $this->update_option('dataprotectioncommissioner_cookietext', $_REQUEST['dataprotectioncommissioner_cookietext'], false, false, "text_field"); - - $this->update_option('wpsg_customerdatadelete', $_REQUEST['wpsg_customerdatadelete'], false, false, "key"); - $this->update_option('wpsg_customerdatadelete_unit', $_REQUEST['wpsg_customerdatadelete_unit'], false, false, "key"); - $this->update_option('wpsg_customerdatedelete_who', $_REQUEST['wpsg_customerdatedelete_who'], false, false, "key"); + $this->update_option('dataprotectioncommissioner_cookie', $_REQUEST['dataprotectioncommissioner_cookie'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->update_option('dataprotectioncommissioner_cookietext', $_REQUEST['dataprotectioncommissioner_cookietext'], false, false, WPSG_SANITIZE_TEXTFIELD); + + $this->update_option('wpsg_customerdatadelete', $_REQUEST['wpsg_customerdatadelete'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->update_option('wpsg_customerdatadelete_unit', $_REQUEST['wpsg_customerdatadelete_unit'], false, false, WPSG_SANITIZE_VALUES, [0, 1, 2]); + $this->update_option('wpsg_customerdatedelete_who', $_REQUEST['wpsg_customerdatedelete_who'], false, false, WPSG_SANITIZE_VALUES, [0, 1]); $this->addBackendMessage(__('Einstellungen gespeichert.', 'wpsg')); @@ -2107,24 +2107,24 @@ { - $this->update_option('wpsg_salt', $_REQUEST['wpsg_salt'], false, false, "text_field"); - $this->update_option('wpsg_options_nl2br', $_REQUEST['wpsg_options_nl2br'], false, false, "key"); - $this->update_option('wpsg_debugModus', $_REQUEST['wpsg_debugModus'], false, false, "key"); - $this->update_option('wpsg_displayTemplates', $_REQUEST['wpsg_displayTemplates'], false, false, "key"); - $this->update_option('wpsg_displayTemplatesLog', $_REQUEST['wpsg_displayTemplatesLog'], false, false, "key"); - - $this->update_option('wpsg_referer_requesturi', $_REQUEST['wpsg_referer_requesturi'], false, false, "key"); - $this->update_option('wpsg_ignoreuserview', $_REQUEST['wpsg_ignoreuserview'], false, false, "key"); - $this->update_option('wpsg_classicupload', $_REQUEST['wpsg_classicupload'], false, false, "key"); - $this->update_option('wpsg_content_filter_direct', $_REQUEST['wpsg_content_filter_direct'], false, false, "key"); - $this->update_option('wpsg_options_no_rte_apply_filter', $_REQUEST['wpsg_options_no_rte_apply_filter'], false, false, "key"); - $this->update_option('wpsg_options_nl2br_out', $_REQUEST['wpsg_options_nl2br_out'], false, false, "key"); - $this->update_option('wpsg_impexp_clearlinebreak', $_REQUEST['wpsg_impexp_clearlinebreak'], false, false, "key"); - $this->update_option('wpsg_removeWpAutoOp', $_REQUEST['wpsg_removeWpAutoOp'], false, false, "key"); - $this->update_option('wpsg_removeWpTrimExcerpt', $_REQUEST['wpsg_removeWpTrimExcerpt'], false, false, "key"); - $this->update_option('wpsg_lockOrderTables', $_REQUEST['wpsg_lockOrderTables'], false, false, "key"); - $this->update_option('wpsg_autoraw', $_REQUEST['wpsg_autoraw'], false, false, "key"); - $this->update_option('wpsg_nocache', $_REQUEST['wpsg_nocache'], false, false, "key"); - $this->update_option('wpsg_autolineending', $_REQUEST['wpsg_autolineending'], false, false, "key"); - $this->update_option('wpsg_geo_determination', $_REQUEST['wpsg_geo_determination'], false, false, "key"); + $this->update_option('wpsg_salt', $_REQUEST['wpsg_salt'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->update_option('wpsg_options_nl2br', $_REQUEST['wpsg_options_nl2br'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->update_option('wpsg_debugModus', $_REQUEST['wpsg_debugModus'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->update_option('wpsg_displayTemplates', $_REQUEST['wpsg_displayTemplates'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->update_option('wpsg_displayTemplatesLog', $_REQUEST['wpsg_displayTemplatesLog'], false, false, WPSG_SANITIZE_CHECKBOX); + + $this->update_option('wpsg_referer_requesturi', $_REQUEST['wpsg_referer_requesturi'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->update_option('wpsg_ignoreuserview', $_REQUEST['wpsg_ignoreuserview'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->update_option('wpsg_classicupload', $_REQUEST['wpsg_classicupload'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->update_option('wpsg_content_filter_direct', $_REQUEST['wpsg_content_filter_direct'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->update_option('wpsg_options_no_rte_apply_filter', $_REQUEST['wpsg_options_no_rte_apply_filter'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->update_option('wpsg_options_nl2br_out', $_REQUEST['wpsg_options_nl2br_out'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->update_option('wpsg_impexp_clearlinebreak', $_REQUEST['wpsg_impexp_clearlinebreak'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->update_option('wpsg_removeWpAutoOp', $_REQUEST['wpsg_removeWpAutoOp'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->update_option('wpsg_removeWpTrimExcerpt', $_REQUEST['wpsg_removeWpTrimExcerpt'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->update_option('wpsg_lockOrderTables', $_REQUEST['wpsg_lockOrderTables'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->update_option('wpsg_autoraw', $_REQUEST['wpsg_autoraw'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->update_option('wpsg_nocache', $_REQUEST['wpsg_nocache'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->update_option('wpsg_autolineending', $_REQUEST['wpsg_autolineending'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->update_option('wpsg_geo_determination', $_REQUEST['wpsg_geo_determination'], false, false, WPSG_SANITIZE_VALUES, [0, 3, 4]); $this->addBackendMessage(__('Einstellungen gespeichert.', 'wpsg')); @@ -2136,15 +2136,15 @@ { - $this->update_option('wpsg_imagehandler_basketimage', $_REQUEST['wpsg_imagehandler_basketimage'], false, false, "key"); - $this->update_option('wpsg_imagehandler_overviewimage', $_REQUEST['wpsg_imagehandler_overviewimage'], false, false, "key"); - $this->update_option('wpsg_showMwstAlways', $_REQUEST['wpsg_showMwstAlways'], false, false, "key"); - $this->update_option('wpsg_form_validation', $_REQUEST['wpsg_form_validation'], false, false, "key"); - $this->update_option('wpsg_showArticelnumber', $_REQUEST['wpsg_showArticelnumber'], false, false, "key"); - $this->update_option('wpsg_ProductPositionNumber', $_REQUEST['wpsg_ProductPositionNumber'], false, false, "key"); - $this->update_option('wpsg_ProductPositionNumber', $_REQUEST['wpsg_ProductPositionNumber'], false, false, "key"); - $this->update_option('wpsg_hideBasketCountrySelect', $_REQUEST['wpsg_hideBasketCountrySelect'], false, false, "key"); - - $this->update_option('wpsg_alternativeProductDetailDesign', $_REQUEST['wpsg_alternativeProductDetailDesign'], false, false, "wpsg_checkbox"); - $this->update_option('wpsg_alternativeOrderDesign', $_REQUEST['wpsg_alternativeOrderDesign'], false, false, "wpsg_checkbox"); + $this->update_option('wpsg_imagehandler_basketimage', $_REQUEST['wpsg_imagehandler_basketimage'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->update_option('wpsg_imagehandler_overviewimage', $_REQUEST['wpsg_imagehandler_overviewimage'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->update_option('wpsg_showMwstAlways', $_REQUEST['wpsg_showMwstAlways'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->update_option('wpsg_form_validation', $_REQUEST['wpsg_form_validation'], false, false, WPSG_SANITIZE_VALUES, [0, 1, 2]); + $this->update_option('wpsg_showArticelnumber', $_REQUEST['wpsg_showArticelnumber'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->update_option('wpsg_ProductPositionNumber', $_REQUEST['wpsg_ProductPositionNumber'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->update_option('wpsg_ProductPositionNumber', $_REQUEST['wpsg_ProductPositionNumber'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->update_option('wpsg_hideBasketCountrySelect', $_REQUEST['wpsg_hideBasketCountrySelect'], false, false, WPSG_SANITIZE_CHECKBOX); + + $this->update_option('wpsg_alternativeProductDetailDesign', $_REQUEST['wpsg_alternativeProductDetailDesign'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->update_option('wpsg_alternativeOrderDesign', $_REQUEST['wpsg_alternativeOrderDesign'], false, false, WPSG_SANITIZE_CHECKBOX); $this->shop->callMods('admin_presentation_submit'); @@ -2302,11 +2302,11 @@ { - $this->update_option('wpsg_load_css', $_REQUEST['wpsg_load_css'], false, false, "key"); - $this->update_option('wpsg_load_jquery', $_REQUEST['wpsg_load_jquery'], false, false, "key"); - $this->update_option('wpsg_load_thickbox_js', $_REQUEST['wpsg_load_thickbox_js'], false, false, "key"); - $this->update_option('wpsg_load_thickbox_css', $_REQUEST['wpsg_load_thickbox_css'], false, false, "key"); - $this->update_option('wpsg_load_validierung_js', $_REQUEST['wpsg_load_validierung_js'], false, false, "key"); - $this->update_option('wpsg_load_validierung_css', $_REQUEST['wpsg_load_validierung_css'], false, false, "key"); - $this->update_option('wpsg_load_bootstrap_glyphfont_css', $_REQUEST['wpsg_load_bootstrap_glyphfont_css'], false, false, "key"); + $this->update_option('wpsg_load_css', $_REQUEST['wpsg_load_css'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->update_option('wpsg_load_jquery', $_REQUEST['wpsg_load_jquery'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->update_option('wpsg_load_thickbox_js', $_REQUEST['wpsg_load_thickbox_js'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->update_option('wpsg_load_thickbox_css', $_REQUEST['wpsg_load_thickbox_css'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->update_option('wpsg_load_validierung_js', $_REQUEST['wpsg_load_validierung_js'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->update_option('wpsg_load_validierung_css', $_REQUEST['wpsg_load_validierung_css'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->update_option('wpsg_load_bootstrap_glyphfont_css', $_REQUEST['wpsg_load_bootstrap_glyphfont_css'], false, false, WPSG_SANITIZE_CHECKBOX); $this->shop->callMods('admin_includes_save'); @@ -2331,10 +2331,10 @@ { - $this->update_option('wpsg_kleinunternehmer', $_REQUEST['wpsg_kleinunternehmer'], false, false, "key"); - $this->update_option('wpsg_kleinunternehmer_text', $_REQUEST['wpsg_kleinunternehmer_text'], false, false, "text_field"); - $this->update_option('wpsg_preisangaben', $_REQUEST['wpsg_preisangaben'], false, false, "key"); - $this->update_option('wpsg_preisangaben_frontend', $_REQUEST['wpsg_preisangaben_frontend'], false, false, "key"); - $this->update_option('wpsg_hideemptyshipping', $_REQUEST['wpsg_hideemptyshipping'], false, false, "key"); - $this->update_option('wpsg_hideemptypayment', $_REQUEST['wpsg_hideemptypayment'], false, false, "key"); + $this->update_option('wpsg_kleinunternehmer', $_REQUEST['wpsg_kleinunternehmer'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->update_option('wpsg_kleinunternehmer_text', $_REQUEST['wpsg_kleinunternehmer_text'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->update_option('wpsg_preisangaben', $_REQUEST['wpsg_preisangaben'], false, false, WPSG_SANITIZE_VALUES, ['1, 0']); + $this->update_option('wpsg_preisangaben_frontend', $_REQUEST['wpsg_preisangaben_frontend'], false, false, WPSG_SANITIZE_VALUES, ['1, 0']); + $this->update_option('wpsg_hideemptyshipping', $_REQUEST['wpsg_hideemptyshipping'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->update_option('wpsg_hideemptypayment', $_REQUEST['wpsg_hideemptypayment'], false, false, WPSG_SANITIZE_CHECKBOX); $this->addBackendMessage(__('Einstellung gespeichert.', 'wpsg')); Index: /model/wpsg_product.class.php =================================================================== --- /model/wpsg_product.class.php (revision 7436) +++ /model/wpsg_product.class.php (revision 7437) @@ -371,28 +371,29 @@ public function getOldPrice($taxView = false) { - - if ($taxView === false) - { - - if (is_admin()) $taxView = $this->shop->getBackendTaxview(); - else $taxView = $this->shop->getFrontendTaxview(); - - } - - $oldprice = wpsg_tf($this->oldprice); - - // Rabatt Ìberschreibt die Produkteinstellung - if ($this->shop->hasMod('wpsg_mod_discount') && wpsg_isSizedInt($this->shop->get_option('wpsg_mod_discount_show')) && isset($this->loadedData['preis_prediscount'])) - { - - // Rabatt - $oldprice = $this->loadedData['preis_prediscount']; - - } - - if ($oldprice > 0) return $this->calculateTaxViewPrice($oldprice, $taxView); - else return false; - + + if ($taxView === false) + { + + if (is_admin()) $taxView = $this->shop->getBackendTaxview(); + else $taxView = $this->shop->getFrontendTaxview(); + + } + + $oldprice = wpsg_tf($this->oldprice); + + // Rabatt Ìberschreibt die Produkteinstellung + if ($this->shop->hasMod('wpsg_mod_discount') && wpsg_isSizedInt($this->shop->get_option('wpsg_mod_discount_show')) && isset($this->loadedData['preis_prediscount'])) + { + + // Rabatt + $oldprice = $this->loadedData['preis_prediscount']; + + } + + if ($oldprice > 0) return $this->calculateTaxViewPrice($oldprice, $taxView); + else return false; + } + public function getMinPrice($product_key = false) Index: /mods/wpsg_mod_abo.class.php =================================================================== --- /mods/wpsg_mod_abo.class.php (revision 7436) +++ /mods/wpsg_mod_abo.class.php (revision 7437) @@ -371,5 +371,5 @@ $product_data['wpsg_mod_abo_activ'] = '1'; - $product_data['wpsg_mod_abo_price'] = wpsg_sinput("key", $_REQUEST['wpsg_mod_abo_price'], "isFloat"); + $product_data['wpsg_mod_abo_price'] = wpsg_sinput("key", $_REQUEST['wpsg_mod_abo_price'], WPSG_SANITIZE_FLOAT); $product_data['wpsg_mod_abo_durration'] = wpsg_sinput("key", $_REQUEST['wpsg_mod_abo_durration']); $product_data['wpsg_mod_abo_url'] = wpsg_sinput("text_field", $_REQUEST['wpsg_mod_abo_url']); Index: /mods/wpsg_mod_addressvalidation.class.php =================================================================== --- /mods/wpsg_mod_addressvalidation.class.php (revision 7436) +++ /mods/wpsg_mod_addressvalidation.class.php (revision 7437) @@ -48,5 +48,5 @@ { - $this->shop->update_option('wpsg_mod_addressvalidation_apikey', $_REQUEST['wpsg_mod_addressvalidation_apikey'], false, false, "text_field"); + $this->shop->update_option('wpsg_mod_addressvalidation_apikey', $_REQUEST['wpsg_mod_addressvalidation_apikey'], false, false, WPSG_SANITIZE_TEXTFIELD); } // public function settings_save() Index: /mods/wpsg_mod_amazon.class.php =================================================================== --- /mods/wpsg_mod_amazon.class.php (revision 7436) +++ /mods/wpsg_mod_amazon.class.php (revision 7437) @@ -58,22 +58,22 @@ { - $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, "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"); + $this->shop->update_option('wpsg_mod_amazon_sandbox', $_REQUEST['wpsg_mod_amazon_sandbox'], false, false, WPSG_SANITIZE_CHECKBOX); + + $this->shop->update_option('wpsg_mod_amazon_seller_id', $_REQUEST['wpsg_mod_amazon_seller_id'], false, false, WPSG_SANITIZE_APIKEY); + $this->shop->update_option('wpsg_mod_amazon_mws_access_key_id', $_REQUEST['wpsg_mod_amazon_mws_access_key_id'], false, false, WPSG_SANITIZE_APIKEY); + $this->shop->update_option('wpsg_mod_amazon_mws_access_key', $_REQUEST['wpsg_mod_amazon_mws_access_key'], false, false, WPSG_SANITIZE_APIKEY); + $this->shop->update_option('wpsg_mod_amazon_lwa_client_id', $_REQUEST['wpsg_mod_amazon_lwa_client_id'], false, false, WPSG_SANITIZE_APIKEY); + $this->shop->update_option('wpsg_mod_amazon_lwa_client_secret', $_REQUEST['wpsg_mod_amazon_lwa_client_secret'], false, false, WPSG_SANITIZE_APIKEY); + $this->shop->update_option('wpsg_mod_amazon_sandbox', $_REQUEST['wpsg_mod_amazon_sandbox'], false, false, WPSG_SANITIZE_CHECKBOX); + + $this->shop->update_option('wpsg_mod_amazon_aktiv', $_REQUEST['wpsg_mod_amazon_aktiv'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_amazon_name', $_REQUEST['wpsg_mod_amazon_name'], false, true, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_amazon_subject', $_REQUEST['wpsg_mod_amazon_subject'], false, true, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_amazon_hint', $_REQUEST['wpsg_mod_amazon_hint'], false, true, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_amazon_basket', $_REQUEST['wpsg_mod_amazon_basket'], false, false, WPSG_SANITIZE_CHECKBOX); + + $this->shop->update_option('wpsg_mod_amazon_gebuehr', $_REQUEST['wpsg_mod_amazon_gebuehr'], false, false, WPSG_SANITIZE_FLOAT); + $this->shop->update_option('wpsg_mod_amazon_mwst', $_REQUEST['wpsg_mod_amazon_mwst'], false, false, WPSG_SANITIZE_TAXKEY); + $this->shop->update_option('wpsg_mod_amazon_mwstland', $_REQUEST['wpsg_mod_amazon_mwstland'], false, false, WPSG_SANITIZE_CHECKBOX); } // public function settings_save() Index: /mods/wpsg_mod_autodebit.class.php =================================================================== --- /mods/wpsg_mod_autodebit.class.php (revision 7436) +++ /mods/wpsg_mod_autodebit.class.php (revision 7437) @@ -108,12 +108,12 @@ { - $this->shop->update_option('wpsg_mod_autodebit_bezeichnung', $_REQUEST['wpsg_mod_autodebit_bezeichnung'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_autodebit_aktiv', $_REQUEST['wpsg_mod_autodebit_aktiv'], false, false, "wpsg_checkbox"); - $this->shop->update_option('wpsg_mod_autodebit_hint', $_REQUEST['wpsg_mod_autodebit_hint'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_autodebit_gebuehr', $_REQUEST['wpsg_mod_autodebit_gebuehr'], false, false, "wpsg_tf"); - $this->shop->update_option('wpsg_mod_autodebit_mwst', $_REQUEST['wpsg_mod_autodebit_mwst'], false, false, "wpsg_taxkey"); - $this->shop->update_option('wpsg_mod_autodebit_mwstland', $_REQUEST['wpsg_mod_autodebit_mwstland'], false, false, "wpsg_checkbox"); - $this->shop->update_option('wpsg_mod_autodebit_iban', $_REQUEST['wpsg_mod_autodebit_iban'], false, false, "wpsg_checkbox"); - $this->shop->update_option('wpsg_mod_autodebit_bic', $_REQUEST['wpsg_mod_autodebit_bic'], false, false, "wpsg_checkbox"); + $this->shop->update_option('wpsg_mod_autodebit_bezeichnung', $_REQUEST['wpsg_mod_autodebit_bezeichnung'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_autodebit_aktiv', $_REQUEST['wpsg_mod_autodebit_aktiv'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_autodebit_hint', $_REQUEST['wpsg_mod_autodebit_hint'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_autodebit_gebuehr', $_REQUEST['wpsg_mod_autodebit_gebuehr'], false, false, WPSG_SANITIZE_FLOAT); + $this->shop->update_option('wpsg_mod_autodebit_mwst', $_REQUEST['wpsg_mod_autodebit_mwst'], false, false, WPSG_SANITIZE_TAXKEY); + $this->shop->update_option('wpsg_mod_autodebit_mwstland', $_REQUEST['wpsg_mod_autodebit_mwstland'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_autodebit_iban', $_REQUEST['wpsg_mod_autodebit_iban'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_autodebit_bic', $_REQUEST['wpsg_mod_autodebit_bic'], false, false, WPSG_SANITIZE_CHECKBOX); } // public function settings_save() Index: /mods/wpsg_mod_basketteaser.class.php =================================================================== --- /mods/wpsg_mod_basketteaser.class.php (revision 7436) +++ /mods/wpsg_mod_basketteaser.class.php (revision 7437) @@ -56,5 +56,5 @@ ]); - $this->shop->update_option('wpsg_mod_basketteaser_show', $_REQUEST['wpsg_mod_basketteaser_show'], false, false, "key"); + $this->shop->update_option('wpsg_mod_basketteaser_show', $_REQUEST['wpsg_mod_basketteaser_show'], false, false, WPSG_SANITIZE_VALUES, ['0', '1']); } // public function settings_save() Index: /mods/wpsg_mod_billsafe.class.php =================================================================== --- /mods/wpsg_mod_billsafe.class.php (revision 7436) +++ /mods/wpsg_mod_billsafe.class.php (revision 7437) @@ -91,32 +91,32 @@ { - $this->shop->update_option('wpsg_mod_billsafe_bezeichnung', $_REQUEST['wpsg_mod_billsafe_bezeichnung'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_billsafe_aktiv', $_REQUEST['wpsg_mod_billsafe_aktiv'], false, false, "key"); - $this->shop->update_option('wpsg_mod_billsafe_aktiv_from', $_REQUEST['wpsg_mod_billsafe_aktiv_from'], false, false, "key", ["isFloat"]); - $this->shop->update_option('wpsg_mod_billsafe_aktiv_to', $_REQUEST['wpsg_mod_billsafe_aktiv_to'], false, false, "key", ["isFloat"]); - $this->shop->update_option('wpsg_mod_billsafe_hint', $_REQUEST['wpsg_mod_billsafe_hint'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_billsafe_logo', $_REQUEST['wpsg_mod_billsafe_logo'], false, false, "text_field"); - - $this->shop->update_option('wpsg_mod_billsafe_vendorID', $_REQUEST['wpsg_mod_billsafe_vendorID'], false, false, "user"); + $this->shop->update_option('wpsg_mod_billsafe_bezeichnung', $_REQUEST['wpsg_mod_billsafe_bezeichnung'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_billsafe_aktiv', $_REQUEST['wpsg_mod_billsafe_aktiv'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_billsafe_aktiv_from', $_REQUEST['wpsg_mod_billsafe_aktiv_from'], false, false, WPSG_SANITIZE_FLOAT); + $this->shop->update_option('wpsg_mod_billsafe_aktiv_to', $_REQUEST['wpsg_mod_billsafe_aktiv_to'], false, false, WPSG_SANITIZE_FLOAT); + $this->shop->update_option('wpsg_mod_billsafe_hint', $_REQUEST['wpsg_mod_billsafe_hint'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_billsafe_logo', $_REQUEST['wpsg_mod_billsafe_logo'], false, false, WPSG_SANITIZE_TEXTFIELD); + + $this->shop->update_option('wpsg_mod_billsafe_vendorID', $_REQUEST['wpsg_mod_billsafe_vendorID'], false, false, WPSG_SANITIZE_APIKEY); $this->shop->update_option('wpsg_mod_billsafe_licence', wpsg_xss($_REQUEST['wpsg_mod_billsafe_licence'])); - $this->shop->update_option('wpsg_mod_billsafe_sandbox', $_REQUEST['wpsg_mod_billsafe_sandbox'], false, false, "key"); + $this->shop->update_option('wpsg_mod_billsafe_sandbox', $_REQUEST['wpsg_mod_billsafe_sandbox'], false, false, WPSG_SANITIZE_CHECKBOX); $this->shop->update_option('wpsg_mod_billsafe_licencesandbox', wpsg_xss($_REQUEST['wpsg_mod_billsafe_licencesandbox'])); - $this->shop->update_option('wpsg_mod_billsafe_gebuehr', $_REQUEST['wpsg_mod_billsafe_gebuehr'], false, false, "key", ["isFloat"]); - $this->shop->update_option('wpsg_mod_billsafe_mwst', $_REQUEST['wpsg_mod_billsafe_mwst'], false, false, "key"); - $this->shop->update_option('wpsg_mod_billsafe_mwstland', $_REQUEST['wpsg_mod_billsafe_mwstland'], false, false, "key"); + $this->shop->update_option('wpsg_mod_billsafe_gebuehr', $_REQUEST['wpsg_mod_billsafe_gebuehr'], false, false, WPSG_SANITIZE_FLOAT); + $this->shop->update_option('wpsg_mod_billsafe_mwst', $_REQUEST['wpsg_mod_billsafe_mwst'], false, false, WPSG_SANITIZE_TAXKEY); + $this->shop->update_option('wpsg_mod_billsafe_mwstland', $_REQUEST['wpsg_mod_billsafe_mwstland'], false, false, WPSG_SANITIZE_CHECKBOX); $this->shop->update_option('wpsg_mod_billsafe_currency', wpsg_xss($_REQUEST['wpsg_mod_billsafe_currency'])); - $this->shop->update_option('wpsg_mod_billsafe_autorun', $_REQUEST['wpsg_mod_billsafe_autorun'], false, false, "key"); - $this->shop->update_option('wpsg_mod_billsafe_precheck', $_REQUEST['wpsg_mod_billsafe_precheck'], false, false, "key"); - $this->shop->update_option('wpsg_mod_billsafe_success', $_REQUEST['wpsg_mod_billsafe_success'], false, false, "key"); - $this->shop->update_option('wpsg_mod_billsafe_error', $_REQUEST['wpsg_mod_billsafe_error'], false, false, "key"); - - $this->shop->createPage(__('Ergebnis Ihrer Billsafe Zahlung', 'wpsg'), 'wpsg_mod_billsafe_success', wpsg_sinput("key", $_REQUEST['wpsg_mod_billsafe_success'])); - $this->shop->createPage(__('Fehlgeschlagene Billsafe Zahlung', 'wpsg'), 'wpsg_mod_billsafe_error', wpsg_sinput("key", $_REQUEST['wpsg_mod_billsafe_error'])); - - $this->shop->addTranslationString('wpsg_mod_billsafe_bezeichnung', wpsg_sinput("text_field", $_REQUEST['wpsg_mod_billsafe_bezeichnung'])); - $this->shop->addTranslationString('wpsg_mod_billsafe_aktiv', wpsg_sinput("key", $_REQUEST['wpsg_mod_billsafe_aktiv'])); + $this->shop->update_option('wpsg_mod_billsafe_autorun', $_REQUEST['wpsg_mod_billsafe_autorun'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_billsafe_precheck', $_REQUEST['wpsg_mod_billsafe_precheck'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_billsafe_success', $_REQUEST['wpsg_mod_billsafe_success'], false, false, WPSG_SANITIZE_INT); + $this->shop->update_option('wpsg_mod_billsafe_error', $_REQUEST['wpsg_mod_billsafe_error'], false, false, WPSG_SANITIZE_INT); + + $this->shop->createPage(__('Ergebnis Ihrer Billsafe Zahlung', 'wpsg'), 'wpsg_mod_billsafe_success', wpsg_sinput(WPSG_SANITIZE_INT, $_REQUEST['wpsg_mod_billsafe_success'])); + $this->shop->createPage(__('Fehlgeschlagene Billsafe Zahlung', 'wpsg'), 'wpsg_mod_billsafe_error', wpsg_sinput(WPSG_SANITIZE_INT, $_REQUEST['wpsg_mod_billsafe_error'])); + + $this->shop->addTranslationString('wpsg_mod_billsafe_bezeichnung', wpsg_sinput(WPSG_SANITIZE_TEXTFIELD, $_REQUEST['wpsg_mod_billsafe_bezeichnung'])); + $this->shop->addTranslationString('wpsg_mod_billsafe_aktiv', wpsg_sinput(WPSG_SANITIZE_CHECKBOX, $_REQUEST['wpsg_mod_billsafe_aktiv'])); } // public function settings_save() Index: /mods/wpsg_mod_coverletter.class.php =================================================================== --- /mods/wpsg_mod_coverletter.class.php (revision 7436) +++ /mods/wpsg_mod_coverletter.class.php (revision 7437) @@ -190,11 +190,37 @@ } - $this->shop->update_option('wpsg_mod_coverletter_subject', wpsg_getStr($_REQUEST['wpsg_mod_coverletter_subject'],'Anschreiben'), false, false, "text_field"); - $this->shop->update_option('wpsg_mod_coverletter_text', wpsg_getStr($_REQUEST['wpsg_mod_coverletter_text']), false, false, "text_field"); + $bCheckTextField = false; + + foreach ($_REQUEST['text'] as $k => $v) { + + if ( + !in_array($k, ['firma', 'name', 'strasse', 'plzort', 'land', 'tel', 'fax', 'mail', 'web', 'strnr', 'ustidnr', 'knr', 'blz', 'bank', 'user1', 'user2', 'user3', 'user4', 'user5']) || + !wpsg_checkInput($v['text'], WPSG_SANITIZE_TEXTFIELD) || + !wpsg_checkInput($v['x'], WPSG_SANITIZE_FLOAT) || + !wpsg_checkInput($v['y'], WPSG_SANITIZE_FLOAT) || + !wpsg_checkInput($v['color'], WPSG_SANITIZE_HEXCOLOR) || + !wpsg_checkInput($v['fontsize'],WPSG_SANITIZE_INT) + ) { + + $this->shop->addBackendError(__('Bitte ÌberprÌfen Sie die Textfelder.', 'wpsg')); + $bCheckTextField = true; + + } + + } + + if ($bCheckTextField) { + + $this->shop->update_option("wpsg_mod_coverletter_texte", $_REQUEST['text']); + + } + + $this->shop->update_option('wpsg_mod_coverletter_subject', wpsg_getStr($_REQUEST['wpsg_mod_coverletter_subject'],'Anschreiben'), false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_coverletter_text', wpsg_getStr($_REQUEST['wpsg_mod_coverletter_text']), false, false, WPSG_SANITIZE_TEXTFIELD); $this->shop->update_option("wpsg_mod_coverletter_logo_position", $wpsg_mod_coverletter_logo_position ? $wpsg_mod_coverletter_logo_position : null); - $this->shop->update_option("wpsg_mod_coverletter_logo_transparency", $_REQUEST['wpsg_mod_coverletter_logo_transparency'], false, false, "key", ["isFloat"]); - - $this->shop->update_option('wpsg_mod_coverletter_logo_x', $_REQUEST['wpsg_mod_coverletter_logo_x'], false, false, "key"); - $this->shop->update_option('wpsg_mod_coverletter_logo_y', $_REQUEST['wpsg_mod_coverletter_logo_y'], false, false, "key"); + $this->shop->update_option("wpsg_mod_coverletter_logo_transparency", $_REQUEST['wpsg_mod_coverletter_logo_transparency'], false, false, WPSG_SANITIZE_FLOAT); + + $this->shop->update_option('wpsg_mod_coverletter_logo_x', $_REQUEST['wpsg_mod_coverletter_logo_x'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_coverletter_logo_y', $_REQUEST['wpsg_mod_coverletter_logo_y'], false, false, WPSG_SANITIZE_TEXTFIELD); } // public function settings_save() Index: /mods/wpsg_mod_creditcard.class.php =================================================================== --- /mods/wpsg_mod_creditcard.class.php (revision 7436) +++ /mods/wpsg_mod_creditcard.class.php (revision 7437) @@ -65,11 +65,11 @@ { - $this->shop->update_option('wpsg_mod_creditcard_bezeichnung', $_REQUEST['wpsg_mod_creditcard_bezeichnung'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_creditcard_aktiv', $_REQUEST['wpsg_mod_creditcard_aktiv'], false, false, "key"); - $this->shop->update_option('wpsg_mod_creditcard_hint', $_REQUEST['wpsg_mod_creditcard_hint'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_creditcard_gebuehr', $_REQUEST['wpsg_mod_creditcard_gebuehr'], false, false, "key", ["isFloat"]); - $this->shop->update_option('wpsg_mod_creditcard_mwst', $_REQUEST['wpsg_mod_creditcard_mwst'], false, false, "key"); - $this->shop->update_option('wpsg_mod_creditcard_mwstland', $_REQUEST['wpsg_mod_creditcard_mwstland'], false, false, "key"); - $this->shop->update_option('wpsg_mod_creditcard_schluessel', $_REQUEST['wpsg_mod_creditcard_schluessel'], false, false, "text_field"); + $this->shop->update_option('wpsg_mod_creditcard_bezeichnung', $_REQUEST['wpsg_mod_creditcard_bezeichnung'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_creditcard_aktiv', $_REQUEST['wpsg_mod_creditcard_aktiv'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_creditcard_hint', $_REQUEST['wpsg_mod_creditcard_hint'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_creditcard_gebuehr', $_REQUEST['wpsg_mod_creditcard_gebuehr'], false, false, WPSG_SANITIZE_FLOAT); + $this->shop->update_option('wpsg_mod_creditcard_mwst', $_REQUEST['wpsg_mod_creditcard_mwst'], false, false, WPSG_SANITIZE_TAXKEY); + $this->shop->update_option('wpsg_mod_creditcard_mwstland', $_REQUEST['wpsg_mod_creditcard_mwstland'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_creditcard_schluessel', $_REQUEST['wpsg_mod_creditcard_schluessel'], false, false, WPSG_SANITIZE_TEXTFIELD); } // public function settings_save() Index: /mods/wpsg_mod_crefopay.class.php =================================================================== --- /mods/wpsg_mod_crefopay.class.php (revision 7436) +++ /mods/wpsg_mod_crefopay.class.php (revision 7437) @@ -117,18 +117,18 @@ { - $this->shop->update_option('wpsg_mod_crefopay_merchantID', $_REQUEST['wpsg_mod_crefopay_merchantID'], false, false, "key"); - $this->shop->update_option('wpsg_mod_crefopay_shopID', $_REQUEST['wpsg_mod_crefopay_shopID'], false, false, "key"); - $this->shop->update_option('wpsg_mod_crefopay_sandbox', $_REQUEST['wpsg_mod_crefopay_sandbox'], false, false, "key"); - $this->shop->update_option('wpsg_mod_crefopay_privateKey', $_REQUEST['wpsg_mod_crefopay_privateKey'], false, false, "key"); - $this->shop->update_option('wpsg_mod_crefopay_autocapture', $_REQUEST['wpsg_mod_crefopay_autocapture'], false, false, "key"); - $this->shop->update_option('wpsg_mod_crefopay_capturestatus', $_REQUEST['wpsg_mod_crefopay_capturestatus'], false, false, "key"); - $this->shop->update_option('wpsg_mod_crefopay_riskclass', $_REQUEST['wpsg_mod_crefopay_riskclass'], false, false, "key"); - $this->shop->update_option('wpsg_mod_crefopay_currency', $_REQUEST['wpsg_mod_crefopay_currency'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_crefopay_frameheight', $_REQUEST['wpsg_mod_crefopay_frameheight'], false, false, "key", ["isFloat"]); + $this->shop->update_option('wpsg_mod_crefopay_merchantID', $_REQUEST['wpsg_mod_crefopay_merchantID'], false, false, WPSG_SANITIZE_APIKEY); + $this->shop->update_option('wpsg_mod_crefopay_shopID', $_REQUEST['wpsg_mod_crefopay_shopID'], false, false, WPSG_SANITIZE_APIKEY); + $this->shop->update_option('wpsg_mod_crefopay_sandbox', $_REQUEST['wpsg_mod_crefopay_sandbox'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_crefopay_privateKey', $_REQUEST['wpsg_mod_crefopay_privateKey'], false, false, WPSG_SANITIZE_APIKEY); + $this->shop->update_option('wpsg_mod_crefopay_autocapture', $_REQUEST['wpsg_mod_crefopay_autocapture'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_crefopay_capturestatus', $_REQUEST['wpsg_mod_crefopay_capturestatus'], false, false, WPSG_SANITIZE_INT); + $this->shop->update_option('wpsg_mod_crefopay_riskclass', $_REQUEST['wpsg_mod_crefopay_riskclass'], false, false, WPSG_SANITIZE_VALUES, ['0', '1', '2']); + $this->shop->update_option('wpsg_mod_crefopay_currency', $_REQUEST['wpsg_mod_crefopay_currency'], false, false, WPSG_SANITIZE_INT); + $this->shop->update_option('wpsg_mod_crefopay_frameheight', $_REQUEST['wpsg_mod_crefopay_frameheight'], false, false, WPSG_SANITIZE_FLOAT); // Mapping speichern - foreach ($this->transactionMapping as $crefopay_state => $wpsg_state) $this->shop->update_option('wpsg_mod_crefopay_statemapping_'.$crefopay_state, $_REQUEST['wpsg_mod_crefopay_statemapping_'.$crefopay_state], false, false, "key"); - - $this->shop->update_option('wpsg_mod_crefopay_mns_notice', $_REQUEST['wpsg_mod_crefopay_mns_notice'], false, false, "key"); + foreach ($this->transactionMapping as $crefopay_state => $wpsg_state) $this->shop->update_option('wpsg_mod_crefopay_statemapping_'.$crefopay_state, $_REQUEST['wpsg_mod_crefopay_statemapping_'.$crefopay_state], false, false, WPSG_SANITIZE_INT); + + $this->shop->update_option('wpsg_mod_crefopay_mns_notice', $_REQUEST['wpsg_mod_crefopay_mns_notice'], false, false, WPSG_SANITIZE_CHECKBOX); } // public function settings_save() Index: /mods/wpsg_mod_customerbudget.class.php =================================================================== --- /mods/wpsg_mod_customerbudget.class.php (revision 7436) +++ /mods/wpsg_mod_customerbudget.class.php (revision 7437) @@ -66,9 +66,9 @@ public function settings_save() { - $this->shop->update_option('wpsg_mod_customerbudget_name', $_REQUEST['wpsg_mod_customerbudget_name'], false, false, "text_field"); - $this->shop->addTranslationString('wpsg_mod_customerbudget_name', wpsg_sanitize("text_field", $_REQUEST['wpsg_mod_customerbudget_name']) ?: $this->shop->get_option('wpsg_mod_customerbudget_name')); + $this->shop->update_option('wpsg_mod_customerbudget_name', $_REQUEST['wpsg_mod_customerbudget_name'], false, false, WPSG_SANITIZE_INT); + $this->shop->addTranslationString('wpsg_mod_customerbudget_name', wpsg_sanitize(WPSG_SANITIZE_INT, $_REQUEST['wpsg_mod_customerbudget_name']) ?: $this->shop->get_option('wpsg_mod_customerbudget_name')); - $this->shop->update_option('wpsg_mod_customerbudget_hint', $_REQUEST['wpsg_mod_customerbudget_hint'], false, false, "text_field"); - $this->shop->addTranslationString('wpsg_mod_customerbudget_hint', wpsg_sanitize("text_field", $_REQUEST['wpsg_mod_customerbudget_hint']) ?: $this->shop->get_option('wpsg_mod_customerbudget_hint')); + $this->shop->update_option('wpsg_mod_customerbudget_hint', $_REQUEST['wpsg_mod_customerbudget_hint'], false, false, WPSG_SANITIZE_INT); + $this->shop->addTranslationString('wpsg_mod_customerbudget_hint', wpsg_sanitize(WPSG_SANITIZE_INT, $_REQUEST['wpsg_mod_customerbudget_hint']) ?: $this->shop->get_option('wpsg_mod_customerbudget_hint')); } // public function settings_save() @@ -85,5 +85,5 @@ public function wpsg_mod_customer_save(&$customer_data) { - $customer_data['budget'] = wpsg_tf(wpsg_sinput("key", $_REQUEST['wpsg_mod_customerbudget_budget'], "isFloat")); + $customer_data['budget'] = wpsg_tf(wpsg_sinput("key", $_REQUEST['wpsg_mod_customerbudget_budget'], WPSG_SANITIZE_FLOAT)); } // public function wpsg_mod_customer_save(&$customer_data) Index: /mods/wpsg_mod_customergroup.class.php =================================================================== --- /mods/wpsg_mod_customergroup.class.php (revision 7436) +++ /mods/wpsg_mod_customergroup.class.php (revision 7437) @@ -94,7 +94,7 @@ { - $this->shop->update_option('wpsg_mod_kundenverwaltung_group_perpage', $_REQUEST['wpsg_mod_kundenverwaltung_group_perpage'], false, false, "key"); - $this->shop->update_option('wpsg_page_mod_kundenverwaltung_group_checkout', $_REQUEST['wpsg_page_mod_kundenverwaltung_group_checkout'], false, false, "key"); - $this->shop->update_option('wpsg_page_mod_kundenverwaltung_group_register', $_REQUEST['wpsg_page_mod_kundenverwaltung_group_register'], false, false, "key"); + $this->shop->update_option('wpsg_mod_kundenverwaltung_group_perpage', $_REQUEST['wpsg_mod_kundenverwaltung_group_perpage'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_page_mod_kundenverwaltung_group_checkout', $_REQUEST['wpsg_page_mod_kundenverwaltung_group_checkout'], false, false, WPSG_SANITIZE_INT); + $this->shop->update_option('wpsg_page_mod_kundenverwaltung_group_register', $_REQUEST['wpsg_page_mod_kundenverwaltung_group_register'], false, false, WPSG_SANITIZE_INT); } // public function settings_save() Index: /mods/wpsg_mod_debitpayment.class.php =================================================================== --- /mods/wpsg_mod_debitpayment.class.php (revision 7436) +++ /mods/wpsg_mod_debitpayment.class.php (revision 7437) @@ -47,14 +47,14 @@ { - $this->shop->update_option('wpsg_mod_debitpayment_name', $_REQUEST['wpsg_mod_debitpayment_name'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_debitpayment_aktiv', $_REQUEST['wpsg_mod_debitpayment_aktiv'], false, false, "key"); - $this->shop->addTranslationString('wpsg_mod_debitpayment_name', wpsg_sinput("text_field", $_REQUEST['wpsg_mod_debitpayment_name'])); + $this->shop->update_option('wpsg_mod_debitpayment_name', $_REQUEST['wpsg_mod_debitpayment_name'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_debitpayment_aktiv', $_REQUEST['wpsg_mod_debitpayment_aktiv'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->addTranslationString('wpsg_mod_debitpayment_name', wpsg_sinput(WPSG_SANITIZE_TEXTFIELD, $_REQUEST['wpsg_mod_debitpayment_name'])); - $this->shop->update_option('wpsg_mod_debitpayment_hint', $_REQUEST['wpsg_mod_debitpayment_hint'], false, false, "text_field"); - $this->shop->addTranslationString('wpsg_mod_debitpayment_hint', wpsg_sinput("text_field", $_REQUEST['wpsg_mod_debitpayment_hint'])); + $this->shop->update_option('wpsg_mod_debitpayment_hint', $_REQUEST['wpsg_mod_debitpayment_hint'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->addTranslationString('wpsg_mod_debitpayment_hint', wpsg_sinput(WPSG_SANITIZE_TEXTFIELD, $_REQUEST['wpsg_mod_debitpayment_hint'])); - $this->shop->update_option('wpsg_mod_debitpayment_rabgeb', $_REQUEST['wpsg_mod_debitpayment_rabgeb'], false, false, "key", ["isFloat"]); - $this->shop->update_option('wpsg_mod_debitpayment_mwstland', $_REQUEST['wpsg_mod_debitpayment_mwstland'], false, false, "key"); - $this->shop->update_option('wpsg_mod_debitpayment_mwst', $_REQUEST['wpsg_mod_debitpayment_mwst'], false, false, "key"); + $this->shop->update_option('wpsg_mod_debitpayment_rabgeb', $_REQUEST['wpsg_mod_debitpayment_rabgeb'], false, false, WPSG_SANITIZE_FLOAT); + $this->shop->update_option('wpsg_mod_debitpayment_mwstland', $_REQUEST['wpsg_mod_debitpayment_mwstland'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_debitpayment_mwst', $_REQUEST['wpsg_mod_debitpayment_mwst'], false, false, WPSG_SANITIZE_TAXKEY); } // public function settings_save() Index: /mods/wpsg_mod_deliverynote.class.php =================================================================== --- /mods/wpsg_mod_deliverynote.class.php (revision 7436) +++ /mods/wpsg_mod_deliverynote.class.php (revision 7437) @@ -126,14 +126,14 @@ { - $this->shop->update_option('wpsg_mod_deliverynote_nrformat', $_REQUEST['wpsg_mod_deliverynote_nrformat'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_deliverynote_nr', $_REQUEST['wpsg_mod_deliverynote_nr'], false, false, "key"); - $this->shop->update_option('wpsg_mod_deliverynote_foottext_standard', $_REQUEST['wpsg_mod_deliverynote_foottext_standard'], false, false, "key"); + $this->shop->update_option('wpsg_mod_deliverynote_nrformat', $_REQUEST['wpsg_mod_deliverynote_nrformat'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_deliverynote_nr', $_REQUEST['wpsg_mod_deliverynote_nr'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_deliverynote_foottext_standard', $_REQUEST['wpsg_mod_deliverynote_foottext_standard'], false, false, WPSG_SANITIZE_TEXTFIELD); $this->shop->update_option("wpsg_mod_deliverynote_texte", $_REQUEST['text'], false, false, "wpsg_txt_tbl"); - $this->shop->update_option('wpsg_mod_deliverynote_url', $_REQUEST['wpsg_mod_deliverynote_url'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_deliverynote_url_standard', $_REQUEST['wpsg_mod_deliverynote_url_standard'], false, false, "key"); - $this->shop->update_option('wpsg_mod_deliverynote_adressrow', $_REQUEST['wpsg_mod_deliverynote_adressrow'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_deliverynote_produktattribute', $_REQUEST['wpsg_mod_deliverynote_produktattribute'], false, false, "key"); - $this->shop->update_option('wpsg_mod_deliverynote_hideCountry', $_REQUEST['wpsg_mod_deliverynote_hideCountry'], false, false, "key"); - $this->shop->update_option('wpsg_mod_deliverynote_anr', $_REQUEST['wpsg_mod_deliverynote_anr'], false, false, "key"); + $this->shop->update_option('wpsg_mod_deliverynote_url', $_REQUEST['wpsg_mod_deliverynote_url'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_deliverynote_url_standard', $_REQUEST['wpsg_mod_deliverynote_url_standard'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_deliverynote_adressrow', $_REQUEST['wpsg_mod_deliverynote_adressrow'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_deliverynote_produktattribute', $_REQUEST['wpsg_mod_deliverynote_produktattribute'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_deliverynote_hideCountry', $_REQUEST['wpsg_mod_deliverynote_hideCountry'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_deliverynote_anr', $_REQUEST['wpsg_mod_deliverynote_anr'], false, false, WPSG_SANITIZE_VALUES, ['0', '1', '2']); if (file_exists($_FILES['wpsg_mod_deliverynote_bp']['tmp_name'])) @@ -201,6 +201,32 @@ } + $bCheckTextField = false; + + foreach ($_REQUEST['text'] as $k => $v) { + + if ( + !in_array($k, ['firma', 'name', 'strasse', 'plzort', 'land', 'tel', 'fax', 'mail', 'web', 'strnr', 'ustidnr', 'knr', 'blz', 'bank', 'user1', 'user2', 'user3', 'user4', 'user5']) || + !wpsg_checkInput($v['text'], WPSG_SANITIZE_TEXTFIELD) || + !wpsg_checkInput($v['x'], WPSG_SANITIZE_FLOAT) || + !wpsg_checkInput($v['y'], WPSG_SANITIZE_FLOAT) || + !wpsg_checkInput($v['color'], WPSG_SANITIZE_HEXCOLOR) || + !wpsg_checkInput($v['fontsize'],WPSG_SANITIZE_INT) + ) { + + $this->shop->addBackendError(__('Bitte ÌberprÌfen Sie die Textfelder.', 'wpsg')); + $bCheckTextField = true; + + } + + } + + if ($bCheckTextField) { + + $this->shop->update_option("wpsg_mod_deliverynote_texte", $_REQUEST['text']); + + } + $this->shop->update_option("wpsg_mod_deliverynote_logo_position", $wpsg_mod_deliverynote_logo_position ? $wpsg_mod_deliverynote_logo_position : null); - $this->shop->update_option("wpsg_mod_deliverynote_logo_transparency", $_REQUEST['wpsg_mod_deliverynote_logo_transparency'], false, false, "key"); + $this->shop->update_option("wpsg_mod_deliverynote_logo_transparency", $_REQUEST['wpsg_mod_deliverynote_logo_transparency'], false, false, WPSG_SANITIZE_TEXTFIELD); } // public function settings_save() @@ -217,6 +243,6 @@ { - $this->shop->update_option('wpsg_mod_deliverynote_pdf_beschreibung', $_REQUEST['wpsg_mod_deliverynote_pdf_beschreibung'], false, false, "key"); - if ($this->shop->hasMod('wpsg_mod_productvariants')) $this->shop->update_option('wpsg_mod_deliverynote_pdf_varianten', $_REQUEST['wpsg_mod_deliverynote_pdf_varianten'], false, false, "key"); + $this->shop->update_option('wpsg_mod_deliverynote_pdf_beschreibung', $_REQUEST['wpsg_mod_deliverynote_pdf_beschreibung'], false, false, WPSG_SANITIZE_CHECKBOX); + if ($this->shop->hasMod('wpsg_mod_productvariants')) $this->shop->update_option('wpsg_mod_deliverynote_pdf_varianten', $_REQUEST['wpsg_mod_deliverynote_pdf_varianten'], false, false, WPSG_SANITIZE_CHECKBOX); } // public function admin_presentation_submit() @@ -452,10 +478,13 @@ if (!is_array($foot_text)) $foot_text = array(); - $_REQUEST['value'] = wpsg_sinput("text_field", $_REQUEST['value']); - $foot_text[$_REQUEST['field_id']][$_REQUEST['field']] = $_REQUEST['value']; - - $this->shop->update_option('wpsg_mod_deliverynote_footer', $foot_text); - - die($_REQUEST['value']); + if (wpsg_checkInput($_REQUEST['value'], WPSG_SANITIZE_TEXTFIELD)) { + + $foot_text[$_REQUEST['field_id']][$_REQUEST['field']] = $_REQUEST['value']; + + $this->shop->update_option('wpsg_mod_deliverynote_footer', $foot_text); + + die($_REQUEST['value']); + + } else die($foot_text[$_REQUEST['field_id']][$_REQUEST['field']]); } Index: /mods/wpsg_mod_deliverytime.class.php =================================================================== --- /mods/wpsg_mod_deliverytime.class.php (revision 7436) +++ /mods/wpsg_mod_deliverytime.class.php (revision 7437) @@ -139,31 +139,31 @@ { - $this->shop->update_option('wpsg_mod_deliverytime_mode', $_REQUEST['wpsg_mod_deliverytime_mode'], false, false, "key"); - $this->shop->update_option('wpsg_mod_deliverytime_mode_select_values', $_REQUEST['wpsg_mod_deliverytime_mode_select_values'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_deliverytime_mode_select_default', $_REQUEST['wpsg_mod_deliverytime_mode_select_default'], false, false, "key"); - $this->shop->update_option('wpsg_mod_deliverytime_mode_days_default', $_REQUEST['wpsg_mod_deliverytime_mode_days_default'], false, false, "key"); - - $this->shop->update_option('wpsg_mod_deliverytime_store', $_REQUEST['wpsg_mod_deliverytime_store'], false, false, "key"); - $this->shop->update_option('wpsg_mod_deliverytime_storetext', $_REQUEST['wpsg_mod_deliverytime_storetext'], false, false, "text_field"); - $this->shop->update_option('wpsg_page_mod_deliverytime_storelink', $_REQUEST['wpsg_page_mod_deliverytime_storelink'], false, false, "key"); - - $this->shop->update_option('wpsg_mod_deliverytime_show_product', $_REQUEST['wpsg_mod_deliverytime_show_product'], false, false, "key"); - $this->shop->update_option('wpsg_mod_deliverytime_show_basket', $_REQUEST['wpsg_mod_deliverytime_show_basket'], false, false, "key"); - $this->shop->update_option('wpsg_mod_deliverytime_show_overview', $_REQUEST['wpsg_mod_deliverytime_show_overview'], false, false, "key"); - $this->shop->update_option('wpsg_mod_deliverytime_show_mail', $_REQUEST['wpsg_mod_deliverytime_show_mail'], false, false, "key"); + $this->shop->update_option('wpsg_mod_deliverytime_mode', $_REQUEST['wpsg_mod_deliverytime_mode'], false, false, WPSG_SANITIZE_INT); + $this->shop->update_option('wpsg_mod_deliverytime_mode_select_values', $_REQUEST['wpsg_mod_deliverytime_mode_select_values'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_deliverytime_mode_select_default', $_REQUEST['wpsg_mod_deliverytime_mode_select_default'], false, false, WPSG_SANITIZE_INT); + $this->shop->update_option('wpsg_mod_deliverytime_mode_days_default', $_REQUEST['wpsg_mod_deliverytime_mode_days_default'], false, false, WPSG_SANITIZE_TEXTFIELD); + + $this->shop->update_option('wpsg_mod_deliverytime_store', $_REQUEST['wpsg_mod_deliverytime_store'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_deliverytime_storetext', $_REQUEST['wpsg_mod_deliverytime_storetext'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_page_mod_deliverytime_storelink', $_REQUEST['wpsg_page_mod_deliverytime_storelink'], false, false, WPSG_SANITIZE_TEXTFIELD); + + $this->shop->update_option('wpsg_mod_deliverytime_show_product', $_REQUEST['wpsg_mod_deliverytime_show_product'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_deliverytime_show_basket', $_REQUEST['wpsg_mod_deliverytime_show_basket'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_deliverytime_show_overview', $_REQUEST['wpsg_mod_deliverytime_show_overview'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_deliverytime_show_mail', $_REQUEST['wpsg_mod_deliverytime_show_mail'], false, false, WPSG_SANITIZE_CHECKBOX); $this->shop->update_option('wpsg_mod_deliverytime_source', wpsg_xss($_REQUEST['wpsg_mod_deliverytime_source'])); - $this->shop->update_option('wpsg_mod_deliverytime_delay', $_REQUEST['wpsg_mod_deliverytime_delay'], false, false, "key"); - $this->shop->update_option('wpsg_mod_deliverytime_delayText', $_REQUEST['wpsg_mod_deliverytime_delayText'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_deliverytime_delayTime', $_REQUEST['wpsg_mod_deliverytime_delayTime'], false, false, "key", ["isFloat"]); - - $this->shop->update_option('wpsg_mod_deliverytime_holiday', $_REQUEST['wpsg_mod_deliverytime_holiday'], false, false, "key"); + $this->shop->update_option('wpsg_mod_deliverytime_delay', $_REQUEST['wpsg_mod_deliverytime_delay'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_deliverytime_delayText', $_REQUEST['wpsg_mod_deliverytime_delayText'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_deliverytime_delayTime', $_REQUEST['wpsg_mod_deliverytime_delayTime'], false, false, WPSG_SANITIZE_FLOAT); + + $this->shop->update_option('wpsg_mod_deliverytime_holiday', $_REQUEST['wpsg_mod_deliverytime_holiday'], false, false, WPSG_SANITIZE_CHECKBOX); $this->shop->update_option('wpsg_mod_deliverytime_holidayStart', wpsg_xss($_REQUEST['wpsg_mod_deliverytime_holidayStart'])); $this->shop->update_option('wpsg_mod_deliverytime_holidayEnd', wpsg_xss($_REQUEST['wpsg_mod_deliverytime_holidayEnd'])); - $this->shop->update_option('wpsg_mod_deliverytime_holidaytext', $_REQUEST['wpsg_mod_deliverytime_holidaytext'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_deliverytime_productindex', $_REQUEST['wpsg_mod_deliverytime_productindex'], false, false, "key"); - - $this->shop->addTranslationString('wpsg_mod_deliverytime_mode_select_values', wpsg_sinput("text_field", $_REQUEST['wpsg_mod_deliverytime_mode_select_values'])); - $this->shop->addTranslationString('wpsg_mod_deliverytime_mode_select_default', wpsg_sinput("key", $_REQUEST['wpsg_mod_deliverytime_mode_select_default'])); + $this->shop->update_option('wpsg_mod_deliverytime_holidaytext', $_REQUEST['wpsg_mod_deliverytime_holidaytext'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_deliverytime_productindex', $_REQUEST['wpsg_mod_deliverytime_productindex'], false, false, WPSG_SANITIZE_CHECKBOX); + + $this->shop->addTranslationString('wpsg_mod_deliverytime_mode_select_values', wpsg_sinput(WPSG_SANITIZE_TEXTFIELD, $_REQUEST['wpsg_mod_deliverytime_mode_select_values'])); + $this->shop->addTranslationString('wpsg_mod_deliverytime_mode_select_default', wpsg_sinput(WPSG_SANITIZE_INT, $_REQUEST['wpsg_mod_deliverytime_mode_select_default'])); @@ -173,16 +173,16 @@ { - $produkt_data['wpsg_mod_deliverytime_deliverytime'] = wpsg_q(wpsg_sinput("text_field", $_REQUEST['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_deliverytime'])); + $produkt_data['wpsg_mod_deliverytime_deliverytime'] = wpsg_q(wpsg_sinput(WPSG_SANITIZE_FLOAT, $_REQUEST['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_deliverytime'])); $produkt_data['wpsg_mod_deliverytime_storeproduct'] = wpsg_q(wpsg_sinput("key", wpsg_getStr($_REQUEST['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_storeproduct']))); // Neue Felder im Produkt - $produkt_data['wpsg_mod_deliverytime_storetext'] = wpsg_q(wpsg_sinput("text_field", wpsg_getStr($_REQUEST['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_storetext']))); - $produkt_data['wpsg_mod_deliverytime_storelink'] = wpsg_q(wpsg_sinput("key", wpsg_getStr($_REQUEST['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_storelink']))); - $produkt_data['wpsg_mod_deliverytime_source'] = wpsg_q(wpsg_sinput("key", wpsg_getStr($_REQUEST['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_source']))); - $produkt_data['wpsg_mod_deliverytime_delay'] = wpsg_q(wpsg_sinput("key", wpsg_getStr($_REQUEST['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_delay']))); - $produkt_data['wpsg_mod_deliverytime_delaytext'] = wpsg_q(wpsg_sinput("text_field", wpsg_getStr($_REQUEST['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_delaytext']))); - $produkt_data['wpsg_mod_deliverytime_delaytime'] = wpsg_tf(wpsg_q(wpsg_sinput("key", wpsg_getStr($_REQUEST['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_delaytime']), "isFloat"))); - $produkt_data['wpsg_mod_deliverytime_holiday'] = wpsg_q(wpsg_sinput("key", wpsg_getStr($_REQUEST['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_holiday']))); - $produkt_data['wpsg_mod_deliverytime_holidaytext'] = wpsg_q(wpsg_sinput("text_field", wpsg_getStr($_REQUEST['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_holidaytext']))); + $produkt_data['wpsg_mod_deliverytime_storetext'] = wpsg_q(wpsg_sinput(WPSG_SANITIZE_FLOAT, wpsg_getStr($_REQUEST['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_storetext']))); + $produkt_data['wpsg_mod_deliverytime_storelink'] = wpsg_q(wpsg_sinput(WPSG_SANITIZE_INT, wpsg_getStr($_REQUEST['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_storelink']))); + $produkt_data['wpsg_mod_deliverytime_source'] = wpsg_q(wpsg_sinput(WPSG_SANITIZE_TEXTFIELD, wpsg_getStr($_REQUEST['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_source']))); + $produkt_data['wpsg_mod_deliverytime_delay'] = wpsg_q(wpsg_sinput(WPSG_SANITIZE_VALUES, ['0, 1, 2'], wpsg_getStr($_REQUEST['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_delay']))); + $produkt_data['wpsg_mod_deliverytime_delaytext'] = wpsg_q(wpsg_sinput(WPSG_SANITIZE_FLOAT, wpsg_getStr($_REQUEST['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_delaytext']))); + $produkt_data['wpsg_mod_deliverytime_delaytime'] = wpsg_tf(wpsg_q(wpsg_sinput(WPSG_SANITIZE_TEXTFIELD, wpsg_getStr($_REQUEST['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_delaytime']), WPSG_SANITIZE_FLOAT))); + $produkt_data['wpsg_mod_deliverytime_holiday'] = wpsg_q(wpsg_sinput(WPSG_SANITIZE_VALUES, ['0, 1, 2'], wpsg_getStr($_REQUEST['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_holiday']))); + $produkt_data['wpsg_mod_deliverytime_holidaytext'] = wpsg_q(wpsg_sinput(WPSG_SANITIZE_TEXTFIELD, wpsg_getStr($_REQUEST['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_holidaytext']))); $produkt_data['wpsg_mod_deliverytime_holidayStart'] = wpsg_q(wpsg_xss(wpsg_getStr($_REQUEST['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_holidayStart']))); $produkt_data['wpsg_mod_deliverytime_holidayEnd'] = wpsg_q(wpsg_xss(wpsg_getStr($_REQUEST['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_holidayEnd']))); Index: /mods/wpsg_mod_discount.class.php =================================================================== --- /mods/wpsg_mod_discount.class.php (revision 7436) +++ /mods/wpsg_mod_discount.class.php (revision 7437) @@ -373,8 +373,8 @@ * Ich speichere die Rabatteinstellungen in einem Feld innerhalb der Produktgruppe das Trennzeichen ist "_" */ - $dis_aktiv = wpsg_sinput("key", $_REQUEST['wpsg_mod_discount']['discount_aktiv']); - $dis_from = wpsg_sinput("text_field", $_REQUEST['wpsg_mod_discount']['discount_from']); - $dis_to = wpsg_sinput("text_field", $_REQUEST['wpsg_mod_discount']['discount_to']); - $dis_val = wpsg_tf(wpsg_sinput("key", $_REQUEST['wpsg_mod_discount']['discount_value'], "isFloat")); + $dis_aktiv = wpsg_sinput(WPSG_SANITIZE_CHECKBOX, $_REQUEST['wpsg_mod_discount']['discount_aktiv']); + $dis_from = wpsg_sinput(WPSG_SANITIZE_TEXTFIELD, $_REQUEST['wpsg_mod_discount']['discount_from']); + $dis_to = wpsg_sinput(WPSG_SANITIZE_TEXTFIELD, $_REQUEST['wpsg_mod_discount']['discount_to']); + $dis_val = wpsg_tf(wpsg_sinput("key", $_REQUEST['wpsg_mod_discount']['discount_value'], WPSG_SANITIZE_FLOAT)); $rabatt_str = $dis_aktiv.'_'.$dis_from.'_'.$dis_to.'_'.wpsg_tf($dis_val, true); @@ -400,5 +400,5 @@ $dis_from = wpsg_sinput("text_field", $_REQUEST['wpsg_mod_discount']['discount_from']); $dis_to = wpsg_sinput("text_field", $_REQUEST['wpsg_mod_discount']['discount_to']); - $dis_value = wpsg_tf(wpsg_sinput("key", $_REQUEST['wpsg_mod_discount']['discount_value'], "isFloat")); + $dis_value = wpsg_tf(wpsg_sinput("key", $_REQUEST['wpsg_mod_discount']['discount_value'], WPSG_SANITIZE_FLOAT)); $rabatt_str = $dis_active."_".$dis_from."_".$dis_to."_".wpsg_tf($dis_value, true); @@ -425,5 +425,5 @@ $this->db->UpdateQuery(WPSG_TBL_KG, array( - 'discount' => wpsg_q(wpsg_tf(wpsg_sinput("key", $_REQUEST['wpsg_mod_discount']['discount'], "isFloat"))) + 'discount' => wpsg_q(wpsg_tf(wpsg_sinput("key", $_REQUEST['wpsg_mod_discount']['discount'], WPSG_SANITIZE_FLOAT))) ), " `id` = '".wpsg_q($customergroup_id)."' "); Index: /mods/wpsg_mod_downloadplus.class.php =================================================================== --- /mods/wpsg_mod_downloadplus.class.php (revision 7436) +++ /mods/wpsg_mod_downloadplus.class.php (revision 7437) @@ -140,31 +140,31 @@ $this->shop->update_option('wpsg_mod_downloadplus_text', $_REQUEST['text'], false, false, "wpsg_txt_tbl"); - $this->shop->update_option('wpsg_mod_downloadplus_filename', $_REQUEST['wpsg_mod_downloadplus_filename'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_downloadplus_indiv_mode', $_REQUEST['wpsg_mod_downloadplus_indiv_mode'], false, false, "key"); - $this->shop->update_option('wpsg_mod_downloadplus_autosend', $_REQUEST['wpsg_mod_downloadplus_autosend'], false, false, "key"); - $this->shop->update_option('wpsg_mod_downloadplus_shipping', $_REQUEST['wpsg_mod_downloadplus_shipping'], false, false, "key"); - $this->shop->update_option('wpsg_mod_downloadplus_einsplusx', $_REQUEST['wpsg_mod_downloadplus_einsplusx'], false, false, "key"); - $this->shop->update_option('wpsg_mod_downloadplus_accepted', $_REQUEST['wpsg_mod_downloadplus_accepted'], false, false, "key"); - $this->shop->update_option('wpsg_mod_downloadplus_days', $_REQUEST['wpsg_mod_downloadplus_days'], false, false, "key"); - $this->shop->update_option('wpsg_mod_downloadplus_downloads', $_REQUEST['wpsg_mod_downloadplus_downloads'], false, false, "key"); - $this->shop->update_option('wpsg_mod_downloadplus_cleanraiddownloads', $_REQUEST['wpsg_mod_downloadplus_cleanraiddownloads'], false, false, "key"); - $this->shop->update_option('wpsg_mod_downloadplus_cleanolddownloads', $_REQUEST['wpsg_mod_downloadplus_cleanolddownloads'], false, false, "key"); - $this->shop->update_option('wpsg_mod_downloadplus_pdfpath', $_REQUEST['wpsg_mod_downloadplus_pdfpath'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_downloadplus_pdfindivpath', $_REQUEST['wpsg_mod_downloadplus_pdfindivpath'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_downloadplus_range', $_REQUEST['wpsg_mod_downloadplus_range'], false, false, "key"); - $this->shop->update_option('wpsg_mod_downloadplus_range_von', $_REQUEST['wpsg_mod_downloadplus_range_von'], false, false, "key"); - $this->shop->update_option('wpsg_mod_downloadplus_range_bis', $_REQUEST['wpsg_mod_downloadplus_range_bis'], false, false, "key"); - $this->shop->update_option('wpsg_mod_downloadplus_masterpass', $_REQUEST['wpsg_mod_downloadplus_masterpass'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_downloadplus_openpass', $_REQUEST['wpsg_mod_downloadplus_openpass'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_downloadplus_securitysave', $_REQUEST['wpsg_mod_downloadplus_securitysave'], false, false, "key"); - $this->shop->update_option('wpsg_mod_downloadplus_securityprint', $_REQUEST['wpsg_mod_downloadplus_securityprint'], false, false, "key"); - $this->shop->update_option('wpsg_mod_downloadplus_securitymod', $_REQUEST['wpsg_mod_downloadplus_securitymod'], false, false, "key"); - $this->shop->update_option('wpsg_mod_downloadplus_securitynote', $_REQUEST['wpsg_mod_downloadplus_securitynote'], false, false, "key"); - $this->shop->update_option('wpsg_mod_downloadplus_format', $_REQUEST['wpsg_mod_downloadplus_format'], false, false, "key"); - $this->shop->update_option('wpsg_mod_downloadplus_memorylimit', $_REQUEST['wpsg_mod_downloadplus_memorylimit'], false, false, "key"); - $this->shop->update_option('wpsg_mod_downloadplus_timelimit', $_REQUEST['wpsg_mod_downloadplus_timelimit'], false, false, "key"); - $this->shop->update_option('wpsg_mod_downloadplus_numberformat', $_REQUEST['wpsg_mod_downloadplus_numberformat'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_downloadplus_startnumber', $_REQUEST['wpsg_mod_downloadplus_startnumber'], false, false, "key"); - $this->shop->update_option('wpsg_mod_downloadplus_attachement', $_REQUEST['wpsg_mod_downloadplus_attachement'], false, false, "key"); + $this->shop->update_option('wpsg_mod_downloadplus_filename', $_REQUEST['wpsg_mod_downloadplus_filename'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_downloadplus_indiv_mode', $_REQUEST['wpsg_mod_downloadplus_indiv_mode'], false, false, WPSG_SANITIZE_VALUES, ['0', '1', '2']); + $this->shop->update_option('wpsg_mod_downloadplus_autosend', $_REQUEST['wpsg_mod_downloadplus_autosend'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_downloadplus_shipping', $_REQUEST['wpsg_mod_downloadplus_shipping'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_downloadplus_einsplusx', $_REQUEST['wpsg_mod_downloadplus_einsplusx'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_downloadplus_accepted', $_REQUEST['wpsg_mod_downloadplus_accepted'], false, false, WPSG_SANITIZE_VALUES, ['0', '1', '2']); + $this->shop->update_option('wpsg_mod_downloadplus_days', $_REQUEST['wpsg_mod_downloadplus_days'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_downloadplus_downloads', $_REQUEST['wpsg_mod_downloadplus_downloads'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_downloadplus_cleanraiddownloads', $_REQUEST['wpsg_mod_downloadplus_cleanraiddownloads'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_downloadplus_cleanolddownloads', $_REQUEST['wpsg_mod_downloadplus_cleanolddownloads'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_downloadplus_pdfpath', $_REQUEST['wpsg_mod_downloadplus_pdfpath'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_downloadplus_pdfindivpath', $_REQUEST['wpsg_mod_downloadplus_pdfindivpath'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_downloadplus_range', $_REQUEST['wpsg_mod_downloadplus_range'], false, false, WPSG_SANITIZE_VALUES, ['0', '1']); + $this->shop->update_option('wpsg_mod_downloadplus_range_von', $_REQUEST['wpsg_mod_downloadplus_range_von'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_downloadplus_range_bis', $_REQUEST['wpsg_mod_downloadplus_range_bis'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_downloadplus_masterpass', $_REQUEST['wpsg_mod_downloadplus_masterpass'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_downloadplus_openpass', $_REQUEST['wpsg_mod_downloadplus_openpass'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_downloadplus_securitysave', $_REQUEST['wpsg_mod_downloadplus_securitysave'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_downloadplus_securityprint', $_REQUEST['wpsg_mod_downloadplus_securityprint'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_downloadplus_securitymod', $_REQUEST['wpsg_mod_downloadplus_securitymod'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_downloadplus_securitynote', $_REQUEST['wpsg_mod_downloadplus_securitynote'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_downloadplus_format', $_REQUEST['wpsg_mod_downloadplus_format'], false, false, WPSG_SANITIZE_VALUES, ['0', '1']); + $this->shop->update_option('wpsg_mod_downloadplus_memorylimit', $_REQUEST['wpsg_mod_downloadplus_memorylimit'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_downloadplus_timelimit', $_REQUEST['wpsg_mod_downloadplus_timelimit'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_downloadplus_numberformat', $_REQUEST['wpsg_mod_downloadplus_numberformat'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_downloadplus_startnumber', $_REQUEST['wpsg_mod_downloadplus_startnumber'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_downloadplus_attachement', $_REQUEST['wpsg_mod_downloadplus_attachement'], false, false, WPSG_SANITIZE_CHECKBOX); } // public function settings_save() Index: /mods/wpsg_mod_downloadprodukte.class.php =================================================================== --- /mods/wpsg_mod_downloadprodukte.class.php (revision 7436) +++ /mods/wpsg_mod_downloadprodukte.class.php (revision 7437) @@ -65,11 +65,11 @@ { - $this->shop->update_option('wpsg_mod_downloadprodukte_zt', wpsg_q($_REQUEST['wpsg_mod_downloadprodukte_zt']), false, false, "key"); - $this->shop->update_option('wpsg_mod_downloadprodukte_days', wpsg_q($_REQUEST['wpsg_mod_downloadprodukte_days']), false, false, "key"); - $this->shop->update_option('wpsg_mod_downloadprodukte_raid', wpsg_q($_REQUEST['wpsg_mod_downloadprodukte_raid']), false, false, "text_field"); - $this->shop->update_option('wpsg_mod_downloadprodukte_zip', wpsg_q($_REQUEST['wpsg_mod_downloadprodukte_zip']), false, false, "key"); - $this->shop->update_option('wpsg_mod_downloadprodukte_shipping', wpsg_q($_REQUEST['wpsg_mod_downloadprodukte_shipping']), false, false, "key"); - $this->shop->update_option('wpsg_mod_downloadprodukte_einsplusx', wpsg_q($_REQUEST['wpsg_mod_downloadprodukte_einsplusx']), false, false, "key"); - $this->shop->update_option('wpsg_mod_downloadprodukte_ziptemp', $_REQUEST['wpsg_mod_downloadprodukte_ziptemp'], false, false, "text_field"); + $this->shop->update_option('wpsg_mod_downloadprodukte_zt', wpsg_q($_REQUEST['wpsg_mod_downloadprodukte_zt']), false, false, WPSG_SANITIZE_INT); + $this->shop->update_option('wpsg_mod_downloadprodukte_days', wpsg_q($_REQUEST['wpsg_mod_downloadprodukte_days']), false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_downloadprodukte_raid', wpsg_q($_REQUEST['wpsg_mod_downloadprodukte_raid']), false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_downloadprodukte_zip', wpsg_q($_REQUEST['wpsg_mod_downloadprodukte_zip']), false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_downloadprodukte_shipping', wpsg_q($_REQUEST['wpsg_mod_downloadprodukte_shipping']), false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_downloadprodukte_einsplusx', wpsg_q($_REQUEST['wpsg_mod_downloadprodukte_einsplusx']), false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_downloadprodukte_ziptemp', $_REQUEST['wpsg_mod_downloadprodukte_ziptemp'], false, false, WPSG_SANITIZE_TEXTFIELD); } // public function settings_save() Index: /mods/wpsg_mod_flexipay.class.php =================================================================== --- /mods/wpsg_mod_flexipay.class.php (revision 7436) +++ /mods/wpsg_mod_flexipay.class.php (revision 7437) @@ -92,22 +92,22 @@ { - $this->shop->update_option('wpsg_mod_flexipay_integratormode', $_REQUEST['wpsg_mod_flexipay_integratormode'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_flexipay_sender', $_REQUEST['wpsg_mod_flexipay_sender'], false, false, "key"); - $this->shop->update_option('wpsg_mod_flexipay_channelid', $_REQUEST['wpsg_mod_flexipay_channelid'], false, false, "key"); - $this->shop->update_option('wpsg_mod_flexipay_userid', $_REQUEST['wpsg_mod_flexipay_userid'], false, false, "key"); - $this->shop->update_option('wpsg_mod_flexipay_password', $_REQUEST['wpsg_mod_flexipay_password'], false, false, "text_field"); - - $this->shop->update_option('wpsg_mod_flexipay_activ', $_REQUEST['wpsg_mod_flexipay_activ'], false, false, "key"); - $this->shop->update_option('wpsg_mod_flexipay_paymenttypes', implode(' ', $_REQUEST['wpsg_mod_flexipay_paymenttypes']), false, false, "text_field"); - $this->shop->update_option('wpsg_mod_flexipay_name', $_REQUEST['wpsg_mod_flexipay_name'], false, false, "text_field"); $this->shop->addTranslationString('wpsg_mod_flexipay_name', wpsg_sinput("text_field", $_REQUEST['wpsg_mod_flexipay_name'])); - $this->shop->update_option('wpsg_mod_flexipay_hint', $_REQUEST['wpsg_mod_flexipay_hint'], false, false, "text_field"); $this->shop->addTranslationString('wpsg_mod_flexipay_hint', wpsg_sinput("text_field", $_REQUEST['wpsg_mod_flexipay_hint'])); - $this->shop->update_option('wpsg_mod_flexipay_logo', $_REQUEST['wpsg_mod_flexipay_logo'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_flexipay_language', $_REQUEST['wpsg_mod_flexipay_language'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_flexipay_gebuehr', $_REQUEST['wpsg_mod_flexipay_gebuehr'], false, false, "key", ["isFloat"]); - $this->shop->update_option('wpsg_mod_flexipay_mwst', $_REQUEST['wpsg_mod_flexipay_mwst'], false, false, "key"); - $this->shop->update_option('wpsg_mod_flexipay_mwstland', $_REQUEST['wpsg_mod_flexipay_mwstland'], false, false, "key"); - - $this->shop->createPage(__('Erfolgreiche Zahlung', 'wpsg'), 'wpsg_mod_flexipay_successPage', wpsg_sinput("key", $_REQUEST['wpsg_mod_flexipay_successPage'])); - $this->shop->createPage(__('Fehlerhafte Zahlung', 'wpsg'), 'wpsg_mod_flexipay_errorPage', wpsg_sinput("key", $_REQUEST['wpsg_mod_flexipay_errorPage'])); + $this->shop->update_option('wpsg_mod_flexipay_integratormode', $_REQUEST['wpsg_mod_flexipay_integratormode'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_flexipay_sender', $_REQUEST['wpsg_mod_flexipay_sender'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_flexipay_channelid', $_REQUEST['wpsg_mod_flexipay_channelid'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_flexipay_userid', $_REQUEST['wpsg_mod_flexipay_userid'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_flexipay_password', $_REQUEST['wpsg_mod_flexipay_password'], false, false, WPSG_SANITIZE_TEXTFIELD); + + $this->shop->update_option('wpsg_mod_flexipay_activ', $_REQUEST['wpsg_mod_flexipay_activ'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_flexipay_paymenttypes', implode(' ', $_REQUEST['wpsg_mod_flexipay_paymenttypes']), false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_flexipay_name', $_REQUEST['wpsg_mod_flexipay_name'], false, false, WPSG_SANITIZE_TEXTFIELD); $this->shop->addTranslationString('wpsg_mod_flexipay_name', wpsg_sinput(WPSG_SANITIZE_TEXTFIELD, $_REQUEST['wpsg_mod_flexipay_name'])); + $this->shop->update_option('wpsg_mod_flexipay_hint', $_REQUEST['wpsg_mod_flexipay_hint'], false, false, WPSG_SANITIZE_TEXTFIELD); $this->shop->addTranslationString('wpsg_mod_flexipay_hint', wpsg_sinput(WPSG_SANITIZE_TEXTFIELD, $_REQUEST['wpsg_mod_flexipay_hint'])); + $this->shop->update_option('wpsg_mod_flexipay_logo', $_REQUEST['wpsg_mod_flexipay_logo'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_flexipay_language', $_REQUEST['wpsg_mod_flexipay_language'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_flexipay_gebuehr', $_REQUEST['wpsg_mod_flexipay_gebuehr'], false, false, WPSG_SANITIZE_FLOAT); + $this->shop->update_option('wpsg_mod_flexipay_mwst', $_REQUEST['wpsg_mod_flexipay_mwst'], false, false, WPSG_SANITIZE_TAXKEY); + $this->shop->update_option('wpsg_mod_flexipay_mwstland', $_REQUEST['wpsg_mod_flexipay_mwstland'], false, false, WPSG_SANITIZE_CHECKBOX); + + $this->shop->createPage(__('Erfolgreiche Zahlung', 'wpsg'), 'wpsg_mod_flexipay_successPage', wpsg_sinput(WPSG_SANITIZE_INT, $_REQUEST['wpsg_mod_flexipay_successPage'])); + $this->shop->createPage(__('Fehlerhafte Zahlung', 'wpsg'), 'wpsg_mod_flexipay_errorPage', wpsg_sinput(WPSG_SANITIZE_INT, $_REQUEST['wpsg_mod_flexipay_errorPage'])); } // public function settings_save() Index: /mods/wpsg_mod_freeshipping.class.php =================================================================== --- /mods/wpsg_mod_freeshipping.class.php (revision 7436) +++ /mods/wpsg_mod_freeshipping.class.php (revision 7437) @@ -47,9 +47,9 @@ { - $this->shop->update_option('wpsg_mod_freeshipping_bezeichnung', $_REQUEST['wpsg_mod_freeshipping_bezeichnung'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_freeshipping_aktiv', $_REQUEST['wpsg_mod_freeshipping_aktiv'], false, false, "key"); - $this->shop->update_option('wpsg_mod_freeshipping_minvalue', $_REQUEST['wpsg_mod_freeshipping_minvalue'], false, false, "key", ["isFloat"]); + $this->shop->update_option('wpsg_mod_freeshipping_bezeichnung', $_REQUEST['wpsg_mod_freeshipping_bezeichnung'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_freeshipping_aktiv', $_REQUEST['wpsg_mod_freeshipping_aktiv'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_freeshipping_minvalue', $_REQUEST['wpsg_mod_freeshipping_minvalue'], false, false, WPSG_SANITIZE_FLOAT); - $this->shop->addTranslationString('wpsg_mod_freeshipping_bezeichnung', wpsg_sinput("text_field", $_REQUEST['wpsg_mod_freeshipping_bezeichnung'])); + $this->shop->addTranslationString('wpsg_mod_freeshipping_bezeichnung', wpsg_sinput(WPSG_SANITIZE_TEXTFIELD, $_REQUEST['wpsg_mod_freeshipping_bezeichnung'])); } // public function settings_save() Index: /mods/wpsg_mod_fuellmenge.class.php =================================================================== --- /mods/wpsg_mod_fuellmenge.class.php (revision 7436) +++ /mods/wpsg_mod_fuellmenge.class.php (revision 7437) @@ -64,18 +64,18 @@ { - $this->shop->update_option('wpsg_mod_fuellmenge_einheit', $_REQUEST['wpsg_mod_fuellmenge_einheit'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_fuellmenge_bezug', $_REQUEST['wpsg_mod_fuellmenge_bezug'], false, false, "key", ["isFloat"]); - $this->shop->update_option('wpsg_mod_fuellmenge_showAjaxDialog', $_REQUEST['wpsg_mod_fuellmenge_showAjaxDialog'], false, false, "key"); + $this->shop->update_option('wpsg_mod_fuellmenge_einheit', $_REQUEST['wpsg_mod_fuellmenge_einheit'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_fuellmenge_bezug', $_REQUEST['wpsg_mod_fuellmenge_bezug'], false, false, WPSG_SANITIZE_FLOAT); + $this->shop->update_option('wpsg_mod_fuellmenge_showAjaxDialog', $_REQUEST['wpsg_mod_fuellmenge_showAjaxDialog'], false, false, WPSG_SANITIZE_CHECKBOX); if ($this->shop->hasMod('wpsg_mod_fuellmenge') == '1') { - $this->shop->update_option('wpsg_mod_fuellmenge_showProductindex_fmenge', $_REQUEST['wpsg_mod_fuellmenge_showProductindex_fmenge'], false, false, "key"); - $this->shop->update_option('wpsg_mod_fuellmenge_showProductindex_grundpreis', $_REQUEST['wpsg_mod_fuellmenge_showProductindex_grundpreis'], false, false, "key", ["isFloat"]); - - } - $this->shop->update_option('wpsg_mod_fuellmenge_showBasketProduct', $_REQUEST['wpsg_mod_fuellmenge_showBasketProduct'], false, false, "key"); - $this->shop->update_option('wpsg_mod_fuellmenge_showProductindexBackend_fmenge', $_REQUEST['wpsg_mod_fuellmenge_showProductindexBackend_fmenge'], false, false, "key"); - $this->shop->update_option('wpsg_mod_fuellmenge_showOverviewProduct', $_REQUEST['wpsg_mod_fuellmenge_showOverviewProduct'], false, false, "key"); - $this->shop->update_option('wpsg_mod:fuellmenge_showRequestPageProduct', $_REQUEST['wpsg_mod_fuellmenge_showRequestPageProduct'], false, false, "key"); + $this->shop->update_option('wpsg_mod_fuellmenge_showProductindex_fmenge', $_REQUEST['wpsg_mod_fuellmenge_showProductindex_fmenge'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_fuellmenge_showProductindex_grundpreis', $_REQUEST['wpsg_mod_fuellmenge_showProductindex_grundpreis'], false, false, WPSG_SANITIZE_FLOAT); + + } + $this->shop->update_option('wpsg_mod_fuellmenge_showBasketProduct', $_REQUEST['wpsg_mod_fuellmenge_showBasketProduct'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_fuellmenge_showProductindexBackend_fmenge', $_REQUEST['wpsg_mod_fuellmenge_showProductindexBackend_fmenge'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_fuellmenge_showOverviewProduct', $_REQUEST['wpsg_mod_fuellmenge_showOverviewProduct'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod:fuellmenge_showRequestPageProduct', $_REQUEST['wpsg_mod_fuellmenge_showRequestPageProduct'], false, false, WPSG_SANITIZE_CHECKBOX); } // public function settings_save() @@ -207,5 +207,5 @@ $this->db->UpdateQuery(WPSG_TBL_PRODUCTS, array( "feinheit" => wpsg_q(wpsg_sinput("key", $_REQUEST['feinheit'])), - "fmenge" => wpsg_q(wpsg_tf(wpsg_sinput("key", $_REQUEST['fmenge'], "isFloat"))) + "fmenge" => wpsg_q(wpsg_tf(wpsg_sinput("key", $_REQUEST['fmenge'], WPSG_SANITIZE_FLOAT))) ), "`id` = '".wpsg_q(wpsg_sinput("key", $produkt_id))."'"); Index: /mods/wpsg_mod_giropay.class.php =================================================================== --- /mods/wpsg_mod_giropay.class.php (revision 7436) +++ /mods/wpsg_mod_giropay.class.php (revision 7437) @@ -66,58 +66,58 @@ { - $this->shop->update_option('wpsg_mod_giropay_merchantId', $_REQUEST['wpsg_mod_giropay_merchantId'], false, false, "key"); + $this->shop->update_option('wpsg_mod_giropay_merchantId', $_REQUEST['wpsg_mod_giropay_merchantId'], false, false, WPSG_SANITIZE_TEXTFIELD); //$this->shop->update_option('wpsg_mod_giropay_currency', $_REQUEST['wpsg_mod_giropay_currency']); - $this->shop->update_option('wpsg_mod_giropay_paystart', $_REQUEST['wpsg_mod_giropay_paystart'], false, false, "key"); - $this->shop->update_option('wpsg_mod_giropay_subject', $_REQUEST['wpsg_mod_giropay_subject'], false, false, "text_field"); + $this->shop->update_option('wpsg_mod_giropay_paystart', $_REQUEST['wpsg_mod_giropay_paystart'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_giropay_subject', $_REQUEST['wpsg_mod_giropay_subject'], false, false, WPSG_SANITIZE_TEXTFIELD); $this->shop->createPage(__('Erfolgreiche Zahlung', 'wpsg'), 'wpsg_mod_giropay_successPage', wpsg_xss($_REQUEST['wpsg_mod_giropay_successPage'])); $this->shop->createPage(__('Fehlerhafte Zahlung', 'wpsg'), 'wpsg_mod_giropay_errorPage', wpsg_xss($_REQUEST['wpsg_mod_giropay_errorPage'])); // DirektÌberweisung - $this->shop->update_option('wpsg_mod_giropay_giropay_activ', $_REQUEST['wpsg_mod_giropay_giropay_activ'], false, false, "key"); - $this->shop->update_option('wpsg_mod_giropay_giropay_projectid', $_REQUEST['wpsg_mod_giropay_giropay_projectid'], false, false, "key"); - $this->shop->update_option('wpsg_mod_giropay_giropay_projectpw', $_REQUEST['wpsg_mod_giropay_giropay_projectpw'], false, false, "text_field"); - - $this->shop->update_option('wpsg_mod_giropay_giropay_name', $_REQUEST['wpsg_mod_giropay_giropay_name'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_giropay_giropay_hint', $_REQUEST['wpsg_mod_giropay_giropay_hint'], false, false, "text_field"); - - $this->shop->addTranslationString('wpsg_mod_giropay_giropay_name', wpsg_sinput("text_field", $_REQUEST['wpsg_mod_giropay_giropay_name'])); - $this->shop->addTranslationString('wpsg_mod_giropay_giropay_hint', wpsg_sinput("text_field", $_REQUEST['wpsg_mod_giropay_giropay_hint'])); - - $this->shop->update_option('wpsg_mod_giropay_giropay_logo', $_REQUEST['wpsg_mod_giropay_giropay_logo'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_giropay_giropay_gebuehr', $_REQUEST['wpsg_mod_giropay_giropay_gebuehr'], false, false, "key", ["isFloat"]); - $this->shop->update_option('wpsg_mod_giropay_giropay_mwst', $_REQUEST['wpsg_mod_giropay_giropay_mwst'], false, false, "key"); - $this->shop->update_option('wpsg_mod_giropay_giropay_mwstland', $_REQUEST['wpsg_mod_giropay_giropay_mwstland'], false, false, "key"); + $this->shop->update_option('wpsg_mod_giropay_giropay_activ', $_REQUEST['wpsg_mod_giropay_giropay_activ'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_giropay_giropay_projectid', $_REQUEST['wpsg_mod_giropay_giropay_projectid'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_giropay_giropay_projectpw', $_REQUEST['wpsg_mod_giropay_giropay_projectpw'], false, false, WPSG_SANITIZE_TEXTFIELD); + + $this->shop->update_option('wpsg_mod_giropay_giropay_name', $_REQUEST['wpsg_mod_giropay_giropay_name'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_giropay_giropay_hint', $_REQUEST['wpsg_mod_giropay_giropay_hint'], false, false, WPSG_SANITIZE_TEXTFIELD); + + $this->shop->addTranslationString('wpsg_mod_giropay_giropay_name', wpsg_sinput(WPSG_SANITIZE_TEXTFIELD, $_REQUEST['wpsg_mod_giropay_giropay_name'])); + $this->shop->addTranslationString('wpsg_mod_giropay_giropay_hint', wpsg_sinput(WPSG_SANITIZE_TEXTFIELD, $_REQUEST['wpsg_mod_giropay_giropay_hint'])); + + $this->shop->update_option('wpsg_mod_giropay_giropay_logo', $_REQUEST['wpsg_mod_giropay_giropay_logo'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_giropay_giropay_gebuehr', $_REQUEST['wpsg_mod_giropay_giropay_gebuehr'], false, false, WPSG_SANITIZE_FLOAT); + $this->shop->update_option('wpsg_mod_giropay_giropay_mwst', $_REQUEST['wpsg_mod_giropay_giropay_mwst'], false, false, WPSG_SANITIZE_TAXKEY); + $this->shop->update_option('wpsg_mod_giropay_giropay_mwstland', $_REQUEST['wpsg_mod_giropay_giropay_mwstland'], false, false, WPSG_SANITIZE_CHECKBOX); // Kreditkarte - $this->shop->update_option('wpsg_mod_giropay_creditcard_activ', $_REQUEST['wpsg_mod_giropay_creditcard_activ'], false, false, "key"); - $this->shop->update_option('wpsg_mod_giropay_creditcard_projectid', $_REQUEST['wpsg_mod_giropay_creditcard_projectid'], false, false, "key"); - $this->shop->update_option('wpsg_mod_giropay_creditcard_projectpw', $_REQUEST['wpsg_mod_giropay_creditcard_projectpw'], false, false, "text_field"); - - $this->shop->update_option('wpsg_mod_giropay_creditcard_name', $_REQUEST['wpsg_mod_giropay_creditcard_name'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_giropay_creditcard_hint', $_REQUEST['wpsg_mod_giropay_creditcard_hint'], false, false, "text_field"); - - $this->shop->addTranslationString('wpsg_mod_giropay_creditcard_name', wpsg_sinput("text_field", $_REQUEST['wpsg_mod_giropay_creditcard_name'])); - $this->shop->addTranslationString('wpsg_mod_giropay_creditcard_hint', wpsg_sinput("text_field", $_REQUEST['wpsg_mod_giropay_creditcard_hint'])); - - $this->shop->update_option('wpsg_mod_giropay_creditcard_logo', $_REQUEST['wpsg_mod_giropay_creditcard_logo'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_giropay_creditcard_gebuehr', $_REQUEST['wpsg_mod_giropay_creditcard_gebuehr'], false, false, "key", ["isFloat"]); - $this->shop->update_option('wpsg_mod_giropay_creditcard_mwst', $_REQUEST['wpsg_mod_giropay_creditcard_mwst'], false, false, "key"); - $this->shop->update_option('wpsg_mod_giropay_creditcard_mwstland', $_REQUEST['wpsg_mod_giropay_creditcard_mwstland'], false, false, "key"); + $this->shop->update_option('wpsg_mod_giropay_creditcard_activ', $_REQUEST['wpsg_mod_giropay_creditcard_activ'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_giropay_creditcard_projectid', $_REQUEST['wpsg_mod_giropay_creditcard_projectid'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_giropay_creditcard_projectpw', $_REQUEST['wpsg_mod_giropay_creditcard_projectpw'], false, false, WPSG_SANITIZE_TEXTFIELD); + + $this->shop->update_option('wpsg_mod_giropay_creditcard_name', $_REQUEST['wpsg_mod_giropay_creditcard_name'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_giropay_creditcard_hint', $_REQUEST['wpsg_mod_giropay_creditcard_hint'], false, false, WPSG_SANITIZE_TEXTFIELD); + + $this->shop->addTranslationString('wpsg_mod_giropay_creditcard_name', wpsg_sinput(WPSG_SANITIZE_TEXTFIELD, $_REQUEST['wpsg_mod_giropay_creditcard_name'])); + $this->shop->addTranslationString('wpsg_mod_giropay_creditcard_hint', wpsg_sinput(WPSG_SANITIZE_TEXTFIELD, $_REQUEST['wpsg_mod_giropay_creditcard_hint'])); + + $this->shop->update_option('wpsg_mod_giropay_creditcard_logo', $_REQUEST['wpsg_mod_giropay_creditcard_logo'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_giropay_creditcard_gebuehr', $_REQUEST['wpsg_mod_giropay_creditcard_gebuehr'], false, false, WPSG_SANITIZE_FLOAT); + $this->shop->update_option('wpsg_mod_giropay_creditcard_mwst', $_REQUEST['wpsg_mod_giropay_creditcard_mwst'], false, false, WPSG_SANITIZE_TAXKEY); + $this->shop->update_option('wpsg_mod_giropay_creditcard_mwstland', $_REQUEST['wpsg_mod_giropay_creditcard_mwstland'], false, false, WPSG_SANITIZE_CHECKBOX); // Lastschrift - $this->shop->update_option('wpsg_mod_giropay_directdebit_activ', $_REQUEST['wpsg_mod_giropay_directdebit_activ'], false, false, "key"); + $this->shop->update_option('wpsg_mod_giropay_directdebit_activ', $_REQUEST['wpsg_mod_giropay_directdebit_activ'], false, false, WPSG_SANITIZE_CHECKBOX); $this->shop->update_option('wpsg_mod_giropay_directdebit_projectid', $_REQUEST['wpsg_mod_giropay_directdebit_projectid'], false, false, "key"); - $this->shop->update_option('wpsg_mod_giropay_directdebit_projectpw', $_REQUEST['wpsg_mod_giropay_directdebit_projectpw'], false, false, "text_field"); - - $this->shop->update_option('wpsg_mod_giropay_directdebit_name', $_REQUEST['wpsg_mod_giropay_directdebit_name'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_giropay_directdebit_hint', $_REQUEST['wpsg_mod_giropay_directdebit_hint'], false, false, "text_field"); - - $this->shop->addTranslationString('wpsg_mod_giropay_directdebit_name', wpsg_sinput("text_field", $_REQUEST['wpsg_mod_giropay_directdebit_name'])); - $this->shop->addTranslationString('wpsg_mod_giropay_directdebit_hint', wpsg_sinput("text_field", $_REQUEST['wpsg_mod_giropay_directdebit_hint'])); - - $this->shop->update_option('wpsg_mod_giropay_directdebit_logo', $_REQUEST['wpsg_mod_giropay_directdebit_logo'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_giropay_directdebit_gebuehr', $_REQUEST['wpsg_mod_giropay_directdebit_gebuehr'], false, false, "key", ["isFloat"]); - $this->shop->update_option('wpsg_mod_giropay_directdebit_mwst', $_REQUEST['wpsg_mod_giropay_directdebit_mwst'], false, false, "key"); - $this->shop->update_option('wpsg_mod_giropay_directdebit_mwstland', $_REQUEST['wpsg_mod_giropay_directdebit_mwstland'], false, false, "key"); + $this->shop->update_option('wpsg_mod_giropay_directdebit_projectpw', $_REQUEST['wpsg_mod_giropay_directdebit_projectpw'], false, false, WPSG_SANITIZE_TEXTFIELD); + + $this->shop->update_option('wpsg_mod_giropay_directdebit_name', $_REQUEST['wpsg_mod_giropay_directdebit_name'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_giropay_directdebit_hint', $_REQUEST['wpsg_mod_giropay_directdebit_hint'], false, false, WPSG_SANITIZE_TEXTFIELD); + + $this->shop->addTranslationString('wpsg_mod_giropay_directdebit_name', wpsg_sinput(WPSG_SANITIZE_TEXTFIELD, $_REQUEST['wpsg_mod_giropay_directdebit_name'])); + $this->shop->addTranslationString('wpsg_mod_giropay_directdebit_hint', wpsg_sinput(WPSG_SANITIZE_TEXTFIELD, $_REQUEST['wpsg_mod_giropay_directdebit_hint'])); + + $this->shop->update_option('wpsg_mod_giropay_directdebit_logo', $_REQUEST['wpsg_mod_giropay_directdebit_logo'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_giropay_directdebit_gebuehr', $_REQUEST['wpsg_mod_giropay_directdebit_gebuehr'], false, false, WPSG_SANITIZE_FLOAT); + $this->shop->update_option('wpsg_mod_giropay_directdebit_mwst', $_REQUEST['wpsg_mod_giropay_directdebit_mwst'], false, false, WPSG_SANITIZE_TAXKEY); + $this->shop->update_option('wpsg_mod_giropay_directdebit_mwstland', $_REQUEST['wpsg_mod_giropay_directdebit_mwstland'], false, false, WPSG_SANITIZE_CHECKBOX); } // public function settings_save() Index: /mods/wpsg_mod_gutschein.class.php =================================================================== --- /mods/wpsg_mod_gutschein.class.php (revision 7436) +++ /mods/wpsg_mod_gutschein.class.php (revision 7437) @@ -496,5 +496,5 @@ $this->db->UpdateQuery(WPSG_TBL_GUTSCHEIN, [ 'code' => wpsg_q(wpsg_sinput("text_field", $_REQUEST['wpsg_mod_gutschein_code'])), - 'value' => wpsg_q(wpsg_tf(wpsg_sinput("key", $_REQUEST['wpsg_mod_gutschein_value'], "isFloat"))), + 'value' => wpsg_q(wpsg_tf(wpsg_sinput("key", $_REQUEST['wpsg_mod_gutschein_value'], WPSG_SANITIZE_FLOAT))), 'calc_typ' => wpsg_q(wpsg_sinput("wpsg_in_array", $_REQUEST['wpsg_mod_gutschein_calc'], ['p', 'w'])), 'start_date' => wpsg_q(date('Y-m-d H:i:s', strtotime(wpsg_sinput("text_field", $_REQUEST['wpsg_mod_gutschein_start'])))), @@ -502,5 +502,5 @@ 'multi' => wpsg_q(wpsg_sinput("key", $_REQUEST['wpsg_mod_gutschein_multi'])), 'comment' => wpsg_q(wpsg_sinput("text_field", $_REQUEST['wpsg_mod_gutschein_comment'])), - 'minvalue' => wpsg_q(wpsg_tf(wpsg_sinput("key", $_REQUEST['wpsg_mod_gutschein_minvalue'], "isFloat"))), + 'minvalue' => wpsg_q(wpsg_tf(wpsg_sinput("key", $_REQUEST['wpsg_mod_gutschein_minvalue'], WPSG_SANITIZE_FLOAT))), 'productgroups' => wpsg_q(implode(',', wpsg_getArray(wpsg_xss($_REQUEST['wpsg_mod_gutschein_productgroups'])))), 'products' => wpsg_q(implode(',', wpsg_getArray(wpsg_xss($_REQUEST['wpsg_mod_gutschein_products'])))), @@ -532,5 +532,5 @@ $this->genGS( - wpsg_tf(wpsg_sinput("key", $_REQUEST['wpsg_mod_gutschein_value'], "isFloat")), + wpsg_tf(wpsg_sinput("key", $_REQUEST['wpsg_mod_gutschein_value'], WPSG_SANITIZE_FLOAT)), wpsg_sinput("text_field", $_REQUEST['wpsg_mod_gutschein_calc']), $tStart, @@ -544,5 +544,5 @@ $arProductGroups, $arProducts, - wpsg_tf(wpsg_sinput("key", $_REQUEST['wpsg_mod_gutschein_minvalue'], "isFloat")), + wpsg_tf(wpsg_sinput("key", $_REQUEST['wpsg_mod_gutschein_minvalue'], WPSG_SANITIZE_FLOAT)), $setCode ); @@ -1265,6 +1265,6 @@ { - $this->shop->update_option('wpsg_mod_gutschein_size', $_REQUEST['wpsg_mod_gutschein_size'], false, false, "key"); - $this->shop->update_option('wpsg_mod_gutschein_perPage', $_REQUEST['wpsg_mod_gutschein_perPage'], false, false, "key"); + $this->shop->update_option('wpsg_mod_gutschein_size', $_REQUEST['wpsg_mod_gutschein_size'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_gutschein_perPage', $_REQUEST['wpsg_mod_gutschein_perPage'], false, false, WPSG_SANITIZE_TEXTFIELD); } // public function settings_save() Index: /mods/wpsg_mod_icp.class.php =================================================================== --- /mods/wpsg_mod_icp.class.php (revision 7436) +++ /mods/wpsg_mod_icp.class.php (revision 7437) @@ -92,22 +92,22 @@ { - $this->shop->update_option('wpsg_mod_icp_sandbox', $_REQUEST['wpsg_mod_icp_sandbox'], false, false, "key"); - $this->shop->update_option('wpsg_mod_icp_sender', $_REQUEST['wpsg_mod_icp_sender'], false, false, "key"); - $this->shop->update_option('wpsg_mod_icp_channelid', $_REQUEST['wpsg_mod_icp_channelid'], false, false, "key"); - $this->shop->update_option('wpsg_mod_icp_userid', $_REQUEST['wpsg_mod_icp_userid'], false, false, "key"); - $this->shop->update_option('wpsg_mod_icp_password', $_REQUEST['wpsg_mod_icp_password'], false, false, "text_field"); - - $this->shop->update_option('wpsg_mod_icp_activ', $_REQUEST['wpsg_mod_icp_activ'], false, false, "key"); - $this->shop->update_option('wpsg_mod_icp_paymenttypes', $_REQUEST['wpsg_mod_icp_paymenttypes'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_icp_name', $_REQUEST['wpsg_mod_icp_name'], false, false, "text_field"); $this->shop->addTranslationString('wpsg_mod_icp_name', wpsg_sinput("text_field", $_REQUEST['wpsg_mod_icp_name'])); - $this->shop->update_option('wpsg_mod_icp_hint', $_REQUEST['wpsg_mod_icp_hint'], false, false, "text_field"); $this->shop->addTranslationString('wpsg_mod_icp_hint', wpsg_sinput("text_field", $_REQUEST['wpsg_mod_icp_hint'])); - $this->shop->update_option('wpsg_mod_icp_logo', $_REQUEST['wpsg_mod_icp_logo'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_icp_language', $_REQUEST['wpsg_mod_icp_language'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_icp_gebuehr', $_REQUEST['wpsg_mod_icp_gebuehr'], false, false, "key", ["isFloat"]); - $this->shop->update_option('wpsg_mod_icp_mwst', $_REQUEST['wpsg_mod_icp_mwst'], false, false, "key"); - $this->shop->update_option('wpsg_mod_icp_mwstland', $_REQUEST['wpsg_mod_icp_mwstland'], false, false, "key"); - - $this->shop->createPage(__('Erfolgreiche Zahlung', 'wpsg'), 'wpsg_mod_icp_successPage', wpsg_sinput("key", $_REQUEST['wpsg_mod_icp_successPage'])); - $this->shop->createPage(__('Fehlerhafte Zahlung', 'wpsg'), 'wpsg_mod_icp_errorPage', wpsg_sinput("key", $_REQUEST['wpsg_mod_icp_errorPage'])); + $this->shop->update_option('wpsg_mod_icp_sandbox', $_REQUEST['wpsg_mod_icp_sandbox'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_icp_sender', $_REQUEST['wpsg_mod_icp_sender'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_icp_channelid', $_REQUEST['wpsg_mod_icp_channelid'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_icp_userid', $_REQUEST['wpsg_mod_icp_userid'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_icp_password', $_REQUEST['wpsg_mod_icp_password'], false, false, WPSG_SANITIZE_TEXTFIELD); + + $this->shop->update_option('wpsg_mod_icp_activ', $_REQUEST['wpsg_mod_icp_activ'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_icp_paymenttypes', $_REQUEST['wpsg_mod_icp_paymenttypes'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_icp_name', $_REQUEST['wpsg_mod_icp_name'], false, false, WPSG_SANITIZE_TEXTFIELD); $this->shop->addTranslationString('wpsg_mod_icp_name', wpsg_sinput("text_field", $_REQUEST['wpsg_mod_icp_name'])); + $this->shop->update_option('wpsg_mod_icp_hint', $_REQUEST['wpsg_mod_icp_hint'], false, false, WPSG_SANITIZE_TEXTFIELD); $this->shop->addTranslationString('wpsg_mod_icp_hint', wpsg_sinput("text_field", $_REQUEST['wpsg_mod_icp_hint'])); + $this->shop->update_option('wpsg_mod_icp_logo', $_REQUEST['wpsg_mod_icp_logo'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_icp_language', $_REQUEST['wpsg_mod_icp_language'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_icp_gebuehr', $_REQUEST['wpsg_mod_icp_gebuehr'], false, false, WPSG_SANITIZE_FLOAT); + $this->shop->update_option('wpsg_mod_icp_mwst', $_REQUEST['wpsg_mod_icp_mwst'], false, false, WPSG_SANITIZE_TAXKEY); + $this->shop->update_option('wpsg_mod_icp_mwstland', $_REQUEST['wpsg_mod_icp_mwstland'], false, false, WPSG_SANITIZE_CHECKBOX); + + $this->shop->createPage(__('Erfolgreiche Zahlung', 'wpsg'), 'wpsg_mod_icp_successPage', wpsg_sinput(WPSG_SANITIZE_INT, $_REQUEST['wpsg_mod_icp_successPage'])); + $this->shop->createPage(__('Fehlerhafte Zahlung', 'wpsg'), 'wpsg_mod_icp_errorPage', wpsg_sinput(WPSG_SANITIZE_INT, $_REQUEST['wpsg_mod_icp_errorPage'])); } // public function settings_save() Index: /mods/wpsg_mod_klarna.class.php =================================================================== --- /mods/wpsg_mod_klarna.class.php (revision 7436) +++ /mods/wpsg_mod_klarna.class.php (revision 7437) @@ -65,21 +65,21 @@ { - $this->shop->update_option('wpsg_mod_klarna_bezeichnung', $_REQUEST['wpsg_mod_klarna_bezeichnung'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_klarna_aktiv', $_REQUEST['wpsg_mod_klarna_aktiv'], false, false, "key"); - $this->shop->update_option('wpsg_mod_klarna_aktiv_from', $_REQUEST['wpsg_mod_klarna_aktiv_from'], false, false, "key", ["isFloat"]); - $this->shop->update_option('wpsg_mod_klarna_aktiv_to', $_REQUEST['wpsg_mod_klarna_aktiv_to'], false, false, "key", ["isFloat"]); - $this->shop->update_option('wpsg_mod_klarna_hint', $_REQUEST['wpsg_mod_klarna_hint'], false, false, "text_field"); - - $this->shop->update_option('wpsg_mod_klarna_merchantID', $_REQUEST['wpsg_mod_klarna_merchantID'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_klarna_sharedSecret', $_REQUEST['wpsg_mod_klarna_sharedSecret'], false, false, "text_field"); - - $this->shop->update_option('wpsg_mod_klarna_sandbox', $_REQUEST['wpsg_mod_klarna_sandbox'], false, false, "key"); - - $this->shop->update_option('wpsg_mod_klarna_gebuehr', $_REQUEST['wpsg_mod_klarna_gebuehr'], false, false, "key", ["isFloat"]); - $this->shop->update_option('wpsg_mod_klarna_mwst', $_REQUEST['wpsg_mod_klarna_mwst'], false, false, "key"); - $this->shop->update_option('wpsg_mod_klarna_mwstland', $_REQUEST['wpsg_mod_klarna_mwstland'], false, false, "key"); - - $this->shop->createPage(__('Erfolgreiche Klarna Zahlung', 'wpsg'), 'wpsg_mod_klarna_success', wpsg_sinput("key", $_REQUEST['wpsg_mod_klarna_success'])); - $this->shop->createPage(__('Fehlgeschlagene Klarna Zahlung', 'wpsg'), 'wpsg_mod_klarna_error', wpsg_sinput("key", $_REQUEST['wpsg_mod_klarna_error'])); + $this->shop->update_option('wpsg_mod_klarna_bezeichnung', $_REQUEST['wpsg_mod_klarna_bezeichnung'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_klarna_aktiv', $_REQUEST['wpsg_mod_klarna_aktiv'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_klarna_aktiv_from', $_REQUEST['wpsg_mod_klarna_aktiv_from'], false, false, WPSG_SANITIZE_FLOAT); + $this->shop->update_option('wpsg_mod_klarna_aktiv_to', $_REQUEST['wpsg_mod_klarna_aktiv_to'], false, false, WPSG_SANITIZE_FLOAT); + $this->shop->update_option('wpsg_mod_klarna_hint', $_REQUEST['wpsg_mod_klarna_hint'], false, false, WPSG_SANITIZE_TEXTFIELD); + + $this->shop->update_option('wpsg_mod_klarna_merchantID', $_REQUEST['wpsg_mod_klarna_merchantID'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_klarna_sharedSecret', $_REQUEST['wpsg_mod_klarna_sharedSecret'], false, false, WPSG_SANITIZE_TEXTFIELD); + + $this->shop->update_option('wpsg_mod_klarna_sandbox', $_REQUEST['wpsg_mod_klarna_sandbox'], false, false, WPSG_SANITIZE_CHECKBOX); + + $this->shop->update_option('wpsg_mod_klarna_gebuehr', $_REQUEST['wpsg_mod_klarna_gebuehr'], false, false, WPSG_SANITIZE_FLOAT); + $this->shop->update_option('wpsg_mod_klarna_mwst', $_REQUEST['wpsg_mod_klarna_mwst'], false, false, WPSG_SANITIZE_TAXKEY); + $this->shop->update_option('wpsg_mod_klarna_mwstland', $_REQUEST['wpsg_mod_klarna_mwstland'], false, false, WPSG_SANITIZE_CHECKBOX); + + $this->shop->createPage(__('Erfolgreiche Klarna Zahlung', 'wpsg'), 'wpsg_mod_klarna_success', wpsg_sinput(WPSG_SANITIZE_INT, $_REQUEST['wpsg_mod_klarna_success'])); + $this->shop->createPage(__('Fehlgeschlagene Klarna Zahlung', 'wpsg'), 'wpsg_mod_klarna_error', wpsg_sinput(WPSG_SANITIZE_INT, $_REQUEST['wpsg_mod_klarna_error'])); } // public function settings_save() Index: /mods/wpsg_mod_kundenkontakt.class.php =================================================================== --- /mods/wpsg_mod_kundenkontakt.class.php (revision 7436) +++ /mods/wpsg_mod_kundenkontakt.class.php (revision 7437) @@ -74,11 +74,11 @@ public function settings_save() { - $this->shop->update_option('wpsg_mod_kundenkontakt_smsflatrate_active', $_REQUEST['wpsg_mod_kundenkontakt']['smsflatrate']['active'], false, false, "key"); - $this->shop->update_option('wpsg_mod_kundenkontakt_smsflatrate_key', $_REQUEST['wpsg_mod_kundenkontakt']['smsflatrate']['key'], false, false, "key"); - $this->shop->update_option('wpsg_mod_kundenkontakt_smsflatrate_from', $_REQUEST['wpsg_mod_kundenkontakt']['smsflatrate']['from'], false, false, "key"); - $this->shop->update_option('wpsg_mod_kundenkontakt_smsflatrate_type', $_REQUEST['wpsg_mod_kundenkontakt']['smsflatrate']['type'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_kundenkontakt_smsflatrate_status', $_REQUEST['wpsg_mod_kundenkontakt']['smsflatrate']['status'], false, false, "key"); - $this->shop->update_option('wpsg_mod_kundenkontakt_smsflatrate_reply', $_REQUEST['wpsg_mod_kundenkontakt']['smsflatrate']['reply'], false, false, "key"); - $this->shop->update_option('wpsg_mod_kundenkontakt_smsflatrate_replytomail', $_REQUEST['wpsg_mod_kundenkontakt']['smsflatrate']['replytomail'], false, false, "email"); + $this->shop->update_option('wpsg_mod_kundenkontakt_smsflatrate_active', $_REQUEST['wpsg_mod_kundenkontakt']['smsflatrate']['active'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_kundenkontakt_smsflatrate_key', $_REQUEST['wpsg_mod_kundenkontakt']['smsflatrate']['key'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_kundenkontakt_smsflatrate_from', $_REQUEST['wpsg_mod_kundenkontakt']['smsflatrate']['from'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_kundenkontakt_smsflatrate_type', $_REQUEST['wpsg_mod_kundenkontakt']['smsflatrate']['type'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_kundenkontakt_smsflatrate_status', $_REQUEST['wpsg_mod_kundenkontakt']['smsflatrate']['status'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_kundenkontakt_smsflatrate_reply', $_REQUEST['wpsg_mod_kundenkontakt']['smsflatrate']['reply'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_kundenkontakt_smsflatrate_replytomail', $_REQUEST['wpsg_mod_kundenkontakt']['smsflatrate']['replytomail'], false, false, WSPG_SANITIZE_EMAIL); } Index: /mods/wpsg_mod_kundenverwaltung.class.php =================================================================== --- /mods/wpsg_mod_kundenverwaltung.class.php (revision 7436) +++ /mods/wpsg_mod_kundenverwaltung.class.php (revision 7437) @@ -181,33 +181,33 @@ { - $this->shop->update_option('wpsg_mod_kundenverwaltung_perpage', $_REQUEST['wpsg_mod_kundenverwaltung_perpage'], false, false, "key"); - $this->shop->update_option('wpsg_mod_kundenverwaltung_showCheckoutLogin', $_REQUEST['wpsg_mod_kundenverwaltung_showCheckoutLogin'], false, false, "key"); - $this->shop->update_option('wpsg_mod_kundenverwaltung_showCheckoutRegister', $_REQUEST['wpsg_mod_kundenverwaltung_showCheckoutRegister'], false, false, "key"); - $this->shop->update_option('wpsg_mod_kundenverwaltung_showCheckoutRegisterzwang', $_REQUEST['wpsg_mod_kundenverwaltung_showCheckoutRegisterzwang'], false, false, "key"); - $this->shop->update_option('wpsg_mod_kundenverwaltung_loginZwang', $_REQUEST['wpsg_mod_kundenverwaltung_loginZwang'], false, false, "key"); - $this->shop->update_option('wpsg_mod_kundenverwaltung_preisAnzeige', $_REQUEST['wpsg_mod_kundenverwaltung_preisAnzeige'], false, false, "key"); - - $this->shop->update_option('wpsg_mod_kundenverwaltung_redirectlogin', $_REQUEST['wpsg_mod_kundenverwaltung_redirectlogin'], false, false, "key"); - $this->shop->update_option('wpsg_mod_kundenverwaltung_redirectLogout', $_REQUEST['wpsg_mod_kundenverwaltung_redirectLogout'], false, false, "key"); - $this->shop->update_option('wpsg_page_mod_kundenverwaltung_status', $_REQUEST['wpsg_page_mod_kundenverwaltung_status'], false, false, "key"); - - $this->shop->update_option('wpsg_mod_kundenverwaltung_wpuser', $_REQUEST['wpsg_mod_kundenverwaltung_wpuser'], false, false, "key"); + $this->shop->update_option('wpsg_mod_kundenverwaltung_perpage', $_REQUEST['wpsg_mod_kundenverwaltung_perpage'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_kundenverwaltung_showCheckoutLogin', $_REQUEST['wpsg_mod_kundenverwaltung_showCheckoutLogin'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_kundenverwaltung_showCheckoutRegister', $_REQUEST['wpsg_mod_kundenverwaltung_showCheckoutRegister'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_kundenverwaltung_showCheckoutRegisterzwang', $_REQUEST['wpsg_mod_kundenverwaltung_showCheckoutRegisterzwang'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_kundenverwaltung_loginZwang', $_REQUEST['wpsg_mod_kundenverwaltung_loginZwang'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_kundenverwaltung_preisAnzeige', $_REQUEST['wpsg_mod_kundenverwaltung_preisAnzeige'], false, false, WPSG_SANITIZE_CHECKBOX); + + $this->shop->update_option('wpsg_mod_kundenverwaltung_redirectlogin', $_REQUEST['wpsg_mod_kundenverwaltung_redirectlogin'], false, false, WPSG_SANITIZE_INT); + $this->shop->update_option('wpsg_mod_kundenverwaltung_redirectLogout', $_REQUEST['wpsg_mod_kundenverwaltung_redirectLogout'], false, false, WPSG_SANITIZE_INT); + $this->shop->update_option('wpsg_page_mod_kundenverwaltung_status', $_REQUEST['wpsg_page_mod_kundenverwaltung_status'], false, false, WPSG_SANITIZE_INT); + + $this->shop->update_option('wpsg_mod_kundenverwaltung_wpuser', $_REQUEST['wpsg_mod_kundenverwaltung_wpuser'], false, false, WPSG_SANITIZE_CHECKBOX); $this->shop->update_option('wpsg_mod_kundenverwaltung_wpuser_role', wpsg_xss($_REQUEST['wpsg_mod_kundenverwaltung_wpuser_role'])); - $this->shop->update_option('wpsg_mod_kundenverwaltung_aweber', $_REQUEST['wpsg_mod_kundenverwaltung_aweber'], false, false, "key"); - $this->shop->update_option('wpsg_mod_kundenverwaltung_aweber_formid', $_REQUEST['wpsg_mod_kundenverwaltung_aweber_formid'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_kundenverwaltung_aweber_listname', $_REQUEST['wpsg_mod_kundenverwaltung_aweber_listname'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_kundenverwaltung_aweber_metaAdtracking', $_REQUEST['wpsg_mod_kundenverwaltung_aweber_metaAdtracking'], false, false, "text_field"); - - $this->shop->update_option('wpsg_mod_kundenverwaltung_recaptcha_register', $_REQUEST['wpsg_mod_kundenverwaltung_recaptcha_register'], false, false, "key"); - $this->shop->update_option('wpsg_mod_kundenveraltung_recaptcha_key', $_REQUEST['wpsg_mod_kundenveraltung_recaptcha_key'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_kundenveraltung_recaptcha_secretkey', $_REQUEST['wpsg_mod_kundenveraltung_recaptcha_secretkey'], false, false, "text_field"); - - $this->shop->createPage(__('Profil', 'wpsg'), 'wpsg_page_mod_kundenverwaltung_profil', wpsg_sinput("key", $_REQUEST['wpsg_page_mod_kundenverwaltung_profil'])); - $this->shop->createPage(__('Registrierung', 'wpsg'), 'wpsg_page_mod_kundenverwaltung_registrierung', wpsg_sinput("key", $_REQUEST['wpsg_page_mod_kundenverwaltung_registrierung'])); - $this->shop->createPage(__('Registrierung abgeschlossen', 'wpsg'), 'wpsg_page_mod_kundenverwaltung_weiterleitung_nach_registrierung', wpsg_sinput("key", $_REQUEST['wpsg_page_mod_kundenverwaltung_weiterleitung_nach_registrierung'])); - $this->shop->createPage(__('Passwort gesendet', 'wpsg'), 'wpsg_page_mod_kundenverwaltung_passwordsend', wpsg_sinput("key", $_REQUEST['wpsg_page_mod_kundenverwaltung_passwordsend'])); - $this->shop->createPage(__('Bestellungen', 'wpsg'), 'wpsg_page_mod_kundenverwaltung_order', wpsg_sinput("key", $_REQUEST['wpsg_page_mod_kundenverwaltung_order'])); - $this->shop->createPage(__('Abonnements', 'wpsg'), 'wpsg_page_mod_kundenverwaltung_abo', wpsg_sinput("key", $_REQUEST['wpsg_page_mod_kundenverwaltung_abo'])); + $this->shop->update_option('wpsg_mod_kundenverwaltung_aweber', $_REQUEST['wpsg_mod_kundenverwaltung_aweber'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_kundenverwaltung_aweber_formid', $_REQUEST['wpsg_mod_kundenverwaltung_aweber_formid'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_kundenverwaltung_aweber_listname', $_REQUEST['wpsg_mod_kundenverwaltung_aweber_listname'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_kundenverwaltung_aweber_metaAdtracking', $_REQUEST['wpsg_mod_kundenverwaltung_aweber_metaAdtracking'], false, false, WPSG_SANITIZE_TEXTFIELD); + + $this->shop->update_option('wpsg_mod_kundenverwaltung_recaptcha_register', $_REQUEST['wpsg_mod_kundenverwaltung_recaptcha_register'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_kundenveraltung_recaptcha_key', $_REQUEST['wpsg_mod_kundenveraltung_recaptcha_key'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_kundenveraltung_recaptcha_secretkey', $_REQUEST['wpsg_mod_kundenveraltung_recaptcha_secretkey'], false, false, WPSG_SANITIZE_TEXTFIELD); + + $this->shop->createPage(__('Profil', 'wpsg'), 'wpsg_page_mod_kundenverwaltung_profil', wpsg_sinput(WPSG_SANITIZE_INT, $_REQUEST['wpsg_page_mod_kundenverwaltung_profil'])); + $this->shop->createPage(__('Registrierung', 'wpsg'), 'wpsg_page_mod_kundenverwaltung_registrierung', wpsg_sinput(WPSG_SANITIZE_INT, $_REQUEST['wpsg_page_mod_kundenverwaltung_registrierung'])); + $this->shop->createPage(__('Registrierung abgeschlossen', 'wpsg'), 'wpsg_page_mod_kundenverwaltung_weiterleitung_nach_registrierung', wpsg_sinput(WPSG_SANITIZE_INT, $_REQUEST['wpsg_page_mod_kundenverwaltung_weiterleitung_nach_registrierung'])); + $this->shop->createPage(__('Passwort gesendet', 'wpsg'), 'wpsg_page_mod_kundenverwaltung_passwordsend', wpsg_sinput(WPSG_SANITIZE_INT, $_REQUEST['wpsg_page_mod_kundenverwaltung_passwordsend'])); + $this->shop->createPage(__('Bestellungen', 'wpsg'), 'wpsg_page_mod_kundenverwaltung_order', wpsg_sinput(WPSG_SANITIZE_INT, $_REQUEST['wpsg_page_mod_kundenverwaltung_order'])); + $this->shop->createPage(__('Abonnements', 'wpsg'), 'wpsg_page_mod_kundenverwaltung_abo', wpsg_sinput(WPSG_SANITIZE_INT, $_REQUEST['wpsg_page_mod_kundenverwaltung_abo'])); } // public function settings_save() Index: /mods/wpsg_mod_micropayment.class.php =================================================================== --- /mods/wpsg_mod_micropayment.class.php (revision 7436) +++ /mods/wpsg_mod_micropayment.class.php (revision 7437) @@ -144,95 +144,95 @@ // Allgemein - $this->shop->update_option('wpsg_mod_micropayment_projectid', $_REQUEST['wpsg_mod_micropayment_projectid'], false, false, "key"); - $this->shop->update_option('wpsg_mod_micropayment_accountid', $_REQUEST['wpsg_mod_micropayment_accountid'], false, false, "key"); - $this->shop->update_option('wpsg_mod_micropayment_accesskey', $_REQUEST['wpsg_mod_micropayment_accesskey'], false, false, "key"); - $this->shop->createPage(__('Erfolgreiche Zahlung', 'wpsg'), 'wpsg_mod_micropayment_successPage', wpsg_sinput("key", $_REQUEST['wpsg_mod_micropayment_successPage'])); - $this->shop->update_option('wpsg_mod_micropayment_paystart', $_REQUEST['wpsg_mod_micropayment_paystart'], false, false, "key"); - - $this->shop->update_option('wpsg_mod_micropayment_account', $_REQUEST['wpsg_mod_micropayment_account'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_micropayment_layout', $_REQUEST['wpsg_mod_micropayment_layout'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_micropayment_bgcolor', $_REQUEST['wpsg_mod_micropayment_bgcolor'], false, false, "hex_color"); - $this->shop->update_option('wpsg_mod_micropayment_campaign', $_REQUEST['wpsg_mod_micropayment_campaign'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_micropayment_sandbox', $_REQUEST['wpsg_mod_micropayment_sandbox'], false, false, "key"); - $this->shop->update_option('wpsg_mod_micropayment_bggfx', $_REQUEST['wpsg_mod_micropayment_bggfx'], false, false, "text_field"); + $this->shop->update_option('wpsg_mod_micropayment_projectid', $_REQUEST['wpsg_mod_micropayment_projectid'], false, false, WPSG_SANITIZE_APIKEY); + $this->shop->update_option('wpsg_mod_micropayment_accountid', $_REQUEST['wpsg_mod_micropayment_accountid'], false, false, WPSG_SANITIZE_APIKEY); + $this->shop->update_option('wpsg_mod_micropayment_accesskey', $_REQUEST['wpsg_mod_micropayment_accesskey'], false, false, WPSG_SANITIZE_APIKEY); + $this->shop->createPage(__('Erfolgreiche Zahlung', 'wpsg'), 'wpsg_mod_micropayment_successPage', wpsg_sinput(WPSG_SANITIZE_INT, $_REQUEST['wpsg_mod_micropayment_successPage'])); + $this->shop->update_option('wpsg_mod_micropayment_paystart', $_REQUEST['wpsg_mod_micropayment_paystart'], false, false, WPSG_SANITIZE_CHECKBOX); + + $this->shop->update_option('wpsg_mod_micropayment_account', $_REQUEST['wpsg_mod_micropayment_account'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_micropayment_layout', $_REQUEST['wpsg_mod_micropayment_layout'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_micropayment_bgcolor', $_REQUEST['wpsg_mod_micropayment_bgcolor'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_micropayment_campaign', $_REQUEST['wpsg_mod_micropayment_campaign'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_micropayment_sandbox', $_REQUEST['wpsg_mod_micropayment_sandbox'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_micropayment_bggfx', $_REQUEST['wpsg_mod_micropayment_bggfx'], false, false, WPSG_SANITIZE_TEXTFIELD); // Kreditkarte - $this->shop->update_option('wpsg_mod_micropayment_creditcard_activ', $_REQUEST['wpsg_mod_micropayment_creditcard_activ'], false, false, "key"); - $this->shop->update_option('wpsg_mod_micropayment_creditcard_name', $_REQUEST['wpsg_mod_micropayment_creditcard_name'], false, false, "text_field"); - $this->shop->addTranslationString('wpsg_mod_micropayment_creditcard_name', wpsg_sinput("text_field", $_REQUEST['wpsg_mod_micropayment_creditcard_name'])); - $this->shop->update_option('wpsg_mod_micropayment_creditcard_hint', $_REQUEST['wpsg_mod_micropayment_creditcard_hint'], false, false, "text_field"); - $this->shop->addTranslationString('wpsg_mod_micropayment_creditcard_hint', wpsg_sinput("text_field", $_REQUEST['wpsg_mod_micropayment_creditcard_hint'])); - $this->shop->update_option('wpsg_mod_micropayment_creditcard_logo', $_REQUEST['wpsg_mod_micropayment_creditcard_logo'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_micropayment_creditcard_gebuehr', $_REQUEST['wpsg_mod_micropayment_creditcard_gebuehr'], false, false, "key", ["isFloat"]); - $this->shop->update_option('wpsg_mod_micropayment_creditcard_mwst', $_REQUEST['wpsg_mod_micropayment_creditcard_mwst'], false, false, "key"); - $this->shop->update_option('wpsg_mod_micropayment_creditcard_mwstland', $_REQUEST['wpsg_mod_micropayment_creditcard_mwstland'], false, false, "key"); + $this->shop->update_option('wpsg_mod_micropayment_creditcard_activ', $_REQUEST['wpsg_mod_micropayment_creditcard_activ'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_micropayment_creditcard_name', $_REQUEST['wpsg_mod_micropayment_creditcard_name'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->addTranslationString('wpsg_mod_micropayment_creditcard_name', wpsg_sinput(WPSG_SANITIZE_TEXTFIELD, $_REQUEST['wpsg_mod_micropayment_creditcard_name'])); + $this->shop->update_option('wpsg_mod_micropayment_creditcard_hint', $_REQUEST['wpsg_mod_micropayment_creditcard_hint'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->addTranslationString('wpsg_mod_micropayment_creditcard_hint', wpsg_sinput(WPSG_SANITIZE_TEXTFIELD, $_REQUEST['wpsg_mod_micropayment_creditcard_hint'])); + $this->shop->update_option('wpsg_mod_micropayment_creditcard_logo', $_REQUEST['wpsg_mod_micropayment_creditcard_logo'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_micropayment_creditcard_gebuehr', $_REQUEST['wpsg_mod_micropayment_creditcard_gebuehr'], false, false, WPSG_SANITIZE_FLOAT); + $this->shop->update_option('wpsg_mod_micropayment_creditcard_mwst', $_REQUEST['wpsg_mod_micropayment_creditcard_mwst'], false, false, WPSG_SANITIZE_TAXKEY); + $this->shop->update_option('wpsg_mod_micropayment_creditcard_mwstland', $_REQUEST['wpsg_mod_micropayment_creditcard_mwstland'], false, false, WPSG_SANITIZE_CHECKBOX); // Kreditkarte (Reservierung) - $this->shop->update_option('wpsg_mod_micropayment_creditcardreservation_activ', $_REQUEST['wpsg_mod_micropayment_creditcardreservation_activ'], false, false, "key"); - $this->shop->update_option('wpsg_mod_micropayment_creditcardreservation_name', $_REQUEST['wpsg_mod_micropayment_creditcardreservation_name'], false, false, "text_field"); - $this->shop->addTranslationString('wpsg_mod_micropayment_creditcardreservation_name', wpsg_sinput("text_field", $_REQUEST['wpsg_mod_micropayment_creditcardreservation_name'])); - $this->shop->update_option('wpsg_mod_micropayment_creditcardreservation_hint', $_REQUEST['wpsg_mod_micropayment_creditcardreservation_hint'], false, false, "text_field"); - $this->shop->addTranslationString('wpsg_mod_micropayment_creditcardreservation_hint', wpsg_sinput("text_field", $_REQUEST['wpsg_mod_micropayment_creditcardreservation_hint'])); - $this->shop->update_option('wpsg_mod_micropayment_creditcardreservation_logo', $_REQUEST['wpsg_mod_micropayment_creditcardreservation_logo'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_micropayment_creditcardreservation_gebuehr', $_REQUEST['wpsg_mod_micropayment_creditcardreservation_gebuehr'], false, false, "key", ["isFloat"]); - $this->shop->update_option('wpsg_mod_micropayment_creditcardreservation_mwst', $_REQUEST['wpsg_mod_micropayment_creditcardreservation_mwst'], false, false, "key"); - $this->shop->update_option('wpsg_mod_micropayment_creditcardreservation_mwstland', $_REQUEST['wpsg_mod_micropayment_creditcardreservation_mwstland'], false, false, "key"); + $this->shop->update_option('wpsg_mod_micropayment_creditcardreservation_activ', $_REQUEST['wpsg_mod_micropayment_creditcardreservation_activ'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_micropayment_creditcardreservation_name', $_REQUEST['wpsg_mod_micropayment_creditcardreservation_name'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->addTranslationString('wpsg_mod_micropayment_creditcardreservation_name', wpsg_sinput(WPSG_SANITIZE_TEXTFIELD, $_REQUEST['wpsg_mod_micropayment_creditcardreservation_name'])); + $this->shop->update_option('wpsg_mod_micropayment_creditcardreservation_hint', $_REQUEST['wpsg_mod_micropayment_creditcardreservation_hint'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->addTranslationString('wpsg_mod_micropayment_creditcardreservation_hint', wpsg_sinput(WPSG_SANITIZE_TEXTFIELD, $_REQUEST['wpsg_mod_micropayment_creditcardreservation_hint'])); + $this->shop->update_option('wpsg_mod_micropayment_creditcardreservation_logo', $_REQUEST['wpsg_mod_micropayment_creditcardreservation_logo'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_micropayment_creditcardreservation_gebuehr', $_REQUEST['wpsg_mod_micropayment_creditcardreservation_gebuehr'], false, false, WPSG_SANITIZE_FLOAT); + $this->shop->update_option('wpsg_mod_micropayment_creditcardreservation_mwst', $_REQUEST['wpsg_mod_micropayment_creditcardreservation_mwst'], false, false, WPSG_SANITIZE_TAXKEY); + $this->shop->update_option('wpsg_mod_micropayment_creditcardreservation_mwstland', $_REQUEST['wpsg_mod_micropayment_creditcardreservation_mwstland'], false, false, WPSG_SANITIZE_CHECKBOX); // Lastschrift - $this->shop->update_option('wpsg_mod_micropayment_directdebit_activ', $_REQUEST['wpsg_mod_micropayment_directdebit_activ'], false, false, "key"); - $this->shop->update_option('wpsg_mod_micropayment_directdebit_name', $_REQUEST['wpsg_mod_micropayment_directdebit_name'], false, false, "text_field"); - $this->shop->addTranslationString('wpsg_mod_micropayment_directdebit_name', wpsg_sinput("text_field", $_REQUEST['wpsg_mod_micropayment_directdebit_name'])); - $this->shop->update_option('wpsg_mod_micropayment_directdebit_hint', $_REQUEST['wpsg_mod_micropayment_directdebit_hint'], false, false, "text_field"); - $this->shop->addTranslationString('wpsg_mod_micropayment_directdebit_hint', wpsg_sinput("text_field", $_REQUEST['wpsg_mod_micropayment_directdebit_hint'])); - $this->shop->update_option('wpsg_mod_micropayment_directdebit_logo', $_REQUEST['wpsg_mod_micropayment_directdebit_logo'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_micropayment_directdebit_gebuehr', $_REQUEST['wpsg_mod_micropayment_directdebit_gebuehr'], false, false, "key", ["isFloat"]); - $this->shop->update_option('wpsg_mod_micropayment_directdebit_mwst', $_REQUEST['wpsg_mod_micropayment_directdebit_mwst'], false, false, "key"); - $this->shop->update_option('wpsg_mod_micropayment_directdebit_mwstland', $_REQUEST['wpsg_mod_micropayment_directdebit_mwstland'], false, false, "key"); - $this->shop->update_option('wpsg_mod_micropayment_directdebit_subject', $_REQUEST['wpsg_mod_micropayment_directdebit_subject'], false, false, "text_field"); + $this->shop->update_option('wpsg_mod_micropayment_directdebit_activ', $_REQUEST['wpsg_mod_micropayment_directdebit_activ'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_micropayment_directdebit_name', $_REQUEST['wpsg_mod_micropayment_directdebit_name'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->addTranslationString('wpsg_mod_micropayment_directdebit_name', wpsg_sinput(WPSG_SANITIZE_TEXTFIELD, $_REQUEST['wpsg_mod_micropayment_directdebit_name'])); + $this->shop->update_option('wpsg_mod_micropayment_directdebit_hint', $_REQUEST['wpsg_mod_micropayment_directdebit_hint'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->addTranslationString('wpsg_mod_micropayment_directdebit_hint', wpsg_sinput(WPSG_SANITIZE_TEXTFIELD, $_REQUEST['wpsg_mod_micropayment_directdebit_hint'])); + $this->shop->update_option('wpsg_mod_micropayment_directdebit_logo', $_REQUEST['wpsg_mod_micropayment_directdebit_logo'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_micropayment_directdebit_gebuehr', $_REQUEST['wpsg_mod_micropayment_directdebit_gebuehr'], false, false, WPSG_SANITIZE_FLOAT); + $this->shop->update_option('wpsg_mod_micropayment_directdebit_mwst', $_REQUEST['wpsg_mod_micropayment_directdebit_mwst'], false, false, WPSG_SANITIZE_TAXKEY); + $this->shop->update_option('wpsg_mod_micropayment_directdebit_mwstland', $_REQUEST['wpsg_mod_micropayment_directdebit_mwstland'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_micropayment_directdebit_subject', $_REQUEST['wpsg_mod_micropayment_directdebit_subject'], false, false, WPSG_SANITIZE_TEXTFIELD); // eBank2Pay - $this->shop->update_option('wpsg_mod_micropayment_ebank2pay_activ', $_REQUEST['wpsg_mod_micropayment_ebank2pay_activ'], false, false, "key"); - $this->shop->update_option('wpsg_mod_micropayment_ebank2pay_name', $_REQUEST['wpsg_mod_micropayment_ebank2pay_name'], false, false, "text_field"); - $this->shop->addTranslationString('wpsg_mod_micropayment_ebank2pay_name', wpsg_sinput("text_field", $_REQUEST['wpsg_mod_micropayment_ebank2pay_name'])); - $this->shop->update_option('wpsg_mod_micropayment_ebank2pay_hint', $_REQUEST['wpsg_mod_micropayment_ebank2pay_hint'], false, false, "text_field"); - $this->shop->addTranslationString('wpsg_mod_micropayment_ebank2pay_hint', wpsg_sinput("text_field", $_REQUEST['wpsg_mod_micropayment_ebank2pay_hint'])); - $this->shop->update_option('wpsg_mod_micropayment_ebank2pay_logo', $_REQUEST['wpsg_mod_micropayment_ebank2pay_logo'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_micropayment_ebank2pay_gebuehr', $_REQUEST['wpsg_mod_micropayment_ebank2pay_gebuehr'], false, false, "key", ["isFloat"]); - $this->shop->update_option('wpsg_mod_micropayment_ebank2pay_mwst', $_REQUEST['wpsg_mod_micropayment_ebank2pay_mwst'], false, false, "key"); - $this->shop->update_option('wpsg_mod_micropayment_ebank2pay_mwstland', $_REQUEST['wpsg_mod_micropayment_ebank2pay_mwstland'], false, false, "key"); + $this->shop->update_option('wpsg_mod_micropayment_ebank2pay_activ', $_REQUEST['wpsg_mod_micropayment_ebank2pay_activ'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_micropayment_ebank2pay_name', $_REQUEST['wpsg_mod_micropayment_ebank2pay_name'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->addTranslationString('wpsg_mod_micropayment_ebank2pay_name', wpsg_sinput(WPSG_SANITIZE_TEXTFIELD, $_REQUEST['wpsg_mod_micropayment_ebank2pay_name'])); + $this->shop->update_option('wpsg_mod_micropayment_ebank2pay_hint', $_REQUEST['wpsg_mod_micropayment_ebank2pay_hint'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->addTranslationString('wpsg_mod_micropayment_ebank2pay_hint', wpsg_sinput(WPSG_SANITIZE_TEXTFIELD, $_REQUEST['wpsg_mod_micropayment_ebank2pay_hint'])); + $this->shop->update_option('wpsg_mod_micropayment_ebank2pay_logo', $_REQUEST['wpsg_mod_micropayment_ebank2pay_logo'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_micropayment_ebank2pay_gebuehr', $_REQUEST['wpsg_mod_micropayment_ebank2pay_gebuehr'], false, false, WPSG_SANITIZE_FLOAT); + $this->shop->update_option('wpsg_mod_micropayment_ebank2pay_mwst', $_REQUEST['wpsg_mod_micropayment_ebank2pay_mwst'], false, false, WPSG_SANITIZE_TAXKEY); + $this->shop->update_option('wpsg_mod_micropayment_ebank2pay_mwstland', $_REQUEST['wpsg_mod_micropayment_ebank2pay_mwstland'], false, false, WPSG_SANITIZE_CHECKBOX); // Vorkasse - $this->shop->update_option('wpsg_mod_micropayment_prepayment_activ', $_REQUEST['wpsg_mod_micropayment_prepayment_activ'], false, false, "key"); - $this->shop->update_option('wpsg_mod_micropayment_prepayment_name', $_REQUEST['wpsg_mod_micropayment_prepayment_name'], false, false, "text_field"); - $this->shop->addTranslationString('wpsg_mod_micropayment_prepayment_name', wpsg_sinput("text_field", $_REQUEST['wpsg_mod_micropayment_prepayment_name'])); - $this->shop->update_option('wpsg_mod_micropayment_prepayment_hint', $_REQUEST['wpsg_mod_micropayment_prepayment_hint'], false, false, "text_field"); - $this->shop->addTranslationString('wpsg_mod_micropayment_prepayment_hint', wpsg_sinput("text_field", $_REQUEST['wpsg_mod_micropayment_prepayment_hint'])); - $this->shop->update_option('wpsg_mod_micropayment_prepayment_logo', $_REQUEST['wpsg_mod_micropayment_prepayment_logo'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_micropayment_prepayment_gebuehr', $_REQUEST['wpsg_mod_micropayment_prepayment_gebuehr'], false, false, "key", ["isFloat"]); - $this->shop->update_option('wpsg_mod_micropayment_prepayment_mwst', $_REQUEST['wpsg_mod_micropayment_prepayment_mwst'], false, false, "key"); - $this->shop->update_option('wpsg_mod_micropayment_prepayment_mwstland', $_REQUEST['wpsg_mod_micropayment_prepayment_mwstland'], false, false, "key"); - $this->shop->update_option('wpsg_mod_micropayment_prepayment_subject', $_REQUEST['wpsg_mod_micropayment_prepayment_subject'], false, false, "text_field"); + $this->shop->update_option('wpsg_mod_micropayment_prepayment_activ', $_REQUEST['wpsg_mod_micropayment_prepayment_activ'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_micropayment_prepayment_name', $_REQUEST['wpsg_mod_micropayment_prepayment_name'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->addTranslationString('wpsg_mod_micropayment_prepayment_name', wpsg_sinput(WPSG_SANITIZE_TEXTFIELD, $_REQUEST['wpsg_mod_micropayment_prepayment_name'])); + $this->shop->update_option('wpsg_mod_micropayment_prepayment_hint', $_REQUEST['wpsg_mod_micropayment_prepayment_hint'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->addTranslationString('wpsg_mod_micropayment_prepayment_hint', wpsg_sinput(WPSG_SANITIZE_TEXTFIELD, $_REQUEST['wpsg_mod_micropayment_prepayment_hint'])); + $this->shop->update_option('wpsg_mod_micropayment_prepayment_logo', $_REQUEST['wpsg_mod_micropayment_prepayment_logo'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_micropayment_prepayment_gebuehr', $_REQUEST['wpsg_mod_micropayment_prepayment_gebuehr'], false, false, WPSG_SANITIZE_FLOAT); + $this->shop->update_option('wpsg_mod_micropayment_prepayment_mwst', $_REQUEST['wpsg_mod_micropayment_prepayment_mwst'], false, false, WPSG_SANITIZE_TAXKEY); + $this->shop->update_option('wpsg_mod_micropayment_prepayment_mwstland', $_REQUEST['wpsg_mod_micropayment_prepayment_mwstland'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_micropayment_prepayment_subject', $_REQUEST['wpsg_mod_micropayment_prepayment_subject'], false, false, WPSG_SANITIZE_TEXTFIELD); // Call2Pay - $this->shop->update_option('wpsg_mod_micropayment_call2pay_activ', $_REQUEST['wpsg_mod_micropayment_call2pay_activ'], false, false, "key"); - $this->shop->update_option('wpsg_mod_micropayment_call2pay_name', $_REQUEST['wpsg_mod_micropayment_call2pay_name'], false, false, "text_field"); - $this->shop->addTranslationString('wpsg_mod_micropayment_call2pay_name', wpsg_sinput("text_field", $_REQUEST['wpsg_mod_micropayment_call2pay_name'])); - $this->shop->update_option('wpsg_mod_micropayment_call2pay_hint', $_REQUEST['wpsg_mod_micropayment_call2pay_hint'], false, false, "text_field"); - $this->shop->addTranslationString('wpsg_mod_micropayment_call2pay_hint', wpsg_sinput("text_field", $_REQUEST['wpsg_mod_micropayment_call2pay_hint'])); - $this->shop->update_option('wpsg_mod_micropayment_call2pay_logo', $_REQUEST['wpsg_mod_micropayment_call2pay_logo'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_micropayment_call2pay_gebuehr', $_REQUEST['wpsg_mod_micropayment_call2pay_gebuehr'], false, false, "key", ["isFloat"]); - $this->shop->update_option('wpsg_mod_micropayment_call2pay_mwst', $_REQUEST['wpsg_mod_micropayment_call2pay_mwst'], false, false, "key"); - $this->shop->update_option('wpsg_mod_micropayment_call2pay_mwstland', $_REQUEST['wpsg_mod_micropayment_call2pay_mwstland'], false, false, "key"); + $this->shop->update_option('wpsg_mod_micropayment_call2pay_activ', $_REQUEST['wpsg_mod_micropayment_call2pay_activ'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_micropayment_call2pay_name', $_REQUEST['wpsg_mod_micropayment_call2pay_name'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->addTranslationString('wpsg_mod_micropayment_call2pay_name', wpsg_sinput(WPSG_SANITIZE_TEXTFIELD, $_REQUEST['wpsg_mod_micropayment_call2pay_name'])); + $this->shop->update_option('wpsg_mod_micropayment_call2pay_hint', $_REQUEST['wpsg_mod_micropayment_call2pay_hint'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->addTranslationString('wpsg_mod_micropayment_call2pay_hint', wpsg_sinput(WPSG_SANITIZE_TEXTFIELD, $_REQUEST['wpsg_mod_micropayment_call2pay_hint'])); + $this->shop->update_option('wpsg_mod_micropayment_call2pay_logo', $_REQUEST['wpsg_mod_micropayment_call2pay_logo'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_micropayment_call2pay_gebuehr', $_REQUEST['wpsg_mod_micropayment_call2pay_gebuehr'], false, false, WPSG_SANITIZE_FLOAT); + $this->shop->update_option('wpsg_mod_micropayment_call2pay_mwst', $_REQUEST['wpsg_mod_micropayment_call2pay_mwst'], false, false, WPSG_SANITIZE_TAXKEY); + $this->shop->update_option('wpsg_mod_micropayment_call2pay_mwstland', $_REQUEST['wpsg_mod_micropayment_call2pay_mwstland'], false, false, WPSG_SANITIZE_CHECKBOX); // HandyPay - $this->shop->update_option('wpsg_mod_micropayment_handypay_activ', $_REQUEST['wpsg_mod_micropayment_handypay_activ'], false, false, "key"); - $this->shop->update_option('wpsg_mod_micropayment_handypay_name', $_REQUEST['wpsg_mod_micropayment_handypay_name'], false, false, "text_field"); - $this->shop->addTranslationString('wpsg_mod_micropayment_handypay_name', wpsg_sinput("text_field", $_REQUEST['wpsg_mod_micropayment_handypay_name'])); - $this->shop->update_option('wpsg_mod_micropayment_handypay_hint', $_REQUEST['wpsg_mod_micropayment_handypay_hint'], false, false, "text_field"); - $this->shop->addTranslationString('wpsg_mod_micropayment_handypay_hint', wpsg_sinput("text_field", $_REQUEST['wpsg_mod_micropayment_handypay_hint'])); - $this->shop->update_option('wpsg_mod_micropayment_handypay_logo', $_REQUEST['wpsg_mod_micropayment_handypay_logo'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_micropayment_handypay_gebuehr', $_REQUEST['wpsg_mod_micropayment_handypay_gebuehr'], false, false, "key", ["isFloat"]); - $this->shop->update_option('wpsg_mod_micropayment_handypay_mwst', $_REQUEST['wpsg_mod_micropayment_handypay_mwst'], false, false, "key"); - $this->shop->update_option('wpsg_mod_micropayment_handypay_mwstland', $_REQUEST['wpsg_mod_micropayment_handypay_mwstland'], false, false, "key"); + $this->shop->update_option('wpsg_mod_micropayment_handypay_activ', $_REQUEST['wpsg_mod_micropayment_handypay_activ'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_micropayment_handypay_name', $_REQUEST['wpsg_mod_micropayment_handypay_name'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->addTranslationString('wpsg_mod_micropayment_handypay_name', wpsg_sinput(WPSG_SANITIZE_TEXTFIELD, $_REQUEST['wpsg_mod_micropayment_handypay_name'])); + $this->shop->update_option('wpsg_mod_micropayment_handypay_hint', $_REQUEST['wpsg_mod_micropayment_handypay_hint'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->addTranslationString('wpsg_mod_micropayment_handypay_hint', wpsg_sinput(WPSG_SANITIZE_TEXTFIELD, $_REQUEST['wpsg_mod_micropayment_handypay_hint'])); + $this->shop->update_option('wpsg_mod_micropayment_handypay_logo', $_REQUEST['wpsg_mod_micropayment_handypay_logo'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_micropayment_handypay_gebuehr', $_REQUEST['wpsg_mod_micropayment_handypay_gebuehr'], false, false, WPSG_SANITIZE_FLOAT); + $this->shop->update_option('wpsg_mod_micropayment_handypay_mwst', $_REQUEST['wpsg_mod_micropayment_handypay_mwst'], false, false, WPSG_SANITIZE_TAXKEY); + $this->shop->update_option('wpsg_mod_micropayment_handypay_mwstland', $_REQUEST['wpsg_mod_micropayment_handypay_mwstland'], false, false, WPSG_SANITIZE_CHECKBOX); $this->getBillingURLs(); Index: /mods/wpsg_mod_minrequest.class.php =================================================================== --- /mods/wpsg_mod_minrequest.class.php (revision 7436) +++ /mods/wpsg_mod_minrequest.class.php (revision 7437) @@ -39,6 +39,6 @@ { - $this->shop->update_option('wpsg_mod_minrequest_basketamount', $_REQUEST['wpsg_mod_minrequest_basketamount'], false, false, "key", ["isFloat"]); - $this->shop->update_option('wpsg_mod_minrequest_basketmaxamount', $_REQUEST['wpsg_mod_minrequest_basketmaxamount'], false, false, "key", ["isFloat"]); + $this->shop->update_option('wpsg_mod_minrequest_basketamount', $_REQUEST['wpsg_mod_minrequest_basketamount'], false, false, WPSG_SANITIZE_FLOAT); + $this->shop->update_option('wpsg_mod_minrequest_basketmaxamount', $_REQUEST['wpsg_mod_minrequest_basketmaxamount'], false, false, WPSG_SANITIZE_FLOAT); } // public function settings_save() Index: /mods/wpsg_mod_newsletter.class.php =================================================================== --- /mods/wpsg_mod_newsletter.class.php (revision 7436) +++ /mods/wpsg_mod_newsletter.class.php (revision 7437) @@ -51,6 +51,6 @@ { - $this->shop->update_option('wpsg_mod_newsletter_groups', implode(',', (array)array_values($_REQUEST['wpsg_mod_newsletter_groups'])), false, false, "text_field"); - $this->shop->update_option('wpsg_mod_newsletter_action', $_REQUEST['wpsg_mod_newsletter_action'], false, false, "text_field"); + $this->shop->update_option('wpsg_mod_newsletter_groups', implode(',', (array)array_values($_REQUEST['wpsg_mod_newsletter_groups'])), false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_newsletter_action', $_REQUEST['wpsg_mod_newsletter_action'], false, false, WPSG_SANITIZE_TEXTFIELD); } // public function settings_save() Index: /mods/wpsg_mod_nlsatolo.class.php =================================================================== --- /mods/wpsg_mod_nlsatolo.class.php (revision 7436) +++ /mods/wpsg_mod_nlsatolo.class.php (revision 7437) @@ -55,6 +55,6 @@ public function settings_save() { - $this->shop->update_option('wpsg_mod_nlsatolo_doubleoptin', $_REQUEST['wpsg_mod_nlsatolo_doubleoptin'], false, false, "key"); - $this->shop->update_option('wpsg_mod_nlsatolo_group', $_REQUEST['wpsg_mod_nlsatolo_group'], false, false, "key"); + $this->shop->update_option('wpsg_mod_nlsatolo_doubleoptin', $_REQUEST['wpsg_mod_nlsatolo_doubleoptin'], false, false, WPSG_SANITIZE_INT); + $this->shop->update_option('wpsg_mod_nlsatolo_group', $_REQUEST['wpsg_mod_nlsatolo_group'], false, false, WPSG_SANITIZE_INT); } // public function settings_save() Index: /mods/wpsg_mod_onepagecheckout.class.php =================================================================== --- /mods/wpsg_mod_onepagecheckout.class.php (revision 7436) +++ /mods/wpsg_mod_onepagecheckout.class.php (revision 7437) @@ -53,6 +53,6 @@ { - $this->shop->createPage(__('Kasse', 'wpsg'), 'wpsg_mod_onepagecheckout_page', wpsg_sinput("key", $_REQUEST['wpsg_mod_onepagecheckout_page'])); - $this->shop->update_option('wpsg_mod_onepagecheckout_basket', $_REQUEST['wpsg_mod_onepagecheckout_basket'], false, false, "key"); + $this->shop->createPage(__('Kasse', 'wpsg'), 'wpsg_mod_onepagecheckout_page', wpsg_sinput(WPSG_SANITIZE_INT, $_REQUEST['wpsg_mod_onepagecheckout_page'])); + $this->shop->update_option('wpsg_mod_onepagecheckout_basket', $_REQUEST['wpsg_mod_onepagecheckout_basket'], false, false, WPSG_SANITIZE_CHECKBOX); } // public function settings_save() Index: /mods/wpsg_mod_orderupload.class.php =================================================================== --- /mods/wpsg_mod_orderupload.class.php (revision 7436) +++ /mods/wpsg_mod_orderupload.class.php (revision 7437) @@ -61,13 +61,13 @@ { - $this->shop->update_option('wpsg_mod_orderupload_filename', $_REQUEST['wpsg_mod_orderupload_filename'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_orderupload_allowedext', $_REQUEST['wpsg_mod_orderupload_allowedext'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_orderupload_multifiles', $_REQUEST['wpsg_mod_orderupload_multifiles'], false, false, "key"); - $this->shop->update_option('wpsg_mod_orderupload_optional', $_REQUEST['wpsg_mod_orderupload_optional'],false, false, "key"); - $this->shop->update_option('wpsg_mod_orderupload_zip', $_REQUEST['wpsg_mod_orderupload_zip'], false, false, "key"); - $this->shop->update_option('wpsg_mod_orderupload_maxweight', $_REQUEST['wpsg_mod_orderupload_maxweight'], false, false, "wpsg_tf"); - $this->shop->update_option('wpsg_mod_orderupload_mail', $_REQUEST['wpsg_mod_orderupload_mail'], false, false, "key"); - $this->shop->update_option('wpsg_mod_orderupload_maxweight_text', $_REQUEST['wpsg_mod_orderupload_maxweight_text'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_orderupload__mode', $_REQUEST['wpsg_mod_orderupload__mode'], false, false, "key"); + $this->shop->update_option('wpsg_mod_orderupload_filename', $_REQUEST['wpsg_mod_orderupload_filename'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_orderupload_allowedext', $_REQUEST['wpsg_mod_orderupload_allowedext'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_orderupload_multifiles', $_REQUEST['wpsg_mod_orderupload_multifiles'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_orderupload_optional', $_REQUEST['wpsg_mod_orderupload_optional'],false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_orderupload_zip', $_REQUEST['wpsg_mod_orderupload_zip'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_orderupload_maxweight', $_REQUEST['wpsg_mod_orderupload_maxweight'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_orderupload_mail', $_REQUEST['wpsg_mod_orderupload_mail'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_orderupload_maxweight_text', $_REQUEST['wpsg_mod_orderupload_maxweight_text'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_orderupload__mode', $_REQUEST['wpsg_mod_orderupload__mode'], false, false, WPSG_SANITIZE_INT); } // public function settings_save() Index: /mods/wpsg_mod_paypal.class.php =================================================================== --- /mods/wpsg_mod_paypal.class.php (revision 7436) +++ /mods/wpsg_mod_paypal.class.php (revision 7437) @@ -104,5 +104,5 @@ // Rest API $this->shop->update_option('wpsg_mod_paypal_clientid', $_REQUEST['wpsg_mod_paypal_clientid'], false, false, WPSG_SANITIZE_TEXTFIELD); - $this->shop->update_option('wpsg_mod_paypal_secret', $_REQUEST['wpsg_mod_paypal_secret'], false, false, "text_field"); + $this->shop->update_option('wpsg_mod_paypal_secret', $_REQUEST['wpsg_mod_paypal_secret'], false, false, WPSG_SANITIZE_TEXTFIELD); if (wpsg_isSizedInt($_REQUEST['wpsg_mod_paypal_createwebhook'])) @@ -115,17 +115,17 @@ $this->shop->update_option('wpsg_mod_paypal_stornostate', $_REQUEST['wpsg_mod_paypal_stornostate']); - $this->shop->update_option('wpsg_mod_paypal_subject', $_REQUEST['wpsg_mod_paypal_subject'], false, false, "text_field"); - $this->shop->addTranslationString('wpsg_mod_paypal_hint', wpsg_sanitize("text_field", $_REQUEST['wpsg_mod_paypal_hint']) ?: $this->shop->get_option('wpsg_mod_paypal_hint')); - - $this->shop->update_option('wpsg_mod_paypal_currency', $_REQUEST['wpsg_mod_paypal_currency'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_paypal_autostart', $_REQUEST['wpsg_mod_paypal_autostart'], false, false, "key"); - $this->shop->update_option('wpsg_mod_paypal_mwstland', $_REQUEST['wpsg_mod_paypal_mwstland'], false, false, "key"); - $this->shop->update_option('wpsg_mod_paypal_language', $_REQUEST['wpsg_mod_paypal_language'], false, false, "text_field"); - - $this->shop->createPage(__('Erfolgreiche PayPal Zahlung', 'wpsg'), 'wpsg_page_mod_paypal_success', wpsg_sinput("key", $_REQUEST['wpsg_page_mod_paypal_success'])); - $this->shop->createPage(__('Fehlgeschlagene PayPal Zahlung', 'wpsg'), 'wpsg_page_mod_paypal_error', wpsg_sinput("key", $_REQUEST['wpsg_page_mod_paypal_error'])); - - $this->shop->addTranslationString('mod_paypal_bezeichnung', wpsg_sanitize("text_field", $_REQUEST['mod_paypal_bezeichnung']) ?: $this->shop->get_option('mod_paypal_bezeichnung')); - $this->shop->addTranslationString('wpsg_mod_paypal_hint', wpsg_sanitize("text_field", $_REQUEST['wpsg_mod_paypal_hint']) ?: $this->shop->get_option('wpsg_mod_paypal_hint')); + $this->shop->update_option('wpsg_mod_paypal_subject', $_REQUEST['wpsg_mod_paypal_subject'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->addTranslationString('wpsg_mod_paypal_hint', wpsg_sanitize(WPSG_SANITIZE_TEXTFIELD, $_REQUEST['wpsg_mod_paypal_hint']) ?: $this->shop->get_option('wpsg_mod_paypal_hint')); + + $this->shop->update_option('wpsg_mod_paypal_currency', $_REQUEST['wpsg_mod_paypal_currency'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_paypal_autostart', $_REQUEST['wpsg_mod_paypal_autostart'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_paypal_mwstland', $_REQUEST['wpsg_mod_paypal_mwstland'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_paypal_language', $_REQUEST['wpsg_mod_paypal_language'], false, false, WPSG_SANITIZE_TEXTFIELD); + + $this->shop->createPage(__('Erfolgreiche PayPal Zahlung', 'wpsg'), 'wpsg_page_mod_paypal_success', wpsg_sinput(WPSG_SANITIZE_INT, $_REQUEST['wpsg_page_mod_paypal_success'])); + $this->shop->createPage(__('Fehlgeschlagene PayPal Zahlung', 'wpsg'), 'wpsg_page_mod_paypal_error', wpsg_sinput(WPSG_SANITIZE_INT, $_REQUEST['wpsg_page_mod_paypal_error'])); + + $this->shop->addTranslationString('mod_paypal_bezeichnung', wpsg_sanitize(WPSG_SANITIZE_TEXTFIELD, $_REQUEST['mod_paypal_bezeichnung']) ?: $this->shop->get_option('mod_paypal_bezeichnung')); + $this->shop->addTranslationString('wpsg_mod_paypal_hint', wpsg_sanitize(WPSG_SANITIZE_TEXTFIELD, $_REQUEST['wpsg_mod_paypal_hint']) ?: $this->shop->get_option('wpsg_mod_paypal_hint')); } // public function settings_save() Index: /mods/wpsg_mod_prepayment.class.php =================================================================== --- /mods/wpsg_mod_prepayment.class.php (revision 7436) +++ /mods/wpsg_mod_prepayment.class.php (revision 7437) @@ -51,18 +51,18 @@ { - $this->shop->update_option('wpsg_mod_prepayment_bezeichnung', $_REQUEST['wpsg_mod_prepayment_bezeichnung'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_prepayment_aktiv', $_REQUEST['wpsg_mod_prepayment_aktiv'], false, false, "key"); - $this->shop->update_option('wpsg_mod_prepayment_hint', $_REQUEST['wpsg_mod_prepayment_hint'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_prepayment_gebuehr', $_REQUEST['wpsg_mod_prepayment_gebuehr'], false, false, "key", ["isFloat"]); - $this->shop->update_option('wpsg_mod_prepayment_mwst', $_REQUEST['wpsg_mod_prepayment_mwst'], false, false, "key"); - $this->shop->update_option('wpsg_mod_prepayment_mwstland', $_REQUEST['wpsg_mod_prepayment_mwstland'], false, false, "key"); - $this->shop->update_option('wpsg_mod_prepayment_kinhaber', $_REQUEST['wpsg_mod_prepayment_kinhaber'], false, false, "user"); - $this->shop->update_option('wpsg_mod_prepayment_bank', $_REQUEST['wpsg_mod_prepayment_bank'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_prepayment_iban', $_REQUEST['wpsg_mod_prepayment_iban'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_prepayment_swift', $_REQUEST['wpsg_mod_prepayment_swift'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_prepayment_subject', $_REQUEST['wpsg_mod_prepayment_subject'], false, false, "text_field"); - - $this->shop->addTranslationString('wpsg_mod_prepayment_bezeichnung', wpsg_sinput("text_field", $_REQUEST['wpsg_mod_prepayment_bezeichnung'])); - $this->shop->addTranslationString('wpsg_mod_prepayment_hint', wpsg_sinput("text_field", $_REQUEST['wpsg_mod_prepayment_hint'])); + $this->shop->update_option('wpsg_mod_prepayment_bezeichnung', $_REQUEST['wpsg_mod_prepayment_bezeichnung'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_prepayment_aktiv', $_REQUEST['wpsg_mod_prepayment_aktiv'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_prepayment_hint', $_REQUEST['wpsg_mod_prepayment_hint'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_prepayment_gebuehr', $_REQUEST['wpsg_mod_prepayment_gebuehr'], false, false, WPSG_SANITIZE_FLOAT); + $this->shop->update_option('wpsg_mod_prepayment_mwst', $_REQUEST['wpsg_mod_prepayment_mwst'], false, false, WPSG_SANITIZE_TAXKEY); + $this->shop->update_option('wpsg_mod_prepayment_mwstland', $_REQUEST['wpsg_mod_prepayment_mwstland'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_prepayment_kinhaber', $_REQUEST['wpsg_mod_prepayment_kinhaber'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_prepayment_bank', $_REQUEST['wpsg_mod_prepayment_bank'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_prepayment_iban', $_REQUEST['wpsg_mod_prepayment_iban'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_prepayment_swift', $_REQUEST['wpsg_mod_prepayment_swift'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_prepayment_subject', $_REQUEST['wpsg_mod_prepayment_subject'], false, false, WPSG_SANITIZE_TEXTFIELD); + + $this->shop->addTranslationString('wpsg_mod_prepayment_bezeichnung', wpsg_sinput(WPSG_SANITIZE_TEXTFIELD, $_REQUEST['wpsg_mod_prepayment_bezeichnung'])); + $this->shop->addTranslationString('wpsg_mod_prepayment_hint', wpsg_sinput(WPSG_SANITIZE_TEXTFIELD, $_REQUEST['wpsg_mod_prepayment_hint'])); } // public function settings_save() Index: /mods/wpsg_mod_productgroups.class.php =================================================================== --- /mods/wpsg_mod_productgroups.class.php (revision 7436) +++ /mods/wpsg_mod_productgroups.class.php (revision 7437) @@ -704,9 +704,9 @@ $data = array( - 'name' => wpsg_q(wpsg_sinput("text_field", $_REQUEST['wpsg_mod_productgroups_name'])), - 'template_file' => wpsg_q(wpsg_sinput("key", $_REQUEST['wpsg_mod_productgroups_template'])), - 'infopage' => wpsg_q(wpsg_sinput("key", $_REQUEST['wpsg_mod_productgroups_infopage'])), - 'stock_aktiv' => wpsg_q(wpsg_sinput("key", $_REQUEST['wpsg_mod_productgroups']['stock_aktiv'])), - 'stock_value' => wpsg_q(wpsg_sinput("key", $_REQUEST['wpsg_mod_productgroups']['stock_value'])), + 'name' => wpsg_q(wpsg_sinput(WPSG_SANITIZE_TEXTFIELD, $_REQUEST['wpsg_mod_productgroups_name'])), + 'template_file' => wpsg_q(wpsg_sinput(WPSG_SANITIZE_INT, $_REQUEST['wpsg_mod_productgroups_template'])), + 'infopage' => wpsg_q(wpsg_sinput(WPSG_SANITIZE_INT, $_REQUEST['wpsg_mod_productgroups_infopage'])), + 'stock_aktiv' => wpsg_q(wpsg_sinput(WPSG_SANITIZE_CHECKBOX, $_REQUEST['wpsg_mod_productgroups']['stock_aktiv'])), + 'stock_value' => wpsg_q(wpsg_sinput(WPSG_SANITIZE_CHECKBOX, $_REQUEST['wpsg_mod_productgroups']['stock_value'])), 'lang' => wpsg_q(serialize(wpsg_getArray(wpsg_xss($_REQUEST['lang'])))) ); Index: /mods/wpsg_mod_productvariants.class.php =================================================================== --- /mods/wpsg_mod_productvariants.class.php (revision 7436) +++ /mods/wpsg_mod_productvariants.class.php (revision 7437) @@ -120,6 +120,6 @@ { - $this->shop->update_option('wpsg_mod_productvariants_price', $_REQUEST['wpsg_mod_productvariants_price'], false, false, "key"); - $this->shop->update_option('wpsg_vp_detailview', $_REQUEST['wpsg_vp_detailview'], false, false, "key"); + $this->shop->update_option('wpsg_mod_productvariants_price', $_REQUEST['wpsg_mod_productvariants_price'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_vp_detailview', $_REQUEST['wpsg_vp_detailview'], false, false, WPSG_SANITIZE_CHECKBOX); $this->shop->update_option('wpsg_vp_replaceanr', wpsg_xss($_REQUEST['wpsg_vp_replaceanr'])); Index: /mods/wpsg_mod_productvars.class.php =================================================================== --- /mods/wpsg_mod_productvars.class.php (revision 7436) +++ /mods/wpsg_mod_productvars.class.php (revision 7437) @@ -67,8 +67,8 @@ { - $this->shop->update_option('wpsg_mod_productvars_showProduct', $_REQUEST['wpsg_mod_productvars_showProduct'], false, false, "key"); - $this->shop->update_option('wpsg_mod_productvars_showBasket', $_REQUEST['wpsg_mod_productvars_showBasket'], false, false, "key"); - $this->shop->update_option('wpsg_mod_productvars_showOverview', $_REQUEST['wpsg_mod_productvars_showOverview'], false, false, "key"); - $this->shop->update_option('wpsg_mod_productvars_showMail', $_REQUEST['wpsg_mod_productvars_showMail'], false, false, "key"); + $this->shop->update_option('wpsg_mod_productvars_showProduct', $_REQUEST['wpsg_mod_productvars_showProduct'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_productvars_showBasket', $_REQUEST['wpsg_mod_productvars_showBasket'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_productvars_showOverview', $_REQUEST['wpsg_mod_productvars_showOverview'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_productvars_showMail', $_REQUEST['wpsg_mod_productvars_showMail'], false, false, WPSG_SANITIZE_CHECKBOX); } Index: /mods/wpsg_mod_produktartikel.class.php =================================================================== --- /mods/wpsg_mod_produktartikel.class.php (revision 7436) +++ /mods/wpsg_mod_produktartikel.class.php (revision 7437) @@ -326,27 +326,28 @@ $_REQUEST['wpsg_mod_produktartikel_pathkey_cat'] = wpsg_sinput("text_field", $_REQUEST['wpsg_mod_produktartikel_pathkey_cat']); - $this->shop->update_option('wpsg_mod_produktartikel_showHome', $_REQUEST['wpsg_mod_produktartikel_showHome'], false, false, "key"); - $this->shop->update_option('wpsg_mod_produktartikel_showCategory', $_REQUEST['wpsg_mod_produktartikel_showCategory'], false, false, "key"); - $this->shop->update_option('wpsg_mod_produktartikel_showFeed', $_REQUEST['wpsg_mod_produktartikel_showFeed'], false, false, "key"); - $this->shop->update_option('wpsg_mod_produktartikel_showSearch', $_REQUEST['wpsg_mod_produktartikel_showSearch'], false, false, "key"); - $this->shop->update_option('wpsg_mod_produktartikel_onlyMainQuery', $_REQUEST['wpsg_mod_produktartikel_onlyMainQuery'], false, false, "key"); - + $this->shop->update_option('wpsg_mod_produktartikel_showHome', $_REQUEST['wpsg_mod_produktartikel_showHome'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_produktartikel_showCategory', $_REQUEST['wpsg_mod_produktartikel_showCategory'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_produktartikel_showFeed', $_REQUEST['wpsg_mod_produktartikel_showFeed'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_produktartikel_showSearch', $_REQUEST['wpsg_mod_produktartikel_showSearch'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_produktartikel_onlyMainQuery', $_REQUEST['wpsg_mod_produktartikel_onlyMainQuery'], false, false, WPSG_SANITIZE_CHECKBOX); + + + $this->shop->update_option('wpsg_mod_produktartikel_showui', $_REQUEST['wpsg_mod_produktartikel_showui'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_produktartikel_ean', $_REQUEST['wpsg_mod_produktartikel_ean'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_produktartikel_gtin', $_REQUEST['wpsg_mod_produktartikel_gtin'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_produktartikel_comment', $_REQUEST['wpsg_mod_produktartikel_comment'], false, false, WPSG_SANITIZE_INT); + $this->shop->update_option('wpsg_mod_produktartikel_hometemplate', wpsg_xss($_REQUEST['wpsg_mod_produktartikel_hometemplate'])); $this->shop->update_option('wpsg_mod_produktartikel_listtemplate', wpsg_xss($_REQUEST['wpsg_mod_produktartikel_listtemplate'])); $this->shop->update_option('wpsg_mod_produktartikel_searchtemplate', wpsg_xss($_REQUEST['wpsg_mod_produktartikel_searchtemplate'])); - - $this->shop->update_option('wpsg_mod_produktartikel_showui', $_REQUEST['wpsg_mod_produktartikel_showui'], false, false, "key"); - $this->shop->update_option('wpsg_mod_produktartikel_ean', $_REQUEST['wpsg_mod_produktartikel_ean'], false, false, "key"); - $this->shop->update_option('wpsg_mod_produktartikel_gtin', $_REQUEST['wpsg_mod_produktartikel_gtin'], false, false, "key"); - $this->shop->update_option('wpsg_mod_produktartikel_comment', $_REQUEST['wpsg_mod_produktartikel_comment'], false, false, "key"); - - $this->shop->update_option('wpsg_mod_produktartikel_postthumbnail', $_REQUEST['wpsg_mod_produktartikel_postthumbnail'], false, false, "key"); - - $this->shop->update_option('wpsg_mod_produktartikel_positionnumber', $_REQUEST['wpsg_mod_produktartikel_positionnumber'], false, false, "key"); + + $this->shop->update_option('wpsg_mod_produktartikel_postthumbnail', $_REQUEST['wpsg_mod_produktartikel_postthumbnail'], false, false, WPSG_SANITIZE_CHECKBOX); + + $this->shop->update_option('wpsg_mod_produktartikel_positionnumber', $_REQUEST['wpsg_mod_produktartikel_positionnumber'], false, false, WPSG_SANITIZE_CHECKBOX); $pathkey_alt = $this->shop->get_option('wpsg_mod_produktartikel_pathkey'); $pathkey_new = $this->shop->clear($_REQUEST['wpsg_mod_produktartikel_pathkey']); - $this->shop->update_option('wpsg_mod_produktartikel_rating', $_REQUEST['wpsg_mod_produktartikel_rating'], false, false, "key"); + $this->shop->update_option('wpsg_mod_produktartikel_rating', $_REQUEST['wpsg_mod_produktartikel_rating'], false, false, WPSG_SANITIZE_TEXTFIELD); if ($pathkey_alt != $_REQUEST['wpsg_mod_produktartikel_pathkey'] && $pathkey_new != '') @@ -357,5 +358,5 @@ ), "`post_type` = '".wpsg_q($pathkey_alt)."'"); - $this->shop->update_option('wpsg_mod_produktartikel_pathkey', $pathkey_new, false, false, "text_field"); + $this->shop->update_option('wpsg_mod_produktartikel_pathkey', $pathkey_new, false, false, WPSG_SANITIZE_TEXTFIELD); $this->shop->addBackendMessage(__('Path Key erfolgreich geÀndert. Die Produkt URLs haben sich geÀndert!', 'wpsg')); @@ -383,5 +384,5 @@ ), " `meta_key` = '_menu_item_object' AND `meta_value` = '".wpsg_q($pathkey_cat_old)."' "); - $this->shop->update_option('wpsg_mod_produktartikel_pathkey_cat', $pathkey_cat_new, false, false, "text_field"); + $this->shop->update_option('wpsg_mod_produktartikel_pathkey_cat', $pathkey_cat_new, false, false, WPSG_SANITIZE_TEXTFIELD); $this->shop->addBackendMessage(__('Path Key (Kategorie) erfolgreich geÀndert. Die Kategorie URLs haben sich geÀndert!', 'wpsg')); @@ -443,5 +444,5 @@ { - $this->shop->update_option('wpsg_mod_produktartikel_noJS', $_REQUEST['wpsg_mod_produktartikel_noJS'], false, false, "key"); + $this->shop->update_option('wpsg_mod_produktartikel_noJS', $_REQUEST['wpsg_mod_produktartikel_noJS'], false, false, WPSG_SANITIZE_CHECKBOX); } // function admin_includes_save() Index: /mods/wpsg_mod_produktattribute.class.php =================================================================== --- /mods/wpsg_mod_produktattribute.class.php (revision 7436) +++ /mods/wpsg_mod_produktattribute.class.php (revision 7437) @@ -191,8 +191,8 @@ { - $this->shop->update_option('wpsg_mod_produktattribute_showProduct', $_REQUEST['wpsg_mod_produktattribute_showProduct'], false, false, "key"); - $this->shop->update_option('wpsg_mod_produktattribute_showBasket', $_REQUEST['wpsg_mod_produktattribute_showBasket'], false, false, "key"); - $this->shop->update_option('wpsg_mod_produktattribute_showOverview', $_REQUEST['wpsg_mod_produktattribute_showOverview'], false, false, "key"); - $this->shop->update_option('wpsg_mod_produktattribute_showMail', $_REQUEST['wpsg_mod_produktattribute_showMail'], false, false, "key"); + $this->shop->update_option('wpsg_mod_produktattribute_showProduct', $_REQUEST['wpsg_mod_produktattribute_showProduct'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_produktattribute_showBasket', $_REQUEST['wpsg_mod_produktattribute_showBasket'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_produktattribute_showOverview', $_REQUEST['wpsg_mod_produktattribute_showOverview'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_produktattribute_showMail', $_REQUEST['wpsg_mod_produktattribute_showMail'], false, false, WPSG_SANITIZE_CHECKBOX); } // public function settings_save() Index: /mods/wpsg_mod_rechnungen.class.php =================================================================== --- /mods/wpsg_mod_rechnungen.class.php (revision 7436) +++ /mods/wpsg_mod_rechnungen.class.php (revision 7437) @@ -254,5 +254,5 @@ $bCheckTextField = false; -# + foreach ($_REQUEST['text'] as $k => $v) { @@ -292,5 +292,5 @@ $this->shop->update_option("wpsg_rechnungen_url", $_REQUEST['wpsg_rechnungen_url'], false, false, WPSG_SANITIZE_TEXTFIELD); - $this->shop->update_option("wpsg_mod_rechnungen_auto", $_REQUEST['wpsg_mod_rechnungen_auto'], false, false, WPSG_SANITIZE_INT); + $this->shop->update_option("wpsg_mod_rechnungen_auto", $_REQUEST['wpsg_mod_rechnungen_auto'], false, false, WPSG_SANITIZE_VALUES, ['0', '1', '2']); $this->shop->update_option("wpsg_rechnungen_logo_position", ($wpsg_rechnungen_logo_position??false)); $this->shop->update_option("wpsg_rechnungen_logo_transparency", $_REQUEST['wpsg_rechnungen_logo_transparency'], false, false, WPSG_SANITIZE_FLOAT); @@ -304,5 +304,5 @@ $this->shop->update_option("wpsg_mod_rechnungen_showov", $_REQUEST['wpsg_mod_rechnungen_showov'], false, false, WPSG_SANITIZE_CHECKBOX); $this->shop->update_option("wpsg_rechnungen_start", $_REQUEST['wpsg_rechnungen_start'], false, false, WPSG_SANITIZE_TEXTFIELD); - $this->shop->update_option("wpsg_gutschrift_start", $_REQUEST['wpsg_gutschrift_start'], false, false, WPSG_SANITIZE_INT); + $this->shop->update_option("wpsg_gutschrift_start", $_REQUEST['wpsg_gutschrift_start'], false, false, WPSG_SANITIZE_TEXTFIELD); $this->shop->update_option('wpsg_mod_rechnungen_gutschrifttax', wpsg_xss($_REQUEST['wpsg_mod_rechnungen_gutschrifttax'])); $this->shop->update_option("wpsg_rechnungen_format", $_REQUEST['wpsg_rechnungen_format'], false, false, WPSG_SANITIZE_TEXTFIELD); @@ -1125,5 +1125,5 @@ } - $to = $_REQUEST['wpsg_rechnungen_email']; + $empfaenger = $_REQUEST['wpsg_rechnungen_email']; $header = ""; @@ -1144,5 +1144,5 @@ } - $this->shop->sendMail($mail_text, $to, 'invoicemail', $arFiles, $order_id, false, $mail_html); + $this->shop->sendMail($mail_text, $empfaenger, 'invoicemail', $arFiles, $order_id, false, $mail_html); // TemporÀre Rechnung löschen @@ -1155,5 +1155,5 @@ "cdate" => "NOW()", "o_id" => wpsg_q($this->shop->view['data']['id']), - "title" => wpsg_q(wpsg_translate(__('Rechnungsmail an #1#', 'wpsg'), $to)), + "title" => wpsg_q(wpsg_translate(__('Rechnungsmail an #1#', 'wpsg'), $empfaenger)), "mailtext" => wpsg_q($mail_text) )); @@ -1746,4 +1746,5 @@ $_REQUEST['wpsg_rechnungen_sendmail'] = '1'; + //$_REQUEST['wpsg_rechnungen_email'] = wpsg_q($customer_data['email']); $_REQUEST['wpsg_rechnungen_email'] = wpsg_q(wpsg_sinput("email", $customer_data['email'])); $_REQUEST['wpsg_rechnungen_fusstext'] = ''; Index: /mods/wpsg_mod_relatedproducts.class.php =================================================================== --- /mods/wpsg_mod_relatedproducts.class.php (revision 7436) +++ /mods/wpsg_mod_relatedproducts.class.php (revision 7437) @@ -77,10 +77,8 @@ $this->shop->update_option('wpsg_mod_relatedproducts_showBasket', $_REQUEST['wpsg_mod_relatedproducts_showBasket'], false, false, WPSG_SANITIZE_CHECKBOX); $this->shop->update_option('wpsg_mod_relatedproducts_showBasketLimit', $_REQUEST['wpsg_mod_relatedproducts_showBasketLimit'], false, false, WPSG_SANITIZE_TEXTFIELD); - $this->shop->update_option('wpsg_mod_relatedproducts_showBasketTemplate', $_REQUEST['wpsg_mod_relatedproducts_showBasketTemplate'], false, false, WPSG_SANITIZE_VALUES, [ - ['0'] + array_keys($arTemplateFiles) - ]); + $this->shop->update_option('wpsg_mod_relatedproducts_showBasketTemplate', $_REQUEST['wpsg_mod_relatedproducts_showBasketTemplate'], false, false, WPSG_SANITIZE_VALUES, array_keys(['0'] + $arTemplateFiles)); $this->shop->update_option('wpsg_mod_relatedproducts_showAjaxDialog', $_REQUEST['wpsg_mod_relatedproducts_showAjaxDialog'], false, false, WPSG_SANITIZE_CHECKBOX); $this->shop->update_option('wpsg_mod_relatedproducts_showAjaxDialogLimit', $_REQUEST['wpsg_mod_relatedproducts_showAjaxDialogLimit'], false, false, WPSG_SANITIZE_TEXTFIELD); - $this->shop->update_option('wpsg_mod_relatedproducts_showAjaxDialogTemplate', $_REQUEST['wpsg_mod_relatedproducts_showAjaxDialogTemplate'], false, false, WPSG_SANITIZE_INT); + $this->shop->update_option('wpsg_mod_relatedproducts_showAjaxDialogTemplate', $_REQUEST['wpsg_mod_relatedproducts_showAjaxDialogTemplate'], false, false, WPSG_SANITIZE_VALUES, array_keys(['0'] + $arTemplateFiles)); } // public function settings_save Index: /mods/wpsg_mod_request.class.php =================================================================== --- /mods/wpsg_mod_request.class.php (revision 7436) +++ /mods/wpsg_mod_request.class.php (revision 7437) @@ -66,12 +66,12 @@ { - $this->shop->createPage(__('Anfrage', 'wpsg'), 'wpsg_mod_request_page', wpsg_sinput("key", $_REQUEST['wpsg_mod_request_page'])); - $this->shop->createPage(__('Vielen Dank fÌr Ihre Anfrage', 'wpsg'), 'wpsg_mod_request_redirect', wpsg_sinput("key", $_REQUEST['wpsg_mod_request_redirect'])); - - $this->shop->update_option('wpsg_mod_request_afterinsert', $_REQUEST['wpsg_mod_request_afterinsert'], false, false, "key"); - $this->shop->update_option('wpsg_mod_request_customerdata', $_REQUEST['wpsg_mod_request_customerdata'], false, false, "key"); - - if ($this->shop->hasMod('wpsg_mod_ordervars')) $this->shop->update_option('wpsg_mod_request_ordervars', $_REQUEST['wpsg_mod_request_ordervars'], false, false, "key"); - if ($this->shop->hasMod('wpsg_mod_productvars')) $this->shop->update_option('wpsg_mod_request_productvars', $_REQUEST['wpsg_mod_request_productvars'], false, false, "key"); + $this->shop->createPage(__('Anfrage', 'wpsg'), 'wpsg_mod_request_page', wpsg_sinput(WPSG_SANITIZE_INT, $_REQUEST['wpsg_mod_request_page'])); + $this->shop->createPage(__('Vielen Dank fÌr Ihre Anfrage', 'wpsg'), 'wpsg_mod_request_redirect', wpsg_sinput(WPSG_SANITIZE_INT, $_REQUEST['wpsg_mod_request_redirect'])); + + $this->shop->update_option('wpsg_mod_request_afterinsert', $_REQUEST['wpsg_mod_request_afterinsert'], false, false, WPSG_SANITIZE_INT); + $this->shop->update_option('wpsg_mod_request_customerdata', $_REQUEST['wpsg_mod_request_customerdata'], false, false, WPSG_SANITIZE_CHECKBOX); + + if ($this->shop->hasMod('wpsg_mod_ordervars')) $this->shop->update_option('wpsg_mod_request_ordervars', $_REQUEST['wpsg_mod_request_ordervars'], false, false, WPSG_SANITIZE_CHECKBOX); + if ($this->shop->hasMod('wpsg_mod_productvars')) $this->shop->update_option('wpsg_mod_request_productvars', $_REQUEST['wpsg_mod_request_productvars'], false, false, WPSG_SANITIZE_CHECKBOX); } // public function settings_save() Index: /mods/wpsg_mod_securepay.class.php =================================================================== --- /mods/wpsg_mod_securepay.class.php (revision 7436) +++ /mods/wpsg_mod_securepay.class.php (revision 7437) @@ -93,22 +93,22 @@ { - $this->shop->update_option('wpsg_mod_securepay_sandbox', $_REQUEST['wpsg_mod_securepay_sandbox'], false, false, "key"); - $this->shop->update_option('wpsg_mod_securepay_sender', $_REQUEST['wpsg_mod_securepay_sender'], false, false, "key"); - $this->shop->update_option('wpsg_mod_securepay_channelid', $_REQUEST['wpsg_mod_securepay_channelid'], false, false, "key"); - $this->shop->update_option('wpsg_mod_securepay_userid', $_REQUEST['wpsg_mod_securepay_userid'], false, false, "key"); - $this->shop->update_option('wpsg_mod_securepay_password', $_REQUEST['wpsg_mod_securepay_password'], false, false, "text_field"); - - $this->shop->update_option('wpsg_mod_securepay_activ', $_REQUEST['wpsg_mod_securepay_activ'], false, false, "key"); - $this->shop->update_option('wpsg_mod_securepay_paymenttypes', $_REQUEST['wpsg_mod_securepay_paymenttypes'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_securepay_name', $_REQUEST['wpsg_mod_securepay_name'], false, false, "text_field"); $this->shop->addTranslationString('wpsg_mod_securepay_name', wpsg_sinput("text_field", $_REQUEST['wpsg_mod_securepay_name'])); - $this->shop->update_option('wpsg_mod_securepay_hint', $_REQUEST['wpsg_mod_securepay_hint'], false, false, "text_field"); $this->shop->addTranslationString('wpsg_mod_securepay_hint', wpsg_sinput("text_field", $_REQUEST['wpsg_mod_securepay_hint'])); - $this->shop->update_option('wpsg_mod_securepay_logo', $_REQUEST['wpsg_mod_securepay_logo'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_securepay_language', $_REQUEST['wpsg_mod_securepay_language'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_securepay_gebuehr', $_REQUEST['wpsg_mod_securepay_gebuehr'], false, false, "key", ["isFloat"]); - $this->shop->update_option('wpsg_mod_securepay_mwst', $_REQUEST['wpsg_mod_securepay_mwst'], false, false, "key"); - $this->shop->update_option('wpsg_mod_securepay_mwstland', $_REQUEST['wpsg_mod_securepay_mwstland'], false, false, "key"); - - $this->shop->createPage(__('Erfolgreiche Zahlung', 'wpsg'), 'wpsg_mod_securepay_successPage', wpsg_sinput("key", $_REQUEST['wpsg_mod_securepay_successPage'])); - $this->shop->createPage(__('Fehlerhafte Zahlung', 'wpsg'), 'wpsg_mod_securepay_errorPage', wpsg_sinput("key", $_REQUEST['wpsg_mod_securepay_errorPage'])); + $this->shop->update_option('wpsg_mod_securepay_sandbox', $_REQUEST['wpsg_mod_securepay_sandbox'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_securepay_sender', $_REQUEST['wpsg_mod_securepay_sender'], false, false, WPSG_SANITIZE_APIKEY); + $this->shop->update_option('wpsg_mod_securepay_channelid', $_REQUEST['wpsg_mod_securepay_channelid'], false, false, WPSG_SANITIZE_APIKEY); + $this->shop->update_option('wpsg_mod_securepay_userid', $_REQUEST['wpsg_mod_securepay_userid'], false, false, WPSG_SANITIZE_APIKEY); + $this->shop->update_option('wpsg_mod_securepay_password', $_REQUEST['wpsg_mod_securepay_password'], false, false, WPSG_SANITIZE_APIKEY); + + $this->shop->update_option('wpsg_mod_securepay_activ', $_REQUEST['wpsg_mod_securepay_activ'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_securepay_paymenttypes', $_REQUEST['wpsg_mod_securepay_paymenttypes'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_securepay_name', $_REQUEST['wpsg_mod_securepay_name'], false, false, WPSG_SANITIZE_TEXTFIELD); $this->shop->addTranslationString('wpsg_mod_securepay_name', wpsg_sinput("text_field", $_REQUEST['wpsg_mod_securepay_name'])); + $this->shop->update_option('wpsg_mod_securepay_hint', $_REQUEST['wpsg_mod_securepay_hint'], false, false, WPSG_SANITIZE_TEXTFIELD); $this->shop->addTranslationString('wpsg_mod_securepay_hint', wpsg_sinput("text_field", $_REQUEST['wpsg_mod_securepay_hint'])); + $this->shop->update_option('wpsg_mod_securepay_logo', $_REQUEST['wpsg_mod_securepay_logo'], false, false, WPSG_SANITIZE_PATH); + $this->shop->update_option('wpsg_mod_securepay_language', $_REQUEST['wpsg_mod_securepay_language'], false, false, WPSG_SANITIZE_INT); + $this->shop->update_option('wpsg_mod_securepay_gebuehr', $_REQUEST['wpsg_mod_securepay_gebuehr'], false, false, WPSG_SANITIZE_FLOAT); + $this->shop->update_option('wpsg_mod_securepay_mwst', $_REQUEST['wpsg_mod_securepay_mwst'], false, false, WPSG_SANITIZE_TAXKEY); + $this->shop->update_option('wpsg_mod_securepay_mwstland', $_REQUEST['wpsg_mod_securepay_mwstland'], false, false, WPSG_SANITIZE_CHECKBOX); + + $this->shop->createPage(__('Erfolgreiche Zahlung', 'wpsg'), 'wpsg_mod_securepay_successPage', wpsg_sinput(WPSG_SANITIZE_INT, $_REQUEST['wpsg_mod_securepay_successPage'])); + $this->shop->createPage(__('Fehlerhafte Zahlung', 'wpsg'), 'wpsg_mod_securepay_errorPage', wpsg_sinput(WPSG_SANITIZE_INT, $_REQUEST['wpsg_mod_securepay_errorPage'])); } // public function settings_save() Index: /mods/wpsg_mod_shs.class.php =================================================================== --- /mods/wpsg_mod_shs.class.php (revision 7436) +++ /mods/wpsg_mod_shs.class.php (revision 7437) @@ -113,40 +113,40 @@ { - $this->shop->update_option('wpsg_mod_shs_bezeichnung_creditcard', $_REQUEST['wpsg_mod_shs_bezeichnung_creditcard'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_shs_aktiv_creditcard', $_REQUEST['wpsg_mod_shs_aktiv_creditcard'], false, false, "key"); - $this->shop->update_option('wpsg_mod_shs_hint_creditcard', $_REQUEST['wpsg_mod_shs_hint_creditcard'], false, false, "text_field"); - - $this->shop->update_option('wpsg_mod_shs_bezeichnung_maestro', $_REQUEST['wpsg_mod_shs_bezeichnung_maestro'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_shs_aktiv_maestro', $_REQUEST['wpsg_mod_shs_aktiv_maestro'], false, false, "key"); - $this->shop->update_option('wpsg_mod_shs_hint_maestro', $_REQUEST['wpsg_mod_shs_hint_maestro'], false, false, "text_field"); - - $this->shop->update_option('wpsg_mod_shs_bezeichnung_directdebit', $_REQUEST['wpsg_mod_shs_bezeichnung_directdebit'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_shs_aktiv_directdebit', $_REQUEST['wpsg_mod_shs_aktiv_directdebit'], false, false, "key"); - $this->shop->update_option('wpsg_mod_shs_hint_directdebit', $_REQUEST['wpsg_mod_shs_hint_directdebit'], false, false, "text_field"); - - $this->shop->update_option('wpsg_mod_shs_mwst', $_REQUEST['wpsg_mod_shs_mwst'], false, false, "key"); - $this->shop->update_option('wpsg_mod_shs_gebuehr', $_REQUEST['wpsg_mod_shs_gebuehr'], false, false, "key", ["isFloat"]); - $this->shop->update_option('wpsg_mod_shs_mwstland', $_REQUEST['wpsg_mod_shs_mwstland'], false, false, "key"); - $this->shop->update_option('wpsg_mod_shs_autostart', $_REQUEST['wpsg_mod_shs_autostart'], false, false, "key"); - $this->shop->update_option('wpsg_mod_shs_autoend', $_REQUEST['wpsg_mod_shs_autoend'], false, false, "key"); - - $this->shop->update_option('wpsg_mod_shs_mobileversion', wpsg_getStr($_REQUEST['wpsg_mod_shs_mobileversion']), false, false, "key"); - $this->shop->update_option('wpsg_mod_shs_creditcard_cardholder', wpsg_getStr($_REQUEST['wpsg_mod_shs_creditcard_cardholder']), false, false, "key"); - $this->shop->update_option('wpsg_mod_shs_creditcard_optionalcardholder', wpsg_getStr($_REQUEST['wpsg_mod_shs_creditcard_optionalcardholder']), false, false, "key"); - $this->shop->update_option('wpsg_mod_shs_creditcard_sslifvisaenrolledu', wpsg_getStr($_REQUEST['wpsg_mod_shs_creditcard_sslifvisaenrolledu']), false, false, "key"); - $this->shop->update_option('wpsg_mod_shs_directdebit_accountholder', wpsg_getStr($_REQUEST['wpsg_mod_shs_directdebit_accountholder']), false, false, "key"); - $this->shop->update_option('wpsg_mod_shs_directdebit_optionalaccountholder', wpsg_getStr($_REQUEST['wpsg_mod_shs_directdebit_optionalaccountholder']), false, false, "key"); - $this->shop->update_option('wpsg_mod_shs_directdebit_checklist', wpsg_getStr($_REQUEST['wpsg_mod_shs_directdebit_checklist']), false, false, "key"); - - $this->shop->update_option('wpsg_mod_shs_transactiontype', $_REQUEST['wpsg_mod_shs_transactiontype'], false, false, "key"); - - $this->shop->update_option('wpsg_mod_shs_sandbox', $_REQUEST['wpsg_mod_shs_sandbox'], false, false, "key"); - $this->shop->update_option('wpsg_mod_shs_sslmerchant', $_REQUEST['wpsg_mod_shs_sslmerchant'], false, false, "key"); - $this->shop->update_option('wpsg_mod_shs_sslpw', $_REQUEST['wpsg_mod_shs_sslpw'], false, false, "key"); + $this->shop->update_option('wpsg_mod_shs_bezeichnung_creditcard', $_REQUEST['wpsg_mod_shs_bezeichnung_creditcard'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_shs_aktiv_creditcard', $_REQUEST['wpsg_mod_shs_aktiv_creditcard'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_shs_hint_creditcard', $_REQUEST['wpsg_mod_shs_hint_creditcard'], false, false, WPSG_SANITIZE_TEXTFIELD); + + $this->shop->update_option('wpsg_mod_shs_bezeichnung_maestro', $_REQUEST['wpsg_mod_shs_bezeichnung_maestro'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_shs_aktiv_maestro', $_REQUEST['wpsg_mod_shs_aktiv_maestro'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_shs_hint_maestro', $_REQUEST['wpsg_mod_shs_hint_maestro'], false, false, WPSG_SANITIZE_TEXTFIELD); + + $this->shop->update_option('wpsg_mod_shs_bezeichnung_directdebit', $_REQUEST['wpsg_mod_shs_bezeichnung_directdebit'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_shs_aktiv_directdebit', $_REQUEST['wpsg_mod_shs_aktiv_directdebit'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_shs_hint_directdebit', $_REQUEST['wpsg_mod_shs_hint_directdebit'], false, false, WPSG_SANITIZE_TEXTFIELD); + + $this->shop->update_option('wpsg_mod_shs_mwst', $_REQUEST['wpsg_mod_shs_mwst'], false, false, WPSG_SANITIZE_TAXKEY); + $this->shop->update_option('wpsg_mod_shs_gebuehr', $_REQUEST['wpsg_mod_shs_gebuehr'], false, false, WPSG_SANITIZE_FLOAT); + $this->shop->update_option('wpsg_mod_shs_mwstland', $_REQUEST['wpsg_mod_shs_mwstland'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_shs_autostart', $_REQUEST['wpsg_mod_shs_autostart'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_shs_autoend', $_REQUEST['wpsg_mod_shs_autoend'], false, false, WPSG_SANITIZE_CHECKBOX); + + $this->shop->update_option('wpsg_mod_shs_mobileversion', wpsg_getStr($_REQUEST['wpsg_mod_shs_mobileversion']), false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_shs_creditcard_cardholder', wpsg_getStr($_REQUEST['wpsg_mod_shs_creditcard_cardholder']), false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_shs_creditcard_optionalcardholder', wpsg_getStr($_REQUEST['wpsg_mod_shs_creditcard_optionalcardholder']), false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_shs_creditcard_sslifvisaenrolledu', wpsg_getStr($_REQUEST['wpsg_mod_shs_creditcard_sslifvisaenrolledu']), false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_shs_directdebit_accountholder', wpsg_getStr($_REQUEST['wpsg_mod_shs_directdebit_accountholder']), false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_shs_directdebit_optionalaccountholder', wpsg_getStr($_REQUEST['wpsg_mod_shs_directdebit_optionalaccountholder']), false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_shs_directdebit_checklist', wpsg_getStr($_REQUEST['wpsg_mod_shs_directdebit_checklist']), false, false, WPSG_SANITIZE_CHECKBOX); + + $this->shop->update_option('wpsg_mod_shs_transactiontype', $_REQUEST['wpsg_mod_shs_transactiontype'], false, false, WPSG_SANITIZE_INT); + + $this->shop->update_option('wpsg_mod_shs_sandbox', $_REQUEST['wpsg_mod_shs_sandbox'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_shs_sslmerchant', $_REQUEST['wpsg_mod_shs_sslmerchant'], false, false, WPSG_SANITIZE_TEXTAREA); + $this->shop->update_option('wpsg_mod_shs_sslpw', $_REQUEST['wpsg_mod_shs_sslpw'], false, false, WPSG_SANITIZE_TEXTAREA); - $this->shop->update_option('wpsg_mod_shs_apiurl', $_REQUEST['wpsg_mod_shs_apiurl'], false, false, "text_field"); - - $this->shop->createPage(__('Erfolgreiche Zahlung (Sparkassen Internetkasse)', 'wpsg'), 'wpsg_page_mod_shs_success', wpsg_sinput("key", $_REQUEST['wpsg_page_mod_shs_success'])); - $this->shop->createPage(__('Fehlgeschlagene Zahlung (Sparkassen Internetkasse)', 'wpsg'), 'wpsg_page_mod_shs_error', wpsg_sinput("key", $_REQUEST['wpsg_page_mod_shs_error'])); + $this->shop->update_option('wpsg_mod_shs_apiurl', $_REQUEST['wpsg_mod_shs_apiurl'], false, false, WPSG_SANITIZE_TEXTFIELD); + + $this->shop->createPage(__('Erfolgreiche Zahlung (Sparkassen Internetkasse)', 'wpsg'), 'wpsg_page_mod_shs_success', wpsg_sinput(WPSG_SANITIZE_INT, $_REQUEST['wpsg_page_mod_shs_success'])); + $this->shop->createPage(__('Fehlgeschlagene Zahlung (Sparkassen Internetkasse)', 'wpsg'), 'wpsg_page_mod_shs_error', wpsg_sinput(WPSG_SANITIZE_INT, $_REQUEST['wpsg_page_mod_shs_error'])); } // public function settings_save() Index: /mods/wpsg_mod_si.class.php =================================================================== --- /mods/wpsg_mod_si.class.php (revision 7436) +++ /mods/wpsg_mod_si.class.php (revision 7437) @@ -63,12 +63,12 @@ { - $this->shop->update_option('wpsg_mod_si_user_id', $_REQUEST['wpsg_mod_si_user_id'], false, false, "key"); - $this->shop->update_option('wpsg_mod_si_project_id', $_REQUEST['wpsg_mod_si_project_id'], false, false, "key"); - - $this->shop->update_option('wpsg_mod_si_project_pwd', $_REQUEST['wpsg_mod_si_project_pwd'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_si_hashalgo', $_REQUEST['wpsg_mod_si_hashalgo'], false, false, "wpsg_in_array", [['0', '1', '2', '3']]); - - $this->shop->update_option('wpsg_mod_si_minAge', $_REQUEST['wpsg_mod_si_minAge'], false, false, "key"); - $this->shop->update_option('wpsg_mod_si_country', $_REQUEST['wpsg_mod_si_country'], false, false, "key"); + $this->shop->update_option('wpsg_mod_si_user_id', $_REQUEST['wpsg_mod_si_user_id'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_si_project_id', $_REQUEST['wpsg_mod_si_project_id'], false, false, WPSG_SANITIZE_TEXTFIELD); + + $this->shop->update_option('wpsg_mod_si_project_pwd', $_REQUEST['wpsg_mod_si_project_pwd'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_si_hashalgo', $_REQUEST['wpsg_mod_si_hashalgo'], false, false, WPSG_SANITIZE_VALUES, ['0', '1', '2', '3']); + + $this->shop->update_option('wpsg_mod_si_minAge', $_REQUEST['wpsg_mod_si_minAge'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_si_country', $_REQUEST['wpsg_mod_si_country'], false, false, WPSG_SANITIZE_CHECKBOX); } // public function settings_save() Index: /mods/wpsg_mod_stock.class.php =================================================================== --- /mods/wpsg_mod_stock.class.php (revision 7436) +++ /mods/wpsg_mod_stock.class.php (revision 7437) @@ -60,15 +60,15 @@ //$this->shop->update_option('wpsg_mod_stock_template', $_REQUEST['wpsg_mod_stock_template']); - $this->shop->update_option('wpsg_mod_stock_allow', $_REQUEST['wpsg_mod_stock_allow'], false, false, "key"); - $this->shop->update_option('wpsg_mod_stock_showBackendStock', $_REQUEST['wpsg_mod_stock_showBackendStock'], false, false, "key"); - $this->shop->update_option('wpsg_mod_stock_minstockproduct', $_REQUEST['wpsg_mod_stock_minstockproduct'], false, false, "key"); - $this->shop->update_option('wpsg_mod_stock_hideSoldout', $_REQUEST['wpsg_mod_stock_hideSoldout'], false, false, "key"); + $this->shop->update_option('wpsg_mod_stock_allow', $_REQUEST['wpsg_mod_stock_allow'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_stock_showBackendStock', $_REQUEST['wpsg_mod_stock_showBackendStock'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_stock_minstockproduct', $_REQUEST['wpsg_mod_stock_minstockproduct'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_stock_hideSoldout', $_REQUEST['wpsg_mod_stock_hideSoldout'], false, false, WPSG_SANITIZE_CHECKBOX); if ($this->shop->hasMod('wpsg_mod_productindex')) { - $this->shop->update_option('wpsg_mod_stock_showProductindex', $_REQUEST['wpsg_mod_stock_showProductindex'], false, false, "key"); - } - - $this->shop->update_option('wpsg_mod_stock_showProduct', $_REQUEST['wpsg_mod_stock_showProduct'], false, false, "key"); + $this->shop->update_option('wpsg_mod_stock_showProductindex', $_REQUEST['wpsg_mod_stock_showProductindex'], false, false, WPSG_SANITIZE_CHECKBOX); + } + + $this->shop->update_option('wpsg_mod_stock_showProduct', $_REQUEST['wpsg_mod_stock_showProduct'], false, false, WPSG_SANITIZE_CHECKBOX); @@ -132,9 +132,9 @@ $this->db->UpdateQuery(WPSG_TBL_PRODUCTS, array( - "stock" => wpsg_q(wpsg_sinput("key", $_REQUEST['wpsg_mod_stock_stock'])), - "stock_count" => wpsg_q(wpsg_sinput("key", $_REQUEST['wpsg_mod_stock_stock_count'])), - "minstockproduct_count" => wpsg_q(wpsg_sinput("key", $_REQUEST['wpsg_mod_minstockproduct'])), - "minstockproduct_mail" => wpsg_q(wpsg_sinput("email", $_REQUEST['wpsg_mod_stock_minstockproduct_mail'])) - ), "`id` = '".wpsg_q(wpsg_sinput("key", $produkt_id))."'"); + "stock" => wpsg_q(wpsg_sinput(WPSG_SANITIZE_TEXTFIELD, $_REQUEST['wpsg_mod_stock_stock'])), + "stock_count" => wpsg_q(wpsg_sinput(WPSG_SANITIZE_CHECKBOX, $_REQUEST['wpsg_mod_stock_stock_count'])), + "minstockproduct_count" => wpsg_q(wpsg_sinput(WPSG_SANITIZE_TEXTFIELD, $_REQUEST['wpsg_mod_minstockproduct'])), + "minstockproduct_mail" => wpsg_q(wpsg_sinput(WSPG_SANITIZE_EMAIL, $_REQUEST['wpsg_mod_stock_minstockproduct_mail'])) + ), "`id` = '".wpsg_q(wpsg_sinput(WPSG_SANITIZE_TEXTFIELD, $produkt_id))."'"); } // public function produkt_save(&$produkt_id) Index: /mods/wpsg_mod_su.class.php =================================================================== --- /mods/wpsg_mod_su.class.php (revision 7436) +++ /mods/wpsg_mod_su.class.php (revision 7437) @@ -108,25 +108,25 @@ { - $this->shop->update_option('wpsg_mod_su_bezeichnung', $_REQUEST['wpsg_mod_su_bezeichnung'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_su_aktiv', $_REQUEST['wpsg_mod_su_aktiv'], false, false, "key"); - $this->shop->update_option('wpsg_mod_su_hint', $_REQUEST['wpsg_mod_su_hint'], false, false, "text_field"); - - $this->shop->update_option('wpsg_mod_su_subject1', $_REQUEST['wpsg_mod_su_subject1'], false, false, "text_field"); - $this->shop->addTranslationString('wpsg_mod_su_subject1', wpsg_sinput("text_field", $_REQUEST['wpsg_mod_su_subject1'])); - $this->shop->update_option('wpsg_mod_su_subject2', $_REQUEST['wpsg_mod_su_subject2'], false, false, "text_field"); - $this->shop->addTranslationString('wpsg_mod_su_subject2', wpsg_sinput("text_field", $_REQUEST['wpsg_mod_su_subject2'])); + $this->shop->update_option('wpsg_mod_su_bezeichnung', $_REQUEST['wpsg_mod_su_bezeichnung'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_su_aktiv', $_REQUEST['wpsg_mod_su_aktiv'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_su_hint', $_REQUEST['wpsg_mod_su_hint'], false, false, WPSG_SANITIZE_TEXTFIELD); + + $this->shop->update_option('wpsg_mod_su_subject1', $_REQUEST['wpsg_mod_su_subject1'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->addTranslationString('wpsg_mod_su_subject1', wpsg_sinput(WPSG_SANITIZE_TEXTFIELD, $_REQUEST['wpsg_mod_su_subject1'])); + $this->shop->update_option('wpsg_mod_su_subject2', $_REQUEST['wpsg_mod_su_subject2'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->addTranslationString('wpsg_mod_su_subject2', wpsg_sinput(WPSG_SANITIZE_TEXTFIELD, $_REQUEST['wpsg_mod_su_subject2'])); - $this->shop->update_option('wpsg_mod_su_gebuehr', $_REQUEST['wpsg_mod_su_gebuehr'], false, false, "key", ["isFloat"]); - $this->shop->update_option('wpsg_mod_su_mwst', $_REQUEST['wpsg_mod_su_mwst'], false, false, "key"); - $this->shop->update_option('wpsg_mod_su_mwstland', $_REQUEST['wpsg_mod_su_mwstland'], false, false, "key"); - - $this->shop->update_option('wpsg_mod_su_currency', $_REQUEST['wpsg_mod_su_currency'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_su_userid', $_REQUEST['wpsg_mod_su_userid'], false, false, "key"); - $this->shop->update_option('wpsg_mod_su_projectid', $_REQUEST['wpsg_mod_su_projectid'], false, false, "key"); - $this->shop->update_option('wpsg_mod_su_projectpassword', $_REQUEST['wpsg_mod_su_projectpassword'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_su_noticepassword', $_REQUEST['wpsg_mod_su_noticepassword'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_su_language', $_REQUEST['wpsg_mod_su_language'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_su_hash', $_REQUEST['wpsg_mod_su_hash'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_su_autostart', $_REQUEST['wpsg_mod_su_autostart'], false, false, "key"); + $this->shop->update_option('wpsg_mod_su_gebuehr', $_REQUEST['wpsg_mod_su_gebuehr'], false, false, WPSG_SANITIZE_FLOAT); + $this->shop->update_option('wpsg_mod_su_mwst', $_REQUEST['wpsg_mod_su_mwst'], false, false, WPSG_SANITIZE_TAXKEY); + $this->shop->update_option('wpsg_mod_su_mwstland', $_REQUEST['wpsg_mod_su_mwstland'], false, false, WPSG_SANITIZE_CHECKBOX); + + $this->shop->update_option('wpsg_mod_su_currency', $_REQUEST['wpsg_mod_su_currency'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_su_userid', $_REQUEST['wpsg_mod_su_userid'], false, false, WPSG_SANITIZE_APIKEY); + $this->shop->update_option('wpsg_mod_su_projectid', $_REQUEST['wpsg_mod_su_projectid'], false, false, WPSG_SANITIZE_APIKEY); + $this->shop->update_option('wpsg_mod_su_projectpassword', $_REQUEST['wpsg_mod_su_projectpassword'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_su_noticepassword', $_REQUEST['wpsg_mod_su_noticepassword'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_su_language', $_REQUEST['wpsg_mod_su_language'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_su_hash', $_REQUEST['wpsg_mod_su_hash'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_su_autostart', $_REQUEST['wpsg_mod_su_autostart'], false, false, WPSG_SANITIZE_CHECKBOX); } // public function settings_save() Index: /mods/wpsg_mod_surfaceproduct.class.php =================================================================== --- /mods/wpsg_mod_surfaceproduct.class.php (revision 7436) +++ /mods/wpsg_mod_surfaceproduct.class.php (revision 7437) @@ -94,6 +94,6 @@ { - $this->shop->update_option('wpsg_mod_surfaceproduct_einheit', $_REQUEST['wpsg_mod_surfaceproduct_einheit'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_surfaceproduct_faktor', $_REQUEST['wpsg_mod_surfaceproduct_faktor'], false, false, "key"); + $this->shop->update_option('wpsg_mod_surfaceproduct_einheit', $_REQUEST['wpsg_mod_surfaceproduct_einheit'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_surfaceproduct_faktor', $_REQUEST['wpsg_mod_surfaceproduct_faktor'], false, false, WPSG_SANITIZE_TEXTFIELD); } // public function settings_save() Index: /mods/wpsg_mod_targo.class.php =================================================================== --- /mods/wpsg_mod_targo.class.php (revision 7436) +++ /mods/wpsg_mod_targo.class.php (revision 7437) @@ -85,27 +85,27 @@ { - $this->shop->update_option('wpsg_mod_targo_aktiv', $_REQUEST['wpsg_mod_targo_aktiv'], false, false, "key"); - $this->shop->update_option('wpsg_mod_targo_autostart', $_REQUEST['wpsg_mod_targo_autostart'], false, false, "key"); - $this->shop->update_option('wpsg_mod_targo_summe_min', $_REQUEST['wpsg_mod_targo_summe_min'], false, false, "key", ["isFloat"]); - $this->shop->update_option('wpsg_mod_targo_summe_max', $_REQUEST['wpsg_mod_targo_summe_max'], false, false, "key", ["isFloat"]); - $this->shop->update_option('wpsg_mod_targo_laufzeit_min', $_REQUEST['wpsg_mod_targo_laufzeit_min'], false, false, "key", ["isFloat"]); - $this->shop->update_option('wpsg_mod_targo_laufzeit_max', $_REQUEST['wpsg_mod_targo_laufzeit_max'], false, false, "key", ["isFloat"]); - $this->shop->update_option('wpsg_mod_targo_rate_min', $_REQUEST['wpsg_mod_targo_rate_min'], false, false, "key", ["isFloat"]); - $this->shop->update_option('wpsg_mod_targo_url_test', $_REQUEST['wpsg_mod_targo_url_test'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_targo_url_live', $_REQUEST['wpsg_mod_targo_url_live'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_targo_url_use', $_REQUEST['wpsg_mod_targo_url_use'], false, false, "key"); - $this->shop->update_option('wpsg_mod_targo_koop_id', $_REQUEST['wpsg_mod_targo_koop_id'], false, false, "key"); - $this->shop->update_option('wpsg_mod_targo_dealerid', $_REQUEST['wpsg_mod_targo_dealerid'], false, false, "key"); - $this->shop->update_option('wpsg_mod_targo_hashkey', $_REQUEST['wpsg_mod_targo_hashkey'], false, false, "key"); - - $this->shop->update_option('wpsg_mod_targo_dealerShopURL', $_REQUEST['wpsg_mod_targo_dealerShopURL'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_targo_dealerAbortURL', $_REQUEST['wpsg_mod_targo_dealerAbortURL'], false, false, "text_field"); - - $this->shop->update_option('wpsg_mod_targo_bezeichnung', $_REQUEST['wpsg_mod_targo_bezeichnung'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_targo_hint', $_REQUEST['wpsg_mod_targo_hint'], false, false, "text_field"); + $this->shop->update_option('wpsg_mod_targo_aktiv', $_REQUEST['wpsg_mod_targo_aktiv'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_targo_autostart', $_REQUEST['wpsg_mod_targo_autostart'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_targo_summe_min', $_REQUEST['wpsg_mod_targo_summe_min'], false, false, WPSG_SANITIZE_FLOAT); + $this->shop->update_option('wpsg_mod_targo_summe_max', $_REQUEST['wpsg_mod_targo_summe_max'], false, false, WPSG_SANITIZE_FLOAT); + $this->shop->update_option('wpsg_mod_targo_laufzeit_min', $_REQUEST['wpsg_mod_targo_laufzeit_min'], false, false, WPSG_SANITIZE_FLOAT); + $this->shop->update_option('wpsg_mod_targo_laufzeit_max', $_REQUEST['wpsg_mod_targo_laufzeit_max'], false, false, WPSG_SANITIZE_FLOAT); + $this->shop->update_option('wpsg_mod_targo_rate_min', $_REQUEST['wpsg_mod_targo_rate_min'], false, false, WPSG_SANITIZE_FLOAT); + $this->shop->update_option('wpsg_mod_targo_url_test', $_REQUEST['wpsg_mod_targo_url_test'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_targo_url_live', $_REQUEST['wpsg_mod_targo_url_live'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_targo_url_use', $_REQUEST['wpsg_mod_targo_url_use'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_targo_koop_id', $_REQUEST['wpsg_mod_targo_koop_id'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_targo_dealerid', $_REQUEST['wpsg_mod_targo_dealerid'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_targo_hashkey', $_REQUEST['wpsg_mod_targo_hashkey'], false, false, WPSG_SANITIZE_TEXTFIELD); + + $this->shop->update_option('wpsg_mod_targo_dealerShopURL', $_REQUEST['wpsg_mod_targo_dealerShopURL'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_targo_dealerAbortURL', $_REQUEST['wpsg_mod_targo_dealerAbortURL'], false, false, WPSG_SANITIZE_TEXTFIELD); + + $this->shop->update_option('wpsg_mod_targo_bezeichnung', $_REQUEST['wpsg_mod_targo_bezeichnung'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_targo_hint', $_REQUEST['wpsg_mod_targo_hint'], false, false, WPSG_SANITIZE_TEXTFIELD); //$this->shop->update_option('wpsg_mod_targo_createwebhook', $_REQUEST['wpsg_mod_targo_createwebhook']); - $this->shop->update_option('wpsg_mod_targo_gebuehr', $_REQUEST['wpsg_mod_targo_gebuehr'], false, false, "key", ["isFloat"]); - $this->shop->update_option('wpsg_mod_targo_mwst', $_REQUEST['wpsg_mod_targo_mwst'], false, false, "key"); - $this->shop->update_option('wpsg_mod_targo_mwstland', $_REQUEST['wpsg_mod_targo_mwstland'], false, false, "key"); + $this->shop->update_option('wpsg_mod_targo_gebuehr', $_REQUEST['wpsg_mod_targo_gebuehr'], false, false, WPSG_SANITIZE_FLOAT); + $this->shop->update_option('wpsg_mod_targo_mwst', $_REQUEST['wpsg_mod_targo_mwst'], false, false, WPSG_SANITIZE_TAXKEY); + $this->shop->update_option('wpsg_mod_targo_mwstland', $_REQUEST['wpsg_mod_targo_mwstland'], false, false, WPSG_SANITIZE_CHECKBOX); //$this->shop->createPage(__('Erfolgreiche Targo Finanzierung', 'wpsg'), 'wpsg_mod_targo_success', $_REQUEST['wpsg_mod_targo_success']); Index: /mods/wpsg_mod_topseller.class.php =================================================================== --- /mods/wpsg_mod_topseller.class.php (revision 7436) +++ /mods/wpsg_mod_topseller.class.php (revision 7437) @@ -56,7 +56,7 @@ { - $this->shop->update_option('wpsg_mod_topseller_auto', $_REQUEST['wpsg_mod_topseller_auto'], false, false, "key"); - $this->shop->update_option('wpsg_mod_topseller_limit', $_REQUEST['wpsg_mod_topseller_limit'], false, false, "key"); - $this->shop->update_option('wpsg_mod_topseller_template', $_REQUEST['wpsg_mod_topseller_template'], false, false, "key"); + $this->shop->update_option('wpsg_mod_topseller_auto', $_REQUEST['wpsg_mod_topseller_auto'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_topseller_limit', $_REQUEST['wpsg_mod_topseller_limit'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_topseller_template', $_REQUEST['wpsg_mod_topseller_template'], false, false, WPSG_SANITIZE_INT); } // public function settings_save() Index: /mods/wpsg_mod_voucherproduct.class.php =================================================================== --- /mods/wpsg_mod_voucherproduct.class.php (revision 7436) +++ /mods/wpsg_mod_voucherproduct.class.php (revision 7437) @@ -100,6 +100,6 @@ $this->shop->update_option('wpsg_mod_voucherproduct_texte', $_REQUEST['text'], false, false, "wpsg_txt_tbl"); - $this->shop->update_option('wpsg_voucherproduct_width', $_REQUEST['wpsg_voucherproduct_width'], false, false, "key"); - $this->shop->update_option('wpsg_voucherproduct_height', $_REQUEST['wpsg_voucherproduct_height'], false, false, "key"); + $this->shop->update_option('wpsg_voucherproduct_width', $_REQUEST['wpsg_voucherproduct_width'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_voucherproduct_height', $_REQUEST['wpsg_voucherproduct_height'], false, false, WPSG_SANITIZE_TEXTFIELD); // Briefpapier Index: /mods/wpsg_mod_weight.class.php =================================================================== --- /mods/wpsg_mod_weight.class.php (revision 7436) +++ /mods/wpsg_mod_weight.class.php (revision 7437) @@ -77,17 +77,17 @@ { - $this->shop->update_option('wpsg_mod_weight_unit', $_REQUEST['wpsg_mod_weight_unit'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_weight_showProduct', $_REQUEST['wpsg_mod_weight_showProduct'], false, false, "key"); - $this->shop->update_option('wpsg_mod_weight_showBasket', $_REQUEST['wpsg_mod_weight_showBasket'], false, false, "key"); - $this->shop->update_option('wpsg_mod_weight_showAjaxDialog', $_REQUEST['wpsg_mod_weight_showAjaxDialog'], false, false, "key"); - $this->shop->update_option('wpsg_mod_weight_showBasketProduct', $_REQUEST['wpsg_mod_weight_showBasketProduct'], false, false, "key"); - $this->shop->update_option('wpsg_mod_weight_showOverview', $_REQUEST['wpsg_mod_weight_showOverview'], false, false, "key"); - $this->shop->update_option('wpsg_mod_weight_showOverviewProduct', $_REQUEST['wpsg_mod_weight_showOverviewProduct'], false, false, "key"); + $this->shop->update_option('wpsg_mod_weight_unit', $_REQUEST['wpsg_mod_weight_unit'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_weight_showProduct', $_REQUEST['wpsg_mod_weight_showProduct'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_weight_showBasket', $_REQUEST['wpsg_mod_weight_showBasket'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_weight_showAjaxDialog', $_REQUEST['wpsg_mod_weight_showAjaxDialog'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_weight_showBasketProduct', $_REQUEST['wpsg_mod_weight_showBasketProduct'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_weight_showOverview', $_REQUEST['wpsg_mod_weight_showOverview'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_weight_showOverviewProduct', $_REQUEST['wpsg_mod_weight_showOverviewProduct'], false, false, WPSG_SANITIZE_CHECKBOX); if ($this->shop->hasMod('wpsg_mod_request')) { - $this->shop->update_option('wpsg_mod_weight_showRequestPage', $_REQUEST['wpsg_mod_weight_showRequestPage'], false, false, "key"); - $this->shop->update_option('wpsg_mod_weight_showRequestPageProduct', $_REQUEST['wpsg_mod_weight_showRequestPageProduct'], false, false, "key"); + $this->shop->update_option('wpsg_mod_weight_showRequestPage', $_REQUEST['wpsg_mod_weight_showRequestPage'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_weight_showRequestPageProduct', $_REQUEST['wpsg_mod_weight_showRequestPageProduct'], false, false, WPSG_SANITIZE_CHECKBOX); } @@ -95,7 +95,7 @@ if ($this->shop->hasMod('wpsg_mod_productindex')) { - $this->shop->update_option('wpsg_mod_weight_showProductindex', $_REQUEST['wpsg_mod_weight_showProductindex'], false, false, "key"); - } - $this->shop->update_option('wpsg_mod_weight_showProductindexBackend', $_REQUEST['wpsg_mod_weight_showProductindexBackend'], false, false, "key"); + $this->shop->update_option('wpsg_mod_weight_showProductindex', $_REQUEST['wpsg_mod_weight_showProductindex'], false, false, WPSG_SANITIZE_CHECKBOX); + } + $this->shop->update_option('wpsg_mod_weight_showProductindexBackend', $_REQUEST['wpsg_mod_weight_showProductindexBackend'], false, false, WPSG_SANITIZE_CHECKBOX); } // public function settings_save() Index: /mods/wpsg_mod_willcollect.class.php =================================================================== --- /mods/wpsg_mod_willcollect.class.php (revision 7436) +++ /mods/wpsg_mod_willcollect.class.php (revision 7437) @@ -58,23 +58,23 @@ { - $this->shop->update_option('wpsg_mod_willcollect_bezeichnung', $_REQUEST['wpsg_mod_willcollect_bezeichnung'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_willcollect_aktiv', $_REQUEST['wpsg_mod_willcollect_aktiv'], false, false, "key"); - $this->shop->update_option('wpsg_mod_willcollect_hint', $_REQUEST['wpsg_mod_willcollect_hint'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_willcollect_paymentneed', $_REQUEST['wpsg_mod_willcollect_paymentneed'], false, false, "key"); - $this->shop->update_option('wpsg_mod_willcollect_dontMerge', $_REQUEST['wpsg_mod_willcollect_dontMerge'], false, false, "key"); - - $this->shop->update_option('wpsg_mod_willcollect_adress', $_REQUEST['wpsg_mod_willcollect_adress'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_willcollect_street', $_REQUEST['wpsg_mod_willcollect_street'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_willcollect_plzort', $_REQUEST['wpsg_mod_willcollect_plzort'], false, false, "text_field"); - - $this->shop->update_option('wpsg_mod_willcollect_payment', $_REQUEST['wpsg_mod_willcollect_payment'], false, false, "key"); - $this->shop->update_option('wpsg_mod_willcollect_payment_bezeichnung', $_REQUEST['wpsg_mod_willcollect_payment_bezeichnung'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_willcollect_payment_hint', $_REQUEST['wpsg_mod_willcollect_payment_hint'], false, false, "text_field"); - - $this->shop->update_option('wpsg_mod_willcollect_gebuehr', $_REQUEST['wpsg_mod_willcollect_gebuehr'], false, false, "key", ["isFloat"]); - $this->shop->update_option('wpsg_mod_willcollect_payment_gebuehr', $_REQUEST['wpsg_mod_willcollect_payment_gebuehr'], false, false, "key", ["isFloat"]); - - $this->shop->update_option('wpsg_mod_willcollect_mwst', $_REQUEST['wpsg_mod_willcollect_mwst'], false, false, "wpsg_taxkey"); - $this->shop->update_option('wpsg_mod_willcollect_mwstland', $_REQUEST['wpsg_mod_willcollect_mwstland'], false, false, "key"); + $this->shop->update_option('wpsg_mod_willcollect_bezeichnung', $_REQUEST['wpsg_mod_willcollect_bezeichnung'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_willcollect_aktiv', $_REQUEST['wpsg_mod_willcollect_aktiv'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_willcollect_hint', $_REQUEST['wpsg_mod_willcollect_hint'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_willcollect_paymentneed', $_REQUEST['wpsg_mod_willcollect_paymentneed'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_willcollect_dontMerge', $_REQUEST['wpsg_mod_willcollect_dontMerge'], false, false, WPSG_SANITIZE_CHECKBOX); + + $this->shop->update_option('wpsg_mod_willcollect_adress', $_REQUEST['wpsg_mod_willcollect_adress'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_willcollect_street', $_REQUEST['wpsg_mod_willcollect_street'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_willcollect_plzort', $_REQUEST['wpsg_mod_willcollect_plzort'], false, false, WPSG_SANITIZE_TEXTFIELD); + + $this->shop->update_option('wpsg_mod_willcollect_payment', $_REQUEST['wpsg_mod_willcollect_payment'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_willcollect_payment_bezeichnung', $_REQUEST['wpsg_mod_willcollect_payment_bezeichnung'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_willcollect_payment_hint', $_REQUEST['wpsg_mod_willcollect_payment_hint'], false, false, WPSG_SANITIZE_TEXTFIELD); + + $this->shop->update_option('wpsg_mod_willcollect_gebuehr', $_REQUEST['wpsg_mod_willcollect_gebuehr'], false, false, WPSG_SANITIZE_FLOAT); + $this->shop->update_option('wpsg_mod_willcollect_payment_gebuehr', $_REQUEST['wpsg_mod_willcollect_payment_gebuehr'], false, false, WPSG_SANITIZE_TEXTFIELD); + + $this->shop->update_option('wpsg_mod_willcollect_mwst', $_REQUEST['wpsg_mod_willcollect_mwst'], false, false, WPSG_SANITIZE_TAXKEY); + $this->shop->update_option('wpsg_mod_willcollect_mwstland', $_REQUEST['wpsg_mod_willcollect_mwstland'], false, false, WPSG_SANITIZE_CHECKBOX); } // public function settings_save() Index: /mods/wpsg_mod_wirecard.class.php =================================================================== --- /mods/wpsg_mod_wirecard.class.php (revision 7436) +++ /mods/wpsg_mod_wirecard.class.php (revision 7437) @@ -81,32 +81,32 @@ { - $this->shop->update_option('wpsg_mod_wirecard_name', $_REQUEST['wpsg_mod_wirecard_name'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_wirecard_activ', $_REQUEST['wpsg_mod_wirecard_activ']); - $this->shop->update_option('wpsg_mod_wirecard_hint', $_REQUEST['wpsg_mod_wirecard_hint'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_wirecard_logo', $_REQUEST['wpsg_mod_wirecard_logo'], false, false, "text_field"); - - $this->shop->addTranslationString('wpsg_mod_wirecard_name', wpsg_sinput("text_field", $_REQUEST['wpsg_mod_wirecard_name'])); - $this->shop->addTranslationString('wpsg_mod_wirecard_hint', wpsg_sinput("text_field", $_REQUEST['wpsg_mod_wirecard_hint'])); - - $this->shop->update_option('wpsg_mod_wirecard_customerid', $_REQUEST['wpsg_mod_wirecard_customerid'], false, false, "key"); - $this->shop->update_option('wpsg_mod_wirecard_secret', $_REQUEST['wpsg_mod_wirecard_secret'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_wirecard_shopid', $_REQUEST['wpsg_mod_wirecard_shopid'], false, false, "key"); - - $this->shop->update_option('wpsg_mod_wirecard_gebuehr', $_REQUEST['wpsg_mod_wirecard_gebuehr'], false, false, "key", ["isFloat"]); - $this->shop->update_option('wpsg_mod_wirecard_mwst', $_REQUEST['wpsg_mod_wirecard_mwst']); - $this->shop->update_option('wpsg_mod_wirecard_mwstland', $_REQUEST['wpsg_mod_wirecard_mwstland']); - $this->shop->update_option('wpsg_mod_wirecard_currency', $_REQUEST['wpsg_mod_wirecard_currency']); - $this->shop->update_option('wpsg_mod_wirecard_mode', $_REQUEST['wpsg_mod_wirecard_mode']); - $this->shop->update_option('wpsg_mod_wirecard_language', $_REQUEST['wpsg_mod_wirecard_language']); - $this->shop->update_option('wpsg_mod_wirecard_autostart', $_REQUEST['wpsg_mod_wirecard_autostart']); - $this->shop->update_option('wpsg_mod_wirecard_subject', $_REQUEST['wpsg_mod_wirecard_subject'], false, false, "text_field"); - $this->shop->update_option('wpsg_mod_wirecard_submitadress', $_REQUEST['wpsg_mod_wirecard_submitadress']); - $this->shop->update_option('wpsg_mod_wirecard_minValue', $_REQUEST['wpsg_mod_wirecard_minValue'], false, false, "key", ["isFloat"]); - $this->shop->update_option('wpsg_mod_wirecard_maxValue', $_REQUEST['wpsg_mod_wirecard_maxValue'], false, false, "key", ["isFloat"]); - - $this->shop->createPage(__('Erfolgreiche wirecard Zahlung', 'wpsg'), 'wpsg_page_mod_wirecard_success', $_REQUEST['wpsg_page_mod_wirecard_success']); - $this->shop->createPage(__('Fehlgeschlagene wirecard Zahlung', 'wpsg'), 'wpsg_page_mod_wirecard_error', $_REQUEST['wpsg_page_mod_wirecard_error']); - $this->shop->createPage(__('Abgebrochene wirecard Zahlung', 'wpsg'), 'wpsg_page_mod_wirecard_cancel', $_REQUEST['wpsg_page_mod_wirecard_cancel']); - $this->shop->createPage(__('Unbestimmte wirecard Zahlung', 'wpsg'), 'wpsg_page_mod_wirecard_pending', $_REQUEST['wpsg_page_mod_wirecard_pending']); + $this->shop->update_option('wpsg_mod_wirecard_name', $_REQUEST['wpsg_mod_wirecard_name'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_wirecard_activ', $_REQUEST['wpsg_mod_wirecard_activ'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_wirecard_hint', $_REQUEST['wpsg_mod_wirecard_hint'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_wirecard_logo', $_REQUEST['wpsg_mod_wirecard_logo'], false, false, WPSG_SANITIZE_TEXTFIELD); + + $this->shop->addTranslationString('wpsg_mod_wirecard_name', wpsg_sinput("text_field", $_REQUEST['wpsg_mod_wirecard_name'], false, false, WPSG_SANITIZE_TEXTFIELD)); + $this->shop->addTranslationString('wpsg_mod_wirecard_hint', wpsg_sinput("text_field", $_REQUEST['wpsg_mod_wirecard_hint'], false, false, WPSG_SANITIZE_TEXTFIELD)); + + $this->shop->update_option('wpsg_mod_wirecard_customerid', $_REQUEST['wpsg_mod_wirecard_customerid'], false, false, WPSG_SANITIZE_APIKEY); + $this->shop->update_option('wpsg_mod_wirecard_secret', $_REQUEST['wpsg_mod_wirecard_secret'], false, false, WPSG_SANITIZE_APIKEY); + $this->shop->update_option('wpsg_mod_wirecard_shopid', $_REQUEST['wpsg_mod_wirecard_shopid'], false, false, WPSG_SANITIZE_APIKEY); + + $this->shop->update_option('wpsg_mod_wirecard_gebuehr', $_REQUEST['wpsg_mod_wirecard_gebuehr'], false, false, WPSG_SANITIZE_FLOAT); + $this->shop->update_option('wpsg_mod_wirecard_mwst', $_REQUEST['wpsg_mod_wirecard_mwst'], false, false, WPSG_SANITIZE_TAXKEY); + $this->shop->update_option('wpsg_mod_wirecard_mwstland', $_REQUEST['wpsg_mod_wirecard_mwstland'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_wirecard_currency', $_REQUEST['wpsg_mod_wirecard_currency'], false, false, WPSG_SANITIZE_INT); + $this->shop->update_option('wpsg_mod_wirecard_mode', $_REQUEST['wpsg_mod_wirecard_mode'], false, false, WPSG_SANITIZE_INT); + $this->shop->update_option('wpsg_mod_wirecard_language', $_REQUEST['wpsg_mod_wirecard_language'], false, false, WPSG_SANITIZE_INT); + $this->shop->update_option('wpsg_mod_wirecard_autostart', $_REQUEST['wpsg_mod_wirecard_autostart'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_wirecard_subject', $_REQUEST['wpsg_mod_wirecard_subject'], false, false, WPSG_SANITIZE_TEXTFIELD); + $this->shop->update_option('wpsg_mod_wirecard_submitadress', $_REQUEST['wpsg_mod_wirecard_submitadress'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_wirecard_minValue', $_REQUEST['wpsg_mod_wirecard_minValue'], false, false, WPSG_SANITIZE_FLOAT); + $this->shop->update_option('wpsg_mod_wirecard_maxValue', $_REQUEST['wpsg_mod_wirecard_maxValue'], false, false, WPSG_SANITIZE_FLOAT); + + $this->shop->createPage(__('Erfolgreiche wirecard Zahlung', 'wpsg'), 'wpsg_page_mod_wirecard_success', $_REQUEST['wpsg_page_mod_wirecard_success'], false, false, WPSG_SANITIZE_INT); + $this->shop->createPage(__('Fehlgeschlagene wirecard Zahlung', 'wpsg'), 'wpsg_page_mod_wirecard_error', $_REQUEST['wpsg_page_mod_wirecard_error'], false, false, WPSG_SANITIZE_INT); + $this->shop->createPage(__('Abgebrochene wirecard Zahlung', 'wpsg'), 'wpsg_page_mod_wirecard_cancel', $_REQUEST['wpsg_page_mod_wirecard_cancel'], false, false, WPSG_SANITIZE_INT); + $this->shop->createPage(__('Unbestimmte wirecard Zahlung', 'wpsg'), 'wpsg_page_mod_wirecard_pending', $_REQUEST['wpsg_page_mod_wirecard_pending'], false, false, WPSG_SANITIZE_INT); // Reihenfolge Zahlungsarten Index: /views/mailtemplates/kundenmail.phtml =================================================================== --- /views/mailtemplates/kundenmail.phtml (revision 7436) +++ /views/mailtemplates/kundenmail.phtml (revision 7437) @@ -61,4 +61,31 @@ + +get_option('wpsg_kundenvariablen_show') == '1') { ?> + view['pflicht']['custom'] as $c_id => $c) { if ($c['show'] != '2') { ?> +
+ + + view['error']))?'wpsg_error':''); ?>" name="wpsg[profil][custom][]" type="text" value="view['data']['custom'][$c_id]); ?>" /> + + + + + view['data']['custom'][$c_id] == '1')?'checked="checked"':''); ?> /> + + +
+ + + +
+ view['basket']['checkout']['knr']; ?> view['basket']['checkout']['onr']; ?> Index: /views/mods/mod_packagetracking/settings_edit_list.phtml =================================================================== --- /views/mods/mod_packagetracking/settings_edit_list.phtml (revision 7436) +++ /views/mods/mod_packagetracking/settings_edit_list.phtml (revision 7437) @@ -7,5 +7,5 @@ ?> view['wpsg_mod_packagetracking']['provider'])) { ?> - +