X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=templates-dist%2Fadmin%2Fcontent.template;h=c357c01d2e43eba530fd7d2193d16da7902d010f;hb=b824bb63090abfabe99b73f57246df760748d0f9;hp=160e82c8af1c9ccaf6d2e72e090fb5ad6befd015;hpb=cf04c9314400dfbee41c0d69208782da3b3c1f4f;p=mir.git

diff --git a/templates-dist/admin/content.template b/templates-dist/admin/content.template
index 160e82c8..c357c01d 100755
--- a/templates-dist/admin/content.template
+++ b/templates-dist/admin/content.template
@@ -14,9 +14,9 @@ p {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt}
 <include "admin/head.template">
 <form method="post" action="${config.actionRoot}">
 	<input type="hidden" name="module" value="Content">
-	<input type="hidden" name="where" value="${data.where}">
-	<input type="hidden" name="offset" value="${data.offset}">
-	<input type="hidden" name="order" value="${data.order}">
+	<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="${data.id}">
 	<if data.new>
 		<input type="hidden" name="do" value="insert">
@@ -91,12 +91,12 @@ p {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt}
 		<td>
 		<select name="to_article_type">
 		<list extra.articletypePopupData as a>
-			<option value="${a.key}" <if (a.key == data.to_article_type)>selected</if>>${a.value}</option>
+			<option value="${encodeHTML(a.key)}" <if (a.key == data.to_article_type)>selected</if>>${encodeHTML(a.value)}</option>
 		</list>
 		</select>
 		<select name="to_feature">
 		<list extra.schwerpunktPopupData as s>
-			<option value="${s.key}" <if (s.key == data.to_feature)>selected</if>>${s.value}</option>
+			<option value="${encodeHTML(s.key)}" <if (s.key == data.to_feature)>selected</if>>${encodeHTML(s.value)}</option>
 		</list>
 		</select>
 		</td>
@@ -104,7 +104,7 @@ p {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt}
 		<select name="to_topic" size="5" multiple>
 
 		<list extra.themenPopupData as t>
-		<option value="${t.key}" <list data.to_topics as to><if (t.key == to["id"])>selected</if></list>>${t.value}</option>
+		<option value="${encodeHTML(t.key)}" <list data.to_topics as to><if (t.key == to["id"])>selected</if></list>>${encodeHTML(t.value)}</option>
 		</list>
 
 		</select>
@@ -114,7 +114,7 @@ p {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt}
 		<td>
 		<select name="to_language">
 		<list extra.languagePopupData as l>
-			<option value="${l.key}" <if (l.key == data.to_language)>selected</if>>${l.value}</option>
+			<option value="${encodeHTML(l.key)}" <if (l.key == data.to_language)>selected</if>>${encodeHTML(l.value)}</option>
 		</list>
 		</select>
 		<td>
@@ -130,9 +130,9 @@ p {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt}
 		</font></B>
 	</td>
 	<td colspan="4">
-		<input type="text" size="40" name="title" value="${data.title}"><br>
-		<input type="text" size="20" name="subtitle" value="${data.subtitle}">
-		<input type="text" size="20" name="edittitle" value="${data.edittitle}">
+		<input type="text" size="40" name="title" value="${encodeHTML(data.title)}"><br>
+		<input type="text" size="20" name="subtitle" value="${encodeHTML(data.subtitle)}">
+		<input type="text" size="20" name="edittitle" value="${encodeHTML(data.edittitle)}">
 	</td>
 </tr>
 <tr>
@@ -144,7 +144,7 @@ p {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt}
 		</font></B>
 	</td>
 	<td colspan="4" >
-		<input type="text" size="40" name="place" value="${data.place}">
+		<input type="text" size="40" name="place" value="${encodeHTML(data.place)}">
 	</td>
 </tr>
 <tr>
@@ -155,7 +155,7 @@ p {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt}
 		<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="${data.creator}"><br>
+		<input type="text" size="40" name="creator" value="${encodeHTML(data.creator)}"><br>
 	</td>
 </tr>
 
@@ -167,8 +167,8 @@ p {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt}
 		<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="${data.creator_email}">
-		<input type="text" size="20" name="creator_main_url" value="${data.creator_main_url}">
+		<input type="text" size="20" name="creator_email" value="${encodeHTML(data.creator_email)}">
+		<input type="text" size="20" name="creator_main_url" value="${encodeHTML(data.creator_main_url)}">
 	</td>
 </tr>
 <tr>
@@ -179,8 +179,8 @@ p {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt}
 		<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="${data.creator_address}">
-		<input type="text" size="20" name="creator_phone" value="${data.creator_phone}">
+		<input type="text" size="20" name="creator_address" value="${encodeHTML(data.creator_address)}">
+		<input type="text" size="20" name="creator_phone" value="${encodeHTML(data.creator_phone)}">
 	</td>
 </tr>
 <tr>
@@ -190,7 +190,7 @@ p {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt}
 		<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>${data.description}</textarea>
+		<textarea cols="50" rows="15" name="description" wrap=virtual>${encodeHTML(data.description)}</textarea>
 	</td>
 </tr>
 
@@ -205,7 +205,7 @@ p {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt}
 		<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>${data.content_data}</textarea></td>
+	<textarea cols="50" rows="20" name="content_data" wrap=virtual>${encodeHTML(data.content_data)}</textarea></td>
 </tr>
 <!--
 <tr>
@@ -215,8 +215,8 @@ p {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt}
 		<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="${data.date_from}">
-		<input type="text" size="8" maxlength="8" name="date_to" value="${data.date_to}">
+		<input type="text" size="8" maxlength="8" name="date_from" value="${encodeHTML(data.date_from)}">
+		<input type="text" size="8" maxlength="8" name="date_to" value="${encodeHTML(data.date_to)}">
 	</td>
 	<td>
 		&nbsp;
@@ -227,7 +227,7 @@ p {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt}
 		</font></B>
 	</td>
 	<td>
-		<input type="text" size="25" name="date_name" value="${data.date_name}">
+		<input type="text" size="25" name="date_name" value="${encodeHTML(data.date_name)}">
 	</td>
 </tr>
 -->
@@ -263,7 +263,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.images")}:</B><br></td>
 	<td colspan="4" align="left" valign="top">
-		<a href="${config.actionRoot}?module=Images&do=edit&id=${m["id"]}"><img src="${config.actionRoot}?module=Images&do=showicon&id=${m["id"]}" alt="edit" border="0"></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>
@@ -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="${config.actionRoot}?module=Images&do=list&cid=${data.id}">${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>
@@ -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="${config.actionRoot}?module=Audio&do=list&cid=${data.id}">${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>
@@ -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="${config.actionRoot}?module=Video&do=list&cid=${data.id}">${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,7 +314,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.other")}:</B><br></td>
 	<td colspan="4" align="left" valign="top">
-		<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=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>
@@ -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="${config.actionRoot}?module=OtherMedia&do=list&cid=${data.id}">${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>