Merge pull request #255 from annando/1502-pledgie-deactivated

[friendica-addons.git] / libertree / libertree.php

diff --git a/libertree/libertree.php b/libertree/libertree.php
index f57c773b394588c05730a90854ab93d95d53c848..56dc946c32a2c9f26a4ec3231185e7a4f0c181c9 100755 (executable)
--- a/libertree/libertree.php
+++ b/libertree/libertree.php
@@ -50,8 +50,8 @@ function libertree_settings(&$a,&$s) {
     /* Get the current state of our config variables */
 
     $enabled = get_pconfig(local_user(),'libertree','post');
-
     $checked = (($enabled) ? ' checked="checked" ' : '');
+    $css = (($enabled) ? '' : '-disabled');
 
     $def_enabled = get_pconfig(local_user(),'libertree','post_by_default');
 
@@ -63,8 +63,14 @@ function libertree_settings(&$a,&$s) {
 
     /* Add some HTML to the existing form */
 
-    $s .= '<div class="settings-block">';
-    $s .= '<h3>' . t('libertree Post Settings') . '</h3>';
+    $s .= '<span id="settings_libertree_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_libertree_expanded\'); openClose(\'settings_libertree_inflated\');">';
+    $s .= '<img class="connector'.$css.'" src="images/libertree.png" /><h3 class="connector">'. t('libertree Export').'</h3>';
+    $s .= '</span>';
+    $s .= '<div id="settings_libertree_expanded" class="settings-block" style="display: none;">';
+    $s .= '<span class="fakelink" onclick="openClose(\'settings_libertree_expanded\'); openClose(\'settings_libertree_inflated\');">';
+    $s .= '<img class="connector'.$css.'" src="images/libertree.png" /><h3 class="connector">'. t('libertree Export').'</h3>';
+    $s .= '</span>';
+
     $s .= '<div id="libertree-enable-wrapper">';
     $s .= '<label id="libertree-enable-label" for="libertree-checkbox">' . t('Enable Libertree Post Plugin') . '</label>';
     $s .= '<input id="libertree-checkbox" type="checkbox" name="libertree" value="1" ' . $checked . '/>';
@@ -87,7 +93,7 @@ function libertree_settings(&$a,&$s) {
 
     /* provide a submit button */
 
-    $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="libertree-submit" name="libertree-submit" class="settings-submit" value="' . t('Submit') . '" /></div></div>';
+    $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="libertree-submit" name="libertree-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div></div>';
 
 }
 
@@ -118,7 +124,7 @@ function libertree_post_local(&$a,&$b) {
        if($b['private'] || $b['parent'])
                return;
 
-    $ltree_post   = intval(get_pconfig(local_user(),'libertree','post'));
+       $ltree_post   = intval(get_pconfig(local_user(),'libertree','post'));
 
        $ltree_enable = (($ltree_post && x($_REQUEST,'libertree_enable')) ? intval($_REQUEST['libertree_enable']) : 0);
 
@@ -153,8 +159,12 @@ function libertree_send(&$a,&$b) {
        $ltree_api_token = get_pconfig($b['uid'],'libertree','libertree_api_token');
        $ltree_url = get_pconfig($b['uid'],'libertree','libertree_url');
        $ltree_blog = "$ltree_url/api/v1/posts/create/?token=$ltree_api_token";
+       $ltree_source = $a->get_hostname();
+
+       if ($b['app'] != "")
+               $ltree_source .= " (".$b['app'].")";
 
-       if($ltree_url && $ltree_api_token && $ltree_blog) {
+       if($ltree_url && $ltree_api_token && $ltree_blog && $ltree_source) {
 
                require_once('include/bb2diaspora.php');
                $tag_arr = array();
@@ -171,12 +181,33 @@ function libertree_send(&$a,&$b) {
 
                $title = $b['title'];
                $body = $b['body'];
-
+               // Insert a newline before and after a quote
+               $body = str_ireplace("[quote", "\n\n[quote", $body);
+               $body = str_ireplace("[/quote]", "[/quote]\n\n", $body);
+
+               // Removal of tags and mentions
+               // #-tags
+               $body = preg_replace('/#\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', '#$2', $body);
+               // @-mentions
+               $body = preg_replace('/@\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', '@$2', $body);
+
+               // remove multiple newlines
+               do {
+                       $oldbody = $body;
+                        $body = str_replace("\n\n\n", "\n\n", $body);
+                } while ($oldbody != $body);
+
+               // convert to markdown
+               $body = bb2diaspora($body, false, false);
+
+               // Adding the title
                if(strlen($title))
-                       $body = "[b]".html_entity_decode($title)."[/b]\n\n".$body;
+                       $body = "## ".html_entity_decode($title)."\n\n".$body;
+
 
                $params = array(
-                       'text' => bb2diaspora($body)
+                       'text' => $body,
+                       'source' => $ltree_source
                //      'token' => $ltree_api_token
                );