X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdfrn_request.php;h=25fe69066fb3d51619c2de82353b927b9951e786;hb=f8b74033a4f990e421814ea5bf8b443104e61feb;hp=4fd31e485e1b8a030913cd8dd2f4d2f7707aed0b;hpb=a5952e5425ee623253b2c91daa873ff6cc63bd39;p=friendica.git

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index 4fd31e485e..25fe69066f 100644
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -11,17 +11,21 @@
  *    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\PConfig;
+use Friendica\Core\L10n;
+use Friendica\Core\Protocol;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 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';
 
@@ -81,13 +85,13 @@ function dfrn_request_post(App $a)
 				// Lookup the contact based on their URL (which is the only unique thing we have at the moment)
 				$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' AND NOT `self` LIMIT 1",
 					intval(local_user()),
-					dbesc(normalise_link($dfrn_url))
+					DBA::escape(normalise_link($dfrn_url))
 				);
 
-				if (DBM::is_result($r)) {
+				if (DBA::isResult($r)) {
 					if (strlen($r[0]['dfrn-id'])) {
 						// We don't need to be here. It has already happened.
-						notice(t("This introduction has already been accepted.") . EOL);
+						notice(L10n::t("This introduction has already been accepted.") . EOL);
 						return;
 					} else {
 						$contact_record = $r[0];
@@ -105,18 +109,18 @@ function dfrn_request_post(App $a)
 					$parms = Probe::profile($dfrn_url);
 
 					if (!count($parms)) {
-						notice(t('Profile location is not valid or does not contain profile information.') . EOL);
+						notice(L10n::t('Profile location is not valid or does not contain profile information.') . EOL);
 						return;
 					} else {
 						if (!x($parms, 'fn')) {
-							notice(t('Warning: profile location has no identifiable owner name.') . EOL);
+							notice(L10n::t('Warning: profile location has no identifiable owner name.') . EOL);
 						}
 						if (!x($parms, 'photo')) {
-							notice(t('Warning: profile location has no profile photo.') . EOL);
+							notice(L10n::t('Warning: profile location has no profile photo.') . EOL);
 						}
 						$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;
 						}
 					}
@@ -126,16 +130,16 @@ function dfrn_request_post(App $a)
 					$photo = $parms["photo"];
 
 					// Escape the entire array
-					DBM::esc_array($parms);
+					DBA::escapeArray($parms);
 
 					// Create a contact record on our site for the other person
 					$r = q("INSERT INTO `contact` ( `uid`, `created`,`url`, `nurl`, `addr`, `name`, `nick`, `photo`, `site-pubkey`,
-						`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)",
+						`request`, `confirm`, `notify`, `poll`, `network`, `aes_allow`, `hidden`, `blocked`, `pending`)
+						VALUES ( %d, '%s', '%s', '%s', '%s', '%s' , '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, %d)",
 						intval(local_user()),
-						datetime_convert(),
-						dbesc($dfrn_url),
-						dbesc(normalise_link($dfrn_url)),
+						DateTimeFormat::utcNow(),
+						DBA::escape($dfrn_url),
+						DBA::escape(normalise_link($dfrn_url)),
 						$parms['addr'],
 						$parms['fn'],
 						$parms['nick'],
@@ -145,8 +149,7 @@ function dfrn_request_post(App $a)
 						$parms['dfrn-confirm'],
 						$parms['dfrn-notify'],
 						$parms['dfrn-poll'],
-						$parms['dfrn-poco'],
-						dbesc(NETWORK_DFRN),
+						DBA::escape(Protocol::DFRN),
 						intval($aes_allow),
 						intval($hidden),
 						intval($blocked),
@@ -155,16 +158,16 @@ 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",
 					intval(local_user()),
-					dbesc($dfrn_url),
+					DBA::escape($dfrn_url),
 					$parms['key'] // this was already escaped
 				);
-				if (DBM::is_result($r)) {
-					Group::addMember(User::getDefaultGroup($uid, $r[0]["network"]), $r[0]['id']);
+				if (DBA::isResult($r)) {
+					Group::addMember(User::getDefaultGroup(local_user(), $r[0]["network"]), $r[0]['id']);
 
 					if (isset($photo)) {
 						Contact::updateAvatar($photo, local_user(), $r[0]["id"], true);
@@ -181,18 +184,17 @@ 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
 			}
 		}
 
 		// invalid/bogus request
-		notice(t('Unrecoverable protocol error.') . EOL);
+		notice(L10n::t('Unrecoverable protocol error.') . EOL);
 		goaway(System::baseUrl());
 		return; // NOTREACHED
 	}
@@ -219,7 +221,7 @@ function dfrn_request_post(App $a)
 	 *
 	 */
 	if (!(is_array($a->profile) && count($a->profile))) {
-		notice(t('Profile unavailable.') . EOL);
+		notice(L10n::t('Profile unavailable.') . EOL);
 		return;
 	}
 
@@ -237,13 +239,13 @@ 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')),
+				DBA::escape(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(t('Spam protection measures have been invoked.') . EOL);
-				notice(t('Friends are advised to please try again in 24 hours.') . EOL);
+			if (DBA::isResult($r) && count($r) > $maxreq) {
+				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;
 			}
 		}
@@ -256,16 +258,12 @@ function dfrn_request_post(App $a)
 			WHERE `intro`.`blocked` = 1 AND `contact`.`self` = 0
 			AND `intro`.`datetime` < UTC_TIMESTAMP() - INTERVAL 30 MINUTE "
 		);
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($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']]);
 			}
 		}
 
@@ -273,7 +271,7 @@ function dfrn_request_post(App $a)
 
 		$url = trim($_POST['dfrn_url']);
 		if (!strlen($url)) {
-			notice(t("Invalid locator") . EOL);
+			notice(L10n::t("Invalid locator") . EOL);
 			return;
 		}
 
@@ -290,29 +288,29 @@ function dfrn_request_post(App $a)
 			// Every time we detect the remote subscription we define this as OStatus.
 			// We do this even if it is not OStatus.
 			// we only need to pass this through another section of the code.
-			if ($network != NETWORK_DIASPORA) {
-				$network = NETWORK_OSTATUS;
+			if ($network != Protocol::DIASPORA) {
+				$network = Protocol::OSTATUS;
 			}
 
 			$url = substr($url, 5);
 		} else {
-			$network = NETWORK_DFRN;
+			$network = Protocol::DFRN;
 		}
 
 		logger('dfrn_request: url: ' . $url . ',network=' . $network, LOGGER_DEBUG);
 
-		if ($network === NETWORK_DFRN) {
+		if ($network === Protocol::DFRN) {
 			$ret = q("SELECT * FROM `contact` WHERE `uid` = %d AND `url` = '%s' AND `self` = 0 LIMIT 1",
 				intval($uid),
-				dbesc($url)
+				DBA::escape($url)
 			);
 
-			if (DBM::is_result($ret)) {
+			if (DBA::isResult($ret)) {
 				if (strlen($ret[0]['issued-id'])) {
-					notice(t('You have already introduced yourself here.') . EOL);
+					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);
+				} elseif ($ret[0]['rel'] == Contact::FRIEND) {
+					notice(L10n::t('Apparently you are already friends with %s.', $a->profile['name']) . EOL);
 					return;
 				} else {
 					$contact_record = $ret[0];
@@ -326,25 +324,25 @@ function dfrn_request_post(App $a)
 				// There is a contact record but no issued-id, so this
 				// is a reciprocal introduction from a known contact
 				$r = q("UPDATE `contact` SET `issued-id` = '%s' WHERE `id` = %d",
-					dbesc($issued_id),
+					DBA::escape($issued_id),
 					intval($contact_record['id'])
 				);
 			} else {
-				$url = validate_url($url);
+				$url = Network::isUrlValid($url);
 				if (!$url) {
-					notice(t('Invalid profile URL.') . EOL);
+					notice(L10n::t('Invalid profile URL.') . EOL);
 					goaway(System::baseUrl() . '/' . $a->cmd);
 					return; // NOTREACHED
 				}
 
-				if (!allowed_url($url)) {
-					notice(t('Disallowed profile URL.') . EOL);
+				if (!Network::isUrlAllowed($url)) {
+					notice(L10n::t('Disallowed profile URL.') . EOL);
 					goaway(System::baseUrl() . '/' . $a->cmd);
 					return; // NOTREACHED
 				}
 
-				if (blocked_url($url)) {
-					notice(t('Blocked domain') . EOL);
+				if (Network::isUrlBlocked($url)) {
+					notice(L10n::t('Blocked domain') . EOL);
 					goaway(System::baseUrl() . '/' . $a->cmd);
 					return; // NOTREACHED
 				}
@@ -352,18 +350,18 @@ function dfrn_request_post(App $a)
 				$parms = Probe::profile(($hcard) ? $hcard : $url);
 
 				if (!count($parms)) {
-					notice(t('Profile location is not valid or does not contain profile information.') . EOL);
+					notice(L10n::t('Profile location is not valid or does not contain profile information.') . EOL);
 					goaway(System::baseUrl() . '/' . $a->cmd);
 				} else {
 					if (!x($parms, 'fn')) {
-						notice(t('Warning: profile location has no identifiable owner name.') . EOL);
+						notice(L10n::t('Warning: profile location has no identifiable owner name.') . EOL);
 					}
 					if (!x($parms, 'photo')) {
-						notice(t('Warning: profile location has no profile photo.') . EOL);
+						notice(L10n::t('Warning: profile location has no profile photo.') . EOL);
 					}
 					$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;
 					}
@@ -373,14 +371,14 @@ function dfrn_request_post(App $a)
 				$parms['issued-id'] = $issued_id;
 				$photo = $parms["photo"];
 
-				DBM::esc_array($parms);
+				DBA::escapeArray($parms);
 				$r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `nurl`, `addr`, `name`, `nick`, `issued-id`, `photo`, `site-pubkey`,
-					`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 )",
+					`request`, `confirm`, `notify`, `poll`, `network`, `blocked`, `pending` )
+					VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d )",
 					intval($uid),
