Merge pull request #13143 from MrPetovan/bug/12684-category-link

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

diff --git a/src/Core/ACL.php b/src/Core/ACL.php
index 40612fadfc23e2442a773da74ff56f4ba9b0f690..aa5e2221b782493a4b782fe11dd0bea75596eeb9 100644 (file)
--- a/src/Core/ACL.php
+++ b/src/Core/ACL.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -35,7 +35,7 @@ class ACL
 {
        /**
         * Returns the default lock state for the given user id
-        * @param int $uid 
+        * @param int $uid
         * @return bool "true" if the default settings are non public
         */
        public static function getLockstateForUserId(int $uid)
@@ -47,7 +47,7 @@ class ACL
        /**
         * Returns a select input tag for private message recipient
         *
-        * @param int  $selected Existing recipien contact ID
+        * @param int  $selected Existing recipient contact ID
         * @return string
         * @throws \Exception
         */
@@ -62,12 +62,13 @@ class ACL
                $page->registerStylesheet(Theme::getPathForFile('js/friendica-tagsinput/friendica-tagsinput.css'));
                $page->registerStylesheet(Theme::getPathForFile('js/friendica-tagsinput/friendica-tagsinput-typeahead.css'));
 
-               $contacts = self::getValidMessageRecipientsForUser(local_user());
+               $contacts = self::getValidMessageRecipientsForUser(DI::userSession()->getLocalUserId());
 
                $tpl = Renderer::getMarkupTemplate('acl/message_recipient.tpl');
                $o = Renderer::replaceMacros($tpl, [
-                       '$contacts' => $contacts,
-                       '$selected' => $selected,
+                       '$contacts'      => $contacts,
+                       '$contacts_json' => json_encode($contacts),
+                       '$selected'      => $selected,
                ]);
 
                Hook::callAll(DI::args()->getModuleName() . '_post_recipient', $o);
@@ -294,7 +295,7 @@ class ACL
                                                        !empty($mailacct['pubmail'])
                                                ]
                                        ];
-       
+
                                }
                        }
                        Hook::callAll('jot_networks', $jotnets_fields);
@@ -320,16 +321,16 @@ class ACL
                        '$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.'),
                        '$custom_title'   => DI::l10n()->t('Limited/Private'),
-                       '$custom_desc'    => DI::l10n()->t('This content will be shown only to the people in the first box, to the exception of the people mentioned in the second box. It won\'t appear anywhere public.'),
+                       '$custom_desc'    => DI::l10n()->t('This content will be shown only to the people in the first box, to the exception of the people mentioned in the second box. It won\'t appear anywhere public.') . DI::l10n()->t('Start typing the name of a contact or a group to show a filtered list. You can also mention the special groups "Followers" and "Mutuals".'),
                        '$allow_label'    => DI::l10n()->t('Show to:'),
                        '$deny_label'     => DI::l10n()->t('Except to:'),
                        '$emailcc'        => DI::l10n()->t('CC: email addresses'),
                        '$emtitle'        => DI::l10n()->t('Example: bob@example.com, mary@example.com'),
                        '$jotnets_summary' => DI::l10n()->t('Connectors'),
                        '$visibility'     => $visibility,
-                       '$acl_contacts'   => $acl_contacts,
-                       '$acl_groups'     => $acl_groups,
-                       '$acl_list'       => $acl_list,
+                       '$acl_contacts'   => json_encode($acl_contacts),
+                       '$acl_groups'     => json_encode($acl_groups),
+                       '$acl_list'       => json_encode($acl_list),
                        '$contact_allow'  => implode(',', $default_permissions['allow_cid']),
                        '$group_allow'    => implode(',', $default_permissions['allow_gid']),
                        '$contact_deny'   => implode(',', $default_permissions['deny_cid']),