+
+
+
+
+ $calendar->{'_obj_dtstart_local_time'}->{'month'}
+
+
+ $calendar->{'_obj_dtstart_local_time'}->{'day'}
+
+
+ $calendar->{'_obj_dtstart_local_time'}->{'week'}
+
+ |
+
+
+
+ |
+ $title
+ |
+
+
+ |
+ $text{'view_ical_when'}
+ |
+ $calendar->{'dtwhen_local'} |
+
+
+ |
+ $text{'view_ical_where'}
+ |
+ $calendar->{'location'} |
+
+
+ |
+ $text{'view_ical_who'}
+ |
+ $who |
+
+
+
+
+
+
+ |
+ $text{'view_ical_orginizertime'}
+ |
+ $calendar->{'dtwhen'} |
+
+
+ |
+ $text{'view_ical_orginizername'}
+ |
+ $calendar->{'organizer_name'} |
+
+
+ |
+ $text{'view_ical_orginizeremail'}
+ |
+ $calendar->{'organizer_email'} |
+
+
+ |
+ $text{'view_ical_attendees'}
+ |
+ @{[join('', map {
+ " $_->{'name'}
$_->{'email'} "
+ } @attendees)]} |
+
+
+ |
+ $text{'view_ical_desc'}
+ |
+ @{[join('
',
+ @{$calendar->{'description'}})]} |
+
+
+
+ |
+
+
+HTML
+ # Text version
+ my %textical = (
+ 'view_ical' => $title,
+ 'view_ical_when' => $calendar->{'dtwhen_local'},
+ 'view_ical_where' => $calendar->{'location'},
+ 'view_ical_who' => $who
+ );
+ my $max_label_length = 0;
+ foreach my $key (sort keys %textical) {
+ my $label_length = length($text{$key});
+ if ($label_length > $max_label_length) {
+ $max_label_length = $label_length;
+ }
+ }
+ $calendars->{'text'} = "=" x 79 . "\n";
+ foreach my $key (sort keys %textical) {
+ my $label = $text{$key};
+ my $value = $textical{$key};
+ my $spaces .= " " x ($max_label_length - length($label));
+ $calendars->{'text'} .= "$label$spaces : $value\n";
+ }
+ $calendars->{'text'} .= "=" x 79 . "\n";
+ }
+ }
+return $calendars;
+}
+
1;
diff --git a/mailboxes/lang/en b/mailboxes/lang/en
index cd387a07d..c2ebb6f34 100644
--- a/mailboxes/lang/en
+++ b/mailboxes/lang/en
@@ -154,6 +154,15 @@ view_sub=Attached Email
view_sub2=Attached email from $1
view_egone=This message no longer exists
view_eugone=This user does not exist
+view_ical=Event
+view_ical_when=When
+view_ical_where=Where
+view_ical_who=Who
+view_ical_orginizertime=Organizer time
+view_ical_orginizername=Organizer name
+view_ical_orginizeremail=Organizer email
+view_ical_attendees=Attendees details
+view_ical_desc=Event description
view_gnupg=GnuPG signature verification
view_gnupg_0=Signature by $1 is valid.
diff --git a/mailboxes/mailboxes-lib.pl b/mailboxes/mailboxes-lib.pl
index c877472d5..00f560ec4 100755
--- a/mailboxes/mailboxes-lib.pl
+++ b/mailboxes/mailboxes-lib.pl
@@ -1286,81 +1286,4 @@ if (!glob("\Q$rv\E.*")) {
return $rv;
}
-# parse_calendar_file(calendar-file)
-# Parses an iCalendar file and returns a list of events
-sub parse_calendar_file
-{
-my ($calendar_file) = @_;
-my (@events, %event);
-eval "use DateTime; use DateTime::TimeZone;";
-return \@events if ($@);
-my $adjust_time_with_timezone = sub {
- my ($time, $tzid) = @_;
- my $dt = DateTime->new(
- year => substr($time, 0, 4),
- month => substr($time, 4, 2),
- day => substr($time, 6, 2),
- hour => substr($time, 9, 2),
- minute => substr($time, 11, 2),
- second => substr($time, 13, 2),
- time_zone => $tzid);
- my $local_dt = $dt->clone->set_time_zone('local');
- return {
- formatted => $local_dt->strftime('%Y-%m-%d %H:%M:%S'),
- timestamp => $local_dt->epoch
- };
-};
-my $ics_file_lines = &read_file_lines($calendar_file, 1);
-foreach (@$ics_file_lines) {
- if (/^BEGIN:VEVENT/) {
- # Start a new event
- %event = ();
- }
- elsif (/^END:VEVENT/) {
- # Convert times using the timezone
- if ($event{'dtstart'} && $event{'tzid'}) {
- my $adjusted_start = $adjust_time_with_timezone->($event{'dtstart'}, $event{'tzid'});
- $event{'dtstart_local_timestamp'} = $adjusted_start->{'timestamp'};
- $event{'dtstart_local_date'} = &make_date($event{'dtstart_local_timestamp'});
- }
- if ($event{'dtend'} && $event{'tzid'}) {
- my $adjusted_end = $adjust_time_with_timezone->($event{'dtend'}, $event{'tzid'});
- $event{'dtend_local_timestamp'} = $adjusted_end->{'timestamp'};
- $event{'dtend_local_date'} = &make_date($event{'dtend_local_timestamp'});
- }
- # Local timezone
- $event{'tzid_local'} = DateTime::TimeZone->new(name => 'local')->name;
- # Add the event to the list
- push(@events, { %event });
- }
- # Parse fields
- elsif (/^SUMMARY:(.*)$/) {
- $event{'summary'} = $1;
- }
- elsif (/^DTSTART;TZID=(.*?):(.*)$/) {
- $event{'tzid'} = $1;
- $event{'dtstart'} = $2;
- }
- elsif (/^DTEND;TZID=(.*?):(.*)$/) {
- $event{'tzid'} = $1;
- $event{'dtend'} = $2;
- }
- elsif (/^DESCRIPTION:(.*)$/) {
- $event{'description'} = $1;
- }
- elsif (/^LOCATION:(.*)$/) {
- $event{'location'} = $1;
- }
- elsif (/^ATTENDEE.*:(.*)$/) {
- push @{$event{'attendees'}}, $1;
- }
- elsif (/^ORGANIZER;CN=(.*?):mailto:(.*)$/) {
- $event{'organizer_name'} = $1;
- $event{'organizer_email'} = $2;
- }
- }
-return \@events;
-}
-
1;
-
diff --git a/mailboxes/view_mail.cgi b/mailboxes/view_mail.cgi
index 199a4df15..6197226c7 100755
--- a/mailboxes/view_mail.cgi
+++ b/mailboxes/view_mail.cgi
@@ -89,6 +89,16 @@ foreach $s (@sub) {
@attach = grep { $_ ne $body && $_ ne $dstatus } @attach;
@attach = grep { !$_->{'attach'} } @attach;
+# Calendar attachments
+my @calendars;
+eval {
+foreach my $i (grep { $_->{'data'} }
+ grep { $_->{'type'} =~ /^text\/calendar/ } @attach) {
+ my $calendars = &parse_calendar_file($i->{'data'});
+ push(@calendars, @{$calendars});
+ }};
+
+# Mail buttons
if ($config{'top_buttons'} == 2 && &editable_mail($mail)) {
&show_mail_buttons(1, scalar(@sub));
print "\n";
@@ -138,11 +148,15 @@ else {
print &ui_table_end();
# Show body attachment, with properly linked URLs
-@bodyright = ( );
+my $bodycontents;
+my @bodyright = ( );
+my $calendars = &get_calendar_data(\@calendars);
if ($body && $body->{'data'} =~ /\S/) {
if ($body eq $textbody) {
# Show plain text
$bodycontents = "";
+ $bodycontents .= $calendars->{'text'}
+ if ($calendars->{'text'});
foreach $l (&wrap_lines(&eucconv($body->{'data'}),
$config{'wrap_width'})) {
$bodycontents .= &link_urls_and_escape($l,
@@ -156,7 +170,9 @@ if ($body && $body->{'data'} =~ /\S/) {
}
elsif ($body eq $htmlbody) {
# Attempt to show HTML
- $bodycontents = $body->{'data'};
+ $bodycontents = $calendars->{'html'}
+ if ($calendars->{'html'});
+ $bodycontents .= $body->{'data'};
my @imageurls;
my $image_mode = int(defined($in{'images'}) ? $in{'images'} : $config{'view_images'});
$bodycontents = &disable_html_images($bodycontents, $image_mode, \@imageurls);