X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fbb2diaspora.php;h=d5ce6a7d9616ad0e790136d388256d4ee584cbd7;hb=d4644d73392f335a3cc488fbd8935068a567edcf;hp=3d6408bcfe134b7e66603512c9b1872764fc48b6;hpb=deeae7bdb5dffcdb8f11a604d7ca3078cfadf754;p=friendica.git

diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index 3d6408bcfe..d5ce6a7d96 100644
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@@ -11,13 +11,49 @@ function diaspora2bb($s) {
 	$s = preg_replace('/\@\{(.+?)\; (.+?)\@(.+?)\}/','@[url=https://$3/u/$2]$1[/url]',$s);
 	$s = Markdown($s);
 	$s = html2bbcode($s);
+	$s = str_replace('*','*',$s);
+    $s = preg_replace("/\[url\=?(.*?)\]https?:\/\/www.youtube.com\/watch\?v\=(.*?)\[\/url\]/ism",'[youtube]$2[/youtube]',$s); 
+    $s = preg_replace("/\[url\=https?:\/\/www.youtube.com\/watch\?v\=(.*?)\].*?\[\/url\]/ism",'[youtube]$1[/youtube]',$s); 
+	$s = preg_replace("/\[url\=?(.*?)\]https?:\/\/vimeo.com\/([0-9]+)(.*?)\[\/url\]/ism",'[vimeo]$2[/vimeo]',$s); 
+	$s = preg_replace("/\[url\=https?:\/\/vimeo.com\/([0-9]+)\](.*?)\[\/url\]/ism",'[vimeo]$1[/vimeo]',$s); 
+	$s = preg_replace("/([^\]\=]|^)(https?\:\/\/)(vimeo|youtu|www\.youtube|soundcloud)([a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/ism", '$1[url]$2$3$4[/url]',$s);
+	$s = scale_diaspora_images($s);
 	return $s;
-
 }
 
 
+function scale_diaspora_images($s,$include_link = true) {
+
+	$matches = null;
+	$c = preg_match_all('/\[img\](.*?)\[\/img\]/ism',$s,$matches,PREG_SET_ORDER);
+	if($c) {
+		require_once('include/Photo.php');
+		foreach($matches as $mtch) {
+			logger('scale_diaspora_image: ' . $mtch[1]);
+			$i = fetch_url($mtch[1]);
+			if($i) {
+				$ph = new Photo($i);
+				if($ph->is_valid()) {
+					if($ph->getWidth() > 600 || $ph->getHeight() > 600) {
+						$ph->scaleImage(600);
+						$new_width = $ph->getWidth();
+						$new_height = $ph->getHeight();
+						logger('scale_diaspora_image: ' . $new_width . 'w ' . $new_height . 'h' . 'match: ' . $mtch[0], LOGGER_DEBUG);
+						$s = str_replace($mtch[0],'[img=' . $new_width . 'x' . $new_height. ']' . $mtch[1] . '[/img]'
+							. "\n" . ((! $include_link) 
+								? '[url=' . $mtch[1] . ']' . t('view full size') . '[/url]' . "\n"
+								: ''),$s);
+						logger('scale_diaspora_image: new string: ' . $s, LOGGER_DEBUG);
+					}
+				}
+			}
+		}
+	}
+	return $s;
+}
+
 function stripdcode_br_cb($s) {
-	return '[code]' . str_replace('<br />', '', $s[1]) . '[/code]';
+	return '[code]' . str_replace('<br />', "\n\t", $s[1]) . '[/code]';
 }
 
 
@@ -56,7 +92,7 @@ function bb2diaspora($Text,$preserve_nl = false) {
 	$Text = preg_replace("/\#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '[#$2]($1)', $Text);
 	$Text = preg_replace("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '[$2]($1)', $Text);
 
-//	$Text = preg_replace("/\[img\](.*?)\[\/img\]/", t('Image/photo: ') . '$1', $Text);
+	$Text = preg_replace("/\[img\](.*?)\[\/img\]/", '![' . t('image/photo') . '](' . '$1' . ')', $Text);
 //	$Text = preg_replace("/\[img\](.*?)\[\/img\]/", t('image/photo'), $Text);
 
 	// Perform MAIL Search
@@ -115,17 +151,17 @@ function bb2diaspora($Text,$preserve_nl = false) {
 
 	$Text = preg_replace_callback("/\[code\](.*?)\[\/code\]/is",'stripdcode_br_cb',$Text);
 
-//	$CodeLayout = '<code>$1</code>';
+	//	$CodeLayout = '<code>$1</code>';
 	// Check for [code] text
-	$Text = preg_replace("/\[code\](.*?)\[\/code\]/is","```$1```", $Text);
+	$Text = preg_replace("/\[code\](.*?)\[\/code\]/is","\t$1\n", $Text);
 
 
 
 
 	// Declare the format for [quote] layout
-//	$QuoteLayout = '<blockquote>$1</blockquote>';                     
+	//	$QuoteLayout = '<blockquote>$1</blockquote>';                     
 	// Check for [quote] text
-//	$Text = preg_replace("/\[quote\](.*?)\[\/quote\]/is","$QuoteLayout", $Text);
+	$Text = preg_replace("/\[quote\](.*?)\[\/quote\]/is",">$1\n\n", $Text);
          
 	// Images
 
@@ -181,6 +217,8 @@ function bb2diaspora($Text,$preserve_nl = false) {
 
 function format_event_diaspora($ev) {
 
+	$a = get_app();
+
 	if(! ((is_array($ev)) && count($ev)))
 		return '';
 
@@ -190,20 +228,20 @@ function format_event_diaspora($ev) {
 
 	$o .= '**' . bb2diaspora($ev['desc']) .  '**' . "\n";
 
-	$o .= t('Starts:') . ' ' 
+	$o .= t('Starts:') . ' ' . '['
 		. (($ev['adjust']) ? day_translate(datetime_convert('UTC', 'UTC', 
 			$ev['start'] , $bd_format ))
 			:  day_translate(datetime_convert('UTC', 'UTC', 
 			$ev['start'] , $bd_format)))
-		. "\n";
+		.  '](' . $a->get_baseurl() . '/localtime/?f=&time=' . urlencode(datetime_convert('UTC','UTC',$ev['start'])) . ")\n";
 
 	if(! $ev['nofinish'])
-		$o .= t('Finishes:') . ' ' 
+		$o .= t('Finishes:') . ' ' . '[' 
 			. (($ev['adjust']) ? day_translate(datetime_convert('UTC', 'UTC', 
 				$ev['finish'] , $bd_format ))
 				:  day_translate(datetime_convert('UTC', 'UTC', 
 				$ev['finish'] , $bd_format )))
-			. "\n";
+			. '](' . $a->get_baseurl() . '/localtime/?f=&time=' . urlencode(datetime_convert('UTC','UTC',$ev['finish'])) . ")\n";
 
 	if(strlen($ev['location']))
 		$o .= t('Location:') . bb2diaspora($ev['location'])