From 0e25bb8b038faecdaf6d0b44b872fab582696feb Mon Sep 17 00:00:00 2001
From: simith <simith@inlibro.com>
Date: Thu, 3 Jul 2014 14:02:35 -0400
Subject: [PATCH] Bug 12528 - Enable staff to deny message setting access to
 patrons on the OPAC
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This fix permits the staff to pull apart the access to patron message setting.

Modified:

installer/data/mysql/sysprefs.sql                                         -OPACEnhancedMessagingPreferences preference added
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref    -OPACEnhancedMessagingPreferences preference added
koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc                    -access to message setting changed

Testing:

I Apply the patch
II Run updatedatabase.pl

0) Search OPACEnhancedMessagingPreferences preference;
1) Validate "OPACEnhancedMessagingPreferences show patron messaging setting on the OPAC (NOTE: EnhancedMessagingPreferences must be enabled).";
2) Disable OPACEnhancedMessagingPreferences preference;
3) Enable EnhancedMessagingPreferences preference;
4) On the OPAC -> user's settings, validate "your messaging" is not showed.

Patch behaves as expected
Signed-off-by: Marc Véron <veron@veron.ch>

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
I fixed some minor conflicts, so I'm sending all patches w/ signoff
---
 installer/data/mysql/sysprefs.sql                        |    1 +
 .../prog/en/modules/admin/preferences/patrons.pref       |    7 +++++++
 koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc   |   14 ++++++++------
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql
index 9020b4b..93cff15 100644
--- a/installer/data/mysql/sysprefs.sql
+++ b/installer/data/mysql/sysprefs.sql
@@ -252,6 +252,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `
 ('OPACdefaultSortOrder','dsc','asc|dsc|za|az','Specify the default sort order','Choice'),
 ('OPACdidyoumean',NULL,NULL,'Did you mean? configuration for the OPAC. Do not change, as this is controlled by /cgi-bin/koha/admin/didyoumean.pl.','Free'),
 ('OPACDisplay856uAsImage','OFF','OFF|Details|Results|Both','Display the URI in the 856u field as an image, the corresponding OPACXSLT option must be on','Choice'),
+('OPACEnhancedMessagingPreferences', '1', NULL, 'If ON, show patrons messaging setting on the OPAC.', 'YesNo'),
 ('OpacExportOptions','bibtex,dc,marcxml,marc8,utf8,marcstd,mods,ris','','Define export options available on OPAC detail page.','multiple'),
 ('OPACFallback', 'prog', 'bootstrap|prog', 'Define the fallback theme for the OPAC interface.', 'Themes'),
 ('OpacFavicon','','','Enter a complete URL to an image to replace the default Koha favicon on the OPAC','free'),
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
index aa567c3..3799423 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
@@ -139,6 +139,13 @@ Patrons:
          - pref: CardnumberLength
          - "characters long. The length can be a single number to specify an exact length, a range separated by a comma (i.e., 'Min,Max'), or a maximum with no minimum (i.e., ',Max')."
          - "If 'cardnumber' is included in the BorrowerMandatoryField list, the minimum length, if not specified here, defaults to one."
+     -
+         - pref: OPACEnhancedMessagingPreferences
+           choices:
+               yes: Show
+               no: "Don't show"
+         - "patron messaging setting on the OPAC (NOTE: EnhancedMessagingPreferences must be enabled)."
+
     "Norwegian patron database":
      -
          - pref: NorwegianPatronDBEnable
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc
index 182543b..50fe23e 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc
@@ -79,12 +79,14 @@
             [% END %]
 
             [% IF ( EnhancedMessagingPreferences ) %]
-                [% IF ( messagingview ) %]
-                    <li class="active">
-                [% ELSE %]
-                    <li>
-                [% END %]
-                <a href="/cgi-bin/koha/opac-messaging.pl">your messaging</a></li>
+                [% IF Koha.Preference( 'OPACEnhancedMessagingPreferences' ) %]
+                    [% IF ( messagingview ) %]
+                        <li class="active">
+                    [% ELSE %]
+                        <li>
+                    [% END %]
+                    <a href="/cgi-bin/koha/opac-messaging.pl">your messaging</a></li>
+                 [% END %]
             [% END %]
 
             [% IF Koha.Preference( 'virtualshelves' ) == 1 %]
-- 
1.7.10.4