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

Fixing path exception move

Browse Source
This commit is contained in:
Dennis Eichhorn 2016-03-12 15:28:59 +01:00
parent 5d0ae32a84
commit e412e3935d
9 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dispatcher/Dispatcher.php
View File

@ -19,7 +19,7 @@ use phpOMS\ApplicationAbstract;
use phpOMS\Message\RequestAbstract; use phpOMS\Message\RequestAbstract;
use phpOMS\Message\ResponseAbstract; use phpOMS\Message\ResponseAbstract;
use phpOMS\Module\ModuleAbstract; use phpOMS\Module\ModuleAbstract;
use phpOMS\System\FilePathException; use phpOMS\System\File\PathException;
use phpOMS\Views\ViewLayout; use phpOMS\Views\ViewLayout;
/** /**
@ -131,7 +131,7 @@ class Dispatcher
{ {
if (!isset($this->controllers[$controller])) { if (!isset($this->controllers[$controller])) {
if (realpath($path = ROOT_PATH . '/' . str_replace('\\', '/', $controller) . '.php') === false) { if (realpath($path = ROOT_PATH . '/' . str_replace('\\', '/', $controller) . '.php') === false) {
throw new FilePathException($path); throw new PathException($path);
} }
$this->controllers[$controller] = new $controller($this->app); $this->controllers[$controller] = new $controller($this->app);

4
Log/FileLogger.php
View File

@ -16,7 +16,7 @@
namespace phpOMS\Log; namespace phpOMS\Log;
use phpOMS\Datatypes\Exception\InvalidEnumValue; use phpOMS\Datatypes\Exception\InvalidEnumValue;
use phpOMS\System\FilePathException; use phpOMS\System\File\PathException;
use phpOMS\Validation\Validator; use phpOMS\Validation\Validator;
/** /**
@ -88,7 +88,7 @@ class FileLogger implements LoggerInterface
$path = realpath($lpath); $path = realpath($lpath);
if ($path !== false && Validator::startsWith($path, ROOT_PATH) === false) { if ($path !== false && Validator::startsWith($path, ROOT_PATH) === false) {
throw new FilePathException($lpath); throw new PathException($lpath);
} }
if (is_dir($lpath)) { if (is_dir($lpath)) {

4
Module/InfoManager.php
View File

@ -15,7 +15,7 @@
*/ */
namespace phpOMS\Module; namespace phpOMS\Module;
use phpOMS\System\FilePathException; use phpOMS\System\File\PathException;
use phpOMS\Utils\ArrayUtils; use phpOMS\Utils\ArrayUtils;
use phpOMS\Validation\Validator; use phpOMS\Validation\Validator;
@ -62,7 +62,7 @@ class InfoManager
public function __construct(string $module) public function __construct(string $module)
{ {
if (($path = realpath($oldPath = ModuleAbstract::MODULE_PATH . '/' . $module . '/info.json')) === false || Validator::startsWith($path, ModuleAbstract::MODULE_PATH)) { if (($path = realpath($oldPath = ModuleAbstract::MODULE_PATH . '/' . $module . '/info.json')) === false || Validator::startsWith($path, ModuleAbstract::MODULE_PATH)) {
throw new FilePathException($oldPath); throw new PathException($oldPath);
} }
$this->path = $path; $this->path = $path;

4
Module/ModuleAbstract.php
View File

@ -15,7 +15,7 @@
*/ */
namespace phpOMS\Module; namespace phpOMS\Module;
use phpOMS\System\FilePathException; use phpOMS\System\File\PathException;
/** /**
@ -152,7 +152,7 @@ abstract class ModuleAbstract
/** @noinspection PhpUnusedLocalVariableInspection */ /** @noinspection PhpUnusedLocalVariableInspection */
foreach (static::$localization[$destination] as $file) { foreach (static::$localization[$destination] as $file) {
if (($path = realpath($oldPath = __DIR__ . '/../../Modules/' . static::MODULE_NAME . '/Theme/' . $destination . '/Lang/' . $language . '.lang.php')) === false) { if (($path = realpath($oldPath = __DIR__ . '/../../Modules/' . static::MODULE_NAME . '/Theme/' . $destination . '/Lang/' . $language . '.lang.php')) === false) {
throw new FilePathException($oldPath); throw new PathException($oldPath);
} }
/** @noinspection PhpIncludeInspection */ /** @noinspection PhpIncludeInspection */

6
Module/ModuleManager.php
View File

@ -19,7 +19,7 @@ use phpOMS\ApplicationAbstract;
use phpOMS\DataStorage\Database\DatabaseType; use phpOMS\DataStorage\Database\DatabaseType;
use phpOMS\Log\FileLogger; use phpOMS\Log\FileLogger;
use phpOMS\Message\Http\Request; use phpOMS\Message\Http\Request;
use phpOMS\System\FilePathException; use phpOMS\System\File\PathException;
use phpOMS\Utils\IO\Json\InvalidJsonException; use phpOMS\Utils\IO\Json\InvalidJsonException;
/** /**
@ -250,7 +250,7 @@ class ModuleManager
if (file_exists($path)) { if (file_exists($path)) {
if (strpos($path, self::MODULE_PATH) === false) { if (strpos($path, self::MODULE_PATH) === false) {
throw new FilePathException($oldPath); throw new PathException($oldPath);
} }
$json = json_decode(file_get_contents($path), true); $json = json_decode(file_get_contents($path), true);
@ -300,7 +300,7 @@ class ModuleManager
if ($path !== false) { if ($path !== false) {
if (strpos($path, self::MODULE_PATH) === false) { if (strpos($path, self::MODULE_PATH) === false) {
throw new FilePathException($oldPath); throw new PathException($oldPath);
} }
$info = json_decode(file_get_contents($path), true); $info = json_decode(file_get_contents($path), true);

2
System/FilePathException.php → System/File/PathException.php
View File

@ -28,7 +28,7 @@ namespace phpOMS\System;
* @link http://orange-management.com * @link http://orange-management.com
* @since 1.0.0 * @since 1.0.0
*/ */
class FilePathException extends \UnexpectedValueException class PathException extends \UnexpectedValueException
{ {
/** /**
* Constructor. * Constructor.

2
System/FileSystem.php
View File

@ -91,7 +91,7 @@ class FileSystem
{ {
$path = realpath($oldPath = $path); $path = realpath($oldPath = $path);
if ($path === false || !is_dir($path) || Validator::startsWith($path, ROOT_PATH)) { if ($path === false || !is_dir($path) || Validator::startsWith($path, ROOT_PATH)) {
throw new FilePathException($oldPath); throw new PathException($oldPath);
} }
$files = scandir($path); $files = scandir($path);

2
Version/Version.php
View File

@ -14,7 +14,7 @@
* @link http://orange-management.com * @link http://orange-management.com
*/ */
namespace phpOMS\Version; namespace phpOMS\Version;
use phpOMS\System\FilePathException; use phpOMS\System\File\PathException;
use phpOMS\Validation\Validator; use phpOMS\Validation\Validator;
/** /**

4
Views/View.php
View File

@ -20,7 +20,7 @@ use phpOMS\Contract\RenderableInterface;
use phpOMS\Localization\Localization; use phpOMS\Localization\Localization;
use phpOMS\Message\RequestAbstract; use phpOMS\Message\RequestAbstract;
use phpOMS\Message\ResponseAbstract; use phpOMS\Message\ResponseAbstract;
use phpOMS\System\FilePathException; use phpOMS\System\File\PathException;
use phpOMS\Validation\Validator; use phpOMS\Validation\Validator;
/** /**
@ -283,7 +283,7 @@ class View implements RenderableInterface
$path = realpath($oldPath = __DIR__ . '/../..' . $this->template . '.tpl.php'); $path = realpath($oldPath = __DIR__ . '/../..' . $this->template . '.tpl.php');
if ($path === false || Validator::startsWith($path, ROOT_PATH) === false) { if ($path === false || Validator::startsWith($path, ROOT_PATH) === false) {
throw new FilePathException($oldPath); throw new PathException($oldPath);
} }
ob_start(); ob_start();