<?php
-
/**
* Name: LiveJournal Post Connector
* Description: Post to LiveJournal
* Version: 1.0
* Author: Tony Baldwin <https://free-haven.org/profile/tony>
* Author: Michael Johnston
+ * Author: Cat Gray <https://free-haven.org/profile/catness>
*/
+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 ljpost_install() {
- register_hook('post_local', 'addon/ljpost/ljpost.php', 'ljpost_post_local');
- register_hook('notifier_normal', 'addon/ljpost/ljpost.php', 'ljpost_send');
- register_hook('jot_networks', 'addon/ljpost/ljpost.php', 'ljpost_jot_nets');
- register_hook('connector_settings', 'addon/ljpost/ljpost.php', 'ljpost_settings');
- register_hook('connector_settings_post', 'addon/ljpost/ljpost.php', 'ljpost_settings_post');
+ Addon::registerHook('post_local', 'addon/ljpost/ljpost.php', 'ljpost_post_local');
+ Addon::registerHook('notifier_normal', 'addon/ljpost/ljpost.php', 'ljpost_send');
+ Addon::registerHook('jot_networks', 'addon/ljpost/ljpost.php', 'ljpost_jot_nets');
+ Addon::registerHook('connector_settings', 'addon/ljpost/ljpost.php', 'ljpost_settings');
+ Addon::registerHook('connector_settings_post', 'addon/ljpost/ljpost.php', 'ljpost_settings_post');
}
function ljpost_uninstall() {
- unregister_hook('post_local', 'addon/ljpost/ljpost.php', 'ljpost_post_local');
- unregister_hook('notifier_normal', 'addon/ljpost/ljpost.php', 'ljpost_send');
- unregister_hook('jot_networks', 'addon/ljpost/ljpost.php', 'ljpost_jot_nets');
- unregister_hook('connector_settings', 'addon/ljpost/ljpost.php', 'ljpost_settings');
- unregister_hook('connector_settings_post', 'addon/ljpost/ljpost.php', 'ljpost_settings_post');
+ Addon::unregisterHook('post_local', 'addon/ljpost/ljpost.php', 'ljpost_post_local');
+ Addon::unregisterHook('notifier_normal', 'addon/ljpost/ljpost.php', 'ljpost_send');
+ Addon::unregisterHook('jot_networks', 'addon/ljpost/ljpost.php', 'ljpost_jot_nets');
+ Addon::unregisterHook('connector_settings', 'addon/ljpost/ljpost.php', 'ljpost_settings');
+ Addon::unregisterHook('connector_settings_post', 'addon/ljpost/ljpost.php', 'ljpost_settings_post');
}
if(! local_user())
return;
- $lj_post = get_pconfig(local_user(),'ljpost','post');
+ $lj_post = PConfig::get(local_user(),'ljpost','post');
if(intval($lj_post) == 1) {
- $lj_defpost = get_pconfig(local_user(),'ljpost','post_by_default');
+ $lj_defpost = PConfig::get(local_user(),'ljpost','post_by_default');
$selected = ((intval($lj_defpost) == 1) ? ' checked="checked" ' : '');
$b .= '<div class="profile-jot-net"><input type="checkbox" name="ljpost_enable" ' . $selected . ' value="1" /> '
- . t('Post to LiveJournal') . '</div>';
+ . L10n::t('Post to LiveJournal') . '</div>';
}
}
/* Get the current state of our config variables */
- $enabled = get_pconfig(local_user(),'ljpost','post');
+ $enabled = PConfig::get(local_user(),'ljpost','post');
$checked = (($enabled) ? ' checked="checked" ' : '');
- $def_enabled = get_pconfig(local_user(),'ljpost','post_by_default');
+ $def_enabled = PConfig::get(local_user(),'ljpost','post_by_default');
$def_checked = (($def_enabled) ? ' checked="checked" ' : '');
- $lj_username = get_pconfig(local_user(), 'ljpost', 'lj_username');
- $lj_password = get_pconfig(local_user(), 'ljpost', 'lj_password');
+ $lj_username = PConfig::get(local_user(), 'ljpost', 'lj_username');
+ $lj_password = PConfig::get(local_user(), 'ljpost', 'lj_password');
/* Add some HTML to the existing form */
$s .= '<div class="settings-block">';
- $s .= '<h3>' . t('LiveJournal Post Settings') . '</h3>';
+ $s .= '<h3>' . L10n::t('LiveJournal Post Settings') . '</h3>';
$s .= '<div id="ljpost-enable-wrapper">';
- $s .= '<label id="ljpost-enable-label" for="ljpost-checkbox">' . t('Enable LiveJournal Post Plugin') . '</label>';
+ $s .= '<label id="ljpost-enable-label" for="ljpost-checkbox">' . L10n::t('Enable LiveJournal Post Addon') . '</label>';
$s .= '<input id="ljpost-checkbox" type="checkbox" name="ljpost" value="1" ' . $checked . '/>';
$s .= '</div><div class="clear"></div>';
$s .= '<div id="ljpost-username-wrapper">';
- $s .= '<label id="ljpost-username-label" for="ljpost-username">' . t('LiveJournal username') . '</label>';
+ $s .= '<label id="ljpost-username-label" for="ljpost-username">' . L10n::t('LiveJournal username') . '</label>';
$s .= '<input id="ljpost-username" type="text" name="lj_username" value="' . $lj_username . '" />';
$s .= '</div><div class="clear"></div>';
$s .= '<div id="ljpost-password-wrapper">';
- $s .= '<label id="ljpost-password-label" for="ljpost-password">' . t('LiveJournal password') . '</label>';
+ $s .= '<label id="ljpost-password-label" for="ljpost-password">' . L10n::t('LiveJournal password') . '</label>';
$s .= '<input id="ljpost-password" type="password" name="lj_password" value="' . $lj_password . '" />';
$s .= '</div><div class="clear"></div>';
$s .= '<div id="ljpost-bydefault-wrapper">';
- $s .= '<label id="ljpost-bydefault-label" for="ljpost-bydefault">' . t('Post to LiveJournal by default') . '</label>';
+ $s .= '<label id="ljpost-bydefault-label" for="ljpost-bydefault">' . L10n::t('Post to LiveJournal by default') . '</label>';
$s .= '<input id="ljpost-bydefault" type="checkbox" name="lj_bydefault" value="1" ' . $def_checked . '/>';
$s .= '</div><div class="clear"></div>';
/* provide a submit button */
- $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="ljpost-submit" name="ljpost-submit" class="settings-submit" value="' . t('Submit') . '" /></div></div>';
+ $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="ljpost-submit" name="ljpost-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div></div>';
}
if(x($_POST,'ljpost-submit')) {
- set_pconfig(local_user(),'ljpost','post',intval($_POST['ljpost']));
- set_pconfig(local_user(),'ljpost','post_by_default',intval($_POST['lj_bydefault']));
- set_pconfig(local_user(),'ljpost','lj_username',trim($_POST['lj_username']));
- set_pconfig(local_user(),'ljpost','lj_password',trim($_POST['lj_password']));
+ PConfig::set(local_user(),'ljpost','post',intval($_POST['ljpost']));
+ PConfig::set(local_user(),'ljpost','post_by_default',intval($_POST['lj_bydefault']));
+ PConfig::set(local_user(),'ljpost','lj_username',trim($_POST['lj_username']));
+ PConfig::set(local_user(),'ljpost','lj_password',trim($_POST['lj_password']));
}
if($b['private'] || $b['parent'])
return;
- $lj_post = intval(get_pconfig(local_user(),'ljpost','post'));
+ $lj_post = intval(PConfig::get(local_user(),'ljpost','post'));
$lj_enable = (($lj_post && x($_REQUEST,'ljpost_enable')) ? intval($_REQUEST['ljpost_enable']) : 0);
- if($_REQUEST['api_source'] && intval(get_pconfig(local_user(),'ljpost','post_by_default')))
+ if($_REQUEST['api_source'] && intval(PConfig::get(local_user(),'ljpost','post_by_default')))
$lj_enable = 1;
if(! $lj_enable)
if($b['parent'] != $b['id'])
return;
- // LiveJournal post in the LJ user's timezone.
+ // LiveJournal post in the LJ user's timezone.
// Hopefully the person's Friendica account
// will be set to the same thing.
intval($b['uid'])
);
if($x && strlen($x[0]['timezone']))
- $tz = $x[0]['timezone'];
+ $tz = $x[0]['timezone'];
- $lj_username = get_pconfig($b['uid'],'ljpost','lj_username');
- $lj_password = get_pconfig($b['uid'],'ljpost','lj_password');
- $lj_blog = 'http://www.livejournal.com/interface/xmlrpc';
-
- if($lj_username && $lj_password && $lj_blog) {
+ $lj_username = xmlify(PConfig::get($b['uid'],'ljpost','lj_username'));
+ $lj_password = xmlify(PConfig::get($b['uid'],'ljpost','lj_password'));
+ $lj_journal = xmlify(PConfig::get($b['uid'],'ljpost','lj_journal'));
+// if(! $lj_journal)
+// $lj_journal = $lj_username;
- require_once('include/bbcode.php');
- require_once('include/datetime.php');
+ $lj_blog = xmlify(PConfig::get($b['uid'],'ljpost','lj_blog'));
+ if(! strlen($lj_blog))
+ $lj_blog = xmlify('http://www.livejournal.com/interface/xmlrpc');
- $title = $b['title'];
- $post = bbcode($b['body']);
+ if($lj_username && $lj_password && $lj_blog) {
+ $title = xmlify($b['title']);
+ $post = BBCode::convert($b['body']);
$post = xmlify($post);
+ $tags = ljpost_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));
$xml = <<< EOT
<?xml version="1.0" encoding="utf-8"?>
-<methodCall><methodName>LJ.XMLRPC.postevent</methodName>
-<params><param>
-<value><struct>
-<member><name>year</name><value><int>$year</int></value></member>
-<member><name>mon</name><value><int>$mon</int></value></member>
-<member><name>day</name><value><int>$day</int></value></member>
-<member><name>hour</name><value><int>$hour</int></value></member>
-<member><name>min</name><value><int>$min</int></value></member>
-<member><name>usejournal</name><value><string>$lj_username</string></value></member>
-<member><name>event</name><value><string>$post</string></value></member>
-<member><name>username</name><value><string>$lj_username</string></value></member>
-<member><name>password</name><value><string>$lj_password</string></value></member>
-<member><name>subject</name><value><string>$title</string></value></member>
-<member><name>lineendings</name><value><string>unix</string></value></member>
-<member><name>ver</name><value><int>1</int></value></member>
-<member><name>props</name>
-<value><struct>
-<member><name>useragent</name><value><string>Friendica</string></value></member>
-<member><name>taglist</name><value><string>friendica</string></value></member>
-</struct></value></member>
-</struct></value>
-</param></params>
+<methodCall>
+ <methodName>LJ.XMLRPC.postevent</methodName>
+ <params>
+ <param><value>
+ <struct>
+ <member><name>username</name><value><string>$lj_username</string></value></member>
+ <member><name>password</name><value><string>$lj_password</string></value></member>
+ <member><name>event</name><value><string>$post</string></value></member>
+ <member><name>subject</name><value><string>$title</string></value></member>
+ <member><name>lineendings</name><value><string>unix</string></value></member>
+ <member><name>year</name><value><int>$year</int></value></member>
+ <member><name>mon</name><value><int>$mon</int></value></member>
+ <member><name>day</name><value><int>$day</int></value></member>
+ <member><name>hour</name><value><int>$hour</int></value></member>
+ <member><name>min</name><value><int>$min</int></value></member>
+ <member><name>usejournal</name><value><string>$lj_username</string></value></member>
+ <member>
+ <name>props</name>
+ <value>
+ <struct>
+ <member>
+ <name>useragent</name>
+ <value><string>Friendica</string></value>
+ </member>
+ <member>
+ <name>taglist</name>
+ <value><string>$tags</string></value>
+ </member>
+ </struct>
+ </value>
+ </member>
+ </struct>
+ </value></param>
+ </params>
</methodCall>
EOT;
logger('ljpost: data: ' . $xml, LOGGER_DATA);
- if($lj_blog !== 'test')
- $x = post_url($lj_blog,$xml);
+ if ($lj_blog !== 'test') {
+ $x = Network::post($lj_blog, $xml, ["Content-Type: text/xml"]);
+ }
logger('posted to livejournal: ' . ($x) ? $x : '', LOGGER_DEBUG);
-
}
}
+function ljpost_get_tags($post)
+{
+ preg_match_all("/\]([^\[#]+)\[/",$post,$matches);
+ $tags = implode(', ',$matches[1]);
+ return $tags;
+}
projects / friendica-addons.git / blobdiff