merged from develop and increased DB-version

[friendica.git] / mod / dfrn_request.php

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index 34cc9cf258032308ef7cb88ff241f23d407492f0..6592bf901fbcebd38f8cbe3b9f5ed5272fcb9430 100644 (file)
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -168,7 +168,7 @@ function dfrn_request_post(App $a)
                                        $parms['key'] // this was already escaped
                                );
                                if (DBM::is_result($r)) {
-                                       Group::addMember(User::getDefaultGroup($uid, $r[0]["network"]), $r[0]['id']);
+                                       Group::addMember(User::getDefaultGroup(local_user(), $r[0]["network"]), $r[0]['id']);
 
                                        if (isset($photo)) {
                                                Contact::updateAvatar($photo, local_user(), $r[0]["id"], true);
@@ -189,7 +189,6 @@ function dfrn_request_post(App $a)
                                }
 
                                // (ignore reply, nothing we can do it failed)
-                               // Old: goaway(Profile::zrl($dfrn_url));
                                goaway($forwardurl);
                                return; // NOTREACHED
                        }
@@ -263,13 +262,9 @@ function dfrn_request_post(App $a)
                if (DBM::is_result($r)) {
                        foreach ($r as $rr) {
                                if (!$rr['rel']) {
-                                       q("DELETE FROM `contact` WHERE `id` = %d AND NOT `self`",
-                                               intval($rr['cid'])
-                                       );
+                                       dba::delete('contact', ['id' => $rr['cid'], 'self' => false]);
                                }
-                               q("DELETE FROM `intro` WHERE `id` = %d",
-                                       intval($rr['iid'])
-                               );
+                               dba::delete('intro', ['id' => $rr['iid']]);
                        }
                }
 
@@ -581,7 +576,6 @@ function dfrn_request_content(App $a)
                                                'dfrn_id'  => $r[0]['issued-id'],
                                                'intro_id' => $intro[0]['id'],
                                                'duplex'   => (($r[0]['page-flags'] == PAGE_FREELOVE) ? 1 : 0),
-                                               'activity' => intval(PConfig::get($r[0]['uid'], 'system', 'post_newfriend'))
                                        ];
                                        dfrn_confirm_post($a, $handsfree);
                                }