X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FACL.php;h=e6c82fd4bfdfb2b45a9ac41abaf97e27ef4a37a4;hb=295d90d496a56217383481fa7a0153e0ac48e38a;hp=19015714e9c7b48148700c0f414153330aa9cc75;hpb=3dede5dbd2120e617e4cf23ca90fa1cbd18c789f;p=friendica.git
diff --git a/src/Core/ACL.php b/src/Core/ACL.php
index 19015714e9..e6c82fd4bf 100644
--- a/src/Core/ACL.php
+++ b/src/Core/ACL.php
@@ -266,14 +266,12 @@ class ACL extends BaseObject
$default_permissions = self::getDefaultUserPermissions($user);
}
- $jotnets = '';
+ $jotnets_fields = [];
if ($show_jotnets) {
- $imap_disabled = !function_exists('imap_open') || Config::get('system', 'imap_disabled');
-
$mail_enabled = false;
$pubmail_enabled = false;
- if (!$imap_disabled) {
+ if (function_exists('imap_open') && !Config::get('system', 'imap_disabled')) {
$mailacct = DBA::selectFirst('mailacct', ['pubmail'], ['`uid` = ? AND `server` != ""', local_user()]);
if (DBA::isResult($mailacct)) {
$mail_enabled = true;
@@ -283,17 +281,20 @@ class ACL extends BaseObject
if (empty($default_permissions['hidewall'])) {
if ($mail_enabled) {
- $selected = $pubmail_enabled ? ' checked="checked"' : '';
- $jotnets .= '
' . L10n::t("Post to Email") . '
';
+ $jotnets_fields[] = [
+ 'type' => 'checkbox',
+ 'field' => [
+ 'pubmail_enable',
+ L10n::t('Post to Email'),
+ $pubmail_enabled
+ ]
+ ];
}
- Hook::callAll('jot_networks', $jotnets);
- } else {
- $jotnets .= L10n::t('Connectors disabled, since "%s" is enabled.',
- L10n::t('Hide your profile details from unknown viewers?'));
+ Hook::callAll('jot_networks', $jotnets_fields);
}
}
-
+
$tpl = Renderer::getMarkupTemplate('acl_selector.tpl');
$o = Renderer::replaceMacros($tpl, [
'$showall' => L10n::t('Visible to everybody'),
@@ -306,7 +307,10 @@ class ACL extends BaseObject
'$networks' => $show_jotnets,
'$emailcc' => L10n::t('CC: email addresses'),
'$emtitle' => L10n::t('Example: bob@example.com, mary@example.com'),
- '$jotnets' => $jotnets,
+ '$jotnets_enabled' => empty($default_permissions['hidewall']),
+ '$jotnets_summary' => L10n::t('Connectors'),
+ '$jotnets_fields' => $jotnets_fields,
+ '$jotnets_disabled_label' => L10n::t('Connectors disabled, since "%s" is enabled.', L10n::t('Hide your profile details from unknown viewers?')),
'$aclModalTitle' => L10n::t('Permissions'),
'$aclModalDismiss' => L10n::t('Close'),
'$features' => [