mirror of
https://github.com/mainwp/mainwp-child.git
synced 2025-09-05 09:19:53 +08:00
This commit is contained in:
ruben-
parent
c451e00821
commit
a3cad3d0b5
4 changed files with 47 additions and 16 deletions
|
|
@ -466,7 +466,10 @@ class MainWPChild
|
|||
$newExcludes[] = rtrim($exclude, '/');
|
||||
}
|
||||
|
||||
$res = MainWPBackup::get()->createFullBackup($newExcludes, (isset($_POST['f']) ? $_POST['f'] : $_POST['file']), true, $includeCoreFiles);
|
||||
$method = (!isset($_POST['zipmethod']) ? 'tar.gz' : $_POST['zipmethod']);
|
||||
if ($method == 'tar.gz' && !function_exists('gzopen')) $method = 'zip';
|
||||
|
||||
$res = MainWPBackup::get()->createFullBackup($newExcludes, (isset($_POST['f']) ? $_POST['f'] : $_POST['file']), true, $includeCoreFiles, 0, false, false, false, false, $method);
|
||||
if (!$res)
|
||||
{
|
||||
$information['backup'] = false;
|
||||
|
|
@ -618,6 +621,16 @@ class MainWPChild
|
|||
ini_set('display_errors', TRUE);
|
||||
ini_set('display_startup_errors', TRUE);
|
||||
echo '<pre>';
|
||||
$start = microtime(true);
|
||||
//$excludes = array('wp-content/uploads');
|
||||
$excludes = array();
|
||||
$excludes[] = str_replace(ABSPATH, '', WP_CONTENT_DIR) . '/uploads/mainwp';
|
||||
$uploadDir = MainWPHelper::getMainWPDir();
|
||||
$uploadDir = $uploadDir[0];
|
||||
$excludes[] = str_replace(ABSPATH, '', $uploadDir);
|
||||
|
||||
print_r(MainWPBackup::get()->createFullBackup($excludes, '', false, false, 0, false, false, false, false, 'tar.gz'));
|
||||
|
||||
die('</pre>');
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1034,7 +1034,8 @@ Author URI: http://dd32.id.au/
|
|||
MainWPHelper::endSession();
|
||||
//Send request to the childsite!
|
||||
global $wp_version;
|
||||
$result = MainWPHelper::fetchUrl($url, array('cloneFunc' => 'createCloneBackup', 'key' => $key, 'f' => $rand, 'wpversion' => $wp_version));
|
||||
$method = (function_exists('gzopen') ? 'tar.gz' : 'zip');
|
||||
$result = MainWPHelper::fetchUrl($url, array('cloneFunc' => 'createCloneBackup', 'key' => $key, 'f' => $rand, 'wpversion' => $wp_version, 'zipmethod' => $method));
|
||||
|
||||
if (!$result['backup']) throw new Exception(__('Could not create backupfile on child','mainwp-child'));
|
||||
@session_start();
|
||||
|
|
|
|||
|
|
@ -153,7 +153,8 @@ class TarArchiver
|
|||
|
||||
if (file_exists(rtrim($path, '/') . '/.htaccess')) $this->addFile(rtrim($path, '/') . '/.htaccess', rtrim(str_replace(ABSPATH, '', $path), '/') . '/mainwp-htaccess');
|
||||
|
||||
$iterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($path), RecursiveIteratorIterator::SELF_FIRST);
|
||||
$iterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($path), RecursiveIteratorIterator::SELF_FIRST,
|
||||
RecursiveIteratorIterator::CATCH_GET_CHILD);
|
||||
|
||||
/** @var $path DirectoryIterator */
|
||||
foreach ($iterator as $path)
|
||||
|
|
@ -185,6 +186,7 @@ class TarArchiver
|
|||
if ($this->type == 'tar.gz')
|
||||
{
|
||||
@fputs($this->archive, $data, strlen($data));
|
||||
@fflush($this->archive);
|
||||
}
|
||||
else if ($this->type == 'tar.bz2')
|
||||
{
|
||||
|
|
@ -193,6 +195,7 @@ class TarArchiver
|
|||
else
|
||||
{
|
||||
@fputs($this->archive, $data, strlen($data));
|
||||
@fflush($this->archive);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -247,6 +250,10 @@ class TarArchiver
|
|||
return true;
|
||||
}
|
||||
|
||||
protected $block;
|
||||
protected $tempContent;
|
||||
protected $gcCnt = 0;
|
||||
|
||||
private function addFile($path, $entryName)
|
||||
{
|
||||
if (time() - $this->lastRun > 60)
|
||||
|
|
@ -257,6 +264,14 @@ class TarArchiver
|
|||
|
||||
if ($this->excludeZip && MainWPHelper::endsWith($path, '.zip')) return false;
|
||||
|
||||
$this->gcCnt++;
|
||||
if ($this->gcCnt > 20)
|
||||
{
|
||||
if (function_exists('gc_enable')) @gc_enable();
|
||||
if (function_exists('gc_collect_cycles')) @gc_collect_cycles();
|
||||
$this->gcCnt = 0;
|
||||
}
|
||||
|
||||
$prefix = "";
|
||||
if (strlen($entryName) > 99)
|
||||
{
|
||||
|
|
@ -265,6 +280,7 @@ class TarArchiver
|
|||
if (strlen($prefix) > 154 || strlen($entryName) > 99)
|
||||
{
|
||||
//todo: add some error feedback!
|
||||
return;
|
||||
}
|
||||
}
|
||||
$stat = @stat($path);
|
||||
|
|
@ -272,9 +288,10 @@ class TarArchiver
|
|||
if (!$fp)
|
||||
{
|
||||
//todo: add some error feedback!
|
||||
return;
|
||||
}
|
||||
|
||||
$block = pack("a100a8a8a8a12a12a8a1a100a6a2a32a32a8a8a155a12",
|
||||
$this->block = pack("a100a8a8a8a12a12a8a1a100a6a2a32a32a8a8a155a12",
|
||||
$entryName,
|
||||
sprintf("%07o", $stat['mode']),
|
||||
sprintf("%07o", $stat['uid']),
|
||||
|
|
@ -295,18 +312,18 @@ class TarArchiver
|
|||
|
||||
$checksum = 0;
|
||||
for ($i = 0; $i < 512; $i++)
|
||||
$checksum += ord(substr($block, $i, 1));
|
||||
$checksum += ord(substr($this->block, $i, 1));
|
||||
$checksum = pack("a8", sprintf("%07o", $checksum));
|
||||
$block = substr_replace($block, $checksum, 148, 8);
|
||||
$this->block = substr_replace($this->block, $checksum, 148, 8);
|
||||
|
||||
$this->addData($block);
|
||||
$this->addData($this->block);
|
||||
|
||||
while (!feof($fp))
|
||||
{
|
||||
$temp = fread($fp, 512);
|
||||
if ($temp)
|
||||
$this->tempContent = fread($fp, 512);
|
||||
if ($this->tempContent)
|
||||
{
|
||||
$this->addData(pack("a512", $temp));
|
||||
$this->addData(pack("a512", $this->tempContent));
|
||||
}
|
||||
}
|
||||
@fclose($fp);
|
||||
|
|
@ -430,7 +447,7 @@ class TarArchiver
|
|||
{
|
||||
$temp = unpack("a100name/a8mode/a8uid/a8gid/a12size/a12mtime/a8checksum/a1type/a100symlink/a6magic/a2temp/a32temp/a32temp/a8temp/a8temp/a155prefix/a12temp", $block);
|
||||
$file = array(
|
||||
'name' => $temp['prefix'] . $temp['name'],
|
||||
'name' => trim($temp['prefix']) . trim($temp['name']),
|
||||
'stat' => array(
|
||||
2 => $temp['mode'],
|
||||
4 => octdec($temp['uid']),
|
||||
|
|
@ -461,7 +478,7 @@ class TarArchiver
|
|||
|
||||
if ($file['type'] == 0)
|
||||
{
|
||||
if ($temp['name'] == $entryName)
|
||||
if (strcmp(trim($temp['name']), trim($entryName)) == 0)
|
||||
{
|
||||
if ($file['stat'][7] > 0)
|
||||
{
|
||||
|
|
@ -496,7 +513,7 @@ class TarArchiver
|
|||
{
|
||||
$temp = unpack("a100name/a8mode/a8uid/a8gid/a12size/a12mtime/a8checksum/a1type/a100symlink/a6magic/a2temp/a32temp/a32temp/a8temp/a8temp/a155prefix/a12temp", $block);
|
||||
$file = array(
|
||||
'name' => $temp['prefix'] . $temp['name'],
|
||||
'name' => trim($temp['prefix']) . trim($temp['name']),
|
||||
'stat' => array(
|
||||
2 => $temp['mode'],
|
||||
4 => octdec($temp['uid']),
|
||||
|
|
@ -527,7 +544,7 @@ class TarArchiver
|
|||
|
||||
if ($file['type'] == 0)
|
||||
{
|
||||
if ($temp['name'] == $entryName)
|
||||
if (strcmp(trim($temp['name']), trim($entryName)) == 0)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
|
@ -554,7 +571,7 @@ class TarArchiver
|
|||
{
|
||||
$temp = unpack("a100name/a8mode/a8uid/a8gid/a12size/a12mtime/a8checksum/a1type/a100symlink/a6magic/a2temp/a32temp/a32temp/a8temp/a8temp/a155prefix/a12temp", $block);
|
||||
$file = array(
|
||||
'name' => $temp['prefix'] . $temp['name'],
|
||||
'name' => trim($temp['prefix']) . trim($temp['name']),
|
||||
'stat' => array(
|
||||
2 => $temp['mode'],
|
||||
4 => octdec($temp['uid']),
|
||||
|
|
|
|||
|
|
@ -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: 1.4-beta4
|
||||
Version: 1.4-beta5
|
||||
*/
|
||||
header('X-Frame-Options: ALLOWALL');
|
||||
//header('X-Frame-Options: GOFORIT');
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue
