Fix throwing exceptions from remote calendars.

If the server didn't respond with a 200 code, we used an incorrect exception, so it wasn't properly catched where necessary. We used an untranslated, not very helpful message too. Use a translatable error message an include the remote URL instead.
horde · Jan 18, 2017 · c7e4c52 · c7e4c52
1 parent 7ac599b
commit c7e4c52
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/kronolith/lib/Driver/Ical.php b/kronolith/lib/Driver/Ical.php
@@ -636,10 +636,11 @@ public function getRemoteCalendar($cache = true)
             }
         }
 
+        $error = sprintf(_("Could not open %s"), $url);
         try {
             $response = $this->_getClient($url)->request('GET');
             if ($response['statusCode'] != 200) {
-                throw new Horde_Dav_Exception('Request Failed', $response['statusCode']);
+                throw new Kronolith_Exception($error, $response['statusCode']);
             }
         } catch (\Sabre\HTTP\ClientException $e) {
             throw new Kronolith_Exception($e);
@@ -649,10 +650,7 @@ public function getRemoteCalendar($cache = true)
                         $url, $e->getHttpStatus()),
                 'INFO'
             );
-            $error = sprintf(
-                _("Could not open %s: %s"),
-                $url, $e->getResponse()->getStatusText()
-            );
+            $error .= ': ' . $e->getResponse()->getStatusText();
             if ($cache) {
                 $cacheOb->set($signature, serialize($error));
             }