X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fdfrn_request.php;h=9755895ced0220cb398342798a0256f1dbab10c2;hb=5a890b0ef910f58db906cf502e76d3b7eb4aca38;hp=4b41c9c6cc14ac6b041f59c27d74bca02cec1577;hpb=023dd993f60a103601c4943a33678356d919a643;p=friendica.git

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index 4b41c9c6cc..9755895ced 100644
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -1,23 +1,41 @@
 <?php
 
+/**
+ *
+ * Module: dfrn_request
+ *
+ * Purpose: Handles communication associated with the issuance of
+ * friend requests.
+ *
+ */
+
 if(! function_exists('dfrn_request_init')) {
 function dfrn_request_init(&$a) {
 
-	if($_SESSION['authenticated']) {
-		// choose which page to show (could be remote auth)
-
-	}
-
 	if($a->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) {
 
@@ -26,303 +44,435 @@ function dfrn_request_post(&$a) {
 
 
 	if($_POST['cancel']) {
-		goaway($a->get_baseurl());
+		goaway(z_root());
 	} 
 
 
-	// callback to local site after remote request and local confirm
+	/**
+	 *
+	 * 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) 
-		&& local_user() && ($a->user['nickname'] == $a->argv[1]) && (x($_POST,'dfrn_url'))) {
+	if((x($_POST,'localconfirm')) && ($_POST['localconfirm'] == 1)) {
 
-		// We are the requestor, and we've been sent back to our own site
-		// to confirm the request. We've done so and clicked submit,
-		// which brings us here.
+		/**
+		 * Ensure this is a valid request
+		 */
 
-		$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'] : "");
+		if(local_user() && ($a->user['nickname'] == $a->argv[1]) && (x($_POST,'dfrn_url'))) {
 
-		$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)
-			);
+			$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'] : "");
+
+			$contact_record = null;
 	
-			if(count($r)) {
-				if(strlen($r[0]['dfrn-id'])) {
-					notice("This introduction has already been accepted." . EOL );
-					return;
-				}
-				else
-					$contact_record = $r[0];
-			}
+			if(x($dfrn_url)) {
+
+				/**
+				 * Lookup the contact based on their URL (which is the only unique thing we have at the moment)
+				 */
 	
-			if(is_array($contact_record)) {
-				$r = q("UPDATE `contact` SET `ret-aes` = %d WHERE `id` = %d LIMIT 1",
-					intval($aes_allow),
-					intval($contact_record['id'])
+				$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `url` = '%s' AND `self` = 0 LIMIT 1",
+					intval(local_user()),
+					dbesc($dfrn_url)
 				);
-			}
-			else {
-
-				require_once('Scrape.php');
-
+	
+				if(count($r)) {
+					if(strlen($r[0]['dfrn-id'])) {
 
-				$parms = scrape_dfrn($dfrn_url);
+						/**
+						 * We don't need to be here. It has already happened.
+						 */
 
-				if(! count($parms)) {
-					notice( 'Profile location is not valid or does not contain profile information.' . EOL );
-					return;
+						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",
+						intval($aes_allow),
+						intval($contact_record['id'])
+					);
 				}
 				else {
-					if(! x($parms,'fn'))
-						notice( 'Warning: profile location has no identifiable owner name.' . EOL );
-					if(! x($parms,'photo'))
-						notice( 'Warning: profile location has no profile photo.' . EOL );
-					$invalid = validate_dfrn($parms);		
-					if($invalid) {
-						notice( $invalid . ' required parameter' 
-							. (($invalid == 1) ? " was " : "s were " )
-							. "not found at the given location." . EOL ) ;
+	
+					/**
+					 * Scrape the other site's profile page to pick up the dfrn links, key, fn, and photo
+					 */
+
+					require_once('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;
 					}
-				}
+					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;
+						}
+					}
 
+					$dfrn_request = $parms['dfrn-request'];
+
+                    /********* 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`,
+						`request`, `confirm`, `notify`, `poll`, `poco`, `network`, `aes_allow`) 
+						VALUES ( %d, '%s', '%s', '%s', '%s' , '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d)",
+						intval(local_user()),
+						datetime_convert(),
+						dbesc($dfrn_url),
+						dbesc(normalise_link($dfrn_url)),
+						$parms['fn'],
+						$parms['nick'],
+						$parms['photo'],
+						$parms['key'],
+						$parms['dfrn-request'],
+						$parms['dfrn-confirm'],
+						$parms['dfrn-notify'],
+						$parms['dfrn-poll'],
+						$parms['dfrn-poco'],
+						dbesc(NETWORK_DFRN),
+						intval($aes_allow)
+					);
+				}
 
+				if($r) {
+					info( t("Introduction complete.") . EOL);
+				}
 
-				$dfrn_request = $parms['dfrn-request'];
+				/**
+				 * Allow the blocked remote notification to complete
+				 */
 
-				dbesc_array($parms);
+				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, nothing we can do it failed)
 
-				$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']),
-					datetime_convert(),
-					dbesc($dfrn_url),
-					$parms['fn'],
-					$parms['photo'],
-					$parms['key'],
-					$parms['dfrn-request'],
-					$parms['dfrn-confirm'],
-					$parms['dfrn-notify'],
-					$parms['dfrn-poll'],
-					intval($aes_allow)
-				);
-			}
+				goaway($dfrn_url);
+				return; // NOTREACHED
 
-			if($r) {
-				notice( "Introduction complete." . EOL);
 			}
 
-			// 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);
-			// NOTREACHED
+ 		// invalid/bogus request
 
-		}
- 		// invalid DFRN-url
-		notice( "Unrecoverable protocol error." . EOL );
-		goaway($a->get_baseurl());
+		notice( t('Unrecoverable protocol error.') . EOL );
+		goaway(z_root());
+		return; // NOTREACHED
 	}
