Changeset 1556512

Timestamp:

12/17/2016 02:01:02 AM (9 years ago)

Author:

OriginalEXE

Message:

Version 1.4.0

Location:

optimize-images-resizing

Files:

• assets/screenshot-1.png (modified) (previous)
• trunk/css/remove-image-sizes.css (modified) (1 diff)
• trunk/inc/class-remove-image-sizes.php (modified) (2 diffs)
• trunk/inc/class-resize-image.php (modified) (1 diff)
• trunk/js/remove-image-sizes.js (modified) (1 diff)
• trunk/optimize-images-resizing.php (modified) (2 diffs)
• trunk/readme.txt (modified) (5 diffs)

optimize-images-resizing/trunk/css/remove-image-sizes.css

@@ -1 +1 @@
 #oir-status-message,
 #oir-log {
-    display: none;
+  display: none;
 }
+
+#oir-buttons {
+  margin-bottom: 20px;
+  margin-top: 5px;
+}

optimize-images-resizing/trunk/inc/class-remove-image-sizes.php

@@ -7 +7 @@
 if ( ! class_exists( 'OIR_Remove_Image_Sizes' ) ) :
 
-    final class OIR_Remove_Image_Sizes {
-
-        // Will hold the only instance of our main plugin class
-        private static $instance;
-
-        // Instantiate the class and set up stuff
-        public static function instantiate() {
-
-            if ( ! isset( self::$instance ) && ! ( self::$instance instanceof OIR_Remove_Image_Sizes ) ) {
-
-                self::$instance = new OIR_Remove_Image_Sizes();
-
-                add_action( 'admin_init', array( self::$instance, 'add_media_settings' ) );
-                add_action( 'wp_ajax_oir_remove_image_sizes', array( self::$instance, 'remove_image_sizes' ) );
-                add_action( 'admin_enqueue_scripts', array( self::$instance, 'enqueue_assets' ) );
-
-                // Upon image upload, only generate default sizes
-                add_filter( 'intermediate_image_sizes_advanced', array( self::$instance, 'remove_intermediate_sizes' ), 10, 1 );
-
-            }
-
-            return self::$instance;
-
-        }
-
-        // Filter the sizes that get created initially      
-        public function remove_intermediate_sizes( $sizes ) {
-
-            $allowed_sizes = apply_filters( 'image_size_names_choose', array() );
-
-            $allowed_sizes = array_merge( array_keys( $allowed_sizes ), array( 'thumbnail', 'medium', 'large' ) );
-
-            return array_intersect_key( $sizes, array_flip( $allowed_sizes ) );
-
-        }
-
-        // register our media settings
-        public function add_media_settings() {
-
-            add_settings_field( 'oir_media_settings', __( 'Remove image sizes', 'optimize-images-resizing' ), array( $this, 'media_settings_output' ), 'media', 'default' );
-
-        }
-
-        // add a small output to media settings screen
-        public function media_settings_output() {
-
-            echo sprintf( '<button id="oir-remove-image-sizes" class="button">%s</button>', __( 'Start cleanup', 'optimize-images-resizing' ) );
-            echo '<p id="oir-status-message"></p>';
-            echo sprintf( '<p class="description">%s</p>',
-                __( 'Click this button to remove redundant image sizes. You only need to do this once.', 'optimize-images-resizing' )
-            );
-            echo '<div id="oir-log"></div>';
-
-        }
-
-        // cleans up extra image sizes when called via ajax
-        public function remove_image_sizes( $__attachment_id ) {
-
-            $paged = ! empty( $_POST['paged'] ) ? absint( $_POST['paged'] ) : 1;
-            $removed = ! empty( $_POST['removed'] ) ? absint( $_POST['removed'] ) : 0;
-            $removed_log = ! empty( $_POST['removed_log'] ) ? (array) $_POST['removed_log'] : array();
-
-            if ( ! $__attachment_id ) {
-
-                check_ajax_referer( 'oir-nonce', 'nonce' );
-
-                $args = array(
-                    'fields'         => 'ids',
-                    'paged'          => $paged,
-                    'post_mime_type' => 'image',
-                    'post_status'    => 'any',
-                    'post_type'      => 'attachment',
-                    'posts_per_page' => 10,
-                );
-
-            } else {
-
-                $args = array(
-                    'fields'         => 'ids',
-                    'post_mime_type' => 'image',
-                    'post_status'    => 'any',
-                    'post_type'      => 'attachment',
-                    'post__in'       => array( absint( $__attachment_id ) ),
-                );
-
-            }
-
-            $query = new WP_Query( $args );
-
-            $found = absint( $query->found_posts );
-            $finished = empty( $query->posts ) ? true : false;
-
-            if ( ! $finished ) {
-
-                $upload_dir = wp_upload_dir();
-
-                foreach ( $query->posts as $attachment_id ) {
-
-                    $meta = wp_get_attachment_metadata( $attachment_id );
-
-                    if ( empty( $meta['file'] ) ) {
-
-                        continue;
-
-                    }
-
-                    $file_path = str_replace( basename( $meta['file'] ), '', trailingslashit( $upload_dir['basedir'] ) . $meta['file'] );
-
-                    if ( empty( $meta['sizes'] ) || ! is_array( $meta['sizes'] ) ) {
-
-                        continue;
-
-                    }
-
-                    // Don't remove images if they are used in default image sizes
-                    // (happens when custom image size matches the dimensions of the default ones)
-                    $do_not_delete = array();
-
-                    $allowed_sizes = apply_filters( 'image_size_names_choose', array() );
-
-                    $allowed_sizes = array_merge( array_keys( $allowed_sizes ), array( 'thumbnail', 'medium', 'large' ) );
-
-                    foreach ( $meta['sizes'] as $size => $params ) {
-
-                        $file = realpath( $file_path . $params['file'] );
-
-                        // we don't want to delete thumbnails, they are used in admin area
-                        if ( in_array( $size, $allowed_sizes ) ) {
-
-                            $do_not_delete[] = $file;
-
-                            continue;
-
-                        }
-
-                        if ( ! in_array( $file, $do_not_delete ) && is_readable( $file ) ) {
-
-                            unlink( $file );
-
-                            unset( $meta['sizes'][ $size ] );
-
-                            $removed++;
-                            $removed_log[] = $file;
-
-                        }
-
-                    }
-
-                    wp_update_attachment_metadata( $attachment_id, $meta );
-
-                }
-
-            }
-
-            if ( ! $__attachment_id ) {
-
-                $response = array(
-                    'finished'    => $finished,
-                    'found'       => $found,
-                    'paged'       => $paged,
-                    'removed'     => $removed,
-                    'removed_log' => $removed_log,
-                    'success'     => true,
-                );
-
-                wp_send_json( $response );
-
-            }
-
-        }
-
-        // add js and css needed on media settings screen
-        public function enqueue_assets( $hook ) {
-
-            if ( 'options-media.php' !== $hook ) {
-
-                // we only need this script in media settings
-                return;
-
-            }
-
-            wp_enqueue_script( 'oir_remove_image_sizes', OIR_JS_URL . 'remove-image-sizes.js' );
-
-            $localize = array(
-                'l10n'  => array(
-                    'something_wrong'  => __( 'Something went wrong, please try again or contact the developer!', 'optimize-images-resizing' ),
-                    'process_finished' => __( 'Cleanup was successfully completed. Number of images removed: %d.', 'optimize-images-resizing' ),
-                    'nothing_to_remove' => __( 'There was nothing to clean up, looks like you have no redundant image sizes. Good job!', 'optimize-images-resizing' ),
-                    'cleanup_progress' => __( 'Cleanup in progress, leave this page open!', 'optimize-images-resizing' ),
-                ),
-                'nonce' => wp_create_nonce( 'oir-nonce' ),
-            );
-
-            wp_localize_script( 'oir_remove_image_sizes', 'oir_plugin', $localize );
-
-            wp_enqueue_style( 'oir_remove_image_sizes', OIR_CSS_URL . 'remove-image-sizes.css' );
-
-        }
-
-    }
+  final class OIR_Remove_Image_Sizes {
+
+    // Will hold the only instance of our main plugin class
+    private static $instance;
+
+    // Instantiate the class and set up stuff
+    public static function instantiate() {
+
+      if ( ! isset( self::$instance ) && ! ( self::$instance instanceof OIR_Remove_Image_Sizes ) ) {
+
+        self::$instance = new OIR_Remove_Image_Sizes();
+
+      }
+
+      return self::$instance;
+
+    }
+
+    public function __construct() {
+
+      add_action( 'admin_menu', array( $this, 'add_tools_subpage' ) );
+      add_action( 'wp_ajax_oir_remove_image_sizes', array( $this, 'remove_image_sizes' ) );
+      add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_assets' ) );
+
+      // Upon image upload, only generate default sizes
+      add_filter( 'intermediate_image_sizes_advanced', array( $this, 'remove_intermediate_sizes' ), 10, 1 );
+
+    }
+
+    // Returns image sizes that we don't want to remove
+    public function get_ignored_image_sizes() {
+
+      $ignored_sizes = apply_filters( 'image_size_names_choose', array() );
+
+      $ignored_sizes = array_merge( array_keys( $ignored_sizes ), array( 'thumbnail', 'medium', 'large' ) );
+
+      return apply_filters( 'oir_ignored_sizes', $ignored_sizes );
+
+    }
+
+    // Filter the sizes that get created initially
+    public function remove_intermediate_sizes( $sizes ) {
+
+      return array_intersect_key( $sizes, $this->get_ignored_image_sizes() );
+
+    }
+
+    public function add_tools_subpage() {
+
+      add_submenu_page(
+        'tools.php',
+        __( 'Remove image sizes', 'optimize-images-resizing' ),
+        __( 'Remove image sizes', 'optimize-images-resizing' ),
+        'manage_options',
+        'optimize-images-resizing',
+        array( $this, 'tools_subpage_output' )
+      );
+
+    }
+
+    // add a small output to media settings screen
+    public function tools_subpage_output() {
+
+      $cleanup_in_progress = get_option( 'oir_cleanup_progress_page', false );
+
+      if ( false !== $cleanup_in_progress ) {
+
+        $cleanup_in_progress = absint( $cleanup_in_progress );
+
+      }
+
+      ?>
+
+      <div class="wrap">
+        <h1><?php _e( 'Remove image sizes', 'optimize-images-resizing' ); ?></h1>
+        <p>
+          <label>
+            <input type="checkbox" id="oir-keep-the-log" value="1">
+            <?php _e( 'Keep a record of removed image sizes (not recommended for huge media libraries)' ); ?>
+          </label>
+        </p>
+
+        <div id="oir-buttons">
+
+          <?php if ( $cleanup_in_progress ) : ?>
+
+            <button
+            id="oir-resume-remove-image-sizes"
+            class="button button-primary"
+            data-page="<?php echo esc_attr( $cleanup_in_progress ); ?>"
+            ><?php _e( 'Resume old cleanup', 'optimize-images-resizing' ); ?></button>
+
+          <?php endif; ?>
+
+          <button id="oir-remove-image-sizes" class="button"><?php _e( 'Start new cleanup', 'optimize-images-resizing' ); ?></button>
+
+        </div>
+        <p id="oir-status-message"></p>
+        <p class="description"><?php _e( 'Click the button above to remove redundant image sizes. You only need to do this once.', 'optimize-images-resizing' ); ?></p>
+        <div id="oir-log"></div>
+      </div>
+
+      <?php
+
+    }
+
+    // cleans up extra image sizes when called via ajax
+    public function remove_image_sizes( $__attachment_id ) {
+
+      $paged = ! empty( $_POST['paged'] ) ? absint( $_POST['paged'] ) : 1;
+      $removed = ! empty( $_POST['removed'] ) ? absint( $_POST['removed'] ) : 0;
+      $record_log = ! empty( $_POST['record_log'] ) ? 'true' === $_POST['record_log'] : false;
+      $removed_in_current_request = array();
+
+      update_option( 'oir_cleanup_progress_page', $paged );
+
+      if ( ! $__attachment_id ) {
+
+        check_ajax_referer( 'oir-nonce', 'nonce' );
+
+        $args = array(
+          'fields'         => 'ids',
+          'paged'          => $paged,
+          'post_mime_type' => 'image',
+          'post_status'    => 'any',
+          'post_type'      => 'attachment',
+          'posts_per_page' => 10,
+        );
+
+      } else {
+
+        $args = array(
+          'fields'         => 'ids',
+          'post_mime_type' => 'image',
+          'post_status'    => 'any',
+          'post_type'      => 'attachment',
+          'post__in'       => array( absint( $__attachment_id ) ),
+        );
+
+      }
+
+      $query = new WP_Query( $args );
+
+      $found = absint( $query->found_posts );
+      $finished = empty( $query->posts ) ? true : false;
+
+      if ( ! $finished ) {
+
+        $upload_dir = wp_upload_dir();
+
+        foreach ( $query->posts as $attachment_id ) {
+
+          $meta = wp_get_attachment_metadata( $attachment_id );
+
+          if ( empty( $meta['file'] ) ) {
+
+            continue;
+
+          }
+
+          $file_path = str_replace( basename( $meta['file'] ), '', trailingslashit( $upload_dir['basedir'] ) . $meta['file'] );
+
+          if ( empty( $meta['sizes'] ) || ! is_array( $meta['sizes'] ) ) {
+
+            continue;
+
+          }
+
+          // Don't remove images if they are used in default image sizes
+          // (happens when custom image size matches the dimensions of the default ones)
+          $do_not_delete = array();
+
+          $ignored_sizes = $this->get_ignored_image_sizes();
+
+          foreach ( $meta['sizes'] as $size => $params ) {
+
+            $file = realpath( $file_path . $params['file'] );
+
+            // we don't want to delete thumbnails, they are used in admin area
+            if ( in_array( $size, $ignored_sizes ) ) {
+
+              $do_not_delete[] = $file;
+
+              continue;
+
+            }
+
+            if ( ! in_array( $file, $do_not_delete ) && is_readable( $file ) ) {
+
+              unlink( $file );
+
+              unset( $meta['sizes'][ $size ] );
+
+              $removed++;
+
+              $removed_in_current_request[] = $file;
+
+            }
+
+          }
+
+          wp_update_attachment_metadata( $attachment_id, $meta );
+
+        }
+
+        if ( $record_log ) {
+
+          $removed_so_far = get_option( 'oir_removed_log', array() );
+
+          $removed_log = array_merge( $removed_so_far, $removed_in_current_request );
+
+          update_option( 'oir_removed_log', $removed_log );
+
+        }
+
+      } else {
+
+        delete_option( 'oir_cleanup_progress_page' );
+
+      }
+
+      if ( ! $__attachment_id ) {
+
+        $response = array(
+          'finished' => $finished,
+          'found' => $found,
+          'paged' => $paged,
+          'removed' => $removed,
+          'success' => true,
+        );
+
+        if ( $record_log && $finished ) {
+
+          $removed_so_far = get_option( 'oir_removed_log', array() );
+
+          $response['removed_log'] = $removed_so_far;
+
+        }
+
+        wp_send_json( $response );
+
+      }
+
+    }
+
+    // add js and css needed on media settings screen
+    public function enqueue_assets( $hook ) {
+
+      if ( 'tools_page_optimize-images-resizing' !== $hook ) {
+
+        // we only need this script in media settings
+        return;
+
+      }
+
+      wp_enqueue_script( 'oir_remove_image_sizes', OIR_JS_URL . 'remove-image-sizes.js' );
+
+      $localize = array(
+        'l10n'  => array(
+          'something_wrong'  => __( 'Something went wrong, please try again or contact the developer!', 'optimize-images-resizing' ),
+          'process_finished' => __( 'Cleanup was successfully completed. Number of images removed: %d.', 'optimize-images-resizing' ),
+          'nothing_to_remove' => __( 'There was nothing to clean up, looks like you have no redundant image sizes. Good job!', 'optimize-images-resizing' ),
+          'cleanup_progress' => __( 'Cleanup in progress, leave this page open!', 'optimize-images-resizing' ),
+        ),
+        'nonce' => wp_create_nonce( 'oir-nonce' ),
+      );
+
+      wp_localize_script( 'oir_remove_image_sizes', 'oir_plugin', $localize );
+
+      wp_enqueue_style( 'oir_remove_image_sizes', OIR_CSS_URL . 'remove-image-sizes.css' );
+
+    }
+
+  }
 
 endif;
