Commit a4a61875 authored by Carsten  Rose's avatar Carsten Rose
Browse files

AbstractBuildForm.php: Aufruf von Support::appendToolTip() - neu kein Aufruf...

AbstractBuildForm.php: Aufruf von Support::appendToolTip() - neu kein Aufruf von htmlentitities vorher, damit Ticks nicht kodiert werden nach '"'. Durch Verwenddung von Support::appendTooltip() sollten single ticks im Code automatisch escaped werden.
Evaluate.php: In debugstack eine Freizeile eingebaut zur besseren Lesbarkeit.
parent 97e88238
......@@ -355,7 +355,8 @@ abstract class AbstractBuildForm {
// debugStack as Tooltip
if ($this->showDebugInfo && count($debugStack) > 0) {
$elementHtml = Support::appendTooltip($elementHtml, implode("\n", OnArray::htmlentitiesOnArray($debugStack)));
// $elementHtml = Support::appendTooltip($elementHtml, implode("\n", OnArray::htmlentitiesOnArray($debugStack)));
$elementHtml = Support::appendTooltip($elementHtml, implode("\n", $debugStack));
}
// Construct Marshaller Name: buildRow
......
......@@ -79,7 +79,7 @@ class Evaluate {
$result = $line;
$debugIndent = str_repeat(' ', $recursion);
$debugLocal[] = $debugIndent . "#Parse: '$result'";
$debugLocal[] = $debugIndent . "PARSE: $result";
$posFirstClose = strpos($result, $this->endDelimiter);
......@@ -96,12 +96,15 @@ class Evaluate {
$evaluated = $this->substitute($match, $foundInStore);
$debugLocal[] = $debugIndent . "#Replace: '$match'";
// newline
$debugLocal[] = '';
$debugLocal[] = $debugIndent . "REPLACE: $match";
if ($foundInStore === '') {
// Encode the non replaceable part as preparation not to process again and to recode at the end.
$evaluated = Support::encryptDoubleCurlyBraces($this->startDelimiter . $match . $this->endDelimiter);
$debugLocal[] = $debugIndent . "#By: <nothing found - not replaced>";
$debugLocal[] = $debugIndent . "BY: <nothing found - not replaced>";
} else {
$flagTokenReplaced = true;
......@@ -109,11 +112,11 @@ class Evaluate {
// If an array is returned, break everything and return this assoc array.
if (is_array($evaluated)) {
$result = $evaluated;
$debugLocal[] = $debugIndent . "#By: 'array(" . count($result) . ")'";
$debugLocal[] = $debugIndent . "BY: array(" . count($result) . ")";
break;
}
$debugLocal[] = $debugIndent . "#By: '$evaluated'";
$debugLocal[] = $debugIndent . "BY: $evaluated";
// More to substitute in the new evaluated result? Start recursion just with the new result..
if (strpos($evaluated, $this->endDelimiter) !== false) {
......@@ -126,7 +129,8 @@ class Evaluate {
}
if ($flagTokenReplaced === true) {
$debugLocal[] = $debugIndent . "#Final: " . is_array($result) ? "array(" . count($result) . ")" : "'$result'";
$debugLocal[] = $debugIndent . "FINAL: " . is_array($result) ? "array(" . count($result) . ")" : "$result";
$debugStack = $debugLocal;
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment