style tabs

[friendica.git] / mod / dfrn_request.php

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index 7675ee766ad23319f37e5e6cdcc7865319d3e895..7fb55c4bfe13d164a6b1520f9be3c91b67c5e6c7 100644 (file)
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -166,6 +166,15 @@ function dfrn_request_post(&$a) {
                        return;
                }
 
+               if(strstr($url,'@')) {
+                       $username = substr($url,0,strpos($url,'@'));
+                       $hostname = substr($url,strpos($url,'@') + 1);
+                       require_once('Scrape.php');
+
+                       $parms = scrape_meta('http://' . $url);
+                       if((x($parms,'dfrn-template')) && strstr($parms['dfrn-template'],'%s'))
+                               $url = sprintf($parms['dfrn-template'],$username);
+               }
 
                $ret = q("SELECT * FROM `contact` WHERE `uid` = %d AND `url` = '%s' LIMIT 1", 
                        intval($uid),
@@ -187,7 +196,7 @@ function dfrn_request_post(&$a) {
                if(is_array($contact_record)) {
                        // There is a contact record but no issued-id, so this
                        // is a reciprocal introduction from a known contact
-                       $r = q("UPDATE `contact` SET `issued-id` = '%s', `ret-blocked` = 1 WHERE `id` = %d LIMIT 1",
+                       $r = q("UPDATE `contact` SET `issued-id` = '%s' WHERE `id` = %d LIMIT 1",
                                dbesc($issued_id),
                                intval($contact_record['id'])
                        );