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

fix bugs

Browse Source
This commit is contained in:
Dennis Eichhorn 2024-04-12 00:52:09 +00:00
parent f991f15889
commit 1d49ceb5a0
7 changed files with 16 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
DataStorage/Database/Mapper/ReadMapper.php
View File

@ -381,16 +381,6 @@ final class ReadMapper extends DataMapperAbstract
$query ??= $this->getQuery(); $query ??= $this->getQuery();
try { try {
/*
\phpOMS\Log\FileLogger::getInstance()->info(
\phpOMS\Log\FileLogger::MSG_FULL, [
'message' => $query->toSql(),
'line' => __LINE__,
'file' => self::class,
]
);
*/
$sth = $this->db->con->prepare($query->toSql()); $sth = $this->db->con->prepare($query->toSql());
if ($sth === false) { if ($sth === false) {
yield []; yield [];

5
DataStorage/Session/HttpSession.php
View File

@ -14,7 +14,6 @@ declare(strict_types=1);
namespace phpOMS\DataStorage\Session; namespace phpOMS\DataStorage\Session;
use phpOMS\Log\FileLogger;
use phpOMS\Message\RequestAbstract; use phpOMS\Message\RequestAbstract;
use phpOMS\Session\JWT; use phpOMS\Session\JWT;
use phpOMS\Uri\UriFactory; use phpOMS\Uri\UriFactory;
@ -106,8 +105,8 @@ final class HttpSession implements SessionInterface
\session_start(); \session_start();
// @codeCoverageIgnoreEnd // @codeCoverageIgnoreEnd
} else { } else {
FileLogger::getInstance()->warning( \phpOMS\Log\FileLogger::getInstance()->warning(
FileLogger::MSG_FULL, [ \phpOMS\Log\FileLogger::MSG_FULL, [
'message' => 'Headers already sent.', 'message' => 'Headers already sent.',
'line' => __LINE__, 'line' => __LINE__,
'file' => self::class, 'file' => self::class,

3
Localization/L11nManager.php
View File

@ -15,7 +15,6 @@ declare(strict_types=1);
namespace phpOMS\Localization; namespace phpOMS\Localization;
use phpOMS\Autoloader; use phpOMS\Autoloader;
use phpOMS\Log\FileLogger;
use phpOMS\Module\ModuleAbstract; use phpOMS\Module\ModuleAbstract;
use phpOMS\Stdlib\Base\FloatInt; use phpOMS\Stdlib\Base\FloatInt;
@ -176,7 +175,7 @@ final class L11nManager
$this->loadLanguage($code, $module, $class::getLocalization($code, $theme)); $this->loadLanguage($code, $module, $class::getLocalization($code, $theme));
} catch (\Throwable $_) { } catch (\Throwable $_) {
// @codeCoverageIgnoreStart // @codeCoverageIgnoreStart
FileLogger::getInstance()->warning(FileLogger::MSG_FULL, [ \phpOMS\Log\FileLogger::getInstance()->warning(\phpOMS\Log\FileLogger::MSG_FULL, [
'message' => 'Undefined translation for \'' . $code . '/' . $module . '/' . $translation . '\'.', 'message' => 'Undefined translation for \'' . $code . '/' . $module . '/' . $translation . '\'.',
]); ]);
// @codeCoverageIgnoreEnd // @codeCoverageIgnoreEnd

5
Message/Cli/CliResponse.php
View File

@ -16,7 +16,6 @@ namespace phpOMS\Message\Cli;
use phpOMS\Contract\RenderableInterface; use phpOMS\Contract\RenderableInterface;
use phpOMS\Localization\Localization; use phpOMS\Localization\Localization;
use phpOMS\Log\FileLogger;
use phpOMS\Message\Http\RequestStatusCode; use phpOMS\Message\Http\RequestStatusCode;
use phpOMS\Message\ResponseAbstract; use phpOMS\Message\ResponseAbstract;
use phpOMS\System\MimeType; use phpOMS\System\MimeType;
@ -158,9 +157,9 @@ final class CliResponse extends ResponseAbstract implements RenderableInterface
} elseif ($response === null) { } elseif ($response === null) {
continue; continue;
} else { } else {
FileLogger::getInstance() \phpOMS\Log\FileLogger::getInstance()
->error( ->error(
FileLogger::MSG_FULL, [ \phpOMS\Log\FileLogger::MSG_FULL, [
'message' => 'Unknown type.', 'message' => 'Unknown type.',
'line' => __LINE__, 'line' => __LINE__,
'file' => self::class, 'file' => self::class,

5
Message/Http/HttpResponse.php
View File

@ -16,7 +16,6 @@ namespace phpOMS\Message\Http;
use phpOMS\Contract\RenderableInterface; use phpOMS\Contract\RenderableInterface;
use phpOMS\Localization\Localization; use phpOMS\Localization\Localization;
use phpOMS\Log\FileLogger;
use phpOMS\Message\ResponseAbstract; use phpOMS\Message\ResponseAbstract;
use phpOMS\System\MimeType; use phpOMS\System\MimeType;
use phpOMS\Utils\ArrayUtils; use phpOMS\Utils\ArrayUtils;
@ -190,9 +189,9 @@ final class HttpResponse extends ResponseAbstract implements RenderableInterface
} elseif ($response === null) { } elseif ($response === null) {
continue; continue;
} else { } else {
FileLogger::getInstance() \phpOMS\Log\FileLogger::getInstance()
->error( ->error(
FileLogger::MSG_FULL, [ \phpOMS\Log\FileLogger::MSG_FULL, [
'message' => 'Unknown type.', 'message' => 'Unknown type.',
'line' => __LINE__, 'line' => __LINE__,
'file' => self::class, 'file' => self::class,

6
Module/NullModule.php
View File

@ -14,8 +14,6 @@ declare(strict_types=1);
namespace phpOMS\Module; namespace phpOMS\Module;
use phpOMS\Log\FileLogger;
/** /**
* Mull module class. * Mull module class.
* *
@ -35,9 +33,9 @@ final class NullModule extends ModuleAbstract
/** {@inheritdoc} */ /** {@inheritdoc} */
public static function __callStatic(string $name, array $arguments) : void public static function __callStatic(string $name, array $arguments) : void
{ {
FileLogger::getInstance() \phpOMS\Log\FileLogger::getInstance()
->error( ->error(
FileLogger::MSG_FULL, [ \phpOMS\Log\FileLogger::MSG_FULL, [
'message' => 'Expected module/controller but got NullModule.', 'message' => 'Expected module/controller but got NullModule.',
'line' => __LINE__, 'line' => __LINE__,
'file' => self::class, 'file' => self::class,

14
Utils/Parser/Markdown/Markdown.php
View File

@ -729,7 +729,7 @@ class Markdown
return null; return null;
} }
$url = UriFactory::build($matches[1]); $url = UriFactory::build(\str_replace('{$CSRF}', 'ERROR', $matches[1]));
if (!isset($matches[2])) { if (!isset($matches[2])) {
$url = "mailto:{$url}"; $url = "mailto:{$url}";
@ -943,7 +943,7 @@ class Markdown
return null; return null;
} }
$url = UriFactory::build($matches[0][0]); $url = UriFactory::build(\str_replace('{$CSRF}', 'ERROR', $matches[0][0]));
return [ return [
'extent' => \strlen($matches[0][0]), 'extent' => \strlen($matches[0][0]),
@ -976,7 +976,7 @@ class Markdown
return null; return null;
} }
$url = UriFactory::build($matches[1]); $url = UriFactory::build(\str_replace('{$CSRF}', 'ERROR', $matches[1]));
return [ return [
'extent' => \strlen($matches[0]), 'extent' => \strlen($matches[0]),
@ -1390,7 +1390,7 @@ class Markdown
default: default:
$element = 'video'; $element = 'video';
$attributes = [ $attributes = [
'src' => UriFactory::build($url), 'src' => UriFactory::build(\str_replace('{$CSRF}', 'ERROR', $url)),
'controls' => '', 'controls' => '',
]; ];
} }
@ -1410,7 +1410,7 @@ class Markdown
'name' => 'audio', 'name' => 'audio',
'text' => $matches[1], 'text' => $matches[1],
'attributes' => [ 'attributes' => [
'src' => UriFactory::build($url), 'src' => UriFactory::build(\str_replace('{$CSRF}', 'ERROR', $url)),
'controls' => '', 'controls' => '',
], ],
], ],
@ -2310,7 +2310,7 @@ class Markdown
$id = \strtolower($matches[1]); $id = \strtolower($matches[1]);
$this->definitionData['Reference'][$id] = [ $this->definitionData['Reference'][$id] = [
'url' => UriFactory::build($matches[2]), 'url' => UriFactory::build(\str_replace('{$CSRF}', 'ERROR', $matches[2])),
'title' => isset($matches[3]) ? $matches[3] : null, 'title' => isset($matches[3]) ? $matches[3] : null,
]; ];
@ -4394,7 +4394,7 @@ class Markdown
} }
if (\preg_match('/^[(]\s*+((?:[^ ()]++|[(][^ )]+[)])++)(?:[ ]+("[^"]*+"|\'[^\']*+\'))?\s*+[)]/', $remainder, $matches)) { if (\preg_match('/^[(]\s*+((?:[^ ()]++|[(][^ )]+[)])++)(?:[ ]+("[^"]*+"|\'[^\']*+\'))?\s*+[)]/', $remainder, $matches)) {
$element['attributes']['href'] = UriFactory::build($matches[1]); $element['attributes']['href'] = UriFactory::build(\str_replace('{$CSRF}', 'ERROR', $matches[1]));
if (isset($matches[2])) { if (isset($matches[2])) {
$element['attributes']['title'] = \substr($matches[2], 1, - 1); $element['attributes']['title'] = \substr($matches[2], 1, - 1);