diff --git a/admin/actions.php b/admin/actions.php
index 532d7c35..6ff1aa54 100755
--- a/admin/actions.php
+++ b/admin/actions.php
@@ -185,7 +185,7 @@ function edit_schedule_services_submit() {
check_admin_referer( 'hmbkp-edit-schedule-services', 'hmbkp-edit-schedule-services-nonce' );
if ( empty( $_POST['hmbkp_schedule_id'] ) ) {
- wp_die( __( 'The schedule ID was not provided. Aborting.', 'backupwordpress' ) );
+ wp_die( esc_html__( 'The schedule ID was not provided. Aborting.', 'backupwordpress' ) );
}
$schedule = new Scheduled_Backup( sanitize_text_field( $_POST['hmbkp_schedule_id'] ) );
@@ -633,13 +633,51 @@ function ajax_cron_test() {
if ( is_wp_error( $response1 ) && is_wp_error( $response2 ) && is_wp_error( $response3 ) ) {
- echo '
' . __( 'BackUpWordPress has detected a problem.', 'backupwordpress' ) . ' ' . sprintf( __( '%1$s is returning a %2$s response which could mean cron jobs aren\'t getting fired properly. BackUpWordPress relies on wp-cron to run scheduled backups. See the %3$s for more details.', 'backupwordpress' ), 'wp-cron.php', '' . $response1->get_error_message() . '', 'FAQ' ) . '
';
+ echo '
';
+
+ printf(
+ wp_kses(
+ /* translators: 1: wp-cron.php 2: Error messages 3: URL to plugin's FAQ page in wordpress.org plugin directory */
+ __( 'BackUpWordPress has detected a problem. %1$s is returning a %2$s response which could mean cron jobs aren\'t getting fired properly. BackUpWordPress relies on wp-cron to run scheduled backups. See the FAQ for more details.', 'backupwordpress' ),
+ array(
+ 'strong' => array(),
+ 'code' => array(),
+ 'a' => array(
+ 'href' => array(),
+ ),
+ )
+ ),
+ 'wp-cron.php',
+ '' . esc_html( $response1->get_error_message() ) . '',
+ 'http://wordpress.org/extend/plugins/backupwordpress/faq/'
+ );
+
+ echo '
' . __( 'BackUpWordPress has detected a problem.', 'backupwordpress' ) . ' ' . sprintf( __( '%1$s is returning a %2$s response which could mean cron jobs aren\'t getting fired properly. BackUpWordPress relies on wp-cron to run scheduled backups, and more generally relies on HTTP loopback connections not being blocked for manual backups. See the %3$s for more details.', 'backupwordpress' ), 'wp-cron.php', '' . esc_html( wp_remote_retrieve_response_code( $response1 ) ) . ' ' . esc_html( get_status_header_desc( wp_remote_retrieve_response_code( $response1 ) ) ) . '', 'FAQ' ) . '
';
+ echo '
';
+
+ printf(
+ wp_kses(
+ /* translators: 1: wp-cron.php 2: Error messages 3: URL to plugin's FAQ page in wordpress.org plugin directory */
+ __( 'BackUpWordPress has detected a problem. %1$s is returning a %2$s response which could mean cron jobs aren\'t getting fired properly. BackUpWordPress relies on wp-cron to run scheduled backups, and more generally relies on HTTP loopback connections not being blocked for manual backups. See the FAQ for more details.', 'backupwordpress' ),
+ array(
+ 'strong' => array(),
+ 'code' => array(),
+ 'a' => array(
+ 'href' => array(),
+ ),
+ )
+ ),
+ 'wp-cron.php',
+ '' . esc_html( wp_remote_retrieve_response_code( $response1 ) . ' ' . get_status_header_desc( wp_remote_retrieve_response_code( $response1 ) ) ) . '',
+ 'http://wordpress.org/extend/plugins/backupwordpress/faq/'
+ );
+
+ echo '
diff --git a/admin/faq.php b/admin/faq.php
index 187b729f..bb774eb2 100644
--- a/admin/faq.php
+++ b/admin/faq.php
@@ -1,58 +1,55 @@
-' . __( 'Where does BackUpWordPress store the backup files?', 'backupwordpress' ) . '' .
+
- '
' . __( 'Backups are stored on your server in /wp-content/backups, you can change the directory.', 'backupwordpress' ). '
' .
+
/wp-content/backups, you can change the directory.', 'backupwordpress' ), 'code' ); ?>
- '
' . __( 'Important: By default BackUpWordPress backs up everything in your site root as well as your database, this includes any non WordPress folders that happen to be in your site root. This does mean that your backup directory can get quite large.', 'backupwordpress' ) . '
' .
+
- '
' . __( 'What if I want to back up my site to another destination?', 'backupwordpress' ) . '
' .
+
- '
' . __( 'BackUpWordPress Pro supports Dropbox, Google Drive, Amazon S3, Rackspace, Azure, DreamObjects and FTP/SFTP. Check it out here: https://bwp.hmn.md', 'backupwordpress' ) . '
' . __( 'How do I restore my site from a backup?', 'backupwordpress' ) . '
' .
+
- '
' . __( 'You need to download the latest backup file either by clicking download on the backups page or via FTP. Unzip the files and upload all the files to your server overwriting your site. You can then import the database using your hosts database management tool (likely phpMyAdmin).', 'backupwordpress' ) . '
' .
+
FTP. Unzip the files and upload all the files to your server overwriting your site. You can then import the database using your hosts database management tool (likely phpMyAdmin).', 'backupwordpress' ), 'code' ); ?>
How to restore from backup.', 'backupwordpress' ), 'a' ); ?>
- '
' . __( 'Does BackUpWordPress back up the backups directory?', 'backupwordpress' ) . '
' .
+
- '
' . __( 'No.', 'backupwordpress' ) . '
' .
+
- '
' . __( 'I\'m not receiving my backups by email', 'backupwordpress' ) . '
' .
+
- '
' . __( 'Most servers have a filesize limit on email attachments, it\'s generally about 10mb. If your backup file is over that limit, it won\'t be sent attached to the email. Instead, you should receive an email with a link to download the backup. If you aren\'t even receiving that, then you likely have a mail issue on your server that you\'ll need to contact your host about.', 'backupwordpress' ) . '
' .
+
- '
' . __( 'How many backups are stored by default?', 'backupwordpress' ) . '
' .
+
- '
' . __( 'BackUpWordPress stores the last 10 backups by default.', 'backupwordpress' ) . '
' .
+
- '
' . __( 'How long should a backup take?', 'backupwordpress' ) . '
' .
+
- '
' . __( 'Unless your site is very large (many gigabytes) it should only take a few minutes to perform a backup. If your back up has been running for longer than an hour, it\'s safe to assume that something has gone wrong. Try de-activating and re-activating the plugin. If it keeps happening, contact support.', 'backupwordpress' ) . '
' .
+
- '
' . __( 'What do I do if I get the wp-cron error message?', 'backupwordpress' ) . '
' .
+
- '
' . __( 'The issue is that your wp-cron.php is not returning a 200 response when hit with a HTTP request originating from your own server, it could be several things. In most cases, it\'s an issue with the server / site.', 'backupwordpress' ) . '
' .
+
wp-cron.php is not returning a 200 response when hit with a HTTP request originating from your own server, it could be several things. In most cases, it\'s an issue with the server / site.', 'backupwordpress' ), 'code' ); ?>
- '
' . __( 'There are some things you can test to confirm this is the issue.', 'backupwordpress' ) . '
' .
+
- '
' . __( 'Are scheduled posts working? (They use wp-cron as well.)', 'backupwordpress' ) . '
' .
+
+
+
+
+
define( \'ALTERNATE_WP_CRON\', true ); to your wp-config.php. Do automatic backups work?', 'backupwordpress' ), 'a' ); ?>
+
+
- '
' . __( 'Are you hosted on Heart Internet? (wp-cron may not be supported by Heart Internet, see below for work-around.)', 'backupwordpress' ) . '
' .
+
- '
' . __( 'If you click manual backup, does it work?', 'backupwordpress' ) . '
' .
+
- '
' . __( 'Try adding define( \'ALTERNATE_WP_CRON\', true ); to your wp-config.php. Do automatic backups work?', 'backupwordpress' ) . '
' .
+
/usr/bin/php5 /home/sites/yourdomain.com/public_html/wp-cron.php (note the space between php5 and the location of the file). The file wp-cron.phpchmod must be set to 711.', 'backupwordpress' ), 'code' ); ?>
- '
' . __( 'Is your site private (i.e. is it behind some kind of authentication, maintenance plugin, .htaccess)? If so, wp-cron won\'t work until you remove it. If you are and you temporarily remove the authentication, do backups start working?', 'backupwordpress' ) . '
' .
+
- '
' . __( 'Report the results to our support team for further help. To do this, either enable support from your Admin Dashboard (recommended), or email backupwordpress@hmn.md', 'backupwordpress' ) . '
' .
-
- '
' . __( 'How to get BackUpWordPress working in Heart Internet', 'backupwordpress' ) . '
' .
-
- '
' . __( 'The script to be entered into the Heart Internet cPanel is: /usr/bin/php5 /home/sites/yourdomain.com/public_html/wp-cron.php (note the space between php5 and the location of the file). The file wp-cron.phpchmod must be set to 711.', 'backupwordpress' ) . '
' .
-
- '
' . __( 'My backups seem to be failing?', 'backupwordpress' ) . '
' .
-
- '
' . __( 'If your backups are failing, it\'s commonly caused by a lack of available resources on your server. To establish this is the case, exclude the complete (or parts of the) uploads folder and run a backup. If that succeeds, you know it\'s probably a server issue. If it does not succeed, report the results to our support team for further help. You can contact support by enabling support from your Admin Dashboard (recommended), or emailing backupwordpress@hmn.md', 'backupwordpress' ) . '