report failure to generate keys

[friendica.git] / mod / dfrn_request.php

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index ddf495986d842433bdb414507b67ccae058df1fe..60106661cb38afd37d07f3581a731c5446716617 100644 (file)
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -192,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;
@@ -441,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) {
@@ -472,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;
        }