improve push_lang and pop_lang to do basically nothing if the new language is the...

[friendica.git] / include / acl_selectors.php

diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index 953243a437fac1a600ef2862c4ed16df3b0568d8..b1bcf510864d2907b8d42d74d6b5ed0224d15ee6 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())
        );
 
 
@@ -26,7 +26,7 @@ function group_select($selname,$selclass,$preselected = false,$size = 4) {
                                $selected = " selected=\"selected\" ";
                        else
                                $selected = '';
-                       $trimmed = substr($rr['name'],0,12);
+                       $trimmed = mb_substr($rr['name'],0,12);
 
                        $o .= "<option value=\"{$rr['id']}\" $selected title=\"{$rr['name']}\" >$trimmed</option>\r\n";
                }
@@ -44,9 +44,11 @@ function group_select($selname,$selclass,$preselected = false,$size = 4) {
 
 function contact_select($selname, $selclass, $preselected = false, $size = 4, $privmail = false, $celeb = false, $privatenet = false) {
 
+       $a = get_app();
+
        $o = '';
 
-       // When used for private messages, we limit correspondence to mutual friends and the selector
+       // When used for private messages, we limit correspondence to mutual DFRN/Friendika friends and the selector
        // to one recipient. By default our selector allows multiple selects amongst all contacts.
 
        $sql_extra = '';
@@ -55,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', 'face' ) ";
+       }
 
        if($privmail)
                $o .= "<select name=\"$selname\" id=\"$selclass\" class=\"$selclass\" size=\"$size\" >\r\n";
@@ -78,8 +83,6 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p
 
        call_hooks($a->module . '_pre_' . $selname, $arr);
 
-
-
        if(count($r)) {
                foreach($r as $rr) {
                        if((is_array($preselected)) && in_array($rr['id'], $preselected))
@@ -87,7 +90,7 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p
                        else
                                $selected = '';
 
-                       $trimmed = substr($rr['name'],0,22);
+                       $trimmed = mb_substr($rr['name'],0,22);
 
                        $o .= "<option value=\"{$rr['id']}\" $selected title=\"{$rr['name']}|{$rr['url']}\" >$trimmed</option>\r\n";
                }
@@ -127,7 +130,7 @@ function populate_acl($user = null,$celeb = false) {
        $o = '';
        $o .= '<div id="acl-wrapper">';
        $o .= '<div id="acl-permit-outer-wrapper">';
-       $o .= '<div id="acl-permit-text">' . t('Visible To:') . '</div>';
+       $o .= '<div id="acl-permit-text">' . t('Visible To:') . '</div><div id="jot-public">' . t('everybody') . '</div>';
        $o .= '<div id="acl-permit-text-end"></div>';
        $o .= '<div id="acl-permit-wrapper">';
        $o .= '<div id="group_allow_wrapper">';