X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=ijpost%2Fijpost.php;h=091edec388c196007bf7cb7777ab6e6c2b7e4232;hb=39dd3dffe07efd69fa1ac6d0bd243c7fc0e3a66f;hp=3c4e917dda0dfcb5c15a153a5bcab846c691f428;hpb=b24690e8df43b9db055fc67b5c306daf23d8ec56;p=friendica-addons.git diff --git a/ijpost/ijpost.php b/ijpost/ijpost.php index 3c4e917d..091edec3 100644 --- a/ijpost/ijpost.php +++ b/ijpost/ijpost.php @@ -8,11 +8,12 @@ * Author: Cat Gray */ +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; -use Friendica\Util\Temporal; function ijpost_install() { Addon::registerHook('post_local', 'addon/ijpost/ijpost.php', 'ijpost_post_local'); @@ -36,9 +37,9 @@ function ijpost_jot_nets(&$a,&$b) { if(! local_user()) return; - $ij_post = PConfig::get(local_user(),'ijpost','post'); + $ij_post = get_pconfig(local_user(),'ijpost','post'); if(intval($ij_post) == 1) { - $ij_defpost = PConfig::get(local_user(),'ijpost','post_by_default'); + $ij_defpost = get_pconfig(local_user(),'ijpost','post_by_default'); $selected = ((intval($ij_defpost) == 1) ? ' checked="checked" ' : ''); $b .= '
' . L10n::t('Post to Insanejournal') . '
'; @@ -57,16 +58,16 @@ function ijpost_settings(&$a,&$s) { /* Get the current state of our config variables */ - $enabled = PConfig::get(local_user(),'ijpost','post'); + $enabled = get_pconfig(local_user(),'ijpost','post'); $checked = (($enabled) ? ' checked="checked" ' : ''); - $def_enabled = PConfig::get(local_user(),'ijpost','post_by_default'); + $def_enabled = get_pconfig(local_user(),'ijpost','post_by_default'); $def_checked = (($def_enabled) ? ' checked="checked" ' : ''); - $ij_username = PConfig::get(local_user(), 'ijpost', 'ij_username'); - $ij_password = PConfig::get(local_user(), 'ijpost', 'ij_password'); + $ij_username = get_pconfig(local_user(), 'ijpost', 'ij_username'); + $ij_password = get_pconfig(local_user(), 'ijpost', 'ij_password'); /* Add some HTML to the existing form */ @@ -109,10 +110,10 @@ function ijpost_settings_post(&$a,&$b) { if(x($_POST,'ijpost-submit')) { - PConfig::set(local_user(),'ijpost','post',intval($_POST['ijpost'])); - PConfig::set(local_user(),'ijpost','post_by_default',intval($_POST['ij_bydefault'])); - PConfig::set(local_user(),'ijpost','ij_username',trim($_POST['ij_username'])); - PConfig::set(local_user(),'ijpost','ij_password',trim($_POST['ij_password'])); + set_pconfig(local_user(),'ijpost','post',intval($_POST['ijpost'])); + set_pconfig(local_user(),'ijpost','post_by_default',intval($_POST['ij_bydefault'])); + set_pconfig(local_user(),'ijpost','ij_username',trim($_POST['ij_username'])); + set_pconfig(local_user(),'ijpost','ij_password',trim($_POST['ij_password'])); } @@ -131,11 +132,11 @@ function ijpost_post_local(&$a,&$b) { if($b['private'] || $b['parent']) return; - $ij_post = intval(PConfig::get(local_user(),'ijpost','post')); + $ij_post = intval(get_pconfig(local_user(),'ijpost','post')); $ij_enable = (($ij_post && x($_REQUEST,'ijpost_enable')) ? intval($_REQUEST['ijpost_enable']) : 0); - if($_REQUEST['api_source'] && intval(PConfig::get(local_user(),'ijpost','post_by_default'))) + if($_REQUEST['api_source'] && intval(get_pconfig(local_user(),'ijpost','post_by_default'))) $ij_enable = 1; if(! $ij_enable) @@ -160,7 +161,7 @@ function ijpost_send(&$a,&$b) { if($b['parent'] != $b['id']) return; - // insanejournal post in the LJ user's timezone. + // insanejournal post in the LJ user's timezone. // Hopefully the person's Friendica account // will be set to the same thing. @@ -170,23 +171,19 @@ function ijpost_send(&$a,&$b) { intval($b['uid']) ); if($x && strlen($x[0]['timezone'])) - $tz = $x[0]['timezone']; + $tz = $x[0]['timezone']; - $ij_username = PConfig::get($b['uid'],'ijpost','ij_username'); - $ij_password = PConfig::get($b['uid'],'ijpost','ij_password'); + $ij_username = get_pconfig($b['uid'],'ijpost','ij_username'); + $ij_password = get_pconfig($b['uid'],'ijpost','ij_password'); $ij_blog = 'http://www.insanejournal.com/interface/xmlrpc'; if($ij_username && $ij_password && $ij_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 = ijpost_get_tags($b['tag']); - $date = Temporal::convert($b['created'], $tz); + $date = DateTimeFormat::convert($b['created'], $tz); $year = intval(substr($date,0,4)); $mon = intval(substr($date,5,2)); $day = intval(substr($date,8,2));