From 2ce51846a02c2c617d8cf26db8ef4329472e2d3e Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 3 Feb 2010 15:20:17 -0500 Subject: [PATCH] More fixes for Bug 2600, HTML tags in titles not escaped in many places Signed-off-by: Galen Charlton --- .../prog/en/modules/acqui/basket.tmpl | 6 +-- .../prog/en/modules/acqui/neworderempty.tmpl | 4 +- .../prog/en/modules/acqui/parcel.tmpl | 20 ++++---- .../prog/en/modules/acqui/z3950_search.tmpl | 29 +++++------ .../prog/en/modules/basket/basket.tmpl | 48 +++++++++---------- .../en/modules/catalogue/detailprint.tmpl | 4 +- .../en/modules/catalogue/issuehistory.tmpl | 6 +-- .../prog/en/modules/catalogue/moredetail.tmpl | 20 ++++---- .../prog/en/modules/cataloguing/addbooks.tmpl | 10 ++-- .../prog/en/modules/circ/branchoverdues.tmpl | 18 +++---- .../prog/en/modules/circ/overdue.tmpl | 14 +++--- .../en/modules/circ/transferstoreceive.tmpl | 16 +++---- .../prog/en/modules/circ/waitingreserves.tmpl | 16 +++---- .../prog/en/modules/labels/result.tmpl | 2 +- .../en/modules/offline_circ/process_koc.tmpl | 8 ++-- .../en/modules/reports/serials_stats.tmpl | 26 +++++----- .../prog/en/modules/reserve/request.tmpl | 4 +- .../rotating_collections/addItems.tmpl | 4 +- .../en/modules/suggestion/suggestion.tmpl | 6 +-- .../virtualshelves/addbybiblionumber.tmpl | 8 ++-- .../prog/en/modules/opac-account.tmpl | 8 ++-- .../prog/en/modules/opac-basket.tmpl | 46 +++++++++--------- .../prog/en/modules/opac-opensearch.tmpl | 12 ++--- .../prog/en/modules/opac-results-grouped.tmpl | 20 ++++---- .../prog/en/modules/opac-review.tmpl | 18 +++---- 25 files changed, 187 insertions(+), 186 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl index 096bc710fc..4c4dd3fba2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl @@ -113,7 +113,7 @@ - +

Vendor not found

@@ -170,7 +170,7 @@ - +

Order Details

@@ -237,7 +237,7 @@

