@@ -10,51 +10,134 @@

 namespace EsalesMedia\ContentHelperBundle\EventListener;

+use Contao\FilesModel;

+use Contao\Validator;

 class InsertTagsListener

 {

     public function onReplaceInsertTags($tag)

     {

-        $strId = '';

-        $strPrefix = 'ico';

-        $template = '<svg class="%s %s"><use xlink:href="#%s"></use></svg>';

-        $elements = explode('::', $tag);

+        $elements = explode('::', $tag,2);

+        $insertTag = array_shift($elements);

-        if ($elements[0] == 'svg')

-        {

-            if ($elements[2])

+        if (strtolower($insertTag) === 'svg_inline') {

+            if (isset($elements[0]) && $elements[0])

             {

-                $strPrefix =  $elements[2];

-                if (isset($elements[3])) {

-                  $strId = $elements[3];

+                $fragments = explode(':', $elements[0]);

+                $strFile = $fragments[0];

+                $strId = null;

+                $strClass = null;

+                if (isset($fragments[1]))

+                {

+                    $strClass = $fragments[1];

+                }

+                if (isset($fragments[2]))

+                {

+                    $strId = $fragments[2];

                 }

-            }

-            if ($elements[1])

-            {

-                $strClasses = '';

-                $arrClasses = explode(':', $elements[1]);

-                $strClass = array_shift($arrClasses);

-                $strSvgId = $strPrefix.'-'.$strClass;

-                $strClasses = $strSvgId;

+                if (Validator::isUuid($strFile))

+                {

+                    // Handle UUIDs

+                    $objFile = FilesModel::findByUuid($strFile);

-                foreach ($arrClasses as $class)

+                    if ($objFile === null)

+                    {

+                        return '';

+                    }

+

+                    $strFile = $objFile->path;

+                }

+                elseif (is_numeric($strFile))

                 {

-                    $classFragments = explode(' ', $class);

-                    foreach ($classFragments as $classFragment)

+                    // Handle numeric IDs (see #4805)

+                    $objFile = FilesModel::findByPk($strFile);

+

+                    if ($objFile === null)

                     {

-                        $strClasses .= ' ' . $classFragment;

+                        return '';

                     }

+

+                    $strFile = $objFile->path;

+                }

+                elseif (Validator::isInsecurePath($strFile))

+                {

+                    throw new \RuntimeException('Invalid path ' . $strFile);

+                }

+                elseif (($objFile = FilesModel::findByPath($strFile)) !== null)

+                {

+                    $strFile = $objFile->path;

+                } else {

+                    return '';

                 }

-                if ($strId)

+                return $this->print_svg($strFile,$strClass,$strId);

+            }

+        }

+

+        if (strtolower($insertTag) === 'svg_use')

+        {

+            if (isset($elements[0]) && $elements[0])

+            {

+                $strId = '';

+                $strPrefix = 'ico';

+                $template = '<svg class="%s %s"><use xlink:href="#%s"></use></svg>';

+                $fragments = explode(':', $elements[0]);

+

+                if (isset($fragments[1]))

                 {

-                    $template = '<svg id="'.$strId.'" class="%s %s"><use xlink:href="#%s"></use></svg>';

+                    $strPrefix = $fragments[1];

+                    if (isset($fragments[2]))

+                    {

+                        $strId = $fragments[2];

+                    }

+                }

+                if (isset($fragments[0]))

+                {

+                    $strClasses = '';

+                    $arrClasses = explode(':', $fragments[0]);

+                    $strClass = array_shift($arrClasses);

+

+                    $strSvgId = $strPrefix . '-' . $strClass;

+                    $strClasses = $strSvgId;

+

+                    foreach ($arrClasses as $class)

+                    {

+                        $classFragments = explode(' ', $class);

+                        foreach ($classFragments as $classFragment)

+                        {

+                            $strClasses .= ' ' . $classFragment;

+                        }

+                    }

+

+                    if ($strId)

+                    {

+                        $template = '<svg id="' . $strId . '" class="%s %s"><use xlink:href="#%s"></use></svg>';

+                    }

+                    return sprintf($template, $strPrefix, $strClasses, $strSvgId);

                 }

-                return sprintf($template,$strPrefix,$strClasses,$strSvgId);

             }

         }

-      return false;

+        return false;

+    }

+

+    protected function print_svg($svgPath, ?string $strClass=null, ?string$strId=null){

+        $iconfile = new \DOMDocument();

+        $iconfile->load($svgPath);

+        if (($svg = $iconfile->getElementsByTagName('svg')->item(0)))

+        {

+            if ($strClass) {

+                if (($embClass = $svg->getAttribute('class')))

+                {

+                    $strClass = $embClass. ' ' . $strClass;

+                }

+                $svg->setAttribute('class', $strClass);

+            }

+            if ($strId){

+                $svg->setAttribute('id', $strId);

+            }

+            return $iconfile->saveHTML($svg);

+        }

     }

 }