X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fdfrn_request.php;h=b7a0dd7487e6fbbf566c7beb1eb435bcdad7ffb0;hb=b10ae510c0911bf47e8a83fd47a2b9ffdb06c42a;hp=41d13ff8118177338f5cdead6c599469ea80b64f;hpb=2e420a15f8f3e469f9ea3fd298b1283d9806698e;p=friendica.git

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index 41d13ff811..b7a0dd7487 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);
@@ -187,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
 			}
@@ -239,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) {
@@ -261,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']]);
 			}
 		}
 
@@ -380,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'],
@@ -428,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())
 				);
 			}
 
@@ -579,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);
 				}
@@ -615,7 +611,7 @@ function dfrn_request_content(App $a)
 		} elseif (x($_GET, 'address') && ($_GET['address'] != "")) {
 			$myaddr = $_GET['address'];
 		} elseif (local_user()) {
-			if (strlen($a->path)) {
+			if (strlen($a->urlpath)) {
 				$myaddr = System::baseUrl() . '/profile/' . $a->user['nickname'];
 			} else {
 				$myaddr = $a->user['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3);