MINOR Code formatting for delete unused thumbnails functionality

MINOR Use FormResponse instead of echoing strings as JS

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70678 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sean Harvey 2009-01-23 03:10:41 +00:00 committed by Sam Minnee
parent b686f45ab5
commit 39b10d2923
3 changed files with 57 additions and 37 deletions

View File

@ -616,57 +616,78 @@ JS;
*/ */
/** /**
* Removes all unused thumbnails, and echos status message to user. * Removes all unused thumbnails from the file store
* and returns the status of the process to the user.
*/ */
public function deleteUnusedThumbnails() { public function deleteunusedthumbnails() {
foreach($this->getUnusedThumbnailsArray() as $file) { $count = 0;
unlink(ASSETS_PATH . "/" . $file); $thumbnails = $this->getUnusedThumbnails();
}
echo "statusMessage('"._t('AssetAdmin.THUMBSDELETED', 'All unused thumbnails have been deleted')."','good')"; if($thumbnails) {
foreach($thumbnails as $thumbnail) {
unlink(ASSETS_PATH . "/" . $thumbnail);
$count++;
}
}
$message = sprintf(_t('AssetAdmin.THUMBSDELETED', '%s unused thumbnails have been deleted'), $count);
FormResponse::status_message($message, 'good');
echo FormResponse::respond();
} }
/** /**
* Creates array containg all unused thumbnails. * Creates array containg all unused thumbnails.
* *
* Array is created in three steps: * Array is created in three steps:
* 1.Scan assets folder and retrieve all thumbnails * 1. Scan assets folder and retrieve all thumbnails
* 2.Scan all HTMLField in system and retrieve thumbnails from them. * 2. Scan all HTMLField in system and retrieve thumbnails from them.
* 3.Count difference between two sets (array_diff) * 3. Count difference between two sets (array_diff)
* *
* @return array * @return array
*/ */
private function getUnusedThumbnailsArray() { private function getUnusedThumbnails() {
$allThumbnails = array(); $allThumbnails = array();
$usedThumbnails = array(); $usedThumbnails = array();
$dirIterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator(ASSETS_PATH)); $dirIterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator(ASSETS_PATH));
$classes = ClassInfo::subclassesFor('SiteTree');
foreach($dirIterator as $file) { if($dirIterator) {
if($file->isFile()) { foreach($dirIterator as $file) {
if(strpos($file->getPathname(),"_resampled") !== false) { if($file->isFile()) {
$pathInfo = pathinfo($file->getPathname()); if(strpos($file->getPathname(), '_resampled') !== false) {
if(in_array(strtolower($pathInfo['extension']), array('jpeg', 'jpg', 'jpe', 'png', 'gif'))) { $pathInfo = pathinfo($file->getPathname());
$path = str_replace('\\','/', $file->getPathname()); if(in_array(strtolower($pathInfo['extension']), array('jpeg', 'jpg', 'jpe', 'png', 'gif'))) {
$allThumbnails[] = substr($path, strpos($path, '/assets/') + 8); $path = str_replace('\\','/', $file->getPathname());
$allThumbnails[] = substr($path, strpos($path, '/assets/') + 8);
}
} }
} }
} }
} }
$classes = ClassInfo::subclassesFor('SiteTree'); if($classes) {
foreach($classes as $className) {
foreach($classes as $className) { $SNG_class = singleton($className);
$sng = singleton($className); $objects = DataObject::get($className);
$objects = DataObject::get($className);
if($objects !== NULL) { if($objects !== NULL) {
foreach($objects as $object) { foreach($objects as $object) {
foreach($sng->db() as $fieldName => $fieldType) { foreach($SNG_class->db() as $fieldName => $fieldType) {
if($fieldType == 'HTMLText') { if($fieldType == 'HTMLText') {
$url1 = HTTP::findByTagAndAttribute($object->$fieldName,array("img" => "src")); $url1 = HTTP::findByTagAndAttribute($object->$fieldName,array('img' => 'src'));
if($url1 != NULL) $usedThumbnails[] = substr($url1[0],strpos($url1[0],'/assets/')+8);
if($object->latestPublished > 0) { if($url1 != NULL) {
$object = Versioned::get_latest_version($className, $object->ID); $usedThumbnails[] = substr($url1[0], strpos($url1[0], '/assets/') + 8);
$url2 = HTTP::findByTagAndAttribute($object->$fieldName,array("img" => "src")); }
if($url2 != NULL) $usedThumbnails[] = substr($url2[0],strpos($url2[0],'/assets/')+8);
if($object->latestPublished > 0) {
$object = Versioned::get_latest_version($className, $object->ID);
$url2 = HTTP::findByTagAndAttribute($object->$fieldName, array('img' => 'src'));
if($url2 != NULL) {
$usedThumbnails[] = substr($url2[0], strpos($url2[0], '/assets/') + 8);
}
}
} }
} }
} }
@ -674,9 +695,8 @@ JS;
} }
} }
return array_diff($allThumbnails,$usedThumbnails); return array_diff($allThumbnails, $usedThumbnails);
} }
} }
?> ?>

View File

@ -483,7 +483,7 @@ Behaviour.register({
eval(t.responseText); eval(t.responseText);
} }
}; };
new Ajax.Request('admin/assets/deleteUnusedThumbnails',options); new Ajax.Request('admin/assets/deleteunusedthumbnails',options);
} }
} }
}); });

View File

@ -20,7 +20,7 @@ $lang['en_US']['AssetAdmin']['NOWBROKEN'] = 'The following pages now have broken
$lang['en_US']['AssetAdmin']['NOWBROKEN2'] = 'Their owners have been emailed and they will fix up those pages.'; $lang['en_US']['AssetAdmin']['NOWBROKEN2'] = 'Their owners have been emailed and they will fix up those pages.';
$lang['en_US']['AssetAdmin']['SAVEDFILE'] = 'Saved file %s'; $lang['en_US']['AssetAdmin']['SAVEDFILE'] = 'Saved file %s';
$lang['en_US']['AssetAdmin']['SAVEFOLDERNAME'] = 'Save folder name'; $lang['en_US']['AssetAdmin']['SAVEFOLDERNAME'] = 'Save folder name';
$lang['en_US']['AssetAdmin']['THUMBSDELETED'] = 'All unused thumbnails have been deleted'; $lang['en_US']['AssetAdmin']['THUMBSDELETED'] = '%s unused thumbnails have been deleted';
$lang['en_US']['AssetAdmin']['UPLOAD'] = 'Upload Files Listed Below'; $lang['en_US']['AssetAdmin']['UPLOAD'] = 'Upload Files Listed Below';
$lang['en_US']['AssetAdmin']['UPLOADEDX'] = 'Uploaded %s files'; $lang['en_US']['AssetAdmin']['UPLOADEDX'] = 'Uploaded %s files';
$lang['en_US']['AssetAdmin_left.ss']['CREATE'] = 'Create'; $lang['en_US']['AssetAdmin_left.ss']['CREATE'] = 'Create';