From 1b87a97a81272e4b0b4773e0f929cacd173609a5 Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 22 Feb 2020 08:54:28 +0000 Subject: [PATCH] Remove "hidewall" check from ACL --- src/Core/ACL.php | 22 ++++------------------ src/Module/Item/Compose.php | 2 +- view/templates/acl_selector.tpl | 5 +---- 3 files changed, 6 insertions(+), 23 deletions(-) diff --git a/src/Core/ACL.php b/src/Core/ACL.php index 1c32759cf..f35889061 100644 --- a/src/Core/ACL.php +++ b/src/Core/ACL.php @@ -218,8 +218,7 @@ class ACL * 'allow_cid' => [], * 'allow_gid' => [], * 'deny_cid' => [], - * 'deny_gid' => [], - * 'hidewall' => true/false + * 'deny_gid' => [] * ] * @param array $condition * @param string $form_prefix @@ -257,7 +256,6 @@ class ACL 'allow_gid' => $default_permissions['allow_gid'] ?? [], 'deny_cid' => $default_permissions['deny_cid'] ?? [], 'deny_gid' => $default_permissions['deny_gid'] ?? [], - 'hidewall' => $default_permissions['hidewall'] ?? false, ]; if (count($default_permissions['allow_cid']) @@ -273,31 +271,21 @@ class ACL $jotnets_fields = []; if ($for_federation) { - $mail_enabled = false; - $pubmail_enabled = false; - if (function_exists('imap_open') && !DI::config()->get('system', 'imap_disabled')) { $mailacct = DBA::selectFirst('mailacct', ['pubmail'], ['`uid` = ? AND `server` != ""', $user['uid']]); if (DBA::isResult($mailacct)) { - $mail_enabled = true; - $pubmail_enabled = !empty($mailacct['pubmail']); - } - } - - if (!$default_permissions['hidewall']) { - if ($mail_enabled) { $jotnets_fields[] = [ 'type' => 'checkbox', 'field' => [ 'pubmail_enable', 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); @@ -326,7 +314,6 @@ class ACL '$emailcc' => DI::l10n()->t('CC: email addresses'), '$emtitle' => DI::l10n()->t('Example: bob@example.com, mary@example.com'), '$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, '$acl_contacts' => $acl_contacts, '$acl_groups' => $acl_groups, @@ -337,7 +324,6 @@ class ACL '$group_deny' => implode(',', $default_permissions['deny_gid']), '$for_federation' => $for_federation, '$jotnets_fields' => $jotnets_fields, - '$user_hidewall' => $default_permissions['hidewall'], '$input_names' => $input_names, '$input_group_id' => $input_group_id, ]); diff --git a/src/Module/Item/Compose.php b/src/Module/Item/Compose.php index 6dc879f76..c0b3f73f4 100644 --- a/src/Module/Item/Compose.php +++ b/src/Module/Item/Compose.php @@ -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(); diff --git a/view/templates/acl_selector.tpl b/view/templates/acl_selector.tpl index babedd6c0..c3abdad5b 100644 --- a/view/templates/acl_selector.tpl +++ b/view/templates/acl_selector.tpl @@ -9,10 +9,7 @@

{{$public_desc}}

{{if $for_federation}} - {{if $user_hidewall}} -

{{$jotnets_summary}}

- {{$jotnets_disabled_label}} - {{elseif $jotnets_fields}} + {{if $jotnets_fields}} {{if $jotnets_fields|count < 3}}
{{else}}