don't use encodeHTML for the list view

diff --git a/templates-dist/admin/audiolist.template b/templates-dist/admin/audiolist.template
index b62465e..82e010a 100755 (executable)
--- a/templates-dist/admin/audiolist.template
+++ b/templates-dist/admin/audiolist.template
@@ -73,12 +73,12 @@
   <td>
          <a href="${config.actionRoot}?module=Audio&do=getMedia&id=${entry.id}">
          <img src="${config.docRoot}/img/${entry.big_icon}" border=0></a></font></td>
-  <td>${encodeHTML(entry.title)}&nbsp;
-         <if entry.description><br>${encodeHTML(entry.description)}</if></td>
-  <td>${encodeHTML(entry.media_descr)}&nbsp;</td>
+  <td>${entry.title}&nbsp;
+         <if entry.description><br>${entry.description}</if></td>
+  <td>${entry.media_descr}&nbsp;</td>
   <td>${entry.human_readable_size}&nbsp;</td>
-  <td>${encodeHTML(data.mediafolderHashdata[entry.to_media_folder]["name"])}&nbsp;</td>
-  <td>${encodeHTML(entry.creator)}&nbsp;</td>
+  <td>${data.mediafolderHashdata[entry.to_media_folder]["name"]}&nbsp;</td>
+  <td>${entry.creator}&nbsp;</td>
   <td><font size="1">&nbsp;
        <if data.cid><a href="${config.actionRoot}?module=Content&do=attach&mid=${entry.id}&cid=${data.cid}">${lang("attach")}</a>
        <else>

diff --git a/templates-dist/admin/breakinglist.template b/templates-dist/admin/breakinglist.template
index c1b62b4..f4ac33a 100755 (executable)
--- a/templates-dist/admin/breakinglist.template
+++ b/templates-dist/admin/breakinglist.template
@@ -18,7 +18,7 @@
        <if grey=="1"><assign grey="0">bgcolor="#dddddd" <else><assign grey="1"> </if>
   >
   <td>${entry.webdb_create_formatted}&nbsp;</td>
-  <td>${encodeHTML(entry.text)}&nbsp;</td>
+  <td>${entry.text}&nbsp;</td>
   <td><font size="1">&nbsp;<a href="${config.actionRoot}?module=Breaking&do=delete&id=${entry.id}">${lang("delete")}</a>
     | <a href="${config.actionRoot}?module=Breaking&do=edit&id=${entry.id}">${lang("edit")}</a></font></td>
   </tr>

diff --git a/templates-dist/admin/commentlist.template b/templates-dist/admin/commentlist.template
index c62b14b..1a4d079 100755 (executable)
--- a/templates-dist/admin/commentlist.template
+++ b/templates-dist/admin/commentlist.template
@@ -52,10 +52,10 @@
                </td>
 
                <td>
-                       <if entry.title><b>${encodeHTML(entry.title)}</b><br></if>
-                       <if entry.creator>Von: ${encodeHTML(entry.creator)}<br></if>
-                       <font size="-1">${encodeHTML(entry.description)}</font>
-                       <if entry.main_url><br>URL: ${encodeHTML(entry.main_url)}</if>
+                       <if entry.title><b>${entry.title}</b><br></if>
+                       <if entry.creator>Von: ${entry.creator}<br></if>
+                       <font size="-1">${entry.description}</font>
+                       <if entry.main_url><br>URL: ${entry.main_url}</if>
                        <br><a href="${config.actionRoot}?module=Comment&do=edit&order=${encodeHTML(data.order)}&offset=${data.offset}&id=${entry.id}">${lang("edit")}</a>
                </td>
 
@@ -75,7 +75,7 @@
   </list>
 
   <tr>
-    <td colspan="3" bgcolor="#006600"><font color="#ffffff">${encodeHTML(data.count)} ${lang("records")}
+    <td colspan="3" bgcolor="#006600"><font color="#ffffff">${data.count} ${lang("records")}
       / ${lang("show_from_to", data.from, data.to)}</font></td>
     <td>&nbsp;</td>
   </tr>

