Fix incorrect Temporal reference after Item function move rebase

[friendica.git] / mod / dfrn_request.php

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index 18a6eefaf250ad3d824c6188d219106284bac88c..34cc9cf258032308ef7cb88ff241f23d407492f0 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,11 @@ 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';
@@ -135,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'],
@@ -183,7 +185,7 @@ function dfrn_request_post(App $a)
                                }
 
                                if (strlen($dfrn_request) && strlen($confirm_key)) {
-                                       $s = Network::fetchURL($dfrn_request . '?confirm_key=' . $confirm_key);
+                                       $s = Network::fetchUrl($dfrn_request . '?confirm_key=' . $confirm_key);
                                }
 
                                // (ignore reply, nothing we can do it failed)
@@ -239,7 +241,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) {
@@ -332,20 +334,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
@@ -380,7 +382,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'],
@@ -428,7 +430,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())
                                );
                        }