X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fdfrn_request.php;h=ec675865617b49d2d35f7fa8e0021117a478c16f;hb=63622966666729ba82fef8f12484e022500ff867;hp=f3875ed8e40939d8a0672c97fa312f53dcc07446;hpb=f99bb958f61f17e81452f3f9c4d3472c3de8b37b;p=friendica.git
diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index f3875ed8e4..ec67586561 100644
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -1,5 +1,4 @@
argc > 1)
+use Friendica\App;
+use Friendica\Core\Config;
+use Friendica\Core\PConfig;
+use Friendica\Core\System;
+use Friendica\Database\DBM;
+use Friendica\Model\Contact;
+use Friendica\Model\Group;
+use Friendica\Model\User;
+use Friendica\Network\Probe;
+
+require_once 'include/enotify.php';
+
+function dfrn_request_init(App $a)
+{
+ if ($a->argc > 1)
$which = $a->argv[1];
- profile_load($a,$which);
+ profile_load($a, $which);
return;
}
@@ -51,7 +56,7 @@ function dfrn_request_post(App $a) {
if(x($_POST, 'cancel')) {
- goaway(z_root());
+ goaway(System::baseUrl());
}
@@ -91,7 +96,7 @@ function dfrn_request_post(App $a) {
dbesc(normalise_link($dfrn_url))
);
- if (dbm::is_result($r)) {
+ if (DBM::is_result($r)) {
if(strlen($r[0]['dfrn-id'])) {
/*
@@ -131,7 +136,7 @@ function dfrn_request_post(App $a) {
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",
@@ -145,7 +150,7 @@ function dfrn_request_post(App $a) {
$photo = $parms["photo"];
// Escape the entire array
- dbm::esc_array($parms);
+ DBM::esc_array($parms);
/*
* Create a contact record on our site for the other person
@@ -185,17 +190,16 @@ function dfrn_request_post(App $a) {
dbesc($dfrn_url),
$parms['key'] // this was already escaped
);
- if (dbm::is_result($r)) {
- $def_gid = get_default_group(local_user(), $r[0]["network"]);
- if(intval($def_gid))
- group_add_member(local_user(), '', $r[0]['id'], $def_gid);
+ if (DBM::is_result($r)) {
+ Group::addMember(User::getDefaultGroup($uid, $r[0]["network"]), $r[0]['id']);
- if (isset($photo))
- update_contact_avatar($photo, local_user(), $r[0]["id"], true);
+ if (isset($photo)) {
+ Contact::updateAvatar($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";
}
/*
@@ -223,7 +227,7 @@ function dfrn_request_post(App $a) {
// invalid/bogus request
notice( t('Unrecoverable protocol error.') . EOL );
- goaway(z_root());
+ goaway(System::baseUrl());
return; // NOTREACHED
}
@@ -276,7 +280,7 @@ function dfrn_request_post(App $a) {
dbesc(datetime_convert('UTC','UTC','now - 24 hours')),
intval($uid)
);
- if (dbm::is_result($r) && count($r) > $maxreq) {
+ 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);
@@ -288,42 +292,14 @@ function dfrn_request_post(App $a) {
*
* Cleanup old introductions that remain blocked.
* Also remove the contact record, but only if there is no existing relationship
- * Do not remove email contacts as these may be awaiting email verification
- */
-
- $r = q("SELECT `intro`.*, `intro`.`id` AS `iid`, `contact`.`id` AS `cid`, `contact`.`rel`
- FROM `intro` LEFT JOIN `contact` on `intro`.`contact-id` = `contact`.`id`
- WHERE `intro`.`blocked` = 1 AND `contact`.`self` = 0
- AND `contact`.`network` != '%s'
- AND `intro`.`datetime` < UTC_TIMESTAMP() - INTERVAL 30 MINUTE ",
- dbesc(NETWORK_MAIL2)
- );
- 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'])
- );
- }
- q("DELETE FROM `intro` WHERE `id` = %d",
- intval($rr['iid'])
- );
- }
- }
-
- /*
- *
- * Cleanup any old email intros - which will have a greater lifetime
*/
$r = q("SELECT `intro`.*, `intro`.`id` AS `iid`, `contact`.`id` AS `cid`, `contact`.`rel`
FROM `intro` LEFT JOIN `contact` on `intro`.`contact-id` = `contact`.`id`
WHERE `intro`.`blocked` = 1 AND `contact`.`self` = 0
- AND `contact`.`network` = '%s'
- AND `intro`.`datetime` < UTC_TIMESTAMP() - INTERVAL 3 DAY ",
- dbesc(NETWORK_MAIL2)
+ AND `intro`.`datetime` < UTC_TIMESTAMP() - INTERVAL 30 MINUTE "
);
- if (dbm::is_result($r)) {
+ if (DBM::is_result($r)) {
foreach ($r as $rr) {
if(! $rr['rel']) {
q("DELETE FROM `contact` WHERE `id` = %d AND NOT `self`",
@@ -336,7 +312,6 @@ function dfrn_request_post(App $a) {
}
}
- $email_follow = (x($_POST,'email_follow') ? intval($_POST['email_follow']) : 0);
$real_name = (x($_POST,'realname') ? notags(trim($_POST['realname'])) : '');
$url = trim($_POST['dfrn_url']);
@@ -347,125 +322,25 @@ function dfrn_request_post(App $a) {
$hcard = '';
- if($email_follow) {
+ // Detect the network
+ $data = Probe::uri($url);
+ $network = $data["network"];
- if(! validate_email($url)) {
- notice( t('Invalid email address.') . EOL);
- return;
- }
+ // Canonicalise email-style profile locator
+ $url = Probe::webfingerDfrn($url,$hcard);
- $addr = $url;
- $name = ($realname) ? $realname : $addr;
- $nick = substr($addr,0,strpos($addr,'@'));
- $url = 'http://' . substr($addr,strpos($addr,'@') + 1);
- $nurl = normalise_url($host);
- $poll = 'email ' . random_string();
- $notify = 'smtp ' . random_string();
- $network = NETWORK_MAIL2;
- $rel = CONTACT_IS_FOLLOWER;
-
- $mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1);
- if(get_config('system','dfrn_only'))
- $mail_disabled = 1;
-
- if(! $mail_disabled) {
- $failed = false;
- $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
- intval($uid)
- );
+ if (substr($url,0,5) === 'stat:') {
- if (! dbm::is_result($r)) {
- notice( t('This account has not been configured for email. Request failed.') . EOL);
- return;
- }
+ // 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;
}
- $r = q("insert into contact ( uid, created, addr, name, nick, url, nurl, poll, notify, blocked, pending, network, rel )
- values( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', %d ) ",
- intval($uid),
- dbesc(datetime_convert()),
- dbesc($addr),
- dbesc($name),
- dbesc($nick),
- dbesc($url),
- dbesc($nurl),
- dbesc($poll),
- dbesc($notify),
- intval($blocked),
- intval($pending),
- dbesc($network),
- intval($rel)
- );
-
- $r = q("SELECT `id`, `network` FROM `contact` WHERE `poll` = '%s' AND `uid` = %d LIMIT 1",
- dbesc($poll),
- intval($uid)
- );
- if (dbm::is_result($r)) {
- $contact_id = $r[0]['id'];
-
- $def_gid = get_default_group($uid, $r[0]["network"]);
- if (intval($def_gid))
- group_add_member($uid, '', $contact_id, $def_gid);
-
- $photo = avatar_img($addr);
-
- $r = q("UPDATE `contact` SET
- `photo` = '%s',
- `thumb` = '%s',
- `micro` = '%s',
- `name-date` = '%s',
- `uri-date` = '%s',
- `avatar-date` = '%s',
- `hidden` = 0,
- WHERE `id` = %d
- ",
- dbesc($photos[0]),
- dbesc($photos[1]),
- dbesc($photos[2]),
- dbesc(datetime_convert()),
- dbesc(datetime_convert()),
- dbesc(datetime_convert()),
- intval($contact_id)
- );
- }
-
- // contact is created. Now create an introduction
-
- $hash = random_string();
-
- $r = q("INSERT INTO `intro` ( `uid`, `contact-id`, knowyou, note, hash, datetime, blocked )
- VALUES( %d , %d, %d, '%s', '%s', '%s', %d ) ",
- intval($uid),
- intval($contact_id),
- ((x($_POST,'knowyou') && ($_POST['knowyou'] == 1)) ? 1 : 0),
- dbesc(notags(trim($_POST['dfrn-request-message']))),
- dbesc($hash),
- dbesc(datetime_convert()),
- 1
- );
-
- // Next send an email verify form to the requestor.
-
+ $url = substr($url,5);
} else {
- // Detect the network
- $data = probe_url($url);
- $network = $data["network"];
-
- // Canonicalise email-style profile locator
- $url = Probe::webfinger_dfrn($url,$hcard);
-
- if (substr($url,0,5) === 'stat:') {
-
- // 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;
-
- $url = substr($url,5);
- } else
- $network = NETWORK_DFRN;
+ $network = NETWORK_DFRN;
}
logger('dfrn_request: url: ' . $url . ',network=' . $network, LOGGER_DEBUG);
@@ -476,7 +351,7 @@ function dfrn_request_post(App $a) {
dbesc($url)
);
- if (dbm::is_result($ret)) {
+ if (DBM::is_result($ret)) {
if(strlen($ret[0]['issued-id'])) {
notice( t('You have already introduced yourself here.') . EOL );
return;
@@ -504,24 +379,27 @@ function dfrn_request_post(App $a) {
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')) {
@@ -530,7 +408,7 @@ function dfrn_request_post(App $a) {
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",
@@ -545,7 +423,7 @@ function dfrn_request_post(App $a) {
$parms['issued-id'] = $issued_id;
$photo = $parms["photo"];
- dbm::esc_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 )",
@@ -577,9 +455,9 @@ function dfrn_request_post(App $a) {
$parms['url'],
$parms['issued-id']
);
- if (dbm::is_result($r)) {
+ if (DBM::is_result($r)) {
$contact_record = $r[0];
- update_contact_avatar($photo, $uid, $contact_record["id"], true);
+ Contact::updateAvatar($photo, $uid, $contact_record["id"], true);
}
}
@@ -611,7 +489,7 @@ function dfrn_request_post(App $a) {
// "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"
@@ -621,7 +499,7 @@ function dfrn_request_post(App $a) {
);
// NOTREACHED
// END $network === NETWORK_DFRN
- } elseif (($network != NETWORK_PHANTOM) AND ($url != "")) {
+ } elseif (($network != NETWORK_PHANTOM) && ($url != "")) {
/*
*
@@ -640,7 +518,7 @@ function dfrn_request_post(App $a) {
$uri = urlencode($uri);
} else {
- $uri = App::get_baseurl().'/profile/'.$nickname;
+ $uri = System::baseUrl().'/profile/'.$nickname;
}
$url = str_replace('{uri}', $uri, $url);
@@ -688,7 +566,7 @@ function dfrn_request_content(App $a) {
$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;
@@ -728,7 +606,7 @@ function dfrn_request_content(App $a) {
dbesc($_GET['confirm_key'])
);
- if (dbm::is_result($intro)) {
+ if (DBM::is_result($intro)) {
$r = q("SELECT `contact`.*, `user`.* FROM `contact` LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid`
WHERE `contact`.`id` = %d LIMIT 1",
@@ -737,7 +615,7 @@ function dfrn_request_content(App $a) {
$auto_confirm = false;
- if (dbm::is_result($r)) {
+ if (DBM::is_result($r)) {
if(($r[0]['page-flags'] != PAGE_NORMAL) && ($r[0]['page-flags'] != PAGE_PRVGROUP))
$auto_confirm = true;
@@ -750,7 +628,7 @@ function dfrn_request_content(App $a) {
'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'],
@@ -760,14 +638,14 @@ function dfrn_request_content(App $a) {
}
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'],
'dfrn_id' => $r[0]['issued-id'],
'intro_id' => $intro[0]['id'],
'duplex' => (($r[0]['page-flags'] == PAGE_FREELOVE) ? 1 : 0),
- 'activity' => intval(get_pconfig($r[0]['uid'],'system','post_newfriend'))
+ 'activity' => intval(PConfig::get($r[0]['uid'],'system','post_newfriend'))
);
dfrn_confirm_post($a,$handsfree);
}
@@ -794,8 +672,8 @@ function dfrn_request_content(App $a) {
* Normal web request. Display our user's introduction form.
*/
- if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
- if(! get_config('system','local_block')) {
+ if((Config::get('system','block_public')) && (! local_user()) && (! remote_user())) {
+ if(! Config::get('system','local_block')) {
notice( t('Public access denied.') . EOL);
return;
}
@@ -808,22 +686,22 @@ function dfrn_request_content(App $a) {
// 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()) {
if (strlen($a->path)) {
- $myaddr = App::get_baseurl() . '/profile/' . $a->user['nickname'];
+ $myaddr = System::baseUrl() . '/profile/' . $a->user['nickname'];
} else {
- $myaddr = $a->user['nickname'] . '@' . substr(z_root(), strpos(z_root(),'://') + 3 );
+ $myaddr = $a->user['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(),'://') + 3 );
}
} 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 );
/*
@@ -842,27 +720,6 @@ function dfrn_request_content(App $a) {
$page_desc = t("Please enter your 'Identity Address' from one of the following supported communications networks:");
- // 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')) {
- $mail_disabled = 1;
- }
-
- if (! $mail_disabled) {
- $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
- intval($a->profile['uid'])
- );
- if (! dbm::is_result($r)) {
- $mail_disabled = 1;
- }
- }
-
- // "coming soon" is disabled for now
- //$emailnet = (($mail_disabled) ? '' : t("Connect as an email follower \x28Coming soon\x29"));
- $emailnet = "";
-
$invite_desc = sprintf(
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()
@@ -870,7 +727,7 @@ function dfrn_request_content(App $a) {
$o = replace_macros($tpl,array(
'$header' => t('Friend/Connection Request'),
- '$desc' => t('Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca'),
+ '$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' => 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']),
@@ -879,12 +736,11 @@ function dfrn_request_content(App $a) {
'$add_note' => t('Add a personal note:'),
'$page_desc' => $page_desc,
'$friendica' => t('Friendica'),
- '$statusnet' => t('StatusNet/Federated Social Web'),
- '$diaspora' => t('Diaspora'),
+ '$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:'),
'$invite_desc' => $invite_desc,
- '$emailnet' => $emailnet,
'$submit' => t('Submit Request'),
'$cancel' => t('Cancel'),
'$nickname' => $a->argv[1],