diff --git a/templates-dist/admin/contentlist.template b/templates-dist/admin/contentlist.template
index 7f504ea..a5681c4 100755 (executable)
--- a/templates-dist/admin/contentlist.template
+++ b/templates-dist/admin/contentlist.template
@@ -30,8 +30,8 @@
                        <if entry.is_html!="0">H<else>-</if>
                        </font></td>
            <td><font face="Verdana, Arial, Helvetica, sans-serif" size="-1"><b>
-                       <font size="-2">${articletypeHash[entry.to_article_type]["name"]} -- </font><if entry.place>${encodeHTML(entry.place)}: </if>${encodeHTML(entry.title)}</b><br>
-                       ${encodeHTML(entry.creator)}&nbsp;
+                       <font size="-2">${articletypeHash[entry.to_article_type]["name"]} -- </font><if entry.place>${entry.place}: </if>${entry.title}</b><br>
+                       ${entry.creator}&nbsp;
                        <a href="${config.actionRoot}?module=Content&do=edit&id=${entry.id}&where=${encodeHTML(data.where_encoded)}&order=${encodeHTML(data.order_encoded)}&offset=${data.offset}">${lang("edit")}</a>
                        <if entry.to_article_type=="0">&nbsp;|&nbsp;<a href="${config.actionRoot}?module=Content&do=newswire&id=${entry.id}&where=${encodeHTML(data.where_encoded)}&order=${encodeHTML(data.order_encoded)}&offset=${data.offset}">newswire</a></if></font></td>
            <td><font face="Verdana, Arial, Helvetica, sans-serif" size="-1">

diff --git a/templates-dist/admin/featurelist.template b/templates-dist/admin/featurelist.template
index 9c20e15..3701003 100755 (executable)
--- a/templates-dist/admin/featurelist.template
+++ b/templates-dist/admin/featurelist.template
@@ -21,10 +21,10 @@
   <if grey=="1"><assign grey="0">bgcolor="#dddddd" <else><assign grey="1"> </if>
   >
   <td align="center"><if entry.is_published!="0">X<else>&nbsp;</if></td>
-  <td>${encodeHTML(entry.title)}&nbsp;</td>
-  <td>${encodeHTML(entry.filename)}&nbsp;</td>
-  <td>${encodeHTML(entry.main_url)}&nbsp;</td>
-  <td>${encodeHTML(entry.description)}&nbsp;</td>
+  <td>${entry.title}&nbsp;</td>
+  <td>${entry.filename}&nbsp;</td>
+  <td>${entry.main_url}&nbsp;</td>
+  <td>${entry.description}&nbsp;</td>
   <td><font size="1"> <a href="${config.actionRoot}?module=Schwerpunkt&do=delete&id=${entry.id}">${lang("delete")}</a>
   | <a href="${config.actionRoot}?module=Schwerpunkt&do=edit&id=${entry.id}">${lang("edit")}</a></font></td>
   </tr>
@@ -32,7 +32,7 @@
 
   <tr>
     <td align="center" colspan="5" bgcolor="#006600">
-      <div align="left"><font color="#ffffff">${encodeHTML(data.count)} ${lang("records")} /
+      <div align="left"><font color="#ffffff">${data.count} ${lang("records")} /
         ${lang("show_from_to", data.from, data.to)}</font></div>
     </td>
     <td><a href="${config.docRoot}"><font size="1">&nbsp;${lang("back")}</font></a></td>

diff --git a/templates-dist/admin/fileeditlist.template b/templates-dist/admin/fileeditlist.template
index 3720fb7..36695c9 100755 (executable)
--- a/templates-dist/admin/fileeditlist.template
+++ b/templates-dist/admin/fileeditlist.template
@@ -22,7 +22,7 @@
         <tr
         <if grey=="1"><assign grey="0">bgcolor="#dddddd" <else><assign grey="1"> </if>
         >
-                <td>${encodeHTML(entry)}&nbsp;</td>
+                <td>${entry}&nbsp;</td>
                 <td><font size="1"><a href="${config.actionRoot}?module=FileEdit&do=edit&filename=${encodeHTML(entry)}">${lang("edit")}</a></font></td>
         </tr>
   </list>