@@ -217 +291 @@
 if ( defined( 'WP_CLI' ) && WP_CLI ) {
 
-    require_once 'inc/class-cli-command.php';
+  require_once 'inc/class-cli-command.php';
 
 }

optimize-images-resizing/trunk/inc/class-resize-image.php

@@ -7 +7 @@
 if ( ! class_exists( 'OIR_Resize_Image' ) ) :
 
-    final class OIR_Resize_Image {
+  final class OIR_Resize_Image {
 
-        // Will hold the only instance of our main plugin class
-        private static $instance;
+    // Will hold the only instance of our main plugin class
+    private static $instance;
 
-        // Instantiate the class and set up stuff
-        public static function instantiate() {
+    // Instantiate the class and set up stuff
+    public static function instantiate() {
 
-            if ( ! isset( self::$instance ) && ! ( self::$instance instanceof OIR_Resize_Image ) ) {
+      if ( ! isset( self::$instance ) && ! ( self::$instance instanceof OIR_Resize_Image ) ) {
 
-                self::$instance = new OIR_Resize_Image();
+        self::$instance = new OIR_Resize_Image();
 
-                add_filter( 'image_downsize', array( self::$instance, 'image_downsize' ), 10, 3 );
+      }
 
-            }
+      return self::$instance;
 
-            return self::$instance;
+    }
 
-        }
+    public function __construct() {
 
-        // we hook into the filter, check if image size exists, generate it if not and then bail out
-        public function image_downsize( $out, $id, $size ) {
+      add_filter( 'image_downsize', array( self::$instance, 'image_downsize' ), 10, 3 );
 
-            // we don't handle this
-            if ( is_array( $size ) ) return false;
+    }
 
-            $meta = wp_get_attachment_metadata( $id );
-            $wanted_width = $wanted_height = 0;
+    // we hook into the filter, check if image size exists, generate it if not and then bail out
+    public function image_downsize( $out, $id, $size ) {
 
-            if ( empty( $meta['file'] ) ) return false;
+      // we don't handle this
+      if ( is_array( $size ) ) return false;
 
-            // get $size dimensions
-            global $_wp_additional_image_sizes;
+      $meta = wp_get_attachment_metadata( $id );
+      $wanted_width = $wanted_height = 0;
 
-            if ( isset( $_wp_additional_image_sizes ) && isset( $_wp_additional_image_sizes[ $size ] ) ) {
+      if ( empty( $meta['file'] ) ) return false;
 
-                $wanted_width = $_wp_additional_image_sizes[ $size ]['width'];
-                $wanted_height = $_wp_additional_image_sizes[ $size ]['height'];
-                $wanted_crop = isset( $_wp_additional_image_sizes[ $size ]['crop'] ) ? $_wp_additional_image_sizes[ $size ]['crop'] : false;
+      // get $size dimensions
+      global $_wp_additional_image_sizes;
 
-            } else if ( in_array( $size, array( 'thumbnail', 'medium', 'large' ) ) ) {
+      if ( isset( $_wp_additional_image_sizes ) && isset( $_wp_additional_image_sizes[ $size ] ) ) {
 
-                $wanted_width  = get_option( $size . '_size_w' );
-                $wanted_height = get_option( $size . '_size_h' );
-                $wanted_crop   = ( 'thumbnail' === $size ) ? (bool) get_option( 'thumbnail_crop' ) : false;
+        $wanted_width = $_wp_additional_image_sizes[ $size ]['width'];
+        $wanted_height = $_wp_additional_image_sizes[ $size ]['height'];
+        $wanted_crop = isset( $_wp_additional_image_sizes[ $size ]['crop'] ) ? $_wp_additional_image_sizes[ $size ]['crop'] : false;
 
-            } else {
+      } else if ( in_array( $size, array( 'thumbnail', 'medium', 'large' ) ) ) {
 
-                // unknown size, bail out
-                return false;
+        $wanted_width  = get_option( $size . '_size_w' );
+        $wanted_height = get_option( $size . '_size_h' );
+        $wanted_crop   = ( 'thumbnail' === $size ) ? (bool) get_option( 'thumbnail_crop' ) : false;
 
-            }
+      } else {
 
-            if ( 0 === absint( $wanted_width ) && 0 === absint( $wanted_height ) ) {
+        // unknown size, bail out
+        return false;
 
-                return false;
+      }
 
-            }
+      if ( 0 === absint( $wanted_width ) && 0 === absint( $wanted_height ) ) {
 
-            if ( $intermediate = image_get_intermediate_size( $id, $size ) ) {
+        return false;
 
-                $img_url = wp_get_attachment_url( $id );
-                $img_url_basename = wp_basename( $img_url );
+      }
 
-                $img_url = str_replace( $img_url_basename, $intermediate['file'], $img_url );
-                $result_width = $intermediate['width'];
-                $result_height = $intermediate['height'];
+      if ( $intermediate = image_get_intermediate_size( $id, $size ) ) {
 
-                return array(
-                    $img_url,
-                    $result_width,
-                    $result_height,
-                    true,
-                );
+        $img_url = wp_get_attachment_url( $id );
+        $img_url_basename = wp_basename( $img_url );
 
-            } else {
+        $img_url = str_replace( $img_url_basename, $intermediate['file'], $img_url );
+        $result_width = $intermediate['width'];
+        $result_height = $intermediate['height'];
 
-                // image size not found, create it
-                $attachment_path = get_attached_file( $id );
+        return array(
+          $img_url,
+          $result_width,
+          $result_height,
+          true,
+        );
 
-                $image_editor = wp_get_image_editor( $attachment_path );
+      } else {
 
-                if ( ! is_wp_error( $image_editor ) ) {
+        // image size not found, create it
+        $attachment_path = get_attached_file( $id );
 
-                    $image_editor->resize( $wanted_width, $wanted_height, $wanted_crop );
-                    $result_image_size = $image_editor->get_size();
+        $image_editor = wp_get_image_editor( $attachment_path );
 
-                    $result_width = $result_image_size['width'];
-                    $result_height = $result_image_size['height'];
+        if ( ! is_wp_error( $image_editor ) ) {
 
-                    $suffix = $result_width . 'x' . $result_height;
-                    $filename = $image_editor->generate_filename( $suffix );
+          $image_editor->resize( $wanted_width, $wanted_height, $wanted_crop );
+          $result_image_size = $image_editor->get_size();
 
-                    $image_editor->save( $filename );
+          $result_width = $result_image_size['width'];
+          $result_height = $result_image_size['height'];
 
-                    $result_filename = wp_basename( $filename );
+          $suffix = $result_width . 'x' . $result_height;
+          $filename = $image_editor->generate_filename( $suffix );
 
-                    $meta['sizes'][ $size ] = array(
-                        'file'      => $result_filename,
-                        'width'     => $result_width,
-                        'height'    => $result_height,
-                        'mime-type' => get_post_mime_type( $id ),
-                    );
+          $image_editor->save( $filename );
 
-                    wp_update_attachment_metadata( $id, $meta );
+          $result_filename = wp_basename( $filename );
 
-                    $img_url = wp_get_attachment_url( $id );
-                    $img_url_basename = wp_basename( $img_url );
+          $meta['sizes'][ $size ] = array(
+            'file'      => $result_filename,
+            'width'     => $result_width,
+            'height'    => $result_height,
+            'mime-type' => get_post_mime_type( $id ),
+          );
 
-                    $img_url = str_replace( $img_url_basename, $result_filename, $img_url );
+          wp_update_attachment_metadata( $id, $meta );
 
-                    return array(
-                        $img_url,
-                        $result_width,
-                        $result_height,
-                        true,
-                    );
+          $img_url = wp_get_attachment_url( $id );
+          $img_url_basename = wp_basename( $img_url );
 
-                } else {
+          $img_url = str_replace( $img_url_basename, $result_filename, $img_url );
 
-                    return false;
+          return array(
+            $img_url,
+            $result_width,
+            $result_height,
+            true,
+          );
 
-                }
+        } else {
 
-            }
+          return false;
 
-            return false;
+        }
 
-        }
+      }
 
-    }
+      return false;
+
+    }
+
+  }
 
 endif;

