use Friendica\App;
use Friendica\Content\Text\BBCode;
-use Friendica\Core\Addon;
-use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
+use Friendica\Core\Hook;
+use Friendica\Core\Logger;
use Friendica\Database\DBA;
+use Friendica\DI;
+use Friendica\Model\Tag;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Network;
+use Friendica\Util\XML;
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');
+ Hook::register('post_local', 'addon/dwpost/dwpost.php', 'dwpost_post_local');
+ Hook::register('notifier_normal', 'addon/dwpost/dwpost.php', 'dwpost_send');
+ Hook::register('jot_networks', 'addon/dwpost/dwpost.php', 'dwpost_jot_nets');
+ Hook::register('connector_settings', 'addon/dwpost/dwpost.php', 'dwpost_settings');
+ Hook::register('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');
- Addon::unregisterHook('connector_settings', 'addon/dwpost/dwpost.php', 'dwpost_settings');
- Addon::unregisterHook('connector_settings_post', 'addon/dwpost/dwpost.php', 'dwpost_settings_post');
+ Hook::unregister('post_local', 'addon/dwpost/dwpost.php', 'dwpost_post_local');
+ Hook::unregister('notifier_normal', 'addon/dwpost/dwpost.php', 'dwpost_send');
+ Hook::unregister('jot_networks', 'addon/dwpost/dwpost.php', 'dwpost_jot_nets');
+ Hook::unregister('connector_settings', 'addon/dwpost/dwpost.php', 'dwpost_settings');
+ Hook::unregister('connector_settings_post', 'addon/dwpost/dwpost.php', 'dwpost_settings_post');
}
-function dwpost_jot_nets(App $a, &$b)
+function dwpost_jot_nets(App $a, array &$jotnets_fields)
{
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>';
+ if (DI::pConfig()->get(local_user(), 'dwpost', 'post')) {
+ $jotnets_fields[] = [
+ 'type' => 'checkbox',
+ 'field' => [
+ 'dwpost_enable',
+ DI::l10n()->t('Post to Dreamwidth'),
+ DI::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";
+ DI::page()['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . DI::baseUrl()->get() . '/addon/dwpost/dwpost.css' . '" media="all" />' . "\r\n";
/* Get the current state of our config variables */
- $enabled = PConfig::get(local_user(), 'dwpost', 'post');
+ $enabled = DI::pConfig()->get(local_user(), 'dwpost', 'post');
$checked = (($enabled) ? ' checked="checked" ' : '');
- $def_enabled = PConfig::get(local_user(), 'dwpost', 'post_by_default');
+ $def_enabled = DI::pConfig()->get(local_user(), 'dwpost', 'post_by_default');
$def_checked = (($def_enabled) ? ' checked="checked" ' : '');
- $dw_username = PConfig::get(local_user(), 'dwpost', 'dw_username');
- $dw_password = PConfig::get(local_user(), 'dwpost', 'dw_password');
+ $dw_username = DI::pConfig()->get(local_user(), 'dwpost', 'dw_username');
+ $dw_password = DI::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 .= '<img class="connector" src="images/dreamwidth.png" /><h3 class="connector">'. DI::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 .= '<img class="connector" src="images/dreamwidth.png" /><h3 class="connector">'. DI::l10n()->t("Dreamwidth Export").'</h3>';
$s .= '</span>';
$s .= '<div id="dwpost-enable-wrapper">';
- $s .= '<label id="dwpost-enable-label" for="dwpost-checkbox">' . L10n::t('Enable dreamwidth Post Addon') . '</label>';
+ $s .= '<label id="dwpost-enable-label" for="dwpost-checkbox">' . DI::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-username-wrapper">';
- $s .= '<label id="dwpost-username-label" for="dwpost-username">' . L10n::t('dreamwidth username') . '</label>';
+ $s .= '<label id="dwpost-username-label" for="dwpost-username">' . DI::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 .= '<label id="dwpost-password-label" for="dwpost-password">' . DI::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 .= '<label id="dwpost-bydefault-label" for="dwpost-bydefault">' . DI::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 class="settings-submit-wrapper" ><input type="submit" id="dwpost-submit" name="dwpost-submit" class="settings-submit" value="' . DI::l10n()->t('Save Settings') . '" /></div></div>';
}
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']));
+ DI::pConfig()->set(local_user(), 'dwpost', 'post', intval($_POST['dwpost']));
+ DI::pConfig()->set(local_user(), 'dwpost', 'post_by_default', intval($_POST['dw_bydefault']));
+ DI::pConfig()->set(local_user(), 'dwpost', 'dw_username', trim($_POST['dw_username']));
+ DI::pConfig()->set(local_user(), 'dwpost', 'dw_password', trim($_POST['dw_password']));
}
}
return;
}
- $dw_post = intval(PConfig::get(local_user(),'dwpost','post'));
+ $dw_post = intval(DI::pConfig()->get(local_user(),'dwpost','post'));
- $dw_enable = (($dw_post && x($_REQUEST,'dwpost_enable')) ? intval($_REQUEST['dwpost_enable']) : 0);
+ $dw_enable = (($dw_post && !empty($_REQUEST['dwpost_enable'])) ? intval($_REQUEST['dwpost_enable']) : 0);
- if ($_REQUEST['api_source'] && intval(PConfig::get(local_user(),'dwpost','post_by_default'))) {
+ if ($b['api_source'] && intval(DI::pConfig()->get(local_user(),'dwpost','post_by_default'))) {
$dw_enable = 1;
}
$tz = $x[0]['timezone'];
}
- $dw_username = PConfig::get($b['uid'],'dwpost','dw_username');
- $dw_password = PConfig::get($b['uid'],'dwpost','dw_password');
+ $dw_username = DI::pConfig()->get($b['uid'],'dwpost','dw_username');
+ $dw_password = DI::pConfig()->get($b['uid'],'dwpost','dw_password');
$dw_blog = 'http://www.dreamwidth.org/interface/xmlrpc';
if ($dw_username && $dw_password && $dw_blog) {
$title = $b['title'];
$post = BBCode::convert($b['body']);
- $post = xmlify($post);
- $tags = dwpost_get_tags($b['tag']);
+ $post = XML::escape($post);
+ $tags = Tag::getCSVByURIId($b['uri-id'], [Tag::HASHTAG]);
$date = DateTimeFormat::convert($b['created'], $tz);
$year = intval(substr($date,0,4));
EOT;
- logger('dwpost: data: ' . $xml, LOGGER_DATA);
+ Logger::log('dwpost: data: ' . $xml, Logger::DATA);
if ($dw_blog !== 'test') {
- $x = Network::post($dw_blog, $xml, ["Content-Type: text/xml"]);
+ $x = Network::post($dw_blog, $xml, ["Content-Type: text/xml"])->getBody();
}
- logger('posted to dreamwidth: ' . ($x) ? $x : '', LOGGER_DEBUG);
+ Logger::log('posted to dreamwidth: ' . ($x) ? $x : '', Logger::DEBUG);
}
}
-
-function dwpost_get_tags($post)
-{
- preg_match_all("/\]([^\[#]+)\[/", $post, $matches);
-
- $tags = implode(', ', $matches[1]);
-
- return $tags;
-}
https://reisub.nsupdate.info/git / friendica-addons.git / .git / blobdiff