mirror of
https://github.com/e107inc/e107.git
synced 2025-08-04 21:57:51 +02:00
Bugtracker #4168 - stray [br] display in places
This commit is contained in:
e107steved
@@ -1,5 +1,4 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
/*
|
/*
|
||||||
+ ----------------------------------------------------------------------------+
|
+ ----------------------------------------------------------------------------+
|
||||||
| e107 website system
|
| e107 website system
|
||||||
@@ -12,8 +11,8 @@
|
|||||||
| GNU General Public License (http://gnu.org).
|
| GNU General Public License (http://gnu.org).
|
||||||
|
|
|
|
||||||
| $Source: /cvs_backup/e107_0.8/e107_handlers/bbcode_handler.php,v $
|
| $Source: /cvs_backup/e107_0.8/e107_handlers/bbcode_handler.php,v $
|
||||||
| $Revision: 1.10 $
|
| $Revision: 1.11 $
|
||||||
| $Date: 2007-07-31 20:10:44 $
|
| $Date: 2007-10-28 20:45:22 $
|
||||||
| $Author: e107steved $
|
| $Author: e107steved $
|
||||||
+----------------------------------------------------------------------------+
|
+----------------------------------------------------------------------------+
|
||||||
*/
|
*/
|
||||||
@@ -40,19 +39,19 @@ class e_bbcode
|
|||||||
|
|
||||||
foreach($core_bb as $c)
|
foreach($core_bb as $c)
|
||||||
{
|
{
|
||||||
$this->bbLocation[$c] = 'core';
|
$this->bbLocation[$c] = 'core';
|
||||||
}
|
}
|
||||||
|
|
||||||
// grab list of plugin bbcodes.
|
// grab list of plugin bbcodes.
|
||||||
if(isset($pref['bbcode_list']) && $pref['bbcode_list'] != '')
|
if(isset($pref['bbcode_list']) && $pref['bbcode_list'] != '')
|
||||||
{
|
{
|
||||||
foreach($pref['bbcode_list'] as $path=>$namearray)
|
foreach($pref['bbcode_list'] as $path=>$namearray)
|
||||||
{
|
|
||||||
foreach($namearray as $code=>$uclass)
|
|
||||||
{
|
{
|
||||||
$this->bbLocation[$code] = $path;
|
foreach($namearray as $code=>$uclass)
|
||||||
|
{
|
||||||
|
$this->bbLocation[$code] = $path;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Eliminate duplicates
|
// Eliminate duplicates
|
||||||
@@ -60,29 +59,27 @@ class e_bbcode
|
|||||||
krsort($this->bbLocation);
|
krsort($this->bbLocation);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// If $bb_strip is TRUE, all bbcodes are stripped. If FALSE, none are stripped.
|
||||||
|
// If a comma separated (lower case) list is passed, only the listed codes are stripped (and the rest are processed)
|
||||||
|
function parseBBCodes($value, $p_ID, $force_lower = 'default', $bb_strip = FALSE)
|
||||||
|
{
|
||||||
|
global $postID;
|
||||||
|
$postID = $p_ID;
|
||||||
|
|
||||||
|
if (strlen($value) <= 6) return $value; // Don't waste time on trivia!
|
||||||
|
if ($force_lower == 'default') $force_lower = TRUE; // Set the default behaviour if not overridden
|
||||||
|
$code_stack = array(); // Stack for unprocessed bbcodes and text
|
||||||
|
$unmatch_stack = array(); // Stack for unmatched bbcodes
|
||||||
|
$result = ''; // Accumulates fully processed text
|
||||||
|
$stacktext = ''; // Accumulates text which might be subject to one or more bbcodes
|
||||||
|
$nopro = FALSE; // Blocks processing within [code]...[/code] tags
|
||||||
|
|
||||||
// If $bb_strip is TRUE, all bbcodes are stripped. If FALSE, none are stripped.
|
$strip_array = array();
|
||||||
// If a comma separated (lower case) list is passed, only the listed codes are stripped (and the rest are processed)
|
if (!is_bool($bb_strip))
|
||||||
function parseBBCodes($value, $p_ID, $force_lower = 'default', $bb_strip = FALSE)
|
{
|
||||||
{
|
$strip_array = explode(',',$bb_strip);
|
||||||
global $postID;
|
}
|
||||||
$postID = $p_ID;
|
$pattern = '#^\[(/?)([A-Za-z_]+)(\d*)([=:]?)(.*?)]$#i'; // Pattern to split up bbcodes
|
||||||
|
|
||||||
if (strlen($value) <= 6) return $value; // Don't waste time on trivia!
|
|
||||||
if ($force_lower == 'default') $force_lower = TRUE; // Set the default behaviour if not overridden
|
|
||||||
$code_stack = array(); // Stack for unprocessed bbcodes and text
|
|
||||||
$unmatch_stack = array(); // Stack for unmatched bbcodes
|
|
||||||
$result = ''; // Accumulates fully processed text
|
|
||||||
$stacktext = ''; // Accumulates text which might be subject to one or more bbcodes
|
|
||||||
$nopro = FALSE; // Blocks processing within [code]...[/code] tags
|
|
||||||
|
|
||||||
$strip_array = array();
|
|
||||||
if (!is_bool($bb_strip))
|
|
||||||
{
|
|
||||||
$strip_array = explode(',',$bb_strip);
|
|
||||||
}
|
|
||||||
$pattern = '#^\[(/?)([A-Za-z_]+)(\d*)([=:]?)(.*?)]$#i'; // Pattern to split up bbcodes
|
|
||||||
// $matches[0] - same as the input text
|
// $matches[0] - same as the input text
|
||||||
// $matches[1] - '/' for a closing tag. Otherwise empty string
|
// $matches[1] - '/' for a closing tag. Otherwise empty string
|
||||||
// $matches[2] - the bbcode word
|
// $matches[2] - the bbcode word
|
||||||
@@ -90,163 +87,170 @@ class e_bbcode
|
|||||||
// $matches[4] - '=' or ':' according to the separator used
|
// $matches[4] - '=' or ':' according to the separator used
|
||||||
// $matches[5] - any parameter
|
// $matches[5] - any parameter
|
||||||
|
|
||||||
$content = preg_split('#(\[(?:\w|/\w).*?\])#mis', $value, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE );
|
$content = preg_split('#(\[(?:\w|/\w).*?\])#mis', $value, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE );
|
||||||
|
|
||||||
foreach ($content as $cont)
|
foreach ($content as $cont)
|
||||||
{ // Each chunk is either a bbcode or a piece of text
|
{ // Each chunk is either a bbcode or a piece of text
|
||||||
$is_proc = FALSE;
|
$is_proc = FALSE;
|
||||||
while (!$is_proc)
|
while (!$is_proc)
|
||||||
{
|
{
|
||||||
$oddtext = '';
|
$oddtext = '';
|
||||||
if ($cont[0] == '[')
|
if ($cont[0] == '[')
|
||||||
{ // We've got a bbcode - split it up and process it
|
{ // We've got a bbcode - split it up and process it
|
||||||
$match_count = preg_match($pattern,$cont,$matches);
|
$match_count = preg_match($pattern,$cont,$matches);
|
||||||
$bbparam = (isset($matches[5])) ? $matches[5] : '';
|
$bbparam = (isset($matches[5])) ? $matches[5] : '';
|
||||||
$bbword = (isset($matches[2])) ? $matches[2] : '';
|
$bbword = (isset($matches[2])) ? $matches[2] : '';
|
||||||
if ($force_lower) $bbword = strtolower($bbword);
|
if($cont[1] != '/')
|
||||||
if ($nopro && ($bbword == 'code') && ($matches[1] == '/')) $nopro = FALSE; // End of code block
|
{
|
||||||
if (($bbword) && ($bbword == trim($bbword)) && !$nopro)
|
$bbstart = $cont;
|
||||||
{ // Got a code to process here
|
$bbsep = varset($matches[4]);
|
||||||
if (($bb_strip === TRUE) || in_array($bbword,$strip_array))
|
}
|
||||||
{
|
if ($force_lower) $bbword = strtolower($bbword);
|
||||||
$is_proc = TRUE; // Just discard this bbcode
|
if ($nopro && ($bbword == 'code') && ($matches[1] == '/')) $nopro = FALSE; // End of code block
|
||||||
}
|
if (($bbword) && ($bbword == trim($bbword)) && !$nopro)
|
||||||
else
|
{ // Got a code to process here
|
||||||
{
|
if (($bb_strip === TRUE) || in_array($bbword,$strip_array))
|
||||||
|
{
|
||||||
|
$is_proc = TRUE; // Just discard this bbcode
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
|
||||||
if ($matches[1] == '/')
|
if ($matches[1] == '/')
|
||||||
{ // Closing code to process
|
{ // Closing code to process
|
||||||
$found = FALSE;
|
$found = FALSE;
|
||||||
$i = 0;
|
$i = 0;
|
||||||
while ($i < count($code_stack))
|
while ($i < count($code_stack))
|
||||||
{ // See if code is anywhere on the stack.
|
{ // See if code is anywhere on the stack.
|
||||||
if (($code_stack[$i]['type'] == 'bbcode') && ($code_stack[$i]['code'] == $bbword) && ($code_stack[0]['numbers'] == $matches[3]))
|
if (($code_stack[$i]['type'] == 'bbcode') && ($code_stack[$i]['code'] == $bbword) && ($code_stack[0]['numbers'] == $matches[3]))
|
||||||
{
|
{
|
||||||
$found = TRUE;
|
$found = TRUE;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
$i++;
|
$i++;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($found)
|
if ($found)
|
||||||
{
|
{
|
||||||
$found = FALSE; // Use as 'done' variable now
|
$found = FALSE; // Use as 'done' variable now
|
||||||
// Code is on stack - $i has index number. Process text, discard unmatched open codes, process 'our' code
|
// Code is on stack - $i has index number. Process text, discard unmatched open codes, process 'our' code
|
||||||
while ($i > 0) { $unmatch_stack[] = array_shift($code_stack); $i--; } // Get required code to top of stack
|
while ($i > 0) { $unmatch_stack[] = array_shift($code_stack); $i--; } // Get required code to top of stack
|
||||||
|
|
||||||
// Pull it off using array_shift - this keeps it as a zero-based array, newest first.
|
// Pull it off using array_shift - this keeps it as a zero-based array, newest first.
|
||||||
while (!$found && (count($code_stack) != 0))
|
while (!$found && (count($code_stack) != 0))
|
||||||
{
|
{
|
||||||
switch ($code_stack[0]['type'])
|
switch ($code_stack[0]['type'])
|
||||||
{
|
{
|
||||||
case 'text' :
|
case 'text' :
|
||||||
$stacktext = $code_stack[0]['code'].$stacktext; // Need to insert text at front
|
$stacktext = $code_stack[0]['code'].$stacktext; // Need to insert text at front
|
||||||
array_shift($code_stack);
|
array_shift($code_stack);
|
||||||
break;
|
break;
|
||||||
case 'bbcode' :
|
case 'bbcode' :
|
||||||
if (($code_stack[0]['code'] == $bbword) && ($code_stack[0]['numbers'] == $matches[3]))
|
if (($code_stack[0]['code'] == $bbword) && ($code_stack[0]['numbers'] == $matches[3]))
|
||||||
{
|
{
|
||||||
$stacktext = $this->proc_bbcode($bbword,$code_stack[0]['param'],$stacktext,$bbparam);
|
$stacktext = $this->proc_bbcode($bbword,$code_stack[0]['param'],$stacktext,$bbparam, $bbsep, $bbstart.$stacktext.$cont);
|
||||||
array_shift($code_stack);
|
array_shift($code_stack);
|
||||||
// Intentionally don't terminate here - may be some text we can clean up
|
// Intentionally don't terminate here - may be some text we can clean up
|
||||||
$bbword=''; // Necessary to make sure we don't double process if several instances on stack
|
$bbword=''; // Necessary to make sure we don't double process if several instances on stack
|
||||||
while (count($unmatch_stack) != 0) { array_unshift($code_stack,array_pop($unmatch_stack)); }
|
while (count($unmatch_stack) != 0) { array_unshift($code_stack,array_pop($unmatch_stack)); }
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
{
|
$found = TRUE; // Terminate on unmatched bbcode
|
||||||
$found = TRUE; // Terminate on unmatched bbcode
|
}
|
||||||
}
|
break;
|
||||||
}
|
}
|
||||||
break;
|
if (count($code_stack) == 0)
|
||||||
}
|
{
|
||||||
if (count($code_stack) == 0)
|
$result .= $stacktext;
|
||||||
{
|
$stacktext = '';
|
||||||
$result .= $stacktext;
|
$found = TRUE;
|
||||||
$stacktext = '';
|
}
|
||||||
$found = TRUE;
|
}
|
||||||
}
|
$is_proc = TRUE;
|
||||||
}
|
}
|
||||||
$is_proc = TRUE;
|
}
|
||||||
}
|
else
|
||||||
}
|
{ // Opening code to process
|
||||||
else
|
// If its a single code, we can process it now. Otherwise just stack the value
|
||||||
{ // Opening code to process
|
if (array_key_exists('_'.$bbword,$this->bbLocation))
|
||||||
// If its a single code, we can process it now. Otherwise just stack the value
|
{ // Single code to process
|
||||||
if (array_key_exists('_'.$bbword,$this->bbLocation))
|
if (count($code_stack) == 0)
|
||||||
{ // Single code to process
|
{
|
||||||
if (count($code_stack) == 0)
|
$result .= $this->proc_bbcode('_'.$bbword,$bbparam);
|
||||||
$result .= $this->proc_bbcode('_'.$bbword,$bbparam);
|
}
|
||||||
else
|
else
|
||||||
$stacktext .= $this->proc_bbcode('_'.$bbword,$bbparam);
|
{
|
||||||
$is_proc = TRUE;
|
$stacktext .= $this->proc_bbcode('_'.$bbword,$bbparam);
|
||||||
}
|
}
|
||||||
elseif (array_key_exists($bbword,$this->bbLocation))
|
$is_proc = TRUE;
|
||||||
{
|
}
|
||||||
if ($stacktext != '')
|
elseif (array_key_exists($bbword,$this->bbLocation))
|
||||||
{ // Stack the text we've accumulated so far
|
{
|
||||||
array_unshift($code_stack,array('type' => 'text','code' => $stacktext));
|
if ($stacktext != '')
|
||||||
$stacktext = '';
|
{ // Stack the text we've accumulated so far
|
||||||
}
|
array_unshift($code_stack,array('type' => 'text','code' => $stacktext));
|
||||||
array_unshift($code_stack,array('type' => 'bbcode','code' => $bbword, 'numbers'=> $matches[3], 'param'=>$bbparam));
|
$stacktext = '';
|
||||||
if ($bbword == 'code') $nopro = TRUE;
|
}
|
||||||
$is_proc = TRUE;
|
array_unshift($code_stack,array('type' => 'bbcode','code' => $bbword, 'numbers'=> $matches[3], 'param'=>$bbparam));
|
||||||
}
|
if ($bbword == 'code') $nopro = TRUE;
|
||||||
}
|
$is_proc = TRUE;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Next lines could be deleted - but gives better rejection of 'stray' opening brackets
|
// Next lines could be deleted - but gives better rejection of 'stray' opening brackets
|
||||||
if ((!$is_proc) && (($temp = strrpos($cont,"[")) !== 0))
|
if ((!$is_proc) && (($temp = strrpos($cont,"[")) !== 0))
|
||||||
{
|
{
|
||||||
$oddtext = substr($cont,0,$temp);
|
$oddtext = substr($cont,0,$temp);
|
||||||
$cont = substr($cont,$temp);
|
$cont = substr($cont,$temp);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!$is_proc)
|
||||||
|
{ // We've got some text between bbcodes (or possibly text in front of a bbcode)
|
||||||
|
if ($oddtext == '') { $oddtext = $cont; $is_proc = TRUE; }
|
||||||
|
if (count($code_stack) == 0)
|
||||||
|
{ // Can just add text to answer
|
||||||
|
$result .= $oddtext;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{ // Add to accumulator at this level
|
||||||
|
$stacktext .= $oddtext;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
if (!$is_proc)
|
// Basically done - just tidy up now
|
||||||
{ // We've got some text between bbcodes (or possibly text in front of a bbcode)
|
// If there's still anything on the stack, we need to process it
|
||||||
if ($oddtext == '') { $oddtext = $cont; $is_proc = TRUE; }
|
while (count($code_stack) != 0)
|
||||||
if (count($code_stack) == 0)
|
{
|
||||||
{ // Can just add text to answer
|
switch ($code_stack[0]['type'])
|
||||||
$result .= $oddtext;
|
{
|
||||||
}
|
case 'text' :
|
||||||
else
|
$stacktext = $code_stack[0]['code'].$stacktext; // Need to insert text at front
|
||||||
{ // Add to accumulator at this level
|
array_shift($code_stack);
|
||||||
$stacktext .= $oddtext;
|
break;
|
||||||
}
|
case 'bbcode' :
|
||||||
}
|
$stacktext = '['.$code_stack[0]['code'].']'.$stacktext; // To discard unmatched codes, delete this line
|
||||||
|
array_shift($code_stack); // Just discard any unmatched bbcodes
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
$result .= $stacktext;
|
||||||
|
return $result;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
// Basically done - just tidy up now
|
|
||||||
// If there's still anything on the stack, we need to process it
|
|
||||||
while (count($code_stack) != 0)
|
|
||||||
{
|
|
||||||
switch ($code_stack[0]['type'])
|
|
||||||
{
|
|
||||||
case 'text' :
|
|
||||||
$stacktext = $code_stack[0]['code'].$stacktext; // Need to insert text at front
|
|
||||||
array_shift($code_stack);
|
|
||||||
break;
|
|
||||||
case 'bbcode' :
|
|
||||||
$stacktext = '['.$code_stack[0]['code'].']'.$stacktext; // To discard unmatched codes, delete this line
|
|
||||||
array_shift($code_stack); // Just discard any unmatched bbcodes
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
$result .= $stacktext;
|
|
||||||
return $result;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
function proc_bbcode($code, $param1='',$code_text_par='', $param2='')
|
function proc_bbcode($code, $param1='',$code_text_par='', $param2='', $sep='', $full_text='')
|
||||||
// Invoke an actual bbcode handler
|
// Invoke an actual bbcode handler
|
||||||
// $code - textual value of the bbcode (already begins with '_' if a single code)
|
// $code - textual value of the bbcode (already begins with '_' if a single code)
|
||||||
// $param1 - any text after '=' in the opening code
|
// $param1 - any text after '=' in the opening code
|
||||||
// $code_text_par - text between the opening and closing codes
|
// $code_text_par - text between the opening and closing codes
|
||||||
// $param2 - any text after '=' for the closing code
|
// $param2 - any text after '=' for the closing code
|
||||||
{
|
{
|
||||||
global $tp, $postID, $code_text, $parm;
|
global $tp, $postID, $code_text, $parm;
|
||||||
$parm = $param1;
|
$parm = $param1;
|
||||||
@@ -303,4 +307,3 @@ function proc_bbcode($code, $param1='',$code_text_par='', $param2='')
|
|||||||
return $bbcode_output.$bbcode_return;
|
return $bbcode_output.$bbcode_return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
?>
|
|
||||||
|
|||||||
Reference in New Issue
Block a user