Merge pull request #2148 from annando/issue-1871

[friendica.git] / mod / oexchange.php

diff --git a/mod/oexchange.php b/mod/oexchange.php
index 8dee1cb996d40af9555ed65578160a7356c5a825..bbb436e7021ab3f0ad8088fedfde4772e46b0891 100644 (file)
--- a/mod/oexchange.php
+++ b/mod/oexchange.php
@@ -4,15 +4,13 @@
 function oexchange_init(&$a) {
 
        if(($a->argc > 1) && ($a->argv[1] === 'xrd')) {
-               $tpl = load_view_file('view/oexchange_xrd.tpl');
+               $tpl = get_markup_template('oexchange_xrd.tpl');
 
                $o = replace_macros($tpl, array('$base' => $a->get_baseurl()));
                echo $o;
                killme();
        }
 
-               
-
 
 }
 
@@ -24,13 +22,20 @@ function oexchange_content(&$a) {
        }
 
        if(($a->argc > 1) && $a->argv[1] === 'done') {
-               notice( t('Post successful.') . EOL);
+               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($a->get_baseurl() . '/parse_url?f=&url=' . $url . $title . $description . $tags);
 
        if(! strlen($s))
                return;
@@ -44,7 +49,7 @@ function oexchange_content(&$a) {
        $post['body'] = html2bbcode($s);
        $post['type'] = 'wall';
 
-       $_POST = $post;
+       $_REQUEST = $post;
        require_once('mod/item.php');
        item_post($a);