-					dbesc(datetime_convert()),
+					DBA::escape(DateTimeFormat::utcNow()),
 					$parms['url'],
-					dbesc(normalise_link($url)),
+					DBA::escape(normalise_link($url)),
 					$parms['addr'],
 					$parms['fn'],
 					$parms['nick'],
@@ -391,8 +389,7 @@ function dfrn_request_post(App $a)
 					$parms['dfrn-confirm'],
 					$parms['dfrn-notify'],
 					$parms['dfrn-poll'],
-					$parms['dfrn-poco'],
-					dbesc(NETWORK_DFRN),
+					DBA::escape(Protocol::DFRN),
 					intval($blocked),
 					intval($pending)
 				);
@@ -405,14 +402,14 @@ function dfrn_request_post(App $a)
 						$parms['url'],
 						$parms['issued-id']
 					);
-					if (DBM::is_result($r)) {
+					if (DBA::isResult($r)) {
 						$contact_record = $r[0];
 						Contact::updateAvatar($photo, $uid, $contact_record["id"], true);
 					}
 				}
 			}
 			if ($r === false) {
-				notice(t('Failed to update contact record.') . EOL);
+				notice(L10n::t('Failed to update contact record.') . EOL);
 				return;
 			}
 
@@ -424,15 +421,15 @@ function dfrn_request_post(App $a)
 					intval($uid),
 					intval($contact_record['id']),
 					((x($_POST,'knowyou') && ($_POST['knowyou'] == 1)) ? 1 : 0),
