work on api.

[friendica.git] / include / acl_selectors.php

diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index 9467531d9f4aed70b182e84a4a8dea8507364c23..d1303d933e0955c490ce53ffeff28e2b1685c167 100644 (file)
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -10,7 +10,7 @@ function group_select($selname,$selclass,$preselected = false,$size = 4) {
        $o .= "<select name=\"{$selname}[]\" id=\"$selclass\" class=\"$selclass\" multiple=\"multiple\" size=\"$size\" >\r\n";
 
        $r = q("SELECT * FROM `group` WHERE `deleted` = 0 AND `uid` = %d ORDER BY `name` ASC",
-               $_SESSION['uid']
+               intval(local_user())
        );
 
 
@@ -57,9 +57,12 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p
                $sql_extra .= sprintf(" AND `rel` = %d ", intval(REL_BUD));
        }
 
-       if($privmail || $privatenet) {
+       if($privmail) {
                $sql_extra .= " AND `network` IN ( 'dfrn' ) ";
-       }       
+       }
+       elseif($privatenet) {   
+               $sql_extra .= " AND `network` IN ( 'dfrn', 'mail' ) ";
+       }
 
        if($privmail)
                $o .= "<select name=\"$selname\" id=\"$selclass\" class=\"$selclass\" size=\"$size\" >\r\n";