From 5d83469621facf89884ada4036bd25b7b566b616 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Thu, 31 May 2018 16:11:51 -0700 Subject: when removing a connection, use the same rules as expire: don't remove items that are starred, filed, or that you replied to. --- include/connections.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/include/connections.php b/include/connections.php index 32baa94bd..5a9e31950 100644 --- a/include/connections.php +++ b/include/connections.php @@ -374,14 +374,19 @@ function contact_remove($channel_id, $abook_id) { return false; - $r = q("select id from item where (owner_xchan = '%s' or author_xchan = '%s') and uid = %d", + $r = q("select id from item where (owner_xchan = '%s' or author_xchan = '%s') and uid = %d and item_retained = 0 and item_starred = 0", dbesc($abook['abook_xchan']), dbesc($abook['abook_xchan']), intval($channel_id) ); if($r) { + $r = fetch_post_tags($r,true); + foreach($r as $rr) { - drop_item($rr['id'],false); + $terms = get_terms_oftype($item['term'],TERM_FILE); + if(! $terms) { + drop_item($rr['id'],false); + } } } -- cgit v1.2.3 From 7c05500392aea9d992919e1791c1557dd2f49424 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Thu, 31 May 2018 16:17:24 -0700 Subject: don't show forums in forum widget if archived flag is set --- Zotlabs/Widget/Forums.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Zotlabs/Widget/Forums.php b/Zotlabs/Widget/Forums.php index 7415c0f0a..d3e2f2534 100644 --- a/Zotlabs/Widget/Forums.php +++ b/Zotlabs/Widget/Forums.php @@ -51,7 +51,7 @@ class Forums { - $r1 = q("select abook_id, xchan_hash, xchan_name, xchan_url, xchan_photo_s from abook left join xchan on abook_xchan = xchan_hash where xchan_deleted = 0 and abook_channel = %d and abook_pending = 0 and abook_ignored = 0 and abook_blocked = 0 $sql_extra order by xchan_name $limit ", + $r1 = q("select abook_id, xchan_hash, xchan_name, xchan_url, xchan_photo_s from abook left join xchan on abook_xchan = xchan_hash where xchan_deleted = 0 and abook_channel = %d and abook_pending = 0 and abook_ignored = 0 and abook_blocked = 0 and abook_archived = 0 $sql_extra order by xchan_name $limit ", intval(local_channel()) ); -- cgit v1.2.3 From dd962027cce033b6bcdef7a2fef7b946a9f67a20 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Thu, 31 May 2018 21:14:12 -0700 Subject: proper pronoun --- Zotlabs/Widget/Activity_filter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Zotlabs/Widget/Activity_filter.php b/Zotlabs/Widget/Activity_filter.php index e56d13fc1..40f294fa5 100644 --- a/Zotlabs/Widget/Activity_filter.php +++ b/Zotlabs/Widget/Activity_filter.php @@ -80,7 +80,7 @@ class Activity_filter { 'icon' => 'folder', 'url' => z_root() . '/' . $cmd . '/?f=&file=' . $t['term'], 'sel' => $file_active, - 'title' => sprintf(t('Show posts that i have filed to %s'), $t['term']), + 'title' => sprintf(t('Show posts that I have filed to %s'), $t['term']), ]; } } -- cgit v1.2.3