X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FACL.php;h=347e8278f9eca5d3d1b2ab762e756fb382a9660c;hb=06284e60073f374c1bd411e0bba6474a13c14f10;hp=cfe46e77061f9adff0ebe8fcd784c6e1235929ce;hpb=b7527a803a5eda9a383b6fc95c522d1ebf8580eb;p=friendica.git diff --git a/src/Core/ACL.php b/src/Core/ACL.php index cfe46e7706..347e8278f9 100644 --- a/src/Core/ACL.php +++ b/src/Core/ACL.php @@ -1,7 +1,22 @@ . + * */ namespace Friendica\Core; @@ -11,197 +26,90 @@ use Friendica\Database\DBA; use Friendica\DI; use Friendica\Model\Contact; use Friendica\Model\Group; +use Friendica\Model\User; /** * Handle ACL management and display - * - * @author Hypolite Petovan */ class ACL { /** - * Returns a select input tag with all the contact of the local user + * Returns the default lock state for the given user id + * @param int $uid + * @return bool "true" if the default settings are non public + */ + public static function getLockstateForUserId(int $uid) + { + $user = User::getById($uid, ['allow_cid', 'allow_gid', 'deny_cid', 'deny_gid']); + return !empty($user['allow_cid']) || !empty($user['allow_gid']) || !empty($user['deny_cid']) || !empty($user['deny_gid']); + } + + /** + * Returns a select input tag for private message recipient * - * @param string $selname Name attribute of the select input tag - * @param string $selclass Class attribute of the select input tag - * @param array $options Available options: - * - size: length of the select box - * - mutual_friends: Only used for the hook - * - single: Only used for the hook - * - exclude: Only used for the hook - * @param array $preselected Contact ID that should be already selected + * @param int $selected Existing recipien contact ID * @return string * @throws \Exception */ - public static function getSuggestContactSelectHTML($selname, $selclass, array $options = [], array $preselected = []) + public static function getMessageContactSelectHTML(int $selected = null) { - $a = DI::app(); - - $networks = null; - - $size = ($options['size'] ?? 0) ?: 4; - $mutual = !empty($options['mutual_friends']); - $single = !empty($options['single']) && empty($options['multiple']); - $exclude = $options['exclude'] ?? false; - - switch (($options['networks'] ?? '') ?: Protocol::PHANTOM) { - case 'DFRN_ONLY': - $networks = [Protocol::DFRN]; - break; - - case 'PRIVATE': - $networks = [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::MAIL, Protocol::DIASPORA]; - break; - - case 'TWO_WAY': - if (!empty($a->user['prvnets'])) { - $networks = [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::MAIL, Protocol::DIASPORA]; - } else { - $networks = [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::MAIL, Protocol::DIASPORA, Protocol::OSTATUS]; - } - break; - - default: /// @TODO Maybe log this call? - break; - } - - $x = ['options' => $options, 'size' => $size, 'single' => $single, 'mutual' => $mutual, 'exclude' => $exclude, 'networks' => $networks]; - - Hook::callAll('contact_select_options', $x); - $o = ''; - $sql_extra = ''; - - if (!empty($x['mutual'])) { - $sql_extra .= sprintf(" AND `rel` = %d ", intval(Contact::FRIEND)); - } - - if (!empty($x['exclude'])) { - $sql_extra .= sprintf(" AND `id` != %d ", intval($x['exclude'])); - } + $page = DI::page(); - if (!empty($x['networks'])) { - /// @TODO rewrite to foreach() - array_walk($x['networks'], function (&$value) { - $value = "'" . DBA::escape($value) . "'"; - }); - $str_nets = implode(',', $x['networks']); - $sql_extra .= " AND `network` IN ( $str_nets ) "; - } - - $tabindex = (!empty($options['tabindex']) ? 'tabindex="' . $options["tabindex"] . '"' : ''); + $page->registerFooterScript(Theme::getPathForFile('asset/typeahead.js/dist/typeahead.bundle.js')); + $page->registerFooterScript(Theme::getPathForFile('js/friendica-tagsinput/friendica-tagsinput.js')); + $page->registerStylesheet(Theme::getPathForFile('js/friendica-tagsinput/friendica-tagsinput.css')); + $page->registerStylesheet(Theme::getPathForFile('js/friendica-tagsinput/friendica-tagsinput-typeahead.css')); - if (!empty($x['single'])) { - $o .= "\r\n"; - } + $condition = [ + 'uid' => local_user(), + 'self' => false, + 'blocked' => false, + 'pending' => false, + 'archive' => false, + 'deleted' => false, + 'rel' => [Contact::FOLLOWER, Contact::SHARING, Contact::FRIEND], + 'network' => Protocol::SUPPORT_PRIVATE, + ]; - $stmt = DBA::p("SELECT `id`, `name`, `url`, `network` FROM `contact` - WHERE `uid` = ? AND NOT `self` AND NOT `blocked` AND NOT `pending` AND NOT `archive` AND NOT `deleted` AND `notify` != '' - $sql_extra - ORDER BY `name` ASC ", intval(local_user()) + $contacts = Contact::selectToArray( + ['id', 'name', 'addr', 'micro'], + DBA::mergeConditions($condition, ["`notify` != ''"]) ); - $contacts = DBA::toArray($stmt); - $arr = ['contact' => $contacts, 'entry' => $o]; - // e.g. 'network_pre_contact_deny', 'profile_pre_contact_allow' - Hook::callAll(DI::module()->getName() . '_pre_' . $selname, $arr); - - if (DBA::isResult($contacts)) { - foreach ($contacts as $contact) { - if (in_array($contact['id'], $preselected)) { - $selected = ' selected="selected" '; - } else { - $selected = ''; - } - - $trimmed = mb_substr($contact['name'], 0, 20); + Hook::callAll(DI::module()->getName() . '_pre_recipient', $arr); - $o .= "\r\n"; - } - } - - $o .= '' . PHP_EOL; + $tpl = Renderer::getMarkupTemplate('acl/message_recipient.tpl'); + $o = Renderer::replaceMacros($tpl, [ + '$contacts' => $contacts, + '$selected' => $selected, + ]); - Hook::callAll(DI::module()->getName() . '_post_' . $selname, $o); + Hook::callAll(DI::module()->getName() . '_post_recipient', $o); return $o; } /** - * Returns a select input tag with all the contact of the local user + * Returns a minimal ACL block for self-only permissions * - * @param string $selname Name attribute of the select input tag - * @param string $selclass Class attribute of the select input tag - * @param array $preselected Contact IDs that should be already selected - * @param int $size Length of the select box - * @param int $tabindex Select input tag tabindex attribute + * @param int $localUserId + * @param string $explanation * @return string - * @throws \Exception + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function getMessageContactSelectHTML($selname, $selclass, array $preselected = [], $size = 4, $tabindex = null) + public static function getSelfOnlyHTML(int $localUserId, string $explanation) { - $a = DI::app(); - - $o = ''; - - // When used for private messages, we limit correspondence to mutual DFRN/Friendica friends and the selector - // to one recipient. By default our selector allows multiple selects amongst all contacts. - $sql_extra = sprintf(" AND `rel` = %d ", intval(Contact::FRIEND)); - $sql_extra .= sprintf(" AND `network` IN ('%s' , '%s') ", Protocol::DFRN, Protocol::DIASPORA); - - $tabindex_attr = !empty($tabindex) ? ' tabindex="' . intval($tabindex) . '"' : ''; - - $hidepreselected = ''; - if ($preselected) { - $sql_extra .= " AND `id` IN (" . implode(",", $preselected) . ")"; - $hidepreselected = ' style="display: none;"'; - } - - $o .= "' . PHP_EOL; - - if ($preselected) { - $o .= implode(', ', $receiverlist); - } - - Hook::callAll(DI::module()->getName() . '_post_' . $selname, $o); + $tpl = Renderer::getMarkupTemplate('acl/self_only.tpl'); + $o = Renderer::replaceMacros($tpl, [ + '$selfPublicContactId' => $selfPublicContactId, + '$explanation' => $explanation, + ]); return $o; } @@ -246,6 +154,7 @@ class ACL 'archive' => false, 'deleted' => false, 'pending' => false, + 'network' => Protocol::FEDERATED, 'rel' => [Contact::FOLLOWER, Contact::FRIEND] ], $condition), $params @@ -258,7 +167,7 @@ class ACL $acl_forums = Contact::selectToArray($fields, ['uid' => $user_id, 'self' => false, 'blocked' => false, 'archive' => false, 'deleted' => false, - 'pending' => false, 'contact-type' => Contact::TYPE_COMMUNITY], $params + 'network' => Protocol::FEDERATED, 'pending' => false, 'contact-type' => Contact::TYPE_COMMUNITY], $params ); $acl_contacts = array_merge($acl_forums, $acl_contacts); @@ -311,15 +220,14 @@ class ACL * Return the full jot ACL selector HTML * * @param Page $page - * @param array $user User array + * @param int $uid User ID * @param bool $for_federation * @param array $default_permissions Static defaults permission array: * [ * 'allow_cid' => [], * 'allow_gid' => [], * 'deny_cid' => [], - * 'deny_gid' => [], - * 'hidewall' => true/false + * 'deny_gid' => [] * ] * @param array $condition * @param string $form_prefix @@ -328,18 +236,20 @@ class ACL */ public static function getFullSelectorHTML( Page $page, - array $user = null, + int $uid = null, bool $for_federation = false, array $default_permissions = [], array $condition = [], $form_prefix = '' ) { - if (empty($user['uid'])) { + if (empty($uid)) { return ''; } static $input_group_id = 0; + $user = User::getById($uid); + $input_group_id++; $page->registerFooterScript(Theme::getPathForFile('asset/typeahead.js/dist/typeahead.bundle.js')); @@ -357,7 +267,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']) @@ -373,31 +282,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); @@ -415,7 +314,7 @@ class ACL 'emailcc' => $form_prefix ? $form_prefix . '[emailcc]' : 'emailcc', ]; - $tpl = Renderer::getMarkupTemplate('acl_selector.tpl'); + $tpl = Renderer::getMarkupTemplate('acl/full_selector.tpl'); $o = Renderer::replaceMacros($tpl, [ '$public_title' => DI::l10n()->t('Public'), '$public_desc' => DI::l10n()->t('This content will be shown to all your followers and can be seen in the community pages and by anyone with its link.'), @@ -426,7 +325,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, @@ -437,7 +335,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, ]);