Changeset 338704

Timestamp:

01/30/2011 02:01:49 AM (13 years ago)

Author:

filosofo

Message:

check to see if gzipping successful; if not, download full sized file

File:

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

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

@@ -183 +183 @@
             default:
                 $this->deliver_backup($this->backup_file, $via);
-                $this->error_display( 'frame' );
-            }
-            die();
+                 );
+            }
+            ;
         }
         if (isset($_GET['fragment'] )) {
@@ -245 +245 @@
             <script type="text/javascript">
             //<![CDATA[
+
+
+
+
+
+
+
+
+
             window.onbeforeunload = function() {
                 return "' . __('Navigating away from this page will cause your backup to fail.', 'wp-db-backup') . '";
@@ -286 +295 @@
                 window.onbeforeunload = null; 
                 fram.src = "' . $download_uri . '";
+
+
+
             ';
             break;
@@ -1017 +1029 @@
         
         $diskfile = $this->backup_dir . $filename;
+
+
         /**
-         * Try to compress to gzip, if available 
+         * Try 
          */
-        if ( function_exists('gzencode') ) {
-            $gz_diskfile = "{$diskfile}.gz";
-            if ( function_exists('file_get_contents') ) {
-                $text = file_get_contents($diskfile);
-            } else {
-                $text = implode("", file($diskfile));
-            }
-            $gz_text = gzencode($text, 9);
-            $fp = fopen($gz_diskfile, "w");
-            fwrite($fp, $gz_text);
-            if ( fclose($fp) ) {
+        if ( function_exists('memory_get_usage') && ( (int) @ini_get('memory_limit') < 64 ) ) {
+            @ini_set('memory_limit', '64M' );
+        }
+
+        if ( file_exists( $diskfile ) && empty( $_GET['download-retry'] ) ) {
+            /**
+             * Try gzipping with an external application
+             */
+            if ( file_exists( $diskfile ) && ! file_exists( $gz_diskfile ) ) {
+                @exec( "gzip $diskfile" );
+            }
+
+            if ( file_exists( $gz_diskfile ) ) {
                 unlink($diskfile);
                 $diskfile = $gz_diskfile;
                 $filename = "{$filename}.gz";
-            }
-        }
-        /*
-         * 
-         */
+            
+            /**
+             * Try to compress to gzip, if available 
+             */
+            } else {
+                if ( function_exists('gzencode') ) {
+                    if ( function_exists('file_get_contents') ) {
+                        $text = file_get_contents($diskfile);
+                    } else {
+                        $text = implode("", file($diskfile));
+                    }
+                    $gz_text = gzencode($text, 9);
+                    $fp = fopen($gz_diskfile, "w");
+                    fwrite($fp, $gz_text);
+                    if ( fclose($fp) ) {
+                        unlink($diskfile);
+                        $diskfile = $gz_diskfile;
+                        $filename = "{$filename}.gz";
+                    }
+                }
+            }
+            /*
+             * 
+             */
+        }
 
         if ('http' == $delivery) {
-            if (! file_exists($diskfile)) 
+            if ( 
                 $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>'));
-            header('Content-Description: File Transfer');
-            header('Content-Type: application/octet-stream');
-            header('Content-Length: ' . filesize($diskfile));
-            header("Content-Disposition: attachment; filename=$filename");
-            $success = readfile($diskfile);
-            unlink($diskfile);
+            } elseif ( file_exists( $diskfile ) ) {
+                header('Content-Description: File Transfer');
+                header('Content-Type: application/octet-stream');
+                header('Content-Length: ' . filesize($diskfile));
+                header("Content-Disposition: attachment; filename=$filename");
+                $success = readfile($diskfile);
+                unlink($diskfile);
+            }
         } elseif ('smtp' == $delivery) {
             if (! file_exists($diskfile)) {