Changeset 339017

Timestamp:

01/31/2011 02:28:28 AM (13 years ago)

Author:

filosofo

Message:

do not attempt to delete nonexistent files

File:

• wp-db-backup/tags/2.2.4/wp-db-backup.php (modified) (7 diffs)

wp-db-backup/tags/2.2.4/wp-db-backup.php

@@ -182 +182 @@
                 break;
             default:
-                $this->deliver_backup($this->backup_file, $via);
+                $this->deliver_backup($this->backup_file, $via);
                 echo $this->error_display( 'frame', false );
+
+
+
+
+
+
+
+
             }
             exit;
@@ -245 +253 @@
             <script type="text/javascript">
             //<![CDATA[
-            var wpDBBackupWaiting;
-            function markSuccess() {
-                if ( wpDBBackupWaiting ) {
-                    try {
-                        clearTimeout( wpDBBackupWaiting );
-                    } catch ( err ) {}
-                }
-            }
-
             window.onbeforeunload = function() {
                 return "' . __('Navigating away from this page will cause your backup to fail.', 'wp-db-backup') . '";
@@ -292 +291 @@
         case 'http':
             echo '
-                setProgress("' . __('Backup Complete!','wp-db-backup') . '");
+                setProgress("' . __('','wp-db-backup') . '");
                 window.onbeforeunload = null; 
                 fram.src = "' . $download_uri . '";
-                setInterval( function() {
-                    fram.src = "' . $download_uri . '&download-retry=1";
+                
+                setTimeout( function() {
+                    var secondFrame = document.createElement("iframe");             
+                    fram.parentNode.insertBefore(secondFrame, fram);
+                    secondFrame.src = "' . $download_uri . '&download-retry=1";
                 }, 30000 );
             ';
@@ -1047 +1049 @@
 
             if ( file_exists( $gz_diskfile ) ) {
-                unlink($diskfile);
+                if ( file_exists( $diskfile ) ) {
+                    unlink($diskfile);
+                }
                 $diskfile = $gz_diskfile;
                 $filename = "{$filename}.gz";
@@ -1074 +1078 @@
              * 
              */
+
+
+
         }
 
         if ('http' == $delivery) {
-            if ( ! file_exists($diskfile) && empty( $_GET['download-retry'] ) ) { 
-                $this->error(array('kind' => 'fatal', 'msg' => sprintf(__('File not found:%s','wp-db-backup'), "&nbsp;<strong>$filename</strong><br />") . '<br /><a href="' . $this->page_url . '">' . __('Return to Backup','wp-db-backup') . '</a>'));
+            if ( ! file_exists( $diskfile ) ) {
+                if ( empty( $_GET['download-retry'] ) ) { 
+                    $this->error(array('kind' => 'fatal', 'msg' => sprintf(__('File not found:%s','wp-db-backup'), "&nbsp;<strong>$filename</strong><br />") . '<br /><a href="' . $this->page_url . '">' . __('Return to Backup','wp-db-backup') . '</a>'));
+                } else {
+                    return true;
+                }
             } elseif ( file_exists( $diskfile ) ) {
                 header('Content-Description: File Transfer');
@@ -1085 +1096 @@
                 header("Content-Disposition: attachment; filename=$filename");
                 $success = readfile($diskfile);
-                unlink($diskfile);
+                if ( $success ) {
+                    unlink($diskfile);
+                }
             }
         } elseif ('smtp' == $delivery) {
@@ -1109 +1122 @@
                 $this->error(array('kind' => 'fatal', 'loc' => $location, 'msg' => $msg));
             } else {
-                unlink($diskfile);
+                if ( file_exists( $diskfile ) ) {
+                    unlink($diskfile);
+                }
             }
         }