From d99d7df596168be1fa2f554768192f2d7947f4aa Mon Sep 17 00:00:00 2001
From: Sophie Meynieux <sophie.meynieux@biblibre.com>
Date: Mon, 10 Mar 2014 17:07:07 +0100
Subject: [PATCH] Bug 11647: (follow-up) test if user is logged in before
 proposing to subscribe or unsubcribe from serial routing list

To test :
1) Search for a subscription with patron notification active
2) If you're not logged in, a message warns you that you must log
   in to subscribe to notification on new issues
3) If you log in, and have not yet subscribed to this routing list,
   you've got a link to subscribe
4) Once you have subscribed, you've got a link to unsubscribe
5) If you log out, you've got a message saying you must log in to
   subscribe
6) If you log in with another user, you've got the link to subscribe
   or unsubscribe depending on if he has already subscribed.

Signed-off-by: remy juliette <remy.gonzalves@iepg.fr>

Signed-off-by: Aurelie Fichot <aurelie.fichot@iepg.fr>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit b056f93c4d33a9a56d56bbb081924f7c4c974a79)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit a5588825138f2156682342eb012e3f08d65441d2)
---
 .../prog/en/modules/opac-serial-issues.tt      | 18 +++++++++++-------
 opac/opac-serial-issues.pl                     | 18 +++++++++++-------
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-serial-issues.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-serial-issues.tt
index 546bc1556a..5d590a99c5 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-serial-issues.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-serial-issues.tt
@@ -113,14 +113,18 @@
         </p>
     [% END %]
     [% IF ( subscription_LOO.letter ) %]
-        [% IF ( subscription_LOO.hasalert ) %]
-            You have subscribed to email notification on new issues <a href="opac-alert-subscribe.pl?op=cancel&amp;externalid=[% subscription_LOO.subscriptionid %]&amp;alerttype=issue&amp;biblionumber=[% subscription_LOO.biblionumber %]" class="button" title="Cancel email notification">
-                Cancel email notification
-            </a>
+        [% IF ( loggedinusername ) %]
+            [% IF ( subscription_LOO.hasalert ) %]
+                You have subscribed to email notification on new issues <a href="opac-alert-subscribe.pl?op=cancel&amp;externalid=[% subscription_LOO.subscriptionid %]&amp;alerttype=issue&amp;biblionumber=[% subscription_LOO.biblionumber %]" class="button" title="Cancel email notification">
+                    Cancel email notification
+                </a>
+            [% ELSE %]
+                <a href="opac-alert-subscribe.pl?externalid=[% subscription_LOO.subscriptionid %]&amp;alerttype=issue&amp;biblionumber=[% subscription_LOO.biblionumber %]" class="button" title="Subscribe to email notification on new issues">
+                    Subscribe to email notification on new issues
+                </a>
+            [% END %]
         [% ELSE %]
-            <a href="opac-alert-subscribe.pl?externalid=[% subscription_LOO.subscriptionid %]&amp;alerttype=issue&amp;biblionumber=[% subscription_LOO.biblionumber %]" class="button" title="Subscribe to email notification on new issues">
-                Subscribe to email notification on new issues
-            </a>
+            You must log in if you want to subscribe to email notification on new issues
         [% END %]
     [% END %]
 </div>
diff --git a/opac/opac-serial-issues.pl b/opac/opac-serial-issues.pl
index b5349740c5..edc6248b64 100755
--- a/opac/opac-serial-issues.pl
+++ b/opac/opac-serial-issues.pl
@@ -62,9 +62,11 @@ if ( $selectview eq "full" ) {
     }
 
     # now, check is there is an alert subscription for one of the subscriptions
-    foreach (@$subscriptions) {
-        if (getalert($loggedinuser,'issue',$_->{subscriptionid})) {
-            $_->{hasalert} = 1;
+    if ($loggedinuser) {
+        foreach (@$subscriptions) {
+            if (getalert($loggedinuser,'issue',$_->{subscriptionid})) {
+                $_->{hasalert} = 1;
+            }
         }
     }
 
@@ -100,10 +102,12 @@ else {
 
     my $subscriptions = GetSubscriptionsFromBiblionumber($biblionumber);
     # now, check is there is an alert subscription for one of the subscriptions
-    foreach (@$subscriptions) {
-        my $subscription = getalert($loggedinuser,'issue',$_->{subscriptionid});
-        if (@$subscription[0]) {
-            $_->{hasalert} = 1;
+    if ($loggedinuser){
+        foreach (@$subscriptions) {
+            my $subscription = getalert($loggedinuser,'issue',$_->{subscriptionid});
+            if (@$subscription[0]) {
+                $_->{hasalert} = 1;
+            }
         }
     }
 
-- 
2.39.5