-	// extra safety
-	if($_POST['localconfirm'])
-		return;
-
 
-	// we are operating as a remote site and an introduction was requested of us.
-	// 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 originator so that their site can record the request.
-	// If our user confirms the request, a record of it will need to exist on the 
-	// originator's site in order for the confirmation process to complete.. 
+	/**
+	 * 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);
+		return;
+	}
 
+	$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;
 
-	$tailname = $a->profile['nickname'];
 
-	$uid = $a->profile['uid'];
+	if( x($_POST,'dfrn_url')) {
 
-	$contact_record = null;
-	$failed = false;
-	$parms = null;
+		/**
+		 * 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;
+			} 
+		}
 
-	if( x($_POST,'dfrn_url')) {
+		/**
+		 *
+		 * Cleanup old introductions that remain blocked. 
+		 * Also remove the contact record, but only if there is no existing relationship
+		 *
+		 */
+
+		$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 `intro`.`datetime` < UTC_TIMESTAMP() - INTERVAL 30 MINUTE ");
+		if(count($r)) {
+			foreach($r as $rr) {
+				if(! $rr['rel']) {
+					q("DELETE FROM `contact` WHERE `id` = %d LIMIT 1",
+						intval($rr['cid'])
+					);
+				}
+				q("DELETE FROM `intro` WHERE `id` = %d LIMIT 1",
+					intval($rr['iid'])
+				);
+			}
+		}
 
 		$url = trim($_POST['dfrn_url']);
 		if(! strlen($url)) {
-			notice( "Invalid URL" . EOL );
+			notice( t("Invalid locator") . EOL );
 			return;
 		}
 
-		if(strstr($url,'@')) {
-			$username = substr($url,0,strpos($url,'@'));
-			$hostname = substr($url,strpos($url,'@') + 1);
-			require_once('Scrape.php');
+		// Canonicalise email-style profile locator
 
-		
-			$parms = scrape_meta('https://' . $url);
-			if((x($parms,'dfrn-template')) && strstr($parms['dfrn-template'],'%s')) {
-				$url = sprintf($parms['dfrn-template'],$username);
-			}
-			else {
-				$parms = scrape_meta('http://' . $url);
-				if((x($parms,'dfrn-template')) && strstr($parms['dfrn-template'],'%s')) {
-					$url = sprintf($parms['dfrn-template'],$username);
-				}
-				else {
-					$url = '';
-				}
-			}
+		$hcard = '';
+		$url = webfinger_dfrn($url,$hcard);
 
+		if(substr($url,0,5) === 'stat:') {
+			$network = NETWORK_OSTATUS;
+			$url = substr($url,5);
 		}
+		else {
+			$network = NETWORK_DFRN;
+		}
+
+		logger('dfrn_request: url: ' . $url);
 
 		if(! strlen($url)) {
-			notice("Unable to resolve your name at the provided location." . EOL);			
+			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)
-		);
 
