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

Add PR #228 loop code optimization plus other minor code adjustments in WireFileTools

Browse Source 
Co-authored-by: pine3ree <pine3ree@gmail.com>
This commit is contained in:
Ryan Cramer
2022-09-16 10:49:04 -04:00
parent 330be8c05a
commit 96848654a4
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
wire/core/WireFileTools.php
View File

@@ -28,7 +28,7 @@ class WireFileTools extends Wire {
* *
*/ */
public function __destruct() { public function __destruct() {
foreach($this->data as $key => $value) { foreach($this->data as $value) {
if(isset($value['fp'])) fclose($value['fp']); if(isset($value['fp'])) fclose($value['fp']);
} }
} }
@@ -131,7 +131,7 @@ class WireFileTools extends Wire {
if($file == '.' || $file == '..' || strpos($file, '..') !== false) continue; if($file == '.' || $file == '..' || strpos($file, '..') !== false) continue;
$pathname = rtrim($path, '/') . '/' . $file; $pathname = rtrim($path, '/') . '/' . $file;
if(is_dir($pathname)) { if(is_dir($pathname)) {
$this->rmdir($pathname, $recursive, $options); $this->rmdir($pathname, true, $options);
} else { } else {
$this->unlink($pathname, $options['limitPath'], $options['throw']); $this->unlink($pathname, $options['limitPath'], $options['throw']);
} }
@@ -675,7 +675,7 @@ class WireFileTools extends Wire {
} }
$pos = strpos($pathname, '//'); $pos = strpos($pathname, '//');
if($pos !== false && $pos !== strpos($this->wire('config')->paths->assets, '//')) { if($pos !== false && $pos !== strpos($this->wire()->config->paths->assets, '//')) {
// URLs or accidental extra slashes not allowed, unless they also appear in a known safe system path // URLs or accidental extra slashes not allowed, unless they also appear in a known safe system path
return $this->filesError(__FUNCTION__, 'pathname may not contain double slash “//”', $throw); return $this->filesError(__FUNCTION__, 'pathname may not contain double slash “//”', $throw);
} }
@@ -1212,7 +1212,6 @@ class WireFileTools extends Wire {
$dataKey = "csv:$filename"; $dataKey = "csv:$filename";
$header = false; $header = false;
$row = false; $row = false;
$fp = null;
if(isset($this->data[$dataKey])) { if(isset($this->data[$dataKey])) {
// file is open // file is open
@@ -1456,7 +1455,7 @@ class WireFileTools extends Wire {
} }
if(!$allowed) { if(!$allowed) {
$error = "Filename $filename is not in an allowed path." ; $error = "Filename $filename is not in an allowed path." ;
$error .= ' Paths: ' . implode("\n", $options['allowedPaths']) . ''; $error .= ' Paths: ' . implode("\n", $options['allowedPaths']);
if($options['throwExceptions']) $this->filesException(__FUNCTION__, $error); if($options['throwExceptions']) $this->filesException(__FUNCTION__, $error);
$this->error($error); $this->error($error);
return false; return false;
@@ -1464,8 +1463,7 @@ class WireFileTools extends Wire {
} }
if($options['cache']) { if($options['cache']) {
/** @var WireCache $cache */ $cache = $this->wire()->cache;
$cache = $this->wire('cache');
$o = $options; $o = $options;
unset($o['cache']); unset($o['cache']);
$o['vars'] = $vars; $o['vars'] = $vars;
@@ -1511,7 +1509,7 @@ class WireFileTools extends Wire {
*/ */
public function ___include($filename, array $vars = array(), array $options = array()) { public function ___include($filename, array $vars = array(), array $options = array()) {
$paths = $this->wire('config')->paths; $paths = $this->wire()->config->paths;
$defaults = array( $defaults = array(
'func' => 'include', 'func' => 'include',
'autoExtension' => 'php', 'autoExtension' => 'php',
@@ -1557,6 +1555,7 @@ class WireFileTools extends Wire {
$allowed = false; $allowed = false;
foreach($options['allowedPaths'] as $path) { foreach($options['allowedPaths'] as $path) {
if($this->fileInPath($filename, $path)) $allowed = true; if($this->fileInPath($filename, $path)) $allowed = true;
if($allowed) break;
} }
if(!$allowed) $this->filesException(__FUNCTION__, "File is not in an allowed path: $filename"); if(!$allowed) $this->filesException(__FUNCTION__, "File is not in an allowed path: $filename");
} }
@@ -1564,7 +1563,7 @@ class WireFileTools extends Wire {
if(!file_exists($filename)) $this->filesException(__FUNCTION__, "File does not exist: $filename"); if(!file_exists($filename)) $this->filesException(__FUNCTION__, "File does not exist: $filename");
// extract all API vars // extract all API vars
$fuel = array_merge($this->wire('fuel')->getArray(), $vars); $fuel = array_merge($this->wire()->fuel->getArray(), $vars);
extract($fuel); extract($fuel);
// include the file // include the file
@@ -1621,8 +1620,9 @@ class WireFileTools extends Wire {
if($fileIsContents) { if($fileIsContents) {
$data = trim($file); $data = trim($file);
} else { } else {
$data = trim(file_get_contents($file)); $data = file_get_contents($file);
if($data === false) return $namespace; if($data === false) return $namespace;
$data = trim($data);
} }
// if there's no "namespace" keyword in the file, it's not declaring one // if there's no "namespace" keyword in the file, it's not declaring one
@@ -1754,7 +1754,7 @@ class WireFileTools extends Wire {
// for multi-instance support, use the same compiled version // for multi-instance support, use the same compiled version
// otherwise, require_once() statements in a file may not work as intended // otherwise, require_once() statements in a file may not work as intended
// applied just to site/modules for the moment, but may need to do site/templates too // applied just to site/modules for the moment, but may need to do site/templates too
$f = str_replace($this->wire('config')->paths->root, '', $file); $f = str_replace($this->wire()->config->paths->root, '', $file);
if(isset($compiled[$f])) return $compiled[$f]; if(isset($compiled[$f])) return $compiled[$f];
} else { } else {
$f = ''; $f = '';
@@ -1976,4 +1976,4 @@ class WireFileTools extends Wire {
} }
} }