she'll be right

[friendica.git] / mod / dfrn_request.php

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index 7a3060ff4fc01ffb5b55586f2ee6995193ea0a58..60106661cb38afd37d07f3581a731c5446716617 100644 (file)
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -44,7 +44,7 @@ function dfrn_request_post(&$a) {
        
                        if(x($dfrn_url)) {
        
-                               $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `url` = '%s' LIMIT 1",
+                               $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `url` = '%s' AND `self` = 0 LIMIT 1",
                                        intval(local_user()),
                                        dbesc($dfrn_url)
                                );
@@ -96,13 +96,14 @@ function dfrn_request_post(&$a) {
                                        dbesc_array($parms);
 
 
-                                       $r = q("INSERT INTO `contact` ( `uid`, `created`,`url`, `name`, `photo`, `site-pubkey`,
+                                       $r = q("INSERT INTO `contact` ( `uid`, `created`,`url`, `name`, `nick`, `photo`, `site-pubkey`,
                                                `request`, `confirm`, `notify`, `poll`, `aes_allow`) 
-                                               VALUES ( %d, '%s', '%s', '%s' , '%s', '%s', '%s', '%s', '%s', '%s', %d)",
+                                               VALUES ( %d, '%s', '%s', '%s' , '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d)",
                                                intval(local_user()),
                                                datetime_convert(),
                                                dbesc($dfrn_url),
                                                $parms['fn'],
+                                               $parms['nick'],
                                                $parms['photo'],
                                                $parms['key'],
                                                $parms['dfrn-request'],
@@ -191,6 +192,8 @@ function dfrn_request_post(&$a) {
                        $network = 'dfrn';
                }
 
+               logger('dfrn_request: url: ' . $url);
+
                if(! strlen($url)) {
                        notice( t("Unable to resolve your name at the provided location.") . EOL);                      
                        return;
@@ -198,7 +201,7 @@ function dfrn_request_post(&$a) {
 
 
                if($network === 'dfrn') {
-                       $ret = q("SELECT * FROM `contact` WHERE `uid` = %d AND `url` = '%s' LIMIT 1", 
+                       $ret = q("SELECT * FROM `contact` WHERE `uid` = %d AND `url` = '%s' AND `self` = 0 LIMIT 1", 
                                intval($uid),
                                dbesc($url)
                        );
@@ -271,13 +274,14 @@ function dfrn_request_post(&$a) {
 
 
                                dbesc_array($parms);
-                               $r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `name`, `issued-id`, `photo`, `site-pubkey`,
+                               $r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `name`, `nick`, `issued-id`, `photo`, `site-pubkey`,
                                        `request`, `confirm`, `notify`, `poll` )
-                                       VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' )",
+                                       VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' )",
                                        intval($uid),
                                        datetime_convert(),
                                        $parms['url'],
                                        $parms['fn'],
+                                       $parms['nick'],
                                        $parms['issued-id'],
                                        $parms['photo'],
                                        $parms['key'],
@@ -439,7 +443,7 @@ function dfrn_request_content(&$a) {
                                        $res = mail($r[0]['email'], 
                                                t("Introduction received at ") . $a->config['sitename'],
                                                $email,
-                                               'From: ' . t('Administrator') . '@' . $_SERVER[SERVER_NAME] );
+                                               'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] );
                                        // This is a redundant notification - no point throwing errors if it fails.
                                }
                                if($auto_confirm) {
@@ -470,13 +474,17 @@ function dfrn_request_content(&$a) {
                return; // NOTREACHED
        }
        else {
-
+               $myaddr = ((x($_GET,'address')) ? urldecode($_GET['address']) : '');
                // Normal web request. Display our user's introduction form. 
                if($a->profile['page-flags'] == PAGE_NORMAL)
                        $tpl = load_view_file('view/dfrn_request.tpl');
                else
                        $tpl = load_view_file('view/auto_request.tpl');
-               $o .= replace_macros($tpl,array('$nickname' => $a->argv[1]));
+               $o .= replace_macros($tpl,array(
+                       '$nickname' => $a->argv[1],
+                       '$name' => $a->profile['name'],
+                       '$myaddr' => $myaddr
+               ));
                return $o;
        }