X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=serials%2Fsubscription-renew.pl;h=bbbc8e501d6ad98942a5a309ae2fe9669c058507;hb=a28334aeceba9ea8fcfcd301c4c01f473110bbe3;hp=eede24bed09fefb2f00da7962f607c70c6b895d5;hpb=f36c042b80f053b7f75dfc1aff12a312e5a59134;p=koha.git

diff --git a/serials/subscription-renew.pl b/serials/subscription-renew.pl
index eede24bed0..bbbc8e501d 100755
--- a/serials/subscription-renew.pl
+++ b/serials/subscription-renew.pl
@@ -4,18 +4,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., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 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 NAME
@@ -46,37 +46,38 @@ Id of the subscription this script has to renew
 use strict;
 use warnings;
 
-use CGI;
+use CGI qw ( -utf8 );
 use Carp;
 use C4::Koha;
 use C4::Auth;
-use C4::Dates qw/format_date/;
 use C4::Context;
 use C4::Auth;
 use C4::Output;
 use C4::Serials;
+use Koha::DateUtils;
 
 my $query = new CGI;
 my $dbh   = C4::Context->dbh;
 
-my $mode           = $query->param('mode');
-my $op             = $query->param('op') || q{};
+my $mode           = $query->param('mode') || q{};
+my $op             = $query->param('op') || 'display';
 my $subscriptionid = $query->param('subscriptionid');
 my $done = 0;    # for after form has been submitted
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "serials/subscription-renew.tmpl",
+        template_name   => "serials/subscription-renew.tt",
         query           => $query,
         type            => "intranet",
         authnotrequired => 0,
-        flagsrequired   => { serials => 1 },
+        flagsrequired   => { serials => 'renew_subscription' },
         debug           => 1,
     }
 );
 if ( $op eq "renew" ) {
+    my $startdate = output_pref( { str => scalar $query->param('startdate'), dateonly => 1, dateformat => 'iso' } );
     ReNewSubscription(
-        $subscriptionid,             $loggedinuser,
-        C4::Dates->new($query->param('startdate'))->output('iso'),  $query->param('numberlength'),
+        $subscriptionid, $loggedinuser,
+        $startdate, $query->param('numberlength'),
         $query->param('weeklength'), $query->param('monthlength'),
         $query->param('note')
     );
@@ -88,18 +89,18 @@ if ($subscription->{'cannotedit'}){
   print $query->redirect("/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=$subscriptionid");
 }
 
+my $newstartdate = output_pref( { str => $subscription->{enddate}, dateonly => 1 } )
+    or output_pref( { dt => dt_from_string, dateonly => 1 } );
+
 $template->param(
-    startdate => format_date(
-             $subscription->{enddate}
-          || POSIX::strftime( "%Y-%m-%d", localtime )
-    ),
+    startdate      => $newstartdate,
     numberlength   => $subscription->{numberlength},
     weeklength     => $subscription->{weeklength},
     monthlength    => $subscription->{monthlength},
     subscriptionid => $subscriptionid,
     bibliotitle    => $subscription->{bibliotitle},
     $op            => 1,
-    popup          => ($query->param('mode')eq "popup"),
+    popup          => ($mode eq 'popup'),
 );
 
 # Print the page