Merge pull request #5086 from annando/issue-2880

[friendica.git] / mod / dfrn_confirm.php

diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php
index 9106f588028a7c5587ab6be6db09c16c1b2f7b52..857f6c82df22c15ed69bb96a6e80ee46b395b458 100644 (file)
--- a/mod/dfrn_confirm.php
+++ b/mod/dfrn_confirm.php
@@ -31,6 +31,7 @@ use Friendica\Model\User;
 use Friendica\Network\Probe;
 use Friendica\Protocol\Diaspora;
 use Friendica\Util\Crypto;
+use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
 use Friendica\Util\XML;
 
@@ -282,12 +283,14 @@ function dfrn_confirm_post(App $a, $handsfree = null)
                                notice(L10n::t('Remote site reported: ') . $message . EOL);
                        }
 
-                       if (($status == 0) && ($intro_id)) {
+                       if (($status == 0) && $intro_id) {
+                               $intro = dba::selectFirst('intro', ['note'], ['id' => $intro_id]);
+                               if (DBM::is_result($intro)) {
+                                       dba::update('contact', ['reason' => $intro['note']], ['id' => $contact_id]);
+                               }
+
                                // Success. Delete the notification.
-                               q("DELETE FROM `intro` WHERE `id` = %d AND `uid` = %d",
-                                       intval($intro_id),
-                                       intval($uid)
-                               );
+                               dba::delete('intro', ['id' => $intro_id]);
                        }
 
                        if ($status != 0) {
@@ -326,8 +329,8 @@ function dfrn_confirm_post(App $a, $handsfree = null)
                                `network` = '%s' WHERE `id` = %d
                        ",
                                intval($new_relation),
-                               dbesc(datetime_convert()),
-                               dbesc(datetime_convert()),
+                               dbesc(DateTimeFormat::utcNow()),
+                               dbesc(DateTimeFormat::utcNow()),
                                intval($duplex),
                                intval($hidden),
                                dbesc(NETWORK_DFRN),
@@ -359,10 +362,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)
                                }
                        }
 
-                       q("DELETE FROM `intro` WHERE `id` = %d AND `uid` = %d",
-                               intval($intro_id),
-                               intval($uid)
-                       );
+                       dba::delete('intro', ['id' => $intro_id]);
 
                        $r = q("UPDATE `contact` SET `name-date` = '%s',
                                `uri-date` = '%s',
@@ -377,8 +377,8 @@ function dfrn_confirm_post(App $a, $handsfree = null)
                                `rel` = %d
                                WHERE `id` = %d
                        ",
-                               dbesc(datetime_convert()),
-                               dbesc(datetime_convert()),
+                               dbesc(DateTimeFormat::utcNow()),
+                               dbesc(DateTimeFormat::utcNow()),
                                dbesc($addr),
                                dbesc($notify),
                                dbesc($poll),
@@ -390,7 +390,6 @@ function dfrn_confirm_post(App $a, $handsfree = null)
                        );
                }
 
-               /// @TODO is DBM::is_result() working here?
                if (!DBM::is_result($r)) {
                        notice(L10n::t('Unable to set contact photo.') . EOL);
                }
@@ -618,8 +617,8 @@ function dfrn_confirm_post(App $a, $handsfree = null)
                        `network` = '%s' WHERE `id` = %d
                ",
                        intval($new_relation),
-                       dbesc(datetime_convert()),
-                       dbesc(datetime_convert()),
+                       dbesc(DateTimeFormat::utcNow()),
+                       dbesc(DateTimeFormat::utcNow()),
                        intval($duplex),
                        intval($forum),
                        intval($prv),