Merge pull request #36 from tomaszsita/v1.12

V1.12
tomaszsita · Sep 2, 2015 · 3edcc91 · 3edcc91
2 parents 134588b + 623bfa9
commit 3edcc91
Show file tree

Hide file tree

Showing 5 changed files with 111 additions and 63 deletions.
diff --git a/lib/ManualImageCrop.php b/lib/ManualImageCrop.php
@@ -140,14 +140,45 @@ public function addAfterUploadAttachementEditLink() {
 	</script>
 <?php
 	}
+
+	private function filterPostData() {
+		$imageSizes = get_intermediate_image_sizes();
+
+		$data = array(
+				'attachmentId' => filter_var($_POST['attachmentId'], FILTER_SANITIZE_NUMBER_INT),			
+				'editedSize' => in_array($_POST['editedSize'], $imageSizes) ? $_POST['editedSize'] : null,
+				'select' => array(
+							'x' => filter_var($_POST['select']['x'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION),
+							'y' => filter_var($_POST['select']['y'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION),
+							'w' => filter_var($_POST['select']['w'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION),
+							'h' => filter_var($_POST['select']['h'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION),
+						),
+				'previewScale' => filter_var($_POST['previewScale'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION)
+
+		);
+
+		if (isset($_POST['mic_quality'])) {
+			$data['mic_quality'] = filter_var($_POST['mic_quality'], FILTER_SANITIZE_NUMBER_INT);
+		} else {
+			$data['mic_quality'] = 60;
+		}
+
+		if (isset($_POST['make2x'])) {
+			$data['make2x'] = filter_var($_POST['make2x'], FILTER_VALIDATE_BOOLEAN);
+		}
+
+		return $data;
+	}
 
 	/**
 	 * Crops the image based on params passed in $_POST array
 	 */
 	public function cropImage() {
 		global $_wp_additional_image_sizes;
+
+		$data = $this->filterPostData();
 
-		$dst_file_url = wp_get_attachment_image_src($_POST['attachmentId'], $_POST['editedSize']);
+		$dst_file_url = wp_get_attachment_image_src($data['attachmentId'], $data['editedSize']);
 
 		if (!$dst_file_url) {
 			exit;
@@ -163,10 +194,10 @@ public function cropImage() {
 
 		if ( function_exists( '_load_image_to_edit_path' ) ) {
 			// this function is consider as private, but it return proper image path. Notice it is in function_exists condition
-			$src_file = _load_image_to_edit_path( $_POST['attachmentId'], 'full' );
-			$dst_file = _load_image_to_edit_path( $_POST['attachmentId'], $_POST['editedSize'] );
+			$src_file = _load_image_to_edit_path( $data['attachmentId'], 'full' );
+			$dst_file = _load_image_to_edit_path( $data['attachmentId'], $data['editedSize'] );
 		} else {
-			$src_file_url = wp_get_attachment_image_src( $_POST['attachmentId'], 'full' );
+			$src_file_url = wp_get_attachment_image_src( $data['attachmentId'], 'full' );
 
 			if ( ! $src_file_url ) {
 				echo json_encode( array( 'status' => 'error', 'message' => 'wrong attachment' ) );
@@ -179,31 +210,31 @@ public function cropImage() {
 
 		//checks if the destination image file is present (if it's not, we want to create a new file, as the WordPress returns the original image instead of specific one)
 		if ($dst_file == $src_file) {
-			$attachmentData = wp_generate_attachment_metadata( $_POST['attachmentId'], $dst_file );
+			$attachmentData = wp_generate_attachment_metadata( $data['attachmentId'], $dst_file );
 
 			//overwrite with previous values
-			$prevAttachmentData = wp_get_attachment_metadata($_POST['attachmentId']);
+			$prevAttachmentData = wp_get_attachment_metadata($data['attachmentId']);
 			if (isset($prevAttachmentData['micSelectedArea'])) {
 				$attachmentData['micSelectedArea'] = $prevAttachmentData['micSelectedArea'];
 			}
 
 			//saves new path to the image size in the database
-			wp_update_attachment_metadata( $_POST['attachmentId'],  $attachmentData );
+			wp_update_attachment_metadata( $data['attachmentId'],  $attachmentData );
 
 			//new destination file path - replaces original file name with the correct one
-			$dst_file = str_replace( basename($attachmentData['file']), $attachmentData['sizes'][ $_POST['editedSize'] ]['file'], $dst_file);
+			$dst_file = str_replace( basename($attachmentData['file']), $attachmentData['sizes'][ $data['editedSize'] ]['file'], $dst_file);
 
 			//retrieves the new url to file (needet to refresh the preview)
-			$dst_file_url = wp_get_attachment_image_src($_POST['attachmentId'], $_POST['editedSize']);
+			$dst_file_url = wp_get_attachment_image_src($data['attachmentId'], $data['editedSize']);
 		}
 
 		//sets the destination image dimensions
-		if (isset($_wp_additional_image_sizes[$_POST['editedSize']])) {
-			$dst_w = min(intval($_wp_additional_image_sizes[$_POST['editedSize']]['width']), $_POST['select']['w'] * $_POST['previewScale']);
-			$dst_h = min(intval($_wp_additional_image_sizes[$_POST['editedSize']]['height']), $_POST['select']['h'] * $_POST['previewScale']);
+		if (isset($_wp_additional_image_sizes[$data['editedSize']])) {
+			$dst_w = min(intval($_wp_additional_image_sizes[$data['editedSize']]['width']), $data['select']['w'] * $data['previewScale']);
+			$dst_h = min(intval($_wp_additional_image_sizes[$data['editedSize']]['height']), $data['select']['h'] * $data['previewScale']);
 		} else {
-			$dst_w = min(get_option($_POST['editedSize'].'_size_w'), $_POST['select']['w'] * $_POST['previewScale']);
-			$dst_h = min(get_option($_POST['editedSize'].'_size_h'), $_POST['select']['h'] * $_POST['previewScale']);
+			$dst_w = min(get_option($data['editedSize'].'_size_w'), $data['select']['w'] * $data['previewScale']);
+			$dst_h = min(get_option($data['editedSize'].'_size_h'), $data['select']['h'] * $data['previewScale']);
 		}
 
 		if (!$dst_w || !$dst_h) {
@@ -214,10 +245,10 @@ public function cropImage() {
 		//prepares coordinates that will be passed to cropping function
 		$dst_x = 0;
 		$dst_y = 0;
-		$src_x = max(0, $_POST['select']['x']) * $_POST['previewScale'];
-		$src_y = max(0, $_POST['select']['y']) * $_POST['previewScale'];
-		$src_w = max(0, $_POST['select']['w']) * $_POST['previewScale'];
-		$src_h = max(0, $_POST['select']['h']) * $_POST['previewScale'];
+		$src_x = max(0, $data['select']['x']) * $data['previewScale'];
+		$src_y = max(0, $data['select']['y']) * $data['previewScale'];
+		$src_w = max(0, $data['select']['w']) * $data['previewScale'];
+		$src_h = max(0, $data['select']['h']) * $data['previewScale'];
 
 		$size = wp_get_image_editor( $src_file )->get_size();
 
@@ -238,25 +269,23 @@ public function cropImage() {
 		}
 
 		//saves the selected area
-		$imageMetadata = wp_get_attachment_metadata($_POST['attachmentId']);
-		$imageMetadata['micSelectedArea'][$_POST['editedSize']] = array(
-				'x' => $_POST['select']['x'],
-				'y' => $_POST['select']['y'],
-				'w' => $_POST['select']['w'],
-				'h' => $_POST['select']['h'],
-				'scale' => $_POST['previewScale'],
+		$imageMetadata = wp_get_attachment_metadata($data['attachmentId']);
+		$imageMetadata['micSelectedArea'][$data['editedSize']] = array(
+				'x' => $data['select']['x'],
+				'y' => $data['select']['y'],
+				'w' => $data['select']['w'],
+				'h' => $data['select']['h'],
+				'scale' => $data['previewScale'],
 		);
-		wp_update_attachment_metadata($_POST['attachmentId'], $imageMetadata);
-
-		$quality = isset($_POST['mic_quality']) ? intval($_POST['mic_quality']) : 60;
+		wp_update_attachment_metadata($data['attachmentId'], $imageMetadata);
 
 		if ( function_exists('wp_get_image_editor') ) {
 			$img = wp_get_image_editor( $src_file );
 
 			if ( ! is_wp_error( $img ) ) {
 
 				$img->crop( $src_x, $src_y, $src_w, $src_h, $dst_w, $dst_h, false );
-				$img->set_quality( $quality );
+				$img->set_quality( $data['mic_quality'] );
 				$saveStatus = $img->save( $dst_file );
 
 				if ( is_wp_error( $saveStatus ) ) {
@@ -307,7 +336,7 @@ public function cropImage() {
 		}
 
 		// Generate Retina Image
-		if( isset( $_POST['make2x'] ) && $_POST['make2x'] === 'true' ) {
+		if( isset( $data['make2x'] ) && $data['make2x'] === 'true' ) {
 			$dst_w2x = $dst_w * 2;
 			$dst_h2x = $dst_h * 2;
 
@@ -352,8 +381,8 @@ public function cropImage() {
 			}
 		}
 		// update 'mic_make2x' option status to persist choice
-		if( isset( $_POST['make2x'] ) && $_POST['make2x'] !== get_option('mic_make2x') ) {
-			update_option('mic_make2x', $_POST['make2x']);
+		if( isset( $data['make2x'] ) && $data['make2x'] !== get_option('mic_make2x') ) {
+			update_option('mic_make2x', $data['make2x']);
 		}
 
 		//returns the url to the generated image (to allow refreshing the preview)

diff --git a/lib/ManualImageCropEditorWindow.php b/lib/ManualImageCropEditorWindow.php
@@ -36,8 +36,10 @@ public function renderWindow() {
 
 		$imageSizes = get_intermediate_image_sizes();
 
-		$editedSize = isset( $_GET['size'] ) ? $_GET['size'] : null;
+		$editedSize = in_array($_GET['size'], $imageSizes) ? $_GET['size'] : null;
 
+		$postId = filter_var($_GET['postId'], FILTER_SANITIZE_NUMBER_INT);
+
 		$sizeLabels = apply_filters( 'image_size_names_choose', array(
 				'thumbnail' => __('Thumbnail'),
 				'medium'    => __('Medium'),
@@ -74,7 +76,7 @@ public function renderWindow() {
 			// Get user defined label for the size or just cleanup a bit
 			$label = isset($sizeLabels[$s]) ? $sizeLabels[$s] : ucfirst( str_replace( '-', ' ', $s ) );
 			$label = $sizesSettings[$s]['label'] ? $sizesSettings[$s]['label'] : $label;
-			echo '<a href="' . admin_url( 'admin-ajax.php' ) . '?action=mic_editor_window&size=' . $s . '&postId=' . $_GET['postId'] . '&width=940" class="mic-icon-' . $s . ' rm-crop-size-tab nav-tab ' . ( ($s == $editedSize) ? 'nav-tab-active' : '' ) .  '">' . $label . '</a>';
+			echo '<a href="' . admin_url( 'admin-ajax.php' ) . '?action=mic_editor_window&size=' . $s . '&postId=' . $postId . '&width=940" class="mic-icon-' . $s . ' rm-crop-size-tab nav-tab ' . ( ($s == $editedSize) ? 'nav-tab-active' : '' ) .  '">' . $label . '</a>';
 		}
 		?>
 	</h2>
@@ -93,9 +95,9 @@ public function renderWindow() {
 
 		$uploadsDir = wp_upload_dir();
 
-		$metaData = wp_get_attachment_metadata($_GET['postId']);
+		$metaData = wp_get_attachment_metadata($postId);
 
-		$src_file_url = wp_get_attachment_image_src($_GET['postId'], 'full');
+		$src_file_url = wp_get_attachment_image_src($postId, 'full');
 		if (!$src_file_url) {
 			echo json_encode (array('status' => 'error', 'message' => 'wrong attachement' ) );
 			exit;
@@ -127,12 +129,11 @@ public function renderWindow() {
 		$minWidth = min($width / $previewRatio, $previewWidth);
 		$minHeight = min($height / $previewRatio, $previewHeight);
 
-		if ($cropMethod == 1) {
+		if ($cropMethod != 0) {
 			$aspectRatio = ($width / $height);
-			// 					if ($aspectRatio * $minWidth > $sizes[0]) {
-			// 						die('a');
-			// 						$aspectRatio = ($previewWidth / $minHeight);
-			// 					}
+			// if ($aspectRatio * $minWidth > $sizes[0]) {
+			// 	$aspectRatio = ($previewWidth / $minHeight);
+			// }
 
 			if (1 / $aspectRatio * $minHeight > $sizes[1]) {
 				$aspectRatio = ($minWidth / $previewHeight);
@@ -157,7 +158,7 @@ public function renderWindow() {
 
 		?>
 		<div style="margin: auto; width: <?php echo $previewWidth; ?>px;">
-			<img style="width: <?php echo $previewWidth; ?>px; height: <?php echo $previewHeight; ?>px;" id="jcrop_target" src="<?php echo wp_get_attachment_url($_GET['postId']); ?>">
+			<img style="width: <?php echo $previewWidth; ?>px; height: <?php echo $previewHeight; ?>px;" id="jcrop_target" src="<?php echo wp_get_attachment_url($postId); ?>">
 		</div>
 	</div>
 	<div class="mic-right-col">
@@ -181,13 +182,13 @@ public function renderWindow() {
 			<br />
 			<div style="width: <?php echo $smallPreviewWidth; ?>px; height: <?php echo $smallPreviewHeight; ?>px; overflow: hidden; margin-left: 5px; float: right;">
 				<img id="preview"
-					src="<?php echo wp_get_attachment_url($_GET['postId']); ?>">
+					src="<?php echo wp_get_attachment_url($postId); ?>">
 			</div>
 		</div>
 
 		<div class="mic-48-col">
 			<?php _e('Previous image:','microp');
-			$editedImage =  wp_get_attachment_image_src($_GET['postId'], $editedSize);
+			$editedImage =  wp_get_attachment_image_src($postId, $editedSize);
 			?>
 			<div style="width: <?php echo $smallPreviewWidth; ?>px; height: <?php echo $smallPreviewHeight; ?>px; overflow: hidden; margin-left: 5px;">
 				<img id="micPreviousImage" style="max-width: <?php echo $smallPreviewWidth; ?>px; max-height: <?php echo $smallPreviewHeight; ?>px;" src="<?php echo $editedImage[0] . '?' . time(); ?>">
@@ -237,7 +238,7 @@ public function renderWindow() {
 </div>
 <script>
 		jQuery(document).ready(function($) {
-			mic_attachment_id = <?php echo $_GET['postId']; ?>;
+			mic_attachment_id = <?php echo $postId; ?>;
 			mic_edited_size = '<?php echo $editedSize; ?>';
 			mic_preview_scale = <?php echo $previewRatio; ?>;
 
@@ -283,6 +284,5 @@ function showPreview(coords) {
 		});
 		</script>
 <?php
-die;
 	}
 }
diff --git a/lib/ManualImageCropSettingsPage.php b/lib/ManualImageCropSettingsPage.php
@@ -148,7 +148,10 @@ public function sizes_settings_callback()
 			 </thead>
              <tbody>';
 
-		$sizesSettings = self::getSettings() || array();
+		$sizesSettings = self::getSettings();
+		if (!is_array($sizesSettings)) {
+			$sizesSettings = array();
+		}
 
 		foreach ($imageSizes as $s) {
 			$label = isset($sizeLabels[$s]) ? $sizeLabels[$s] : ucfirst( str_replace( '-', ' ', $s ) );

diff --git a/manual-image-crop.php b/manual-image-crop.php
@@ -1,17 +1,17 @@
 <?php
 /*
 Plugin Name: Manual Image Crop
-Plugin URI: http://www.rocketmill.co.uk/wordpress-plugin-manual-image-crop
+Plugin URI: https://github.com/tomaszsita/wp-manual-image-crop
 Description: Plugin allows you to manually crop all the image sizes registered in your WordPress theme (in particular featured image). Simply click on the "Crop" link next to any image in your media library and select the area of the image you want to crop.
-Version: 1.09
+Version: 1.12
 Author: Tomasz Sita
 Author URI: https://github.com/tomaszsita
 License: GPL2
 Text Domain: microp
 Domain Path: /languages/
 */
 
-define('mic_VERSION', '1.09');
+define('mic_VERSION', '1.12');
 
 include_once(dirname(__FILE__) . '/lib/ManualImageCropSettingsPage.php');
 

diff --git a/readme.txt b/readme.txt
@@ -1,16 +1,15 @@
 === Manual Image Crop ===
 Contributors: tomasz.sita
 Tags: crop, cropping, thumbnail, featured image, gallery, images, picture, image, image area
-Tested up to: 4.2.1
+Tested up to: 4.3
 Requires at least: 3.5
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=WB5ZQWGUM7T96
-Stable tag: 1.09
+Stable tag: 1.12
 
 Plugin allows you to manually crop all the image sizes registered in your WordPress theme (in particular featured image).
 
-
 == Description ==
 Plugin allows you to manually crop all the image sizes registered in your WordPress theme (in particular featured image).
 Simply click on the "Crop" link next to any image in your media library. 
@@ -21,32 +20,49 @@ Apart from media library list, the plugin adds links in few more places:
 * Below featured image box ("Crop featured image")
 * In the media insert modal window (once you select an image)
 
-GitHub Repository:
+= Enjoying using Manual Image Crop? =
+[Donate the plugin here](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=WB5ZQWGUM7T96 "Donate")
+
+Thank you!
+
+= GitHub Repository =
 https://github.com/tomaszsita/wp-manual-image-crop
 
-Translations:
+= Translations =
 * Dutch (Bernardo Hulsman)
 * French (Gabriel Féron)
 * German (Bertram Greenhough)
+* Hungarian (Roland Kal)
 * Italian (Alessandro Curci)
 * Polish (myself)
 * Russian (Andrey Hohlov)
 * Spanish (Andrew Kurtis)
+* Swedish (Karl Oskar Mattsson)
 
 Please contact me if you want to add a translation (or submit a pull request on GitHub)
 
-
 == Installation ==
-Manually:
-* Upload `manual-image-crop` to the `/wp-content/plugins/` directory
-* Activate the plugin through the 'Plugins' menu in WordPress
+= Manually: =
+*   Upload `manual-image-crop` to the `/wp-content/plugins/` directory
+*   Activate the plugin through the 'Plugins' menu in WordPress
 
-Automatically:
-* Navigate to the 'Plugins' menu inside of the wordpress wp-admin dashboard, and select AD NEW 
-* Search for 'Manual Imag Crop', and click install 
-* When the plugin has been installed, Click 'Activate' 
+= Automatically: =
+*   Navigate to the 'Plugins' menu inside of the wordpress wp-admin dashboard, and select AD NEW 
+*   Search for 'Manual Imag Crop', and click install 
+*   When the plugin has been installed, Click 'Activate' 
 
 == Changelog ==
+= 1.12 =
+* Fixed 'streched images' issue
+
+= 1.11 =
+* Hungarian translation added
+* Swedish translation added
+* Security improvements
+
+= 1.10 =
+* Fixed handling of array $crop param
+
 = 1.09 =
 * Dutch translation added
 * Better error handling