*/
require_once('include/enotify.php');
+require_once('include/Scrape.php');
if(! function_exists('dfrn_request_init')) {
function dfrn_request_init(&$a) {
* Scrape the other site's profile page to pick up the dfrn links, key, fn, and photo
*/
- require_once('include/Scrape.php');
-
$parms = scrape_dfrn($dfrn_url);
if(! count($parms)) {
$dfrn_request = $parms['dfrn-request'];
- /********* Escape the entire array ********/
+ /********* Escape the entire array ********/
dbesc_array($parms);
* Create a contact record on our site for the other person
*/
- $r = q("INSERT INTO `contact` ( `uid`, `created`,`url`, `nurl`, `name`, `nick`, `photo`, `site-pubkey`,
+ $r = q("INSERT INTO `contact` ( `uid`, `created`,`url`, `nurl`, `addr`, `name`, `nick`, `photo`, `site-pubkey`,
`request`, `confirm`, `notify`, `poll`, `poco`, `network`, `aes_allow`, `hidden`)
- VALUES ( %d, '%s', '%s', '%s', '%s' , '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d)",
+ VALUES ( %d, '%s', '%s', '%s', '%s', '%s' , '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d)",
intval(local_user()),
datetime_convert(),
dbesc($dfrn_url),
dbesc(normalise_link($dfrn_url)),
+ $parms['addr'],
$parms['fn'],
$parms['nick'],
$parms['photo'],
// Next send an email verify form to the requestor.
- }
-
- else {
+ } else {
+ // Detect the network
+ $data = probe_url($url);
+ $network = $data["network"];
// Canonicalise email-style profile locator
-
$url = webfinger_dfrn($url,$hcard);
- if(substr($url,0,5) === 'stat:') {
- $network = NETWORK_OSTATUS;
+ 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 {
+ } else
$network = NETWORK_DFRN;
- }
}
logger('dfrn_request: url: ' . $url);
- if(! strlen($url)) {
- notice( t("Unable to resolve your name at the provided location.") . EOL);
- return;
- }
-
-
if($network === NETWORK_DFRN) {
$ret = q("SELECT * FROM `contact` WHERE `uid` = %d AND `url` = '%s' AND `self` = 0 LIMIT 1",
intval($uid),
dbesc_array($parms);
- $r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `nurl`,`name`, `nick`, `issued-id`, `photo`, `site-pubkey`,
+ $r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `nurl`, `addr`, `name`, `nick`, `issued-id`, `photo`, `site-pubkey`,
`request`, `confirm`, `notify`, `poll`, `poco`, `network` )
- VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' )",
+ VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' )",
intval($uid),
dbesc(datetime_convert()),
$parms['url'],
dbesc(normalise_link($parms['url'])),
+ $parms['addr'],
$parms['fn'],
$parms['nick'],
$parms['issued-id'],
);
// NOTREACHED
// END $network === NETWORK_DFRN
- }
- elseif($network === NETWORK_OSTATUS) {
+ } elseif (($network != NETWORK_PHANTOM) AND ($url != "")) {
/**
*
- * OStatus network
- * Check contact existence
- * Try and scrape together enough information to create a contact record,
- * with us as CONTACT_IS_FOLLOWER
* Substitute our user's feed URL into $url template
* Send the subscriber home to subscribe
*
*/
- $url = str_replace('{uri}', $a->get_baseurl() . '/profile/' . $nickname, $url);
+ // Diaspora needs the uri in the format user@domain.tld
+ // Diaspora will support the remote subscription in a future version
+ if ($network == NETWORK_DIASPORA) {
+ $uri = $nickname.'@'.$a->get_hostname();
+
+ if ($a->get_path())
+ $uri .= '/'.$a->get_path();
+
+ $uri = urlencode($uri);
+ } else
+ $uri = $a->get_baseurl().'/profile/'.$nickname;
+
+ $url = str_replace('{uri}', $uri, $url);
goaway($url);
// NOTREACHED
- // END $network === NETWORK_OSTATUS
+ // END $network != NETWORK_PHANTOM
+ } else {
+ notice(t("Remote subscription can't be done for your network. Please subscribe directly on your system.").EOL);
+ return;
}
} return;
if(! local_user()) {
info( t("Please login to confirm introduction.") . EOL );
-
/* setup the return URL to come back to this page if they use openid */
-
- $stripped = str_replace('q=','',$a->query_string);
- $_SESSION['return_url'] = trim($stripped,'/');
-
+ $_SESSION['return_url'] = $a->query_string;
return login();
}
$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'] : "");
+
+ // Checking fastlane for validity
+ if (x($_SESSION, "fastlane") AND (normalise_link($_SESSION["fastlane"]) == normalise_link($dfrn_url))) {
+ $_POST["dfrn_url"] = $dfrn_url;
+ $_POST["confirm_key"] = $confirm_key;
+ $_POST["localconfirm"] = 1;
+ $_POST["hidden-contact"] = 0;
+ $_POST["submit"] = t('Confirm');
+
+ dfrn_request_post($a);
+
+ killme();
+ return; // NOTREACHED
+ }
+
$tpl = get_markup_template("dfrn_req_confirm.tpl");
$o = replace_macros($tpl,array(
'$dfrn_url' => $dfrn_url,
//$emailnet = (($mail_disabled) ? '' : t("<strike>Connect as an email follower</strike> \x28Coming soon\x29"));
$emailnet = "";
- $invite_desc = t('If you are not yet a member of the free social web, <a href="http://dir.friendica.com/siteinfo">follow this link to find a public Friendica site and join us today</a>.');
+ $invite_desc = sprintf(
+ t('If you are not yet a member of the free social web, <a href="%s/siteinfo">follow this link to find a public Friendica site and join us today</a>.'),
+ get_server()
+ );
$o .= replace_macros($tpl,array(
'$header' => t('Friend/Connection Request'),
projects / friendica.git / blobdiff