MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

limit privacy ACL's to networks which can handle privacy

Browse source
This commit is contained in:
Friendika 2011-01-30 22:45:02 -08:00
parent 6935d34e76
commit d8877b88d6
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
include/acl_selectors.php
View file

@ -30,7 +30,7 @@ function group_select($selname,$selclass,$preselected = false,$size = 4) {
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) {
$o = ''; $o = '';
@ -43,6 +43,10 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p
$sql_extra .= sprintf(" AND `rel` = %d ", intval(REL_BUD)); $sql_extra .= sprintf(" AND `rel` = %d ", intval(REL_BUD));
} }
if($privmail || $privatenet) {
$sql_extra .= " AND `network` IN ( 'dfrn' ) ";
}
if($privmail) if($privmail)
$o .= "<select name=\"$selname\" id=\"$selclass\" class=\"$selclass\" size=\"$size\" >\r\n"; $o .= "<select name=\"$selname\" id=\"$selclass\" class=\"$selclass\" size=\"$size\" >\r\n";
else else
@ -61,11 +65,8 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p
$selected = " selected=\"selected\" "; $selected = " selected=\"selected\" ";
else else
$selected = ''; $selected = '';
if(($privmail) && ($rr['network'] === 'stat'))
$disabled = ' disabled="true" ' ; $o .= "<option value=\"{$rr['id']}\" $selected title=\"{$rr['url']}\" >{$rr['name']}</option>\r\n";
else
$disabled = '';
$o .= "<option value=\"{$rr['id']}\" $selected $disabled title=\"{$rr['url']}\" >{$rr['name']}</option>\r\n";
} }
} }
@ -110,7 +111,7 @@ function populate_acl($user = null,$celeb = false) {
$o .= '</div>'; $o .= '</div>';
$o .= '<div id="contact_allow_wrapper">'; $o .= '<div id="contact_allow_wrapper">';
$o .= '<label id="acl-allow-contact-label" for="contact_allow" >' . t('Contacts') . '</label>'; $o .= '<label id="acl-allow-contact-label" for="contact_allow" >' . t('Contacts') . '</label>';
$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 .= '</div>'; $o .= '</div>';
$o .= '</div>' . "\r\n"; $o .= '</div>' . "\r\n";
$o .= '<div id="acl-allow-end"></div>' . "\r\n"; $o .= '<div id="acl-allow-end"></div>' . "\r\n";
@ -125,7 +126,7 @@ function populate_acl($user = null,$celeb = false) {
$o .= '</div>'; $o .= '</div>';
$o .= '<div id="contact_deny_wrapper" >'; $o .= '<div id="contact_deny_wrapper" >';
$o .= '<label id="acl-deny-contact-label" for="contact_deny" >' . t('Contacts') . '</label>'; $o .= '<label id="acl-deny-contact-label" for="contact_deny" >' . t('Contacts') . '</label>';
$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 .= '</div>'; $o .= '</div>';
$o .= '</div>' . "\r\n"; $o .= '</div>' . "\r\n";
$o .= '<div id="acl-deny-end"></div>' . "\r\n"; $o .= '<div id="acl-deny-end"></div>' . "\r\n";

1
include/main.js
View file

@ -45,6 +45,7 @@
} }
} }
// this is shift-home on FF, but $ on IE, disabling until I figure out why the diff. // this is shift-home on FF, but $ on IE, disabling until I figure out why the diff.
// update: incompatible usage of onKeyDown vs onKeyPress
// if(event.keyCode == '36' && event.shiftKey == true) { // if(event.keyCode == '36' && event.shiftKey == true) {
// if(homebase !== undefined) { // if(homebase !== undefined) {
// event.preventDefault(); // event.preventDefault();