Merge pull request #187 from annando/master

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

diff --git a/wppost/wppost.php b/wppost/wppost.php
index e8b6fc6d5236235690b0a0ca0b9f6f16a5a13eb8..8436fd3ae22141ef1d93a26036a225d6e06fe01d 100755 (executable)
--- a/wppost/wppost.php
+++ b/wppost/wppost.php
@@ -72,8 +72,13 @@ function wppost_settings(&$a,&$s) {
 
     /* Add some HTML to the existing form */
 
-    $s .= '<div class="settings-block">';
-    $s .= '<h3>' . t('WordPress Post Settings') . '</h3>';
+    $s .= '<span id="settings_wppost_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_wppost_expanded\'); openClose(\'settings_wppost_inflated\');">';
+    $s .= '<img class="connector" src="images/wordpress.png" /><h3 class="connector">'. t('Wordpress Export').'</h3>';
+    $s .= '</span>';
+    $s .= '<div id="settings_wppost_expanded" class="settings-block" style="display: none;">';
+    $s .= '<span class="fakelink" onclick="openClose(\'settings_wppost_expanded\'); openClose(\'settings_wppost_inflated\');">';
+    $s .= '<img class="connector" src="images/wordpress.png" /><h3 class="connector">'. t('Wordpress Export').'</h3>';
+    $s .= '</span>';
     $s .= '<div id="wppost-enable-wrapper">';
     $s .= '<label id="wppost-enable-label" for="wppost-checkbox">' . t('Enable WordPress Post Plugin') . '</label>';
     $s .= '<input id="wppost-checkbox" type="checkbox" name="wppost" value="1" ' . $checked . '/>';
@@ -107,7 +112,7 @@ function wppost_settings(&$a,&$s) {
 
     /* provide a submit button */
 
-    $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="wppost-submit" name="wppost-submit" class="settings-submit" value="' . t('Submit') . '" /></div></div>';
+    $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="wppost-submit" name="wppost-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div></div>';
 
 }
 
@@ -189,21 +194,33 @@ function wppost_send(&$a,&$b) {
 
                        // If no bookmark is found then take the first line
                        if ($wptitle == '') {
-                               $title = html2plain(bbcode($b['body']), 0, true);
+                               // Remove the share element before fetching the first line
+                               $title = trim(preg_replace("/\[share.*?\](.*?)\[\/share\]/ism","\n$1\n",$b['body']));
+
+                               $title = html2plain(bbcode($title, false, false), 0, true)."\n";
                                $pos = strpos($title, "\n");
-                               if (($pos == 0) or ($pos > 60))
-                                       $pos = 60;
+                               $trailer = "";
+                               if (($pos == 0) or ($pos > 100)) {
+                                       $pos = 100;
+                                       $trailer = "...";
+                               }
 
-                               $wptitle = substr($title, 0, $pos);
+                               $wptitle = substr($title, 0, $pos).$trailer;
                        }
                }
 
                $title = '<title>' . (($wptitle) ? $wptitle : t('Post from Friendica')) . '</title>';
-               $post = $title . bbcode($b['body']);
+               $post = bbcode($b['body'], false, false, 4);
+
+               // If a link goes to youtube then remove the stuff around it. Wordpress detects youtube links and embeds it
+               $post = preg_replace('/<a.*?href="(https?:\/\/www.youtube.com\/.*?)".*?>(.*?)<\/a>/ism',"\n$1\n",$post);
+               $post = preg_replace('/<a.*?href="(https?:\/\/youtu.be\/.*?)".*?>(.*?)<\/a>/ism',"\n$1\n",$post);
+
+               $post = $title.$post;
 
                $wp_backlink = intval(get_pconfig($b['uid'],'wppost','backlink'));
                if($wp_backlink && $b['plink'])
-                       $post .= EOL . EOL . '<a href="' . $b['plink'] . '">' 
+                       $post .= EOL . EOL . '<a href="' . $b['plink'] . '">'
                                . t('Read the original post and comment stream on Friendica') . '</a>' . EOL . EOL;
 
                $post = xmlify($post);