X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdfrn_request.php;h=e8bc5092625a9033c62afd2afd965bc96c961ac8;hb=a25c07b1627909eba4b0a463be53718b9eafd074;hp=41d13ff8118177338f5cdead6c599469ea80b64f;hpb=f04d40a37eb36e903433478d671a9dcd5bb6aacb;p=friendica.git diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php index 41d13ff811..e8bc509262 100644 --- 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'], @@ -166,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); @@ -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) { @@ -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()) ); }