diff --git a/templates-dist/admin/hiddenlist.template b/templates-dist/admin/hiddenlist.template
index 96186fa..a4c4d07 100755 (executable)
--- a/templates-dist/admin/hiddenlist.template
+++ b/templates-dist/admin/hiddenlist.template
@@ -62,7 +62,7 @@
 <table cellpadding="6" bgcolor="#dddddd" width="98%">
   <tr>
     <td>
-     <p>${lang("start.content.hidden")} | ${lang("month")}: ${encodeHTML(data.month)} , ${lang("year")}:${encodeHTML(data.year)}</p>
+     <p>${lang("start.content.hidden")} | ${lang("month")}: ${data.month} , ${lang("year")}:${data.year}</p>
     </td>
   </tr>
 </table>

diff --git a/templates-dist/admin/imagelist.template b/templates-dist/admin/imagelist.template
index 0aa3731..65e78e0 100755 (executable)
--- a/templates-dist/admin/imagelist.template
+++ b/templates-dist/admin/imagelist.template
@@ -75,12 +75,12 @@
        <a href="${config.actionRoot}?module=Images&do=getMedia&id=${entry.id}" target="new">
          <img src="${config.actionRoot}?module=Images&do=getIcon&id=${entry.id}" border=0></a></font></td>
        </if>
-  <td>${encodeHTML(entry.title)}&nbsp;
-         <if entry.description><br>${encodeHTML(entry.description)}</if></td>
-  <td>${encodeHTML(entry.media_descr)}&nbsp;</td>
-  <td>${encodeHTML(entry.human_readable_size)}&nbsp;</td>
+  <td>${entry.title}&nbsp;
+         <if entry.description><br>${entry.description}</if></td>
+  <td>${entry.media_descr}&nbsp;</td>
+  <td>${entry.human_readable_size}&nbsp;</td>
   <td>${data.mediafolderHashdata[entry.to_media_folder]["name"]}&nbsp;</td>
-  <td>${encodeHTML(entry.creator)}&nbsp;</td>
+  <td>${entry.creator}&nbsp;</td>
   <td><font size="1">&nbsp;
        <if data.cid><a href="${config.actionRoot}?module=Content&do=attach&mid=${entry.id}&cid=${data.cid}">${lang("attach")}</a>
        <else>

diff --git a/templates-dist/admin/languagelist.template b/templates-dist/admin/languagelist.template
index 4f2d658..25691ac 100755 (executable)
--- a/templates-dist/admin/languagelist.template
+++ b/templates-dist/admin/languagelist.template
@@ -17,8 +17,8 @@
   <tr
        <if grey=="1"><assign grey="0">bgcolor="#dddddd" <else><assign grey="1"> </if>
   >
-  <td>${encodeHTML(entry.name)}&nbsp;</td>
-  <td>${encodeHTML(entry.code)}&nbsp;</td>
+  <td>${entry.name}&nbsp;</td>
+  <td>${entry.code}&nbsp;</td>
   <td><font size="1">&nbsp;<a href="${config.actionRoot}?module=Language&do=delete&id=${entry.id}">${lang("delete")}</a>
     | <a href="${config.actionRoot}?module=Language&do=edit&id=${entry.id}">${lang("edit")}</a></font></td>
   </tr>

diff --git a/templates-dist/admin/linksimcslist.template b/templates-dist/admin/linksimcslist.template
index 974116b..496f6d1 100755 (executable)
--- a/templates-dist/admin/linksimcslist.template
+++ b/templates-dist/admin/linksimcslist.template
@@ -28,14 +28,14 @@
        <td>\r
                <select name="to_parent_id">\r
                        <option value=""></option>\r
-                   <list data.parentlist as parent><option value="${encodeHTML(parent.id)}"<if to_parent_id == parent.id> selected</if>>${encodeHTML(parent.title)}</option>\r
+                   <list data.parentlist as parent><option value="${parent.id}"<if to_parent_id == parent.id> selected</if>>${parent.title}</option>\r
                        </list>\r
            </select>\r
        </td>\r
        <td>\r
                <select name="to_language">\r
                        <option value="">${lang("all")}</option>\r
