Merge branch 'drupal9-latest' into 'master'

Drupal 9 latest See merge request agaric/sites/geo!4
2024-02-16 23:55:40 +00:00 · 2024-02-16 23:55:40 +00:00 · 95ca4e9c06
commit 95ca4e9c06
parent 3678c26c96 7c654e2dd5
52 changed files with 6172 additions and 2920 deletions
--- a/.ddev/.gitignore
+++ b/.ddev/.gitignore
@ -9,7 +9,9 @@
 /.*downloads
 /.global_commands
 /.homeadditions
+/.importdb*
 /.sshimageBuild
+/.venv
 /.webimageBuild
 /.webimageExtra
 /apache/apache-site.conf
@ -18,13 +20,19 @@
 /commands/host/launch
 /commands/web/xdebug
 /commands/web/live
-/config.*.y*ml
+/config.local.y*ml
 /db_snapshots
 /import-db
 /import.yaml
-/mutagen
+/mutagen/mutagen.yml
+/mutagen/.start-synced
 /nginx_full/nginx-site.conf
 /postgres/postgresql.conf
+/providers/platform.yaml
 /sequelpro.spf
-/xhprof
+/settings/settings.ddev.py
+/traefik/config/geo.yaml
+/traefik/certs/geo.crt
+/traefik/certs/geo.key
+/xhprof/xhprof_prepend.php
 /**/README.*
--- a/.ddev/commands/db/mysql
+++ b/.ddev/commands/db/mysql
@ -1,9 +0,0 @@
-#!/bin/bash
-
-## #ddev-generated
-## Description: run mysql client in db container
-## Usage: mysql [flags] [args]
-## Example: "ddev mysql" or "ddev mysql -uroot -proot" or "echo 'SHOW TABLES;' | ddev mysql"
-## `ddev mysql --database=mysql -uroot -proot` gets you to the 'mysql' database with root privileges
-
-mysql -udb -pdb $@
--- a/.ddev/config.yaml
+++ b/.ddev/config.yaml
@ -1,7 +1,7 @@
 name: geo
 type: drupal9
 docroot: web
-php_version: "7.4"
+php_version: "8.1"
 webserver_type: apache-fpm
 router_http_port: "80"
 router_https_port: "443"