-					dbesc(notags(trim($_POST['dfrn-request-message']))),
-					dbesc($hash),
-					dbesc(datetime_convert())
+					DBA::escape(notags(trim(defaults($_POST, 'dfrn-request-message', '')))),
+					DBA::escape($hash),
+					DBA::escape(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.
@@ -445,15 +442,15 @@ function dfrn_request_post(App $a)
 				. (($aes_allow) ? "&aes_allow=1" : "")
 			);
 			// NOTREACHED
-			// END $network === NETWORK_DFRN
-		} elseif (($network != NETWORK_PHANTOM) && ($url != "")) {
+			// END $network === Protocol::DFRN
+		} elseif (($network != Protocol::PHANTOM) && ($url != "")) {
 
 			/* Substitute our user's feed URL into $url template
 			 * Send the subscriber home to subscribe
 			 */
 			// Diaspora needs the uri in the format user@domain.tld
 			// Diaspora will support the remote subscription in a future version
-			if ($network == NETWORK_DIASPORA) {
+			if ($network == Protocol::DIASPORA) {
 				$uri = $nickname . '@' . $a->get_hostname();
 
 				if ($a->get_path()) {
@@ -468,9 +465,9 @@ function dfrn_request_post(App $a)
 			$url = str_replace('{uri}', $uri, $url);
 			goaway($url);
 			// NOTREACHED
-			// END $network != NETWORK_PHANTOM
+			// END $network != Protocol::PHANTOM
 		} else {
-			notice(t("Remote subscription can't be done for your network. Please subscribe directly on your system.") . EOL);
+			notice(L10n::t("Remote subscription can't be done for your network. Please subscribe directly on your system.") . EOL);
 			return;
 		}
 	} return;
@@ -486,7 +483,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();
 		}
@@ -494,7 +491,7 @@ function dfrn_request_content(App $a)
 		// Edge case, but can easily happen in the wild. This person is authenticated,
 		// but not as the person who needs to deal with this request.
 		if ($a->user['nickname'] != $a->argv[1]) {
-			notice(t("Incorrect identity currently logged in. Please login to <strong>this</strong> profile.") . EOL);
+			notice(L10n::t("Incorrect identity currently logged in. Please login to <strong>this</strong> profile.") . EOL);
 			return Login::form();
 		}
 
@@ -508,7 +505,7 @@ function dfrn_request_content(App $a)
 			$_POST["confirm_key"] = $confirm_key;
 			$_POST["localconfirm"] = 1;
 			$_POST["hidden-contact"] = 0;
-			$_POST["submit"] = t('Confirm');
+			$_POST["submit"] = L10n::t('Confirm');
 
 			dfrn_request_post($a);
 
@@ -520,12 +517,12 @@ function dfrn_request_content(App $a)
 		$o = replace_macros($tpl, [
 			'$dfrn_url' => $dfrn_url,
 			'$aes_allow' => (($aes_allow) ? '<input type="hidden" name="aes_allow" value="1" />' : "" ),
-			'$hidethem' => t('Hide this contact'),
+			'$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),
-			'$submit' => t('Confirm'),
+			'$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'],
 			'dfrn_rawurl' => $_GET['dfrn_url']
@@ -536,10 +533,10 @@ function dfrn_request_content(App $a)
 		// We could just unblock it, but first we have to jump through a few hoops to
 		// send an email, or even to find out if we need to send an email.
 		$intro = q("SELECT * FROM `intro` WHERE `hash` = '%s' LIMIT 1",
-			dbesc($_GET['confirm_key'])
+			DBA::escape($_GET['confirm_key'])
 		);
 
-		if (DBM::is_result($intro)) {
+		if (DBA::isResult($intro)) {
 			$r = q("SELECT `contact`.*, `user`.* FROM `contact` LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid`
 				WHERE `contact`.`id` = %d LIMIT 1",
 				intval($intro[0]['contact-id'])
@@ -547,8 +544,8 @@ function dfrn_request_content(App $a)
 
 			$auto_confirm = false;
 
-			if (DBM::is_result($r)) {
-				if ($r[0]['page-flags'] != PAGE_NORMAL && $r[0]['page-flags'] != PAGE_PRVGROUP) {
+			if (DBA::isResult($r)) {
+				if ($r[0]['page-flags'] != Contact::PAGE_NORMAL && $r[0]['page-flags'] != Contact::PAGE_PRVGROUP) {
 					$auto_confirm = true;
 				}
 
@@ -561,7 +558,7 @@ function dfrn_request_content(App $a)
 						'to_email'     => $r[0]['email'],
 						'uid'          => $r[0]['uid'],
 						'link'         => System::baseUrl() . '/notifications/intros',
-						'source_name'  => ((strlen(stripslashes($r[0]['name']))) ? stripslashes($r[0]['name']) : t('[Name Withheld]')),
+						'source_name'  => ((strlen(stripslashes($r[0]['name']))) ? stripslashes($r[0]['name']) : L10n::t('[Name Withheld]')),
 						'source_link'  => $r[0]['url'],
 						'source_photo' => $r[0]['photo'],
 						'verb'         => ACTIVITY_REQ_FRIEND,
@@ -576,8 +573,7 @@ function dfrn_request_content(App $a)
 						'node'     => $r[0]['nickname'],
 						'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'))
+						'duplex'   => (($r[0]['page-flags'] == Contact::PAGE_FREELOVE) ? 1 : 0),
 					];
 					dfrn_confirm_post($a, $handsfree);
 				}
@@ -589,7 +585,7 @@ function dfrn_request_content(App $a)
 				// in dfrn_confirm_post()
 
 				$r = q("UPDATE `intro` SET `blocked` = 0 WHERE `hash` = '%s'",
-					dbesc($_GET['confirm_key'])
+					DBA::escape($_GET['confirm_key'])
 				);
 			}
 		}
@@ -600,7 +596,7 @@ function dfrn_request_content(App $a)
 		// Normal web request. Display our user's introduction form.
 		if ((Config::get('system', 'block_public')) && (!local_user()) && (!remote_user())) {
 			if (!Config::get('system', 'local_block')) {
-				notice(t('Public access denied.') . EOL);
+				notice(L10n::t('Public access denied.') . EOL);
 				return;
 			}
 		}
@@ -613,7 +609,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);
@@ -629,34 +625,34 @@ function dfrn_request_content(App $a)
 		 * because nobody is going to read the comments and
 		 * it doesn't matter if they know you or not.
 		 */
-		if ($a->profile['page-flags'] == PAGE_NORMAL) {
+		if ($a->profile['page-flags'] == Contact::PAGE_NORMAL) {
 			$tpl = get_markup_template('dfrn_request.tpl');
 		} else {
 			$tpl = get_markup_template('auto_request.tpl');
 		}
 
-		$page_desc = t("Please enter your 'Identity Address' from one of the following supported communications networks:");
+		$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'
 		);
 
 		$o = replace_macros($tpl, [
-			'$header' => t('Friend/Connection Request'),
-			'$desc' => t('Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@gnusocial.de'),
-			'$pls_answer' => t('Please answer the following:'),
-			'$does_know_you' => ['knowyou', sprintf(t('Does %s know you?'), $a->profile['name']), false, '', [t('No'), t('Yes')]],
-			'$add_note' => t('Add a personal note:'),
+			'$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', 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' => t('Friendica'),
-			'$statusnet' => t('GNU Social (Pleroma, Mastodon)'),
-			'$diaspora' => t('Diaspora (Socialhome, Hubzilla)'),
-			'$diasnote' => sprintf(t(' - please do not use this form.  Instead, enter %s into your Diaspora search bar.'), $target_addr),
-			'$your_address' => t('Your Identity Address:'),
+			'$friendica' => L10n::t('Friendica'),
+			'$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' => t('Submit Request'),
-			'$cancel' => t('Cancel'),
+			'$submit' => L10n::t('Submit Request'),
+			'$cancel' => L10n::t('Cancel'),
 			'$nickname' => $a->argv[1],
 			'$name' => $a->profile['name'],
 			'$myaddr' => $myaddr