From 7b0792584ef8d75073ce26c6f496abbe2e80bd9d Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@biblibre.com>
Date: Mon, 27 Apr 2015 16:06:37 +0200
Subject: [PATCH] Bug 12160: Rename opacuserjs with OPACUserJS

Test plan:
Same as previous patch for opacuserjs

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>

NOTE: Worked before and after updatedatabase.pl, though after
      is less confusing to the programmer unaware of case-insensitivity.

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
---
 C4/Auth.pm                                                    | 4 ++--
 .../Bug_12160-Rename_pref_opacuserjs_to_OPACUserJS.sql        | 1 +
 installer/data/mysql/sysprefs.sql                             | 2 +-
 .../intranet-tmpl/prog/en/modules/admin/preferences/opac.pref | 2 +-
 koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc     | 4 ++--
 5 files changed, 7 insertions(+), 6 deletions(-)
 create mode 100644 installer/data/mysql/atomicupdate/Bug_12160-Rename_pref_opacuserjs_to_OPACUserJS.sql

diff --git a/C4/Auth.pm b/C4/Auth.pm
index 812b78c744..544bf7ec9c 100644
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -510,7 +510,7 @@ sub get_template_and_user {
             opacheader                            => "" . C4::Context->preference("opacheader"),
             opaclanguagesdisplay                  => "" . C4::Context->preference("opaclanguagesdisplay"),
             opacreadinghistory                    => C4::Context->preference("opacreadinghistory"),
-            opacuserjs                            => C4::Context->preference("opacuserjs"),
+            OPACUserJS                            => C4::Context->preference("OPACUserJS"),
             opacuserlogin                         => "" . C4::Context->preference("opacuserlogin"),
             ShowReviewer                          => C4::Context->preference("ShowReviewer"),
             ShowReviewerPhoto                     => C4::Context->preference("ShowReviewerPhoto"),
@@ -1182,7 +1182,7 @@ sub checkauth {
         OpacFavicon                           => C4::Context->preference("OpacFavicon"),
         opacreadinghistory                    => C4::Context->preference("opacreadinghistory"),
         opaclanguagesdisplay                  => C4::Context->preference("opaclanguagesdisplay"),
-        opacuserjs                            => C4::Context->preference("opacuserjs"),
+        OPACUserJS                            => C4::Context->preference("OPACUserJS"),
         opacbookbag                           => "" . C4::Context->preference("opacbookbag"),
         OpacCloud                             => C4::Context->preference("OpacCloud"),
         OpacTopissue                          => C4::Context->preference("OpacTopissue"),
diff --git a/installer/data/mysql/atomicupdate/Bug_12160-Rename_pref_opacuserjs_to_OPACUserJS.sql b/installer/data/mysql/atomicupdate/Bug_12160-Rename_pref_opacuserjs_to_OPACUserJS.sql
new file mode 100644
index 0000000000..0b03d43e5d
--- /dev/null
+++ b/installer/data/mysql/atomicupdate/Bug_12160-Rename_pref_opacuserjs_to_OPACUserJS.sql
@@ -0,0 +1 @@
+UPDATE systempreferences SET variable="OPACUserJS" where variable="opacuserjs"
diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql
index a1b518cb32..9620d67d84 100644
--- a/installer/data/mysql/sysprefs.sql
+++ b/installer/data/mysql/sysprefs.sql
@@ -317,7 +317,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `
 ('OpacTopissue','0',NULL,'If ON, enables the \'most popular items\' link on OPAC. Warning, this is an EXPERIMENTAL feature, turning ON may overload your server','YesNo'),
 ('OPACURLOpenInNewWindow','0',NULL,'If ON, URLs in the OPAC open in a new window','YesNo'),
 ('OPACUserCSS','',NULL,'Add CSS to be included in the OPAC in an embedded <style> tag.','free'),
-('opacuserjs','','70|10','Define custom javascript for inclusion in OPAC','Textarea'),
+('OPACUserJS','','70|10','Define custom javascript for inclusion in OPAC','Textarea'),
 ('opacuserlogin','1',NULL,'Enable or disable display of user login features','YesNo'),
 ('OPACViewOthersSuggestions','0',NULL,'If ON, allows all suggestions to be displayed in the OPAC','YesNo'),
 ('OPACXSLTDetailsDisplay','default','','Enable XSL stylesheet control over details page display on OPAC','Free'),
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
index c26d048198..835a4ce543 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
@@ -182,7 +182,7 @@ OPAC:
             - for the OPAC's favicon. (This should be a complete URL, starting with <code>http://</code>.)
         -
             - "Include the following JavaScript on all pages in the OPAC:"
-            - pref: opacuserjs
+            - pref: OPACUserJS
               type: textarea
               class: code
         -
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc
index 59b046491e..91eb8cfb54 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc
@@ -262,10 +262,10 @@ $(document).ready(function() {
 </script>
 [% PROCESS jsinclude %]
 
-[% IF ( opacuserjs ) %]
+[% IF ( OPACUserJS ) %]
     <script type="text/javascript">
         //<![CDATA[
-        [% opacuserjs %]
+        [% OPACUserJS %]
         //]]>
     </script>
 [% END %]
-- 
2.39.5