Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix cache clearing for webp thumbnails #79

Open
wants to merge 1 commit into
base: pThumb-dev
Choose a base branch
from
Open

Fix cache clearing for webp thumbnails #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/components/phpthumbof/model/phpthumbof.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ function __construct(modX &$modx, &$settings_cache, $options, $s3info = 0) {
}
$this->config['s3multiImgGlobal'] = $s3info ? true : $modx->getOption('pthumb.s3_multi_img', null, false);
if ($s3info) { // used by the cache cleaner class
$this->cacheimgRegex = '/^' . str_replace('/', '\/', $this->config['s3cachePath']) . '.+\.(?:[0-9a-f]{8}|[0-9a-f]{32})\.(?:jpe?g|png|gif)$/'; // for safety, only select images with a hash
$this->cacheimgRegex = '/^' . str_replace('/', '\/', $this->config['s3cachePath']) . '.+\.(?:[0-9a-f]{8}|[0-9a-f]{32})\.(?:jpe?g|png|gif|webp)$/'; // for safety, only select images with a hash
}
}
// these can't be cached
Expand Down
6 changes: 3 additions & 3 deletions core/components/phpthumbof/model/pthumbcachecleaner.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,10 @@ public function cleanCache() {

$cachefiles = array(); // gather up cache files
foreach (array('pThumb', 'Remote Images') as $cachename) {
if (is_writeable($cachepath[$cachename])) { // recurse through all subdirectories looking for jpeg, jpg, png and gif
if (is_writeable($cachepath[$cachename])) { // recurse through all subdirectories looking for jpeg, jpg, png, gif and webp
$filter = new FilenameFilter(
new RecursiveDirectoryIterator($cachepath[$cachename], FilesystemIterator::SKIP_DOTS),
$cachename === 'pThumb' ? '/.+\.[0-9a-f]{8}\.(jpg|png|gif)$/' : '/\.(?:jpe?g|png|gif)$/i' // for pThumb cache, only select images with what appears to be an 8-character hash
$cachename === 'pThumb' ? '/.+\.[0-9a-f]{8}\.(jpg|png|gif|webp)$/' : '/\.(?:jpe?g|png|gif|webp)$/i' // for pThumb cache, only select images with what appears to be an 8-character hash
);
$cachefiles[$cachename] = array();
foreach(new RecursiveIteratorIterator($filter) as $file) {
Expand All @@ -112,7 +112,7 @@ public function cleanCache() {
}
}
if ($cachepath['phpThumbOf']) {
if ( ! $cachefiles['phpThumbOf'] = glob("{$cachepath['phpThumbOf']}/*.{jp*g,png,gif}", GLOB_BRACE)) {
if ( ! $cachefiles['phpThumbOf'] = glob("{$cachepath['phpThumbOf']}/*.{jp*g,png,gif,webp}", GLOB_BRACE)) {
$cachefiles['phpThumbOf'] = array(); // empty array if glob didn't find anything
}
}
Expand Down