From 8b0c6097166ca23f4e83e644d7581abeb2efbe42 Mon Sep 17 00:00:00 2001
From: zapata <zapata>
Date: Mon, 5 Sep 2005 21:28:01 +0000
Subject: [PATCH] some template tweaking

---
 etc/producer/article.template   | 20 ++++++++++----------
 etc/producer/startpage.template |  6 +++---
 2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/etc/producer/article.template b/etc/producer/article.template
index 68986c11..b67cbbd3 100755
--- a/etc/producer/article.template
+++ b/etc/producer/article.template
@@ -6,7 +6,7 @@
 <html>
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=${config["Mir.DefaultHTMLCharset"]}">
-    <title>${config["Mir.Name"]} | ${article.title}</title>
+    <title>${config["Mir.Name"]} | ${utility.encodeHTML(article.title)}</title>
   <meta name="keywords" content="indymedia,imc">
   <meta name="description" content="indymedia,imc">
   <meta http-equiv="expires" content="599">
@@ -116,9 +116,9 @@
         </td></tr></table>
 
         <br>
-        <h2>${article.title}</h2>
+        <h2>${utility.encodeHTML(article.title)}</h2>
 
-        <p><i><font size="-1">${article.to_original.creator} <if article.to_original.id!=article.id>(${lang("general.translatedby", article.creator)})</if><if article.creator || article.to_original.creator>, </if>${article.to_original.creationdate.formatted["dd.MM.yyyy HH:mm"]}</font></i></p>
+        <p><i><font size="-1">${utility.encodeHTML(article.to_original.creator)} <if article.to_original.id!=article.id>(${lang("general.translatedby", utility.encodrHTML(article.creator))})</if><if article.creator || article.to_original.creator>, </if>${article.to_original.creationdate.formatted["dd.MM.yyyy HH:mm"]}</font></i></p>
         <br>
         <p>${article.description_parsed}</p>
 
@@ -166,10 +166,10 @@
             <p>
             <font size="-1">
             <if article.creator_email>
-              <img src="../../../img/mail_small.gif" width="12" height="10" border="0" alt="-"> ${lang("article.email.prefix")}: <a href="mailto:${article.creator_email}">${article.creator_email}</a><br>
+              <img src="../../../img/mail_small.gif" width="12" height="10" border="0" alt="-"> ${lang("article.email.prefix")}: <a href="mailto:${utility.encodeHTML(article.creator_email)}">${utility.encodeHTML(article.creator_email)}</a><br>
             </if>
             <if article.creator_main_url>
-              <img src="../../../img/link_small.gif" width="12" height="10" border="0" alt=""> ${lang("article.homepage.prefix")}: <a href="${article.creator_main_url}" target="extern">${article.creator_main_url}</a><br>
+              <img src="../../../img/link_small.gif" width="12" height="10" border="0" alt=""> ${lang("article.homepage.prefix")}: <a href="${utitlity.encodeHTML(article.creator_main_url)}" target="extern">${utility.encodeHTML(article.creator_main_url)}</a><br>
             </if>
             </font>
             </p>
@@ -210,25 +210,25 @@
 
           <list c.to_media_audio as media>
             <a href="${media["publish_server"]}${media["publish_path"]}">
-              ${media["title"]} - ${media["media_descr"]} ${media["human_readable_size"]}
+              ${utility.encodeHTML(media["title"])} - ${media["media_descr"]} ${media["human_readable_size"]}
             </a>
           </list>
           <list c.to_media_video as media>
             <img src="../../../img/${media["big_icon"]}" border="0" alt="">
             <a href="${media["publish_server"]}${media["publish_path"]}">
-            ${media["title"]} - ${media["media_descr"]} ${media["human_readable_size"]}</a>
+            ${utility.encodeHTML(media["title"])} - ${media["media_descr"]} ${media["human_readable_size"]}</a>
           </list>
           <list c.to_media_other as media>
             <img src="../../../img/${media["big_icon"]}" border="0" alt="">
             <a href="${media["publish_server"]}${media["publish_path"]}">
-            ${media["title"]} - ${media["media_descr"]} ${media["human_readable_size"]}</a>
+            ${utility.encodeHTML(media["title"])} - ${media["media_descr"]} ${media["human_readable_size"]}</a>
           </list>
 
           <list c.to_media_images as image>
             <img src="${image["publish_server"]}${image["publish_path"]}"
             border="0" width="${image["img_width"]}"
-            height="${image["img_height"]}" alt="${image["title"]}">
-            <br><i>${image["title"]}</i>
+            height="${image["img_height"]}" alt="${utility.encodeHTML(image["title"])}">
+            <br><i>${utility.encodeHTML(image["title"])}</i>
           </list>
 
 
diff --git a/etc/producer/startpage.template b/etc/producer/startpage.template
index 2242e27d..222feffd 100755
--- a/etc/producer/startpage.template
+++ b/etc/producer/startpage.template
@@ -110,7 +110,7 @@
  
         <table width="100%" border="0" cellspacing="0" cellpadding="10" bgcolor="#eeeeee"><tr><td>
              <p><font size="+2">
-             <a href="${config["Producer.DocRoot"]}/${language.code}/${s.date.formatted["yyyy'/'MM"]}/${s.id}.shtml"><b>${s.title}</b></a>
+             <a href="${config["Producer.DocRoot"]}/${language.code}/${s.date.formatted["yyyy'/'MM"]}/${s.id}.shtml"><b>${utility.encodeHTML(s.title)}</b></a>
              </font><br>
                 <font size="-2">${sorig.creator} <if sorig.id!=s.id>(${lang("general.translatedby", s.creator)})</if><if s.creator || sorig.creator>, </if>  ${sorig.creationdate.formatted["dd.MM.yyyy - HH:mm"]}</font></p>
              <p><font size="-1">
@@ -153,7 +153,7 @@
         </if>
 
         <p><font size="+1">
-        <a href="${config["Producer.DocRoot"]}/${language.code}/${i.date.formatted["yyyy'/'MM"]}/${i.id}.shtml"><b>${i.title}</b></a>
+        <a href="${config["Producer.DocRoot"]}/${language.code}/${i.date.formatted["yyyy'/'MM"]}/${i.id}.shtml"><b>${utility.encodeHTML(i.title)}</b></a>
         </font><br>
            <font size="-2">${forig.creator} <if forig.id!=i.id>(${lang("general.translatedby", i.creator)})</if><if i.creator || forig.creator>, </if> ${forig.creationdate.formatted["dd.MM.yyyy -  HH:mm"]}</font></p>
         <p><font size="-1">
@@ -210,7 +210,7 @@
 	    
 
 	      <img src="${norig.to_media_icon.tiny_icon}" alt="${norig.to_media_icon.icon_alt}" height="10" width="12">
-              <a href="${config["Producer.DocRoot"]}/${language.code}/${n.date.formatted.yyyy}/${n.date.formatted.MM}/${n.id}.shtml">${n.title}</a>
+              <a href="${config["Producer.DocRoot"]}/${language.code}/${n.date.formatted.yyyy}/${n.date.formatted.MM}/${n.id}.shtml">${utility.encodeHTML(n.title)}</a>
               <br>
               <font size="-2">${n.creationdate.formatted["dd-MM-yyyy HH:mm"]}</font><br>
               <br>
-- 
2.11.0

