like, dislike, activity streams, etc.

[friendica.git] / view / acl_selectors.php

diff --git a/view/acl_selectors.php b/view/acl_selectors.php
index c0d3ddcd445e086f796444fc480e314ac84dcc49..0366ab2a17fb6ff5a9dd98a572187f1a3134ef9e 100644 (file)
--- a/view/acl_selectors.php
+++ b/view/acl_selectors.php
@@ -5,9 +5,9 @@ function group_select($selname,$selclass,$preselected = false,$size = 4) {
 
        $o = '';
 
-       $o .= "<select name=\"{$selname}[]\" class=\"$selclass\" multiple=\"multiple\" size=\"$size\" />\r\n";
+       $o .= "<select name=\"{$selname}[]\" id=\"$selclass\" class=\"$selclass\" multiple=\"multiple\" size=\"$size\" >\r\n";
 
-       $r = q("SELECT * FROM `group` WHERE `uid` = %d ORDER BY `name` ASC",
+       $r = q("SELECT * FROM `group` WHERE `deleted` = 0 AND `uid` = %d ORDER BY `name` ASC",
                $_SESSION['uid']
        );
 
@@ -38,12 +38,12 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p
        // to one recipient. By default our selector allows multiple selects amongst all contacts.
 
        if($privmail) {
-               $sql_extra = " AND `issued-id` != '' AND `dfrn-id` != '' ";
-               $o .= "<select name=\"$selname\" class=\"$selclass\" size=\"$size\" />\r\n";
+               $sql_extra = sprintf(" AND `rel` = %d ", intval(DIRECTION_BOTH));
+               $o .= "<select name=\"$selname\" id=\"$selclass\" class=\"$selclass\" size=\"$size\" >\r\n";
        }
        else {
                $sql_extra = '';
-               $o .= "<select name=\"{$selname}[]\" class=\"$selclass\" multiple=\"multiple\" size=\"$size\" />\r\n";
+               $o .= "<select name=\"{$selname}[]\" id=\"$selclass\" class=\"$selclass\" multiple=\"multiple\" size=\"$size\" >\r\n";
        }
 
        $r = q("SELECT `id`, `name`, `url` FROM `contact` 
@@ -128,4 +128,5 @@ function populate_acl($user = null) {
        $o .= '<div id="acl-wrapper-end"></div>' . "\r\n";
        return $o;
 
-}
\ No newline at end of file
+}
+