X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=libertree%2Flibertree.php;h=0ff512cf232febc9e67e0b3b5fc1984f6130b806;hb=c3e93f1ed9a487f823bcc75ddd43024334c25bfc;hp=56dc946c32a2c9f26a4ec3231185e7a4f0c181c9;hpb=0f430ccb42b11dcc98c98bac6eb4127140b2f58b;p=friendica-addons.git

diff --git a/libertree/libertree.php b/libertree/libertree.php
index 56dc946c..0ff512cf 100755
--- a/libertree/libertree.php
+++ b/libertree/libertree.php
@@ -7,6 +7,8 @@
  * Author: Tony Baldwin <https://free-haven.org/u/tony>
  */
 
+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');
@@ -28,9 +30,9 @@ 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 .= '<div class="profile-jot-net"><input type="checkbox" name="libertree_enable"' . $selected . ' value="1" /> '
             . t('Post to libertree') . '</div>';
@@ -49,16 +51,16 @@ 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 */
@@ -102,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']));
 
 	}
 
@@ -115,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';
 }
 
 
@@ -156,8 +165,8 @@ function libertree_send(&$a,&$b) {
         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();