remove gratuitous uses of encodeHTML as well as a couple of other where it is a bug...

author mh <mh>

Fri, 13 Dec 2002 01:44:39 +0000 (01:44 +0000)

committer mh <mh>

Fri, 13 Dec 2002 01:44:39 +0000 (01:44 +0000)
author mh <mh>
Fri, 13 Dec 2002 01:44:39 +0000 (01:44 +0000)
committer mh <mh>
Fri, 13 Dec 2002 01:44:39 +0000 (01:44 +0000)
diff --git a/templates-dist/admin/audio.template b/templates-dist/admin/audio.template

index 81353c9..b911187 100755 (executable)
--- a/templates-dist/admin/audio.template
+++ b/templates-dist/admin/audio.template
@@ -4,16 +4,11 @@
  ${lang("audio.htmltitle")}
  </title>
  </head>
-<SCRIPT LANGUAGE="JavaScript">
-function openWin(url) {
-   window.open(url,"vc","scrollbars=0,height=${encodeHTML(data.img_height)},width=${encodeHTML(data.img_width)}");
-}
-</SCRIPT>
  <body bgcolor="#FFFFFF">
  <include "admin/head.template">
  
  <if data.new>
-<form action="${encodeHTML(config.actionRoot)}?module=Audio&do=add" method="post">
+<form action="${config.actionRoot}?module=Audio&do=add" method="post">
         <table border="0">
         <tr>
         <td align="right" bgcolor="#006600">
