mirror/processwire
1
0
Fork 0
mirror of https://github.com/processwire/processwire.git synced 2025-08-12 09:44:38 +02:00
Code Issues Releases Wiki Activity

Some refactoring in WireTempDir class and attempt fix of issue processwire/processwire-issues#704

Browse Source
This commit is contained in:
Ryan Cramer
2018-09-26 09:40:40 -04:00
parent bf8baf36dd
commit 42ec0e3cf4
1 changed files with 36 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
wire/core/WireTempDir.php
View File

@@ -3,7 +3,7 @@
/** /**
* ProcessWire Temporary Directory Manager * ProcessWire Temporary Directory Manager
* *
* ProcessWire 3.x, Copyright 2017 by Ryan Cramer * ProcessWire 3.x, Copyright 2018 by Ryan Cramer
* https://processwire.com * https://processwire.com
* *
*/ */
@@ -85,13 +85,9 @@ class WireTempDir extends Wire {
* *
*/ */
public function createName($prefix = '') { public function createName($prefix = '') {
$pass = new Password(); $random = new WireRandom();
$this->wire($pass); $len = $random->integer(10, 20);
$len = mt_rand(10, 30); $name = $prefix . str_replace(' ', 'T', microtime()) . 'R' . $random->alphanumeric($len);
$name = microtime() . '.' . $pass->randomBase64String($len, true);
$a = explode('.', $name);
shuffle($a);
$name = $prefix . implode('O', $a);
$this->createdName = $name; $this->createdName = $name;
return $name; return $name;
} }
@@ -206,7 +202,7 @@ class WireTempDir extends Wire {
return true; return true;
} }
if(is_dir($this->tempDir)) { if($this->tempDir && is_dir($this->tempDir)) {
// remove temporary directory created by this instance // remove temporary directory created by this instance
if(!$this->rmdir($this->tempDir, true)) { if(!$this->rmdir($this->tempDir, true)) {
$this->log("$errorMessage: $this->tempDir"); $this->log("$errorMessage: $this->tempDir");
@@ -214,7 +210,7 @@ class WireTempDir extends Wire {
} }
} }
if(is_dir($this->tempDirRoot)) { if($this->tempDirRoot && is_dir($this->tempDirRoot)) {
if($this->createdName && strpos($this->tempDirRoot, "/.$this->createdName")) { if($this->createdName && strpos($this->tempDirRoot, "/.$this->createdName")) {
// if tempDirRoot is just for this PW instance, we can remove it now // if tempDirRoot is just for this PW instance, we can remove it now
$this->rmdir($this->tempDirRoot, true); $this->rmdir($this->tempDirRoot, true);
@@ -224,7 +220,7 @@ class WireTempDir extends Wire {
} }
} }
if(!$classRuns && is_dir($this->classRoot)) { if(!$classRuns && $this->classRoot && is_dir($this->classRoot)) {
$this->removeExpiredDirs($this->classRoot, 86400); $this->removeExpiredDirs($this->classRoot, 86400);
} }
@@ -263,10 +259,8 @@ class WireTempDir extends Wire {
} }
// old dir found: check times on files/dirs within that dir // old dir found: check times on files/dirs within that dir
$pathname = rtrim($dir->getPathname(), "/\\") . DIRECTORY_SEPARATOR; $pathname = $this->wire('files')->unixDirName($dir->getPathname());
if(!$this->isTempDir($pathname)) continue;
// if our .wtd identifier file isn't present, ignore the directory
if(!is_file($pathname . self::hiddenFileName)) continue;
$removeDir = true; $removeDir = true;
$newestFileTime = $this->getNewestModTime($pathname); $newestFileTime = $this->getNewestModTime($pathname);
@@ -352,11 +346,11 @@ class WireTempDir extends Wire {
* *
*/ */
protected function mkdir($dir, $recursive = false) { protected function mkdir($dir, $recursive = false) {
if($this->wire('files')->mkdir($dir, $recursive)) { /** @var WireFileTools $files */
$dir = rtrim($dir, "/\\") . DIRECTORY_SEPARATOR; $files = $this->wire('files');
$hiddenFile = $dir . self::hiddenFileName; $dir = $files->unixDirName($dir);
file_put_contents($hiddenFile, time()); if($files->mkdir($dir, $recursive)) {
$this->wire('files')->chmod($hiddenFile); $files->filePutContents($dir . self::hiddenFileName, time());
return true; return true;
} else { } else {
return false; return false;
@@ -372,9 +366,28 @@ class WireTempDir extends Wire {
* *
*/ */
protected function rmdir($dir, $recursive = false) { protected function rmdir($dir, $recursive = false) {
$dir = rtrim($dir, "/\\") . DIRECTORY_SEPARATOR; $dir = $this->wire('files')->unixDirName($dir);
if(!is_file($dir . self::hiddenFileName)) return false; if(!strlen($dir) || !is_dir($dir)) return true;
unlink($dir . self::hiddenFileName); if(!$this->isTempDir($dir)) return false;
if(is_file($dir . self::hiddenFileName)) unlink($dir . self::hiddenFileName);
return $this->wire('files')->rmdir($dir, $recursive); return $this->wire('files')->rmdir($dir, $recursive);
} }
/**
* Is given directory/path created by this class?
*
* @param string $dir
* @return bool
*
*/
protected function isTempDir($dir) {
if(!strlen($dir) || !is_dir($dir)) {
// if given a non-directory return false
return false;
} else if($this->classRoot && $this->wire('files')->fileInPath($dir, $this->classRoot)) {
return true;
}
return false;
}
} }