Merge branch '3.6-rc'

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

diff --git a/ljpost/ljpost.php b/ljpost/ljpost.php
index de62c9761894469f1396ea433a21c919f6df77fa..7cfba81ed5074d1a12bb335982fe65c245488b4c 100644 (file)
--- a/ljpost/ljpost.php
+++ b/ljpost/ljpost.php
@@ -8,11 +8,12 @@
  * Author: Cat Gray <https://free-haven.org/profile/catness>
  */
 
+use Friendica\Content\Text\BBCode;
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
+use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
-use Friendica\Util\Temporal;
 
 function ljpost_install() {
     Addon::registerHook('post_local',           'addon/ljpost/ljpost.php', 'ljpost_post_local');
@@ -36,9 +37,9 @@ function ljpost_jot_nets(&$a,&$b) {
     if(! local_user())
         return;
 
-    $lj_post = PConfig::get(local_user(),'ljpost','post');
+    $lj_post = get_pconfig(local_user(),'ljpost','post');
     if(intval($lj_post) == 1) {
-        $lj_defpost = PConfig::get(local_user(),'ljpost','post_by_default');
+        $lj_defpost = get_pconfig(local_user(),'ljpost','post_by_default');
         $selected = ((intval($lj_defpost) == 1) ? ' checked="checked" ' : '');
         $b .= '<div class="profile-jot-net"><input type="checkbox" name="ljpost_enable" ' . $selected . ' value="1" /> '
             . L10n::t('Post to LiveJournal') . '</div>';
@@ -57,16 +58,16 @@ function ljpost_settings(&$a,&$s) {
 
     /* Get the current state of our config variables */
 
-    $enabled = PConfig::get(local_user(),'ljpost','post');
+    $enabled = get_pconfig(local_user(),'ljpost','post');
 
     $checked = (($enabled) ? ' checked="checked" ' : '');
 
-    $def_enabled = PConfig::get(local_user(),'ljpost','post_by_default');
+    $def_enabled = get_pconfig(local_user(),'ljpost','post_by_default');
 
     $def_checked = (($def_enabled) ? ' checked="checked" ' : '');
 
-       $lj_username = PConfig::get(local_user(), 'ljpost', 'lj_username');
-       $lj_password = PConfig::get(local_user(), 'ljpost', 'lj_password');
+       $lj_username = get_pconfig(local_user(), 'ljpost', 'lj_username');
+       $lj_password = get_pconfig(local_user(), 'ljpost', 'lj_password');
 
 
     /* Add some HTML to the existing form */
@@ -104,10 +105,10 @@ function ljpost_settings_post(&$a,&$b) {
 
        if(x($_POST,'ljpost-submit')) {
 
-               PConfig::set(local_user(),'ljpost','post',intval($_POST['ljpost']));
-               PConfig::set(local_user(),'ljpost','post_by_default',intval($_POST['lj_bydefault']));
-               PConfig::set(local_user(),'ljpost','lj_username',trim($_POST['lj_username']));
-               PConfig::set(local_user(),'ljpost','lj_password',trim($_POST['lj_password']));
+               set_pconfig(local_user(),'ljpost','post',intval($_POST['ljpost']));
+               set_pconfig(local_user(),'ljpost','post_by_default',intval($_POST['lj_bydefault']));
+               set_pconfig(local_user(),'ljpost','lj_username',trim($_POST['lj_username']));
+               set_pconfig(local_user(),'ljpost','lj_password',trim($_POST['lj_password']));
 
        }
 
@@ -126,11 +127,11 @@ function ljpost_post_local(&$a,&$b) {
        if($b['private'] || $b['parent'])
                return;
 
-    $lj_post   = intval(PConfig::get(local_user(),'ljpost','post'));
+    $lj_post   = intval(get_pconfig(local_user(),'ljpost','post'));
 
        $lj_enable = (($lj_post && x($_REQUEST,'ljpost_enable')) ? intval($_REQUEST['ljpost_enable']) : 0);
 
-       if($_REQUEST['api_source'] && intval(PConfig::get(local_user(),'ljpost','post_by_default')))
+       if($_REQUEST['api_source'] && intval(get_pconfig(local_user(),'ljpost','post_by_default')))
                $lj_enable = 1;
 
     if(! $lj_enable)
@@ -155,7 +156,7 @@ function ljpost_send(&$a,&$b) {
     if($b['parent'] != $b['id'])
         return;
 
-       // LiveJournal post in the LJ user's timezone.
+       // LiveJournal post in the LJ user's timezone. 
        // Hopefully the person's Friendica account
        // will be set to the same thing.
 
@@ -165,24 +166,21 @@ function ljpost_send(&$a,&$b) {
                intval($b['uid'])
        );
        if($x && strlen($x[0]['timezone']))
-               $tz = $x[0]['timezone'];
+               $tz = $x[0]['timezone'];        
 
-       $lj_username = xmlify(PConfig::get($b['uid'],'ljpost','lj_username'));
-       $lj_password = xmlify(PConfig::get($b['uid'],'ljpost','lj_password'));
-       $lj_journal = xmlify(PConfig::get($b['uid'],'ljpost','lj_journal'));
+       $lj_username = xmlify(get_pconfig($b['uid'],'ljpost','lj_username'));
+       $lj_password = xmlify(get_pconfig($b['uid'],'ljpost','lj_password'));
+       $lj_journal = xmlify(get_pconfig($b['uid'],'ljpost','lj_journal'));
 //     if(! $lj_journal)
 //             $lj_journal = $lj_username;
 
-       $lj_blog = xmlify(PConfig::get($b['uid'],'ljpost','lj_blog'));
+       $lj_blog = xmlify(get_pconfig($b['uid'],'ljpost','lj_blog'));
        if(! strlen($lj_blog))
                $lj_blog = xmlify('http://www.livejournal.com/interface/xmlrpc');
 
        if($lj_username && $lj_password && $lj_blog) {
-
-               require_once('include/bbcode.php');
-
                $title = xmlify($b['title']);
-               $post = bbcode($b['body']);
+               $post = BBCode::convert($b['body']);
                $post = xmlify($post);
                $tags = ljpost_get_tags($b['tag']);