Bug 5549 : Format Date in ILSDI::Services to include hhmm

[koha.git] / serials / checkexpiration.pl

diff --git a/serials/checkexpiration.pl b/serials/checkexpiration.pl
index 7ff00c1..02a4fbc 100755 (executable)
--- 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::Context;
-use C4::Date;
+use C4::Dates qw/format_date format_date_in_iso/;
 use Date::Calc qw/Today Date_to_Days/;
 
 my $query = new CGI;
@@ -60,7 +60,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user (
         query           => $query,
         type            => "intranet",
         authnotrequired => 0,
-        flagsrequired   => { serials => 1 },
+        flagsrequired   => { serials => 'check_expiration' },
         debug           => 1,
     }
 );
@@ -68,10 +68,8 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user (
 my $title = $query->param('title');
 my $issn  = $query->param('issn');
 my $date  = format_date_in_iso($query->param('date'));
-my $today = join "-",&Today;
 
 if ($date) {
-
     my @subscriptions = GetSubscriptions( $title, $issn );
     my @subscriptions_loop;
 
@@ -80,14 +78,14 @@ 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) ) {
+                        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,
@@ -98,6 +96,6 @@ if ($date) {
     );
 }
 $template->param (
-    DHTMLcalendar_dateformat => get_date_format_string_for_DHTMLcalendar(),
+    DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
 );
 output_html_with_http_headers $query, $cookie, $template->output;