Changeset 1466192

Timestamp:

08/02/2016 02:01:46 PM (8 years ago)

Author:

pauldewouters

Message:

Version 3.6.2

Location:

backupwordpress/trunk

Files:

• admin/actions.php (modified) (2 diffs)
• admin/schedule-form-excludes.php (modified) (18 diffs)
• assets/hmbkp.min.js (modified) (1 diff)
• backupwordpress.php (modified) (1 diff)
• classes/backup/class-backup-engine-database-mysqldump.php (modified) (2 diffs)
• classes/class-plugin.php (modified) (2 diffs)
• classes/class-scheduled-backup.php (modified) (2 diffs)
• classes/class-schedules.php (modified) (1 diff)
• classes/class-site-size.php (modified) (4 diffs)
• languages/backupwordpress.pot (modified) (10 diffs)
• readme.txt (modified) (2 diffs)
• vendor/composer/autoload_classmap.php (modified) (1 diff)
• vendor/composer/installed.json (modified) (4 diffs)
• vendor/symfony/finder/Expression/Expression.php (modified) (1 diff)
• vendor/symfony/finder/Finder.php (modified) (27 diffs)
• vendor/symfony/finder/Iterator/PathFilterIterator.php (modified) (1 diff)
• vendor/symfony/process/Pipes/AbstractPipes.php (modified) (4 diffs)
• vendor/symfony/process/Pipes/PipesInterface.php (modified) (1 diff)
• vendor/symfony/process/Pipes/WindowsPipes.php (modified) (1 diff)
• vendor/symfony/process/Process.php (modified) (10 diffs)
• vendor/symfony/process/ProcessBuilder.php (modified) (1 diff)
• vendor/symfony/process/ProcessUtils.php (modified) (2 diffs)
• vendor/symfony/process/Tests/ProcessTest.php (modified) (5 diffs)
• whitelist-html (added)
• whitelist-html/whitelist-html.php (added)

backupwordpress/trunk/admin/actions.php

@@ -412 +412 @@
 
     $schedule->save();
+
 
     wp_safe_redirect( wp_get_referer(), '303' );
@@ -442 +443 @@
 
     $schedule->save();
+
 
     wp_safe_redirect( wp_get_referer(), '303' );

backupwordpress/trunk/admin/schedule-form-excludes.php

@@ -3 +3 @@
 namespace HM\BackUpWordPress;
 
-$excludes = $schedule->get_excludes();
+$excludes = $schedule->get_excludes();
 $user_excludes = $excludes->get_user_excludes(); ?>
 
@@ -9 +9 @@
 
     <h3>
-        <?php _e( 'Currently Excluded', 'backupwordpress' ); ?>
+        <?php _e( 'Currently Excluded', 'backupwordpress' ); ?>
     </h3>
 
-    <p><?php _e( 'We automatically detect and ignore common <abbr title="Version Control Systems">VCS</abbr> folders and other backup plugin folders.', 'backupwordpress' ); ?></p>
+    <p>
+        <?php esc_html_e( 'We automatically detect and ignore common Version Control Systems folders and other backup plugin folders.', 'backupwordpress' ); ?>
+    </p>
 
     <table class="widefat">
@@ -46 +48 @@
                     <td>
 
-                        <?php if ( ( in_array( $exclude, $excludes->get_default_excludes() ) ) || ( Path::get_path() === trailingslashit( Path::get_root() ) . untrailingslashit( $exclude ) ) ) : ?>
-
-                            <?php _e( 'Default rule', 'backupwordpress' ); ?>
+                        <?php if (
+                            ( in_array( $exclude, $excludes->get_default_excludes() ) ) ||
+                            ( Path::get_path() === trailingslashit( Path::get_root() ) . untrailingslashit( $exclude ) )
+                        ) : ?>
+
+                            <?php esc_html_e( 'Default rule', 'backupwordpress' ); ?>
 
                         <?php elseif ( defined( 'HMBKP_EXCLUDE' ) && false !== strpos( HMBKP_EXCLUDE, $exclude ) ) : ?>
 
-                            <?php _e( 'Defined in wp-config.php', 'backupwordpress' ); ?>
+                            <?php ' ); ?>
 
                         <?php else : ?>
@@ -59 +64 @@
                                 'hmbkp_remove_exclude' => $exclude,
                                 'hmbkp_schedule_id'    => $schedule->get_id(),
-                            ) ); ?>" class="delete-action"><?php _e( 'Stop excluding', 'backupwordpress' ); ?></a>
+                            ) ); ?>" class="delete-action">
+                                <?php esc_html_e( 'Stop excluding', 'backupwordpress' ); ?>
+                            </a>
 
                         <?php endif; ?>
@@ -73 +80 @@
     </table>
 
-    <h3 id="directory-listing"><?php _e( 'Your Site', 'backupwordpress' ); ?></h3>
-
-    <p><?php _e( 'Here\'s a directory listing of all files on your site, you can browse through and exclude files or folders that you don\'t want included in your backup.', 'backupwordpress' ); ?></p>
+    <h3 id="directory-listing">
+        <?php esc_html_e( 'Your Site', 'backupwordpress' ); ?>
+    </h3>
+
+    <p>
+        <?php esc_html_e( 'Here\'s a directory listing of all files on your site, you can browse through and exclude files or folders that you don\'t want included in your backup.', 'backupwordpress' ); ?>
+    </p>
 
     <?php
 
-    // The directory to display
+    // The directory to display
     $directory = Path::get_root();
 
-    if ( isset( $_GET['hmbkp_directory_browse'] ) ) :
+    if ( isset( $_GET['hmbkp_directory_browse'] ) ) 
 
         $untrusted_directory = urldecode( $_GET['hmbkp_directory_browse'] );
 
