From 932d51580b7ac7d828df4fc5a8d47b2022189f55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20H=C3=A4der?= Date: Mon, 14 May 2018 21:57:20 +0200 Subject: [PATCH] Continued: - added/removed empty line(s) - curly braces after function/method definition should be in new line (PR/PSR-2) - proper todo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- mailstream/mailstream.php | 2 +- wppost/wppost.php | 26 ++++++++++++++++---------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/mailstream/mailstream.php b/mailstream/mailstream.php index 57116a4b..d6ccdc1c 100644 --- a/mailstream/mailstream.php +++ b/mailstream/mailstream.php @@ -292,7 +292,7 @@ function mailstream_send(App $a, $message_id, array $item, $user) { return; } - /// @TODO Isn't there a better way? + /// @TODO Maybe properly use Composer require_once dirname(__FILE__) . '/phpmailer/class.phpmailer.php'; $attachments = []; diff --git a/wppost/wppost.php b/wppost/wppost.php index 4266beb8..d0059a58 100644 --- a/wppost/wppost.php +++ b/wppost/wppost.php @@ -15,7 +15,8 @@ use Friendica\Core\PConfig; use Friendica\Database\DBA; use Friendica\Util\Network; -function wppost_install() { +function wppost_install() +{ Addon::registerHook('post_local', 'addon/wppost/wppost.php', 'wppost_post_local'); Addon::registerHook('notifier_normal', 'addon/wppost/wppost.php', 'wppost_send'); Addon::registerHook('jot_networks', 'addon/wppost/wppost.php', 'wppost_jot_nets'); @@ -23,7 +24,9 @@ function wppost_install() { Addon::registerHook('connector_settings_post', 'addon/wppost/wppost.php', 'wppost_settings_post'); } -function wppost_uninstall() { + +function wppost_uninstall() +{ Addon::unregisterHook('post_local', 'addon/wppost/wppost.php', 'wppost_post_local'); Addon::unregisterHook('notifier_normal', 'addon/wppost/wppost.php', 'wppost_send'); Addon::unregisterHook('jot_networks', 'addon/wppost/wppost.php', 'wppost_jot_nets'); @@ -38,11 +41,13 @@ function wppost_uninstall() { } -function wppost_jot_nets(App $a, &$b) { +function wppost_jot_nets(App $a, &$b) +{ if(! local_user()) return; $wp_post = PConfig::get(local_user(),'wppost','post'); + if(intval($wp_post) == 1) { $wp_defpost = PConfig::get(local_user(),'wppost','post_by_default'); $selected = ((intval($wp_defpost) == 1) ? ' checked="checked" ' : ''); @@ -52,7 +57,8 @@ function wppost_jot_nets(App $a, &$b) { } -function wppost_settings(App &$a,&$s) { +function wppost_settings(App &$a, &$s) +{ if(! local_user()) return; @@ -137,8 +143,8 @@ function wppost_settings(App &$a,&$s) { } -function wppost_settings_post(App $a, array &$b) { - +function wppost_settings_post(App $a, array &$b) +{ if(x($_POST,'wppost-submit')) { PConfig::set(local_user(),'wppost','post',intval($_POST['wppost'])); @@ -157,8 +163,8 @@ function wppost_settings_post(App $a, array &$b) { } -function wppost_post_local(App $a, array &$b) { - +function wppost_post_local(App $a, array &$b) +{ // This can probably be changed to allow editing by pointing to a different API endpoint if ($b['edit']) { @@ -195,8 +201,8 @@ function wppost_post_local(App $a, array &$b) { -function wppost_send(App $a, array &$b) { - +function wppost_send(App $a, array &$b) +{ if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) { return; }