Merge pull request #676 from Quix0r/dwpost/fixes-curly-spaces
[dwpost] Cleanups and type-hint rewrite
This commit is contained in:
Michael Vogel
GitHub
commit
fc2a367dae
|
|
@ -8,177 +8,184 @@
|
|||
* Author: Cat Gray <https://free-haven.org/profile/catness>
|
||||
*/
|
||||
|
||||
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 .= '<div class="profile-jot-net"><input type="checkbox" name="dwpost_enable" ' . $selected . ' value="1" /> '
|
||||
. L10n::t('Post to Dreamwidth') . '</div>';
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
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 .= '<div class="profile-jot-net"><input type="checkbox" name="dwpost_enable" ' . $selected . ' value="1" /> '
|
||||
. L10n::t('Post to Dreamwidth') . '</div>';
|
||||
}
|
||||
}
|
||||
/* Add our stylesheet to the page so we can make our settings look nice */
|
||||
$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->get_baseurl() . '/addon/dwpost/dwpost.css' . '" media="all" />' . "\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'] .= '<link rel="stylesheet" type="text/css" href="' . $a->get_baseurl() . '/addon/dwpost/dwpost.css' . '" media="all" />' . "\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 .= '<span id="settings_dwpost_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_dwpost_expanded\'); openClose(\'settings_dwpost_inflated\');">';
|
||||
$s .= '<img class="connector" src="images/dreamwidth.png" /><h3 class="connector">'. L10n::t("Dreamwidth Export").'</h3>';
|
||||
$s .= '</span>';
|
||||
$s .= '<div id="settings_dwpost_expanded" class="settings-block" style="display: none;">';
|
||||
$s .= '<span class="fakelink" onclick="openClose(\'settings_dwpost_expanded\'); openClose(\'settings_dwpost_inflated\');">';
|
||||
$s .= '<img class="connector" src="images/dreamwidth.png" /><h3 class="connector">'. L10n::t("Dreamwidth Export").'</h3>';
|
||||
$s .= '</span>';
|
||||
|
||||
/* Add some HTML to the existing form */
|
||||
$s .= '<div id="dwpost-enable-wrapper">';
|
||||
$s .= '<label id="dwpost-enable-label" for="dwpost-checkbox">' . L10n::t('Enable dreamwidth Post Addon') . '</label>';
|
||||
$s .= '<input id="dwpost-checkbox" type="checkbox" name="dwpost" value="1" ' . $checked . '/>';
|
||||
$s .= '</div><div class="clear"></div>';
|
||||
|
||||
$s .= '<span id="settings_dwpost_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_dwpost_expanded\'); openClose(\'settings_dwpost_inflated\');">';
|
||||
$s .= '<img class="connector" src="images/dreamwidth.png" /><h3 class="connector">'. L10n::t("Dreamwidth Export").'</h3>';
|
||||
$s .= '</span>';
|
||||
$s .= '<div id="settings_dwpost_expanded" class="settings-block" style="display: none;">';
|
||||
$s .= '<span class="fakelink" onclick="openClose(\'settings_dwpost_expanded\'); openClose(\'settings_dwpost_inflated\');">';
|
||||
$s .= '<img class="connector" src="images/dreamwidth.png" /><h3 class="connector">'. L10n::t("Dreamwidth Export").'</h3>';
|
||||
$s .= '</span>';
|
||||
$s .= '<div id="dwpost-username-wrapper">';
|
||||
$s .= '<label id="dwpost-username-label" for="dwpost-username">' . L10n::t('dreamwidth username') . '</label>';
|
||||
$s .= '<input id="dwpost-username" type="text" name="dw_username" value="' . $dw_username . '" />';
|
||||
$s .= '</div><div class="clear"></div>';
|
||||
|
||||
$s .= '<div id="dwpost-enable-wrapper">';
|
||||
$s .= '<label id="dwpost-enable-label" for="dwpost-checkbox">' . L10n::t('Enable dreamwidth Post Addon') . '</label>';
|
||||
$s .= '<input id="dwpost-checkbox" type="checkbox" name="dwpost" value="1" ' . $checked . '/>';
|
||||
$s .= '</div><div class="clear"></div>';
|
||||
$s .= '<div id="dwpost-password-wrapper">';
|
||||
$s .= '<label id="dwpost-password-label" for="dwpost-password">' . L10n::t('dreamwidth password') . '</label>';
|
||||
$s .= '<input id="dwpost-password" type="password" name="dw_password" value="' . $dw_password . '" />';
|
||||
$s .= '</div><div class="clear"></div>';
|
||||
|
||||
$s .= '<div id="dwpost-username-wrapper">';
|
||||
$s .= '<label id="dwpost-username-label" for="dwpost-username">' . L10n::t('dreamwidth username') . '</label>';
|
||||
$s .= '<input id="dwpost-username" type="text" name="dw_username" value="' . $dw_username . '" />';
|
||||
$s .= '</div><div class="clear"></div>';
|
||||
|
||||
$s .= '<div id="dwpost-password-wrapper">';
|
||||
$s .= '<label id="dwpost-password-label" for="dwpost-password">' . L10n::t('dreamwidth password') . '</label>';
|
||||
$s .= '<input id="dwpost-password" type="password" name="dw_password" value="' . $dw_password . '" />';
|
||||
$s .= '</div><div class="clear"></div>';
|
||||
|
||||
$s .= '<div id="dwpost-bydefault-wrapper">';
|
||||
$s .= '<label id="dwpost-bydefault-label" for="dwpost-bydefault">' . L10n::t('Post to dreamwidth by default') . '</label>';
|
||||
$s .= '<input id="dwpost-bydefault" type="checkbox" name="dw_bydefault" value="1" ' . $def_checked . '/>';
|
||||
$s .= '</div><div class="clear"></div>';
|
||||
|
||||
/* provide a submit button */
|
||||
|
||||
$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="dwpost-submit" name="dwpost-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div></div>';
|
||||
$s .= '<div id="dwpost-bydefault-wrapper">';
|
||||
$s .= '<label id="dwpost-bydefault-label" for="dwpost-bydefault">' . L10n::t('Post to dreamwidth by default') . '</label>';
|
||||
$s .= '<input id="dwpost-bydefault" type="checkbox" name="dw_bydefault" value="1" ' . $def_checked . '/>';
|
||||
$s .= '</div><div class="clear"></div>';
|
||||
|
||||
/* provide a submit button */
|
||||
$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="dwpost-submit" name="dwpost-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div></div>';
|
||||
}
|
||||
|
||||
|
||||
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;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user