-        // Only allow real sub directories of the site root to be browsed
-        if ( false !== strpos( $untrusted_directory, Path::get_root() ) && is_dir( $untrusted_directory ) ) :
+        // Only allow real sub directories of the site root to be browsed.
+        if (
+            false !== strpos( $untrusted_directory, Path::get_root() ) &&
+            is_dir( $untrusted_directory )
+        ) {
             $directory = $untrusted_directory;
-        endif;
-    endif;
+        
+    
 
     $exclude_string = implode( '|', $excludes->get_excludes_for_regex() );
 
-    $site_size = new Site_Size( 'file' );
+    $site_size = new Site_Size( 'file' );
     $excluded_site_size = new Site_Size( 'file', $excludes );
 
-    // Kick off a recursive filesize scan
-    $files = list_directory_by_total_filesize( $directory, $excludes ); ?>
+    // Kick off a recursive filesize scan.
+    $files = list_directory_by_total_filesize( $directory, $excludes );
+    ?>
 
     <table class="widefat">
@@ -106 +121 @@
             <tr>
                 <th></th>
-                <th scope="col"><?php _e( 'Name', 'backupwordpress' ); ?></th>
-                <th scope="col" class="column-format"><?php _e( 'Included Size', 'backupwordpress' ); ?></th>
-                <th scope="col" class="column-format"><?php _e( 'Permissions', 'backupwordpress' ); ?></th>
-                <th scope="col" class="column-format"><?php _e( 'Type', 'backupwordpress' ); ?></th>
-                <th scope="col" class="column-format"><?php _e( 'Status', 'backupwordpress' ); ?></th>
+                <th scope="col"><?php _e( 'Name', 'backupwordpress' ); ?></th>
+                <th scope="col" class="column-format"><?php _e( 'Included Size', 'backupwordpress' ); ?></th>
+                <th scope="col" class="column-format"><?php _e( 'Permissions', 'backupwordpress' ); ?></th>
+                <th scope="col" class="column-format"><?php _e( 'Type', 'backupwordpress' ); ?></th>
+                <th scope="col" class="column-format"><?php _e( 'Status', 'backupwordpress' ); ?></th>
             </tr>
 
@@ -123 +138 @@
                     <?php if ( Path::get_root() !== $directory ) : ?>
 
-                        <a href="<?php echo esc_url( remove_query_arg( 'hmbkp_directory_browse' ) ); ?>"><?php echo esc_html( Path::get_root() ); ?></a>
+                        <a href="<?php echo esc_url( remove_query_arg( 'hmbkp_directory_browse' ) ); ?>">
+                            <?php echo esc_html( Path::get_root() ); ?>
+                        </a>
                         <code>/</code>
 
-                        <?php $parents = array_filter( explode( '/', str_replace( trailingslashit( Path::get_root() ), '', trailingslashit( dirname( $directory ) ) ) ) );
+                        <?php
+                        $parents = array_filter( explode(
+                            '/',
+                            str_replace( trailingslashit( Path::get_root() ), '', trailingslashit( dirname( $directory ) ) )
+                        ) );
 
                         foreach ( $parents as $directory_basename ) : ?>
 
-                            <a href="<?php echo esc_url( add_query_arg( 'hmbkp_directory_browse', urlencode( substr( $directory, 0, strpos( $directory, $directory_basename ) ) . $directory_basename ) ) ); ?>"><?php echo esc_html( $directory_basename ); ?></a>
+                            <a href="<?php echo esc_url( add_query_arg( 'hmbkp_directory_browse', urlencode( substr( $directory, 0, strpos( $directory, $directory_basename ) ) . $directory_basename ) ) ); ?>">
+                                <?php echo esc_html( $directory_basename ); ?>
+                            </a>
                             <code>/</code>
 
@@ -153 +176 @@
                     <?php else :
 
-                        $root = new \SplFileInfo( Path::get_root() );
-
-                        $size = $site_size->filesize( $root );
-                        $excluded_size = $excluded_site_size->filesize( $root ); ?>
+                        $root          = new \SplFileInfo( Path::get_root() );
+                        $size          = $site_size->filesize( $root );
+                        $excluded_size = $excluded_site_size->filesize( $root );
+                        $excluded_size = is_same_size_format( $size, $excluded_size ) ? (int) size_format( $excluded_size ) : size_format( $excluded_size );
+                        ?>
 
                             <code>
-                                <?php $excluded_size = is_same_size_format( $size, $excluded_size ) ? (int) size_format( $excluded_size ) : size_format( $excluded_size ); ?>
-                                <?php echo sprintf( __( '%s of %s', 'backupwordpress' ), esc_html( $excluded_size ), esc_html( size_format( $size ) ) ); ?>
-                                <a class="dashicons dashicons-update" href="<?php echo esc_url( wp_nonce_url( add_query_arg( 'hmbkp_recalculate_directory_filesize',  urlencode( Path::get_root() ) ), 'hmbkp-recalculate_directory_filesize' ) ); ?>"><span><?php _e( 'Refresh', 'backupwordpress' ); ?></span></a>
+                                <?php
+                                /* translators: 1: Excluded size 2: Overall site size */
+                                printf(
+                                    esc_html__( '%1$s of %2$s', 'backupwordpress' ),
+                                    esc_html( $excluded_size ),
+                                    esc_html( size_format( $size ) )
+                                );
+                                ?>
+
+                                <a class="dashicons dashicons-update" href="<?php echo esc_url( wp_nonce_url( add_query_arg( 'hmbkp_recalculate_directory_filesize',  urlencode( Path::get_root() ) ), 'hmbkp-recalculate_directory_filesize' ) ); ?>">
+                                    <span><?php esc_html_e( 'Refresh', 'backupwordpress' ); ?></span>
+                                </a>
                             </code>
 
@@ -175 +208 @@
 
                         <?php if ( is_link( Path::get_root() ) ) :
-                            _e( 'Symlink', 'backupwordpress' );
+                            _e( 'Symlink', 'backupwordpress' );
                         elseif ( is_dir( Path::get_root() ) ) :
-                            _e( 'Folder', 'backupwordpress' );
+                            _e( 'Folder', 'backupwordpress' );
                         endif; ?>
 
@@ -198 +231 @@
                 $is_excluded = $is_unreadable = false;
 
-                // Check if the file is excluded
-                if ( $exclude_string && preg_match( '(' . $exclude_string . ')', str_ireplace( trailingslashit( Path::get_root() ), '', wp_normalize_path( $file->getPathname() ) ) ) ) :
+                // Check if the file is excluded.
+                if (
+                    $exclude_string &&
+                    preg_match( '(' . $exclude_string . ')', str_ireplace( trailingslashit( Path::get_root() ), '', wp_normalize_path( $file->getPathname() ) ) )
+                ) :
                     $is_excluded = true;
                 endif;
 
-                // Skip unreadable files
+                // Skip unreadable files
                 if ( ! @realpath( $file->getPathname() ) || ! $file->isReadable() ) :
                     $is_unreadable = true;
-                endif; ?>
+                endif;
+                ?>
 
                 <tr>
@@ -232 +269 @@
                         <?php if ( $is_unreadable ) : ?>
 
-                            <code class="strikethrough" title="<?php echo esc_attr( wp_normalize_path( $file->getRealPath() ) ); ?>"><?php echo esc_html( $file->getBasename() ); ?></code>
+                            <code class="strikethrough" title="<?php echo esc_attr( wp_normalize_path( $file->getRealPath() ) ); ?>">
+                                <?php echo esc_html( $file->getBasename() ); ?>
+                            </code>
 
                         <?php elseif ( $file->isFile() ) : ?>
 
-                            <code title="<?php echo esc_attr( wp_normalize_path( $file->getRealPath() ) ); ?>"><?php echo esc_html( $file->getBasename() ); ?></code>
+                            <code title="<?php echo esc_attr( wp_normalize_path( $file->getRealPath() ) ); ?>">
+                                <?php echo esc_html( $file->getBasename() ); ?>
+                            </code>
 
                         <?php elseif ( $file->isDir() ) : ?>
 
-                            <code title="<?php echo esc_attr( wp_normalize_path( $file->getRealPath() ) ); ?>"><a href="<?php echo esc_url( add_query_arg( 'hmbkp_directory_browse', urlencode( wp_normalize_path( $file->getPathname() ) ) ) ); ?>"><?php echo esc_html( $file->getBasename() ); ?></a></code>
+                            <code title="<?php echo esc_attr( wp_normalize_path( $file->getRealPath() ) ); ?>">
+                                <a href="<?php echo esc_url( add_query_arg( 'hmbkp_directory_browse', urlencode( wp_normalize_path( $file->getPathname() ) ) ) ); ?>">
+                                    <?php echo esc_html( $file->getBasename() ); ?>
+                                </a>
+                            </code>
 
                         <?php endif; ?>
@@ -254 +299 @@
 
                             if ( false !== $size ) :
-                                $size = size_format( $size ) ?: '0 B';
-                                $excluded_size = size_format( $excluded_site_size->filesize( $file ) ) ?: '0'; ?>
+                                $size ';
+                                $excluded_size =  ) ?: '0'; ?>
 
                                 <code>
 
                                     <?php if ( $file->isDir() ) :
+
                                         $excluded_size = is_same_size_format( $size, $excluded_size ) ? (int) size_format( $excluded_size ) : size_format( $excluded_size );
-                                        echo sprintf( __( '%s of %s', 'backupwordpress' ), esc_html( $excluded_size ), esc_html( size_format( $size ) ) );
+
+                                        /* translators: 1: Excluded size 2: Overall site size */
+                                        printf(
+                                            esc_html__( '%1$s of %2$s', 'backupwordpress' ),
+                                            esc_html( $excluded_size ),
+                                            esc_html( size_format( $size ) )
+                                        );
+
                                     elseif ( ! $is_unreadable ) :
-                                        echo esc_html( $size );
+                                        echo esc_html(  );
                                     else :
                                         echo '-';
@@ -275 +328 @@
 
                             <?php endif;
-                        endif; ?>
+                        endif;
+                        ?>
 
                     </td>
@@ -292 +346 @@
                         <code>
                         <?php if ( $file->isLink() ) : ?>
-                            <span title="<?php echo esc_attr( wp_normalize_path( $file->getRealPath() ) ); ?>"><?php _e( 'Symlink', 'backupwordpress' ); ?></span>
+                            <span title="<?php echo esc_attr( wp_normalize_path( $file->getRealPath() ) ); ?>">
+                                <?php esc_html_e( 'Symlink', 'backupwordpress' ); ?>
+                            </span>
                         <?php elseif ( $file->isDir() ) :
-                            _e( 'Folder', 'backupwordpress' );
+                            _e( 'Folder', 'backupwordpress' );
                         else :
-                            _e( 'File', 'backupwordpress' );
+                            _e( 'File', 'backupwordpress' );
                         endif; ?>
                         </code>
@@ -305 +361 @@
                         <?php if ( $is_unreadable ) : ?>
 
-                            <strong title="<?php _e( 'Unreadable files won\'t be backed up.', 'backupwordpress' ); ?>"><?php _e( 'Unreadable', 'backupwordpress' ); ?></strong>
+                            <strong title="<?php esc_attr_e( 'Unreadable files won\'t be backed up.', 'backupwordpress' ); ?>">
+                                <?php esc_html_e( 'Unreadable', 'backupwordpress' ); ?>
+                            </strong>
 
                         <?php elseif ( $is_excluded ) : ?>
 
-                            <strong><?php _e( 'Excluded', 'backupwordpress' ); ?></strong>
+                            <strong><?php _e( 'Excluded', 'backupwordpress' ); ?></strong>
 
                         <?php else :
