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

more work on linked item/resource deletion for photos and events, deprecate the force flag in drop_item() and comment out goaway() in drop_item().

Browse Source
This commit is contained in:
Mario Vavti 2019-06-13 13:34:04 +02:00
parent bc34167c84
commit 801ab611ed
4 changed files with 54 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Zotlabs/Lib/NativeWiki.php
View File

@ -191,7 +191,7 @@ class NativeWiki {
return array('item' => null, 'success' => false); return array('item' => null, 'success' => false);
} }
else { else {
$drop = drop_item($item['id'], false, DROPITEM_NORMAL, true); $drop = drop_item($item['id'], false, DROPITEM_NORMAL);
} }
info( t('Wiki files deleted successfully')); info( t('Wiki files deleted successfully'));

5
Zotlabs/Module/Channel_calendar.php
View File

@ -455,11 +455,6 @@ class Channel_calendar extends \Zotlabs\Web\Controller {
if($can_delete || $local_delete) { if($can_delete || $local_delete) {
q("update item set resource_type = '', resource_id = '' where resource_type = 'event' and resource_id = '%s' and uid = %d",
dbesc($event_id),
intval(local_channel())
);
// if this is a different page type or it's just a local delete // if this is a different page type or it's just a local delete
// but not by the item author or owner, do a simple deletion // but not by the item author or owner, do a simple deletion

7
include/attach.php
View File

@ -1514,12 +1514,15 @@ function attach_delete($channel_id, $resource, $is_photo = 0) {
function attach_drop_photo($channel_id,$resource) { function attach_drop_photo($channel_id,$resource) {
$x = q("select id, item_hidden from item where resource_id = '%s' and resource_type = 'photo' and uid = %d", $x = q("select id, item_hidden from item where resource_id = '%s' and resource_type = 'photo' and uid = %d and item_deleted = 0",
dbesc($resource), dbesc($resource),
intval($channel_id) intval($channel_id)
); );
if($x) { if($x) {
drop_item($x[0]['id'],false,(($x[0]['item_hidden']) ? DROPITEM_NORMAL : DROPITEM_PHASE1),true); $stage = (($x[0]['item_hidden']) ? DROPITEM_NORMAL : DROPITEM_PHASE1);
$interactive = (($x[0]['item_hidden']) ? false : true);
drop_item($x[0]['id'], $interactive, $stage);
} }
$r = q("SELECT content FROM photo WHERE resource_id = '%s' AND uid = %d AND os_storage = 1", $r = q("SELECT content FROM photo WHERE resource_id = '%s' AND uid = %d AND os_storage = 1",

115
include/items.php
View File

@ -3663,7 +3663,7 @@ function retain_item($id) {
); );
} }
function drop_items($items,$interactive = false,$stage = DROPITEM_NORMAL,$force = false) { function drop_items($items,$interactive = false,$stage = DROPITEM_NORMAL) {
$uid = 0; $uid = 0;
if(! local_channel() && ! remote_channel()) if(! local_channel() && ! remote_channel())
@ -3671,7 +3671,7 @@ function drop_items($items,$interactive = false,$stage = DROPITEM_NORMAL,$force
if(count($items)) { if(count($items)) {
foreach($items as $item) { foreach($items as $item) {
$owner = drop_item($item,$interactive,$stage,$force); $owner = drop_item($item,$interactive,$stage);
if($owner && ! $uid) if($owner && ! $uid)
$uid = $owner; $uid = $owner;
} }
@ -3694,12 +3694,7 @@ function drop_items($items,$interactive = false,$stage = DROPITEM_NORMAL,$force
// $stage = 1 => set deleted flag on the item and perform intial notifications // $stage = 1 => set deleted flag on the item and perform intial notifications
// $stage = 2 => perform low level delete at a later stage // $stage = 2 => perform low level delete at a later stage
function drop_item($id,$interactive = true,$stage = DROPITEM_NORMAL,$force = false) { function drop_item($id,$interactive = true,$stage = DROPITEM_NORMAL) {
// These resource types have linked items that should only be removed at the same time
// as the linked resource; if we encounter one set it to item_hidden rather than item_deleted.
$linked_resource_types = [ 'photo' ];
// locate item to be deleted // locate item to be deleted
@ -3711,13 +3706,11 @@ function drop_item($id,$interactive = true,$stage = DROPITEM_NORMAL,$force = fal
if(! $interactive) if(! $interactive)
return 0; return 0;
notice( t('Item not found.') . EOL); notice( t('Item not found.') . EOL);
goaway(z_root() . '/' . $_SESSION['return_url']); //goaway(z_root() . '/' . $_SESSION['return_url']);
} }
$item = $r[0]; $item = $r[0];
$linked_item = (($item['resource_id'] && $item['resource_type'] && in_array($item['resource_type'], $linked_resource_types)) ? true : false);
$ok_to_delete = false; $ok_to_delete = false;
// system deletion // system deletion
@ -3740,26 +3733,12 @@ 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.
if(($linked_item) && (! $force)) { $r = q("UPDATE item SET item_deleted = 1 WHERE id = %d",
$r = q("UPDATE item SET item_hidden = 1 WHERE id = %d", intval($item['id'])
intval($item['id']) );
);
}
else {
$r = q("UPDATE item SET item_deleted = 1 WHERE id = %d",
intval($item['id'])
);
}
$arr = [ $arr = [
'item' => $item, 'item' => $item,
@ -3799,14 +3778,13 @@ function drop_item($id,$interactive = true,$stage = DROPITEM_NORMAL,$force = fal
if((intval($item['item_wall']) && ($stage != DROPITEM_PHASE2)) || ($stage == DROPITEM_PHASE1)) { if((intval($item['item_wall']) && ($stage != DROPITEM_PHASE2)) || ($stage == DROPITEM_PHASE1)) {
Master::Summon([ 'Notifier','drop',$notify_id ]); Master::Summon([ 'Notifier','drop',$notify_id ]);
} }
//goaway(z_root() . '/' . $_SESSION['return_url']);
goaway(z_root() . '/' . $_SESSION['return_url']);
} }
else { else {
if(! $interactive) if(! $interactive)
return 0; return 0;
notice( t('Permission denied.') . EOL); notice( t('Permission denied.') . EOL);
goaway(z_root() . '/' . $_SESSION['return_url']); //goaway(z_root() . '/' . $_SESSION['return_url']);
} }
} }
@ -3821,14 +3799,9 @@ function drop_item($id,$interactive = true,$stage = DROPITEM_NORMAL,$force = fal
* @param boolean $force * @param boolean $force
* @return boolean * @return boolean
*/ */
function delete_item_lowlevel($item, $stage = DROPITEM_NORMAL, $force = false) { function delete_item_lowlevel($item, $stage = DROPITEM_NORMAL) {
//$linked_item = (($item['resource_id']) ? true : false); logger('item: ' . $item['id'] . ' stage: ' . $stage, LOGGER_DATA);
$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);
switch($stage) { switch($stage) {
case DROPITEM_PHASE2: case DROPITEM_PHASE2:
@ -3841,42 +3814,50 @@ function delete_item_lowlevel($item, $stage = DROPITEM_NORMAL, $force = false) {
break; break;
case DROPITEM_PHASE1: case DROPITEM_PHASE1:
if($linked_item && ! $force) { $r = q("UPDATE item set item_deleted = 1, changed = '%s', edited = '%s' where id = %d",
$r = q("UPDATE item SET item_hidden = 1, dbesc(datetime_convert()),
changed = '%s', edited = '%s' WHERE id = %d", dbesc(datetime_convert()),
dbesc(datetime_convert()), intval($item['id'])
dbesc(datetime_convert()), );
intval($item['id'])
);
}
else {
$r = q("UPDATE item set item_deleted = 1, changed = '%s', edited = '%s' where id = %d",
dbesc(datetime_convert()),
dbesc(datetime_convert()),
intval($item['id'])
);
}
break; break;
case DROPITEM_NORMAL: case DROPITEM_NORMAL:
default: default:
if($linked_item && ! $force) { $r = q("DELETE FROM item WHERE id = %d",
$r = q("UPDATE item SET item_hidden = 1, intval($item['id'])
changed = '%s', edited = '%s' WHERE id = %d", );
dbesc(datetime_convert()),
dbesc(datetime_convert()),
intval($item['id'])
);
}
else {
$r = q("DELETE FROM item WHERE id = %d",
intval($item['id'])
);
}
break; break;
} }
// immediately remove local linked resources
if($item['resource_type'] === 'event') {
$r = q("SELECT * FROM event WHERE event_hash = '%s' AND uid = %d LIMIT 1",
dbesc($item['resource_id']),
intval($item['uid'])
);
$sync_data = $r[0];
$x = q("delete from event where event_hash = '%s' and uid = %d",
dbesc($item['resource_id']),
intval($item['uid'])
);
if($x) {
$sync_data['event_deleted'] = 1;
build_sync_packet($item['uid'], ['event' => [$syncsync_data]]);
}
}
if($item['resource_type'] === 'photo') {
attach_delete($item['uid'], $item['resource_id'], true );
$channel = channelx_by_n($item['uid']);
$sync_data = attach_export_data($channel, $item['resource_id'], true);
if($sync_data)
build_sync_packet($item['uid'], ['file' => [$sync_data]]);
}
// immediately remove any undesired profile likes. // immediately remove any undesired profile likes.
q("delete from likes where iid = %d and channel_id = %d", q("delete from likes where iid = %d and channel_id = %d",