From b0e23a16340428af2bae3330bddbf8988d01ce00 Mon Sep 17 00:00:00 2001
From: Florian Pritz <bluewind@xinu.at>
Date: Thu, 22 Sep 2011 22:09:03 +0200
Subject: [PATCH] apps/calendar: add delete button to edit event form

Signed-off-by: Florian Pritz <bluewind@xinu.at>
---
 apps/calendar/ajax/deleteevent.php         | 30 ++++++++++++++++++++++
 apps/calendar/js/calendar.js               | 13 ++++++++++
 apps/calendar/templates/part.editevent.php |  1 +
 3 files changed, 44 insertions(+)
 create mode 100644 apps/calendar/ajax/deleteevent.php

diff --git a/apps/calendar/ajax/deleteevent.php b/apps/calendar/ajax/deleteevent.php
new file mode 100644
index 0000000000..08a0e1a1e2
--- /dev/null
+++ b/apps/calendar/ajax/deleteevent.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright (c) 2011 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+require_once('../../../lib/base.php');
+
+$l10n = new OC_L10N('calendar');
+
+if(!OC_USER::isLoggedIn()) {
+	die('<script type="text/javascript">document.location = oc_webroot;</script>');
+}
+
+$id = $_POST['id'];
+$data = OC_Calendar_Object::find($id);
+if (!$data)
+{
+	echo json_encode(array('status'=>'error'));
+	exit;
+}
+$calendar = OC_Calendar_Calendar::findCalendar($data['calendarid']);
+if($calendar['userid'] != OC_User::getUser()){
+	echo json_encode(array('status'=>'error'));
+	exit;
+}
+$result = OC_Calendar_Object::delete($id);
+echo json_encode(array('status' => 'success'));
+?> 
diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js
index 1a8bc49957..61a1945c34 100644
--- a/apps/calendar/js/calendar.js
+++ b/apps/calendar/js/calendar.js
@@ -300,6 +300,19 @@ Calendar={
 				$('#dialog_holder').load(oc_webroot + '/apps/calendar/ajax/editeventform.php?id=' + id, Calendar.UI.startEventDialog);
 			}
 		},
+		submitDeleteEventForm:function(url){
+			var post = $( "#event_form" ).serialize();
+			$("#errorbox").html("");
+			$.post(url, post, function(data){
+					if(data.status == 'success'){
+						$('#event').dialog('destroy').remove();
+						Calendar.UI.loadEvents();
+					} else {
+						$("#errorbox").html("Deletion failed");
+					}
+
+			}, "json");
+		},
 		validateEventForm:function(url){
 			var post = $( "#event_form" ).serialize();
 			$("#errorbox").html("");
diff --git a/apps/calendar/templates/part.editevent.php b/apps/calendar/templates/part.editevent.php
index 859828216b..be637aeae5 100644
--- a/apps/calendar/templates/part.editevent.php
+++ b/apps/calendar/templates/part.editevent.php
@@ -5,6 +5,7 @@
 	<div style="width: 100%;text-align: center;color: #FF1D1D;" id="errorbox"></div>
 	<span id="actions">
 		<input type="button" class="submit" style="float: left;" value="<?php echo $l->t("Submit");?>" onclick="Calendar.UI.validateEventForm('ajax/editevent.php');">
+		<input type="button" class="submit" style="float: left;" name="delete" value="<?php echo $l->t("Delete");?>" onclick="Calendar.UI.submitDeleteEventForm('ajax/deleteevent.php');">
 	</span>
 	</form>
 </div>