@@ -315 +373 @@
                             $exclude_path = $file->getPathname();
 
-                            // Excluded directories need to be trailingslashed
+                            // Excluded directories need to be trailingslashed
                             if ( $file->isDir() ) :
                                 $exclude_path = trailingslashit( wp_normalize_path( $file->getPathname() ) );
                             endif; ?>
 
-                            <a href="<?php echo esc_url( wp_nonce_url( add_query_arg( array(
-                                'hmbkp_schedule_id' => $schedule->get_id(),
-                                'action' => 'hmbkp_add_exclude_rule',
-                                'hmbkp_exclude_pathname' => urlencode( $exclude_path ),
-                            ), admin_url( 'admin-post.php' ) ), 'hmbkp-add-exclude-rule', 'hmbkp-add-exclude-rule-nonce' ) ); ?>" class="button-secondary"><?php _e( 'Exclude &rarr;', 'backupwordpress' ); ?></a>
+                            <a href="<?php echo esc_url( wp_nonce_url(
+                                add_query_arg( array(
+                                    'hmbkp_schedule_id'      => $schedule->get_id(),
+                                    'action'                 => 'hmbkp_add_exclude_rule',
+                                    'hmbkp_exclude_pathname' => urlencode( $exclude_path ),
+                                    ),
+                                    admin_url( 'admin-post.php' )
+                                ),
+                                'hmbkp-add-exclude-rule',
+                                'hmbkp-add-exclude-rule-nonce'
+                            ) ); ?>" class="button-secondary">
+                                <?php esc_html_e( 'Exclude &rarr;', 'backupwordpress' ); ?>
+                            </a>
 
                         <?php endif; ?>
@@ -337 +403 @@
 
             <tr>
-                <td colspan="5"><span class="description"><?php _e( 'This folder is empty', 'backupwordpress' ); ?></span></td>
+                <td colspan="5">
+                    <span class="description"><?php esc_html_e( 'This folder is empty', 'backupwordpress' ); ?></span>
+                </td>
             </tr>
 
@@ -347 +415 @@
 
     <p class="submit">
-        <a href="<?php echo esc_url( get_settings_url() ) ?>" class="button-primary"><?php _e( 'Done', 'backupwordpress' ); ?></a>
+        <a href="<?php echo esc_url( get_settings_url() ) ?>" class="button-primary">
+            <?php esc_html_e( 'Done', 'backupwordpress' ); ?>
+        </a>
     </p>
 

backupwordpress/trunk/assets/hmbkp.min.js

