X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=wppost%2Fwppost.php;h=8436fd3ae22141ef1d93a26036a225d6e06fe01d;hb=2ca92ed594ba3909fdcc063b2b63e27620841336;hp=216c6417c171fed939616d7c4e3281c100584b6e;hpb=dbaf0fd251979156c8efc29346647cf2fef28dae;p=friendica-addons.git

diff --git a/wppost/wppost.php b/wppost/wppost.php
index 216c6417..8436fd3a 100755
--- 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 . '/>';
@@ -97,6 +102,7 @@ function wppost_settings(&$a,&$s) {
     $s .= '<div id="wppost-bydefault-wrapper">';
     $s .= '<label id="wppost-bydefault-label" for="wppost-bydefault">' . t('Post to WordPress by default') . '</label>';
     $s .= '<input id="wppost-bydefault" type="checkbox" name="wp_bydefault" value="1" ' . $def_checked . '/>';
+    $s .= '</div><div class="clear"></div>';
 
     $s .= '<div id="wppost-backlink-wrapper">';
     $s .= '<label id="wppost-backlink-label" for="wppost-backlink">' . t('Provide a backlink to the Friendica post') . '</label>';
@@ -106,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>';
 
 }
 
@@ -178,29 +184,43 @@ function wppost_send(&$a,&$b) {
 		require_once('include/bbcode.php');
 		require_once('include/html2plain.php');
 
+		$wptitle = trim($b['title']);
+
 		// If the title is empty then try to guess
-		if ($b['title'] == '') {
+		if ($wptitle == '') {
 			// Take the description from the bookmark
 			if(preg_match("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/is",$b['body'],$matches))
-				$b['title'] = $matches[2];
+				$wptitle = $matches[2];
 
 			// If no bookmark is found then take the first line
-			if ($b['title'] == '') {
-				$title = html2plain(bbcode($b['body']), 0, true);
+			if ($wptitle == '') {
+				// 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 = "...";
+				}
 
-				$b['title'] = substr($title, 0, $pos);
+				$wptitle = substr($title, 0, $pos).$trailer;
 			}
 		}
 
-		$title = '<title>' . (($b['title']) ? $b['title'] : t('Post from Friendica')) . '</title>';
-		$post = $title . bbcode($b['body']);
+		$title = '<title>' . (($wptitle) ? $wptitle : t('Post from Friendica')) . '</title>';
+		$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);