X-Git-Url: https://git.mxchange.org/?p=friendica-addons.git;a=blobdiff_plain;f=dwpost%2Fdwpost.php;h=b268d02ebce24604572c2e7a49bd042beba915ae;hp=1717be118c8a71fb7329e7d721694341ff0031ee;hb=27b60e003f92dd9f3aebbeddb34ebb905488ca82;hpb=f26c87aaeaf4f6e11034729f6e642104a107cfb9

diff --git a/dwpost/dwpost.php b/dwpost/dwpost.php
index 1717be11..b268d02e 100644
--- a/dwpost/dwpost.php
+++ b/dwpost/dwpost.php
@@ -9,6 +9,8 @@
  * 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');
@@ -31,9 +33,9 @@ function dwpost_jot_nets(&$a,&$b) {
     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>';
@@ -52,22 +54,28 @@ function dwpost_settings(&$a,&$s) {
 
     /* 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 . '/>';
@@ -90,7 +98,7 @@ function dwpost_settings(&$a,&$s) {
 
     /* 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>';
 
 }
 
@@ -99,10 +107,10 @@ function dwpost_settings_post(&$a,&$b) {
 
 	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']));
 
 	}
 
@@ -121,11 +129,11 @@ function dwpost_post_local(&$a,&$b) {
 	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)
@@ -150,7 +158,7 @@ function dwpost_send(&$a,&$b) {
     if($b['parent'] != $b['id'])
         return;
 
-	// dreamwidth post in the DW user's timezone. 
+	// dreamwidth post in the LJ user's timezone.
 	// Hopefully the person's Friendica account
 	// will be set to the same thing.
 
@@ -160,16 +168,12 @@ function dwpost_send(&$a,&$b) {
 		intval($b['uid'])
 	);
 	if($x && strlen($x[0]['timezone']))
-		$tz = $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';
 
-	$dw_blog = xmlify(get_pconfig($b['uid'],'dwpost','dw_blog'));
-	if(! strlen($dw_blog))
-		$dw_blog = xmlify('http://www.dreamwidth.org/interface/xmlrpc');
-
 	if($dw_username && $dw_password && $dw_blog) {
 
 		require_once('include/bbcode.php');
@@ -189,40 +193,27 @@ function dwpost_send(&$a,&$b) {
 
 		$xml = <<< EOT
 <?xml version="1.0" encoding="utf-8"?>
-<methodCall>
-  <methodName>LJ.XMLRPC.postevent</methodName>
-  <params>
-    <param><value>
-        <struct>
-        <member><name>username</name><value><string>$dw_username</string></value></member>
-        <member><name>password</name><value><string>$dw_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><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>event</name><value><string>$post</string></value></member>
+<member><name>username</name><value><string>$dw_username</string></value></member>
+<member><name>password</name><value><string>$dw_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>$tags</string></value></member>
+</struct></value></member>
+</struct></value>
+</param></params>
 </methodCall>
 
 EOT;
@@ -230,7 +221,7 @@ EOT;
 		logger('dwpost: data: ' . $xml, LOGGER_DATA);
 
 		if($dw_blog !== 'test')
-			$x = post_url($dw_blog,$xml);
+			$x = post_url($dw_blog,$xml,["Content-Type: text/xml"]);
 		logger('posted to dreamwidth: ' . ($x) ? $x : '', LOGGER_DEBUG);
 
 	}