Merge pull request #380 from tobiasd/20161011-es

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

diff --git a/libertree/libertree.php b/libertree/libertree.php
index 0e7e1a8191b2491ed96f257bc49841ad40ac9eb2..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>';
 
 }
 
@@ -153,7 +159,11 @@ 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 = "Friendica";
+       $ltree_source = $a->get_hostname();
+
+       if ($b['app'] != "")
+               $ltree_source .= " (".$b['app'].")";
+
        if($ltree_url && $ltree_api_token && $ltree_blog && $ltree_source) {
 
                require_once('include/bb2diaspora.php');
@@ -188,12 +198,12 @@ function libertree_send(&$a,&$b) {
                 } while ($oldbody != $body);
 
                // convert to markdown
-               $body = bb2diaspora($body);
+               $body = bb2diaspora($body, false, false);
 
                // Adding the title
                if(strlen($title))
                        $body = "## ".html_entity_decode($title)."\n\n".$body;
-               
+
 
                $params = array(
                        'text' => $body,