jakob/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

respect hidewall

Browse source
This commit is contained in:
rabuzarus 2015-06-25 20:29:09 +02:00
parent 94b21245bc
commit 65286f79ed
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
include/acl_selectors.php
View file

@ -305,13 +305,16 @@ function populate_acl($user = null,$celeb = false,$show_jotnets = false) {
} }
} }
if (!$user['hidewall']) {
if($mail_enabled) { if($mail_enabled) {
$selected = (($pubmail_enabled) ? ' checked="checked" ' : ''); $selected = (($pubmail_enabled) ? ' checked="checked" ' : '');
$jotnets .= '<div class="profile-jot-net"><input type="checkbox" name="pubmail_enable"' . $selected . ' value="1" /> ' $jotnets .= '<div class="profile-jot-net"><input type="checkbox" name="pubmail_enable"' . $selected . ' value="1" /> ' . t("Post to Email") . '</div>';
. t("Post to Email") . '</div>';
} }
call_hooks('jot_networks', $jotnets); call_hooks('jot_networks', $jotnets);
} else
$jotnets .= sprintf(t('Connectors disabled, since "%s" is enabled.'),
t('Hide your profile details from unknown viewers?'));
} }
// We shouldn't need to prune deadguys from the block list. Either way they can't get the message. // We shouldn't need to prune deadguys from the block list. Either way they can't get the message.

2
mod/events.php
View file

@ -507,7 +507,7 @@ function events_content(&$a) {
'$sh_text' => t('Share this event'), '$sh_text' => t('Share this event'),
'$sh_checked' => $sh_checked, '$sh_checked' => $sh_checked,
'$preview' => t('Preview'), '$preview' => t('Preview'),
'$acl' => (($cid) ? '' : populate_acl(((x($orig_event)) ? $orig_event : $a->user),false, false)), '$acl' => (($cid) ? '' : populate_acl(((x($orig_event)) ? $orig_event : $a->user),false)),
'$submit' => t('Submit') '$submit' => t('Submit')
)); ));