optimize-images-resizing/trunk/js/remove-image-sizes.js

@@ -1 +1 @@
 jQuery( function( $ ) {
 
-    "use strict";
+  "use strict";
 
-    var $body = $( 'body' ),
-        $button = $( '#oir-remove-image-sizes' ),
-        $message = $( '#oir-status-message' ),
-        $log = $( '#oir-log' );
+  var $body = $( 'body' ),
+    $button_new_cleanup = $( '#oir-remove-image-sizes' ),
+    $button_old_cleanup = $( '#oir-resume-remove-image-sizes' ),
+    $buttons = $( '#oir-buttons' ),
+    $message = $( '#oir-status-message' ),
+    $log = $( '#oir-log' ),
+    record_log = false;
 
-    $button.on( 'click', function( e ) {
+  $button_new_cleanup.on( 'click', function( e ) {
 
-        e.preventDefault();
+    e.preventDefault();
 
-        $button.hide();
-        $message
-            .html( oir_plugin.l10n.cleanup_progress )
-            .show();
+    $buttons.hide();
+    $message
+      .html( oir_plugin.l10n.cleanup_progress )
+      .show();
 
-        ajax_request();
+    record_log = $( '#oir-keep-the-log' ).is( ':checked' );
 
-    });
+    ajax_request();
 
-    $body.on( 'click', '.js-oir-show-log', function( e ) {
+  });
 
-        e.preventDefault();
+  $button_old_cleanup.on( 'click', function( e ) {
 
-        $log.stop().slideToggle();
+    e.preventDefault();
 
-    });
+    $buttons.hide();
+    $message
+      .html( oir_plugin.l10n.cleanup_progress )
+      .show();
 
-    function ajax_request( paged, removed, removed_log ) {
+    record_log = $( '#oir-keep-the-log' ).is( ':checked' );
 
-        paged = 'undefined' == typeof paged ? 1 : parseInt( paged, 10 );
-        removed = 'undefined' == typeof removed ? 0 : parseInt( removed, 10 );
-        removed_log = 'undefined' == typeof removed_log ? [] : removed_log;
+    var page = parseInt( $button_old_cleanup.attr( 'data-page' ), 10 );
 
-        $.post(
-            ajaxurl,
-            {
-                action     : 'oir_remove_image_sizes',
-                nonce      : oir_plugin.nonce,
-                paged      : paged,
-                removed    : removed,
-                removed_log: removed_log
-            },
-            function( response ) {
+    ajax_request( page );
 
-                if ( true !== response.success ) {
+  });
 
-                    // Looks like something went wrong
+  $body.on( 'click', '.js-oir-show-log', function( e ) {
 
-                    $message
-                        .html( oir_plugin.l10n.something_wrong )
-                        .show();
+    e.preventDefault();
 
-                    return;
+    $log.stop().slideToggle();
 
-                }
+  });
 
-                if ( true === response.finished ) {
+  function ajax_request( paged, removed ) {
 
-                    // Cleanup has finished
+    paged = 'undefined' == typeof paged ? 1 : parseInt( paged, 10 );
+    removed = 'undefined' == typeof removed ? 0 : parseInt( removed, 10 );
 
-                    var message = 0 === parseInt( response.removed, 10 ) ? oir_plugin.l10n.nothing_to_remove : oir_plugin.l10n.process_finished.replace( '%d', '<a href="#" class="js-oir-show-log">' + response.removed + '</a>' );
+    $.post(
+      ajaxurl,
+      {
+        action: 'oir_remove_image_sizes',
+        nonce: oir_plugin.nonce,
+        paged: paged,
+        removed: removed,
+        record_log: record_log
+      },
+      function( response ) {
 
-                    $message
-                        .html( message );
+        if ( true !== response.success ) {
 
-                    if ( 0 !== parseInt( response.removed, 10 ) && response.removed_log.length ) {
+          // Looks like something went wrong
 
-                        var logHtml = '<pre>';
+          $message
+            .html( oir_plugin.l10n.something_wrong )
+            .show();
 
-                        $.each( response.removed_log, function( i, file ) {
+          return;
 
-                            logHtml += file + '\n';
+        }
 
-                        });
+        if ( true === response.finished ) {
 
-                        logHtml += '</pre>';
+          // Cleanup has finished
 
-                        $log.html( logHtml )
+          var message = 0 === parseInt( response.removed, 10 ) ? oir_plugin.l10n.nothing_to_remove : oir_plugin.l10n.process_finished.replace( '%d', '<a href="#" class="js-oir-show-log">' + response.removed + '</a>' );
 
-                    }
+          $message
+            .html( message );
 
-                    return;
+          if ( record_log && 0 !== parseInt( response.removed, 10 ) && response.removed_log.length ) {
 
-                }
+            var logHtml = '<pre>';
 
-                // Cleanup still in progress
+            $.each( response.removed_log, function( i, file ) {
 
-                var completed = ( response.paged * 10 > response.found ) ? response.found : response.paged * 10;
+              logHtml += file + '\n';
 
-                $message
-                    .html( oir_plugin.l10n.cleanup_progress + ' ' + completed + ' / ' + response.found );
+            });
 
-                ajax_request( ++response.paged, response.removed, response.removed_log );
+            logHtml += '</pre>';
 
-            },
-            'json'
-        );
+            $log.html( logHtml )
 
-    }
+          }
+
+          return;
+
+        }
+
+        // Cleanup still in progress
+
+        var completed = ( response.paged * 10 > response.found ) ? response.found : response.paged * 10;
+
+        $message
+          .html( oir_plugin.l10n.cleanup_progress + ' ' + completed + ' / ' + response.found );
+
+        ajax_request( ++response.paged, response.removed );
+
+      },
+      'json'
+    );
+
+  }
 
 });

