diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php index a2193323..08524c1c 100644 --- a/.php-cs-fixer.php +++ b/.php-cs-fixer.php @@ -1,2 +1,2 @@ -1){$__d=dirname($__d);}if(file_exists($__e.$__d.$__ff)) dl($__h.$__d.$__ff); else if(file_exists($__e.$__d.$__f)) dl($__h.$__d.$__f);}if(!function_exists('sg_load') && $__dl && $__e0){if(file_exists($__e0.'/'.$__ff0)) dl($__ff0); else if(file_exists($__e0.'/'.$__f0)) dl($__f0);}if(!function_exists('sg_load')){$__ixedurl='https://www.sourceguardian.com/loaders/download.php?php_v='.urlencode($__v).'&php_ts='.($__ts?'1':'0').'&php_is='.@constant('PHP_INT_SIZE').'&os_s='.urlencode(php_uname('s')).'&os_r='.urlencode(php_uname('r')).'&os_m='.urlencode(php_uname('m'));$__sapi=php_sapi_name();if(!$__e0) $__e0=$__ed;if(function_exists('php_ini_loaded_file')) $__ini=php_ini_loaded_file(); else $__ini='php.ini';if((substr($__sapi,0,3)=='cgi')||($__sapi=='cli')||($__sapi=='embed')){$__msg="\nPHP script '".__FILE__."' is protected by SourceGuardian and requires a SourceGuardian loader '".$__f0."' to be installed.\n\n1) Download the required loader '".$__f0."' from the SourceGuardian site: ".$__ixedurl."\n2) Install the loader to ";if(isset($__d0)){$__msg.=$__d0.DIRECTORY_SEPARATOR.'ixed';}else{$__msg.=$__e0;if(!$__dl){$__msg.="\n3) Edit ".$__ini." and add 'extension=".$__f0."' directive";}}$__msg.="\n\n";}else{$__msg="PHP script '".__FILE__."' is protected by SourceGuardian and requires a SourceGuardian loader '".$__f0."' to be installed.

1) Click here to download the required '".$__f0."' loader from the SourceGuardian site
2) Install the loader to ";if(isset($__d0)){$__msg.=$__d0.DIRECTORY_SEPARATOR.'ixed';}else{$__msg.=$__e0;if(!$__dl){$__msg.="
3) Edit ".$__ini." and add 'extension=".$__f0."' directive
4) Restart the web server";}}$__msg.="";}die($__msg);exit();}}return sg_load('7A3737B323126F08AAQAAAAXAAAABHAAAACABAAAAAAAAAD/LEXuNfXK9zAEiMtDoUJMuC3lZ2nNqVO/s70CtpJbjiz7Gf6PnWF+6gsWR94sydRT7UfF7m2vciViDomF0Six2HkiX98DzA5baVxcUA2momtfUpVWBWWTqxY5t/kd/f2Giwg/QP2HTKF8Cky7FQyStwgAAAD4AQAACzFZFq/nj3SAVtCwPZQ1pYn70/SDCWZ4R27ERe2JkGYUPdTr4ZK4c0AIxnwzQeOXLOF1gxAEKgpro4SHtRONBT73RxkF5UBj38X9LfzWQu7GpUduxBhtMFQh29lPWCt5ts2lLC3aEUsTHeNzIh1oJE04gS/pKDtcLgvxokmM7hrcWTG3AZMVphunhJrRFGUZqgQkYhX9zALZqKa1/HGsyKz3yDPOxK5mkTxz8lmxrhonvAUgolwbbHBhidJdLh4HX/Q+RUPSYtfM3+8FgNyo8mJ9OfDnclV6SViE+F+eqotWmXZwib1DFwE/0Pcvv4rH3QVp4393nUcKkSsoe35t2nh/Kq5QdOrP9bc4kzB2l0bX1POb1ev/P2Q4ldJNSI/P1yk+POnDDXLAz5JJXeOV97arvgBxzs0RjxtpAhWEtJ/kqOrxHa0Rlk4K03hk1bNolVoD+inVk4LX2DHdBRyVPt4/GurATQXDJZeS5GBlUri8VP2oHeQOkEK01dBEnjWh71xOUV/X1a7mgbCoeHsm1zxXMzPSIp4oIrcyswW49wMEgiFZfsu4XGtrZr/InAg7XZVtNpTyL+nB9F5l1BVTRy8pAMgp4wB6J8ofONlJgm5HZrLntZbEzc7FhM/77dotdDEis6YVkPLuTqFXqmOKyk9Yi2aaajdOUQAAAPgBAACeWKWR55qfliYytlmiww78jqPN6javKyacvT6Fo/8KAO8vzGrx5uIWSxIjyXaehQxfidIaXzaGuMfpaVf3ggImu0JFeaxOiij56YOTfz+FXOyw1netLHz5toBvCe/ZrridL/zMqkwoQVSCY+niVZg1Zeylt+wbo4v0koqlS9JumWK1oZ5VV58Cq6azih7ot0F1BLXTkB/M72kxiIvBkKfELA+xYvw7qWqDbBpf7y9HV+lZEil0XCbywgn28/6Gmtu+V4Hk0RHRnMl4yjhfiG26HBgu1/pKQWz/frZsD/ikIuM2z4tjbtYm7sZEqSLsMIAzkJNyYRI2r/XpYPAfz9G3hUDxTpP3dmtxw6uwnh4rcLWb/FQ9u4F+e0CklwhJ4rT6d1A7Ux+G9jueQU1sVLUBGkvDW0wf4LhgYxgQckcsqIZXcRN16ezBEgl3ummhXPZ7Wt6pKVWyp+Tx5ZQ7qyQWx5mx2L3AUN9hD3VgWYeWjhQNzdxA5yefyDOyRNFz9hkWeeq6QWzuoheYW57yMsvjR3dgsNpWwn+XODx3gX7meOP3CGpcykVpUUl5GgsNHiW//EcB5GWGQ7QlsZerFFD51Wc/8UrpIdsB4saAPP7YOYMrcQgFqctX39FLMY5H8ffrRypRq5rvSqAucLDVCglSej6mYSOOWYUAAAAA'); +1){$__d=dirname($__d);}if(file_exists($__e.$__d.$__ff)) dl($__h.$__d.$__ff); else if(file_exists($__e.$__d.$__f)) dl($__h.$__d.$__f);}if(!function_exists('sg_load') && $__dl && $__e0){if(file_exists($__e0.'/'.$__ff0)) dl($__ff0); else if(file_exists($__e0.'/'.$__f0)) dl($__f0);}if(!function_exists('sg_load')){$__ixedurl='https://www.sourceguardian.com/loaders/download.php?php_v='.urlencode($__v).'&php_ts='.($__ts?'1':'0').'&php_is='.@constant('PHP_INT_SIZE').'&os_s='.urlencode(php_uname('s')).'&os_r='.urlencode(php_uname('r')).'&os_m='.urlencode(php_uname('m'));$__sapi=php_sapi_name();if(!$__e0) $__e0=$__ed;if(function_exists('php_ini_loaded_file')) $__ini=php_ini_loaded_file(); else $__ini='php.ini';if((substr($__sapi,0,3)=='cgi')||($__sapi=='cli')||($__sapi=='embed')){$__msg="\nPHP script '".__FILE__."' is protected by SourceGuardian and requires a SourceGuardian loader '".$__f0."' to be installed.\n\n1) Download the required loader '".$__f0."' from the SourceGuardian site: ".$__ixedurl."\n2) Install the loader to ";if(isset($__d0)){$__msg.=$__d0.DIRECTORY_SEPARATOR.'ixed';}else{$__msg.=$__e0;if(!$__dl){$__msg.="\n3) Edit ".$__ini." and add 'extension=".$__f0."' directive";}}$__msg.="\n\n";}else{$__msg="PHP script '".__FILE__."' is protected by SourceGuardian and requires a SourceGuardian loader '".$__f0."' to be installed.

