Skip to content

Commit f23fdec

Browse files
brrdbrrd
committed
Avoid unexpected protocol in URLs
See OpenEdition/lodel#122
1 parent 05a6a78 commit f23fdec

2 files changed

Lines changed: 24 additions & 24 deletions

File tree

‎macros_head.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
<meta name="DC.rights" content="[#OPTIONS.METADONNEESSITE.DROITSAUTEUR|textebrut|cleanBadChars|replacequotationmark]" />
6969
</IF>
7070

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

7373
<meta name="DC.type" content="text" />
7474
<IF COND="[#CLASS] EQ 'publications'">

‎macros_rss.html‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -40,21 +40,21 @@
4040
<DO>
4141
<IF COND="([#TPL] EQ 'sommaire') OR ([#TPL] EQ 'article')">
4242
<title>[#G_TITLE|textebrut|htmlspecialchars]</title>
43-
<link>[#CURRENTURL|dirname]/[#ID|makeurlwithid]</link>
43+
<link>[#SITEINFOS.URL]/[#ID|makeurlwithid]</link>
4444
<IF COND="[#ID|get_dc_fields('description')]">
4545
<description>[#ID|get_dc_fields('description')|textebrut|htmlspecialchars]</description>
4646
</IF>
4747

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

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

6060
<IF COND="[#TPL] EQ 'sommaire'">
@@ -83,12 +83,12 @@
8383
<ELSEIF COND="![#TYPENAME] OR ([#TYPE] EQ [#TYPENAME])" />
8484
<item>
8585
<title>[#G_TITLE|textebrut|htmlspecialchars] </title>
86-
<link>[#CURRENTURL|dirname]/[#ID|makeurlwithid]</link>
86+
<link>[#SITEINFOS.URL]/[#ID|makeurlwithid]</link>
8787
<IF COND="[#ID|get_dc_fields('description')]">
8888
<description>[#ID|get_dc_fields('description')|textebrut|htmlspecialchars]</description>
8989
</IF>
9090
<pubDate>[#CREATIONDATE|formateddate('%a, %d %b %Y %T %z')]</pubDate>
91-
<guid isPermaLink="true">[#CURRENTURL|dirname]/[#ID|makeurlwithid]</guid>
91+
<guid isPermaLink="true">[#SITEINFOS.URL]/[#ID|makeurlwithid]</guid>
9292
</item>
9393
</IF>
9494
</DO>
@@ -103,7 +103,7 @@
103103
<LOOP NAME="rss_home" TABLE="sites" WHERE="name='[#SITE]' AND status GT 0" LIMIT="0,1">
104104
<title>[#TITLE]</title>
105105
</LOOP>
106-
<link>[#CURRENTURL|dirname]</link>
106+
<link>[#SITEINFOS.URL]</link>
107107
<IF COND="[#OPTIONS.METADONNEESSITE.DESCRIPTIONSITE]">
108108
<description>[#OPTIONS.METADONNEESSITE.DESCRIPTIONSITE|textebrut|cleanBadChars|replacequotationmark]</description>
109109
</IF>
@@ -112,14 +112,14 @@
112112
<DO>
113113
<item>
114114
<title>[#G_TITLE|textebrut|htmlspecialchars]</title>
115-
<link>[#CURRENTURL|dirname]/[#ID|makeurlwithid]</link>
115+
<link>[#SITEINFOS.URL]/[#ID|makeurlwithid]</link>
116116
<IF COND="[#RESUME|textebrut]">
117117
<description>[#RESUME|textebrut]</description>
118118
<ELSE />
119119
<description>[#TEXTE|textebrut|couper(1500)]</description>
120120
</IF>
121121
<pubDate>[(#DATEPUBLI|formateddate('%a, %d %b %Y %T %z'))]</pubDate>
122-
<guid isPermaLink="true">[#CURRENTURL|dirname]/[#ID|makeurlwithid]</guid>
122+
<guid isPermaLink="true">[#SITEINFOS.URL]/[#ID|makeurlwithid]</guid>
123123
</item>
124124
</DO>
125125
</LOOP>
@@ -132,16 +132,16 @@
132132
<LOOP NAME="rss_index_auteurs_types" TABLE="persontypes" WHERE="persontypes.id='[#IDENTITY]'">
133133
<DO>
134134
<title>[#TITLE]</title>
135-
<link>[#CURRENTURL|dirname]/[#ID|makeurlwithid]</link>
135+
<link>[#SITEINFOS.URL]/[#ID|makeurlwithid]</link>
136136
<description>[@INDEX]</description>
137137
<language>fr</language>
138138
<ttl>0</ttl>
139139

140140
<LOOP NAME="rss_index_auteurs_entries" TABLE="persons" WHERE="persons.idtype='[#ID]'" LIMIT="0,10" ORDER="upd DESC">
141141
<item>
142142
<title>[#G_FIRSTNAME|removenotes] [#G_FAMILYNAME|removenotes]</title>
143-
<link>[#CURRENTURL|dirname]/[#ID|makeurlwithid]</link>
144-
<guid isPermaLink="true">[#CURRENTURL|dirname]/[#ID|makeurlwithid]</guid>
143+
<link>[#SITEINFOS.URL]/[#ID|makeurlwithid]</link>
144+
<guid isPermaLink="true">[#SITEINFOS.URL]/[#ID|makeurlwithid]</guid>
145145
<pubDate>[#UPD]</pubDate>
146146
</item>
147147
</LOOP>
@@ -150,23 +150,23 @@
150150
<LOOP NAME="rss_index_auteurs" TABLE="persons, persontypes" WHERE="persons.id='[#IDENTITY]' AND persons.idtype = persontypes.id">
151151
<DO>
152152
<title>[#TITLE] : [#G_FIRSTNAME|removenotes] [#G_FAMILYNAME|removenotes]</title>
153-
<link>[#CURRENTURL|dirname]/[#ID|makeurlwithid]</link>
153+
<link>[#SITEINFOS.URL]/[#ID|makeurlwithid]</link>
154154
<description>[@PUBLICATIONS_DE] [#TITLE] [#G_FIRSTNAME] [#G_FAMILYNAME]</description>
155155
<language>fr</language>
156156
<ttl>0</ttl>
157157

158158
<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">
159159
<item>
160160
<title>[#G_TITLE|textebrut|htmlspecialchars]</title>
161-
<link>[#CURRENTURL|dirname]/[#ID|makeurlwithid]</link>
161+
<link>[#SITEINFOS.URL]/[#ID|makeurlwithid]</link>
162162

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

167167
<pubDate>[#CREATIONDATE|formateddate('%a, %d %b %Y %T %z')]</pubDate>
168168
<lastBuildDate>[#MODIFICATIONDATE|formateddate('%a, %d %b %Y %T %z')]</lastBuildDate>
169-
<guid isPermaLink="true">[#CURRENTURL|dirname]/[#ID|makeurlwithid]</guid>
169+
<guid isPermaLink="true">[#SITEINFOS.URL]/[#ID|makeurlwithid]</guid>
170170
</item>
171171
</LOOP>
172172
</DO>
@@ -180,16 +180,16 @@
180180
<LOOP NAME="rss_index_general_types" TABLE="entrytypes" WHERE="entrytypes.id='[#IDENTITY]'">
181181
<DO>
182182
<title>[#TITLE]</title>
183-
<link>[#CURRENTURL|dirname]/[#ID|makeurlwithid]</link>
183+
<link>[#SITEINFOS.URL]/[#ID|makeurlwithid]</link>
184184
<description>[@DERNIERES_ENTREES_INDEX]</description>
185185
<language>fr</language>
186186
<ttl>0</ttl>
187187

188188
<LOOP NAME="rss_index_general_entries" TABLE="entries" WHERE="entries.idtype='[#ID]'" LIMIT="0,10" ORDER="upd DESC">
189189
<item>
190190
<title>[#G_NAME|removenotes]</title>
191-
<link>[#CURRENTURL|dirname]/[#ID|makeurlwithid]</link>
192-
<guid isPermaLink="true">[#CURRENTURL|dirname]/[#ID|makeurlwithid]</guid>
191+
<link>[#SITEINFOS.URL]/[#ID|makeurlwithid]</link>
192+
<guid isPermaLink="true">[#SITEINFOS.URL]/[#ID|makeurlwithid]</guid>
193193
<pubDate>[#UPD]</pubDate>
194194
</item>
195195
</LOOP>
@@ -199,23 +199,23 @@
199199
<LOOP NAME="rss_index_general" TABLE="entries" WHERE="entries.id='[#IDENTITY]'">
200200
<DO>
201201
<title>[#G_NAME]</title>
202-
<link>[#CURRENTURL|dirname]/[#ID|makeurlwithid]</link>
202+
<link>[#SITEINFOS.URL]/[#ID|makeurlwithid]</link>
203203
<description>[@ENTREES_INDEX]</description>
204204
<language>fr</language>
205205
<ttl>0</ttl>
206206

207207
<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">
208208
<item>
209209
<title>[#G_TITLE|textebrut|htmlspecialchars]</title>
210-
<link>[#CURRENTURL|dirname]/[#ID|makeurlwithid]</link>
210+
<link>[#SITEINFOS.URL]/[#ID|makeurlwithid]</link>
211211

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

216216
<pubDate>[#CREATIONDATE|formateddate('%a, %d %b %Y %T %z')]</pubDate>
217217
<lastBuildDate>[#MODIFICATIONDATE|formateddate('%a, %d %b %Y %T %z')]</lastBuildDate>
218-
<guid isPermaLink="true">[#CURRENTURL|dirname]/[#ID|makeurlwithid]</guid>
218+
<guid isPermaLink="true">[#SITEINFOS.URL]/[#ID|makeurlwithid]</guid>
219219
</item>
220220
</LOOP>
221221
</DO>
@@ -229,23 +229,23 @@
229229
<LOOP NAME="rss_individu" TABLE="individus" WHERE="individus.identity='[#IDENTITY]'">
230230
<DO>
231231
<title>[#PRENOM] [#NOM]</title>
232-
<link>[#CURRENTURL|dirname]/[#ID|makeurlwithid]</link>
232+
<link>[#SITEINFOS.URL]/[#ID|makeurlwithid]</link>
233233
<description>[#ACCROCHE]</description>
234234
<language>fr</language>
235235
<ttl>0</ttl>
236236

237237
<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">
238238
<item>
239239
<title>[#G_TITLE|textebrut|htmlspecialchars]</title>
240-
<link>[#CURRENTURL|dirname]/[#ID|makeurlwithid]</link>
240+
<link>[#SITEINFOS.URL]/[#ID|makeurlwithid]</link>
241241

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

246246
<pubDate>[#CREATIONDATE|formateddate('%a, %d %b %Y %T %z')]</pubDate>
247247
<lastBuildDate>[#MODIFICATIONDATE|formateddate('%a, %d %b %Y %T %z')]</lastBuildDate>
248-
<guid isPermaLink="true">[#CURRENTURL|dirname]/[#ID|makeurlwithid]</guid>
248+
<guid isPermaLink="true">[#SITEINFOS.URL]/[#ID|makeurlwithid]</guid>
249249
</item>
250250
</LOOP>
251251
</DO>

0 commit comments

Comments
 (0)