From: mh Date: Fri, 13 Dec 2002 01:44:39 +0000 (+0000) Subject: remove gratuitous uses of encodeHTML as well as a couple of other where it is a bug... X-Git-Tag: MIR_1_0_0_RC5~11 X-Git-Url: http://erislabs.net/gitweb/?p=mir.git;a=commitdiff_plain;h=0afa9945987545fd7f85be5fd4eda5b84f16c8c3 remove gratuitous uses of encodeHTML as well as a couple of other where it is a bug to use it --- diff --git a/templates-dist/admin/audio.template b/templates-dist/admin/audio.template index 81353c93..b9111870 100755 --- a/templates-dist/admin/audio.template +++ b/templates-dist/admin/audio.template @@ -4,16 +4,11 @@ ${lang("audio.htmltitle")} - -
+
@@ -22,30 +17,30 @@ function openWin(url) { -   +  
-
+ - + - + + + @@ -98,7 +93,7 @@ function openWin(url) { - + diff --git a/templates-dist/admin/audiolist.template b/templates-dist/admin/audiolist.template index 558209f6..b62465e3 100755 --- a/templates-dist/admin/audiolist.template +++ b/templates-dist/admin/audiolist.template @@ -8,10 +8,10 @@
- - - ${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.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} / ${encodeHTML(data.media_descr)} / ${data.human_readable_size}
${lang("media.rights")}: ${data.rightsHashdata[to_rights]["name"]}
${lang("media.comment")}:
- - + diff --git a/templates-dist/admin/foot.template b/templates-dist/admin/foot.template index d0e5a6ee..31fb0a40 100755 --- a/templates-dist/admin/foot.template +++ b/templates-dist/admin/foot.template @@ -6,6 +6,6 @@ + ${lang("imc.shortname")} - ${config.mirVersion}
+ - + @@ -71,35 +71,35 @@ bgcolor="#dddddd" > + + - - + + - diff --git a/templates-dist/admin/breaking.template b/templates-dist/admin/breaking.template index f3445cd1..a265c29f 100755 --- a/templates-dist/admin/breaking.template +++ b/templates-dist/admin/breaking.template @@ -7,9 +7,9 @@ ${lang("breaking.htmltitle")} - + - +
${lang("medialist.search_text_in")}:
- - ${encodeHTML(entry.title)} 
${encodeHTML(entry.description)}		 ${encodeHTML(entry.media_descr)} ${encodeHTML(entry.human_readable_size)} ${data.mediafolderHashdata[entry.to_media_folder]["name"]} ${entry.human_readable_size} ${encodeHTML(data.mediafolderHashdata[entry.to_media_folder]["name"])}  ${encodeHTML(entry.creator)}    - ${lang("attach")} + ${lang("attach")} ${lang("delete")} - | ${lang("edit")} + | ${lang("edit")}
${encodeHTML(data.count)} ${lang("records")} + ${data.count} ${lang("records")} / ${lang("show_from_to", data.from, data.to)}  
- zurueck  + zurueck  -weiter +weiter
@@ -17,7 +17,7 @@ ${lang("breaking.htmltitle")} diff --git a/templates-dist/admin/breakinglist.template b/templates-dist/admin/breakinglist.template index 4d9bceae..c1b62b45 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 fa27e230..1c30661d 100755 --- a/templates-dist/admin/comment.template +++ b/templates-dist/admin/comment.template @@ -8,14 +8,14 @@ ${lang("comment.htmltitle")} - + - + - - - + + + @@ -25,7 +25,7 @@ ${lang("comment.htmltitle")}

- + @@ -49,7 +49,7 @@ ${lang("comment.htmltitle")} - + @@ -67,7 +67,7 @@ ${lang("comment.htmltitle")} - + bgcolor="#dddddd" > + ${lang("edit")} +  | newswire + ${entry.comment}  -
${lang("breaking.date")}: - ${encodeHTML(data.webdb_create_formatted)} + ${data.webdb_create_formatted}
${encodeHTML(entry.webdb_create_formatted)} ${entry.webdb_create_formatted}  ${encodeHTML(entry.text)}  ${lang("delete")} - | ${lang("edit")} ${lang("delete")} + | ${lang("edit")}
${encodeHTML(data.count)} ${lang("records")} + ${data.count} ${lang("records")} / ${lang("show_from_to", data.from, data.to)}  
${lang("comment.date")}:${encodeHTML(data.date)}${data.date}
${lang("comment.email")}:
${lang("comment.text")}:
diff --git a/templates-dist/admin/commentlist.template b/templates-dist/admin/commentlist.template index be81a56d..c62b14ba 100755 --- a/templates-dist/admin/commentlist.template +++ b/templates-dist/admin/commentlist.template @@ -1,7 +1,7 @@ ${lang("commentlist.htmltitle")} - + @@ -12,7 +12,7 @@ class="list1"class="list2"> - @@ -56,15 +56,15 @@ Von: ${encodeHTML(entry.creator)}
${encodeHTML(entry.description)}
URL: ${encodeHTML(entry.main_url)} -
${lang("edit")} +
${lang("edit")} @@ -82,10 +82,10 @@ diff --git a/templates-dist/admin/content.template b/templates-dist/admin/content.template index bbacb048..c357c01d 100755 --- 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} - + - + @@ -32,7 +32,7 @@ p { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt} ${lang("content.owner")}: @@ -43,7 +43,7 @@ p { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt} ${lang("content.import_date")}: @@ -55,7 +55,7 @@ p { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt} ${lang("content.lastchange_date")}: @@ -68,7 +68,7 @@ p { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt} ${lang("content.create_date")}: @@ -78,11 +78,11 @@ p { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt} @@ -211,8 +211,8 @@ p { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt} @@ -246,7 +246,7 @@ p { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt} @@ -272,7 +272,7 @@ p { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt} @@ -280,8 +280,8 @@ p { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt} @@ -289,7 +289,7 @@ p { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt} @@ -297,8 +297,8 @@ p { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt} @@ -306,7 +306,7 @@ p { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt} @@ -314,8 +314,8 @@ p { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt} @@ -323,7 +323,7 @@ p { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt}
- + @@ -47,7 +47,7 @@
${encodeHTML(entry.webdb_create_short)}
+ 		${entry.webdb_create_short}
V- 		${data.articleHash[entry.to_media]["title"]}
- + edit | - + view
-zurueck  +zurueck  -weiter +weiter
- ${encodeHTML(data.login_user.login)} + ${data.login_user.login}   - ${encodeHTML(data.date)} + ${data.date}   - ${encodeHTML(data.webdb_lastchange)} + ${data.webdb_lastchange}
- ${encodeHTML(data.webdb_create)}

${lang("edit")} (yyyy-mm-dd [HH:mm]): + ${data.webdb_create}

${lang("edit")} (yyyy-mm-dd [HH:mm]):
- ${lang("content.topic")}  - + ${lang("content.topic")}  +  / ${lang("content.feature")}:  - - + + @@ -125,8 +125,8 @@ p { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt}
${lang("content.title")}: 

${lang("content.subtitle")}: 
- - + + 		@@ -139,8 +139,8 @@ p { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt} ${lang("content.location")}: - - + + @@ -151,8 +151,8 @@ p { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt} ${lang("content.creator")}: - - + +
@@ -163,8 +163,8 @@ p { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt} 		${lang("content.creator.email")}/${lang("content.creator.url")}: - - + + @@ -175,8 +175,8 @@ p { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt} ${lang("content.creator.address")}/${lang("content.creator.telephone")}: - - + + @@ -186,8 +186,8 @@ p { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt}
${lang("content.abstract")}: - - + + @@ -197,12 +197,12 @@ p { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt}
${lang("content.content")}: - - + + ${lang("content.html")} checked>  - - + +
Termin (von/bis) - - + + : @@ -223,7 +223,7 @@ p { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt} Termin Name:  - + @@ -237,7 +237,7 @@ p { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt} ${lang("content.internal")} - +
    - frei : + frei : checked> @@ -263,8 +263,8 @@ p { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt} ${lang("content.images")}:
 - edit - ${lang("delete")} + edit + ${lang("delete")}
${lang("content.media")}:
 - ${lang("content.addimage")} + ${lang("content.addimage")}
${lang("content.audio")}:
 - edit - ${lang("delete")} + edit + ${lang("delete")}
${lang("content.media")}:
 - ${lang("content.addaudio")} + ${lang("content.addaudio")}
${lang("content.video")}:
 - edit - ${lang("delete")} + edit + ${lang("delete")}
${lang("content.media")}:
 - ${lang("content.addvideo")} + ${lang("content.addvideo")}
${lang("content.other")}:
 - edit - ${lang("delete")} + edit + ${lang("delete")}
${lang("content.media")}:
 - ${lang("content.addother")} + ${lang("content.addother")}
diff --git a/templates-dist/admin/contentlist.template b/templates-dist/admin/contentlist.template index f9c72d37..7f504ea2 100755 --- a/templates-dist/admin/contentlist.template +++ b/templates-dist/admin/contentlist.template @@ -24,44 +24,44 @@
- ${encodeHTML(entry.webdb_create_formatted)}
- ${encodeHTML(entry.webdb_lastchange_formatted)}-
+ ${entry.webdb_create_formatted}
+ ${entry.webdb_lastchange_formatted}-
F- H- 		${articletypeHash[entry.to_article_type]["name"]} -- ${encodeHTML(entry.place)}: ${encodeHTML(entry.title)}
${encodeHTML(entry.creator)}  - ${lang("edit")} -  | newswire		 ${themenHashData[entry.thema_id]["name"]} 
${schwerpunktHashData[entry.to_feature]["title"]} 		 bgcolor="Pink"bgcolor="Yellow" valign="top"> - ${encodeHTML(entry.comment)}  - ${lang("delete")} + ${lang("delete")}
${encodeHTML(data.count)} ${lang("records")} + ${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 2255a040..a25a09bb 100755 --- a/templates-dist/admin/feature.template +++ b/templates-dist/admin/feature.template @@ -9,7 +9,7 @@ ${lang("feature.htmltitle")} - + @@ -19,7 +19,7 @@ ${lang("feature.htmltitle")} - + - + @@ -35,13 +35,13 @@
${encodeHTML(data.count)} ${lang("records")} / ${lang("show_from_to", data.from, data.to)}
- +
${lang("feature.title")}: diff --git a/templates-dist/admin/featurelist.template b/templates-dist/admin/featurelist.template index 01c9252a..9c20e157 100755 --- a/templates-dist/admin/featurelist.template +++ b/templates-dist/admin/featurelist.template @@ -25,8 +25,8 @@ ${encodeHTML(entry.filename)}  ${encodeHTML(entry.main_url)}  ${encodeHTML(entry.description)}  ${lang("delete")} - | ${lang("edit")} ${lang("delete")} + | ${lang("edit")}
 ${lang("back")} ${lang("back")}

- + diff --git a/templates-dist/admin/fileedit.template b/templates-dist/admin/fileedit.template index 85e80278..2a1cf1fd 100755 --- a/templates-dist/admin/fileedit.template +++ b/templates-dist/admin/fileedit.template @@ -1,7 +1,7 @@ ${lang("edit")} ${lang("edit")} - + @@ -14,7 +14,7 @@
- + diff --git a/templates-dist/admin/fileeditlist.template b/templates-dist/admin/fileeditlist.template index 5c7798d6..3720fb78 100755 --- a/templates-dist/admin/fileeditlist.template +++ b/templates-dist/admin/fileeditlist.template @@ -23,7 +23,7 @@ bgcolor="#dddddd" >

${encodeHTML(entry)} ${lang("edit")}${lang("edit")}
${lang("foot.top")} - ${lang("imc.shortname")} - ${encodeHTML(config.mirVersion)}
diff --git a/templates-dist/admin/head.template b/templates-dist/admin/head.template index 56eb4c0a..b705a824 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 31494d81..5d8d69ea 100755 --- a/templates-dist/admin/head_nonavi.template +++ b/templates-dist/admin/head_nonavi.template @@ -1,6 +1,6 @@ -
  +
  ${lang("imc.name")}
${encodeHTML(login_user.login)} ${lang("head.logged_in")} / diff --git a/templates-dist/admin/hiddenlist.template b/templates-dist/admin/hiddenlist.template index 192d4ff2..96186fae 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 @@ - + diff --git a/templates-dist/admin/image.template b/templates-dist/admin/image.template index 8f0b0615..3c71fa6d 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) { -   +  
-
+ - + + + @@ -71,14 +71,14 @@ function openWin(url) { - + - + @@ -103,7 +103,7 @@ function openWin(url) { - + @@ -125,13 +125,13 @@ function openWin(url) { ${lang("media.title")}: diff --git a/templates-dist/admin/imagelist.template b/templates-dist/admin/imagelist.template index cbf59461..0aa37317 100755 --- a/templates-dist/admin/imagelist.template +++ b/templates-dist/admin/imagelist.template @@ -8,10 +8,10 @@
- - ${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.published")}: ${data.publish_date} / ${data.publish_server}${data.publish_path}
 + ${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"]}
${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.comment")}:
- +
-
+
-
+ - + @@ -72,8 +72,8 @@ bgcolor="#dddddd" > + + @@ -82,10 +82,10 @@ @@ -98,10 +98,10 @@ diff --git a/templates-dist/admin/language.template b/templates-dist/admin/language.template index e49420b2..0384abed 100755 --- a/templates-dist/admin/language.template +++ b/templates-dist/admin/language.template @@ -7,9 +7,9 @@ ${lang("language.htmltitle")} - + - +
${lang("medialist.search_text_in")}:
- - ${encodeHTML(entry.title)} 
${encodeHTML(entry.description)}		${data.mediafolderHashdata[entry.to_media_folder]["name"]}  ${encodeHTML(entry.creator)}    - ${lang("attach")} + ${lang("attach")} ${lang("delete")} - | ${lang("edit")} + | ${lang("edit")}
- zurueck  + zurueck  -weiter +weiter
@@ -26,7 +26,7 @@ ${lang("language.htmltitle")} diff --git a/templates-dist/admin/languagelist.template b/templates-dist/admin/languagelist.template index 2e884baa..4f2d6580 100755 --- a/templates-dist/admin/languagelist.template +++ b/templates-dist/admin/languagelist.template @@ -19,12 +19,12 @@ > - + - @@ -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 8b4087a3..4608f42b 100755 --- a/templates-dist/admin/linksimcs.template +++ b/templates-dist/admin/linksimcs.template @@ -7,7 +7,7 @@ ${lang("linkimcs.htmltitle")} - + @@ -27,7 +27,7 @@ ${lang("linkimcs.htmltitle")} diff --git a/templates-dist/admin/linksimcslist.template b/templates-dist/admin/linksimcslist.template index 17eba79d..974116b3 100755 --- a/templates-dist/admin/linksimcslist.template +++ b/templates-dist/admin/linksimcslist.template @@ -5,7 +5,7 @@ - + @@ -78,8 +78,8 @@

- @@ -91,10 +91,10 @@
${lang("language.code")}: - +
${encodeHTML(entry.name)}  ${encodeHTML(entry.code)}  ${lang("delete")} - | ${lang("edit")} ${lang("delete")} + | ${lang("edit")}
${encodeHTML(data.count)} ${lang("records")} + ${data.count} ${lang("records")} / ${lang("show_from_to", data.from, data.to)}  
${encodeHTML(entry.url)} ${encodeHTML(entry.sortpriority)} ${encodeHTML(data.language)} ${lang("delete")} - | ${lang("edit")} +  ${lang("delete")} + | ${lang("edit")}

- ${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 cfd7b5fb..b127603b 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 de50af47..08ddcec5 100755 --- a/templates-dist/admin/media.template +++ b/templates-dist/admin/media.template @@ -4,16 +4,11 @@ ${lang("other_media.htmltitle")} - - +
@@ -22,31 +17,31 @@ function openWin(url) { -   +  
-
+ - + + + @@ -73,8 +68,8 @@ function openWin(url) { - + @@ -99,7 +94,7 @@ function openWin(url) { - + @@ -123,13 +118,13 @@ function openWin(url) { ${lang("media.title")}: diff --git a/templates-dist/admin/mediafolder.template b/templates-dist/admin/mediafolder.template index ab7f31ce..2b29bf7a 100755 --- a/templates-dist/admin/mediafolder.template +++ b/templates-dist/admin/mediafolder.template @@ -7,9 +7,9 @@ ${lang("mediafolder.htmltitle")} - + - + diff --git a/templates-dist/admin/mediafolderlist.template b/templates-dist/admin/mediafolderlist.template index 542c8044..93897fef 100755 --- a/templates-dist/admin/mediafolderlist.template +++ b/templates-dist/admin/mediafolderlist.template @@ -16,28 +16,28 @@ bgcolor="#dddddd" > - + - + -
- - - ${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.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.rights")}: ${data.rightsHashdata[to_rights]["name"]}
${lang("media.date")}: - +
${lang("media.comment")}:
- +
-
+
${encodeHTML(entry.date)} ${entry.date}  ${encodeHTML(entry.name)}  ${encodeHTML(entry.place)}  ${encodeHTML(entry.comment)}  ${encodeHTML(entry.keywords)} ${lang("delete")} - | ${lang("edit")} - | ${lang("list")}${lang("delete")} + | ${lang("edit")} + | ${lang("list")}
${encodeHTML(data.count)} ${lang("records")} / + ${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/medialist.template b/templates-dist/admin/medialist.template index cd70fb53..6758f47d 100755 --- a/templates-dist/admin/medialist.template +++ b/templates-dist/admin/medialist.template @@ -8,10 +8,10 @@ - - + diff --git a/templates-dist/admin/video.template b/templates-dist/admin/video.template index 5a8ba44c..084af505 100755 --- a/templates-dist/admin/video.template +++ b/templates-dist/admin/video.template @@ -4,16 +4,11 @@ ${lang("video.htmltitle")} - - +
+ - + @@ -71,35 +71,35 @@ bgcolor="#dddddd" > + + - + - diff --git a/templates-dist/admin/message.template b/templates-dist/admin/message.template index 4aa33058..c6bafb90 100755 --- a/templates-dist/admin/message.template +++ b/templates-dist/admin/message.template @@ -7,9 +7,9 @@ ${lang("message.htmltitle")} - + - +
${lang("medialist.search_text_in")}:
- - ${encodeHTML(entry.title)} 
${encodeHTML(entry.description)}		 ${encodeHTML(entry.media_descr)} ${encodeHTML(entry.human_readable_size)} ${entry.human_readable_size}  ${data.mediafolderHashdata[entry.to_media_folder]["name"]}  ${encodeHTML(entry.creator)}    - ${lang("attach")} + ${lang("attach")} ${lang("delete")} - | ${lang("edit")} + | ${lang("edit")}
${encodeHTML(data.count)} ${lang("records")} + ${data.count} ${lang("records")} / ${lang("show_from_to", data.from, data.to)}  
- zurueck  + zurueck  -weiter +weiter
@@ -17,7 +17,7 @@ ${lang("message.htmltitle")} diff --git a/templates-dist/admin/messagelist.template b/templates-dist/admin/messagelist.template index 1274bb23..2d03919a 100755 --- a/templates-dist/admin/messagelist.template +++ b/templates-dist/admin/messagelist.template @@ -20,12 +20,12 @@ bgcolor="#dddddd" > - + - + @@ -37,10 +37,10 @@

- ${lang("list.previous")}  + ${lang("list.previous")}  -${lang("list.next")} +${lang("list.next")} @@ -48,4 +48,4 @@ - \ No newline at end of file + diff --git a/templates-dist/admin/start_admin.template b/templates-dist/admin/start_admin.template index 6ee29017..5cef834a 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")}: - ${encodeHTML(data.date)} + ${data.date}
${encodeHTML(entry.webdb_create)} ${entry.webdb_create}  ${encodeHTML(entry.title)}
${encodeHTML(entry.creator)}		 ${encodeHTML(entry.description)}  ${lang("delete")} - | ${lang("edit")} ${lang("delete")} + | ${lang("edit")}
@@ -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")}

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

 
diff --git a/templates-dist/admin/topiclist.template b/templates-dist/admin/topiclist.template index 91678645..e9472947 100755 --- a/templates-dist/admin/topiclist.template +++ b/templates-dist/admin/topiclist.template @@ -22,8 +22,8 @@ - + @@ -34,7 +34,7 @@
${encodeHTML(entry.main_url)}
${encodeHTML(entry.archiv_url)}		 ${lang("delete")} - | ${lang("edit")} ${lang("delete")} + | ${lang("edit")}

- + diff --git a/templates-dist/admin/user.template b/templates-dist/admin/user.template index baf37216..5918ca64 100755 --- a/templates-dist/admin/user.template +++ b/templates-dist/admin/user.template @@ -7,7 +7,7 @@ ${lang("user.htmltitle")} - + diff --git a/templates-dist/admin/userlist.template b/templates-dist/admin/userlist.template index 794e67c5..84db96d8 100755 --- a/templates-dist/admin/userlist.template +++ b/templates-dist/admin/userlist.template @@ -18,8 +18,8 @@ >

${encodeHTML(entry.login)}  ${encodeHTML(entry.is_admin)}  ${lang("delete")} - | ${lang("edit")} ${lang("delete")} + | ${lang("edit")}
@@ -22,31 +17,31 @@ function openWin(url) { -   +  
-
+ - + + + @@ -73,8 +68,8 @@ function openWin(url) { - + @@ -99,7 +94,7 @@ function openWin(url) { - + @@ -123,13 +118,13 @@ function openWin(url) { ${lang("media.title")}: diff --git a/templates-dist/admin/videolist.template b/templates-dist/admin/videolist.template index e3ae1d07..7450171b 100755 --- a/templates-dist/admin/videolist.template +++ b/templates-dist/admin/videolist.template @@ -8,10 +8,10 @@
- - - ${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.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} / ${encodeHTML(data.media_descr)} / ${data.human_readable_size}
${lang("media.rights")}: ${data.rightsHashdata[to_rights]["name"]}
${lang("media.date")}: - +
${lang("media.comment")}:
- +
-
+
-
+ - + @@ -71,19 +71,19 @@ bgcolor="#dddddd" > + + - + @@ -96,10 +96,10 @@
${lang("medialist.search_text_in")}:
- - ${encodeHTML(entry.title)} 
${encodeHTML(entry.description)}		 ${encodeHTML(entry.media_descr)} ${encodeHTML(entry.human_readable_size)} ${entry.human_readable_size}  ${data.mediafolderHashdata[entry.to_media_folder]["name"]}  ${encodeHTML(entry.creator)}    - ${lang("attach")} + ${lang("attach")} ${lang("delete")} - | ${lang("edit")} + | ${lang("edit")}
- zurueck  + zurueck  -weiter +weiter