@@ -1 @@
-var BackUpWordPressAdmin=function(a){"use strict";function b(){d=a("select#hmbkp_schedule_recurrence_type"),a.ajaxSetup({cache:!1}),d.length&&(c(d.val()),a(document).on("change","select#hmbkp_schedule_recurrence_type",function(){c(a(this).val())})),a(".notice.is-dismissible").on("click",".notice-dismiss",function(){a.post(ajaxurl,{action:"hmbkp_dismiss_notice"})}),a(document).on("click",".hmbkp-schedule-actions .delete-action",function(a){confirm(hmbkp.delete_schedule)||a.preventDefault()}),a(document).on("click",".hmbkp_manage_backups_row .delete-action",function(a){confirm(hmbkp.delete_backup)||a.preventDefault()}),a(document).on("click",".hmbkp-edit-schedule-excludes-form .delete-action",function(a){confirm(hmbkp.remove_exclude_rule)||a.preventDefault()}),a.post(ajaxurl,{nonce:hmbkp.nonce,action:"hmbkp_cron_test"},function(b){"1"!==b&&a(".wrap > h2").after(b)}),a(document).on("click",".hmbkp-run",function(b){wp.heartbeat.interval("fast"),a(this).closest(".hmbkp-schedule-sentence").addClass("hmbkp-running"),a(".hmbkp-error").removeClass("hmbkp-error");var c=a("[data-hmbkp-schedule-id]").attr("data-hmbkp-schedule-id");a.post(ajaxurl,{hmbkp_run_schedule_nonce:hmbkp.hmbkp_run_schedule_nonce,action:"hmbkp_run_schedule",hmbkp_schedule_id:c}),b.preventDefault()}),a(document).on("heartbeat-send",function(b,c){c.hmbkp_schedule_id=a("[data-hmbkp-schedule-id]").attr("data-hmbkp-schedule-id"),a(".hmbkp-schedule-sentence.hmbkp-running").length?c.hmbkp_is_in_progress=!0:c.hmbkp_client_request="site_size"}),a(document).on("heartbeat-tick",function(b,c){if(0!==c.hmbkp_schedule_status||a(".hmbkp-error").length||location.reload(!0),0!==c.hmbkp_schedule_status&&void 0!==c.hmbkp_schedule_status&&a(".hmbkp-status").replaceWith(c.hmbkp_schedule_status),void 0!==c.hmbkp_site_size&&a("code.calculating").length){a("code.calculating").text(c.hmbkp_site_size);var d=a(".hmbkp-exclude-settings");d.length&&d.replaceWith(c.hmbkp_dir_sizes)}}),a(document).on("click",".hmbkp-thickbox-close",function(a){a.preventDefault(),window.parent.tb_remove()}),a(document).on("click",'[id^="hmbkp-warning-"] .notice-dismiss',function(){a.post(ajaxurl,{action:"hmbkp_dismiss_error"})}),jQuery(document).one("click",".hmbkp_send_error_via_email",function(a){a.preventDefault(),jQuery(this).addClass("hmbkp-ajax-loading").attr("disabled","disabled"),jQuery.post(ajaxurl,{nonce:hmbkp.nonce,action:"hmbkp_email_error",hmbkp_error:data},function(){})})}function c(a){a="undefined"!=typeof a?a:"manually";var b=jQuery(".recurring-setting"),c=jQuery("#schedule-start"),d=jQuery(".twice-js");switch(a){case"manually":b.hide();break;case"hourly":b.hide();break;case"daily":b.hide(),c.show(),d.hide();break;case"twicedaily":b.hide(),c.show(),d.show();break;case"weekly":// fall through
+var BackUpWordPressAdmin=function(a){"use strict";function b(){d=a("select#hmbkp_schedule_recurrence_type"),
+// Don't ever cache ajax requests
+a.ajaxSetup({cache:!1}),d.length&&(c(d.val()),a(document).on("change","select#hmbkp_schedule_recurrence_type",function(){c(a(this).val())})),a(".notice.is-dismissible").on("click",".notice-dismiss",function(){a.post(ajaxurl,{action:"hmbkp_dismiss_notice"})}),
+// Show delete confirm message for delete schedule
+a(document).on("click",".hmbkp-schedule-actions .delete-action",function(a){confirm(hmbkp.delete_schedule)||a.preventDefault()}),
+// Show delete confirm message for delete backup
+a(document).on("click",".hmbkp_manage_backups_row .delete-action",function(a){confirm(hmbkp.delete_backup)||a.preventDefault()}),
+// Show delete confirm message for remove exclude rule
+a(document).on("click",".hmbkp-edit-schedule-excludes-form .delete-action",function(a){confirm(hmbkp.remove_exclude_rule)||a.preventDefault()}),
+// Test the cron response using ajax
+a.post(ajaxurl,{nonce:hmbkp.nonce,action:"hmbkp_cron_test"},function(b){"1"!==b&&a(".wrap > h2").after(b)}),
+// Run a backup
+a(document).on("click",".hmbkp-run",function(b){wp.heartbeat.interval("fast"),a(this).closest(".hmbkp-schedule-sentence").addClass("hmbkp-running"),a(".hmbkp-error").removeClass("hmbkp-error");var c=a("[data-hmbkp-schedule-id]").attr("data-hmbkp-schedule-id");a.post(ajaxurl,{hmbkp_run_schedule_nonce:hmbkp.hmbkp_run_schedule_nonce,action:"hmbkp_run_schedule",hmbkp_schedule_id:c}),b.preventDefault()}),
+// Send the schedule id with the heartbeat
+a(document).on("heartbeat-send",function(b,c){c.hmbkp_schedule_id=a("[data-hmbkp-schedule-id]").attr("data-hmbkp-schedule-id"),a(".hmbkp-schedule-sentence.hmbkp-running").length?c.hmbkp_is_in_progress=!0:c.hmbkp_client_request="site_size"}),
+// Update schedule status on heartbeat tick
+a(document).on("heartbeat-tick",function(b,c){if(
+// If the schedule has finished then reload the page
+0!==c.hmbkp_schedule_status||a(".hmbkp-error").length||location.reload(!0),
+// If the schedule is still running then update the schedule status
+0!==c.hmbkp_schedule_status&&void 0!==c.hmbkp_schedule_status&&a(".hmbkp-status").replaceWith(c.hmbkp_schedule_status),void 0!==c.hmbkp_site_size&&a("code.calculating").length){a("code.calculating").text(c.hmbkp_site_size);var d=a(".hmbkp-exclude-settings");d.length&&d.replaceWith(c.hmbkp_dir_sizes)}}),
+// Closing ThickBox Modal Window
+a(document).on("click",".hmbkp-thickbox-close",function(a){a.preventDefault(),window.parent.tb_remove()}),a(document).on("click",'[id^="hmbkp-warning-"] .notice-dismiss',function(){a.post(ajaxurl,{action:"hmbkp_dismiss_error"})}),jQuery(document).one("click",".hmbkp_send_error_via_email",function(a){a.preventDefault(),jQuery(this).addClass("hmbkp-ajax-loading").attr("disabled","disabled"),jQuery.post(ajaxurl,{nonce:hmbkp.nonce,action:"hmbkp_email_error",hmbkp_error:data},function(){})})}function c(a){a="undefined"!=typeof a?a:"manually";var b=jQuery(".recurring-setting"),c=jQuery("#schedule-start"),d=jQuery(".twice-js");switch(a){case"manually":b.hide();break;case"hourly":b.hide();break;case"daily":b.hide(),c.show(),d.hide();break;case"twicedaily":b.hide(),c.show(),d.show();break;case"weekly":// fall through
 case"fortnightly":b.hide(),jQuery("#start-day").show(),c.show(),d.hide();break;case"monthly":b.hide(),c.show(),jQuery("#start-date").show(),d.hide()}}var d;return{init:b}}(jQuery);jQuery(document).ready(BackUpWordPressAdmin.init);

backupwordpress/trunk/backupwordpress.php

@@ -4 +4 @@
 Plugin URI: http://bwp.hmn.md/
 Description: Simple automated backups of your WordPress powered website. Once activated you'll find me under <strong>Tools &rarr; Backups</strong>. On multisite, you'll find me under the Network Settings menu.
-Version: 3.6.1
+Version: 3.6.
 Author: Human Made Limited
 Author URI: http://hmn.md/

backupwordpress/trunk/classes/backup/class-backup-engine-database-mysqldump.php

@@ -80 +80 @@
 
     /**
-     * Check whether it's possible to connect to the database with the
-     * credentials we have.
-     *
-     * @return bool Whether the database connection was successful.
-     */
-    public function check_user_can_connect_to_database_via_cli() {
-
-        if ( ! function_exists( 'proc_open' ) || ! function_exists( 'proc_close' ) ) {
-            return false;
-        }
-
-        $args = $this->get_mysql_connection_args();
-        $args[] = escapeshellarg( $this->get_name() );
-
-        // Quit immediately as we're only interesting in testing the connection
-        $args[] = '--execute="quit"';
-
-        $process = new Process( 'mysql ' . implode( ' ', $args ) );
-
-        try {
-            $process->run();
-        } catch ( \Exception $e ) {
-            $this->error( __CLASS__, $e->getMessage() );
-            return false;
-        }
-
-        if ( ! $process->isSuccessful() ) {
-            $this->error( __CLASS__, $process->getErrorOutput() );
-            return false;
-        }
-
-        return true;
-
-    }
-
-    /**
      * Perform the database backup.
      *
@@ -122 +86 @@
     public function backup() {
 
-        if ( ! $this->check_user_can_connect_to_database_via_cli() || ! $this->get_mysqldump_executable_path() ) {
+        if ( ! $this->get_mysqldump_executable_path() ) {
             return false;
         }

backupwordpress/trunk/classes/class-plugin.php

@@ -7 +7 @@
  */
 final class Plugin {
-    const PLUGIN_VERSION = '3.6.1';
+    const PLUGIN_VERSION = '3.6.';
 
     /**
@@ -129 +129 @@
         require_once( HMBKP_PLUGIN_PATH . 'classes/class-notices.php' );
 
-        // Load the admin menu
+        // Load Whitelist HTML submodule and admin required functions.
+        require_once( HMBKP_PLUGIN_PATH . 'whitelist-html/whitelist-html.php' );
         require_once( HMBKP_PLUGIN_PATH . 'admin/menu.php' );
         require_once( HMBKP_PLUGIN_PATH . 'admin/actions.php' );

backupwordpress/trunk/classes/class-scheduled-backup.php

@@ -649 +649 @@
         if ( get_option( 'hmbkp_schedule_' . $this->get_id() ) !== $this->options ) {
             update_option( 'hmbkp_schedule_' . $this->get_id(), $this->options );
+
+
+
         }
 
@@ -666 +669 @@
         delete_option( 'hmbkp_schedule_' . $this->get_id() );
 
+
+
+
         // Clear any existing schedules
         $this->unschedule();

backupwordpress/trunk/classes/class-schedules.php

@@ -41 +41 @@
     public function refresh_schedules() {
 
-        global $wpdb;
+        ;
 
-        // Load all schedule options from the database
-        $schedules = $wpdb->get_col( "SELECT option_name from $wpdb->options WHERE option_name LIKE 'hmbkp\_schedule\_%'" );
+        if ( ! $schedules ) {
+
+            global $wpdb;
+
+            // Load all schedule options from the database.
+            $schedules = $wpdb->get_col( "SELECT option_name from $wpdb->options WHERE option_name LIKE 'hmbkp\_schedule\_%'" );
+
+            set_transient( 'hmbkp_schedules', $schedules, WEEK_IN_SECONDS );
+        }
 
         // Instantiate each one as a Scheduled_Backup

backupwordpress/trunk/classes/class-site-size.php

@@ -51 +51 @@
         if ( 'file' !== $this->type ) {
 
-            global $wpdb;
-            $tables = $wpdb->get_results( 'SHOW TABLE STATUS FROM `' . DB_NAME . '`', ARRAY_A );
-
-            foreach ( $tables as $table ) {
-                $size += (float) $table['Data_length'];
+            $size = (int) get_transient( 'hmbkp_database_size' );
+
+            if ( ! $size ) {
+
+                global $wpdb;
+
+                $tables = $wpdb->get_results( 'SHOW TABLE STATUS FROM `' . DB_NAME . '`', ARRAY_A );
+
+                foreach ( $tables as $table ) {
+                    $size += (float) $table['Data_length'];
+                }
+
+                set_transient( 'hmbkp_database_size', $size, WEEK_IN_SECONDS );
             }
         }
@@ -186 +194 @@
     public function directory_filesize( \SplFileInfo $file ) {
 
+
+
+
+
+
+
+
+
+
         // If we haven't calculated the site size yet then kick it off in a thread
         $directory_sizes = $this->get_cached_filesizes();
@@ -196 +213 @@
         }
 
-        // The filepaths are stored in keys so we need to flip for use with preg_grep
+        /*
+         * Ensure we only include files in the current path, the filepaths are stored in keys
+         * so we need to flip for use with preg_grep.
+         */
         $directory_sizes = array_flip( preg_grep( '(' . wp_normalize_path( $file->getRealPath() ) . ')', array_flip( $directory_sizes ) ) );
 
@@ -207 +227 @@
         }
 
-        // Directory size is now just a sum of all files across all sub directories
-        return absint( array_sum( $directory_sizes ) );
+        $directory_sizes = absint( array_sum( $directory_sizes ) );
+
+        // For performance reasons we cache the root.
+        if ( $file->getRealPath() === PATH::get_root() && $this->excludes ) {
+            set_transient( 'hmbkp_root_size', $directory_sizes, DAY_IN_SECONDS );
+        }
+
+        // Directory size is now just a sum of all files across all sub directories.
+        return $directory_sizes;
 
     }

backupwordpress/trunk/languages/backupwordpress.pot

@@ -3 +3 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: BackUpWordPress 3.6.1\n"
+"Project-Id-Version: BackUpWordPress 3.6.\n"
 "Report-Msgid-Bugs-To: backupwordpress@hmn.md\n"
-"POT-Creation-Date: 2016-04-26 15:47:53+00:00\n"
+"POT-Creation-Date: 2016-0+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
@@ -68 +68 @@
 msgstr ""
 
-#: admin/actions.php:636 admin/actions.php:642
+#: admin/actions.php:63
 msgid "BackUpWordPress has detected a problem."
 msgstr ""
 
-#: admin/actions.php:636
+#: admin/actions.php:63
 msgid ""
 "%1$s is returning a %2$s response which could mean cron jobs aren't getting "
@@ -79 +79 @@
 msgstr ""
 
-#: admin/actions.php:642
+#: admin/actions.php:64
 msgid ""
 "%1$s is returning a %2$s response which could mean cron jobs aren't getting "
@@ -91 +91 @@
 msgstr ""
 
-#: admin/backups-table.php:15 admin/schedule-form-excludes.php:111
+#: admin/backups-table.php:15 admin/schedule-form-excludes.php:1
 msgid "Type"
 msgstr ""
@@ -489 +489 @@
 msgstr ""
 
-#: admin/schedule-form-excludes.php:14
-msgid ""
-"We automatically detect and ignore common <abbr title=\"Version Control "
-"Systems\">VCS</abbr> folders and other backup plugin folders."
-msgstr ""
-
-#: admin/schedule-form-excludes.php:50
+#: admin/schedule-form-excludes.php:1
+msgid ""
+"We automatically detect and ignore common  "
+"and other backup plugin folders."
+msgstr ""
+
+#: admin/schedule-form-excludes.php:5
 msgid "Default rule"
 msgstr ""
 
-#: admin/schedule-form-excludes.php:54
-msgid "Defined in wp-config.php"
-msgstr ""
-
-#: admin/schedule-form-excludes.php:61
+#: admin/schedule-form-excludes.php:5
+msgid "Defined in "
+msgstr ""
+
+#: admin/schedule-form-excludes.php:6
 msgid "Stop excluding"
 msgstr ""
 
-#: admin/schedule-form-excludes.php:75
+#: admin/schedule-form-excludes.php:
 msgid "Your Site"
 msgstr ""
 
-#: admin/schedule-form-excludes.php:77
+#: admin/schedule-form-excludes.php:7
 msgid ""
 "Here's a directory listing of all files on your site, you can browse "
@@ -518 +518 @@
 msgstr ""
 
-#: admin/schedule-form-excludes.php:108
+#: admin/schedule-form-excludes.php:1
 msgid "Name"
 msgstr ""
 
-#: admin/schedule-form-excludes.php:109
+#: admin/schedule-form-excludes.php:1
 msgid "Included Size"
 msgstr ""
 
-#: admin/schedule-form-excludes.php:110
+#: admin/schedule-form-excludes.php:1
 msgid "Permissions"
 msgstr ""
 
-#: admin/schedule-form-excludes.php:112
+#: admin/schedule-form-excludes.php:1
 msgid "Status"
 msgstr ""
 
-#: admin/schedule-form-excludes.php:162 admin/schedule-form-excludes.php:263
-msgid "%s of %s"
-msgstr ""
-
-#: admin/schedule-form-excludes.php:163
+#: admin/schedule-form-excludes.php:188 admin/schedule-form-excludes.php:312
+#. translators: 1: Excluded size 2: Overall site size
+msgid "%1$s of %2$s"
+msgstr ""
+
+#: admin/schedule-form-excludes.php:195
 msgid "Refresh"
 msgstr ""
 
-#: admin/schedule-form-excludes.php:177 admin/schedule-form-excludes.php:294
+#: admin/schedule-form-excludes.php:
 msgid "Symlink"
 msgstr ""
 
-#: admin/schedule-form-excludes.php:179 admin/schedule-form-excludes.php:296
+#: admin/schedule-form-excludes.php:
 msgid "Folder"
 msgstr ""
 
-#: admin/schedule-form-excludes.php:298
+#: admin/schedule-form-excludes.php:
 msgid "File"
 msgstr ""
 
-#: admin/schedule-form-excludes.php:307
+#: admin/schedule-form-excludes.php:3
 msgid "Unreadable files won't be backed up."
 msgstr ""
 
-#: admin/schedule-form-excludes.php:307
+#: admin/schedule-form-excludes.php:3
 msgid "Unreadable"
 msgstr ""
 
-#: admin/schedule-form-excludes.php:311
+#: admin/schedule-form-excludes.php:3
 msgid "Excluded"
 msgstr ""
 
-#: admin/schedule-form-excludes.php:326
+#: admin/schedule-form-excludes.php:3
 msgid "Exclude &rarr;"
 msgstr ""
 
-#: admin/schedule-form-excludes.php:339
+#: admin/schedule-form-excludes.php:
 msgid "This folder is empty"
 msgstr ""
 
-#: admin/schedule-form-excludes.php:349 admin/schedule-form.php:204
+#: admin/schedule-form-excludes.php: admin/schedule-form.php:204
 #: admin/schedule-settings.php:85
 msgid "Done"
@@ -870 +871 @@
 msgstr ""
 
-#: classes/class-plugin.php:240
+#: classes/class-plugin.php:24
 msgid "Update"
 msgstr ""
 
-#: classes/class-plugin.php:241
+#: classes/class-plugin.php:24
 msgid "Cancel"
 msgstr ""
 
-#: classes/class-plugin.php:242
+#: classes/class-plugin.php:24
 msgid ""
 "Are you sure you want to delete this schedule? All of its backups will also "
@@ -884 +885 @@
 msgstr ""
 
-#: classes/class-plugin.php:242 classes/class-plugin.php:243
-#: classes/class-plugin.php:244 classes/class-plugin.php:245
+#: classes/class-plugin.php:24
+#: classes/class-plugin.php:24
 msgid "'Cancel' to go back, 'OK' to delete."
 msgstr ""
 
-#: classes/class-plugin.php:243
+#: classes/class-plugin.php:24
 msgid "Are you sure you want to delete this backup?"
 msgstr ""
 
-#: classes/class-plugin.php:244
+#: classes/class-plugin.php:24
 msgid "Are you sure you want to remove this exclude rule?"
 msgstr ""
 
-#: classes/class-plugin.php:245
+#: classes/class-plugin.php:24
 msgid ""
 "Reducing the number of backups that are stored on this server will cause "
@@ -904 +905 @@
 msgstr ""
 
-#: classes/class-plugin.php:444
+#: classes/class-plugin.php:44
 #. translators: %1$s and %2$s expand to anchor tags linking to the new
 #. extensions page.
@@ -912 +913 @@
 msgstr ""
 
-#: classes/class-plugin.php:454
+#: classes/class-plugin.php:45
 msgid "Dismiss this notice."
 msgstr ""

backupwordpress/trunk/readme.txt

@@ -1 +1 @@
 === BackUpWordPress ===
-Contributors: humanmade, willmot, pauldewouters, joehoyle, mattheu, tcrsavage, cuvelier
+Contributors: humanmade, willmot, pauldewouters, joehoyle, mattheu, tcrsavage, cuvelier
 Tags: back up, backup, backups, database, zip, db, files, archive, wp-cli, humanmade
 Requires at least: 3.9
-Tested up to: 4.4.2
-Stable tag: 3.6.1
+Tested up to: 4.
+Stable tag: 3.6.
 
 Simple automated backups of your WordPress-powered website.
@@ -158 +158 @@
 
 == Changelog ==
+
+
+
+
+
+
+
+
+
+
 
 ### 3.6.0 / 2016-03-31

backupwordpress/trunk/vendor/composer/autoload_classmap.php

@@ -7 +7 @@
 
 return array(
-    'Ifsnop\\Mysqldump\\CompressBzip2' => $vendorDir . '/ifsnop/mysqldump-php/src/Ifsnop/Mysqldump/Mysqldump.php',
-    'Ifsnop\\Mysqldump\\CompressGzip' => $vendorDir . '/ifsnop/mysqldump-php/src/Ifsnop/Mysqldump/Mysqldump.php',
-    'Ifsnop\\Mysqldump\\CompressManagerFactory' => $vendorDir . '/ifsnop/mysqldump-php/src/Ifsnop/Mysqldump/Mysqldump.php',
-    'Ifsnop\\Mysqldump\\CompressMethod' => $vendorDir . '/ifsnop/mysqldump-php/src/Ifsnop/Mysqldump/Mysqldump.php',
-    'Ifsnop\\Mysqldump\\CompressNone' => $vendorDir . '/ifsnop/mysqldump-php/src/Ifsnop/Mysqldump/Mysqldump.php',
-    'Ifsnop\\Mysqldump\\Mysqldump' => $vendorDir . '/ifsnop/mysqldump-php/src/Ifsnop/Mysqldump/Mysqldump.php',
-    'Ifsnop\\Mysqldump\\TypeAdapter' => $vendorDir . '/ifsnop/mysqldump-php/src/Ifsnop/Mysqldump/Mysqldump.php',
-    'Ifsnop\\Mysqldump\\TypeAdapterDblib' => $vendorDir . '/ifsnop/mysqldump-php/src/Ifsnop/Mysqldump/Mysqldump.php',
-    'Ifsnop\\Mysqldump\\TypeAdapterFactory' => $vendorDir . '/ifsnop/mysqldump-php/src/Ifsnop/Mysqldump/Mysqldump.php',
-    'Ifsnop\\Mysqldump\\TypeAdapterMysql' => $vendorDir . '/ifsnop/mysqldump-php/src/Ifsnop/Mysqldump/Mysqldump.php',
-    'Ifsnop\\Mysqldump\\TypeAdapterPgsql' => $vendorDir . '/ifsnop/mysqldump-php/src/Ifsnop/Mysqldump/Mysqldump.php',
-    'Ifsnop\\Mysqldump\\TypeAdapterSqlite' => $vendorDir . '/ifsnop/mysqldump-php/src/Ifsnop/Mysqldump/Mysqldump.php',
-    'Symfony\\Component\\Finder\\Adapter\\AbstractAdapter' => $vendorDir . '/symfony/finder/Adapter/AbstractAdapter.php',
-    'Symfony\\Component\\Finder\\Adapter\\AbstractFindAdapter' => $vendorDir . '/symfony/finder/Adapter/AbstractFindAdapter.php',
-    'Symfony\\Component\\Finder\\Adapter\\AdapterInterface' => $vendorDir . '/symfony/finder/Adapter/AdapterInterface.php',
-    'Symfony\\Component\\Finder\\Adapter\\BsdFindAdapter' => $vendorDir . '/symfony/finder/Adapter/BsdFindAdapter.php',
-    'Symfony\\Component\\Finder\\Adapter\\GnuFindAdapter' => $vendorDir . '/symfony/finder/Adapter/GnuFindAdapter.php',
-    'Symfony\\Component\\Finder\\Adapter\\PhpAdapter' => $vendorDir . '/symfony/finder/Adapter/PhpAdapter.php',
-    'Symfony\\Component\\Finder\\Comparator\\Comparator' => $vendorDir . '/symfony/finder/Comparator/Comparator.php',
-    'Symfony\\Component\\Finder\\Comparator\\DateComparator' => $vendorDir . '/symfony/finder/Comparator/DateComparator.php',
-    'Symfony\\Component\\Finder\\Comparator\\NumberComparator' => $vendorDir . '/symfony/finder/Comparator/NumberComparator.php',
-    'Symfony\\Component\\Finder\\Exception\\AccessDeniedException' => $vendorDir . '/symfony/finder/Exception/AccessDeniedException.php',
-    'Symfony\\Component\\Finder\\Exception\\AdapterFailureException' => $vendorDir . '/symfony/finder/Exception/AdapterFailureException.php',
-    'Symfony\\Component\\Finder\\Exception\\ExceptionInterface' => $vendorDir . '/symfony/finder/Exception/ExceptionInterface.php',
-    'Symfony\\Component\\Finder\\Exception\\OperationNotPermitedException' => $vendorDir . '/symfony/finder/Exception/OperationNotPermitedException.php',
-    'Symfony\\Component\\Finder\\Exception\\ShellCommandFailureException' => $vendorDir . '/symfony/finder/Exception/ShellCommandFailureException.php',
-    'Symfony\\Component\\Finder\\Expression\\Expression' => $vendorDir . '/symfony/finder/Expression/Expression.php',
-    'Symfony\\Component\\Finder\\Expression\\Glob' => $vendorDir . '/symfony/finder/Expression/Glob.php',
-    'Symfony\\Component\\Finder\\Expression\\Regex' => $vendorDir . '/symfony/finder/Expression/Regex.php',
-    'Symfony\\Component\\Finder\\Expression\\ValueInterface' => $vendorDir . '/symfony/finder/Expression/ValueInterface.php',
-    'Symfony\\Component\\Finder\\Finder' => $vendorDir . '/symfony/finder/Finder.php',
-    'Symfony\\Component\\Finder\\Glob' => $vendorDir . '/symfony/finder/Glob.php',
-    'Symfony\\Component\\Finder\\Iterator\\CustomFilterIterator' => $vendorDir . '/symfony/finder/Iterator/CustomFilterIterator.php',
-    'Symfony\\Component\\Finder\\Iterator\\DateRangeFilterIterator' => $vendorDir . '/symfony/finder/Iterator/DateRangeFilterIterator.php',
-    'Symfony\\Component\\Finder\\Iterator\\DepthRangeFilterIterator' => $vendorDir . '/symfony/finder/Iterator/DepthRangeFilterIterator.php',
-    'Symfony\\Component\\Finder\\Iterator\\ExcludeDirectoryFilterIterator' => $vendorDir . '/symfony/finder/Iterator/ExcludeDirectoryFilterIterator.php',
-    'Symfony\\Component\\Finder\\Iterator\\FilePathsIterator' => $vendorDir . '/symfony/finder/Iterator/FilePathsIterator.php',
-    'Symfony\\Component\\Finder\\Iterator\\FileTypeFilterIterator' => $vendorDir . '/symfony/finder/Iterator/FileTypeFilterIterator.php',
-    'Symfony\\Component\\Finder\\Iterator\\FilecontentFilterIterator' => $vendorDir . '/symfony/finder/Iterator/FilecontentFilterIterator.php',
-    'Symfony\\Component\\Finder\\Iterator\\FilenameFilterIterator' => $vendorDir . '/symfony/finder/Iterator/FilenameFilterIterator.php',
-    'Symfony\\Component\\Finder\\Iterator\\FilterIterator' => $vendorDir . '/symfony/finder/Iterator/FilterIterator.php',
-    'Symfony\\Component\\Finder\\Iterator\\MultiplePcreFilterIterator' => $vendorDir . '/symfony/finder/Iterator/MultiplePcreFilterIterator.php',
-    'Symfony\\Component\\Finder\\Iterator\\PathFilterIterator' => $vendorDir . '/symfony/finder/Iterator/PathFilterIterator.php',
-    'Symfony\\Component\\Finder\\Iterator\\RecursiveDirectoryIterator' => $vendorDir . '/symfony/finder/Iterator/RecursiveDirectoryIterator.php',
-    'Symfony\\Component\\Finder\\Iterator\\SizeRangeFilterIterator' => $vendorDir . '/symfony/finder/Iterator/SizeRangeFilterIterator.php',
-    'Symfony\\Component\\Finder\\Iterator\\SortableIterator' => $vendorDir . '/symfony/finder/Iterator/SortableIterator.php',
-    'Symfony\\Component\\Finder\\Shell\\Command' => $vendorDir . '/symfony/finder/Shell/Command.php',
-    'Symfony\\Component\\Finder\\Shell\\Shell' => $vendorDir . '/symfony/finder/Shell/Shell.php',
-    'Symfony\\Component\\Finder\\SplFileInfo' => $vendorDir . '/symfony/finder/SplFileInfo.php',
-    'Symfony\\Component\\Process\\Exception\\ExceptionInterface' => $vendorDir . '/symfony/process/Exception/ExceptionInterface.php',
-    'Symfony\\Component\\Process\\Exception\\InvalidArgumentException' => $vendorDir . '/symfony/process/Exception/InvalidArgumentException.php',
-    'Symfony\\Component\\Process\\Exception\\LogicException' => $vendorDir . '/symfony/process/Exception/LogicException.php',
-    'Symfony\\Component\\Process\\Exception\\ProcessFailedException' => $vendorDir . '/symfony/process/Exception/ProcessFailedException.php',
-    'Symfony\\Component\\Process\\Exception\\ProcessTimedOutException' => $vendorDir . '/symfony/process/Exception/ProcessTimedOutException.php',
-    'Symfony\\Component\\Process\\Exception\\RuntimeException' => $vendorDir . '/symfony/process/Exception/RuntimeException.php',
-    'Symfony\\Component\\Process\\ExecutableFinder' => $vendorDir . '/symfony/process/ExecutableFinder.php',
-    'Symfony\\Component\\Process\\PhpExecutableFinder' => $vendorDir . '/symfony/process/PhpExecutableFinder.php',
-    'Symfony\\Component\\Process\\PhpProcess' => $vendorDir . '/symfony/process/PhpProcess.php',
-    'Symfony\\Component\\Process\\Pipes\\AbstractPipes' => $vendorDir . '/symfony/process/Pipes/AbstractPipes.php',
-    'Symfony\\Component\\Process\\Pipes\\PipesInterface' => $vendorDir . '/symfony/process/Pipes/PipesInterface.php',
-    'Symfony\\Component\\Process\\Pipes\\UnixPipes' => $vendorDir . '/symfony/process/Pipes/UnixPipes.php',
-    'Symfony\\Component\\Process\\Pipes\\WindowsPipes' => $vendorDir . '/symfony/process/Pipes/WindowsPipes.php',
-    'Symfony\\Component\\Process\\Process' => $vendorDir . '/symfony/process/Process.php',
-    'Symfony\\Component\\Process\\ProcessBuilder' => $vendorDir . '/symfony/process/ProcessBuilder.php',
-    'Symfony\\Component\\Process\\ProcessUtils' => $vendorDir . '/symfony/process/ProcessUtils.php',
 );

backupwordpress/trunk/vendor/composer/installed.json

@@ -56 +56 @@
     {
         "name": "symfony/finder",
-        "version": "v2.8.4",
-        "version_normalized": "2.8.4.0",
+        "version": "v2.8.",
+        "version_normalized": "2.8..0",
         "source": {
             "type": "git",
             "url": "https://github.com/symfony/finder.git",
-            "reference": "ca24cf2cd4e3826f571e0067e535758e73807aa1"
+            "reference": ""
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/symfony/finder/zipball/ca24cf2cd4e3826f571e0067e535758e73807aa1",
-            "reference": "ca24cf2cd4e3826f571e0067e535758e73807aa1",
+            "url": "https://api.github.com/repos/symfony/finder/zipball/",
+            "reference": "",
             "shasum": ""
         },
@@ -72 +72 @@
             "php": ">=5.3.9"
         },
-        "time": "2016-03-10 10:53:53",
+        "time": "2016-0",
         "type": "library",
         "extra": {
@@ -107 +107 @@
     {
         "name": "symfony/process",
-        "version": "v2.8.4",
-        "version_normalized": "2.8.4.0",
+        "version": "v2.8.",
+        "version_normalized": "2.8..0",
         "source": {
             "type": "git",
             "url": "https://github.com/symfony/process.git",
-            "reference": "fb467471952ef5cf8497c029980e556b47545333"
+            "reference": ""
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/symfony/process/zipball/fb467471952ef5cf8497c029980e556b47545333",
-            "reference": "fb467471952ef5cf8497c029980e556b47545333",
+            "url": "https://api.github.com/repos/symfony/process/zipball/",
+            "reference": "",
             "shasum": ""
         },
@@ -123 +123 @@
             "php": ">=5.3.9"
         },
-        "time": "2016-03-23 13:11:46",
+        "time": "2016-0",
         "type": "library",
         "extra": {

backupwordpress/trunk/vendor/symfony/finder/Expression/Expression.php

@@ -126 +126 @@
 
     /**
+
+
      * @throws \LogicException
-     *
-     * @return Glob
      */
     public function getGlob()

backupwordpress/trunk/vendor/symfony/finder/Finder.php

@@ -134 +134 @@
      * @param string $name
      *
+
+
      * @throws \InvalidArgumentException
-     *
-     * @return Finder The current Finder instance
      *
      * @deprecated since 2.8, to be removed in 3.0.
@@ -193 +193 @@
      * Restricts the matching to directories only.
      *
-     * @return Finder The current Finder instance
+     * @return Finder The current Finder instance
      */
     public function directories()
@@ -205 +205 @@
      * Restricts the matching to files only.
      *
-     * @return Finder The current Finder instance
+     * @return Finder The current Finder instance
      */
     public function files()
@@ -224 +224 @@
      * @param int $level The depth level expression
      *
-     * @return Finder The current Finder instance
+     * @return Finder The current Finder instance
      *
      * @see DepthRangeFilterIterator
@@ -248 +248 @@
      * @param string $date A date range string
      *
-     * @return Finder The current Finder instance
+     * @return Finder The current Finder instance
      *
      * @see strtotime
@@ -272 +272 @@
      * @param string $pattern A pattern (a regexp, a glob, or a string)
      *
-     * @return Finder The current Finder instance
+     * @return Finder The current Finder instance
      *
      * @see FilenameFilterIterator
@@ -288 +288 @@
      * @param string $pattern A pattern (a regexp, a glob, or a string)
      *
-     * @return Finder The current Finder instance
+     * @return Finder The current Finder instance
      *
      * @see FilenameFilterIterator
@@ -309 +309 @@
      * @param string $pattern A pattern (string or regexp)
      *
-     * @return Finder The current Finder instance
+     * @return Finder The current Finder instance
      *
      * @see FilecontentFilterIterator
@@ -330 +330 @@
      * @param string $pattern A pattern (string or regexp)
      *
-     * @return Finder The current Finder instance
+     * @return Finder The current Finder instance
      *
      * @see FilecontentFilterIterator
@@ -353 +353 @@
      * @param string $pattern A pattern (a regexp or a string)
      *
-     * @return Finder The current Finder instance
+     * @return Finder The current Finder instance
      *
      * @see FilenameFilterIterator
@@ -376 +376 @@
      * @param string $pattern A pattern (a regexp or a string)
      *
-     * @return Finder The current Finder instance
+     * @return Finder The current Finder instance
      *
      * @see FilenameFilterIterator
@@ -396 +396 @@
      * @param string $size A size range string
      *
-     * @return Finder The current Finder instance
+     * @return Finder The current Finder instance
      *
      * @see SizeRangeFilterIterator
@@ -413 +413 @@
      * @param string|array $dirs A directory path or an array of directories
      *
-     * @return Finder The current Finder instance
+     * @return Finder The current Finder instance
      *
      * @see ExcludeDirectoryFilterIterator
@@ -429 +429 @@
      * @param bool $ignoreDotFiles Whether to exclude "hidden" files or not
      *
-     * @return Finder The current Finder instance
+     * @return Finder The current Finder instance
      *
      * @see ExcludeDirectoryFilterIterator
@@ -449 +449 @@
      * @param bool $ignoreVCS Whether to exclude VCS files or not
      *
-     * @return Finder The current Finder instance
+     * @return Finder The current Finder instance
      *
      * @see ExcludeDirectoryFilterIterator
@@ -489 +489 @@
      * @param \Closure $closure An anonymous function
      *
-     * @return Finder The current Finder instance
+     * @return Finder The current Finder instance
      *
      * @see SortableIterator
@@ -505 +505 @@
      * This can be slow as all the matching files and directories must be retrieved for comparison.
      *
-     * @return Finder The current Finder instance
+     * @return Finder The current Finder instance
      *
      * @see SortableIterator
@@ -521 +521 @@
      * This can be slow as all the matching files and directories must be retrieved for comparison.
      *
-     * @return Finder The current Finder instance
+     * @return Finder The current Finder instance
      *
      * @see SortableIterator
@@ -539 +539 @@
      * This can be slow as all the matching files and directories must be retrieved for comparison.
      *
-     * @return Finder The current Finder instance
+     * @return Finder The current Finder instance
      *
      * @see SortableIterator
@@ -559 +559 @@
      * This can be slow as all the matching files and directories must be retrieved for comparison.
      *
-     * @return Finder The current Finder instance
+     * @return Finder The current Finder instance
      *
      * @see SortableIterator
@@ -577 +577 @@
      * This can be slow as all the matching files and directories must be retrieved for comparison.
      *
-     * @return Finder The current Finder instance
+     * @return Finder The current Finder instance
      *
      * @see SortableIterator
@@ -596 +596 @@
      * @param \Closure $closure An anonymous function
      *
-     * @return Finder The current Finder instance
+     * @return Finder The current Finder instance
      *
      * @see CustomFilterIterator
@@ -610 +610 @@
      * Forces the following of symlinks.
      *
-     * @return Finder The current Finder instance
+     * @return Finder The current Finder instance
      */
     public function followLinks()
@@ -626 +626 @@
      * @param bool $ignore
      *
-     * @return Finder The current Finder instance
+     * @return Finder The current Finder instance
      */
     public function ignoreUnreadableDirs($ignore = true)
@@ -640 +640 @@
      * @param string|array $dirs A directory path or an array of directories
      *
-     * @return Finder The current Finder instance
+     * @return Finder The current Finder instance
      *
      * @throws \InvalidArgumentException if one of the directories does not exist
@@ -668 +668 @@
      * This method implements the IteratorAggregate interface.
      *
-     * @return \Iterator An iterator
+     * @return \Iterator An iterator
      *
      * @throws \LogicException if the in() method has not been called
@@ -701 +701 @@
      * @param mixed $iterator
      *
-     * @return Finder The finder
+     * @return Finder The finder
      *
      * @throws \InvalidArgumentException When the given argument is not iterable.

backupwordpress/trunk/vendor/symfony/finder/Iterator/PathFilterIterator.php

@@ -46 +46 @@
      * Use only / as directory separator (on Windows also).
      *
-     * @param string $str Pattern: regexp or dirname.
+     * @param string $str Pattern: regexp or dirname
      *
      * @return string regexp corresponding to a given string or regexp

backupwordpress/trunk/vendor/symfony/process/Pipes/AbstractPipes.php

@@ -23 +23 @@
 
     /** @var string */
-    protected $inputBuffer = '';
+    pr $inputBuffer = '';
     /** @var resource|null */
-    protected $input;
-
+    private $input;
     /** @var bool */
     private $blocked = true;
@@ -92 +91 @@
             return;
         }
-
-        $e = array();
-        $r = null !== $this->input ? array($this->input) : $e;
+        $input = $this->input;
+        $r = $e = array();
         $w = array($this->pipes[0]);
 
@@ -111 +109 @@
             }
 
-            foreach ($r as $input) {
+            $input) {
                 for (;;) {
                     $data = fread($input, self::CHUNK_SIZE);
@@ -125 +123 @@
                     }
                 }
-                if (!isset($data[0]) && feof($input)) {
+                if (feof($input)) {
                     // no more data to read on input resource
                     // use an empty buffer in the next reads

backupwordpress/trunk/vendor/symfony/process/Pipes/PipesInterface.php

@@ -40 +40 @@
      * Reads data in file handles and pipes.
      *
-     * @param bool $blocking Whether to use blocking calls or not.
-     * @param bool $close    Whether to close pipes if they've reached EOF.
+     * @param bool $blocking Whether to use blocking calls or not
+     * @param bool $close    Whether to close pipes if they've reached EOF
      *
-     * @return string[] An array of read data indexed by their fd.
+     * @return string[] An array of read data indexed by their fd
      */
     public function readAndWrite($blocking, $close = false);

backupwordpress/trunk/vendor/symfony/process/Pipes/WindowsPipes.php

@@ -48 +48 @@
             //
             // @see https://bugs.php.net/bug.php?id=51800
-            $this->files = array(
-                Process::STDOUT => tempnam(sys_get_temp_dir(), 'out_sf_proc'),
-                Process::STDERR => tempnam(sys_get_temp_dir(), 'err_sf_proc'),
+            $es = array(
+                Process::STDOUT => ,
+                Process::STDERR => ,
             );
-            foreach ($this->files as $offset => $file) {
-                if (false === $file || false === $this->fileHandles[$offset] = @fopen($file, 'rb')) {
-                    throw new RuntimeException('A temporary file could not be opened to write the process output to, verify that your TEMP environment variable is writable');
+            $tmpDir = sys_get_temp_dir();
+            $error = 'unknown reason';
+            set_error_handler(function ($type, $msg) use (&$error) { $error = $msg; });
+            for ($i = 0;; ++$i) {
+                foreach ($pipes as $pipe => $name) {
+                    $file = sprintf('%s\\sf_proc_%02X.%s', $tmpDir, $i, $name);
+                    if (file_exists($file) && !unlink($file)) {
+                        continue 2;
+                    }
+                    $h = fopen($file, 'xb');
+                    if (!$h && false === strpos($error, 'File exists')) {
+                        restore_error_handler();
+                        throw new RuntimeException(sprintf('A temporary file could not be opened to write the process output: %s', $error));
+                    }
+                    if (!$h || !$this->fileHandles[$pipe] = fopen($file, 'rb')) {
+                        continue 2;
+                    }
+                    if (isset($this->files[$pipe])) {
+                        unlink($this->files[$pipe]);
+                    }
+                    $this->files[$pipe] = $file;
                 }
-            }
+                break;
+            }
+            restore_error_handler();
         }
 

backupwordpress/trunk/vendor/symfony/process/Process.php

@@ -159 +159 @@
         }
 
-        $this->input = $input;
+        $this->;
         $this->setTimeout($timeout);
         $this->useFileHandles = '\\' === DIRECTORY_SEPARATOR;
@@ -478 +478 @@
      * output, this one returns the new output since the last call.
      *
+
+
      * @throws LogicException in case the output has been disabled
      * @throws LogicException In case the process is not started
-     *
-     * @return string The process output since the last call
      */
     public function getIncrementalOutput()
@@ -537 +537 @@
      * call.
      *
+
+
      * @throws LogicException in case the output has been disabled
      * @throws LogicException In case the process is not started
-     *
-     * @return string The process error output since the last call
      */
     public function getIncrementalErrorOutput()
@@ -594 +594 @@
      * and might not be relevant for other operating systems.
      *
-     * @return null|string A string representation for the exit status code, null if the Process is not terminated.
+     * @return null|string A string representation for the exit status code, null if the Process is not terminated
      *
      * @see http://tldp.org/LDP/abs/html/exitcodes.html
@@ -882 +882 @@
      * @param int|float|null $timeout The timeout in seconds
      *
-     * @return self The current Process instance.
+     * @return self The current Process instance
      *
      * @throws LogicException           if the output is disabled
@@ -1088 +1088 @@
         }
 
-        $this->input = ProcessUtils::validateInput(sprintf('%s::%s', __CLASS__, __FUNCTION__), $input);
+        $this->input = ProcessUtils::validateInput(, $input);
 
         return $this;
@@ -1266 +1266 @@
      * Updates the status of the process, reads pipes.
      *
-     * @param bool $blocking Whether to use a blocking read call.
+     * @param bool $blocking Whether to use a blocking read call
      */
     protected function updateStatus($blocking)
@@ -1352 +1352 @@
      * Reads pipes, executes callback.
      *
-     * @param bool $blocking Whether to use blocking calls or not.
-     * @param bool $close    Whether to close file handles or not.
+     * @param bool $blocking Whether to use blocking calls or not
+     * @param bool $close    Whether to close file handles or not
      */
     private function readPipes($blocking, $close)
@@ -1479 +1479 @@
      * Ensures the process is running or terminated, throws a LogicException if the process has a not started.
      *
-     * @param string $functionName The function name that was called.
+     * @param string $functionName The function name that was called
      *
      * @throws LogicException If the process has not run.
@@ -1493 +1493 @@
      * Ensures the process is terminated, throws a LogicException if the process has a status different than `terminated`.
      *
-     * @param string $functionName The function name that was called.
+     * @param string $functionName The function name that was called
      *
      * @throws LogicException If the process is not yet terminated.

backupwordpress/trunk/vendor/symfony/process/ProcessBuilder.php

@@ -178 +178 @@
     public function setInput($input)
     {
-        $this->input = ProcessUtils::validateInput(sprintf('%s::%s', __CLASS__, __FUNCTION__), $input);
+        $this->input = ProcessUtils::validateInput(, $input);
 
         return $this;

backupwordpress/trunk/vendor/symfony/process/ProcessUtils.php

@@ -81 +81 @@
      * @param mixed  $input  The input to validate
      *
-     * @return string The validated input
+     * @return  The validated input
      *
      * @throws InvalidArgumentException In case the input is not valid
@@ -91 +91 @@
         if (null !== $input) {
             if (is_resource($input)) {
+
+
+
                 return $input;
             }

backupwordpress/trunk/vendor/symfony/process/Tests/ProcessTest.php

@@ -55 +55 @@
     public function testThatProcessDoesNotThrowWarningDuringRun()
     {
+
+
+
         @trigger_error('Test Error', E_USER_NOTICE);
         $process = $this->getProcess(self::$phpBin." -r 'sleep(3)'");
@@ -208 +211 @@
         $this->assertEquals($expectedLength, strlen($p->getOutput()));
         $this->assertEquals($expectedLength, strlen($p->getErrorOutput()));
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     }
 
@@ -1163 +1184 @@
      * @dataProvider provideVariousIncrementals
      */
-    public function testIncrementalOutputDoesNotRequireAnotherCall($stream, $method) {
-        $process = new Process(self::$phpBin.' -r '.escapeshellarg('$n = 0; while ($n < 3) { file_put_contents(\''.$stream.'\', $n, 1); $n++; usleep(1000); }'), null, null, null, null);
+    public function testIncrementalOutputDoesNotRequireAnotherCall($stream, $method)
+    {
+        $process = $this->getProcess(self::$phpBin.' -r '.escapeshellarg('$n = 0; while ($n < 3) { file_put_contents(\''.$stream.'\', $n, 1); $n++; usleep(1000); }'), null, null, null, null);
         $process->start();
         $result = '';
@@ -1178 +1200 @@
     }
 
-    public function provideVariousIncrementals() {
+    public function provideVariousIncrementals()
+    {
         return array(
             array('php://stdout', 'getIncrementalOutput'),
             array('php://stderr', 'getIncrementalErrorOutput'),
         );
-    }
-
-    /**
-     * provides default method names for simple getter/setter.
-     */
-    public function methodProvider()
-    {
-        $defaults = array(
-            array('CommandLine'),
-            array('Timeout'),
-            array('WorkingDirectory'),
-            array('Env'),
-            array('Stdin'),
-            array('Input'),
-            array('Options'),
-        );
-
-        return $defaults;
     }
 
@@ -1225 +1230 @@
                 $this->assertSame('This PHP has been compiled with --enable-sigchild. You must use setEnhanceSigchildCompatibility() to use this method.', $e->getMessage());
                 if ($enhance) {
-                    $process->setEnhanceSigChildCompatibility(true);
+                    $process->setEnhanceSighildCompatibility(true);
                 } else {
                     self::$notEnhancedSigchild = true;