Bug 19188: Self checkout missing currency symbol

[srvgit] / opac / opac-messaging.pl

diff --git a/opac/opac-messaging.pl b/opac/opac-messaging.pl
index 3ea529e..3fef7eb 100755 (executable)
--- a/opac/opac-messaging.pl
+++ b/opac/opac-messaging.pl
@@ -17,62 +17,93 @@
 # You should have received a copy of the GNU General Public License
 # along with Koha; if not, see <http://www.gnu.org/licenses>.
 
-use strict;
-use warnings;
+use Modern::Perl;
 
 use CGI qw ( -utf8 );
 
-use C4::Auth;    # checkauth, getborrowernumber.
+use C4::Auth qw( get_template_and_user );
 use C4::Context;
-use C4::Koha;
-use C4::Circulation;
-use C4::Output;
-use C4::Members;
+use C4::Output qw( output_html_with_http_headers );
 use C4::Members::Messaging;
-use C4::Branch;
 use C4::Form::MessagingPreferences;
+use Koha::Patrons;
 use Koha::SMS::Providers;
+use Koha::Token;
 
 my $query = CGI->new();
+my $opac_messaging = C4::Context->preference('EnhancedMessagingPreferencesOPAC');
+
+unless ( ( $opac_messaging or C4::Context->preference('TranslateNotices') ) and
+         C4::Context->preference('EnhancedMessagingPreferences') ) {
+    print $query->redirect("/cgi-bin/koha/errors/404.pl");
+    exit;
+}
 
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     {
         template_name   => 'opac-messaging.tt',
         query           => $query,
         type            => 'opac',
-        authnotrequired => 0,
-        debug           => 1,
     }
 );
 
-my $borrower = C4::Members::GetMember( borrowernumber => $borrowernumber );
-my $messaging_options = C4::Members::Messaging::GetMessagingOptions();
+my $patron = Koha::Patrons->find( $borrowernumber ); # FIXME and if borrowernumber is invalid?
+
+my $messaging_options;
+$messaging_options = C4::Members::Messaging::GetMessagingOptions() if $opac_messaging;
 
 if ( defined $query->param('modify') && $query->param('modify') eq 'yes' ) {
-    my $sms = $query->param('SMSnumber');
-    if ( defined $sms && ( $borrower->{'smsalertnumber'} // '' ) ne $sms ) {
-        ModMember(
-            borrowernumber  => $borrowernumber,
+    die "Wrong CSRF token" unless Koha::Token->new->check_csrf({
+        session_id => scalar $query->cookie('CGISESSID'),
+        token  => scalar $query->param('csrf_token'),
+    });
+
+    if( $opac_messaging ) {
+        my $sms = $query->param('SMSnumber');
+        my $sms_provider_id = $query->param('sms_provider_id');
+        $patron->set({
             smsalertnumber  => $sms,
-            sms_provider_id => $query->param('sms_provider_id'),
-        );
-        $borrower = C4::Members::GetMember( borrowernumber => $borrowernumber );
+            sms_provider_id => $sms_provider_id,
+        })->store;
+
+        C4::Form::MessagingPreferences::handle_form_action($query, { borrowernumber => $patron->borrowernumber }, $template);
     }
 
-    C4::Form::MessagingPreferences::handle_form_action($query, { borrowernumber => $borrowernumber }, $template);
+    if ( C4::Context->preference('TranslateNotices') ) {
+        $patron->set({ lang => scalar $query->param('lang') })->store;
+    }
 }
 
-C4::Form::MessagingPreferences::set_form_values({ borrowernumber     => $borrower->{'borrowernumber'} }, $template);
+C4::Form::MessagingPreferences::set_form_values({ borrowernumber     => $patron->borrowernumber }, $template) if $opac_messaging;
 
-$template->param( BORROWER_INFO         => $borrower,
-                  messagingview         => 1,
-                  SMSnumber => $borrower->{'smsalertnumber'},
-                  SMSSendDriver                =>  C4::Context->preference("SMSSendDriver"),
-                  TalkingTechItivaPhone        =>  C4::Context->preference("TalkingTechItivaPhoneNotification") );
+$template->param(
+    messagingview         => 1,
+    SMSnumber             => $patron->smsalertnumber, # FIXME This is already sent 2 lines above
+    SMSSendDriver         => C4::Context->preference("SMSSendDriver"),
+    TalkingTechItivaPhone => C4::Context->preference("TalkingTechItivaPhoneNotification"),
+);
+
+if( $opac_messaging && C4::Context->preference("SMSSendDriver") eq 'Email' ) {
+    my @providers = Koha::SMS::Providers->search( {}, { order_by => 'name' } )->as_list;
+    $template->param(
+        sms_providers => \@providers,
+        sms_provider_id => $patron->sms_provider_id,
+    );
+}
+
+my $new_session_id = $query->cookie('CGISESSID');
+$template->param(
+    csrf_token => Koha::Token->new->generate_csrf({
+            session_id => $new_session_id,
+        }),
+);
 
-if ( C4::Context->preference("SMSSendDriver") eq 'Email' ) {
-    my @providers = Koha::SMS::Providers->search();
-    $template->param( sms_providers => \@providers, sms_provider_id => $borrower->{'sms_provider_id'} );
+if ( C4::Context->preference('TranslateNotices') ) {
+    my $translated_languages = C4::Languages::getTranslatedLanguages( 'opac', C4::Context->preference('template') );
+    $template->param(
+        languages => $translated_languages,
+        patron_lang => $patron->lang,
+    );
 }
 
 output_html_with_http_headers $query, $cookie, $template->output, undef, { force_no_caching => 1 };