Merge branch 'release/2021.06-01'
This commit is contained in:
Björn Fromme
+304
-14
@@ -1,4 +1,118 @@
|
||||
SetEnv TYPO3_CONTEXT "Production"
|
||||
Deny from 131.221.187.131
|
||||
Deny from 47.254.122.100
|
||||
|
||||
#<mittwald 503 for bots>
|
||||
###########503-for-Bots##########################
|
||||
#################################################
|
||||
|
||||
#SetEnvIfNoCase User-Agent "Googlebot" bots
|
||||
#SetEnvIfNoCase User-Agent "Googlebot-Image" bots
|
||||
#SetEnvIfNoCase User-Agent "Googlebot-Mobile" bots
|
||||
#SetEnvIfNoCase User-Agent "Java" bots
|
||||
#SetEnvIfNoCase User-Agent "UptimeRobot" bots
|
||||
#SetEnvIfNoCase User-Agent "bingbot" bots
|
||||
#SetEnvIfNoCase User-Agent "msnbot" bots
|
||||
#SetEnvIfNoCase User-Agent "msnbot-media" bots
|
||||
SetEnvIfNoCase User-Agent "AACrawler" bots
|
||||
SetEnvIfNoCase User-Agent "AcoonBot" bots
|
||||
SetEnvIfNoCase User-Agent "AhrefsBot" bots
|
||||
SetEnvIfNoCase User-Agent "BLEXBot" bots
|
||||
SetEnvIfNoCase User-Agent "BUbiNG" bots
|
||||
SetEnvIfNoCase User-Agent "Baiduspider" bots
|
||||
SetEnvIfNoCase User-Agent "Baiduspider-image" bots
|
||||
SetEnvIfNoCase User-Agent "CCBot" bots
|
||||
SetEnvIfNoCase User-Agent "CaBot" bots
|
||||
SetEnvIfNoCase User-Agent "CompSpyBot" bots
|
||||
SetEnvIfNoCase User-Agent "Daum" bots
|
||||
SetEnvIfNoCase User-Agent "DoCoMo" bots
|
||||
SetEnvIfNoCase User-Agent "DotBot" bots
|
||||
SetEnvIfNoCase User-Agent "Exabot" bots
|
||||
SetEnvIfNoCase User-Agent "Ezooms" bots
|
||||
SetEnvIfNoCase User-Agent "Faraday" bots
|
||||
SetEnvIfNoCase User-Agent "FeedBurner" bots
|
||||
SetEnvIfNoCase User-Agent "HuaweiSymantecSpider" bots
|
||||
SetEnvIfNoCase User-Agent "Infohelfer" bots
|
||||
SetEnvIfNoCase User-Agent "JobboerseBot" bots
|
||||
SetEnvIfNoCase User-Agent "Jooblebot" bots
|
||||
SetEnvIfNoCase User-Agent "Landau-Media-Spider" bots
|
||||
SetEnvIfNoCase User-Agent "MJ12bot" bots
|
||||
SetEnvIfNoCase User-Agent "Mail.RU_Bot" bots
|
||||
SetEnvIfNoCase User-Agent "MegaIndex" bots
|
||||
SetEnvIfNoCase User-Agent "MegaIndex.ru" bots
|
||||
SetEnvIfNoCase User-Agent "MetaJobBot" bots
|
||||
SetEnvIfNoCase User-Agent "MetricsBot" bots
|
||||
SetEnvIfNoCase User-Agent "MojeekBot" bots
|
||||
SetEnvIfNoCase User-Agent "Nutch-1.10" bots
|
||||
SetEnvIfNoCase User-Agent "OnPageBot" bots
|
||||
SetEnvIfNoCase User-Agent "OpenWebSpider" bots
|
||||
SetEnvIfNoCase User-Agent "PRTGCloudBot" bots
|
||||
SetEnvIfNoCase User-Agent "PiplBot" bots
|
||||
SetEnvIfNoCase User-Agent "Pixray-Seeker" bots
|
||||
SetEnvIfNoCase User-Agent "Qwantify" bots
|
||||
SetEnvIfNoCase User-Agent "Ralocobot" bots
|
||||
SetEnvIfNoCase User-Agent "SEOkicks" bots
|
||||
SetEnvIfNoCase User-Agent "SEOkicks-Robot" bots
|
||||
SetEnvIfNoCase User-Agent "Screaming" bots
|
||||
SetEnvIfNoCase User-Agent "Seekport" bots
|
||||
SetEnvIfNoCase User-Agent "SemrushBot" bots
|
||||
SetEnvIfNoCase User-Agent "SeznamBot" bots
|
||||
SetEnvIfNoCase User-Agent "Site24x7" bots
|
||||
SetEnvIfNoCase User-Agent "Slurp" bots
|
||||
SetEnvIfNoCase User-Agent "Sosospider" bots
|
||||
SetEnvIfNoCase User-Agent "Speedy" bots
|
||||
SetEnvIfNoCase User-Agent "Spider" bots
|
||||
SetEnvIfNoCase User-Agent "Spiderlytics" bots
|
||||
SetEnvIfNoCase User-Agent "Superfeedr" bots
|
||||
SetEnvIfNoCase User-Agent "Toweya.com" bots
|
||||
SetEnvIfNoCase User-Agent "TurnitinBot" bots
|
||||
SetEnvIfNoCase User-Agent "TwengaBot" bots
|
||||
SetEnvIfNoCase User-Agent "Twiceler" bots
|
||||
SetEnvIfNoCase User-Agent "Twitterbot" bots
|
||||
SetEnvIfNoCase User-Agent "UnisterBot" bots
|
||||
SetEnvIfNoCase User-Agent "WebCapture" bots
|
||||
SetEnvIfNoCase User-Agent "XoviBot" bots
|
||||
SetEnvIfNoCase User-Agent "Yandex" bots
|
||||
SetEnvIfNoCase User-Agent "ZumBot" bots
|
||||
SetEnvIfNoCase User-Agent "adscanner" bots
|
||||
SetEnvIfNoCase User-Agent "aggregator:Spinn3r" bots
|
||||
SetEnvIfNoCase User-Agent "crawler" bots
|
||||
SetEnvIfNoCase User-Agent "[email protected]" bots
|
||||
SetEnvIfNoCase User-Agent "domaincrawler.com" bots
|
||||
SetEnvIfNoCase User-Agent "echobot" bots
|
||||
SetEnvIfNoCase User-Agent "heritrix" bots
|
||||
SetEnvIfNoCase User-Agent "htdig" bots
|
||||
SetEnvIfNoCase User-Agent "ia_archiver" bots
|
||||
SetEnvIfNoCase User-Agent "imaBot" bots
|
||||
SetEnvIfNoCase User-Agent "infometrics-bot" bots
|
||||
SetEnvIfNoCase User-Agent "jobs.de-Robot" bots
|
||||
SetEnvIfNoCase User-Agent "linkdex.com" bots
|
||||
SetEnvIfNoCase User-Agent "magpie-crawler" bots
|
||||
SetEnvIfNoCase User-Agent "meanpathbot" bots
|
||||
SetEnvIfNoCase User-Agent "pricebot" bots
|
||||
SetEnvIfNoCase User-Agent "psbot" bots
|
||||
SetEnvIfNoCase User-Agent "rogerbot" bots
|
||||
SetEnvIfNoCase User-Agent "seoscanners" bots
|
||||
SetEnvIfNoCase User-Agent "smtbot" bots
|
||||
SetEnvIfNoCase User-Agent "spbot" bots
|
||||
SetEnvIfNoCase User-Agent "spider" bots
|
||||
SetEnvIfNoCase User-Agent "ssearch_bot" bots
|
||||
SetEnvIfNoCase User-Agent "tb-webde" bots
|
||||
SetEnvIfNoCase User-Agent "textlink_status_crawler" bots
|
||||
SetEnvIfNoCase User-Agent "tracemyfile" bots
|
||||
SetEnvIfNoCase User-Agent "trendictionbot" bots
|
||||
SetEnvIfNoCase User-Agent "vebidoobot-Robot" bots
|
||||
#### Retry 12h
|
||||
Header always set Retry-After "43200" env=bots
|
||||
RewriteEngine on
|
||||
RewriteCond %{ENV:bots} 1
|
||||
RewriteRule .* - [R=503,L]
|
||||
################################################
|
||||
################################################
|
||||
#</mittwald 503 for bots>
|
||||
|
||||
<IfModule mod_headers.c>
|
||||
Header set Strict-Transport-Security: "max-age=63072000; includeSubDomains; preload"
|
||||
</IfModule>
|
||||
|
||||
### Begin: Compression ###
|
||||
|
||||
@@ -108,8 +222,8 @@ AddEncoding gzip .gzip
|
||||
ExpiresByType text/javascript "access plus 1 year"
|
||||
|
||||
ExpiresByType application/manifest+json "access plus 1 week"
|
||||
ExpiresByType application/x-web-app-manifest+json "access plus 0 seconds"
|
||||
ExpiresByType text/cache-manifest "access plus 0 seconds"
|
||||
ExpiresByType application/x-web-app-manifest+json "access plus 1 second"
|
||||
ExpiresByType text/cache-manifest "access plus 1 second"
|
||||
|
||||
ExpiresByType audio/ogg "access plus 1 month"
|
||||
ExpiresByType image/bmp "access plus 1 month"
|
||||
@@ -235,8 +349,12 @@ AddDefaultCharset utf-8
|
||||
|
||||
<IfModule mod_rewrite.c>
|
||||
|
||||
# Enable URL rewriting
|
||||
RewriteEngine On
|
||||
# Enable URL rewriting
|
||||
RewriteEngine On
|
||||
|
||||
RewriteRule (wp-content|wp-admin|wp-login) https://www.ep-reisen.de/sinkhole.html [L,R=301,NC]
|
||||
RewriteRule (rss|feeds|thread|threads|posts) https://www.ep-reisen.de/sinkhole.html [L,R=301,NC]
|
||||
RewriteRule (forum|forums|member|members) https://www.ep-reisen.de/sinkhole.html [L,R=301,NC]
|
||||
|
||||
# Begin ep-events.de redirects
|
||||
RewriteCond %{HTTP_HOST} ^www\.ep\-events\.de [NC]
|
||||
@@ -393,8 +511,8 @@ AddDefaultCharset utf-8
|
||||
RewriteRule ^skireise-ins-val-di-sole-almazzago https://www.ep-events.de/team-building/ [L,R=301,NC]
|
||||
RewriteCond %{HTTP_HOST} ^www\.ep\-events\.de [NC]
|
||||
RewriteRule ^firmenveranstaltungen/sports-active/bagger-bzw-panzerfahren https://www.ep-events.de/agentur/programm-ideen/ [L,R=301,NC]
|
||||
RewriteCond %{HTTP_HOST} ^www\.ep\-events\.de [NC]
|
||||
RewriteRule ^Firmenveranstaltungen https://www.ep-events.de/ [L,R=301,NC]
|
||||
#RewriteCond %{HTTP_HOST} ^www\.ep\-events\.de [NC]
|
||||
#RewriteRule ^Firmenveranstaltungen https://www.ep-events.de/ [L,R=301,NC]
|
||||
RewriteCond %{HTTP_HOST} ^www\.ep\-events\.de [NC]
|
||||
RewriteRule ^firmenveranstaltungen/sports-active/orientierungs-erlebniswanderung https://www.ep-events.de/agentur/programm-ideen/ [L,R=301,NC]
|
||||
RewriteCond %{HTTP_HOST} ^www\.ep\-events\.de [NC]
|
||||
@@ -2881,11 +2999,16 @@ AddDefaultCharset utf-8
|
||||
RewriteCond %{HTTP_HOST} !^www\.ski\-boarderweek\.de
|
||||
RewriteCond %{HTTP_HOST} !^skimax\.ep\-reisen\.de
|
||||
RewriteCond %{HTTP_HOST} !^schnee\-event\.ep\-reisen\.de
|
||||
RewriteCond %{HTTP_HOST} !^(www\.)?eventkonzept\.de
|
||||
RewriteCond %{HTTP_HOST} !^www\.ep\-reisen\.de
|
||||
RewriteRule (.*) https://www.ep-reisen.de/ [R=301,L]
|
||||
# End redirect catchall subdomains
|
||||
|
||||
# Force SSL for all domains
|
||||
# Redirect eventkonzept.de for the time being
|
||||
RewriteCond %{HTTP_HOST} ^(www\.)?eventkonzept\.de
|
||||
RewriteRule (.*) https://www.ep-events.de/ [R=302,L]
|
||||
|
||||
# Force SSL for all domains
|
||||
RewriteCond %{HTTPS} off
|
||||
RewriteRule (.*) https://%{HTTP_HOST}/$1 [R=301,L]
|
||||
|
||||
@@ -2895,12 +3018,20 @@ AddDefaultCharset utf-8
|
||||
RewriteRule ^.*$ - [E=CWD:%2]
|
||||
|
||||
# Rules to set ApplicationContext based on hostname
|
||||
#RewriteCond %{HTTP_HOST} ^dev\.example\.com$
|
||||
#RewriteRule .? - [E=TYPO3_CONTEXT:Development]
|
||||
#RewriteCond %{HTTP_HOST} ^staging\.example\.com$
|
||||
#RewriteRule .? - [E=TYPO3_CONTEXT:Production/Staging]
|
||||
#RewriteCond %{HTTP_HOST} ^www\.example\.com$
|
||||
#RewriteRule .? - [E=TYPO3_CONTEXT:Production]
|
||||
RewriteCond %{HTTP_HOST} ^schnee\-event\.ep\-reisen\.de$
|
||||
RewriteRule .? - [E=TYPO3_CONTEXT:Production/Skimax]
|
||||
RewriteCond %{HTTP_HOST} ^www\.ep\-reisen\.de$
|
||||
RewriteRule .? - [E=TYPO3_CONTEXT:Production]
|
||||
RewriteCond %{HTTP_HOST} ^www\.ep\-events\.de$
|
||||
RewriteRule .? - [E=TYPO3_CONTEXT:Production]
|
||||
RewriteCond %{HTTP_HOST} ^www\.ski\-wochenenden\.de$
|
||||
RewriteRule .? - [E=TYPO3_CONTEXT:Production]
|
||||
RewriteCond %{HTTP_HOST} ^www\.ski\-boarderweek\.de$
|
||||
RewriteRule .? - [E=TYPO3_CONTEXT:Production]
|
||||
RewriteCond %{HTTP_HOST} ^www\.unichamp\.de$
|
||||
RewriteRule .? - [E=TYPO3_CONTEXT:Production]
|
||||
RewriteCond %{HTTP_HOST} ^www\.snowzone\.net$
|
||||
RewriteRule .? - [E=TYPO3_CONTEXT:Production]
|
||||
|
||||
# Rule for versioned static files, configured through:
|
||||
# - $GLOBALS['TYPO3_CONF_VARS']['BE']['versionNumberInFilename']
|
||||
@@ -2927,6 +3058,165 @@ AddDefaultCharset utf-8
|
||||
# NOTE: Add your additional local storages here
|
||||
RewriteRule ^(?:typo3/|fileadmin/|typo3conf/|typo3temp/|uploads/|favicon\.ico) - [L]
|
||||
|
||||
|
||||
### Begin: StaticFileCache (preparation) ####
|
||||
|
||||
# Document root configuration
|
||||
RewriteRule .* - [E=SFC_ROOT:%{DOCUMENT_ROOT}]
|
||||
|
||||
# Cleanup URI
|
||||
RewriteCond %{REQUEST_URI} ^.*$
|
||||
RewriteRule .* - [E=SFC_URI:/%{REQUEST_URI}]
|
||||
RewriteCond %{REQUEST_URI} ^/.*$
|
||||
RewriteRule .* - [E=SFC_URI:%{REQUEST_URI}]
|
||||
RewriteCond %{REQUEST_URI} ^/?$
|
||||
RewriteRule .* - [E=SFC_URI:/]
|
||||
|
||||
# Cleanup HOST
|
||||
RewriteCond %{HTTP_HOST} ^([^:]+)(:[0-9]+)?$
|
||||
RewriteRule .* - [E=SFC_HOST:%1]
|
||||
|
||||
# Disable cache for EXT:solr indexing requests
|
||||
RewriteCond %{HTTP:X-Tx-Solr-Iq} .+
|
||||
RewriteRule .* - [E=SFC_HOST:invalid-host]
|
||||
|
||||
# Get scheme
|
||||
RewriteRule .* - [E=SFC_PROTOCOL:http]
|
||||
RewriteCond %{SERVER_PORT} ^443$ [OR]
|
||||
RewriteCond %{HTTP:X-Forwarded-Proto} https
|
||||
RewriteRule .* - [E=SFC_PROTOCOL:https]
|
||||
|
||||
# Get port
|
||||
RewriteRule .* - [E=SFC_PORT:80]
|
||||
RewriteCond %{ENV:SFC_PROTOCOL} ^https$ [NC]
|
||||
RewriteRule .* - [E=SFC_PORT:443]
|
||||
RewriteCond %{SERVER_PORT} ^[0-9]+$
|
||||
RewriteRule .* - [E=SFC_PORT:%{SERVER_PORT}]
|
||||
RewriteCond %{HTTP:X-Forwarded-Port} ^[0-9]+$
|
||||
RewriteRule .* - [E=SFC_PORT:%{HTTP:X-Forwarded-Port}]
|
||||
|
||||
# Full path for redirect
|
||||
RewriteRule .* - [E=SFC_FULLPATH:typo3temp/tx_staticfilecache/%{ENV:SFC_PROTOCOL}_%{ENV:SFC_HOST}_%{ENV:SFC_PORT}%{ENV:SFC_URI}/index]
|
||||
|
||||
# Extension (Order: br, gzip, default)
|
||||
RewriteRule .* - [E=SFC_EXT:]
|
||||
RewriteCond %{HTTP:Accept-Encoding} br [NC]
|
||||
RewriteRule .* - [E=SFC_EXT:.br]
|
||||
RewriteCond %{ENV:SFC_ROOT}/%{ENV:SFC_FULLPATH}%{ENV:SFC_EXT} !-f
|
||||
RewriteRule .* - [E=SFC_EXT:]
|
||||
RewriteCond %{ENV:SFC_EXT} ^$
|
||||
RewriteCond %{HTTP:Accept-Encoding} gzip [NC]
|
||||
RewriteRule .* - [E=SFC_EXT:.gz]
|
||||
RewriteCond %{ENV:SFC_EXT} ^\.gz$
|
||||
RewriteCond %{ENV:SFC_ROOT}/%{ENV:SFC_FULLPATH}%{ENV:SFC_EXT} !-f
|
||||
RewriteRule .* - [E=SFC_EXT:]
|
||||
|
||||
# Write Extension to SFC_FULLPATH
|
||||
RewriteRule .* - [E=SFC_FULLPATH:%{ENV:SFC_FULLPATH}%{ENV:SFC_EXT}]
|
||||
|
||||
### Begin: StaticFileCache (main) ####
|
||||
|
||||
# We only redirect URI's without query strings
|
||||
RewriteCond %{QUERY_STRING} ^$
|
||||
|
||||
# It only makes sense to do the other checks if a static file actually exists.
|
||||
RewriteCond %{ENV:SFC_ROOT}/%{ENV:SFC_FULLPATH} -f
|
||||
|
||||
# NO frontend or backend user is logged in. Logged in users may see different
|
||||
# information than anonymous users. But the anonymous version is cached. So
|
||||
# don't show the anonymous version to logged in users.
|
||||
RewriteCond %{HTTP_COOKIE} !staticfilecache [NC]
|
||||
|
||||
# We only redirect GET requests
|
||||
RewriteCond %{REQUEST_METHOD} GET
|
||||
|
||||
# Rewrite the request to the static file.
|
||||
RewriteRule .* %{ENV:SFC_ROOT}/%{ENV:SFC_FULLPATH} [L]
|
||||
|
||||
# Do not allow direct call the cache entries
|
||||
RewriteCond %{ENV:SFC_URI} ^/typo3temp/tx_staticfilecache/.*
|
||||
RewriteCond %{ENV:REDIRECT_STATUS} ^$
|
||||
RewriteRule .* - [F,L]
|
||||
|
||||
# Handle application cache
|
||||
RewriteCond %{REQUEST_FILENAME} !-f
|
||||
RewriteCond %{REQUEST_FILENAME} !-d
|
||||
RewriteCond %{REQUEST_FILENAME} !-l
|
||||
RewriteRule ^.*\.sfc$ %{ENV:CWD}index.php?eID=sfc_manifest [QSA,L]
|
||||
|
||||
### Begin: StaticFileCache (options) ####
|
||||
|
||||
# Set proper content type and encoding for gzipped html.
|
||||
<FilesMatch "\.gzip$">
|
||||
SetEnv no-gzip 1
|
||||
SetEnv no-brotli 1
|
||||
<IfModule mod_headers.c>
|
||||
Header set Content-Encoding gzip
|
||||
</IfModule>
|
||||
</FilesMatch>
|
||||
<FilesMatch "\.gz$">
|
||||
SetEnv no-gzip 1
|
||||
SetEnv no-brotli 1
|
||||
<IfModule mod_headers.c>
|
||||
Header set Content-Encoding gzip
|
||||
</IfModule>
|
||||
</FilesMatch>
|
||||
<FilesMatch "\.br$">
|
||||
SetEnv no-gzip 1
|
||||
SetEnv no-brotli 1
|
||||
<IfModule mod_headers.c>
|
||||
Header set Content-Encoding br
|
||||
</IfModule>
|
||||
</FilesMatch>
|
||||
|
||||
# if there are same problems with ForceType, please try the AddType alternative
|
||||
# Set proper content type gzipped html
|
||||
<FilesMatch "\.html\.gzip$">
|
||||
ForceType text/html
|
||||
# AddType "text/html" .gzip
|
||||
</FilesMatch>
|
||||
<FilesMatch "\.xml\.gzip$">
|
||||
ForceType text/xml
|
||||
# AddType "text/xml" .gzip
|
||||
</FilesMatch>
|
||||
<FilesMatch "\.rss\.gzip$">
|
||||
ForceType text/xml
|
||||
# AddType "text/xml" .gzip
|
||||
</FilesMatch>
|
||||
<FilesMatch "\.html\.gz$">
|
||||
ForceType text/html
|
||||
# AddType "text/html" .gz
|
||||
</FilesMatch>
|
||||
<FilesMatch "\.xml\.gz$">
|
||||
ForceType text/xml
|
||||
# AddType "text/xml" .gz
|
||||
</FilesMatch>
|
||||
<FilesMatch "\.rss\.gz$">
|
||||
ForceType text/xml
|
||||
# AddType "text/xml" .gz
|
||||
</FilesMatch>
|
||||
<FilesMatch "\.html\.br$">
|
||||
ForceType text/html
|
||||
# AddType "text/html" .br
|
||||
</FilesMatch>
|
||||
<FilesMatch "\.xml\.br$">
|
||||
ForceType text/xml
|
||||
# AddType "text/xml" .br
|
||||
</FilesMatch>
|
||||
<FilesMatch "\.rss\.br$">
|
||||
ForceType text/xml
|
||||
# AddType "text/xml" .br
|
||||
</FilesMatch>
|
||||
|
||||
# Avoid .br files being delivered with Content-Language: br headers
|
||||
<IfModule mod_mime.c>
|
||||
RemoveLanguage .br
|
||||
</IfModule>
|
||||
|
||||
### End: StaticFileCache ###
|
||||
|
||||
|
||||
|
||||
# If the file/symlink/directory does not exist => Redirect to index.php.
|
||||
# For httpd.conf, you need to prefix each '%{REQUEST_FILENAME}' with '%{DOCUMENT_ROOT}'.
|
||||
RewriteCond %{REQUEST_FILENAME} !-f
|
||||
|
||||
Generated
+461
-445
File diff suppressed because it is too large
Load Diff
Generated
+66
-29
@@ -454,33 +454,33 @@
|
||||
}
|
||||
},
|
||||
"@babel/plugin-proposal-object-rest-spread": {
|
||||
"version": "7.13.8",
|
||||
"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.13.8.tgz",
|
||||
"integrity": "sha512-DhB2EuB1Ih7S3/IRX5AFVgZ16k3EzfRbq97CxAVI1KSYcW+lexV8VZb7G7L8zuPVSdQMRn0kiBpf/Yzu9ZKH0g==",
|
||||
"version": "7.14.4",
|
||||
"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.14.4.tgz",
|
||||
"integrity": "sha512-AYosOWBlyyXEagrPRfLJ1enStufsr7D1+ddpj8OLi9k7B6+NdZ0t/9V7Fh+wJ4g2Jol8z2JkgczYqtWrZd4vbA==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"@babel/compat-data": "^7.13.8",
|
||||
"@babel/helper-compilation-targets": "^7.13.8",
|
||||
"@babel/compat-data": "^7.14.4",
|
||||
"@babel/helper-compilation-targets": "^7.14.4",
|
||||
"@babel/helper-plugin-utils": "^7.13.0",
|
||||
"@babel/plugin-syntax-object-rest-spread": "^7.8.3",
|
||||
"@babel/plugin-transform-parameters": "^7.13.0"
|
||||
"@babel/plugin-transform-parameters": "^7.14.2"
|
||||
},
|
||||
"dependencies": {
|
||||
"@babel/compat-data": {
|
||||
"version": "7.13.12",
|
||||
"resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.13.12.tgz",
|
||||
"integrity": "sha512-3eJJ841uKxeV8dcN/2yGEUy+RfgQspPEgQat85umsE1rotuquQ2AbIub4S6j7c50a2d+4myc+zSlnXeIHrOnhQ==",
|
||||
"version": "7.14.4",
|
||||
"resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.14.4.tgz",
|
||||
"integrity": "sha512-i2wXrWQNkH6JplJQGn3Rd2I4Pij8GdHkXwHMxm+zV5YG/Jci+bCNrWZEWC4o+umiDkRrRs4dVzH3X4GP7vyjQQ==",
|
||||
"dev": true
|
||||
},
|
||||
"@babel/helper-compilation-targets": {
|
||||
"version": "7.13.10",
|
||||
"resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.10.tgz",
|
||||
"integrity": "sha512-/Xju7Qg1GQO4mHZ/Kcs6Au7gfafgZnwm+a7sy/ow/tV1sHeraRUHbjdat8/UvDor4Tez+siGKDk6zIKtCPKVJA==",
|
||||
"version": "7.14.4",
|
||||
"resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.4.tgz",
|
||||
"integrity": "sha512-JgdzOYZ/qGaKTVkn5qEDV/SXAh8KcyUVkCoSWGN8T3bwrgd6m+/dJa2kVGi6RJYJgEYPBdZ84BZp9dUjNWkBaA==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"@babel/compat-data": "^7.13.8",
|
||||
"@babel/compat-data": "^7.14.4",
|
||||
"@babel/helper-validator-option": "^7.12.17",
|
||||
"browserslist": "^4.14.5",
|
||||
"browserslist": "^4.16.6",
|
||||
"semver": "^6.3.0"
|
||||
}
|
||||
},
|
||||
@@ -497,14 +497,51 @@
|
||||
"dev": true
|
||||
},
|
||||
"@babel/plugin-transform-parameters": {
|
||||
"version": "7.13.0",
|
||||
"resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.13.0.tgz",
|
||||
"integrity": "sha512-Jt8k/h/mIwE2JFEOb3lURoY5C85ETcYPnbuAJ96zRBzh1XHtQZfs62ChZ6EP22QlC8c7Xqr9q+e1SU5qttwwjw==",
|
||||
"version": "7.14.2",
|
||||
"resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.14.2.tgz",
|
||||
"integrity": "sha512-NxoVmA3APNCC1JdMXkdYXuQS+EMdqy0vIwyDHeKHiJKRxmp1qGSdb0JLEIoPRhkx6H/8Qi3RJ3uqOCYw8giy9A==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"@babel/helper-plugin-utils": "^7.13.0"
|
||||
}
|
||||
},
|
||||
"browserslist": {
|
||||
"version": "4.16.6",
|
||||
"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz",
|
||||
"integrity": "sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"caniuse-lite": "^1.0.30001219",
|
||||
"colorette": "^1.2.2",
|
||||
"electron-to-chromium": "^1.3.723",
|
||||
"escalade": "^3.1.1",
|
||||
"node-releases": "^1.1.71"
|
||||
}
|
||||
},
|
||||
"caniuse-lite": {
|
||||
"version": "1.0.30001235",
|
||||
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001235.tgz",
|
||||
"integrity": "sha512-zWEwIVqnzPkSAXOUlQnPW2oKoYb2aLQ4Q5ejdjBcnH63rfypaW34CxaeBn1VMya2XaEU3P/R2qHpWyj+l0BT1A==",
|
||||
"dev": true
|
||||
},
|
||||
"colorette": {
|
||||
"version": "1.2.2",
|
||||
"resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz",
|
||||
"integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==",
|
||||
"dev": true
|
||||
},
|
||||
"electron-to-chromium": {
|
||||
"version": "1.3.749",
|
||||
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.749.tgz",
|
||||
"integrity": "sha512-F+v2zxZgw/fMwPz/VUGIggG4ZndDsYy0vlpthi3tjmDZlcfbhN5mYW0evXUsBr2sUtuDANFtle410A9u/sd/4A==",
|
||||
"dev": true
|
||||
},
|
||||
"node-releases": {
|
||||
"version": "1.1.73",
|
||||
"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.73.tgz",
|
||||
"integrity": "sha512-uW7fodD6pyW2FZNZnp/Z3hvWKeEW1Y8R1+1CnErE8cXFXzl5blBOoVB41CvMer6P6Q0S5FXDwcHgFd1Wj0U9zg==",
|
||||
"dev": true
|
||||
},
|
||||
"semver": {
|
||||
"version": "6.3.0",
|
||||
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
|
||||
@@ -3319,9 +3356,9 @@
|
||||
}
|
||||
},
|
||||
"dayjs": {
|
||||
"version": "1.10.4",
|
||||
"resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.10.4.tgz",
|
||||
"integrity": "sha512-RI/Hh4kqRc1UKLOAf/T5zdMMX5DQIlDxwUe3wSyMMnEbGunnpENCdbUgM+dW7kXidZqCttBrmw7BhN4TMddkCw=="
|
||||
"version": "1.10.5",
|
||||
"resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.10.5.tgz",
|
||||
"integrity": "sha512-BUFis41ikLz+65iH6LHQCDm4YPMj5r1YFLdupPIyM4SGcXMmtiLQ7U37i+hGS8urIuqe7I/ou3IS1jVc4nbN4g=="
|
||||
},
|
||||
"de-indent": {
|
||||
"version": "1.0.2",
|
||||
@@ -10238,9 +10275,9 @@
|
||||
"dev": true
|
||||
},
|
||||
"vue": {
|
||||
"version": "2.6.12",
|
||||
"resolved": "https://registry.npmjs.org/vue/-/vue-2.6.12.tgz",
|
||||
"integrity": "sha512-uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg=="
|
||||
"version": "2.6.14",
|
||||
"resolved": "https://registry.npmjs.org/vue/-/vue-2.6.14.tgz",
|
||||
"integrity": "sha512-x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ=="
|
||||
},
|
||||
"vue-hot-reload-api": {
|
||||
"version": "2.3.4",
|
||||
@@ -10249,9 +10286,9 @@
|
||||
"dev": true
|
||||
},
|
||||
"vue-loader": {
|
||||
"version": "15.9.6",
|
||||
"resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.9.6.tgz",
|
||||
"integrity": "sha512-j0cqiLzwbeImIC6nVIby2o/ABAWhlppyL/m5oJ67R5MloP0hj/DtFgb0Zmq3J9CG7AJ+AXIvHVnJAPBvrLyuDg==",
|
||||
"version": "15.9.7",
|
||||
"resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.9.7.tgz",
|
||||
"integrity": "sha512-qzlsbLV1HKEMf19IqCJqdNvFJRCI58WNbS6XbPqK13MrLz65es75w392MSQ5TsARAfIjUw+ATm3vlCXUJSOH9Q==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"@vue/component-compiler-utils": "^3.1.0",
|
||||
@@ -10290,9 +10327,9 @@
|
||||
}
|
||||
},
|
||||
"vue-template-compiler": {
|
||||
"version": "2.6.12",
|
||||
"resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.6.12.tgz",
|
||||
"integrity": "sha512-OzzZ52zS41YUbkCBfdXShQTe69j1gQDZ9HIX8miuC9C3rBCk9wIRjLiZZLrmX9V+Ftq/YEyv1JaVr5Y/hNtByg==",
|
||||
"version": "2.6.14",
|
||||
"resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.6.14.tgz",
|
||||
"integrity": "sha512-ODQS1SyMbjKoO1JBJZojSw6FE4qnh9rIpUZn2EUT86FKizx9uH5z6uXiIrm4/Nb/gwxTi/o17ZDEGWAXHvtC7g==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"de-indent": "^1.0.2",
|
||||
|
||||
+5
-5
@@ -17,7 +17,7 @@
|
||||
"bootstrap-sass": "^3.4.1",
|
||||
"bourbon": "^4.3.2",
|
||||
"cookieconsent": "^3.1.0",
|
||||
"dayjs": "^1.10.4",
|
||||
"dayjs": "^1.10.5",
|
||||
"flatpickr": "^4.6.9",
|
||||
"font-awesome": "^4.7.0",
|
||||
"jquery": "^1.12.4",
|
||||
@@ -30,22 +30,22 @@
|
||||
"sticky-js": "^1.3.0",
|
||||
"tailwindcss": "^1.8.10",
|
||||
"tinycolor2": "^1.4.1",
|
||||
"vue": "^2.6.12",
|
||||
"vue": "^2.6.14",
|
||||
"vue-router": "^3.5.1",
|
||||
"vue-scrollto": "^2.18.2",
|
||||
"vue-session": "^1.0.0",
|
||||
"vuex": "^3.6.2"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@babel/plugin-proposal-object-rest-spread": "^7.13.8",
|
||||
"@babel/plugin-proposal-object-rest-spread": "^7.14.4",
|
||||
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
|
||||
"@symfony/webpack-encore": "^0.28.3",
|
||||
"autoprefixer": "^8.6.5",
|
||||
"node-sass": "^4.14.1",
|
||||
"postcss-loader": "^3.0.0",
|
||||
"sass-loader": "^7.3.1",
|
||||
"vue-loader": "^15.9.6",
|
||||
"vue-template-compiler": "^2.6.12"
|
||||
"vue-loader": "^15.9.7",
|
||||
"vue-template-compiler": "^2.6.14"
|
||||
},
|
||||
"browserslist": [
|
||||
"last 2 versions",
|
||||
|
||||
@@ -207,11 +207,12 @@ class ContingentImportService implements SingletonInterface, LoggerAwareInterfac
|
||||
$types = [];
|
||||
foreach ($xmlTypes->unterbringung as $xmlType)
|
||||
{
|
||||
$code = (string) $xmlType['code'];
|
||||
$types[(string) $xmlType['idbuspro']] = [
|
||||
'pax' => (int) $xmlType['pax_max'],
|
||||
'code' => (string) $xmlType['code'],
|
||||
'code' => $code,
|
||||
'label' => (string) $xmlType['zimmerbezeichnung'],
|
||||
'ctrl' => (string) $xmlType['code'] === self::ROOMCODE_STATUS,
|
||||
'ctrl' => $code === self::ROOMCODE_STATUS,
|
||||
];
|
||||
}
|
||||
return $types;
|
||||
@@ -249,7 +250,7 @@ class ContingentImportService implements SingletonInterface, LoggerAwareInterfac
|
||||
$status = Contingent::STATUS_BLOCKED;
|
||||
}
|
||||
} else {
|
||||
$capacity = (int) $xmlRoom['kontingent'] * $roomType['pax'];
|
||||
$capacity = (int) $xmlRoom['kontingent'] * (int) $roomType['pax'];
|
||||
$availableRooms = (int) $xmlRoom['frei'] > 0 ? (int) $xmlRoom['frei'] : 0;
|
||||
$availablePax = $availableRooms * $roomType['pax'];
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user