aboutsummaryrefslogtreecommitdiffstats
path: root/view/acl_selectors.php
diff options
context:
space:
mode:
Diffstat (limited to 'view/acl_selectors.php')
-rw-r--r--view/acl_selectors.php73
1 files changed, 42 insertions, 31 deletions
diff --git a/view/acl_selectors.php b/view/acl_selectors.php
index 09ce24d0e..0ffdc8ab3 100644
--- a/view/acl_selectors.php
+++ b/view/acl_selectors.php
@@ -30,14 +30,25 @@ function group_select($selname,$selclass,$preselected = false,$size = 4) {
-function contact_select($selname,$selclass,$preselected = false,$size = 4) {
+function contact_select($selname, $selclass, $preselected = false, $size = 4, $privmail = false) {
$o = '';
- $o .= "<select name=\"{$selname}[]\" class=\"$selclass\" multiple=\"multiple\" size=\"$size\" />\r\n";
+ // When used for private messages, we limit correspondence to mutual friends and the selector
+ // to one recipient. By default our selector allows multiple selects amongst all contacts.
+
+ if($privmail) {
+ $sql_extra = " AND `issued-id` != '' AND `dfrn-id` != '' ";
+ $o .= "<select name=\"$selname\" class=\"$selclass\" size=\"$size\" />\r\n";
+ }
+ else {
+ $sql_extra = '';
+ $o .= "<select name=\"{$selname}[]\" class=\"$selclass\" multiple=\"multiple\" size=\"$size\" />\r\n";
+ }
$r = q("SELECT `id`, `name` FROM `contact`
WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0
+ $sql_extra
ORDER BY `name` ASC ",
$_SESSION['uid']
);
@@ -62,39 +73,39 @@ function contact_select($selname,$selclass,$preselected = false,$size = 4) {
function populate_acl() {
$o = '';
- $o .= "<div id=\"acl-wrapper\">";
- $o .= "<div id=\"acl-permit-outer-wrapper\">";
- $o .= "<div id=\"acl-permit-text\">Visible To:</div>";
- $o .= "<div id=\"acl-permit-text-end\"></div>";
- $o .= "<div id=\"acl-permit-wrapper\">";
- $o .= "<div id=\"group_allow_wrapper\">";
- $o .= "<label id=\"acl-allow-group-label\" for=\"group_allow\" >Groups</label>";
+ $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-end"></div>';
+ $o .= '<div id="acl-permit-wrapper">';
+ $o .= '<div id="group_allow_wrapper">';
+ $o .= '<label id="acl-allow-group-label" for="group_allow" >' . t('Groups') . '</label>';
$o .= group_select('group_allow','group_allow');
- $o .= "</div>";
- $o .= "<div id=\"contact_allow_wrapper\">";
- $o .= "<label id=\"acl-allow-contact-label\" for=\"contact_allow\" >Contacts</label>";
+ $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');
- $o .= "</div>";
- $o .= "</div>\r\n";
- $o .= "<div id=\"acl-allow-end\"></div>\r\n";
- $o .= "</div>";
- $o .= "<div id=\"acl-deny-outer-wrapper\">";
- $o .= "<div id=\"acl-deny-text\">Except For:</div>";
- $o .= "<div id=\"acl-deny-text-end\"></div>";
- $o .= "<div id=\"acl-deny-wrapper\">";
- $o .= "<div id=\"group_deny_wrapper\" >";
- $o .= "<label id=\"acl-deny-group-label\" for=\"group_deny\" >Groups</label>";
+ $o .= '</div>';
+ $o .= '</div>' . "\r\n";
+ $o .= '<div id="acl-allow-end"></div>' . "\r\n";
+ $o .= '</div>';
+ $o .= '<div id="acl-deny-outer-wrapper">';
+ $o .= '<div id="acl-deny-text">' . t('Except For:') . '</div>';
+ $o .= '<div id="acl-deny-text-end"></div>';
+ $o .= '<div id="acl-deny-wrapper">';
+ $o .= '<div id="group_deny_wrapper" >';
+ $o .= '<label id="acl-deny-group-label" for="group_deny" >' . t('Groups') . '</label>';
$o .= group_select('group_deny','group_deny');
- $o .= "</div>";
- $o .= "<div id=\"contact_deny_wrapper\" >";
- $o .= "<label id=\"acl-deny-contact-label\" for=\"contact_deny\" >Contacts</label>";
+ $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');
- $o .= "</div>";
- $o .= "</div>\r\n";
- $o .= "<div id=\"acl-deny-end\"></div>\r\n";
- $o .= "</div>";
- $o .= "</div>\r\n";
- $o .= "<div id=\"acl-wrapper-end\"></div>";
+ $o .= '</div>';
+ $o .= '</div>' . "\r\n";
+ $o .= '<div id="acl-deny-end"></div>' . "\r\n";
+ $o .= '</div>';
+ $o .= '</div>' . "\r\n";
+ $o .= '<div id="acl-wrapper-end"></div>' . "\r\n";
return $o;
} \ No newline at end of file