Changeset 2963465

Timestamp:

09/06/2023 08:22:18 AM (2 years ago)

Author:

thanhtd

Message:

Update

Location:

exmage-wp-image-links/trunk

Files:

• CHANGELOG.txt (modified) (1 diff)
• exmage-wp-image-links.php (modified) (6 diffs)
• includes/exmage-background-process.php (modified) (2 diffs)
• includes/support.php (modified) (3 diffs)
• readme.txt (modified) (2 diffs)

exmage-wp-image-links/trunk/CHANGELOG.txt

@@ +1 @@
+/**1.0.16 - 2023.09.06**/
+- Updated: Add stop processing button
+
 /**1.0.15 - 2023.05.12**/
 - Updated: Keep exmage link of product when import product from csv

exmage-wp-image-links/trunk/exmage-wp-image-links.php

@@ -4 +4 @@
  * Plugin URI: https://villatheme.com/extensions/exmage-wordpress-image-links/
  * Description: Save storage by using external image URLs.
- * Version: 1.0.15
+ * Version: 1.0.16
  * Author: VillaTheme(villatheme.com)
  * Author URI: https://villatheme.com
  * Text Domain: exmage-wp-image-links
  * Copyright 2021-2023 VillaTheme.com. All rights reserved.
- * Tested up to: 6.2
+ * Tested up to: 6.3
  * Requires PHP: 7.0
  **/
+
 if ( ! defined( 'ABSPATH' ) ) {
     exit;
 }
 
-define( 'EXMAGE_WP_IMAGE_LINKS_VERSION', '1.0.15' );
+define( 'EXMAGE_WP_IMAGE_LINKS_VERSION', '1.0.16' );
 include_once( ABSPATH . 'wp-admin/includes/plugin.php' );
 define( 'EXMAGE_WP_IMAGE_LINKS_DIR', plugin_dir_path( __FILE__ ) );
@@ -32 +33 @@
             add_action( 'plugins_loaded', array( $this, 'background_process' ) );
             add_action( 'init', array( $this, 'init' ) );
+            add_action( 'admin_init', array( $this, 'admin_init' ) );
             add_action( 'admin_notices', array( $this, 'admin_notices' ) );
             add_action( 'admin_enqueue_scripts', array( $this, 'admin_enqueue_scripts' ), PHP_INT_MAX );
             add_action( 'wp_enqueue_media', array( $this, 'wp_enqueue_media' ), PHP_INT_MAX );
             /*Short link to Add new media*/
-            add_filter(
-                'plugin_action_links_exmage-wp-image-links/exmage-wp-image-links.php', array(
-                    $this,
-                    'settings_link'
-                )
-            );
+            add_filter( 'plugin_action_links_exmage-wp-image-links/exmage-wp-image-links.php', array( $this, 'settings_link' ) );
             /*wp.media*/
             add_action( 'post-upload-ui', array( $this, 'post_upload_ui' ), 20 );
@@ -61 +58 @@
             add_filter( 'jetpack_photon_skip_image', array( $this, 'jetpack_photon_skip_image' ), 10, 3 );
             /*WPML*/
-            add_action( 'wpml_after_duplicate_attachment', array(
-                $this,
-                'wpml_after_duplicate_attachment'
-            ), 10, 2 );
+            add_action( 'wpml_after_duplicate_attachment', array( $this, 'wpml_after_duplicate_attachment' ), 10, 2 );
 
             add_action( 'woocommerce_product_import_before_process_item', function () {
@@ -89 +83 @@
         }
 
+        public function stop_processing_button() {
+            $href = add_query_arg( [ 'exmage_stop_processing' => 1, 'exmage_nonce' => wp_create_nonce( 'exmage_stop_processing' ) ] );
+            printf( "<a href='%s' class='button' style='vertical-align: middle;'>%s</a>", esc_url( $href ), esc_html__( 'Stop processing', 'exmage-wp-image-links' ) );
+        }
+
         /**
          * Show status of background processing
          */
         public function admin_notices() {
+            if ( get_site_option( 'exmage_background_process_image_kill_process' ) ) {
+                return;
+            }
+
             if ( self::$background_process->is_downloading() ) {
                 ?>
                 <div class="updated">
                     <h4>
-                        <?php printf( esc_html__( 'EXMAGE - WordPress Image Links: %s URLs are being processed in the background.', 'exmage-wp-image-links' ), self::$background_process->get_items_left() ) ?>
+                        <?php
+                        printf( esc_html__( 'EXMAGE - WordPress Image Links: %s URLs are being processed in the background.', 'exmage-wp-image-links' ), self::$background_process->get_items_left() );
+                        $this->stop_processing_button();
+                        ?>
                     </h4>
                 </div>
@@ -105 +111 @@
                 <div class="updated">
                     <h4>
-                        <?php printf( esc_html__( 'EXMAGE - WordPress Image Links: %s URLs are in the queue.', 'exmage-wp-image-links' ), self::$background_process->get_items_left() ) ?>
+                        <?php
+                        printf( esc_html__( 'EXMAGE - WordPress Image Links: %s URLs are in the queue.', 'exmage-wp-image-links' ), self::$background_process->get_items_left() );
+                        $this->stop_processing_button();
+                        ?>
                     </h4>
                 </div>
@@ -118 +127 @@
                 </div>
                 <?php
+            }
+        }
+
+        public function admin_init() {
+            if ( isset( $_GET['exmage_stop_processing'], $_GET['exmage_nonce'] ) && wp_verify_nonce( $_GET['exmage_nonce'], 'exmage_stop_processing' ) ) {
+                if ( ! empty( self::$background_process ) ) {
+                    self::$background_process->kill_process();
+                    $url = remove_query_arg( [ 'exmage_stop_processing', 'exmage_nonce' ] );
+                    wp_safe_redirect( $url );
+                    die;
+                }
             }
         }

exmage-wp-image-links/trunk/includes/exmage-background-process.php

@@ -64 +64 @@
             $this->delete_all_batches();
             wp_clear_scheduled_hook( $this->cron_hook_identifier );
+            update_site_option( $this->action . '_kill_process', true );
         }
     }
