Revert to stable version 3.5.4

This commit is contained in:
Hypolite Petovan 2018-02-11 19:00:01 -05:00
parent 38db18b624
commit 5360f08f42
355 changed files with 21449 additions and 4957 deletions

View file

@ -9,8 +9,6 @@
* Author: Cat Gray <https://free-haven.org/profile/catness>
*/
use Friendica\Core\PConfig;
function ijpost_install() {
register_hook('post_local', 'addon/ijpost/ijpost.php', 'ijpost_post_local');
register_hook('notifier_normal', 'addon/ijpost/ijpost.php', 'ijpost_send');
@ -33,9 +31,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 .= '<div class="profile-jot-net"><input type="checkbox" name="ijpost_enable" ' . $selected . ' value="1" /> '
. t('Post to Insanejournal') . '</div>';
@ -54,16 +52,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 */
@ -106,10 +104,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']));
}
@ -128,11 +126,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)
@ -157,7 +155,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.
@ -167,10 +165,10 @@ 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) {
@ -220,7 +218,7 @@ EOT;
logger('ijpost: data: ' . $xml, LOGGER_DATA);
if($ij_blog !== 'test')
$x = post_url($ij_blog,$xml,["Content-Type: text/xml"]);
$x = post_url($ij_blog,$xml,array("Content-Type: text/xml"));
logger('posted to insanejournal: ' . ($x) ? $x : '', LOGGER_DEBUG);
}