oldkid/friendica
1
0
Fork 0
mirror of https://git.sekbaer.de/Friendica/friendica.git synced 2025-06-10 17:14:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use Contact::getIdForURL instead of probing

Browse source 
- Add change to mod/admin
- Add change to util/global_community_block
This commit is contained in:
Hypolite Petovan 2017-12-01 22:32:24 -05:00
parent 843ec842c3
commit 8826ece55e
2 changed files with 22 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

15
mod/admin.php
View file

@ -381,17 +381,12 @@ function admin_page_contactblock_post(App $a)
check_form_security_token_redirectOnErr('/admin/contactblock', 'admin_contactblock');
if (x($_POST, 'page_contactblock_block')) {
$net = Probe::uri($contact_url);
if (in_array($net['network'], array(NETWORK_PHANTOM, NETWORK_MAIL))) {
notice(t('This contact doesn\'t seem to exist.'));
}
$nurl = normalise_link($net['url']);
$r = dba::select('contact', ['id'], ['nurl' => $nurl, 'uid' => 0], ['limit' => 1]);
if (DBM::is_result($r)) {
Contact::block($r['id']);
$contact_id = Contact::getIdForURL($contact_url, 0);
if ($contact_id) {
Contact::block($contact_id);
notice(t('The contact has been blocked from the node'));
} else {
notice(t('Could not find any contact entry for this URL (%s)', $nurl));
notice(t('Could not find any contact entry for this URL (%s)', $contact_url));
}
}
if (x($_POST, 'page_contactblock_unblock')) {
@ -428,7 +423,7 @@ function admin_page_contactblock(App $a)
// strings //
'$title' => t('Administration'),
'$page' => t('Remote Contact Blocklist'),
'$description' => t('This page allows you to prevent any message from a remote contact to reach your node. However, your node must have knowledge of the contact before you can block it.'),
'$description' => t('This page allows you to prevent any message from a remote contact to reach your node.'),
'$submit' => t('Block Remote Contact'),
'$select_all' => t('select all'),
'$select_none' => t('select none'),