harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'mike/master' into dev

Browse Source
This commit is contained in:
Mario Vavti 2018-01-26 10:33:55 +01:00
commit e982698de1
1 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
include/bbcode.php
View File

@ -610,11 +610,23 @@ function bb_observer($Text) {
return $Text; return $Text;
} }
function bb_code_protect($s) {
return 'b64.^9e%.' . base64_encode($s) . '.b64.$9e%';
}
function bb_code_unprotect($s) {
return preg_replace_callback('|b64\.\^9e\%\.(.*?)\.b64\.\$9e\%|ism','bb_code_unprotect_sub',$s);
}
function bb_code_unprotect_sub($match) {
return base64_decode($match[1]);
}
function bb_code($match) { function bb_code($match) {
if(strpos($match[0], "<br />")) if(strpos($match[0], "<br />"))
return '<code>' . trim($match[1]) . '</code>'; return '<code>' . bb_code_protect(trim($match[1])) . '</code>';
else else
return '<code class="inline-code">' . trim($match[1]) . '</code>'; return '<code class="inline-code">' . bb_code_protect(trim($match[1])) . '</code>';
} }
function bb_code_options($match) { function bb_code_options($match) {
@ -628,11 +640,11 @@ function bb_code_options($match) {
} else { } else {
$style = ""; $style = "";
} }
return '<code class="'. $class .'" style="'. $style .'">' . trim($match[2]) . '</code>'; return '<code class="'. $class .'" style="'. $style .'">' . bb_code_protect(trim($match[2])) . '</code>';
} }
function bb_highlight($match) { function bb_highlight($match) {
return text_highlight($match[2],strtolower($match[1])); return bb_code_protect(text_highlight($match[2],strtolower($match[1])));
} }
function bb_fixtable_lf($match) { function bb_fixtable_lf($match) {
@ -822,6 +834,17 @@ function bbcode($Text, $options = []) {
$Text = str_replace(array("\t", " "), array("&nbsp;&nbsp;&nbsp;&nbsp;", "&nbsp;&nbsp;"), $Text); $Text = str_replace(array("\t", " "), array("&nbsp;&nbsp;&nbsp;&nbsp;", "&nbsp;&nbsp;"), $Text);
// Check for [code] text
if (strpos($Text,'[code]') !== false) {
$Text = preg_replace_callback("/\[code\](.*?)\[\/code\]/ism", 'bb_code', $Text);
}
// Check for [code options] text
if (strpos($Text,'[code ') !== false) {
$Text = preg_replace_callback("/\[code(.*?)\](.*?)\[\/code\]/ism", 'bb_code_options', $Text);
}
// Set up the parameters for a URL search string // Set up the parameters for a URL search string
$URLSearchString = "^\[\]"; $URLSearchString = "^\[\]";
// Set up the parameters for a MAIL search string // Set up the parameters for a MAIL search string
@ -1062,16 +1085,6 @@ function bbcode($Text, $options = []) {
$Text = preg_replace("/\[font=(.*?)\](.*?)\[\/font\]/sm", "<span style=\"font-family: $1;\">$2</span>", $Text); $Text = preg_replace("/\[font=(.*?)\](.*?)\[\/font\]/sm", "<span style=\"font-family: $1;\">$2</span>", $Text);
} }
// Check for [code] text
if (strpos($Text,'[code]') !== false) {
$Text = preg_replace_callback("/\[code\](.*?)\[\/code\]/ism", 'bb_code', $Text);
}
// Check for [code options] text
if (strpos($Text,'[code ') !== false) {
$Text = preg_replace_callback("/\[code(.*?)\](.*?)\[\/code\]/ism", 'bb_code_options', $Text);
}
if(strpos($Text,'[/summary]') !== false) { if(strpos($Text,'[/summary]') !== false) {
$Text = preg_replace_callback("/^(.*?)\[summary\](.*?)\[\/summary\](.*?)$/ism", 'bb_summary', $Text); $Text = preg_replace_callback("/^(.*?)\[summary\](.*?)\[\/summary\](.*?)$/ism", 'bb_summary', $Text);
@ -1288,6 +1301,7 @@ function bbcode($Text, $options = []) {
// replace escaped links in code= blocks // replace escaped links in code= blocks
$Text = str_replace('%eY9-!','http', $Text); $Text = str_replace('%eY9-!','http', $Text);
$Text = bb_code_unprotect($Text);
$Text = preg_replace('/\[\&amp\;([#a-z0-9]+)\;\]/', '&$1;', $Text); $Text = preg_replace('/\[\&amp\;([#a-z0-9]+)\;\]/', '&$1;', $Text);