X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fbbcode.php;h=ef4a9aa9ba3462747f5ba5a30d69e565e77c077c;hb=4c3e9fde288130259ec3729b310551511c1c8f13;hp=08beeddfc174252be6e724012f1ff8faecabefc6;hpb=04f14d96c679d1732993252d137515ad38c4b41f;p=friendica.git
diff --git a/include/bbcode.php b/include/bbcode.php
index 08beeddfc1..ef4a9aa9ba 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -47,6 +47,89 @@ function bb_unspacefy_and_trim($st) {
return $unspacefied;
}
+function bb_find_open_close($s, $open, $close, $occurance = 1) {
+
+ if($occurance < 1)
+ $occurance = 1;
+
+ $start_pos = -1;
+ for($i = 1; $i <= $occurance; $i++) {
+ if( $start_pos !== false)
+ $start_pos = strpos($s, $open, $start_pos + 1);
+ }
+
+ if( $start_pos === false)
+ return false;
+
+ $end_pos = strpos($s, $close, $start_pos);
+
+ if( $end_pos === false)
+ return false;
+
+ $res = array( 'start' => $start_pos, 'end' => $end_pos );
+
+ return $res;
+}
+
+function get_bb_tag_pos($s, $name, $occurance = 1) {
+
+ if($occurance < 1)
+ $occurance = 1;
+
+ $start_open = -1;
+ for($i = 1; $i <= $occurance; $i++) {
+ if( $start_open !== false)
+ $start_open = strpos($s, '[' . $name, $start_open + 1); // allow [name= type tags
+ }
+
+ if( $start_open === false)
+ return false;
+
+ $start_equal = strpos($s, '=', $start_open);
+ $start_close = strpos($s, ']', $start_open);
+
+ if( $start_close === false)
+ return false;
+
+ $start_close++;
+
+ $end_open = strpos($s, '[/' . $name . ']', $start_close);
+
+ if( $end_open === false)
+ return false;
+
+ $res = array( 'start' => array('open' => $start_open, 'close' => $start_close),
+ 'end' => array('open' => $end_open, 'close' => $end_open + strlen('[/' . $name . ']')) );
+ if( $start_equal !== false)
+ $res['start']['equal'] = $start_equal + 1;
+
+ return $res;
+}
+
+function bb_tag_preg_replace($pattern, $replace, $name, $s) {
+
+ $string = $s;
+
+ $occurance = 1;
+ $pos = get_bb_tag_pos($string, $name, $occurance);
+ while($pos !== false && $occurance < 1000) {
+
+ $start = substr($string, 0, $pos['start']['open']);
+ $subject = substr($string, $pos['start']['open'], $pos['end']['close'] - $pos['start']['open']);
+ $end = substr($string, $pos['end']['close']);
+ if($end === false)
+ $end = '';
+
+ $subject = preg_replace($pattern, $replace, $subject);
+ $string = $start . $subject . $end;
+
+ $occurance++;
+ $pos = get_bb_tag_pos($string, $name, $occurance);
+ }
+
+ return $string;
+}
+
if(! function_exists('bb_extract_images')) {
function bb_extract_images($body) {
@@ -115,10 +198,6 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
$a = get_app();
- // Move all spaces out of the tags
- $Text = preg_replace("/\[(\w*)\](\s*)/ism", '$2[$1]', $Text);
- $Text = preg_replace("/(\s*)\[\/(\w*)\]/ism", '[/$2]$1', $Text);
-
// Hide all [noparse] contained bbtags by spacefying them
// POSSIBLE BUG --> Will the 'preg' functions crash if there's an embedded image?
@@ -127,6 +206,10 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
$Text = preg_replace_callback("/\[pre\](.*?)\[\/pre\]/ism", 'bb_spacefy',$Text);
+ // Move all spaces out of the tags
+ $Text = preg_replace("/\[(\w*)\](\s*)/ism", '$2[$1]', $Text);
+ $Text = preg_replace("/(\s*)\[\/(\w*)\]/ism", '[/$2]$1', $Text);
+
// Extract the private images which use data url's since preg has issues with
// large data sizes. Stash them away while we do bbcode conversion, and then put them back
// in after we've done all the regex matching. We cannot use any preg functions to do this.
@@ -325,6 +408,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
$Text = preg_replace("/\[crypt\](.*?)\[\/crypt\]/ism",'
![' . t('Encrypted content') . ' ' . t('Encrypted content') . '](' .$a->get_baseurl() . '/images/lock_icon.gif)
', $Text);
+ $Text = preg_replace("/\[crypt=(.*?)\](.*?)\[\/crypt\]/ism",'
![' . '$1' . ' ' . t('Encrypted content') . ' ' . t('Encrypted content') . '](' .$a->get_baseurl() . '/images/lock_icon.gif)
', $Text);
// Try to Oembed
@@ -411,6 +495,8 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
$Text = preg_replace('/\[\&\;([#a-z0-9]+)\;\]/','&$1;',$Text);
+ $Text = preg_replace('/\&\#039\;/','\'',$Text);
+ $Text = preg_replace('/\"\;/','"',$Text);
// fix any escaped ampersands that may have been converted into links
$Text = preg_replace("/\<(.*?)(src|href)=(.*?)\&\;(.*?)\>/ism",'<$1$2=$3&$4>',$Text);