Browse Source

http -> https

pull/1646/head
Max Mehl 4 months ago
parent
commit
e22b923e17
Signed by: max.mehl GPG Key ID: 2704E4AB371E2E92
6 changed files with 35 additions and 35 deletions
  1. +14
    -14
      .htaccess
  2. +4
    -4
      cgi-bin/order-payonline.pl
  3. +4
    -4
      cgi-bin/weborder.pl
  4. +1
    -1
      events/events.ics.xsl
  5. +11
    -11
      events/events.rss.xsl
  6. +1
    -1
      pdfreaders/xslt/pdfreaders_body.xsl

+ 14
- 14
.htaccess View File

@ -28,13 +28,13 @@ RewriteRule ^translate/?$ /contribute/translators/ [R=301,L]
RewriteRule ^promo(/.*)? /contribute/spreadtheword$1 [R=301,L]
# Convince your friends
RewriteRule ^(cyf|convince)/?$ http://wiki.fsfe.org/ConvinceYourFriends [R=301,L]
RewriteRule ^(cyf|convince)/?$ https://wiki.fsfe.org/ConvinceYourFriends [R=301,L]
# Summit 2016
RewriteRule ^summit16(/.*)?$ https://fsfe.org/community/events/2016/summit/frontpage$1 [R=301,L]
RewriteRule ^summit16(/.*)?$ /community/events/2016/summit/frontpage$1 [R=301,L]
# 15 years of FSFE
RewriteRule ^15(/.*)?$ https://fsfe.org/activities/15years$1 [R=301,L]
RewriteRule ^15(/.*)?$ /activities/15years$1 [R=301,L]
# Podcast
RewriteRule ^podcast(/.*)? /news/podcast.html [R=301,L]
@ -98,17 +98,17 @@ RewriteRule ^people/greve(/.*)?$ /about/people/greve [R=301,L]
RewriteRule ^about/people/?(people.*)?$ /about/team.html [R=301,L]
# /en/.*
RewriteRule ^en/layout/set/rss/content/view/full/5116 http://blogs.fsfe.org/ciaran/?feed=rss2 [R=301,L]
RewriteRule ^en/layout/set/rss/content/view/full/5009 http://blogs.fsfe.org/maffulli/?feed=rss2 [R=301,L]
RewriteRule ^en/layout/set/rss/content/view/full/4972 http://blogs.fsfe.org/gerloff/?feed=rss2 [R=301,L]
RewriteRule ^en/layout/set/rss/content/view/full/5971 http://blogs.fsfe.org/jj/?feed=rss2 [R=301,L]
RewriteRule ^en/layout/set/rss/content/view/full/6128 http://blogs.fsfe.org/jj/?feed=rss2 [R=301,L]
RewriteRule ^en/layout/set/rss/content/view/full/4974 http://blogs.fsfe.org/greve/?feed=rss2 [R=301,L]
RewriteRule ^en/news http://fsfe.org/news/ [R=301,L]
RewriteRule ^en/layout/set/rss/content/view/full/5116 https://blogs.fsfe.org/ciaran/?feed=rss2 [R=301,L]
RewriteRule ^en/layout/set/rss/content/view/full/5009 https://blogs.fsfe.org/maffulli/?feed=rss2 [R=301,L]
RewriteRule ^en/layout/set/rss/content/view/full/4972 https://blogs.fsfe.org/gerloff/?feed=rss2 [R=301,L]
RewriteRule ^en/layout/set/rss/content/view/full/5971 https://blogs.fsfe.org/jj/?feed=rss2 [R=301,L]
RewriteRule ^en/layout/set/rss/content/view/full/6128 https://blogs.fsfe.org/jj/?feed=rss2 [R=301,L]
RewriteRule ^en/layout/set/rss/content/view/full/4974 https://blogs.fsfe.org/greve/?feed=rss2 [R=301,L]
RewriteRule ^en/news /news/ [R=301,L]
RewriteRule ^en/rss/feed/news.xml /news/news.en.rss [R=301,L]
RewriteRule ^en/rss/feed/events.xml /events/events.en.rss [R=301,L]
RewriteRule ^en/content/download/17665/125518/file/gnupg-ccid.rules http://wiki.fsfe.org/Card_howtos/Card_reader_setup_(udev)?action=AttachFile&do=view&target=gnupg-ccid.rules [R=301,L]
RewriteRule ^en/content/download/15872/77909/file/gnupg-ccid http://wiki.fsfe.org/Card_howtos/Card_reader_setup_(udev)?action=AttachFile&do=view&target=gnupg-ccid [R=301,L]
RewriteRule ^en/content/download/17665/125518/file/gnupg-ccid.rules https://wiki.fsfe.org/Card_howtos/Card_reader_setup_(udev)?action=AttachFile&do=view&target=gnupg-ccid.rules [R=301,L]
RewriteRule ^en/content/download/15872/77909/file/gnupg-ccid https://wiki.fsfe.org/Card_howtos/Card_reader_setup_(udev)?action=AttachFile&do=view&target=gnupg-ccid [R=301,L]
# Tags
RewriteRule ^tags/tagged(\...)(\.html)?$ /tags/tags$1.html [R=301,L]
@ -184,7 +184,7 @@ RewriteRule ^fellowship/payonline/([^/]*)/(.*) https://my.fsfe.org/payonline/$
RewriteRule ^fellowship/login(/.*)?$ https://my.fsfe.org/ [R=301,L]
RewriteRule ^fellowship/join(/.*)?$ https://my.fsfe.org/support [R=301,L]
RewriteRule ^fellowship/donate(/.*)?$ https://my.fsfe.org/donate [R=301,L]
RewriteRule ^fellowship/payment(/.*)?$ https://fsfe.org/donate/payment$1 [R=301,L]
RewriteRule ^fellowship/payment(/.*)?$ /donate/payment$1 [R=301,L]
RewriteRule ^donate/payonline(/.*)?$ https://my.fsfe.org/payonline$1 [R=301,L]
RewriteRule ^order/payonline.(.*)/(.*) /cgi-bin/order-payonline.pl?language=$1&reference=$2
@ -192,7 +192,7 @@ RewriteRule ^order/payonline.(.*)/(.*) /cgi-bin/order-payonline.pl?language=$1&r
RewriteRule ^fellowship/card(/.*)?$ https://wiki.fsfe.org/TechDocs/CardHowtos [R=301,L]
RewriteRule ^fellowship/communicate(/.*)?$ /contact/community.html [R=301,L]
RewriteRule ^fellowship/contact(/.*)?$ /contact/contact.html [R=301,L]
RewriteRule ^fellowship/events(.*) https://fsfe.org/events$1 [R=301,L]
RewriteRule ^fellowship/events(.*) /events$1 [R=301,L]
RewriteRule ^fellowship/faq(/.*)?$ https://wiki.fsfe.org/KnowHow/FSFELife/FAQ [R=301,L]
RewriteRule ^fellowship/graphics/people(/.*)?$ - [L]
RewriteRule ^fellowship/groups(/.*)?$ https://wiki.fsfe.org/LocalGroups [R=301,L]