-		if(count($ret)) {
-			if(strlen($ret[0]['issued-id'])) {
-				notice( 'You have already introduced yourself here.' . 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 LIMIT 1",
-				dbesc($issued_id),
-				intval($contact_record['id'])
+		if($network === NETWORK_DFRN) {
+			$ret = q("SELECT * FROM `contact` WHERE `uid` = %d AND `url` = '%s' AND `self` = 0 LIMIT 1", 
+				intval($uid),
+				dbesc($url)
 			);
-		}
-		else {
-	
-			require_once('Scrape.php');
 
-			$parms = scrape_dfrn($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(! count($parms)) {
-				notice( 'Profile location is not valid or does not contain profile information.' . EOL );
-				killme();
+			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'])
+				);
 			}
 			else {
-				if(! x($parms,'fn'))
-					notice( 'Warning: profile location has no identifiable owner name.' . EOL );
-				if(! x($parms,'photo'))
-					notice( 'Warning: profile location has no profile photo.' . EOL );
-				$invalid = validate_dfrn($parms);		
-				if($invalid) {
-					notice( $invalid . ' required parameter' 
-						. (($invalid == 1) ? " was " : "s were " )
-						. "not found at the given location." . EOL ) ;
+				if(! validate_url($url)) {
+					notice( t('Invalid profile URL.') . EOL);
+					goaway($a->get_baseurl() . '/' . $a->cmd);
+					return; // NOTREACHED
+				}
 
-					return;
+				if(! allowed_url($url)) {
+					notice( t('Disallowed profile URL.') . EOL);
+					goaway($a->get_baseurl() . '/' . $a->cmd);
+					return; // NOTREACHED
 				}
-			}
+			
 
+				require_once('Scrape.php');
+
+				$parms = scrape_dfrn(($hcard) ? $hcard : $url);
+
+				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;
+					}
+				}
 
-			$parms['url'] = $url;
-			$parms['issued-id'] = $issued_id;
 
+				$parms['url'] = $url;
+				$parms['issued-id'] = $issued_id;
 
-			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']
-			);
 
-			// 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",
+				dbesc_array($parms);
+				$r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `nurl`,`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' )",
 					intval($uid),
+					dbesc(datetime_convert()),
 					$parms['url'],
-					$parms['issued-id']
+					dbesc(normalise_link($parms['url'])),
+					$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)
+				);
+
+				// 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;
+			}
+
+			$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(notags(trim($_POST['dfrn-request-message']))),
+					dbesc($hash),
+					dbesc(datetime_convert())
 				);
-				if(count($r)) 
-					$contact_record = $r[0];
 			}
 	
-		}
-		if($r === false) {
-			notice( 'Failed to update contact record.' . EOL );
-			return;
-		}
+			// This notice will only be seen by the requestor if the requestor and requestee are on the same server.
 
-		$hash = random_string() . (string) time();   // Generate a confirm_key
+			if(! $failed) 
+				info( t('Your introduction has been sent.') . EOL );
 
-		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())
+			// "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);
+
+			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() . '/dfrn_poll/' . $nickname, $url);
+			goaway($url);
+			// NOTREACHED
+			// END $network === NETWORK_OSTATUS
 		}
-	
-		// TODO: send an email notification if our user wants one
-
-		if(! $failed) 
-			notice( "Your introduction has been sent." . EOL );
 
-		// "Homecoming" - send the requestor back to their site to record the introduction.
+	}	return;
+}}
 
-		$dfrn_url = bin2hex($a->get_baseurl() . "/profile/$tailname");
-		$aes_allow = ((function_exists('openssl_encrypt')) ? 1 : 0);
 
-		goaway($parms['dfrn-request'] . "?dfrn_url=$dfrn_url" . '&confirm_key=' . $hash . (($aes_allow) ? "&aes_allow=1" : ""));
-		// NOTREACHED
 
-	}
-	return;
-}}
 
 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.
@@ -330,27 +480,35 @@ function dfrn_request_content(&$a) {
 	if(x($_GET,'dfrn_url')) {
 
 		if(! local_user()) {
-			notice( "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 */
+
+			$stripped = str_replace('q=','',$a->query_string);
+			$_SESSION['return_url'] = trim($stripped,'/');
+
 			return login();
 		}
 
 		// 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 (($_SESSION['uid'] != $a->argv[1]) && ($a->user['nickname'] != $a->argv[1])) {
-			notice( "Incorrect identity currently logged in. Please login to <strong>this</strong> profile." . EOL);
+		if ($a->user['nickname'] != $a->argv[1]) {
+			notice( t("Incorrect identity currently logged in. Please login to <strong>this</strong> profile.") . EOL);
 			return login();
 		}
 
-		$dfrn_url = notags(trim(pack("H*" , $_GET['dfrn_url'])));
+		$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(
+		$tpl = get_markup_template("dfrn_req_confirm.tpl");
+		$o  = replace_macros($tpl,array(
 			'$dfrn_url' => $dfrn_url,
 			'$aes_allow' => (($aes_allow) ? '<input type="hidden" name="aes_allow" value="1" />' : "" ),
 			'$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']
@@ -358,21 +516,149 @@ function dfrn_request_content(&$a) {
 		return $o;
 
 	}
-	else {
-		// we are the requestee and it is now safe to send our user their introduction
-		if((x($_GET,'confirm_key')) && strlen($_GET['confirm_key'])) {
-			$r = q("UPDATE `intro` SET `blocked` = 0 WHERE `hash` = '%s' LIMIT 1",
-				dbesc($_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. 
+
+		$intro = q("SELECT * FROM `intro` WHERE `hash` = '%s' LIMIT 1",
+			dbesc($_GET['confirm_key'])
+		);
+
+		if(count($intro)) {
+
+			$r = q("SELECT `contact`.*, `user`.* FROM `contact` LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid`
+				WHERE `contact`.`id` = %d LIMIT 1",
+				intval($intro[0]['contact-id'])
 			);
-			killme();
+
+			$auto_confirm = false;
+
+			if(count($r)) {
+				if($r[0]['page-flags'] != PAGE_NORMAL)
+					$auto_confirm = true;				
+				if(($r[0]['notify-flags'] & NOTIFY_INTRO) && (! $auto_confirm)) {
+					$email_tpl = get_intltext_template('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']
+					));
+					$res = mail($r[0]['email'], 
+					    t("Introduction received at ") . $a->config['sitename'],
+						$email,
+						'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
+						. 'Content-type: text/plain; charset=UTF-8' . "\n"
+						. 'Content-transfer-encoding: 8bit' );
+
+					// 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)
+					);
+					dfrn_confirm_post($a,$handsfree);
+				}
+
+			}
+
+			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' LIMIT 1",
+					dbesc($_GET['confirm_key'])
+				);
+			}
 		}
 
