X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=dwpost%2Fdwpost.php;h=a46f55b2a3d30c817ce6134349aef882af5c70a8;hb=bfd8e37fb89c74bc1ba588845c8d7a7e817e0544;hp=2391b5711cdbf41b8dac81f60cf45659514e8027;hpb=28a7fb268071406dc3a463fa7869f94b7f7f9dc7;p=friendica-addons.git
diff --git a/dwpost/dwpost.php b/dwpost/dwpost.php
index 2391b571..a46f55b2 100644
--- a/dwpost/dwpost.php
+++ b/dwpost/dwpost.php
@@ -1,5 +1,4 @@
*/
+use Friendica\Content\Text\BBCode;
+use Friendica\Core\Addon;
+use Friendica\Core\L10n;
+use Friendica\Core\PConfig;
+use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Network;
+
function dwpost_install() {
- register_hook('post_local', 'addon/dwpost/dwpost.php', 'dwpost_post_local');
- register_hook('notifier_normal', 'addon/dwpost/dwpost.php', 'dwpost_send');
- register_hook('jot_networks', 'addon/dwpost/dwpost.php', 'dwpost_jot_nets');
- register_hook('connector_settings', 'addon/dwpost/dwpost.php', 'dwpost_settings');
- register_hook('connector_settings_post', 'addon/dwpost/dwpost.php', 'dwpost_settings_post');
+ 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() {
- unregister_hook('post_local', 'addon/dwpost/dwpost.php', 'dwpost_post_local');
- unregister_hook('notifier_normal', 'addon/dwpost/dwpost.php', 'dwpost_send');
- unregister_hook('jot_networks', 'addon/dwpost/dwpost.php', 'dwpost_jot_nets');
- unregister_hook('connector_settings', 'addon/dwpost/dwpost.php', 'dwpost_settings');
- unregister_hook('connector_settings_post', 'addon/dwpost/dwpost.php', 'dwpost_settings_post');
+ 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');
}
@@ -31,12 +37,12 @@ function dwpost_jot_nets(&$a,&$b) {
if(! local_user())
return;
- $dw_post = get_pconfig(local_user(),'dwpost','post');
+ $dw_post = PConfig::get(local_user(),'dwpost','post');
if(intval($dw_post) == 1) {
- $dw_defpost = get_pconfig(local_user(),'dwpost','post_by_default');
+ $dw_defpost = PConfig::get(local_user(),'dwpost','post_by_default');
$selected = ((intval($dw_defpost) == 1) ? ' checked="checked" ' : '');
$b .= '
'
- . t('Post to Dreamwidth') . '
';
+ . L10n::t('Post to Dreamwidth') . '';
}
}
@@ -52,45 +58,51 @@ function dwpost_settings(&$a,&$s) {
/* Get the current state of our config variables */
- $enabled = get_pconfig(local_user(),'dwpost','post');
+ $enabled = PConfig::get(local_user(),'dwpost','post');
$checked = (($enabled) ? ' checked="checked" ' : '');
- $def_enabled = get_pconfig(local_user(),'dwpost','post_by_default');
+ $def_enabled = PConfig::get(local_user(),'dwpost','post_by_default');
$def_checked = (($def_enabled) ? ' checked="checked" ' : '');
- $dw_username = get_pconfig(local_user(), 'dwpost', 'dw_username');
- $dw_password = get_pconfig(local_user(), 'dwpost', 'dw_password');
+ $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 .= '
' . t('Dreamwidth Post Settings') . '
';
+ $s .= '
';
+ $s .= ''. L10n::t("Dreamwidth Export").'
';
+ $s .= '';
+ $s .= '
';
+ $s .= '
';
+ $s .= ''. L10n::t("Dreamwidth Export").'
';
+ $s .= '';
+
$s .= '
';
- $s .= '';
+ $s .= '';
$s .= '';
$s .= '
';
$s .= '
';
- $s .= '';
+ $s .= '';
$s .= '';
$s .= '
';
$s .= '
';
- $s .= '';
+ $s .= '';
$s .= '';
$s .= '
';
$s .= '
';
- $s .= '';
+ $s .= '';
$s .= '';
$s .= '
';
/* provide a submit button */
- $s .= '
';
+ $s .= '
';
}
@@ -99,10 +111,10 @@ function dwpost_settings_post(&$a,&$b) {
if(x($_POST,'dwpost-submit')) {
- set_pconfig(local_user(),'dwpost','post',intval($_POST['dwpost']));
- set_pconfig(local_user(),'dwpost','post_by_default',intval($_POST['dw_bydefault']));
- set_pconfig(local_user(),'dwpost','dw_username',trim($_POST['dw_username']));
- set_pconfig(local_user(),'dwpost','dw_password',trim($_POST['dw_password']));
+ 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']));
}
@@ -121,11 +133,11 @@ function dwpost_post_local(&$a,&$b) {
if($b['private'] || $b['parent'])
return;
- $dw_post = intval(get_pconfig(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(get_pconfig(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)
@@ -150,7 +162,7 @@ function dwpost_send(&$a,&$b) {
if($b['parent'] != $b['id'])
return;
- // dreamwidth post in the LJ user's timezone.
+ // dreamwidth post in the LJ user's timezone.
// Hopefully the person's Friendica account
// will be set to the same thing.
@@ -160,23 +172,19 @@ function dwpost_send(&$a,&$b) {
intval($b['uid'])
);
if($x && strlen($x[0]['timezone']))
- $tz = $x[0]['timezone'];
+ $tz = $x[0]['timezone'];
- $dw_username = get_pconfig($b['uid'],'dwpost','dw_username');
- $dw_password = get_pconfig($b['uid'],'dwpost','dw_password');
+ $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) {
-
- require_once('include/bbcode.php');
- require_once('include/datetime.php');
-
$title = $b['title'];
- $post = bbcode($b['body']);
+ $post = BBCode::convert($b['body']);
$post = xmlify($post);
$tags = dwpost_get_tags($b['tag']);
- $date = datetime_convert('UTC',$tz,$b['created'],'Y-m-d H:i:s');
+ $date = DateTimeFormat::convert($b['created'], $tz);
$year = intval(substr($date,0,4));
$mon = intval(substr($date,5,2));
$day = intval(substr($date,8,2));
@@ -212,10 +220,10 @@ EOT;
logger('dwpost: data: ' . $xml, LOGGER_DATA);
- if($dw_blog !== 'test')
- $x = post_url($dw_blog,$xml,array("Content-Type: text/xml"));
+ if($dw_blog !== 'test') {
+ $x = Network::post($dw_blog, $xml, ["Content-Type: text/xml"]);
+ }
logger('posted to dreamwidth: ' . ($x) ? $x : '', LOGGER_DEBUG);
-
}
}