X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdfrn_request.php;h=b0ad2d4a0f741190c5af8cced8d05651f3bc4d4c;hb=6e2c09b1ea6da8f268d336c1dd73590f080e0180;hp=7ba81681fa3df600d88cd342d87e2270aa943abf;hpb=2e5fb9c37e76c20ea0c25e1215a549b561dc68a8;p=friendica.git diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php index 7ba81681fa..b0ad2d4a0f 100644 --- a/mod/dfrn_request.php +++ b/mod/dfrn_request.php @@ -1,18 +1,43 @@ argc > 1) $which = $a->argv[1]; - require_once('mod/profile.php'); - profile_init($a,$which); - + profile_load($a,$which); return; }} +/** + * Function: dfrn_request_post + * + * Purpose: + * Handles multiple scenarios. + * + * Scenario 1: + * Clicking 'submit' on a friend request page. + * + * Scenario 2: + * Following Scenario 1, we are brought back to our home site + * in order to link our friend request with our own server cell. + * After logging in, we click 'submit' to approve the linkage. + * + */ + if(! function_exists('dfrn_request_post')) { function dfrn_request_post(&$a) { @@ -20,57 +45,77 @@ function dfrn_request_post(&$a) { return; - if($_POST['cancel']) { - goaway($a->get_baseurl()); - } + if(x($_POST, 'cancel')) { + goaway(z_root()); + } - // We've introduced ourself to another cell, then have been returned to our own cell - // to confirm the request, and then we've clicked submit (perhaps after logging in). - // That brings us here: + /** + * + * Scenario 2: We've introduced ourself to another cell, then have been returned to our own cell + * 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)) { - // Ensure this is a valid request - + /** + * 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); + $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); $contact_record = null; - + if(x($dfrn_url)) { - - $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `url` = '%s' LIMIT 1", - intval($_SESSION['uid']), - dbesc($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 (`url` = '%s' OR `nurl` = '%s') AND `self` = 0 LIMIT 1", + intval(local_user()), + dbesc($dfrn_url), + dbesc(normalise_link($dfrn_url)) ); - + if(count($r)) { if(strlen($r[0]['dfrn-id'])) { + + /** + * We don't need to be here. It has already happened. + */ + notice( t("This introduction has already been accepted.") . EOL ); return; } else $contact_record = $r[0]; } - + if(is_array($contact_record)) { - $r = q("UPDATE `contact` SET `ret-aes` = %d WHERE `id` = %d LIMIT 1", + $r = q("UPDATE `contact` SET `ret-aes` = %d, hidden = %d WHERE `id` = %d", intval($aes_allow), + intval($hidden), intval($contact_record['id']) ); } else { - - require_once('Scrape.php'); - - + + /** + * 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)) { notice( t('Profile location is not valid or does not contain profile information.') . EOL ); return; @@ -80,52 +125,85 @@ function dfrn_request_post(&$a) { notice( t('Warning: profile location has no identifiable owner name.') . EOL ); if(! x($parms,'photo')) notice( t('Warning: profile location has no profile photo.') . EOL ); - $invalid = validate_dfrn($parms); + $invalid = validate_dfrn($parms); if($invalid) { - notice( $invalid . t(' required parameter') - . (($invalid == 1) ? t(" was ") : t("s were ") ) - . t("not found at the given location.") . EOL ) ; + notice( sprintf( tt("%d required parameter was not found at the given location", + "%d required parameters were not found at the given location", + $invalid), $invalid) . EOL ); return; } } - - $dfrn_request = $parms['dfrn-request']; + /********* Escape the entire array ********/ + dbesc_array($parms); + /******************************************/ - $r = q("INSERT INTO `contact` ( `uid`, `created`,`url`, `name`, `photo`, `site-pubkey`, - `request`, `confirm`, `notify`, `poll`, `aes_allow`) - VALUES ( %d, '%s', '%s', '%s' , '%s', '%s', '%s', '%s', '%s', '%s', %d)", - intval($_SESSION['uid']), + /** + * Create a contact record on our site for the other person + */ + + $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', '%s', %d, %d)", + intval(local_user()), datetime_convert(), dbesc($dfrn_url), + dbesc(normalise_link($dfrn_url)), + $parms['addr'], $parms['fn'], + $parms['nick'], $parms['photo'], $parms['key'], $parms['dfrn-request'], $parms['dfrn-confirm'], $parms['dfrn-notify'], $parms['dfrn-poll'], - intval($aes_allow) + $parms['dfrn-poco'], + dbesc(NETWORK_DFRN), + intval($aes_allow), + intval($hidden) ); } if($r) { - notice( t("Introduction complete.") . EOL); + info( t("Introduction complete.") . EOL); } - // Allow the blocked remote notification to complete + $r = q("select id from contact where uid = %d and url = '%s' and `site-pubkey` = '%s' limit 1", + intval(local_user()), + dbesc($dfrn_url), + $parms['key'] // this was already escaped + ); + if(count($r)) { + $g = q("select def_gid from user where uid = %d limit 1", + intval(local_user()) + ); + if($g && intval($g[0]['def_gid'])) { + require_once('include/group.php'); + group_add_member(local_user(),'',$r[0]['id'],$g[0]['def_gid']); + } + $forwardurl = $a->get_baseurl()."/contacts/".$r[0]['id']; + } else + $forwardurl = $a->get_baseurl()."/contacts"; + + /** + * Allow the blocked remote notification to complete + */ if(is_array($contact_record)) $dfrn_request = $contact_record['request']; if(strlen($dfrn_request) && strlen($confirm_key)) $s = fetch_url($dfrn_request . '?confirm_key=' . $confirm_key); - // ignore reply - goaway($dfrn_url); + + // (ignore reply, nothing we can do it failed) + + // Old: goaway(zrl($dfrn_url)); + goaway($forwardurl); return; // NOTREACHED } @@ -134,200 +212,425 @@ function dfrn_request_post(&$a) { // invalid/bogus request - notice( t("Unrecoverable protocol error.") . EOL ); - goaway($a->get_baseurl()); + notice( t('Unrecoverable protocol error.') . EOL ); + goaway(z_root()); return; // NOTREACHED } - // Otherwise: - - // We are the requestee. A person from a remote cell has made an introduction - // on our profile web page and clicked submit. We will use their DFRN-URL to - // figure out how to contact their cell. - - // Scrape the originating DFRN-URL for everything we need. Create a contact record - // and an introduction to show our user next time he/she logs in. - // Finally redirect back to the requestor so that their site can record the request. - // If our user (the requestee) later confirms this request, a record of it will need - // to exist on the requestor's cell in order for the confirmation process to complete.. - - // It's possible that neither the requestor or the requestee are logged in at the moment, - // and the requestor does not yet have any credentials to the requestee profile. - - // Who is the requestee? We've already loaded their profile which means their nickname should be - // in $a->argv[1] and we should have their complete info in $a->profile. + /** + * Otherwise: + * + * Scenario 1: + * We are the requestee. A person from a remote cell has made an introduction + * on our profile web page and clicked submit. We will use their DFRN-URL to + * figure out how to contact their cell. + * + * Scrape the originating DFRN-URL for everything we need. Create a contact record + * and an introduction to show our user next time he/she logs in. + * Finally redirect back to the requestor so that their site can record the request. + * If our user (the requestee) later confirms this request, a record of it will need + * to exist on the requestor's cell in order for the confirmation process to complete.. + * + * It's possible that neither the requestor or the requestee are logged in at the moment, + * and the requestor does not yet have any credentials to the requestee profile. + * + * Who is the requestee? We've already loaded their profile which means their nickname should be + * in $a->argv[1] and we should have their complete info in $a->profile. + * + */ if(! (is_array($a->profile) && count($a->profile))) { - notice(t("Profile unavailable.") . EOL); + notice( t('Profile unavailable.') . EOL); return; } - $nickname = $a->profile['nickname']; - $notify_flags = $a->profile['notify-flags']; - $uid = $a->profile['uid']; - + $nickname = $a->profile['nickname']; + $notify_flags = $a->profile['notify-flags']; + $uid = $a->profile['uid']; + $maxreq = intval($a->profile['maxreq']); $contact_record = null; - $failed = false; - $parms = null; + $failed = false; + $parms = null; if( x($_POST,'dfrn_url')) { + /** + * Block friend request spam + */ + + if($maxreq) { + $r = q("SELECT * FROM `intro` WHERE `datetime` > '%s' AND `uid` = %d", + dbesc(datetime_convert('UTC','UTC','now - 24 hours')), + intval($uid) + ); + if(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); + return; + } + } + + /** + * + * 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(count($r)) { + foreach($r as $rr) { + if(! $rr['rel']) { + q("DELETE FROM `contact` WHERE `id` = %d", + 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) + ); + if(count($r)) { + foreach($r as $rr) { + if(! $rr['rel']) { + q("DELETE FROM `contact` WHERE `id` = %d", + intval($rr['cid']) + ); + } + q("DELETE FROM `intro` WHERE `id` = %d", + intval($rr['iid']) + ); + } + } + + $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']); if(! strlen($url)) { notice( t("Invalid locator") . EOL ); return; } - // Is this an email-style DFRN locator? + $hcard = ''; - if(strstr($url,'@')) { - $username = substr($url,0,strpos($url,'@')); - $hostname = substr($url,strpos($url,'@') + 1); - require_once('Scrape.php'); + if($email_follow) { - - $parms = scrape_meta('https://' . $url); - if((x($parms,'dfrn-template')) && strstr($parms['dfrn-template'],'%s')) { - $url = sprintf($parms['dfrn-template'],$username); + if(! validate_email($url)) { + notice( t('Invalid email address.') . EOL); + return; } - else { - $parms = scrape_meta('http://' . $url); - if((x($parms,'dfrn-template')) && strstr($parms['dfrn-template'],'%s')) { - $url = sprintf($parms['dfrn-template'],$username); + + $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(); + $blocked = 1; + $pending = 1; + $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(! count($r)) { + + notice( t('This account has not been configured for email. Request failed.') . EOL); + return; } - else { - $url = ''; + } + + $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 from contact where poll = '%s' and uid = %d limit 1", + dbesc($poll), + intval($uid) + ); + if(count($r)) { + $contact_id = $r[0]['id']; + + $g = q("select def_gid from user where uid = %d limit 1", + intval($uid) + ); + if($g && intval($g[0]['def_gid'])) { + require_once('include/group.php'); + group_add_member($uid,'',$contact_id,$g[0]['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. - if(! strlen($url)) { - notice(t("Unable to resolve your name at the provided location.") . EOL); - return; } - $ret = q("SELECT * FROM `contact` WHERE `uid` = %d AND `url` = '%s' LIMIT 1", - intval($uid), - dbesc($url) - ); + else { - if(count($ret)) { - if(strlen($ret[0]['issued-id'])) { - notice( t('You have already introduced yourself here.') . EOL ); - return; + // Canonicalise email-style profile locator + + $url = webfinger_dfrn($url,$hcard); + + if(substr($url,0,5) === 'stat:') { + $network = NETWORK_OSTATUS; + $url = substr($url,5); } else { - $contact_record = $ret[0]; - $parms = array('dfrn-request' => $ret[0]['request']); + $network = NETWORK_DFRN; } } - $issued_id = random_string(); - - if(is_array($contact_record)) { - // There is a contact record but no issued-id, so this - // is a reciprocal introduction from a known contact - $r = q("UPDATE `contact` SET `issued-id` = '%s' WHERE `id` = %d LIMIT 1", - dbesc($issued_id), - intval($contact_record['id']) - ); + + logger('dfrn_request: url: ' . $url); + + if(! strlen($url)) { + notice( t("Unable to resolve your name at the provided location.") . EOL); + return; } - else { - - require_once('Scrape.php'); - $parms = scrape_dfrn($url); - if(! count($parms)) { - notice( t('Profile location is not valid or does not contain profile information.') . EOL ); - killme(); - } - else { - if(! x($parms,'fn')) - notice( t('Warning: profile location has no identifiable owner name.') . EOL ); - if(! x($parms,'photo')) - notice( t('Warning: profile location has no profile photo.') . EOL ); - $invalid = validate_dfrn($parms); - if($invalid) { - notice( $invalid . t(' required parameter') - . (($invalid == 1) ? t(" was ") : t("s were ") ) - . t("not found at the given location.") . EOL ) ; + if($network === NETWORK_DFRN) { + $ret = q("SELECT * FROM `contact` WHERE `uid` = %d AND `url` = '%s' AND `self` = 0 LIMIT 1", + intval($uid), + dbesc($url) + ); + if(count($ret)) { + if(strlen($ret[0]['issued-id'])) { + notice( t('You have already introduced yourself here.') . EOL ); + return; + } + elseif($ret[0]['rel'] == CONTACT_IS_FRIEND) { + notice( sprintf( t('Apparently you are already friends with %s.'), $a->profile['name']) . EOL); return; } + else { + $contact_record = $ret[0]; + $parms = array('dfrn-request' => $ret[0]['request']); + } + } + + $issued_id = random_string(); + + if(is_array($contact_record)) { + // There is a contact record but no issued-id, so this + // is a reciprocal introduction from a known contact + $r = q("UPDATE `contact` SET `issued-id` = '%s' WHERE `id` = %d", + dbesc($issued_id), + intval($contact_record['id']) + ); } + else { + if(! validate_url($url)) { + notice( t('Invalid profile URL.') . EOL); + goaway($a->get_baseurl() . '/' . $a->cmd); + return; // NOTREACHED + } + + if(! allowed_url($url)) { + notice( t('Disallowed profile URL.') . EOL); + goaway($a->get_baseurl() . '/' . $a->cmd); + return; // NOTREACHED + } - $parms['url'] = $url; - $parms['issued-id'] = $issued_id; + require_once('include/Scrape.php'); + $parms = scrape_dfrn(($hcard) ? $hcard : $url); - dbesc_array($parms); - $r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `name`, `issued-id`, `photo`, `site-pubkey`, - `request`, `confirm`, `notify`, `poll` ) - VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' )", - intval($uid), - datetime_convert(), - $parms['url'], - $parms['fn'], - $parms['issued-id'], - $parms['photo'], - $parms['key'], - $parms['dfrn-request'], - $parms['dfrn-confirm'], - $parms['dfrn-notify'], - $parms['dfrn-poll'] - ); + if(! count($parms)) { + notice( t('Profile location is not valid or does not contain profile information.') . EOL ); + goaway($a->get_baseurl() . '/' . $a->cmd); + } + else { + if(! x($parms,'fn')) + notice( t('Warning: profile location has no identifiable owner name.') . EOL ); + if(! x($parms,'photo')) + notice( t('Warning: profile location has no profile photo.') . EOL ); + $invalid = validate_dfrn($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", + $invalid), $invalid) . EOL ); + + return; + } + } - // find the contact record we just created - if($r) { - $r = q("SELECT `id` FROM `contact` - WHERE `uid` = '%s' AND `url` = '%s' AND `issued-id` = '%s' LIMIT 1", + + $parms['url'] = $url; + $parms['issued-id'] = $issued_id; + + + dbesc_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` ) + VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' )", intval($uid), + dbesc(datetime_convert()), $parms['url'], - $parms['issued-id'] + dbesc(normalise_link($parms['url'])), + $parms['addr'], + $parms['fn'], + $parms['nick'], + $parms['issued-id'], + $parms['photo'], + $parms['key'], + $parms['dfrn-request'], + $parms['dfrn-confirm'], + $parms['dfrn-notify'], + $parms['dfrn-poll'], + $parms['dfrn-poco'], + dbesc(NETWORK_DFRN) ); - if(count($r)) - $contact_record = $r[0]; + + // find the contact record we just created + if($r) { + $r = q("SELECT `id` FROM `contact` + WHERE `uid` = %d AND `url` = '%s' AND `issued-id` = '%s' LIMIT 1", + intval($uid), + $parms['url'], + $parms['issued-id'] + ); + if(count($r)) + $contact_record = $r[0]; + } + + } + if($r === false) { + notice( t('Failed to update contact record.') . EOL ); + return; } - - } - if($r === false) { - notice( 'Failed to update contact record.' . EOL ); - return; - } - $hash = random_string() . (string) time(); // Generate a confirm_key + $hash = random_string() . (string) time(); // Generate a confirm_key - if(is_array($contact_record)) { - $ret = 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), - dbesc(trim($_POST['dfrn-request-message'])), - dbesc($hash), - dbesc(datetime_convert()) - ); - } - + if(is_array($contact_record)) { + $ret = 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), + dbesc(notags(trim($_POST['dfrn-request-message']))), + dbesc($hash), + dbesc(datetime_convert()) + ); + } - // This notice will only be seen by the requestor if the requestor and requestee are on the same server. + // This notice will only be seen by the requestor if the requestor and requestee are on the same server. - if(! $failed) - notice( t("Your introduction has been sent.") . EOL ); + if(! $failed) + info( t('Your introduction has been sent.') . EOL ); - // "Homecoming" - send the requestor back to their site to record the introduction. + // "Homecoming" - send the requestor back to their site to record the introduction. - $dfrn_url = bin2hex($a->get_baseurl() . "/profile/$nickname"); - $aes_allow = ((function_exists('openssl_encrypt')) ? 1 : 0); + $dfrn_url = bin2hex($a->get_baseurl() . '/profile/' . $nickname); + $aes_allow = ((function_exists('openssl_encrypt')) ? 1 : 0); - goaway($parms['dfrn-request'] . "?dfrn_url=$dfrn_url" . '&confirm_key=' . $hash . (($aes_allow) ? "&aes_allow=1" : "")); - return; // NOTREACHED + goaway($parms['dfrn-request'] . "?dfrn_url=$dfrn_url" + . '&dfrn_version=' . DFRN_PROTOCOL_VERSION + . '&confirm_key=' . $hash + . (($aes_allow) ? "&aes_allow=1" : "") + ); + // NOTREACHED + // END $network === NETWORK_DFRN + } + elseif($network === NETWORK_OSTATUS) { + + /** + * + * 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); + goaway($url); + // NOTREACHED + // END $network === NETWORK_OSTATUS + } - } - return; + } return; }} @@ -336,12 +639,9 @@ function dfrn_request_post(&$a) { if(! function_exists('dfrn_request_content')) { function dfrn_request_content(&$a) { - - if(($a->argc != 2) || (! count($a->profile))) return ""; - $a->page['template'] = 'profile'; // "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. @@ -349,11 +649,13 @@ function dfrn_request_content(&$a) { if(x($_GET,'dfrn_url')) { if(! local_user()) { - notice( t("Please login to confirm introduction.") . EOL ); + info( t("Please login to confirm introduction.") . EOL ); + /* setup the return URL to come back to this page if they use openid */ + $_SESSION['return_url'] = $a->query_string; return login(); } - // Edge case, but can easily happen in the wild. This person is authenticated, + // Edge case, but can easily happen in the wild. This person is authenticated, // but not as the person who needs to deal with this request. if ($a->user['nickname'] != $a->argv[1]) { @@ -364,12 +666,31 @@ function dfrn_request_content(&$a) { $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'] : ""); - $o .= file_get_contents("view/dfrn_req_confirm.tpl"); - $o = replace_macros($o,array( + + // 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, '$aes_allow' => (($aes_allow) ? '' : "" ), + '$hidethem' => t('Hide this contact'), + '$hidechecked' => '', '$confirm_key' => $confirm_key, - '$username' => $a->user['username'], + '$welcome' => sprintf( t('Welcome home %s.'), $a->user['username']), + '$please' => sprintf( t('Please confirm your introduction/connection request to %s.'), $dfrn_url), + '$submit' => t('Confirm'), '$uid' => $_SESSION['uid'], '$nickname' => $a->user['nickname'], 'dfrn_rawurl' => $_GET['dfrn_url'] @@ -377,11 +698,11 @@ function dfrn_request_content(&$a) { return $o; } - elseif((x($_GET,'confirm_key')) && strlen($_GET['confirm_key'])) { + elseif((x($_GET,'confirm_key')) && strlen($_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. + // 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. $intro = q("SELECT * FROM `intro` WHERE `hash` = '%s' LIMIT 1", dbesc($_GET['confirm_key']) @@ -393,38 +714,160 @@ function dfrn_request_content(&$a) { WHERE `contact`.`id` = %d LIMIT 1", intval($intro[0]['contact-id']) ); - if(count($r)) { - if($r[0]['notify-flags'] & NOTIFY_INTRO) { - $email_tpl = file_get_contents('view/request_notify_eml.tpl'); - $email = replace_macros($email_tpl, array( - '$requestor' => ((strlen(stripslashes($r[0]['name']))) ? stripslashes($r[0]['name']) : t('[Name Withheld]')), - '$url' => stripslashes($r[0]['url']), - '$myname' => $r[0]['username'], - '$siteurl' => $a->get_baseurl(), - '$sitename' => $a->config['sitename'] + $auto_confirm = false; + + if(count($r)) { + if(($r[0]['page-flags'] != PAGE_NORMAL) && ($r[0]['page-flags'] != PAGE_PRVGROUP)) + $auto_confirm = true; + + if(! $auto_confirm) { + + notification(array( + 'type' => NOTIFY_INTRO, + 'notify_flags' => $r[0]['notify-flags'], + 'language' => $r[0]['language'], + 'to_name' => $r[0]['username'], + 'to_email' => $r[0]['email'], + 'uid' => $r[0]['uid'], + 'link' => $a->get_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'], + 'verb' => ACTIVITY_REQ_FRIEND, + 'otype' => 'intro' )); - $res = mail($r[0]['email'],t("Introduction received at ") . $a->config['sitename'],$email,t('From: Administrator@') . $_SERVER[SERVER_NAME] ); - // This is a redundant notification - no point throwing errors if it fails. } + + if($auto_confirm) { + 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')) + ); + dfrn_confirm_post($a,$handsfree); + } + } - $r = q("UPDATE `intro` SET `blocked` = 0 WHERE `hash` = '%s' LIMIT 1", - dbesc($_GET['confirm_key']) - ); + if(! $auto_confirm) { + + // 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'", + dbesc($_GET['confirm_key']) + ); + } } + killme(); return; // NOTREACHED } else { - // Normal web request. Display our user's introduction form. + /** + * Normal web request. Display our user's introduction form. + */ - $o = file_get_contents("view/dfrn_request.tpl"); - $o = replace_macros($o,array('$nickname' => $a->argv[1])); + if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) { + if(! get_config('system','local_block')) { + notice( t('Public access denied.') . EOL); + return; + } + } + + + /** + * Try to auto-fill the profile address + */ + + // At first look if an address was provided + // Otherwise take the local address + if (x($_GET,'addr') AND ($_GET['addr'] != "")) + $myaddr = hex2bin($_GET['addr']); + elseif (x($_GET,'address') AND ($_GET['address'] != "")) + $myaddr = $_GET['address']; + elseif(local_user()) { + if(strlen($a->path)) { + $myaddr = $a->get_baseurl() . '/profile/' . $a->user['nickname']; + } + else { + $myaddr = $a->user['nickname'] . '@' . substr(z_root(), strpos(z_root(),'://') + 3 ); + } + } else // last, try a zrl + $myaddr = get_my_url(); + + $target_addr = $a->profile['nickname'] . '@' . substr(z_root(), strpos(z_root(),'://') + 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'] == PAGE_NORMAL) + $tpl = get_markup_template('dfrn_request.tpl'); + else + $tpl = get_markup_template('auto_request.tpl'); + + $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(! count($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() + ); + + $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'), + '$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']), + '$yes' => t('Yes'), + '$no' => t('No'), */ + '$add_note' => t('Add a personal note:'), + '$page_desc' => $page_desc, + '$friendica' => t('Friendica'), + '$statusnet' => t('StatusNet/Federated Social Web'), + '$diaspora' => t('Diaspora'), + '$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], + '$name' => $a->profile['name'], + '$myaddr' => $myaddr + )); return $o; } return; // Somebody is fishing. -}} \ No newline at end of file +}}