Moved all OStatus code in a single file.

[friendica.git] / include / acl_selectors.php

diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index 1e43431612b79787a8e59165eca8232955903f16..dc2f8d4164cdfc46d1cff87d44a0959820b5cdeb 100644 (file)
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -181,12 +181,12 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p
                $sql_extra .= sprintf(" AND `rel` = %d ", intval(CONTACT_IS_FRIEND));
        }
 
-       if($privmail) {
-               $sql_extra .= " AND `network` IN ( NETWORK_DFRN, NETWORK_DIASPORA ) ";
-       }
-       elseif($privatenet) {
-               $sql_extra .= " AND `network` IN ( NETWORK_DFRN, NETWORK_MAIL, NETWORK_FACEBOOK, NETWORK_DIASPORA ) ";
-       }
+       if($privmail)
+               $sql_extra .= sprintf(" AND `network` IN ('%s' , '%s') ",
+                                       NETWORK_DFRN, NETWORK_DIASPORA);
+       elseif($privatenet)
+               $sql_extra .= sprintf(" AND `network` IN ('%s' , '%s', '%s', '%s') ",
+                                       NETWORK_DFRN, NETWORK_MAIL, NETWORK_FACEBOOK, NETWORK_DIASPORA);
 
        $tabindex = ($tabindex > 0 ? "tabindex=\"$tabindex\"" : "");
 
@@ -422,7 +422,7 @@ function acl_lookup(&$a, $out_type = 'json') {
                                WHERE `uid` = %d AND `self` = 0
                                AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0
                                AND `notify` != '' $sql_extra2" ,
-                       intval(local_user())
+                       intval(local_user()),
                );
                $contact_count = (int)$r[0]['c'];
        }