aboutsummaryrefslogtreecommitdiffstats
path: root/include/connections.php
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2021-08-17 18:18:52 +0000
committerMario <mario@mariovavti.com>2021-08-17 18:18:52 +0000
commitdd296e1aaa3c7b992d7ec71a50ce92f74f78ca06 (patch)
tree24e77d206f0f719264fb8d0b66f5710c90db912a /include/connections.php
parentc3bbc35e84bc8517064a55e362aeefb905d910b4 (diff)
downloadvolse-hubzilla-dd296e1aaa3c7b992d7ec71a50ce92f74f78ca06.tar.gz
volse-hubzilla-dd296e1aaa3c7b992d7ec71a50ce92f74f78ca06.tar.bz2
volse-hubzilla-dd296e1aaa3c7b992d7ec71a50ce92f74f78ca06.zip
more legacy mail cleanup - issue #1595
Diffstat (limited to 'include/connections.php')
-rw-r--r--include/connections.php17
1 files changed, 2 insertions, 15 deletions
diff --git a/include/connections.php b/include/connections.php
index a1b27e301..59020051c 100644
--- a/include/connections.php
+++ b/include/connections.php
@@ -294,21 +294,15 @@ function remove_all_xchan_resources($xchan, $channel_id = 0) {
drop_item($rr,false);
}
}
+
$r = q("delete from event where event_xchan = '%s'",
dbesc($xchan)
);
+
$r = q("delete from pgrp_member where xchan = '%s'",
dbesc($xchan)
);
- // Cannot delete just one side of the conversation since we do not allow
- // you to block private mail replies. This would leave open a gateway for abuse.
- // Both participants are owners of the conversation and both can remove it.
-
- $r = q("delete from mail where ( from_xchan = '%s' or to_xchan = '%s' )",
- dbesc($xchan),
- dbesc($xchan)
- );
$r = q("delete from xlink where ( xlink_xchan = '%s' or xlink_link = '%s' )",
dbesc($xchan),
dbesc($xchan)
@@ -318,7 +312,6 @@ function remove_all_xchan_resources($xchan, $channel_id = 0) {
dbesc($xchan)
);
-
if($dirmode === false || $dirmode == DIRECTORY_MODE_NORMAL) {
$r = q("delete from xchan where xchan_hash = '%s'",
@@ -440,12 +433,6 @@ function contact_remove($channel_id, $abook_id) {
intval($channel_id)
);
- $r = q("delete from mail where ( from_xchan = '%s' or to_xchan = '%s' ) and channel_id = %d ",
- dbesc($abook['abook_xchan']),
- dbesc($abook['abook_xchan']),
- intval($channel_id)
- );
-
$r = q("delete from abconfig where chan = %d and xchan = '%s'",
intval($channel_id),
dbesc($abook['abook_xchan'])