Changeset 3211352

Timestamp:

12/21/2024 04:09:46 AM (11 months ago)

Author:

seobaked

Message:

Fixed v1.0.2 download error

Location:

seinc-backup

Files:

• tags/1.0.2/seinc-backup.php (modified) (4 diffs)
• trunk/seinc-backup.php (modified) (4 diffs)

seinc-backup/tags/1.0.2/seinc-backup.php

@@ -283 +283 @@
         $files = glob($backup_path . 'wp-backup-*.zip');
         foreach ($files as $file) {
-            // Get file modification time in GMT
+            // Get file modification time
             $file_time = filemtime($file);
-            $gmt_time = gmdate('Y-m-d H:i:s', $file_time);
+            
+            // Convert to WordPress timezone
+            $date_time = new DateTime();
+            $date_time->setTimestamp($file_time);
+            $date_time->setTimezone(wp_timezone());
             
             $backups[] = array(
                 'name' => basename($file),
                 'size' => size_format(filesize($file)),
-                'date' => gmdate(get_option('date_format') . ' ' . get_option('time_format'), $file_time)
+                'date' => wp_date(get_option('date_format') . ' ' . get_option('time_format'), $file_time)
             );
         }
@@ -302 +306 @@
     }
 
-    $file = isset($_GET['file']) ? sanitize_file_name(wp_unslash($_GET['file'])) : '';
-    if (empty($file) || !isset($_GET['_wpnonce']) || !wp_verify_nonce(sanitize_text_field(wp_unslash($_GET['_wpnonce'])), 'seinc_backup_download_' . $file)) {
-        wp_die(esc_html__('Invalid request', 'seinc-backup'));
-    }
-
+    // Verify nonce
+    if (!isset($_GET['file']) || !wp_verify_nonce($_GET['_wpnonce'], 'seinc_backup_download_' . $_GET['file'])) {
+        wp_die(esc_html__('Invalid download request', 'seinc-backup'));
+    }
+
+    $file = sanitize_file_name(wp_unslash($_GET['file']));
     $backup_path = seinc_backup_get_path();
     $file_path = trailingslashit($backup_path) . $file;
 
-    if (!file_exists($file_path)) {
-        wp_die(esc_html__('File not found', 'seinc-backup'));
-    }
-
-    // Log download attempt
+    // Initialize WP_Filesystem
+    require_once(ABSPATH . 'wp-admin/includes/file.php');
+    WP_Filesystem();
+    global $wp_filesystem;
+
+    // Check if file exists and is readable
+    if (!$wp_filesystem->exists($file_path)) {
+        wp_die(esc_html__('Backup file not found', 'seinc-backup'));
+    }
+
+    // Get file size
+    $file_size = $wp_filesystem->size($file_path);
+    if ($file_size === false || $file_size === 0) {
+        wp_die(esc_html__('Invalid backup file', 'seinc-backup'));
+    }
+
+    // Clean any previous output
+    while (ob_get_level()) {
+        ob_end_clean();
+    }
+
+    // Set download headers
+    nocache_headers();
+    header('Content-Description: File Transfer');
+    header('Content-Type: application/zip');
+    header('Content-Disposition: attachment; filename="' . basename($file_path) . '"');
+    header('Content-Transfer-Encoding: binary');
+    header('Content-Length: ' . $file_size);
+    header('Accept-Ranges: bytes');
+    header('Cache-Control: private');
+    header('Pragma: private');
+    header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+
+    // Log download start
     global $seinc_backup_logs;
     $seinc_backup_logs->add_log(
@@ -321 +355 @@
         $backup_path,
         'info',
-        'Starting file download'
+        'Starting backup download'
     );
 
-    // Clean any previous output
-    if (ob_get_level()) {
-        ob_end_clean();
-    }
-
-    // Send appropriate headers
-    nocache_headers();
-    header('Content-Type: application/octet-stream');
-    header('Content-Description: File Transfer');
-    header('Content-Disposition: attachment; filename="' . esc_attr(basename($file_path)) . '"');
-    header('Content-Transfer-Encoding: binary');
-    header('Content-Length: ' . $file_size);
-    header('Connection: close');
-
-    // Initialize WP_Filesystem
-    require_once(ABSPATH . 'wp-admin/includes/file.php');
-    WP_Filesystem();
-    global $wp_filesystem;
-
-    // Check if file exists and is readable
-    if (!$wp_filesystem->exists($file_path)) {
-        // Log error
-        $seinc_backup_logs->add_log(
-            'manual_download_error',
-            $file,
-            $backup_path,
-            'error',
-            'Backup file not found'
-        );
-        wp_die(esc_html__('Backup file not found', 'seinc-backup'));
-    }
-
-    // Get file contents using WP_Filesystem
+    // Disable time limit for large files
+    set_time_limit(0);
+
+    // Get and output file contents
     $file_contents = $wp_filesystem->get_contents($file_path);
