From 086c081ac3273b22052bd89d6b019a4e597b2a66 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 3 Feb 2010 13:46:31 -0500 Subject: [PATCH] Fixes for Bug 2600, HTML tags in titles not escaped in many places --- .../prog/en/modules/catalogue/MARCdetail.tmpl | 30 ++++++------ .../prog/en/modules/catalogue/results.tmpl | 42 ++++++++-------- .../prog/en/modules/reserve/request.tmpl | 50 ++++++++++---------- .../prog/en/modules/opac-addbybiblionumber.tmpl | 4 +- .../prog/en/modules/opac-readingrecord.tmpl | 2 +- .../opac-tmpl/prog/en/modules/opac-results.tmpl | 32 ++++++------ .../prog/en/modules/opac-search-history.tmpl | 4 +- 7 files changed, 82 insertions(+), 82 deletions(-) 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 9e6f733..8fa7d1b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl @@ -21,23 +21,23 @@ function Changefwk(FwkList) { - +
- +
-

MARC biblio : ( )

- +

MARC biblio : ( )

+

With Framework :

- +
    @@ -103,7 +103,7 @@ function Changefwk(FwkList) {
- +
@@ -133,7 +133,7 @@ function Changefwk(FwkList) {
- +
@@ -163,7 +163,7 @@ function Changefwk(FwkList) {
- +
@@ -193,7 +193,7 @@ function Changefwk(FwkList) {
- +
@@ -223,7 +223,7 @@ function Changefwk(FwkList) {
- +
@@ -253,7 +253,7 @@ function Changefwk(FwkList) {
- +
@@ -283,7 +283,7 @@ function Changefwk(FwkList) {
- +
@@ -313,7 +313,7 @@ function Changefwk(FwkList) {
- +
@@ -343,7 +343,7 @@ function Changefwk(FwkList) {
- +
@@ -373,7 +373,7 @@ function Changefwk(FwkList) {
- +
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl index d62fcd3..09d6339 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl @@ -27,9 +27,9 @@ $(window).load(function() { verify_images(); }); -function Dopop(link) { +function Dopop(link) { newin=window.open(link,'popup','width=500,height=500,toolbar=false,scrollbars=yes,resizeable=yes'); -} +} $(document).ready(function() { $('#sortbyform').find("input:submit").hide(); $('#sort_by').change(function() { @@ -62,19 +62,19 @@ $(".addtocart").show(); }); $("#tagsel_span").html(""); - + function cartList(){ if($("#addto").find("option:selected").attr("value") == "addtolist"){ var shelfnumber = $("#addto").find("option:selected").attr("id").replace("s",""); if (vShelfAdd()) { Dopop('/cgi-bin/koha/virtualshelves/addbybiblionumber.pl?shelfnumber='+shelfnumber+'&confirm=1&' + vShelfAdd()); } - return false; + return false; } else if($("#addto").find("option:selected").attr("value") == "newlist"){ if (vShelfAdd()) { Dopop('/cgi-bin/koha/virtualshelves/addbybiblionumber.pl?newshelf=1&' + vShelfAdd()); } - return false; + return false; } if($("#addto").find("option:selected").attr("value") == "addtocart"){ addMultiple(); @@ -191,7 +191,7 @@ function GetZ3950Terms(){ -
Did you mean: +
Did you mean:
  • @@ -255,15 +255,15 @@ function GetZ3950Terms(){
- +

- Error: + Error: - + @@ -298,7 +298,7 @@ function GetZ3950Terms(){
- +
@@ -308,7 +308,7 @@ function GetZ3950Terms(){ @@ -600,7 +600,7 @@ function checkMultiHold() { - Only item + Only item diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-addbybiblionumber.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-addbybiblionumber.tmpl index adbcf92..f85d914 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-addbybiblionumber.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-addbybiblionumber.tmpl @@ -2,7 +2,7 @@ Koha Online Catalog › Add to Your List @@ -17,7 +17,7 @@
    -
  • +
  • diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tmpl index ec566a9..5216d11 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tmpl @@ -57,7 +57,7 @@ TMPL_ELSE -->Title /SC.GIF&client=&upc=&oclc=&type=xw10" alt=""/> -
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl index 2b015cb..7455ff3 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl @@ -1,7 +1,7 @@ -Koha Online Catalog › +Koha Online Catalog › - Results of Search for '' with limit(s): '' + Results of Search for '' with limit(s): '' You did not specify any search criteria. @@ -29,7 +29,7 @@ function holdMultiple() { if (checkedCount > 0) { holdBiblioNums(checkedBiblioNums); } else { - alert(MSG_NO_RECORD_SELECTED); + alert(MSG_NO_RECORD_SELECTED); } } @@ -151,19 +151,19 @@ $(document).ready(function(){ $("#tagsel_span").html(""); - + function cartList(){ if($("#addto").find("option:selected").attr("value") == "addtolist"){ var shelfnumber = $("#addto").find("option:selected").attr("id").replace("s",""); if (vShelfAdd()) { Dopop('/cgi-bin/koha/opac-addbybiblionumber.pl?selectedshelf='+shelfnumber+'&' + vShelfAdd()); } - return false; + return false; } else if($("#addto").find("option:selected").attr("value") == "newlist"){ if (vShelfAdd()) { Dopop('/cgi-bin/koha/opac-addbybiblionumber.pl?newshelf=1&' + vShelfAdd()); } alert('You must be logged in to create or add to Lists'); - return false; + return false; } if($("#addto").find("option:selected").attr("value") == "addtocart" || $("#addto").attr("class") == "addtocart"){ addMultiple(); @@ -250,8 +250,8 @@ $(document).ready(function(){

Error:

- - + + @@ -286,7 +286,7 @@ $(document).ready(function(){
- &q="""> + &q="""> @@ -369,7 +369,7 @@ function GetZ3950Terms(){ " value=""/> - + @@ -386,7 +386,7 @@ function GetZ3950Terms(){ "> http://images.amazon.com/images/P/.01.TZZZZZZZ.jpghttp://g-images.amazon.com/images/G/01/x-site/icons/no-img-sm.gif" alt="image" class="thumbnail" /> - +
" name="biblionumber" value="" style="display:none" /> @@ -402,8 +402,8 @@ function GetZ3950Terms(){ "> - No title - + No title + , , ,

@@ -433,10 +433,10 @@ function GetZ3950Terms(){   - + Edition: - Description: + Description: ; , , @@ -455,7 +455,7 @@ function GetZ3950Terms(){

- + No holds allowed @@ -472,7 +472,7 @@ function GetZ3950Terms(){ available:
    - +
  • " title="" />
  • @@ -489,7 +489,7 @@ function GetZ3950Terms(){
  • " title="" />
  • -
  • +
  • @@ -542,7 +542,7 @@ function GetZ3950Terms(){ - + 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 9fd20c4..b52c484 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl @@ -70,23 +70,23 @@ function checkMultiHold() { alert(MSG_NO_ITEMS_AVAILABLE); return false; } - + var biblionumbers = ""; $(spans).each(function() { var bibnum = $(this).attr("title"); - biblionumbers += bibnum + "/"; + biblionumbers += bibnum + "/"; }); var badSpans = $(".not_holdable"); var badBibs = ""; $(badSpans).each(function() { var bibnum = $(this).attr("title"); - badBibs += bibnum + "/"; + badBibs += bibnum + "/"; }); $("#multi_hold_bibs").val(biblionumbers); $("#bad_bibs").val(badBibs); - + return true; } @@ -148,7 +148,7 @@ function checkMultiHold() {
    -
    +
    Cannot place hold: this record has no items attached.
    @@ -162,7 +162,7 @@ function checkMultiHold() {
    - +

    Place a hold on ">

    @@ -170,15 +170,15 @@ function checkMultiHold() { - -

    Patron Not Found

    No patron with this name, Please, try another

    + +

    Patron Not Found

    No patron with this name, Please, try another

    " method="post">
    Enter patron card number or partial name:
    - + " />
    @@ -216,7 +216,7 @@ function checkMultiHold() {
    - +
      @@ -234,7 +234,7 @@ function checkMultiHold() {

      Patron not found:

      Name or barcode not found. Please try an other

      - +
      Hold details @@ -242,7 +242,7 @@ function checkMultiHold() { - + " /> @@ -252,12 +252,12 @@ function checkMultiHold() { - " value=" " /> - " /> + " /> " /> @@ -343,7 +343,7 @@ function checkMultiHold() {
    • Publication year:
    • - + @@ -367,7 +367,7 @@ function checkMultiHold() { " /> /img/famfamfam/silk/error.png" alt="Requires override of hold policy" /> - " /> + " /> /img/famfamfam/silk/cross.png" alt="Cannot be put on hold" /> @@ -378,7 +378,7 @@ function checkMultiHold() {
      Place a hold on a specific copy
      - + @@ -399,11 +399,11 @@ function checkMultiHold() { to , since - + Unavailable (lost or missing) - + Not for loan () @@ -425,7 +425,7 @@ function checkMultiHold() {
      - + @@ -494,7 +494,7 @@ function checkMultiHold() {
- +
@@ -545,9 +545,9 @@ function checkMultiHold() { - - - + + +
"> +">
- +
@@ -300,7 +300,7 @@ $(document).ready(function(){ - + -- 1.6.3.3
- """>No title + """>No title @@ -400,7 +400,7 @@ $(document).ready(function(){ " title="View details for this title"> - No title + No title by " title="Search for works by this author" class="author">   @@ -452,7 +452,7 @@ $(document).ready(function(){ -
+
@@ -528,7 +528,7 @@ $(document).ready(function(){
Not finding what you're looking for?
Make a purchase suggestion
Not finding what you're looking for?
Make a purchase suggestion
- + @@ -540,7 +540,7 @@ $(document).ready(function(){ - - - + + + diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-search-history.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-search-history.tmpl index 20e8c93..657ad14 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-search-history.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-search-history.tmpl @@ -7,7 +7,7 @@ $(document).ready(function() { // We show table ordered by descending dates by default // (so that the more recent query is shown first) - $.tablesorter.defaults.sortList = [[0,1]]; + $.tablesorter.defaults.sortList = [[0,1]]; $(".historyt").tablesorter({ widgets : ['zebra'], dateFormat: 'uk' @@ -46,7 +46,7 @@
">">