From 3fbbe0d9f1887d939fdb56733612f8ab0971deaf Mon Sep 17 00:00:00 2001 From: Simounet Date: Sun, 3 Jun 2018 22:52:48 +0200 Subject: Fix image downloading on null image path --- src/Wallabag/CoreBundle/Helper/DownloadImages.php | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/Wallabag/CoreBundle/Helper/DownloadImages.php') diff --git a/src/Wallabag/CoreBundle/Helper/DownloadImages.php b/src/Wallabag/CoreBundle/Helper/DownloadImages.php index 9c9452dd..f91cdf5e 100644 --- a/src/Wallabag/CoreBundle/Helper/DownloadImages.php +++ b/src/Wallabag/CoreBundle/Helper/DownloadImages.php @@ -85,6 +85,10 @@ class DownloadImages */ public function processSingleImage($entryId, $imagePath, $url, $relativePath = null) { + if (null === $imagePath) { + return false; + } + if (null === $relativePath) { $relativePath = $this->getRelativePath($entryId); } -- cgit v1.2.3 From e6f12c073416eba6fc620f0ff38a343bda428280 Mon Sep 17 00:00:00 2001 From: Simounet Date: Wed, 11 Jul 2018 19:57:34 +0200 Subject: More robust srcset image attribute handling Linked to HTMLawed PR https://github.com/kesar/HTMLawed/pull/17 --- src/Wallabag/CoreBundle/Helper/DownloadImages.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'src/Wallabag/CoreBundle/Helper/DownloadImages.php') diff --git a/src/Wallabag/CoreBundle/Helper/DownloadImages.php b/src/Wallabag/CoreBundle/Helper/DownloadImages.php index f91cdf5e..487a3a23 100644 --- a/src/Wallabag/CoreBundle/Helper/DownloadImages.php +++ b/src/Wallabag/CoreBundle/Helper/DownloadImages.php @@ -185,7 +185,7 @@ class DownloadImages * * @return array An array of urls */ - protected function getSrcsetUrls(Crawler $imagesCrawler) + private function getSrcsetUrls(Crawler $imagesCrawler) { $urls = []; $iterator = $imagesCrawler @@ -193,9 +193,14 @@ class DownloadImages while ($iterator->valid()) { $srcsetAttribute = $iterator->current()->getAttribute('srcset'); if ('' !== $srcsetAttribute) { - $srcset = array_map('trim', explode(',', $srcsetAttribute)); + // Couldn't start with " OR ' OR a white space + // Could be one or more white space + // Must be one or more digits followed by w OR x + $pattern = "/(?:[^\"'\s]+\s*(?:\d+[wx])+)/"; + preg_match_all($pattern, $srcsetAttribute, $matches); + $srcset = call_user_func_array('array_merge', $matches); $srcsetUrls = array_map(function ($src) { - return explode(' ', $src)[0]; + return trim(explode(' ', $src, 2)[0]); }, $srcset); $urls = array_merge($srcsetUrls, $urls); } -- cgit v1.2.3 From 2a1ceb67b4400f46f4d3067e887ff54aa906f0a2 Mon Sep 17 00:00:00 2001 From: Kevin Decherf Date: Wed, 5 Sep 2018 14:25:32 +0200 Subject: php-cs-fixer Signed-off-by: Kevin Decherf --- src/Wallabag/CoreBundle/Helper/DownloadImages.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/Wallabag/CoreBundle/Helper/DownloadImages.php') diff --git a/src/Wallabag/CoreBundle/Helper/DownloadImages.php b/src/Wallabag/CoreBundle/Helper/DownloadImages.php index 487a3a23..cc3dcfce 100644 --- a/src/Wallabag/CoreBundle/Helper/DownloadImages.php +++ b/src/Wallabag/CoreBundle/Helper/DownloadImages.php @@ -198,7 +198,7 @@ class DownloadImages // Must be one or more digits followed by w OR x $pattern = "/(?:[^\"'\s]+\s*(?:\d+[wx])+)/"; preg_match_all($pattern, $srcsetAttribute, $matches); - $srcset = call_user_func_array('array_merge', $matches); + $srcset = \call_user_func_array('array_merge', $matches); $srcsetUrls = array_map(function ($src) { return trim(explode(' ', $src, 2)[0]); }, $srcset); @@ -308,7 +308,7 @@ class DownloadImages $this->logger->debug('DownloadImages: Checking extension (alternative)', ['ext' => $ext]); } - if (!in_array($ext, ['jpeg', 'jpg', 'gif', 'png'], true)) { + if (!\in_array($ext, ['jpeg', 'jpg', 'gif', 'png'], true)) { $this->logger->error('DownloadImages: Processed image with not allowed extension. Skipping: ' . $imagePath); return false; -- cgit v1.2.3