From 0f6ea75bb72b186e87eead96e5dac1d7b7473619 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Wed, 19 Oct 2022 09:47:48 -0400 Subject: [PATCH] [various] Improve formatting --- group_text/group_text.php | 21 +++++++++---------- libertree/libertree.php | 2 +- ljpost/ljpost.php | 4 ++-- pumpio/pumpio.php | 29 +++++++++++++-------------- windowsphonepush/windowsphonepush.php | 22 ++++++++++---------- 5 files changed, 38 insertions(+), 40 deletions(-) diff --git a/group_text/group_text.php b/group_text/group_text.php index 0c088f99..6c60b8e3 100644 --- a/group_text/group_text.php +++ b/group_text/group_text.php @@ -13,12 +13,10 @@ use Friendica\Core\Renderer; use Friendica\Core\Session; use Friendica\DI; -function group_text_install() { - +function group_text_install() +{ Hook::register('addon_settings', 'addon/group_text/group_text.php', 'group_text_settings'); Hook::register('addon_settings_post', 'addon/group_text/group_text.php', 'group_text_settings_post'); - - Logger::notice("installed group_text"); } /** @@ -30,29 +28,30 @@ function group_text_install() { * */ -function group_text_settings_post(App $a, $post) { - if(! Session::getLocalUser() || empty($_POST['group_text-submit'])) +function group_text_settings_post(App $a, array $post) +{ + if (!Session::getLocalUser() || empty($post['group_text-submit'])) { return; - DI::pConfig()->set(Session::getLocalUser(),'system','groupedit_image_limit',intval($_POST['group_text'])); + } + + DI::pConfig()->set(Session::getLocalUser(), 'system', 'groupedit_image_limit', intval($post['group_text'])); } /** * - * Called from the Addon Setting form. + * Called from the Addon Setting form. * Add our own settings info to the page. * */ - - function group_text_settings(App &$a, array &$data) { if (!Session::getLocalUser()) { return; } - $enabled = DI::pConfig()->get(Session::getLocalUser(),'system','groupedit_image_limit'); + $enabled = DI::pConfig()->get(Session::getLocalUser(), 'system', 'groupedit_image_limit'); $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/group_text/'); $html = Renderer::replaceMacros($t, [ diff --git a/libertree/libertree.php b/libertree/libertree.php index 7847f60e..4085fe0a 100644 --- a/libertree/libertree.php +++ b/libertree/libertree.php @@ -108,7 +108,7 @@ function libertree_post_local(App $a, array &$b) return; } - if ((!Session::getLocalUser()) || (Session::getLocalUser() != $b['uid'])) { + if (!Session::getLocalUser() || (Session::getLocalUser() != $b['uid'])) { return; } diff --git a/ljpost/ljpost.php b/ljpost/ljpost.php index fcba7bb3..ba2263a9 100644 --- a/ljpost/ljpost.php +++ b/ljpost/ljpost.php @@ -54,7 +54,7 @@ function ljpost_settings(App &$a, array &$data) return; } - $enabled = DI::pConfig()->get(Session::getLocalUser(), 'ljpost', 'post', false); + $enabled = DI::pConfig()->get(Session::getLocalUser(), 'ljpost', 'post', false); $ij_username = DI::pConfig()->get(Session::getLocalUser(), 'ljpost', 'ij_username'); $def_enabled = DI::pConfig()->get(Session::getLocalUser(), 'ljpost', 'post_by_default'); @@ -92,7 +92,7 @@ function ljpost_post_local(App $a, array &$b) return; } - if ((!Session::getLocalUser()) || (Session::getLocalUser() != $b['uid'])) { + if (!Session::getLocalUser() || (Session::getLocalUser() != $b['uid'])) { return; } diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php index f2f158d8..456342e6 100644 --- a/pumpio/pumpio.php +++ b/pumpio/pumpio.php @@ -139,9 +139,9 @@ function pumpio_registerclient(App $a, $host) function pumpio_connect(App $a) { // Define the needed keys - $consumer_key = DI::pConfig()->get(Session::getLocalUser(), 'pumpio', 'consumer_key'); + $consumer_key = DI::pConfig()->get(Session::getLocalUser(), 'pumpio', 'consumer_key'); $consumer_secret = DI::pConfig()->get(Session::getLocalUser(), 'pumpio', 'consumer_secret'); - $hostname = DI::pConfig()->get(Session::getLocalUser(), 'pumpio', 'host'); + $hostname = DI::pConfig()->get(Session::getLocalUser(), 'pumpio', 'host'); if ((($consumer_key == '') || ($consumer_secret == '')) && ($hostname != '')) { Logger::notice('pumpio_connect: register client'); @@ -149,7 +149,7 @@ function pumpio_connect(App $a) DI::pConfig()->set(Session::getLocalUser(), 'pumpio', 'consumer_key', $clientdata->client_id); DI::pConfig()->set(Session::getLocalUser(), 'pumpio', 'consumer_secret', $clientdata->client_secret); - $consumer_key = DI::pConfig()->get(Session::getLocalUser(), 'pumpio', 'consumer_key'); + $consumer_key = DI::pConfig()->get(Session::getLocalUser(), 'pumpio', 'consumer_key'); $consumer_secret = DI::pConfig()->get(Session::getLocalUser(), 'pumpio', 'consumer_secret'); Logger::info('pumpio_connect: ckey: ' . $consumer_key . ' csecrect: ' . $consumer_secret); @@ -463,13 +463,13 @@ function pumpio_send(App $a, array &$b) // Support for native shares // http:///api//shares?id= - $oauth_token = DI::pConfig()->get($b['uid'], 'pumpio', 'oauth_token'); + $oauth_token = DI::pConfig()->get($b['uid'], 'pumpio', 'oauth_token'); $oauth_token_secret = DI::pConfig()->get($b['uid'], 'pumpio', 'oauth_token_secret'); - $consumer_key = DI::pConfig()->get($b['uid'], 'pumpio', 'consumer_key'); - $consumer_secret = DI::pConfig()->get($b['uid'], 'pumpio', 'consumer_secret'); + $consumer_key = DI::pConfig()->get($b['uid'], 'pumpio', 'consumer_key'); + $consumer_secret = DI::pConfig()->get($b['uid'], 'pumpio', 'consumer_secret'); - $host = DI::pConfig()->get($b['uid'], 'pumpio', 'host'); - $user = DI::pConfig()->get($b['uid'], 'pumpio', 'user'); + $host = DI::pConfig()->get($b['uid'], 'pumpio', 'host'); + $user = DI::pConfig()->get($b['uid'], 'pumpio', 'user'); $public = DI::pConfig()->get($b['uid'], 'pumpio', 'public'); if ($oauth_token && $oauth_token_secret) { @@ -700,10 +700,10 @@ function pumpio_cron(App $a, $b) function pumpio_fetchtimeline(App $a, int $uid) { - $ckey = DI::pConfig()->get($uid, 'pumpio', 'consumer_key'); - $csecret = DI::pConfig()->get($uid, 'pumpio', 'consumer_secret'); - $otoken = DI::pConfig()->get($uid, 'pumpio', 'oauth_token'); - $osecret = DI::pConfig()->get($uid, 'pumpio', 'oauth_token_secret'); + $ckey = DI::pConfig()->get($uid, 'pumpio', 'consumer_key'); + $csecret = DI::pConfig()->get($uid, 'pumpio', 'consumer_secret'); + $otoken = DI::pConfig()->get($uid, 'pumpio', 'oauth_token'); + $osecret = DI::pConfig()->get($uid, 'pumpio', 'oauth_token_secret'); $lastdate = DI::pConfig()->get($uid, 'pumpio', 'lastdate'); $hostname = DI::pConfig()->get($uid, 'pumpio', 'host'); $username = DI::pConfig()->get($uid, 'pumpio', 'user'); @@ -1125,7 +1125,6 @@ function pumpio_dopost(App $a, $client, int $uid, array $self, $post, string $ow $reply->generator->displayName = 'pumpio'; $reply->published = $post->object->inReplyTo->published; $reply->received = $post->object->inReplyTo->updated; - $reply->url = $post->object->inReplyTo->url; pumpio_dopost($a, $client, $uid, $self, $reply, $own_id, false); $postarray['thr-parent'] = $post->object->inReplyTo->id; @@ -1219,7 +1218,7 @@ function pumpio_dopost(App $a, $client, int $uid, array $self, $post, string $ow function pumpio_fetchinbox(App $a, int $uid) { - $ckey= DI::pConfig()->get($uid, 'pumpio', 'consumer_key'); + $ckey = DI::pConfig()->get($uid, 'pumpio', 'consumer_key'); $csecret = DI::pConfig()->get($uid, 'pumpio', 'consumer_secret'); $otoken = DI::pConfig()->get($uid, 'pumpio', 'oauth_token'); $osecret = DI::pConfig()->get($uid, 'pumpio', 'oauth_token_secret'); @@ -1285,7 +1284,7 @@ function pumpio_fetchinbox(App $a, int $uid) function pumpio_getallusers(App &$a, int $uid) { - $ckey= DI::pConfig()->get($uid, 'pumpio', 'consumer_key'); + $ckey = DI::pConfig()->get($uid, 'pumpio', 'consumer_key'); $csecret = DI::pConfig()->get($uid, 'pumpio', 'consumer_secret'); $otoken = DI::pConfig()->get($uid, 'pumpio', 'oauth_token'); $osecret = DI::pConfig()->get($uid, 'pumpio', 'oauth_token_secret'); diff --git a/windowsphonepush/windowsphonepush.php b/windowsphonepush/windowsphonepush.php index 55ecb14f..2ea23721 100644 --- a/windowsphonepush/windowsphonepush.php +++ b/windowsphonepush/windowsphonepush.php @@ -73,19 +73,19 @@ function windowsphonepush_module() {} * We will make sure we've got a valid user account * and if so set our configuration setting for this person. */ -function windowsphonepush_settings_post(App $a, $post) +function windowsphonepush_settings_post(App $a, array $post) { - if (!Session::getLocalUser() || empty($_POST['windowsphonepush-submit'])) { + if (!Session::getLocalUser() || empty($post['windowsphonepush-submit'])) { return; } - $enable = intval($_POST['windowsphonepush']); + $enable = intval($post['windowsphonepush']); DI::pConfig()->set(Session::getLocalUser(), 'windowsphonepush', 'enable', $enable); if ($enable) { DI::pConfig()->set(Session::getLocalUser(), 'windowsphonepush', 'counterunseen', 0); } - DI::pConfig()->set(Session::getLocalUser(), 'windowsphonepush', 'senditemtext', intval($_POST['windowsphonepush-senditemtext'])); + DI::pConfig()->set(Session::getLocalUser(), 'windowsphonepush', 'senditemtext', intval($post['windowsphonepush-senditemtext'])); } /* Called from the Addon Setting form. @@ -97,9 +97,9 @@ function windowsphonepush_settings(App &$a, array &$data) return; } - $enabled = DI::pConfig()->get(Session::getLocalUser(), 'windowsphonepush', 'enable'); + $enabled = DI::pConfig()->get(Session::getLocalUser(), 'windowsphonepush', 'enable'); $senditemtext = DI::pConfig()->get(Session::getLocalUser(), 'windowsphonepush', 'senditemtext'); - $device_url = DI::pConfig()->get(Session::getLocalUser(), 'windowsphonepush', 'device_url'); + $device_url = DI::pConfig()->get(Session::getLocalUser(), 'windowsphonepush', 'device_url'); $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/windowsphonepush/'); $html = Renderer::replaceMacros($t, [ @@ -334,12 +334,12 @@ function windowsphonepush_showsettings() return; } - $enable = DI::pConfig()->get(Session::getLocalUser(), 'windowsphonepush', 'enable'); - $device_url = DI::pConfig()->get(Session::getLocalUser(), 'windowsphonepush', 'device_url'); - $senditemtext = DI::pConfig()->get(Session::getLocalUser(), 'windowsphonepush', 'senditemtext'); - $lastpushid = DI::pConfig()->get(Session::getLocalUser(), 'windowsphonepush', 'lastpushid'); + $enable = DI::pConfig()->get(Session::getLocalUser(), 'windowsphonepush', 'enable'); + $device_url = DI::pConfig()->get(Session::getLocalUser(), 'windowsphonepush', 'device_url'); + $senditemtext = DI::pConfig()->get(Session::getLocalUser(), 'windowsphonepush', 'senditemtext'); + $lastpushid = DI::pConfig()->get(Session::getLocalUser(), 'windowsphonepush', 'lastpushid'); $counterunseen = DI::pConfig()->get(Session::getLocalUser(), 'windowsphonepush', 'counterunseen'); - $addonversion = "2.0"; + $addonversion = "2.0"; if (!$device_url) { $device_url = ""; -- 2.39.5