Prevent fatal error if calendar could not be found.

horde · Apr 11, 2015 · e98242b · e98242b
1 parent 35b99b1
commit e98242b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/kronolith/calendars/edit.php b/kronolith/calendars/edit.php
@@ -36,7 +36,13 @@
     $notification->push(_("You are not allowed to see this calendar."), 'horde.error');
     $default->redirect();
 }
-$form = new Kronolith_Form_EditCalendar($vars, $calendar);
+
+try {
+    $form = new Kronolith_Form_EditCalendar($vars, $calendar);
+} catch (Horde_Exception_NotFound $e) {
+    $notification->push(_("The calendar could not be found."), 'horde.error');
+    $default->redirect();
+}
 
 // Execute if the form is valid.
 if ($owner && $form->validate($vars)) {

diff --git a/kronolith/lib/Form/EditCalendar.php b/kronolith/lib/Form/EditCalendar.php
@@ -79,6 +79,11 @@ public function __construct($vars, $calendar)
             Kronolith::ALL_CALENDARS,
             $calendar->getName()
         );
+
+        if (!$calendarObject) {
+            throw new Horde_Exception_NotFound();
+        }
+
         $url = $registry->get('webroot', 'horde');
         if (isset($conf['urls']['pretty']) &&
             $conf['urls']['pretty'] == 'rewrite') {