+		killme();
+		return; // NOTREACHED
+	}
+	else {
+
+		/**
+		 * Normal web request. Display our user's introduction form.
+		 */
+ 
+		if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
+			notice( t('Public access denied.') . EOL);
+			return;
+		}
 
-	// Outside request. Display our user's introduction form. 
 
+		/**
+		 * Try to auto-fill the profile address
+		 */
 
-	$o = file_get_contents("view/dfrn_request.tpl");
-	$o = replace_macros($o,array('$uid' => $a->argv[1]));
-	return $o;
+		if(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 );
+			}
+		}
+		elseif(x($_GET,'addr')) {
+			$myaddr = hex2bin($_GET['addr']);
+		}
+		else {
+			/* $_GET variables are already urldecoded */ 
+			$myaddr = ((x($_GET,'address')) ? $_GET['address'] : '');
+		}
+
+		$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 = sprintf( t('Diaspora members: Please do not use this form. Instead, enter "%s" into your Diaspora search bar.'), 
+			$target_addr) . EOL . EOL;
+
+		$page_desc .= t("Please enter your 'Identity Address' from one of the following supported social networks:");
+
+		$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' => 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,
+			'$friendika' => t('Friendica'),
+			'$statusnet' => t('StatusNet/Federated Social Web'),
+			'$diaspora' => t('Diaspora'),
+			'$diasnote' => t('- please share from your own site as noted above'),
+			'$your_address' => t('Your Identity Address:'),
+			'$submit' => t('Submit Request'),
+			'$cancel' => t('Cancel'),
+			'$nickname' => $a->argv[1],
+			'$name' => $a->profile['name'],
+			'$myaddr' => $myaddr
+		));
+		return $o;
 	}
-}}
\ No newline at end of file
+
+	return; // Somebody is fishing.
+}}