X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fdfrn_request.php;h=5a32d946e29f470ca0a441dd52375b99f51da92a;hb=7e154d5e4cb0c6be4631beef33a2ec1acc1fbdf5;hp=cec2d7f8b01c1420f82a6b6b76090c897b305047;hpb=00668aaa71336f48b141c443749a66c58a555503;p=friendica.git diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php index cec2d7f8b0..5a32d946e2 100644 --- a/mod/dfrn_request.php +++ b/mod/dfrn_request.php @@ -110,7 +110,7 @@ function dfrn_request_post(&$a) { * Scrape the other site's profile page to pick up the dfrn links, key, fn, and photo */ - require_once('Scrape.php'); + require_once('include/Scrape.php'); $parms = scrape_dfrn($dfrn_url); @@ -358,6 +358,7 @@ function dfrn_request_post(&$a) { intval($uid) ); if(! count($r)) { + notice( t('This account has not been configured for email. Request failed.') . EOL); return; } @@ -504,7 +505,7 @@ function dfrn_request_post(&$a) { } - require_once('Scrape.php'); + require_once('include/Scrape.php'); $parms = scrape_dfrn(($hcard) ? $hcard : $url); @@ -616,7 +617,7 @@ function dfrn_request_post(&$a) { * */ - $url = str_replace('{uri}', $a->get_baseurl() . '/dfrn_poll/' . $nickname, $url); + $url = str_replace('{uri}', $a->get_baseurl() . '/profile/' . $nickname, $url); goaway($url); // NOTREACHED // END $network === NETWORK_OSTATUS @@ -756,8 +757,10 @@ function dfrn_request_content(&$a) { */ if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) { - notice( t('Public access denied.') . EOL); - return; + if(! get_config('system','local_block')) { + notice( t('Public access denied.') . EOL); + return; + } }