Merge remote-tracking branch 'friendika/master' into newui

3 files changed, 57 insertions, 17 deletions

diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php
index 4dacb5d81..180e8ff31 100644
--- a/mod/dfrn_confirm.php
+++ b/mod/dfrn_confirm.php
@@ -566,7 +566,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 				dbesc($newurl),
 				intval($local_uid)
 			);
-			if(! count($r)) {
+			if(! count($ret)) {
 				// this is either a bogus confirmation (?) or we deleted the original introduction.
 				$message = t('Contact record was not found for you on our site.');
 				xml_status(3,$message);
@@ -581,6 +581,11 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 		$foreign_pubkey = $ret[0]['site-pubkey'];
 		$dfrn_record    = $ret[0]['id'];
 
+		if(! $foreign_pubkey) {
+			$message = sprintf( t('Site public key not available in contact record for URL %s.'), $newurl);
+			xml_status(3,$message);
+		}
+
 		$decrypted_dfrn_id = "";
 		openssl_public_decrypt($dfrn_id,$decrypted_dfrn_id,$foreign_pubkey);
 
diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index 98901e9f5..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 );
@@ -611,6 +612,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 +628,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 +641,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'),
diff --git a/mod/network.php b/mod/network.php
index 3c8125303..145caa173 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -14,6 +14,9 @@ function network_init(&$a) {
 		$a->page['aside'] = '';
 
 	$search = ((x($_GET,'search')) ? escape_tags($_GET['search']) : '');
+
+	// We need a better way of managing a growing argument list
+
 	$srchurl = '/network' 
 		. ((x($_GET,'cid')) ? '?cid=' . $_GET['cid'] : '') 
 		. ((x($_GET,'star')) ? '?star=' . $_GET['star'] : '')
@@ -44,8 +47,9 @@ function network_init(&$a) {
 
 
 	$a->page['aside'] .= '<div id="network-view-link">';
-	if(($a->argc > 1 && $a->argv[1] === 'new') || ($a->argc > 2 && $a->argv[2] === 'new') || x($_GET,'search'))
+	if(($a->argc > 1 && $a->argv[1] === 'new') || ($a->argc > 2 && $a->argv[2] === 'new') || x($_GET,'search')) {
 		$a->page['aside'] .= '<a href="' . $a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '?cid=' . $_GET['cid'] : '') . '">' . t('View Conversations') . '</a></div>';
+	}
 	else { 
 		$a->page['aside'] .= '<a href="' . $a->get_baseurl() . '/' . $a->cmd . '/new' . ((x($_GET,'cid')) ? '/?cid=' . $_GET['cid'] : '') . '">' . t('View New Items') . '</a></div>';
 
@@ -65,6 +69,14 @@ function network_init(&$a) {
 				. '<span class="network-star icon starred"></span>' 
 				. '<div class="clear"></div></div>';
 
+		if(! $_GET['bmark'])
+			$a->page['aside'] .= '<div id="network-bmark-link">'
+				. '<a class="network-bmark" href="' . $a->get_baseurl() . '/' . $a->cmd 
+				. ((x($_GET,'cid')) ? '/?cid=' . $_GET['cid'] : '') . '&bmark=1" >' 
+				. t('View Bookmarks') . '</a>'
+				. '<div class="clear"></div></div>';
+
+
 	}
 
 	$a->page['aside'] .= '</div>';
@@ -299,21 +311,29 @@ function network_content(&$a, $update = 0) {
 	else {
 
 		// Normal conversation view
+		// Show conversation by activity date
+		
+		
 		// First fetch a known number of parent items
 
 		$r = q("SELECT `item`.`id` AS `item_id`, `contact`.`uid` AS `contact_uid`
 			FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
-			WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
+			, (SELECT `_com`.`parent`,max(`_com`.`created`) as `created`
+				FROM `item` AS `_com` 
+				WHERE `_com`.`uid`=%d AND
+				(`_com`.`parent`!=`_com`.`id` OR `_com`.`id`  NOT IN (SELECT `__com`.`parent` FROM `item` as `__com` WHERE `__com`.`parent`!=`__com`.`id`))
+				GROUP BY `_com`.`parent` ORDER BY `created` DESC) AS `com` 
+			WHERE `item`.`id`=`com`.`parent` AND
+			`item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
 			AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
-			AND `item`.`parent` = `item`.`id`
+			
 			$sql_extra
-			ORDER BY `item`.`created` DESC LIMIT %d ,%d ",
+			ORDER BY `com`.`created` DESC LIMIT %d ,%d ",
+			intval(local_user()),
 			intval(local_user()),
 			intval($a->pager['start']),
 			intval($a->pager['itemspage'])
 		);
-
-
 		// Then fetch all the children of the parents that are on this page
 
 		$parents_arr = array();
@@ -328,13 +348,19 @@ function network_content(&$a, $update = 0) {
 				`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, `contact`.`writable`,
 				`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
 				`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
-				FROM `item`, (SELECT `p`.`id`,`p`.`created` FROM `item` AS `p` WHERE `p`.`parent`=`p`.`id`) as `parentitem`, `contact`
+				FROM `item`, `contact`,
+					(SELECT `_com`.`parent`,max(`_com`.`created`) as `created`
+					FROM `item` AS `_com` 
+					WHERE `_com`.`uid`=%d AND
+					(`_com`.`parent`!=`_com`.`id` OR `_com`.`id`  NOT IN (SELECT `__com`.`parent` FROM `item` as `__com` WHERE `__com`.`parent`!=`__com`.`id`))
+					GROUP BY `_com`.`parent` ORDER BY `created` DESC) AS `com` 
 				WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
 				AND `contact`.`id` = `item`.`contact-id`
 				AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
-				AND `item`.`parent` = `parentitem`.`id` AND `item`.`parent` IN ( %s )
+				AND `item`.`parent` = `com`.`parent` AND `item`.`parent` IN ( %s )
 				$sql_extra
-				ORDER BY `parentitem`.`created`  DESC, `item`.`gravity` ASC, `item`.`created` ASC ",
+				ORDER BY `com`.`created`  DESC, `item`.`gravity` ASC, `item`.`created` ASC ",
+				intval(local_user()),
 				intval(local_user()),
 				dbesc($parents_str)
 			);