Merge pull request #17 from bwein-net/feature/icalcreator-update

Support kigkonsult/icalcreator 2.28
Craffft · May 19, 2020 · 9786bda · 9786bda
2 parents fd16e30 + 506801b
commit 9786bda
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -26,7 +26,7 @@
   "require": {
     "php": ">=5.6.0",
     "contao/core-bundle": ">=4.2,<5.0",
-    "kigkonsult/icalcreator": "2.27.*"
+    "kigkonsult/icalcreator": "2.28.*"
   },
   "require-dev": {
     "contao/manager-plugin": "^2.0"

diff --git a/src/Resources/contao/classes/CalendarImport.php b/src/Resources/contao/classes/CalendarImport.php
@@ -12,6 +12,7 @@
 
 namespace Contao;
 
+use Exception;
 use Kigkonsult\Icalcreator\Vcalendar;
 
 /**
@@ -127,7 +128,12 @@ public function importFromWebICS($pid, $url, $startDate, $endDate, $timezone, $p
         }
         $this->cal->setConfig('directory', TL_ROOT . '/' . dirname($filename));
         $this->cal->setConfig('filename', basename($filename));
-        $this->cal->parse();
+        try {
+            $this->cal->parse();
+        } catch (Exception $e) {
+            \System::log($e->getMessage(), __METHOD__, TL_ERROR);
+            return;
+        }
         $tz = $this->cal->getProperty('X-WR-TIMEZONE');
 
         if (!is_array($tz) || strlen($tz[1]) == 0) {
@@ -676,7 +682,12 @@ protected function importFromICSFile(
         /* start parse of local file */
         $this->cal->setConfig('directory', TL_ROOT . '/' . dirname($filename));
         $this->cal->setConfig('filename', basename($filename));
-        $this->cal->parse();
+        try {
+            $this->cal->parse();
+        } catch (Exception $e) {
+            \Message::addError($e->getMessage());
+            $this->redirect(str_replace('&key=import', '', \Environment::get('request')));
+        }
         $tz = $this->cal->getProperty('X-WR-TIMEZONE');
 
         if ($timeshift == 0) {