Merge branch '2.4' into develop

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,67 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ 2.4 ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ 2.4 ]
+  schedule:
+    - cron: '31 16 * * 1'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'javascript', 'python' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
+        # Learn more:
+        # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

app/Plugin/ShibbAuth/README.md

@@ -144,7 +144,7 @@ If used with Apache as webserver it might be useful to make a distinction to fil
 If you want the logout button to work for killing your session, you can use the CustomAuth plugin to configure a custom logout url, by default the url should be https://&lt;host&gt;/Shibboleth.sso/Logout. This leads to a local logout. If you want to also trigger a logout at the identity provider, you can use the return mechanism. In this case you will need to change the allowed redirects. Your logout url will look like https://&lt;host&gt;/Shibboleth.sso/Logout?return=https://<idp_host>/Logout. Edit your shibboleth configuration (often at /etc/shibboleth/shibboleth2.xml) as necessary. Relevant shibboleth documentation can be found at https://wiki.shibboleth.net/confluence/display/SP3/Logout and https://wiki.shibboleth.net/confluence/display/SP3/Sessions.
 ```xml
 <Sessions lifetime="28800" timeout="3600" relayState="ss:mem"
-                  checkAddress="false" handlerSSL="false" cookieProps="https"
+                  checkAddress="false" handlerSSL="true" cookieProps="https"
                   redirectLimit="exact+whitelist" redirectWhitelist="https://<idp_host>">
 ```
 

app/View/EventReports/ajax/importReportFromUrl.ctp

@@ -10,7 +10,7 @@
                     'field' => 'url',
                     'class' => 'input span6',
                     'div' => 'text',
-                    'label' =>  sprintf('<b>%s:</b> ', __('URL')) . __('Content for this URL will be downloaded and converted to Mardown')
+                    'label' =>  sprintf('<b>%s:</b> ', __('URL')) . __('Content for this URL will be downloaded and converted to Markdown')
                 ),
             ),
             'submit' => array(
@@ -18,4 +18,4 @@
                 'ajaxSubmit' => sprintf('submitPopoverForm(\'%s\', \'addEventReport\', 0, 1)', h($event_id))
             )
         )
-    ));
+    ));

app/View/EventReports/ajax/indexForEvent.ctp

@@ -27,7 +27,7 @@
                                     'onClickParams' => [$baseurl . '/eventReports/importReportFromUrl/' . h($event_id)],
                                     'active' => true,
                                     'text' => __('Import from URL'),
-                                    'title' => __('Content for this URL will be downloaded and converted to Mardown'),
+                                    'title' => __('Content for this URL will be downloaded and converted to Markdown'),
                                     'fa-icon' => 'link',
                                     'requirement' => $canModify && $importModuleEnabled,
                                 ),