-                       <list data.languagelist as language><option value="${encodeHTML(language.id)}"<if to_language == language.id> selected</if>>${encodeHTML(language.name)}</option>\r
+                       <list data.languagelist as language><option value="${language.id}"<if to_language == language.id> selected</if>>${language.name}</option>\r
                        </list> \r
                </select>\r
        </td>\r
@@ -73,19 +73,19 @@
   </list>\r
   \r
   <tr <if grey=="1"><assign grey="0">bgcolor="#dddddd" <else><assign grey="1"> </if>>\r
-       <td><font face="Verdana, Arial, Helvetica, sans-serif" size="-1">${encodeHTML(entry.title)}&nbsp;</font></td>\r
-       <td><font face="Verdana, Arial, Helvetica, sans-serif" size="-1">${encodeHTML(parent)}</font></td>\r
-       <td><font face="Verdana, Arial, Helvetica, sans-serif" size="-1">${encodeHTML(entry.url)}</font></td>\r
-       <td><font face="Verdana, Arial, Helvetica, sans-serif" size="-1">${encodeHTML(entry.sortpriority)}</font></td>\r
-       <td><font face="Verdana, Arial, Helvetica, sans-serif" size="-1">${encodeHTML(data.language)}</font></td>\r
-       <td><font size="1">&nbsp;<a href="${encodeHTML(actionRoot)}?module=LinksImcs&do=delete&id=${entry.id}">${lang("delete")}</a>\r
-       | <a href="${encodeHTML(actionRoot)}?module=LinksImcs&do=edit&id=${entry.id}">${lang("edit")}</a></font>\r
+       <td><font face="Verdana, Arial, Helvetica, sans-serif" size="-1">${entry.title}&nbsp;</font></td>\r
+       <td><font face="Verdana, Arial, Helvetica, sans-serif" size="-1">${parent}</font></td>\r
+       <td><font face="Verdana, Arial, Helvetica, sans-serif" size="-1">${entry.url}</font></td>\r
+       <td><font face="Verdana, Arial, Helvetica, sans-serif" size="-1">${entry.sortpriority}</font></td>\r
+       <td><font face="Verdana, Arial, Helvetica, sans-serif" size="-1">${data.language}</font></td>\r
+       <td><font size="1">&nbsp;<a href="${config.actionRoot}?module=LinksImcs&do=delete&id=${entry.id}">${lang("delete")}</a>\r
+       | <a href="${config.actionRoot}?module=LinksImcs&do=edit&id=${entry.id}">${lang("edit")}</a></font>\r
        </td>\r
   </tr>\r
   </list>\r
   <tr>\r
   <td colspan="6" bgcolor="#006600"><font face="Verdana, Arial, Helvetica, sans-serif" size="-1" color="#ffffff">\r
-       ${encodeHTML(data.count)} ${lang("records")} / ${lang("show_from_to", data.from, data.to)}</font></td>\r
+       ${data.count} ${lang("records")} / ${lang("show_from_to", data.from, data.to)}</font></td>\r
   <td>&nbsp;</td>\r
   </tr>\r
 </table>\r
@@ -102,4 +102,4 @@
 </if>\r
 <include "admin/foot.template">\r
 </body>\r
-</html>
\ No newline at end of file
+</html>\r

diff --git a/templates-dist/admin/mediafolderlist.template b/templates-dist/admin/mediafolderlist.template
index 93897fe..7519a6a 100755 (executable)
--- a/templates-dist/admin/mediafolderlist.template
+++ b/templates-dist/admin/mediafolderlist.template
@@ -17,10 +17,10 @@
          <list data.contentlist as entry>
                  <tr <if grey=="1"><assign grey="0">bgcolor="#dddddd" <else><assign grey="1"> </if> >
                        <td>${entry.date}&nbsp;</td>
