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

Fix root_path bugs

Browse Source
This commit is contained in:
Dennis Eichhorn 2017-04-03 21:45:15 +02:00
parent d084862571
commit 04bef943b2
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Log/FileLogger.php
View File

@ -108,7 +108,7 @@ class FileLogger implements LoggerInterface
$path = realpath($lpath); $path = realpath($lpath);
$this->verbose = $verbose; $this->verbose = $verbose;
if ($path !== false && StringUtils::startsWith($path, ROOT_PATH) === false) { if ($path === false) {
throw new PathException($lpath); throw new PathException($lpath);
} }
@ -266,7 +266,7 @@ class FileLogger implements LoggerInterface
$backtrace = json_encode($backtrace); $backtrace = json_encode($backtrace);
$replace['{backtrace}'] = str_replace(str_replace('\\', '\\\\', ROOT_PATH), '', $backtrace); $replace['{backtrace}'] = str_replace(str_replace('\\', '\\\\'), '', $backtrace);
$replace['{datetime}'] = sprintf('%--19s', (new \DateTime('NOW'))->format('Y-m-d H:i:s')); $replace['{datetime}'] = sprintf('%--19s', (new \DateTime('NOW'))->format('Y-m-d H:i:s'));
$replace['{level}'] = sprintf('%--12s', $level); $replace['{level}'] = sprintf('%--12s', $level);
$replace['{path}'] = $_SERVER['REQUEST_URI'] ?? 'REQUEST_URI'; $replace['{path}'] = $_SERVER['REQUEST_URI'] ?? 'REQUEST_URI';

6
UnhandledHandler.php
View File

@ -41,7 +41,7 @@ final class UnhandledHandler
*/ */
public static function exceptionHandler($e) /* : void */ public static function exceptionHandler($e) /* : void */
{ {
$logger = FileLogger::getInstance(ROOT_PATH . '/Logs'); $logger = FileLogger::getInstance(__DIR__ . '/../Logs');
$logger->critical(FileLogger::MSG_FULL, [ $logger->critical(FileLogger::MSG_FULL, [
'message' => $e->getMessage(), 'message' => $e->getMessage(),
'line' => $e->getLine(), 'line' => $e->getLine(),
@ -74,7 +74,7 @@ final class UnhandledHandler
return false; return false;
} }
$logger = FileLogger::getInstance(ROOT_PATH . '/Logs'); $logger = FileLogger::getInstance(__DIR__ . '/../Logs');
$logger->error(FileLogger::MSG_FULL, [ $logger->error(FileLogger::MSG_FULL, [
'message' => 'Unhandled error', 'message' => 'Unhandled error',
'line' => $errline, 'line' => $errline,
@ -116,7 +116,7 @@ final class UnhandledHandler
$e = error_get_last(); $e = error_get_last();
if (isset($e)) { if (isset($e)) {
$logger = FileLogger::getInstance(ROOT_PATH . '/Logs'); $logger = FileLogger::getInstance(__DIR__ . '/../Logs');
$logger->warning(FileLogger::MSG_FULL, [ $logger->warning(FileLogger::MSG_FULL, [
'message' => $e['message'], 'message' => $e['message'],
'line' => $e['line'], 'line' => $e['line'],