X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Facl_selectors.php;h=b1bcf510864d2907b8d42d74d6b5ed0224d15ee6;hb=87de83997499a380ef26d72acb6d5fd3df91e95b;hp=d0952421ea3b92aa78d4a9b79f5a0d42f3481034;hpb=f1630780e9d81a3e7cd41d76d7a6fa7b4c125edb;p=friendica.git
diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index d0952421ea..b1bcf51086 100644
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -3,38 +3,52 @@
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;
}
-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 = '';
- // 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,6 +57,13 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p
$sql_extra .= sprintf(" AND `rel` = %d ", intval(REL_BUD));
}
+ 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;
}
@@ -101,7 +130,7 @@ function populate_acl($user = null,$celeb = false) {
$o = '';
$o .= '
';
$o .= '
';
- $o .= '
' . t('Visible To:') . '
';
+ $o .= '
' . t('Visible To:') . '
' . t('everybody') . '
';
$o .= '
';
$o .= '
';
$o .= '
';
@@ -110,7 +139,7 @@ function populate_acl($user = null,$celeb = false) {
$o .= '
';
$o .= '
';
$o .= '';
- $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 .= '
';
$o .= '
' . "\r\n";
$o .= '
' . "\r\n";
@@ -125,7 +154,7 @@ function populate_acl($user = null,$celeb = false) {
$o .= '
';
$o .= '
';
$o .= '';
- $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 .= '
';
$o .= '
' . "\r\n";
$o .= '' . "\r\n";