update RTx::Calendar from 0.14 to 0.17 (upstream fix for Digest::SHA1 -> Digest:...

[freeside.git] / rt / share / html / NoAuth / Calendar / dhandler

diff --git a/rt/share/html/NoAuth/Calendar/dhandler b/rt/share/html/NoAuth/Calendar/dhandler
index 4b4aa63..7c91bb5 100644 (file)
--- a/rt/share/html/NoAuth/Calendar/dhandler
+++ b/rt/share/html/NoAuth/Calendar/dhandler
@@ -3,7 +3,6 @@
 use Data::ICal;
 use Data::ICal::Entry::Todo;
 use Data::ICal::Entry::Event;
-use Date::ICal;
 
 $RT::ICalTicketType   ||= "Data::ICal::Entry::Todo";
 $RT::ICalReminderType ||= "Data::ICal::Entry::Event";
@@ -101,20 +100,21 @@ my $cal = $calendar->as_string;
 $r->content_type('text/calendar;charset=utf-8');
 $m->clear_buffer();
 $m->out($cal);
-$m->abort; 
+$m->abort;
 
 sub add_event {
     my ($Reminder, $uid) = @_;
 
     return unless defined $Reminder->RefersTo->First;
     my $Ticket  = $Reminder->RefersTo->First->TargetObj;
-    
+
+    my $now = RT::Date->new( $session{'CurrentUser'} ); $now->SetToNow;
     my %event = (
        summary => $Reminder->Subject ? $Reminder->Subject : '',
        url        => "${RT::WebURL}/Ticket/Display.html?id=" . $Ticket->id,
-       uid        => Date::ICal->new( epoch => time() )->ical() . "-" . $Reminder->Id . "@" . $uid,
+       uid        => $now->iCal . "-" . $Reminder->Id . "@" . $uid,
        categories => $Ticket->QueueObj->Name,
-       dtstart     => Date::ICal->new( epoch => $Reminder->DueObj->Unix )->ical,
+       dtstart     => $Reminder->DueObj->iCal,
     );
 
     my $event = $RT::ICalReminderType->new();
@@ -126,15 +126,16 @@ sub add_event {
 sub add_todo {
     my ($Ticket, $uid) = @_;
 
+    my $now = RT::Date->new( $session{'CurrentUser'} ); $now->SetToNow;
     my %vtodo = (
        summary    => $Ticket->Subject ? $Ticket->Subject : '',
-       dtstart    => Date::ICal->new( epoch => $Ticket->CreatedObj->Unix )->ical,
+       dtstart    => $Ticket->CreatedObj->iCal,
        url        => "${RT::WebURL}/Ticket/Display.html?id=" . $Ticket->id,
-       uid        => Date::ICal->new( epoch => time() )->ical() . "-" . $Ticket->Id . "@" . $uid,
+       uid        => $now->iCal . "-" . $Ticket->Id . "@" . $uid,
        categories => $Ticket->QueueObj->Name,
     );
 
-    $vtodo{due} = Date::ICal->new( epoch => $Ticket->DueObj->Unix )->ical,
+    $vtodo{due} = $Ticket->DueObj->iCal,
         if $Ticket->DueObj;
 
     if ($Ticket->OwnerObj->Id != $RT::Nobody->Id and $Ticket->OwnerObj->EmailAddress) {
@@ -142,7 +143,7 @@ sub add_todo {
        $vtodo{attendee} = "MAILTO:" . $Ticket->OwnerObj->EmailAddress;
     } elsif ($Ticket->QueueObj->CommentAddress) {
        $vtodo{organizer} = "MAILTO:" . $Ticket->QueueObj->CommentAddress;
-       $vtodo{attendee} = "MAILTO:" . $Ticket->QueueObj->CommentAddress; 
+       $vtodo{attendee} = "MAILTO:" . $Ticket->QueueObj->CommentAddress;
     }
 
     $vtodo{priority} = $Ticket->Priority