lochmueller /
sourceopt
@@ -13,256 +13,256 @@ |
||
| 13 | 13 | */ |
| 14 | 14 | class SvgStoreService implements \TYPO3\CMS\Core\SingletonInterface |
| 15 | 15 | { |
| 16 | - /** |
|
| 17 | - * SVG-Sprite relativ storage directory. |
|
| 18 | - * |
|
| 19 | - * @var string |
|
| 20 | - */ |
|
| 21 | - protected $outputDir = '/typo3temp/assets/svg/'; |
|
| 22 | - |
|
| 23 | - /** |
|
| 24 | - * TYPO3 absolute path to public web. |
|
| 25 | - * |
|
| 26 | - * @var string |
|
| 27 | - */ |
|
| 28 | - protected $sitePath = ''; |
|
| 29 | - |
|
| 30 | - /** |
|
| 31 | - * Final TYPO3 Frontend-Cache object. |
|
| 32 | - * |
|
| 33 | - * @var \TYPO3\CMS\Core\Cache\Frontend\VariableFrontend |
|
| 34 | - */ |
|
| 35 | - protected $svgCache; |
|
| 36 | - |
|
| 37 | - /** |
|
| 38 | - * Cached SVG-Sprite relativ file path. |
|
| 39 | - * |
|
| 40 | - * @var string |
|
| 41 | - */ |
|
| 42 | - protected $spritePath = ''; |
|
| 43 | - |
|
| 44 | - /** |
|
| 45 | - * Cached used SVG files (incl. defs). |
|
| 46 | - * |
|
| 47 | - * @var array |
|
| 48 | - */ |
|
| 49 | - protected $svgFileArr = []; |
|
| 50 | - |
|
| 51 | - /** |
|
| 52 | - * Final SVG-Sprite Vectors. |
|
| 53 | - * |
|
| 54 | - * @var array |
|
| 55 | - */ |
|
| 56 | - protected $svgs = []; |
|
| 57 | - |
|
| 58 | - /** |
|
| 59 | - * Final SVG-Sprite Styles. |
|
| 60 | - * |
|
| 61 | - * @var array |
|
| 62 | - */ |
|
| 63 | - protected $styl = []; // ToFix ; https://stackoverflow.com/questions/39583880/external-svg-fails-to-apply-internal-css |
|
| 64 | - |
|
| 65 | - /** |
|
| 66 | - * Final SVG-Sprite Objects. |
|
| 67 | - * |
|
| 68 | - * @var array |
|
| 69 | - */ |
|
| 70 | - protected $defs = []; // ToFix ; https://bugs.chromium.org/p/chromium/issues/detail?id=751733#c14 |
|
| 71 | - |
|
| 72 | - public function __construct() |
|
| 73 | - { |
|
| 74 | - $this->sitePath = \TYPO3\CMS\Core\Core\Environment::getPublicPath(); // [^/]$ |
|
| 75 | - $this->svgCache = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Cache\CacheManager::class)->getCache('svgstore'); |
|
| 76 | - |
|
| 77 | - $this->spritePath = $this->svgCache->get('spritePath') ?: ''; |
|
| 78 | - $this->svgFileArr = $this->svgCache->get('svgFileArr') ?: []; |
|
| 79 | - |
|
| 80 | - if (empty($this->spritePath) && !$this->populateCache()) { |
|
| 81 | - throw new \Exception('could not write file: '.$this->sitePath.$this->spritePath); |
|
| 82 | - } |
|
| 83 | - |
|
| 84 | - if (!file_exists($this->sitePath.$this->spritePath)) { |
|
| 85 | - throw new \Exception('file does not exists: '.$this->sitePath.$this->spritePath); |
|
| 86 | - } |
|
| 87 | - } |
|
| 88 | - |
|
| 89 | - public function process(string $html): string |
|
| 90 | - { |
|
| 91 | - if (empty($this->svgFileArr)) { |
|
| 92 | - return $html; |
|
| 93 | - } |
|
| 94 | - |
|
| 95 | - if ($GLOBALS['TSFE']->config['config']['disableAllHeaderCode'] ?? false) { |
|
| 96 | - $dom = ['head' => '', 'body' => $html]; |
|
| 97 | - } elseif (!preg_match('/(?<head>.+?<\/head>)(?<body>.+)/s', $html, $dom)) { |
|
| 98 | - return $html; |
|
| 99 | - } |
|
| 100 | - |
|
| 101 | - // https://developer.mozilla.org/en-US/docs/Web/HTML/Element/img#attributes |
|
| 102 | - $dom['body'] = preg_replace_callback('/<img(?<pre>[^>]*)src="(?:https?:)?(?:\/\/[^\/]+?)?(?<src>\/[^"]+\.svg)"(?<post>[^>]*?)[\s\/]*>(?!\s*<\/picture>)/s', function (array $match): string { // ^[/] |
|
| 103 | - if (!isset($this->svgFileArr[$match['src']])) { // check usage |
|
| 104 | - return $match[0]; |
|
| 105 | - } |
|
| 106 | - $attr = preg_replace('/\s(?:alt|ismap|loading|title|sizes|srcset|usemap|crossorigin|decoding|fetchpriority|referrerpolicy)="[^"]*"/', '', $match['pre'].$match['post']); // cleanup |
|
| 107 | - |
|
| 108 | - return \sprintf('<svg %s %s><use href="%s#%s"/></svg>', $this->svgFileArr[$match['src']]['attr'], trim($attr), $this->spritePath, $this->convertFilePath($match['src'])); |
|
| 109 | - }, $dom['body']); |
|
| 110 | - |
|
| 111 | - // https://developer.mozilla.org/en-US/docs/Web/HTML/Element/object#attributes |
|
| 112 | - $dom['body'] = preg_replace_callback('/<object(?<pre>[^>]*)data="(?<data>\/[^"]+\.svg)"(?<post>[^>]*?)[\s\/]*>(?:<\/object>)/s', function (array $match): string { // ^[/] |
|
| 113 | - if (!isset($this->svgFileArr[$match['data']])) { // check usage |
|
| 114 | - return $match[0]; |
|
| 115 | - } |
|
| 116 | - $attr = preg_replace('/\s(?:form|name|type|usemap)="[^"]*"/', '', $match['pre'].$match['post']); // cleanup |
|
| 117 | - |
|
| 118 | - return \sprintf('<svg %s %s><use href="%s#%s"/></svg>', $this->svgFileArr[$match['data']]['attr'], trim($attr), $this->spritePath, $this->convertFilePath($match['data'])); |
|
| 119 | - }, $dom['body']); |
|
| 120 | - |
|
| 121 | - return $dom['head'].$dom['body']; |
|
| 122 | - } |
|
| 123 | - |
|
| 124 | - private function convertFilePath(string $path): string |
|
| 125 | - { |
|
| 126 | - return preg_replace('/.svg$|[^\w\-]/', '', str_replace('/', '-', ltrim($path, '/'))); // ^[^/] |
|
| 127 | - } |
|
| 128 | - |
|
| 129 | - private function addFileToSpriteArr(string $hash, string $path, array $attr = []): ?array |
|
| 130 | - { |
|
| 131 | - if (!file_exists($this->sitePath.$path)) { |
|
| 132 | - return null; |
|
| 133 | - } |
|
| 134 | - |
|
| 135 | - $svg = file_get_contents($this->sitePath.$path); |
|
| 136 | - |
|
| 137 | - if (preg_match('/(?:;base64|i:a?i?pgf)/', $svg)) { // noop! |
|
| 138 | - return null; |
|
| 139 | - } |
|
| 140 | - |
|
| 141 | - if (preg_match('/<(?:style|defs)|url\(/', $svg)) { |
|
| 142 | - return null; // check links @ __construct |
|
| 143 | - } |
|
| 144 | - |
|
| 145 | - // https://developer.mozilla.org/en-US/docs/Web/SVG/Attribute/xlink:href |
|
| 146 | - $svg = preg_replace('/^.*?<svg|\s*(<\/svg>)(?!.*\1).*$|xlink:|\s(?:(?:version|xmlns)|(?:[a-z\-]+\:[a-z\-]+))="[^"]*"/s', '', $svg); // cleanup |
|
| 147 | - |
|
| 148 | - // $svg = preg_replace('/(?<=(?:id|class)=")/', $hash.'__', $svg); // extend IDs |
|
| 149 | - // $svg = preg_replace('/(?<=href="|url\()#/', $hash.'__', $svg); // recover IDs |
|
| 150 | - |
|
| 151 | - // $svg = preg_replace_callback('/<style[^>]*>(?<styl>.+?)<\/style>|<defs[^>]*>(?<defs>.+?)<\/defs>/s', function(array $match) use($hash): string { |
|
| 152 | - // |
|
| 153 | - // if(isset($match['styl'])) |
|
| 154 | - // { |
|
| 155 | - // $this->styl[] = preg_replace('/\s*(\.|#){1}(.+?)\s*\{/', '$1'.$hash.'__$2{', $match['styl']); // patch CSS # https://mathiasbynens.be/notes/css-escapes |
|
| 156 | - // } |
|
| 157 | - // if(isset($match['defs'])) |
|
| 158 | - // { |
|
| 159 | - // $this->defs[] = trim($match['defs']); |
|
| 160 | - // } |
|
| 161 | - // return ''; |
|
| 162 | - // }, $svg); |
|
| 163 | - |
|
| 164 | - // https://developer.mozilla.org/en-US/docs/Web/SVG/Element/svg#attributes |
|
| 165 | - $svg = preg_replace_callback('/([^>]*)\s*(?=>)/s', function (array $match) use (&$attr): string { |
|
| 166 | - if (false === preg_match_all('/(?!\s)(?<attr>[a-z\-]+)="\s*(?<value>[^"]+)\s*"/i', $match[1], $matches)) { |
|
| 167 | - return $match[0]; |
|
| 168 | - } |
|
| 169 | - foreach ($matches['attr'] as $index => $attribute) { |
|
| 170 | - switch ($attribute) { |
|
| 171 | - case 'id': |
|
| 172 | - case 'width': |
|
| 173 | - case 'height': |
|
| 174 | - unset($matches[0][$index]); |
|
| 175 | - break; |
|
| 176 | - |
|
| 177 | - case 'viewBox': |
|
| 178 | - if (false !== preg_match('/(?<minX>[-+]?[\d\.]+)\s(?<minY>[-+]?[\d\.]+)\s\+?(?<width>[\d\.]+)\s\+?(?<height>[\d\.]+)/', $matches['value'][$index], $match)) { |
|
| 179 | - $attr[] = \sprintf('%s="%s %s %s %s"', $attribute, $match['minX'], $match['minY'], $match['width'], $match['height']); // save! |
|
| 180 | - } |
|
| 181 | - } |
|
| 182 | - } |
|
| 183 | - |
|
| 184 | - return implode(' ', $matches[0]); |
|
| 185 | - }, $svg, 1); |
|
| 186 | - |
|
| 187 | - if (empty($attr)) { |
|
| 188 | - return null; |
|
| 189 | - } |
|
| 190 | - |
|
| 191 | - $this->svgs[] = \sprintf('id="%s" %s', $this->convertFilePath($path), $svg); // prepend ID |
|
| 192 | - |
|
| 193 | - return ['attr' => implode(' ', $attr), 'hash' => $hash]; |
|
| 194 | - } |
|
| 195 | - |
|
| 196 | - private function populateCache(): bool |
|
| 197 | - { |
|
| 198 | - $storageArr = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Resource\StorageRepository::class)->findByStorageType('Local'); |
|
| 199 | - foreach ($storageArr as $storage) { |
|
| 200 | - $storageConfig = $storage->getConfiguration(); |
|
| 201 | - if (!\is_array($storageConfig) || !isset($storageConfig['pathType'], $storageConfig['basePath'])) { |
|
| 202 | - continue; |
|
| 203 | - } |
|
| 204 | - if ('relative' == $storageConfig['pathType']) { |
|
| 205 | - $storageArr[$storage->getUid()] = rtrim($storageConfig['basePath'], '/'); // [^/]$ |
|
| 206 | - } |
|
| 207 | - } |
|
| 208 | - unset($storageArr[0]); // keep! |
|
| 209 | - |
|
| 210 | - $fileArr = GeneralUtility::makeInstance(\HTML\Sourceopt\Resource\SvgFileRepository::class)->findAllByStorageUids(array_keys($storageArr)); |
|
| 211 | - foreach ($fileArr as $file) { |
|
| 212 | - $file['path'] = '/'.$storageArr[$file['storage']].$file['identifier']; // ^[/] |
|
| 213 | - $file['defs'] = $this->addFileToSpriteArr($file['sha1'], $file['path']); |
|
| 214 | - |
|
| 215 | - if (null !== $file['defs']) { |
|
| 216 | - $this->svgFileArr[$file['path']] = $file['defs']; |
|
| 217 | - } |
|
| 218 | - } |
|
| 219 | - unset($storageArr, $storage, $fileArr, $file); // save MEM |
|
| 220 | - |
|
| 221 | - if (empty($this->svgFileArr)) { |
|
| 222 | - return true; |
|
| 223 | - } |
|
| 224 | - |
|
| 225 | - $svg = preg_replace_callback( |
|
| 226 | - '/<use(?<pre>.*?)(?:xlink:)?href="(?<href>\/.+?\.svg)(?:#[^"]*?)?"(?<post>.*?)[\s\/]*>(?:<\/use>)?/s', |
|
| 227 | - function (array $match): string { |
|
| 228 | - if (!isset($this->svgFileArr[$match['href']])) { // check usage |
|
| 229 | - return $match[0]; |
|
| 230 | - } |
|
| 231 | - |
|
| 232 | - return \sprintf('<use%s href="#%s"/>', $match['pre'].$match['post'], $this->convertFilePath($match['href'])); |
|
| 233 | - }, |
|
| 234 | - '<svg xmlns="http://www.w3.org/2000/svg">' |
|
| 235 | - // ."\n<style>\n".implode("\n", $this->styl)."\n</style>" |
|
| 236 | - // ."\n<defs>\n".implode("\n", $this->defs)."\n</defs>" |
|
| 237 | - ."\n<symbol ".implode("</symbol>\n<symbol ", $this->svgs)."</symbol>\n" |
|
| 238 | - .'</svg>' |
|
| 239 | - ); |
|
| 240 | - |
|
| 241 | - // unset($this->styl); // save MEM |
|
| 242 | - // unset($this->defs); // save MEM |
|
| 243 | - unset($this->svgs); // save MEM |
|
| 244 | - |
|
| 245 | - if ($GLOBALS['TSFE']->config['config']['sourceopt.']['formatHtml'] ?? false) { |
|
| 246 | - $svg = preg_replace('/(?<=>)\s+(?=<)/', '', $svg); // remove emptiness |
|
| 247 | - $svg = preg_replace('/[\t\v]/', ' ', $svg); // prepare shrinkage |
|
| 248 | - $svg = preg_replace('/\s{2,}/', ' ', $svg); // shrink whitespace |
|
| 249 | - } |
|
| 250 | - |
|
| 251 | - $svg = preg_replace('/<([a-z\-]+)\s*(\/|>\s*<\/\1)>\s*|\s+(?=\/>)/i', '', $svg); // remove emtpy TAGs & shorten endings |
|
| 252 | - $svg = preg_replace('/<((circle|ellipse|line|path|polygon|polyline|rect|stop|use)\s[^>]+?)\s*>\s*<\/\2>/', '<$1/>', $svg); // shorten/minify TAG syntax |
|
| 253 | - |
|
| 254 | - if (!is_dir($this->sitePath.$this->outputDir)) { |
|
| 255 | - GeneralUtility::mkdir_deep($this->sitePath.$this->outputDir); |
|
| 256 | - } |
|
| 257 | - |
|
| 258 | - $this->spritePath = $this->outputDir.hash('sha1', serialize($this->svgFileArr)).'.svg'; |
|
| 259 | - if (false === file_put_contents($this->sitePath.$this->spritePath, $svg)) { |
|
| 260 | - return false; |
|
| 261 | - } |
|
| 262 | - |
|
| 263 | - $this->svgCache->set('spritePath', $this->spritePath); |
|
| 264 | - $this->svgCache->set('svgFileArr', $this->svgFileArr); |
|
| 265 | - |
|
| 266 | - return true; |
|
| 267 | - } |
|
| 16 | + /** |
|
| 17 | + * SVG-Sprite relativ storage directory. |
|
| 18 | + * |
|
| 19 | + * @var string |
|
| 20 | + */ |
|
| 21 | + protected $outputDir = '/typo3temp/assets/svg/'; |
|
| 22 | + |
|
| 23 | + /** |
|
| 24 | + * TYPO3 absolute path to public web. |
|
| 25 | + * |
|
| 26 | + * @var string |
|
| 27 | + */ |
|
| 28 | + protected $sitePath = ''; |
|
| 29 | + |
|
| 30 | + /** |
|
| 31 | + * Final TYPO3 Frontend-Cache object. |
|
| 32 | + * |
|
| 33 | + * @var \TYPO3\CMS\Core\Cache\Frontend\VariableFrontend |
|
| 34 | + */ |
|
| 35 | + protected $svgCache; |
|
| 36 | + |
|
| 37 | + /** |
|
| 38 | + * Cached SVG-Sprite relativ file path. |
|
| 39 | + * |
|
| 40 | + * @var string |
|
| 41 | + */ |
|
| 42 | + protected $spritePath = ''; |
|
| 43 | + |
|
| 44 | + /** |
|
| 45 | + * Cached used SVG files (incl. defs). |
|
| 46 | + * |
|
| 47 | + * @var array |
|
| 48 | + */ |
|
| 49 | + protected $svgFileArr = []; |
|
| 50 | + |
|
| 51 | + /** |
|
| 52 | + * Final SVG-Sprite Vectors. |
|
| 53 | + * |
|
| 54 | + * @var array |
|
| 55 | + */ |
|
| 56 | + protected $svgs = []; |
|
| 57 | + |
|
| 58 | + /** |
|
| 59 | + * Final SVG-Sprite Styles. |
|
| 60 | + * |
|
| 61 | + * @var array |
|
| 62 | + */ |
|
| 63 | + protected $styl = []; // ToFix ; https://stackoverflow.com/questions/39583880/external-svg-fails-to-apply-internal-css |
|
| 64 | + |
|
| 65 | + /** |
|
| 66 | + * Final SVG-Sprite Objects. |
|
| 67 | + * |
|
| 68 | + * @var array |
|
| 69 | + */ |
|
| 70 | + protected $defs = []; // ToFix ; https://bugs.chromium.org/p/chromium/issues/detail?id=751733#c14 |
|
| 71 | + |
|
| 72 | + public function __construct() |
|
| 73 | + { |
|
| 74 | + $this->sitePath = \TYPO3\CMS\Core\Core\Environment::getPublicPath(); // [^/]$ |
|
| 75 | + $this->svgCache = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Cache\CacheManager::class)->getCache('svgstore'); |
|
| 76 | + |
|
| 77 | + $this->spritePath = $this->svgCache->get('spritePath') ?: ''; |
|
| 78 | + $this->svgFileArr = $this->svgCache->get('svgFileArr') ?: []; |
|
| 79 | + |
|
| 80 | + if (empty($this->spritePath) && !$this->populateCache()) { |
|
| 81 | + throw new \Exception('could not write file: '.$this->sitePath.$this->spritePath); |
|
| 82 | + } |
|
| 83 | + |
|
| 84 | + if (!file_exists($this->sitePath.$this->spritePath)) { |
|
| 85 | + throw new \Exception('file does not exists: '.$this->sitePath.$this->spritePath); |
|
| 86 | + } |
|
| 87 | + } |
|
| 88 | + |
|
| 89 | + public function process(string $html): string |
|
| 90 | + { |
|
| 91 | + if (empty($this->svgFileArr)) { |
|
| 92 | + return $html; |
|
| 93 | + } |
|
| 94 | + |
|
| 95 | + if ($GLOBALS['TSFE']->config['config']['disableAllHeaderCode'] ?? false) { |
|
| 96 | + $dom = ['head' => '', 'body' => $html]; |
|
| 97 | + } elseif (!preg_match('/(?<head>.+?<\/head>)(?<body>.+)/s', $html, $dom)) { |
|
| 98 | + return $html; |
|
| 99 | + } |
|
| 100 | + |
|
| 101 | + // https://developer.mozilla.org/en-US/docs/Web/HTML/Element/img#attributes |
|
| 102 | + $dom['body'] = preg_replace_callback('/<img(?<pre>[^>]*)src="(?:https?:)?(?:\/\/[^\/]+?)?(?<src>\/[^"]+\.svg)"(?<post>[^>]*?)[\s\/]*>(?!\s*<\/picture>)/s', function (array $match): string { // ^[/] |
|
| 103 | + if (!isset($this->svgFileArr[$match['src']])) { // check usage |
|
| 104 | + return $match[0]; |
|
| 105 | + } |
|
| 106 | + $attr = preg_replace('/\s(?:alt|ismap|loading|title|sizes|srcset|usemap|crossorigin|decoding|fetchpriority|referrerpolicy)="[^"]*"/', '', $match['pre'].$match['post']); // cleanup |
|
| 107 | + |
|
| 108 | + return \sprintf('<svg %s %s><use href="%s#%s"/></svg>', $this->svgFileArr[$match['src']]['attr'], trim($attr), $this->spritePath, $this->convertFilePath($match['src'])); |
|
| 109 | + }, $dom['body']); |
|
| 110 | + |
|
| 111 | + // https://developer.mozilla.org/en-US/docs/Web/HTML/Element/object#attributes |
|
| 112 | + $dom['body'] = preg_replace_callback('/<object(?<pre>[^>]*)data="(?<data>\/[^"]+\.svg)"(?<post>[^>]*?)[\s\/]*>(?:<\/object>)/s', function (array $match): string { // ^[/] |
|
| 113 | + if (!isset($this->svgFileArr[$match['data']])) { // check usage |
|
| 114 | + return $match[0]; |
|
| 115 | + } |
|
| 116 | + $attr = preg_replace('/\s(?:form|name|type|usemap)="[^"]*"/', '', $match['pre'].$match['post']); // cleanup |
|
| 117 | + |
|
| 118 | + return \sprintf('<svg %s %s><use href="%s#%s"/></svg>', $this->svgFileArr[$match['data']]['attr'], trim($attr), $this->spritePath, $this->convertFilePath($match['data'])); |
|
| 119 | + }, $dom['body']); |
|
| 120 | + |
|
| 121 | + return $dom['head'].$dom['body']; |
|
| 122 | + } |
|
| 123 | + |
|
| 124 | + private function convertFilePath(string $path): string |
|
| 125 | + { |
|
| 126 | + return preg_replace('/.svg$|[^\w\-]/', '', str_replace('/', '-', ltrim($path, '/'))); // ^[^/] |
|
| 127 | + } |
|
| 128 | + |
|
| 129 | + private function addFileToSpriteArr(string $hash, string $path, array $attr = []): ?array |
|
| 130 | + { |
|
| 131 | + if (!file_exists($this->sitePath.$path)) { |
|
| 132 | + return null; |
|
| 133 | + } |
|
| 134 | + |
|
| 135 | + $svg = file_get_contents($this->sitePath.$path); |
|
| 136 | + |
|
| 137 | + if (preg_match('/(?:;base64|i:a?i?pgf)/', $svg)) { // noop! |
|
| 138 | + return null; |
|
| 139 | + } |
|
| 140 | + |
|
| 141 | + if (preg_match('/<(?:style|defs)|url\(/', $svg)) { |
|
| 142 | + return null; // check links @ __construct |
|
| 143 | + } |
|
| 144 | + |
|
| 145 | + // https://developer.mozilla.org/en-US/docs/Web/SVG/Attribute/xlink:href |
|
| 146 | + $svg = preg_replace('/^.*?<svg|\s*(<\/svg>)(?!.*\1).*$|xlink:|\s(?:(?:version|xmlns)|(?:[a-z\-]+\:[a-z\-]+))="[^"]*"/s', '', $svg); // cleanup |
|
| 147 | + |
|
| 148 | + // $svg = preg_replace('/(?<=(?:id|class)=")/', $hash.'__', $svg); // extend IDs |
|
| 149 | + // $svg = preg_replace('/(?<=href="|url\()#/', $hash.'__', $svg); // recover IDs |
|
| 150 | + |
|
| 151 | + // $svg = preg_replace_callback('/<style[^>]*>(?<styl>.+?)<\/style>|<defs[^>]*>(?<defs>.+?)<\/defs>/s', function(array $match) use($hash): string { |
|
| 152 | + // |
|
| 153 | + // if(isset($match['styl'])) |
|
| 154 | + // { |
|
| 155 | + // $this->styl[] = preg_replace('/\s*(\.|#){1}(.+?)\s*\{/', '$1'.$hash.'__$2{', $match['styl']); // patch CSS # https://mathiasbynens.be/notes/css-escapes |
|
| 156 | + // } |
|
| 157 | + // if(isset($match['defs'])) |
|
| 158 | + // { |
|
| 159 | + // $this->defs[] = trim($match['defs']); |
|
| 160 | + // } |
|
| 161 | + // return ''; |
|
| 162 | + // }, $svg); |
|
| 163 | + |
|
| 164 | + // https://developer.mozilla.org/en-US/docs/Web/SVG/Element/svg#attributes |
|
| 165 | + $svg = preg_replace_callback('/([^>]*)\s*(?=>)/s', function (array $match) use (&$attr): string { |
|
| 166 | + if (false === preg_match_all('/(?!\s)(?<attr>[a-z\-]+)="\s*(?<value>[^"]+)\s*"/i', $match[1], $matches)) { |
|
| 167 | + return $match[0]; |
|
| 168 | + } |
|
| 169 | + foreach ($matches['attr'] as $index => $attribute) { |
|
| 170 | + switch ($attribute) { |
|
| 171 | + case 'id': |
|
| 172 | + case 'width': |
|
| 173 | + case 'height': |
|
| 174 | + unset($matches[0][$index]); |
|
| 175 | + break; |
|
| 176 | + |
|
| 177 | + case 'viewBox': |
|
| 178 | + if (false !== preg_match('/(?<minX>[-+]?[\d\.]+)\s(?<minY>[-+]?[\d\.]+)\s\+?(?<width>[\d\.]+)\s\+?(?<height>[\d\.]+)/', $matches['value'][$index], $match)) { |
|
| 179 | + $attr[] = \sprintf('%s="%s %s %s %s"', $attribute, $match['minX'], $match['minY'], $match['width'], $match['height']); // save! |
|
| 180 | + } |
|
| 181 | + } |
|
| 182 | + } |
|
| 183 | + |
|
| 184 | + return implode(' ', $matches[0]); |
|
| 185 | + }, $svg, 1); |
|
| 186 | + |
|
| 187 | + if (empty($attr)) { |
|
| 188 | + return null; |
|
| 189 | + } |
|
| 190 | + |
|
| 191 | + $this->svgs[] = \sprintf('id="%s" %s', $this->convertFilePath($path), $svg); // prepend ID |
|
| 192 | + |
|
| 193 | + return ['attr' => implode(' ', $attr), 'hash' => $hash]; |
|
| 194 | + } |
|
| 195 | + |
|
| 196 | + private function populateCache(): bool |
|
| 197 | + { |
|
| 198 | + $storageArr = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Resource\StorageRepository::class)->findByStorageType('Local'); |
|
| 199 | + foreach ($storageArr as $storage) { |
|
| 200 | + $storageConfig = $storage->getConfiguration(); |
|
| 201 | + if (!\is_array($storageConfig) || !isset($storageConfig['pathType'], $storageConfig['basePath'])) { |
|
| 202 | + continue; |
|
| 203 | + } |
|
| 204 | + if ('relative' == $storageConfig['pathType']) { |
|
| 205 | + $storageArr[$storage->getUid()] = rtrim($storageConfig['basePath'], '/'); // [^/]$ |
|
| 206 | + } |
|
| 207 | + } |
|
| 208 | + unset($storageArr[0]); // keep! |
|
| 209 | + |
|
| 210 | + $fileArr = GeneralUtility::makeInstance(\HTML\Sourceopt\Resource\SvgFileRepository::class)->findAllByStorageUids(array_keys($storageArr)); |
|
| 211 | + foreach ($fileArr as $file) { |
|
| 212 | + $file['path'] = '/'.$storageArr[$file['storage']].$file['identifier']; // ^[/] |
|
| 213 | + $file['defs'] = $this->addFileToSpriteArr($file['sha1'], $file['path']); |
|
| 214 | + |
|
| 215 | + if (null !== $file['defs']) { |
|
| 216 | + $this->svgFileArr[$file['path']] = $file['defs']; |
|
| 217 | + } |
|
| 218 | + } |
|
| 219 | + unset($storageArr, $storage, $fileArr, $file); // save MEM |
|
| 220 | + |
|
| 221 | + if (empty($this->svgFileArr)) { |
|
| 222 | + return true; |
|
| 223 | + } |
|
| 224 | + |
|
| 225 | + $svg = preg_replace_callback( |
|
| 226 | + '/<use(?<pre>.*?)(?:xlink:)?href="(?<href>\/.+?\.svg)(?:#[^"]*?)?"(?<post>.*?)[\s\/]*>(?:<\/use>)?/s', |
|
| 227 | + function (array $match): string { |
|
| 228 | + if (!isset($this->svgFileArr[$match['href']])) { // check usage |
|
| 229 | + return $match[0]; |
|
| 230 | + } |
|
| 231 | + |
|
| 232 | + return \sprintf('<use%s href="#%s"/>', $match['pre'].$match['post'], $this->convertFilePath($match['href'])); |
|
| 233 | + }, |
|
| 234 | + '<svg xmlns="http://www.w3.org/2000/svg">' |
|
| 235 | + // ."\n<style>\n".implode("\n", $this->styl)."\n</style>" |
|
| 236 | + // ."\n<defs>\n".implode("\n", $this->defs)."\n</defs>" |
|
| 237 | + ."\n<symbol ".implode("</symbol>\n<symbol ", $this->svgs)."</symbol>\n" |
|
| 238 | + .'</svg>' |
|
| 239 | + ); |
|
| 240 | + |
|
| 241 | + // unset($this->styl); // save MEM |
|
| 242 | + // unset($this->defs); // save MEM |
|
| 243 | + unset($this->svgs); // save MEM |
|
| 244 | + |
|
| 245 | + if ($GLOBALS['TSFE']->config['config']['sourceopt.']['formatHtml'] ?? false) { |
|
| 246 | + $svg = preg_replace('/(?<=>)\s+(?=<)/', '', $svg); // remove emptiness |
|
| 247 | + $svg = preg_replace('/[\t\v]/', ' ', $svg); // prepare shrinkage |
|
| 248 | + $svg = preg_replace('/\s{2,}/', ' ', $svg); // shrink whitespace |
|
| 249 | + } |
|
| 250 | + |
|
| 251 | + $svg = preg_replace('/<([a-z\-]+)\s*(\/|>\s*<\/\1)>\s*|\s+(?=\/>)/i', '', $svg); // remove emtpy TAGs & shorten endings |
|
| 252 | + $svg = preg_replace('/<((circle|ellipse|line|path|polygon|polyline|rect|stop|use)\s[^>]+?)\s*>\s*<\/\2>/', '<$1/>', $svg); // shorten/minify TAG syntax |
|
| 253 | + |
|
| 254 | + if (!is_dir($this->sitePath.$this->outputDir)) { |
|
| 255 | + GeneralUtility::mkdir_deep($this->sitePath.$this->outputDir); |
|
| 256 | + } |
|
| 257 | + |
|
| 258 | + $this->spritePath = $this->outputDir.hash('sha1', serialize($this->svgFileArr)).'.svg'; |
|
| 259 | + if (false === file_put_contents($this->sitePath.$this->spritePath, $svg)) { |
|
| 260 | + return false; |
|
| 261 | + } |
|
| 262 | + |
|
| 263 | + $this->svgCache->set('spritePath', $this->spritePath); |
|
| 264 | + $this->svgCache->set('svgFileArr', $this->svgFileArr); |
|
| 265 | + |
|
| 266 | + return true; |
|
| 267 | + } |
|
| 268 | 268 | } |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | } |
| 100 | 100 | |
| 101 | 101 | // https://developer.mozilla.org/en-US/docs/Web/HTML/Element/img#attributes |
| 102 | - $dom['body'] = preg_replace_callback('/<img(?<pre>[^>]*)src="(?:https?:)?(?:\/\/[^\/]+?)?(?<src>\/[^"]+\.svg)"(?<post>[^>]*?)[\s\/]*>(?!\s*<\/picture>)/s', function (array $match): string { // ^[/] |
|
| 102 | + $dom['body'] = preg_replace_callback('/<img(?<pre>[^>]*)src="(?:https?:)?(?:\/\/[^\/]+?)?(?<src>\/[^"]+\.svg)"(?<post>[^>]*?)[\s\/]*>(?!\s*<\/picture>)/s', function(array $match): string { // ^[/] |
|
| 103 | 103 | if (!isset($this->svgFileArr[$match['src']])) { // check usage |
| 104 | 104 | return $match[0]; |
| 105 | 105 | } |
@@ -109,7 +109,7 @@ discard block |
||
| 109 | 109 | }, $dom['body']); |
| 110 | 110 | |
| 111 | 111 | // https://developer.mozilla.org/en-US/docs/Web/HTML/Element/object#attributes |
| 112 | - $dom['body'] = preg_replace_callback('/<object(?<pre>[^>]*)data="(?<data>\/[^"]+\.svg)"(?<post>[^>]*?)[\s\/]*>(?:<\/object>)/s', function (array $match): string { // ^[/] |
|
| 112 | + $dom['body'] = preg_replace_callback('/<object(?<pre>[^>]*)data="(?<data>\/[^"]+\.svg)"(?<post>[^>]*?)[\s\/]*>(?:<\/object>)/s', function(array $match): string { // ^[/] |
|
| 113 | 113 | if (!isset($this->svgFileArr[$match['data']])) { // check usage |
| 114 | 114 | return $match[0]; |
| 115 | 115 | } |
@@ -162,7 +162,7 @@ discard block |
||
| 162 | 162 | // }, $svg); |
| 163 | 163 | |
| 164 | 164 | // https://developer.mozilla.org/en-US/docs/Web/SVG/Element/svg#attributes |
| 165 | - $svg = preg_replace_callback('/([^>]*)\s*(?=>)/s', function (array $match) use (&$attr): string { |
|
| 165 | + $svg = preg_replace_callback('/([^>]*)\s*(?=>)/s', function(array $match) use (&$attr): string { |
|
| 166 | 166 | if (false === preg_match_all('/(?!\s)(?<attr>[a-z\-]+)="\s*(?<value>[^"]+)\s*"/i', $match[1], $matches)) { |
| 167 | 167 | return $match[0]; |
| 168 | 168 | } |
@@ -224,7 +224,7 @@ discard block |
||
| 224 | 224 | |
| 225 | 225 | $svg = preg_replace_callback( |
| 226 | 226 | '/<use(?<pre>.*?)(?:xlink:)?href="(?<href>\/.+?\.svg)(?:#[^"]*?)?"(?<post>.*?)[\s\/]*>(?:<\/use>)?/s', |
| 227 | - function (array $match): string { |
|
| 227 | + function(array $match): string { |
|
| 228 | 228 | if (!isset($this->svgFileArr[$match['href']])) { // check usage |
| 229 | 229 | return $match[0]; |
| 230 | 230 | } |
@@ -17,392 +17,392 @@ |
||
| 17 | 17 | */ |
| 18 | 18 | class CleanHtmlService implements SingletonInterface |
| 19 | 19 | { |
| 20 | - /** |
|
| 21 | - * Enable Debug comment in footer. |
|
| 22 | - * |
|
| 23 | - * @var bool |
|
| 24 | - */ |
|
| 25 | - protected $debugComment = false; |
|
| 26 | - |
|
| 27 | - /** |
|
| 28 | - * Format Type. |
|
| 29 | - * |
|
| 30 | - * @var int |
|
| 31 | - */ |
|
| 32 | - protected $formatType = 0; |
|
| 33 | - |
|
| 34 | - /** |
|
| 35 | - * Tab character. |
|
| 36 | - * |
|
| 37 | - * @var string |
|
| 38 | - */ |
|
| 39 | - protected $tab = "\t"; |
|
| 40 | - |
|
| 41 | - /** |
|
| 42 | - * Newline character. |
|
| 43 | - * |
|
| 44 | - * @var string |
|
| 45 | - */ |
|
| 46 | - protected $newline = "\n"; |
|
| 47 | - |
|
| 48 | - /** |
|
| 49 | - * Configured extra header comment. |
|
| 50 | - * |
|
| 51 | - * @var string |
|
| 52 | - */ |
|
| 53 | - protected $headerComment = ''; |
|
| 54 | - |
|
| 55 | - /** |
|
| 56 | - * Empty space char. |
|
| 57 | - * |
|
| 58 | - * @var string |
|
| 59 | - */ |
|
| 60 | - protected $emptySpaceChar = ' '; |
|
| 61 | - |
|
| 62 | - /** |
|
| 63 | - * Set variables based on given config. |
|
| 64 | - */ |
|
| 65 | - public function setVariables(array $config): void |
|
| 66 | - { |
|
| 67 | - if (isset($config['headerComment']) && !empty($config['headerComment'])) { |
|
| 68 | - $this->headerComment = $config['headerComment']; |
|
| 69 | - } |
|
| 70 | - |
|
| 71 | - if (isset($config['formatHtml']) && is_numeric($config['formatHtml'])) { |
|
| 72 | - $this->formatType = (int) $config['formatHtml']; |
|
| 73 | - } |
|
| 74 | - |
|
| 75 | - if (isset($config['formatHtml.']['tabSize']) && is_numeric($config['formatHtml.']['tabSize'])) { |
|
| 76 | - $this->tab = str_pad('', (int) $config['formatHtml.']['tabSize'], ' '); |
|
| 77 | - } |
|
| 78 | - |
|
| 79 | - if (isset($config['formatHtml.']['debugComment'])) { |
|
| 80 | - $this->debugComment = (bool) $config['formatHtml.']['debugComment']; |
|
| 81 | - } |
|
| 82 | - |
|
| 83 | - if (isset($config['dropEmptySpaceChar']) && (bool) $config['dropEmptySpaceChar']) { |
|
| 84 | - $this->emptySpaceChar = ''; |
|
| 85 | - } |
|
| 86 | - } |
|
| 87 | - |
|
| 88 | - /** |
|
| 89 | - * Clean given HTML with formatter. |
|
| 90 | - * |
|
| 91 | - * @return string |
|
| 92 | - */ |
|
| 93 | - public function clean(string $html, array $config = []) |
|
| 94 | - { |
|
| 95 | - if (!empty($config)) { |
|
| 96 | - $this->setVariables($config); |
|
| 97 | - } |
|
| 98 | - |
|
| 99 | - // convert line-breaks to UNIX |
|
| 100 | - $this->convNlOs($html); |
|
| 101 | - |
|
| 102 | - $manipulations = []; |
|
| 103 | - |
|
| 104 | - if (isset($config['removeGenerator']) && (bool) $config['removeGenerator']) { |
|
| 105 | - $manipulations['removeGenerator'] = GeneralUtility::makeInstance(RemoveGenerator::class); |
|
| 106 | - } |
|
| 107 | - |
|
| 108 | - if (isset($config['removeComments']) && (bool) $config['removeComments']) { |
|
| 109 | - $manipulations['removeComments'] = GeneralUtility::makeInstance(RemoveComments::class); |
|
| 110 | - } |
|
| 111 | - |
|
| 112 | - if (!empty($this->headerComment)) { |
|
| 113 | - $this->includeHeaderComment($html); |
|
| 114 | - } |
|
| 115 | - |
|
| 116 | - foreach ($manipulations as $key => $manipulation) { |
|
| 117 | - /** @var ManipulationInterface $manipulation */ |
|
| 118 | - $configuration = isset($config[$key.'.']) && \is_array($config[$key.'.']) ? $config[$key.'.'] : []; |
|
| 119 | - $html = $manipulation->manipulate($html, $configuration); |
|
| 120 | - } |
|
| 121 | - |
|
| 122 | - // cleanup HTML5 self-closing elements |
|
| 123 | - if (!isset($GLOBALS['TSFE']->config['config']['doctype']) |
|
| 124 | - || 'x' !== substr($GLOBALS['TSFE']->config['config']['doctype'], 0, 1)) { |
|
| 125 | - $html = preg_replace( |
|
| 126 | - '/<((?:area|base|br|col|embed|hr|img|input|link|meta|param|source|track|wbr)\s[^>]+?)\s*\\\?\/>/', |
|
| 127 | - '<$1>', |
|
| 128 | - $html |
|
| 129 | - ); |
|
| 130 | - } |
|
| 131 | - |
|
| 132 | - if ($this->formatType > 0) { |
|
| 133 | - $html = $this->formatHtml($html); |
|
| 134 | - } |
|
| 135 | - |
|
| 136 | - // remove white space after line ending |
|
| 137 | - $this->rTrimLines($html); |
|
| 138 | - |
|
| 139 | - // recover line-breaks |
|
| 140 | - if (Environment::isWindows()) { |
|
| 141 | - $html = str_replace($this->newline, "\r\n", $html); |
|
| 142 | - } |
|
| 143 | - |
|
| 144 | - return (string) $html; |
|
| 145 | - } |
|
| 146 | - |
|
| 147 | - /** |
|
| 148 | - * Formats the (X)HTML code: |
|
| 149 | - * - taps according to the hirarchy of the tags |
|
| 150 | - * - removes empty spaces between tags |
|
| 151 | - * - removes linebreaks within tags (spares where necessary: pre, textarea, comments, ..) |
|
| 152 | - * choose from five options: |
|
| 153 | - * 0 => off |
|
| 154 | - * 1 => no line break at all (code in one line) |
|
| 155 | - * 2 => minimalistic line breaks (structure defining box-elements) |
|
| 156 | - * 3 => aesthetic line breaks (important box-elements) |
|
| 157 | - * 4 => logic line breaks (all box-elements) |
|
| 158 | - * 5 => max line breaks (all elements). |
|
| 159 | - */ |
|
| 160 | - protected function formatHtml(string $html): string |
|
| 161 | - { |
|
| 162 | - // Save original formated pre, textarea, comments, styles and scripts & replace them with markers |
|
| 163 | - preg_match_all( |
|
| 164 | - '/(?s)((<!--.*?-->)|(<[ \n\r]*pre[^>]*>.*?<[ \n\r]*\/pre[^>]*>)|(<[ \n\r]*textarea[^>]*>.*?<[ \n\r]*\/textarea[^>]*>)|(<[ \n\r]*style[^>]*>.*?<[ \n\r]*\/style[^>]*>)|(<[ \n\r]*script[^>]*>.*?<[ \n\r]*\/script[^>]*>))/im', |
|
| 165 | - $html, |
|
| 166 | - $matches |
|
| 167 | - ); |
|
| 168 | - $noFormat = $matches[0]; // do not format these block elements |
|
| 169 | - for ($i = 0; $i < \count($noFormat); ++$i) { |
|
| 170 | - $html = str_replace($noFormat[$i], "\n<!-- ELEMENT {$i} -->", $html); |
|
| 171 | - } |
|
| 172 | - |
|
| 173 | - // define box elements for formatting |
|
| 174 | - $trueBoxElements = 'address|blockquote|center|dir|div|dl|fieldset|form|h1|h2|h3|h4|h5|h6|hr|isindex|menu|noframes|noscript|ol|p|pre|table|ul|article|aside|details|figcaption|figure|footer|header|hgroup|menu|nav|section'; |
|
| 175 | - $functionalBoxElements = 'dd|dt|frameset|li|tbody|td|tfoot|th|thead|tr|colgroup'; |
|
| 176 | - $usableBoxElements = 'applet|button|del|iframe|ins|map|object|script'; |
|
| 177 | - $imagineBoxElements = 'html|body|head|meta|title|link|script|base|!--'; |
|
| 178 | - $allBoxLikeElements = '(?>'.$trueBoxElements.'|'.$functionalBoxElements.'|'.$usableBoxElements.'|'.$imagineBoxElements.')'; |
|
| 179 | - $esteticBoxLikeElements = '(?>html|head|body|meta name|title|div|table|h1|h2|h3|h4|h5|h6|p|form|pre|center|!--)'; |
|
| 180 | - $structureBoxLikeElements = '(?>html|head|body|div|!--)'; |
|
| 181 | - |
|
| 182 | - // split html into it's elements |
|
| 183 | - $htmlArrayTemp = preg_split( |
|
| 184 | - '/(<(?:[^<>]+(?:"[^"]*"|\'[^\']*\')?)+>)/', |
|
| 185 | - $html, |
|
| 186 | - -1, |
|
| 187 | - \PREG_SPLIT_DELIM_CAPTURE | \PREG_SPLIT_NO_EMPTY |
|
| 188 | - ); |
|
| 189 | - |
|
| 190 | - if (false === $htmlArrayTemp) { |
|
| 191 | - // Restore saved comments, styles and scripts |
|
| 192 | - for ($i = 0; $i < \count($noFormat); ++$i) { |
|
| 193 | - $html = str_replace("<!-- ELEMENT {$i} -->", $noFormat[$i], $html); |
|
| 194 | - } |
|
| 195 | - |
|
| 196 | - return $html; |
|
| 197 | - } |
|
| 198 | - // remove empty lines |
|
| 199 | - $htmlArray = ['']; |
|
| 200 | - $index = 1; |
|
| 201 | - for ($x = 0; $x < \count($htmlArrayTemp); ++$x) { |
|
| 202 | - $text = trim($htmlArrayTemp[$x]); |
|
| 203 | - $htmlArray[$index] = '' !== $text ? $htmlArrayTemp[$x] : $this->emptySpaceChar; |
|
| 204 | - ++$index; |
|
| 205 | - } |
|
| 206 | - |
|
| 207 | - // rebuild html |
|
| 208 | - $html = ''; |
|
| 209 | - $tabs = 0; |
|
| 210 | - for ($x = 0; $x < \count($htmlArray); ++$x) { |
|
| 211 | - $htmlArrayBefore = $htmlArray[$x - 1] ?? ''; |
|
| 212 | - $htmlArrayCurrent = $htmlArray[$x] ?? ''; |
|
| 213 | - |
|
| 214 | - // check if the element should stand in a new line |
|
| 215 | - $newline = false; |
|
| 216 | - if ('<?xml' == substr($htmlArrayBefore, 0, 5)) { |
|
| 217 | - $newline = true; |
|
| 218 | - } elseif (2 == $this->formatType && ( // minimalistic line break |
|
| 219 | - // this element has a line break before itself |
|
| 220 | - preg_match( |
|
| 221 | - '/<'.$structureBoxLikeElements.'(.*)>/Usi', |
|
| 222 | - $htmlArrayCurrent |
|
| 223 | - ) || preg_match( |
|
| 224 | - '/<'.$structureBoxLikeElements.'(.*) \/>/Usi', |
|
| 225 | - $htmlArrayCurrent |
|
| 226 | - ) // one element before is a element that has a line break after |
|
| 227 | - || preg_match( |
|
| 228 | - '/<\/'.$structureBoxLikeElements.'(.*)>/Usi', |
|
| 229 | - $htmlArrayBefore |
|
| 230 | - ) || '<!--' == substr( |
|
| 231 | - $htmlArrayBefore, |
|
| 232 | - 0, |
|
| 233 | - 4 |
|
| 234 | - ) || preg_match('/<'.$structureBoxLikeElements.'(.*) \/>/Usi', $htmlArrayBefore)) |
|
| 235 | - ) { |
|
| 236 | - $newline = true; |
|
| 237 | - } elseif (3 == $this->formatType && ( // aestetic line break |
|
| 238 | - // this element has a line break before itself |
|
| 239 | - preg_match( |
|
| 240 | - '/<'.$esteticBoxLikeElements.'(.*)>/Usi', |
|
| 241 | - $htmlArrayCurrent |
|
| 242 | - ) || preg_match( |
|
| 243 | - '/<'.$esteticBoxLikeElements.'(.*) \/>/Usi', |
|
| 244 | - $htmlArrayCurrent |
|
| 245 | - ) // one element before is a element that has a line break after |
|
| 246 | - || preg_match('/<\/'.$esteticBoxLikeElements.'(.*)>/Usi', $htmlArrayBefore) || '<!--' == substr( |
|
| 247 | - $htmlArrayBefore, |
|
| 248 | - 0, |
|
| 249 | - 4 |
|
| 250 | - ) || preg_match('/<'.$esteticBoxLikeElements.'(.*) \/>/Usi', $htmlArrayBefore)) |
|
| 251 | - ) { |
|
| 252 | - $newline = true; |
|
| 253 | - } elseif ($this->formatType >= 4 && ( // logical line break |
|
| 254 | - // this element has a line break before itself |
|
| 255 | - preg_match( |
|
| 256 | - '/<'.$allBoxLikeElements.'(.*)>/Usi', |
|
| 257 | - $htmlArrayCurrent |
|
| 258 | - ) || preg_match( |
|
| 259 | - '/<'.$allBoxLikeElements.'(.*) \/>/Usi', |
|
| 260 | - $htmlArrayCurrent |
|
| 261 | - ) // one element before is a element that has a line break after |
|
| 262 | - || preg_match('/<\/'.$allBoxLikeElements.'(.*)>/Usi', $htmlArrayBefore) || '<!--' == substr( |
|
| 263 | - $htmlArrayBefore, |
|
| 264 | - 0, |
|
| 265 | - 4 |
|
| 266 | - ) || preg_match('/<'.$allBoxLikeElements.'(.*) \/>/Usi', $htmlArrayBefore)) |
|
| 267 | - ) { |
|
| 268 | - $newline = true; |
|
| 269 | - } |
|
| 270 | - |
|
| 271 | - // count down a tab |
|
| 272 | - if ('</' == substr($htmlArrayCurrent, 0, 2)) { |
|
| 273 | - --$tabs; |
|
| 274 | - } |
|
| 275 | - |
|
| 276 | - // add tabs and line breaks in front of the current tag |
|
| 277 | - if ($newline) { |
|
| 278 | - $html .= $this->newline; |
|
| 279 | - for ($y = 0; $y < $tabs; ++$y) { |
|
| 280 | - $html .= $this->tab; |
|
| 281 | - } |
|
| 282 | - } |
|
| 283 | - |
|
| 284 | - // remove white spaces and line breaks and add current tag to the html-string |
|
| 285 | - if ('<![CDATA[' == substr($htmlArrayCurrent, 0, 9) // remove multiple white space in CDATA / XML |
|
| 286 | - || '<?xml' == substr($htmlArrayCurrent, 0, 5) |
|
| 287 | - ) { |
|
| 288 | - $html .= $this->killWhiteSpace($htmlArrayCurrent); |
|
| 289 | - } else { // remove all line breaks |
|
| 290 | - $html .= $this->killLineBreaks($htmlArrayCurrent); |
|
| 291 | - } |
|
| 292 | - |
|
| 293 | - // count up a tab |
|
| 294 | - if ('<' == substr($htmlArrayCurrent, 0, 1) && '/' != substr($htmlArrayCurrent, 1, 1)) { |
|
| 295 | - if (' ' !== substr($htmlArrayCurrent, 1, 1) |
|
| 296 | - && 'img' !== substr($htmlArrayCurrent, 1, 3) |
|
| 297 | - && 'source' !== substr($htmlArrayCurrent, 1, 6) |
|
| 298 | - && 'br' !== substr($htmlArrayCurrent, 1, 2) |
|
| 299 | - && 'hr' !== substr($htmlArrayCurrent, 1, 2) |
|
| 300 | - && 'input' !== substr($htmlArrayCurrent, 1, 5) |
|
| 301 | - && 'link' !== substr($htmlArrayCurrent, 1, 4) |
|
| 302 | - && 'meta' !== substr($htmlArrayCurrent, 1, 4) |
|
| 303 | - && 'col ' !== substr($htmlArrayCurrent, 1, 4) |
|
| 304 | - && 'frame' !== substr($htmlArrayCurrent, 1, 5) |
|
| 305 | - && 'isindex' !== substr($htmlArrayCurrent, 1, 7) |
|
| 306 | - && 'param' !== substr($htmlArrayCurrent, 1, 5) |
|
| 307 | - && 'area' !== substr($htmlArrayCurrent, 1, 4) |
|
| 308 | - && 'base' !== substr($htmlArrayCurrent, 1, 4) |
|
| 309 | - && '<!' !== substr($htmlArrayCurrent, 0, 2) |
|
| 310 | - && '<?xml' !== substr($htmlArrayCurrent, 0, 5) |
|
| 311 | - ) { |
|
| 312 | - ++$tabs; |
|
| 313 | - } |
|
| 314 | - } |
|
| 315 | - } |
|
| 316 | - |
|
| 317 | - // Remove empty lines |
|
| 318 | - if ($this->formatType > 1) { |
|
| 319 | - $this->removeEmptyLines($html); |
|
| 320 | - } |
|
| 321 | - |
|
| 322 | - // Restore saved comments, styles and scripts |
|
| 323 | - for ($i = 0; $i < \count($noFormat); ++$i) { |
|
| 324 | - $html = str_replace("<!-- ELEMENT {$i} -->", $noFormat[$i], $html); |
|
| 325 | - } |
|
| 326 | - |
|
| 327 | - // include debug comment at the end |
|
| 328 | - if (0 != $tabs && true === $this->debugComment) { |
|
| 329 | - $html .= "<!-- {$tabs} open elements found -->"; |
|
| 330 | - } |
|
| 331 | - |
|
| 332 | - return $html; |
|
| 333 | - } |
|
| 334 | - |
|
| 335 | - /** |
|
| 336 | - * Remove ALL line breaks and multiple white space. |
|
| 337 | - * |
|
| 338 | - * @param string $html |
|
| 339 | - * |
|
| 340 | - * @return string |
|
| 341 | - */ |
|
| 342 | - protected function killLineBreaks($html) |
|
| 343 | - { |
|
| 344 | - $html = str_replace($this->newline, '', $html); |
|
| 345 | - |
|
| 346 | - return preg_replace('/\s\s+/u', ' ', $html); |
|
| 347 | - // ? return preg_replace('/\n|\s+(\s)/u', '$1', $html); |
|
| 348 | - } |
|
| 349 | - |
|
| 350 | - /** |
|
| 351 | - * Remove multiple white space, keeps line breaks. |
|
| 352 | - */ |
|
| 353 | - protected function killWhiteSpace(string $html): string |
|
| 354 | - { |
|
| 355 | - $temp = explode($this->newline, $html); |
|
| 356 | - for ($i = 0; $i < \count($temp); ++$i) { |
|
| 357 | - if (!trim($temp[$i])) { |
|
| 358 | - unset($temp[$i]); |
|
| 359 | - continue; |
|
| 360 | - } |
|
| 361 | - |
|
| 362 | - $temp[$i] = trim($temp[$i]); |
|
| 363 | - $temp[$i] = preg_replace('/\s\s+/', ' ', $temp[$i]); |
|
| 364 | - } |
|
| 365 | - |
|
| 366 | - return implode($this->newline, $temp); |
|
| 367 | - } |
|
| 368 | - |
|
| 369 | - /** |
|
| 370 | - * Remove white space at the end of lines, keeps other white space and line breaks. |
|
| 371 | - */ |
|
| 372 | - protected function rTrimLines(string &$html): void |
|
| 373 | - { |
|
| 374 | - $html = preg_replace('/\s+$/m', '', $html); |
|
| 375 | - } |
|
| 376 | - |
|
| 377 | - /** |
|
| 378 | - * Convert newlines according to the current OS. |
|
| 379 | - */ |
|
| 380 | - protected function convNlOs(string &$html): void |
|
| 381 | - { |
|
| 382 | - $html = preg_replace("(\r\n|\r)", $this->newline, $html); |
|
| 383 | - } |
|
| 384 | - |
|
| 385 | - /** |
|
| 386 | - * Remove empty lines. |
|
| 387 | - */ |
|
| 388 | - protected function removeEmptyLines(string &$html): void |
|
| 389 | - { |
|
| 390 | - $temp = explode($this->newline, $html); |
|
| 391 | - $result = []; |
|
| 392 | - for ($i = 0; $i < \count($temp); ++$i) { |
|
| 393 | - if ('' == trim($temp[$i])) { |
|
| 394 | - continue; |
|
| 395 | - } |
|
| 396 | - $result[] = $temp[$i]; |
|
| 397 | - } |
|
| 398 | - $html = implode($this->newline, $result); |
|
| 399 | - } |
|
| 400 | - |
|
| 401 | - /** |
|
| 402 | - * Include configured header comment in HTML content block. |
|
| 403 | - */ |
|
| 404 | - public function includeHeaderComment(string &$html): void |
|
| 405 | - { |
|
| 406 | - $html = preg_replace('/^(-->)$/m', "\n\t".$this->headerComment."\n$1", $html); |
|
| 407 | - } |
|
| 20 | + /** |
|
| 21 | + * Enable Debug comment in footer. |
|
| 22 | + * |
|
| 23 | + * @var bool |
|
| 24 | + */ |
|
| 25 | + protected $debugComment = false; |
|
| 26 | + |
|
| 27 | + /** |
|
| 28 | + * Format Type. |
|
| 29 | + * |
|
| 30 | + * @var int |
|
| 31 | + */ |
|
| 32 | + protected $formatType = 0; |
|
| 33 | + |
|
| 34 | + /** |
|
| 35 | + * Tab character. |
|
| 36 | + * |
|
| 37 | + * @var string |
|
| 38 | + */ |
|
| 39 | + protected $tab = "\t"; |
|
| 40 | + |
|
| 41 | + /** |
|
| 42 | + * Newline character. |
|
| 43 | + * |
|
| 44 | + * @var string |
|
| 45 | + */ |
|
| 46 | + protected $newline = "\n"; |
|
| 47 | + |
|
| 48 | + /** |
|
| 49 | + * Configured extra header comment. |
|
| 50 | + * |
|
| 51 | + * @var string |
|
| 52 | + */ |
|
| 53 | + protected $headerComment = ''; |
|
| 54 | + |
|
| 55 | + /** |
|
| 56 | + * Empty space char. |
|
| 57 | + * |
|
| 58 | + * @var string |
|
| 59 | + */ |
|
| 60 | + protected $emptySpaceChar = ' '; |
|
| 61 | + |
|
| 62 | + /** |
|
| 63 | + * Set variables based on given config. |
|
| 64 | + */ |
|
| 65 | + public function setVariables(array $config): void |
|
| 66 | + { |
|
| 67 | + if (isset($config['headerComment']) && !empty($config['headerComment'])) { |
|
| 68 | + $this->headerComment = $config['headerComment']; |
|
| 69 | + } |
|
| 70 | + |
|
| 71 | + if (isset($config['formatHtml']) && is_numeric($config['formatHtml'])) { |
|
| 72 | + $this->formatType = (int) $config['formatHtml']; |
|
| 73 | + } |
|
| 74 | + |
|
| 75 | + if (isset($config['formatHtml.']['tabSize']) && is_numeric($config['formatHtml.']['tabSize'])) { |
|
| 76 | + $this->tab = str_pad('', (int) $config['formatHtml.']['tabSize'], ' '); |
|
| 77 | + } |
|
| 78 | + |
|
| 79 | + if (isset($config['formatHtml.']['debugComment'])) { |
|
| 80 | + $this->debugComment = (bool) $config['formatHtml.']['debugComment']; |
|
| 81 | + } |
|
| 82 | + |
|
| 83 | + if (isset($config['dropEmptySpaceChar']) && (bool) $config['dropEmptySpaceChar']) { |
|
| 84 | + $this->emptySpaceChar = ''; |
|
| 85 | + } |
|
| 86 | + } |
|
| 87 | + |
|
| 88 | + /** |
|
| 89 | + * Clean given HTML with formatter. |
|
| 90 | + * |
|
| 91 | + * @return string |
|
| 92 | + */ |
|
| 93 | + public function clean(string $html, array $config = []) |
|
| 94 | + { |
|
| 95 | + if (!empty($config)) { |
|
| 96 | + $this->setVariables($config); |
|
| 97 | + } |
|
| 98 | + |
|
| 99 | + // convert line-breaks to UNIX |
|
| 100 | + $this->convNlOs($html); |
|
| 101 | + |
|
| 102 | + $manipulations = []; |
|
| 103 | + |
|
| 104 | + if (isset($config['removeGenerator']) && (bool) $config['removeGenerator']) { |
|
| 105 | + $manipulations['removeGenerator'] = GeneralUtility::makeInstance(RemoveGenerator::class); |
|
| 106 | + } |
|
| 107 | + |
|
| 108 | + if (isset($config['removeComments']) && (bool) $config['removeComments']) { |
|
| 109 | + $manipulations['removeComments'] = GeneralUtility::makeInstance(RemoveComments::class); |
|
| 110 | + } |
|
| 111 | + |
|
| 112 | + if (!empty($this->headerComment)) { |
|
| 113 | + $this->includeHeaderComment($html); |
|
| 114 | + } |
|
| 115 | + |
|
| 116 | + foreach ($manipulations as $key => $manipulation) { |
|
| 117 | + /** @var ManipulationInterface $manipulation */ |
|
| 118 | + $configuration = isset($config[$key.'.']) && \is_array($config[$key.'.']) ? $config[$key.'.'] : []; |
|
| 119 | + $html = $manipulation->manipulate($html, $configuration); |
|
| 120 | + } |
|
| 121 | + |
|
| 122 | + // cleanup HTML5 self-closing elements |
|
| 123 | + if (!isset($GLOBALS['TSFE']->config['config']['doctype']) |
|
| 124 | + || 'x' !== substr($GLOBALS['TSFE']->config['config']['doctype'], 0, 1)) { |
|
| 125 | + $html = preg_replace( |
|
| 126 | + '/<((?:area|base|br|col|embed|hr|img|input|link|meta|param|source|track|wbr)\s[^>]+?)\s*\\\?\/>/', |
|
| 127 | + '<$1>', |
|
| 128 | + $html |
|
| 129 | + ); |
|
| 130 | + } |
|
| 131 | + |
|
| 132 | + if ($this->formatType > 0) { |
|
| 133 | + $html = $this->formatHtml($html); |
|
| 134 | + } |
|
| 135 | + |
|
| 136 | + // remove white space after line ending |
|
| 137 | + $this->rTrimLines($html); |
|
| 138 | + |
|
| 139 | + // recover line-breaks |
|
| 140 | + if (Environment::isWindows()) { |
|
| 141 | + $html = str_replace($this->newline, "\r\n", $html); |
|
| 142 | + } |
|
| 143 | + |
|
| 144 | + return (string) $html; |
|
| 145 | + } |
|
| 146 | + |
|
| 147 | + /** |
|
| 148 | + * Formats the (X)HTML code: |
|
| 149 | + * - taps according to the hirarchy of the tags |
|
| 150 | + * - removes empty spaces between tags |
|
| 151 | + * - removes linebreaks within tags (spares where necessary: pre, textarea, comments, ..) |
|
| 152 | + * choose from five options: |
|
| 153 | + * 0 => off |
|
| 154 | + * 1 => no line break at all (code in one line) |
|
| 155 | + * 2 => minimalistic line breaks (structure defining box-elements) |
|
| 156 | + * 3 => aesthetic line breaks (important box-elements) |
|
| 157 | + * 4 => logic line breaks (all box-elements) |
|
| 158 | + * 5 => max line breaks (all elements). |
|
| 159 | + */ |
|
| 160 | + protected function formatHtml(string $html): string |
|
| 161 | + { |
|
| 162 | + // Save original formated pre, textarea, comments, styles and scripts & replace them with markers |
|
| 163 | + preg_match_all( |
|
| 164 | + '/(?s)((<!--.*?-->)|(<[ \n\r]*pre[^>]*>.*?<[ \n\r]*\/pre[^>]*>)|(<[ \n\r]*textarea[^>]*>.*?<[ \n\r]*\/textarea[^>]*>)|(<[ \n\r]*style[^>]*>.*?<[ \n\r]*\/style[^>]*>)|(<[ \n\r]*script[^>]*>.*?<[ \n\r]*\/script[^>]*>))/im', |
|
| 165 | + $html, |
|
| 166 | + $matches |
|
| 167 | + ); |
|
| 168 | + $noFormat = $matches[0]; // do not format these block elements |
|
| 169 | + for ($i = 0; $i < \count($noFormat); ++$i) { |
|
| 170 | + $html = str_replace($noFormat[$i], "\n<!-- ELEMENT {$i} -->", $html); |
|
| 171 | + } |
|
| 172 | + |
|
| 173 | + // define box elements for formatting |
|
| 174 | + $trueBoxElements = 'address|blockquote|center|dir|div|dl|fieldset|form|h1|h2|h3|h4|h5|h6|hr|isindex|menu|noframes|noscript|ol|p|pre|table|ul|article|aside|details|figcaption|figure|footer|header|hgroup|menu|nav|section'; |
|
| 175 | + $functionalBoxElements = 'dd|dt|frameset|li|tbody|td|tfoot|th|thead|tr|colgroup'; |
|
| 176 | + $usableBoxElements = 'applet|button|del|iframe|ins|map|object|script'; |
|
| 177 | + $imagineBoxElements = 'html|body|head|meta|title|link|script|base|!--'; |
|
| 178 | + $allBoxLikeElements = '(?>'.$trueBoxElements.'|'.$functionalBoxElements.'|'.$usableBoxElements.'|'.$imagineBoxElements.')'; |
|
| 179 | + $esteticBoxLikeElements = '(?>html|head|body|meta name|title|div|table|h1|h2|h3|h4|h5|h6|p|form|pre|center|!--)'; |
|
| 180 | + $structureBoxLikeElements = '(?>html|head|body|div|!--)'; |
|
| 181 | + |
|
| 182 | + // split html into it's elements |
|
| 183 | + $htmlArrayTemp = preg_split( |
|
| 184 | + '/(<(?:[^<>]+(?:"[^"]*"|\'[^\']*\')?)+>)/', |
|
| 185 | + $html, |
|
| 186 | + -1, |
|
| 187 | + \PREG_SPLIT_DELIM_CAPTURE | \PREG_SPLIT_NO_EMPTY |
|
| 188 | + ); |
|
| 189 | + |
|
| 190 | + if (false === $htmlArrayTemp) { |
|
| 191 | + // Restore saved comments, styles and scripts |
|
| 192 | + for ($i = 0; $i < \count($noFormat); ++$i) { |
|
| 193 | + $html = str_replace("<!-- ELEMENT {$i} -->", $noFormat[$i], $html); |
|
| 194 | + } |
|
| 195 | + |
|
| 196 | + return $html; |
|
| 197 | + } |
|
| 198 | + // remove empty lines |
|
| 199 | + $htmlArray = ['']; |
|
| 200 | + $index = 1; |
|
| 201 | + for ($x = 0; $x < \count($htmlArrayTemp); ++$x) { |
|
| 202 | + $text = trim($htmlArrayTemp[$x]); |
|
| 203 | + $htmlArray[$index] = '' !== $text ? $htmlArrayTemp[$x] : $this->emptySpaceChar; |
|
| 204 | + ++$index; |
|
| 205 | + } |
|
| 206 | + |
|
| 207 | + // rebuild html |
|
| 208 | + $html = ''; |
|
| 209 | + $tabs = 0; |
|
| 210 | + for ($x = 0; $x < \count($htmlArray); ++$x) { |
|
| 211 | + $htmlArrayBefore = $htmlArray[$x - 1] ?? ''; |
|
| 212 | + $htmlArrayCurrent = $htmlArray[$x] ?? ''; |
|
| 213 | + |
|
| 214 | + // check if the element should stand in a new line |
|
| 215 | + $newline = false; |
|
| 216 | + if ('<?xml' == substr($htmlArrayBefore, 0, 5)) { |
|
| 217 | + $newline = true; |
|
| 218 | + } elseif (2 == $this->formatType && ( // minimalistic line break |
|
| 219 | + // this element has a line break before itself |
|
| 220 | + preg_match( |
|
| 221 | + '/<'.$structureBoxLikeElements.'(.*)>/Usi', |
|
| 222 | + $htmlArrayCurrent |
|
| 223 | + ) || preg_match( |
|
| 224 | + '/<'.$structureBoxLikeElements.'(.*) \/>/Usi', |
|
| 225 | + $htmlArrayCurrent |
|
| 226 | + ) // one element before is a element that has a line break after |
|
| 227 | + || preg_match( |
|
| 228 | + '/<\/'.$structureBoxLikeElements.'(.*)>/Usi', |
|
| 229 | + $htmlArrayBefore |
|
| 230 | + ) || '<!--' == substr( |
|
| 231 | + $htmlArrayBefore, |
|
| 232 | + 0, |
|
| 233 | + 4 |
|
| 234 | + ) || preg_match('/<'.$structureBoxLikeElements.'(.*) \/>/Usi', $htmlArrayBefore)) |
|
| 235 | + ) { |
|
| 236 | + $newline = true; |
|
| 237 | + } elseif (3 == $this->formatType && ( // aestetic line break |
|
| 238 | + // this element has a line break before itself |
|
| 239 | + preg_match( |
|
| 240 | + '/<'.$esteticBoxLikeElements.'(.*)>/Usi', |
|
| 241 | + $htmlArrayCurrent |
|
| 242 | + ) || preg_match( |
|
| 243 | + '/<'.$esteticBoxLikeElements.'(.*) \/>/Usi', |
|
| 244 | + $htmlArrayCurrent |
|
| 245 | + ) // one element before is a element that has a line break after |
|
| 246 | + || preg_match('/<\/'.$esteticBoxLikeElements.'(.*)>/Usi', $htmlArrayBefore) || '<!--' == substr( |
|
| 247 | + $htmlArrayBefore, |
|
| 248 | + 0, |
|
| 249 | + 4 |
|
| 250 | + ) || preg_match('/<'.$esteticBoxLikeElements.'(.*) \/>/Usi', $htmlArrayBefore)) |
|
| 251 | + ) { |
|
| 252 | + $newline = true; |
|
| 253 | + } elseif ($this->formatType >= 4 && ( // logical line break |
|
| 254 | + // this element has a line break before itself |
|
| 255 | + preg_match( |
|
| 256 | + '/<'.$allBoxLikeElements.'(.*)>/Usi', |
|
| 257 | + $htmlArrayCurrent |
|
| 258 | + ) || preg_match( |
|
| 259 | + '/<'.$allBoxLikeElements.'(.*) \/>/Usi', |
|
| 260 | + $htmlArrayCurrent |
|
| 261 | + ) // one element before is a element that has a line break after |
|
| 262 | + || preg_match('/<\/'.$allBoxLikeElements.'(.*)>/Usi', $htmlArrayBefore) || '<!--' == substr( |
|
| 263 | + $htmlArrayBefore, |
|
| 264 | + 0, |
|
| 265 | + 4 |
|
| 266 | + ) || preg_match('/<'.$allBoxLikeElements.'(.*) \/>/Usi', $htmlArrayBefore)) |
|
| 267 | + ) { |
|
| 268 | + $newline = true; |
|
| 269 | + } |
|
| 270 | + |
|
| 271 | + // count down a tab |
|
| 272 | + if ('</' == substr($htmlArrayCurrent, 0, 2)) { |
|
| 273 | + --$tabs; |
|
| 274 | + } |
|
| 275 | + |
|
| 276 | + // add tabs and line breaks in front of the current tag |
|
| 277 | + if ($newline) { |
|
| 278 | + $html .= $this->newline; |
|
| 279 | + for ($y = 0; $y < $tabs; ++$y) { |
|
| 280 | + $html .= $this->tab; |
|
| 281 | + } |
|
| 282 | + } |
|
| 283 | + |
|
| 284 | + // remove white spaces and line breaks and add current tag to the html-string |
|
| 285 | + if ('<![CDATA[' == substr($htmlArrayCurrent, 0, 9) // remove multiple white space in CDATA / XML |
|
| 286 | + || '<?xml' == substr($htmlArrayCurrent, 0, 5) |
|
| 287 | + ) { |
|
| 288 | + $html .= $this->killWhiteSpace($htmlArrayCurrent); |
|
| 289 | + } else { // remove all line breaks |
|
| 290 | + $html .= $this->killLineBreaks($htmlArrayCurrent); |
|
| 291 | + } |
|
| 292 | + |
|
| 293 | + // count up a tab |
|
| 294 | + if ('<' == substr($htmlArrayCurrent, 0, 1) && '/' != substr($htmlArrayCurrent, 1, 1)) { |
|
| 295 | + if (' ' !== substr($htmlArrayCurrent, 1, 1) |
|
| 296 | + && 'img' !== substr($htmlArrayCurrent, 1, 3) |
|
| 297 | + && 'source' !== substr($htmlArrayCurrent, 1, 6) |
|
| 298 | + && 'br' !== substr($htmlArrayCurrent, 1, 2) |
|
| 299 | + && 'hr' !== substr($htmlArrayCurrent, 1, 2) |
|
| 300 | + && 'input' !== substr($htmlArrayCurrent, 1, 5) |
|
| 301 | + && 'link' !== substr($htmlArrayCurrent, 1, 4) |
|
| 302 | + && 'meta' !== substr($htmlArrayCurrent, 1, 4) |
|
| 303 | + && 'col ' !== substr($htmlArrayCurrent, 1, 4) |
|
| 304 | + && 'frame' !== substr($htmlArrayCurrent, 1, 5) |
|
| 305 | + && 'isindex' !== substr($htmlArrayCurrent, 1, 7) |
|
| 306 | + && 'param' !== substr($htmlArrayCurrent, 1, 5) |
|
| 307 | + && 'area' !== substr($htmlArrayCurrent, 1, 4) |
|
| 308 | + && 'base' !== substr($htmlArrayCurrent, 1, 4) |
|
| 309 | + && '<!' !== substr($htmlArrayCurrent, 0, 2) |
|
| 310 | + && '<?xml' !== substr($htmlArrayCurrent, 0, 5) |
|
| 311 | + ) { |
|
| 312 | + ++$tabs; |
|
| 313 | + } |
|
| 314 | + } |
|
| 315 | + } |
|
| 316 | + |
|
| 317 | + // Remove empty lines |
|
| 318 | + if ($this->formatType > 1) { |
|
| 319 | + $this->removeEmptyLines($html); |
|
| 320 | + } |
|
| 321 | + |
|
| 322 | + // Restore saved comments, styles and scripts |
|
| 323 | + for ($i = 0; $i < \count($noFormat); ++$i) { |
|
| 324 | + $html = str_replace("<!-- ELEMENT {$i} -->", $noFormat[$i], $html); |
|
| 325 | + } |
|
| 326 | + |
|
| 327 | + // include debug comment at the end |
|
| 328 | + if (0 != $tabs && true === $this->debugComment) { |
|
| 329 | + $html .= "<!-- {$tabs} open elements found -->"; |
|
| 330 | + } |
|
| 331 | + |
|
| 332 | + return $html; |
|
| 333 | + } |
|
| 334 | + |
|
| 335 | + /** |
|
| 336 | + * Remove ALL line breaks and multiple white space. |
|
| 337 | + * |
|
| 338 | + * @param string $html |
|
| 339 | + * |
|
| 340 | + * @return string |
|
| 341 | + */ |
|
| 342 | + protected function killLineBreaks($html) |
|
| 343 | + { |
|
| 344 | + $html = str_replace($this->newline, '', $html); |
|
| 345 | + |
|
| 346 | + return preg_replace('/\s\s+/u', ' ', $html); |
|
| 347 | + // ? return preg_replace('/\n|\s+(\s)/u', '$1', $html); |
|
| 348 | + } |
|
| 349 | + |
|
| 350 | + /** |
|
| 351 | + * Remove multiple white space, keeps line breaks. |
|
| 352 | + */ |
|
| 353 | + protected function killWhiteSpace(string $html): string |
|
| 354 | + { |
|
| 355 | + $temp = explode($this->newline, $html); |
|
| 356 | + for ($i = 0; $i < \count($temp); ++$i) { |
|
| 357 | + if (!trim($temp[$i])) { |
|
| 358 | + unset($temp[$i]); |
|
| 359 | + continue; |
|
| 360 | + } |
|
| 361 | + |
|
| 362 | + $temp[$i] = trim($temp[$i]); |
|
| 363 | + $temp[$i] = preg_replace('/\s\s+/', ' ', $temp[$i]); |
|
| 364 | + } |
|
| 365 | + |
|
| 366 | + return implode($this->newline, $temp); |
|
| 367 | + } |
|
| 368 | + |
|
| 369 | + /** |
|
| 370 | + * Remove white space at the end of lines, keeps other white space and line breaks. |
|
| 371 | + */ |
|
| 372 | + protected function rTrimLines(string &$html): void |
|
| 373 | + { |
|
| 374 | + $html = preg_replace('/\s+$/m', '', $html); |
|
| 375 | + } |
|
| 376 | + |
|
| 377 | + /** |
|
| 378 | + * Convert newlines according to the current OS. |
|
| 379 | + */ |
|
| 380 | + protected function convNlOs(string &$html): void |
|
| 381 | + { |
|
| 382 | + $html = preg_replace("(\r\n|\r)", $this->newline, $html); |
|
| 383 | + } |
|
| 384 | + |
|
| 385 | + /** |
|
| 386 | + * Remove empty lines. |
|
| 387 | + */ |
|
| 388 | + protected function removeEmptyLines(string &$html): void |
|
| 389 | + { |
|
| 390 | + $temp = explode($this->newline, $html); |
|
| 391 | + $result = []; |
|
| 392 | + for ($i = 0; $i < \count($temp); ++$i) { |
|
| 393 | + if ('' == trim($temp[$i])) { |
|
| 394 | + continue; |
|
| 395 | + } |
|
| 396 | + $result[] = $temp[$i]; |
|
| 397 | + } |
|
| 398 | + $html = implode($this->newline, $result); |
|
| 399 | + } |
|
| 400 | + |
|
| 401 | + /** |
|
| 402 | + * Include configured header comment in HTML content block. |
|
| 403 | + */ |
|
| 404 | + public function includeHeaderComment(string &$html): void |
|
| 405 | + { |
|
| 406 | + $html = preg_replace('/^(-->)$/m', "\n\t".$this->headerComment."\n$1", $html); |
|
| 407 | + } |
|
| 408 | 408 | } |
