mirror/processwire
1
0
Fork 0
mirror of https://github.com/processwire/processwire.git synced 2025-08-16 11:44:42 +02:00
Code Issues Releases Wiki Activity

Fix issue processwire/processwire-issues#505 add support for detection of missing closing tags in WireMarkupRegions in order to prevent timeout

Browse Source
This commit is contained in:
Ryan Cramer
2018-02-28 08:40:58 -05:00
parent 8acd06646f
commit cd0f76d32c
1 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
wire/core/WireMarkupRegions.php
View File

@@ -121,11 +121,11 @@ class WireMarkupRegions extends Wire {
if(is_null($options['wrap'])) $options['wrap'] = $hasClass ? true : false; if(is_null($options['wrap'])) $options['wrap'] = $hasClass ? true : false;
$startPos = 0; $startPos = 0;
$whileCnt = 0; $whileCnt = 0; // number of do-while loop completions
$iterations = 0; $iterations = 0; // total number of iterations, including continue statements
do { do {
$iterations++; if(++$iterations >= $options['max'] * 2) break;
// find all the positions where each test appears // find all the positions where each test appears
$positions = array(); $positions = array();
@@ -188,9 +188,21 @@ class WireMarkupRegions extends Wire {
$regions[$pos] = $region; $regions[$pos] = $region;
} }
$markup = trim(str_replace($region['html'], '', $markup)); $replaceQty = 0;
$markup = str_replace($region['html'], '', $markup, $replaceQty);
if(!$replaceQty) {
// region html was not present, try replacement without closing tag (which might be missing)
$markup = str_replace($region['open'] . $region['region'], '', $markup, $replaceQty);
if($replaceQty) {
$this->debugNotes[] = "ERROR: missing closing tag for: $region[open]";
} else {
$this->debugNotes[] = "ERROR: unable to populate: $region[open]";
}
}
if($replaceQty) $startPos = 0;
$markup = trim($markup);
if(empty($markup)) break; if(empty($markup)) break;
$startPos = 0;
} while(++$whileCnt < $options['max']); } while(++$whileCnt < $options['max']);
@@ -1366,7 +1378,7 @@ class WireMarkupRegions extends Wire {
$debugRegionStart = "[sm]" . trim(substr($region['region'], 0, 80)); $debugRegionStart = "[sm]" . trim(substr($region['region'], 0, 80));
$pos = strrpos($debugRegionStart, '>'); $pos = strrpos($debugRegionStart, '>');
if($pos) $debugRegionStart = substr($debugRegionStart, 0, $pos+1); if($pos) $debugRegionStart = substr($debugRegionStart, 0, $pos+1);
$debugRegionStart .= " … [b]" . strlen($region['html']) . " bytes[/b][/sm]"; $debugRegionStart .= " … [b]" . strlen($region['region']) . " bytes[/b][/sm]";
//$debugRegionEnd = substr($region['region'], -30); //$debugRegionEnd = substr($region['region'], -30);
//$pos = strpos($debugRegionEnd, '</'); //$pos = strpos($debugRegionEnd, '</');
//if($pos !== false) $debugRegionEnd = substr($debugRegionEnd, $pos); //if($pos !== false) $debugRegionEnd = substr($debugRegionEnd, $pos);
@@ -1431,6 +1443,7 @@ class WireMarkupRegions extends Wire {
} }
} }
if(count($this->debugNotes)) { if(count($this->debugNotes)) {
$this->debugNotes = array_unique($this->debugNotes);
$debugNotes[] = "---------------"; $debugNotes[] = "---------------";
foreach($this->debugNotes as $n => $s) { foreach($this->debugNotes as $n => $s) {
$debugNotes[] = $this->debugNoteStr($s); $debugNotes[] = $this->debugNoteStr($s);