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

fix fix audit log creation

Browse Source
This commit is contained in:
Dennis Eichhorn 2020-07-31 15:38:20 +02:00
parent 7c3811e624
commit 45507970b9
9 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Module/ModuleAbstract.php
View File

@ -263,13 +263,13 @@ abstract class ModuleAbstract
protected function createModel(int $account, $obj, string $mapper, string $trigger, string $ip) : void protected function createModel(int $account, $obj, string $mapper, string $trigger, string $ip) : void
{ {
$this->app->eventManager->trigger('PRE:Module:' . static::MODULE_NAME . '-' . $trigger . '-create', '', $obj); $this->app->eventManager->trigger('PRE:Module:' . static::MODULE_NAME . '-' . $trigger . '-create', '', $obj);
$mapper::create($obj); $id = $mapper::create($obj);
$this->app->eventManager->trigger('POST:Module:' . static::MODULE_NAME . '-' . $trigger . '-create', '', [ $this->app->eventManager->trigger('POST:Module:' . static::MODULE_NAME . '-' . $trigger . '-create', '', [
$account, $account,
null, $obj, null, $obj,
StringUtils::intHash(\is_string($mapper) ? $mapper : \get_class($mapper)), 0, StringUtils::intHash(\is_string($mapper) ? $mapper : \get_class($mapper)), 0,
static::MODULE_NAME, static::MODULE_NAME,
(string) $obj->getId(), (string) $id,
'', '',
$ip, $ip,
]); ]);
@ -292,13 +292,13 @@ abstract class ModuleAbstract
{ {
foreach ($objs as $obj) { foreach ($objs as $obj) {
$this->app->eventManager->trigger('PRE:Module:' . static::MODULE_NAME . '-' . $trigger . '-create', '', $obj); $this->app->eventManager->trigger('PRE:Module:' . static::MODULE_NAME . '-' . $trigger . '-create', '', $obj);
$mapper::create($obj); $id = $mapper::create($obj);
$this->app->eventManager->trigger('POST:Module:' . static::MODULE_NAME . '-' . $trigger . '-create', '', [ $this->app->eventManager->trigger('POST:Module:' . static::MODULE_NAME . '-' . $trigger . '-create', '', [
$account, $account,
null, $obj, null, $obj,
StringUtils::intHash(\is_string($mapper) ? $mapper : \get_class($mapper)), 0, StringUtils::intHash(\is_string($mapper) ? $mapper : \get_class($mapper)), 0,
static::MODULE_NAME, static::MODULE_NAME,
(string) $obj->getId(), (string) $id,
'', '',
$ip, $ip,
]); ]);
@ -322,8 +322,9 @@ abstract class ModuleAbstract
protected function updateModel(int $account, $old, $new, $mapper, string $trigger, string $ip) : void protected function updateModel(int $account, $old, $new, $mapper, string $trigger, string $ip) : void
{ {
$this->app->eventManager->trigger('PRE:Module:' . static::MODULE_NAME . '-' . $trigger . '-update', '', $old); $this->app->eventManager->trigger('PRE:Module:' . static::MODULE_NAME . '-' . $trigger . '-update', '', $old);
$id = 0;
if (\is_string($mapper)) { if (\is_string($mapper)) {
$mapper::update($new); $id = $mapper::update($new);
} elseif ($mapper instanceof \Closure) { } elseif ($mapper instanceof \Closure) {
$mapper(); $mapper();
} }
@ -332,7 +333,7 @@ abstract class ModuleAbstract
$old, $new, $old, $new,
StringUtils::intHash(\is_string($mapper) ? $mapper : \get_class($mapper)), 0, StringUtils::intHash(\is_string($mapper) ? $mapper : \get_class($mapper)), 0,
static::MODULE_NAME, static::MODULE_NAME,
(string) $old->getId(), (string) $id,
'', '',
$ip, $ip,
]); ]);
@ -354,13 +355,13 @@ abstract class ModuleAbstract
protected function deleteModel(int $account, $obj, string $mapper, string $trigger, string $ip) : void protected function deleteModel(int $account, $obj, string $mapper, string $trigger, string $ip) : void
{ {
$this->app->eventManager->trigger('PRE:Module:' . static::MODULE_NAME . '-' . $trigger . '-delete', '', $obj); $this->app->eventManager->trigger('PRE:Module:' . static::MODULE_NAME . '-' . $trigger . '-delete', '', $obj);
$mapper::delete($obj); $id = $mapper::delete($obj);
$this->app->eventManager->trigger('POST:Module:' . static::MODULE_NAME . '-' . $trigger . '-delete', '', [ $this->app->eventManager->trigger('POST:Module:' . static::MODULE_NAME . '-' . $trigger . '-delete', '', [
$account, $account,
$obj, null, $obj, null,
StringUtils::intHash(\is_string($mapper) ? $mapper : \get_class($mapper)), 0, StringUtils::intHash(\is_string($mapper) ? $mapper : \get_class($mapper)), 0,
static::MODULE_NAME, static::MODULE_NAME,
(string) $obj->getId(), (string) $id,
'', '',
$ip, $ip,
]); ]);

4
tests/Module/PackageManagerTest.php
View File

@ -228,8 +228,8 @@ class PackageManagerTest extends \PHPUnit\Framework\TestCase
$package->extract(__DIR__ . '/testPackageExtracted'); $package->extract(__DIR__ . '/testPackageExtracted');
$package->cleanup(); $package->cleanup();
self::assertFileNotExists(__DIR__ . '/testPackage.zip'); self::assertFileDoesNotExist(__DIR__ . '/testPackage.zip');
self::assertFileNotExists(__DIR__ . '/testPackageExtracted'); self::assertFileDoesNotExist(__DIR__ . '/testPackageExtracted');
} }
public static function tearDownAfterClass() : void public static function tearDownAfterClass() : void

1
tests/Uri/UriFactoryTest.php
View File

@ -220,7 +220,6 @@ class UriFactoryTest extends \PHPUnit\Framework\TestCase
$escaped = '{/base}{/rootPath}{/}?id=\{\?id\}&ab={?ab}#{#}'; $escaped = '{/base}{/rootPath}{/}?id=\{\?id\}&ab={?ab}#{#}';
$unescaped = 'http://www.test-uri.com/path/here?id={?id}&ab=c#fragi'; $unescaped = 'http://www.test-uri.com/path/here?id={?id}&ab=c#fragi';
var_dump('TEST:');
UriFactory::setupUriBuilder(new HttpUri($uri)); UriFactory::setupUriBuilder(new HttpUri($uri));
self::assertEquals($unescaped, UriFactory::build($escaped)); self::assertEquals($unescaped, UriFactory::build($escaped));

2
tests/Utils/IO/Zip/GzTest.php
View File

@ -40,7 +40,7 @@ class GzTest extends \PHPUnit\Framework\TestCase
$a = \file_get_contents(__DIR__ . '/test a.txt'); $a = \file_get_contents(__DIR__ . '/test a.txt');
\unlink(__DIR__ . '/test a.txt'); \unlink(__DIR__ . '/test a.txt');
self::assertFileNotExists(__DIR__ . '/test a.txt'); self::assertFileDoesNotExist(__DIR__ . '/test a.txt');
self::assertTrue(Gz::unpack(__DIR__ . '/test.gz', __DIR__ . '/test a.txt')); self::assertTrue(Gz::unpack(__DIR__ . '/test.gz', __DIR__ . '/test a.txt'));
self::assertFileExists(__DIR__ . '/test a.txt'); self::assertFileExists(__DIR__ . '/test a.txt');

4
tests/Utils/Parser/Markdown/MarkdownTest.php
View File

@ -30,9 +30,9 @@ class MarkdownTest extends \PHPUnit\Framework\TestCase
$data = \explode('.', $file); $data = \explode('.', $file);
if ($data[1] === 'md' if ($data[1] === 'md'
&& (\file_get_contents(__DIR__ . '/data/' . $data[0] . '.html') !== Markdown::parse(\file_get_contents(__DIR__ . '/data/' . $data[0] . '.md'))) && (\file_get_contents(__DIR__ . '/data/' . $data[0] . '.html') !== ($parsed = Markdown::parse(\file_get_contents(__DIR__ . '/data/' . $data[0] . '.md'))))
) { ) {
self::assertTrue(false, $file); self::assertTrue(false, $file . "\n\n" . $parsed);
} }
} }

4
tests/Utils/Parser/Markdown/data/xss_bad_url.html
View File

@ -1,11 +1,11 @@
<p><a href="javascript%3Aalert(1)">xss</a></p> <p><a href="javascript%3Aalert(1)">xss</a></p>
<p><a href="javascript%3Aalert(1)">xss</a></p> <p><a href="javascript%3Aalert(1)">xss</a></p>
<p><a href="javascript%3A//alert(1)">xss</a></p> <p><a href="javascript%3A//alert(1)">xss</a></p>
<p><a href="javascript">xss</a></p> <p><a href="javascript&amp;colon;alert(1)">xss</a></p>
<p><img src="javascript%3Aalert(1)" alt="xss" /></p> <p><img src="javascript%3Aalert(1)" alt="xss" /></p>
<p><img src="javascript%3Aalert(1)" alt="xss" /></p> <p><img src="javascript%3Aalert(1)" alt="xss" /></p>
<p><img src="javascript%3A//alert(1)" alt="xss" /></p> <p><img src="javascript%3A//alert(1)" alt="xss" /></p>
<p><img src="javascript" alt="xss" /></p> <p><img src="javascript&amp;colon;alert(1)" alt="xss" /></p>
<p><a href="data%3Atext/html;base64,PHNjcmlwdD5hbGVydCgxKTwvc2NyaXB0Pg==">xss</a></p> <p><a href="data%3Atext/html;base64,PHNjcmlwdD5hbGVydCgxKTwvc2NyaXB0Pg==">xss</a></p>
<p><a href="data%3Atext/html;base64,PHNjcmlwdD5hbGVydCgxKTwvc2NyaXB0Pg==">xss</a></p> <p><a href="data%3Atext/html;base64,PHNjcmlwdD5hbGVydCgxKTwvc2NyaXB0Pg==">xss</a></p>
<p><a href="data%3A//text/html;base64,PHNjcmlwdD5hbGVydCgxKTwvc2NyaXB0Pg==">xss</a></p> <p><a href="data%3A//text/html;base64,PHNjcmlwdD5hbGVydCgxKTwvc2NyaXB0Pg==">xss</a></p>

2
tests/Utils/RnG/FileTest.php
View File

@ -30,6 +30,6 @@ class FileTest extends \PHPUnit\Framework\TestCase
*/ */
public function testRnGExtension() : void public function testRnGExtension() : void
{ {
self::assertRegExp('/^[a-z0-9]{1,5}$/', File::generateExtension()); self::assertMatchesRegularExpression('/^[a-z0-9]{1,5}$/', File::generateExtension());
} }
} }

2
tests/Utils/RnG/PhoneTest.php
View File

@ -30,6 +30,6 @@ class PhoneTest extends \PHPUnit\Framework\TestCase
*/ */
public function testRnG() : void public function testRnG() : void
{ {
self::assertRegExp('/^\+\d{1,2} \(\d{3,4}\) \d{3,5}\-\d{3,8}$/', Phone::generatePhone()); self::assertMatchesRegularExpression('/^\+\d{1,2} \(\d{3,4}\) \d{3,5}\-\d{3,8}$/', Phone::generatePhone());
} }
} }

2
tests/Utils/StringUtilsTest.php
View File

@ -111,7 +111,7 @@ class StringUtilsTest extends \PHPUnit\Framework\TestCase
*/ */
public function testDifferentHash() : void public function testDifferentHash() : void
{ {
self::assertEquals(StringUtils::intHash('test1'), StringUtils::intHash('test2')); self::assertNotEquals(StringUtils::intHash('test1'), StringUtils::intHash('test2'));
} }
/** /**