Merge commit 'mike/master'

[friendica.git] / include / acl_selectors.php

diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index 9bbd6bcb474d056cf2edb46aafe9ce468c6c620a..94f51a9ff5ae1fd0e1b3636b557cace370a6d752 100644 (file)
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -3,6 +3,8 @@
 
 function group_select($selname,$selclass,$preselected = false,$size = 4) {
 
+       $a = get_app();
+
        $o = '';
 
        $o .= "<select name=\"{$selname}[]\" id=\"$selclass\" class=\"$selclass\" multiple=\"multiple\" size=\"$size\" >\r\n";
@@ -11,26 +13,38 @@ function group_select($selname,$selclass,$preselected = false,$size = 4) {
                $_SESSION['uid']
        );
 
+
+       $arr = array('group' => $r, 'entry' => $o);
+
+       // e.g. 'network_pre_group_deny', 'profile_pre_group_allow'
+
+       call_hooks($a->module . '_pre_' . $selname, $arr);
+
        if(count($r)) {
                foreach($r as $rr) {
                        if((is_array($preselected)) && in_array($rr['id'], $preselected))
                                $selected = " selected=\"selected\" ";
                        else
                                $selected = '';
+                       $trimmed = substr($rr['name'],0,12);
 
-                       $o .= "<option value=\"{$rr['id']}\" $selected >{$rr['name']}</option>\r\n";
+                       $o .= "<option value=\"{$rr['id']}\" $selected title=\"{$rr['name']}\" >$trimmed</option>\r\n";
                }
        
        }
        $o .= "</select>\r\n";
 
+       call_hooks($a->module . '_post_' . $selname, $o);
+
 
        return $o;
 }
 
 
 
-function contact_select($selname, $selclass, $preselected = false, $size = 4, $privmail = false, $celeb = false) {
+function contact_select($selname, $selclass, $preselected = false, $size = 4, $privmail = false, $celeb = false, $privatenet = false) {
+
+       $a = get_app();
 
        $o = '';
 
@@ -40,37 +54,51 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p
        $sql_extra = '';
 
        if($privmail || $celeb) {
-               $sql_extra = sprintf(" AND `rel` = %d ", intval(REL_BUD));
+               $sql_extra .= sprintf(" AND `rel` = %d ", intval(REL_BUD));
        }
 
+       if($privmail || $privatenet) {
+               $sql_extra .= " AND `network` IN ( 'dfrn' ) ";
+       }       
+
        if($privmail)
                $o .= "<select name=\"$selname\" id=\"$selclass\" class=\"$selclass\" size=\"$size\" >\r\n";
        else 
                $o .= "<select name=\"{$selname}[]\" id=\"$selclass\" class=\"$selclass\" multiple=\"multiple\" size=\"$size\" >\r\n";
 
        $r = q("SELECT `id`, `name`, `url`, `network` FROM `contact` 
-               WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 
+               WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 AND `notify` != ''
                $sql_extra
                ORDER BY `name` ASC ",
                intval(local_user())
        );
 
+
+       $arr = array('contact' => $r, 'entry' => $o);
+
+       // e.g. 'network_pre_contact_deny', 'profile_pre_contact_allow'
+
+       call_hooks($a->module . '_pre_' . $selname, $arr);
+
+
+
        if(count($r)) {
                foreach($r as $rr) {
                        if((is_array($preselected)) && in_array($rr['id'], $preselected))
                                $selected = " selected=\"selected\" ";
                        else
                                $selected = '';
-                       if(($privmail) && ($rr['network'] === 'stat'))
-                               $disabled = ' disabled="true" ' ;
-                       else
-                               $disabled = '';
-                       $o .= "<option value=\"{$rr['id']}\" $selected  $disabled title=\"{$rr['url']}\" >{$rr['name']}</option>\r\n";
+
+                       $trimmed = substr($rr['name'],0,22);
+
+                       $o .= "<option value=\"{$rr['id']}\" $selected title=\"{$rr['name']}|{$rr['url']}\" >$trimmed</option>\r\n";
                }
        
        }
+
        $o .= "</select>\r\n";
 
+       call_hooks($a->module . '_post_' . $selname, $o);
 
        return $o;
 }
@@ -110,7 +138,7 @@ function populate_acl($user = null,$celeb = false) {
        $o .= '</div>';
        $o .= '<div id="contact_allow_wrapper">';
        $o .= '<label id="acl-allow-contact-label" for="contact_allow" >' . t('Contacts') . '</label>';
-       $o .= contact_select('contact_allow','contact_allow',$allow_cid,4,false,$celeb);
+       $o .= contact_select('contact_allow','contact_allow',$allow_cid,4,false,$celeb,true);
        $o .= '</div>';
        $o .= '</div>' . "\r\n";
        $o .= '<div id="acl-allow-end"></div>' . "\r\n";
@@ -125,7 +153,7 @@ function populate_acl($user = null,$celeb = false) {
        $o .= '</div>';
        $o .= '<div id="contact_deny_wrapper" >';
        $o .= '<label id="acl-deny-contact-label" for="contact_deny" >' . t('Contacts') . '</label>';
-       $o .= contact_select('contact_deny','contact_deny', $deny_cid,4,false, $celeb);
+       $o .= contact_select('contact_deny','contact_deny', $deny_cid,4,false, $celeb,true);
        $o .= '</div>';
        $o .= '</div>' . "\r\n";
        $o .= '<div id="acl-deny-end"></div>' . "\r\n";