Bug 17502: Throw some exceptions in output_pref

[koha-ffzg.git] / Koha / DateUtils.pm

diff --git a/Koha/DateUtils.pm b/Koha/DateUtils.pm
index 0a5e15a..66ad264 100644 (file)
--- a/Koha/DateUtils.pm
+++ b/Koha/DateUtils.pm
@@ -16,14 +16,12 @@ package Koha::DateUtils;
 # Koha; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-use strict;
-use warnings;
-use 5.010;
+use Modern::Perl;
 use DateTime;
 use C4::Context;
+use Koha::Exceptions;
 
 use base 'Exporter';
-use version; our $VERSION = qv('1.0.0');
 
 our @EXPORT = (
     qw( dt_from_string output_pref format_sqldatetime )
@@ -66,6 +64,16 @@ sub dt_from_string {
     }
 
     my $regex;
+
+    # The fallback format is sql/iso
+    my $fallback_re = qr|
+        (?<year>\d{4})
+        -
+        (?<month>\d{2})
+        -
+        (?<day>\d{2})
+    |xms;
+
     if ( $date_format eq 'metric' ) {
         # metric format is "dd/mm/yyyy[ hh:mm:ss]"
         $regex = qr|
@@ -76,6 +84,16 @@ sub dt_from_string {
             (?<year>\d{4})
         |xms;
     }
+    elsif ( $date_format eq 'dmydot' ) {
+        # dmydot format is "dd.mm.yyyy[ hh:mm:ss]"
+        $regex = qr|
+            (?<day>\d{2})
+            .
+            (?<month>\d{2})
+            .
+            (?<year>\d{4})
+        |xms;
+    }
     elsif ( $date_format eq 'us' ) {
         # us format is "mm/dd/yyyy[ hh:mm:ss]"
         $regex = qr|
@@ -87,21 +105,15 @@ sub dt_from_string {
         |xms;
     }
     elsif ( $date_format eq 'iso' or $date_format eq 'sql' ) {
-        # iso format is yyyy-dd-mm[ hh:mm:ss]"
-        $regex = qr|
-            (?<year>\d{4})
-            -
-            (?<month>\d{2})
-            -
-            (?<day>\d{2})
-        |xms;
+        # iso or sql format are yyyy-dd-mm[ hh:mm:ss]"
+        $regex = $fallback_re;
     }
     else {
         die "Invalid dateformat parameter ($date_format)";
     }
 
     # Add the faculative time part [hh:mm[:ss]]
-    $regex .= qr|
+    my $time_re .= qr|
             (
                 \s*
                 (?<hour>\d{2})
@@ -113,6 +125,8 @@ sub dt_from_string {
                 )?
             )?
     |xms;
+    $regex .= $time_re;
+    $fallback_re .= $time_re;
 
     my %dt_params;
     if ( $date_string =~ $regex ) {
@@ -124,6 +138,15 @@ sub dt_from_string {
             minute => $+{minute},
             second => $+{second},
         );
+    } elsif ( $date_string =~ $fallback_re ) {
+        %dt_params = (
+            year   => $+{year},
+            month  => $+{month},
+            day    => $+{day},
+            hour   => $+{hour},
+            minute => $+{minute},
+            second => $+{second},
+        );
     }
     else {
         die "The given date ($date_string) does not match the date format ($date_format)";
@@ -174,9 +197,10 @@ should be returned without the time.
 
 sub output_pref {
     my $params = shift;
-    my ( $dt, $force_pref, $force_time, $dateonly, $as_due_date );
+    my ( $dt, $str, $force_pref, $force_time, $dateonly, $as_due_date );
     if ( ref $params eq 'HASH' ) {
         $dt         = $params->{dt};
+        $str        = $params->{str};
         $force_pref = $params->{dateformat};         # if testing we want to override Context
         $force_time = $params->{timeformat};
         $dateonly   = $params->{dateonly} || 0;    # if you don't want the hours and minutes
@@ -185,7 +209,16 @@ sub output_pref {
         $dt = $params;
     }
 
-    return unless defined $dt;
+    Koha::Exceptions::WrongParameter->throw( 'output_pref should not be called with both dt and str parameter' ) if $dt and $str;
+
+    if ( $str ) {
+        local $@;
+        $dt = eval { dt_from_string( $str ) };
+        Koha::Exceptions::WrongParameter->throw("Invalid date '$str' passed to output_pref" ) if $@;
+    }
+
+    return if !defined $dt; # NULL date
+    Koha::Exceptions::WrongParameter->throw( 'dt is not a datetime' )  if ref($dt) ne 'DateTime';
 
     # FIXME: see bug 13242 => no TZ for dates 'infinite'
     if ( $dt->ymd !~ /^9999/ ) {
@@ -209,6 +242,12 @@ sub output_pref {
           ? $dt->strftime("%d/%m/%Y")
           : $dt->strftime("%d/%m/%Y $time");
     }
+    elsif ( $pref =~ m/^dmydot/ ) {
+        $date = $dateonly
+          ? $dt->strftime("%d.%m.%Y")
+          : $dt->strftime("%d.%m.%Y $time");
+    }
+
     elsif ( $pref =~ m/^us/ ) {
         $date = $dateonly
           ? $dt->strftime("%m/%d/%Y")