-    if (false === $file_contents) {
-        // Log error
+    if ($file_contents === false) {
+        // Log download error
         $seinc_backup_logs->add_log(
             'manual_download_error',
@@ -382 +387 @@
         'Backup downloaded successfully'
     );
-    exit();
+    exit;
 }
 add_action('admin_post_seinc_backup_download', 'seinc_backup_download');

seinc-backup/trunk/seinc-backup.php

@@ -283 +283 @@
         $files = glob($backup_path . 'wp-backup-*.zip');
         foreach ($files as $file) {
-            // Get file modification time in GMT
+            // Get file modification time
             $file_time = filemtime($file);
-            $gmt_time = gmdate('Y-m-d H:i:s', $file_time);
+            
+            // Convert to WordPress timezone
+            $date_time = new DateTime();
+            $date_time->setTimestamp($file_time);
+            $date_time->setTimezone(wp_timezone());
             
             $backups[] = array(
                 'name' => basename($file),
                 'size' => size_format(filesize($file)),
-                'date' => gmdate(get_option('date_format') . ' ' . get_option('time_format'), $file_time)
+                'date' => wp_date(get_option('date_format') . ' ' . get_option('time_format'), $file_time)
             );
         }
@@ -302 +306 @@
     }
 
-    $file = isset($_GET['file']) ? sanitize_file_name(wp_unslash($_GET['file'])) : '';
-    if (empty($file) || !isset($_GET['_wpnonce']) || !wp_verify_nonce(sanitize_text_field(wp_unslash($_GET['_wpnonce'])), 'seinc_backup_download_' . $file)) {
-        wp_die(esc_html__('Invalid request', 'seinc-backup'));
-    }
-
+    // Verify nonce
+    if (!isset($_GET['file']) || !wp_verify_nonce($_GET['_wpnonce'], 'seinc_backup_download_' . $_GET['file'])) {
+        wp_die(esc_html__('Invalid download request', 'seinc-backup'));
+    }
+
+    $file = sanitize_file_name(wp_unslash($_GET['file']));
     $backup_path = seinc_backup_get_path();
     $file_path = trailingslashit($backup_path) . $file;
 
-    if (!file_exists($file_path)) {
-        wp_die(esc_html__('File not found', 'seinc-backup'));
-    }
-
-    // Log download attempt
+    // Initialize WP_Filesystem
+    require_once(ABSPATH . 'wp-admin/includes/file.php');
+    WP_Filesystem();
+    global $wp_filesystem;
+
+    // Check if file exists and is readable
+    if (!$wp_filesystem->exists($file_path)) {
+        wp_die(esc_html__('Backup file not found', 'seinc-backup'));
+    }
+
+    // Get file size
+    $file_size = $wp_filesystem->size($file_path);
+    if ($file_size === false || $file_size === 0) {
+        wp_die(esc_html__('Invalid backup file', 'seinc-backup'));
+    }
+
+    // Clean any previous output
+    while (ob_get_level()) {
+        ob_end_clean();
+    }
+
+    // Set download headers
+    nocache_headers();
+    header('Content-Description: File Transfer');
+    header('Content-Type: application/zip');
+    header('Content-Disposition: attachment; filename="' . basename($file_path) . '"');
+    header('Content-Transfer-Encoding: binary');
+    header('Content-Length: ' . $file_size);
+    header('Accept-Ranges: bytes');
+    header('Cache-Control: private');
+    header('Pragma: private');
+    header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+
+    // Log download start
     global $seinc_backup_logs;
     $seinc_backup_logs->add_log(
@@ -321 +355 @@
         $backup_path,
         'info',
-        'Starting file download'
+        'Starting backup download'
     );
 
-    // Clean any previous output
-    if (ob_get_level()) {
-        ob_end_clean();
-    }
-
-    // Send appropriate headers
-    nocache_headers();
-    header('Content-Type: application/octet-stream');
-    header('Content-Description: File Transfer');
-    header('Content-Disposition: attachment; filename="' . esc_attr(basename($file_path)) . '"');
-    header('Content-Transfer-Encoding: binary');
-    header('Content-Length: ' . $file_size);
-    header('Connection: close');
-
-    // Initialize WP_Filesystem
-    require_once(ABSPATH . 'wp-admin/includes/file.php');
-    WP_Filesystem();
-    global $wp_filesystem;
-
-    // Check if file exists and is readable
-    if (!$wp_filesystem->exists($file_path)) {
-        // Log error
-        $seinc_backup_logs->add_log(
-            'manual_download_error',
-            $file,
-            $backup_path,
-            'error',
-            'Backup file not found'
-        );
-        wp_die(esc_html__('Backup file not found', 'seinc-backup'));
-    }
-
-    // Get file contents using WP_Filesystem
+    // Disable time limit for large files
+    set_time_limit(0);
+
+    // Get and output file contents
     $file_contents = $wp_filesystem->get_contents($file_path);
-    if (false === $file_contents) {
-        // Log error
+    if ($file_contents === false) {
+        // Log download error
         $seinc_backup_logs->add_log(
             'manual_download_error',
@@ -382 +387 @@
         'Backup downloaded successfully'
     );
-    exit();
+    exit;
 }
 add_action('admin_post_seinc_backup_download', 'seinc_backup_download');