use Friendica\App;
use Friendica\Core\Config;
use Friendica\Core\L10n;
+use Friendica\Core\Logger;
use Friendica\Core\Protocol;
+use Friendica\Core\Renderer;
use Friendica\Core\System;
use Friendica\Database\DBA;
use Friendica\Model\Contact;
use Friendica\Network\Probe;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Network;
+use Friendica\Util\Strings;
require_once 'include/enotify.php';
function dfrn_request_post(App $a)
{
if (($a->argc != 2) || (!count($a->profile))) {
- logger('Wrong count of argc or profiles: argc=' . $a->argc . ',profile()=' . count($a->profile));
+ Logger::log('Wrong count of argc or profiles: argc=' . $a->argc . ',profile()=' . count($a->profile));
return;
}
if (x($_POST, 'cancel')) {
- goaway(System::baseUrl());
+ $a->internalRedirect();
}
/*
if ((x($_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']));
+ $dfrn_url = Strings::escapeTags(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);
// 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)) {
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'],
Contact::updateAvatar($photo, local_user(), $r[0]["id"], true);
}
- $forwardurl = System::baseUrl() . "/contacts/" . $r[0]['id'];
+ $forward_path = "contact/" . $r[0]['id'];
} else {
- $forwardurl = System::baseUrl() . "/contacts";
+ $forward_path = "contact";
}
// Allow the blocked remote notification to complete
}
// (ignore reply, nothing we can do it failed)
- goaway($forwardurl);
+ $a->internalRedirect($forward_path);
return; // NOTREACHED
}
}
// invalid/bogus request
notice(L10n::t('Unrecoverable protocol error.') . EOL);
- goaway(System::baseUrl());
+ $a->internalRedirect();
return; // NOTREACHED
}
}
}
- $real_name = x($_POST, 'realname') ? notags(trim($_POST['realname'])) : '';
+ $real_name = x($_POST, 'realname') ? Strings::escapeTags(trim($_POST['realname'])) : '';
$url = trim($_POST['dfrn_url']);
if (!strlen($url)) {
$network = Protocol::DFRN;
}
- logger('dfrn_request: url: ' . $url . ',network=' . $network, LOGGER_DEBUG);
+ Logger::log('dfrn_request: url: ' . $url . ',network=' . $network, Logger::DEBUG);
if ($network === Protocol::DFRN) {
$ret = q("SELECT * FROM `contact` WHERE `uid` = %d AND `url` = '%s' AND `self` = 0 LIMIT 1",
}
}
- $issued_id = random_string();
+ $issued_id = Strings::getRandomHex();
if (is_array($contact_record)) {
// There is a contact record but no issued-id, so this
$url = Network::isUrlValid($url);
if (!$url) {
notice(L10n::t('Invalid profile URL.') . EOL);
- goaway(System::baseUrl() . '/' . $a->cmd);
+ $a->internalRedirect($a->cmd);
return; // NOTREACHED
}
if (!Network::isUrlAllowed($url)) {
notice(L10n::t('Disallowed profile URL.') . EOL);
- goaway(System::baseUrl() . '/' . $a->cmd);
+ $a->internalRedirect($a->cmd);
return; // NOTREACHED
}
if (Network::isUrlBlocked($url)) {
notice(L10n::t('Blocked domain') . EOL);
- goaway(System::baseUrl() . '/' . $a->cmd);
+ $a->internalRedirect($a->cmd);
return; // NOTREACHED
}
if (!count($parms)) {
notice(L10n::t('Profile location is not valid or does not contain profile information.') . EOL);
- goaway(System::baseUrl() . '/' . $a->cmd);
+ $a->internalRedirect($a->cmd);
} else {
if (!x($parms, 'fn')) {
notice(L10n::t('Warning: profile location has no identifiable owner name.') . EOL);
intval($uid),
DBA::escape(DateTimeFormat::utcNow()),
$parms['url'],
- DBA::escape(normalise_link($url)),
+ DBA::escape(Strings::normaliseLink($url)),
$parms['addr'],
$parms['fn'],
$parms['nick'],
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`)
intval($uid),
intval($contact_record['id']),
((x($_POST,'knowyou') && ($_POST['knowyou'] == 1)) ? 1 : 0),
- DBA::escape(notags(trim(defaults($_POST, 'dfrn-request-message', '')))),
+ DBA::escape(Strings::escapeTags(trim(defaults($_POST, 'dfrn-request-message', '')))),
DBA::escape($hash),
DBA::escape(DateTimeFormat::utcNow())
);
}
// "Homecoming" - send the requestor back to their site to record the introduction.
- $dfrn_url = bin2hex(System::baseUrl() . '/profile/' . $nickname);
+ $dfrn_url = bin2hex($a->getBaseURL() . '/profile/' . $nickname);
$aes_allow = ((function_exists('openssl_encrypt')) ? 1 : 0);
- goaway($parms['dfrn-request'] . "?dfrn_url=$dfrn_url"
+ System::externalRedirect($parms['dfrn-request'] . "?dfrn_url=$dfrn_url"
. '&dfrn_version=' . DFRN_PROTOCOL_VERSION
. '&confirm_key=' . $hash
. (($aes_allow) ? "&aes_allow=1" : "")
$uri = urlencode($uri);
} else {
- $uri = System::baseUrl() . '/profile/' . $nickname;
+ $uri = 'profile/' . $nickname;
}
$url = str_replace('{uri}', $uri, $url);
- goaway($url);
+ System::externalRedirect($url);
// NOTREACHED
// END $network != Protocol::PHANTOM
} else {
return Login::form();
}
- $dfrn_url = notags(trim(hex2bin($_GET['dfrn_url'])));
+ $dfrn_url = Strings::escapeTags(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'] : "";
// Checking fastlane for validity
- if (x($_SESSION, "fastlane") && (normalise_link($_SESSION["fastlane"]) == normalise_link($dfrn_url))) {
+ if (x($_SESSION, "fastlane") && (Strings::normaliseLink($_SESSION["fastlane"]) == Strings::normaliseLink($dfrn_url))) {
$_POST["dfrn_url"] = $dfrn_url;
$_POST["confirm_key"] = $confirm_key;
$_POST["localconfirm"] = 1;
return; // NOTREACHED
}
- $tpl = get_markup_template("dfrn_req_confirm.tpl");
- $o = replace_macros($tpl, [
+ $tpl = Renderer::getMarkupTemplate("dfrn_req_confirm.tpl");
+ $o = Renderer::replaceMacros($tpl, [
'$dfrn_url' => $dfrn_url,
'$aes_allow' => (($aes_allow) ? '<input type="hidden" name="aes_allow" value="1" />' : "" ),
'$hidethem' => L10n::t('Hide this contact'),
* it doesn't matter if they know you or not.
*/
if ($a->profile['page-flags'] == Contact::PAGE_NORMAL) {
- $tpl = get_markup_template('dfrn_request.tpl');
+ $tpl = Renderer::getMarkupTemplate('dfrn_request.tpl');
} else {
- $tpl = get_markup_template('auto_request.tpl');
+ $tpl = Renderer::getMarkupTemplate('auto_request.tpl');
}
$page_desc = L10n::t("Please enter your 'Identity Address' from one of the following supported communications networks:");
get_server() . '/servers'
);
- $o = replace_macros($tpl, [
+ $o = Renderer::replaceMacros($tpl, [
'$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:'),