X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=libertree%2Flibertree.php;h=b1b7546154b6dd96c50bcfc07354039de4a52389;hb=f8c162cbfb777793891f885e019eb8eae319dce1;hp=0de89b9dd7823e841bf81d4bd6bd2681e9c69934;hpb=d6283663ca6da0e6edd4dc59d05760309d1384a9;p=friendica-addons.git
diff --git a/libertree/libertree.php b/libertree/libertree.php
old mode 100755
new mode 100644
index 0de89b9d..b1b75461
--- a/libertree/libertree.php
+++ b/libertree/libertree.php
@@ -1,26 +1,28 @@
*/
+use Friendica\Core\Addon;
+use Friendica\Core\L10n;
+use Friendica\Core\PConfig;
function libertree_install() {
- register_hook('post_local', 'addon/libertree/libertree.php', 'libertree_post_local');
- register_hook('notifier_normal', 'addon/libertree/libertree.php', 'libertree_send');
- register_hook('jot_networks', 'addon/libertree/libertree.php', 'libertree_jot_nets');
- register_hook('connector_settings', 'addon/libertree/libertree.php', 'libertree_settings');
- register_hook('connector_settings_post', 'addon/libertree/libertree.php', 'libertree_settings_post');
+ Addon::registerHook('post_local', 'addon/libertree/libertree.php', 'libertree_post_local');
+ Addon::registerHook('notifier_normal', 'addon/libertree/libertree.php', 'libertree_send');
+ Addon::registerHook('jot_networks', 'addon/libertree/libertree.php', 'libertree_jot_nets');
+ Addon::registerHook('connector_settings', 'addon/libertree/libertree.php', 'libertree_settings');
+ Addon::registerHook('connector_settings_post', 'addon/libertree/libertree.php', 'libertree_settings_post');
}
function libertree_uninstall() {
- unregister_hook('post_local', 'addon/libertree/libertree.php', 'libertree_post_local');
- unregister_hook('notifier_normal', 'addon/libertree/libertree.php', 'libertree_send');
- unregister_hook('jot_networks', 'addon/libertree/libertree.php', 'libertree_jot_nets');
- unregister_hook('connector_settings', 'addon/libertree/libertree.php', 'libertree_settings');
- unregister_hook('connector_settings_post', 'addon/libertree/libertree.php', 'libertree_settings_post');
+ Addon::unregisterHook('post_local', 'addon/libertree/libertree.php', 'libertree_post_local');
+ Addon::unregisterHook('notifier_normal', 'addon/libertree/libertree.php', 'libertree_send');
+ Addon::unregisterHook('jot_networks', 'addon/libertree/libertree.php', 'libertree_jot_nets');
+ Addon::unregisterHook('connector_settings', 'addon/libertree/libertree.php', 'libertree_settings');
+ Addon::unregisterHook('connector_settings_post', 'addon/libertree/libertree.php', 'libertree_settings_post');
}
@@ -28,12 +30,12 @@ function libertree_jot_nets(&$a,&$b) {
if(! local_user())
return;
- $ltree_post = get_pconfig(local_user(),'libertree','post');
+ $ltree_post = PConfig::get(local_user(),'libertree','post');
if(intval($ltree_post) == 1) {
- $ltree_defpost = get_pconfig(local_user(),'libertree','post_by_default');
+ $ltree_defpost = PConfig::get(local_user(),'libertree','post_by_default');
$selected = ((intval($ltree_defpost) == 1) ? ' checked="checked" ' : '');
- $b .= '
'
- . t('Post to libertree') . '
';
+ $b .= ' '
+ . L10n::t('Post to libertree') . '
';
}
}
@@ -49,45 +51,51 @@ function libertree_settings(&$a,&$s) {
/* Get the current state of our config variables */
- $enabled = get_pconfig(local_user(),'libertree','post');
-
+ $enabled = PConfig::get(local_user(),'libertree','post');
$checked = (($enabled) ? ' checked="checked" ' : '');
+ $css = (($enabled) ? '' : '-disabled');
- $def_enabled = get_pconfig(local_user(),'libertree','post_by_default');
+ $def_enabled = PConfig::get(local_user(),'libertree','post_by_default');
$def_checked = (($def_enabled) ? ' checked="checked" ' : '');
- $ltree_api_token = get_pconfig(local_user(), 'libertree', 'libertree_api_token');
- $ltree_url = get_pconfig(local_user(), 'libertree', 'libertree_url');
+ $ltree_api_token = PConfig::get(local_user(), 'libertree', 'libertree_api_token');
+ $ltree_url = PConfig::get(local_user(), 'libertree', 'libertree_url');
/* Add some HTML to the existing form */
- $s .= '';
- $s .= '
' . t('libertree Post Settings') . '
';
+ $s .= '
';
+ $s .= ''. L10n::t('libertree Export').'
';
+ $s .= '';
+ $s .= '
';
+ $s .= '
';
+ $s .= ''. L10n::t('libertree Export').'
';
+ $s .= '';
+
$s .= '
';
- $s .= '';
+ $s .= '';
$s .= '';
$s .= '
';
$s .= '
';
- $s .= '';
+ $s .= '';
$s .= '';
$s .= '
';
$s .= '
';
- $s .= '';
+ $s .= '';
$s .= '';
$s .= '
';
$s .= '
';
- $s .= '';
+ $s .= '';
$s .= '';
$s .= '
';
/* provide a submit button */
- $s .= '
';
+ $s .= '
';
}
@@ -96,10 +104,10 @@ function libertree_settings_post(&$a,&$b) {
if(x($_POST,'libertree-submit')) {
- set_pconfig(local_user(),'libertree','post',intval($_POST['libertree']));
- set_pconfig(local_user(),'libertree','post_by_default',intval($_POST['libertree_bydefault']));
- set_pconfig(local_user(),'libertree','libertree_api_token',trim($_POST['libertree_api_token']));
- set_pconfig(local_user(),'libertree','libertree_url',trim($_POST['libertree_url']));
+ PConfig::set(local_user(),'libertree','post',intval($_POST['libertree']));
+ PConfig::set(local_user(),'libertree','post_by_default',intval($_POST['libertree_bydefault']));
+ PConfig::set(local_user(),'libertree','libertree_api_token',trim($_POST['libertree_api_token']));
+ PConfig::set(local_user(),'libertree','libertree_url',trim($_POST['libertree_url']));
}
@@ -109,28 +117,35 @@ function libertree_post_local(&$a,&$b) {
// This can probably be changed to allow editing by pointing to a different API endpoint
- if($b['edit'])
+ if ($b['edit']) {
return;
+ }
- if((! local_user()) || (local_user() != $b['uid']))
+ if ((! local_user()) || (local_user() != $b['uid'])) {
return;
+ }
- if($b['private'] || $b['parent'])
+ if ($b['private'] || $b['parent']) {
return;
+ }
- $ltree_post = intval(get_pconfig(local_user(),'libertree','post'));
+ $ltree_post = intval(PConfig::get(local_user(),'libertree','post'));
$ltree_enable = (($ltree_post && x($_REQUEST,'libertree_enable')) ? intval($_REQUEST['libertree_enable']) : 0);
- if($_REQUEST['api_source'] && intval(get_pconfig(local_user(),'libertree','post_by_default')))
+ if ($b['api_source'] && intval(PConfig::get(local_user(),'libertree','post_by_default'))) {
$ltree_enable = 1;
+ }
- if(! $ltree_enable)
- return;
+ if (!$ltree_enable) {
+ return;
+ }
+
+ if (strlen($b['postopts'])) {
+ $b['postopts'] .= ',';
+ }
- if(strlen($b['postopts']))
- $b['postopts'] .= ',';
- $b['postopts'] .= 'libertree';
+ $b['postopts'] .= 'libertree';
}
@@ -140,24 +155,37 @@ function libertree_send(&$a,&$b) {
logger('libertree_send: invoked');
- if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited']))
- return;
+ if ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) {
+ return;
+ }
- if(! strstr($b['postopts'],'libertree'))
- return;
+ if (! strstr($b['postopts'],'libertree')) {
+ return;
+ }
- if($b['parent'] != $b['id'])
- return;
+ if ($b['parent'] != $b['id']) {
+ return;
+ }
+ // Dont't post if the post doesn't belong to us.
+ // This is a check for forum postings
+ $self = dba::selectFirst('contact', ['id'], ['uid' => $b['uid'], 'self' => true]);
+ if ($b['contact-id'] != $self['id']) {
+ return;
+ }
- $ltree_api_token = get_pconfig($b['uid'],'libertree','libertree_api_token');
- $ltree_url = get_pconfig($b['uid'],'libertree','libertree_url');
+ $ltree_api_token = PConfig::get($b['uid'],'libertree','libertree_api_token');
+ $ltree_url = PConfig::get($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();
+ $tag_arr = [];
$tags = '';
$x = preg_match_all('/\#\[(.*?)\](.*?)\[/',$b['tag'],$matches,PREG_SET_ORDER);
@@ -167,16 +195,42 @@ function libertree_send(&$a,&$b) {
}
}
if(count($tag_arr))
- $tags = implode(',',$tag_arr);
+ $tags = implode(',',$tag_arr);
+
+ $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 = "## ".html_entity_decode($title)."\n\n".$body;
- $params = array(
- 'text' => bb2diaspora($b['body'])
+ $params = [
+ 'text' => $body,
+ 'source' => $ltree_source
// 'token' => $ltree_api_token
- );
+ ];
$result = post_url($ltree_blog,$params);
- logger('libertree: ' . $result);
+ logger('libertree: ' . $result);
}
}