* Name: Dreamwidth Post Connector
* Description: Post to dreamwidth
* Version: 1.0
- * Author: Tony Baldwin <http://tonybaldwin.me/friendica/profile/tony>
+ * Author: Tony Baldwin <https://free-haven.org/profile/tony>
* Author: Michael Johnston
+ * Author: Cat Gray <https://free-haven.org/profile/catness>
*/
+use Friendica\Core\PConfig;
+
function dwpost_install() {
register_hook('post_local', 'addon/dwpost/dwpost.php', 'dwpost_post_local');
register_hook('notifier_normal', 'addon/dwpost/dwpost.php', 'dwpost_send');
if(! local_user())
return;
- $dw_post = get_pconfig(local_user(),'dwpost','post');
+ $dw_post = PConfig::get(local_user(),'dwpost','post');
if(intval($dw_post) == 1) {
- $dw_defpost = get_pconfig(local_user(),'dwpost','post_by_default');
+ $dw_defpost = PConfig::get(local_user(),'dwpost','post_by_default');
$selected = ((intval($dw_defpost) == 1) ? ' checked="checked" ' : '');
$b .= '<div class="profile-jot-net"><input type="checkbox" name="dwpost_enable" ' . $selected . ' value="1" /> '
. t('Post to Dreamwidth') . '</div>';
/* Get the current state of our config variables */
- $enabled = get_pconfig(local_user(),'dwpost','post');
+ $enabled = PConfig::get(local_user(),'dwpost','post');
$checked = (($enabled) ? ' checked="checked" ' : '');
- $def_enabled = get_pconfig(local_user(),'dwpost','post_by_default');
+ $def_enabled = PConfig::get(local_user(),'dwpost','post_by_default');
$def_checked = (($def_enabled) ? ' checked="checked" ' : '');
- $dw_username = get_pconfig(local_user(), 'dwpost', 'dw_username');
- $dw_password = get_pconfig(local_user(), 'dwpost', 'dw_password');
+ $dw_username = PConfig::get(local_user(), 'dwpost', 'dw_username');
+ $dw_password = PConfig::get(local_user(), 'dwpost', 'dw_password');
/* Add some HTML to the existing form */
- $s .= '<div class="settings-block">';
- $s .= '<h3>' . t('Dreamwidth Post Settings') . '</h3>';
+ $s .= '<span id="settings_dwpost_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_dwpost_expanded\'); openClose(\'settings_dwpost_inflated\');">';
+ $s .= '<img class="connector" src="images/dreamwidth.png" /><h3 class="connector">'. t("Dreamwidth Export").'</h3>';
+ $s .= '</span>';
+ $s .= '<div id="settings_dwpost_expanded" class="settings-block" style="display: none;">';
+ $s .= '<span class="fakelink" onclick="openClose(\'settings_dwpost_expanded\'); openClose(\'settings_dwpost_inflated\');">';
+ $s .= '<img class="connector" src="images/dreamwidth.png" /><h3 class="connector">'. t("Dreamwidth Export").'</h3>';
+ $s .= '</span>';
+
$s .= '<div id="dwpost-enable-wrapper">';
$s .= '<label id="dwpost-enable-label" for="dwpost-checkbox">' . t('Enable dreamwidth Post Plugin') . '</label>';
$s .= '<input id="dwpost-checkbox" type="checkbox" name="dwpost" value="1" ' . $checked . '/>';
/* provide a submit button */
- $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="dwpost-submit" name="dwpost-submit" class="settings-submit" value="' . t('Submit') . '" /></div></div>';
+ $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="dwpost-submit" name="dwpost-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div></div>';
}
if(x($_POST,'dwpost-submit')) {
- set_pconfig(local_user(),'dwpost','post',intval($_POST['dwpost']));
- set_pconfig(local_user(),'dwpost','post_by_default',intval($_POST['dw_bydefault']));
- set_pconfig(local_user(),'dwpost','dw_username',trim($_POST['dw_username']));
- set_pconfig(local_user(),'dwpost','dw_password',trim($_POST['dw_password']));
+ PConfig::set(local_user(),'dwpost','post',intval($_POST['dwpost']));
+ PConfig::set(local_user(),'dwpost','post_by_default',intval($_POST['dw_bydefault']));
+ PConfig::set(local_user(),'dwpost','dw_username',trim($_POST['dw_username']));
+ PConfig::set(local_user(),'dwpost','dw_password',trim($_POST['dw_password']));
}
if($b['private'] || $b['parent'])
return;
- $dw_post = intval(get_pconfig(local_user(),'dwpost','post'));
+ $dw_post = intval(PConfig::get(local_user(),'dwpost','post'));
$dw_enable = (($dw_post && x($_REQUEST,'dwpost_enable')) ? intval($_REQUEST['dwpost_enable']) : 0);
- if($_REQUEST['api_source'] && intval(get_pconfig(local_user(),'dwpost','post_by_default')))
+ if($_REQUEST['api_source'] && intval(PConfig::get(local_user(),'dwpost','post_by_default')))
$dw_enable = 1;
if(! $dw_enable)
if($x && strlen($x[0]['timezone']))
$tz = $x[0]['timezone'];
- $dw_username = get_pconfig($b['uid'],'dwpost','dw_username');
- $dw_password = get_pconfig($b['uid'],'dwpost','dw_password');
+ $dw_username = PConfig::get($b['uid'],'dwpost','dw_username');
+ $dw_password = PConfig::get($b['uid'],'dwpost','dw_password');
$dw_blog = 'http://www.dreamwidth.org/interface/xmlrpc';
if($dw_username && $dw_password && $dw_blog) {
$title = $b['title'];
$post = bbcode($b['body']);
$post = xmlify($post);
+ $tags = dwpost_get_tags($b['tag']);
$date = datetime_convert('UTC',$tz,$b['created'],'Y-m-d H:i:s');
$year = intval(substr($date,0,4));
<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>
+<member><name>taglist</name><value><string>$tags</string></value></member>
</struct></value></member>
</struct></value>
</param></params>
logger('dwpost: data: ' . $xml, LOGGER_DATA);
if($dw_blog !== 'test')
- $x = post_url($dw_blog,$xml);
+ $x = post_url($dw_blog,$xml,array("Content-Type: text/xml"));
logger('posted to dreamwidth: ' . ($x) ? $x : '', LOGGER_DEBUG);
}
}
+function dwpost_get_tags($post)
+{
+ preg_match_all("/\]([^\[#]+)\[/",$post,$matches);
+ $tags = implode(', ',$matches[1]);
+ return $tags;
+}