Merge branch 'issue-14' into dev

wecodemore · Aug 24, 2015 · 89db40c · 89db40c
2 parents 770e9eb + f3eaafb
commit 89db40c
Showing 1 changed file with 21 additions and 4 deletions.
diff --git a/src/Services/AvatarDimensionLimitService.php b/src/Services/AvatarDimensionLimitService.php
@@ -42,18 +42,35 @@ public function setup( Array $file = [ ] )
 
 		}*/
 
-		$limit = absint( filter_var( apply_filters(
-			'wcm.avatar.size_max',
+		// Maximum
+		$max = absint( filter_var( apply_filters(
+			'wcm.avatar.size.max',
 			1024
 		), FILTER_SANITIZE_NUMBER_INT ) );
 
-		if ( $limit < max( $width, $height ) )
+		if ( $max < max( $width, $height ) )
 		{
 			$file['error'] = sprintf( _x(
 				'Image exceeds maximum size of %spx × %spx',
 				'%s are the maximum pixels',
 				'clients_domain'
-			), number_format_i18n( $limit ), number_format_i18n( $limit ) );
+			), number_format_i18n( $max ), number_format_i18n( $max ) );
+		}
+
+		// Minimum
+		$min = absint( filter_var( apply_filters(
+			'wcm.avatar.size.min',
+			32
+		), FILTER_SANITIZE_NUMBER_INT ) );
+
+		// The larger size should not be below the requested min size
+		if ( $min > max( $width, $height ) )
+		{
+			$file['error'] = sprintf( _x(
+				'Image does not reach the needed minimum size of %spx × %spx',
+				'%s are the minimum pixels',
+				'clients_domain'
+			), number_format_i18n( $min ), number_format_i18n( $min ) );
 		}
 
 		/*$magick = new \Imagick( $file['tmp_name'] );