Remove construct_acl_data()

diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index 7a488ca40bb6511b211ea57c2d45703373787e9a..9153207efb5a1ea52e4b4f2cbdd981e52e7b0580 100644 (file)
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -386,43 +386,6 @@ function populate_acl($user = null, $show_jotnets = false) {
 
 }
 
-function construct_acl_data(App $a, $user) {
-       // This function is now deactivated. It seems as if the generated data isn't used anywhere.
-       /// @todo Remove this function and all function calls before releasing Friendica 3.5.3
-       return;
-
-       // Get group and contact information for html ACL selector
-       $acl_data = acl_lookup($a, 'html');
-
-       $user_defaults = get_acl_permissions($user);
-
-       if ($acl_data['groups']) {
-               foreach ($acl_data['groups'] as $key => $group) {
-                       // Add a "selected" flag to groups that are posted to by default
-                       if ($user_defaults['allow_gid'] &&
-                                       in_array($group['id'], $user_defaults['allow_gid']) && !in_array($group['id'], $user_defaults['deny_gid']) ) {
-                               $acl_data['groups'][$key]['selected'] = 1;
-                       } else {
-                               $acl_data['groups'][$key]['selected'] = 0;
-                       }
-               }
-       }
-       if ($acl_data['contacts']) {
-               foreach ($acl_data['contacts'] as $key => $contact) {
-                       // Add a "selected" flag to groups that are posted to by default
-                       if ($user_defaults['allow_cid'] &&
-                                       in_array($contact['id'], $user_defaults['allow_cid']) && !in_array($contact['id'], $user_defaults['deny_cid']) ) {
-                               $acl_data['contacts'][$key]['selected'] = 1;
-                       } else {
-                               $acl_data['contacts'][$key]['selected'] = 0;
-                       }
-               }
-       }
-
-       return $acl_data;
-
-}
-
 function acl_lookup(App $a, $out_type = 'json') {
 
        if (!local_user()) {

diff --git a/include/conversation.php b/include/conversation.php
index 97630a65fb22633307b1397010bbce8310aded9d..3fd89d73933e72c5388044fab02f85a26e51a960 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1361,7 +1361,6 @@ function status_editor(App $a, $x, $notes_cid = 0, $popup = false)
 
                // ACL permissions box
                '$acl'           => $x['acl'],
-               '$acl_data'      => $x['acl_data'],
                '$group_perms'   => t('Post to Groups'),
                '$contact_perms' => t('Post to Contacts'),
                '$private'       => t('Private post'),

diff --git a/mod/bookmarklet.php b/mod/bookmarklet.php
index 4696ed6580e4ba0524fa5681d7bc8f37c4268c7b..2e0d449711eb569cf6c832a06f9b394197f66608 100644 (file)
--- a/mod/bookmarklet.php
+++ b/mod/bookmarklet.php
@@ -37,7 +37,6 @@ function bookmarklet_content(App $a)
                        'bang' => '',
                        'visitor' => 'block',
                        'profile_uid' => local_user(),
-                       'acl_data' => construct_acl_data($a, $a->user), // For non-Javascript ACL selector
                        'title' => trim($_REQUEST["title"], "*"),
                        'content' => $content
                );

diff --git a/mod/display.php b/mod/display.php
index 2d91d2d1aed782d8036373ee7292e5bb497eb2bf..755c8b922e526f8f69b35150650a6db3d75ce64f 100644 (file)
--- a/mod/display.php
+++ b/mod/display.php
@@ -313,9 +313,8 @@ function display_content(App $a, $update = false, $update_uid = 0) {
                        'bang' => '',
                        'visitor' => 'block',
                        'profile_uid' => local_user(),
-                       'acl_data' => construct_acl_data($a, $a->user), // For non-Javascript ACL selector
                );
-               $o .= status_editor($a,$x,0,true);
+               $o .= status_editor($a, $x, 0, true);
        }
 
        $sql_extra = item_permissions_sql($a->profile['uid'], $remote_contact, $groups);

diff --git a/mod/network.php b/mod/network.php
index 65b15cb03a5506f309b117b172649d8f614dd16e..f54ee06f0421459b77f1613b7844d77df85d8d94 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -454,11 +454,10 @@ function networkFlatView(App $a, $update = 0) {
                        'bang'  => '',
                        'visitor' => 'block',
                        'profile_uid' => local_user(),
-                       'acl_data' => construct_acl_data($a, $a->user), // For non-Javascript ACL selector
                        'content' => '',
                );
 
-               $o .= status_editor($a,$x);
+               $o .= status_editor($a, $x);
 
                if (!Config::get('theme','hide_eventlist')) {
                        $o .= get_birthdays();
@@ -605,12 +604,10 @@ function networkThreadedView(App $a, $update = 0) {
                        'bang'  => (($group || $cid || $nets) ? '!' : ''),
                        'visitor' => 'block',
                        'profile_uid' => local_user(),
-                       'acl_data' => construct_acl_data($a, $a->user), // For non-Javascript ACL selector
                        'content' => $content,
                );
 
-               $o .= status_editor($a,$x);
-
+               $o .= status_editor($a, $x);
        }
 
        // We don't have to deal with ACLs on this page. You're looking at everything

diff --git a/mod/photos.php b/mod/photos.php
index 3298e284a7cb9f6777bb6eece08d4e27887ca93f..54cfd7d4f7fa19f430037e40e09b92d5d1ee5213 100644 (file)
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -1134,7 +1134,6 @@ function photos_content(App $a)
                        '$uploadurl' => $ret['post_url'],
 
                        // ACL permissions box
-                       '$acl_data' => construct_acl_data($a, $a->user), // For non-Javascript ACL selector
                        '$group_perms' => t('Show to Groups'),
                        '$contact_perms' => t('Show to Contacts'),
                        '$return_path' => $a->query_string,
@@ -1482,7 +1481,6 @@ function photos_content(App $a)
                                '$delete' => t('Delete Photo'),
 
                                // ACL permissions box
-                               '$acl_data' => construct_acl_data($a, $ph[0]), // For non-Javascript ACL selector
                                '$group_perms' => t('Show to Groups'),
                                '$contact_perms' => t('Show to Contacts'),
                                '$return_path' => $a->query_string,

diff --git a/mod/profile.php b/mod/profile.php
index f439f754c0746a362874a38b14638dd0c74f0262..bebd28403007c6a58643ad4fa9813b8e64af5890 100644 (file)
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -210,7 +210,6 @@ function profile_content(App $a, $update = 0)
                                'bang' => '',
                                'visitor' => $is_owner || $commvisitor ? 'block' : 'none',
                                'profile_uid' => $a->profile['profile_uid'],
-                               'acl_data' => $is_owner ? construct_acl_data($a, $a->user) : '', // For non-Javascript ACL selector
                        );
 
                        $o .= status_editor($a, $x);

diff --git a/mod/settings.php b/mod/settings.php
index f9482289d75c78e6f709c530dfd84f74b51436fa..5a430e39d15b8e1643009deda7d1cca5f46199f1 100644 (file)
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -1280,7 +1280,6 @@ function settings_content(App $a) {
                '$blocktags'=> $blocktags, // array('blocktags', t('Allow friends to tag your posts:'), !$blocktags, ''),
 
                // ACL permissions box
-               '$acl_data' => construct_acl_data($a, $a->user), // For non-Javascript ACL selector
                '$group_perms' => t('Show to Groups'),
                '$contact_perms' => t('Show to Contacts'),
                '$private' => t('Default Private Post'),