diff --git a/composer.lock b/composer.lock index 899e2dd2..de8daef7 100644 --- a/composer.lock +++ b/composer.lock @@ -64,16 +64,16 @@ }, { "name": "caxy/php-htmldiff", - "version": "v0.1.14", + "version": "v0.1.15", "source": { "type": "git", "url": "https://github.com/caxy/php-htmldiff.git", - "reference": "3f8ee7edda3d7c6d2e58a02d70a12d3242c84ea5" + "reference": "6342b02ddb86fd36093ad7e2db2efc21f01ab7cd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/caxy/php-htmldiff/zipball/3f8ee7edda3d7c6d2e58a02d70a12d3242c84ea5", - "reference": "3f8ee7edda3d7c6d2e58a02d70a12d3242c84ea5", + "url": "https://api.github.com/repos/caxy/php-htmldiff/zipball/6342b02ddb86fd36093ad7e2db2efc21f01ab7cd", + "reference": "6342b02ddb86fd36093ad7e2db2efc21f01ab7cd", "shasum": "" }, "require": { @@ -119,9 +119,9 @@ ], "support": { "issues": "https://github.com/caxy/php-htmldiff/issues", - "source": "https://github.com/caxy/php-htmldiff/tree/v0.1.14" + "source": "https://github.com/caxy/php-htmldiff/tree/v0.1.15" }, - "time": "2022-01-19T11:09:59+00:00" + "time": "2023-11-05T23:49:04+00:00" }, { "name": "chi-teck/drupal-code-generator", @@ -1789,17 +1789,17 @@ }, { "name": "drupal/config_filter", - "version": "2.5.0", + "version": "2.6.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/config_filter.git", - "reference": "8.x-2.5" + "reference": "8.x-2.6" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/config_filter-8.x-2.5.zip", - "reference": "8.x-2.5", - "shasum": "a509ec432b0560fbba853b52e74d71cede5f6bdf" + "url": "https://ftp.drupal.org/files/projects/config_filter-8.x-2.6.zip", + "reference": "8.x-2.6", + "shasum": "fd1a057a402436fc906c63bf0a74722f73b9b155" }, "require": { "drupal/core": "^8.8 || ^9 || ^10" @@ -1813,8 +1813,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-2.5", - "datestamp": "1698096457", + "version": "8.x-2.6", + "datestamp": "1698308577", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -3816,16 +3816,16 @@ }, { "name": "drupal/hdbt", - "version": "5.6.23", + "version": "5.6.25", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "e3d59c7b07f051da0a2f9d3cc0708137c5d72264" + "reference": "09c80a3399d9319f1dfb837e190113f0a6c6effb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/e3d59c7b07f051da0a2f9d3cc0708137c5d72264", - "reference": "e3d59c7b07f051da0a2f9d3cc0708137c5d72264", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/09c80a3399d9319f1dfb837e190113f0a6c6effb", + "reference": "09c80a3399d9319f1dfb837e190113f0a6c6effb", "shasum": "" }, "require": { @@ -3843,10 +3843,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.6.23", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.6.25", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2023-10-24T11:50:11+00:00" + "time": "2023-10-30T12:30:23+00:00" }, { "name": "drupal/hdbt_admin", @@ -3935,16 +3935,16 @@ }, { "name": "drupal/helfi_api_base", - "version": "2.5.8", + "version": "2.5.11", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base.git", - "reference": "c8ed69e045bae960fff5b71179d09f62ea53651a" + "reference": "cd300f71fcf464111636eec7c1da7f4bc855f772" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/c8ed69e045bae960fff5b71179d09f62ea53651a", - "reference": "c8ed69e045bae960fff5b71179d09f62ea53651a", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/cd300f71fcf464111636eec7c1da7f4bc855f772", + "reference": "cd300f71fcf464111636eec7c1da7f4bc855f772", "shasum": "" }, "require": { @@ -3954,13 +3954,15 @@ "firebase/php-jwt": "^6.5", "php": "^8.1", "t4web/composer-lock-parser": "^1.0", - "textalk/websocket": "^1.6" + "textalk/websocket": "^1.6", + "webmozart/assert": "^1.0" }, "conflict": { "drupal/helfi_debug": "*" }, "require-dev": { "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0", + "dg/bypass-finals": "^1.0", "donatj/mock-webserver": "dev-master", "drupal/coder": "^8.3" }, @@ -3970,10 +3972,10 @@ ], "description": "Helfi - API Base", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.5.8", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.5.11", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/issues" }, - "time": "2023-10-18T05:44:50+00:00" + "time": "2023-11-06T08:22:25+00:00" }, { "name": "drupal/helfi_azure_fs", @@ -4020,12 +4022,12 @@ "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-tools.git", - "reference": "3f74602477470e7220c12e0304d291f2504ad2ba" + "reference": "f063599143079b099b49e613eb7691662958a3b1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/3f74602477470e7220c12e0304d291f2504ad2ba", - "reference": "3f74602477470e7220c12e0304d291f2504ad2ba", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/f063599143079b099b49e613eb7691662958a3b1", + "reference": "f063599143079b099b49e613eb7691662958a3b1", "shasum": "" }, "require": { @@ -4063,7 +4065,7 @@ "source": "https://github.com/City-of-Helsinki/drupal-tools/tree/main", "issues": "https://github.com/City-of-Helsinki/drupal-tools/issues" }, - "time": "2023-10-25T07:38:01+00:00" + "time": "2023-10-27T06:16:44+00:00" }, { "name": "drupal/helfi_navigation", @@ -4102,16 +4104,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "3.4.32", + "version": "3.4.36", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "3fc6a55c3e54e0fcc83971bef6b8cd108aa59a7d" + "reference": "610a1bef07d85c1939bafe42e0f2e17b01f832e5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/3fc6a55c3e54e0fcc83971bef6b8cd108aa59a7d", - "reference": "3fc6a55c3e54e0fcc83971bef6b8cd108aa59a7d", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/610a1bef07d85c1939bafe42e0f2e17b01f832e5", + "reference": "610a1bef07d85c1939bafe42e0f2e17b01f832e5", "shasum": "" }, "require": { @@ -4207,7 +4209,7 @@ "Add missing schema to social media. (https://www.drupal.org/project/social_media/issues/2986819)": "https://git.drupalcode.org/project/social_media/-/commit/1964f42e5a6fb5d7a97fdf8ec5ca259bc6c5b19a.patch" }, "drupal/simple_sitemap": { - "[#UHF-8514] Fix frontpage URLs in sitemap. (https://www.drupal.org/project/simple_sitemap/issues/3264573)": "https://www.drupal.org/files/issues/2022-02-15/3264573-2.patch" + "[#UHF-8514] Fix frontpage URLs in sitemap. (https://www.drupal.org/i/3264573)": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/55722f695264bbaf6062f46e400e905c761fd5b7/patches/simple_sitemap-3264573-respect-frontpage-configuration.patch" } } }, @@ -4216,10 +4218,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.4.32", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.4.36", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2023-10-24T19:15:05+00:00" + "time": "2023-11-06T06:55:42+00:00" }, { "name": "drupal/helfi_proxy", @@ -4267,16 +4269,16 @@ }, { "name": "drupal/helfi_tpr", - "version": "2.2.8", + "version": "2.2.10", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr.git", - "reference": "96e148e1e18bf62bc592ee30f65bfe360b3d2396" + "reference": "a562d26f7c8eb866455be49dc6ec767edff2c263" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tpr/zipball/96e148e1e18bf62bc592ee30f65bfe360b3d2396", - "reference": "96e148e1e18bf62bc592ee30f65bfe360b3d2396", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tpr/zipball/a562d26f7c8eb866455be49dc6ec767edff2c263", + "reference": "a562d26f7c8eb866455be49dc6ec767edff2c263", "shasum": "" }, "require": { @@ -4302,10 +4304,10 @@ ], "description": "TPR integration", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/tree/2.2.8", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/tree/2.2.10", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/issues" }, - "time": "2023-10-13T10:43:12+00:00" + "time": "2023-11-02T10:54:20+00:00" }, { "name": "drupal/helfi_tunnistamo", @@ -4786,6 +4788,10 @@ { "name": "bkosborne", "homepage": "https://www.drupal.org/user/788032" + }, + { + "name": "joevagyok", + "homepage": "https://www.drupal.org/user/2876343" } ], "description": "Allows content editors to easily replace source files associated with any file-based media entity, preserving the original filename.", @@ -5978,17 +5984,17 @@ }, { "name": "drupal/simple_sitemap", - "version": "4.1.6", + "version": "4.1.7", "source": { "type": "git", "url": "https://git.drupalcode.org/project/simple_sitemap.git", - "reference": "4.1.6" + "reference": "4.1.7" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/simple_sitemap-4.1.6.zip", - "reference": "4.1.6", - "shasum": "5ea5ee97ab4d59b43db86dd6279c3ac5ecbe69b9" + "url": "https://ftp.drupal.org/files/projects/simple_sitemap-4.1.7.zip", + "reference": "4.1.7", + "shasum": "3d55ee386b0ebb81ed4c3461451a9e32a15d93d7" }, "require": { "drupal/core": "^9.3 || ^10", @@ -5997,8 +6003,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "4.1.6", - "datestamp": "1686288643", + "version": "4.1.7", + "datestamp": "1698936269", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" diff --git a/conf/cmi/core.entity_form_display.paragraph.remote_video.default.yml b/conf/cmi/core.entity_form_display.paragraph.remote_video.default.yml index 61c1753d..3fe27efc 100644 --- a/conf/cmi/core.entity_form_display.paragraph.remote_video.default.yml +++ b/conf/cmi/core.entity_form_display.paragraph.remote_video.default.yml @@ -14,7 +14,7 @@ dependencies: - media_library - text _core: - default_config_hash: DuVlqWDqCioL_uKoV5oTbHouDQZWChekxk7VhucegKM + default_config_hash: AMDZDzWNP90sUgt9bSZf2RbL7KmSxkXMKIiueo1JSWg id: paragraph.remote_video.default targetEntityType: paragraph bundle: remote_video diff --git a/conf/cmi/core.entity_view_display.paragraph.remote_video.default.yml b/conf/cmi/core.entity_view_display.paragraph.remote_video.default.yml index 70cfb51a..76ffe885 100644 --- a/conf/cmi/core.entity_view_display.paragraph.remote_video.default.yml +++ b/conf/cmi/core.entity_view_display.paragraph.remote_video.default.yml @@ -13,7 +13,7 @@ dependencies: module: - text _core: - default_config_hash: MOnn4AFhzDjCTeqfjs5VvI3wK128ulmu_tPpo2VZ7YA + default_config_hash: hYT61xkhP2zXO2VXijtXVPkoENlhLvIv5DRycKMm6iE id: paragraph.remote_video.default targetEntityType: paragraph bundle: remote_video diff --git a/conf/cmi/field.field.paragraph.remote_video.field_iframe_title.yml b/conf/cmi/field.field.paragraph.remote_video.field_iframe_title.yml index 2c54e969..717b9c8e 100644 --- a/conf/cmi/field.field.paragraph.remote_video.field_iframe_title.yml +++ b/conf/cmi/field.field.paragraph.remote_video.field_iframe_title.yml @@ -5,12 +5,14 @@ dependencies: config: - field.storage.paragraph.field_iframe_title - paragraphs.paragraphs_type.remote_video +_core: + default_config_hash: 4JZoeG_XitvgE9Tg7ZfVUwjpWcjeqktlO2tOnx_WfWU id: paragraph.remote_video.field_iframe_title field_name: field_iframe_title entity_type: paragraph bundle: remote_video label: 'Assistive technology title' -description: 'Users of assistive technology need a descriptive title to know what is in the embedded content.' +description: 'Users of assistive technology need a descriptive title to know what is in the embedded content. Do not use the prefix "Video: ". It will be added automatically.' required: true translatable: true default_value: { } diff --git a/conf/cmi/language/fi/field.field.paragraph.remote_video.field_iframe_title.yml b/conf/cmi/language/fi/field.field.paragraph.remote_video.field_iframe_title.yml index 36c9ed0e..ca8475b7 100644 --- a/conf/cmi/language/fi/field.field.paragraph.remote_video.field_iframe_title.yml +++ b/conf/cmi/language/fi/field.field.paragraph.remote_video.field_iframe_title.yml @@ -1,2 +1,2 @@ label: 'Avustavan teknologian otsikko' -description: 'Avustavan teknologian käyttäjät tarvitsevat kuvaavan otsikon upotetulle sisällölle.' +description: 'Avustavan teknologian käyttäjät tarvitsevat kuvaavan otsikon upotetulle sisällölle. Älä käytä etuliitettä "Video: ". Se lisätään automaattisesti.' diff --git a/conf/cmi/language/sv/field.field.paragraph.remote_video.field_iframe_title.yml b/conf/cmi/language/sv/field.field.paragraph.remote_video.field_iframe_title.yml index 80a22d2b..34cc701d 100644 --- a/conf/cmi/language/sv/field.field.paragraph.remote_video.field_iframe_title.yml +++ b/conf/cmi/language/sv/field.field.paragraph.remote_video.field_iframe_title.yml @@ -1,2 +1,2 @@ label: 'Hjälpmedel rubrik' -description: 'Användare av hjälpmedel behöver en beskrivande rubrik för inbäddad innehåll.' +description: 'Användare av hjälpmedel behöver en beskrivande rubrik för inbäddad innehåll. Använd inte prefixet "Video: ". Den läggs till automatiskt.' diff --git a/public/sites/default/settings.php b/public/sites/default/settings.php index 442df275..21ada2e4 100755 --- a/public/sites/default/settings.php +++ b/public/sites/default/settings.php @@ -121,7 +121,7 @@ function drupal_get_env(string|array $variables) : mixed { } $settings['reverse_proxy'] = TRUE; $settings['reverse_proxy_addresses'] = $reverse_proxy_address; - $settings['reverse_proxy_trusted_headers'] = Request::HEADER_X_FORWARDED_ALL; + $settings['reverse_proxy_trusted_headers'] = Request::HEADER_X_FORWARDED_FOR | Request::HEADER_X_FORWARDED_HOST | Request::HEADER_X_FORWARDED_PORT | Request::HEADER_X_FORWARDED_PROTO; $settings['reverse_proxy_host_header'] = 'X_FORWARDED_HOST'; }