(rcvd) - "> by + "> by - , 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 d3f82966e4..a77e214432 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();

  1. Title - " /> + " /> - " /> + " />
  2. diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl index 5a6e8a71dd..a4775eb32c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl @@ -3,7 +3,7 @@ Receipt Summary for Invoice on Receive Orders from - + + @@ -37,7 +37,7 @@ $.tablesorter.addParser({ - +
    @@ -46,8 +46,8 @@ $.tablesorter.addParser({
    -
    -
    1. " />
      2. +
      +
      1. " />
      2. " />
      @@ -82,17 +82,18 @@ $.tablesorter.addParser({

      Search targets Select AllClear All

      -

      +

      " value="" checked="checked" /> " value="" /> - +

      Cancel
      +
    @@ -111,15 +112,15 @@ $.tablesorter.addParser({ - + - + " title="MARC" rel="gb_page_center[600,500]">MARC" title="MARC" rel="gb_page_center[600,500]">Card - &breedingid=&booksellerid=&basketno=">Order + &breedingid=&booksellerid=&basketno=">Order 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 45801039c8..8cf9c5b6eb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tmpl @@ -5,7 +5,7 @@ /includes/favicon.ico" type="image/x-icon" /> - @@ -14,14 +14,14 @@ @@ -195,7 +195,7 @@ function tagAdded() {

    - + @@ -234,7 +234,7 @@ function tagAdded() { - + Publisher @@ -254,7 +254,7 @@ function tagAdded() { - + Subject(s) @@ -265,13 +265,13 @@ function tagAdded() { - + Copyright - + Notes @@ -281,7 +281,7 @@ function tagAdded() { - + Unified title @@ -312,20 +312,20 @@ function tagAdded() { - + URL(s)

    -
    - +
    +

    - + Location(s) @@ -345,10 +345,10 @@ function tagAdded() {

    - Select All + Select All Clear All | Selected items : - + Remove @@ -386,7 +386,7 @@ function tagAdded() { " name="bib" id="bib" onclick="selRecord(value,checked);" /> - + ',)"> @@ -403,7 +403,7 @@ function tagAdded() { &rft.btitle=&rft.date=&rft.tpages=&rft.isbn=&rft.aucorp=&rft.place=&rft.pub=&rft.edition=&rft.series=&rft.genre=">
    _status" class="tagstatus results_summary" style="display:none">Tag status here.
    - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detailprint.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detailprint.tmpl index 3eeda6590f..060bbc6d78 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detailprint.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detailprint.tmpl @@ -1,5 +1,5 @@ -Koha › Catalog › Details for <!-- TMPL_VAR NAME="title" --> +Koha › Catalog › Details for <!-- TMPL_VAR NAME="title" ESCAPE="html" --> /css/print.css" /> @@ -22,7 +22,7 @@ Subject: Copyright Date: Notes: - Unititle: + Unititle: Dewey: Classification: LCCN: diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tmpl index 5c9fd57f06..2d97d5d104 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tmpl @@ -1,5 +1,5 @@ -Koha › Catalog › Checkout History for <!-- TMPL_VAR NAME="title" --> +Koha › Catalog › Checkout History for <!-- TMPL_VAR NAME="title" ESCAPE="html" --> @@ -10,7 +10,7 @@
    - +
    @@ -78,7 +78,7 @@

    () has never been checked out.

    - +
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl index 4b88ecc288..72c9b0bbc0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl @@ -11,7 +11,7 @@
    - +
    @@ -48,18 +48,18 @@
  3. Item type:  
    4. -
  4. Collection:
    5. +
  5. Collection:
  6. Item Callnumber:  
    7. -
  7. Copy / Vol :  
    8. +
  8. Copy / Vol :  
  9. Replacement Price:  

-

Statuses ( +

Statuses ( - Lost + Lost Damaged Withdrawn )

- +
  1. Current Location:  
  2. Checkout Status: Checked out to ">, Due back on Not Checked out
    3. @@ -141,13 +141,13 @@
  3. - - Accession Date: + + Accession Date: "> - +
    4. @@ -166,7 +166,7 @@ " /> " />" /> - +
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl index ff09a92d06..2c217b354c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl @@ -15,12 +15,12 @@
- +
- + - + No results found @@ -48,7 +48,7 @@

- "> + ">

@@ -101,7 +101,7 @@ ">Edit biblio " class="disabled" onclick="return false;">Edit biblio - + ">Add holdings diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tmpl index 3299030247..072a87f818 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tmpl @@ -9,7 +9,7 @@
- +
@@ -42,7 +42,7 @@ - + @@ -67,7 +67,7 @@ @@ -127,7 +127,7 @@ - + @@ -145,7 +145,7 @@ @@ -167,7 +167,7 @@ - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl index c6437607b4..1d0afa3c4c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl @@ -95,9 +95,9 @@

- ">Download file of displayed overdues + ">Download file of displayed overdues - Download file of all overdues + Download file of all overdues

@@ -116,15 +116,15 @@ @@ -229,7 +229,7 @@ -
  • +
  • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tmpl index 6b036af247..8ee68eb977 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tmpl @@ -5,19 +5,19 @@ @@ -32,7 +32,7 @@ $.tablesorter.addParser({
    - +
    @@ -90,7 +90,7 @@ $.tablesorter.addParser({
    • @@ -101,7 +101,7 @@ $.tablesorter.addParser({ " /> " /> - " /> + " /> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tmpl index 19db05c899..11681022e9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tmpl @@ -86,7 +86,7 @@
    Date due Title Patron ">  

    - ?subject=Overdue: "> + ?subject=Overdue: ">     		@@ -99,16 +99,16 @@ &itemnumber=&method=letter&location=&overduelevel= &notifyId=">Notice - + &itemnumber=&method=letter&location=&overduelevel=&notifyId=">Notice - + &itemnumber=&method=lost&location=&overduelevel= &notifyId=">Considered lost - +
    Location Overdue status Notified byCancelCancel

    ">  

    - ?subject=Overdue: "> + ?subject=Overdue: ">

    		&itemnumber=&method=phone&location=&notify_date=">Cancel notification
    "> - [?subject=Overdue: ">email] + [?subject=Overdue: ">email] () -"> +"> -"> +"> -"> , by +"> , by &itemnumber=#item"> ">,

    - ?subject=Reservation: "> + ?subject=Reservation: ">
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tmpl index d4d2d57575..960052c3cc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tmpl @@ -41,7 +41,7 @@ function CheckForm(f) {
    - +
    @@ -54,9 +54,9 @@ function CheckForm(f) {

    Warning: Unable to determine patron from item barcode (). Cannot check in.

    -

    Checked out "> () to "> ():

    -

    Renewed "> () for "> ():

    -

    Checked in "> () from "> ():

    +

    Checked out "> () to "> ():

    +

    Renewed "> () for "> ():

    +

    Checked in "> () from "> ():

    Accepted payment () from "> ():

    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 3888d2e2dd..d8bb17b0fb 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 @@ -7,7 +7,7 @@ - - -
    + + +
    CGI debug is on.
    @@ -65,10 +65,10 @@ Note: this window will close automatically in 5 seconds
    -
    ?debug=1" method="post"> +?debug=1" method="post"> " />
    - Comments on by + Comments on by

    Note: Your comment must be approved by a librarian.

    -- 2.20.1
    - + by
    [], , , ISBN: ,