diff --git a/src/_h5ai/index.html.jade b/src/_h5ai/index.html.jade index 34f875b8..1ef867ef 100644 --- a/src/_h5ai/index.html.jade +++ b/src/_h5ai/index.html.jade @@ -33,10 +33,6 @@ html.no-js( lang="en" ) span.test-label cache directory span.test-result ? div.test-info web server has write access - li.test( data-id="temp" ) - span.test-label temp directory - span.test-result ? - div.test-info web server has write access li.test( data-id="thumbs" ) span.test-label image thumbs span.test-result ? diff --git a/src/_h5ai/server/php/api.php b/src/_h5ai/server/php/api.php index 22174d61..f2b0465d 100644 --- a/src/_h5ai/server/php/api.php +++ b/src/_h5ai/server/php/api.php @@ -88,7 +88,7 @@ else if ($action === "getarchive") { list($id, $as) = check_keys(array("id", "as")); json_fail(2, "file not found", !preg_match("/^package-/", $id)); - $target = $h5ai->getTempAbsPath() . "/" . $id; + $target = $h5ai->getCacheAbsPath() . "/" . $id; json_fail(3, "file not found", !file_exists($target)); header("Content-Type: application/octet-stream"); @@ -110,7 +110,6 @@ else if ($action === "getchecks") { $gd = array_key_exists("JPG Support", $gdinfo) && $gdinfo["JPG Support"] || array_key_exists("JPEG Support", $gdinfo) && $gdinfo["JPEG Support"]; } $cache = @is_writable($h5ai->getCacheAbsPath()); - $temp = @is_writable($h5ai->getTempAbsPath()); $tar = @preg_match("/tar$/", `which tar`) > 0; $zip = @preg_match("/zip$/", `which zip`) > 0; $convert = @preg_match("/convert$/", `which convert`) > 0; @@ -121,7 +120,6 @@ else if ($action === "getchecks") { "php" => $php, "cache" => $cache, "thumbs" => $gd, - "temp" => $temp, "archive" => $archive, "tar" => $tar, "zip" => $zip, diff --git a/src/_h5ai/server/php/inc/Archive.php b/src/_h5ai/server/php/inc/Archive.php index cc3fa634..78947dd2 100644 --- a/src/_h5ai/server/php/inc/Archive.php +++ b/src/_h5ai/server/php/inc/Archive.php @@ -29,7 +29,7 @@ class Archive { return 404; } - $target = $this->h5ai->getTempAbsPath() . "/package-" . sha1(microtime(true) . rand()) . "." . $format; + $target = $this->h5ai->getCacheAbsPath() . "/package-" . sha1(microtime(true) . rand()) . "." . $format; try { if ($execution === "shell") { diff --git a/src/_h5ai/server/php/inc/H5ai.php b/src/_h5ai/server/php/inc/H5ai.php index c0ad6bd4..bff79d80 100644 --- a/src/_h5ai/server/php/inc/H5ai.php +++ b/src/_h5ai/server/php/inc/H5ai.php @@ -127,13 +127,6 @@ class H5ai { } - public function getTempAbsPath() { - - // return H5ai::normalize_path(sys_get_temp_dir()); - return $this->h5aiAbsPath . '/cache'; - } - - public function getOptions() { return $this->options;