+ 4
- 4
cgi-bin/order-payonline.pl View File

@ -21,9 +21,9 @@ my $amount100 = $amount * 100;
my $passphrase = "Only4TestingPurposes";
my $shastring =
"ACCEPTURL=http://fsfe.org/order/thankyou.$lang.html$passphrase" .
"ACCEPTURL=https://fsfe.org/order/thankyou.$lang.html$passphrase" .
"AMOUNT=$amount100$passphrase" .
"CANCELURL=http://fsfe.org/order/cancel.$lang.html$passphrase" .
"CANCELURL=https://fsfe.org/order/cancel.$lang.html$passphrase" .
"CURRENCY=EUR$passphrase" .
"LANGUAGE=$language$passphrase" .
"ORDERID=$reference$passphrase" .
@ -41,8 +41,8 @@ my $form = " <!-- payment parameters -->\n" .
" <input type=\"hidden\" name=\"TP\" value=\"https://fsfe.org/order/tmpl-concardis.$lang.html\"/>\n" .
" <input type=\"hidden\" name=\"PMListType\" value=\"2\"/>\n" .
" <!-- post-payment redirection -->\n" .
" <input type=\"hidden\" name=\"accepturl\" value=\"http://fsfe.org/order/thankyou.$lang.html\"/>\n" .
" <input type=\"hidden\" name=\"cancelurl\" value=\"http://fsfe.org/order/cancel.$lang.html\"/>\n" .
" <input type=\"hidden\" name=\"accepturl\" value=\"https://fsfe.org/order/thankyou.$lang.html\"/>\n" .
" <input type=\"hidden\" name=\"cancelurl\" value=\"https://fsfe.org/order/cancel.$lang.html\"/>\n" .
" <!-- SHA1 signature -->\n" .
" <input type=\"hidden\" name=\"SHASign\" value=\"$shasum\"/>";


