From: Tony Baldwin <tony@baldwinsoftware.com>
Date: Sat, 17 Mar 2012 22:34:25 +0000 (-0400)
Subject: corrections, minor alterations
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=3d38180d8f61c9922f4bbdbda0ac5010463a0b0e;p=friendica-addons.git

corrections, minor alterations
---

diff --git a/dwpost/dwpost.php b/dwpost/dwpost.php
index 1717be11..85e808c0 100644
--- a/dwpost/dwpost.php
+++ b/dwpost/dwpost.php
@@ -150,7 +150,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.
 
@@ -166,10 +166,6 @@ function dwpost_send(&$a,&$b) {
 	$dw_password = get_pconfig($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 +185,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;
diff --git a/ijpost.tar.gz b/ijpost.tar.gz
index 635eee21..2903c317 100644
Binary files a/ijpost.tar.gz and b/ijpost.tar.gz differ
diff --git a/ijpost/ijpost.php b/ijpost/ijpost.php
index a166e319..00bc375e 100644
--- a/ijpost/ijpost.php
+++ b/ijpost/ijpost.php
@@ -2,7 +2,7 @@
 
 /**
  * Name: Insanejournal Post Connector
- * Description: Post to insanejournal
+ * Description: Post to Insanejournal
  * Version: 1.0
  * Author: Tony Baldwin <https://free-haven.org/profile/tony>
  * Author: Michael Johnston
@@ -67,7 +67,7 @@ function ijpost_settings(&$a,&$s) {
     /* Add some HTML to the existing form */
 
     $s .= '<div class="settings-block">';
-    $s .= '<h3>' . t('insanejournal Post Settings') . '</h3>';
+    $s .= '<h3>' . t('Insanejournal Post Settings') . '</h3>';
     $s .= '<div id="ijpost-enable-wrapper">';
     $s .= '<label id="ijpost-enable-label" for="ijpost-checkbox">' . t('Enable insanejournal Post Plugin') . '</label>';
     $s .= '<input id="ijpost-checkbox" type="checkbox" name="ijpost" value="1" ' . $checked . '/>';
@@ -150,7 +150,7 @@ function ijpost_send(&$a,&$b) {
     if($b['parent'] != $b['id'])
         return;
 
-	// insanejournal post in the LJ user's timezone. 
+	// insanejournal post in the IJ user's timezone. 
 	// Hopefully the person's Friendica account
 	// will be set to the same thing.
 
@@ -162,20 +162,16 @@ function ijpost_send(&$a,&$b) {
 	if($x && strlen($x[0]['timezone']))
 		$tz = $x[0]['timezone'];	
 
-	$ij_username = xmlify(get_pconfig($b['uid'],'ijpost','ij_username'));
-	$ij_password = xmlify(get_pconfig($b['uid'],'ijpost','ij_password'));
-	$ij_journal = xmlify(get_pconfig($b['uid'],'ijpost','ij_journal'));
-
-	$ij_blog = xmlify(get_pconfig($b['uid'],'ijpost','ij_blog'));
-	if(! strlen($ij_blog))
-		$ij_blog = xmlify('http://www.insanejournal.com/interface/xmlrpc');
+	$ij_username = get_pconfig($b['uid'],'ijpost','ij_username');
+	$ij_password = get_pconfig($b['uid'],'ijpost','ij_password');
+	$ij_blog = 'http://www.insanejournal.com/interface/xmlrpc';
 
 	if($ij_username && $ij_password && $ij_blog) {
 
 		require_once('include/bbcode.php');
 		require_once('include/datetime.php');
 
-		$title = xmlify($b['title']);
+		$title = $b['title'];
 		$post = bbcode($b['body']);
 		$post = xmlify($post);
 		$tags = ijpost_get_tags($b['tag']);
@@ -189,40 +185,27 @@ function ijpost_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>$ij_username</string></value></member>
-        <member><name>password</name><value><string>$ij_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>$ij_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>$ij_username</string></value></member>
+<member><name>password</name><value><string>$ij_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;
diff --git a/ljpost/ljpost.php b/ljpost/ljpost.php
index 717b77c1..ddcd2890 100755
--- a/ljpost/ljpost.php
+++ b/ljpost/ljpost.php
@@ -165,6 +165,8 @@ function ljpost_send(&$a,&$b) {
 	$lj_username = xmlify(get_pconfig($b['uid'],'ljpost','lj_username'));
 	$lj_password = xmlify(get_pconfig($b['uid'],'ljpost','lj_password'));
 	$lj_journal = xmlify(get_pconfig($b['uid'],'ljpost','lj_journal'));
+//	if(! $lj_journal)
+//		$lj_journal = $lj_username;
 
 	$lj_blog = xmlify(get_pconfig($b['uid'],'ljpost','lj_blog'));
 	if(! strlen($lj_blog))