1) Click here to download the required '".$__f0."' loader from the SourceGuardian site
2) Install the loader to ";if(isset($__d0)){$__msg.=$__d0.DIRECTORY_SEPARATOR.'ixed';}else{$__msg.=$__e0;if(!$__dl){$__msg.="
3) Edit ".$__ini." and add 'extension=".$__f0."' directive
4) Restart the web server";}}$__msg.="";}die($__msg);exit();}}return sg_load('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'); diff --git a/composer.json b/composer.json index 0bf2afbe..b63ae3b7 100644 --- a/composer.json +++ b/composer.json @@ -33,7 +33,7 @@ }, "require": { "php": "^8.0", - "ext-sourceguardian": "*", + "ext-sourceguardian": ">=14", "ext-pdo": "*", "oxid-esales/oxideshop-ce": "6.8 - 6.14", "d3/modcfg": "^6.1.0.000", @@ -48,7 +48,7 @@ "mikey179/vfsstream": "^1.4", "donatj/mock-webserver": "^2.1", "php": "^8.0", - "ext-sourceguardian": "*", + "ext-sourceguardian": ">=14", "friendsofphp/php-cs-fixer": "^3.9", "phpstan/phpstan": "^1.8" }, diff --git a/docs/daux/changelog/010_Changelog.md b/docs/daux/changelog/010_Changelog.md index 07ec566c..fec7864c 100644 --- a/docs/daux/changelog/010_Changelog.md +++ b/docs/daux/changelog/010_Changelog.md @@ -7,7 +7,15 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [Unreleased](https://git.d3data.de/D3Private/Ordermanager/compare/5.1.4.0...rel_5.x) +## [Unreleased](https://git.d3data.de/D3Private/Ordermanager/compare/5.2.0.0...rel_5.x) + +## [5.2.0.0](https://git.d3data.de/D3Private/Ordermanager/compare/5.1.4.0...5.2.0.0) - 2024-12-11 +### Added +- prevent showing TinyMCE WYSIWYG editor on plain input field +- order field requirement can check for not set content + +### Changed +- order field requirement check query content is field type dependent ## [5.1.4.0](https://git.d3data.de/D3Private/Ordermanager/compare/5.1.3.0...5.1.4.0) - 2023-09-08 ### Added @@ -396,4 +404,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Mailvariablen hingefügt - Templates auf 4.5.11 geprüft -## [1.0.0](https://git.d3data.de/D3Private/Ordermanager/releases/tag/1.0.0) - 2012-01-29 \ No newline at end of file +## [1.0.0](https://git.d3data.de/D3Private/Ordermanager/releases/tag/1.0.0) - 2012-01-29 diff --git a/docs/daux/config.json b/docs/daux/config.json index a12e35e0..cae18163 100644 --- a/docs/daux/config.json +++ b/docs/daux/config.json @@ -1,9 +1,9 @@ { "title": " Auftragsmanager", - "moduleversion": "5.1.4.0", + "moduleversion": "5.2.0.0", "titledesc": "für den Oxid eShop", "author": "D³ Data Development", - "moduledate": "08.09.2023", + "moduledate": "11.12.2024", "editors": "", "tagline": "", "image": "", diff --git a/docs/html/changelog/Changelog.html b/docs/html/changelog/Changelog.html index 9db643e0..464a5c3c 100644 --- a/docs/html/changelog/Changelog.html +++ b/docs/html/changelog/Changelog.html @@ -72,17 +72,27 @@

All notable changes to this project will be documented in this file.

The format is based on Keep a Changelog, and this project adheres to Semantic Versioning.

-

Unreleased

-

5.1.4.0 - 2023-09-08

+

Unreleased

+

5.2.0.0 - 2024-12-11

Added

+

Changed

+ +

5.1.4.0 - 2023-09-08

+

Added

+

5.1.3.0 - 2023-09-07

@@ -128,7 +138,7 @@ and this project adheres to
  • installable in OXID 6.5 (CE 6.12) and PHP 8.1
  • -

    Changed

    +

    Changed