+ 4
- 4
cgi-bin/weborder.pl View File

@ -205,9 +205,9 @@ $msg->send("sendmail", FromSender => $email);
my $passphrase = "Only4TestingPurposes";
my $shastring =
"ACCEPTURL=http://fsfe.org/order/thankyou.$lang.html$passphrase" .
"ACCEPTURL=https://fsfe.org/order/thankyou.$lang.html$passphrase" .
"AMOUNT=$amount100$passphrase" .
"CANCELURL=http://fsfe.org/order/cancel.$lang.html$passphrase" .
"CANCELURL=https://fsfe.org/order/cancel.$lang.html$passphrase" .
"CN=$name$passphrase" .
"CURRENCY=EUR$passphrase" .
"EMAIL=$email$passphrase" .
@ -229,8 +229,8 @@ my $form = " <!-- payment parameters -->\n" .
" <input type=\"hidden\" name=\"TP\" value=\"https://fsfe.org/order/tmpl-concardis.$lang.html\"/>\n" .
" <input type=\"hidden\" name=\"PMListType\" value=\"2\"/>\n" .
" <!-- post-payment redirection -->\n" .
" <input type=\"hidden\" name=\"accepturl\" value=\"http://fsfe.org/order/thankyou.$lang.html\"/>\n" .
" <input type=\"hidden\" name=\"cancelurl\" value=\"http://fsfe.org/order/cancel.$lang.html\"/>\n" .
" <input type=\"hidden\" name=\"accepturl\" value=\"https://fsfe.org/order/thankyou.$lang.html\"/>\n" .
" <input type=\"hidden\" name=\"cancelurl\" value=\"https://fsfe.org/order/cancel.$lang.html\"/>\n" .
" <!-- SHA1 signature -->\n" .
" <input type=\"hidden\" name=\"SHASign\" value=\"$shasum\"/>";


+ 1
- 1
events/events.ics.xsl View File

@ -48,7 +48,7 @@
<xsl:text>URL:</xsl:text>
<xsl:choose>
<xsl:when test="$page != ''"><xsl:value-of select="$page" /></xsl:when>
<xsl:otherwise>http://fsfe.org/events/events.<xsl:value-of select="/buildinfo/@language" />.html</xsl:otherwise>
<xsl:otherwise>https://fsfe.org/events/events.<xsl:value-of select="/buildinfo/@language" />.html</xsl:otherwise>
</xsl:choose>
<xsl:call-template name="nl" />


+ 11
- 11
events/events.rss.xsl View File

