Merge pull request #1205 from darthvader666uk/Patch2

darthvader666uk · web-flow · commit 291581972394 · 2019-06-10T15:08:33.000+01:00
Patch2
diff --git a/admin/faq.php b/admin/faq.php
@@ -47,12 +47,12 @@
 
 	 '<li>' . __( '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' ) . '</li></ul>' .
 
-	 '<p>' . __( 'Report the results to our support team for further help. To do this, email support@xibomarketing.com', 'backupwordpress' ) . '</p>' .
+	 '<p>' . __( 'For further help, please post on our <a href="http://wordpress.org/support/plugin/backupwordpress" title="support forums" target="_blank">support forums</a>', 'backupwordpress' ) . '</p>' .
 
 	 '<p><strong>' . __( 'How to get BackUpWordPress working in Heart Internet', 'backupwordpress' ) . '</strong></p>' .
 
 	 '<p>' . __( 'The script to be entered into the Heart Internet cPanel is: <code>/usr/bin/php5 /home/sites/yourdomain.com/public_html/wp-cron.php</code> (note the space between php5 and the location of the file). The file <code>wp-cron.php</code> <code>chmod</code> must be set to <code>711</code>.', 'backupwordpress' ) . '</p>' .
 
 	 '<p><strong>' . __( 'My backups seem to be failing?', 'backupwordpress' ) . '</strong></p>' .
 
-	 '<p>' . __( '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 emailing support@xibomarketing.com', 'backupwordpress' ) . '</p>';
+	 '<p>' . __( '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, you can seek further help on our <a href="http://wordpress.org/support/plugin/backupwordpress" title="support forums" target="_blank">support forums</a>', 'backupwordpress' ) . '</p>';
diff --git a/backupwordpress.php b/backupwordpress.php
@@ -3,7 +3,7 @@
 Plugin Name: BackUpWordPress
 Plugin URI: https://updraftplus.com/backupwordpress/?afref=744
 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.8
+Version: 3.9
 Author: XIBO Ltd
 Author URI: https://profiles.wordpress.org/xibodevelopment
 License: GPL-2+
