From: Bart Visscher Date: Sun, 18 Sep 2011 15:12:31 +0000 (+0200) Subject: Fix event error/success json message X-Git-Tag: v3.0~178 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0660133d2edc915a6b7c8ce9a05fe8247b5dd4ad;p=nextcloud-server.git Fix event error/success json message --- diff --git a/apps/calendar/ajax/editevent.php b/apps/calendar/ajax/editevent.php index e4e6c4548c7..c78e494356e 100644 --- a/apps/calendar/ajax/editevent.php +++ b/apps/calendar/ajax/editevent.php @@ -33,12 +33,12 @@ if($errarr){ $data = OC_Calendar_Object::find($id); if (!$data) { - echo json_encode(array("error"=>"true")); + echo json_encode(array('status'=>'error')); exit; } $calendar = OC_Calendar_Calendar::findCalendar($data['calendarid']); if($calendar['userid'] != OC_User::getUser()){ - echo json_encode(array("error"=>"true")); + echo json_encode(array('status'=>'error')); exit; } $vcalendar = Sabre_VObject_Reader::read($data['calendardata']); diff --git a/apps/calendar/ajax/newevent.php b/apps/calendar/ajax/newevent.php index fb3745d0525..3ae1df66aca 100644 --- a/apps/calendar/ajax/newevent.php +++ b/apps/calendar/ajax/newevent.php @@ -29,13 +29,13 @@ if(!OC_USER::isLoggedIn()) { $errarr = OC_Calendar_Object::validateRequest($_POST); if($errarr){ //show validate errors - $errarr["error"] = "true"; + $errarr['status'] = 'error'; echo json_encode($errarr); exit; }else{ $cal = $_POST['calendar']; $vcalendar = OC_Calendar_Object::createVCalendarFromRequest($_POST); $result = OC_Calendar_Object::add($cal, $vcalendar->serialize()); - echo json_encode(array("success"=>"true")); + echo json_encode(array('status'=>'success')); } ?>