X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Facl_selectors.php;h=b1bcf510864d2907b8d42d74d6b5ed0224d15ee6;hb=a27b7fb28d151c00eef8319cdf876896d36df8b0;hp=554782a82632f9ff7c32c60024abdc0aa2aee5d9;hpb=1151124feed13ebe1bf87bdcebf9692a5ce6233e;p=friendica.git

diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index 554782a826..b1bcf51086 100644
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -3,27 +3,39 @@
 
 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";
 
 	$r = q("SELECT * FROM `group` WHERE `deleted` = 0 AND `uid` = %d ORDER BY `name` ASC",
-		$_SESSION['uid']
+		intval(local_user())
 	);
 
+
+	$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 = mb_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,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 = '';
@@ -43,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";
@@ -59,6 +76,13 @@ 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 +90,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 = mb_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;
 }
@@ -102,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">';