X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdfrn_request.php;h=38a3f310acc2b2839825033f8ac40b1190b3260b;hb=b9dba631aadf6c25a97b679808c684276b3dd76a;hp=fdb1a42ee292ac1810ba2b215b0ac7b91b86d86c;hpb=7d5494dd67f58e1fc63c6571946e26290092321c;p=friendica.git
diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index fdb1a42ee2..38a3f310ac 100644
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -19,25 +19,27 @@ use Friendica\Core\Logger;
use Friendica\Core\Protocol;
use Friendica\Core\Renderer;
use Friendica\Core\System;
+use Friendica\Core\Session;
use Friendica\Database\DBA;
+use Friendica\DI;
use Friendica\Model\Contact;
use Friendica\Model\Group;
use Friendica\Model\Profile;
use Friendica\Model\User;
-use Friendica\Module\Login;
+use Friendica\Module\Security\Login;
use Friendica\Network\Probe;
+use Friendica\Protocol\Activity;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Network;
-
-require_once 'include/enotify.php';
+use Friendica\Util\Strings;
function dfrn_request_init(App $a)
{
if ($a->argc > 1) {
$which = $a->argv[1];
+ Profile::load($a, $which);
}
- Profile::load($a, $which);
return;
}
@@ -55,6 +57,9 @@ function dfrn_request_init(App $a)
* in order to link our friend request with our own server cell.
* After logging in, we click 'submit' to approve the linkage.
*
+ * @param App $a
+ * @throws ImagickException
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
function dfrn_request_post(App $a)
{
@@ -63,8 +68,8 @@ function dfrn_request_post(App $a)
return;
}
- if (x($_POST, 'cancel')) {
- $a->internalRedirect();
+ if (!empty($_POST['cancel'])) {
+ DI::baseUrl()->redirect();
}
/*
@@ -72,22 +77,22 @@ function dfrn_request_post(App $a)
* to confirm the request, and then we've clicked submit (perhaps after logging in).
* That brings us here:
*/
- if ((x($_POST, 'localconfirm')) && ($_POST['localconfirm'] == 1)) {
+ if (!empty($_POST['localconfirm']) && ($_POST['localconfirm'] == 1)) {
// Ensure this is a valid request
- if (local_user() && ($a->user['nickname'] == $a->argv[1]) && (x($_POST, 'dfrn_url'))) {
- $dfrn_url = notags(trim($_POST['dfrn_url']));
- $aes_allow = (((x($_POST, 'aes_allow')) && ($_POST['aes_allow'] == 1)) ? 1 : 0);
- $confirm_key = ((x($_POST, 'confirm_key')) ? $_POST['confirm_key'] : "");
- $hidden = ((x($_POST, 'hidden-contact')) ? intval($_POST['hidden-contact']) : 0);
+ if (local_user() && ($a->user['nickname'] == $a->argv[1]) && !empty($_POST['dfrn_url'])) {
+ $dfrn_url = Strings::escapeTags(trim($_POST['dfrn_url']));
+ $aes_allow = !empty($_POST['aes_allow']);
+ $confirm_key = $_POST['confirm_key'] ?? '';
+ $hidden = (!empty($_POST['hidden-contact']) ? intval($_POST['hidden-contact']) : 0);
$contact_record = null;
- $blocked = 1;
- $pending = 1;
+ $blocked = 1;
+ $pending = 1;
- if (x($dfrn_url)) {
+ if (!empty($dfrn_url)) {
// 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()),
- DBA::escape(normalise_link($dfrn_url))
+ DBA::escape(Strings::normaliseLink($dfrn_url))
);
if (DBA::isResult($r)) {
@@ -114,10 +119,10 @@ function dfrn_request_post(App $a)
notice(L10n::t('Profile location is not valid or does not contain profile information.') . EOL);
return;
} else {
- if (!x($parms, 'fn')) {
+ if (empty($parms['fn'])) {
notice(L10n::t('Warning: profile location has no identifiable owner name.') . EOL);
}
- if (!x($parms, 'photo')) {
+ if (empty($parms['photo'])) {
notice(L10n::t('Warning: profile location has no profile photo.') . EOL);
}
$invalid = Probe::validDfrn($parms);
@@ -141,7 +146,7 @@ function dfrn_request_post(App $a)
intval(local_user()),
DateTimeFormat::utcNow(),
DBA::escape($dfrn_url),
- DBA::escape(normalise_link($dfrn_url)),
+ DBA::escape(Strings::normaliseLink($dfrn_url)),
$parms['addr'],
$parms['fn'],
$parms['nick'],
@@ -166,7 +171,7 @@ function dfrn_request_post(App $a)
$r = q("SELECT `id`, `network` FROM `contact` WHERE `uid` = %d AND `url` = '%s' AND `site-pubkey` = '%s' LIMIT 1",
intval(local_user()),
DBA::escape($dfrn_url),
- $parms['key'] // this was already escaped
+ $parms['key'] ?? '' // Potentially missing
);
if (DBA::isResult($r)) {
Group::addMember(User::getDefaultGroup(local_user(), $r[0]["network"]), $r[0]['id']);
@@ -185,19 +190,19 @@ function dfrn_request_post(App $a)
$dfrn_request = $contact_record['request'];
}
- if (strlen($dfrn_request) && strlen($confirm_key)) {
- $s = Network::fetchUrl($dfrn_request . '?confirm_key=' . $confirm_key);
+ if (!empty($dfrn_request) && strlen($confirm_key)) {
+ Network::fetchUrl($dfrn_request . '?confirm_key=' . $confirm_key);
}
// (ignore reply, nothing we can do it failed)
- $a->internalRedirect($forward_path);
+ DI::baseUrl()->redirect($forward_path);
return; // NOTREACHED
}
}
// invalid/bogus request
notice(L10n::t('Unrecoverable protocol error.') . EOL);
- $a->internalRedirect();
+ DI::baseUrl()->redirect();
return; // NOTREACHED
}
@@ -228,7 +233,6 @@ function dfrn_request_post(App $a)
}
$nickname = $a->profile['nickname'];
- $notify_flags = $a->profile['notify-flags'];
$uid = $a->profile['uid'];
$maxreq = intval($a->profile['maxreq']);
$contact_record = null;
@@ -237,7 +241,7 @@ function dfrn_request_post(App $a)
$blocked = 1;
$pending = 1;
- if (x($_POST, 'dfrn_url')) {
+ if (!empty($_POST['dfrn_url'])) {
// Block friend request spam
if ($maxreq) {
$r = q("SELECT * FROM `intro` WHERE `datetime` > '%s' AND `uid` = %d",
@@ -269,8 +273,6 @@ function dfrn_request_post(App $a)
}
}
- $real_name = x($_POST, 'realname') ? notags(trim($_POST['realname'])) : '';
-
$url = trim($_POST['dfrn_url']);
if (!strlen($url)) {
notice(L10n::t("Invalid locator") . EOL);
@@ -320,7 +322,7 @@ function dfrn_request_post(App $a)
}
}
- $issued_id = random_string();
+ $issued_id = Strings::getRandomHex();
if (is_array($contact_record)) {
// There is a contact record but no issued-id, so this
@@ -333,19 +335,19 @@ function dfrn_request_post(App $a)
$url = Network::isUrlValid($url);
if (!$url) {
notice(L10n::t('Invalid profile URL.') . EOL);
- $a->internalRedirect($a->cmd);
+ DI::baseUrl()->redirect(DI::args()->getCommand());
return; // NOTREACHED
}
if (!Network::isUrlAllowed($url)) {
notice(L10n::t('Disallowed profile URL.') . EOL);
- $a->internalRedirect($a->cmd);
+ DI::baseUrl()->redirect(DI::args()->getCommand());
return; // NOTREACHED
}
if (Network::isUrlBlocked($url)) {
notice(L10n::t('Blocked domain') . EOL);
- $a->internalRedirect($a->cmd);
+ DI::baseUrl()->redirect(DI::args()->getCommand());
return; // NOTREACHED
}
@@ -353,12 +355,12 @@ function dfrn_request_post(App $a)
if (!count($parms)) {
notice(L10n::t('Profile location is not valid or does not contain profile information.') . EOL);
- $a->internalRedirect($a->cmd);
+ DI::baseUrl()->redirect(DI::args()->getCommand());
} else {
- if (!x($parms, 'fn')) {
+ if (empty($parms['fn'])) {
notice(L10n::t('Warning: profile location has no identifiable owner name.') . EOL);
}
- if (!x($parms, 'photo')) {
+ if (empty($parms['photo'])) {
notice(L10n::t('Warning: profile location has no profile photo.') . EOL);
}
$invalid = Probe::validDfrn($parms);
@@ -380,7 +382,7 @@ function dfrn_request_post(App $a)
intval($uid),
DBA::escape(DateTimeFormat::utcNow()),
$parms['url'],
- DBA::escape(normalise_link($url)),
+ DBA::escape(Strings::normaliseLink($url)),
$parms['addr'],
$parms['fn'],
$parms['nick'],
@@ -415,15 +417,15 @@ function dfrn_request_post(App $a)
return;
}
- $hash = random_string() . (string) time(); // Generate a confirm_key
+ $hash = Strings::getRandomHex() . (string) time(); // Generate a confirm_key
if (is_array($contact_record)) {
- $ret = q("INSERT INTO `intro` ( `uid`, `contact-id`, `blocked`, `knowyou`, `note`, `hash`, `datetime`)
+ q("INSERT INTO `intro` ( `uid`, `contact-id`, `blocked`, `knowyou`, `note`, `hash`, `datetime`)
VALUES ( %d, %d, 1, %d, '%s', '%s', '%s' )",
intval($uid),
intval($contact_record['id']),
- ((x($_POST,'knowyou') && ($_POST['knowyou'] == 1)) ? 1 : 0),
- DBA::escape(notags(trim(defaults($_POST, 'dfrn-request-message', '')))),
+ intval(!empty($_POST['knowyou'])),
+ DBA::escape(Strings::escapeTags(trim($_POST['dfrn-request-message'] ?? ''))),
DBA::escape($hash),
DBA::escape(DateTimeFormat::utcNow())
);
@@ -435,7 +437,7 @@ function dfrn_request_post(App $a)
}
// "Homecoming" - send the requestor back to their site to record the introduction.
- $dfrn_url = bin2hex($a->getBaseURL() . '/profile/' . $nickname);
+ $dfrn_url = bin2hex(DI::baseUrl()->get() . '/profile/' . $nickname);
$aes_allow = ((function_exists('openssl_encrypt')) ? 1 : 0);
System::externalRedirect($parms['dfrn-request'] . "?dfrn_url=$dfrn_url"
@@ -453,10 +455,10 @@ function dfrn_request_post(App $a)
// Diaspora needs the uri in the format user@domain.tld
// Diaspora will support the remote subscription in a future version
if ($network == Protocol::DIASPORA) {
- $uri = $nickname . '@' . $a->getHostName();
+ $uri = $nickname . '@' . DI::baseUrl()->getHostname();
- if ($a->getURLPath()) {
- $uri .= '/' . $a->getURLPath();
+ if (DI::baseUrl()->getUrlPath()) {
+ $uri .= '/' . DI::baseUrl()->getUrlPath();
}
$uri = urlencode($uri);
@@ -477,13 +479,13 @@ function dfrn_request_post(App $a)
function dfrn_request_content(App $a)
{
- if (($a->argc != 2) || (!count($a->profile))) {
+ if ($a->argc != 2 || empty($a->profile)) {
return "";
}
// "Homecoming". Make sure we're logged in to this site as the correct user. Then offer a confirm button
// to send us to the post section to record the introduction.
- if (x($_GET, 'dfrn_url')) {
+ if (!empty($_GET['dfrn_url'])) {
if (!local_user()) {
info(L10n::t("Please login to confirm introduction.") . EOL);
/* setup the return URL to come back to this page if they use openid */
@@ -497,12 +499,12 @@ function dfrn_request_content(App $a)
return Login::form();
}
- $dfrn_url = notags(trim(hex2bin($_GET['dfrn_url'])));
- $aes_allow = x($_GET, 'aes_allow') && $_GET['aes_allow'] == 1 ? 1 : 0;
- $confirm_key = x($_GET, 'confirm_key') ? $_GET['confirm_key'] : "";
+ $dfrn_url = Strings::escapeTags(trim(hex2bin($_GET['dfrn_url'])));
+ $aes_allow = !empty($_GET['aes_allow']);
+ $confirm_key = $_GET['confirm_key'] ?? '';
// Checking fastlane for validity
- if (x($_SESSION, "fastlane") && (normalise_link($_SESSION["fastlane"]) == normalise_link($dfrn_url))) {
+ if (!empty($_SESSION['fastlane']) && (Strings::normaliseLink($_SESSION["fastlane"]) == Strings::normaliseLink($dfrn_url))) {
$_POST["dfrn_url"] = $dfrn_url;
$_POST["confirm_key"] = $confirm_key;
$_POST["localconfirm"] = 1;
@@ -511,8 +513,7 @@ function dfrn_request_content(App $a)
dfrn_request_post($a);
- killme();
- return; // NOTREACHED
+ exit();
}
$tpl = Renderer::getMarkupTemplate("dfrn_req_confirm.tpl");
@@ -520,7 +521,6 @@ function dfrn_request_content(App $a)
'$dfrn_url' => $dfrn_url,
'$aes_allow' => (($aes_allow) ? '' : "" ),
'$hidethem' => L10n::t('Hide this contact'),
- '$hidechecked' => '',
'$confirm_key' => $confirm_key,
'$welcome' => L10n::t('Welcome home %s.', $a->user['username']),
'$please' => L10n::t('Please confirm your introduction/connection request to %s.', $dfrn_url),
@@ -530,7 +530,7 @@ function dfrn_request_content(App $a)
'dfrn_rawurl' => $_GET['dfrn_url']
]);
return $o;
- } elseif ((x($_GET, 'confirm_key')) && strlen($_GET['confirm_key'])) {
+ } elseif (!empty($_GET['confirm_key'])) {
// we are the requestee and it is now safe to send our user their introduction,
// 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.
@@ -547,7 +547,7 @@ function dfrn_request_content(App $a)
$auto_confirm = false;
if (DBA::isResult($r)) {
- if ($r[0]['page-flags'] != Contact::PAGE_NORMAL && $r[0]['page-flags'] != Contact::PAGE_PRVGROUP) {
+ if ($r[0]['page-flags'] != User::PAGE_FLAGS_NORMAL && $r[0]['page-flags'] != User::PAGE_FLAGS_PRVGROUP) {
$auto_confirm = true;
}
@@ -559,11 +559,11 @@ function dfrn_request_content(App $a)
'to_name' => $r[0]['username'],
'to_email' => $r[0]['email'],
'uid' => $r[0]['uid'],
- 'link' => System::baseUrl() . '/notifications/intros',
+ 'link' => DI::baseUrl() . '/notifications/intros',
'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,
+ 'verb' => Activity::REQ_FRIEND,
'otype' => 'intro'
]);
}
@@ -575,7 +575,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'] == Contact::PAGE_FREELOVE) ? 1 : 0),
+ 'duplex' => (($r[0]['page-flags'] == User::PAGE_FLAGS_FREELOVE) ? 1 : 0),
];
dfrn_confirm_post($a, $handsfree);
}
@@ -586,17 +586,16 @@ function dfrn_request_content(App $a)
// If we are auto_confirming, this record will have already been nuked
// in dfrn_confirm_post()
- $r = q("UPDATE `intro` SET `blocked` = 0 WHERE `hash` = '%s'",
+ q("UPDATE `intro` SET `blocked` = 0 WHERE `hash` = '%s'",
DBA::escape($_GET['confirm_key'])
);
}
}
- killme();
- return; // NOTREACHED
+ exit();
} else {
// Normal web request. Display our user's introduction form.
- if ((Config::get('system', 'block_public')) && (!local_user()) && (!remote_user())) {
+ if (Config::get('system', 'block_public') && !Session::isAuthenticated()) {
if (!Config::get('system', 'local_block')) {
notice(L10n::t('Public access denied.') . EOL);
return;
@@ -606,28 +605,28 @@ function dfrn_request_content(App $a)
// Try to auto-fill the profile address
// At first look if an address was provided
// Otherwise take the local address
- if (x($_GET, 'addr') && ($_GET['addr'] != "")) {
+ if (!empty($_GET['addr'])) {
$myaddr = hex2bin($_GET['addr']);
- } elseif (x($_GET, 'address') && ($_GET['address'] != "")) {
+ } elseif (!empty($_GET['address'])) {
$myaddr = $_GET['address'];
} elseif (local_user()) {
- if (strlen($a->getURLPath())) {
- $myaddr = System::baseUrl() . '/profile/' . $a->user['nickname'];
+ if (strlen(DI::baseUrl()->getUrlPath())) {
+ $myaddr = DI::baseUrl() . '/profile/' . $a->user['nickname'];
} else {
- $myaddr = $a->user['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3);
+ $myaddr = $a->user['nickname'] . '@' . substr(DI::baseUrl(), strpos(DI::baseUrl(), '://') + 3);
}
} else {
// last, try a zrl
$myaddr = Profile::getMyURL();
}
- $target_addr = $a->profile['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3);
+ $target_addr = $a->profile['nickname'] . '@' . substr(DI::baseUrl(), strpos(DI::baseUrl(), '://') + 3);
/* The auto_request form only has the profile address
* because nobody is going to read the comments and
* it doesn't matter if they know you or not.
*/
- if ($a->profile['page-flags'] == Contact::PAGE_NORMAL) {
+ if ($a->profile['page-flags'] == User::PAGE_FLAGS_NORMAL) {
$tpl = Renderer::getMarkupTemplate('dfrn_request.tpl');
} else {
$tpl = Renderer::getMarkupTemplate('auto_request.tpl');
@@ -635,10 +634,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(
- L10n::t('If you are not yet a member of the free social web, follow this link to find a public Friendica site and join us today.'),
- get_server() . '/servers'
- );
+ $invite_desc = L10n::t('If you are not yet a member of the free social web, follow this link to find a public Friendica site and join us today.', get_server() . '/servers');
$o = Renderer::replaceMacros($tpl, [
'$header' => L10n::t('Friend/Connection Request'),
@@ -661,6 +657,4 @@ function dfrn_request_content(App $a)
]);
return $o;
}
-
- return; // Somebody is fishing.
}