diff --git a/.docker/images/nginx/conf.d/default.conf b/.docker/images/nginx/conf.d/default.conf index efe60946b..77b7845f0 100644 --- a/.docker/images/nginx/conf.d/default.conf +++ b/.docker/images/nginx/conf.d/default.conf @@ -39,7 +39,7 @@ server { add_header Access-Control-Expose-Headers Access-Control-Allow-Origin always; add_header Referrer-Policy "strict-origin" always; add_header X-Content-Type-Options nosniff always; - add_header X-Frame-Options "SAMEORIGIN" always; + #add_header X-Frame-Options "SAMEORIGIN" always; add_header X-XSS-Protection "1; mode=block" always; add_header Content-Security-Policy "default-src https: 'unsafe-eval' 'unsafe-inline'; object-src 'none'; worker-src blob:; img-src https: blob: data:" always; fastcgi_temp_path /tmp/fastcgi 1 2; diff --git a/.docker/images/php/fpm/conf.d/zz-app-prod.ini b/.docker/images/php/fpm/conf.d/zz-app-prod.ini index 835d55158..5f13482e3 100644 --- a/.docker/images/php/fpm/conf.d/zz-app-prod.ini +++ b/.docker/images/php/fpm/conf.d/zz-app-prod.ini @@ -1,2 +1,3 @@ ; overriding defaults -ession.cookie_secure=On +session.cookie_secure=On +session.cookie_samesite=Lax diff --git a/src/new/src/PSC/Shop/MediaBundle/Model/MediaItem.php b/src/new/src/PSC/Shop/MediaBundle/Model/MediaItem.php index 7fb3aa0af..a19ea15f6 100644 --- a/src/new/src/PSC/Shop/MediaBundle/Model/MediaItem.php +++ b/src/new/src/PSC/Shop/MediaBundle/Model/MediaItem.php @@ -7,4 +7,6 @@ class MediaItem public string $name; public string $description; + + public string $media; } diff --git a/src/old/application/Bootstrap.php b/src/old/application/Bootstrap.php index fbf4b2c83..956012e4a 100755 --- a/src/old/application/Bootstrap.php +++ b/src/old/application/Bootstrap.php @@ -119,7 +119,7 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap if (isset($_POST['ARTID'])) { Zend_Registry::get('log')->debug($_POST['ARTID']); try { - Zend_Session::setId($_POST['ARTID']); + //Zend_Session::setId($_POST['ARTID']); } catch (Exception $e) { Zend_Registry::get('log')->debug($e->getMessage()); } diff --git a/src/old/application/design/vorlagen/bootstrap4_api/articletemplates/scripts/6_basket_index.phtml b/src/old/application/design/vorlagen/bootstrap4_api/articletemplates/scripts/6_basket_index.phtml index 7eb78f810..0de9cb058 100755 --- a/src/old/application/design/vorlagen/bootstrap4_api/articletemplates/scripts/6_basket_index.phtml +++ b/src/old/application/design/vorlagen/bootstrap4_api/articletemplates/scripts/6_basket_index.phtml @@ -1,7 +1,7 @@ article['article']; $articleObj = new market_article(); -$filesOptions =$this->article['basketarticle']->getFiles(); +$filesOptions = $this->article['basketarticle']->getFiles(); ?>
article['basketarticle']->getLayouterId() == "" || $this->article['basketarticle']->getLayouterId() == false)): ?> @@ -10,7 +10,7 @@ $filesOptions =$this->article['basketarticle']->getFiles(); image()->thumbnailImage($basketArticle['title'], 'articlelist', $basketArticle['file']); ?> - generatePreview($basketArticle['id'],$this->article['basketarticle']->getLayouterId()); ?> + generatePreview($basketArticle['id'], $this->article['basketarticle']->getLayouterId()); ?>
Anzahl: @@ -24,34 +24,31 @@ $filesOptions =$this->article['basketarticle']->getFiles(); layouter()->getTitle($this->article['basketarticle']->getLayouterId()); ?>
- article['options'])): ?> -
- designsettings()->get('display_no_price')) { ?>currency->toCurrency($this->article['basketarticle']->getNetto()*$this->article['basketarticle']->getCount()) ?>
currency->toCurrency($this->article['basketarticle']->getBrutto()*$this->article['basketarticle']->getCount()) ?> + designsettings()->get('display_no_price')) { ?>currency->toCurrency($this->article['basketarticle']->getNetto() * $this->article['basketarticle']->getCount()) ?>
currency->toCurrency($this->article['basketarticle']->getBrutto() * $this->article['basketarticle']->getCount()) ?>
translate('Löschen'); ?> article['basketarticle']->getLayouterId() != "" && !$this->article()->checkIfCollectionOrdersForTemplatePrint($this->article['basketarticle']->getLayouterId())): ?>
translate('Bearbeiten') ?> diff --git a/src/old/application/design/vorlagen/bootstrap4_api/templates/basket/finish.phtml b/src/old/application/design/vorlagen/bootstrap4_api/templates/basket/finish.phtml index 0b43a3445..c9097ccfc 100755 --- a/src/old/application/design/vorlagen/bootstrap4_api/templates/basket/finish.phtml +++ b/src/old/application/design/vorlagen/bootstrap4_api/templates/basket/finish.phtml @@ -1,3 +1,7 @@ +headScript()->prependFile('/scripts/underscore.js'); +$this->headScript()->prependFile('/' . $this->designPath . '/basket/index.js'); +?>