Use https for www.openarchives.org

Signed-off-by: Stefan Weil <sw@weilnetz.de>
kitodo · Feb 1, 2025 · f34da4e · f34da4e
1 parent 0a9f32b
commit f34da4e
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/Classes/Controller/OaiPmhController.php b/Classes/Controller/OaiPmhController.php
@@ -173,7 +173,7 @@ protected function getUrlParams()
 
     /**
      * Get unqualified Dublin Core data.
-     * @see http://www.openarchives.org/OAI/openarchivesprotocol.html#dublincore
+     * @see https://www.openarchives.org/OAI/openarchivesprotocol.html#dublincore
      *
      * @access private
      *
@@ -845,7 +845,7 @@ protected function generateOutputForDocumentList(array $documentListSet)
     protected function generateResumptionTokenForDocumentListSet(array $documentListSet, int $numShownDocuments)
     {
         // The cursor specifies how many elements have already been returned in previous requests
-        // See http://www.openarchives.org/OAI/openarchivesprotocol.html#FlowControl
+        // See https://www.openarchives.org/OAI/openarchivesprotocol.html#FlowControl
         $currentCursor = $documentListSet['metadata']['cursor'];
 
         if (count($documentListSet['elements']) !== 0) {

diff --git a/Resources/Private/Templates/OaiPmh/Main.xml b/Resources/Private/Templates/OaiPmh/Main.xml
@@ -11,9 +11,9 @@
     </f:else>
 </f:if>
 <OAI-PMH
-    xmlns="http://www.openarchives.org/OAI/2.0/"
+    xmlns="https://www.openarchives.org/OAI/2.0/"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/ http://www.openarchives.org/OAI/2.0/OAI-PMH.xsd">
+    xsi:schemaLocation="https://www.openarchives.org/OAI/2.0/ https://www.openarchives.org/OAI/2.0/OAI-PMH.xsd">
     <responseDate><f:format.date format="Y-m-d\TH:i:s\Z">now</f:format.date></responseDate>
     <f:comment>As per the specification, don't show arguments on badVerb or badArgument.</f:comment>
     {f:if(condition: '{error} == "badVerb" || {error} == "badArgument"', then: '{}', else: '{parameters}') -> f:variable(name: 'shownParameters')}
@@ -193,11 +193,11 @@
     <f:switch expression="{parameters.metadataPrefix}">
         <f:case value="oai_dc">
             <oai_dc:dc
-                xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/"
+                xmlns:oai_dc="https://www.openarchives.org/OAI/2.0/oai_dc/"
                 xmlns:dc="http://purl.org/dc/elements/1.1/"
                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/
-                http://www.openarchives.org/OAI/2.0/oai_dc.xsd">
+                xsi:schemaLocation="https://www.openarchives.org/OAI/2.0/oai_dc/
+                https://www.openarchives.org/OAI/2.0/oai_dc.xsd">
                     <f:for each="{record.metadata}" as="metadata">
                         <f:for each="{metadata}" as="value" key="key">
                             <{key}>{value}</{key}>

diff --git a/Resources/Public/Stylesheets/OaiPmh.xsl b/Resources/Public/Stylesheets/OaiPmh.xsl
@@ -17,7 +17,7 @@
     Edited by Sebastian Meyer, Saxon State and University Library Dresden
 
 -->
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:oai="http://www.openarchives.org/OAI/2.0/">
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:oai="https://www.openarchives.org/OAI/2.0/">
 
 <xsl:output method="html" />
 
@@ -158,7 +158,7 @@ p.intro {
         <xsl:apply-templates select="/oai:OAI-PMH" />
         <xsl:call-template name="quicklinks"/>
         <h2><a name="moreinfo">About the XSLT</a></h2>
-        <p>An XSLT file has converted the <a href="http://www.openarchives.org">OAI-PMH 2.0</a> responses into XHTML in order to make it human-readable in a browser which supports XSLT such as Mozilla Firefox and Microsoft Internet Explorer.<br />
+        <p>An XSLT file has converted the <a href="https://www.openarchives.org">OAI-PMH 2.0</a> responses into XHTML in order to make it human-readable in a browser which supports XSLT such as Mozilla Firefox and Microsoft Internet Explorer.<br />
         The original XSLT file was created by <a href="http://www.ecs.soton.ac.uk/people/cjg">Christopher Gutteridge</a> at the University of Southampton as part of the <a href="http://software.eprints.org">GNU EPrints system</a>, and is freely redistributable under the <a href="http://www.gnu.org">GPL</a>.<br />
         It was adapted to <a href="https://kitodo.org/">Kitodo.Presentation</a> by <a href="mailto:sebastian.meyer@slub-dresden.de">Sebastian Meyer</a> at the Saxon State and University Library Dresden.</p>
     </body>
@@ -409,7 +409,7 @@ p.intro {
 <!--
     DublinCore Metadata
 -->
-<xsl:template match="oai_dc:dc" xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/" >
+<xsl:template match="oai_dc:dc" xmlns:oai_dc="https://www.openarchives.org/OAI/2.0/oai_dc/" >
     <div class="dcdata">
         <h3>DublinCore Metadata</h3>
         <table class="dcdata">

diff --git a/Tests/Functional/Api/OaiPmhTest.php b/Tests/Functional/Api/OaiPmhTest.php
@@ -105,8 +105,8 @@ public function correctlyRespondsOnBadVerb()
         self::assertStringNotContainsString('nastyVerb', (string) $xml->request);
 
         // For bad verbs, the <request> element must not contain any attributes
-        // - http://www.openarchives.org/OAI/openarchivesprotocol.html#XMLResponse
-        // - http://www.openarchives.org/OAI/openarchivesprotocol.html#ErrorConditions
+        // - https://www.openarchives.org/OAI/openarchivesprotocol.html#XMLResponse
+        // - https://www.openarchives.org/OAI/openarchivesprotocol.html#ErrorConditions
         self::assertEmpty($xml->request->attributes());
     }
 

diff --git a/Tests/Unit/Validation/DOMDocumentValidationStackTest.php b/Tests/Unit/Validation/DOMDocumentValidationStackTest.php
@@ -69,7 +69,7 @@ public function testValidatorDerivation(): void
 
     public function testBreakOnError(): void
     {
-        $xmlSchemesValidatorConfig = ["className" => XmlSchemesValidator::class, "configuration" => [["namespace" => "http://www.openarchives.org/OAI/2.0/", "schemaLocation" => "https://www.openarchives.org/OAI/2.0/OAI-PMH.xsd"]]];
+        $xmlSchemesValidatorConfig = ["className" => XmlSchemesValidator::class, "configuration" => [["namespace" => "https://www.openarchives.org/OAI/2.0/", "schemaLocation" => "https://www.openarchives.org/OAI/2.0/OAI-PMH.xsd"]]];
         $domDocumentValidationStack = new DOMDocumentValidationStack([$xmlSchemesValidatorConfig, $xmlSchemesValidatorConfig]);
         $result = $domDocumentValidationStack->validate(new DOMDocument());
         self::assertCount(1, $result->getErrors());