--- a/composer.json
+++ b/composer.json
@ -34,8 +34,6 @@
    "require": {
        "composer/installers": "^1.9",
        "cweagans/composer-patches": "^1.7",
-        "drupal/allowed_formats": "^1.1",
-        "drupal/antibot": "^1.2",
        "drupal/auto_entitylabel": "^3.0@beta",
        "drupal/backup_migrate": "^5",
        "drupal/block_class": "^1.3",
@ -93,7 +91,6 @@
        "drupal/migrate_source_csv": "^3",
        "drupal/migrate_tools": "^6",
        "drupal/migrate_upgrade": "^4",
-        "drupal/minimalhtml": "^1.1",
        "drupal/mobile_number": "^2.0@alpha",
        "drupal/node_view_permissions": "^1.4",
        "drupal/noreferrer": "^1.7",
@ -130,7 +127,6 @@
        "drupal/view_unpublished": "^1.0",
        "drupal/webform": "^6.0",
        "drupal/weight": "^3.3",
-        "drupal/wysiwyg_linebreaks": "^1.10",
        "drush/drush": "^10",
        "drutopia/drutopia": "dev-8.x-1.x",
        "vlucas/phpdotenv": "^5.1",
@ -140,7 +136,7 @@
        "behat/behat": "^3.4",
        "behat/mink": "^1.7",
        "behat/mink-goutte-driver": "^1.2",
-        "drupal/upgrade_status": "^3"
+        "drupal/upgrade_status": "^4"
    },
    "config": {
        "sort-packages": true,
--- a/composer.lock
+++ b/composer.lock
--- a/config/sync/admin_toolbar.settings.yml
+++ b/config/sync/admin_toolbar.settings.yml
@ -0,0 +1 @@
+menu_depth: 4
--- a/config/sync/admin_toolbar_tools.settings.yml
+++ b/config/sync/admin_toolbar_tools.settings.yml
@ -0,0 +1,2 @@
+max_bundle_number: 20
+hoverintent_functionality: true
--- a/config/sync/autosave_form.settings.yml
+++ b/config/sync/autosave_form.settings.yml
@ -10,3 +10,4 @@ notification:
  message: 'Saving draft...'
  delay: 1000
 allowed_content_entity_types: {  }
+allowed_new: true
--- a/config/sync/block.block.geofresco_footer_menu.yml
+++ b/config/sync/block.block.geofresco_footer_menu.yml
@ -5,6 +5,7 @@ dependencies:
  config:
    - system.menu.footer
  module:
+    - block_visibility_groups
    - system
  theme:
    - geofresco
@ -24,4 +25,8 @@ settings:
  level: 1
  depth: 0
  expand_all_items: false
-visibility: {  }
+visibility:
+  condition_group:
+    id: condition_group
+    negate: false
+    block_visibility_group: ''
--- a/config/sync/config_snapshot.snapshot.config_sync.module.admin_toolbar.yml
+++ b/config/sync/config_snapshot.snapshot.config_sync.module.admin_toolbar.yml
@ -8,4 +8,11 @@ id: config_sync.module.admin_toolbar
 snapshotSet: config_sync
 extensionType: module
 extensionName: admin_toolbar
-items: {  }
+items:
+  -
+    collection: ''
+    name: admin_toolbar.settings
+    data:
+      menu_depth: 4
+      _core:
+        default_config_hash: jvTSppzcgH5wnzBhX5xnAExcp2I1CzkQ_aky65XNfYI
--- a/config/sync/config_snapshot.snapshot.config_sync.module.admin_toolbar_tools.yml
+++ b/config/sync/config_snapshot.snapshot.config_sync.module.admin_toolbar_tools.yml
@ -8,4 +8,13 @@ id: config_sync.module.admin_toolbar_tools
 snapshotSet: config_sync
 extensionType: module
 extensionName: admin_toolbar_tools
-items: {  }
+items:
+  -
+    collection: ''
+    name: admin_toolbar_tools.settings
+    data:
+      max_bundle_number: 20
+      hoverintent_functionality: true
+      show_local_tasks: false
+      _core:
+        default_config_hash: WgdZsrd_5w9jlmcHV4R9dD2tG9OZEkYo4I_O8h7Gq8Q
--- a/config/sync/config_snapshot.snapshot.config_sync.module.better_normalizers.yml
+++ b/config/sync/config_snapshot.snapshot.config_sync.module.better_normalizers.yml
@ -1,11 +0,0 @@
-uuid: 46344347-c827-4e07-a053-1730eb2bfdcf
-langcode: en
-status: true
-dependencies:
-  module:
-    - better_normalizers
-id: config_sync.module.better_normalizers
-snapshotSet: config_sync
-extensionType: module
-extensionName: better_normalizers
-items: {  }
--- a/config/sync/config_snapshot.snapshot.config_sync.module.rdf.yml
+++ b/config/sync/config_snapshot.snapshot.config_sync.module.rdf.yml
@ -8,4 +8,27 @@ id: config_sync.module.rdf
 snapshotSet: config_sync
 extensionType: module
 extensionName: rdf
-items: {  }
+items:
+  -
+    collection: ''
+    name: rdf.mapping.user.user
+    data:
+      langcode: en
+      status: true
+      dependencies:
+        module:
+          - user
+        enforced:
+          module:
+            - user
+      id: user.user
+      targetEntityType: user
+      bundle: user
+      types:
+        - 'schema:Person'
+      fieldMappings:
+        name:
+          properties:
+            - 'schema:name'
+      _core:
+        default_config_hash: xtzuACq4Fn0ail4YD8cO_eMnn_g2DBlfI9W5oSpcRWI
--- a/config/sync/core.entity_view_display.node.article.media.yml
+++ b/config/sync/core.entity_view_display.node.article.media.yml
@ -8,12 +8,16 @@ dependencies:
    - field.field.node.article.comment
    - field.field.node.article.field_article_type
    - field.field.node.article.field_authors
+    - field.field.node.article.field_biography
    - field.field.node.article.field_body_paragraph
    - field.field.node.article.field_image
    - field.field.node.article.field_meta_tags
+    - field.field.node.article.field_publication_date
+    - field.field.node.article.field_subtitle
    - field.field.node.article.field_summary
    - field.field.node.article.field_tags
    - field.field.node.article.field_topics
+    - field.field.node.article.field_upload
    - image.style.square_thumbnail
    - node.type.article
  module:
@ -103,6 +107,8 @@ content:
    settings:
      image_link: content
      image_style: square_thumbnail
+      image_loading:
+        attribute: lazy
    third_party_settings: {  }
    weight: 0
    region: ds_content
@ -124,6 +130,7 @@ hidden:
  comment: true
  field_article_type: true
  field_authors: true
+  field_biography: true
  field_body_paragraph: true
  field_economic_sectors: true
  field_institutions_structures: true
--- a/config/sync/core.entity_view_display.node.article.rss.yml
+++ b/config/sync/core.entity_view_display.node.article.rss.yml
@ -8,12 +8,16 @@ dependencies:
    - field.field.node.article.comment
    - field.field.node.article.field_article_type
    - field.field.node.article.field_authors
+    - field.field.node.article.field_biography
    - field.field.node.article.field_body_paragraph
    - field.field.node.article.field_image
    - field.field.node.article.field_meta_tags
+    - field.field.node.article.field_publication_date
+    - field.field.node.article.field_subtitle
    - field.field.node.article.field_summary
    - field.field.node.article.field_tags
    - field.field.node.article.field_topics
+    - field.field.node.article.field_upload
    - image.style.small_square
    - node.type.article
  module:
@ -68,6 +72,8 @@ content:
    settings:
      image_link: ''
      image_style: small_square
+      image_loading:
+        attribute: lazy
    third_party_settings: {  }
    weight: 0
    region: ds_content
@ -100,6 +106,7 @@ hidden:
  comment: true
  field_article_type: true
  field_authors: true
+  field_biography: true
  field_body_paragraph: true
  field_economic_sectors: true
  field_institutions_structures: true
--- a/config/sync/core.entity_view_display.node.blog.media.yml
+++ b/config/sync/core.entity_view_display.node.blog.media.yml
@ -10,9 +10,11 @@ dependencies:
    - field.field.node.blog.field_body_paragraph
    - field.field.node.blog.field_image
    - field.field.node.blog.field_meta_tags
+    - field.field.node.blog.field_publication_date
    - field.field.node.blog.field_summary
    - field.field.node.blog.field_tags
    - field.field.node.blog.field_topics
+    - field.field.node.blog.field_upload
    - image.style.square_thumbnail
    - node.type.blog
  module:
@ -103,6 +105,8 @@ content:
    settings:
      image_link: content
      image_style: square_thumbnail
+      image_loading:
+        attribute: lazy
    third_party_settings: {  }
    weight: 2
    region: ds_content
--- a/config/sync/core.entity_view_display.node.collection.default.yml
+++ b/config/sync/core.entity_view_display.node.collection.default.yml
@ -81,6 +81,8 @@ content:
    settings:
      image_link: ''
      image_style: ''
+      image_loading:
+        attribute: lazy
    third_party_settings: {  }
    weight: 3
    region: content
--- a/config/sync/core.entity_view_display.node.collection.full.yml
+++ b/config/sync/core.entity_view_display.node.collection.full.yml
@ -112,6 +112,8 @@ content:
    settings:
      image_link: ''
      image_style: ''
+      image_loading:
+        attribute: lazy
    third_party_settings: {  }
    weight: 0
    region: header
--- a/config/sync/core.entity_view_display.node.gleaning.default.yml
+++ b/config/sync/core.entity_view_display.node.gleaning.default.yml
@ -33,6 +33,8 @@ content:
    settings:
      image_link: ''
      image_style: ''
+      image_loading:
+        attribute: lazy
    third_party_settings: {  }
    weight: 2
    region: content
--- a/config/sync/core.entity_view_display.paragraph.image.default.yml
+++ b/config/sync/core.entity_view_display.paragraph.image.default.yml
@ -21,6 +21,8 @@ content:
    settings:
      image_link: ''
      image_style: large
+      image_loading:
+        attribute: lazy
    third_party_settings: {  }
    weight: 0
    region: content
--- a/config/sync/core.entity_view_display.user.user.compact.yml
+++ b/config/sync/core.entity_view_display.user.user.compact.yml
@ -20,6 +20,8 @@ content:
    settings:
      image_link: content
      image_style: thumbnail
+      image_loading:
+        attribute: lazy
    third_party_settings: {  }
    weight: 0
    region: content
--- a/config/sync/core.extension.yml
+++ b/config/sync/core.extension.yml
@ -9,7 +9,6 @@ module:
  antibot: 0
  automated_cron: 0
  autosave_form: 0
-  better_normalizers: 0
  block: 0
  block_content: 0
  block_visibility_groups: 0
@ -95,6 +94,7 @@ module:
  migrate_source_csv: 0
  migrate_tools: 0
  minimalhtml: 0
+  mysql: 0
  node: 0
  noreferrer: 0
  options: 0
@ -145,4 +145,5 @@ theme:
  octavia: 0
  geofresco: 0
  claro: 0
+  stable9: 0
 profile: minimal
--- a/config/sync/editor.editor.basic_html.yml
+++ b/config/sync/editor.editor.basic_html.yml
@ -43,10 +43,6 @@ settings:
          items:
            - Source
  plugins:
-    language:
-      language_list: un
-    stylescombo:
-      styles: ''
    drupallink:
      linkit_enabled: true
      linkit_profile: ''
--- a/config/sync/editor.editor.full_html.yml
+++ b/config/sync/editor.editor.full_html.yml
@ -52,10 +52,6 @@ settings:
            - ShowBlocks
            - Source
  plugins:
-    stylescombo:
-      styles: ''
-    language:
-      language_list: un
    drupallink:
      linkit_enabled: true
      linkit_profile: default
--- a/config/sync/editor.editor.minimalhtml.yml
+++ b/config/sync/editor.editor.minimalhtml.yml
@ -38,14 +38,6 @@ settings:
          items:
            - Source
  plugins:
-    language:
-      language_list: un
-    stylescombo:
-      styles: ''
-    indentblock:
-      enable: 0
-    colorbutton:
-      colors: ''
    linebreaks:
      method: force
 image_upload:
--- a/config/sync/facets.facet.article_topics.yml
+++ b/config/sync/facets.facet.article_topics.yml
@ -13,6 +13,8 @@ id: article_topics
 name: 'Article Topics'
 weight: 0
 min_count: 1
+missing: false
+missing_label: others
 url_alias: article_topics
 facet_source_id: 'search_api:views_page__article__page_listing'
 field_identifier: field_topics
--- a/config/sync/facets.facet.article_type.yml
+++ b/config/sync/facets.facet.article_type.yml
@ -13,6 +13,8 @@ id: article_type
 name: 'Article Type'
 weight: 0
 min_count: 1
+missing: false
+missing_label: others
 url_alias: article_type
 facet_source_id: 'search_api:views_page__article__page_listing'
 field_identifier: field_article_type
--- a/config/sync/facets.facet.blog_topics.yml
+++ b/config/sync/facets.facet.blog_topics.yml
@ -13,6 +13,8 @@ id: blog_topics
 name: 'Blog Topics'
 weight: 0
 min_count: 1
+missing: false
+missing_label: others
 url_alias: blog_topics
 facet_source_id: 'search_api:views_page__blog__page_listing'
 field_identifier: field_topics
--- a/config/sync/facets.facet.search_content_type.yml
+++ b/config/sync/facets.facet.search_content_type.yml
@ -13,6 +13,8 @@ id: search_content_type
 name: 'Search content type'
 weight: 0
 min_count: 1
+missing: false
+missing_label: others
 url_alias: search_content_type
 facet_source_id: 'search_api:views_page__search__page_1'
 field_identifier: type
--- a/config/sync/facets.facet.search_date.yml
+++ b/config/sync/facets.facet.search_date.yml
@ -13,6 +13,8 @@ id: search_date
 name: 'Search date'
 weight: 0
 min_count: 1
+missing: false
+missing_label: others
 url_alias: search_date
 facet_source_id: 'search_api:views_page__search__page_1'
 field_identifier: created
--- a/config/sync/facets.facet.search_topics.yml
+++ b/config/sync/facets.facet.search_topics.yml
@ -13,6 +13,8 @@ id: search_topics
 name: 'Search topics'
 weight: 0
 min_count: 1
+missing: false
+missing_label: others
 url_alias: search_topics
 facet_source_id: 'search_api:views_page__search__page_1'
 field_identifier: field_topics
--- a/config/sync/insert.config.yml
+++ b/config/sync/insert.config.yml
@ -3,5 +3,19 @@ _core:
 text_formats:
  - full_html
 css_classes:
-  file: ''
-  image: ''
+  file:
+    - ''
+  image:
+    - ''
+absolute: false
+file_field_images_enabled: false
+widgets:
+  file:
+    - file_generic
+  image:
+    - image_image
+file_extensions:
+  audio:
+    - mp3
+  video:
+    - mp4
--- a/config/sync/pathauto.pattern.gleaning.yml
+++ b/config/sync/pathauto.pattern.gleaning.yml
@ -10,7 +10,7 @@ type: 'canonical_entities:node'
 pattern: 'gleanings/[node:title]'
 selection_criteria:
  16c2c31d-685e-4e54-80a7-d6bb8a344155:
-    id: node_type
+    id: 'entity_bundle:node'
    negate: false
    uuid: 16c2c31d-685e-4e54-80a7-d6bb8a344155
    context_mapping:
--- a/config/sync/pathauto.pattern.node_article.yml
+++ b/config/sync/pathauto.pattern.node_article.yml
@ -12,7 +12,7 @@ type: 'canonical_entities:node'
 pattern: 'articles/[node:title]'
 selection_criteria:
  03faf328-473f-4ba7-bafe-72df857287d9:
-    id: node_type
+    id: 'entity_bundle:node'
    negate: false
    uuid: 03faf328-473f-4ba7-bafe-72df857287d9
    context_mapping:
--- a/config/sync/pathauto.pattern.node_blog.yml
+++ b/config/sync/pathauto.pattern.node_blog.yml
@ -12,7 +12,7 @@ type: 'canonical_entities:node'
 pattern: 'blog/[node:title]'
 selection_criteria:
  cbbc8b23-30be-44a8-969b-ef9c72e952ab:
-    id: node_type
+    id: 'entity_bundle:node'
    negate: false
    uuid: cbbc8b23-30be-44a8-969b-ef9c72e952ab
    context_mapping:
--- a/config/sync/pathauto.pattern.node_landing_page.yml
+++ b/config/sync/pathauto.pattern.node_landing_page.yml
@ -12,7 +12,7 @@ type: 'canonical_entities:node'
 pattern: '[node:title]'
 selection_criteria:
  e3e7a232-e1e0-455e-8b69-c99b582dc4f0:
-    id: node_type
+    id: 'entity_bundle:node'
    negate: false
    uuid: e3e7a232-e1e0-455e-8b69-c99b582dc4f0
    context_mapping:
--- a/config/sync/pathauto.pattern.node_page.yml
+++ b/config/sync/pathauto.pattern.node_page.yml
@ -12,7 +12,7 @@ type: 'canonical_entities:node'
 pattern: '[node:title]'
 selection_criteria:
  2e17ea21-8c33-444d-981e-2a2df6651647:
-    id: node_type
+    id: 'entity_bundle:node'
    negate: false
    uuid: 2e17ea21-8c33-444d-981e-2a2df6651647
    context_mapping:
--- a/config/sync/pathauto.pattern.people_node.yml
+++ b/config/sync/pathauto.pattern.people_node.yml
@ -12,7 +12,7 @@ type: 'canonical_entities:node'
 pattern: 'people/[node:title]'
 selection_criteria:
  c9467269-b644-451e-b21f-01808d094c28:
-    id: node_type
+    id: 'entity_bundle:node'
    negate: false
    uuid: c9467269-b644-451e-b21f-01808d094c28
    context_mapping:
--- a/config/sync/search_api.server.database.yml
+++ b/config/sync/search_api.server.database.yml
@ -19,3 +19,4 @@ backend_config:
    suggest_words: true
  database_text: ''
  partial_matches: false
+  phrase: disabled
--- a/config/sync/subpathauto.settings.yml
+++ b/config/sync/subpathauto.settings.yml
@ -1,3 +1,4 @@
 _core:
  default_config_hash: VSBsC1hsGPM2gNULMlhwxRDW_cJD6BVggQ8f9d9fZUk
 depth: 2
+redirect_support: false
--- a/config/sync/views.view.article.yml
+++ b/config/sync/views.view.article.yml
@ -149,7 +149,7 @@ display:
            'entity:node':
              article: card
      query:
-        type: views_query
+        type: search_api_query
        options:
          bypass_access: false
          skip_access: false
--- a/config/sync/views.view.blog.yml
+++ b/config/sync/views.view.blog.yml
@ -149,7 +149,7 @@ display:
            'entity:node':
              blog: card
      query:
-        type: views_query
+        type: search_api_query
        options:
          bypass_access: false
          skip_access: false
@ -162,8 +162,10 @@ display:
      contexts:
        - 'languages:language_interface'
        - url.query_args
+        - 'user.node_grants:view'
        - user.permissions
-      tags: {  }
+      tags:
+        - 'config:search_api.index.blog'
  block_promoted:
    id: block_promoted
    display_title: 'Block Promoted'
@ -229,8 +231,10 @@ display:
      max-age: -1
      contexts:
        - 'languages:language_interface'
+        - 'user.node_grants:view'
        - user.permissions
-      tags: {  }
+      tags:
+        - 'config:search_api.index.blog'
  page_listing:
    id: page_listing
    display_title: Page
@ -243,7 +247,7 @@ display:
        type: normal
        title: Blog
        description: 'Follow our blogs.'
-        weight: -49
+        weight: -48
        enabled: true
        expanded: false
        menu_name: main
@ -254,5 +258,7 @@ display:
      contexts:
        - 'languages:language_interface'
        - url.query_args
+        - 'user.node_grants:view'
        - user.permissions
-      tags: {  }
+      tags:
+        - 'config:search_api.index.blog'
--- a/config/sync/views.view.collection.yml
+++ b/config/sync/views.view.collection.yml
@ -182,7 +182,7 @@ display:
            'entity:node':
              collection: card
      query:
-        type: views_query
+        type: search_api_query
        options:
          bypass_access: false
          skip_access: false
--- a/config/sync/views.view.gleanings_new.yml
+++ b/config/sync/views.view.gleanings_new.yml
@ -309,7 +309,7 @@ display:
        type: normal
        title: Gleanings
        description: 'Short content and excerpts from, and links to, other sites.'
-        weight: -48
+        weight: -47
        enabled: true
        expanded: false
        menu_name: main
--- a/config/sync/views.view.people.yml
+++ b/config/sync/views.view.people.yml
@ -255,7 +255,7 @@ display:
            'entity:node':
              people: small_card
      query:
-        type: views_query
+        type: search_api_query
        options:
          bypass_access: false
          skip_access: false
--- a/config/sync/views.view.redirect.yml
+++ b/config/sync/views.view.redirect.yml
@ -247,7 +247,7 @@ display:
        type: basic
        options:
          submit_button: Filter
-          reset_button: false
+          reset_button: true
          reset_button_label: Reset
          exposed_sorts_label: 'Sort by'
          expose_sort_order: true
--- a/config/sync/views.view.search.yml
+++ b/config/sync/views.view.search.yml
@ -209,7 +209,7 @@ display:
              page: teaser
              people: teaser
      query:
-        type: views_query
+        type: search_api_query
        options:
          bypass_access: false
          skip_access: false
--- a/web/.ht.router.php
+++ b/web/.ht.router.php
@ -24,6 +24,12 @@
 * @see http://php.net/manual/en/features.commandline.webserver.php
 */

+if (PHP_SAPI !== 'cli-server') {
+  // Bail out if this is not PHP's Development Server.
+  header($_SERVER['SERVER_PROTOCOL'] . ' 403 Forbidden');
+  exit;
+}
+
 $url = parse_url($_SERVER['REQUEST_URI']);
 if (file_exists(__DIR__ . $url['path'])) {
  // Serve the requested resource as-is.
--- a/web/.htaccess
+++ b/web/.htaccess
@ -3,7 +3,7 @@
 #

 # Protect files and directories from prying eyes.
-<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)$">
+<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)$">
  <IfModule mod_authz_core.c>
    Require all denied
  </IfModule>
