Changeset 3378249

Timestamp:

10/14/2025 02:40:40 PM (4 months ago)

Author:

1clickmigration

Message:

2.3.5

Location:

1-click-migration/trunk

Files:

• inc/admin/class-admin-page.php (modified) (1 diff)
• inc/backup/class-ocm-backup.php (modified) (4 diffs)
• js/admin-script.js (modified) (2 diffs)
• one-click-migration.php (modified) (1 diff)
• readme.txt (modified) (2 diffs)

1-click-migration/trunk/inc/admin/class-admin-page.php

@@ -74 +74 @@
                                 class="button button-primary button-large ocm-button restart-button">Restart</a>
                 </div>
+                
+                <p class="ocm-exclusion-warning" style="display:none; color: #dc3232; margin-top: 10px; text-align: center;">
+                    <em>Please select at least one component to backup / restore.</em>
+                </p>
 
             </form>

1-click-migration/trunk/inc/backup/class-ocm-backup.php

@@ -327 +327 @@
 
         if (!One_Click_Migration::$process_backup_single->is_queue_empty()) {
-
-            One_Click_Migration::$process_backup_single->handle_cron_healthcheck();
+            // Queue already exists, just dispatch it
+            One_Click_Migration::$process_backup_single->dispatch();
+            wp_safe_redirect(admin_url('tools.php?page=one-click-migration'));
             exit;
         }
@@ -444 +445 @@
             }
           }
-        // Use direct processing for maximum compatibility across all environments
-        // Async requests can be blocked by Cloudflare, firewalls, or security plugins
-        One_Click_Migration::write_to_log(' SYSLOG: Using direct processing for maximum compatibility');
-        One_Click_Migration::$process_backup_single->save(); // Save the queue
-        One_Click_Migration::$process_backup_single->trigger_processing(); // Process it directly
-
+        // Save the queue and dispatch for processing
+        One_Click_Migration::$process_backup_single->save();
+        
+        // Try async dispatch first
+        $dispatched = One_Click_Migration::$process_backup_single->dispatch();
+        
+        if (is_wp_error($dispatched)) {
+            // If async dispatch fails, use direct processing for compatibility
+            One_Click_Migration::write_to_log(' SYSLOG: Async dispatch failed, using direct processing for maximum compatibility');
+            One_Click_Migration::$process_backup_single->trigger_processing(); // Process it directly
+        } else {
+            One_Click_Migration::write_to_log(' SYSLOG: Backup dispatched asynchronously');
+        }
+
+        // Redirect back to the admin page (Note: 500 error may still appear in console but is cosmetic only)
+        wp_safe_redirect(admin_url('tools.php?page=one-click-migration'));
         exit;
     }
@@ -489 +500 @@
 
         if (!One_Click_Migration::$process_restore_single->is_queue_empty()) {
-            One_Click_Migration::$process_restore_single->handle_cron_healthcheck();
+            // Queue already exists, just dispatch it
+            One_Click_Migration::$process_restore_single->dispatch();
+            wp_safe_redirect(admin_url('tools.php?page=one-click-migration'));
             exit;
         } else {
             One_Click_Migration::$process_restore_single->push_to_queue(array($username, $password));
             
-            // Use direct processing for maximum compatibility across all environments
-            // Async requests can be blocked by Cloudflare, firewalls, or security plugins
-            One_Click_Migration::write_to_log(' SYSLOG: Using direct restore processing for maximum compatibility');
-            One_Click_Migration::$process_restore_single->save(); // Save the queue
-            One_Click_Migration::$process_restore_single->trigger_processing(); // Process it directly
-
+            // Save the queue and dispatch for processing
+            One_Click_Migration::$process_restore_single->save();
+            
+            // Try async dispatch first
+            $dispatched = One_Click_Migration::$process_restore_single->dispatch();
+            
+            if (is_wp_error($dispatched)) {
+                // If async dispatch fails, use direct processing for compatibility
+                One_Click_Migration::write_to_log(' SYSLOG: Async dispatch failed, using direct restore processing for maximum compatibility');
+                One_Click_Migration::$process_restore_single->trigger_processing(); // Process it directly
+            } else {
+                One_Click_Migration::write_to_log(' SYSLOG: Restore dispatched asynchronously');
+            }
+
+            // Redirect back to the admin page
+            wp_safe_redirect(admin_url('tools.php?page=one-click-migration'));
             exit;
         }