-                       <td><b>${encodeHTML(entry.name)}</b>&nbsp;</td>
-                       <td>${encodeHTML(entry.place)}&nbsp;</td>
-                       <td>${encodeHTML(entry.comment)}&nbsp;</td>
-                       <td>${encodeHTML(entry.keywords)}&nbsp;</td>
+                       <td><b>${entry.name}</b>&nbsp;</td>
+                       <td>${entry.place}&nbsp;</td>
+                       <td>${entry.comment}&nbsp;</td>
+                       <td>${entry.keywords}&nbsp;</td>
                        <td><font size="1"><a href="${config.actionRoot}?module=Mediafolder&do=delete&id=${entry.id}">${lang("delete")}</a>
                        | <a href="${config.actionRoot}?module=Mediafolder&do=edit&id=${entry.id}">${lang("edit")}</a>
                                | <a href="${config.actionRoot}?module=Images&do=list&query_media_folder=${entry.id}">${lang("list")}</a></font></td>

diff --git a/templates-dist/admin/medialist.template b/templates-dist/admin/medialist.template
index 6758f47..9e88159 100755 (executable)
--- a/templates-dist/admin/medialist.template
+++ b/templates-dist/admin/medialist.template
@@ -73,12 +73,12 @@
   <td>
          <a href="${config.actionRoot}?module=OtherMedia&do=getMedia&id=${entry.id}">
          <img src="${config.docRoot}/img/${entry.big_icon}" border=0></a></font></td>
-  <td>${encodeHTML(entry.title)}&nbsp;
-         <if entry.description><br>${encodeHTML(entry.description)}</if></td>
-  <td>${encodeHTML(entry.media_descr)}&nbsp;</td>
+  <td>${entry.title}&nbsp;
+         <if entry.description><br>${entry.description}</if></td>
+  <td>${entry.media_descr}&nbsp;</td>
   <td>${entry.human_readable_size}&nbsp;</td>
   <td>${data.mediafolderHashdata[entry.to_media_folder]["name"]}&nbsp;</td>
-  <td>${encodeHTML(entry.creator)}&nbsp;</td>
+  <td>${entry.creator}&nbsp;</td>
   <td><font size="1">&nbsp;
        <if data.cid><a href="${config.actionRoot}?module=Content&do=attach&mid=${entry.id}&cid=${data.cid}">${lang("attach")}</a>
        <else>

diff --git a/templates-dist/admin/topiclist.template b/templates-dist/admin/topiclist.template
index e947294..f403eb6 100755 (executable)
--- a/templates-dist/admin/topiclist.template
+++ b/templates-dist/admin/topiclist.template
@@ -17,18 +17,18 @@
   </tr>
   <list data.contentlist as entry>
   <tr <if grey=="1"><assign grey="0">bgcolor="#dddddd" <else><assign grey="1"> </if>>
-  <td><font face="Verdana, Arial, Helvetica, sans-serif" size="-1">${encodeHTML(entry.title)}&nbsp;</font></td>
-  <td><font face="Verdana, Arial, Helvetica, sans-serif" size="-1">${encodeHTML(entry.description)}&nbsp;</font></td>
+  <td><font face="Verdana, Arial, Helvetica, sans-serif" size="-1">${entry.title}&nbsp;</font></td>
+  <td><font face="Verdana, Arial, Helvetica, sans-serif" size="-1">${entry.description}&nbsp;</font></td>
   <td><font face="Verdana, Arial, Helvetica, sans-serif" size="-1">
-       ${encodeHTML(entry.main_url)}<br>
-       ${encodeHTML(entry.archiv_url)}</font></td>
+       ${entry.main_url}<br>
+       ${entry.archiv_url}</font></td>
   <td><font size="1">&nbsp;<a href="${config.actionRoot}?module=Topics&do=delete&id=${entry.id}">${lang("delete")}</a>
     | <a href="${config.actionRoot}?module=Topics&do=edit&id=${entry.id}">${lang("edit")}</a></font></td>
   </tr>
   </list>
   <tr>
   <td colspan="4" bgcolor="#006600"><font face="Verdana, Arial, Helvetica, sans-serif" size="-1" color="#ffffff">
-       ${encodeHTML(data.count)} ${lang("records")} / ${lang("show_from_to", data.from, data.to)}</font></td>
+       ${data.count} ${lang("records")} / ${lang("show_from_to", data.from, data.to)}</font></td>
   <td>&nbsp;</td>
   </tr>
 </table>

