X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=ljpost%2Fljpost.php;h=382832c5ec44a09d199fad666cc88f6b1d424275;hb=bdfe575365366690fe6a3934e793c67db1a2d623;hp=e8977b5158c975ef624ed5dbafae06c980413978;hpb=c27b1cb66fd0877da0947edfdad1a62dfaf41888;p=friendica-addons.git
diff --git a/ljpost/ljpost.php b/ljpost/ljpost.php
index e8977b51..382832c5 100644
--- a/ljpost/ljpost.php
+++ b/ljpost/ljpost.php
@@ -10,9 +10,8 @@
use Friendica\Content\Text\BBCode;
use Friendica\Core\Hook;
-use Friendica\Core\L10n;
use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
+use Friendica\DI;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Network;
use Friendica\Util\XML;
@@ -35,16 +34,21 @@ function ljpost_uninstall() {
}
-function ljpost_jot_nets(&$a,&$b) {
- if(! local_user())
+function ljpost_jot_nets(\Friendica\App &$a, array &$jotnets_fields)
+{
+ if(! local_user()) {
return;
+ }
- $lj_post = PConfig::get(local_user(),'ljpost','post');
- if(intval($lj_post) == 1) {
- $lj_defpost = PConfig::get(local_user(),'ljpost','post_by_default');
- $selected = ((intval($lj_defpost) == 1) ? ' checked="checked" ' : '');
- $b .= '
'
- . L10n::t('Post to LiveJournal') . '
';
+ if (DI::pConfig()->get(local_user(),'ljpost','post')) {
+ $jotnets_fields[] = [
+ 'type' => 'checkbox',
+ 'field' => [
+ 'ljpost_enable',
+ DI::l10n()->t('Post to LiveJournal'),
+ DI::pConfig()->get(local_user(),'ljpost','post_by_default')
+ ]
+ ];
}
}
@@ -56,49 +60,49 @@ function ljpost_settings(&$a,&$s) {
/* Add our stylesheet to the page so we can make our settings look nice */
- $a->page['htmlhead'] .= '' . "\r\n";
+ DI::page()['htmlhead'] .= '' . "\r\n";
/* Get the current state of our config variables */
- $enabled = PConfig::get(local_user(),'ljpost','post');
+ $enabled = DI::pConfig()->get(local_user(),'ljpost','post');
$checked = (($enabled) ? ' checked="checked" ' : '');
- $def_enabled = PConfig::get(local_user(),'ljpost','post_by_default');
+ $def_enabled = DI::pConfig()->get(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 = DI::pConfig()->get(local_user(), 'ljpost', 'lj_username');
+ $lj_password = DI::pConfig()->get(local_user(), 'ljpost', 'lj_password');
/* Add some HTML to the existing form */
$s .= '';
- $s .= '
' . L10n::t('LiveJournal Post Settings') . '
';
+ $s .= '
' . DI::l10n()->t('LiveJournal Post Settings') . '
';
$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 .= '';
}
@@ -107,10 +111,10 @@ function ljpost_settings_post(&$a,&$b) {
if(!empty($_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']));
+ DI::pConfig()->set(local_user(),'ljpost','post',intval($_POST['ljpost']));
+ DI::pConfig()->set(local_user(),'ljpost','post_by_default',intval($_POST['lj_bydefault']));
+ DI::pConfig()->set(local_user(),'ljpost','lj_username',trim($_POST['lj_username']));
+ DI::pConfig()->set(local_user(),'ljpost','lj_password',trim($_POST['lj_password']));
}
@@ -129,11 +133,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(DI::pConfig()->get(local_user(),'ljpost','post'));
$lj_enable = (($lj_post && !empty($_REQUEST['ljpost_enable'])) ? intval($_REQUEST['ljpost_enable']) : 0);
- if($b['api_source'] && intval(PConfig::get(local_user(),'ljpost','post_by_default')))
+ if($b['api_source'] && intval(DI::pConfig()->get(local_user(),'ljpost','post_by_default')))
$lj_enable = 1;
if(! $lj_enable)
@@ -170,13 +174,13 @@ function ljpost_send(&$a,&$b) {
if($x && strlen($x[0]['timezone']))
$tz = $x[0]['timezone'];
- $lj_username = XML::escape(PConfig::get($b['uid'],'ljpost','lj_username'));
- $lj_password = XML::escape(PConfig::get($b['uid'],'ljpost','lj_password'));
- $lj_journal = XML::escape(PConfig::get($b['uid'],'ljpost','lj_journal'));
+ $lj_username = XML::escape(DI::pConfig()->get($b['uid'],'ljpost','lj_username'));
+ $lj_password = XML::escape(DI::pConfig()->get($b['uid'],'ljpost','lj_password'));
+ $lj_journal = XML::escape(DI::pConfig()->get($b['uid'],'ljpost','lj_journal'));
// if(! $lj_journal)
// $lj_journal = $lj_username;
- $lj_blog = XML::escape(PConfig::get($b['uid'],'ljpost','lj_blog'));
+ $lj_blog = XML::escape(DI::pConfig()->get($b['uid'],'ljpost','lj_blog'));
if(! strlen($lj_blog))
$lj_blog = XML::escape('http://www.livejournal.com/interface/xmlrpc');