X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=serials%2Frouting.pl;h=2e3122d3b5b246b547a5fef99360863754b3f768;hb=b128878294cc76ce4a45f62b1b48ef0c19247ef2;hp=f093da708ecf85fce36d417867a2ba6f7fa8398f;hpb=6f6bfb8aff59ae10b4bf7e8d4bdcb31c5b269458;p=koha-ffzg.git

diff --git a/serials/routing.pl b/serials/routing.pl
index f093da708e..2e3122d3b5 100755
--- a/serials/routing.pl
+++ b/serials/routing.pl
@@ -2,18 +2,18 @@
 
 # This file is part of Koha
 #
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
 #
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along
-# with Koha; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
 
 
 =head1 Routing.pl
@@ -25,23 +25,19 @@ printed out
 
 =cut
 
-use strict;
-use warnings;
-use CGI;
+use Modern::Perl;
+use CGI qw ( -utf8 );
 use C4::Koha;
-use C4::Auth;
-use C4::Dates;
-use C4::Output;
-use C4::Acquisition;
-use C4::Output;
+use C4::Auth qw( get_template_and_user );
+use C4::Output qw( output_and_exit output_html_with_http_headers );
 use C4::Context;
 
-use C4::Members;
-use C4::Serials;
+use C4::Serials qw( GetSubscription delroutingmember addroutingmember getroutinglist GetSerials GetLatestSerials check_routing );
+use Koha::Patrons;
 
 use URI::Escape;
 
-my $query = new CGI;
+my $query = CGI->new;
 my $subscriptionid = $query->param('subscriptionid');
 my $serialseq = $query->param('serialseq');
 my $routingid = $query->param('routingid');
@@ -52,6 +48,20 @@ my $date_selected = $query->param('date_selected');
 $date_selected ||= q{};
 my $dbh = C4::Context->dbh;
 
+my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+    {
+        template_name   => 'serials/routing.tt',
+        query           => $query,
+        type            => 'intranet',
+        flagsrequired   => { serials => 'routing' },
+    }
+);
+
+my $subs = GetSubscription($subscriptionid);
+
+output_and_exit( $query, $cookie, $template, 'unknown_subscription')
+    unless $subs;
+
 if($op eq 'delete'){
     delroutingmember($routingid,$subscriptionid);
 }
@@ -62,19 +72,19 @@ if($op eq 'add'){
 if($op eq 'save'){
     my $sth = $dbh->prepare('UPDATE serial SET routingnotes = ? WHERE subscriptionid = ?');
     $sth->execute($notes,$subscriptionid);
-    my $urldate = URI::Escape::uri_escape($date_selected);
+    my $urldate = URI::Escape::uri_escape_utf8($date_selected);
     print $query->redirect("routing-preview.pl?subscriptionid=$subscriptionid&issue=$urldate");
 }
 
 my @routinglist = getroutinglist($subscriptionid);
-my $subs = GetSubscription($subscriptionid);
+
 my ($count,@serials) = GetSerials($subscriptionid);
 my $serialdates = GetLatestSerials($subscriptionid,$count);
 
 my $dates = [];
 foreach my $dateseq (@{$serialdates}) {
     my $d = {};
-    $d->{planneddate} = $dateseq->{planneddate};
+    $d->{publisheddate} = $dateseq->{publisheddate};
     $d->{serialseq} = $dateseq->{serialseq};
     $d->{serialid} = $dateseq->{serialid};
     if($date_selected eq $dateseq->{serialid}){
@@ -85,18 +95,9 @@ foreach my $dateseq (@{$serialdates}) {
     push @{$dates}, $d;
 }
 
-my ($template, $loggedinuser, $cookie)
-= get_template_and_user({template_name => 'serials/routing.tmpl',
-				query => $query,
-				type => 'intranet',
-				authnotrequired => 0,
-				flagsrequired => {serials => 'routing'},
-				debug => 1,
-				});
-
 my $member_loop = [];
 for my $routing ( @routinglist ) {
-    my $member=GetMember('borrowernumber' => $routing->{borrowernumber});
+    my $member = Koha::Patrons->find( $routing->{borrowernumber} )->unblessed;
     $member->{location} = $member->{branchcode};
     if ($member->{firstname} ) {
         $member->{name} = $member->{firstname} . q| |;
@@ -121,6 +122,8 @@ $template->param(
     dates => $dates,
     routingnotes => $serials[0]->{'routingnotes'},
     hasRouting => check_routing($subscriptionid),
+    (uc(C4::Context->preference("marcflavour"))) => 1
+
     );
 
 output_html_with_http_headers $query, $cookie, $template->output;