scrape_dfrn now scrapes the address as well.

diff --git a/include/Scrape.php b/include/Scrape.php
index ae9331ff7af8fc389ea67aa2e24837e84f8d2e58..64a930bfdaedebfccbf46acb9f37a03085174cbe 100644 (file)
--- a/include/Scrape.php
+++ b/include/Scrape.php
@@ -4,7 +4,7 @@ require_once('library/HTML5/Parser.php');
 require_once('include/crypto.php');
 
 if(! function_exists('scrape_dfrn')) {
-function scrape_dfrn($url) {
+function scrape_dfrn($url, $dont_probe = false) {
 
        $a = get_app();
 
@@ -17,6 +17,11 @@ function scrape_dfrn($url) {
        if(! $s)
                return $ret;
 
+       $probe = probe_url($url);
+
+       if (isset($probe["addr"]))
+               $ret["addr"] = $probe["addr"];
+
        $headers = $a->get_curl_headers();
        logger('scrape_dfrn: headers=' . $headers, LOGGER_DEBUG);
 
@@ -524,7 +529,7 @@ function probe_url($url, $mode = PROBE_NORMAL, $level = 1) {
 
 
                if(strlen($dfrn)) {
-                       $ret = scrape_dfrn(($hcard) ? $hcard : $dfrn);
+                       $ret = scrape_dfrn(($hcard) ? $hcard : $dfrn, true);
                        if(is_array($ret) && x($ret,'dfrn-request')) {
                                $network = NETWORK_DFRN;
                                $request = $ret['dfrn-request'];

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index 7e5b67b7c2b1ff2024c7a5ceb0cd760097bd25ce..b0ad2d4a0f741190c5af8cced8d05651f3bc4d4c 100644 (file)
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -136,7 +136,7 @@ function dfrn_request_post(&$a) {
 
                                        $dfrn_request = $parms['dfrn-request'];
 
-                    /********* Escape the entire array ********/
+                                       /********* Escape the entire array ********/
 
                                        dbesc_array($parms);
 
@@ -146,13 +146,14 @@ function dfrn_request_post(&$a) {
                                         * Create a contact record on our site for the other person
                                         */
 
-                                       $r = q("INSERT INTO `contact` ( `uid`, `created`,`url`, `nurl`, `name`, `nick`, `photo`, `site-pubkey`,
+                                       $r = q("INSERT INTO `contact` ( `uid`, `created`,`url`, `nurl`, `addr`, `name`, `nick`, `photo`, `site-pubkey`,
                                                `request`, `confirm`, `notify`, `poll`, `poco`, `network`, `aes_allow`, `hidden`)
-                                               VALUES ( %d, '%s', '%s', '%s', '%s' , '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d)",
+                                               VALUES ( %d, '%s', '%s', '%s', '%s', '%s' , '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d)",
                                                intval(local_user()),
                                                datetime_convert(),
                                                dbesc($dfrn_url),
                                                dbesc(normalise_link($dfrn_url)),
+                                               $parms['addr'],
                                                $parms['fn'],
                                                $parms['nick'],
                                                $parms['photo'],
@@ -539,13 +540,14 @@ function dfrn_request_post(&$a) {
 
 
                                dbesc_array($parms);
-                               $r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `nurl`,`name`, `nick`, `issued-id`, `photo`, `site-pubkey`,
+                               $r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `nurl`, `addr`, `name`, `nick`, `issued-id`, `photo`, `site-pubkey`,
                                        `request`, `confirm`, `notify`, `poll`, `poco`, `network` )
-                                       VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' )",
+                                       VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' )",
                                        intval($uid),
                                        dbesc(datetime_convert()),
                                        $parms['url'],
                                        dbesc(normalise_link($parms['url'])),
+                                       $parms['addr'],
                                        $parms['fn'],
                                        $parms['nick'],
                                        $parms['issued-id'],