Merge pull request #351 from annando/master

[friendica.git] / include / diaspora.php

diff --git a/include/diaspora.php b/include/diaspora.php
index 0ca9163a8565cdd8f7f62c08bd84a10e0cb0fd3c..80fb104046f827fae5a9b426b90239498d73e7b0 100755 (executable)
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -2005,6 +2005,7 @@ function diaspora_share($me,$contact) {
        ));
 
        $slap = 'xml=' . urlencode(urlencode(diaspora_msg_build($msg,$me,$contact,$me['prvkey'],$contact['pubkey'])));
+       //$slap = 'xml=' . urlencode(diaspora_msg_build($msg,$me,$contact,$me['prvkey'],$contact['pubkey']));
 
        return(diaspora_transmit($owner,$contact,$slap, false));
 }
@@ -2022,6 +2023,7 @@ function diaspora_unshare($me,$contact) {
        ));
 
        $slap = 'xml=' . urlencode(urlencode(diaspora_msg_build($msg,$me,$contact,$me['prvkey'],$contact['pubkey'])));
+       //$slap = 'xml=' . urlencode(diaspora_msg_build($msg,$me,$contact,$me['prvkey'],$contact['pubkey']));
 
        return(diaspora_transmit($owner,$contact,$slap, false));
 
@@ -2060,13 +2062,21 @@ function diaspora_send_status($item,$owner,$contact,$public_batch = false) {
                        $images[] = $detail;
                        $body = str_replace($detail['str'],$mtch[1],$body);
                }
-       }       
+       }
 */
+       // Removal of tags
+       $body = preg_replace('/#\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', '#$2', $body);
+
+       //if(strlen($title))
+       //      $body = "[b]".html_entity_decode($title)."[/b]\n\n".$body;
+
+       // convert to markdown
        $body = xmlify(html_entity_decode(bb2diaspora($body)));
+       //$body = bb2diaspora($body);
 
+       // Adding the title
        if(strlen($title))
-               $body = xmlify('**' . html_entity_decode($title) . '**' . "\n") . $body;
-
+               $body = "## ".html_entity_decode($title)."\n\n".$body;
 
        if($item['attach']) {
                $cnt = preg_match_all('/href=\"(.*?)\"(.*?)title=\"(.*?)\"/ism',$item['attach'],$matches,PREG_SET_ORDER);
@@ -2096,6 +2106,7 @@ function diaspora_send_status($item,$owner,$contact,$public_batch = false) {
        logger('diaspora_send_status: ' . $owner['username'] . ' -> ' . $contact['name'] . ' base message: ' . $msg, LOGGER_DATA);
 
        $slap = 'xml=' . urlencode(urlencode(diaspora_msg_build($msg,$owner,$contact,$owner['uprvkey'],$contact['pubkey'],$public_batch)));
+       //$slap = 'xml=' . urlencode(diaspora_msg_build($msg,$owner,$contact,$owner['uprvkey'],$contact['pubkey'],$public_batch));
 
        $return_code = diaspora_transmit($owner,$contact,$slap,$public_batch);
 
@@ -2140,6 +2151,7 @@ function diaspora_send_images($item,$owner,$contact,$images,$public_batch = fals
 
                logger('diaspora_send_photo: base message: ' . $msg, LOGGER_DATA);
                $slap = 'xml=' . urlencode(urlencode(diaspora_msg_build($msg,$owner,$contact,$owner['uprvkey'],$contact['pubkey'],$public_batch)));
+               //$slap = 'xml=' . urlencode(diaspora_msg_build($msg,$owner,$contact,$owner['uprvkey'],$contact['pubkey'],$public_batch));
 
                diaspora_transmit($owner,$contact,$slap,$public_batch);
        }
@@ -2203,6 +2215,7 @@ function diaspora_send_followup($item,$owner,$contact,$public_batch = false) {
        logger('diaspora_followup: base message: ' . $msg, LOGGER_DATA);
 
        $slap = 'xml=' . urlencode(urlencode(diaspora_msg_build($msg,$owner,$contact,$owner['uprvkey'],$contact['pubkey'],$public_batch)));
+       //$slap = 'xml=' . urlencode(diaspora_msg_build($msg,$owner,$contact,$owner['uprvkey'],$contact['pubkey'],$public_batch));
 
        return(diaspora_transmit($owner,$contact,$slap,$public_batch));
 }
@@ -2309,6 +2322,7 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) {
 
 
        $slap = 'xml=' . urlencode(urlencode(diaspora_msg_build($msg,$owner,$contact,$owner['uprvkey'],$contact['pubkey'],$public_batch)));
+       //$slap = 'xml=' . urlencode(diaspora_msg_build($msg,$owner,$contact,$owner['uprvkey'],$contact['pubkey'],$public_batch));
 
        return(diaspora_transmit($owner,$contact,$slap,$public_batch));
 
@@ -2343,6 +2357,7 @@ function diaspora_send_retraction($item,$owner,$contact,$public_batch = false) {
        ));
 
        $slap = 'xml=' . urlencode(urlencode(diaspora_msg_build($msg,$owner,$contact,$owner['uprvkey'],$contact['pubkey'],$public_batch)));
+       //$slap = 'xml=' . urlencode(diaspora_msg_build($msg,$owner,$contact,$owner['uprvkey'],$contact['pubkey'],$public_batch));
 
        return(diaspora_transmit($owner,$contact,$slap,$public_batch));
 }
@@ -2403,6 +2418,7 @@ function diaspora_send_mail($item,$owner,$contact) {
        logger('diaspora_conversation: ' . print_r($xmsg,true), LOGGER_DATA);
 
        $slap = 'xml=' . urlencode(urlencode(diaspora_msg_build($xmsg,$owner,$contact,$owner['uprvkey'],$contact['pubkey'],false)));
+       //$slap = 'xml=' . urlencode(diaspora_msg_build($xmsg,$owner,$contact,$owner['uprvkey'],$contact['pubkey'],false));
 
        return(diaspora_transmit($owner,$contact,$slap,false));