@ -32,12 +32,17 @@ AddEncoding gzip svgz
  php_value assert.active                   0
 </IfModule>

+# PHP 8, Apache 1 and 2.
+<IfModule mod_php.c>
+  php_value assert.active                   0
+</IfModule>
+
 # Requires mod_expires to be enabled.
 <IfModule mod_expires.c>
  # Enable expirations.
  ExpiresActive On

-  # Cache all files for 2 weeks after access (A).
+  # Cache all files and redirects for 2 weeks after access (A).
  ExpiresDefault A1209600

  <FilesMatch \.php$>
@ -153,12 +158,12 @@ AddEncoding gzip svgz
    # Serve gzip compressed CSS files if they exist and the client accepts gzip.
    RewriteCond %{HTTP:Accept-encoding} gzip
    RewriteCond %{REQUEST_FILENAME}\.gz -s
-    RewriteRule ^(.*)\.css $1\.css\.gz [QSA]
+    RewriteRule ^(.*css_[a-zA-Z0-9-_]+)\.css$ $1\.css\.gz [QSA]

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

    # Serve correct content types, and prevent double compression.
    RewriteRule \.css\.gz$ - [T=text/css,E=no-gzip:1,E=no-brotli:1]
--- a/web/robots.txt
+++ b/web/robots.txt
@ -49,6 +49,8 @@ Disallow: /user/register
 Disallow: /user/password
 Disallow: /user/login
 Disallow: /user/logout
