diff --git a/ijpost/ijpost.php b/ijpost/ijpost.php index df7fc7810..20d4f81d4 100644 --- a/ijpost/ijpost.php +++ b/ijpost/ijpost.php @@ -29,10 +29,10 @@ function ijpost_jot_nets(&$a,&$b) { if(! local_user()) return; - $dw_post = get_pconfig(local_user(),'ijpost','post'); - if(intval($dw_post) == 1) { - $dw_defpost = get_pconfig(local_user(),'ijpost','post_by_default'); - $selected = ((intval($dw_defpost) == 1) ? ' checked="checked" ' : ''); + $ij_post = get_pconfig(local_user(),'ijpost','post'); + if(intval($ij_post) == 1) { + $ij_defpost = get_pconfig(local_user(),'ijpost','post_by_default'); + $selected = ((intval($ij_defpost) == 1) ? ' checked="checked" ' : ''); $b .= '
' . t('Post to InsaneJournal') . '
'; } @@ -58,8 +58,8 @@ function ijpost_settings(&$a,&$s) { $def_checked = (($def_enabled) ? ' checked="checked" ' : ''); - $dw_username = get_pconfig(local_user(), 'ijpost', 'dw_username'); - $dw_password = get_pconfig(local_user(), 'ijpost', 'dw_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 */ @@ -73,17 +73,17 @@ function ijpost_settings(&$a,&$s) { $s .= '
'; $s .= ''; - $s .= ''; + $s .= ''; $s .= '
'; $s .= '
'; $s .= ''; - $s .= ''; + $s .= ''; $s .= '
'; $s .= '
'; $s .= ''; - $s .= ''; + $s .= ''; $s .= '
'; /* provide a submit button */ @@ -98,9 +98,9 @@ function ijpost_settings_post(&$a,&$b) { if(x($_POST,'ijpost-submit')) { set_pconfig(local_user(),'ijpost','post',intval($_POST['ijpost'])); - set_pconfig(local_user(),'ijpost','post_by_default',intval($_POST['dw_bydefault'])); - set_pconfig(local_user(),'ijpost','dw_username',trim($_POST['dw_username'])); - set_pconfig(local_user(),'ijpost','dw_password',trim($_POST['dw_password'])); + 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'])); } @@ -119,14 +119,14 @@ function ijpost_post_local(&$a,&$b) { if($b['private'] || $b['parent']) return; - $dw_post = intval(get_pconfig(local_user(),'ijpost','post')); + $ij_post = intval(get_pconfig(local_user(),'ijpost','post')); - $dw_enable = (($dw_post && x($_REQUEST,'ijpost_enable')) ? intval($_REQUEST['ijpost_enable']) : 0); + $ij_enable = (($ij_post && x($_REQUEST,'ijpost_enable')) ? intval($_REQUEST['ijpost_enable']) : 0); if($_REQUEST['api_source'] && intval(get_pconfig(local_user(),'ijpost','post_by_default'))) - $dw_enable = 1; + $ij_enable = 1; - if(! $dw_enable) + if(! $ij_enable) return; if(strlen($b['postopts'])) @@ -160,11 +160,11 @@ function ijpost_send(&$a,&$b) { if($x && strlen($x[0]['timezone'])) $tz = $x[0]['timezone']; - $dw_username = get_pconfig($b['uid'],'ijpost','dw_username'); - $dw_password = get_pconfig($b['uid'],'ijpost','dw_password'); - $dw_blog = 'http://www.insanejournal.com/interface/xmlrpc'; + $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($dw_username && $dw_password && $dw_blog) { + if($ij_username && $ij_password && $ij_blog) { require_once('include/bbcode.php'); require_once('include/datetime.php'); @@ -191,8 +191,8 @@ function ijpost_send(&$a,&$b) { hour$hour min$min event$post -username$dw_username -password$dw_password +username$ij_username +password$ij_password subject$title lineendingsunix ver1 @@ -209,8 +209,8 @@ EOT; logger('ijpost: data: ' . $xml, LOGGER_DATA); - if($dw_blog !== 'test') - $x = post_url($dw_blog,$xml); + if($ij_blog !== 'test') + $x = post_url($ij_blog,$xml); logger('posted to insanejournal: ' . ($x) ? $x : '', LOGGER_DEBUG); }