@ -15,11 +15,11 @@
<xsl:param name="lang" />
<!-- Original link text -->
<!-- We remove leading "http://fsfe.org" by default -->
<!-- We remove leading "https://fsfe.org" by default -->
<xsl:variable name="link">
<xsl:choose>
<xsl:when test="starts-with (normalize-space(.), 'http://fsfe.org')">
<xsl:value-of select="substring-after(normalize-space(.), 'http://fsfe.org')" />
<xsl:when test="starts-with (normalize-space(.), 'https://fsfe.org')">
<xsl:value-of select="substring-after(normalize-space(.), 'https://fsfe.org')" />
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="normalize-space(.)" />
@ -27,7 +27,7 @@
</xsl:choose>
</xsl:variable>
<!-- Add leading "http://fsfe.org" if necessary -->
<!-- Add leading "https://fsfe.org" if necessary -->
<xsl:variable name="full-link">
<xsl:choose>
<xsl:when test="starts-with ($link, 'http:')">
@ -37,7 +37,7 @@
<xsl:value-of select="$link" />
</xsl:when>
<xsl:otherwise>
<xsl:text>http://fsfe.org</xsl:text>
<xsl:text>https://fsfe.org</xsl:text>
<xsl:value-of select="$link" />
</xsl:otherwise>
</xsl:choose>
@ -45,7 +45,7 @@
<!-- Insert language into link -->
<xsl:choose>
<xsl:when test="starts-with ($full-link, 'http://fsfe.org/')
<xsl:when test="starts-with ($full-link, 'https://fsfe.org/')
and substring-before ($full-link, '.html') != ''">
<xsl:value-of select="concat (substring-before ($full-link, '.html'),
'.', $lang, '.html')" />
@ -77,7 +77,7 @@
<channel>
<title>FSFE Events</title>
<description>Free Software Events</description>
<link>http://fsfe.org/events/</link>
<link>https://fsfe.org/events/</link>
<language><xsl:value-of select="$lang" /></language>
<copyright>Copyright (c) Free Software Foundation Europe. Verbatim copying and distribution
of this entire article is permitted in any medium, provided this
@ -85,11 +85,11 @@
<managingEditor>press@fsfe.org (FSFE Press Team)</managingEditor>
<webMaster>web@lists.fsfe.org (FSFE Webmaster Team)</webMaster>
<image>
<url>http://fsfe.org/events/fsfe-events.png</url>
<url>https://fsfe.org/events/fsfe-events.png</url>
<title>FSFE Events</title>
<width>88</width>
<height>31</height>
<link>http://fsfe.org/events/</link>
<link>https://fsfe.org/events/</link>
</image>
<!-- Event items -->
@ -104,7 +104,7 @@
<!-- <guid> (is also a permalink to the event page, with anchor -->
<xsl:element name="guid">
<xsl:text>http://fsfe.org/events/events.html#</xsl:text>
<xsl:text>https://fsfe.org/events/events.html#</xsl:text>
<xsl:value-of select="@filename"/>
</xsl:element>
@ -144,7 +144,7 @@
<!-- link is not present, link to events.html#… -->
<xsl:otherwise>
<xsl:text>http://fsfe.org</xsl:text>
<xsl:text>https://fsfe.org</xsl:text>
<xsl:text>/events/events.</xsl:text>
<xsl:value-of select="$lang" />
<xsl:text>.html#</xsl:text>


+ 1
- 1
pdfreaders/xslt/pdfreaders_body.xsl View File

@ -30,7 +30,7 @@
<xsl:element name="div">
<xsl:attribute name="id">fsfe-logo</xsl:attribute>
<xsl:element name="a">
<xsl:attribute name="href">http://fsfe.org</xsl:attribute>
<xsl:attribute name="href">https://fsfe.org</xsl:attribute>
<xsl:element name="img">
<xsl:attribute name="src">//fsfe.org//graphics/logo_transparent.svg</xsl:attribute>
</xsl:element>


Loading…
Cancel
Save