Merge pull request #9039 from MrPetovan/task/frio-accent-scheme

[friendica.git] / src / Core / ACL.php

diff --git a/src/Core/ACL.php b/src/Core/ACL.php
index b604218774e3304cc0dc3ea0d4e8baba0e8b3ebf..f35889061dc17153429bb6e63aab8db59b36a182 100644 (file)
--- a/src/Core/ACL.php
+++ b/src/Core/ACL.php
@@ -1,7 +1,22 @@
 <?php
-
 /**
- * @file src/Core/Acl.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
 
 namespace Friendica\Core;
@@ -14,8 +29,6 @@ use Friendica\Model\Group;
 
 /**
  * Handle ACL management and display
- *
- * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
 class ACL
 {
@@ -205,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
@@ -244,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'])
@@ -260,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);
@@ -313,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,
@@ -324,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,
                ]);