@@ -141 +142 @@
         return $is_late;
     }
+
+    protected function handle() {
+        if ( get_site_option( $this->action . '_kill_process' ) ) {
+            delete_site_option( $this->action . '_kill_process' );
+            $this->delete_all_batches();
+            $this->complete();
+            wp_die();
+        }
+
+        $this->lock_process();
+
+        do {
+            $batch = $this->get_batch();
+
+            foreach ( $batch->data as $key => $value ) {
+                $task = $this->task( $value );
+
+                if ( false !== $task ) {
+                    $batch->data[ $key ] = $task;
+                } else {
+                    unset( $batch->data[ $key ] );
+                }
+
+                if ( $this->time_exceeded() || $this->memory_exceeded() ) {
+                    // Batch limits reached.
+                    break;
+                }
+            }
+
+            // Update or delete current batch.
+            if ( ! empty( $batch->data ) ) {
+                $this->update( $batch->key, $batch->data );
+            } else {
+                $this->delete( $batch->key );
+            }
+        } while ( ! $this->time_exceeded() && ! $this->memory_exceeded() && ! $this->is_queue_empty() );
+
+        $this->unlock_process();
+
+        // Start next batch or complete process.
+        if ( ! $this->is_queue_empty() ) {
+            $this->dispatch();
+        } else {
+            $this->complete();
+        }
+
+        wp_die();
+    }
+
 }

exmage-wp-image-links/trunk/includes/support.php

