harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more work on event item deletion

Browse Source
This commit is contained in:
Mario Vavti 2019-06-12 11:27:39 +02:00
parent 9ac9c693ad
commit decd0dc035
3 changed files with 49 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Zotlabs/Lib/Libzot.php
View File

@ -2074,6 +2074,25 @@ class Libzot {
return false; return false;
} }
if ($item['obj_type'] == ACTIVITY_OBJ_EVENT) {
$i = q("SELECT * FROM event WHERE event_hash = '%s' AND uid = %d LIMIT 1",
dbesc($item['uuid']),
intval($uid)
);
if ($i) {
if ($i[0]['event_xchan'] === $sender) {
q("delete from event where event_hash = '%s' and uid = %d",
dbesc($item['uuid']),
intval($uid)
);
}
else {
logger('delete linked event: not owner');
return;
}
}
}
if($item_found) { if($item_found) {
if(intval($r[0]['item_deleted'])) { if(intval($r[0]['item_deleted'])) {
logger('delete_imported_item: item was already deleted'); logger('delete_imported_item: item was already deleted');

12
include/items.php
View File

@ -3740,6 +3740,13 @@ function drop_item($id,$interactive = true,$stage = DROPITEM_NORMAL,$force = fal
if($ok_to_delete) { if($ok_to_delete) {
if ($item['resource_type'] === 'event') {
$x = q("delete from event where event_hash = '%s' and uid = %d",
dbesc($item['resource_id']),
intval($item['uid'])
);
}
// set the deleted flag immediately on this item just in case the // set the deleted flag immediately on this item just in case the
// hook calls a remote process which loops. We'll delete it properly in a second. // hook calls a remote process which loops. We'll delete it properly in a second.
@ -3816,7 +3823,10 @@ function drop_item($id,$interactive = true,$stage = DROPITEM_NORMAL,$force = fal
*/ */
function delete_item_lowlevel($item, $stage = DROPITEM_NORMAL, $force = false) { function delete_item_lowlevel($item, $stage = DROPITEM_NORMAL, $force = false) {
$linked_item = (($item['resource_id']) ? true : false); //$linked_item = (($item['resource_id']) ? true : false);
$linked_resource_types = [ 'photo' ];
$linked_item = (($item['resource_id'] && $item['resource_type'] && in_array($item['resource_type'], $linked_resource_types)) ? true : false);
logger('item: ' . $item['id'] . ' stage: ' . $stage . ' force: ' . $force, LOGGER_DATA); logger('item: ' . $item['id'] . ' stage: ' . $stage . ' force: ' . $force, LOGGER_DATA);

19
include/zot.php
View File

@ -2278,6 +2278,25 @@ function delete_imported_item($sender, $item, $uid, $relay) {
return false; return false;
} }
if ($item['obj_type'] == ACTIVITY_OBJ_EVENT) {
$i = q("SELECT * FROM event WHERE event_hash = '%s' AND uid = %d LIMIT 1",
dbesc($item['uuid']),
intval($uid)
);
if ($i) {
if ($i[0]['event_xchan'] === $sender['hash']) {
q("delete from event where event_hash = '%s' and uid = %d",
dbesc($item['uuid']),
intval($uid)
);
}
else {
logger('delete linked event: not owner');
return;
}
}
}
require_once('include/items.php'); require_once('include/items.php');
if($item_found) { if($item_found) {