X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Foexchange.php;h=4f2d7e0eb8449e97a0c48f8e1332367b05f46d97;hb=3d1626781d473330b9d11ddea8e68d7fee237708;hp=f97356559ed811648dc228e97d81f7ec4bd56e60;hpb=1bba63fb607c2cb5fb2c002e63ad7128ecf8b1ea;p=friendica.git

diff --git a/mod/oexchange.php b/mod/oexchange.php
index f97356559e..4f2d7e0eb8 100644
--- a/mod/oexchange.php
+++ b/mod/oexchange.php
@@ -1,39 +1,41 @@
 <?php
+function oexchange_init(App $a) {
 
+	if (($a->argc > 1) && ($a->argv[1] === 'xrd')) {
+		$tpl = get_markup_template('oexchange_xrd.tpl');
 
-function oexchange_init(&$a) {
-
-	if(($a->argc > 1) && ($a->argv[1] === 'xrd')) {
-		$tpl = load_view_file('view/oexchange_xrd.tpl');
-
-		$o = replace_macros($tpl, array('$base' => $a->get_baseurl()));
+		$o = replace_macros($tpl, array('$base' => App::get_baseurl()));
 		echo $o;
 		killme();
 	}
-
-		
-
-
 }
 
-function oexchange_content(&$a) {
+function oexchange_content(App $a) {
 
-	if(! local_user()) {
+	if (! local_user()) {
 		$o = login(false);
 		return $o;
 	}
 
-	if(($a->argc > 1) && $a->argv[1] === 'done') {
-		notice( t('Post successful.') . EOL);
+	if (($a->argc > 1) && $a->argv[1] === 'done') {
+		info( t('Post successful.') . EOL);
 		return;
 	}
 
-	$url = (((x($_GET,'url')) && strlen($_GET['url'])) ? notags(trim($_GET['url'])) : '');
+	$url = (((x($_REQUEST,'url')) && strlen($_REQUEST['url']))
+		? urlencode(notags(trim($_REQUEST['url']))) : '');
+	$title = (((x($_REQUEST,'title')) && strlen($_REQUEST['title']))
+		? '&title=' . urlencode(notags(trim($_REQUEST['title']))) : '');
+	$description = (((x($_REQUEST,'description')) && strlen($_REQUEST['description']))
+		? '&description=' . urlencode(notags(trim($_REQUEST['description']))) : '');
+	$tags = (((x($_REQUEST,'tags')) && strlen($_REQUEST['tags']))
+		? '&tags=' . urlencode(notags(trim($_REQUEST['tags']))) : '');
 
-	$s = fetch_url($a->get_baseurl() . '/parse_url&url=' . $url);
+	$s = fetch_url(App::get_baseurl() . '/parse_url?f=&url=' . $url . $title . $description . $tags);
 
-	if(! strlen($s))
+	if (! strlen($s)) {
 		return;
+	}
 
 	require_once('include/html2bbcode.php');
 
@@ -44,10 +46,7 @@ function oexchange_content(&$a) {
 	$post['body'] = html2bbcode($s);
 	$post['type'] = 'wall';
 
-	$_POST = $post;
+	$_REQUEST = $post;
 	require_once('mod/item.php');
 	item_post($a);
-
 }
-
-