Move HTML part of oid to template + replace outside the tpl

[friendica.git] / mod / dfrn_request.php

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index b3033c0aa22d0fe8586dd61f9f6496d824a4b9c6..5a32d946e29f470ca0a441dd52375b99f51da92a 100644 (file)
--- 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