@@ -14,10 +14,10 @@
 */
 
 /*
-Copyright 2011 - 2018 XIBO Ltd  (email : support@xibomarketing.com)
+Copyright 2011 - 2018 XIBO Ltd
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the General Public License (GNU) as published by
+it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2 of the License, or
 (at your option) any later version.
 
diff --git a/bin/readme.txt b/bin/readme.txt
@@ -3,7 +3,7 @@ Contributors: xibodevelopment, willmot, dashaluna, pauldewouters, joehoyle, matt
 Tags: back up, backup, backups, database, zip, db, files, archive, wp-cli, xibodevelopment
 Requires at least: 3.9
 Tested up to: 4.9.8
-Stable tag: 3.8
+Stable tag: 3.9
 
 Simple automated backups of your WordPress-powered website.
 
@@ -95,24 +95,20 @@ There are some things you can test to confirm this is the issue.
 
 	 * 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?
 
-Report the results to our support team for further help. To do this, email support@xibomarketing.com
-
 **How to get BackUpWordPress working in Heart Internet**
 
 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.php` `chmod` must be set to `711`.
 
 **My backups seem to be failing?**
 
-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 emailing support@xibomarketing.com
+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, you can find further assistance on our <a href="http://wordpress.org/support/plugin/backupwordpress" title="support forums" target="_blank">support forums</a>.
 
 **Further Support & Feedback**
 
 General support questions should be posted in the <a href="http://wordpress.org/tags/backupwordpress?forum_id=10">WordPress support forums, tagged with backupwordpress.</a>
 
 For development issues, feature requests or anybody wishing to help out with development checkout <a href="https://github.com/orgs/xibodevelopment/backupwordpress/">BackUpWordPress on GitHub.</a>
 
-You can also email support@xibomarketing.com for further help/support.
-
 == Screenshots ==
 
 1. Manage multiple schedules.
@@ -161,6 +157,10 @@ users should see major improvements to reliability.
 
 == Changelog ==
 
+### 3.9 / 2019-06-10
+
+* Readme update
+
 ### 3.8 / 2018-11-01
 
 * GNU Wording change
diff --git a/bin/release.sh b/bin/release.sh
@@ -2,8 +2,8 @@
 #
 # Takes a tag to release, and syncs it to WordPress.org
 
-TAG=3.8
-PLUGIN="backupwordpress-new"
+TAG=3.9
+PLUGIN="backupwordpress"
 PLUGINDIR=$(pwd)
 TMPDIR=$(pwd)/tmp/
 
diff --git a/classes/class-email-service.php b/classes/class-email-service.php
@@ -176,7 +176,7 @@ public function action( $action, Backup $backup ) {
 
 				$subject = sprintf( __( 'Backup of %s Failed', 'backupwordpress' ), $domain );
 
-				$message = sprintf( __( 'BackUpWordPress was unable to backup your site %1$s.', 'backupwordpress' ) . "\n\n" . __( 'Here are the errors that we\'ve encountered:', 'backupwordpress' ) . "\n\n" . '%2$s' . "\n\n" . __( 'If the errors above look like Martian, forward this email to %3$s and we\'ll take a look', 'backupwordpress' ) . "\n\n" . __( "Kind Regards,\nThe Apologetic BackUpWordPress Backup Emailing Robot", 'backupwordpress' ), home_url(), $error_message, 'support@xibomarketing.com' );
+				$message = sprintf( __( 'BackUpWordPress was unable to backup your site %1$s.', 'backupwordpress' ) . "\n\n" . __( 'Here are the errors that we\'ve encountered:', 'backupwordpress' ) . "\n\n" . '%2$s' . "\n\n" . __( 'If the errors above look like Martian, you can find further assistance on our %3$ssupport forums%4$s ', 'backupwordpress' ) . "\n\n" . __( "Kind Regards,\nThe Apologetic BackUpWordPress Backup Emailing Robot", 'backupwordpress' ), home_url(), $error_message, '<a href="http://wordpress.org/support/plugin/backupwordpress" title="support forums" target="_blank">', '</a>' );
 
 				wp_mail( $this->get_email_address_array(), $subject, $message, $headers );
 
diff --git a/classes/class-plugin.php b/classes/class-plugin.php
@@ -6,7 +6,7 @@
  * Class Plugin
  */
 final class Plugin {
-	const PLUGIN_VERSION = '3.8';
+	const PLUGIN_VERSION = '3.9';
 
 	/**
 	 * @var Plugin The singleton instance.
diff --git a/composer.lock b/composer.lock
diff --git a/languages/backupwordpress.pot b/languages/backupwordpress.pot
@@ -2,7 +2,7 @@
 # This file is distributed under the GPL-2+.
 msgid ""
 msgstr ""
-"Project-Id-Version: BackUpWordPress 3.8\n"
+"Project-Id-Version: BackUpWordPress 3.9\n"
 "Report-Msgid-Bugs-To: support@xibomarketing.com\n"
 "POT-Creation-Date: 2018-10-29 10:39:44+00:00\n"
 "MIME-Version: 1.0\n"
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "BackUpWordPress",
-  "version": "3.8",
+  "version": "3.9",
   "description": "Simple automated backups of your WordPress powered website.",
   "main": "backupwordpress.php",
   "directories": {
diff --git a/readme.txt b/readme.txt
@@ -3,7 +3,7 @@ Contributors: xibodevelopment, willmot, dashaluna, pauldewouters, joehoyle, matt
 Tags: back up, backup, backups, database, zip, db, files, archive, wp-cli, xibodevelopment
 Requires at least: 3.9
 Tested up to: 4.9.8
-Stable tag: 3.8
+Stable tag: 3.9
 
 Simple automated backups of your WordPress-powered website.
 
@@ -95,24 +95,20 @@ There are some things you can test to confirm this is the issue.
 
 	 * 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?
 
-Report the results to our support team for further help. To do this, email support@xibomarketing.com
-
 **How to get BackUpWordPress working in Heart Internet**
 
 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.php` `chmod` must be set to `711`.
 
 **My backups seem to be failing?**
 
-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 emailing support@xibomarketing.com
+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, you can find further assistance on our <a href="http://wordpress.org/support/plugin/backupwordpress" title="support forums" target="_blank">support forums</a>
 
 **Further Support & Feedback**
 
 General support questions should be posted in the <a href="http://wordpress.org/tags/backupwordpress?forum_id=10">WordPress support forums, tagged with backupwordpress.</a>
 
 For development issues, feature requests or anybody wishing to help out with development checkout <a href="https://github.com/orgs/xibodevelopment/backupwordpress/">BackUpWordPress on GitHub.</a>
 
-You can also email support@xibomarketing.com for further help/support.
-
 == Screenshots ==
 
 1. Manage multiple schedules.
@@ -161,6 +157,10 @@ users should see major improvements to reliability.
 
 == Changelog ==
 
+### 3.9 / 2019-06-10
+
+* Readme update
+
 ### 3.8 / 2018-11-01
 
 * GNU Wording change
diff --git a/readme/readme-footer.txt b/readme/readme-footer.txt
@@ -4,8 +4,6 @@ General support questions should be posted in the <a href="http://wordpress.org/
 
 For development issues, feature requests or anybody wishing to help out with development checkout <a href="https://github.com/xibodevelopment/backupwordpress/">BackUpWordPress on GitHub.</a>
 
-You can also email support@xibomarketing.com for further help/support.
-
 == Screenshots ==
 
 1. Manage multiple schedules.
@@ -54,6 +52,10 @@ users should see major improvements to reliability.
 
 == Changelog ==
 
+### 3.9 / 2019-06-10
+
+* Readme update
+
 ### 3.8 / 2018-11-01
 
 * GNU Wording change
diff --git a/readme/readme-header.txt b/readme/readme-header.txt
@@ -3,7 +3,7 @@ Contributors: xibodevelopment, willmot, dashaluna, pauldewouters, joehoyle, matt
 Tags: back up, backup, backups, database, zip, db, files, archive, wp-cli, xibodevelopment
 Requires at least: 3.9
 Tested up to: 4.9.8
-Stable tag: 3.8
+Stable tag: 3.9
 
 Simple automated backups of your WordPress-powered website.
 

Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,8 @@`
`2`	`2`	`#`
`3`	`3`	`# Takes a tag to release, and syncs it to WordPress.org`
`4`	`4`
`5`		`-TAG=3.8`
`6`		`-PLUGIN="backupwordpress-new"`
	`5`	`+TAG=3.9`
	`6`	`+PLUGIN="backupwordpress"`
`7`	`7`	`PLUGINDIR=$(pwd)`
`8`	`8`	`TMPDIR=$(pwd)/tmp/`
`9`	`9`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "BackUpWordPress",`
`3`		`- "version": "3.8",`
	`3`	`+ "version": "3.9",`
`4`	`4`	`"description": "Simple automated backups of your WordPress powered website.",`
`5`	`5`	`"main": "backupwordpress.php",`
`6`	`6`	`"directories": {`