Fall back to black for non-color values

Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
Joas Schilling 2019-06-20 15:23:06 +02:00 committed by Backportbot
parent 4ea822c71e
commit 1066e4a952
2 changed files with 6 additions and 0 deletions

View File

@ -111,6 +111,7 @@ class SvgController extends Controller {
*
* @param string $path
* @param string $color
* @param string $fileName
* @return DataDisplayResponse|NotFoundResponse
*/
private function getSvg(string $path, string $color, string $fileName) {

View File

@ -184,6 +184,11 @@ class IconsCacher {
* @return string
*/
public function colorizeSvg($svg, $color): string {
if (!preg_match('/^[0-9a-f]{3,6}$/i', $color)) {
// Prevent not-sane colors from being written into the SVG
$color = '000';
}
// add fill (fill is not present on black elements)
$fillRe = '/<((circle|rect|path)((?!fill)[a-z0-9 =".\-#():;,])+)\/>/mi';
$svg = preg_replace($fillRe, '<$1 fill="#' . $color . '"/>', $svg);