Merge with backwpup branch + version update

This commit is contained in:
ruben- 2015-07-09 19:28:21 +02:00
parent 7bbaa1713d
commit 2c04e35748
3 changed files with 1236 additions and 4 deletions

View file

@ -11,7 +11,7 @@ include_once(ABSPATH . '/wp-admin/includes/plugin.php');
class MainWPChild
{
private $version = '2.0.20';
private $version = '2.0.21';
private $update_version = '1.2';
private $callableFunctions = array(
@ -67,7 +67,8 @@ class MainWPChild
'update_values' => 'update_values',
'ithemes' => 'ithemes',
'updraftplus' => 'updraftplus',
'backup_wp' => 'backup_wp'
'backup_wp' => 'backup_wp',
'backwpup' => 'backwpup'
);
private $FTP_ERROR = 'Failed, please add FTP details for automatic upgrades.';
@ -841,6 +842,8 @@ class MainWPChild
MainWPChildBackUpWordPress::Instance()->init();
}
MainWPChildBackWPup::Instance()->init();
//Call the function required
if (isset($_POST['function']) && isset($this->callableFunctions[$_POST['function']]))
{
@ -1183,6 +1186,7 @@ class MainWPChild
@wp_update_plugins();
$information['plugin_updates'] = get_plugin_updates();
$plugins = explode(',', urldecode($_POST['list']));
$premiumPlugins = array();
$premiumUpdates = get_option('mainwp_premium_updates');
if (is_array($premiumUpdates))
@ -4209,6 +4213,11 @@ class MainWPChild
MainWPChildBackUpWordPress::Instance()->action();
}
function backwpup() {
MainWPChildBackWPup::Instance()->action();
}
function delete_backup()
{
$dirs = MainWPHelper::getMainWPDir('backup');

File diff suppressed because it is too large Load diff

View file

@ -5,7 +5,7 @@
Description: Child Plugin for MainWP. The plugin is used so the installed blog can be securely managed remotely by your network. Plugin documentation and options can be found here http://docs.mainwp.com
Author: MainWP
Author URI: http://mainwp.com
Version: 2.0.20
Version: 2.0.21
*/
if ((isset($_REQUEST['heatmap']) && $_REQUEST['heatmap'] == '1') || (isset($_REQUEST['mainwpsignature']) && (!empty($_REQUEST['mainwpsignature'])))) {
header('X-Frame-Options: ALLOWALL');