super table: added escapeOutputHtml property to column for better escape managing + updated related supertables

janreges · janreges · commit bfb901cb82b9 · 2023-11-07T19:57:01.000+01:00
diff --git a/src/Crawler/Analysis/DnsAnalyzer.php b/src/Crawler/Analysis/DnsAnalyzer.php
@@ -58,7 +58,7 @@ public function analyze(): void
                 }
 
                 return $value;
-            }, null, true, false, true),
+            }, null, true, false, true, false),
         ], false);
 
         $data = [];
diff --git a/src/Crawler/Analysis/SecurityAnalyzer.php b/src/Crawler/Analysis/SecurityAnalyzer.php
@@ -83,7 +83,7 @@ public function analyze(): void
                     } else {
                         return '';
                     }
-                }, null, false, false),
+                }, null, false, false, false, false),
             ], true, 'highestSeverity', 'DESC'
         );
 
diff --git a/src/Crawler/Analysis/SeoAndOpenGraphAnalyzer.php b/src/Crawler/Analysis/SeoAndOpenGraphAnalyzer.php
@@ -207,7 +207,7 @@ private function analyzeHeadings(array $urlResults): void
                     } else {
                         return HeadingTreeItem::getHeadingTreeUlLiList($urlResult->headingTreeItems);
                     }
-                }, true, false),
+                }, true, false, false, false),
                 new SuperTableColumn('headingsCount', 'Count', 5),
                 new SuperTableColumn('headingsErrorsCount', 'Errors', 6, function ($value) {
                     return Utils::getColorText(strval($value), $value > 0 ? 'red' : 'green', true);
diff --git a/src/Crawler/Analysis/SslTlsAnalyzer.php b/src/Crawler/Analysis/SslTlsAnalyzer.php
@@ -81,7 +81,7 @@ public function analyze(): void
                     } else {
                         return $value;
                     }
-                }, null, true),
+                }, null, true, true, false, false),
             ],
             true
         );
diff --git a/src/Crawler/Components/SuperTable.php b/src/Crawler/Components/SuperTable.php
@@ -163,10 +163,14 @@ public function getHtmlOutput(): string
                     $formattedValue = call_user_func($column->formatter, $value, self::RENDER_INTO_HTML);
                 } elseif ($column->renderer) {
                     $formattedValue = call_user_func($column->renderer, $row, self::RENDER_INTO_HTML);
-                } else {
-                    if ($column->nonBreakingSpaces && is_string($formattedValue)) {
-                        $formattedValue = str_replace([' ', "\t"], ['&nbsp;', str_repeat('&nbsp;', 4)], $formattedValue);
-                    }
+                }
+
+                if ($column->escapeOutputHtml) {
+                    $formattedValue = htmlspecialchars(strval($formattedValue));
+                }
+
+                if ($column->nonBreakingSpaces && is_string($formattedValue)) {
+                    $formattedValue = str_replace([' ', "\t"], ['&nbsp;', str_repeat('&nbsp;', 4)], $formattedValue);
                 }
 
                 // colored text
diff --git a/src/Crawler/Components/SuperTableColumn.php b/src/Crawler/Components/SuperTableColumn.php
@@ -24,6 +24,7 @@ class SuperTableColumn
     public readonly bool $truncateIfLonger;
     public readonly bool $formatterWillChangeValueLength;
     public readonly bool $nonBreakingSpaces;
+    public readonly bool $escapeOutputHtml;
 
     /**
      * @param string $aplCode
@@ -34,8 +35,9 @@ class SuperTableColumn
      * @param bool $truncateIfLonger
      * @param bool $formatterWillChangeValueLength
      * @param bool $nonBreakingSpaces
+     * @param bool $escapeOutputHtml
      */
-    public function __construct(string $aplCode, string $name, int $width = self::AUTO_WIDTH, ?callable $formatter = null, ?callable $renderer = null, bool $truncateIfLonger = false, bool $formatterWillChangeValueLength = true, bool $nonBreakingSpaces = false)
+    public function __construct(string $aplCode, string $name, int $width = self::AUTO_WIDTH, ?callable $formatter = null, ?callable $renderer = null, bool $truncateIfLonger = false, bool $formatterWillChangeValueLength = true, bool $nonBreakingSpaces = false, $escapeOutputHtml = true)
     {
         $this->aplCode = $aplCode;
         $this->name = $name;
@@ -45,6 +47,7 @@ public function __construct(string $aplCode, string $name, int $width = self::AU
         $this->truncateIfLonger = $truncateIfLonger;
         $this->formatterWillChangeValueLength = $formatterWillChangeValueLength;
         $this->nonBreakingSpaces = $nonBreakingSpaces;
+        $this->escapeOutputHtml = $escapeOutputHtml;
     }
 
     public function getWidthPx(): int

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public function analyze(): void`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`return $value;`
`61`		`- }, null, true, false, true),`
	`61`	`+ }, null, true, false, true, false),`
`62`	`62`	`], false);`
`63`	`63`
`64`	`64`	`$data = [];`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ public function analyze(): void`
`83`	`83`	`} else {`
`84`	`84`	`return '';`
`85`	`85`	`}`
`86`		`- }, null, false, false),`
	`86`	`+ }, null, false, false, false, false),`
`87`	`87`	`], true, 'highestSeverity', 'DESC'`
`88`	`88`	`);`
`89`	`89`
Original file line number	Diff line number	Diff line change
`@@ -207,7 +207,7 @@ private function analyzeHeadings(array $urlResults): void`
`207`	`207`	`} else {`
`208`	`208`	`return HeadingTreeItem::getHeadingTreeUlLiList($urlResult->headingTreeItems);`
`209`	`209`	`}`
`210`		`- }, true, false),`
	`210`	`+ }, true, false, false, false),`
`211`	`211`	`new SuperTableColumn('headingsCount', 'Count', 5),`
`212`	`212`	`new SuperTableColumn('headingsErrorsCount', 'Errors', 6, function ($value) {`
`213`	`213`	`return Utils::getColorText(strval($value), $value > 0 ? 'red' : 'green', true);`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ public function analyze(): void`
`81`	`81`	`} else {`
`82`	`82`	`return $value;`
`83`	`83`	`}`
`84`		`- }, null, true),`
	`84`	`+ }, null, true, true, false, false),`
`85`	`85`	`],`
`86`	`86`	`true`
`87`	`87`	`);`