X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdfrn_request.php;h=b7a0dd7487e6fbbf566c7beb1eb435bcdad7ffb0;hb=b10ae510c0911bf47e8a83fd47a2b9ffdb06c42a;hp=473543b66ea749d1c8a1071844e0a4625169ad78;hpb=d49f986d1eb6894dd948577288357b6c1755e3d3;p=friendica.git

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index 473543b66e..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,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';
 
@@ -117,7 +120,7 @@ function dfrn_request_post(App $a)
 						}
 						$invalid = Probe::validDfrn($parms);
 						if ($invalid) {
-							notice(sprintf(tt("%d required parameter was not found at the given location", "%d required parameters were not found at the given location", $invalid), $invalid) . EOL);
+							notice(L10n::tt("%d required parameter was not found at the given location", "%d required parameters were not found at the given location", $invalid) . EOL);
 							return;
 						}
 					}
@@ -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'],
@@ -156,7 +159,7 @@ function dfrn_request_post(App $a)
 				}
 
 				if ($r) {
-					info(t("Introduction complete.") . EOL);
+					info(L10n::t("Introduction complete.") . EOL);
 				}
 
 				$r = q("SELECT `id`, `network` FROM `contact` WHERE `uid` = %d AND `url` = '%s' AND `site-pubkey` = '%s' LIMIT 1",
@@ -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,11 +240,11 @@ 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) {
-				notice(sprintf(t('%s has received too many connection requests today.'), $a->profile['name']) . EOL);
+				notice(L10n::t('%s has received too many connection requests today.', $a->profile['name']) . EOL);
 				notice(L10n::t('Spam protection measures have been invoked.') . EOL);
 				notice(L10n::t('Friends are advised to please try again in 24 hours.') . EOL);
 				return;
@@ -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']]);
 			}
 		}
 
@@ -313,7 +311,7 @@ function dfrn_request_post(App $a)
 					notice(L10n::t('You have already introduced yourself here.') . EOL);
 					return;
 				} elseif ($ret[0]['rel'] == CONTACT_IS_FRIEND) {
-					notice(sprintf(t('Apparently you are already friends with %s.'), $a->profile['name']) . EOL);
+					notice(L10n::t('Apparently you are already friends with %s.', $a->profile['name']) . EOL);
 					return;
 				} else {
 					$contact_record = $ret[0];
@@ -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
@@ -364,7 +362,7 @@ function dfrn_request_post(App $a)
 					}
 					$invalid = Probe::validDfrn($parms);
 					if ($invalid) {
-						notice(sprintf(tt("%d required parameter was not found at the given location", "%d required parameters were not found at the given location", $invalid), $invalid) . EOL);
+						notice(L10n::tt("%d required parameter was not found at the given location", "%d required parameters were not found at the given location", $invalid) . EOL);
 
 						return;
 					}
@@ -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,13 +425,13 @@ 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())
 				);
 			}
 
 			// This notice will only be seen by the requestor if the requestor and requestee are on the same server.
 			if (!$failed) {
-				info(t('Your introduction has been sent.') . EOL);
+				info(L10n::t('Your introduction has been sent.') . EOL);
 			}
 
 			// "Homecoming" - send the requestor back to their site to record the introduction.
@@ -487,7 +485,7 @@ function dfrn_request_content(App $a)
 	// to send us to the post section to record the introduction.
 	if (x($_GET, 'dfrn_url')) {
 		if (!local_user()) {
-			info(t("Please login to confirm introduction.") . EOL);
+			info(L10n::t("Please login to confirm introduction.") . EOL);
 			/* setup the return URL to come back to this page if they use openid */
 			return Login::form();
 		}
@@ -524,8 +522,8 @@ function dfrn_request_content(App $a)
 			'$hidethem' => L10n::t('Hide this contact'),
 			'$hidechecked' => '',
 			'$confirm_key' => $confirm_key,
-			'$welcome' => sprintf(t('Welcome home %s.'), $a->user['username']),
-			'$please' => sprintf(t('Please confirm your introduction/connection request to %s.'), $dfrn_url),
+			'$welcome' => L10n::t('Welcome home %s.', $a->user['username']),
+			'$please' => L10n::t('Please confirm your introduction/connection request to %s.', $dfrn_url),
 			'$submit' => L10n::t('Confirm'),
 			'$uid' => $_SESSION['uid'],
 			'$nickname' => $a->user['nickname'],
@@ -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);
 				}
@@ -614,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);
@@ -639,7 +636,7 @@ function dfrn_request_content(App $a)
 		$page_desc = L10n::t("Please enter your 'Identity Address' from one of the following supported communications networks:");
 
 		$invite_desc = sprintf(
-			t('If you are not yet a member of the free social web, <a href="%s">follow this link to find a public Friendica site and join us today</a>.'),
+			L10n::t('If you are not yet a member of the free social web, <a href="%s">follow this link to find a public Friendica site and join us today</a>.'),
 			get_server() . '/servers'
 		);
 
@@ -647,13 +644,13 @@ function dfrn_request_content(App $a)
 			'$header' => L10n::t('Friend/Connection Request'),
 			'$desc' => L10n::t('Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@gnusocial.de'),
 			'$pls_answer' => L10n::t('Please answer the following:'),
-			'$does_know_you' => ['knowyou', sprintf(t('Does %s know you?'), $a->profile['name']), false, '', [t('No'), L10n::t('Yes')]],
+			'$does_know_you' => ['knowyou', L10n::t('Does %s know you?', $a->profile['name']), false, '', [L10n::t('No'), L10n::t('Yes')]],
 			'$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)'),
-			'$diasnote' => sprintf(t(' - please do not use this form.  Instead, enter %s into your Diaspora search bar.'), $target_addr),
+			'$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,
 			'$submit' => L10n::t('Submit Request'),