From: mh Date: Tue, 10 Dec 2002 09:49:25 +0000 (+0000) Subject: wrap pretty much all freemarker variables (i.e the data) in encodeHTML(data..). this... X-Git-Tag: MIR_1_0_0_RC4~12 X-Git-Url: http://erislabs.net/gitweb/?p=mir.git;a=commitdiff_plain;h=5ff55a1f615f4b1c437ee4a5ccc9581f48188f5a wrap pretty much all freemarker variables (i.e the data) in encodeHTML(data..). this fixes some bugs in the admin, like when stuff dissappears after quotes, etc.. it is heavier on the CPU but some obvious stuff can be unwrapped later. --- diff --git a/templates-dist/admin/audio.template b/templates-dist/admin/audio.template index 3d63f97f..81353c93 100755 --- a/templates-dist/admin/audio.template +++ b/templates-dist/admin/audio.template @@ -6,14 +6,14 @@ ${lang("audio.htmltitle")} -
+
@@ -22,30 +22,30 @@ function openWin(url) { -   +  
-
- - - - + + + + + + + @@ -57,7 +57,7 @@ function openWin(url) { @@ -66,45 +66,45 @@ function openWin(url) { - + - + - + - + - + - + @@ -139,7 +139,7 @@ function openWin(url) { ${lang("media.title")}: diff --git a/templates-dist/admin/breaking.template b/templates-dist/admin/breaking.template index 86e6fcf7..f3445cd1 100755 --- a/templates-dist/admin/breaking.template +++ b/templates-dist/admin/breaking.template @@ -7,9 +7,9 @@ ${lang("breaking.htmltitle")} - + - +
- - - ${lang("media.created")}: ${data.webdb_create} - / ${lang("media.changed")} ${data.webdb_lastchange}
- ${lang("media.published")}: ${data.publish_date} / ${data.publish_server}${data.publish_path}
 - ${lang("media.format")}: ${data.mimetype} / ${data.media_descr} / ${data.human_readable_size}
+ ${lang("media.created")}: ${encodeHTML(data.webdb_create)} + / ${lang("media.changed")} ${encodeHTML(data.webdb_lastchange)}
+ ${lang("media.published")}: ${encodeHTML(data.publish_date)} / ${encodeHTML(data.publish_server)}${encodeHTML(data.publish_path)}
 + ${lang("media.format")}: ${encodeHTML(data.mimetype)} / ${encodeHTML(data.media_descr)} / ${encodeHTML(data.human_readable_size)}
${lang("media.rights")}: ${data.rightsHashdata[to_rights]["name"]}
${lang("media.description")}:
${lang("media.date")}: - +
${lang("media.location")}:
${lang("media.creator")}: - +
${lang("media.keywords")}:
${lang("media.comment")}:
${lang("media.source")}:
@@ -122,13 +122,13 @@ function openWin(url) { ${lang("media.title")}: - +
-
+
- +
@@ -17,7 +17,7 @@ ${lang("breaking.htmltitle")} @@ -25,7 +25,7 @@ ${lang("breaking.htmltitle")} diff --git a/templates-dist/admin/breakinglist.template b/templates-dist/admin/breakinglist.template index ce2e5096..4d9bceae 100755 --- a/templates-dist/admin/breakinglist.template +++ b/templates-dist/admin/breakinglist.template @@ -17,14 +17,14 @@ bgcolor="#dddddd" > - - - + + + - @@ -32,10 +32,10 @@

- ${lang("list.previous")}  + ${lang("list.previous")}  -${lang("list.next")} +${lang("list.next")} diff --git a/templates-dist/admin/comment.template b/templates-dist/admin/comment.template index c602a6b0..fa27e230 100755 --- a/templates-dist/admin/comment.template +++ b/templates-dist/admin/comment.template @@ -8,14 +8,14 @@ ${lang("comment.htmltitle")} - + - - - - - - + + + + + + @@ -25,49 +25,49 @@ ${lang("comment.htmltitle")}

- + - + - + - + - + - + - + - + bgcolor="#dddddd" > + ${articletypeHash[entry.to_article_type]["name"]} -- ${encodeHTML(entry.place)}: ${encodeHTML(entry.title)}
+ ${encodeHTML(entry.creator)}  + ${lang("edit")} +  | newswire + ${encodeHTML(entry.comment)}  -
${lang("breaking.date")}: - ${data.webdb_create_formatted} + ${encodeHTML(data.webdb_create_formatted)}
${lang("breaking.text")}: ${lang("breaking.textinfo")} - +
${entry.webdb_create_formatted} ${entry.text}  ${lang("delete")} - | ${lang("edit")}${encodeHTML(entry.webdb_create_formatted)} ${encodeHTML(entry.text)}  ${lang("delete")} + | ${lang("edit")}
${data.count} ${lang("records")} + ${encodeHTML(data.count)} ${lang("records")} / ${lang("show_from_to", data.from, data.to)}  
${lang("comment.date")}:${data.date}${encodeHTML(data.date)}
${lang("comment.title")}:
${lang("comment.creator")}:
${lang("comment.url")}:
${lang("comment.email")}:
${lang("comment.phone")}:
${lang("comment.address")}:
${lang("comment.text")}:
diff --git a/templates-dist/admin/contentlist.template b/templates-dist/admin/contentlist.template index b530f92c..f9c72d37 100755 --- a/templates-dist/admin/contentlist.template +++ b/templates-dist/admin/contentlist.template @@ -24,44 +24,44 @@
- ${entry.webdb_create_formatted}
- ${entry.webdb_lastchange_formatted}-
+ ${encodeHTML(entry.webdb_create_formatted)}
+ ${encodeHTML(entry.webdb_lastchange_formatted)}-
F- H- 		- ${articletypeHash[entry.to_article_type]["name"]} -- ${entry.place}: ${entry.title}
- ${entry.creator}  - ${lang("edit")} -  | newswire		 ${themenHashData[entry.thema_id]["name"]} 
${schwerpunktHashData[entry.to_feature]["title"]} 		 bgcolor="Pink"bgcolor="Yellow" valign="top"> - ${entry.comment}  - ${lang("delete")} + ${lang("delete")}
${data.count} ${lang("records")} + ${encodeHTML(data.count)} ${lang("records")} / ${lang("show_from_to", data.from, data.to)}

- + - - + + - + - + diff --git a/templates-dist/admin/feature.template b/templates-dist/admin/feature.template index bcbd912a..2255a040 100755 --- a/templates-dist/admin/feature.template +++ b/templates-dist/admin/feature.template @@ -9,21 +9,21 @@ ${lang("feature.htmltitle")} - + - - - + + + - + diff --git a/templates-dist/admin/featurelist.template b/templates-dist/admin/featurelist.template index cd9a40d5..01c9252a 100755 --- a/templates-dist/admin/featurelist.template +++ b/templates-dist/admin/featurelist.template @@ -21,35 +21,35 @@ bgcolor="#dddddd" > - - - - - + + + + + - +
${lang("feature.title")}: - +
${lang("feature.filename")}: - +
${lang("feature.abstract")}: - +
${lang("feature.link")}: - +
X ${entry.title} ${entry.filename} ${entry.main_url} ${entry.description}  ${lang("delete")} - | ${lang("edit")}${encodeHTML(entry.title)} ${encodeHTML(entry.filename)} ${encodeHTML(entry.main_url)} ${encodeHTML(entry.description)}  ${lang("delete")} + | ${lang("edit")}
-
${data.count} ${lang("records")} / +
${encodeHTML(data.count)} ${lang("records")} / ${lang("show_from_to", data.from, data.to)}
 ${lang("back")} ${lang("back")}

- + - + - + - + diff --git a/templates-dist/admin/fileedit.template b/templates-dist/admin/fileedit.template index 0bb9b103..85e80278 100755 --- a/templates-dist/admin/fileedit.template +++ b/templates-dist/admin/fileedit.template @@ -1,7 +1,7 @@ ${lang("edit")} ${lang("edit")} - + @@ -10,18 +10,18 @@
-${lang("edit")} ${lang("edit")} : ${data.filename} +${lang("edit")} ${lang("edit")} : ${encodeHTML(data.filename)}
-

+ - + - +
diff --git a/templates-dist/admin/fileeditlist.template b/templates-dist/admin/fileeditlist.template index d52131ce..5c7798d6 100755 --- a/templates-dist/admin/fileeditlist.template +++ b/templates-dist/admin/fileeditlist.template @@ -22,8 +22,8 @@ bgcolor="#dddddd" > - ${entry}  - ${lang("edit")} + ${encodeHTML(entry)}  + ${lang("edit")} diff --git a/templates-dist/admin/foot.template b/templates-dist/admin/foot.template index 31fb0a40..d0e5a6ee 100755 --- a/templates-dist/admin/foot.template +++ b/templates-dist/admin/foot.template @@ -6,6 +6,6 @@ ${lang("foot.top")} - ${lang("imc.shortname")} - ${config.mirVersion} + ${lang("imc.shortname")} - ${encodeHTML(config.mirVersion)} diff --git a/templates-dist/admin/head.template b/templates-dist/admin/head.template index b705a824..56eb4c0a 100755 --- a/templates-dist/admin/head.template +++ b/templates-dist/admin/head.template @@ -1,10 +1,10 @@ - + ${lang("head.start")} | + ${lang("head.logout")} | + ${lang("head.help")} | ${lang("head.search")}
  +
  ${lang("imc.name")}
- ${lang("head.start")} | - ${lang("head.logout")} | - ${lang("head.help")} | ${lang("head.search")}
 diff --git a/templates-dist/admin/head_nonavi.template b/templates-dist/admin/head_nonavi.template index 9dd5106d..31494d81 100755 --- a/templates-dist/admin/head_nonavi.template +++ b/templates-dist/admin/head_nonavi.template @@ -1,10 +1,10 @@ - diff --git a/templates-dist/admin/hiddenlist.template b/templates-dist/admin/hiddenlist.template index 31cf6fe7..192d4ff2 100755 --- a/templates-dist/admin/hiddenlist.template +++ b/templates-dist/admin/hiddenlist.template @@ -1,7 +1,7 @@ ${lang("start.content.hidden")} - + @@ -13,7 +13,7 @@
  +
  ${lang("imc.name")}
- ${login_user.login} ${lang("head.logged_in")} / - ${lang("head.logout")} + ${encodeHTML(login_user.login)} ${lang("head.logged_in")} / + ${lang("head.logout")}
- + @@ -62,16 +62,16 @@
-

${lang("start.content.hidden")} | ${lang("month")}: ${data.month} , ${lang("year")}:${data.year}

+

${lang("start.content.hidden")} | ${lang("month")}: ${encodeHTML(data.month)} , ${lang("year")}:${encodeHTML(data.year)}

-${lang("content.title")}: ${i.title}
-${lang("content.creator")}: ${i.creator}
-${lang("message.date")}: ${i.webdb_create_formatted}
+${lang("content.title")}: ${encodeHTML(i.title)}
+${lang("content.creator")}: ${encodeHTML(i.creator)}
+${lang("message.date")}: ${encodeHTML(i.webdb_create_formatted)}

additional media, type: audio
 additional media, type: video
 @@ -81,11 +81,11 @@ ${lang("message.date")}: ${i.webdb_create_formatted}

${lang("content.abstract")}:
-${i.description_parsed}

+${encodeHTML(i.description_parsed)}

${lang("content.content")}:
-${i.content_data_parsed} +${encodeHTML(i.content_data_parsed)}

 

diff --git a/templates-dist/admin/image.template b/templates-dist/admin/image.template index 3eb7f8e2..8f0b0615 100755 --- a/templates-dist/admin/image.template +++ b/templates-dist/admin/image.template @@ -6,7 +6,7 @@ ${lang("image.htmltitle")} @@ -14,7 +14,7 @@ function openWin(url) { - +
@@ -23,32 +23,32 @@ function openWin(url) { -   +  
-
+ - - - - + + + + + + @@ -62,7 +62,7 @@ function openWin(url) { @@ -71,45 +71,45 @@ function openWin(url) { - + - + - + - + - + - + @@ -125,13 +125,13 @@ function openWin(url) { ${lang("media.title")}: @@ -142,7 +142,7 @@ function openWin(url) { ${lang("media.title")}: diff --git a/templates-dist/admin/language.template b/templates-dist/admin/language.template index d2df3a83..e49420b2 100755 --- a/templates-dist/admin/language.template +++ b/templates-dist/admin/language.template @@ -7,9 +7,9 @@ ${lang("language.htmltitle")} - + - +
- - - ${lang("media.created")}: ${data.webdb_create} / ${lang("media.changed")} ${data.webdb_lastchange}
- ${lang("media.published")}: ${data.publish_date} / ${data.publish_server}${data.publish_path}
 - ${lang("media.format")}: ${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"]}
+ ${lang("media.created")}: ${encodeHTML(data.webdb_create)} / ${lang("media.changed")} ${encodeHTML(data.webdb_lastchange)}
+ ${lang("media.published")}: ${encodeHTML(data.publish_date)} / ${encodeHTML(data.publish_server)}${encodeHTML(data.publish_path)}
 + ${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"]}
${lang("media.rights")}: ${data.rightsHashdata[to_rights]["name"]}
${lang("media.type")}: ${data.imgtypeHashdata[to_img_type]["name"]}
${lang("media.description")}:
${lang("media.date")}: - +
${lang("media.location")}:
${lang("media.creator")}: - +
${lang("media.keywords")}:
${lang("media.comment")}:
${lang("media.source")}:
- +
-
+
- +
@@ -18,7 +18,7 @@ ${lang("language.htmltitle")} @@ -26,7 +26,7 @@ ${lang("language.htmltitle")} diff --git a/templates-dist/admin/languagelist.template b/templates-dist/admin/languagelist.template index c8860254..2e884baa 100755 --- a/templates-dist/admin/languagelist.template +++ b/templates-dist/admin/languagelist.template @@ -17,14 +17,14 @@ bgcolor="#dddddd" > - - - + + + - @@ -32,10 +32,10 @@

- ${lang("list.previous")}  + ${lang("list.previous")}  -${lang("list.next")} +${lang("list.next")} diff --git a/templates-dist/admin/linksimcs.template b/templates-dist/admin/linksimcs.template index 490f2f44..8b4087a3 100755 --- a/templates-dist/admin/linksimcs.template +++ b/templates-dist/admin/linksimcs.template @@ -7,9 +7,9 @@ ${lang("linkimcs.htmltitle")} - + - +

${lang("language.name")}: - +
${lang("language.code")}: - +
${entry.name} ${entry.code}  ${lang("delete")} - | ${lang("edit")}${encodeHTML(entry.name)} ${encodeHTML(entry.code)}  ${lang("delete")} + | ${lang("edit")}
${data.count} ${lang("records")} + ${encodeHTML(data.count)} ${lang("records")} / ${lang("show_from_to", data.from, data.to)}  
@@ -17,7 +17,7 @@ ${lang("linkimcs.htmltitle")} @@ -27,7 +27,7 @@ ${lang("linkimcs.htmltitle")} @@ -35,7 +35,7 @@ ${lang("linkimcs.htmltitle")} @@ -54,7 +54,7 @@ ${lang("linkimcs.htmltitle")} diff --git a/templates-dist/admin/linksimcslist.template b/templates-dist/admin/linksimcslist.template index dbff0f15..17eba79d 100755 --- a/templates-dist/admin/linksimcslist.template +++ b/templates-dist/admin/linksimcslist.template @@ -5,7 +5,7 @@ - + @@ -19,7 +19,7 @@ @@ -73,28 +73,28 @@ bgcolor="#dddddd" > - - - - - - + + + + + + ${encodeHTML(data.count)} ${lang("records")} / ${lang("show_from_to", data.from, data.to)}
${lang("linkimcs.name")}: - +
${lang("linkimcs.url")}: - +
- +
${entry.title} ${parent}${entry.url}${entry.sortpriority}${data.language} ${lang("delete")} - | ${lang("edit")} + ${encodeHTML(entry.title)} ${encodeHTML(parent)}${encodeHTML(entry.url)}${encodeHTML(entry.sortpriority)}${encodeHTML(data.language)} ${lang("delete")} + | ${lang("edit")}
- ${data.count} ${lang("records")} / ${lang("show_from_to", data.from, data.to)} 

- ${lang("list.previous")}  + ${lang("list.previous")}  -${lang("list.next")} +${lang("list.next")} diff --git a/templates-dist/admin/login.template b/templates-dist/admin/login.template index b127603b..cfd7b5fb 100755 --- a/templates-dist/admin/login.template +++ b/templates-dist/admin/login.template @@ -18,7 +18,7 @@ ${lang("imc.contact-email.name")}.

- + diff --git a/templates-dist/admin/media.template b/templates-dist/admin/media.template index 2a30dc02..de50af47 100755 --- a/templates-dist/admin/media.template +++ b/templates-dist/admin/media.template @@ -6,14 +6,14 @@ ${lang("other_media.htmltitle")} - +
@@ -22,31 +22,31 @@ function openWin(url) { -   +  
-
+ - - - - + + + + + + @@ -58,7 +58,7 @@ function openWin(url) { @@ -67,45 +67,45 @@ function openWin(url) { - + - + - + - + - + - + @@ -140,7 +140,7 @@ function openWin(url) { ${lang("media.title")}: diff --git a/templates-dist/admin/mediafolder.template b/templates-dist/admin/mediafolder.template index 73ff162e..ab7f31ce 100755 --- a/templates-dist/admin/mediafolder.template +++ b/templates-dist/admin/mediafolder.template @@ -7,9 +7,9 @@ ${lang("mediafolder.htmltitle")} - + - + @@ -17,27 +17,27 @@ ${lang("mediafolder.htmltitle")} - + - + - + - + - + diff --git a/templates-dist/admin/mediafolderlist.template b/templates-dist/admin/mediafolderlist.template index 3a8ff38c..542c8044 100755 --- a/templates-dist/admin/mediafolderlist.template +++ b/templates-dist/admin/mediafolderlist.template @@ -16,28 +16,28 @@ bgcolor="#dddddd" > - - - - - - + + + + + + -
- - - ${lang("media.created")}: ${data.webdb_create} - / ${lang("media.changed")} ${data.webdb_lastchange}
- ${lang("media.published")}: ${data.publish_date} / ${data.publish_server}${data.publish_path}
 - ${lang("media.format")}: ${data.mimetype} / ${data.human_readable_size}
+ ${lang("media.created")}: ${encodeHTML(data.webdb_create)} + / ${lang("media.changed")} ${encodeHTML(data.webdb_lastchange)}
+ ${lang("media.published")}: ${encodeHTML(data.publish_date)} / ${encodeHTML(data.publish_server)}${encodeHTML(data.publish_path)}
 + ${lang("media.format")}: ${encodeHTML(data.mimetype)} / ${encodeHTML(data.human_readable_size)}
${lang("media.rights")}: ${data.rightsHashdata[to_rights]["name"]}
${lang("media.description")}:
${lang("media.date")}: - +
${lang("media.location")}:
${lang("media.creator")}: - +
${lang("media.keywords")}:
${lang("media.comment")}:
${lang("media.source")}:
@@ -123,13 +123,13 @@ function openWin(url) { ${lang("media.title")}: - +
-
+
- +
${lang("mediafolder.date")}:
${lang("mediafolder.name")}:
${lang("mediafolder.location")}:
${lang("mediafolder.comment")}:
${lang("mediafolder.keywords")}:
${entry.date} ${entry.name} ${entry.place} ${entry.comment} ${entry.keywords} ${lang("delete")} - | ${lang("edit")} - | ${lang("list")}${encodeHTML(entry.date)} ${encodeHTML(entry.name)} ${encodeHTML(entry.place)} ${encodeHTML(entry.comment)} ${encodeHTML(entry.keywords)} ${lang("delete")} + | ${lang("edit")} + | ${lang("list")}
${data.count} ${lang("records")} / + ${encodeHTML(data.count)} ${lang("records")} / ${lang("show_from_to", data.from, data.to)}  

- ${lang("list.previous")}  + ${lang("list.previous")}  - ${lang("list.next")} + ${lang("list.next")}

${lang("no_matches_found")}

diff --git a/templates-dist/admin/message.template b/templates-dist/admin/message.template index 9be97e25..4aa33058 100755 --- a/templates-dist/admin/message.template +++ b/templates-dist/admin/message.template @@ -7,9 +7,9 @@ ${lang("message.htmltitle")} - + - + @@ -17,7 +17,7 @@ ${lang("message.htmltitle")} @@ -25,7 +25,7 @@ ${lang("message.htmltitle")} @@ -33,7 +33,7 @@ ${lang("message.htmltitle")} @@ -41,7 +41,7 @@ ${lang("message.htmltitle")} diff --git a/templates-dist/admin/messagelist.template b/templates-dist/admin/messagelist.template index 45b71642..1274bb23 100755 --- a/templates-dist/admin/messagelist.template +++ b/templates-dist/admin/messagelist.template @@ -20,16 +20,16 @@ bgcolor="#dddddd" > - - - - + + + + - @@ -37,10 +37,10 @@

- ${lang("list.previous")}  + ${lang("list.previous")}  -${lang("list.next")} +${lang("list.next")} diff --git a/templates-dist/admin/start_admin.template b/templates-dist/admin/start_admin.template index 6f50bdf5..5a12037a 100755 --- a/templates-dist/admin/start_admin.template +++ b/templates-dist/admin/start_admin.template @@ -15,23 +15,23 @@ ${lang("start.openpostings.title")}

- - ${lang("edit")} + + ${lang("edit")}

${lang("start.comments.title")}

- - ${lang("edit")} + + ${lang("edit")}

${lang("start.breaking.title")}

- - ${lang("edit")} - - ${lang("start.breaking.new")} + + ${lang("edit")} + + ${lang("start.breaking.new")}

${lang("message.date")}: - ${data.date} + ${encodeHTML(data.date)}
${lang("message.title")}: - +
${lang("message.creator")}: - +
${lang("message.text")}: ${lang("message.textinfo")} - +
${entry.webdb_create} ${entry.title}
- ${entry.creator}		${entry.description}  ${lang("delete")} - | ${lang("edit")}${encodeHTML(entry.webdb_create)} ${encodeHTML(entry.title)}
+ ${encodeHTML(entry.creator)}		${encodeHTML(entry.description)}  ${lang("delete")} + | ${lang("edit")}
${data.count} ${lang("records")} / + ${encodeHTML(data.count)} ${lang("records")} / ${lang("show_from_to", data.from, data.to)}  
@@ -41,42 +41,42 @@ ${lang("start.content.title")}

- - ${lang("start.content.new")} + + ${lang("start.content.new")}

${lang("start.show")}:
- - ${lang("start.content.newswire")}
- - ${lang("start.content.feature")}
- - ${lang("start.content.topicspecial")}
- - ${lang("start.content.startspecial")}
+ + ${lang("start.content.newswire")}
+ + ${lang("start.content.feature")}
+ + ${lang("start.content.topicspecial")}
+ + ${lang("start.content.startspecial")}

- - ${lang("start.content.not_published")}
- - ${lang("start.content.with_media")}
- - ${lang("start.content.last_changes")}
- - ${lang("start.content.with_comments")}
+ + ${lang("start.content.not_published")}
+ + ${lang("start.content.with_media")}
+ + ${lang("start.content.last_changes")}
+ + ${lang("start.content.with_comments")}

- - ${lang("start.content.hidden")} + + ${lang("start.content.hidden")}

here to edit all the include files:
-   - ${lang("edit")} +   + ${lang("edit")} ${lang("file")}

- + @@ -104,64 +104,64 @@ ${lang("file")}
${lang("start.generate.all.title")}:
- - ${lang("start.generate.all.new")}  |  + + ${lang("start.generate.all.new")}  | 
${lang("start.generate.parts.title")}:
- - ${lang("start.generate.startpages.new")} + + ${lang("start.generate.startpages.new")}  |  - ${lang("start.generate.all_forced")} + ${lang("start.generate.all_forced")}  |  - ${lang("start.generate.all_sync")} + ${lang("start.generate.all_sync")}
- - ${lang("start.generate.content.new")} + + ${lang("start.generate.content.new")}  |  - ${lang("start.generate.all_forced")} + ${lang("start.generate.all_forced")}
- - ${lang("start.generate.topics.new")} + + ${lang("start.generate.topics.new")}  |  - ${lang("start.generate.all_forced")} + ${lang("start.generate.all_forced")}
- - ${lang("start.generate.postings.new")} + + ${lang("start.generate.postings.new")}  |  - ${lang("start.generate.all_forced")} + ${lang("start.generate.all_forced")}
- - ${lang("start.generate.images.new")} + + ${lang("start.generate.images.new")}  |  - ${lang("start.generate.all_forced")} + ${lang("start.generate.all_forced")}
- - ${lang("start.generate.audio.new")} + + ${lang("start.generate.audio.new")}  |  - ${lang("start.generate.all_forced")} + ${lang("start.generate.all_forced")}
- - ${lang("start.generate.video.new")} + + ${lang("start.generate.video.new")}  |  - ${lang("start.generate.all_forced")} + ${lang("start.generate.all_forced")}
- - ${lang("start.generate.other.new")} + + ${lang("start.generate.other.new")}  |  - ${lang("start.generate.all_forced")} + ${lang("start.generate.all_forced")}
- - ${lang("start.generate.navigation")} + + ${lang("start.generate.navigation")}
@@ -177,30 +177,30 @@ ${lang("file")} ${lang("start.coverage.title")}

- - ${lang("edit")}
- - ${lang("add")} + + ${lang("edit")}
+ + ${lang("add")}

--> ${lang("start.topics.title")}

- - ${lang("edit")}
- - ${lang("add")} + + ${lang("edit")}
+ + ${lang("add")}

${lang("start.images.title")}

- - ${lang("edit")}
- - ${lang("add")} + + ${lang("edit")}
+ + ${lang("add")}

@@ -208,10 +208,10 @@ ${lang("file")} ${lang("start.audio.title")}

- - ${lang("edit")}
- - ${lang("add")} + + ${lang("edit")}
+ + ${lang("add")}

@@ -219,10 +219,10 @@ ${lang("file")} ${lang("start.video.title")}

- - ${lang("edit")}
- - ${lang("add")} + + ${lang("edit")}
+ + ${lang("add")}

@@ -230,10 +230,10 @@ ${lang("file")} ${lang("start.other_media.title")}

- - ${lang("edit")}
- - ${lang("add")} + + ${lang("edit")}
+ + ${lang("add")}

@@ -241,10 +241,10 @@ ${lang("file")} ${lang("start.mediafolder.title")}

- - ${lang("edit")}
- - ${lang("add")} + + ${lang("edit")}
+ + ${lang("add")}

@@ -263,10 +263,10 @@ ${lang("file")} ${lang("start.imcs.title")}

- - ${lang("edit")}
- - ${lang("add")} + + ${lang("edit")}
+ + ${lang("add")} @@ -278,14 +278,14 @@ ${lang("file")} ${lang("start.messageboard.title")} -
${lang("add")} +
${lang("add")}

- ${m.title}
 - ${m.description}
+ ${encodeHTML(m.title)}
 + ${encodeHTML(m.description)}
- von: ${m.creator} / ${m.webdb_create}
+ von: ${encodeHTML(m.creator)} / ${encodeHTML(m.webdb_create)}
 diff --git a/templates-dist/admin/topic.template b/templates-dist/admin/topic.template index 9ed1cd79..6d52a49e 100755 --- a/templates-dist/admin/topic.template +++ b/templates-dist/admin/topic.template @@ -7,9 +7,9 @@ ${lang("topic.htmltitle")} - + - +

 
@@ -17,32 +17,32 @@ ${lang("topic.htmltitle")} diff --git a/templates-dist/admin/topiclist.template b/templates-dist/admin/topiclist.template index 03441953..91678645 100755 --- a/templates-dist/admin/topiclist.template +++ b/templates-dist/admin/topiclist.template @@ -17,34 +17,34 @@ bgcolor="#dddddd" > - - + + - + ${encodeHTML(entry.main_url)}
+ ${encodeHTML(entry.archiv_url)} + + ${encodeHTML(data.count)} ${lang("records")} / ${lang("show_from_to", data.from, data.to)}
${lang("topic.title")}: - +
${lang("topic.description")}: - +
${lang("topic.filename")}: - +
${lang("topic.main_url")} - +
${lang("topic.archive_url")}: - +
${entry.title} ${entry.description} ${encodeHTML(entry.title)} ${encodeHTML(entry.description)}  - ${entry.main_url}
- ${entry.archiv_url}		 ${lang("delete")} - | ${lang("edit")} ${lang("delete")} + | ${lang("edit")}
- ${data.count} ${lang("records")} / ${lang("show_from_to", data.from, data.to)}  

- + - + - + - + diff --git a/templates-dist/admin/user.template b/templates-dist/admin/user.template index eeaff338..baf37216 100755 --- a/templates-dist/admin/user.template +++ b/templates-dist/admin/user.template @@ -7,9 +7,9 @@ ${lang("user.htmltitle")} -

+ - + @@ -17,19 +17,19 @@ ${lang("user.htmltitle")} + ${lang("user.admin")}:(?) diff --git a/templates-dist/admin/userlist.template b/templates-dist/admin/userlist.template index 8fea5ed4..794e67c5 100755 --- a/templates-dist/admin/userlist.template +++ b/templates-dist/admin/userlist.template @@ -16,14 +16,14 @@ bgcolor="#dddddd" > - - - + + + - @@ -31,10 +31,10 @@

- ${lang("list.previous")}  + ${lang("list.previous")}  -${lang("list.next")} +${lang("list.next")} diff --git a/templates-dist/admin/video.template b/templates-dist/admin/video.template index 0118bd9f..5a8ba44c 100755 --- a/templates-dist/admin/video.template +++ b/templates-dist/admin/video.template @@ -6,14 +6,14 @@ ${lang("video.htmltitle")} - +

${lang("user.login")}: - +
${lang("user.password")}: - +
- ${lang("user.admin")}:(?) checked>
${entry.login} ${entry.is_admin}  ${lang("delete")} - | ${lang("edit")}${encodeHTML(entry.login)} ${encodeHTML(entry.is_admin)}  ${lang("delete")} + | ${lang("edit")}
${data.count} ${lang("records")} + ${encodeHTML(data.count)} ${lang("records")} / ${lang("show_from_to", data.from, data.to)}  
@@ -22,31 +22,31 @@ function openWin(url) { -   +  
-
+ - - - - + + + + + + @@ -58,7 +58,7 @@ function openWin(url) { @@ -67,45 +67,45 @@ function openWin(url) { - + - + - + - + - + - + @@ -140,7 +140,7 @@ function openWin(url) { ${lang("media.title")}:
- - - ${lang("media.created")}: ${data.webdb_create} - / ${lang("media.changed")} ${data.webdb_lastchange}
- ${lang("media.published")}: ${data.publish_date} / ${data.publish_server}${data.publish_path}
 - ${lang("media.format")}: ${data.mimetype} / ${data.media_descr} / ${data.human_readable_size}
+ ${lang("media.created")}: ${encodeHTML(data.webdb_create)} + / ${lang("media.changed")} ${encodeHTML(data.webdb_lastchange)}
+ ${lang("media.published")}: ${encodeHTML(data.publish_date)} / ${encodeHTML(data.publish_server)}${encodeHTML(data.publish_path)}
 + ${lang("media.format")}: ${encodeHTML(data.mimetype)} / ${encodeHTML(data.media_descr)} / ${encodeHTML(data.human_readable_size)}
${lang("media.rights")}: ${data.rightsHashdata[to_rights]["name"]}
${lang("media.description")}:
${lang("media.date")}: - +
${lang("media.location")}:
${lang("media.creator")}: - +
${lang("media.keywords")}:
${lang("media.comment")}:
${lang("media.source")}:
@@ -123,13 +123,13 @@ function openWin(url) { ${lang("media.title")}: - +
-
+
- +