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

More ROOT_PATH fixes

Browse Source
This commit is contained in:
Dennis Eichhorn 2017-04-03 22:47:32 +02:00
parent 04bef943b2
commit 430557d2a5
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Log/FileLogger.php
View File

@ -108,10 +108,6 @@ class FileLogger implements LoggerInterface
$path = realpath($lpath); $path = realpath($lpath);
$this->verbose = $verbose; $this->verbose = $verbose;
if ($path === false) {
throw new PathException($lpath);
}
if (is_dir($lpath) || strpos($lpath, '.') === false) { if (is_dir($lpath) || strpos($lpath, '.') === false) {
$path = $path . '/' . date('Y-m-d') . '.log'; $path = $path . '/' . date('Y-m-d') . '.log';
} else { } else {
@ -266,7 +262,7 @@ class FileLogger implements LoggerInterface
$backtrace = json_encode($backtrace); $backtrace = json_encode($backtrace);
$replace['{backtrace}'] = str_replace(str_replace('\\', '\\\\'), '', $backtrace); $replace['{backtrace}'] = $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';

2
Module/ActivateAbstract.php
View File

@ -47,7 +47,7 @@ class ActivateAbstract
*/ */
public static function activate(DatabasePool $dbPool, InfoManager $info) /* : void */ public static function activate(DatabasePool $dbPool, InfoManager $info) /* : void */
{ {
self::activateRoutes(ROOT_PATH . '/Web/Routes.php', ROOT_PATH . '/Modules/' . $info->getDirectory() . '/Admin/Routes/http.php'); self::activateRoutes(__DIR__ . '/../../Web/Routes.php', __DIR__ . '/../../Modules/' . $info->getDirectory() . '/Admin/Routes/http.php');
self::activateInDatabase($dbPool, $info); self::activateInDatabase($dbPool, $info);
} }

2
Module/DeactivateAbstract.php
View File

@ -47,7 +47,7 @@ class DeactivateAbstract
*/ */
public static function deactivate(DatabasePool $dbPool, InfoManager $info) /* : void */ public static function deactivate(DatabasePool $dbPool, InfoManager $info) /* : void */
{ {
self::deactivateRoutes(ROOT_PATH . '/Web/Routes.php', ROOT_PATH . '/Modules/' . $info->getDirectory() . '/Admin/Routes/http.php'); self::deactivateRoutes(__DIR__ . '/../../Web/Routes.php', __DIR__ . '/../../Modules/' . $info->getDirectory() . '/Admin/Routes/http.php');
self::deactivateInDatabase($dbPool, $info); self::deactivateInDatabase($dbPool, $info);
} }