Friendica/friendica-addons
Friendica/friendica-addons
1
0
Fork 1
mirror of https://git.friendi.ca/friendica/friendica-addons.git synced 2025-06-07 09:54:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

UserSession class - Refactor addon

Browse source
This commit is contained in:
Philipp 2022-10-20 23:51:49 +02:00
parent 8eca74cfab
commit b0eb28143a
No known key found for this signature in database
GPG key ID: 24A7501396EB5432
46 changed files with 534 additions and 580 deletions
Download patch file Download diff file Expand all files Collapse all files

45
wppost/wppost.php
View file

@ -12,7 +12,6 @@ use Friendica\Content\Text\HTML;
use Friendica\Core\Hook;
use Friendica\Core\Logger;
use Friendica\Core\Renderer;
use Friendica\Core\Session;
use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Model\Post;
@ -30,17 +29,17 @@ function wppost_install()
function wppost_jot_nets(App &$a, array &$jotnets_fields)
{
if (!Session::getLocalUser()) {
if (!DI::userSession()->getLocalUserId()) {
return;
}
if (DI::pConfig()->get(Session::getLocalUser(),'wppost','post')) {
if (DI::pConfig()->get(DI::userSession()->getLocalUserId(),'wppost','post')) {
$jotnets_fields[] = [
'type' => 'checkbox',
'field' => [
'wppost_enable',
DI::l10n()->t('Post to Wordpress'),
DI::pConfig()->get(Session::getLocalUser(),'wppost','post_by_default')
DI::pConfig()->get(DI::userSession()->getLocalUserId(),'wppost','post_by_default')
]
];
}
@ -49,17 +48,17 @@ function wppost_jot_nets(App &$a, array &$jotnets_fields)
function wppost_settings(App &$a, array &$data)
{
if (!Session::getLocalUser()) {
if (!DI::userSession()->getLocalUserId()) {
return;
}
$enabled = DI::pConfig()->get(Session::getLocalUser(), 'wppost', 'post', false);
$wp_username = DI::pConfig()->get(Session::getLocalUser(), 'wppost', 'wp_username');
$wp_blog = DI::pConfig()->get(Session::getLocalUser(), 'wppost', 'wp_blog');
$def_enabled = DI::pConfig()->get(Session::getLocalUser(), 'wppost', 'post_by_default', false);
$back_enabled = DI::pConfig()->get(Session::getLocalUser(), 'wppost', 'backlink', false);
$wp_backlink_text = DI::pConfig()->get(Session::getLocalUser(), 'wppost', 'wp_backlink_text');
$shortcheck_enabled = DI::pConfig()->get(Session::getLocalUser(), 'wppost', 'shortcheck', false);
$enabled = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'wppost', 'post', false);
$wp_username = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'wppost', 'wp_username');
$wp_blog = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'wppost', 'wp_blog');
$def_enabled = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'wppost', 'post_by_default', false);
$back_enabled = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'wppost', 'backlink', false);
$wp_backlink_text = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'wppost', 'wp_backlink_text');
$shortcheck_enabled = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'wppost', 'shortcheck', false);
$t = Renderer::getMarkupTemplate('connector_settings.tpl', 'addon/wppost/');
$html = Renderer::replaceMacros($t, [
@ -86,16 +85,16 @@ function wppost_settings(App &$a, array &$data)
function wppost_settings_post(App $a, array &$b)
{
if(!empty($_POST['wppost-submit'])) {
DI::pConfig()->set(Session::getLocalUser(), 'wppost', 'post' , intval($_POST['wppost']));
DI::pConfig()->set(Session::getLocalUser(), 'wppost', 'post_by_default', intval($_POST['wp_bydefault']));
DI::pConfig()->set(Session::getLocalUser(), 'wppost', 'wp_username' , trim($_POST['wp_username']));
DI::pConfig()->set(Session::getLocalUser(), 'wppost', 'wp_password' , trim($_POST['wp_password']));
DI::pConfig()->set(Session::getLocalUser(), 'wppost', 'wp_blog' , trim($_POST['wp_blog']));
DI::pConfig()->set(Session::getLocalUser(), 'wppost', 'backlink' , intval($_POST['wp_backlink']));
DI::pConfig()->set(Session::getLocalUser(), 'wppost', 'shortcheck' , intval($_POST['wp_shortcheck']));
DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'wppost', 'post' , intval($_POST['wppost']));
DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'wppost', 'post_by_default', intval($_POST['wp_bydefault']));
DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'wppost', 'wp_username' , trim($_POST['wp_username']));
DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'wppost', 'wp_password' , trim($_POST['wp_password']));
DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'wppost', 'wp_blog' , trim($_POST['wp_blog']));
DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'wppost', 'backlink' , intval($_POST['wp_backlink']));
DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'wppost', 'shortcheck' , intval($_POST['wp_shortcheck']));
$wp_backlink_text = BBCode::convert(trim($_POST['wp_backlink_text']), false, BBCode::BACKLINK);
$wp_backlink_text = HTML::toPlaintext($wp_backlink_text, 0, true);
DI::pConfig()->set(Session::getLocalUser(), 'wppost', 'wp_backlink_text', $wp_backlink_text);
DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'wppost', 'wp_backlink_text', $wp_backlink_text);
}
}
@ -122,7 +121,7 @@ function wppost_post_local(App $a, array &$b) {
return;
}
if (!Session::getLocalUser() || (Session::getLocalUser() != $b['uid'])) {
if (!DI::userSession()->getLocalUserId() || (DI::userSession()->getLocalUserId() != $b['uid'])) {
return;
}
@ -130,11 +129,11 @@ function wppost_post_local(App $a, array &$b) {
return;
}
$wp_post = intval(DI::pConfig()->get(Session::getLocalUser(), 'wppost', 'post'));
$wp_post = intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'wppost', 'post'));
$wp_enable = (($wp_post && !empty($_REQUEST['wppost_enable'])) ? intval($_REQUEST['wppost_enable']) : 0);
if ($b['api_source'] && intval(DI::pConfig()->get(Session::getLocalUser(), 'wppost', 'post_by_default'))) {
if ($b['api_source'] && intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'wppost', 'post_by_default'))) {
$wp_enable = 1;
}