← All changes
|
modules/optimization/rest/optimize-single-image.php
+13
-19
1.0.0
→
1.7.7
View file →
| @@ -1,11 +1,9 @@ | ||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -namespace ImageOptimizer\Modules\Optimization\Rest; | |
| 3 | +namespace ImageOptimization\Modules\Optimization\Rest; | |
| 4 | 4 | |
| 5 | -use ImageOptimizer\Classes\Image\Image; | |
| 6 | -use ImageOptimizer\Modules\Oauth\Components\Connect; | |
| 7 | -use ImageOptimizer\Modules\Optimization\Classes\{ | |
| 5 | +use ImageOptimization\Modules\Optimization\Classes\{ | |
| 8 | 6 | Route_Base, |
| 9 | 7 | Single_Optimization, |
| 10 | 8 | Validate_Image, |
| 11 | 9 | }; |
| @@ -10,8 +8,9 @@ | ||
| 10 | 8 | Validate_Image, |
| 11 | 9 | }; |
| 12 | 10 | use Throwable; |
| 13 | 11 | use WP_REST_Request; |
| 12 | +use ImageOptimization\Plugin; | |
| 14 | 13 | |
| 15 | 14 | if ( ! defined( 'ABSPATH' ) ) { |
| 16 | 15 | exit; // Exit if accessed directly. |
| 17 | 16 | } |
| @@ -16,9 +15,9 @@ | ||
| 16 | 15 | exit; // Exit if accessed directly. |
| 17 | 16 | } |
| 18 | 17 | |
| 19 | 18 | class Optimize_Single_Image extends Route_Base { |
| 20 | - const NONCE_NAME = 'image-optimizer-optimize-image'; | |
| 19 | + const NONCE_NAME = 'image-optimization-optimize-image'; | |
| 21 | 20 | const IMAGE_ID_PARAM = 'imageId'; |
| 22 | 21 | |
| 23 | 22 | protected string $path = 'image'; |
| 24 | 23 | |
| @@ -30,16 +29,20 @@ | ||
| 30 | 29 | return [ 'POST' ]; |
| 31 | 30 | } |
| 32 | 31 | |
| 33 | 32 | public function POST( WP_REST_Request $request ) { |
| 34 | - $this->verify_nonce_and_capability( | |
| 33 | + $error = $this->verify_nonce_and_capability( | |
| 35 | 34 | $request->get_param( self::NONCE_NAME ), |
| 36 | 35 | self::NONCE_NAME |
| 37 | 36 | ); |
| 38 | 37 | |
| 39 | - if ( ! Connect::is_activated() ) { | |
| 38 | + if ( $error ) { | |
| 39 | + return $error; | |
| 40 | + } | |
| 41 | + | |
| 42 | + if ( ! Plugin::instance()->modules_manager->get_modules( 'connect-manager' )->connect_instance->is_activated() ) { | |
| 40 | 43 | return $this->respond_error_json([ |
| 41 | - 'message' => esc_html__( 'Invalid activation', 'image-optimizer' ), | |
| 44 | + 'message' => esc_html__( 'Invalid activation', 'image-optimization' ), | |
| 42 | 45 | 'code' => 'unauthorized', |
| 43 | 46 | ]); |
| 44 | 47 | } |
| 45 | 48 | |
| @@ -47,24 +50,15 @@ | ||
| 47 | 50 | $image_id = (int) $request->get_param( self::IMAGE_ID_PARAM ); |
| 48 | 51 | |
| 49 | 52 | if ( empty( $image_id ) ) { |
| 50 | 53 | return $this->respond_error_json([ |
| 51 | - 'message' => esc_html__( 'Invalid image id', 'image-optimizer' ), | |
| 52 | - 'code' => 'internal_server_error', | |
| 54 | + 'message' => esc_html__( 'Invalid image id', 'image-optimization' ), | |
| 55 | + 'code' => 'bad_request', | |
| 53 | 56 | ]); |
| 54 | 57 | } |
| 55 | 58 | |
| 56 | 59 | try { |
| 57 | 60 | Validate_Image::is_valid( $image_id ); |
| 58 | - | |
| 59 | - $image = new Image( $image_id ); | |
| 60 | - | |
| 61 | - if ( $is_reoptimize && ! $image->is_optimized() ) { | |
| 62 | - return $this->respond_error_json([ | |
| 63 | - 'message' => esc_html__( 'Cannot reoptimize an image that was not optimized yet.', 'image-optimizer' ), | |
| 64 | - 'code' => 'bad_request', | |
| 65 | - ]); | |
| 66 | - } | |
| 67 | 61 | |
| 68 | 62 | Single_Optimization::schedule_single_optimization( $image_id, $is_reoptimize ); |
| 69 | 63 | |
| 70 | 64 | return $this->respond_success_json(); |