Skip to content

Commit

Permalink
Avoid unexpected protocol in URLs
Browse files Browse the repository at this point in the history 
See OpenEdition/lodel#122
  • Loading branch information
@brrd
brrd committed Dec 2, 2020
1 parent 05a6a78 commit f23fdec
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 24 deletions.
2 changes: 1 addition & 1 deletion macros_head.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
<meta name="DC.rights" content="[#OPTIONS.METADONNEESSITE.DROITSAUTEUR|textebrut|cleanBadChars|replacequotationmark]" />
</IF>

<meta name="DC.source" content="[#CURRENTURL|dirname]" />
<meta name="DC.source" content="[#SITEINFOS.URL]" />

<meta name="DC.type" content="text" />
<IF COND="[#CLASS] EQ 'publications'">
Expand Down
46 changes: 23 additions & 23 deletions macros_rss.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,21 +40,21 @@
<DO>
<IF COND="([#TPL] EQ 'sommaire') OR ([#TPL] EQ 'article')">
<title>[#G_TITLE|textebrut|htmlspecialchars]</title>
<link>[#CURRENTURL|dirname]/[#ID|makeurlwithid]</link>
<link>[#SITEINFOS.URL]/[#ID|makeurlwithid]</link>
<IF COND="[#ID|get_dc_fields('description')]">
<description>[#ID|get_dc_fields('description')|textebrut|htmlspecialchars]</description>
</IF>

<LOOP NAME="rss_document_parent" TABLE="relations, entities" WHERE="id2 = '[#ID]' AND nature = 'P' AND id1 = entities.id" ORDER="degree DESC">
<category domain="[#CURRENTURL|dirname]/[#ID|makeurlwithid]">
<category domain="[#SITEINFOS.URL]/[#ID|makeurlwithid]">
[#G_TITLE|couper(50)]<IF COND="[#G_TITLE|hasbeencut]">...</IF>
</category>
</LOOP>

<language>fr</language>
<pubDate>[#CREATIONDATE|formateddate('%a, %d %b %Y %T %z')]</pubDate>
<lastBuildDate>[#MODIFICATIONDATE|formateddate('%a, %d %b %Y %T %z')]</lastBuildDate>
<guid isPermaLink="true">[#CURRENTURL|dirname]/[#ID|makeurlwithid]</guid>
<guid isPermaLink="true">[#SITEINFOS.URL]/[#ID|makeurlwithid]</guid>
<ttl>0</ttl>

<IF COND="[#TPL] EQ 'sommaire'">
Expand Down Expand Up @@ -83,12 +83,12 @@
<ELSEIF COND="![#TYPENAME] OR ([#TYPE] EQ [#TYPENAME])" />
<item>
<title>[#G_TITLE|textebrut|htmlspecialchars] </title>
<link>[#CURRENTURL|dirname]/[#ID|makeurlwithid]</link>
<link>[#SITEINFOS.URL]/[#ID|makeurlwithid]</link>
<IF COND="[#ID|get_dc_fields('description')]">
<description>[#ID|get_dc_fields('description')|textebrut|htmlspecialchars]</description>
</IF>
<pubDate>[#CREATIONDATE|formateddate('%a, %d %b %Y %T %z')]</pubDate>
<guid isPermaLink="true">[#CURRENTURL|dirname]/[#ID|makeurlwithid]</guid>
<guid isPermaLink="true">[#SITEINFOS.URL]/[#ID|makeurlwithid]</guid>
</item>
</IF>
</DO>
Expand All @@ -103,7 +103,7 @@
<LOOP NAME="rss_home" TABLE="sites" WHERE="name='[#SITE]' AND status GT 0" LIMIT="0,1">
<title>[#TITLE]</title>
</LOOP>
<link>[#CURRENTURL|dirname]</link>
<link>[#SITEINFOS.URL]</link>
<IF COND="[#OPTIONS.METADONNEESSITE.DESCRIPTIONSITE]">
<description>[#OPTIONS.METADONNEESSITE.DESCRIPTIONSITE|textebrut|cleanBadChars|replacequotationmark]</description>
</IF>
Expand All @@ -112,14 +112,14 @@
<DO>
<item>
<title>[#G_TITLE|textebrut|htmlspecialchars]</title>
<link>[#CURRENTURL|dirname]/[#ID|makeurlwithid]</link>
<link>[#SITEINFOS.URL]/[#ID|makeurlwithid]</link>
<IF COND="[#RESUME|textebrut]">
<description>[#RESUME|textebrut]</description>
<ELSE />
<description>[#TEXTE|textebrut|couper(1500)]</description>
</IF>
<pubDate>[(#DATEPUBLI|formateddate('%a, %d %b %Y %T %z'))]</pubDate>
<guid isPermaLink="true">[#CURRENTURL|dirname]/[#ID|makeurlwithid]</guid>
<guid isPermaLink="true">[#SITEINFOS.URL]/[#ID|makeurlwithid]</guid>
</item>
</DO>
</LOOP>
Expand All @@ -132,16 +132,16 @@
<LOOP NAME="rss_index_auteurs_types" TABLE="persontypes" WHERE="persontypes.id='[#IDENTITY]'">
<DO>
<title>[#TITLE]</title>
<link>[#CURRENTURL|dirname]/[#ID|makeurlwithid]</link>
<link>[#SITEINFOS.URL]/[#ID|makeurlwithid]</link>
<description>[@INDEX]</description>
<language>fr</language>
<ttl>0</ttl>

<LOOP NAME="rss_index_auteurs_entries" TABLE="persons" WHERE="persons.idtype='[#ID]'" LIMIT="0,10" ORDER="upd DESC">
<item>
<title>[#G_FIRSTNAME|removenotes] [#G_FAMILYNAME|removenotes]</title>
<link>[#CURRENTURL|dirname]/[#ID|makeurlwithid]</link>
<guid isPermaLink="true">[#CURRENTURL|dirname]/[#ID|makeurlwithid]</guid>
<link>[#SITEINFOS.URL]/[#ID|makeurlwithid]</link>
<guid isPermaLink="true">[#SITEINFOS.URL]/[#ID|makeurlwithid]</guid>
<pubDate>[#UPD]</pubDate>
</item>
</LOOP>
Expand All @@ -150,23 +150,23 @@
<LOOP NAME="rss_index_auteurs" TABLE="persons, persontypes" WHERE="persons.id='[#IDENTITY]' AND persons.idtype = persontypes.id">
<DO>
<title>[#TITLE] : [#G_FIRSTNAME|removenotes] [#G_FAMILYNAME|removenotes]</title>
<link>[#CURRENTURL|dirname]/[#ID|makeurlwithid]</link>
<link>[#SITEINFOS.URL]/[#ID|makeurlwithid]</link>
<description>[@PUBLICATIONS_DE] [#TITLE] [#G_FIRSTNAME] [#G_FAMILYNAME]</description>
<language>fr</language>
<ttl>0</ttl>

<LOOP NAME="rss_index_auteurs_articles" TABLE="relations, entities" WHERE="relations.id2 = [#ID] AND relations.id1 = entities.id AND entities.status GT 0" LIMIT="0,10" ORDER="creationdate DESC">
<item>
<title>[#G_TITLE|textebrut|htmlspecialchars]</title>
<link>[#CURRENTURL|dirname]/[#ID|makeurlwithid]</link>
<link>[#SITEINFOS.URL]/[#ID|makeurlwithid]</link>

<IF COND="[#ID|get_dc_fields('description')]">
<description>[#ID|get_dc_fields('description')|textebrut|htmlspecialchars]</description>
</IF>

<pubDate>[#CREATIONDATE|formateddate('%a, %d %b %Y %T %z')]</pubDate>
<lastBuildDate>[#MODIFICATIONDATE|formateddate('%a, %d %b %Y %T %z')]</lastBuildDate>
<guid isPermaLink="true">[#CURRENTURL|dirname]/[#ID|makeurlwithid]</guid>
<guid isPermaLink="true">[#SITEINFOS.URL]/[#ID|makeurlwithid]</guid>
</item>
</LOOP>
</DO>
Expand All @@ -180,16 +180,16 @@
<LOOP NAME="rss_index_general_types" TABLE="entrytypes" WHERE="entrytypes.id='[#IDENTITY]'">
<DO>
<title>[#TITLE]</title>
<link>[#CURRENTURL|dirname]/[#ID|makeurlwithid]</link>
<link>[#SITEINFOS.URL]/[#ID|makeurlwithid]</link>
<description>[@DERNIERES_ENTREES_INDEX]</description>
<language>fr</language>
<ttl>0</ttl>

<LOOP NAME="rss_index_general_entries" TABLE="entries" WHERE="entries.idtype='[#ID]'" LIMIT="0,10" ORDER="upd DESC">
<item>
<title>[#G_NAME|removenotes]</title>
<link>[#CURRENTURL|dirname]/[#ID|makeurlwithid]</link>
<guid isPermaLink="true">[#CURRENTURL|dirname]/[#ID|makeurlwithid]</guid>
<link>[#SITEINFOS.URL]/[#ID|makeurlwithid]</link>
<guid isPermaLink="true">[#SITEINFOS.URL]/[#ID|makeurlwithid]</guid>
<pubDate>[#UPD]</pubDate>
</item>
</LOOP>
Expand All @@ -199,23 +199,23 @@
<LOOP NAME="rss_index_general" TABLE="entries" WHERE="entries.id='[#IDENTITY]'">
<DO>
<title>[#G_NAME]</title>
<link>[#CURRENTURL|dirname]/[#ID|makeurlwithid]</link>
<link>[#SITEINFOS.URL]/[#ID|makeurlwithid]</link>
<description>[@ENTREES_INDEX]</description>
<language>fr</language>
<ttl>0</ttl>

<LOOP NAME="rss_index_general_entry" TABLE="relations, entities" WHERE="relations.id2 = [#ID] AND relations.id1 = entities.id AND entities.status GT 0" LIMIT="0,10" ORDER="entities.modificationdate DESC">
<item>
<title>[#G_TITLE|textebrut|htmlspecialchars]</title>
<link>[#CURRENTURL|dirname]/[#ID|makeurlwithid]</link>
<link>[#SITEINFOS.URL]/[#ID|makeurlwithid]</link>

<IF COND="[#ID|get_dc_fields('description')]">
<description>[#ID|get_dc_fields('description')|textebrut|htmlspecialchars]</description>
</IF>

<pubDate>[#CREATIONDATE|formateddate('%a, %d %b %Y %T %z')]</pubDate>
<lastBuildDate>[#MODIFICATIONDATE|formateddate('%a, %d %b %Y %T %z')]</lastBuildDate>
<guid isPermaLink="true">[#CURRENTURL|dirname]/[#ID|makeurlwithid]</guid>
<guid isPermaLink="true">[#SITEINFOS.URL]/[#ID|makeurlwithid]</guid>
</item>
</LOOP>
</DO>
Expand All @@ -229,23 +229,23 @@
<LOOP NAME="rss_individu" TABLE="individus" WHERE="individus.identity='[#IDENTITY]'">
<DO>
<title>[#PRENOM] [#NOM]</title>
<link>[#CURRENTURL|dirname]/[#ID|makeurlwithid]</link>
<link>[#SITEINFOS.URL]/[#ID|makeurlwithid]</link>
<description>[#ACCROCHE]</description>
<language>fr</language>
<ttl>0</ttl>

<LOOP NAME="rss_individu_entry" TABLE="relations, entities" WHERE="relations.id2 = [#ID] AND relations.id1 = entities.id AND entities.status GT 0" LIMIT="0,10" ORDER="entities.modificationdate DESC">
<item>
<title>[#G_TITLE|textebrut|htmlspecialchars]</title>
<link>[#CURRENTURL|dirname]/[#ID|makeurlwithid]</link>
<link>[#SITEINFOS.URL]/[#ID|makeurlwithid]</link>

<IF COND="[#ID|get_dc_fields('description')]">
<description>[#ID|get_dc_fields('description')|textebrut|htmlspecialchars]</description>
</IF>

<pubDate>[#CREATIONDATE|formateddate('%a, %d %b %Y %T %z')]</pubDate>
<lastBuildDate>[#MODIFICATIONDATE|formateddate('%a, %d %b %Y %T %z')]</lastBuildDate>
<guid isPermaLink="true">[#CURRENTURL|dirname]/[#ID|makeurlwithid]</guid>
<guid isPermaLink="true">[#SITEINFOS.URL]/[#ID|makeurlwithid]</guid>
</item>
</LOOP>
</DO>
Expand Down

0 comments on commit f23fdec

Please sign in to comment.