EntropyEngineer/friendica-addons
0
0
Fork 0
forked from friendica/friendica-addons
Code Pull requests Activity

Removed notice in ijpost and cleaned code

Browse source
This commit is contained in:
Michael 2018-08-30 19:53:12 +00:00
parent 914b40f32e
commit bfd6e25b24
1 changed files with 114 additions and 111 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

119
ijpost/ijpost.php
View file

@ -15,42 +15,44 @@ use Friendica\Core\PConfig;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
use Friendica\Util\Network; use Friendica\Util\Network;
function ijpost_install() { function ijpost_install()
{
Addon::registerHook('post_local', 'addon/ijpost/ijpost.php', 'ijpost_post_local'); Addon::registerHook('post_local', 'addon/ijpost/ijpost.php', 'ijpost_post_local');
Addon::registerHook('notifier_normal', 'addon/ijpost/ijpost.php', 'ijpost_send'); Addon::registerHook('notifier_normal', 'addon/ijpost/ijpost.php', 'ijpost_send');
Addon::registerHook('jot_networks', 'addon/ijpost/ijpost.php', 'ijpost_jot_nets'); Addon::registerHook('jot_networks', 'addon/ijpost/ijpost.php', 'ijpost_jot_nets');
Addon::registerHook('connector_settings', 'addon/ijpost/ijpost.php', 'ijpost_settings'); Addon::registerHook('connector_settings', 'addon/ijpost/ijpost.php', 'ijpost_settings');
Addon::registerHook('connector_settings_post', 'addon/ijpost/ijpost.php', 'ijpost_settings_post'); Addon::registerHook('connector_settings_post', 'addon/ijpost/ijpost.php', 'ijpost_settings_post');
} }
function ijpost_uninstall() {
function ijpost_uninstall()
{
Addon::unregisterHook('post_local', 'addon/ijpost/ijpost.php', 'ijpost_post_local'); Addon::unregisterHook('post_local', 'addon/ijpost/ijpost.php', 'ijpost_post_local');
Addon::unregisterHook('notifier_normal', 'addon/ijpost/ijpost.php', 'ijpost_send'); Addon::unregisterHook('notifier_normal', 'addon/ijpost/ijpost.php', 'ijpost_send');
Addon::unregisterHook('jot_networks', 'addon/ijpost/ijpost.php', 'ijpost_jot_nets'); Addon::unregisterHook('jot_networks', 'addon/ijpost/ijpost.php', 'ijpost_jot_nets');
Addon::unregisterHook('connector_settings', 'addon/ijpost/ijpost.php', 'ijpost_settings'); Addon::unregisterHook('connector_settings', 'addon/ijpost/ijpost.php', 'ijpost_settings');
Addon::unregisterHook('connector_settings_post', 'addon/ijpost/ijpost.php', 'ijpost_settings_post'); Addon::unregisterHook('connector_settings_post', 'addon/ijpost/ijpost.php', 'ijpost_settings_post');
} }
function ijpost_jot_nets(&$a, &$b)
function ijpost_jot_nets(&$a,&$b) { {
if(! local_user()) if (!local_user()) {
return; return;
}
$ij_post = PConfig::get(local_user(),'ijpost','post'); $ij_post = PConfig::get(local_user(), 'ijpost', 'post');
if(intval($ij_post) == 1) { if (intval($ij_post) == 1) {
$ij_defpost = PConfig::get(local_user(),'ijpost','post_by_default'); $ij_defpost = PConfig::get(local_user(), 'ijpost', 'post_by_default');
$selected = ((intval($ij_defpost) == 1) ? ' checked="checked" ' : ''); $selected = ((intval($ij_defpost) == 1) ? ' checked="checked" ' : '');
$b .= '<div class="profile-jot-net"><input type="checkbox" name="ijpost_enable" ' . $selected . ' value="1" /> ' $b .= '<div class="profile-jot-net"><input type="checkbox" name="ijpost_enable" ' . $selected . ' value="1" /> '
. L10n::t('Post to Insanejournal') . '</div>'; . L10n::t('Post to Insanejournal') . '</div>';
} }
} }
function ijpost_settings(&$a, &$s)
function ijpost_settings(&$a,&$s) { {
if (!local_user()) {
if(! local_user())
return; return;
}
/* Add our stylesheet to the page so we can make our settings look nice */ /* Add our stylesheet to the page so we can make our settings look nice */
@ -58,18 +60,17 @@ function ijpost_settings(&$a,&$s) {
/* Get the current state of our config variables */ /* Get the current state of our config variables */
$enabled = PConfig::get(local_user(),'ijpost','post'); $enabled = PConfig::get(local_user(), 'ijpost', 'post');
$checked = (($enabled) ? ' checked="checked" ' : ''); $checked = (($enabled) ? ' checked="checked" ' : '');
$def_enabled = PConfig::get(local_user(),'ijpost','post_by_default'); $def_enabled = PConfig::get(local_user(), 'ijpost', 'post_by_default');
$def_checked = (($def_enabled) ? ' checked="checked" ' : ''); $def_checked = (($def_enabled) ? ' checked="checked" ' : '');
$ij_username = PConfig::get(local_user(), 'ijpost', 'ij_username'); $ij_username = PConfig::get(local_user(), 'ijpost', 'ij_username');
$ij_password = PConfig::get(local_user(), 'ijpost', 'ij_password'); $ij_password = PConfig::get(local_user(), 'ijpost', 'ij_password');
/* Add some HTML to the existing form */ /* Add some HTML to the existing form */
$s .= '<span id="settings_ijpost_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_ijpost_expanded\'); openClose(\'settings_ijpost_inflated\');">'; $s .= '<span id="settings_ijpost_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_ijpost_expanded\'); openClose(\'settings_ijpost_inflated\');">';
$s .= '<img class="connector" src="images/insanejournal.gif" /><h3 class="connector">'. L10n::t("InsaneJournal Export").'</h3>'; $s .= '<img class="connector" src="images/insanejournal.gif" /><h3 class="connector">'. L10n::t("InsaneJournal Export").'</h3>';
@ -100,66 +101,67 @@ function ijpost_settings(&$a,&$s) {
$s .= '</div><div class="clear"></div>'; $s .= '</div><div class="clear"></div>';
/* provide a submit button */ /* provide a submit button */
$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="ijpost-submit" name="ijpost-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div></div>'; $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="ijpost-submit" name="ijpost-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div></div>';
} }
function ijpost_settings_post(&$a, &$b)
function ijpost_settings_post(&$a,&$b) { {
if (x($_POST, 'ijpost-submit')) {
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','post',intval($_POST['ijpost'])); PConfig::set(local_user(), 'ijpost', 'ij_username', trim($_POST['ij_username']));
PConfig::set(local_user(),'ijpost','post_by_default',intval($_POST['ij_bydefault'])); PConfig::set(local_user(), 'ijpost', 'ij_password', trim($_POST['ij_password']));
PConfig::set(local_user(),'ijpost','ij_username',trim($_POST['ij_username']));
PConfig::set(local_user(),'ijpost','ij_password',trim($_POST['ij_password']));
} }
} }
function ijpost_post_local(&$a,&$b) { function ijpost_post_local(&$a, &$b)
{
// This can probably be changed to allow editing by pointing to a different API endpoint // This can probably be changed to allow editing by pointing to a different API endpoint
if($b['edit']) if ($b['edit']) {
return; return;
}
if((! local_user()) || (local_user() != $b['uid'])) if (!local_user() || (local_user() != $b['uid'])) {
return; return;
}
if($b['private'] || $b['parent']) if ($b['private'] || $b['parent']) {
return; return;
}
$ij_post = intval(PConfig::get(local_user(),'ijpost','post')); $ij_post = intval(PConfig::get(local_user(), 'ijpost', 'post'));
$ij_enable = (($ij_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(PConfig::get(local_user(),'ijpost','post_by_default'))) if ($b['api_source'] && intval(PConfig::get(local_user(), 'ijpost', 'post_by_default'))) {
$ij_enable = 1; $ij_enable = 1;
}
if(! $ij_enable) if (!$ij_enable) {
return; return;
}
if(strlen($b['postopts'])) if (strlen($b['postopts'])) {
$b['postopts'] .= ','; $b['postopts'] .= ',';
}
$b['postopts'] .= 'ijpost'; $b['postopts'] .= 'ijpost';
} }
function ijpost_send(&$a, &$b)
{
if ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) {
function ijpost_send(&$a,&$b) {
if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited']))
return; return;
}
if(! strstr($b['postopts'],'ijpost')) if (!strstr($b['postopts'], 'ijpost')) {
return; return;
}
if($b['parent'] != $b['id']) if ($b['parent'] != $b['id']) {
return; return;
}
// insanejournal post in the LJ user's timezone. // insanejournal post in the LJ user's timezone.
// Hopefully the person's Friendica account // Hopefully the person's Friendica account
@ -170,14 +172,16 @@ function ijpost_send(&$a,&$b) {
$x = q("select timezone from user where uid = %d limit 1", $x = q("select timezone from user where uid = %d limit 1",
intval($b['uid']) intval($b['uid'])
); );
if($x && strlen($x[0]['timezone']))
$tz = $x[0]['timezone'];
$ij_username = PConfig::get($b['uid'],'ijpost','ij_username'); if ($x && strlen($x[0]['timezone'])) {
$ij_password = PConfig::get($b['uid'],'ijpost','ij_password'); $tz = $x[0]['timezone'];
}
$ij_username = PConfig::get($b['uid'], 'ijpost', 'ij_username');
$ij_password = PConfig::get($b['uid'], 'ijpost', 'ij_password');
$ij_blog = 'http://www.insanejournal.com/interface/xmlrpc'; $ij_blog = 'http://www.insanejournal.com/interface/xmlrpc';
if($ij_username && $ij_password && $ij_blog) { if ($ij_username && $ij_password && $ij_blog) {
$title = $b['title']; $title = $b['title'];
$post = BBCode::convert($b['body']); $post = BBCode::convert($b['body']);
$post = xmlify($post); $post = xmlify($post);
@ -219,17 +223,16 @@ EOT;
logger('ijpost: data: ' . $xml, LOGGER_DATA); logger('ijpost: data: ' . $xml, LOGGER_DATA);
if($ij_blog !== 'test') { if ($ij_blog !== 'test') {
$x = Network::post($ij_blog, $xml, ["Content-Type: text/xml"]); $x = Network::post($ij_blog, $xml, ["Content-Type: text/xml"]);
} }
logger('posted to insanejournal: ' . ($x) ? $x : '', LOGGER_DEBUG); logger('posted to insanejournal: ' . $x ? $x : '', LOGGER_DEBUG);
} }
} }
function ijpost_get_tags($post) function ijpost_get_tags($post)
{ {
preg_match_all("/\]([^\[#]+)\[/",$post,$matches); preg_match_all("/\]([^\[#]+)\[/", $post, $matches);
$tags = implode(', ',$matches[1]); $tags = implode(', ', $matches[1]);
return $tags; return $tags;
} }