X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fbbcode.php;h=cff26f5c8ebf2864744db9fbc2c4f6866668f588;hb=edfa7dbac2ff8ed054fce90cba40efcca6c85529;hp=20418f940719f75d1952144a83b17e1e9369cba5;hpb=3a07973ffae4e0f9c576d343eafee30401d92449;p=friendica.git diff --git a/include/bbcode.php b/include/bbcode.php old mode 100755 new mode 100644 index 20418f9407..cff26f5c8e --- a/include/bbcode.php +++ b/include/bbcode.php @@ -11,21 +11,21 @@ function stripcode_br_cb($s) { function tryoembed($match){ $url = ((count($match)==2)?$match[1]:$match[2]); - logger("tryoembed: $url"); - +// logger("tryoembed: $url"); + $o = oembed_fetch_url($url); //echo "
"; var_dump($match, $url, $o); killme(); if ($o->type=="error") return $match[0]; - + $html = oembed_format_object($o); return $html; //oembed_iframe($html,$o->width,$o->height); - + } -// [noparse][i]italic[/i][/noparse] turns into -// [noparse][ i ]italic[ /i ][/noparse], +// [noparse][i]italic[/i][/noparse] turns into +// [noparse][ i ]italic[ /i ][/noparse], // to hide them from parser. function bb_spacefy($st) { @@ -36,7 +36,7 @@ function bb_spacefy($st) { return $new_str; } -// The previously spacefied [noparse][ i ]italic[ /i ][/noparse], +// The previously spacefied [noparse][ i ]italic[ /i ][/noparse], // now turns back and the [noparse] tags are trimed // returning [i]italic[/i] @@ -59,8 +59,8 @@ function bbcode($Text,$preserve_nl = false) { $Text = preg_replace_callback("/\[pre\](.*?)\[\/pre\]/ism", 'bb_spacefy',$Text); - // Extract a single private image which uses data url's since preg has issues with - // large data sizes. Stash it away while we do bbcode conversion, and then put it back + // Extract a single private image which uses data url's since preg has issues with + // large data sizes. Stash it away while we do bbcode conversion, and then put it back // in after we've done all the regex matching. We cannot use any preg functions to do this. $saved_image = ''; @@ -71,13 +71,13 @@ function bbcode($Text,$preserve_nl = false) { $start_fragment = substr($Text,0,$img_start); $img_start += strlen('[img]'); $saved_image = substr($Text,$img_start,$img_end - $img_start); - $end_fragment = substr($Text,$img_end + strlen('[/img]')); + $end_fragment = substr($Text,$img_end + strlen('[/img]')); // logger('saved_image: ' . $saved_image,LOGGER_DEBUG); $Text = $start_fragment . '[$#saved_image#$]' . $end_fragment; } // If we find any event code, turn it into an event. - // After we're finished processing the bbcode we'll + // After we're finished processing the bbcode we'll // replace all of the event code with a reformatted version. $ev = bbtoevent($Text); @@ -105,7 +105,7 @@ function bbcode($Text,$preserve_nl = false) { // Perform URL Search $Text = preg_replace("/([^\]\=]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/ism", '$1$2', $Text); - + $Text = preg_replace_callback("/\[bookmark\=([^\]]*)\].*?\[\/bookmark\]/ism",'tryoembed',$Text); $Text = preg_replace("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism",'[url=$1]$2[/url]',$Text); @@ -118,7 +118,7 @@ function bbcode($Text,$preserve_nl = false) { // Perform MAIL Search $Text = preg_replace("/\[mail\]([$MAILSearchString]*)\[\/mail\]/", '$1', $Text); $Text = preg_replace("/\[mail\=([$MAILSearchString]*)\](.*?)\[\/mail\]/", '$2', $Text); - + // Check for bold text $Text = preg_replace("(\[b\](.*?)\[\/b\])ism",'$1',$Text); @@ -146,30 +146,25 @@ function bbcode($Text,$preserve_nl = false) { $Text = preg_replace("(\[center\](.*?)\[\/center\])ism","$1",$Text); // Check for list text + $Text = str_replace("[*]", "
$1'; + // Check for [quote] text + // handle nested quotes + $endlessloop = 0; + while ((strpos($Text, "[/quote]") !== false) and (strpos($Text, "[quote]") !== false) and (++$endlessloop < 20)) + $Text = preg_replace("/\[quote\](.*?)\[\/quote\]/ism","$QuoteLayout", $Text); + // Check for [quote=Author] text + $t_wrote = t('$1 wrote:'); + + // handle nested quotes + $endlessloop = 0; + while ((strpos($Text, "[/quote]")!== false) and (strpos($Text, "[quote=") !== false) and (++$endlessloop < 20)) + $Text = preg_replace("/\[quote=[\"\']*(.*?)[\"\']*\](.*?)\[\/quote\]/ism", + "
" . $t_wrote . " $2", + $Text); - // Declare the format for [quote] layout - $QuoteLayout = '
$1'; - // Check for [quote] text - $Text = preg_replace("/\[quote\](.*?)\[\/quote\]/ism","$QuoteLayout", $Text); - // [img=widthxheight]image source[/img] $Text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '