X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=include%2Facl_selectors.php;h=b1bcf510864d2907b8d42d74d6b5ed0224d15ee6;hb=21769d7390a0bcfb5c74e53c05867ab52a54448b;hp=269dc3e349b66f20c5ca10ea992e5463cb37d744;hpb=042aa2e169310bc23398d0558455a61fe1e86a92;p=friendica.git diff --git a/include/acl_selectors.php b/include/acl_selectors.php index 269dc3e349..b1bcf51086 100644 --- a/include/acl_selectors.php +++ b/include/acl_selectors.php @@ -3,21 +3,30 @@ function group_select($selname,$selclass,$preselected = false,$size = 4) { + $a = get_app(); + $o = ''; $o .= "\r\n"; + call_hooks($a->module . '_post_' . $selname, $o); + return $o; } @@ -33,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 = ''; @@ -44,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 .= "\r\n"; + call_hooks($a->module . '_post_' . $selname, $o); return $o; } @@ -105,7 +130,7 @@ function populate_acl($user = null,$celeb = false) { $o = ''; $o .= '