Merge pull request #3110 from tobiasd/20170127-translationdocs

[friendica.git] / mod / dfrn_confirm.php

diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php
index 22d4c1535872e7388f99cce209118b4917d910aa..e2ce806275b79f5319e4e64cee3f5cf4dc6d4efa 100644 (file)
--- a/mod/dfrn_confirm.php
+++ b/mod/dfrn_confirm.php
@@ -22,7 +22,7 @@ require_once('include/enotify.php');
 require_once('include/group.php');
 require_once('include/Probe.php');
 
-function dfrn_confirm_post(&$a,$handsfree = null) {
+function dfrn_confirm_post(App $a, $handsfree = null) {
 
        if(is_array($handsfree)) {
 
@@ -224,9 +224,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
                         *
                         */
 
-                       $a->config['system']['curl_timeout'] = 120;
-
-                       $res = post_url($dfrn_confirm,$params);
+                       $res = post_url($dfrn_confirm, $params, null, $redirects, 120);
 
                        logger(' Confirm: received data: ' . $res, LOGGER_DATA);
 
@@ -436,7 +434,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 
                        if (($contact) && ($contact['network'] === NETWORK_DIASPORA)) {
                                require_once('include/diaspora.php');
-                               $ret = diaspora::send_share($user[0],$r[0]);
+                               $ret = Diaspora::send_share($user[0],$r[0]);
                                logger('share returns: ' . $ret);
                        }
 
@@ -588,7 +586,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
                        dbesc($decrypted_source_url),
                        intval($local_uid)
                );
-               if(! dbm::is_result($ret)) {
+               if(! count($ret)) {
                        if(strstr($decrypted_source_url,'http:'))
                                $newurl = str_replace('http:','https:',$decrypted_source_url);
                        else
@@ -598,7 +596,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
                                dbesc($newurl),
                                intval($local_uid)
                        );
-                       if(! dbm::is_result($ret)) {
+                       if(! count($ret)) {
                                // this is either a bogus confirmation (?) or we deleted the original introduction.
                                $message = t('Contact record was not found for you on our site.');
                                xml_status(3,$message);