Skip to content

Commit 53774c8

Browse files
electric-elelectric-el
committed
Merge branch 'dev'
2 parents 1f06565 + b64455d commit 53774c8

File tree

13,934 files changed

+443030
-573030
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

13,934 files changed

+443030
-573030
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
/conf.yml
99
/public/*
1010
!/public/package.json
11+
!/public/static/
1112
!/public/test/
1213
ignore/
1314
node_modules/

‎backend/drupal/.gitattributes‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,24 +19,24 @@
1919
*.config text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
2020
*.css text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
2121
*.dist text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
22-
*.engine text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
22+
*.engine text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php
2323
*.html text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=html
24-
*.inc text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
25-
*.install text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
24+
*.inc text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php
25+
*.install text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php
2626
*.js text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
2727
*.json text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
2828
*.lock text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
2929
*.map text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
3030
*.md text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
31-
*.module text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
32-
*.php text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
31+
*.module text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php
32+
*.php text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php
3333
*.po text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
34-
*.profile text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
34+
*.profile text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php
3535
*.script text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
36-
*.sh text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
36+
*.sh text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php
3737
*.sql text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
3838
*.svg text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
39-
*.theme text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
39+
*.theme text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php
4040
*.twig text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
4141
*.txt text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
4242
*.xml text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2

‎backend/drupal/.ht.router.php‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,12 @@
2424
* @see http://php.net/manual/en/features.commandline.webserver.php
2525
*/
2626

27+
if (PHP_SAPI !== 'cli-server') {
28+
// Bail out if this is not PHP's Development Server.
29+
header($_SERVER['SERVER_PROTOCOL'] . ' 403 Forbidden');
30+
exit;
31+
}
32+
2733
$url = parse_url($_SERVER['REQUEST_URI']);
2834
if (file_exists(__DIR__ . $url['path'])) {
2935
// Serve the requested resource as-is.
@@ -33,7 +39,7 @@
3339
// Work around the PHP bug.
3440
$path = $url['path'];
3541
$script = 'index.php';
36-
if (strpos($path, '.php') !== FALSE) {
42+
if (str_contains($path, '.php')) {
3743
// Work backwards through the path to check if a script exists. Otherwise
3844
// fallback to index.php.
3945
do {

‎backend/drupal/.htaccess‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44

55
# Protect files and directories from prying eyes.
6-
<FilesMatch "\.(engine|inc|install|make|module|profile|po|sh|.*sql|theme|twig|tpl(\.php)?|xtmpl|yml)(~|\.sw[op]|\.bak|\.orig|\.save)?$|^(\.(?!well-known).*|Entries.*|Repository|Root|Tag|Template|composer\.(json|lock)|web\.config)$|^#.*#$|\.php(~|\.sw[op]|\.bak|\.orig|\.save)$">
6+
<FilesMatch "\.(engine|inc|install|make|module|profile|po|sh|.*sql|theme|twig|tpl(\.php)?|xtmpl|yml)(~|\.sw[op]|\.bak|\.orig|\.save)?$|^(\.(?!well-known).*|Entries.*|Repository|Root|Tag|Template|composer\.(json|lock)|web\.config|yarn\.lock|package\.json)$|^#.*#$|\.php(~|\.sw[op]|\.bak|\.orig|\.save)$">
77
<IfModule mod_authz_core.c>
88
Require all denied
99
</IfModule>
@@ -26,13 +26,6 @@ AddEncoding gzip svgz
2626
# sites/default/default.settings.php and
2727
# Drupal\Core\DrupalKernel::bootEnvironment() for settings that can be
2828
# changed at runtime.
29-
30-
# PHP 7, Apache 1 and 2.
31-
<IfModule mod_php7.c>
32-
php_value assert.active 0
33-
</IfModule>
34-
35-
# PHP 8, Apache 1 and 2.
3629
<IfModule mod_php.c>
3730
php_value assert.active 0
3831
</IfModule>
@@ -42,8 +35,8 @@ AddEncoding gzip svgz
4235
# Enable expirations.
4336
ExpiresActive On
4437

45-
# Cache all files for 2 weeks after access (A).
46-
ExpiresDefault A1209600
38+
# Cache all files for 1 year after access.
39+
ExpiresDefault "access plus 1 year"
4740

4841
<FilesMatch \.php$>
4942
# Do not allow PHP scripts to be cached unless they explicitly send cache
@@ -158,12 +151,12 @@ AddEncoding gzip svgz
158151
# Serve gzip compressed CSS files if they exist and the client accepts gzip.
159152
RewriteCond %{HTTP:Accept-encoding} gzip
160153
RewriteCond %{REQUEST_FILENAME}\.gz -s
161-
RewriteRule ^(.*)\.css $1\.css\.gz [QSA]
154+
RewriteRule ^(.*css_[a-zA-Z0-9-_]+)\.css$ $1\.css\.gz [QSA]
162155

163156
# Serve gzip compressed JS files if they exist and the client accepts gzip.
164157
RewriteCond %{HTTP:Accept-encoding} gzip
165158
RewriteCond %{REQUEST_FILENAME}\.gz -s
166-
RewriteRule ^(.*)\.js $1\.js\.gz [QSA]
159+
RewriteRule ^(.*js_[a-zA-Z0-9-_]+)\.js$ $1\.js\.gz [QSA]
167160

168161
# Serve correct content types, and prevent double compression.
169162
RewriteRule \.css\.gz$ - [T=text/css,E=no-gzip:1,E=no-brotli:1]
@@ -180,7 +173,13 @@ AddEncoding gzip svgz
180173

181174
# Various header fixes.
182175
<IfModule mod_headers.c>
183-
# Disable content sniffing, since it's an attack vector.
176+
# Disable content sniffing for all responses, since it's an attack vector.
177+
# This header is also set in FinishResponseSubscriber, which depending on
178+
# Apache configuration might get placed in the 'onsuccess' table. To prevent
179+
# header duplication, unset that one prior to setting in the 'always' table.
180+
# See "To circumvent this limitation..." in
181+
# https://httpd.apache.org/docs/current/mod/mod_headers.html.
182+
Header onsuccess unset X-Content-Type-Options
184183
Header always set X-Content-Type-Options nosniff
185184
# Disable Proxy header, since it's an attack vector.
186185
RequestHeader unset Proxy

‎backend/drupal/INSTALL.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11

2-
Please read core/INSTALL.txt for detailed installation instructions for your
3-
Drupal website.
2+
Read core/INSTALL.txt for detailed installation instructions for your Drupal
3+
website.

‎backend/drupal/autoload.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* Includes the autoloader created by Composer.
66
*
77
* This file was generated by drupal-scaffold.
8-
*.
8+
*
99
* @see composer.json
1010
* @see index.php
1111
* @see core/install.php

‎backend/drupal/composer.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
],
1717
"require": {
1818
"composer/installers": "^1.9",
19-
"drupal/core-composer-scaffold": "^9",
20-
"drupal/core-project-message": "^9",
21-
"drupal/core-recommended": "^9",
19+
"drupal/core-composer-scaffold": "^10",
20+
"drupal/core-project-message": "^10",
21+
"drupal/core-recommended": "^10",
2222
"drupal/core-vendor-hardening": "^9"
2323
},
2424
"conflict": {

0 commit comments

Comments
 (0)