Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  rebuild tgz
  seems the subject isn't really required, contrary to the docs.
  inconsistent file extension
  some small improvements to ljpost
  descriptive text for qcomment settings
  ljpost typos

* master:
pull/43/head
Simon L'nu 2012-02-29 07:00:54 -05:00
commit f5a58f3d38
6 changed files with 91 additions and 90 deletions

Binary file not shown.

BIN
ljpost.tgz Normal file

Binary file not shown.

View File

@ -1,11 +1,11 @@
#ljpost-enable-label, #ljpost-username-label, #ljpost-password-label, #ljpost-blog-label, #ljpost-bydefault-label {
#ljpost-enable-label, #ljpost-username-label, #ljpost-password-label, #ljpost-bydefault-label {
float: left;
width: 200px;
margin-top: 10px;
}
#ljpost-checkbox, #ljpost-username, #ljpost-password, #ljpost-blog, #ljpost-bydefault {
#ljpost-checkbox, #ljpost-username, #ljpost-password, #ljpost-bydefault {
float: left;
margin-top: 10px;
}

88
ljpost/ljpost.php Normal file → Executable file
View File

@ -2,10 +2,10 @@
/**
* Name: LiveJournal Post Connector
* Description: Post to LiveJournal (or anything else which uses blogger XMLRPC API)
* Description: Post to LiveJournal
* Version: 1.0
* Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
* Author: Tony Baldwin <http://theshi.re/profile/tony>
* Author: Michael Johnston
*/
function ljpost_install() {
@ -26,18 +26,16 @@ function ljpost_uninstall() {
}
function ljpost_jot_nets(&$a,&$b) {
if(! local_user())
return;
$lj_post = get_pconfig(local_user(),'ljpost','post');
if(intval($lj_post) == 1) {
$wp_defpost = get_pconfig(local_user(),'ljpost','post_by_default');
$selected = ((intval($wp_defpost) == 1) ? ' checked="checked" ' : '');
$lj_defpost = get_pconfig(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>';
. t('Post to LiveJournal') . '</div>';
}
}
@ -63,7 +61,6 @@ function ljpost_settings(&$a,&$s) {
$lj_username = get_pconfig(local_user(), 'ljpost', 'lj_username');
$lj_password = get_pconfig(local_user(), 'ljpost', 'lj_password');
$lj_blog = get_pconfig(local_user(), 'ljpost', 'lj_blog');
/* Add some HTML to the existing form */
@ -85,14 +82,9 @@ $lj_blog = get_pconfig(local_user(), 'ljpost', 'lj_blog');
$s .= '<input id="ljpost-password" type="password" name="lj_password" value="' . $lj_password . '" />';
$s .= '</div><div class="clear"></div>';
$s .= '<div id="ljpost-blog-wrapper">';
$s .= '<label id="ljpost-blog-label" for="ljpost-blog">' . t('LiveJournal API URL') . '</label>';
$s .= '<input id="ljpost-blog" type="text" name="lj_blog" value="' . $lj_blog . '" />';
$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 .= '<input id="ljpost-bydefault" type="checkbox" name="wp_bydefault" value="1" ' . $def_checked . '/>';
$s .= '<input id="ljpost-bydefault" type="checkbox" name="lj_bydefault" value="1" ' . $def_checked . '/>';
$s .= '</div><div class="clear"></div>';
/* provide a submit button */
@ -110,7 +102,6 @@ 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']));
set_pconfig(local_user(),'ljpost','lj_blog',trim($_POST['lj_blog']));
}
@ -158,50 +149,58 @@ function ljpost_send(&$a,&$b) {
if($b['parent'] != $b['id'])
return;
// LiveJournal post in the LJ user's timezone.
// Hopefully the person's Friendica account
// will be set to the same thing.
$tz = 'UTC';
$x = q("select timezone from user where uid = %d limit 1",
intval($b['uid'])
);
if($x && strlen($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 = get_pconfig($b['uid'],'ljpost','lj_blog');
$lj_blog = 'http://www.livejournal.com/interface/xmlrpc';
if($lj_username && $lj_password && $lj_blog) {
require_once('include/bbcode.php');
require_once('include/datetime.php');
$title = '<title>' . (($b['title']) ? $b['title'] : t('Post from Friendica')) . '</title>';
$post = $title . bbcode($b['body']);
$title = $b['title'];
$post = bbcode($b['body']);
$post = xmlify($post);
$year = date('Y')
$month = date('F')
$day = date('l')
$hour = date('H')
$min = date('i')
$date = datetime_convert('UTC',$tz,$b['created'],'Y-m-d H:i:s');
$year = intval(substr($date,0,4));
$mon = intval(substr($date,5,2));
$day = intval(substr($date,8,2));
$hour = intval(substr($date,11,2));
$min = intval(substr($date,14,2));
$xml = <<< EOT
<?xml version=\"1.0\" encoding=\"iso-8859-1\"?>
<methodCall><methodName>LJ.XMLRPC.postevent</methodName>
<params><param>
<value><struct>
<?xml version="1.0" encoding="utf-8"?>
<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>$month</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_blog</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>friendica post</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,crosspost</string></value></member>
</struct></value></member>
</struct></value>
</param></params>
</struct>
</value></param>
</params>
</methodCall>
EOT;
@ -210,7 +209,8 @@ logger('ljpost: data: ' . $xml, LOGGER_DATA);
if($lj_blog !== 'test')
$x = post_url($lj_blog,$xml);
logger('posted to livejournal: ' . ($x) ? $x : '');
logger('posted to livejournal: ' . ($x) ? $x : '', LOGGER_DEBUG);
}
}

Binary file not shown.

View File

@ -53,6 +53,7 @@ function qcomment_addon_settings(&$a,&$s) {
$s .= '<div class="settings-block">';
$s .= '<h3>' . t('Quick Comment Settings') . '</h3>';
$s .= '<div id="qcomment-wrapper">';
$s .= '<div id="qcomment-desc">' . t("Quick comments are found near comment boxes, sometimes hidden. Click them to provide simple replies.") . '</div>';
$s .= '<label id="qcomment-label" for="qcomment-words">' . t('Enter quick comments, one per line') . ' </label>';
$s .= '<textarea id="qcomment-words" type="text" name="qcomment-words" >' . htmlspecialchars(unxmlify($words)) . '</textarea>';
$s .= '</div><div class="clear"></div>';