bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Merge pull request #8327 from annando/acl-hidewall

Browse source 
Remove "hidewall" check from ACL
This commit is contained in:
Tobias Diekershoff 2020-02-22 11:54:39 +01:00 committed by GitHub
commit d0cc0f1d8c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/Core/ACL.php
View file

@ -218,8 +218,7 @@ class ACL
* 'allow_cid' => [], * 'allow_cid' => [],
* 'allow_gid' => [], * 'allow_gid' => [],
* 'deny_cid' => [], * 'deny_cid' => [],
* 'deny_gid' => [], * 'deny_gid' => []
* 'hidewall' => true/false
* ] * ]
* @param array $condition * @param array $condition
* @param string $form_prefix * @param string $form_prefix
@ -257,7 +256,6 @@ class ACL
'allow_gid' => $default_permissions['allow_gid'] ?? [], 'allow_gid' => $default_permissions['allow_gid'] ?? [],
'deny_cid' => $default_permissions['deny_cid'] ?? [], 'deny_cid' => $default_permissions['deny_cid'] ?? [],
'deny_gid' => $default_permissions['deny_gid'] ?? [], 'deny_gid' => $default_permissions['deny_gid'] ?? [],
'hidewall' => $default_permissions['hidewall'] ?? false,
]; ];
if (count($default_permissions['allow_cid']) if (count($default_permissions['allow_cid'])
@ -273,32 +271,22 @@ class ACL
$jotnets_fields = []; $jotnets_fields = [];
if ($for_federation) { if ($for_federation) {
$mail_enabled = false;
$pubmail_enabled = false;
if (function_exists('imap_open') && !DI::config()->get('system', 'imap_disabled')) { if (function_exists('imap_open') && !DI::config()->get('system', 'imap_disabled')) {
$mailacct = DBA::selectFirst('mailacct', ['pubmail'], ['`uid` = ? AND `server` != ""', $user['uid']]); $mailacct = DBA::selectFirst('mailacct', ['pubmail'], ['`uid` = ? AND `server` != ""', $user['uid']]);
if (DBA::isResult($mailacct)) { if (DBA::isResult($mailacct)) {
$mail_enabled = true;
$pubmail_enabled = !empty($mailacct['pubmail']);
}
}
if (!$default_permissions['hidewall']) {
if ($mail_enabled) {
$jotnets_fields[] = [ $jotnets_fields[] = [
'type' => 'checkbox', 'type' => 'checkbox',
'field' => [ 'field' => [
'pubmail_enable', 'pubmail_enable',
DI::l10n()->t('Post to Email'), DI::l10n()->t('Post to Email'),
$pubmail_enabled !empty($mailacct['pubmail'])
] ]
]; ];
}
Hook::callAll('jot_networks', $jotnets_fields);
} }
} }
Hook::callAll('jot_networks', $jotnets_fields);
}
$acl_contacts = self::getContactListByUserId($user['uid'], $condition); $acl_contacts = self::getContactListByUserId($user['uid'], $condition);
@ -326,7 +314,6 @@ class ACL
'$emailcc' => DI::l10n()->t('CC: email addresses'), '$emailcc' => DI::l10n()->t('CC: email addresses'),
'$emtitle' => DI::l10n()->t('Example: bob@example.com, mary@example.com'), '$emtitle' => DI::l10n()->t('Example: bob@example.com, mary@example.com'),
'$jotnets_summary' => DI::l10n()->t('Connectors'), '$jotnets_summary' => DI::l10n()->t('Connectors'),
'$jotnets_disabled_label' => DI::l10n()->t('Connectors disabled, since "%s" is enabled.', DI::l10n()->t('Hide your profile details from unknown viewers?')),
'$visibility' => $visibility, '$visibility' => $visibility,
'$acl_contacts' => $acl_contacts, '$acl_contacts' => $acl_contacts,
'$acl_groups' => $acl_groups, '$acl_groups' => $acl_groups,
@ -337,7 +324,6 @@ class ACL
'$group_deny' => implode(',', $default_permissions['deny_gid']), '$group_deny' => implode(',', $default_permissions['deny_gid']),
'$for_federation' => $for_federation, '$for_federation' => $for_federation,
'$jotnets_fields' => $jotnets_fields, '$jotnets_fields' => $jotnets_fields,
'$user_hidewall' => $default_permissions['hidewall'],
'$input_names' => $input_names, '$input_names' => $input_names,
'$input_group_id' => $input_group_id, '$input_group_id' => $input_group_id,
]); ]);

2
src/Module/Item/Compose.php
View file

@ -72,7 +72,7 @@ class Compose extends BaseModule
} }
} }
$user = User::getById(local_user(), ['allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', 'hidewall', 'default-location']); $user = User::getById(local_user(), ['allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', 'default-location']);
$aclFormatter = DI::aclFormatter(); $aclFormatter = DI::aclFormatter();

5
view/templates/acl_selector.tpl
View file

@ -9,10 +9,7 @@
<div class="panel-body"> <div class="panel-body">
<p>{{$public_desc}}</p> <p>{{$public_desc}}</p>
{{if $for_federation}} {{if $for_federation}}
{{if $user_hidewall}} {{if $jotnets_fields}}
<h4>{{$jotnets_summary}}</h4>
{{$jotnets_disabled_label}}
{{elseif $jotnets_fields}}
{{if $jotnets_fields|count < 3}} {{if $jotnets_fields|count < 3}}
<div class="profile-jot-net"> <div class="profile-jot-net">
{{else}} {{else}}