From e921b97a7f4e6f16e499eb7a8dd496f88d18277a Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Mon, 5 Sep 2011 18:34:30 -0700
Subject: bug #127, add Diaspora notes to Connect (dfrn_request) page, get rid
 of security warnings

---
 mod/dfrn_request.php | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'mod/dfrn_request.php')

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index 98901e9f5..ce83001b4 100644
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -611,6 +611,9 @@ function dfrn_request_content(&$a) {
 			$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
@@ -624,6 +627,11 @@ function dfrn_request_content(&$a) {
 		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.friendika.com, http://demo.friendika.com/profile/jojo, testuser@identi.ca'),
@@ -632,11 +640,11 @@ function dfrn_request_content(&$a) {
 			'$yes' => t('Yes'),
 			'$no' => t('No'),
 			'$add_note' => t('Add a personal note:'),
-			'$page_desc' => t("Please enter your 'Identity Address' from one of the following supported social networks:"),
+			'$page_desc' => $page_desc,
 			'$friendika' => t('Friendika'),
 			'$statusnet' => t('StatusNet/Federated Social Web'),
-			'$private_net' => t("Private \x28secure\x29 network"),
-			'$public_net' => t("Public \x28insecure\x29 network"),
+			'$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'),
-- 
cgit v1.2.3


From a5125359d85afa056aee18a73692b6d1a587be47 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Tue, 6 Sep 2011 18:06:19 -0700
Subject: faster friend requests (DFRN)

---
 mod/dfrn_request.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'mod/dfrn_request.php')

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index ce83001b4..5d789f480 100644
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -277,14 +277,15 @@ function dfrn_request_post(&$a) {
 
 		// Canonicalise email-style profile locator
 
-		$url = webfinger_dfrn($url);
+		$hcard = '';
+		$url = webfinger_dfrn($url,$hcard);
 
 		if(substr($url,0,5) === 'stat:') {
-			$network = 'stat';
+			$network = NETWORK_OSTATUS;
 			$url = substr($url,5);
 		}
 		else {
-			$network = 'dfrn';
+			$network = NETWORK_DFRN;
 		}
 
 		logger('dfrn_request: url: ' . $url);
@@ -342,7 +343,7 @@ function dfrn_request_post(&$a) {
 
 				require_once('Scrape.php');
 
-				$parms = scrape_dfrn($url);
+				$parms = scrape_dfrn(($hcard) ? $hcard : $url);
 
 				if(! count($parms)) {
 					notice( t('Profile location is not valid or does not contain profile information.') . EOL );
-- 
cgit v1.2.3