Merge branch 'develop' of github.com:friendica/friendica into rhaeder-develop

[friendica.git] / mod / dfrn_request.php

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index 99b933625e541b4b861da8fe119845653e98ff33..5455996069d0b5fd3324e0073b5c1e2d7d8b10fe 100644 (file)
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -10,6 +10,7 @@
  */
 
 require_once('include/enotify.php');
+require_once('include/Scrape.php');
 
 if(! function_exists('dfrn_request_init')) {
 function dfrn_request_init(&$a) {
@@ -41,8 +42,10 @@ function dfrn_request_init(&$a) {
 if(! function_exists('dfrn_request_post')) {
 function dfrn_request_post(&$a) {
 
-       if(($a->argc != 2) || (! count($a->profile)))
+       if(($a->argc != 2) || (! count($a->profile))) {
+               logger('Wrong count of argc or profiles: argc=' . $a->argc . ',profile()=' . count($a->profile));
                return;
+       }
 
 
        if(x($_POST, 'cancel')) {
@@ -112,8 +115,6 @@ function dfrn_request_post(&$a) {
                                         * Scrape the other site's profile page to pick up the dfrn links, key, fn, and photo
                                         */
 
-                                       require_once('include/Scrape.php');
-
                                        $parms = scrape_dfrn($dfrn_url);
 
                                        if(! count($parms)) {
@@ -462,7 +463,7 @@ function dfrn_request_post(&$a) {
                                $network = NETWORK_DFRN;
                }
 
-               logger('dfrn_request: url: ' . $url);
+               logger('dfrn_request: url: ' . $url . ',network=' . $network, LOGGER_DEBUG);
 
                if($network === NETWORK_DFRN) {
                        $ret = q("SELECT * FROM `contact` WHERE `uid` = %d AND `url` = '%s' AND `self` = 0 LIMIT 1",
@@ -826,7 +827,7 @@ function dfrn_request_content(&$a) {
                else
                        $tpl = get_markup_template('auto_request.tpl');
 
-               $page_desc .= t("Please enter your 'Identity Address' from one of the following supported communications networks:");
+               $page_desc = t("Please enter your 'Identity Address' from one of the following supported communications networks:");
 
                // see if we are allowed to have NETWORK_MAIL2 contacts
 
@@ -851,7 +852,7 @@ function dfrn_request_content(&$a) {
                        get_server()
                );
 
-               $o .= replace_macros($tpl,array(
+               $o = replace_macros($tpl,array(
                        '$header' => t('Friend/Connection Request'),
                        '$desc' => t('Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca'),
                        '$pls_answer' => t('Please answer the following:'),