From: Michael Vogel <icarus@dabo.de>
Date: Fri, 16 Oct 2015 23:25:25 +0000 (+0200)
Subject: Delete event when the item is deleted
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=7f9711ffe631c4bca7abb6b5cda6365660e2b386;p=friendica.git

Delete event when the item is deleted
---

diff --git a/include/event.php b/include/event.php
index a87dba64fb..d56388a77a 100644
--- a/include/event.php
+++ b/include/event.php
@@ -204,7 +204,13 @@ function ev_compare($a,$b) {
 	return strcmp($date_a,$date_b);
 }
 
+function event_delete($event_id) {
+	if ($event_id == 0)
+		return;
 
+	q("DELETE FROM `event` WHERE `id` = %d", intval($event_id));
+	logger("Deleted event ".$event_id, LOGGER_DEBUG);
+}
 
 function event_store($arr) {
 
diff --git a/include/items.php b/include/items.php
index 795001bec6..7d1ab1cb36 100644
--- a/include/items.php
+++ b/include/items.php
@@ -2558,6 +2558,11 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
 					if(! $item['deleted'])
 						logger('consume_feed: deleting item ' . $item['id'] . ' uri=' . $item['uri'], LOGGER_DEBUG);
 
+					if($item['object-type'] === ACTIVITY_OBJ_EVENT) {
+						logger("Deleting event ".$item['event-id'], LOGGER_DEBUG);
+						event_delete($item['event-id']);
+					}
+
 					if(($item['verb'] === ACTIVITY_TAG) && ($item['object-type'] === ACTIVITY_OBJ_TAGTERM)) {
 						$xo = parse_xml_string($item['object'],false);
 						$xt = parse_xml_string($item['target'],false);
@@ -3544,6 +3549,11 @@ function local_delivery($importer,$data) {
 
 					logger('local_delivery: deleting item ' . $item['id'] . ' uri=' . $item['uri'], LOGGER_DEBUG);
 
+					if($item['object-type'] === ACTIVITY_OBJ_EVENT) {
+						logger("Deleting event ".$item['event-id'], LOGGER_DEBUG);
+						event_delete($item['event-id']);
+					}
+
 					if(($item['verb'] === ACTIVITY_TAG) && ($item['object-type'] === ACTIVITY_OBJ_TAGTERM)) {
 						$xo = parse_xml_string($item['object'],false);
 						$xt = parse_xml_string($item['target'],false);