[Koha-patches] [PATCH 2/2] Further fixes for Bug 3652 - XSS vulnerabilities
Owen Leonard
oleonard at myacpl.org
Wed Nov 24 20:59:34 CET 2010
Applying "ESCAPE='0'" where necessary in the staff client
---
.../prog/en/includes/auth-finder-search.inc | 6 ++--
.../prog/en/includes/doc-head-close.inc | 2 +-
.../prog/en/includes/doc-head-open.inc | 6 ++++-
.../intranet-tmpl/prog/en/includes/header.inc | 2 +-
.../prog/en/includes/intranet-bottom.inc | 10 ++++----
.../prog/en/modules/acqui/neworderbiblio.tmpl | 2 +-
.../prog/en/modules/acqui/neworderempty.tmpl | 12 +++++-----
.../prog/en/modules/acqui/newordersuggestion.tmpl | 2 +-
.../prog/en/modules/acqui/z3950_search.tmpl | 4 +-
.../prog/en/modules/admin/aqbudgetperiods.tmpl | 2 +-
.../prog/en/modules/admin/aqbudgets.tmpl | 1 +
.../prog/en/modules/admin/aqplan.tmpl | 8 +++---
.../en/modules/admin/auth_subfields_structure.tmpl | 18 ++++++++--------
.../prog/en/modules/admin/authorised_values.tmpl | 2 +-
.../prog/en/modules/admin/classsources.tmpl | 5 +--
.../en/modules/admin/item_circulation_alerts.tmpl | 4 +-
.../prog/en/modules/admin/koha2marclinks.tmpl | 22 ++++++++++----------
.../en/modules/admin/marc_subfields_structure.tmpl | 16 +++++++-------
.../prog/en/modules/admin/matching-rules.tmpl | 2 +-
.../prog/en/modules/admin/patron-attr-types.tmpl | 2 +-
koha-tmpl/intranet-tmpl/prog/en/modules/auth.tmpl | 2 +-
.../prog/en/modules/authorities/authorities.tmpl | 2 +-
.../modules/authorities/searchresultlist-auth.tmpl | 2 +-
.../en/modules/authorities/searchresultlist.tmpl | 2 +-
.../prog/en/modules/basket/basket.tmpl | 6 ++--
.../prog/en/modules/basket/sendbasket.tmpl | 2 +-
.../prog/en/modules/catalogue/ISBDdetail.tmpl | 2 +-
.../prog/en/modules/catalogue/MARCdetail.tmpl | 2 +-
.../prog/en/modules/catalogue/detail.tmpl | 20 +++++++++---------
.../en/modules/catalogue/labeledMARCdetail.tmpl | 2 +-
.../prog/en/modules/cataloguing/addbiblio.tmpl | 2 +-
.../prog/en/modules/cataloguing/additem.tmpl | 4 +-
.../prog/en/modules/circ/circulation.tmpl | 10 ++++----
.../prog/en/modules/intranet-main.tmpl | 4 +-
.../prog/en/modules/labels/label-edit-batch.tmpl | 2 +-
.../prog/en/modules/labels/label-home.tmpl | 4 +-
.../prog/en/modules/labels/spinelabel-print.tmpl | 2 +-
.../prog/en/modules/members/borrowers_details.tmpl | 4 ++-
.../prog/en/modules/members/member.tmpl | 2 +-
.../prog/en/modules/members/memberentrygen.tmpl | 6 ++--
.../en/modules/reports/acquisitions_stats.tmpl | 14 ++++++------
.../prog/en/modules/reports/bor_issues_top.tmpl | 2 +-
.../prog/en/modules/reports/borrowers_out.tmpl | 4 +-
.../prog/en/modules/reports/borrowers_stats.tmpl | 4 +-
.../prog/en/modules/reports/cat_issues_top.tmpl | 4 +-
.../prog/en/modules/reports/catalogue_out.tmpl | 4 +-
.../prog/en/modules/reports/catalogue_stats.tmpl | 4 +-
.../prog/en/modules/reports/issues_avg_stats.tmpl | 16 +++++++-------
.../reports/issues_by_borrower_category.tmpl | 2 +-
.../prog/en/modules/reports/issues_stats.tmpl | 4 +-
.../prog/en/modules/reports/itemtypes.tmpl | 2 +-
.../prog/en/modules/reports/serials_stats.tmpl | 4 +-
.../prog/en/modules/reserve/request.tmpl | 4 +-
53 files changed, 142 insertions(+), 136 deletions(-)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc
index 437b313..fe4f612 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc
@@ -17,7 +17,7 @@
<option value="start">starts with</option>
<option value="is">is exactly</option>
</select>
- <input type="text" name="value_mainstr" value="<!-- TMPL_VAR ESCAPE="HTML" name="value_mainstr" -->" />
+ <input type="text" name="value_mainstr" value="<!-- TMPL_VAR name="value_mainstr" -->" />
</li>
<li>
<label for="mainentry">Main entry</label>
@@ -29,7 +29,7 @@
<option value="start">starts with</option>
<option value="is">is exactly</option>
</select>
- <input type="text" name="value_main" value="<!-- TMPL_VAR ESCAPE="HTML" name="value_main" -->" />
+ <input type="text" name="value_main" value="<!-- TMPL_VAR name="value_main" -->" />
</li>
<li>
<label for="marclist">Anywhere</label>
@@ -41,7 +41,7 @@
<option value="start">starts with</option>
<option value="is">is exactly</option>
</select>
- <input type="text" name="value_any" value="<!-- TMPL_VAR ESCAPE="HTML" name="value_any" -->" />
+ <input type="text" name="value_any" value="<!-- TMPL_VAR name="value_any" -->" />
</li>
<li>
<label for="orderby">Sort by </label>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
index 1970440..f17bc29 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
@@ -75,7 +75,7 @@
<!-- TMPL_IF NAME="intranetuserjs" -->
<script type="text/javascript">
//<![CDATA[
- <!-- TMPL_VAR NAME="intranetuserjs" -->
+ <!-- TMPL_VAR NAME="intranetuserjs" ESCAPE="0" -->
//]]>
</script>
<!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-open.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-open.inc
index df2dc01..d7b838d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-open.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-open.inc
@@ -1,4 +1,8 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="<!-- TMPL_VAR NAME="lang" -->" xml:lang="<!-- TMPL_VAR NAME="lang" -->" <!-- TMPL_IF NAME="bidi" -->dir="<!-- TMPL_VAR NAME="bidi" -->"<!-- /TMPL_IF --> xmlns="http://www.w3.org/1999/xhtml">
+<!-- TMPL_IF NAME="bidi" -->
+<html lang="<!-- TMPL_VAR NAME="lang" -->" xml:lang="<!-- TMPL_VAR NAME="lang" -->" dir="<!-- TMPL_VAR NAME="bidi" -->" xmlns="http://www.w3.org/1999/xhtml">
+<!-- TMPL_ELSE -->
+<html lang="<!-- TMPL_VAR NAME="lang" -->" xml:lang="<!-- TMPL_VAR NAME="lang" -->" xmlns="http://www.w3.org/1999/xhtml">
+<!-- /TMPL_IF -->
<head>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
index 95ce8dd..3e3ab36 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
@@ -9,7 +9,7 @@
<!-- TMPL_IF NAME="intranetbookbag" -->
<li><a href="#" id="cartmenulink">Cart<span id="basketcount"></span></a></li>
<!-- /TMPL_IF -->
- <!-- TMPL_VAR name="IntranetNav" -->
+ <!-- TMPL_VAR name="IntranetNav" ESCAPE="0" -->
<li class="more">
<a id="showmore" href="/cgi-bin/koha/mainpage.pl">More</a>
<div id="moremenu">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc
index 78334b2..71eff05 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc
@@ -7,14 +7,14 @@
<!-- TMPL_LOOP NAME="languages_loop" -->
<!-- TMPL_IF NAME="group_enabled" -->
<!-- TMPL_IF NAME="plural" -->
- <li class="more"><a id="showlang" href="#"><!-- TMPL_VAR NAME="native_description" --> (<!-- TMPL_VAR NAME="rfc4646_subtag" -->)</a><div id="sublangs">
+ <li class="more"><a id="showlang" href="#"><!-- TMPL_VAR NAME="native_description" ESCAPE="0" --> (<!-- TMPL_VAR NAME="rfc4646_subtag" ESCAPE="0" -->)</a><div id="sublangs">
<div class="bd"><ul>
<!-- TMPL_LOOP NAME="sublanguages_loop" -->
<!-- TMPL_IF NAME="enabled" -->
<!-- TMPL_IF NAME="sublanguage_current" -->
- <li> <a href="#"><!-- TMPL_VAR NAME="native_description" --> <!-- TMPL_VAR NAME="script_description" --> <!-- TMPL_VAR NAME="region_description" --> <!-- TMPL_VAR NAME="variant_description" --> (<!-- TMPL_VAR NAME="rfc4646_subtag" -->)</a></li>
+ <li> <a href="#"><!-- TMPL_VAR NAME="native_description" ESCAPE="0" --> <!-- TMPL_VAR NAME="script_description" ESCAPE="0" --> <!-- TMPL_VAR NAME="region_description" --> <!-- TMPL_VAR NAME="variant_description" ESCAPE="0" --> (<!-- TMPL_VAR NAME="rfc4646_subtag" ESCAPE="0" -->)</a></li>
<!-- TMPL_ELSE -->
- <li><a href="/cgi-bin/koha/changelanguage.pl?language=<!-- TMPL_VAR NAME="rfc4646_subtag" -->"> <!-- TMPL_VAR NAME="native_description" --> <!-- TMPL_VAR NAME="script_description" --> <!-- TMPL_VAR NAME="region_description" --> <!-- TMPL_VAR NAME="variant_description" --> (<!-- TMPL_VAR NAME="rfc4646_subtag" -->)</a></li>
+ <li><a href="/cgi-bin/koha/changelanguage.pl?language=<!-- TMPL_VAR NAME="rfc4646_subtag" -->"> <!-- TMPL_VAR NAME="native_description" ESCAPE="0" --> <!-- TMPL_VAR NAME="script_description" ESCAPE="0" --> <!-- TMPL_VAR NAME="region_description" ESCAPE="0" --> <!-- TMPL_VAR NAME="variant_description" --> (<!-- TMPL_VAR NAME="rfc4646_subtag" ESCAPE="0" -->)</a></li>
<!-- /TMPL_IF -->
<!-- /TMPL_IF -->
@@ -24,9 +24,9 @@
<!-- TMPL_ELSE -->
<!-- TMPL_IF NAME="group_enabled" -->
<!-- TMPL_IF NAME="current" -->
- <li><!-- TMPL_IF NAME="native_description" --><!-- TMPL_VAR NAME="native_description" --><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="rfc4646_subtag" --><!-- /TMPL_IF --></li>
+ <li><!-- TMPL_IF NAME="native_description" --><!-- TMPL_VAR NAME="native_description" ESCAPE="0" --><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="rfc4646_subtag" ESCAPE="0" --><!-- /TMPL_IF --></li>
<!-- TMPL_ELSE -->
- <li><a href="/cgi-bin/koha/changelanguage.pl?language=<!-- TMPL_VAR NAME="rfc4646_subtag" -->"><!-- TMPL_IF NAME="native_description" --><!-- TMPL_VAR NAME="native_description" --><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="rfc4646_subtag" --><!-- /TMPL_IF --></a></li>
+ <li><a href="/cgi-bin/koha/changelanguage.pl?language=<!-- TMPL_VAR NAME="rfc4646_subtag" -->"><!-- TMPL_IF NAME="native_description" --><!-- TMPL_VAR NAME="native_description" ESCAPE="0" --><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="rfc4646_subtag" ESCAPE="0" --><!-- /TMPL_IF --></a></li>
<!-- /TMPL_IF -->
<!-- /TMPL_IF -->
<!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl
index f09f474..dbbf8f4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl
@@ -48,7 +48,7 @@
<!-- TMPL_LOOP NAME="resultsloop" -->
<tr>
<td>
- <p><span class="title"><!-- TMPL_VAR NAME="title" escape="html" --></span>
+ <p><span class="title"><!-- TMPL_VAR NAME="title" --></span>
<!-- TMPL_IF name="author" --> by <span class="author"><!-- TMPL_VAR NAME="author" --></span>,<!-- /TMPL_IF --></p>
<p><!-- TMPL_IF name="isbn" --> <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF -->
<!-- TMPL_IF name="pages" --> - <!-- TMPL_VAR name="pages" --><!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl
index e53c7da..21f5044 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl
@@ -140,10 +140,10 @@ ff.submit();
<ol><li>
<!-- TMPL_IF name="biblionumber" -->
<span class="label">Title</span>
- <input type="hidden" size="50" name="title" value="<!-- TMPL_VAR NAME="title" ESCAPE="HTML" -->" /> <span class="title"><!-- TMPL_VAR NAME="title" ESCAPE="html" --></span>
+ <input type="hidden" size="50" name="title" value="<!-- TMPL_VAR NAME="title" -->" /> <span class="title"><!-- TMPL_VAR NAME="title" --></span>
<!-- TMPL_ELSE -->
<label for="entertitle" class="required">Title: </label>
- <input type="text" id="entertitle" size="50" name="title" value="<!-- TMPL_VAR NAME="title" ESCAPE="html" -->" />
+ <input type="text" id="entertitle" size="50" name="title" value="<!-- TMPL_VAR NAME="title" -->" />
<!-- /TMPL_IF -->
</li>
<li>
@@ -206,8 +206,8 @@ ff.submit();
<ol><!-- TMPL_LOOP NAME="iteminformation" --><li>
<div class="subfield_line" style="<!-- TMPL_VAR NAME='hidden' -->;" id="subfield<!-- TMPL_VAR NAME='serialid' --><!-- TMPL_VAR NAME='countitems' --><!-- TMPL_VAR NAME='subfield' --><!-- TMPL_VAR name="random" -->">
- <label><!-- TMPL_VAR NAME="subfield" --> - <!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF --><!-- TMPL_VAR NAME="marc_lib" --><!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF --></label>
- <!-- TMPL_VAR NAME="marc_value" -->
+ <label><!-- TMPL_VAR NAME="subfield" ESCAPE="0" --> - <!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF --><!-- TMPL_VAR NAME="marc_lib" ESCAPE="0" --><!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF --></label>
+ <!-- TMPL_VAR NAME="marc_value" ESCAPE="0" -->
<input type="hidden" name="itemid" value="1" />
<input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->" />
<input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="tag" -->" />
@@ -340,7 +340,7 @@ ff.submit();
<label for="sort1">Planning value1: </label>
<!-- TMPL_IF Name="CGIsort1" -->
- <!-- TMPL_VAR Name="CGIsort1" -->
+ <!-- TMPL_VAR Name="CGIsort1" ESCAPE="0" -->
<!-- TMPL_ELSE -->
<input type="text" id="sort1" size="20" name="sort1" value="<!-- TMPL_VAR NAME="sort1" -->" />
@@ -350,7 +350,7 @@ ff.submit();
<label for="sort2">Planning value2: </label>
<!-- TMPL_IF Name="CGIsort2" -->
- <!-- TMPL_VAR Name="CGIsort2" -->
+ <!-- TMPL_VAR Name="CGIsort2" ESCAPE="0" -->
<!-- TMPL_ELSE -->
<input type="text" id="sort2" size="20" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->" />
<!--/TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tmpl
index 630d9ba..e9c0495 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tmpl
@@ -27,7 +27,7 @@
<!-- TMPL_LOOP NAME="suggestions_loop" -->
<tr>
<td>
- <p><!-- TMPL_VAR NAME="title" escape="html" --> - <!-- TMPL_VAR NAME="author" --></p>
+ <p><!-- TMPL_VAR NAME="title" --> - <!-- TMPL_VAR NAME="author" --></p>
<p>
<!-- TMPL_IF name="copyrightdate" -->copy. year:<!-- TMPL_VAR NAME="copyrightdate" --> <!-- /TMPL_IF -->
<!-- TMPL_IF name="volumedesc" -->volume:<i><!-- TMPL_VAR NAME="volumedesc" --></i> <!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tmpl
index 2219dfa..fbf6565 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tmpl
@@ -73,7 +73,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
<div class="yui-g">
<div class="yui-u first">
<fieldset class="rows">
- <ol><li><label for="searchtitle">Title: </label> <input type="text" id="searchtitle" name="title" value="<!-- TMPL_VAR NAME="title" ESCAPE="html" -->" /></li>
+ <ol><li><label for="searchtitle">Title: </label> <input type="text" id="searchtitle" name="title" value="<!-- TMPL_VAR NAME="title" -->" /></li>
<li><label for="isbn">ISBN/ISSN: </label> <input type="text" id="isbn" name="isbn" value="<!-- TMPL_VAR NAME="isbn" -->" /></li>
<li><label for="lccall">LC Call Number: </label> <input type="text" id="lccall" name="lccall" value="" /></li></ol>
</fieldset>
@@ -141,7 +141,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
<!-- TMPL_IF NAME="toggle" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
<td><!-- TMPL_VAR name="server" --> <div class="linktools"><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=<!-- TMPL_VAR NAME="breedingid" -->" rel="gb_page_center[600,500]">Preview MARC</a> <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&importid=<!-- TMPL_VAR NAME="breedingid" -->" rel="gb_page_center[600,500]">Preview Card</a> <a href="/cgi-bin/koha/acqui/neworderempty.pl?frameworkcode=<!-- TMPL_VAR name="frameworkcode" -->&breedingid=<!-- TMPL_VAR NAME="breedingid" -->&booksellerid=<!-- TMPL_VAR name="booksellerid" -->&basketno=<!-- TMPL_VAR name="basketno" -->">Order</a> <a href="#" id="closemenu" title="Close this menu"> X </a></div></td>
- <td><!-- TMPL_VAR NAME="title" ESCAPE="html" --></td>
+ <td><!-- TMPL_VAR NAME="title" --></td>
<td><!-- TMPL_VAR NAME="author" --></td>
<td><!-- TMPL_VAR NAME="isbn" --></td>
<td><!-- TMPL_VAR NAME="lccn" --></td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tmpl
index 523fd13..8f1f06b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tmpl
@@ -294,7 +294,7 @@
<!-- /TMPL_UNLESS -->
</tbody>
</table>
- <div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" --></div>
+ <div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" ESCAPE="HTML" --></div>
<!-- /TMPL_IF -->
</div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl
index 80d9156..925cb7e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl
@@ -241,6 +241,7 @@
</tbody>
</table>
+<!-- TMPL_IF name="cur" --><p><b>Currency = <!-- TMPL_VAR NAME="cur" --> <!-- TMPL_VAR NAME="cur_format" --></b></p><!-- /TMPL_IF -->
<!-- TMPL_IF NAME="pagination_bar" --><div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" --></div><!-- /TMPL_IF -->
<!-- /TMPL_IF --> <!-- else -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl
index 2192178..fc39f8a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl
@@ -104,7 +104,7 @@ YAHOO.util.Event.onAvailable("popmenu", function () {
</td>
<td>
<label for="authcat" > Select planning type:</label>
- <!-- TMPL_VAR NAME="authcat_dropbox" -->
+ <!-- TMPL_VAR NAME="authcat_dropbox" ESCAPE="0" -->
<input type="submit" name="option_submit" value="Select" />
</td>
</tr>
@@ -176,7 +176,7 @@ YAHOO.util.Event.onAvailable("popmenu", function () {
<tr >
<!--/TMPL_IF -->
- <td align='left'><!-- TMPL_VAR NAME="budget_name_indent"--></td>
+ <td align='left'><!-- TMPL_VAR NAME="budget_name_indent" ESCAPE="0" --></td>
<td align='right'><span id='budget_tot_formatted_<!-- TMPL_VAR NAME="budget_id" -->'><!-- TMPL_VAR NAME="budget_amount_formatted"--> </span>
<!-- NEXT DIV ELEMENT IS USED BY JS FOR CALC-ING AUTO-FILL AND ESTIMATED AMOUNTS -->
@@ -279,8 +279,8 @@ YAHOO.util.Event.onAvailable("popmenu", function () {
<ol>
<li><label for="basename">Output to a file named: </label><input type="text" name="basename" id="basename" value="Export" />
<label class="inline" for="MIME">Into an application
- </label><!-- TMPL_VAR NAME="CGIextChoice" -->
- <!-- TMPL_VAR NAME="CGIsepChoice" -->
+ </label><!-- TMPL_VAR NAME="CGIextChoice" ESCAPE="0" -->
+ <!-- TMPL_VAR NAME="CGIsepChoice" ESCAPE="0" -->
<input type="submit" value="Output"/>
<input type="hidden" name="report_name" value="<!--TMPL_VAR NAME="report_name" -->" />
<input type="hidden" name="output" value="file" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl
index 1b431ec..64d2a29 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl
@@ -75,34 +75,34 @@ function displayMoreConstraint(numlayer){
<fieldset class="rows"><ol>
<!-- TMPL_IF NAME="new_subfield" -->
- <li><label for="tagsubfieldinput<!-- TMPL_VAR NAME="row" -->">Subfield code: </label><!-- TMPL_VAR NAME="tagsubfieldinput" --> </li>
+ <li><label for="tagsubfieldinput<!-- TMPL_VAR NAME="row" -->">Subfield code: </label><!-- TMPL_VAR NAME="tagsubfieldinput" ESCAPE="0" --> </li>
<!-- TMPL_ELSE -->
<li>
<input type="hidden" name="tagsubfield" value="<!-- TMPL_VAR name="tagsubfield" -->" />
</li>
<!-- /TMPL_IF -->
- <li><label for="repeatable<!-- TMPL_VAR NAME="row" -->">Repeatable: </label><!-- TMPL_VAR NAME="repeatable" --> </li>
- <li><label for="mandatory<!-- TMPL_VAR NAME="row" -->">Mandatory: </label><!-- TMPL_VAR NAME="mandatory" --> </li>
+ <li><label for="repeatable<!-- TMPL_VAR NAME="row" -->">Repeatable: </label><!-- TMPL_VAR NAME="repeatable" ESCAPE="0" --> </li>
+ <li><label for="mandatory<!-- TMPL_VAR NAME="row" -->">Mandatory: </label><!-- TMPL_VAR NAME="mandatory" ESCAPE="0" --> </li>
<li><label for="liblibrarian<!-- TMPL_VAR NAME="row" -->">Text for librarian: </label><input id="liblibrarian<!-- TMPL_VAR NAME="row" -->" type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" -->" size="40" maxlength="80" /></li>
<li><label for="libopac<!-- TMPL_VAR NAME="row" -->">Text for OPAC: </label><input type="text" id="libopac<!-- TMPL_VAR NAME="row" -->" name="libopac" value="<!-- TMPL_VAR NAME="libopac" -->" size="40" maxlength="80" /></li>
- <li><label for="tab<!-- TMPL_VAR NAME="row" -->">Managed in tab: </label><!-- TMPL_VAR NAME="tab" --> (ignore means that the subfield does not display in the record editor)</li>
+ <li><label for="tab<!-- TMPL_VAR NAME="row" -->">Managed in tab: </label><!-- TMPL_VAR NAME="tab" ESCAPE="0" --> (ignore means that the subfield does not display in the record editor)</li>
<li>
<fieldset>
<legend>Display</legend>
<ol>
- <li><label for="ohidden<!-- TMPL_VAR NAME="row" -->">Select to display or not:</label><!-- TMPL_VAR name="ohidden" --> </li>
+ <li><label for="ohidden<!-- TMPL_VAR NAME="row" -->">Select to display or not:</label><!-- TMPL_VAR name="ohidden" ESCAPE="0" --> </li>
<!-- <li><label for="ihidden<!-- TMPL_VAR NAME="row" -->">Intranet:</label><!-- TMPL_VAR name="ihidden" --> </li> -->
<!-- <li><label for="ehidden<!-- TMPL_VAR NAME="row" -->">Editor:</label><!-- TMPL_VAR name="ehidden" --> (see online help)</li> -->
</ol>
</fieldset>
</li>
- <li><label for="isurl<!-- TMPL_VAR NAME="row" -->">Is a URL:</label><!-- TMPL_VAR NAME="isurl" --> (if checked, it means that the subfield is a URL and can be clicked)</li>
+ <li><label for="isurl<!-- TMPL_VAR NAME="row" -->">Is a URL:</label><!-- TMPL_VAR NAME="isurl" ESCAPE="0" --> (if checked, it means that the subfield is a URL and can be clicked)</li>
<li>
<fieldset><legend>Help input</legend>
<ol>
- <li><label for="authorised_value<!-- TMPL_VAR NAME="row" -->">Authorized value:</label> <!-- TMPL_VAR NAME="authorised_value" --></li>
- <li><label for="frameworkcode<!-- TMPL_VAR NAME="row" -->">Thesaurus:</label> <!-- TMPL_VAR NAME="frameworkcode" --></li>
- <li><label for="value_builder<!-- TMPL_VAR NAME="row" -->">Plugin:</label> <!-- TMPL_VAR NAME="value_builder" --></li>
+ <li><label for="authorised_value<!-- TMPL_VAR NAME="row" -->">Authorized value:</label> <!-- TMPL_VAR NAME="authorised_value" ESCAPE="0" --></li>
+ <li><label for="frameworkcode<!-- TMPL_VAR NAME="row" -->">Thesaurus:</label> <!-- TMPL_VAR NAME="frameworkcode" ESCAPE="0" --></li>
+ <li><label for="value_builder<!-- TMPL_VAR NAME="row" -->">Plugin:</label> <!-- TMPL_VAR NAME="value_builder" ESCAPE="0" --></li>
</ol>
</fieldset>
</li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tmpl
index bef0cae..7264db1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tmpl
@@ -174,7 +174,7 @@
</span>
</div>
<!-- /TMPL_IF -->
-<form action="/cgi-bin/koha/admin/authorised_values.pl" method="post" id="category"><label for="searchfield">Show Category: </label><!-- TMPL_VAR name="tab_list" --> <input type="submit" value="Submit" /></form>
+<form action="/cgi-bin/koha/admin/authorised_values.pl" method="post" id="category"><label for="searchfield">Show Category: </label><!-- TMPL_VAR name="tab_list" ESCAPE="0" --> <input type="submit" value="Submit" /></form>
<!-- TMPL_IF EXPR="category eq 'Bsort1'" -->
<p>An authorized value attached to patrons, that can be used for stats purposes</p>
<!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tmpl
index 569d875..a5f81b5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tmpl
@@ -274,9 +274,8 @@ $(document).ready(function() {
<!-- /TMPL_LOOP -->
</table>
-<div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" --></div>
+<div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" ESCAPE="HTML" --></div>
-<div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" --></div>
<h2>Classification Filing Rules</h2>
<!-- TMPL_IF name="added_rule" -->
<div class="dialog message">Added filing rule <!-- TMPL_VAR name="added_rule" --></div>
@@ -310,7 +309,7 @@ $(document).ready(function() {
</tr>
<!-- /TMPL_LOOP -->
</table>
-<div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" --></div>
+<div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" ESCAPE="HTML" --></div>
<!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tmpl
index 48dd3ad..d2ffbaf 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tmpl
@@ -157,7 +157,7 @@ $(function(){
<tr>
<th> </th>
<!-- TMPL_LOOP NAME="item_types" -->
- <th><!-- TMPL_VAR NAME="br_description" --></th>
+ <th><!-- TMPL_VAR NAME="br_description" ESCAPE="0" --></th>
<!-- /TMPL_LOOP -->
</tr>
</thead>
@@ -181,7 +181,7 @@ $(function(){
<tr>
<th> </th>
<!-- TMPL_LOOP NAME="item_types" -->
- <th><!-- TMPL_VAR NAME="br_description" --></th>
+ <th><!-- TMPL_VAR NAME="br_description" ESCAPE="0" --></th>
<!-- /TMPL_LOOP -->
</tr>
</thead>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl
index b8f664a..c1e3103 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl
@@ -33,7 +33,7 @@
<input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->" />
<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->" />
<label>000s</label>
- <!-- TMPL_VAR name="marclist0" --> <input type="submit" value="OK" /></form>
+ <!-- TMPL_VAR name="marclist0" ESCAPE="0" --> <input type="submit" value="OK" /></form>
</li>
<li>
@@ -42,7 +42,7 @@
<input type="hidden" name="op" value="add_validate" />
<input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->" />
<label>100s</label>
- <!-- TMPL_VAR name="marclist1" -->
+ <!-- TMPL_VAR name="marclist1" ESCAPE="0" -->
<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->" /><input type="submit" value="OK" /> </form>
</li>
@@ -53,7 +53,7 @@
<input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->" />
<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->" />
<label>200s</label>
- <!-- TMPL_VAR name="marclist2" --> <input type="submit" value="OK" /></form>
+ <!-- TMPL_VAR name="marclist2" ESCAPE="0" --> <input type="submit" value="OK" /></form>
</li>
<li>
@@ -63,7 +63,7 @@
<input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->" />
<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->" />
<label>300s</label>
- <!-- TMPL_VAR name="marclist3" --> <input type="submit" value="OK" /> </form>
+ <!-- TMPL_VAR name="marclist3" ESCAPE="0" --> <input type="submit" value="OK" /> </form>
</li>
<li>
@@ -73,7 +73,7 @@
<input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->" />
<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->" />
<label>400s</label>
- <!-- TMPL_VAR name="marclist4" --> <input type="submit" value="OK" /></form>
+ <!-- TMPL_VAR name="marclist4" ESCAPE="0" --> <input type="submit" value="OK" /></form>
</li>
<li>
@@ -83,7 +83,7 @@
<input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->" />
<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->" />
<label>500s</label>
- <!-- TMPL_VAR name="marclist5" --> <input type="submit" value="OK" /></form>
+ <!-- TMPL_VAR name="marclist5" ESCAPE="0" --> <input type="submit" value="OK" /></form>
</li>
<li>
@@ -93,7 +93,7 @@
<input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->" />
<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->" />
<label>600s</label>
- <!-- TMPL_VAR name="marclist6" --> <input type="submit" value="OK" /></form>
+ <!-- TMPL_VAR name="marclist6" ESCAPE="0" --> <input type="submit" value="OK" /></form>
</li>
<li>
@@ -103,7 +103,7 @@
<input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->" />
<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->" />
<label>700s</label>
- <!-- TMPL_VAR name="marclist7" --> <input type="submit" value="OK" /></form>
+ <!-- TMPL_VAR name="marclist7" ESCAPE="0" --> <input type="submit" value="OK" /></form>
</li>
<li>
@@ -113,7 +113,7 @@
<input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->" />
<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->" />
<label>800s</label>
- <!-- TMPL_VAR name="marclist8" --> <input type="submit" value="OK" /></form>
+ <!-- TMPL_VAR name="marclist8" ESCAPE="0" --> <input type="submit" value="OK" /></form>
</li>
<li>
@@ -123,7 +123,7 @@
<input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->" />
<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->" />
<label>900s</label>
- <!-- TMPL_VAR name="marclist9" --> <input type="submit" value="OK" /></form>
+ <!-- TMPL_VAR name="marclist9" ESCAPE="0" --> <input type="submit" value="OK" /></form>
</li>
</ol></fieldset>
@@ -144,7 +144,7 @@
<h1>Koha to MARC Mapping <!-- TMPL_VAR name="tagfield" --></h1>
<form action="<!-- TMPL_VAR name="script_name" -->" method="post">
-<p><!-- TMPL_VAR name="tablename" --> <input type="submit" value="OK" /></p>
+<p><!-- TMPL_VAR name="tablename" ESCAPE="0" --> <input type="submit" value="OK" /></p>
</form>
<table>
<tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl
index 7873296..b432d72 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl
@@ -98,9 +98,9 @@
<!-- /TMPL_IF -->
<li><label for="liblibrarian<!-- TMPL_VAR NAME="row" -->">Text for librarian: </label><input id="liblibrarian<!-- TMPL_VAR NAME="row" -->" type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" -->" size="40" maxlength="80" /></li>
<li><label for="libopac<!-- TMPL_VAR NAME="row" -->">Text for OPAC: </label><input type="text" id="libopac<!-- TMPL_VAR NAME="row" -->" name="libopac" value="<!-- TMPL_VAR NAME="libopac" -->" size="40" maxlength="80" /></li>
- <li><label for="repeatable<!-- TMPL_VAR NAME="row" -->">Repeatable: </label><!-- TMPL_VAR NAME="repeatable" --></li>
- <li><label for="mandatory<!-- TMPL_VAR NAME="row" -->">Mandatory: </label><!-- TMPL_VAR NAME="mandatory" --></li>
- <li><label for="tab<!-- TMPL_VAR NAME="row" -->">Managed in tab: </label><!-- TMPL_VAR NAME="tab" --> (ignore means that the subfield does not display in the record editor)</li>
+ <li><label for="repeatable<!-- TMPL_VAR NAME="row" -->">Repeatable: </label><!-- TMPL_VAR NAME="repeatable" ESCAPE="0" --></li>
+ <li><label for="mandatory<!-- TMPL_VAR NAME="row" -->">Mandatory: </label><!-- TMPL_VAR NAME="mandatory" ESCAPE="0" --></li>
+ <li><label for="tab<!-- TMPL_VAR NAME="row" -->">Managed in tab: </label><!-- TMPL_VAR NAME="tab" ESCAPE="0" --> (ignore means that the subfield does not display in the record editor)</li>
</ol>
</fieldset>
@@ -111,17 +111,17 @@
<ol><li><label for="defaultvalue<!-- TMPL_VAR NAME="row" -->">Default value:</label>
<input type="text" name="defaultvalue" id="defaultvalue<!-- TMPL_VAR NAME="row" -->" value="<!-- TMPL_VAR NAME="defaultvalue" -->" /></li>
<li><label for="hidden<!-- TMPL_VAR NAME="row" -->">hidden</label><input type="text" id="hidden<!-- TMPL_VAR NAME="row" -->" name="hidden" value="<!-- TMPL_VAR name="hidden" -->" size="2" /> (see online help)</li>
- <li><label for="isurl<!-- TMPL_VAR NAME="row" -->">Is a URL:</label><!-- TMPL_VAR NAME="isurl" --> (if checked, it means that the subfield is a URL and can be clicked)</li>
+ <li><label for="isurl<!-- TMPL_VAR NAME="row" -->">Is a URL:</label><!-- TMPL_VAR NAME="isurl" ESCAPE="0" --> (if checked, it means that the subfield is a URL and can be clicked)</li>
<li><label for="link<!-- TMPL_VAR NAME="row" -->">Link:</label><input type="text" id="link<!-- TMPL_VAR NAME="row" -->" name="link" value="<!-- TMPL_VAR NAME="link" -->" size="10" maxlength="80" /> (e.g., Title or Local-Number) <span class="error"><em>Warning: This value should not change after data has been added to your catalog</em></span></li>
- <li><label for="kohafield<!-- TMPL_VAR NAME="row" -->">Koha link:</label><!-- TMPL_VAR NAME="kohafield" --></li>
+ <li><label for="kohafield<!-- TMPL_VAR NAME="row" -->">Koha link:</label><!-- TMPL_VAR NAME="kohafield" ESCAPE="0" --></li>
</ol>
</fieldset>
<fieldset class="rows">
<legend>Other Options: (choose one)</legend>
<ol>
- <li><label for="authorised_value<!-- TMPL_VAR NAME="row" -->">Authorized value:</label><!-- TMPL_VAR NAME="authorised_value" --></li>
- <li><label for="authtypecode<!-- TMPL_VAR NAME="row" -->">Thesaurus:</label><!-- TMPL_VAR NAME="authtypes" --></li>
- <li><label for="value_builder<!-- TMPL_VAR NAME="row" -->">Plugin:</label><!-- TMPL_VAR NAME="value_builder" --></li>
+ <li><label for="authorised_value<!-- TMPL_VAR NAME="row" -->">Authorized value:</label><!-- TMPL_VAR NAME="authorised_value" ESCAPE="0" --></li>
+ <li><label for="authtypecode<!-- TMPL_VAR NAME="row" -->">Thesaurus:</label><!-- TMPL_VAR NAME="authtypes" ESCAPE="0" --></li>
+ <li><label for="value_builder<!-- TMPL_VAR NAME="row" -->">Plugin:</label><!-- TMPL_VAR NAME="value_builder" ESCAPE="0" --></li>
</ol>
</fieldset>
</div><br class="clear" /><!-- /more -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tmpl
index bfa2ed9..df77592 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tmpl
@@ -572,7 +572,7 @@ function CheckRuleForm(f) {
<!-- /TMPL_LOOP -->
</table><!-- TMPL_ELSE --><p>There are no saved matching rules.</p><!-- /TMPL_IF -->
-<div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" --></div>
+<div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" ESCAPE="HTML" --></div>
<!-- /TMPL_IF -->
<!-- TMPL_IF name="matching_rule_form" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tmpl
index b445c41..8e1c7ea 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tmpl
@@ -221,7 +221,7 @@ function CheckAttributeTypeForm(f) {
<!-- /TMPL_LOOP -->
</table><!-- TMPL_ELSE --><p>There are no saved patron attribute types.</p><!-- /TMPL_IF -->
-<div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" --></div>
+<div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" ESCAPE="HTML" --></div>
<!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tmpl
index fe2cd96..5d8b767 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tmpl
@@ -39,7 +39,7 @@
<form action="<!-- TMPL_VAR NAME="url" -->" method="post" name="loginform" id="loginform">
<input type="hidden" name="koha_login_context" value="intranet" />
<!-- TMPL_LOOP NAME="INPUTS" -->
- <input type="hidden" name="<!-- TMPL_VAR ESCAPE=HTML NAME="name" -->" value="<!-- TMPL_VAR NAME="value" ESCAPE="html" -->" />
+ <input type="hidden" name="<!-- TMPL_VAR NAME="name" -->" value="<!-- TMPL_VAR NAME="value" -->" />
<!-- /TMPL_LOOP -->
<p><label for="userid">Username:</label>
<input type="text" name="userid" id="userid" class="input focus" value="<!-- TMPL_VAR NAME="userid" -->" size="20" tabindex="1" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl
index cadea08..877de7b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl
@@ -705,7 +705,7 @@ function searchauthority() {
</label>
<!-- /TMPL_UNLESS -->
- <!-- TMPL_VAR NAME="marc_value" -->
+ <!-- TMPL_VAR NAME="marc_value" ESCAPE="0" -->
<!-- TMPL_IF NAME="repeatable" -->
<a href="#" onclick="CloneSubfield('subfield<!-- TMPL_VAR NAME='tag' --><!-- TMPL_VAR NAME='subfield' -->'); return false;"><img src="/intranet-tmpl/prog/img/clone-subfield.png" alt="Clone" title="Clone this subfield" /></a>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tmpl
index e327451..80c7657 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tmpl
@@ -93,7 +93,7 @@ function jumpfull(page)
<!-- /TMPL_IF -->
<!-- /TMPL_LOOP -->
<!-- TMPL_IF name="displaynext" -->
- <a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&authtypecode=<!-- TMPL_VAR name="authtypecode" --><!-- TMPL_LOOP name="searchdata"-->&<!-- TMPL_VAR name="term" -->=<!-- TMPL_VAR name="val"--><!-- /TMPL_LOOP -->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->&tagid=<!-- TMPL_VAR name="tagid" -->&orderby=<!-- TMPL_VAR name="orderby" -->">
+ <a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&authtypecode=<!-- TMPL_VAR name="authtypecode" --><!-- TMPL_LOOP name="searchdata"-->&<!-- TMPL_VAR name="term" -->=<!-- TMPL_VAR name="val"--><!-- /TMPL_LOOP -->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->&tagid=<!-- TMPL_VAR name="tagid" -->&orderby=<!-- TMPL_VAR name="orderby" -->">
>></a>
<!-- /TMPL_IF -->
</div><!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tmpl
index 01667e5..6c7ccf6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tmpl
@@ -79,7 +79,7 @@ function searchauthority() {
</table>
</div>
-<div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" --></div>
+<div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" ESCAPE="0" --></div>
<!-- TMPL_ELSE -->
No results found
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tmpl
index d3d83ac..4057166 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tmpl
@@ -133,12 +133,12 @@ function placeHold () {
<!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
<h3>
<!-- TMPL_IF NAME="print_basket" -->
- <!-- TMPL_VAR NAME="title" ESCAPE="html" -->
+ <!-- TMPL_VAR NAME="title" -->
<!-- TMPL_IF name="subtitle" --> <!-- TMPL_VAR NAME="subtitle" --><!-- /TMPL_IF -->
<!-- TMPL_IF name="author" --> <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF -->
<!-- TMPL_ELSE -->
<input type="checkbox" value="<!-- TMPL_VAR NAME="biblionumber" -->" name="bib<!-- TMPL_VAR NAME="biblionumber" -->" id="bib<!-- TMPL_VAR NAME="biblionumber" -->" onclick="selRecord(value,checked)" />
- <!-- TMPL_VAR NAME="title" escape="html" -->
+ <!-- TMPL_VAR NAME="title" -->
<!-- TMPL_IF name="subtitle" --> <!-- TMPL_VAR NAME="subtitle" --><!-- /TMPL_IF -->
<!-- TMPL_IF name="author" --> <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF -->
<!-- /TMPL_IF -->
@@ -318,7 +318,7 @@ function placeHold () {
</td> <!-- /TMPL_UNLESS -->
<td><a href="#" onclick="openBiblio('<!-- TMPL_VAR name="dest" -->',<!-- TMPL_VAR name="biblionumber" -->)">
- <!-- TMPL_VAR NAME="title" escape="html" -->
+ <!-- TMPL_VAR NAME="title" -->
</a>
<!-- TMPL_VAR NAME="author" -->
<p><!-- TMPL_IF name="publishercode" -->- <!-- TMPL_VAR name="publishercode" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.tmpl
index e5cc60d..f4bcde0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.tmpl
@@ -15,7 +15,7 @@ Reference Manager or ProCite.
<MESSAGE>
---------------------------------------------
<!-- TMPL_IF NAME="comment" -->
-<!-- TMPL_VAR NAME="comment" -->
+<!-- TMPL_VAR NAME="comment" ESCAPE="0" -->
<!-- /TMPL_IF -->
<!-- TMPL_LOOP NAME="BIBLIO_RESULTS" --><!-- TMPL_VAR NAME="title" --><!-- TMPL_IF name="subtitle" --> <!-- TMPL_VAR NAME="subtitle" --><!-- /TMPL_IF --><!-- TMPL_IF "HASAUTHORS" -->
Author(s): <!-- TMPL_IF NAME="author" --><!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --><!-- TMPL_IF name="MARCAUTHORS" --><!-- TMPL_IF NAME="author" -->; <!-- /TMPL_IF --><!-- TMPL_LOOP NAME="MARCAUTHORS" --><!-- TMPL_LOOP NAME="MARCAUTHOR_SUBFIELDS_LOOP" --><!-- TMPL_VAR NAME="separator" --><!-- TMPL_VAR NAME="value" --><!-- /TMPL_LOOP --><!-- TMPL_UNLESS NAME="__last__" -->; <!-- TMPL_ELSE --><!-- /TMPL_UNLESS --><!-- /TMPL_LOOP --><!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF name="ISBN" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tmpl
index 1516268..1fc87dc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tmpl
@@ -17,7 +17,7 @@
<!-- TMPL_INCLUDE NAME="cat-toolbar.inc" -->
<div id="catalogue_ISBDdetail">
- <!-- TMPL_VAR NAME="ISBD" -->
+ <!-- TMPL_VAR NAME="ISBD" ESCAPE="0" -->
</div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
index 8880f8b..736e09e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
@@ -391,7 +391,7 @@ function Changefwk(FwkList) {
</tr>
<!-- TMPL_LOOP NAME="item_loop" -->
<tr>
- <!-- TMPL_VAR NAME="item_value" -->
+ <!-- TMPL_VAR NAME="item_value" ESCAPE="0" -->
</tr>
<!-- /TMPL_LOOP -->
</table>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
index e3391ac..2f15388 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
@@ -1,5 +1,5 @@
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha › Catalog › Details for <!-- TMPL_VAR NAME="title" escape="html" --> <!-- TMPL_LOOP NAME="subtitle" --> <!-- TMPL_VAR NAME="subfield" --><!-- /TMPL_LOOP --></title>
+<title>Koha › Catalog › Details for <!-- TMPL_VAR NAME="title" --> <!-- TMPL_LOOP NAME="subtitle" --> <!-- TMPL_VAR NAME="subfield" --><!-- /TMPL_LOOP --></title>
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" --><script type="text/JavaScript" language="JavaScript">
//<![CDATA[
// http://www.oreillynet.com/pub/a/javascript/2003/10/21/amazonhacks.html
@@ -44,7 +44,7 @@ function verify_images() {
<!-- TMPL_INCLUDE NAME="header.inc" -->
<!-- TMPL_INCLUDE NAME="cat-search.inc" -->
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a> › Details for <i><!-- TMPL_VAR NAME="title" escape="html" --> <!-- TMPL_LOOP NAME="subtitle" --> <!-- TMPL_VAR NAME="subfield" --><!-- /TMPL_LOOP --></i></div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a> › Details for <i><!-- TMPL_VAR NAME="title" --> <!-- TMPL_LOOP NAME="subtitle" --> <!-- TMPL_VAR NAME="subfield" --><!-- /TMPL_LOOP --></i></div>
<div id="doc3" class="yui-t2">
@@ -72,7 +72,7 @@ function verify_images() {
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="XSLTDetailsDisplay" -->
- <!-- TMPL_VAR NAME="XSLTBloc" -->
+ <!-- TMPL_VAR NAME="XSLTBloc" ESCAPE="0" -->
<!-- TMPL_IF NAME="GetShelves" -->
<span class="results_summary"><span class="label">Lists that include this title: </span>
@@ -87,12 +87,12 @@ function verify_images() {
<a href="http://www.amazon<!-- TMPL_VAR NAME="AmazonTld" -->/gp/reader/<!-- TMPL_VAR NAME="normalized_isbn" -->/ref=sib_dp_pt/002-7879865-0184864#reader-link"><img border="0" src="http://images.amazon.com/images/P/<!-- TMPL_VAR NAME="normalized_isbn" -->.01.MZZZZZZZ.jpg" alt="" /></a><!-- /TMPL_IF --><!-- /TMPL_IF -->
<!-- TMPL_ELSE -->
- <h3><!-- TMPL_VAR NAME="title" escape="html"--></h3>
+ <h3><!-- TMPL_VAR NAME="title"--></h3>
<!-- TMPL_LOOP NAME="subtitle" -->
<h4><!-- TMPL_VAR NAME="subfield" --></h4>
<!-- /TMPL_LOOP -->
<!-- TMPL_UNLESS NAME="item-level_itypes" --><img src="<!-- TMPL_VAR NAME="imageurl" -->" alt="<!-- TMPL_VAR NAME="description" -->" title="<!-- TMPL_VAR NAME="description" -->"><!-- /TMPL_UNLESS -->
- <!-- TMPL_IF name="unititle" --><p><!-- TMPL_VAR name="unititle" escape="html" --></p><!-- /TMPL_IF -->
+ <!-- TMPL_IF name="unititle" --><p><!-- TMPL_VAR name="unititle" --></p><!-- /TMPL_IF -->
<!-- TMPL_IF NAME="author" --><p>By <a href="/cgi-bin/koha/catalogue/search.pl?q=au:<!-- TMPL_VAR NAME="author" ESCAPE="url" -->"><!-- TMPL_VAR NAME="author" --></a></p><!-- /TMPL_IF -->
<ul>
<!-- TMPL_IF name="MARCAUTHORS" -->
@@ -114,7 +114,7 @@ function verify_images() {
<!-- TMPL_IF name="publishercode" -->
<li><strong>Published by:</strong>
<a href="/cgi-bin/koha/catalogue/search.pl?q=pb:<!-- TMPL_VAR NAME="publishercode" ESCAPE="url" -->">
- <!-- TMPL_VAR NAME="publishercode" ESCAPE="html" -->
+ <!-- TMPL_VAR NAME="publishercode" -->
</a> <!-- TMPL_IF name="place" -->(<!-- TMPL_VAR NAME="place"-->)<!--/TMPL_IF--> <!-- TMPL_IF NAME="publicationyear" -->, <!-- TMPL_VAR NAME="publicationyear" --><!-- /TMPL_IF --> <!-- TMPL_IF NAME="editionstatement" --><!-- TMPL_VAR NAME="editionstatement" --><!-- /TMPL_IF --> <!-- TMPL_IF NAME="editionresponsability" --><!-- TMPL_VAR NAME="editionresponsability" --><!-- /TMPL_IF -->
</li>
<!-- /TMPL_IF -->
@@ -163,7 +163,7 @@ function verify_images() {
<li><strong>Subjects:</strong>
<ul>
<!-- TMPL_LOOP NAME="MARCSUBJCTS" -->
- <li><!-- TMPL_LOOP NAME="MARCSUBJECT_SUBFIELDS_LOOP" --> <!-- TMPL_VAR NAME="separator" --> <a title="‡<!-- TMPL_VAR NAME="code" --> <!-- TMPL_VAR NAME="value" -->" href="/cgi-bin/koha/catalogue/search.pl?q=<!-- TMPL_LOOP NAME="link_loop" --><!-- TMPL_VAR NAME="operator" escape="url" --><!-- TMPL_VAR name="limit" -->:<!-- TMPL_VAR NAME="link" escape="url" --><!-- /TMPL_LOOP -->"><!-- TMPL_VAR NAME="value" ESCAPE="html" --></a><!-- /TMPL_LOOP --></li>
+ <li><!-- TMPL_LOOP NAME="MARCSUBJECT_SUBFIELDS_LOOP" --> <!-- TMPL_VAR NAME="separator" --> <a title="‡<!-- TMPL_VAR NAME="code" --> <!-- TMPL_VAR NAME="value" -->" href="/cgi-bin/koha/catalogue/search.pl?q=<!-- TMPL_LOOP NAME="link_loop" --><!-- TMPL_VAR NAME="operator" escape="url" --><!-- TMPL_VAR name="limit" -->:<!-- TMPL_VAR NAME="link" escape="url" --><!-- /TMPL_LOOP -->"><!-- TMPL_VAR NAME="value" --></a><!-- /TMPL_LOOP --></li>
<!-- /TMPL_LOOP -->
</ul>
</li>
@@ -374,7 +374,7 @@ function verify_images() {
<!-- TMPL_LOOP NAME="AMAZON_EDITORIAL_REVIEWS" -->
<!-- TMPL_IF NAME="Content" -->
<h4>From <!-- TMPL_VAR NAME="Source" -->:</h4>
- <p><!-- TMPL_VAR NAME="Content" --></p>
+ <p><!-- TMPL_VAR NAME="Content" ESCAPE="0" --></p>
<!-- /TMPL_IF -->
<!-- /TMPL_LOOP -->
<!-- /TMPL_IF-->
@@ -444,7 +444,7 @@ function verify_images() {
<div id="editions"><h2>Editions</h2>
<table>
<!-- TMPL_LOOP NAME="XISBNS" --><tr><!-- TMPL_IF NAME="AmazonEnabled" --><td><a href="http://www.amazon.com/gp/reader/<!-- TMPL_VAR NAME="normalized_isbn" -->/ref=sib_dp_pt/002-7879865-0184864#reader-link"><img src="http://images.amazon.com/images/P/<!-- TMPL_VAR NAME="normalized_isbn" -->.01._AA75_PU_PU-5_.jpg" /></a></td><!-- /TMPL_IF --><td><!-- TMPL_IF NAME="noItemTypeImages" --><!-- TMPL_VAR NAME="description" --><!-- TMPL_ELSE --><img src="<!-- TMPL_VAR NAME="imageurl" -->" alt="<!-- TMPL_VAR NAME="description" -->" title="<!-- TMPL_VAR NAME="description" -->"><!-- /TMPL_IF --></td><td>
-<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" escape="html" --></a> by <!-- TMPL_VAR NAME="author" --> ©<!-- TMPL_VAR NAME="copyrightdate" -->
+<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a> by <!-- TMPL_VAR NAME="author" --> ©<!-- TMPL_VAR NAME="copyrightdate" -->
<!-- TMPL_IF name="publishercode" -->
<!-- TMPL_VAR NAME="publishercode" --> <!-- TMPL_IF name="place" -->(<!-- TMPL_VAR NAME="place"-->)<!--/TMPL_IF--> <!-- TMPL_IF NAME="publicationyear" -->, <!-- TMPL_VAR NAME="publicationyear" --><!-- /TMPL_IF --> <!-- TMPL_IF NAME="editionstatement" --><!-- TMPL_VAR NAME="editionstatement" --><!-- /TMPL_IF --> <!-- TMPL_IF NAME="editionresponsability" --><!-- TMPL_VAR NAME="editionresponsability" --><!-- /TMPL_IF -->
<!-- /TMPL_IF -->
@@ -462,7 +462,7 @@ function verify_images() {
<ul>
<!-- TMPL_LOOP NAME="AMAZON_SIMILAR_PRODUCTS" -->
<!-- TMPL_LOOP NAME="similar_biblionumbers" -->
-<li><img alt="img" src="http://images.amazon.com/images/P/<!-- TMPL_VAR NAME="ASIN"-->.01._SS50_.jpg" /> <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" ESCAPE="HTML" --></a> </li>
+<li><img alt="img" src="http://images.amazon.com/images/P/<!-- TMPL_VAR NAME="ASIN"-->.01._SS50_.jpg" /> <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a> </li>
<!-- /TMPL_LOOP -->
<!-- /TMPL_LOOP -->
</ul>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tmpl
index ce26a71..9be4720 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tmpl
@@ -35,7 +35,7 @@
<!-- TMPL_UNLESS name="popup" -->
<h1>Labeled MARC biblio : <!-- TMPL_VAR NAME="biblionumber" --> ( <!-- TMPL_VAR NAME="bibliotitle" --> )</h1>
<!-- /TMPL_UNLESS -->
- <p><b>With Framework :<!--TMPL_VAR Name="framework" --></b></p>
+ <p><b>With Framework :<!--TMPL_VAR Name="framework" ESCAPE="0" --></b></p>
<!-- div id="bibliotabs" class="toptabs numbered" -->
<div>
<table class="labeledmarc-table">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl
index ccd1039..634b472 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl
@@ -843,7 +843,7 @@ function unHideSubfield(index,labelindex) { // FIXME :: is it used ?
</label>
<!-- /TMPL_UNLESS -->
- <!-- TMPL_VAR NAME="marc_value" -->
+ <!-- TMPL_VAR NAME="marc_value" ESCAPE="0" -->
<!-- TMPL_IF NAME="repeatable" -->
<span class="subfield_controls"><a href="#" class="buttonPlus" tabindex="1" onclick="CloneSubfield('subfield<!-- TMPL_VAR NAME='tag' --><!-- TMPL_VAR NAME='subfield' --><!-- TMPL_VAR name="random" -->'); return false;"><img src="/intranet-tmpl/prog/img/clone-subfield.png" alt="Clone" title="Clone this subfield" /></a>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl
index d0be875..677bdcc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl
@@ -232,8 +232,8 @@ function set_to_today(id, force) {
<!-- TMPL_LOOP NAME="item" -->
<li><div class="subfield_line" style="<!-- TMPL_VAR NAME='visibility' -->" id="subfield<!-- TMPL_VAR NAME='tag' --><!-- TMPL_VAR NAME='subfield' --><!-- TMPL_VAR name="random" -->">
- <label><!-- TMPL_VAR NAME="subfield" --> - <!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF --><!-- TMPL_VAR NAME="marc_lib" --><!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF --></label>
- <!-- TMPL_VAR NAME="marc_value" -->
+ <label><!-- TMPL_VAR NAME="subfield" --> - <!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF --><!-- TMPL_VAR NAME="marc_lib" ESCAPE="0" --><!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF --></label>
+ <!-- TMPL_VAR NAME="marc_value" ESCAPE="0" -->
<input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="tag" -->" />
<input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->" />
<input type="hidden" name="mandatory" value="<!-- TMPL_VAR NAME="mandatory" -->" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
index 822de15..5ce935c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
@@ -386,7 +386,7 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
<ol> <li>
<label for="borrowernumber">Select a patron: </label>
- <!-- TMPL_VAR name="CGIselectborrower" -->
+ <!-- TMPL_VAR name="CGIselectborrower" ESCAPE="0" -->
</li>
</ol>
<p><input type="submit" value="Select" /></p>
@@ -553,7 +553,7 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
<h4>Holds waiting:</h4>
<!-- TMPL_LOOP NAME="WaitingReserveLoop" -->
<ul>
- <li> <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" escape="html" --></a> (<!-- TMPL_VAR NAME="itemtype"-->), <!-- TMPL_IF NAME="author" -->by <!-- TMPL_VAR NAME="author"--><!-- /TMPL_IF --> Hold placed on <!-- TMPL_VAR NAME="reservedate"-->.
+ <li> <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a> (<!-- TMPL_VAR NAME="itemtype"-->), <!-- TMPL_IF NAME="author" -->by <!-- TMPL_VAR NAME="author"--><!-- /TMPL_IF --> Hold placed on <!-- TMPL_VAR NAME="reservedate"-->.
<!-- TMPL_IF NAME="waitingat" -->
<br /><!-- TMPL_IF NAME="waitinghere" --><strong class="waitinghere"><!-- TMPL_ELSE --><strong><!-- /TMPL_IF -->Waiting at <!-- TMPL_VAR NAME="waitingat" --></strong>
<!-- /TMPL_IF -->
@@ -680,7 +680,7 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
<tr class="highlight">
<!-- /TMPL_IF -->
<td><!-- TMPL_VAR NAME="dd" --></td>
- <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&type=intra"><strong><!-- TMPL_VAR NAME="title" escape="html" --></strong></a><!-- TMPL_IF NAME="author" -->, by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --><!-- TMPL_IF NAME="itemnotes" -->- <span class="circ-hlt"><!-- TMPL_VAR name="itemnotes" --></span><!-- /TMPL_IF --> <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->#item<!-- TMPL_VAR NAME="itemnumber" -->"><!-- TMPL_VAR NAME="barcode" --></a></td>
+ <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&type=intra"><strong><!-- TMPL_VAR NAME="title" --></strong></a><!-- TMPL_IF NAME="author" -->, by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --><!-- TMPL_IF NAME="itemnotes" -->- <span class="circ-hlt"><!-- TMPL_VAR name="itemnotes" --></span><!-- /TMPL_IF --> <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->#item<!-- TMPL_VAR NAME="itemnumber" -->"><!-- TMPL_VAR NAME="barcode" --></a></td>
<td><!-- TMPL_UNLESS NAME="noItemTypeImages" --> <!-- TMPL_IF NAME="itemtype_image" --><img src="<!-- TMPL_VAR NAME="itemtype_image" -->" alt="" /><!-- /TMPL_IF --><!-- /TMPL_UNLESS --><!-- TMPL_VAR NAME="itemtype" --></td>
<td><!-- TMPL_VAR NAME="checkoutdate" --></td>
<td><!-- TMPL_VAR NAME="itemcallnumber" --></td>
@@ -744,7 +744,7 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
<!-- TMPL_IF NAME="od" --><td class="od"><!-- TMPL_ELSE --><td><!-- /TMPL_IF -->
<!-- TMPL_VAR NAME="dd" -->
</td>
- <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&type=intra"><strong><!-- TMPL_VAR NAME="title" escape="html" --></strong></a><!-- TMPL_IF NAME="author" -->, by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --> <!-- TMPL_IF NAME="itemnotes" -->- <!-- TMPL_VAR name="itemnotes" --><!-- /TMPL_IF --> <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->#item<!-- TMPL_VAR NAME="itemnumber" -->"><!-- TMPL_VAR NAME="barcode" --></a></td>
+ <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&type=intra"><strong><!-- TMPL_VAR NAME="title" --></strong></a><!-- TMPL_IF NAME="author" -->, by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --> <!-- TMPL_IF NAME="itemnotes" -->- <!-- TMPL_VAR name="itemnotes" --><!-- /TMPL_IF --> <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->#item<!-- TMPL_VAR NAME="itemnumber" -->"><!-- TMPL_VAR NAME="barcode" --></a></td>
<td>
<!-- TMPL_VAR NAME="itemtype" -->
</td>
@@ -834,7 +834,7 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
<!-- TMPL_LOOP NAME="reservloop" -->
<tr class="<!-- TMPL_VAR NAME="color" -->">
<td><!-- TMPL_VAR NAME="reservedate" --></td>
- <td><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><strong><!-- TMPL_VAR NAME="title" escape="html" --></strong></a><!-- TMPL_IF NAME="author" -->, by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --></td>
+ <td><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><strong><!-- TMPL_VAR NAME="title" --></strong></a><!-- TMPL_IF NAME="author" -->, by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --></td>
<td><!-- TMPL_VAR NAME="itemcallnumber" --></td>
<td><em><!-- TMPL_IF name="barcodereserv" -->Item <!-- TMPL_VAR NAME="barcodereserv" -->
<!-- /TMPL_IF --><!-- TMPL_IF name="waiting" --> <strong>waiting at <!-- TMPL_VAR NAME="waitingat" --></strong>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl
index 420d7e1..7f299d6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl
@@ -77,7 +77,7 @@
</div>
</div>
<!-- TMPL_IF NAME="IntranetmainUserblock" --><div id="mainuserblock" class="yui-g">
- <!-- TMPL_VAR NAME="IntranetmainUserblock" -->
+ <!-- TMPL_VAR NAME="IntranetmainUserblock" ESCAPE="0" -->
</div><!-- TMPL_ELSE -->
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="koha_news_count" -->
@@ -88,7 +88,7 @@
<h3>News</h3>
<!-- TMPL_LOOP name="koha_news" -->
<div class="newsitem" id="news<!-- TMPL_VAR NAME="idnew" -->"><h4><!-- TMPL_VAR name="title" --></h4>
- <p><!-- TMPL_VAR name="new" --></p>
+ <p><!-- TMPL_VAR name="new" ESCAPE="0" --></p>
<p class="newsfooter"> Posted on <!-- TMPL_VAR name="newdate" --> <!-- TMPL_IF NAME="CAN_user_tools" -->
<a href="/cgi-bin/koha/tools/koha-news.pl?op=add_form&id=<!-- TMPL_VAR NAME="idnew" -->">Edit</a> | <a href="/cgi-bin/koha/tools/koha-news.pl?op=del&ids=<!-- TMPL_VAR NAME="idnew" -->">Delete</a> | <a href="/cgi-bin/koha/tools/koha-news.pl?op=add_form">New</a><!-- /TMPL_IF --></p></div>
<!-- /TMPL_LOOP -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tmpl
index 7ca0d02..4f1c0a5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tmpl
@@ -70,7 +70,7 @@
<!-- TMPL_IF NAME="select_field" -->
<td align="center"><input type="checkbox" name="action" value="<!-- TMPL_VAR NAME="field_value" -->"></td>
<!-- TMPL_ELSE -->
- <td><!-- TMPL_VAR NAME="field_value" --></td>
+ <td><!-- TMPL_VAR NAME="field_value" ESCAPE="0" --></td>
<!-- /TMPL_IF -->
<!-- /TMPL_LOOP -->
</tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tmpl
index ade714d..1da8f69 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tmpl
@@ -7,8 +7,8 @@
<!-- TMPL_INCLUDE NAME="header.inc" -->
<!-- TMPL_INCLUDE NAME="cat-search.inc" -->
<div id="breadcrumbs">
- <a href="/cgi-bin/koha/mainpage.pl">Home</a>›
- <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a>›
+ <a href="/cgi-bin/koha/mainpage.pl">Home</a> ›
+ <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> ›
Labels Home
</div>
<div id="doc3" class="yui-t2">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-print.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-print.tmpl
index d7c1da5..9f4a707 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-print.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-print.tmpl
@@ -24,7 +24,7 @@
<body>
<!-- /TMPL_IF -->
<span id="spinelabel" class="label">
- <!-- TMPL_VAR NAME="content" -->
+ <!-- TMPL_VAR NAME="content" ESCAPE="0" -->
</span>
<span id="print_button" class="noprint">
<button onclick="window.print()">Print This Label</button>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/borrowers_details.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/borrowers_details.tmpl
index 763cf66..01b39a1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/borrowers_details.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/borrowers_details.tmpl
@@ -60,4 +60,6 @@
</form>
</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl
index fef7b69..9261388 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl
@@ -75,7 +75,7 @@
<!-- /TMPL_LOOP -->
</tbody>
</table>
- <div class="pages"><!--TMPL_IF Name="multipage"--><!--TMPL_VAR Name="paginationbar" --><!--/TMPL_IF--></div>
+ <div class="pages"><!--TMPL_IF Name="multipage"--><!--TMPL_VAR Name="paginationbar" ESCAPE="0" --><!--/TMPL_IF--></div>
</div>
<!-- TMPL_ELSE -->
<!-- TMPL_IF NAME="searching" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
index 806b43c..7cad8a6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
@@ -180,7 +180,7 @@
<label for="btitle">
<!-- /TMPL_IF-->
Salutation: </label>
- <!-- TMPL_VAR NAME="borrotitlepopup" -->
+ <!-- TMPL_VAR NAME="borrotitlepopup" ESCAPE="0" -->
<!-- TMPL_IF NAME="mandatorytitle" --><span class="required">Required</span><!-- /TMPL_IF -->
</li>
<!-- /TMPL_IF -->
@@ -380,7 +380,7 @@
<label for="streettype">
<!-- /TMPL_IF-->
Street type: </label>
- <!-- TMPL_VAR NAME="roadpopup" -->
+ <!-- TMPL_VAR NAME="roadpopup" ESCAPE="0" -->
<!-- TMPL_IF NAME="mandatorystreettype" --><span class="required">Required</span><!-- /TMPL_IF -->
</li>
<!--/TMPL_IF-->
@@ -734,7 +734,7 @@
<label for="branchcode">
<!-- /TMPL_IF-->
Library: </label>
- <!-- TMPL_VAR NAME="CGIbranch" -->
+ <!-- TMPL_VAR NAME="CGIbranch" ESCAPE="0" -->
<!-- TMPL_IF NAME="mandatorybranchcode" --><span class="required">Required</span><!-- /TMPL_IF -->
</li>
<li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl
index 0bf5daf..3f94373 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl
@@ -242,20 +242,20 @@
<td>Vendor</td>
<td><input type="radio" checked="checked" name="Line" value="aqbooksellers.name" /></td>
<td><input type="radio" name="Column" value="aqbooksellers.name" /></td>
- <td><!-- TMPL_VAR NAME="CGIBookSeller" --></td>
+ <td><!-- TMPL_VAR NAME="CGIBookSeller" ESCAPE="0" --></td>
</tr>
<tr>
<td>Item Type</td>
<td><input type="radio" name="Line" value="biblioitems.itemtype" /></td>
<td><input type="radio" name="Column" value="biblioitems.itemtype" /></td>
- <td><!-- TMPL_VAR NAME="CGIItemType" --></td>
+ <td><!-- TMPL_VAR NAME="CGIItemType" ESCAPE="0" --></td>
</tr>
<tr>
<td>Budget</td>
<td><input type="radio" name="Line" value="aqbudgets.budget_code" /></td>
<td><input type="radio" name="Column" value="aqbudgets.budget_code" /></td>
- <td><!-- TMPL_VAR NAME="CGIBudget" --></td>
+ <td><!-- TMPL_VAR NAME="CGIBudget" ESCAPE="0" --></td>
</tr>
<!-- TMPL_IF Name="hassort1" -->
@@ -263,7 +263,7 @@
<td>Sort1</td>
<td><input type="radio" name="Line" value="aqorders.sort1" /></td>
<td><input type="radio" name="Column" value="aqorders.sort1" /></td>
- <td><!-- TMPL_VAR NAME="CGISort1" --> </td>
+ <td><!-- TMPL_VAR NAME="CGISort1" ESCAPE="0" --> </td>
</tr>
<!-- /TMPL_IF -->
<!-- TMPL_IF Name="hassort2" -->
@@ -271,7 +271,7 @@
<td>Sort2</td>
<td><input type="radio" name="Line" value="aqorders.sort2" /></td>
<td><input type="radio" name="Column" value="aqorders.sort2" /></td>
- <td><!-- TMPL_VAR NAME="CGISort2" --> </td>
+ <td><!-- TMPL_VAR NAME="CGISort2" ESCAPE="0" --> </td>
</tr>
<!-- /TMPL_IF -->
</tbody>
@@ -286,8 +286,8 @@
<legend>Output</legend>
<ol><li><label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" /> </li>
<li><label for="outputfile">To a file:</label> <input type="radio" name="output" value="file" id="outputfile" /> <label class="inline" for="basename">Named: </label><input type="text" name="basename" id="basename" value="Export" /> <label class="inline" for="MIME">Into an application
- </label><!-- TMPL_VAR NAME="CGIextChoice" -->
- <!-- TMPL_VAR NAME="CGIsepChoice" --></li></ol>
+ </label><!-- TMPL_VAR NAME="CGIextChoice" ESCAPE="0" -->
+ <!-- TMPL_VAR NAME="CGIsepChoice" ESCAPE="0" --></li></ol>
</fieldset>
<fieldset class="action">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl
index b20a2f7..a6c1ac1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl
@@ -257,7 +257,7 @@ function Dopop(link) {
<!-- /TMPL_LOOP -->
</select>
<label class="inline" for="sep">Delimiter: </label>
- <!-- TMPL_VAR NAME="CGIseplist" -->
+ <!-- TMPL_VAR NAME="CGIseplist" ESCAPE="0" -->
</li>
</ol>
</fieldset>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tmpl
index d624f99..fb4efc6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tmpl
@@ -98,8 +98,8 @@
<legend>Output</legend>
<ol><li><label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" /> </li>
<li><label for="outputfile">To a file:</label> <input type="radio" name="output" value="file" id="outputfile" /> <label class="inline" for="basename">Named: </label><input type="text" name="basename" id="basename" value="Export" /> <label class="inline" for="MIME">Into an application
- </label><!-- TMPL_VAR NAME="CGIextChoice" -->
- <!-- TMPL_VAR NAME="CGIsepChoice" --></li></ol>
+ </label><!-- TMPL_VAR NAME="CGIextChoice" ESCAPE="0" -->
+ <!-- TMPL_VAR NAME="CGIsepChoice" ESCAPE="0" --></li></ol>
</fieldset>
<fieldset class="action">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tmpl
index 5e8f6a2..daefcff 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tmpl
@@ -257,8 +257,8 @@
<legend>Output</legend>
<ol><li><label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" /> </li>
<li><label for="outputfile">To a file:</label> <input type="radio" name="output" value="file" id="outputfile" /> <label class="inline" for="basename">Named: </label><input type="text" name="basename" id="basename" value="Export" /> <label class="inline" for="MIME">Into an application
- </label><!-- TMPL_VAR NAME="CGIextChoice" -->
- <!-- TMPL_VAR NAME="CGIsepChoice" --></li></ol>
+ </label><!-- TMPL_VAR NAME="CGIextChoice" ESCAPE="0" -->
+ <!-- TMPL_VAR NAME="CGIsepChoice" ESCAPE="0" --></li></ol>
</fieldset>
<fieldset class="action">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl
index 6a66948..da0b019 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl
@@ -247,8 +247,8 @@ function Dopop(link) {
<legend>Output</legend>
<ol><li><label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" /> </li>
<li><label for="outputfile">To a file:</label> <input type="radio" name="output" value="file" id="outputfile" /> <label class="inline" for="basename">Named: </label><input type="text" name="basename" id="basename" value="Export" /> <label class="inline" for="MIME">Into an application
- </label><!-- TMPL_VAR NAME="CGIextChoice" -->
- <!-- TMPL_VAR NAME="CGIsepChoice" --></li></ol>
+ </label><!-- TMPL_VAR NAME="CGIextChoice" ESCAPE="0" -->
+ <!-- TMPL_VAR NAME="CGIsepChoice" ESCAPE="0" --></li></ol>
</fieldset>
<fieldset class="action">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl
index d6218e1..a665be9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl
@@ -139,11 +139,11 @@
<label class="inline" for="basename">Named: </label><input type="text" name="basename" id="basename" value="Export" />
<label class="inline" for="MIME">Into an application </label>
<select name="MIME" id="MIME">
- <!-- TMPL_LOOP NAME="CGIextChoice" -->
+ <!-- TMPL_LOOP NAME="CGIextChoice" ESCAPE="0" -->
<option value="<!-- TMPL_VAR NAME="type" -->"><!-- TMPL_VAR NAME="type" --></option>
<!-- /TMPL_LOOP -->
</select>
- <!-- TMPL_VAR NAME="CGIsepChoice" -->
+ <!-- TMPL_VAR NAME="CGIsepChoice" ESCAPE="0" -->
</li>
</ol>
</fieldset>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tmpl
index 419193e..129992b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tmpl
@@ -207,12 +207,12 @@
<label class="inline" for="basename">Named: </label><input type="text" name="basename" id="basename" value="Export" />
<label class="inline" for="MIME">Into an application: </label>
<select name="MIME" id="MIME">
- <!-- TMPL_LOOP NAME="CGIextChoice" -->
+ <!-- TMPL_LOOP NAME="CGIextChoice" ESCAPE="0" -->
<option value="<!-- TMPL_VAR NAME="type" -->"><!-- TMPL_VAR NAME="type" --></option>
<!-- /TMPL_LOOP -->
</select>
<!-- <label class="inline" for="sep">Delimiter: </label> -->
- <!-- TMPL_VAR NAME="CGIsepChoice" -->
+ <!-- TMPL_VAR NAME="CGIsepChoice" ESCAPE="0" -->
</li>
</ol>
</fieldset>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl
index 26d671b..f961da5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl
@@ -229,26 +229,26 @@
<td>Patron category</td>
<td><input type="radio" name="Line" value="borrowers.categorycode" /></td>
<td><input type="radio" name="Column" value="borrowers.categorycode" /></td>
- <td><!-- TMPL_VAR NAME="CGIBorCat" --></td>
+ <td><!-- TMPL_VAR NAME="CGIBorCat" ESCAPE="0" --></td>
</tr>
<tr>
<td>Item type</td>
<td><input type="radio" name="Line" value="itemtype" /></td>
<td><input type="radio" name="Column" value="itemtype" /></td>
- <td ><!-- TMPL_VAR NAME="CGIItemType" --></td>
+ <td ><!-- TMPL_VAR NAME="CGIItemType" ESCAPE="0" --></td>
</tr>
<tr class="hilighted">
<td>Library</td>
<td><input type="radio" name="Line" value="branchcode" /></td>
<td><input type="radio" name="Column" value="branchcode" /></td>
- <td><!-- TMPL_VAR NAME="CGIBranch" --></td>
+ <td><!-- TMPL_VAR NAME="CGIBranch" ESCAPE="0" --></td>
</tr>
<!-- Modified according to statistics table
<tr>
<td>Issuing Library</td>
<td><input type="radio" name="Line" value="issuingbranch"></td>
<td><input type="radio" name="Column" value="issuingbranch"></td>
- <td ><! TMPL_VAR NAME="CGIBranch" ></td>
+ <td ><! TMPL_VAR NAME="CGIBranch" ESCAPE="0" ></td>
</tr> -->
<!--End Modified -->
<!-- TMPL_IF Name="hassort1" -->
@@ -256,7 +256,7 @@
<td>Sort1</td>
<td><input type="radio" name="Line" value="borrowers.sort1" /></td>
<td><input type="radio" name="Column" value="borrowers.sort1" /></td>
- <td><!-- TMPL_VAR NAME="CGISort1" --> </td>
+ <td><!-- TMPL_VAR NAME="CGISort1" ESCAPE="0" --> </td>
</tr>
<!-- /TMPL_IF -->
<!-- TMPL_IF Name="hassort2" -->
@@ -264,7 +264,7 @@
<td>Sort2</td>
<td><input type="radio" name="Line" value="borrowers.sort2" /></td>
<td><input type="radio" name="Column" value="borrowers.sort2" /></td>
- <td><!-- TMPL_VAR NAME="CGISort2" --> </td>
+ <td><!-- TMPL_VAR NAME="CGISort2" ESCAPE="0" --> </td>
</tr>
<!-- /TMPL_IF -->
</tbody>
@@ -275,8 +275,8 @@
<legend>Output</legend>
<ol><li><label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" /> </li>
<li><label for="outputfile">To a file:</label> <input type="radio" name="output" value="file" id="outputfile" /> <label class="inline" for="basename">Named: </label><input type="text" name="basename" id="basename" value="Export" /> <label class="inline" for="MIME">Into an application:
- </label><!-- TMPL_VAR NAME="CGIextChoice" -->
- <!-- TMPL_VAR NAME="CGIsepChoice" --></li></ol>
+ </label><!-- TMPL_VAR NAME="CGIextChoice" ESCAPE="0" -->
+ <!-- TMPL_VAR NAME="CGIsepChoice" ESCAPE="0" --></li></ol>
</fieldset>
<fieldset class="action">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_by_borrower_category.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_by_borrower_category.tmpl
index 2121551..87958c2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_by_borrower_category.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_by_borrower_category.tmpl
@@ -60,7 +60,7 @@
<option value="<!--TMPL_VAR Name="value"-->" ><!--TMPL_VAR Name="description"--> </option>
<!--/TMPL_LOOP -->
</select></li>
- <li><label for="branch">Select a branch:</label> <!-- TMPL_VAR NAME="CGIbranch" --></li></ol></fieldset>
+ <li><label for="branch">Select a branch:</label> <!-- TMPL_VAR NAME="CGIbranch" ESCAPE="0" --></li></ol></fieldset>
<fieldset class="action"><input type="submit" value="Submit" />
<input type="hidden" name="report_name" value="<!--TMPL_VAR NAME="report_name" -->" />
<input type="hidden" name="do_it" value="1" /></fieldset>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl
index 6eefeac..da69272 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl
@@ -281,8 +281,8 @@
<legend>Output</legend>
<ol><li><label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" /> </li>
<li><label for="outputfile">To a file:</label> <input type="radio" name="output" value="file" id="outputfile" /> <label class="inline" for="basename">Named: </label><input type="text" name="basename" id="basename" value="Export" /> <label class="inline" for="MIME">Into an application
- </label><!-- TMPL_VAR NAME="CGIextChoice" -->
- <!-- TMPL_VAR NAME="CGIsepChoice" --></li></ol>
+ </label><!-- TMPL_VAR NAME="CGIextChoice" ESCAPE="0" -->
+ <!-- TMPL_VAR NAME="CGIsepChoice" ESCAPE="0" --></li></ol>
</fieldset>
<fieldset class="action">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tmpl
index 22a39dc..403535b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tmpl
@@ -37,7 +37,7 @@
<!-- TMPL_ELSE -->
<form method="post" action="/cgi-bin/koha/reports/manager.pl?report_name=itemtypes">
- <fieldset class="rows"><legend>View catalog group by item types</legend><ol><li><label for="value">Select a branch</label> <!-- TMPL_VAR NAME="CGIbranch" -->
+ <fieldset class="rows"><legend>View catalog group by item types</legend><ol><li><label for="value">Select a branch</label> <!-- TMPL_VAR NAME="CGIbranch" ESCAPE="0" -->
<span class="tip">Select none to see all branches</span></li></ol></fieldset>
<fieldset class="action"><input type="submit" value="Submit" />
<input type="hidden" name="report_name" value="<!--TMPL_VAR NAME="report_name" -->" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tmpl
index d8bb17b..956aa92 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tmpl
@@ -96,8 +96,8 @@
<legend>Output</legend>
<ol><li><label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" /> </li>
<li><label for="outputfile">To a file:</label> <input type="radio" name="output" value="file" id="outputfile" /> <label class="inline" for="basename">Named: </label><input type="text" name="basename" id="basename" value="Export" />
- <label class="inline" for="MIME">Into an application</label><!-- TMPL_VAR NAME="CGIextChoice" -->
- <!-- TMPL_VAR NAME="CGIsepChoice" --></li></ol>
+ <label class="inline" for="MIME">Into an application</label><!-- TMPL_VAR NAME="CGIextChoice" ESCAPE="0" -->
+ <!-- TMPL_VAR NAME="CGIsepChoice" ESCAPE="0" --></li></ol>
</fieldset>
<fieldset class="action">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl
index 53f9138..c42bfd8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl
@@ -184,7 +184,7 @@ function checkMultiHold() {
</fieldset>
<!-- TMPL_ELSE -->
<fieldset>
- <!-- TMPL_VAR NAME="CGIselectborrower" -->
+ <!-- TMPL_VAR NAME="CGIselectborrower" ESCAPE="0" -->
<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber"-->" /><fieldset class="action"><input type="submit" value="Select" /></fieldset></fieldset>
<!-- /TMPL_UNLESS -->
@@ -280,7 +280,7 @@ function checkMultiHold() {
</li>
<li>
<label for="pickup">Pickup at:</label>
- <!-- TMPL_VAR NAME="CGIbranch" -->
+ <!-- TMPL_VAR NAME="CGIbranch" ESCAPE="0" -->
</li>
<!-- TMPL_IF NAME="reserve_in_future" -->
--
1.7.1
More information about the Koha-patches
mailing list