Small fixes to iCal import/export

plugins/calendar/calendar.php

@@ -927,6 +927,8 @@ class calendar extends rcube_plugin
     
     if ($calendars[$calid]) {
       $calname = $calendars[$calid]['name'] ? $calendars[$calid]['name'] : $calid;
+      $calname = preg_replace('/[^a-z0-9_.-]/i', '', html_entity_decode($calname));  // to 7bit ascii
+      if (empty($calname)) $calname = $calid;
       $events = $this->driver->load_events($start, $end, null, $calid, 0);
     }
     else

plugins/calendar/lib/calendar_ical.php

@@ -430,6 +430,9 @@ class calendar_ical
 
   private function format_datetime($attr, $dt, $dateonly = false, $utc = false)
   {
+    if (is_numeric($dt))
+        $dt = new DateTime('@'.$dt);
+
     if ($utc)
       $dt->setTimezone(new DateTimeZone('UTC'));