friendica
/
friendica
mirror of https://git.friendi.ca/friendica/friendica.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Remove construct_acl_data()

pull/4166/head
Hypolite Petovan 2018-01-03 19:29:52 -05:00
parent 04589ecd38
commit d9c6417f5d
8 changed files with 3 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
include/acl_selectors.php
View File

@ -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()) {

1
include/conversation.php
View File

@ -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'),

1
mod/bookmarklet.php
View File

@ -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
);

3
mod/display.php
View File

@ -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);

7
mod/network.php
View File

@ -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

2
mod/photos.php
View File

@ -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,

1
mod/profile.php
View File

@ -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);

1
mod/settings.php
View File

@ -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'),