Merge commit 'mike/master'

[friendica.git] / include / acl_selectors.php

diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index 554782a82632f9ff7c32c60024abdc0aa2aee5d9..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,19 +13,29 @@ 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;
 }
@@ -32,6 +44,8 @@ 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
@@ -59,6 +73,15 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p
                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))
@@ -66,12 +89,16 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p
                        else
                                $selected = '';
 
-                       $o .= "<option value=\"{$rr['id']}\" $selected 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;
 }