@@ -1838 +1861 @@
         $default_text = array(
             'text' => 'Start a backup or a restore to see current progress here.</br></br>Entire process runs in the background, independent of your browser activity.</br> </br>If you get logged out during restore, log back in using your backup old WordPress credentials and refresh this page for progress.',
-            'value' => '0%'
+            'value' => '1%'  // Changed from 0% to 1% to prevent initial progress bar jump from 1% → 0% → 1%
         );
 

1-click-migration/trunk/js/admin-script.js

@@ -683 +683 @@
 
       });
+      
+      // Hook into multiselect checkbox clicks to update button states
+      setTimeout(function() {
+        jQuery('#selective-backup_itemList').on('click', '.multiselect-checkbox', function() {
+          // Use setTimeout to let the multiselect library update the underlying select first
+          setTimeout(function() {
+            updateButtonStates();
+          }, 10);
+        });
+      }, 100);
 
     };
+
+  // Function to check if all components are excluded and disable buttons accordingly
+  var updateButtonStates = function() {
+    var selectedFolders = jQuery('#selective-backup').val() || [];
+    var allExcluded = selectedFolders.length === 4; // All 4 options selected means everything excluded
+    
+    if (allExcluded) {
+        jQuery('.backup-button, .restore-button').addClass('disabled').attr('disabled', 'disabled');
+        jQuery('.backup-button, .restore-button').css({
+            'opacity': '0.5',
+            'cursor': 'not-allowed',
+            'pointer-events': 'none'
+        });
+        jQuery('.ocm-exclusion-warning').show();
+    } else {
+        jQuery('.backup-button, .restore-button').removeClass('disabled').removeAttr('disabled');
+        jQuery('.backup-button, .restore-button').css({
+            'opacity': '1',
+            'cursor': 'pointer',
+            'pointer-events': 'auto'
+        });
+        jQuery('.ocm-exclusion-warning').hide();
+    }
+  };
 
   var reloadPaypalButtons = function(){
@@ -775 +809 @@
 
     renderMultiselect();
+    
+    // Check button states on page load
+    updateButtonStates();
+    
     reloadPaypalButtons();
     restartFailedProcess();

1-click-migration/trunk/one-click-migration.php

@@ -5 +5 @@
  * Plugin URI: https://wordpress.org/plugins/1-click-migration/
  * Description: Migrate, copy, or clone your entire site with 1 click. <strong>Any host, no size limitation, no premium versions.</strong>
- * Version: 2.3.4
+ * Version: 2.3.5
  * Author: 1ClickMigration
  * Author URI: https://1clickmigration.com/

1-click-migration/trunk/readme.txt

@@ -5 +5 @@
 Tested up to: 6.8.3
 Requires PHP: 7.4
-Stable tag: 2.3.4
+Stable tag: 2.3.5
 Author URI: https://1clickmigration.com
 License: GPLv3 or later
@@ -111 +111 @@
 
 == Changelog ==
+= 2.3.5 =
+* **UX Improvement**: Disable Backup/Restore buttons when all components are excluded to prevent empty backups
+* **UX Improvement**: Fixed progress bar jump from 1% to 0% at the start of backup/restore operations
+* **Bug Fix**: Added validation to prevent silent failures when attempting to backup with all components excluded
+
 = 2.3.3 =
 * **Bug Fix**: Fixed `is_processing()` method compatibility issue with different WP Background Processing library versions