Merge pull request #384 from annando/1609-ignorelist-rendertime

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

diff --git a/ijpost/ijpost.php b/ijpost/ijpost.php
index 20d4f81d4f8defd70bad0f50e967bd2ac17352cf..3e57610a3f9454eb1016ee4410bc20c1d69a0a7b 100644 (file)
--- a/ijpost/ijpost.php
+++ b/ijpost/ijpost.php
@@ -1,10 +1,12 @@
 <?php
 
 /**
- * Name: InsaneJournal Post Connector
- * Description: Post to insanejournal  
+ * Name: Insanejournal Post Connector
+ * Description: Post to Insanejournal
  * 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 ijpost_install() {
@@ -34,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>';
     }
 }
 
@@ -63,21 +65,26 @@ 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 .= '<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>';
 
@@ -88,7 +95,7 @@ function ijpost_settings(&$a,&$s) {
 
     /* 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>';
 
 }
 
@@ -148,7 +155,7 @@ function ijpost_send(&$a,&$b) {
     if($b['parent'] != $b['id'])
         return;
 
-       // InsaneJournal post in the IJ user's timezone. 
+       // insanejournal post in the LJ user's timezone. 
        // Hopefully the person's Friendica account
        // will be set to the same thing.
 
@@ -172,6 +179,7 @@ function ijpost_send(&$a,&$b) {
                $title = $b['title'];
                $post = bbcode($b['body']);
                $post = xmlify($post);
+               $tags = ijpost_get_tags($b['tag']);
 
                $date = datetime_convert('UTC',$tz,$b['created'],'Y-m-d H:i:s');
                $year = intval(substr($date,0,4));
@@ -199,7 +207,7 @@ function ijpost_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>
@@ -210,9 +218,15 @@ 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);
 
        }
 }
 
+function ijpost_get_tags($post)
+{
+       preg_match_all("/\]([^\[#]+)\[/",$post,$matches);
+       $tags = implode(', ',$matches[1]);
+       return $tags;
+}