Changeset 347

Timestamp:

11/14/06 05:58:56 (2 years ago)

Author:

ogawa

Message:

Now checks datetime format more strictly.

Files:

• WWW-CybozuOffice6-Calendar/trunk/lib/WWW/CybozuOffice6/Calendar.pm (modified) (3 diffs)

WWW-CybozuOffice6-Calendar/trunk/lib/WWW/CybozuOffice6/Calendar.pm

@@ -82 +82 @@
     my $start = $this->to_datetime($fields[3], $fields[5]);
     my $end   = $this->to_datetime($fields[4], $fields[6]);
-    if ($fields[5] =~ /^:$/) {          # full-day event
+    return unless $start && $end;
+    if ($fields[5] eq ':') {            # full-day event
         $start = $start->truncate(to => 'day');
         $end   = $end->add(days => 1)->truncate(to => 'day');
         $is_full_day = 1;
-    } elsif ($fields[6] =~ /^:$/) {     # event w/o endtime
+    } elsif ($fields[6] eq ':') {       # event w/o endtime
         $end   = $start->clone->add(minutes => 10);
     }
 
-    my($created) = $fields[1] =~ m/ts\.(\d+)/;
-    $created = DateTime->from_epoch(epoch => $created);
+    my($created) = $fields[1] =~ m/^ts\.(\d+)$/;
+    $created = DateTime->from_epoch(epoch => $created || 0);
 
     my $summary = $fields[11] || '';
@@ -126 +127 @@
         $item->{frequency} = $FREQUENCY{$freq};
         $item->{frequency_value} = $fields[8] || 0;
-        $item->{until} = $this->to_datetime($fields[4], '0:0:0')
-            unless $fields[4] =~ m!^//$!;
+        $item->{until} = $this->to_datetime($fields[4])
+            if $fields[4] ne '//';
     }
 
@@ -135 +136 @@
 sub to_datetime {
     my $this = shift;
-    my @d = split '/', $_[0] || '';
-    my @t = split ':', $_[1] || '';
-    my %args = (
-        year      => $d[0],
-        month     => $d[1],
-        day       => $d[2],
-        hour      => $t[0] || 0,
-        minute    => $t[1] || 0,
-        second    => $t[2] || 0,
-        time_zone => $this->{time_zone} || 'Asia/Tokyo',
-    );
-    if ($args{hour} >= 24) {
-        $args{hour}   = 23;
-        $args{minute} = 59;
-        $args{second} = 59;
-    }
+    my($ymd, $hms) = @_;
+
+    my %args;
+    return unless $ymd && $ymd =~ m!^(\d+)/(\d+)/(\d+)$!;
+    @args{qw(year month day)} = ($1, $2, $3);
+
+    $hms = '0:0:0' unless $hms && $hms ne ':';
+    return unless $hms =~ m!^(\d+):(\d+)(?:\:?(\d+)?)$!;
+    @args{qw(hour minute second)} = ($1, $2, $3 || 0);
+    @args{qw(hour minute second)} = (23, 59, 59) if $args{hour} > 23;
+
+    $args{time_zone} = $this->{time_zone} || 'Asia/Tokyo';
+
     DateTime->new(%args);
 }