@@ -22,30 +17,30 @@ function openWin(url) {
         </font>
         </td>
         <td>
-       <input type="text" size="3" name="medianum" value="${encodeHTML(medianum)}">&nbsp;<input type="submit" value="${lang("open.posting.nr_of_media.submit")}">
+       <input type="text" size="3" name="medianum" value="${medianum}">&nbsp;<input type="submit" value="${lang("open.posting.nr_of_media.submit")}">
         </td>
         </tr>
         </table> 
  </form>
  </if>
-<form enctype="multipart/form-data" method="post" action="${encodeHTML(config.actionRoot)}?module=Audio&do=<if data.new>insert<else>update</if>&id=${encodeHTML(data.id)}">
+<form enctype="multipart/form-data" method="post" action="${config.actionRoot}?module=Audio&do=<if data.new>insert<else>update</if>&id=${data.id}">
         <input type="hidden" name="where" value="${encodeHTML(data.where)}">
-       <input type="hidden" name="offset" value="${encodeHTML(data.offset)}">
+       <input type="hidden" name="offset" value="${data.offset}">
         <input type="hidden" name="order" value="${encodeHTML(data.order)}">
-       <input type="hidden" name="id" value="${encodeHTML(data.id)}">
+       <input type="hidden" name="id" value="${data.id}">
  
         <table border="0">
         <if !data.new>
         <tr>
      <td align="right" bgcolor="#006600">
                 <font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
-                       <a href="${encodeHTML(config.actionRoot)}?module=Audio&do=getMedia&id=${encodeHTML(data.id)}">
-                       <img src="${encodeHTML(config.docRoot)}/img/${encodeHTML(data.big_icon)}" border=0></a></font></td>
+                       <a href="${config.actionRoot}?module=Audio&do=getMedia&id=${data.id}">
+                       <img src="${config.docRoot}/img/${data.big_icon}" border=0></a></font></td>
      <td valign="bottom"><font color="Silver" face="Verdana, Arial, Helvetica, sans-serif" size=1>
-               ${lang("media.created")}: ${encodeHTML(data.webdb_create)}
-        <if data.webdb_lastchange>/ ${lang("media.changed")} ${encodeHTML(data.webdb_lastchange)}</if><br>
-               <if data.is_published=="1">${lang("media.published")}: ${encodeHTML(data.publish_date)} / ${encodeHTML(data.publish_server)}${encodeHTML(data.publish_path)}<br></if>
-               ${lang("media.format")}: ${encodeHTML(data.mimetype)} / ${encodeHTML(data.media_descr)} / ${encodeHTML(data.human_readable_size)}<br>
+               ${lang("media.created")}: ${data.webdb_create}
+        <if data.webdb_lastchange>/ ${lang("media.changed")} ${data.webdb_lastchange}</if><br>
+               <if data.is_published=="1">${lang("media.published")}: ${data.publish_date} / ${data.publish_server}${data.publish_path}<br></if>
+               ${lang("media.format")}: ${data.mimetype} / ${encodeHTML(data.media_descr)} / ${data.human_readable_size}<br>
                 ${lang("media.rights")}: <b>${data.rightsHashdata[to_rights]["name"]}</b><br>
         </td>
         </tr>
@@ -98,7 +93,7 @@ function openWin(url) {
         <tr>
      <td align="right" bgcolor="#006600"><font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
          <B>${lang("media.comment")}:</B></font></td>
-    <td><textarea cols="40" rows="2" name="comment">${encodeHTML(data.comment)}</textarea></td>
+    <td><textarea cols="40" rows="2" name="comment">${data.comment}</textarea></td>
         </tr>
  
         <tr>
diff --git a/templates-dist/admin/audiolist.template b/templates-dist/admin/audiolist.template

index 558209f..b62465e 100755 (executable)
--- a/templates-dist/admin/audiolist.template
+++ b/templates-dist/admin/audiolist.template
@@ -8,10 +8,10 @@
  
  <table border="0" cellpadding="2" cellspacing="1">
    <tr>
-    <td colspan="5"><form method="post" action="${encodeHTML(config.actionRoot)}">
+    <td colspan="5"><form method="post" action="${config.actionRoot}">
         <input type="hidden" name="module" value="Audio">
         <input type="hidden" name="do" value="list">
-       <input type="hidden" name="cid" value="${encodeHTML(data.cid)}">
+       <input type="hidden" name="cid" value="${data.cid}">
         <table border="0">
         <tr bgcolor="Pink">
                 <td>${lang("medialist.search_text_in")}:</td>
@@ -71,35 +71,35 @@
    <list data.contentlist as entry>
    <tr <if grey=="1"><assign grey="0">bgcolor="#dddddd" <else><assign grey="1"> </if>>
    <td>
-         <a href="${encodeHTML(config.actionRoot)}?module=Audio&do=getMedia&id=${encodeHTML(entry.id)}">
-         <img src="${encodeHTML(config.docRoot)}/img/${encodeHTML(entry.big_icon)}" border=0></a></font></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>${encodeHTML(entry.human_readable_size)}&nbsp;</td>
-  <td>${data.mediafolderHashdata[entry.to_media_folder]["name"]}&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><font size="1">&nbsp;
-       <if data.cid><a href="${encodeHTML(config.actionRoot)}?module=Content&do=attach&mid=${encodeHTML(entry.id)}&cid=${encodeHTML(data.cid)}">${lang("attach")}</a>
+       <if data.cid><a href="${config.actionRoot}?module=Content&do=attach&mid=${entry.id}&cid=${data.cid}">${lang("attach")}</a>
         <else>
         <a href="${config.actionRoot}?module=Audio&do=delete&id=${entry.id}&query_text=${encodeHTML(data.query_text_encoded)}&query_field=${encodeHTML(data.query_field)}&query_is_published=${data.query_is_published}&query_media_folder=${data.query_media_folder}&offset=${data.offset}">${lang("delete")}</a>
-    | <a href="${encodeHTML(config.actionRoot)}?module=Audio&do=edit&id=${encodeHTML(entry.id)}">${lang("edit")}</a>
+    | <a href="${config.actionRoot}?module=Audio&do=edit&id=${entry.id}">${lang("edit")}</a>
         </if>
         </font></td>
    </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>
  
  <tr><td>
  <if data.prev>
-       <a href="${encodeHTML(config.actionRoot)}?module=Audio&do=list&query_text=${encodeHTML(data.query_text_encoded)}&query_field=${encodeHTML(data.query_field)}&query_is_published=${encodeHTML(data.query_is_published)}&query_media_folder=${encodeHTML(data.query_media_folder)}&offset=${encodeHTML(data.prev)}&prev=zur&uuml;ck&cid=${encodeHTML(data.cid)}">zurueck</a>&nbsp;
+       <a href="${config.actionRoot}?module=Audio&do=list&query_text=${encodeHTML(data.query_text_encoded)}&query_field=${encodeHTML(data.query_field)}&query_is_published=${data.query_is_published}&query_media_folder=${data.query_media_folder}&offset=${data.prev}&prev=zur&uuml;ck&cid=${data.cid}">zurueck</a>&nbsp;
  </if>
  <if data.next>
-<a href="${encodeHTML(config.actionRoot)}?module=Audio&do=list&query_text=${encodeHTML(data.query_text_encoded)}&query_field=${encodeHTML(data.query_field)}&query_is_published=${encodeHTML(data.query_is_published)}&query_media_folder=${encodeHTML(data.query_media_folder)}&offset=${encodeHTML(data.next)}&next=weiter&cid=${encodeHTML(data.cid)}">weiter</a>
+<a href="${config.actionRoot}?module=Audio&do=list&query_text=${encodeHTML(data.query_text_encoded)}&query_field=${encodeHTML(data.query_field)}&query_is_published=${data.query_is_published}&query_media_folder=${data.query_media_folder}&offset=${data.next}&next=weiter&cid=${data.cid}">weiter</a>
  </if>
  </td></tr>
  <else>
diff --git a/templates-dist/admin/breaking.template b/templates-dist/admin/breaking.template

index f3445cd..a265c29 100755 (executable)
--- a/templates-dist/admin/breaking.template
+++ b/templates-dist/admin/breaking.template
@@ -7,9 +7,9 @@ ${lang("breaking.htmltitle")}
  
  <body bgcolor="#FFFFFF">
  <include "admin/head.template">
-<form action="${encodeHTML(config.actionRoot)}" method="post">
+<form action="${config.actionRoot}" method="post">
         <input type="hidden" name="module" value="Breaking">
-       <input type="hidden" name="id" value="${encodeHTML(data.id)}">
+       <input type="hidden" name="id" value="${data.id}">
         <if data.new><input type="hidden" name="do" value="insert">
         <else><input type="hidden" name="do" value="update"></if>
  <table border="0">
@@ -17,7 +17,7 @@ ${lang("breaking.htmltitle")}
      <td align="right" bgcolor="#006600"><font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
         <B>${lang("breaking.date")}:</B></font></td>
      <td>
-      ${encodeHTML(data.webdb_create_formatted)}
+      ${data.webdb_create_formatted}
      </td>
    </tr>
  
diff --git a/templates-dist/admin/breakinglist.template b/templates-dist/admin/breakinglist.template

index 4d9bcea..c1b62b4 100755 (executable)
--- a/templates-dist/admin/breakinglist.template
+++ b/templates-dist/admin/breakinglist.template
@@ -17,14 +17,14 @@
    <tr
         <if grey=="1"><assign grey="0">bgcolor="#dddddd" <else><assign grey="1"> </if>
    >
-  <td>${encodeHTML(entry.webdb_create_formatted)}&nbsp;</td>
+  <td>${entry.webdb_create_formatted}&nbsp;</td>
    <td>${encodeHTML(entry.text)}&nbsp;</td>
-  <td><font size="1">&nbsp;<a href="${encodeHTML(config.actionRoot)}?module=Breaking&do=delete&id=${encodeHTML(entry.id)}">${lang("delete")}</a>
-    | <a href="${encodeHTML(config.actionRoot)}?module=Breaking&do=edit&id=${encodeHTML(entry.id)}">${lang("edit")}</a></font></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>
    </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>
@@ -32,10 +32,10 @@
  
        <P>
  <if data.prev>
-       <a href="${encodeHTML(config.actionRoot)}?module=Breaking&do=list&where=${encodeHTML(data.where)}&prevoffset=${encodeHTML(data.prev)}&prev=zur&uuml;ck">${lang("list.previous")}</a>&nbsp;
+       <a href="${config.actionRoot}?module=Breaking&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(config.actionRoot)}?module=Breaking&do=list&where=${encodeHTML(data.where)}&nextoffset=${encodeHTML(data.next)}&next=weiter">${lang("list.next")}</a>
+<a href="${config.actionRoot}?module=Breaking&do=list&where=${encodeHTML(data.where)}&nextoffset=${data.next}&next=weiter">${lang("list.next")}</a>
  </if>
  
  <else>
diff --git a/templates-dist/admin/comment.template b/templates-dist/admin/comment.template

index fa27e23..1c30661 100755 (executable)
--- a/templates-dist/admin/comment.template
+++ b/templates-dist/admin/comment.template
@@ -8,14 +8,14 @@ ${lang("comment.htmltitle")}
  <body bgcolor="#FFFFFF">
  <include "admin/head.template">
  
-<form method="post" action="${encodeHTML(config.actionRoot)}">
+<form method="post" action="${config.actionRoot}">
         <input type="hidden" name="module" value="Comment">
         <input type="hidden" name="where" value="${encodeHTML(data.where)}">
-       <input type="hidden" name="offset" value="${encodeHTML(data.offset)}">
+       <input type="hidden" name="offset" value="${data.offset}">
         <input type="hidden" name="order" value="${encodeHTML(data.order)}">
-       <input type="hidden" name="id" value="${encodeHTML(data.id)}">
-       <input type="hidden" name="date" value="${encodeHTML(data.date)}">
-       <input type="hidden" name="to_media" value="${encodeHTML(data.to_media)}">
+       <input type="hidden" name="id" value="${data.id}">
+       <input type="hidden" name="date" value="${data.date}">
+       <input type="hidden" name="to_media" value="${data.to_media}">
         <if new> <input type="hidden" name="do" value="insert">
         <else>   <input type="hidden" name="do" value="update">
         </if>
@@ -25,7 +25,7 @@ ${lang("comment.htmltitle")}
         <tr> 
      <td align="right" bgcolor="#006600"><font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
          <B>${lang("comment.date")}:</B></font></td>
-    <td>${encodeHTML(data.date)}</td>
+    <td>${data.date}</td>
         </tr>
         
         <tr> 
@@ -49,7 +49,7 @@ ${lang("comment.htmltitle")}
         <tr> 
      <td align="right" bgcolor="#006600"><font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
          <B>${lang("comment.email")}:</B></font></td>
-    <td><input type="text" size="40" maxlength="80" name="email" value="${encodeHTML(data.email)}"></td>
+    <td><input type="text" size="40" maxlength="80" name="email" value="${data.email}"></td>
         </tr>
    
         <tr> 
@@ -67,7 +67,7 @@ ${lang("comment.htmltitle")}
         <tr> 
      <td align="right" bgcolor="#006600"><font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
          <B>${lang("comment.text")}:</B></font></td>
-    <td><textarea cols="40" rows="10" name="description" wrap="virtual">${encodeHTML(data.description)}</textarea></td>
+    <td><textarea cols="40" rows="10" name="description" wrap="virtual">${data.description}</textarea></td>
         </tr>
  
      <td colspan="2" align="right"> <font color="black">
diff --git a/templates-dist/admin/commentlist.template b/templates-dist/admin/commentlist.template

index be81a56..c62b14b 100755 (executable)
--- a/templates-dist/admin/commentlist.template
+++ b/templates-dist/admin/commentlist.template
@@ -1,7 +1,7 @@
  <html>
  <head>
         <title>${lang("commentlist.htmltitle")}</title>
-       <link rel="stylesheet" type="text/css" href="${encodeHTML(config.docRoot)}/admin.css">
+       <link rel="stylesheet" type="text/css" href="${config.docRoot}/admin.css">
  
  </head>
  
@@ -12,7 +12,7 @@
  <table border="0" cellpadding="2" cellspacing="1">
    <tr>
      <td colspan="5">
-        <form method="post" action="${encodeHTML(config.actionRoot)}">
+        <form method="post" action="${config.actionRoot}">
         <input type="hidden" name="module" value="Comment">
         <input type="hidden" name="do" value="list">
         <input type="text" size="10" maxlength="20" name="query_text" value="${encodeHTML(data.query_text)}">
@@ -47,7 +47,7 @@
    <list data.contentlist as entry>
    <tr <if grey=="1"><assign grey="0">class="list1"<else><assign grey="1">class="list2"</if>>
  
-               <td>${encodeHTML(entry.webdb_create_short)}<br>
+               <td>${entry.webdb_create_short}<br>
         <if entry.is_published=="0"><font color="Brown">V</font><else>-</if>
                 </td>
  
@@ -56,15 +56,15 @@
                         <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>
-                       <br><a href="${encodeHTML(config.actionRoot)}?module=Comment&do=edit&order=${encodeHTML(data.order)}&offset=${encodeHTML(data.offset)}&id=${encodeHTML(entry.id)}">${lang("edit")}</a>
+                       <br><a href="${config.actionRoot}?module=Comment&do=edit&order=${encodeHTML(data.order)}&offset=${data.offset}&id=${entry.id}">${lang("edit")}</a>
                 </td>
  
  
                 <td>
                                 ${data.articleHash[entry.to_media]["title"]}<br>
-                               <a href="${encodeHTML(config.actionRoot)}?module=Content&do=edit&id=${data.articleHash[entry.to_media]["id"]}">
+                               <a href="${config.actionRoot}?module=Content&do=edit&id=${data.articleHash[entry.to_media]["id"]}">
                                 edit</a> |
-                               <a href="${encodeHTML(config.productionHost)}${encodeHTML(config.producerDocRoot)}${data.articleHash[entry.to_media]["publish_path"]}${data.articleHash[entry.to_media]["id"]}.shtml">
+                               <a href="${config.productionHost}${config.producerDocRoot}${data.articleHash[entry.to_media]["publish_path"]}${data.articleHash[entry.to_media]["id"]}.shtml">
                                 view</a>
                 </td>
  
@@ -82,10 +82,10 @@
  <tr><td>
  
  <if data.prev>
-<a href="${encodeHTML(config.actionRoot)}?module=Comment&do=list&order=${encodeHTML(data.order)}&query_text=${encodeHTML(data.query_text_encoded)}&query_field=${encodeHTML(data.query_field)}&query_is_published=${encodeHTML(data.query_is_published)}&query_media_folder=${encodeHTML(data.query_media_folder)}&offset=${encodeHTML(data.prev)}&prev=zur&uuml;ck">zurueck</a>&nbsp;
+<a href="${config.actionRoot}?module=Comment&do=list&order=${encodeHTML(data.order)}&query_text=${encodeHTML(data.query_text_encoded)}&query_field=${encodeHTML(data.query_field)}&query_is_published=${encodeHTML(data.query_is_published)}&query_media_folder=${data.query_media_folder}&offset=${data.prev}&prev=zur&uuml;ck">zurueck</a>&nbsp;
  </if>
  <if data.next>
-<a href="${encodeHTML(config.actionRoot)}?module=Comment&do=list&order=${encodeHTML(data.order)}&query_text=${encodeHTML(data.query_text_encoded)}&query_field=${encodeHTML(data.query_field)}&query_is_published=${encodeHTML(data.query_is_published)}&query_media_folder=${encodeHTML(data.query_media_folder)}&offset=${encodeHTML(data.next)}&next=weiter">weiter</a>
+<a href="${config.actionRoot}?module=Comment&do=list&order=${encodeHTML(data.order)}&query_text=${encodeHTML(data.query_text_encoded)}&query_field=${encodeHTML(data.query_field)}&query_is_published=${data.query_is_published}&query_media_folder=${data.query_media_folder}&offset=${data.next}&next=weiter">weiter</a>
  </if>
  </td></tr>
  <else>
diff --git a/templates-dist/admin/content.template b/templates-dist/admin/content.template

index bbacb04..c357c01 100755 (executable)
--- a/templates-dist/admin/content.template
+++ b/templates-dist/admin/content.template
@@ -12,12 +12,12 @@ p {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt}
  
  <body bgcolor="#FFFFFF" link="#aaaaaa">
  <include "admin/head.template">
-<form method="post" action="${encodeHTML(config.actionRoot)}">
+<form method="post" action="${config.actionRoot}">
         <input type="hidden" name="module" value="Content">
         <input type="hidden" name="where" value="${encodeHTML(data.where)}">
         <input type="hidden" name="offset" value="${encodeHTML(data.offset)}">
         <input type="hidden" name="order" value="${encodeHTML(data.order)}">
-       <input type="hidden" name="id" value="${encodeHTML(data.id)}">
+       <input type="hidden" name="id" value="${data.id}">
         <if data.new>
                 <input type="hidden" name="do" value="insert">
         <else>
@@ -32,7 +32,7 @@ p {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt}
                 <b>${lang("content.owner")}:</b>
    </td>
         <td>
-    ${encodeHTML(data.login_user.login)}
+    ${data.login_user.login}
    </td>
         </font>
         <td colspan="3">&nbsp;</td>
@@ -43,7 +43,7 @@ p {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt}
      <b>${lang("content.import_date")}:</b>
    </td>
    <td>
-    ${encodeHTML(data.date)}
+    ${data.date}
    </td>
         </font>
         <td colspan="3">&nbsp;</td>
@@ -55,7 +55,7 @@ p {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt}
      <b>${lang("content.lastchange_date")}:</b>
    </td>
    <td>
-               ${encodeHTML(data.webdb_lastchange)}
+               ${data.webdb_lastchange}
      <br>
    </td>
         </font>
@@ -68,7 +68,7 @@ p {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt}
      <b>${lang("content.create_date")}:</b>
    </td>
    <td colspan="3">
-       ${encodeHTML(data.webdb_create)}<br><br>${lang("edit")} (yyyy-mm-dd [HH:mm]):
+       ${data.webdb_create}<br><br>${lang("edit")} (yyyy-mm-dd [HH:mm]):
         <input type="text" size="10" maxlength="16" name="webdb_create" value="">
      <br>
    </td>
@@ -78,11 +78,11 @@ p {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt}
  
  <tr>
         <td align="right" valign="top" bgcolor="#AAAAAA"><font color="#ffffff">
-               <B>${lang("content.topic")}&nbsp;<a href="${encodeHTML(config.docRoot)}/help/content.html">
-               <img src=" ${encodeHTML(config.docRoot)}/img/help.gif" border="0" align="absmiddle"></a>
+               <B>${lang("content.topic")}&nbsp;<a href="${config.docRoot}/help/content.html">
+               <img src=" ${config.docRoot}/img/help.gif" border="0" align="absmiddle"></a>
                 &nbsp;/&nbsp;${lang("content.feature")}:&nbsp;
-               <a href="${encodeHTML(config.docRoot)}/help/content.html">
-               <img src="${encodeHTML(config.docRoot)}/img/help.gif" border="0" align="absmiddle"></a>
+               <a href="${config.docRoot}/help/content.html">
+               <img src="${config.docRoot}/img/help.gif" border="0" align="absmiddle"></a>
                 </B></font>
         </td>
         <td colspan="4" >
@@ -125,8 +125,8 @@ p {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt}
  <tr>
         <td align="right" valign="top" bgcolor="#AAAAAA">
                 <B><font color="#ffffff">${lang("content.title")}:&nbsp;<br><br>${lang("content.subtitle")}:&nbsp;<br>
-               <a href="${encodeHTML(config.docRoot)}/help/content.html#title">
-               <img src="${encodeHTML(config.docRoot)}/img/help.gif" border="0" align="absmiddle"></a>
+               <a href="${config.docRoot}/help/content.html#title">
+               <img src="${config.docRoot}/img/help.gif" border="0" align="absmiddle"></a>
                 </font></B>
         </td>
         <td colspan="4">
@@ -139,8 +139,8 @@ p {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt}
         <td align="right" valign="top" bgcolor="#AAAAAA">
                 <B><font color="#ffffff">${lang("content.location")}:</font>
                 <font color="#FFFFFF">
-               <a href="${encodeHTML(config.docRoot)}/help/content.html">
-               <img src="${encodeHTML(config.docRoot)}/img/help.gif" border="0" align="absmiddle"></a>
+               <a href="${config.docRoot}/help/content.html">
+               <img src="${config.docRoot}/img/help.gif" border="0" align="absmiddle"></a>
                 </font></B>
         </td>
         <td colspan="4" >
@@ -151,8 +151,8 @@ p {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt}
         <td align="right" valign="top" bgcolor="#AAAAAA">
                 <font color="#ffffff"><B>${lang("content.creator")}:</B></font>
                 <font color="#ffffff">
-               <a href="${encodeHTML(config.docRoot)}/help/content.html">
-               <img src="${encodeHTML(config.docRoot)}/img/help.gif" border="0" align="absmiddle"></a></font>
+               <a href="${config.docRoot}/help/content.html">
+               <img src="${config.docRoot}/img/help.gif" border="0" align="absmiddle"></a></font>
         </td>
         <td colspan="4">
                 <input type="text" size="40" name="creator" value="${encodeHTML(data.creator)}"><br>
@@ -163,8 +163,8 @@ p {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt}
         <td align="right" valign="top" bgcolor="#AAAAAA">
                 <font color="#ffffff"><B>${lang("content.creator.email")}/${lang("content.creator.url")}:</B></font>
                 <font color="#ffffff">
-               <a href="${encodeHTML(config.docRoot)}/help/content.html">
-               <img src="${encodeHTML(config.docRoot)}/img/help.gif" border="0" align="absmiddle"></a></font>
+               <a href="${config.docRoot}/help/content.html">
+               <img src="${config.docRoot}/img/help.gif" border="0" align="absmiddle"></a></font>
         </td>
         <td colspan="4" >
                 <input type="text" size="20" name="creator_email" value="${encodeHTML(data.creator_email)}">
@@ -175,8 +175,8 @@ p {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt}
         <td align="right" valign="top" bgcolor="#AAAAAA">
                 <font color="#ffffff"><B>${lang("content.creator.address")}/${lang("content.creator.telephone")}:</B></font>
                 <font color="#ffffff">
-               <a href="${encodeHTML(config.docRoot)}/help/content.html">
-               <img src="${encodeHTML(config.docRoot)}/img/help.gif" border="0" align="absmiddle"></a></font>
+               <a href="${config.docRoot}/help/content.html">
+               <img src="${config.docRoot}/img/help.gif" border="0" align="absmiddle"></a></font>
         </td>
         <td colspan="4" >
                 <input type="text" size="20" name="creator_address" value="${encodeHTML(data.creator_address)}">
@@ -186,8 +186,8 @@ p {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt}
  <tr>
    <td align="right" valign="top" bgcolor="#AAAAAA">
                 <B><font color="#ffffff">${lang("content.abstract")}:</font></B>
-               <a href="${encodeHTML(config.docRoot)}/help/content.html">
-               <img src="${encodeHTML(config.docRoot)}/img/help.gif" border="0" align="absmiddle"></a>
+               <a href="${config.docRoot}/help/content.html">
+               <img src="${config.docRoot}/img/help.gif" border="0" align="absmiddle"></a>
         </td>
         <td colspan="4">
                 <textarea cols="50" rows="15" name="description" wrap=virtual>${encodeHTML(data.description)}</textarea>
@@ -197,12 +197,12 @@ p {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt}
  <tr>
      <td align="right" valign="top" bgcolor="#AAAAAA">
                 <B><font color="#ffffff">${lang("content.content")}:
-               <a href="${encodeHTML(config.docRoot)}/help/content.html">
-               <img src="${encodeHTML(config.docRoot)}/img/help.gif" border="0" align="absmiddle"></a>
+               <a href="${config.docRoot}/help/content.html">
+               <img src="${config.docRoot}/img/help.gif" border="0" align="absmiddle"></a>
                 ${lang("content.html")}</font> <input type="checkbox" name="is_html" value="1"<if
                 data.is_html=="1"> checked</if>>&nbsp;
-               <a href="${encodeHTML(config.docRoot)}/help/content.html">
-               <img src="${encodeHTML(config.docRoot)}/img/help.gif" border="0" align="absmiddle"></a>
+               <a href="${config.docRoot}/help/content.html">
+               <img src="${config.docRoot}/img/help.gif" border="0" align="absmiddle"></a>
         </font></b></td>
         <td colspan="4">
         <textarea cols="50" rows="20" name="content_data" wrap=virtual>${encodeHTML(data.content_data)}</textarea></td>
@@ -211,8 +211,8 @@ p {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt}
  <tr>
         <td align="right" valign="top" bgcolor="#aaaaaa"><B><font color="#ffffff">Termin (von/bis)
                 <font color="#000000">
-               <a href="${encodeHTML(config.docRoot)}/help/content.html">
-               <img src="${encodeHTML(config.docRoot)}/img/help.gif" border="0" align="absmiddle"></a></font>
+               <a href="${config.docRoot}/help/content.html">
+               <img src="${config.docRoot}/img/help.gif" border="0" align="absmiddle"></a></font>
                 </font>:</B></td>
         <td nowrap>
                 <input type="text" size="8" maxlength="8" name="date_from" value="${encodeHTML(data.date_from)}">
@@ -223,7 +223,7 @@ p {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt}
         </td>
         <td align="right" valign="top" bgcolor="#aaaaaa">
                 <B><font color="#ffffff">Termin Name:&nbsp;
-               <a href="${encodeHTML(config.docRoot)}/help/content.html"><img src="${encodeHTML(config.docRoot)}/img/help.gif" border="0" align="absmiddle"></a>
+               <a href="${config.docRoot}/help/content.html"><img src="${config.docRoot}/img/help.gif" border="0" align="absmiddle"></a>
                 </font></B>
         </td>
         <td>
@@ -237,7 +237,7 @@ p {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt}
                 <i>${lang("content.internal")}</i></font>
         </td>
         <td colspan="4">
-               <textarea cols="50" rows="6" name="comment" wrap=virtual>${encodeHTML(data.comment)}</textarea>
+               <textarea cols="50" rows="6" name="comment" wrap=virtual>${data.comment}</textarea>
         </td>
  </tr>
  
@@ -246,7 +246,7 @@ p {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt}
         <td>&nbsp;</td>
         <td>&nbsp;</td>
         <td colspan="2" align="right" valign="top">
-               frei <a href="${encodeHTML(config.docRoot)}/help/content.html"><img src="${encodeHTML(config.docRoot)}/img/help.gif" border="0" align="absmiddle"></a>:
+               frei <a href="${config.docRoot}/help/content.html"><img src="${config.docRoot}/img/help.gif" border="0" align="absmiddle"></a>:
                 <input type="checkbox" name="is_published" value="1"<if data.is_published!="0" && data.is_published!=""> checked</if>>
                 <if data.new>
                 <input type="submit" name="save" value="${lang("insert")}">
@@ -263,8 +263,8 @@ p {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt}
         <td align=right valign=top bgcolor="#aaaaaa">
                 <B><font color="#ffffff">${lang("content.images")}:</B><br></td>
         <td colspan="4" align="left" valign="top">
-               <a href="${encodeHTML(config.actionRoot)}?module=Images&do=edit&id=${m["id"]}"><img src="${encodeHTML(config.actionRoot)}?module=Images&do=getIcon&id=${m["id"]}" alt="edit" border="0"></a>
-               <a href="${encodeHTML(config.actionRoot)}?module=Content&do=dettach&cid=${encodeHTML(data.id)}&mid=${m["id"]}">${lang("delete")}</a>
+               <a href="${config.actionRoot}?module=Images&do=edit&id=${m["id"]}"><img src="${config.actionRoot}?module=Images&do=getIcon&id=${m["id"]}" alt="edit" border="0"></a>
+               <a href="${config.actionRoot}?module=Content&do=dettach&cid=${data.id}&mid=${m["id"]}">${lang("delete")}</a>
         </td>
  </tr>
  </list>
@@ -272,7 +272,7 @@ p {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt}
         <td align=right valign=top bgcolor="#aaaaaa">
                 <B><font color="#ffffff">${lang("content.media")}:</B><br></td>
         <td colspan="4" align="left" valign="top">
-               <a href="${encodeHTML(config.actionRoot)}?module=Images&do=list&cid=${encodeHTML(data.id)}&query_is_published=1">${lang("content.addimage")}</a>
+               <a href="${config.actionRoot}?module=Images&do=list&cid=${data.id}&query_is_published=1">${lang("content.addimage")}</a>
         </td>
  </tr>
  <list data.to_media_audio as m>
@@ -280,8 +280,8 @@ p {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt}
         <td align=right valign=top bgcolor="#aaaaaa">
                 <B><font color="#ffffff">${lang("content.audio")}:</B><br></td>
         <td colspan="4" align="left" valign="top">
-               <a href="${encodeHTML(config.actionRoot)}?module=Audio&do=edit&id=${m["id"]}"><img src="${encodeHTML(config.docRoot)}/img/${m["big_icon"]}" alt="edit" border="0"></a>
-               <a href="${encodeHTML(config.actionRoot)}?module=Content&do=dettach&cid=${encodeHTML(data.id)}&mid=${m["id"]}">${lang("delete")}</a>
+               <a href="${config.actionRoot}?module=Audio&do=edit&id=${m["id"]}"><img src="${config.docRoot}/img/${m["big_icon"]}" alt="edit" border="0"></a>
+               <a href="${config.actionRoot}?module=Content&do=dettach&cid=${data.id}&mid=${m["id"]}">${lang("delete")}</a>
         </td>
  </tr>
  </list>
@@ -289,7 +289,7 @@ p {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt}
         <td align=right valign=top bgcolor="#aaaaaa">
                 <B><font color="#ffffff">${lang("content.media")}:</B><br></td>
         <td colspan="4" align="left" valign="top">
-               <a href="${encodeHTML(config.actionRoot)}?module=Audio&do=list&cid=${encodeHTML(data.id)}&query_is_published=1">${lang("content.addaudio")}</a>
+               <a href="${config.actionRoot}?module=Audio&do=list&cid=${data.id}&query_is_published=1">${lang("content.addaudio")}</a>
         </td>
  </tr>
  <list data.to_media_video as m>
@@ -297,8 +297,8 @@ p {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt}
         <td align=right valign=top bgcolor="#aaaaaa">
                 <B><font color="#ffffff">${lang("content.video")}:</B><br></td>
         <td colspan="4" align="left" valign="top">
-               <a href="${encodeHTML(config.actionRoot)}?module=Video&do=edit&id=${m["id"]}"><img src="${encodeHTML(config.docRoot)}/img/${m["big_icon"]}" alt="edit" border="0"></a>
-               <a href="${encodeHTML(config.actionRoot)}?module=Content&do=dettach&cid=${encodeHTML(data.id)}&mid=${m["id"]}">${lang("delete")}</a>
+               <a href="${config.actionRoot}?module=Video&do=edit&id=${m["id"]}"><img src="${config.docRoot}/img/${m["big_icon"]}" alt="edit" border="0"></a>
+               <a href="${config.actionRoot}?module=Content&do=dettach&cid=${data.id}&mid=${m["id"]}">${lang("delete")}</a>
         </td>
  </tr>
  </list>
@@ -306,7 +306,7 @@ p {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt}
         <td align=right valign=top bgcolor="#aaaaaa">
                 <B><font color="#ffffff">${lang("content.media")}:</B><br></td>
         <td colspan="4" align="left" valign="top">
-               <a href="${encodeHTML(config.actionRoot)}?module=Video&do=list&cid=${encodeHTML(data.id)}&query_is_published=1">${lang("content.addvideo")}</a>
+               <a href="${config.actionRoot}?module=Video&do=list&cid=${data.id}&query_is_published=1">${lang("content.addvideo")}</a>
         </td>
  </tr>
  <list data.to_media_other as m>
@@ -314,8 +314,8 @@ p {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt}
         <td align=right valign=top bgcolor="#aaaaaa">
                 <B><font color="#ffffff">${lang("content.other")}:</B><br></td>
         <td colspan="4" align="left" valign="top">
-               <a href="${encodeHTML(config.actionRoot)}?module=OtherMedia&do=edit&id=${m["id"]}"><img src="${encodeHTML(config.docRoot)}/img/${m["big_icon"]}" alt="edit" border="0"></a>
-               <a href="${encodeHTML(config.actionRoot)}?module=Content&do=dettach&cid=${encodeHTML(data.id)}&mid=${m["id"]}">${lang("delete")}</a>
+               <a href="${config.actionRoot}?module=OtherMedia&do=edit&id=${m["id"]}"><img src="${config.docRoot}/img/${m["big_icon"]}" alt="edit" border="0"></a>
+               <a href="${config.actionRoot}?module=Content&do=dettach&cid=${data.id}&mid=${m["id"]}">${lang("delete")}</a>
         </td>
  </tr>
  </list>
@@ -323,7 +323,7 @@ p {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt}
         <td align=right valign=top bgcolor="#aaaaaa">
                 <B><font color="#ffffff">${lang("content.media")}:</B><br></td>
         <td colspan="4" align="left" valign="top">
-               <a href="${encodeHTML(config.actionRoot)}?module=OtherMedia&do=list&cid=${encodeHTML(data.id)}&query_is_published=1">${lang("content.addother")}</a>
+               <a href="${config.actionRoot}?module=OtherMedia&do=list&cid=${data.id}&query_is_published=1">${lang("content.addother")}</a>
         </td>
  </tr>
  </table>
diff --git a/templates-dist/admin/contentlist.template b/templates-dist/admin/contentlist.template

index f9c72d3..7f504ea 100755 (executable)
--- a/templates-dist/admin/contentlist.template
+++ b/templates-dist/admin/contentlist.template
@@ -24,44 +24,44 @@
         <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="-2">
-                       ${encodeHTML(entry.webdb_create_formatted)}<br>
-                       <if entry.webdb_lastchange>${encodeHTML(entry.webdb_lastchange_formatted)}<else>-</if><br>
+                       ${entry.webdb_create_formatted}<br>
+                       <if entry.webdb_lastchange>${entry.webdb_lastchange_formatted}<else>-</if><br>
                         <if entry.is_published!="0">F<else>-</if>
                         <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;
-                       <a href="${encodeHTML(config.actionRoot)}?module=Content&do=edit&id=${encodeHTML(entry.id)}&where=${encodeHTML(data.where_encoded)}&order=${encodeHTML(data.order_encoded)}&offset=${encodeHTML(data.offset)}">${lang("edit")}</a>
-                       <if entry.to_article_type=="0">&nbsp;|&nbsp;<a href="${encodeHTML(config.actionRoot)}?module=Content&do=newswire&id=${encodeHTML(entry.id)}&where=${encodeHTML(data.where_encoded)}&order=${encodeHTML(data.order_encoded)}&offset=${encodeHTML(data.offset)}">newswire</a></if></font></td>
+                       <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">
                         <if entry.thema_id!="0">${themenHashData[entry.thema_id]["name"]}</if>&nbsp;<br>
                         <if entry.to_feature!="0">${schwerpunktHashData[entry.to_feature]["title"]}</if>&nbsp;</font></td>
             <td width="20%" <if grey=="1">bgcolor="Pink"<else>bgcolor="Yellow"</if> valign="top"><font face="Verdana, Arial, Helvetica, sans-serif" size="-2">
-                       ${encodeHTML(entry.comment)}&nbsp;</font></td>
+                       ${entry.comment}&nbsp;</font></td>
             <td bgcolor="#888888"><font size="1">
-             <a href="${encodeHTML(config.actionRoot)}?module=Content&do=delete&id=${encodeHTML(entry.id)}&where=${encodeHTML(data.where_encoded)}&order=${encodeHTML(data.order_encoded)}&offset=${encodeHTML(data.offset)}">${lang("delete")}</a>
+             <a href="${config.actionRoot}?module=Content&do=delete&id=${entry.id}&where=${encodeHTML(data.where_encoded)}&order=${encodeHTML(data.order_encoded)}&offset=${data.offset}">${lang("delete")}</a>
               </font></td>
         </tr>
         </list>
         <tr bgcolor="#006600">
-           <td colspan="4"><font color="#ffffff">${encodeHTML(data.count)} ${lang("records")}
+           <td colspan="4"><font color="#ffffff">${data.count} ${lang("records")}
        / ${lang("show_from_to", data.from, data.to)}</font></td></tr>
         </table>
  
        <P>
  <if data.prev || data.next>
- <form method="post" action="${encodeHTML(config.actionRoot)}">
+ <form method="post" action="${config.actionRoot}">
   <input type="hidden" name="module" value="Content">
   <input type="hidden" name="do" value="listop">
   <input type="hidden" name="where" value="${encodeHTML(data.where)}">
   <input type="hidden" name="order" value="${encodeHTML(data.order)}">
  <if data.prev>
- <input type="hidden" name="prevoffset" value="${encodeHTML(data.prev)}">
+ <input type="hidden" name="prevoffset" value="${data.prev}">
   <input type="submit" name="prev" value="${lang("list.previous")}">
  </if>
  <if data.next>
- <input type="hidden" name="nextoffset" value="${encodeHTML(data.next)}">
+ <input type="hidden" name="nextoffset" value="${data.next}">
   <input type="submit" name="next" value="${lang("list.next")}">
  </if>
   </form>
diff --git a/templates-dist/admin/feature.template b/templates-dist/admin/feature.template

index 2255a04..a25a09b 100755 (executable)
--- a/templates-dist/admin/feature.template
+++ b/templates-dist/admin/feature.template
@@ -9,7 +9,7 @@ ${lang("feature.htmltitle")}
  <include "admin/head.template">
  
  <table border="0">
-  <form method="post" action="${encodeHTML(config.actionRoot)}">
+  <form method="post" action="${config.actionRoot}">
      <input type="hidden" name="module" value="Schwerpunkt">
      <input type="hidden" name="where" value="${encodeHTML(data.where)}">
      <input type="hidden" name="offset" value="${encodeHTML(data.offset)}">
@@ -19,7 +19,7 @@ ${lang("feature.htmltitle")}
      <else>
      <input type="hidden" name="do" value="update">
      </if>
-    <input type="hidden" name="id" value="${encodeHTML(data.id)}">
+    <input type="hidden" name="id" value="${data.id}">
      <tr>
        <td align="right" valign="top" bgcolor="#006600"><font color="#ffffff"><B>${lang("feature.title")}:</B></font></td>
        <td>
diff --git a/templates-dist/admin/featurelist.template b/templates-dist/admin/featurelist.template

index 01c9252..9c20e15 100755 (executable)
--- a/templates-dist/admin/featurelist.template
+++ b/templates-dist/admin/featurelist.template
@@ -25,8 +25,8 @@
    <td>${encodeHTML(entry.filename)}&nbsp;</td>
    <td>${encodeHTML(entry.main_url)}&nbsp;</td>
    <td>${encodeHTML(entry.description)}&nbsp;</td>
-  <td><font size="1"> <a href="${encodeHTML(config.actionRoot)}?module=Schwerpunkt&do=delete&id=${encodeHTML(entry.id)}">${lang("delete")}</a>
-  | <a href="${encodeHTML(config.actionRoot)}?module=Schwerpunkt&do=edit&id=${encodeHTML(entry.id)}">${lang("edit")}</a></font></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>
    </list>
  
@@ -35,13 +35,13 @@
        <div align="left"><font color="#ffffff">${encodeHTML(data.count)} ${lang("records")} /
          ${lang("show_from_to", data.from, data.to)}</font></div>
      </td>
-    <td><a href="${encodeHTML(config.docRoot)}"><font size="1">&nbsp;${lang("back")}</font></a></td>
+    <td><a href="${config.docRoot}"><font size="1">&nbsp;${lang("back")}</font></a></td>
    </tr>
  </table>
  
        <P>
  <if (data.prev || data.next)>
- <form method="post" action="${encodeHTML(config.actionRoot)}">
+ <form method="post" action="${config.actionRoot}">
   <input type="hidden" name="module" value="Schwerpunkt">
   <input type="hidden" name="where" value="${encodeHTML(data.where)}">
  <if data.prev>
diff --git a/templates-dist/admin/fileedit.template b/templates-dist/admin/fileedit.template

index 85e8027..2a1cf1f 100755 (executable)
--- a/templates-dist/admin/fileedit.template
+++ b/templates-dist/admin/fileedit.template
@@ -1,7 +1,7 @@
  <html>
  <head>
         <title>${lang("edit")} ${lang("edit")}</title>
-       <link rel="stylesheet" type="text/css" href="${encodeHTML(config.docRoot)}/admin.css">
+       <link rel="stylesheet" type="text/css" href="${config.docRoot}/admin.css">
  
  </head>
  
@@ -14,7 +14,7 @@
  
  <br>
  
-<form action="${encodeHTML(config.actionRoot)}" method="post">
+<form action="${config.actionRoot}" method="post">
  
         <input type="hidden" name="module" value="FileEdit">
         <input type="hidden" name="filename" value="${encodeHTML(data.filename)}">
diff --git a/templates-dist/admin/fileeditlist.template b/templates-dist/admin/fileeditlist.template

index 5c7798d..3720fb7 100755 (executable)
--- a/templates-dist/admin/fileeditlist.template
+++ b/templates-dist/admin/fileeditlist.template
@@ -23,7 +23,7 @@
          <if grey=="1"><assign grey="0">bgcolor="#dddddd" <else><assign grey="1"> </if>
          >
                  <td>${encodeHTML(entry)}&nbsp;</td>
-                <td><font size="1"><a href="${encodeHTML(config.actionRoot)}?module=FileEdit&do=edit&filename=${encodeHTML(entry)}">${lang("edit")}</a></font></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/foot.template b/templates-dist/admin/foot.template

index d0e5a6e..31fb0a4 100755 (executable)
--- a/templates-dist/admin/foot.template
+++ b/templates-dist/admin/foot.template
@@ -6,6 +6,6 @@
         <td align="left" bgcolor="#663399"><font face="Verdana, Arial, Helvetica, sans-serif" size="-1">
         <a href="#top"><font color="white"><b>${lang("foot.top")}</b></font></a></font></td>
         <td align="right"><font face="Verdana, Arial, Helvetica, sans-serif" size="-1">
-       <a href="mailto:${lang("imc.contact-email.address")}"><font color="#663399"><b>${lang("imc.shortname")}</b></font></a> - ${encodeHTML(config.mirVersion)}</font></td>
+       <a href="mailto:${lang("imc.contact-email.address")}"><font color="#663399"><b>${lang("imc.shortname")}</b></font></a> - ${config.mirVersion}</font></td>
  </tr>
  </table>
diff --git a/templates-dist/admin/head.template b/templates-dist/admin/head.template

index 56eb4c0..b705a82 100755 (executable)
--- a/templates-dist/admin/head.template
+++ b/templates-dist/admin/head.template
@@ -1,10 +1,10 @@
  <a name="top">
  <table width="100%" cellspacing="0" cellpadding="0">
-<tr bgcolor="#006600"><td><img src="${encodeHTML(config.docRoot)}/img/head_small.gif" border="0" align="middle">&nbsp;<font face="Verdana, Arial, Helvetica, sans-serif" size="-1" color="white">
+<tr bgcolor="#006600"><td><img src="${config.docRoot}/img/head_small.gif" border="0" align="middle">&nbsp;<font face="Verdana, Arial, Helvetica, sans-serif" size="-1" color="white">
         <b>${lang("imc.name")}</b></font></td></tr>
  <tr><td align="right"><font face="Verdana, Arial, Helvetica, sans-serif" size="-1" color="#663399">
-       <a href="${encodeHTML(config.actionRoot)}"><font color="#663399">${lang("head.start")}</font></a> |
-       <a href="${encodeHTML(config.actionRoot)}?module=logout"><font color="#663399">${lang("head.logout")}</font></a> |
-       <a href="${encodeHTML(config.docRoot)}/help/help.html"><font color="#663399">${lang("head.help")}</font></a> | ${lang("head.search")}</font></td></tr>
+       <a href="${config.actionRoot}"><font color="#663399">${lang("head.start")}</font></a> |
+       <a href="${config.actionRoot}?module=logout"><font color="#663399">${lang("head.logout")}</font></a> |
+       <a href="${config.docRoot}/help/help.html"><font color="#663399">${lang("head.help")}</font></a> | ${lang("head.search")}</font></td></tr>
  <tr><td><hr></td></tr>
  </table>
diff --git a/templates-dist/admin/head_nonavi.template b/templates-dist/admin/head_nonavi.template

index 31494d8..5d8d69e 100755 (executable)
--- a/templates-dist/admin/head_nonavi.template
+++ b/templates-dist/admin/head_nonavi.template
@@ -1,6 +1,6 @@
   <a name="top">
  <table width="100%" cellspacing="0" cellpadding="0">
-<tr bgcolor="#006600"><td><img src="${encodeHTML(config.docRoot)}/img/head_small.gif" border="0" align="middle">&nbsp;<font face="Verdana, Arial, Helvetica, sans-serif" size="-1" color="white">
+<tr bgcolor="#006600"><td><img src="${config.docRoot}/img/head_small.gif" border="0" align="middle">&nbsp;<font face="Verdana, Arial, Helvetica, sans-serif" size="-1" color="white">
         <b>${lang("imc.name")}</b></font></td></tr>
  <if login_user><tr><td align="right"><font face="Verdana, Arial, Helvetica, sans-serif" size="-1" color="#006600">
         <b>${encodeHTML(login_user.login)}</b> ${lang("head.logged_in")} /
diff --git a/templates-dist/admin/hiddenlist.template b/templates-dist/admin/hiddenlist.template

index 192d4ff..96186fa 100755 (executable)
--- a/templates-dist/admin/hiddenlist.template
+++ b/templates-dist/admin/hiddenlist.template
@@ -1,7 +1,7 @@
  <html>
  <head>
         <title>${lang("start.content.hidden")}</title>
-       <link rel="stylesheet" type="text/css" href="${encodeHTML(config.docRoot)}/admin.css">
+       <link rel="stylesheet" type="text/css" href="${config.docRoot}/admin.css">
  
  </head>
  
@@ -13,7 +13,7 @@
      <td>
  
  
-<form method="post" action="${encodeHTML(config.actionRoot)}">
+<form method="post" action="${config.actionRoot}">
         <input type="hidden" name="module" value="Hidden">
         <input type="hidden" name="do" value="list">
  
diff --git a/templates-dist/admin/image.template b/templates-dist/admin/image.template

index 8f0b061..3c71fa6 100755 (executable)
--- a/templates-dist/admin/image.template
+++ b/templates-dist/admin/image.template
@@ -6,7 +6,7 @@ ${lang("image.htmltitle")}
  </head>
  <SCRIPT LANGUAGE="JavaScript">
  function openWin(url) {
-   window.open(url,"vc","scrollbars=0,height=${encodeHTML(data.img_height)},width=${encodeHTML(data.img_width)}");
+   window.open(url,"vc","scrollbars=0,height=${data.img_height},width=${data.img_width}");
  }
  </SCRIPT>
  <body bgcolor="#FFFFFF">
@@ -14,7 +14,7 @@ function openWin(url) {
  
  
  <if data.new>
-<form action="${encodeHTML(config.actionRoot)}?module=Images&do=add" method="post">
+<form action="${config.actionRoot}?module=Images&do=add" method="post">
         <table border="0">
         <tr>
         <td align="right" bgcolor="#006600">
@@ -23,32 +23,32 @@ function openWin(url) {
         </font>
         </td>
         <td>
-       <input type="text" size="3" name="medianum" value="${encodeHTML(medianum)}">&nbsp;<input type="submit" value="${lang("open.posting.nr_of_media.submit")}">
+       <input type="text" size="3" name="medianum" value="${medianum}">&nbsp;<input type="submit" value="${lang("open.posting.nr_of_media.submit")}">
         </td>
         </tr>
         </table> 
  </form>
  </if>
-<form enctype="multipart/form-data" method="post" action="${encodeHTML(config.actionRoot)}?module=Images&do=<if data.new>insert<else>update</if>&id=${encodeHTML(data.id)}">
+<form enctype="multipart/form-data" method="post" action="${config.actionRoot}?module=Images&do=<if data.new>insert<else>update</if>&id=${data.id}">
         <table border="0">
  
         <input type="hidden" name="where" value="${encodeHTML(data.where)}">
         <input type="hidden" name="offset" value="${encodeHTML(data.offset)}">
         <input type="hidden" name="order" value="${encodeHTML(data.order)}">
-       <input type="hidden" name="id" value="${encodeHTML(data.id)}">
+       <input type="hidden" name="id" value="${data.id}">
  
         <if !data.new>
         <tr>
      <td align="right" bgcolor="#006600">
                 <if (data.icon_data!="" && data.icon_data!="0") && !new>
                 <font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
-               <a href="JavaScript:openWin('${encodeHTML(config.actionRoot)}?module=Images&do=getMedia&id=${encodeHTML(data.id)}')">
-               <img src="${encodeHTML(config.actionRoot)}?module=Images&do=getIcon&id=${encodeHTML(data.id)}" border=0></a></font></td>
+               <a href="JavaScript:openWin('${config.actionRoot}?module=Images&do=getMedia&id=${data.id}')">
+               <img src="${config.actionRoot}?module=Images&do=getIcon&id=${data.id}" border=0></a></font></td>
                 </if>
      <td valign="bottom"><font color="Silver" face="Verdana, Arial, Helvetica, sans-serif" size=1>
                 ${lang("media.created")}: ${encodeHTML(data.webdb_create)} <if data.webdb_lastchange>/ ${lang("media.changed")} ${encodeHTML(data.webdb_lastchange)}</if><br>
-               <if data.is_published=="1">${lang("media.published")}: ${encodeHTML(data.publish_date)} / ${encodeHTML(data.publish_server)}${encodeHTML(data.publish_path)}<br></if>
-               ${lang("media.format")}: ${encodeHTML(data.media_descr)} / ${encodeHTML(data.img_width)}x${encodeHTML(data.img_height)} / ${data.imgformatHashdata[to_img_format]["name"]} / ${data.imglayoutHashdata[to_img_layout]["name"]} /  ${data.imgcolorHashdata[to_img_color]["name"]}<br>
+               <if data.is_published=="1">${lang("media.published")}: ${data.publish_date} / ${data.publish_server}${data.publish_path}<br></if>
+               ${lang("media.format")}: ${encodeHTML(data.media_descr)} / ${data.img_width}x${data.img_height} / ${data.imgformatHashdata[to_img_format]["name"]} / ${data.imglayoutHashdata[to_img_layout]["name"]} /  ${data.imgcolorHashdata[to_img_color]["name"]}<br>
                 ${lang("media.rights")}: <b>${data.rightsHashdata[to_rights]["name"]}</b><br>
                 ${lang("media.type")}: <b>${data.imgtypeHashdata[to_img_type]["name"]}</b><br>
         </td>
@@ -71,14 +71,14 @@ function openWin(url) {
         <tr>
      <td align="right" bgcolor="#006600"><font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
          <B>${lang("media.description")}:</B></font></td>
-    <td><input type="text" size="40" maxlength="255" name="description" value="${encodeHTML(data.description)} ${encodeHTML(data.human_readable_size)}"></td>
+    <td><input type="text" size="40" maxlength="255" name="description" value="${encodeHTML(data.description)} ${data.human_readable_size}"></td>
         </tr>
  
         <tr>
      <td align="right" bgcolor="#006600"><font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
          <B>${lang("media.date")}:</B></font></td>
-    <td><input type="text" size="8" maxlength="8" name="date" value="${encodeHTML(data.date)}">
-               <input type="text" size="20" maxlength="40" name="year" value="${encodeHTML(data.year)}"></td>
+    <td><input type="text" size="8" maxlength="8" name="date" value="${data.date}">
+               <input type="text" size="20" maxlength="40" name="year" value="${data.year}"></td>
         </tr>
  
         <tr>
@@ -103,7 +103,7 @@ function openWin(url) {
         <tr>
      <td align="right" bgcolor="#006600"><font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
          <B>${lang("media.comment")}:</B></font></td>
-    <td><textarea cols="40" rows="2" name="comment">${encodeHTML(data.comment)}</textarea></td>
+    <td><textarea cols="40" rows="2" name="comment">${data.comment}</textarea></td>
         </tr>
  
         <tr>
@@ -125,13 +125,13 @@ function openWin(url) {
                         <B>${lang("media.title")}:<B>
                 </font> </td>
                 <td>
-                       <input type="text" name="media_title${encodeHTML(m)}" size="40" maxlength="80" value="">
+                       <input type="text" name="media_title${m}" size="40" maxlength="80" value="">
                 </td>
                 </tr>
                 <tr>
                 <td bgcolor="#006600"></td>
                 <td>
-                               <INPUT TYPE="file" NAME="mpfile${encodeHTML(m)}"><br>
+                               <INPUT TYPE="file" NAME="mpfile${m}"><br>
                 </td>   
                 </tr>   
         </list>
diff --git a/templates-dist/admin/imagelist.template b/templates-dist/admin/imagelist.template

index cbf5946..0aa3731 100755 (executable)
--- a/templates-dist/admin/imagelist.template
+++ b/templates-dist/admin/imagelist.template
@@ -8,10 +8,10 @@
  
  <table border="0" cellpadding="2" cellspacing="1">
    <tr>
-    <td colspan="5"><form method="post" action="${encodeHTML(config.actionRoot)}">
+    <td colspan="5"><form method="post" action="${config.actionRoot}">
         <input type="hidden" name="module" value="Images">
         <input type="hidden" name="do" value="list">
-       <input type="hidden" name="cid" value="${encodeHTML(data.cid)}">
+       <input type="hidden" name="cid" value="${data.cid}">
         <table border="0">
         <tr bgcolor="Pink">
                 <td>${lang("medialist.search_text_in")}:</td>
@@ -72,8 +72,8 @@
    <tr <if grey=="1"><assign grey="0">bgcolor="#dddddd" <else><assign grey="1"> </if>>
    <td>
         <if entry.icon_data!="" && entry.icon_data!="0">
-       <a href="${encodeHTML(config.actionRoot)}?module=Images&do=getMedia&id=${encodeHTML(entry.id)}" target="new">
-         <img src="${encodeHTML(config.actionRoot)}?module=Images&do=getIcon&id=${encodeHTML(entry.id)}" border=0></a></font></td>
+       <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>
@@ -82,10 +82,10 @@
    <td>${data.mediafolderHashdata[entry.to_media_folder]["name"]}&nbsp;</td>
    <td>${encodeHTML(entry.creator)}&nbsp;</td>
    <td><font size="1">&nbsp;
-       <if data.cid><a href="${encodeHTML(config.actionRoot)}?module=Content&do=attach&mid=${encodeHTML(entry.id)}&cid=${encodeHTML(data.cid)}">${lang("attach")}</a>
+       <if data.cid><a href="${config.actionRoot}?module=Content&do=attach&mid=${entry.id}&cid=${data.cid}">${lang("attach")}</a>
         <else>
         <a href="${config.actionRoot}?module=Images&do=delete&id=${entry.id}&query_text=${encodeHTML(data.query_text_encoded)}&query_field=${encodeHTML(data.query_field)}&query_is_published=${data.query_is_published}&query_media_folder=${data.query_media_folder}&offset=${data.offset}">${lang("delete")}</a>
-    | <a href="${encodeHTML(config.actionRoot)}?module=Images&do=edit&id=${encodeHTML(entry.id)}">${lang("edit")}</a>
+    | <a href="${config.actionRoot}?module=Images&do=edit&id=${entry.id}">${lang("edit")}</a>
         </if>
         </font></td>
    </tr>
@@ -98,10 +98,10 @@
  
  <tr><td>
  <if data.prev>
-       <a href="${encodeHTML(config.actionRoot)}?module=Images&do=list&query_text=${encodeHTML(data.query_text_encoded)}&query_field=${encodeHTML(data.query_field)}&query_is_published=${encodeHTML(data.query_is_published)}&query_media_folder=${encodeHTML(data.query_media_folder)}&offset=${encodeHTML(data.prev)}&prev=zur&uuml;ck&cid=${encodeHTML(data.cid)}">zurueck</a>&nbsp;
+       <a href="${config.actionRoot}?module=Images&do=list&query_text=${encodeHTML(data.query_text_encoded)}&query_field=${encodeHTML(data.query_field)}&query_is_published=${encodeHTML(data.query_is_published)}&query_media_folder=${encodeHTML(data.query_media_folder)}&offset=${encodeHTML(data.prev)}&prev=zur&uuml;ck&cid=${data.cid}">zurueck</a>&nbsp;
  </if>
  <if data.next>
-<a href="${encodeHTML(config.actionRoot)}?module=Images&do=list&query_text=${encodeHTML(data.query_text_encoded)}&query_field=${encodeHTML(data.query_field)}&query_is_published=${encodeHTML(data.query_is_published)}&query_media_folder=${encodeHTML(data.query_media_folder)}&offset=${encodeHTML(data.next)}&next=weiter&cid=${encodeHTML(data.cid)}">weiter</a>
+<a href="${config.actionRoot}?module=Images&do=list&query_text=${encodeHTML(data.query_text_encoded)}&query_field=${encodeHTML(data.query_field)}&query_is_published=${encodeHTML(data.query_is_published)}&query_media_folder=${encodeHTML(data.query_media_folder)}&offset=${encodeHTML(data.next)}&next=weiter&cid=${data.cid}">weiter</a>
  </if>
  </td></tr>
  <else>
diff --git a/templates-dist/admin/language.template b/templates-dist/admin/language.template

index e49420b..0384abe 100755 (executable)
--- a/templates-dist/admin/language.template
+++ b/templates-dist/admin/language.template
@@ -7,9 +7,9 @@ ${lang("language.htmltitle")}
  
  <body bgcolor="#FFFFFF">
  <include "admin/head.template">
-<form action="${encodeHTML(config.actionRoot)}" method="post">
+<form action="${config.actionRoot}" method="post">
         <input type="hidden" name="module" value="Language">
-       <input type="hidden" name="id" value="${encodeHTML(id)}">
+       <input type="hidden" name="id" value="${data.id}">
         <if data.new><input type="hidden" name="do" value="insert">
         <else><input type="hidden" name="do" value="update"></if>
  <table border="0">
@@ -26,7 +26,7 @@ ${lang("language.htmltitle")}
      <td align="right" bgcolor="#006600"><font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
           <B>${lang("language.code")}:</B></font></td>
      <td>
-         <input type="text" name="code" size="2" maxlength="2" value="${encodeHTML(data.code)}">
+         <input type="text" name="code" size="2" maxlength="2" value="${data.code}">
      </td>
    </tr>
  
diff --git a/templates-dist/admin/languagelist.template b/templates-dist/admin/languagelist.template

index 2e884ba..4f2d658 100755 (executable)
--- a/templates-dist/admin/languagelist.template
+++ b/templates-dist/admin/languagelist.template
@@ -19,12 +19,12 @@
    >
    <td>${encodeHTML(entry.name)}&nbsp;</td>
    <td>${encodeHTML(entry.code)}&nbsp;</td>
-  <td><font size="1">&nbsp;<a href="${encodeHTML(config.actionRoot)}?module=Language&do=delete&id=${encodeHTML(entry.id)}">${lang("delete")}</a>
-    | <a href="${encodeHTML(config.actionRoot)}?module=Language&do=edit&id=${encodeHTML(entry.id)}">${lang("edit")}</a></font></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>
    </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>
@@ -32,10 +32,10 @@
  
        <P>
  <if data.prev>
-       <a href="${encodeHTML(config.actionRoot)}?module=Language&do=list&where=${encodeHTML(data.where)}&prevoffset=${encodeHTML(data.prev)}&prev=zur&uuml;ck">${lang("list.previous")}</a>&nbsp;
+       <a href="${config.actionRoot}?module=Language&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(config.actionRoot)}?module=Language&do=list&where=${encodeHTML(data.where)}&nextoffset=${encodeHTML(data.next)}&next=weiter">${lang("list.next")}</a>
+<a href="${config.actionRoot}?module=Language&do=list&where=${encodeHTML(data.where)}&nextoffset=${encodeHTML(data.next)}&next=weiter">${lang("list.next")}</a>
  </if>
  
  <else>
diff --git a/templates-dist/admin/linksimcs.template b/templates-dist/admin/linksimcs.template

index 8b4087a..4608f42 100755 (executable)
--- a/templates-dist/admin/linksimcs.template
+++ b/templates-dist/admin/linksimcs.template
@@ -7,7 +7,7 @@ ${lang("linkimcs.htmltitle")}
  <head>
  <body bgcolor="#FFFFFF">
  <include "admin/head.template">
-<form action="${encodeHTML(config.actionRoot)}" method="post">
+<form action="${config.actionRoot}" method="post">
         <input type=hidden name=module value=LinksImcs>
         <input type="hidden" name="id" value="${encodeHTML(data.entity.id)}">
         <if data.new><input type="hidden" name="do" value="insert">
@@ -27,7 +27,7 @@ ${lang("linkimcs.htmltitle")}
                 <if data.parentlist>
         <select name="to_parent_id" size="1">
                         <option value=NULL> ${lang("linkimcs.new_parent")}
-                       <list data.parentlist as entry><option value="${encodeHTML(entry.id)}"<if entry.id == data.entity.to_parent_id> selected</if>> ${encodeHTML(entry.title)}</list>
+                       <list data.parentlist as entry><option value="${entry.id}"<if entry.id == data.entity.to_parent_id> selected</if>> ${encodeHTML(entry.title)}</list>
                 </select>
                 </if>
      </td>
diff --git a/templates-dist/admin/linksimcslist.template b/templates-dist/admin/linksimcslist.template

index 17eba79..974116b 100755 (executable)
--- a/templates-dist/admin/linksimcslist.template
+++ b/templates-dist/admin/linksimcslist.template
@@ -5,7 +5,7 @@
  <body bgcolor="#FFFFFF">\r
  <include "admin/head.template">\r
  \r
-<form method="post" action="${encodeHTML(config.actionRoot)}">\r
+<form method="post" action="${config.actionRoot}">\r
         <input type="hidden" name="module" value="LinksImcs">\r
         <input type="hidden" name="do" value="list">\r
         <input type="hidden" name="cid" value="">\r
@@ -78,8 +78,8 @@
         <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=${encodeHTML(entry.id)}">${lang("delete")}</a>\r
-       | <a href="${encodeHTML(actionRoot)}?module=LinksImcs&do=edit&id=${encodeHTML(entry.id)}">${lang("edit")}</a></font>\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>\r
    </tr>\r
    </list>\r
@@ -91,10 +91,10 @@
  </table>\r
  <P>\r
  <if data.prev>\r
-       <a href="${encodeHTML(config.actionRoot)}?module=LinksImcs&do=list&order=${encodeHTML(data.order)}&query_text=${encodeHTML(data.query_text_encoded)}&query_field=${encodeHTML(data.query_field)}&to_parent_id=${encodeHTML(data.to_parent_id)}&to_language=${encodeHTML(data.to_language)}&prevoffset=${encodeHTML(data.prev)}&prev=zur&uuml;ck">${lang("list.previous")}</a>&nbsp;\r
+       <a href="${config.actionRoot}?module=LinksImcs&do=list&order=${encodeHTML(data.order)}&query_text=${encodeHTML(data.query_text_encoded)}&query_field=${encodeHTML(data.query_field)}&to_parent_id=${encodeHTML(data.to_parent_id)}&to_language=${encodeHTML(data.to_language)}&prevoffset=${encodeHTML(data.prev)}&prev=zur&uuml;ck">${lang("list.previous")}</a>&nbsp;\r
  </if>\r
  <if data.next>\r
-<a href="${encodeHTML(config.actionRoot)}?module=LinksImcs&do=list&order=${encodeHTML(data.order)}&query_text=${encodeHTML(data.query_text_encoded)}&query_field=${encodeHTML(data.query_field)}&to_parent_id=${encodeHTML(data.to_parent_id)}&to_language=${encodeHTML(data.to_language)}&nextoffset=${encodeHTML(data.next)}&next=weiter">${lang("list.next")}</a>\r
+<a href="${config.actionRoot}?module=LinksImcs&do=list&order=${encodeHTML(data.order)}&query_text=${encodeHTML(data.query_text_encoded)}&query_field=${encodeHTML(data.query_field)}&to_parent_id=${encodeHTML(data.to_parent_id)}&to_language=${encodeHTML(data.to_language)}&nextoffset=${encodeHTML(data.next)}&next=weiter">${lang("list.next")}</a>\r
  </if>\r
  \r
  <else>\r
diff --git a/templates-dist/admin/login.template b/templates-dist/admin/login.template

index cfd7b5f..b127603 100755 (executable)
--- a/templates-dist/admin/login.template
+++ b/templates-dist/admin/login.template
@@ -18,7 +18,7 @@
          <a href="mailto:${lang("imc.contact-email.address")}"><font color="#663399">${lang("imc.contact-email.name")}</font></a>.
          </font></p>
         <hr>
-    <form method="post" action="${encodeHTML(config.actionRootLogin)}">
+    <form method="post" action="${config.actionRootLogin}">
         <input type="hidden" name="module" value="login">
                 <table border="0" cellpadding="2" cellspacing="0" bgcolor="#006600">
                         <tr bgcolor="#663399">
diff --git a/templates-dist/admin/media.template b/templates-dist/admin/media.template

index de50af4..08ddcec 100755 (executable)
--- a/templates-dist/admin/media.template
+++ b/templates-dist/admin/media.template
@@ -4,16 +4,11 @@
  ${lang("other_media.htmltitle")}
  </title>
  <head>
-<SCRIPT LANGUAGE="JavaScript">
-function openWin(url) {
-   window.open(url,"vc","scrollbars=0,height=${encodeHTML(data.img_height)},width=${encodeHTML(data.img_width)}");
-}
-</SCRIPT>
  <body bgcolor="#FFFFFF">
  <include "admin/head.template">
  
  <if data.new>
-<form action="${encodeHTML(config.actionRoot)}?module=OtherMedia&do=add" method="post">
+<form action="${config.actionRoot}?module=OtherMedia&do=add" method="post">
         <table border="0">
         <tr>
         <td align="right" bgcolor="#006600">
@@ -22,31 +17,31 @@ function openWin(url) {
         </font>
         </td>
         <td>
-       <input type="text" size="3" name="medianum" value="${encodeHTML(medianum)}">&nbsp;<input type="submit" value="${lang("open.posting.nr_of_media.submit")}">
+       <input type="text" size="3" name="medianum" value="${medianum}">&nbsp;<input type="submit" value="${lang("open.posting.nr_of_media.submit")}">
         </td>
         </tr>
         </table> 
  </form>
  </if>
-<form enctype="multipart/form-data" method="post" action="${encodeHTML(config.actionRoot)}?module=OtherMedia&do=<if data.new>insert<else>update</if>&id=${encodeHTML(data.id)}">
+<form enctype="multipart/form-data" method="post" action="${config.actionRoot}?module=OtherMedia&do=<if data.new>insert<else>update</if>&id=${data.id}">
  
         <input type="hidden" name="where" value="${encodeHTML(data.where)}">
         <input type="hidden" name="offset" value="${encodeHTML(data.offset)}">
         <input type="hidden" name="order" value="${encodeHTML(data.order)}">
-       <input type="hidden" name="id" value="${encodeHTML(data.id)}">
+       <input type="hidden" name="id" value="${data.id}">
  
         <table border="0">
         <if !data.new>
         <tr>
      <td align="right" bgcolor="#006600">
                 <font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
-                       <a href="${encodeHTML(config.actionRoot)}?module=OtherMedia&do=getMedia&id=${encodeHTML(data.id)}">
-                       <img src="${encodeHTML(config.docRoot)}/img/${encodeHTML(data.big_icon)}" border=0></a></font></td>
+                       <a href="${config.actionRoot}?module=OtherMedia&do=getMedia&id=${data.id}">
+                       <img src="${config.docRoot}/img/${data.big_icon}" border=0></a></font></td>
      <td valign="bottom"><font color="Silver" face="Verdana, Arial, Helvetica, sans-serif" size=1>
-               ${lang("media.created")}: ${encodeHTML(data.webdb_create)}
-        <if data.webdb_lastchange>/ ${lang("media.changed")} ${encodeHTML(data.webdb_lastchange)}</if><br>
-               <if data.is_published=="1">${lang("media.published")}: ${encodeHTML(data.publish_date)} / ${encodeHTML(data.publish_server)}${encodeHTML(data.publish_path)}<br></if>
-               ${lang("media.format")}: ${encodeHTML(data.mimetype)} / ${encodeHTML(data.human_readable_size)}<br>
+               ${lang("media.created")}: ${data.webdb_create}
+        <if data.webdb_lastchange>/ ${lang("media.changed")} ${data.webdb_lastchange}</if><br>
+               <if data.is_published=="1">${lang("media.published")}: ${data.publish_date} / ${data.publish_server}${data.publish_path}<br></if>
+               ${lang("media.format")}: ${data.mimetype} / ${data.human_readable_size}<br>
                 ${lang("media.rights")}: <b>${data.rightsHashdata[to_rights]["name"]}</b><br>
         </td>
         </tr>
@@ -73,8 +68,8 @@ function openWin(url) {
         <tr>
      <td align="right" bgcolor="#006600"><font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
          <B>${lang("media.date")}:</B></font></td>
-    <td><input type="text" size="8" maxlength="8" name="date" value="${encodeHTML(data.date)}">
-               <input type="text" size="20" maxlength="40" name="year" value="${encodeHTML(data.year)}"></td>
+    <td><input type="text" size="8" maxlength="8" name="date" value="${data.date}">
+               <input type="text" size="20" maxlength="40" name="year" value="${data.year}"></td>
         </tr>
  
         <tr>
@@ -99,7 +94,7 @@ function openWin(url) {
         <tr>
      <td align="right" bgcolor="#006600"><font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
          <B>${lang("media.comment")}:</B></font></td>
-    <td><textarea cols="40" rows="2" name="comment">${encodeHTML(data.comment)}</textarea></td>
+    <td><textarea cols="40" rows="2" name="comment">${data.comment}</textarea></td>
         </tr>
  
         <tr>
@@ -123,13 +118,13 @@ function openWin(url) {
                         <B>${lang("media.title")}:<B>
                 </font> </td>
                 <td>
-                       <input type="text" name="media_title${encodeHTML(m)}" size="40" maxlength="80" value="">
+                       <input type="text" name="media_title${m}" size="40" maxlength="80" value="">
                 </td>
                 </tr>
                 <tr>
                 <td bgcolor="#006600"></td>
                 <td>
-                               <INPUT TYPE="file" NAME="mpfile${encodeHTML(m)}"><br>
+                               <INPUT TYPE="file" NAME="mpfile${m}"><br>
                 </td>   
                 </tr>   
         </list>
diff --git a/templates-dist/admin/mediafolder.template b/templates-dist/admin/mediafolder.template

index ab7f31c..2b29bf7 100755 (executable)
--- a/templates-dist/admin/mediafolder.template
+++ b/templates-dist/admin/mediafolder.template
@@ -7,9 +7,9 @@ ${lang("mediafolder.htmltitle")}
  
  <body bgcolor="#FFFFFF">
  <include "admin/head.template">
-<form method="post" action="${encodeHTML(config.actionRoot)}">
+<form method="post" action="${config.actionRoot}">
         <input type=hidden name=module value=Mediafolder>
-       <input type="hidden" name="id" value="${encodeHTML(data.id)}">
+       <input type="hidden" name="id" value="${data.id}">
         <if data.new> <input type="hidden" name="do" value="insert">
         <else>   <input type="hidden" name="do" value="update"></if>
  
diff --git a/templates-dist/admin/mediafolderlist.template b/templates-dist/admin/mediafolderlist.template

index 542c804..93897fe 100755 (executable)
--- a/templates-dist/admin/mediafolderlist.template
+++ b/templates-dist/admin/mediafolderlist.template
@@ -16,28 +16,28 @@
                  </tr>
           <list data.contentlist as entry>
                   <tr <if grey=="1"><assign grey="0">bgcolor="#dddddd" <else><assign grey="1"> </if> >
-                       <td>${encodeHTML(entry.date)}&nbsp;</td>
+                       <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><font size="1"><a href="${encodeHTML(config.actionRoot)}?module=Mediafolder&do=delete&id=${encodeHTML(entry.id)}">${lang("delete")}</a>
-                       | <a href="${encodeHTML(config.actionRoot)}?module=Mediafolder&do=edit&id=${encodeHTML(entry.id)}">${lang("edit")}</a>
-                               | <a href="${encodeHTML(config.actionRoot)}?module=Images&do=list&query_media_folder=${encodeHTML(entry.id)}">${lang("list")}</a></font></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>
                   </tr>
           </list>
                 <tr>
-       <td colspan="5" bgcolor="#006600"><font color="#ffffff">${encodeHTML(data.count)} ${lang("records")} /
+       <td colspan="5" bgcolor="#006600"><font color="#ffffff">${data.count} ${lang("records")} /
          ${lang("show_from_to", data.from, data.to)}</font></td>
         <td>&nbsp;</td>
                 </tr>
         </table>
        <P>
         <if data.prev>
-       <a href="${encodeHTML(config.actionRoot)}?module=Mediafolder&do=list&where=${encodeHTML(data.where)}&prevoffset=${encodeHTML(data.prev)}&prev=zur&uuml;ck">${lang("list.previous")}</a>&nbsp;
+       <a href="${config.actionRoot}?module=Mediafolder&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(config.actionRoot)}?module=Mediafolder&do=list&where=${encodeHTML(data.where)}&nextoffset=${encodeHTML(data.next)}&next=weiter">${lang("list.next")}</a>
+       <a href="${config.actionRoot}?module=Mediafolder&do=list&where=${encodeHTML(data.where)}&nextoffset=${encodeHTML(data.next)}&next=weiter">${lang("list.next")}</a>
         </if>
  <else>
    <P align="center">${lang("no_matches_found")}</p>
diff --git a/templates-dist/admin/medialist.template b/templates-dist/admin/medialist.template

index cd70fb5..6758f47 100755 (executable)
--- a/templates-dist/admin/medialist.template
+++ b/templates-dist/admin/medialist.template
@@ -8,10 +8,10 @@
  
  <table border="0" cellpadding="2" cellspacing="1">
    <tr>
-    <td colspan="5"><form method="post" action="${encodeHTML(config.actionRoot)}">
+    <td colspan="5"><form method="post" action="${config.actionRoot}">
         <input type="hidden" name="module" value="OtherMedia">
         <input type="hidden" name="do" value="list">
-       <input type="hidden" name="cid" value="${encodeHTML(data.cid)}">
+       <input type="hidden" name="cid" value="${data.cid}">
         <table border="0">
         <tr bgcolor="Pink">
                 <td>${lang("medialist.search_text_in")}:</td>
@@ -71,35 +71,35 @@
    <list data.contentlist as entry>
    <tr <if grey=="1"><assign grey="0">bgcolor="#dddddd" <else><assign grey="1"> </if>>
    <td>
-         <a href="${encodeHTML(config.actionRoot)}?module=OtherMedia&do=getMedia&id=${encodeHTML(entry.id)}">
-         <img src="${encodeHTML(config.docRoot)}/img/${encodeHTML(entry.big_icon)}" border=0></a></font></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>${encodeHTML(entry.human_readable_size)}&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><font size="1">&nbsp;
-       <if data.cid><a href="${encodeHTML(config.actionRoot)}?module=Content&do=attach&mid=${encodeHTML(entry.id)}&cid=${encodeHTML(data.cid)}">${lang("attach")}</a>
+       <if data.cid><a href="${config.actionRoot}?module=Content&do=attach&mid=${entry.id}&cid=${data.cid}">${lang("attach")}</a>
         <else>
         <a href="${config.actionRoot}?module=OtherMedia&do=delete&id=${entry.id}&query_text=${encodeHTML(data.query_text_encoded)}&query_field=${encodeHTML(data.query_field)}&query_is_published=${data.query_is_published}&query_media_folder=${data.query_media_folder}&offset=${data.offset}">${lang("delete")}</a>
-    | <a href="${encodeHTML(config.actionRoot)}?module=OtherMedia&do=edit&id=${encodeHTML(entry.id)}">${lang("edit")}</a>
+    | <a href="${config.actionRoot}?module=OtherMedia&do=edit&id=${entry.id}">${lang("edit")}</a>
         </if>
         </font></td>
    </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>
  
  <tr><td>
  <if data.prev>
-       <a href="${encodeHTML(config.actionRoot)}?module=OtherMedia&do=list&query_text=${encodeHTML(data.query_text_encoded)}&query_field=${encodeHTML(data.query_field)}&query_is_published=${encodeHTML(data.query_is_published)}&query_media_folder=${encodeHTML(data.query_media_folder)}&offset=${encodeHTML(data.prev)}&prev=zur&uuml;ck&cid=${encodeHTML(data.cid)}">zurueck</a>&nbsp;
+       <a href="${config.actionRoot}?module=OtherMedia&do=list&query_text=${encodeHTML(data.query_text_encoded)}&query_field=${encodeHTML(data.query_field)}&query_is_published=${encodeHTML(data.query_is_published)}&query_media_folder=${encodeHTML(data.query_media_folder)}&offset=${encodeHTML(data.prev)}&prev=zur&uuml;ck&cid=${data.cid}">zurueck</a>&nbsp;
  </if>
  <if data.next>
-<a href="${encodeHTML(config.actionRoot)}?module=OtherMedia&do=list&query_text=${encodeHTML(data.query_text_encoded)}&query_field=${encodeHTML(data.query_field)}&query_is_published=${encodeHTML(data.query_is_published)}&query_media_folder=${encodeHTML(data.query_media_folder)}&offset=${encodeHTML(data.next)}&next=weiter&cid=${encodeHTML(data.cid)}">weiter</a>
+<a href="${config.actionRoot}?module=OtherMedia&do=list&query_text=${encodeHTML(data.query_text_encoded)}&query_field=${encodeHTML(data.query_field)}&query_is_published=${encodeHTML(data.query_is_published)}&query_media_folder=${encodeHTML(data.query_media_folder)}&offset=${encodeHTML(data.next)}&next=weiter&cid=${data.cid}">weiter</a>
  </if>
  </td></tr>
  <else>
diff --git a/templates-dist/admin/message.template b/templates-dist/admin/message.template

index 4aa3305..c6bafb9 100755 (executable)
--- a/templates-dist/admin/message.template
+++ b/templates-dist/admin/message.template
@@ -7,9 +7,9 @@ ${lang("message.htmltitle")}
  
  <body bgcolor="#FFFFFF">
  <include "admin/head.template">
-<form action="${encodeHTML(config.actionRoot)}" method="post">
+<form action="${config.actionRoot}" method="post">
         <input type="hidden" name="module" value="Message">
-       <input type="hidden" name="id" value="${encodeHTML(data.id)}">
+       <input type="hidden" name="id" value="${data.id}">
         <if data.new><input type="hidden" name="do" value="insert">
         <else><input type="hidden" name="do" value="update"></if>
  <table border="0">
@@ -17,7 +17,7 @@ ${lang("message.htmltitle")}
      <td align="right" bgcolor="#006600"><font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
         <B>${lang("message.date")}:</B></font></td>
      <td>
-      ${encodeHTML(data.date)}
+      ${data.date}
      </td>
    </tr>
  
diff --git a/templates-dist/admin/messagelist.template b/templates-dist/admin/messagelist.template

index 1274bb2..2d03919 100755 (executable)
--- a/templates-dist/admin/messagelist.template
+++ b/templates-dist/admin/messagelist.template
@@ -20,12 +20,12 @@
    <tr
         <if grey=="1"><assign grey="0">bgcolor="#dddddd" <else><assign grey="1"> </if>
    >
-  <td>${encodeHTML(entry.webdb_create)}&nbsp;</td>
+  <td>${entry.webdb_create}&nbsp;</td>
    <td><b>${encodeHTML(entry.title)}</b><br>
        <i>${encodeHTML(entry.creator)}</i></td>
    <td bgcolor="Pink">${encodeHTML(entry.description)}&nbsp;</td>
-  <td><font size="1">&nbsp;<a href="${encodeHTML(config.actionRoot)}?module=Message&do=delete&id=${encodeHTML(entry.id)}">${lang("delete")}</a>
-    | <a href="${encodeHTML(config.actionRoot)}?module=Message&do=edit&id=${encodeHTML(entry.id)}">${lang("edit")}</a></font></td>
+  <td><font size="1">&nbsp;<a href="${config.actionRoot}?module=Message&do=delete&id=${entry.id}">${lang("delete")}</a>
+    | <a href="${config.actionRoot}?module=Message&do=edit&id=${entry.id}">${lang("edit")}</a></font></td>
    </tr>
    </list>
    <tr>
@@ -37,10 +37,10 @@
  
        <P>
  <if data.prev>
-       <a href="${encodeHTML(config.actionRoot)}?module=Users&do=list&where=${encodeHTML(data.where)}&prevoffset=${encodeHTML(data.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(config.actionRoot)}?module=Users&do=list&where=${encodeHTML(data.where)}&nextoffset=${encodeHTML(data.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>
@@ -48,4 +48,4 @@
  </if>
  <include "admin/foot.template">
  </body>
-</html>
-\ No newline at end of file
+</html>
diff --git a/templates-dist/admin/start_admin.template b/templates-dist/admin/start_admin.template

index 6ee2901..5cef834 100755 (executable)
--- a/templates-dist/admin/start_admin.template
+++ b/templates-dist/admin/start_admin.template
@@ -15,23 +15,23 @@
                 <b>${lang("start.openpostings.title")}</b></font>
  
          <p>
-               <a href="${encodeHTML(config.actionRoot)}?module=Content&do=listop&order=webdb_create+desc">
-               <img src="${encodeHTML(config.docRoot)}/img/pointgris.gif" border=0>${lang("edit")}</a>
+               <a href="${config.actionRoot}?module=Content&do=listop&order=webdb_create+desc">
+               <img src="${config.docRoot}/img/pointgris.gif" border=0>${lang("edit")}</a>
  
                 <p>
                         <font face="Verdana, Arial, Helvetica, sans-serif" size="2" color="#663399">
                         <b>${lang("start.comments.title")}</b></font>
                 <p>
-                       <a href="${encodeHTML(config.actionRoot)}?module=Comment&do=list">
-                       <img src="${encodeHTML(config.docRoot)}/img/pointgris.gif" border=0>${lang("edit")}</a>
+                       <a href="${config.actionRoot}?module=Comment&do=list">
+                       <img src="${config.docRoot}/img/pointgris.gif" border=0>${lang("edit")}</a>
             <p>
                         <font face="Verdana, Arial, Helvetica, sans-serif" size="2" color="#663399">
                         <b>${lang("start.breaking.title")}</b></font>
                 <p>
-                       <img src="${encodeHTML(config.docRoot)}/img/pointgris.gif" border=0>
-                       <a href="${encodeHTML(config.actionRoot)}?module=Breaking&do=list">${lang("edit")}</a>
-               <img src="${encodeHTML(config.docRoot)}/img/pointgris.gif" border=0>
-                       <a href="${encodeHTML(config.actionRoot)}?module=Breaking&do=add">${lang("start.breaking.new")}</a>
+                       <img src="${config.docRoot}/img/pointgris.gif" border=0>
+                       <a href="${config.actionRoot}?module=Breaking&do=list">${lang("edit")}</a>
+               <img src="${config.docRoot}/img/pointgris.gif" border=0>
+                       <a href="${config.actionRoot}?module=Breaking&do=add">${lang("start.breaking.new")}</a>
  
                         <table width="100%" border="0">
                 <tr><td bgcolor="white">&nbsp;</td></tr>
@@ -41,42 +41,42 @@
                         <b>${lang("start.content.title")}</b></font>
  
                 <p>
-                       <img src="${encodeHTML(config.docRoot)}/img/pointgris.gif" border=0>
-                       <a href="${encodeHTML(config.actionRoot)}?module=Content&do=add&where=aktuell">${lang("start.content.new")}</a>
+                       <img src="${config.docRoot}/img/pointgris.gif" border=0>
+                       <a href="${config.actionRoot}?module=Content&do=add&where=aktuell">${lang("start.content.new")}</a>
             <p>
                         <b>${lang("start.show")}:</b><br>
-                       <img src="${encodeHTML(config.docRoot)}/img/pointgris.gif" border=0>
-                       <a href="${encodeHTML(config.actionRoot)}?module=Content&do=list&where=newswire">${lang("start.content.newswire")}</a><br>
-                       <img src="${encodeHTML(config.docRoot)}/img/pointgris.gif" border=0>
-                       <a href="${encodeHTML(config.actionRoot)}?module=Content&do=list&where=feature">${lang("start.content.feature")}</a><br>
-                       <img src="${encodeHTML(config.docRoot)}/img/pointgris.gif" border=0>
-                       <a href="${encodeHTML(config.actionRoot)}?module=Content&do=list&where=themenspecial">${lang("start.content.topicspecial")}</a><br>
-                       <img src="${encodeHTML(config.docRoot)}/img/pointgris.gif" border=0>
-                       <a href="${encodeHTML(config.actionRoot)}?module=Content&do=list&where=special">${lang("start.content.startspecial")}</a><br>
+                       <img src="${config.docRoot}/img/pointgris.gif" border=0>
+                       <a href="${config.actionRoot}?module=Content&do=list&where=newswire">${lang("start.content.newswire")}</a><br>
+                       <img src="${config.docRoot}/img/pointgris.gif" border=0>
+                       <a href="${config.actionRoot}?module=Content&do=list&where=feature">${lang("start.content.feature")}</a><br>
+                       <img src="${config.docRoot}/img/pointgris.gif" border=0>
+                       <a href="${config.actionRoot}?module=Content&do=list&where=themenspecial">${lang("start.content.topicspecial")}</a><br>
+                       <img src="${config.docRoot}/img/pointgris.gif" border=0>
+                       <a href="${config.actionRoot}?module=Content&do=list&where=special">${lang("start.content.startspecial")}</a><br>
                         <br>
-               <img src="${encodeHTML(config.docRoot)}/img/pointgris.gif" border=0>
-                       <a href="${encodeHTML(config.actionRoot)}?module=Content&do=list&where=nfrei" >${lang("start.content.not_published")}</a><br>
-                       <img src="${encodeHTML(config.docRoot)}/img/pointgris.gif" border=0>
-                       <a href="${encodeHTML(config.actionRoot)}?module=Content&do=list&where=media">${lang("start.content.with_media")}</a><br>
-                       <img src="${encodeHTML(config.docRoot)}/img/pointgris.gif" border=0>
-                       <a href="${encodeHTML(config.actionRoot)}?module=Content&do=list&where=lastchange">${lang("start.content.last_changes")}</a><br>
-                       <img src="${encodeHTML(config.docRoot)}/img/pointgris.gif" border=0>
-                       <a href="${encodeHTML(config.actionRoot)}?module=Content&do=list&where=comments">${lang("start.content.with_comments")}</a><br>
+               <img src="${config.docRoot}/img/pointgris.gif" border=0>
+                       <a href="${config.actionRoot}?module=Content&do=list&where=nfrei" >${lang("start.content.not_published")}</a><br>
+                       <img src="${config.docRoot}/img/pointgris.gif" border=0>
+                       <a href="${config.actionRoot}?module=Content&do=list&where=media">${lang("start.content.with_media")}</a><br>
+                       <img src="${config.docRoot}/img/pointgris.gif" border=0>
+                       <a href="${config.actionRoot}?module=Content&do=list&where=lastchange">${lang("start.content.last_changes")}</a><br>
+                       <img src="${config.docRoot}/img/pointgris.gif" border=0>
+                       <a href="${config.actionRoot}?module=Content&do=list&where=comments">${lang("start.content.with_comments")}</a><br>
                          <br>
-                        <img src="${encodeHTML(config.docRoot)}/img/pointgris.gif" border=0>
-                        <a href="${encodeHTML(config.actionRoot)}?module=Hidden&do=list">${lang("start.content.hidden")}</a>
+                        <img src="${config.docRoot}/img/pointgris.gif" border=0>
+                        <a href="${config.actionRoot}?module=Hidden&do=list">${lang("start.content.hidden")}</a>
  
  <br><br>
                          <b>here to edit all the include files:</b>
                          <br>
-                        <img src="${encodeHTML(config.docRoot)}/img/pointgris.gif" border=0>&nbsp;
-                        <a href="${encodeHTML(config.actionRoot)}?module=FileEdit&do=list">${lang("edit")}
+                        <img src="${config.docRoot}/img/pointgris.gif" border=0>&nbsp;
+                        <a href="${config.actionRoot}?module=FileEdit&do=list">${lang("edit")}
  ${lang("file")}</a>
  
                          <br><br>
  
  
-     <form action="${encodeHTML(config.actionRoot)}" method="post">
+     <form action="${config.actionRoot}" method="post">
              <input type="hidden" name="module" value="Content">
         <input type="hidden" name="do" value="search">
         <input type="hidden" name="order" value="date desc">
@@ -104,64 +104,64 @@ ${lang("file")}</a>
                                 <br>
                                 ${lang("start.generate.all.title")}:
                                 <br>
-                               <img src="${encodeHTML(config.docRoot)}/img/pointgris.gif" border=0>
-                               <a href="${encodeHTML(config.actionRoot)}?module=Producer&task=All">${lang("start.generate.all.new")}</a> &nbsp;|&nbsp;
+                               <img src="${config.docRoot}/img/pointgris.gif" border=0>
+                               <a href="${config.actionRoot}?module=Producer&task=All">${lang("start.generate.all.new")}</a> &nbsp;|&nbsp;
          <!--
         <br>
-        <a href="${encodeHTML(config.actionRoot)}?module=Producer&task=All&forced=1">alles (!)(forced, update auf www > 5min.)</a>
+        <a href="${config.actionRoot}?module=Producer&task=All&forced=1">alles (!)(forced, update auf www > 5min.)</a>
          &nbsp;|&nbsp;
          <br>
-        <a href="${encodeHTML(config.actionRoot)}?module=Producer&task=All&forced=1&sync=1">alles (!)(www sofort, nur im Notfall)</a>
+        <a href="${config.actionRoot}?module=Producer&task=All&forced=1&sync=1">alles (!)(www sofort, nur im Notfall)</a>
          &nbsp;|&nbsp;
          <br>
         -->
                                 <br>${lang("start.generate.parts.title")}:
                                 <br>
-                       <img src="${encodeHTML(config.docRoot)}/img/pointgris.gif" border=0>
-                               <a href="${encodeHTML(config.actionRoot)}?module=Producer&task=StartPage">${lang("start.generate.startpages.new")}</a>
+                       <img src="${config.docRoot}/img/pointgris.gif" border=0>
+                               <a href="${config.actionRoot}?module=Producer&task=StartPage">${lang("start.generate.startpages.new")}</a>
                                 &nbsp;|&nbsp;
-                               <a href="${encodeHTML(config.actionRoot)}?module=Producer&task=StartPage&forced=1">${lang("start.generate.all_forced")}</a>
+                               <a href="${config.actionRoot}?module=Producer&task=StartPage&forced=1">${lang("start.generate.all_forced")}</a>
                                 &nbsp;|&nbsp;
-                               <a href="${encodeHTML(config.actionRoot)}?module=Producer&task=StartPage&forced=1&sync=1">${lang("start.generate.all_sync")}</a>
+                               <a href="${config.actionRoot}?module=Producer&task=StartPage&forced=1&sync=1">${lang("start.generate.all_sync")}</a>
                                 <br>
-                               <img src="${encodeHTML(config.docRoot)}/img/pointgris.gif" border=0>
-                       <a href="${encodeHTML(config.actionRoot)}?module=Producer&task=Content">${lang("start.generate.content.new")}</a>
+                               <img src="${config.docRoot}/img/pointgris.gif" border=0>
+                       <a href="${config.actionRoot}?module=Producer&task=Content">${lang("start.generate.content.new")}</a>
                                 &nbsp;|&nbsp;
-                               <a href="${encodeHTML(config.actionRoot)}?module=Producer&task=Content&forced=1">${lang("start.generate.all_forced")}</a>
+                               <a href="${config.actionRoot}?module=Producer&task=Content&forced=1">${lang("start.generate.all_forced")}</a>
                                 <br>
-                       <img src="${encodeHTML(config.docRoot)}/img/pointgris.gif" border=0>
-                               <a href="${encodeHTML(config.actionRoot)}?module=Producer&task=Topics">${lang("start.generate.topics.new")}</a>
+                       <img src="${config.docRoot}/img/pointgris.gif" border=0>
+                               <a href="${config.actionRoot}?module=Producer&task=Topics">${lang("start.generate.topics.new")}</a>
                                 &nbsp;|&nbsp;
-                               <a href="${encodeHTML(config.actionRoot)}?module=Producer&task=Topics&forced=1">${lang("start.generate.all_forced")}</a>
+                               <a href="${config.actionRoot}?module=Producer&task=Topics&forced=1">${lang("start.generate.all_forced")}</a>
                                 <br>
-                               <a href="${encodeHTML(config.actionRoot)}?module=Producer&task=OpenPosting">
-                       <img src="${encodeHTML(config.docRoot)}/img/pointgris.gif" border=0>${lang("start.generate.postings.new")}</a>
+                               <a href="${config.actionRoot}?module=Producer&task=OpenPosting">
+                       <img src="${config.docRoot}/img/pointgris.gif" border=0>${lang("start.generate.postings.new")}</a>
                                 &nbsp;|&nbsp;
-                               <a href="${encodeHTML(config.actionRoot)}?module=Producer&task=OpenPosting&forced=1">${lang("start.generate.all_forced")}</a>
+                               <a href="${config.actionRoot}?module=Producer&task=OpenPosting&forced=1">${lang("start.generate.all_forced")}</a>
                                 <br>
-                               <a href="${encodeHTML(config.actionRoot)}?module=Producer&task=Images">
-                       <img src="${encodeHTML(config.docRoot)}/img/pointgris.gif" border=0>${lang("start.generate.images.new")}</a>
+                               <a href="${config.actionRoot}?module=Producer&task=Images">
+                       <img src="${config.docRoot}/img/pointgris.gif" border=0>${lang("start.generate.images.new")}</a>
                                 &nbsp;|&nbsp;
-                               <a href="${encodeHTML(config.actionRoot)}?module=Producer&task=Images&forced=1">${lang("start.generate.all_forced")}</a>
+                               <a href="${config.actionRoot}?module=Producer&task=Images&forced=1">${lang("start.generate.all_forced")}</a>
                  <br>
-                               <a href="${encodeHTML(config.actionRoot)}?module=Producer&task=Audio">
-                       <img src="${encodeHTML(config.docRoot)}/img/pointgris.gif" border=0>${lang("start.generate.audio.new")}</a>
+                               <a href="${config.actionRoot}?module=Producer&task=Audio">
+                       <img src="${config.docRoot}/img/pointgris.gif" border=0>${lang("start.generate.audio.new")}</a>
                                 &nbsp;|&nbsp;
-                               <a href="${encodeHTML(config.actionRoot)}?module=Producer&task=Audio&forced=1">${lang("start.generate.all_forced")}</a>
+                               <a href="${config.actionRoot}?module=Producer&task=Audio&forced=1">${lang("start.generate.all_forced")}</a>
  <br>
-                               <a href="${encodeHTML(config.actionRoot)}?module=Producer&task=Video">
-                       <img src="${encodeHTML(config.docRoot)}/img/pointgris.gif" border=0>${lang("start.generate.video.new")}</a>
+                               <a href="${config.actionRoot}?module=Producer&task=Video">
+                       <img src="${config.docRoot}/img/pointgris.gif" border=0>${lang("start.generate.video.new")}</a>
                                 &nbsp;|&nbsp;
-                               <a href="${encodeHTML(config.actionRoot)}?module=Producer&task=Video&forced=1">${lang("start.generate.all_forced")}</a>
+                               <a href="${config.actionRoot}?module=Producer&task=Video&forced=1">${lang("start.generate.all_forced")}</a>
  <br>
-                               <a href="${encodeHTML(config.actionRoot)}?module=Producer&task=Other">
-                       <img src="${encodeHTML(config.docRoot)}/img/pointgris.gif" border=0>${lang("start.generate.other.new")}</a>
+                               <a href="${config.actionRoot}?module=Producer&task=Other">
+                       <img src="${config.docRoot}/img/pointgris.gif" border=0>${lang("start.generate.other.new")}</a>
                                 &nbsp;|&nbsp;
-                               <a href="${encodeHTML(config.actionRoot)}?module=Producer&task=Other&forced=1">${lang("start.generate.all_forced")}</a>
+                               <a href="${config.actionRoot}?module=Producer&task=Other&forced=1">${lang("start.generate.all_forced")}</a>
  
                                 <br>
-        <a href="${encodeHTML(config.actionRoot)}?module=Producer&task=Navigation">
-                       <img src="${encodeHTML(config.docRoot)}/img/pointgris.gif" border=0>${lang("start.generate.navigation")}</a>
+        <a href="${config.actionRoot}?module=Producer&task=Navigation">
+                       <img src="${config.docRoot}/img/pointgris.gif" border=0>${lang("start.generate.navigation")}</a>
                                 <br>
  
  
@@ -177,30 +177,30 @@ ${lang("file")}</a>
                 <b>${lang("start.coverage.title")}</b></font>
  
                 <P>
-                       <a href="${encodeHTML(config.actionRoot)}?module=Schwerpunkt&do=list" >
-      <img src="${encodeHTML(config.docRoot)}/img/pointgris.gif" border=0> ${lang("edit")}</a><br>
-      <a href="${encodeHTML(config.actionRoot)}?module=Schwerpunkt&do=add" >
-                 <img src="${encodeHTML(config.docRoot)}/img/pointgris.gif" border=0> ${lang("add")}</a>
+                       <a href="${config.actionRoot}?module=Schwerpunkt&do=list" >
+      <img src="${config.docRoot}/img/pointgris.gif" border=0> ${lang("edit")}</a><br>
+      <a href="${config.actionRoot}?module=Schwerpunkt&do=add" >
+                 <img src="${config.docRoot}/img/pointgris.gif" border=0> ${lang("add")}</a>
      <p>
  -->
                         <font face="Verdana, Arial, Helvetica, sans-serif" size="2" color="#663399">
                         <b>${lang("start.topics.title")}</b></font>
  
                 <p>
-                       <a href="${encodeHTML(config.actionRoot)}?module=Topics&do=list">
-      <img src="${encodeHTML(config.docRoot)}/img/pointgris.gif" border=0> ${lang("edit")}</a><br>
-      <a href="${encodeHTML(config.actionRoot)}?module=Topics&do=add" >
-                       <img src="${encodeHTML(config.docRoot)}/img/pointgris.gif" border=0> ${lang("add")}</a>
+                       <a href="${config.actionRoot}?module=Topics&do=list">
+      <img src="${config.docRoot}/img/pointgris.gif" border=0> ${lang("edit")}</a><br>
+      <a href="${config.actionRoot}?module=Topics&do=add" >
+                       <img src="${config.docRoot}/img/pointgris.gif" border=0> ${lang("add")}</a>
  
                 <p>
                         <font face="Verdana, Arial, Helvetica, sans-serif" size="2" color="#663399">
                   <b>${lang("start.images.title")}</b></font>
  
      <p>
-                       <a href="${encodeHTML(config.actionRoot)}?module=Images&do=list">
-      <img src="${encodeHTML(config.docRoot)}/img/pointgris.gif" border=0> ${lang("edit")}</a><br>
-      <a href="${encodeHTML(config.actionRoot)}?module=Images&do=add" >
-                       <img src="${encodeHTML(config.docRoot)}/img/pointgris.gif" border=0> ${lang("add")}</a>
+                       <a href="${config.actionRoot}?module=Images&do=list">
+      <img src="${config.docRoot}/img/pointgris.gif" border=0> ${lang("edit")}</a><br>
+      <a href="${config.actionRoot}?module=Images&do=add" >
+                       <img src="${config.docRoot}/img/pointgris.gif" border=0> ${lang("add")}</a>
  
                 <p>
  
@@ -208,10 +208,10 @@ ${lang("file")}</a>
                   <b>${lang("start.audio.title")}</b></font>
  
      <p>
-                       <a href="${encodeHTML(config.actionRoot)}?module=Audio&do=list">
-      <img src="${encodeHTML(config.docRoot)}/img/pointgris.gif" border=0> ${lang("edit")}</a><br>
-      <a href="${encodeHTML(config.actionRoot)}?module=Audio&do=add" >
-                       <img src="${encodeHTML(config.docRoot)}/img/pointgris.gif" border=0> ${lang("add")}</a>
+                       <a href="${config.actionRoot}?module=Audio&do=list">
+      <img src="${config.docRoot}/img/pointgris.gif" border=0> ${lang("edit")}</a><br>
+      <a href="${config.actionRoot}?module=Audio&do=add" >
+                       <img src="${config.docRoot}/img/pointgris.gif" border=0> ${lang("add")}</a>
  
                 <p>
  
@@ -219,10 +219,10 @@ ${lang("file")}</a>
                   <b>${lang("start.video.title")}</b></font>
  
      <p>
-                       <a href="${encodeHTML(config.actionRoot)}?module=Video&do=list">
-      <img src="${encodeHTML(config.docRoot)}/img/pointgris.gif" border=0> ${lang("edit")}</a><br>
-      <a href="${encodeHTML(config.actionRoot)}?module=Video&do=add" >
-                       <img src="${encodeHTML(config.docRoot)}/img/pointgris.gif" border=0> ${lang("add")}</a>
+                       <a href="${config.actionRoot}?module=Video&do=list">
+      <img src="${config.docRoot}/img/pointgris.gif" border=0> ${lang("edit")}</a><br>
+      <a href="${config.actionRoot}?module=Video&do=add" >
+                       <img src="${config.docRoot}/img/pointgris.gif" border=0> ${lang("add")}</a>
  
                 <p>
  
@@ -230,10 +230,10 @@ ${lang("file")}</a>
                   <b>${lang("start.other_media.title")}</b></font>
  
      <p>
-                       <a href="${encodeHTML(config.actionRoot)}?module=OtherMedia&do=list">
-      <img src="${encodeHTML(config.docRoot)}/img/pointgris.gif" border=0> ${lang("edit")}</a><br>
-      <a href="${encodeHTML(config.actionRoot)}?module=OtherMedia&do=add" >
-                       <img src="${encodeHTML(config.docRoot)}/img/pointgris.gif" border=0> ${lang("add")}</a>
+                       <a href="${config.actionRoot}?module=OtherMedia&do=list">
+      <img src="${config.docRoot}/img/pointgris.gif" border=0> ${lang("edit")}</a><br>
+      <a href="${config.actionRoot}?module=OtherMedia&do=add" >
+                       <img src="${config.docRoot}/img/pointgris.gif" border=0> ${lang("add")}</a>
  
                 <p>
  
@@ -241,10 +241,10 @@ ${lang("file")}</a>
                   <b>${lang("start.mediafolder.title")}</b></font>
  
                 <p>
-                       <a href="${encodeHTML(config.actionRoot)}?module=Mediafolder&do=list">
-      <img src="${encodeHTML(config.docRoot)}/img/pointgris.gif" border=0> ${lang("edit")}</a><br>
-      <a href="${encodeHTML(config.actionRoot)}?module=Mediafolder&do=add" >
-                       <img src="${encodeHTML(config.docRoot)}/img/pointgris.gif" border=0> ${lang("add")}</a>
+                       <a href="${config.actionRoot}?module=Mediafolder&do=list">
+      <img src="${config.docRoot}/img/pointgris.gif" border=0> ${lang("edit")}</a><br>
+      <a href="${config.actionRoot}?module=Mediafolder&do=add" >
+                       <img src="${config.docRoot}/img/pointgris.gif" border=0> ${lang("add")}</a>
  
      <p>
  <!--
@@ -252,10 +252,10 @@ ${lang("file")}</a>
                   <b>${lang("start.languages.title")}</b></font>
  
                 <p>
-                       <a href="${encodeHTML(config.actionRoot)}?module=Language&do=list">
-      <img src="${encodeHTML(config.docRoot)}/img/pointgris.gif" border=0> ${lang("edit")}</a><br>
-      <a href="${encodeHTML(config.actionRoot)}?module=Language&do=add" >
-                       <img src="${encodeHTML(config.docRoot)}/img/pointgris.gif" border=0> ${lang("add")}</a>
+                       <a href="${config.actionRoot}?module=Language&do=list">
+      <img src="${config.docRoot}/img/pointgris.gif" border=0> ${lang("edit")}</a><br>
+      <a href="${config.actionRoot}?module=Language&do=add" >
+                       <img src="${config.docRoot}/img/pointgris.gif" border=0> ${lang("add")}</a>
  
                 <p>
  -->
@@ -263,10 +263,10 @@ ${lang("file")}</a>
                   <b>${lang("start.imcs.title")}</b></font>
  
                 <p>
-                       <a href="${encodeHTML(config.actionRoot)}?module=LinksImcs&do=list">
-      <img src="${encodeHTML(config.docRoot)}/img/pointgris.gif" border=0> ${lang("edit")}</a><br>
-      <a href="${encodeHTML(config.actionRoot)}?module=LinksImcs&do=add" >
-                       <img src="${encodeHTML(config.docRoot)}/img/pointgris.gif" border=0> ${lang("add")}</a>
+                       <a href="${config.actionRoot}?module=LinksImcs&do=list">
+      <img src="${config.docRoot}/img/pointgris.gif" border=0> ${lang("edit")}</a><br>
+      <a href="${config.actionRoot}?module=LinksImcs&do=add" >
+                       <img src="${config.docRoot}/img/pointgris.gif" border=0> ${lang("add")}</a>
                         </td>
  
  
@@ -278,14 +278,14 @@ ${lang("file")}</a>
  
                 <font  face="Verdana, Arial, Helvetica, sans-serif" size="2" color="#663399">
                 <b>${lang("start.messageboard.title")}</b>
-               <font size="-1"><br><a href="${encodeHTML(config.actionRoot)}?module=Message&do=add">${lang("add")}</a></font>
+               <font size="-1"><br><a href="${config.actionRoot}?module=Message&do=add">${lang("add")}</a></font>
                 <if data.messages>
                         <list data.messages as m>
                                 <p>
-                               <if m.title><b>${encodeHTML(m.title)}</b><br></if>
-                               ${encodeHTML(m.description)}<br>
+                               <if m.title><b>${m.title}</b><br></if>
+                               ${m.description}<br>
                                 <font size="-2">
-                               <if m.creator><i>von: ${encodeHTML(m.creator)}</i> / </if>${encodeHTML(m.webdb_create)}<br>
+                               <if m.creator><i>von: ${m.creator}</i> / </if>${m.webdb_create}<br>
                                 </font>
                         </list>
                 <else>
diff --git a/templates-dist/admin/topic.template b/templates-dist/admin/topic.template

index 6d52a49..48038f6 100755 (executable)
--- a/templates-dist/admin/topic.template
+++ b/templates-dist/admin/topic.template
@@ -7,9 +7,9 @@ ${lang("topic.htmltitle")}
  
  <body bgcolor="#FFFFFF">
  <include "admin/head.template">
-<form action="${encodeHTML(config.actionRoot)}" method="post">
+<form action="${config.actionRoot}" method="post">
         <input type=hidden name=module value=Topics>
-       <input type="hidden" name="id" value="${encodeHTML(data.id)}">
+       <input type="hidden" name="id" value="${data.id}">
         <if data.new><input type="hidden" name="do" value="insert">
         <else><input type="hidden" name="do" value="update"></if>
  <table border="0">
diff --git a/templates-dist/admin/topiclist.template b/templates-dist/admin/topiclist.template

index 9167864..e947294 100755 (executable)
--- a/templates-dist/admin/topiclist.template
+++ b/templates-dist/admin/topiclist.template
@@ -22,8 +22,8 @@
    <td><font face="Verdana, Arial, Helvetica, sans-serif" size="-1">
         ${encodeHTML(entry.main_url)}<br>
         ${encodeHTML(entry.archiv_url)}</font></td>
-  <td><font size="1">&nbsp;<a href="${encodeHTML(config.actionRoot)}?module=Topics&do=delete&id=${encodeHTML(entry.id)}">${lang("delete")}</a>
-    | <a href="${encodeHTML(config.actionRoot)}?module=Topics&do=edit&id=${encodeHTML(entry.id)}">${lang("edit")}</a></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>
@@ -34,7 +34,7 @@
  </table>
  <P>
  <if (data.prev || data.next)>
- <form method="post" action="${encodeHTML(config.actionRoot)}">
+ <form method="post" action="${config.actionRoot}">
   <input type="hidden" name="module" value="Topics">
   <input type="hidden" name="where" value="${encodeHTML(data.where)}">
  <if data.prev>
diff --git a/templates-dist/admin/user.template b/templates-dist/admin/user.template

index baf3721..5918ca6 100755 (executable)
--- a/templates-dist/admin/user.template
+++ b/templates-dist/admin/user.template
@@ -7,7 +7,7 @@ ${lang("user.htmltitle")}
  
  <body bgcolor="#FFFFFF">
  <include "admin/head.template">
-<form action="${encodeHTML(config.actionRoot)}" method="post">
+<form action="${config.actionRoot}" method="post">
         <input type="hidden" name="module" value="Users">
         <input type="hidden" name="id" value="${encodeHTML(id)}">
         <if new><input type="hidden" name="do" value="insert">
diff --git a/templates-dist/admin/userlist.template b/templates-dist/admin/userlist.template

index 794e67c..84db96d 100755 (executable)
--- a/templates-dist/admin/userlist.template
+++ b/templates-dist/admin/userlist.template
@@ -18,8 +18,8 @@
    >
    <td>${encodeHTML(entry.login)}&nbsp;</td>
    <td>${encodeHTML(entry.is_admin)}&nbsp;</td>
-  <td><font size="1">&nbsp;<a href="${encodeHTML(config.actionRoot)}?module=Users&do=delete&id=${encodeHTML(entry.id)}">${lang("delete")}</a>
-    | <a href="${encodeHTML(config.actionRoot)}?module=Users&do=edit&id=${encodeHTML(entry.id)}">${lang("edit")}</a></font></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>
diff --git a/templates-dist/admin/video.template b/templates-dist/admin/video.template

index 5a8ba44..084af50 100755 (executable)
--- a/templates-dist/admin/video.template
+++ b/templates-dist/admin/video.template
@@ -4,16 +4,11 @@
  ${lang("video.htmltitle")}
  </title>
  </head>
-<SCRIPT LANGUAGE="JavaScript">
-function openWin(url) {
-   window.open(url,"vc","scrollbars=0,height=${encodeHTML(data.img_height)},width=${encodeHTML(data.img_width)}");
-}
-</SCRIPT>
  <body bgcolor="#FFFFFF">
  <include "admin/head.template">
  
  <if data.new>
-<form action="${encodeHTML(config.actionRoot)}?module=Video&do=add" method="post">
+<form action="${config.actionRoot}?module=Video&do=add" method="post">
         <table border="0">
         <tr>
         <td align="right" bgcolor="#006600">
@@ -22,31 +17,31 @@ function openWin(url) {
         </font>
         </td>
         <td>
-       <input type="text" size="3" name="medianum" value="${encodeHTML(medianum)}">&nbsp;<input type="submit" value="${lang("open.posting.nr_of_media.submit")}">
+       <input type="text" size="3" name="medianum" value="${medianum}">&nbsp;<input type="submit" value="${lang("open.posting.nr_of_media.submit")}">
         </td>
         </tr>
         </table> 
  </form>
  </if>
-<form enctype="multipart/form-data" method="post" action="${encodeHTML(config.actionRoot)}?module=Video&do=<if data.new>insert<else>update</if>&id=${encodeHTML(data.id)}">
+<form enctype="multipart/form-data" method="post" action="${config.actionRoot}?module=Video&do=<if data.new>insert<else>update</if>&id=${data.id}">
  
         <input type="hidden" name="where" value="${encodeHTML(data.where)}">
         <input type="hidden" name="offset" value="${encodeHTML(data.offset)}">
         <input type="hidden" name="order" value="${encodeHTML(data.order)}">
-       <input type="hidden" name="id" value="${encodeHTML(data.id)}">
+       <input type="hidden" name="id" value="${data.id}">
  
         <table border="0">
         <if !data.new>
         <tr>
      <td align="right" bgcolor="#006600">
                 <font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
-                       <a href="${encodeHTML(config.actionRoot)}?module=Video&do=getMedia&id=${encodeHTML(data.id)}">
-                       <img src="${encodeHTML(config.docRoot)}/img/${encodeHTML(data.big_icon)}" border=0></a></font></td>
+                       <a href="${config.actionRoot}?module=Video&do=getMedia&id=${data.id}">
+                       <img src="${config.docRoot}/img/${data.big_icon}" border=0></a></font></td>
      <td valign="bottom"><font color="Silver" face="Verdana, Arial, Helvetica, sans-serif" size=1>
-               ${lang("media.created")}: ${encodeHTML(data.webdb_create)}
-        <if data.webdb_lastchange>/ ${lang("media.changed")} ${encodeHTML(data.webdb_lastchange)}</if><br>
-               <if data.is_published=="1">${lang("media.published")}: ${encodeHTML(data.publish_date)} / ${encodeHTML(data.publish_server)}${encodeHTML(data.publish_path)}<br></if>
-               ${lang("media.format")}: ${encodeHTML(data.mimetype)} / ${encodeHTML(data.media_descr)} / ${encodeHTML(data.human_readable_size)}<br>
+               ${lang("media.created")}: ${data.webdb_create}
+        <if data.webdb_lastchange>/ ${lang("media.changed")} ${data.webdb_lastchange}</if><br>
+               <if data.is_published=="1">${lang("media.published")}: ${data.publish_date} / ${data.publish_server}${data.publish_path}<br></if>
+               ${lang("media.format")}: ${data.mimetype} / ${encodeHTML(data.media_descr)} / ${data.human_readable_size}<br>
                 ${lang("media.rights")}: <b>${data.rightsHashdata[to_rights]["name"]}</b><br>
         </td>
         </tr>
@@ -73,8 +68,8 @@ function openWin(url) {
         <tr>
      <td align="right" bgcolor="#006600"><font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
          <B>${lang("media.date")}:</B></font></td>
-    <td><input type="text" size="8" maxlength="8" name="date" value="${encodeHTML(data.date)}">
-               <input type="text" size="20" maxlength="40" name="year" value="${encodeHTML(data.year)}"></td>
+    <td><input type="text" size="8" maxlength="8" name="date" value="${data.date}">
+               <input type="text" size="20" maxlength="40" name="year" value="${data.year}"></td>
         </tr>
  
         <tr>
@@ -99,7 +94,7 @@ function openWin(url) {
         <tr>
      <td align="right" bgcolor="#006600"><font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="-1">
          <B>${lang("media.comment")}:</B></font></td>
-    <td><textarea cols="40" rows="2" name="comment">${encodeHTML(data.comment)}</textarea></td>
+    <td><textarea cols="40" rows="2" name="comment">${data.comment}</textarea></td>
         </tr>
  
         <tr>
@@ -123,13 +118,13 @@ function openWin(url) {
                         <B>${lang("media.title")}:<B>
                 </font> </td>
                 <td>
-                       <input type="text" name="media_title${encodeHTML(m)}" size="40" maxlength="80" value="">
+                       <input type="text" name="media_title${m}" size="40" maxlength="80" value="">
                 </td>
                 </tr>
                 <tr>
                 <td bgcolor="#006600"></td>
                 <td>
-                               <INPUT TYPE="file" NAME="mpfile${encodeHTML(m)}"><br>
+                               <INPUT TYPE="file" NAME="mpfile${m}"><br>
                 </td>   
                 </tr>   
         </list>
diff --git a/templates-dist/admin/videolist.template b/templates-dist/admin/videolist.template

index e3ae1d0..7450171 100755 (executable)
--- a/templates-dist/admin/videolist.template
+++ b/templates-dist/admin/videolist.template
@@ -8,10 +8,10 @@
  
  <table border="0" cellpadding="2" cellspacing="1">
    <tr>
-    <td colspan="5"><form method="post" action="${encodeHTML(config.actionRoot)}">
+    <td colspan="5"><form method="post" action="${config.actionRoot}">
         <input type="hidden" name="module" value="Video">
         <input type="hidden" name="do" value="list">
-       <input type="hidden" name="cid" value="${encodeHTML(data.cid)}">
+       <input type="hidden" name="cid" value="${data.cid}">
         <table border="0">
         <tr bgcolor="Pink">
                 <td>${lang("medialist.search_text_in")}:</td>
@@ -71,19 +71,19 @@
    <list data.contentlist as entry>
    <tr <if grey=="1"><assign grey="0">bgcolor="#dddddd" <else><assign grey="1"> </if>>
    <td>
-         <a href="${encodeHTML(config.actionRoot)}?module=Video&do=getMedia&id=${encodeHTML(entry.id)}">
-         <img src="${encodeHTML(config.docRoot)}/img/${encodeHTML(entry.big_icon)}" border=0></a></font></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>${encodeHTML(entry.human_readable_size)}&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><font size="1">&nbsp;
-       <if data.cid><a href="${encodeHTML(config.actionRoot)}?module=Content&do=attach&mid=${encodeHTML(entry.id)}&cid=${encodeHTML(data.cid)}">${lang("attach")}</a>
+       <if data.cid><a href="${config.actionRoot}?module=Content&do=attach&mid=${entry.id}&cid=${data.cid}">${lang("attach")}</a>
         <else>
         <a href="${config.actionRoot}?module=Video&do=delete&id=${entry.id}&query_text=${encodeHTML(data.query_text_encoded)}&query_field=${encodeHTML(data.query_field)}&query_is_published=${data.query_is_published}&query_media_folder=${data.query_media_folder}&offset=${data.offset}">${lang("delete")}</a>
-    | <a href="${encodeHTML(config.actionRoot)}?module=Video&do=edit&id=${encodeHTML(entry.id)}">${lang("edit")}</a>
+    | <a href="${config.actionRoot}?module=Video&do=edit&id=${entry.id}">${lang("edit")}</a>
         </if>
         </font></td>
    </tr>
@@ -96,10 +96,10 @@
  
  <tr><td>
  <if data.prev>
-       <a href="${encodeHTML(config.actionRoot)}?module=Video&do=list&query_text=${encodeHTML(data.query_text_encoded)}&query_field=${encodeHTML(data.query_field)}&query_is_published=${encodeHTML(data.query_is_published)}&query_media_folder=${encodeHTML(data.query_media_folder)}&offset=${encodeHTML(data.prev)}&prev=zur&uuml;ck&cid=${encodeHTML(data.cid)}">zurueck</a>&nbsp;
+       <a href="${config.actionRoot}?module=Video&do=list&query_text=${encodeHTML(data.query_text_encoded)}&query_field=${encodeHTML(data.query_field)}&query_is_published=${encodeHTML(data.query_is_published)}&query_media_folder=${encodeHTML(data.query_media_folder)}&offset=${encodeHTML(data.prev)}&prev=zur&uuml;ck&cid=${data.cid}">zurueck</a>&nbsp;
  </if>
  <if data.next>
-<a href="${encodeHTML(config.actionRoot)}?module=Video&do=list&query_text=${encodeHTML(data.query_text_encoded)}&query_field=${encodeHTML(data.query_field)}&query_is_published=${encodeHTML(data.query_is_published)}&query_media_folder=${encodeHTML(data.query_media_folder)}&offset=${encodeHTML(data.next)}&next=weiter&cid=${encodeHTML(data.cid)}">weiter</a>
+<a href="${config.actionRoot}?module=Video&do=list&query_text=${encodeHTML(data.query_text_encoded)}&query_field=${encodeHTML(data.query_field)}&query_is_published=${encodeHTML(data.query_is_published)}&query_media_folder=${encodeHTML(data.query_media_folder)}&offset=${encodeHTML(data.next)}&next=weiter&cid=${data.cid}">weiter</a>
  </if>
  </td></tr>
  <else>
author	mh <mh>
	Fri, 13 Dec 2002 01:44:39 +0000 (01:44 +0000)
committer	mh <mh>
	Fri, 13 Dec 2002 01:44:39 +0000 (01:44 +0000)
templates-dist/admin/audio.template		patch \| blob \| history
templates-dist/admin/audiolist.template		patch \| blob \| history
templates-dist/admin/breaking.template		patch \| blob \| history
templates-dist/admin/breakinglist.template		patch \| blob \| history
templates-dist/admin/comment.template		patch \| blob \| history
templates-dist/admin/commentlist.template		patch \| blob \| history
templates-dist/admin/content.template		patch \| blob \| history
templates-dist/admin/contentlist.template		patch \| blob \| history
templates-dist/admin/feature.template		patch \| blob \| history
templates-dist/admin/featurelist.template		patch \| blob \| history
templates-dist/admin/fileedit.template		patch \| blob \| history
templates-dist/admin/fileeditlist.template		patch \| blob \| history
templates-dist/admin/foot.template		patch \| blob \| history
templates-dist/admin/head.template		patch \| blob \| history
templates-dist/admin/head_nonavi.template		patch \| blob \| history
templates-dist/admin/hiddenlist.template		patch \| blob \| history
templates-dist/admin/image.template		patch \| blob \| history
templates-dist/admin/imagelist.template		patch \| blob \| history
templates-dist/admin/language.template		patch \| blob \| history
templates-dist/admin/languagelist.template		patch \| blob \| history
templates-dist/admin/linksimcs.template		patch \| blob \| history
templates-dist/admin/linksimcslist.template		patch \| blob \| history
templates-dist/admin/login.template		patch \| blob \| history
templates-dist/admin/media.template		patch \| blob \| history
templates-dist/admin/mediafolder.template		patch \| blob \| history
templates-dist/admin/mediafolderlist.template		patch \| blob \| history
templates-dist/admin/medialist.template		patch \| blob \| history
templates-dist/admin/message.template		patch \| blob \| history
templates-dist/admin/messagelist.template		patch \| blob \| history
templates-dist/admin/start_admin.template		patch \| blob \| history
templates-dist/admin/topic.template		patch \| blob \| history
templates-dist/admin/topiclist.template		patch \| blob \| history
templates-dist/admin/user.template		patch \| blob \| history
templates-dist/admin/userlist.template		patch \| blob \| history
templates-dist/admin/video.template		patch \| blob \| history
templates-dist/admin/videolist.template		patch \| blob \| history