* https://github.com/friendica/friendica/blob/master/spec/dfrn2_contact_request.png
*/
-require_once('include/enotify.php');
-require_once('include/Scrape.php');
-require_once('include/Probe.php');
-require_once('include/group.php');
+use Friendica\App;
+use Friendica\Core\System;
+use Friendica\Network\Probe;
-function dfrn_request_init(&$a) {
+require_once 'include/enotify.php';
+require_once 'include/probe.php';
+require_once 'include/group.php';
+
+function dfrn_request_init(App $a) {
if($a->argc > 1)
$which = $a->argv[1];
* After logging in, we click 'submit' to approve the linkage.
*
*/
-function dfrn_request_post(&$a) {
+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));
if(x($_POST, 'cancel')) {
- goaway(z_root());
+ goaway(System::baseUrl());
}
if (! x($parms,'photo')) {
notice( t('Warning: profile location has no profile photo.') . EOL );
}
- $invalid = Probe::valid_dfrn($parms);
+ $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",
$photo = $parms["photo"];
// Escape the entire array
-
- dbesc_array($parms);
-
+ dbm::esc_array($parms);
/*
* Create a contact record on our site for the other person
if (isset($photo))
update_contact_avatar($photo, local_user(), $r[0]["id"], true);
- $forwardurl = App::get_baseurl()."/contacts/".$r[0]['id'];
+ $forwardurl = System::baseUrl()."/contacts/".$r[0]['id'];
} else {
- $forwardurl = App::get_baseurl()."/contacts";
+ $forwardurl = System::baseUrl()."/contacts";
}
/*
// invalid/bogus request
notice( t('Unrecoverable protocol error.') . EOL );
- goaway(z_root());
+ goaway(System::baseUrl());
return; // NOTREACHED
}
if (dbm::is_result($r)) {
foreach ($r as $rr) {
if(! $rr['rel']) {
- q("DELETE FROM `contact` WHERE `id` = %d",
+ q("DELETE FROM `contact` WHERE `id` = %d AND NOT `self`",
intval($rr['cid'])
);
}
if (dbm::is_result($r)) {
foreach ($r as $rr) {
if(! $rr['rel']) {
- q("DELETE FROM `contact` WHERE `id` = %d",
+ q("DELETE FROM `contact` WHERE `id` = %d AND NOT `self`",
intval($rr['cid'])
);
}
$network = $data["network"];
// Canonicalise email-style profile locator
- $url = Probe::webfinger_dfrn($url,$hcard);
+ $url = Probe::webfingerDfrn($url,$hcard);
if (substr($url,0,5) === 'stat:') {
else {
if (! validate_url($url)) {
notice( t('Invalid profile URL.') . EOL);
- goaway(App::get_baseurl() . '/' . $a->cmd);
+ goaway(System::baseUrl() . '/' . $a->cmd);
return; // NOTREACHED
}
if (! allowed_url($url)) {
notice( t('Disallowed profile URL.') . EOL);
- goaway(App::get_baseurl() . '/' . $a->cmd);
+ goaway(System::baseUrl() . '/' . $a->cmd);
return; // NOTREACHED
}
-
- require_once('include/Scrape.php');
+ if (blocked_url($url)) {
+ notice( t('Blocked domain') . EOL);
+ goaway(System::baseUrl() . '/' . $a->cmd);
+ return; // NOTREACHED
+ }
$parms = Probe::profile(($hcard) ? $hcard : $url);
if (! count($parms)) {
notice( t('Profile location is not valid or does not contain profile information.') . EOL );
- goaway(App::get_baseurl() . '/' . $a->cmd);
+ goaway(System::baseUrl() . '/' . $a->cmd);
}
else {
if (! x($parms,'fn')) {
if (! x($parms,'photo')) {
notice( t('Warning: profile location has no profile photo.') . EOL );
}
- $invalid = Probe::valid_dfrn($parms);
+ $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",
$parms['issued-id'] = $issued_id;
$photo = $parms["photo"];
- dbesc_array($parms);
+ dbm::esc_array($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 )",
// "Homecoming" - send the requestor back to their site to record the introduction.
- $dfrn_url = bin2hex(App::get_baseurl() . '/profile/' . $nickname);
+ $dfrn_url = bin2hex(System::baseUrl() . '/profile/' . $nickname);
$aes_allow = ((function_exists('openssl_encrypt')) ? 1 : 0);
goaway($parms['dfrn-request'] . "?dfrn_url=$dfrn_url"
);
// NOTREACHED
// END $network === NETWORK_DFRN
- } elseif (($network != NETWORK_PHANTOM) AND ($url != "")) {
+ } elseif (($network != NETWORK_PHANTOM) && ($url != "")) {
/*
*
$uri = urlencode($uri);
} else {
- $uri = App::get_baseurl().'/profile/'.$nickname;
+ $uri = System::baseUrl().'/profile/'.$nickname;
}
$url = str_replace('{uri}', $uri, $url);
}
-function dfrn_request_content(&$a) {
+function dfrn_request_content(App $a) {
if (($a->argc != 2) || (! count($a->profile))) {
return "";
$confirm_key = (x($_GET,'confirm_key') ? $_GET['confirm_key'] : "");
// Checking fastlane for validity
- if (x($_SESSION, "fastlane") AND (normalise_link($_SESSION["fastlane"]) == normalise_link($dfrn_url))) {
+ if (x($_SESSION, "fastlane") && (normalise_link($_SESSION["fastlane"]) == normalise_link($dfrn_url))) {
$_POST["dfrn_url"] = $dfrn_url;
$_POST["confirm_key"] = $confirm_key;
$_POST["localconfirm"] = 1;
'to_name' => $r[0]['username'],
'to_email' => $r[0]['email'],
'uid' => $r[0]['uid'],
- 'link' => App::get_baseurl() . '/notifications/intros',
+ 'link' => System::baseUrl() . '/notifications/intros',
'source_name' => ((strlen(stripslashes($r[0]['name']))) ? stripslashes($r[0]['name']) : t('[Name Withheld]')),
'source_link' => $r[0]['url'],
'source_photo' => $r[0]['photo'],
}
if($auto_confirm) {
- require_once('mod/dfrn_confirm.php');
+ require_once 'mod/dfrn_confirm.php';
$handsfree = array(
'uid' => $r[0]['uid'],
'node' => $r[0]['nickname'],
// At first look if an address was provided
// Otherwise take the local address
- if (x($_GET,'addr') AND ($_GET['addr'] != ""))
+ if (x($_GET,'addr') && ($_GET['addr'] != "")) {
$myaddr = hex2bin($_GET['addr']);
- elseif (x($_GET,'address') AND ($_GET['address'] != ""))
+ } elseif (x($_GET,'address') && ($_GET['address'] != "")) {
$myaddr = $_GET['address'];
- elseif (local_user()) {
+ } elseif (local_user()) {
if (strlen($a->path)) {
- $myaddr = App::get_baseurl() . '/profile/' . $a->user['nickname'];
- }
- else {
- $myaddr = $a->user['nickname'] . '@' . substr(z_root(), strpos(z_root(),'://') + 3 );
+ $myaddr = System::baseUrl() . '/profile/' . $a->user['nickname'];
+ } else {
+ $myaddr = $a->user['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(),'://') + 3 );
}
- }
- else {
+ } else {
// last, try a zrl
$myaddr = get_my_url();
}
- $target_addr = $a->profile['nickname'] . '@' . substr(z_root(), strpos(z_root(),'://') + 3 );
+ $target_addr = $a->profile['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(),'://') + 3 );
/*
if ($a->profile['page-flags'] == PAGE_NORMAL) {
$tpl = get_markup_template('dfrn_request.tpl');
- }
- else {
+ } else {
$tpl = get_markup_template('auto_request.tpl');
}
// see if we are allowed to have NETWORK_MAIL2 contacts
$mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1);
- if(get_config('system','dfrn_only'))
+
+ if (get_config('system','dfrn_only')) {
$mail_disabled = 1;
+ }
- if(! $mail_disabled) {
+ if (! $mail_disabled) {
$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
intval($a->profile['uid'])
);
'$header' => t('Friend/Connection Request'),
'$desc' => t('Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca'),
'$pls_answer' => t('Please answer the following:'),
- '$does_know_you' => array('knowyou', sprintf(t('Does %s know you?'),$a->profile['name']), false, '', array(t('No'),t('Yes'))),
+ '$does_know_you' => array('knowyou', sprintf(t('Does %s know you?'),$a->profile['name']), false, '', array(t('No'), t('Yes'))),
/*'$does_know' => sprintf( t('Does %s know you?'),$a->profile['name']),
'$yes' => t('Yes'),
'$no' => t('No'), */
projects / friendica.git / blobdiff