X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=ijpost%2Fijpost.php;h=3e57610a3f9454eb1016ee4410bc20c1d69a0a7b;hb=23fe74a97f92f528a153ed24e89906b602ddcabd;hp=a166e319d877c871acb301b9e1335aa0389a6684;hpb=f26c87aaeaf4f6e11034729f6e642104a107cfb9;p=friendica-addons.git

diff --git a/ijpost/ijpost.php b/ijpost/ijpost.php
index a166e319..3e57610a 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
@@ -36,7 +36,7 @@ function ijpost_jot_nets(&$a,&$b) {
         $ij_defpost = get_pconfig(local_user(),'ijpost','post_by_default');
         $selected = ((intval($ij_defpost) == 1) ? ' checked="checked" ' : '');
         $b .= '<div class="profile-jot-net"><input type="checkbox" name="ijpost_enable" ' . $selected . ' value="1" /> '
-            . t('Post to insanejournal') . '</div>';
+            . t('Post to Insanejournal') . '</div>';
     }
 }
 
@@ -65,32 +65,37 @@ function ijpost_settings(&$a,&$s) {
 
 
     /* Add some HTML to the existing form */
+    $s .= '<span id="settings_ijpost_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_ijpost_expanded\'); openClose(\'settings_ijpost_inflated\');">';
+    $s .= '<img class="connector" src="images/insanejournal.gif" /><h3 class="connector">'. t("InsaneJournal Export").'</h3>';
+    $s .= '</span>';
+    $s .= '<div id="settings_ijpost_expanded" class="settings-block" style="display: none;">';
+    $s .= '<span class="fakelink" onclick="openClose(\'settings_ijpost_expanded\'); openClose(\'settings_ijpost_inflated\');">';
+    $s .= '<img class="connector" src="images/insanejournal.gif" /><h3 class="connector">'. t("InsaneJournal Export").'</h3>';
+    $s .= '</span>';
 
-    $s .= '<div class="settings-block">';
-    $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 .= '<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 . '/>';
     $s .= '</div><div class="clear"></div>';
 
     $s .= '<div id="ijpost-username-wrapper">';
-    $s .= '<label id="ijpost-username-label" for="ijpost-username">' . t('insanejournal username') . '</label>';
+    $s .= '<label id="ijpost-username-label" for="ijpost-username">' . t('InsaneJournal username') . '</label>';
     $s .= '<input id="ijpost-username" type="text" name="ij_username" value="' . $ij_username . '" />';
     $s .= '</div><div class="clear"></div>';
 
     $s .= '<div id="ijpost-password-wrapper">';
-    $s .= '<label id="ijpost-password-label" for="ijpost-password">' . t('insanejournal password') . '</label>';
+    $s .= '<label id="ijpost-password-label" for="ijpost-password">' . t('InsaneJournal password') . '</label>';
     $s .= '<input id="ijpost-password" type="password" name="ij_password" value="' . $ij_password . '" />';
     $s .= '</div><div class="clear"></div>';
 
     $s .= '<div id="ijpost-bydefault-wrapper">';
-    $s .= '<label id="ijpost-bydefault-label" for="ijpost-bydefault">' . t('Post to insanejournal by default') . '</label>';
+    $s .= '<label id="ijpost-bydefault-label" for="ijpost-bydefault">' . t('Post to InsaneJournal by default') . '</label>';
     $s .= '<input id="ijpost-bydefault" type="checkbox" name="ij_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="ijpost-submit" name="ijpost-submit" class="settings-submit" value="' . t('Submit') . '" /></div></div>';
+    $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="ijpost-submit" name="ijpost-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div></div>';
 
 }
 
@@ -162,20 +167,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 +190,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;
@@ -230,7 +218,7 @@ EOT;
 		logger('ijpost: data: ' . $xml, LOGGER_DATA);
 
 		if($ij_blog !== 'test')
-			$x = post_url($ij_blog,$xml);
+			$x = post_url($ij_blog,$xml,array("Content-Type: text/xml"));
 		logger('posted to insanejournal: ' . ($x) ? $x : '', LOGGER_DEBUG);
 
 	}