feat(file): default icon sizes are now available for new image thumbs

fixes #6181

ref #3907

mod/file/actions/file/upload.php

@@ -35,7 +35,6 @@
 	if (!$file instanceof ElggFile) {
 		return elgg_error_response(elgg_echo('file:cannotload'));
 	}
-	/* @var ElggFile $file */
 
 	// user must be able to edit file
 	if (!$file->canEdit()) {
@@ -51,46 +50,30 @@
 $file->container_guid = $container_guid;
 $file->tags = string_to_tag_array($tags);
 
+$file->save();
+
 if ($uploaded_file && $uploaded_file->isValid()) {
-	if ($file->acceptUploadedFile($uploaded_file)) {
-		$guid = $file->save();
+	// save master file
+	if (!$file->acceptUploadedFile($uploaded_file)) {
+		return elgg_error_response(elgg_echo('file:uploadfailed'));
 	}
 
-	if ($guid && $file->saveIconFromElggFile($file)) {
-		$file->thumbnail = $file->getIcon('small')->getFilename();
-		$file->smallthumb = $file->getIcon('medium')->getFilename();
-		$file->largethumb = $file->getIcon('large')->getFilename();
-	} else {
-		$file->deleteIcon();
-		unset($file->thumbnail);
-		unset($file->smallthumb);
-		unset($file->largethumb);
-	}
-} else if ($file->exists()) {
-	$file->save();
-
-	if (isset($reset_icon_urls)) {
-		// we touch the thumbs because we want new URLs from \Elgg\FileService\File::getURL
-		$thumbnails = [$file->thumbnail, $file->smallthumb, $file->largethumb];
-		foreach ($thumbnails as $thumbnail) {
-			$thumbfile = new ElggFile();
-			$thumbfile->owner_guid = $file->owner_guid;
-			$thumbfile->setFilename($thumbnail);
-			if ($thumbfile->exists()) {
-				$thumb_filename = $thumbfile->getFilenameOnFilestore();
-				touch($thumb_filename);
-			}
-		}
+	if (!$file->save()) {
+		return elgg_error_response(elgg_echo('file:uploadfailed'));
 	}
+
+	// update icons
+	$file->saveIconFromElggFile($file);
+
+	// remove legacy metadata
+	unset($file->thumbnail);
+	unset($file->smallthumb);
+	unset($file->largethumb);
 }
 
 // file saved so clear sticky form
 elgg_clear_sticky_form('file');
 
-if (empty($guid)) {
-	return elgg_error_response(elgg_echo('file:uploadfailed'));
-}
-
 $forward = $file->getURL();
 
 // handle results differently for new files and file updates

mod/file/start.php

@@ -429,25 +429,25 @@ function file_set_custom_icon_sizes($hook, $type, $return, $params) {
 		return;
 	}
 
-	return [
-		'small' => [
-			'w' => 60,
-			'h' => 60,
-			'square' => true,
-			'upscale' => true,
-		],
-		'medium' => [
-			'w' => 153,
-			'h' => 153,
-			'square' => true,
-			'upscale' => true,
-		],
-		'large' => [
-			'w' => 600,
-			'h' => 600,
-			'upscale' => false,
-		],
+	$return['small'] = [
+		'w' => 60,
+		'h' => 60,
+		'square' => true,
+		'upscale' => true,
+	];
+	$return['medium'] = [
+		'w' => 153,
+		'h' => 153,
+		'square' => true,
+		'upscale' => true,
+	];
+	$return['large'] = [
+		'w' => 600,
+		'h' => 600,
+		'upscale' => false,
 	];
+
+	return $return;
 }
 
 /**
@@ -464,7 +464,7 @@ function file_set_icon_file($hook, $type, $icon, $params) {
 	$entity = elgg_extract('entity', $params);
 	$size = elgg_extract('size', $params, 'large');
 
-	if (!elgg_instanceof($entity, 'object', 'file')) {
+	if (!($entity instanceof \ElggFile)) {
 		return;
 	}
 
@@ -479,11 +479,6 @@ function file_set_icon_file($hook, $type, $icon, $params) {
 			$metadata_name = 'smallthumb';
 			break;
 
-		case 'large' :
-			$filename_prefix = 'largethumb';
-			$metadata_name = 'largethumb';
-			break;
-
 		default :
 			$filename_prefix = "{$size}thumb";
 			$metadata_name = $filename_prefix;
@@ -498,6 +493,7 @@ function file_set_icon_file($hook, $type, $icon, $params) {
 		$filename = "file/{$filename_prefix}{$filename}.jpg";
 		$icon->setFilename($filename);
 	}
+
 	return $icon;
 }
 

mod/file/views/default/icon/object/file.php

@@ -10,23 +10,10 @@
  */
 $entity = elgg_extract('entity', $vars);
 if (!$entity instanceof ElggFile) {
-	elgg_log('icon/object/file view expects an instance of ElggFile', 'ERROR');
 	return;
 }
 
-$sizes = array_keys(elgg_get_icon_sizes($entity->getType(), $entity->getSubtype()));
 $size = elgg_extract('size', $vars, 'medium');
-if (!in_array($size, $sizes)) {
-	// File plugin only capable of handling 3 sizes
-	// Anything that is an unknown size defaults to large
-	if ($size == 'topbar' || $size == 'tiny') {
-		$size = 'small';
-	} else if ($size == 'master') {
-		$size = 'large';
-	} else {
-		$size = "medium";
-	}
-}
 
 $url = elgg_extract('href', $vars, $entity->getURL());