diff --git a/templates-dist/admin/userlist.template b/templates-dist/admin/userlist.template
index 84db96d..ffa0e7e 100755 (executable)
--- a/templates-dist/admin/userlist.template
+++ b/templates-dist/admin/userlist.template
@@ -16,14 +16,14 @@
   <tr
        <if grey=="1"><assign grey="0">bgcolor="#dddddd" <else><assign grey="1"> </if>
   >
-  <td>${encodeHTML(entry.login)}&nbsp;</td>
-  <td>${encodeHTML(entry.is_admin)}&nbsp;</td>
+  <td>${entry.login}&nbsp;</td>
+  <td>${entry.is_admin}&nbsp;</td>
   <td><font size="1">&nbsp;<a href="${config.actionRoot}?module=Users&do=delete&id=${entry.id}">${lang("delete")}</a>
     | <a href="${config.actionRoot}?module=Users&do=edit&id=${entry.id}">${lang("edit")}</a></font></td>
   </tr>
   </list>
   <tr>
-    <td colspan="3" bgcolor="#006600"><font color="#ffffff">${encodeHTML(data.count)} ${lang("records")}
+    <td colspan="3" bgcolor="#006600"><font color="#ffffff">${data.count} ${lang("records")}
       /  ${lang("show_from_to", data.from, data.to)}</font></td>
     <td>&nbsp;</td>
   </tr>
@@ -31,10 +31,10 @@
 
       <P>
 <if data.prev>
-       <a href="${encodeHTML(actionRoot)}?module=Users&do=list&where=${encodeHTML(where)}&prevoffset=${encodeHTML(prev)}&prev=zur&uuml;ck">${lang("list.previous")}</a>&nbsp;
+       <a href="${config.actionRoot}?module=Users&do=list&where=${encodeHTML(data.where)}&prevoffset=${encodeHTML(data.prev)}&prev=zur&uuml;ck">${lang("list.previous")}</a>&nbsp;
 </if>
 <if data.next>
-<a href="${encodeHTML(actionRoot)}?module=Users&do=list&where=${encodeHTML(where)}&nextoffset=${encodeHTML(next)}&next=weiter">${lang("list.next")}</a>
+<a href="${config.actionRoot}?module=Users&do=list&where=${encodeHTML(data.where)}&nextoffset=${encodeHTML(data.next)}&next=weiter">${lang("list.next")}</a>
 </if>
 
 <else>

diff --git a/templates-dist/admin/videolist.template b/templates-dist/admin/videolist.template
index 7450171..949ff5e 100755 (executable)
--- a/templates-dist/admin/videolist.template
+++ b/templates-dist/admin/videolist.template
@@ -73,12 +73,12 @@
   <td>
          <a href="${config.actionRoot}?module=Video&do=getMedia&id=${entry.id}">
          <img src="${config.docRoot}/img/${entry.big_icon}" border=0></a></font></td>
-  <td>${encodeHTML(entry.title)}&nbsp;
-         <if entry.description><br>${encodeHTML(entry.description)}</if></td>
-  <td>${encodeHTML(entry.media_descr)}&nbsp;</td>
+  <td>${entry.title}&nbsp;
+         <if entry.description><br>${entry.description}</if></td>
+  <td>${entry.media_descr}&nbsp;</td>
   <td>${entry.human_readable_size}&nbsp;</td>
   <td>${data.mediafolderHashdata[entry.to_media_folder]["name"]}&nbsp;</td>
-  <td>${encodeHTML(entry.creator)}&nbsp;</td>
+  <td>${entry.creator}&nbsp;</td>
   <td><font size="1">&nbsp;
        <if data.cid><a href="${config.actionRoot}?module=Content&do=attach&mid=${entry.id}&cid=${data.cid}">${lang("attach")}</a>
        <else>
@@ -89,7 +89,7 @@
   </tr>
   </list>
   <tr>
-    <td colspan="4" bgcolor="#006600"><font color="#ffffff">${encodeHTML(data.count)} ${lang("records")}
+    <td colspan="4" bgcolor="#006600"><font color="#ffffff">${data.count} ${lang("records")}
       / ${lang("show_from_to", data.from, data.to)}</font></td>
     <td>&nbsp;</td>
   </tr>