Jingga/phpOMS
1
0
Fork 0
mirror of https://github.com/Karaka-Management/phpOMS.git synced 2026-02-06 04:28:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Implementing own file handler

Browse Source
This commit is contained in:
Dennis Eichhorn 2017-01-14 19:57:04 +01:00
parent be324d0d04
commit 182ffcd6eb
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
DataStorage/Cache/FileCache.php
View File

@ -87,8 +87,8 @@ class FileCache implements CacheInterface
{ {
$path = $config['path'] ?? ''; $path = $config['path'] ?? '';
if (!file_exists($path)) { if (!File::exists($path)) {
mkdir($path); Directory::create($path);
} }
$this->cachePath = realpath($path); $this->cachePath = realpath($path);
@ -153,7 +153,7 @@ class FileCache implements CacheInterface
// todo: allow $key to contain / as char and create subdirectory if necessary. This is important for cleaner caching. // todo: allow $key to contain / as char and create subdirectory if necessary. This is important for cleaner caching.
$path = File::sanitize($key, self::SANITIZE); $path = File::sanitize($key, self::SANITIZE);
file_put_contents($this->cachePath . '/' . trim($path, '/') . '.cache', $this->build($value, $expire)); File::put($this->cachePath . '/' . trim($path, '/') . '.cache', $this->build($value, $expire));
return false; return false;
} }
@ -170,8 +170,8 @@ class FileCache implements CacheInterface
$path = File::sanitize($key, self::SANITIZE); $path = File::sanitize($key, self::SANITIZE);
$path = $this->cachePath . '/' . trim($path, '/') . '.cache'; $path = $this->cachePath . '/' . trim($path, '/') . '.cache';
if (!file_exists($path)) { if (!File::exists($path)) {
file_put_contents($path, $this->build($value, $expire)); File::put($path, $this->build($value, $expire));
return true; return true;
} }
@ -287,7 +287,7 @@ class FileCache implements CacheInterface
$name = File::sanitize($key, self::SANITIZE); $name = File::sanitize($key, self::SANITIZE);
$path = $this->cachePath . '/' . trim($name, '/') . '.cache'; $path = $this->cachePath . '/' . trim($name, '/') . '.cache';
if(!file_exists($path)) { if(!File::exists($path)) {
return null; return null;
} }
@ -298,7 +298,7 @@ class FileCache implements CacheInterface
return null; return null;
} }
$raw = file_get_contents($path); $raw = File::get($path);
$type = $raw[0]; $type = $raw[0];
$expireStart = strpos($raw, self::DELIM); $expireStart = strpos($raw, self::DELIM);
@ -354,8 +354,8 @@ class FileCache implements CacheInterface
$name = File::sanitize($key, self::SANITIZE); $name = File::sanitize($key, self::SANITIZE);
$path = $this->cachePath . '/' . trim($name, '/') . '.cache'; $path = $this->cachePath . '/' . trim($name, '/') . '.cache';
if ($expire < 0 && file_exists($path)) { if ($expire < 0 && File::exists($path)) {
unlink($path); File::delete($path);
return true; return true;
} }
@ -369,7 +369,7 @@ class FileCache implements CacheInterface
$cacheExpire = substr($raw, $expireStart+1, $expireEnd - ($expireStart+1)); $cacheExpire = substr($raw, $expireStart+1, $expireEnd - ($expireStart+1));
if ($cacheExpire >= 0 && $created + $cacheExpire > $now) { if ($cacheExpire >= 0 && $created + $cacheExpire > $now) {
unlink($path); File::delete($path);
return true; return true;
} }
@ -397,7 +397,7 @@ class FileCache implements CacheInterface
($expire >= 0 && $created + $expire < $now) ($expire >= 0 && $created + $expire < $now)
|| ($expire < 0 && $created + $this->getExpire($file->getContent()) < $now) || ($expire < 0 && $created + $this->getExpire($file->getContent()) < $now)
) { ) {
unlink($file->getPath()); File::delete($file->getPath());
} }
} }
} }
@ -417,8 +417,8 @@ class FileCache implements CacheInterface
$name = File::sanitize($key, self::SANITIZE); $name = File::sanitize($key, self::SANITIZE);
$path = $this->cachePath . '/' . trim($path, '/') . '.cache'; $path = $this->cachePath . '/' . trim($path, '/') . '.cache';
if (file_exists($path)) { if (File::exists($path)) {
file_put_contents($path, $this->build($value, $expire)); File::put($path, $this->build($value, $expire));
return true; return true;
} }

2
System/File/Local/File.php
View File

@ -147,7 +147,7 @@ class File extends FileAbstract implements FileInterface
*/ */
public static function sanitize(string $path, string $replace = '') : string public static function sanitize(string $path, string $replace = '') : string
{ {
return preg_replace('/[^\w\s\d\.\-_~,;\[\]\(\]]/', $replace, $path); return preg_replace('/[^\w\s\d\.\-_~,;\/\[\]\(\]]/', $replace, $path);
} }
/** /**