Don't show deleted contacts, set new AP contacts as "pending" until they are accepted

[friendica.git] / src / Core / ACL.php

diff --git a/src/Core/ACL.php b/src/Core/ACL.php
index 9abd259acd0550f60c59f924aafed59f24ed5115..030825e8138904e101f8c2d12f94ca9e3b211156 100644 (file)
--- a/src/Core/ACL.php
+++ b/src/Core/ACL.php
@@ -101,7 +101,7 @@ class ACL extends BaseObject
                }
 
                $stmt = DBA::p("SELECT `id`, `name`, `url`, `network` FROM `contact`
-                       WHERE `uid` = ? AND NOT `self` AND NOT `blocked` AND NOT `pending` AND NOT `archive` AND `notify` != ''
+                       WHERE `uid` = ? AND NOT `self` AND NOT `blocked` AND NOT `pending` AND NOT `archive` AND NOT `deleted` AND `notify` != ''
                        $sql_extra
                        ORDER BY `name` ASC ", intval(local_user())
                );
@@ -166,7 +166,7 @@ class ACL extends BaseObject
                $o .= "<select name=\"$selname\" id=\"$selclass\" class=\"$selclass\" size=\"$size\"$tabindex_attr$hidepreselected>\r\n";
 
                $stmt = DBA::p("SELECT `id`, `name`, `url`, `network` FROM `contact`
-                       WHERE `uid` = ? AND NOT `self` AND NOT `blocked` AND NOT `pending` AND NOT `archive` AND `notify` != ''
+                       WHERE `uid` = ? AND NOT `self` AND NOT `blocked` AND NOT `pending` AND NOT `archive` AND NOT `deleted` AND `notify` != ''
                        $sql_extra
                        ORDER BY `name` ASC ", intval(local_user())
                );