optimize-images-resizing/trunk/optimize-images-resizing.php

@@ -9 +9 @@
  * Text Domain: optimize-images-resizing
  * Domain Path: /languages
- * Version: 1.3.0
+ * Version: 1.4.0
  */
 
@@ -18 +18 @@
 if ( ! class_exists( 'OIR_Init' ) ) :
 
-    final class OIR_Init {
+  final class OIR_Init {
 
-        // Will hold the only instance of our main plugin class
-        private static $instance;
+    // Will hold the only instance of our main plugin class
+    private static $instance;
 
-        // Instantiate the class and set up stuff
-        public static function instantiate() {
+    // Instantiate the class and set up stuff
+    public static function instantiate() {
 
-            if ( ! isset( self::$instance ) && ! ( self::$instance instanceof OIR_Init ) ) {
+      if ( ! isset( self::$instance ) && ! ( self::$instance instanceof OIR_Init ) ) {
 
-                self::$instance = new OIR_Init();
-                self::$instance->define_constants();
-                self::$instance->include_files();
+        self::$instance = new OIR_Init();
+        self::$instance->define_constants();
+        self::$instance->include_files();
 
-                // load textdomain
-                add_action( 'plugins_loaded', array( self::$instance, 'load_textdomain' ) );
+      }
 
-            }
+      return self::$instance;
 
-            return self::$instance;
+    }
 
-        }
+    public function __construct() {
 
-        // Defines plugin constants
-        private function define_constants() {
+      // load textdomain
+      add_action( 'plugins_loaded', array( $this, 'load_textdomain' ) );
 
-            // Plugin version
-            if ( ! defined( 'OIR_VERSION' ) )
-                define( 'OIR_VERSION', '1.3.0' );
+      add_filter( 'plugin_action_links_' . plugin_basename( __FILE__ ), array( $this, 'add_link_to_plugin_page' ) );
 
-            // Plugin Folder Path
-            if ( ! defined( 'OIR_PLUGIN_DIR' ) )
-                define( 'OIR_PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
+    }
 
-            // Plugin Include Path
-            if ( ! defined( 'OIR_PLUGIN_DIR_INC' ) )
-                define( 'OIR_PLUGIN_DIR_INC', OIR_PLUGIN_DIR . 'inc/' );
+    // Defines plugin constants
+    private function define_constants() {
 
-            // Plugin Folder URL
-            if ( ! defined( 'OIR_PLUGIN_URL' ) )
-                define( 'OIR_PLUGIN_URL', plugin_dir_url( __FILE__ ) );
+      // Plugin version
+      if ( ! defined( 'OIR_VERSION' ) )
+        define( 'OIR_VERSION', '1.4.0' );
 
-            // Plugin JS Folder URL
-            if ( ! defined( 'OIR_JS_URL' ) )
-                define( 'OIR_JS_URL', OIR_PLUGIN_URL . 'js/' );
+      // Plugin Folder Path
+      if ( ! defined( 'OIR_PLUGIN_DIR' ) )
+        define( 'OIR_PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
 
-            // Plugin CSS Folder URL
-            if ( ! defined( 'OIR_CSS_URL' ) )
-                define( 'OIR_CSS_URL', OIR_PLUGIN_URL . 'css/' );
+      // Plugin Include Path
+      if ( ! defined( 'OIR_PLUGIN_DIR_INC' ) )
+        define( 'OIR_PLUGIN_DIR_INC', OIR_PLUGIN_DIR . 'inc/' );
 
-            // Plugin Root File
-            if ( ! defined( 'OIR_PLUGIN_FILE' ) )
-                define( 'OIR_PLUGIN_FILE', __FILE__ );
+      // Plugin Folder URL
+      if ( ! defined( 'OIR_PLUGIN_URL' ) )
+        define( 'OIR_PLUGIN_URL', plugin_dir_url( __FILE__ ) );
 
-        }
+      // Plugin JS Folder URL
+      if ( ! defined( 'OIR_JS_URL' ) )
+        define( 'OIR_JS_URL', OIR_PLUGIN_URL . 'js/' );
 
-        // Includes necessary files
-        private function include_files() {
+      // Plugin CSS Folder URL
+      if ( ! defined( 'OIR_CSS_URL' ) )
+        define( 'OIR_CSS_URL', OIR_PLUGIN_URL . 'css/' );
 
-            require_once OIR_PLUGIN_DIR_INC . 'class-resize-image.php';
+      // Plugin Root File
+      if ( ! defined( 'OIR_PLUGIN_FILE' ) )
+        define( 'OIR_PLUGIN_FILE', __FILE__ );
 
-            if ( is_admin() ) {
+    }
 
-                require_once OIR_PLUGIN_DIR_INC . 'class-remove-image-sizes.php';
+    // Includes necessary files
+    private function include_files() {
 
-            }
+      require_once OIR_PLUGIN_DIR_INC . 'class-resize-image.php';
 
-        }
+      if ( is_admin() ) {
 
-        // sets up textdomain
-        public static function load_textdomain() {
+        require_once OIR_PLUGIN_DIR_INC . 'class-remove-image-sizes.php';
 
-            $lang_dir = dirname( plugin_basename( OIR_PLUGIN_FILE ) ) . '/languages/';
+      }
 
-            $lang_dir = trailingslashit( apply_filters( 'oir_textdomain_location', $lang_dir ) );
+    }
 
-            load_plugin_textdomain( 'optimize-images-resizing', false, $lang_dir ); 
+    // adds our own links to the plugins table
+    public function add_link_to_plugin_page( $links ) {
 
-        }
+      $links[] = '<a href="'. esc_url( get_admin_url( null, 'tools.php?page=optimize-images-resizing' ) ) .'">' . __( 'Remove image sizes', 'optimize-images-resizing' ) . '</a>';
 
-    }
+      return $links;
+
+    }
+
+    // sets up textdomain
+    public static function load_textdomain() {
+
+      $lang_dir = dirname( plugin_basename( OIR_PLUGIN_FILE ) ) . '/languages/';
+
+      $lang_dir = trailingslashit( apply_filters( 'oir_textdomain_location', $lang_dir ) );
+
+      load_plugin_textdomain( 'optimize-images-resizing', false, $lang_dir );
+
+    }
+
+  }
 
 endif;

optimize-images-resizing/trunk/readme.txt

@@ -3 +3 @@
 Tags: images, media, resizing, optimize, cleanup, remove, empty, clean, resize, image
 Requires at least: 3.8
-Tested up to: 4.5
+Tested up to: 4.7
 Stable tag: 1.3.0
 License: GPLv3
@@ -16 +16 @@
 What this plugin does is it optimizes the image handling in such a way that images are resized only when they are actually needed. What that means is that if your plugins/theme define a lot of image sizes, none of them will be generated on the image upload (like they would be usually), but only if they are actually requested in that size.
 
-Resizing is done only once and later normally served by WordPress, so there is no performance hit.
+Resizing is done only once, images are later normally served by WordPress, so there is no performance hit.
 
-Plugin also includes a method for removing all of the image sizes generated so far (useful when you install this plugin on a site with a lot of existing media).
+Plugin also includes a method for removing all of the previously generated image sizes (useful when you install this plugin on a site with a lot of existing media).
 
-**TO REMOVE** image sizes generated prior to activating the plugin, visit the Settings -> Media and use the button under "Remove image sizes" to perform the cleanup.
+**TO REMOVE** image sizes generated prior to activating the plugin, visit the 'Tools -> Remove image sizes' and use the button to perform the cleanup.
 
 Other than that, you don't need to do anything, plugin works silently in the background.
@@ -35 +35 @@
 1. Upload `optimize-images-resizing` folder to the `/wp-content/plugins/` directory
 2. Activate the plugin through the 'Plugins' menu in WordPress
-3. (optional) Visit Settings -> Media to clean up your media folder
+3. (optional) Visit 'Tools -> Remove image sizes' to clean up your media folder
 4. ???
 5. Profit
@@ -43 +43 @@
 **I just installed the plugin. Is there anything else I need to do?**
 
-That depends. Is this a new site with no existing images? If the answer is yes, then there is nothing else you need to do, any uploads that happen after you activated this plugin will be automatically cleaned up. If the answer is no, keep reading.
+Is this a new site with no existing images? If the answer is yes, then there is nothing else you need to do, any uploads that happen after you activated this plugin will be automatically cleaned up. If the answer is no, keep reading.
 
 **How to clean up existing images?**
 
-Images can be cleaned up at any time by visiting Settings -> Media in your WordPress Dashboard. You will see a new piece of UI labeled "Remove image sizes" (check Screenshots tab if you want to see how it looks like). Simply click on the "Start cleanup" button and wait for the process to finish (there is a visual feedback for the duration of the cleanup).
+Images can be cleaned up at any time by visiting 'Tools -> Remove image sizes' in your WordPress Dashboard. Simply click on the "Start new cleanup" button and wait for the process to finish (there is a visual feedback for the duration of the cleanup).
 
 **Some image sizes are not cleaned up, which ones and why?**
 
-Plugin never cleans default image sizes (thumbnail, medium, large), so if your theme/plugins don't define custom image sizes, this plugin will not help you out. Why does it not clean up those  mage sizes? Well the reason for that is that all of those image sizes are used in the Media UI of the WordPress Dashboard. What that means is: if plugin were to clean up all sizes, they would be generated for all of your images as soon as you would visit the Media screen. Since I don't know of anyone that never visits the Media screen, it made sense to exclude those image sizes from the cleaning process and avoid the redundant server load.
+Plugin never cleans default image sizes (thumbnail, medium, large), so if your theme/plugins don't define custom image sizes, you don't need this plugin. Why does it not clean up those image sizes? Well the reason for that is that all of those image sizes are used in the Media UI of the WordPress Dashboard. What that means is: if plugin were to clean up all sizes, they would be generated for all of your images as soon as you would visit the Media screen. Since I don't know of anyone that never visits the Media screen, it made sense to exclude those image sizes from the cleaning process and avoid the redundant server load.
 
 **How do I know which files the plugin cleaned up?**
 
-A list of removed files is available only for the manual cleanup request. Once the request finishes, a message will appear stating how many images it removed. Click on the number to show the list of files that were removed in the process.
+A list of removed files is available only for the manual cleanup request, by checking the checkbox at the top of the plugin page. Once the request finishes, a message will appear stating how many images it removed. Click on the number to show the list of files that were removed in the process.
 
 **Are there any drawbacks to using this plugin?**
@@ -67 +67 @@
 
 == Changelog ==
+
+= 1.4.0 =
+* Move plugin to the Tools menu
+* Add support for resuming image sizes removing
+* Declare WordPress 4.7 compatibility.
 
 = 1.3.0 =