Optimize loop

This commit is contained in:
Lukas Reschke 2015-02-20 18:19:14 +01:00 committed by Thomas Müller
parent abacfd84da
commit 2f18a09a20
1 changed files with 9 additions and 6 deletions

View File

@ -494,18 +494,21 @@ abstract class Common implements \OC\Files\Storage\Storage {
} }
/** /**
* @param $fileName * @param string $fileName
* @param string $invalidChars
* @throws InvalidPathException * @throws InvalidPathException
*/ */
private function scanForInvalidCharacters($fileName, $invalidChars) { private function scanForInvalidCharacters($fileName, $invalidChars) {
foreach (str_split($fileName) as $char) { foreach(str_split($invalidChars) as $char) {
if (strpos($invalidChars, $char) !== false) { if (strpos($fileName, $char) !== false) {
throw new InvalidPathException('File name contains at least one invalid characters');
}
if (ord($char) >= 0 && ord($char) <= 31) {
throw new InvalidPathException('File name contains at least one invalid characters'); throw new InvalidPathException('File name contains at least one invalid characters');
} }
} }
$sanitizedFileName = filter_var($fileName, FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_LOW);
if($sanitizedFileName !== $fileName) {
throw new InvalidPathException('File name contains at least one invalid characters');
}
} }
} }