From d9c6417f5dd6620d2fe2ff349b274ce745720c83 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Wed, 3 Jan 2018 19:29:52 -0500
Subject: [PATCH] Remove construct_acl_data()
---
include/acl_selectors.php | 37 -------------------------------------
include/conversation.php | 1 -
mod/bookmarklet.php | 1 -
mod/display.php | 3 +--
mod/network.php | 7 ++-----
mod/photos.php | 2 --
mod/profile.php | 1 -
mod/settings.php | 1 -
8 files changed, 3 insertions(+), 50 deletions(-)
diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index 7a488ca40b..9153207efb 100644
--- 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 97630a65fb..3fd89d7393 100644
--- 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 4696ed6580..2e0d449711 100644
--- 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 2d91d2d1ae..755c8b922e 100644
--- 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 65b15cb03a..f54ee06f04 100644
--- 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 3298e284a7..54cfd7d4f7 100644
--- 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 f439f754c0..bebd284030 100644
--- 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 f9482289d7..5a430e39d1 100644
--- 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'),
--
2.39.5