X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=serials%2Fsubscription-renew.pl;h=48861bcae47419c82de73c3dc90fc22ed3733e85;hb=c11f8cb622dbf464adbc484ea9e174218382cd7c;hp=10c1205d63a27850801232eb396b720c91a6db7a;hpb=4bf76c2d77cb32dd7147b11334eb17aa959955ba;p=koha.git

diff --git a/serials/subscription-renew.pl b/serials/subscription-renew.pl
index 10c1205d63..48861bcae4 100755
--- a/serials/subscription-renew.pl
+++ b/serials/subscription-renew.pl
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# WARNING: 4-character tab stops here
 
 # Copyright 2000-2002 Katipo Communications
 #
@@ -14,9 +13,9 @@
 # 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, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 
 =head1 NAME
@@ -45,8 +44,10 @@ Id of the subscription this script has to renew
 =cut
 
 use strict;
+use warnings;
 
 use CGI;
+use Carp;
 use C4::Koha;
 use C4::Auth;
 use C4::Dates qw/format_date/;
@@ -59,7 +60,7 @@ my $query = new CGI;
 my $dbh   = C4::Context->dbh;
 
 my $mode           = $query->param('mode');
-my $op             = $query->param('op');
+my $op             = $query->param('op') || q{};
 my $subscriptionid = $query->param('subscriptionid');
 my $done = 0;    # for after form has been submitted
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
@@ -68,29 +69,28 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         query           => $query,
         type            => "intranet",
         authnotrequired => 0,
-        flagsrequired   => { serials => 1 },
+        flagsrequired   => { serials => 'renew_subscription' },
         debug           => 1,
     }
 );
-
 if ( $op eq "renew" ) {
     ReNewSubscription(
         $subscriptionid,             $loggedinuser,
-        $query->param('startdate'),  $query->param('numberlength'),
+        C4::Dates->new($query->param('startdate'))->output('iso'),  $query->param('numberlength'),
         $query->param('weeklength'), $query->param('monthlength'),
         $query->param('note')
-    );  
+    );
 }
 
 my $subscription = GetSubscription($subscriptionid);
 if ($subscription->{'cannotedit'}){
-  warn "Attempt to renew subscription $subscriptionid by ".C4::Context->userenv->{'id'}." not allowed";
+  carp "Attempt to renew subscription $subscriptionid by ".C4::Context->userenv->{'id'}." not allowed";
   print $query->redirect("/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=$subscriptionid");
-}  
+}
 
 $template->param(
     startdate => format_date(
-             GetExpirationDate($subscriptionid)
+             $subscription->{enddate}
           || POSIX::strftime( "%Y-%m-%d", localtime )
     ),
     numberlength   => $subscription->{numberlength},
@@ -99,12 +99,8 @@ $template->param(
     subscriptionid => $subscriptionid,
     bibliotitle    => $subscription->{bibliotitle},
     $op            => 1,
-    popup          => ($query->param('mode')eq "popup"),  
+    popup          => ($query->param('mode')eq "popup"),
 );
 
 # Print the page
 output_html_with_http_headers $query, $cookie, $template->output;
-
-# Local Variables:
-# tab-width: 4
-# End: