From f4e5fab5a8388155194401ddc75e445111b83d42 Mon Sep 17 00:00:00 2001 From: Jan Schneider Date: Fri, 13 Mar 2009 17:21:49 +0100 Subject: [PATCH] Catch events not found, reduce indention. --- kronolith/ajax.php | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/kronolith/ajax.php b/kronolith/ajax.php index 0ca1c511d..320ca821b 100644 --- a/kronolith/ajax.php +++ b/kronolith/ajax.php @@ -98,14 +98,14 @@ case 'ListEvents': if (is_a($events, 'PEAR_Error')) { $notification->push($events, 'horde.error'); $result = true; - } else { - $result = new stdClass; - $result->cal = $cal; - $result->view = Util::getFormData('view'); - $result->sig = $start->dateString() . $end->dateString(); - if (count($events)) { - $result->events = $events; - } + break; + } + $result = new stdClass; + $result->cal = $cal; + $result->view = Util::getFormData('view'); + $result->sig = $start->dateString() . $end->dateString(); + if (count($events)) { + $result->events = $events; } break; @@ -118,10 +118,15 @@ case 'GetEvent': if (is_a($event, 'PEAR_Error')) { $notification->push($event, 'horde.error'); $result = true; - } else { - $result = new stdClass; - $result->event = $event; + break; + } + if (!$event) { + $notification->push(_("The requested event was not found."), 'horde.error'); + $result = true; + break; } + $result = new stdClass; + $result->event = $event; break; case 'SaveCalPref': -- 2.11.0