Merge remote-tracking branch 'upstream/master'

1 files changed, 20 insertions, 4 deletions

diff --git a/mod/oexchange.php b/mod/oexchange.php
index 791a493ff..27c8b388d 100644
--- a/mod/oexchange.php
+++ b/mod/oexchange.php
@@ -15,6 +15,21 @@ function oexchange_init(&$a) {
 function oexchange_content(&$a) {
 
 	if(! local_user()) {
+		if(remote_user()) {
+			$observer = $a->get_observer();
+			if($observer && $observer['xchan_url']) {
+				$parsed = @parse_url($observer['xchan_url']);
+				if(! $parsed) {
+					notice( t('Unable to find your hub.') . EOL);
+					return;
+				}
+				$url = $parsed['scheme'] . '://' . $parsed['host'] . (($parsed['port']) ? ':' . $parsed['port'] : '');
+				$url .= '/oexchange';
+				$result = z_post_url($url,$_REQUEST);
+				json_return_and_die($result);
+			}
+		}
+
 		return login(false);
 	}
 
@@ -32,18 +47,19 @@ function oexchange_content(&$a) {
 	$tags = (((x($_REQUEST,'tags')) && strlen($_REQUEST['tags'])) 
 		? '&tags=' . urlencode(notags(trim($_REQUEST['tags']))) : '');
 
-	$s = fetch_url($a->get_baseurl() . '/parse_url?f=&url=' . $url . $title . $description . $tags);
+	$ret = z_fetch_url($a->get_baseurl() . '/parse_url?f=&url=' . $url . $title . $description . $tags);
+
+	if($ret['success'])
+		$s = $ret['body'];
 
 	if(! strlen($s))
 		return;
 
-	require_once('include/html2bbcode.php');
-
 	$post = array();
 
 	$post['profile_uid'] = local_user();
 	$post['return'] = '/oexchange/done' ;
-	$post['body'] = html2bbcode($s);
+	$post['body'] = $s;
 	$post['type'] = 'wall';
 
 	$_REQUEST = $post;