@@ -8 +8 @@
     /**
      * Class VillaTheme_Support
-     * 1.1.7
+     * 1.1.8
      */
     class VillaTheme_Support {
         protected $plugin_base_name;
         protected $ads_data;
-        protected $version = '1.1.7';
+        protected $version = '1.1.8';
+        protected $data = [];
 
         public function __construct( $data ) {
@@ -702 +703 @@
             $wp_admin_bar->add_node( array(
                 'id'     => 'villatheme_hide_toolbar',
-                'title'  => '<span style="font-family:dashicons" class="dashicons dashicons-dismiss"></span><span class="villatheme-hide-toolbar-button-title">Hide VillaTheme toolbar</span>',
+                'title'  => '<span class="dashicons dashicons-dismiss"></span><span class="villatheme-hide-toolbar-button-title">Hide VillaTheme toolbar</span>',
                 'parent' => 'villatheme',
                 'href'   => add_query_arg( array( '_villatheme_nonce' => wp_create_nonce( 'villatheme_hide_toolbar' ) ) ),
@@ -941 +942 @@
     }
 }
+
+if ( ! class_exists( 'VillaTheme_Require_Environment' ) ) {
+    class VillaTheme_Require_Environment {
+
+        protected $args;
+        protected $plugin_name;
+        protected $notices = [];
+
+        public function __construct( $args ) {
+            if ( ! did_action( 'plugins_loaded' ) ) {
+                _doing_it_wrong( 'VillaTheme_Require_Environment', sprintf(
+                /* translators: %s: plugins_loaded */
+                    __( 'VillaTheme_Require_Environment should not be run before the %s hook.' ),
+                    '<code>plugins_loaded</code>'
+                ), '6.2.0' );
+            }
+
+            $args = wp_parse_args( $args, [
+                'plugin_name'     => '',
+                'php_version'     => '',
+                'wp_version'      => '',
+                'wc_verison'      => '',
+                'require_plugins' => [],
+            ] );
+
+            $this->plugin_name = $args['plugin_name'];
+
+            $this->check( $args );
+
+            add_action( 'admin_notices', [ $this, 'notice' ] );
+        }
+
+        protected function check( $args ) {
+            if ( ! function_exists( 'install_plugin_install_status' ) ) {
+                require_once ABSPATH . 'wp-admin/includes/plugin-install.php';
+            }
+
+            if ( ! function_exists( 'is_plugin_active' ) ) {
+                require_once ABSPATH . 'wp-admin/includes/plugin.php';
+            }
+
+            if ( ! empty( $args['php_version'] ) ) {
+                $compatible_php = is_php_version_compatible( $args['php_version'] );
+                if ( ! $compatible_php ) {
+                    $this->notices[] = sprintf( "PHP version at least %s.", esc_html( $args['php_version'] ) );
+                }
+            }
+
+            if ( ! empty( $args['wp_version'] ) ) {
+                $compatible_wp = is_wp_version_compatible( $args['wp_version'] );
+                if ( ! $compatible_wp ) {
+                    $this->notices[] = sprintf( "WordPress version at least %s.", esc_html( $args['wp_version'] ) );
+                }
+            }
+
+            if ( ! empty( $args['require_plugins'] ) ) {
+                foreach ( $args['require_plugins'] as $plugin ) {
+                    if ( empty( $plugin['version'] ) ) {
+                        $plugin['version'] = '';
+                    }
+
+                    $status              = install_plugin_install_status( $plugin );
+                    $require_plugin_name = $plugin['name'] ?? '';
+
+                    $requires_php = isset( $plugin['requires_php'] ) ? $plugin['requires_php'] : null;
+                    $requires_wp  = isset( $plugin['requires'] ) ? $plugin['requires'] : null;
+
+                    $compatible_php = is_php_version_compatible( $requires_php );
+                    $compatible_wp  = is_wp_version_compatible( $requires_wp );
+
+                    if ( ! $compatible_php || ! $compatible_wp ) {
+                        continue;
+                    }
+
+                    switch ( $status['status'] ) {
+
+                        case 'install':
+                            $this->notices[] = sprintf( "%s to be installed. <br><a href='%s' target='_blank' class='button button-primary' style='vertical-align: middle; margin-top: 5px;'>Install %s</a>",
+                                esc_html( $require_plugin_name ),
+                                esc_url( ! empty( $status['url'] ) ? $status['url'] : '#' ),
+                                esc_html( $require_plugin_name ) );
+
+                            break;
+
+                        default:
+
+                            if ( ! is_plugin_active( $status['file'] ) && current_user_can( 'activate_plugin', $status['file'] ) ) {
+                                $activate_url = add_query_arg(
+                                    [
+                                        '_wpnonce' => wp_create_nonce( 'activate-plugin_' . $status['file'] ),
+                                        'action'   => 'activate',
+                                        'plugin'   => $status['file'],
+                                    ],
+                                    network_admin_url( 'plugins.php' )
+                                );
+
+                                $this->notices[] = sprintf( "%s is installed and activated. <br> <a href='%s' target='_blank' class='button button-primary' style='vertical-align: middle; margin-top: 5px;'>Active %s</a>",
+                                    esc_html( $require_plugin_name ),
+                                    esc_url( $activate_url ),
+                                    esc_html( $require_plugin_name ) );
+
+                            }
+
+                            if ( $plugin['slug'] == 'woocommerce' && ! empty( $args['wc_version'] ) && is_plugin_active( $status['file'] ) ) {
+                                $wc_current_version = get_option( 'woocommerce_version' );
+                                if ( ! version_compare( $wc_current_version, $args['wc_version'], '>=' ) ) {
+                                    $this->notices[] = sprintf( "WooCommerce version at least %s.", esc_html( $args['wc_version'] ) );
+                                }
+                            }
+
+                            break;
+                    }
+                }
+            }
+        }
+
+        public function notice() {
+            $screen = get_current_screen();
+
+            if ( ! current_user_can( 'manage_options' ) || $screen->id === 'update' ) {
+                return;
+            }
+
+            if ( ! empty( $this->notices ) ) {
+                ?>
+                <div class="error">
+                    <?php
+                    if ( count( $this->notices ) > 1 ) {
+                        printf( "<p>%s requires:</p>", esc_html( $this->plugin_name ) );
+                        ?>
+                        <ol>
+                            <?php
+                            foreach ( $this->notices as $notice ) {
+                                printf( "<li>%s</li>", wp_kses_post( $notice ) );
+                            }
+                            ?>
+                        </ol>
+                        <?php
+                    } else {
+                        printf( "<p>%s requires %s</p>", esc_html( $this->plugin_name ), wp_kses_post( current( $this->notices ) ) );
+                    }
+                    ?>
+                </div>
+                <?php
+            }
+        }
+
+        public function has_error() {
+            return ! empty( $this->notices );
+        }
+    }
+}

exmage-wp-image-links/trunk/readme.txt

@@ -4 +4 @@
 Tags: ecommerce, elementor gallery with links, elementor image carousel link, woocommerce, woocommerce product image external url, wordpress, wordpress gallery custom links, wordpress gallery link, wordpress gallery with links, wordpress image links
 Requires at least: 5.0.0
-Tested up to: 6.1
+Tested up to: 6.3
 Requires PHP: 7.0
 License: GPLv2 or later
@@ -161 +161 @@
 == Changelog ==
 
+/**1.0.16 - 2023.09.06**/
+- Updated: Add stop processing button
+
 /**1.0.15 - 2023.05.12**/
 - Updated: Keep exmage link of product when import product from csv