X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=libertree%2Flibertree.php;h=d614d758a3ed1ff5e4d292d92b895afce4b9af1d;hb=2e96c60a478156a9dae89d9ab9d35c6eebf543e6;hp=fc9dcc44d0b6af0823b505a1647bc6b28af5735e;hpb=fe7c741eed1afa26ddab7a07cbe5d1944d3d1584;p=friendica-addons.git
diff --git a/libertree/libertree.php b/libertree/libertree.php
index fc9dcc44..d614d758 100755
--- 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 .= '
';
- $s .= '
' . t('libertree Post Settings') . '
';
+ $s .= '
';
+ $s .= ''. t('libertree Export').'
';
+ $s .= '';
+ $s .= '
';
+ $s .= '
';
+ $s .= ''. t('libertree Export').'
';
+ $s .= '';
+
$s .= '
';
+ $s .= '
';
}
@@ -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";
+ if (isset($a->config['sitename']) AND ($a->config['sitename'] != ""))
+ $ltree_source = $a->config['sitename'];
+ else
+ $ltree_source = "Friendica";
- 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,11 +181,16 @@ 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;
@@ -183,14 +198,16 @@ 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
+ 'text' => $body,
+ 'source' => $ltree_source
// 'token' => $ltree_api_token
);