Fix for displaying public items

[friendica.git] / mod / dfrn_request.php

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index 57bba3595e1aff0e8a26bbd5a0d3eb15c35f38fd..6592bf901fbcebd38f8cbe3b9f5ed5272fcb9430 100644 (file)
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -11,6 +11,7 @@
  *    You also find a graphic which describes the confirmation process at
  *    https://github.com/friendica/friendica/blob/master/spec/dfrn2_contact_request.png
  */
+
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
@@ -19,10 +20,12 @@ use Friendica\Core\System;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Model\Group;
-use Friendica\Model\User;
 use Friendica\Model\Profile;
+use Friendica\Model\User;
 use Friendica\Module\Login;
 use Friendica\Network\Probe;
+use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Network;
 
 require_once 'include/enotify.php';
 
@@ -134,7 +137,7 @@ function dfrn_request_post(App $a)
                                                `request`, `confirm`, `notify`, `poll`, `poco`, `network`, `aes_allow`, `hidden`, `blocked`, `pending`)
                                                VALUES ( %d, '%s', '%s', '%s', '%s', '%s' , '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, %d)",
                                                intval(local_user()),
-                                               datetime_convert(),
+                                               DateTimeFormat::utcNow(),
                                                dbesc($dfrn_url),
                                                dbesc(normalise_link($dfrn_url)),
                                                $parms['addr'],
@@ -165,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);
@@ -182,11 +185,10 @@ function dfrn_request_post(App $a)
                                }
 
                                if (strlen($dfrn_request) && strlen($confirm_key)) {
-                                       $s = fetch_url($dfrn_request . '?confirm_key=' . $confirm_key);
+                                       $s = Network::fetchUrl($dfrn_request . '?confirm_key=' . $confirm_key);
                                }
 
                                // (ignore reply, nothing we can do it failed)
-                               // Old: goaway(Profile::zrl($dfrn_url));
                                goaway($forwardurl);
                                return; // NOTREACHED
                        }
@@ -238,7 +240,7 @@ function dfrn_request_post(App $a)
                // Block friend request spam
                if ($maxreq) {
                        $r = q("SELECT * FROM `intro` WHERE `datetime` > '%s' AND `uid` = %d",
-                               dbesc(datetime_convert('UTC', 'UTC', 'now - 24 hours')),
+                               dbesc(DateTimeFormat::utc('now - 24 hours')),
                                intval($uid)
                        );
                        if (DBM::is_result($r) && count($r) > $maxreq) {
@@ -260,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']]);
                        }
                }
 
@@ -331,20 +329,20 @@ function dfrn_request_post(App $a)
                                        intval($contact_record['id'])
                                );
                        } else {
-                               $url = validate_url($url);
+                               $url = Network::isUrlValid($url);
                                if (!$url) {
                                        notice(L10n::t('Invalid profile URL.') . EOL);
                                        goaway(System::baseUrl() . '/' . $a->cmd);
                                        return; // NOTREACHED
                                }
 
-                               if (!allowed_url($url)) {
+                               if (!Network::isUrlAllowed($url)) {
                                        notice(L10n::t('Disallowed profile URL.') . EOL);
                                        goaway(System::baseUrl() . '/' . $a->cmd);
                                        return; // NOTREACHED
                                }
 
-                               if (blocked_url($url)) {
+                               if (Network::isUrlBlocked($url)) {
                                        notice(L10n::t('Blocked domain') . EOL);
                                        goaway(System::baseUrl() . '/' . $a->cmd);
                                        return; // NOTREACHED
@@ -379,7 +377,7 @@ function dfrn_request_post(App $a)
                                        `request`, `confirm`, `notify`, `poll`, `poco`, `network`, `blocked`, `pending` )
                                        VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d )",
                                        intval($uid),
-                                       dbesc(datetime_convert()),
+                                       dbesc(DateTimeFormat::utcNow()),
                                        $parms['url'],
                                        dbesc(normalise_link($url)),
                                        $parms['addr'],
@@ -427,7 +425,7 @@ function dfrn_request_post(App $a)
                                        ((x($_POST,'knowyou') && ($_POST['knowyou'] == 1)) ? 1 : 0),
                                        dbesc(notags(trim($_POST['dfrn-request-message']))),
                                        dbesc($hash),
-                                       dbesc(datetime_convert())
+                                       dbesc(DateTimeFormat::utcNow())
                                );
                        }
 
@@ -578,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);
                                }
@@ -651,8 +648,8 @@ function dfrn_request_content(App $a)
                        '$add_note' => L10n::t('Add a personal note:'),
                        '$page_desc' => $page_desc,
                        '$friendica' => L10n::t('Friendica'),
-                       '$statusnet' => L10n::t('GNU Social (Pleroma, Mastodon)'),
-                       '$diaspora' => L10n::t('Diaspora (Socialhome, Hubzilla)'),
+                       '$statusnet' => L10n::t("GNU Social \x28Pleroma, Mastodon\x29"),
+                       '$diaspora' => L10n::t("Diaspora \x28Socialhome, Hubzilla\x29"),
                        '$diasnote' => L10n::t(' - please do not use this form.  Instead, enter %s into your Diaspora search bar.', $target_addr),
                        '$your_address' => L10n::t('Your Identity Address:'),
                        '$invite_desc' => $invite_desc,