+Disallow: /media/oembed
+Disallow: /*/media/oembed
 # Paths (no clean URLs)
 Disallow: /index.php/admin/
 Disallow: /index.php/comment/reply/
@ -59,3 +61,5 @@ Disallow: /index.php/user/password
 Disallow: /index.php/user/register
 Disallow: /index.php/user/login
 Disallow: /index.php/user/logout
+Disallow: /index.php/media/oembed
+Disallow: /index.php/*/media/oembed
--- a/web/themes/custom/geofresco/geofresco.theme
+++ b/web/themes/custom/geofresco/geofresco.theme
@ -16,7 +16,7 @@ function geofresco_preprocess_page_title(&$variables) {
    return;
  }
  $string = isset($variables['title']['#markup']) ? $variables['title']['#markup'] : FALSE;
-  if ($string && $pos = strpos($string, "'s blog", -7)) {
+  if ($string && strlen($string) > 7 && $pos = strpos($string, "'s blog", -7)) {
    $uid = substr($string, 0, $pos);
    if (is_numeric($uid) && $account = \Drupal\user\Entity\User::load($uid)) {
      $variables['title'] = [
--- a/web/web.config
+++ b/web/web.config
@ -22,7 +22,7 @@
    <rewrite>
      <rules>
        <rule name="Protect files and directories from prying eyes" stopProcessing="true">
-          <match url="\.(engine|inc|install|module|profile|po|sh|.*sql|theme|twig|tpl(\.php)?|xtmpl|yml|svn-base)$|^(code-style\.pl|Entries.*|Repository|Root|Tag|Template|all-wcprops|entries|format|composer\.(json|lock)|\.htaccess)$" />
+          <match url="\.(engine|inc|install|module|profile|po|sh|.*sql|theme|twig|tpl(\.php)?|xtmpl|yml|svn-base)$|^(code-style\.pl|Entries.*|Repository|Root|Tag|Template|all-wcprops|entries|format|composer\.(json|lock)|\.htaccess|yarn.lock|package.json)$" />
          <action type="CustomResponse" statusCode="403" subStatusCode="0" statusReason="Forbidden" statusDescription="Access is forbidden." />
        </rule>