Merge remote-tracking branch 'friendica/master'

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

diff --git a/dwpost/dwpost.php b/dwpost/dwpost.php
index bb4557269a6f458a644466d8f6ae83565d7fc114..2391b5711cdbf41b8dac81f60cf45659514e8027 100644 (file)
--- a/dwpost/dwpost.php
+++ b/dwpost/dwpost.php
@@ -6,6 +6,7 @@
  * Version: 1.0
  * Author: Tony Baldwin <https://free-haven.org/profile/tony>
  * Author: Michael Johnston
+ * Author: Cat Gray <https://free-haven.org/profile/catness>
  */
 
 function dwpost_install() {
@@ -173,6 +174,7 @@ function dwpost_send(&$a,&$b) {
                $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));
@@ -200,7 +202,7 @@ function dwpost_send(&$a,&$b) {
 <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>
@@ -211,9 +213,15 @@ EOT;
                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;
+}