new plugin: profilehome

[friendica-addons.git] / ljpost / ljpost.php

diff --git a/ljpost/ljpost.php b/ljpost/ljpost.php
index 1ea8dfe55967d0e46dd3c002cbafd665612fd279..dc17e83fc8e7d667b71c1bad2a440ba8c2d03238 100755 (executable)
--- a/ljpost/ljpost.php
+++ b/ljpost/ljpost.php
@@ -4,8 +4,9 @@
  * Name: LiveJournal Post Connector
  * Description: Post to LiveJournal
  * Version: 1.0
- * Author: Tony Baldwin <http://theshi.re/profile/tony>
+ * Author: Tony Baldwin <https://free-haven.org/profile/tony>
  * Author: Michael Johnston
+ * Author: Cat Gray <https://free-haven.org/profile/catness>
  */
 
 function ljpost_install() {
@@ -161,18 +162,25 @@ function ljpost_send(&$a,&$b) {
        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 = 'http://www.livejournal.com/interface/xmlrpc';
+       $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))
+               $lj_blog = xmlify('http://www.livejournal.com/interface/xmlrpc');
 
        if($lj_username && $lj_password && $lj_blog) {
 
                require_once('include/bbcode.php');
                require_once('include/datetime.php');
 
-               $title = (($b['title']) ? $b['title'] : t('[no subject]'));
+               $title = xmlify($b['title']);
                $post = bbcode($b['body']);
                $post = xmlify($post);
+               $tags = ljpost_get_tags($b['tag']);
 
                $date = datetime_convert('UTC',$tz,$b['created'],'Y-m-d H:i:s');
                $year = intval(substr($date,0,4));
@@ -198,6 +206,22 @@ function ljpost_send(&$a,&$b) {
         <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>
@@ -208,9 +232,15 @@ EOT;
                logger('ljpost: data: ' . $xml, LOGGER_DATA);
 
                if($lj_blog !== 'test')
-                       $x = post_url($lj_blog,$xml);
+                       $x = post_url($lj_blog,$xml,array("Content-Type: text/xml"));
                logger('posted to livejournal: ' . ($x) ? $x : '', LOGGER_DEBUG);
 
        }
 }
 
+function ljpost_get_tags($post)
+{
+       preg_match_all("/\]([^\[#]+)\[/",$post,$matches);
+       $tags = implode(', ',$matches[1]);
+       return $tags;
+}