Merge remote-tracking branch 'origin/new/bug_6634'

[koha.git] / serials / checkexpiration.pl

diff --git a/serials/checkexpiration.pl b/serials/checkexpiration.pl
old mode 100644 (file)
new mode 100755 (executable)
index 458beef..bf4b6e9
--- a/serials/checkexpiration.pl
+++ b/serials/checkexpiration.pl
@@ -12,11 +12,10 @@
 # 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.
 
-# $Id$
 
 =head1 NAME
 
@@ -44,12 +43,13 @@ The date to filter on.
 =cut
 
 use strict;
+use warnings;
 use CGI;
 use C4::Auth;
 use C4::Serials; # GetExpirationDate
 use C4::Output;
-use C4::Interface::CGI::Output;
 use C4::Context;
+use C4::Dates qw/format_date format_date_in_iso/;
 use Date::Calc qw/Today Date_to_Days/;
 
 my $query = new CGI;
@@ -60,18 +60,16 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user (
         query           => $query,
         type            => "intranet",
         authnotrequired => 0,
-        flagsrequired   => { serials => 1 },
+        flagsrequired   => { serials => 'check_expiration' },
         debug           => 1,
     }
 );
 
 my $title = $query->param('title');
 my $issn  = $query->param('issn');
-my $date  = $query->param('date');
-my $today = join "-",&Today;
+my $date  = format_date_in_iso($query->param('date'));
 
 if ($date) {
-
     my @subscriptions = GetSubscriptions( $title, $issn );
     my @subscriptions_loop;
 
@@ -80,21 +78,25 @@ if ($date) {
         my $expirationdate = GetExpirationDate($subscriptionid);
 
         $subscription->{expirationdate} = $expirationdate;
-        next if $expirationdate !~ /\d{4}-\d{2}-\d{2}/; # next if not in good format.
+        next if $expirationdate !~ /\d{4}-\d{2}-\d{2}/; # next if not in ISO format.
         if ( Date_to_Days(split "-",$expirationdate) < Date_to_Days(split "-",$date) &&
-             Date_to_Days(split "-",$expirationdate) > Date_to_Days(split "-",$today) ) {
-            push @subscriptions_loop,$subscription;             
+                        Date_to_Days(split "-",$expirationdate) > Date_to_Days(&Today) ) {
+            $subscription->{expirationdate}=format_date($subscription->{expirationdate});
+            push @subscriptions_loop,$subscription;
         }
     }
-    
+
     $template->param (
         title           => $title,
         issn            => $issn,
         numsubscription => scalar @subscriptions_loop,
-        date => $date,
+        date => format_date($date),
         subscriptions_loop => \@subscriptions_loop,
         "BiblioDefaultView".C4::Context->preference("BiblioDefaultView") => 1,
     );
 }
-
+$template->param (
+    DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
+    (uc(C4::Context->preference("marcflavour"))) => 1
+);
 output_html_with_http_headers $query, $cookie, $template->output;