From 24c2f06e85fa266672504e99dd9b2cc9bcd6b166 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20H=C3=A4der?= Date: Sun, 29 Jul 2018 22:31:54 +0200 Subject: [PATCH] [dwpost] Cleanups: - used type-hint `App` and no call-by-reference - converted spaces -> tab for indenting - DBA::isResult() used instead of empty/count/... - added curly braces and spaces for better readability - opening curly brace after function/method/class belongs into new line --- dwpost/dwpost.php | 236 ++++++++++++++++++++++++---------------------- 1 file changed, 123 insertions(+), 113 deletions(-) diff --git a/dwpost/dwpost.php b/dwpost/dwpost.php index a46f55b2a..9afbcc833 100644 --- a/dwpost/dwpost.php +++ b/dwpost/dwpost.php @@ -8,177 +8,184 @@ * Author: Cat Gray */ +use Friendica\App; use Friendica\Content\Text\BBCode; use Friendica\Core\Addon; use Friendica\Core\L10n; use Friendica\Core\PConfig; +use Friendica\Database\DBA; use Friendica\Util\DateTimeFormat; use Friendica\Util\Network; -function dwpost_install() { - Addon::registerHook('post_local', 'addon/dwpost/dwpost.php', 'dwpost_post_local'); - Addon::registerHook('notifier_normal', 'addon/dwpost/dwpost.php', 'dwpost_send'); - Addon::registerHook('jot_networks', 'addon/dwpost/dwpost.php', 'dwpost_jot_nets'); +function dwpost_install() +{ + Addon::registerHook('post_local', 'addon/dwpost/dwpost.php', 'dwpost_post_local'); + Addon::registerHook('notifier_normal', 'addon/dwpost/dwpost.php', 'dwpost_send'); + Addon::registerHook('jot_networks', 'addon/dwpost/dwpost.php', 'dwpost_jot_nets'); Addon::registerHook('connector_settings', 'addon/dwpost/dwpost.php', 'dwpost_settings'); Addon::registerHook('connector_settings_post', 'addon/dwpost/dwpost.php', 'dwpost_settings_post'); - } -function dwpost_uninstall() { - Addon::unregisterHook('post_local', 'addon/dwpost/dwpost.php', 'dwpost_post_local'); - Addon::unregisterHook('notifier_normal', 'addon/dwpost/dwpost.php', 'dwpost_send'); - Addon::unregisterHook('jot_networks', 'addon/dwpost/dwpost.php', 'dwpost_jot_nets'); + +function dwpost_uninstall() +{ + Addon::unregisterHook('post_local', 'addon/dwpost/dwpost.php', 'dwpost_post_local'); + Addon::unregisterHook('notifier_normal', 'addon/dwpost/dwpost.php', 'dwpost_send'); + Addon::unregisterHook('jot_networks', 'addon/dwpost/dwpost.php', 'dwpost_jot_nets'); Addon::unregisterHook('connector_settings', 'addon/dwpost/dwpost.php', 'dwpost_settings'); Addon::unregisterHook('connector_settings_post', 'addon/dwpost/dwpost.php', 'dwpost_settings_post'); +} +function dwpost_jot_nets(App $a, &$b) +{ + if (!local_user()) { + return; + } + + $dw_post = PConfig::get(local_user(), 'dwpost', 'post'); + + if (intval($dw_post) == 1) { + $dw_defpost = PConfig::get(local_user(), 'dwpost', 'post_by_default'); + $selected = ((intval($dw_defpost) == 1) ? ' checked="checked" ' : ''); + + $b .= '
' + . L10n::t('Post to Dreamwidth') . '
'; + } } -function dwpost_jot_nets(&$a,&$b) { - if(! local_user()) - return; +function dwpost_settings(App $a, &$s) +{ + if (!local_user()) { + return; + } - $dw_post = PConfig::get(local_user(),'dwpost','post'); - if(intval($dw_post) == 1) { - $dw_defpost = PConfig::get(local_user(),'dwpost','post_by_default'); - $selected = ((intval($dw_defpost) == 1) ? ' checked="checked" ' : ''); - $b .= '
' - . L10n::t('Post to Dreamwidth') . '
'; - } -} + /* Add our stylesheet to the page so we can make our settings look nice */ + $a->page['htmlhead'] .= '' . "\r\n"; + /* Get the current state of our config variables */ + $enabled = PConfig::get(local_user(), 'dwpost', 'post'); -function dwpost_settings(&$a,&$s) { + $checked = (($enabled) ? ' checked="checked" ' : ''); - if(! local_user()) - return; + $def_enabled = PConfig::get(local_user(), 'dwpost', 'post_by_default'); - /* Add our stylesheet to the page so we can make our settings look nice */ - - $a->page['htmlhead'] .= '' . "\r\n"; - - /* Get the current state of our config variables */ - - $enabled = PConfig::get(local_user(),'dwpost','post'); - - $checked = (($enabled) ? ' checked="checked" ' : ''); - - $def_enabled = PConfig::get(local_user(),'dwpost','post_by_default'); - - $def_checked = (($def_enabled) ? ' checked="checked" ' : ''); + $def_checked = (($def_enabled) ? ' checked="checked" ' : ''); $dw_username = PConfig::get(local_user(), 'dwpost', 'dw_username'); $dw_password = PConfig::get(local_user(), 'dwpost', 'dw_password'); + /* Add some HTML to the existing form */ + $s .= ''; + $s .= '

'. L10n::t("Dreamwidth Export").'

'; + $s .= '
'; + $s .= ''; } -function dwpost_settings_post(&$a,&$b) { - - if(x($_POST,'dwpost-submit')) { - - PConfig::set(local_user(),'dwpost','post',intval($_POST['dwpost'])); - PConfig::set(local_user(),'dwpost','post_by_default',intval($_POST['dw_bydefault'])); - PConfig::set(local_user(),'dwpost','dw_username',trim($_POST['dw_username'])); - PConfig::set(local_user(),'dwpost','dw_password',trim($_POST['dw_password'])); +function dwpost_settings_post(App $a, array &$b) +{ + if (!empty($_POST['dwpost-submit'])) { + PConfig::set(local_user(), 'dwpost', 'post', intval($_POST['dwpost'])); + PConfig::set(local_user(), 'dwpost', 'post_by_default', intval($_POST['dw_bydefault'])); + PConfig::set(local_user(), 'dwpost', 'dw_username', trim($_POST['dw_username'])); + PConfig::set(local_user(), 'dwpost', 'dw_password', trim($_POST['dw_password'])); + } +} +function dwpost_post_local(App $a, array &$b) +{ + // This can probably be changed to allow editing by pointing to a different API endpoint + if ($b['edit']) { + return; } -} - -function dwpost_post_local(&$a,&$b) { - - // This can probably be changed to allow editing by pointing to a different API endpoint - - if($b['edit']) + if ((!local_user()) || (local_user() != $b['uid'])) { return; + } - if((! local_user()) || (local_user() != $b['uid'])) + if ($b['private'] || $b['parent']) { return; + } - if($b['private'] || $b['parent']) - return; - - $dw_post = intval(PConfig::get(local_user(),'dwpost','post')); + $dw_post = intval(PConfig::get(local_user(),'dwpost','post')); $dw_enable = (($dw_post && x($_REQUEST,'dwpost_enable')) ? intval($_REQUEST['dwpost_enable']) : 0); - if($_REQUEST['api_source'] && intval(PConfig::get(local_user(),'dwpost','post_by_default'))) + if ($_REQUEST['api_source'] && intval(PConfig::get(local_user(),'dwpost','post_by_default'))) { $dw_enable = 1; + } - if(! $dw_enable) - return; + if (!$dw_enable) { + return; + } - if(strlen($b['postopts'])) - $b['postopts'] .= ','; - $b['postopts'] .= 'dwpost'; + if (strlen($b['postopts'])) { + $b['postopts'] .= ','; + } + + $b['postopts'] .= 'dwpost'; } +function dwpost_send(App $a, array &$b) +{ + if ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) { + return; + } + if (!strstr($b['postopts'],'dwpost')) { + return; + } + if ($b['parent'] != $b['id']) { + return; + } -function dwpost_send(&$a,&$b) { - - if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) - return; - - if(! strstr($b['postopts'],'dwpost')) - return; - - if($b['parent'] != $b['id']) - return; - - // dreamwidth post in the LJ user's timezone. - // Hopefully the person's Friendica account - // will be set to the same thing. - + /* + * dreamwidth post in the LJ user's timezone. + * Hopefully the person's Friendica account + * will be set to the same thing. + */ $tz = 'UTC'; - $x = q("select timezone from user where uid = %d limit 1", + $x = q("SELECT `timezone` FROM `user` WHERE `uid` = %d LIMIT 1", intval($b['uid']) ); - if($x && strlen($x[0]['timezone'])) + + if (DBA::isResult($x) && !empty($x[0]['timezone'])) { $tz = $x[0]['timezone']; + } $dw_username = PConfig::get($b['uid'],'dwpost','dw_username'); $dw_password = PConfig::get($b['uid'],'dwpost','dw_password'); $dw_blog = 'http://www.dreamwidth.org/interface/xmlrpc'; - if($dw_username && $dw_password && $dw_blog) { + if ($dw_username && $dw_password && $dw_blog) { $title = $b['title']; $post = BBCode::convert($b['body']); $post = xmlify($post); @@ -220,16 +227,19 @@ EOT; logger('dwpost: data: ' . $xml, LOGGER_DATA); - if($dw_blog !== 'test') { + if ($dw_blog !== 'test') { $x = Network::post($dw_blog, $xml, ["Content-Type: text/xml"]); } + logger('posted to dreamwidth: ' . ($x) ? $x : '', LOGGER_DEBUG); } } function dwpost_get_tags($post) { - preg_match_all("/\]([^\[#]+)\[/",$post,$matches); - $tags = implode(', ',$matches[1]); + preg_match_all("/\]([^\[#]+)\[/", $post, $matches); + + $tags = implode(', ', $matches[1]); + return $tags; }