diff --git a/CHANGELOG.md b/CHANGELOG.md index db0936738..229409646 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,64 @@ # Change-Log -- ＋ New +- ＋ Added - ✓ Fixed - Δ Changed - − Removed +## [Next] + +- [Full commit-log](https://github.com/Schlaefer/Saito/compare/5.6.0...) +- [Download release-zip](https://github.com/Schlaefer/Saito/releases/download//saito-release-master-.zip) + +### Changes + +### Update Notes + +## [5.6.0] + +- [Full commit-log](https://github.com/Schlaefer/Saito/compare/5.5.0...5.6.0) +- [Download release-zip](https://github.com/Schlaefer/Saito/releases/download//saito-release-master-5.6.0.zip) + +### Changes + +- ＋ Adds permission `saito.core.posting.solves.set` for marking a posting as solution/helpful (defaults to thread creator). +- ＋ Improves compatibility with PHP 7.3 +- ＋ Improves browser detection for changes in the Bota theme CSS +- ＋ Improves logging of unauthorized access +- ✓ Deleting a bookmark creates an empty area above the bookmarks +- ✓ User roles with ID greater than 3 can't be assigned to category access control +- ✓ Fixes link to default favicon if installed in subdirectory +- Δ Adds "Saito" prefix to CSRF-cookie name +- Δ Moves layout for viewing a posting and answering from center to the left +- Δ Updates Saito default favicon +- − Removes visiblity description for category in category-title hover +- Search: + - ✓ Internal error on simple search when results are sorted by rank + - ✓ Internal error if search term contains multiple whitespaces +- Improves dark theme: + - ✓ Drop down menus aren't styled + - ✓ Code inserts aren't styled + - Δ Exchanges dark and light distinction between background and form areas + - Δ Darkens border and dividiers +- Uploader: + - ＋ Adds filter options + - ＋ Performance improvements for users with many (100+) uploads + - ＋ Adds permission `saito.plugin.uploader.view` for viewing uploads (defaults to upload owner and group `admin`). + - ＋ Adds permission `saito.plugin.uploader.add` for uploading new files (defaults to profile owner). + - ＋ Adds permission `saito.plugin.uploader.delete` for deleting uploads (defaults to upload owner and group `admin`). + - ＋ Adds "audio/ogg" and "audio/opus" to default allowed mime-types + - ✓ Wrong error message is shown if no file was received on the server + - Δ Layout improvements +- Internal code changes: + - ＋ Minor changes for improved theming support + - Δ Refactors creation, update and validation of postings + - Δ Updates PHP and Javascript libraries + - Δ Entries::Table throws RecordNotFoundException instead of returning null + - Δ Update Apcu version in docker container to 5.1.18 + - Δ Drafts for new threads are stored with a `pid` of `0` instead of `NULL` + - − Removes SaitoValidationProvider::validateAssoc with CakePHP build-in facility + - − Removes abandonded Selenium test files + ## [5.5.0] - 2019-11-16 - [Full commit-log](https://github.com/Schlaefer/Saito/compare/5.4.1...5.5.0) diff --git a/build.xml b/build.xml index 6741aa68d..310e966a6 100644 --- a/build.xml +++ b/build.xml @@ -21,6 +21,7 @@ + diff --git a/composer.json b/composer.json index aee46a4f7..7239c771d 100644 --- a/composer.json +++ b/composer.json @@ -11,6 +11,9 @@ "forum": "http://saito.siezi.com/forum/" } }, + "config": { + "discard-changes": true + }, "require": { "php": ">=7.2", "cakephp/cakephp": "3.8.*", @@ -25,7 +28,7 @@ "markstory/geshi": "^3", "siezi/cakephp-simple-captcha": "*", "yzalis/identicon": "*", - "league/commonmark": "^0.17.5", + "league/commonmark": "^1.0", "suin/php-rss-writer": "^1.6", "friendsofcake/bootstrap-ui": "dev-develop", "friendsofcake/search": "^4.4", @@ -97,10 +100,10 @@ "post-create-project-cmd": "App\\Console\\Installer::postInstall", "post-autoload-dump": "Cake\\Composer\\Installer\\PluginInstaller::postAutoloadDump", - "cs-check": "phpcs --runtime-set ignore_warnings_on_exit true", - "cs-fix": "phpcbf > /dev/null || true", - "php-check": ["@phpstan", "@cs-fix", "@cs-check"], - "phpstan": "vendor/bin/phpstan analyse --ansi", + "cs-check": "unset XDEBUG_CONFIG; phpcs --runtime-set ignore_warnings_on_exit true", + "cs-fix": "unset XDEBUG_CONFIG; phpcbf > /dev/null || true", + "check": ["@cs-fix", "@cs-check"], + "phpstan": "unset XDEBUG_CONFIG; vendor/bin/phpstan analyse --ansi", "coverage": [ "Composer\\Config::disableProcessTimeout", "unset XDEBUG_CONFIG; composer phpunit -- --coverage-html docs/local/" @@ -111,12 +114,12 @@ ], "phpunit": [ "Composer\\Config::disableProcessTimeout", - "phpunit --colors=always" + "unset XDEBUG_CONFIG; phpunit --colors=always" ], "test": [ - "unset XDEBUG_CONFIG", "@phpunit", - "@php-check" + "@phpstan", + "@check" ], "js-all": "yarn run test", diff --git a/composer.lock b/composer.lock index 2194566d1..6bf8c740a 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "99f1b718749b0447db98a4a4a2414566", + "content-hash": "4e308c870760d041f92d42302def387c", "packages": [ { "name": "aura/di", @@ -107,21 +107,21 @@ }, { "name": "cakephp/authentication", - "version": "1.2.1", + "version": "1.4.0", "source": { "type": "git", "url": "https://github.com/cakephp/authentication.git", - "reference": "98dce91a4440f2d3930b200537e3e91eb9bcf149" + "reference": "007d62a91d85556b590187660084286df570daa4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/authentication/zipball/98dce91a4440f2d3930b200537e3e91eb9bcf149", - "reference": "98dce91a4440f2d3930b200537e3e91eb9bcf149", + "url": "https://api.github.com/repos/cakephp/authentication/zipball/007d62a91d85556b590187660084286df570daa4", + "reference": "007d62a91d85556b590187660084286df570daa4", "shasum": "" }, "require": { "cakephp/core": "^3.7", - "psr/http-message": "~1.0", + "psr/http-message": "^1.0", "zendframework/zend-diactoros": "^1.4.0" }, "require-dev": { @@ -131,7 +131,7 @@ "phpunit/phpunit": "^5.7.14|^6.0" }, "suggest": { - "cakephp/cakephp": "Install version >=3.5.0 to use \"CookieAuthenticator\".", + "cakephp/cakephp": "Install full core to use \"CookieAuthenticator\".", "cakephp/orm": "To use \"OrmResolver\" (Not needed separately if using full CakePHP framework).", "cakephp/utility": "Provides CakePHP security methods. Required for the JWT adapter and Legacy password hasher.", "ext-ldap": "Make sure this php extension is installed and enabled on your system if you want to use the built-in LDAP adapter for \"LdapIdentifier\".", @@ -161,20 +161,20 @@ "cakephp", "middleware" ], - "time": "2019-09-22T15:25:23+00:00" + "time": "2019-11-09T10:51:04+00:00" }, { "name": "cakephp/cakephp", - "version": "3.8.5", + "version": "3.8.6", "source": { "type": "git", "url": "https://github.com/cakephp/cakephp.git", - "reference": "ea64434740f0d2a53438f95a3de414de63a11101" + "reference": "34833a0c02fc1fc21e27ceb69cf7b4f7c131a3cc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/cakephp/zipball/ea64434740f0d2a53438f95a3de414de63a11101", - "reference": "ea64434740f0d2a53438f95a3de414de63a11101", + "url": "https://api.github.com/repos/cakephp/cakephp/zipball/34833a0c02fc1fc21e27ceb69cf7b4f7c131a3cc", + "reference": "34833a0c02fc1fc21e27ceb69cf7b4f7c131a3cc", "shasum": "" }, "require": { @@ -250,7 +250,7 @@ "rapid-development", "validation" ], - "time": "2019-10-07T00:51:50+00:00" + "time": "2019-11-07T01:11:43+00:00" }, { "name": "cakephp/chronos", @@ -311,16 +311,16 @@ }, { "name": "cakephp/migrations", - "version": "2.3.0", + "version": "2.4.0", "source": { "type": "git", "url": "https://github.com/cakephp/migrations.git", - "reference": "3d1750bb218958b4c48fea1365c619bedea62d69" + "reference": "643e54e627e876c10b5ffa1c706a6819aa6a70b9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/migrations/zipball/3d1750bb218958b4c48fea1365c619bedea62d69", - "reference": "3d1750bb218958b4c48fea1365c619bedea62d69", + "url": "https://api.github.com/repos/cakephp/migrations/zipball/643e54e627e876c10b5ffa1c706a6819aa6a70b9", + "reference": "643e54e627e876c10b5ffa1c706a6819aa6a70b9", "shasum": "" }, "require": { @@ -360,7 +360,7 @@ "cakephp", "migrations" ], - "time": "2019-10-07T22:04:21+00:00" + "time": "2019-11-10T15:12:59+00:00" }, { "name": "cakephp/plugin-installer", @@ -762,16 +762,16 @@ "source": { "type": "git", "url": "https://github.com/GeSHi/geshi-1.0.git", - "reference": "5861c58981244ab6ee0dd337f096ff14bf15b1eb" + "reference": "fd22ab78481bf90337862b590e6f7517863926b8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/GeSHi/geshi-1.0/zipball/5861c58981244ab6ee0dd337f096ff14bf15b1eb", - "reference": "5861c58981244ab6ee0dd337f096ff14bf15b1eb", + "url": "https://api.github.com/repos/GeSHi/geshi-1.0/zipball/fd22ab78481bf90337862b590e6f7517863926b8", + "reference": "fd22ab78481bf90337862b590e6f7517863926b8", "shasum": "" }, "require-dev": { - "phpunit/phpunit": "^5.7" + "phpunit/phpunit": "^5.7 || ^6.5 || ^7.5 || ^8.2" }, "type": "library", "autoload": { @@ -794,7 +794,7 @@ ], "description": "Generic Syntax Highlighter", "homepage": "http://qbnz.com/highlighter/", - "time": "2018-10-01T23:49:06+00:00" + "time": "2019-10-20T20:54:46+00:00" }, { "name": "guzzlehttp/psr7", @@ -869,16 +869,16 @@ }, { "name": "intervention/image", - "version": "2.5.0", + "version": "2.5.1", "source": { "type": "git", "url": "https://github.com/Intervention/image.git", - "reference": "39eaef720d082ecc54c64bf54541c55f10db546d" + "reference": "abbf18d5ab8367f96b3205ca3c89fb2fa598c69e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Intervention/image/zipball/39eaef720d082ecc54c64bf54541c55f10db546d", - "reference": "39eaef720d082ecc54c64bf54541c55f10db546d", + "url": "https://api.github.com/repos/Intervention/image/zipball/abbf18d5ab8367f96b3205ca3c89fb2fa598c69e", + "reference": "abbf18d5ab8367f96b3205ca3c89fb2fa598c69e", "shasum": "" }, "require": { @@ -935,7 +935,7 @@ "thumbnail", "watermark" ], - "time": "2019-06-24T14:06:31+00:00" + "time": "2019-11-02T09:15:47+00:00" }, { "name": "jbbcode/jbbcode", @@ -1239,34 +1239,36 @@ }, { "name": "league/commonmark", - "version": "0.17.5", + "version": "1.1.1", "source": { "type": "git", "url": "https://github.com/thephpleague/commonmark.git", - "reference": "82d7ab62d7f68391cb9d323f3ccce50be24a5369" + "reference": "d74654d85954e3b9451d67faaebacd210fc70252" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/82d7ab62d7f68391cb9d323f3ccce50be24a5369", - "reference": "82d7ab62d7f68391cb9d323f3ccce50be24a5369", + "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/d74654d85954e3b9451d67faaebacd210fc70252", + "reference": "d74654d85954e3b9451d67faaebacd210fc70252", "shasum": "" }, "require": { "ext-mbstring": "*", - "php": ">=5.6.5" + "php": "^7.1" }, "replace": { "colinodell/commonmark-php": "*" }, "require-dev": { "cebe/markdown": "~1.0", - "commonmark/commonmark.js": "0.28", + "commonmark/commonmark.js": "0.29.0", "erusev/parsedown": "~1.0", + "ext-json": "*", "michelf/php-markdown": "~1.4", - "mikehaertl/php-shellcommand": "^1.2", - "phpunit/phpunit": "^5.7|^6.5", - "scrutinizer/ocular": "^1.1", - "symfony/finder": "^3.0|^4.0" + "mikehaertl/php-shellcommand": "^1.4", + "phpstan/phpstan-shim": "^0.11.5", + "phpunit/phpunit": "^7.5", + "scrutinizer/ocular": "^1.5", + "symfony/finder": "^4.2" }, "suggest": { "league/commonmark-extras": "Library of useful extensions including smart punctuation" @@ -1277,12 +1279,12 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "0.18-dev" + "dev-master": "1.2-dev" } }, "autoload": { "psr-4": { - "League\\CommonMark\\": "src/" + "League\\CommonMark\\": "src" } }, "notification-url": "https://packagist.org/downloads/", @@ -1297,14 +1299,14 @@ "role": "Lead Developer" } ], - "description": "Markdown parser for PHP based on the CommonMark spec", - "homepage": "https://github.com/thephpleague/commonmark", + "description": "PHP Markdown parser based on the CommonMark spec", + "homepage": "https://commonmark.thephpleague.com", "keywords": [ "commonmark", "markdown", "parser" ], - "time": "2018-03-29T14:35:19+00:00" + "time": "2019-11-11T22:23:29+00:00" }, { "name": "m1/env", @@ -1566,16 +1568,16 @@ }, { "name": "psr/log", - "version": "1.1.0", + "version": "1.1.2", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd" + "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd", - "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd", + "url": "https://api.github.com/repos/php-fig/log/zipball/446d54b4cb6bf489fc9d75f55843658e6f25d801", + "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801", "shasum": "" }, "require": { @@ -1584,7 +1586,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.1.x-dev" } }, "autoload": { @@ -1609,7 +1611,7 @@ "psr", "psr-3" ], - "time": "2018-11-20T15:27:04+00:00" + "time": "2019-11-01T11:05:21+00:00" }, { "name": "psr/simple-cache", @@ -1868,16 +1870,16 @@ }, { "name": "symfony/config", - "version": "v4.3.5", + "version": "v4.3.8", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "0acb26407a9e1a64a275142f0ae5e36436342720" + "reference": "8267214841c44d315a55242ea867684eb43c42ce" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/0acb26407a9e1a64a275142f0ae5e36436342720", - "reference": "0acb26407a9e1a64a275142f0ae5e36436342720", + "url": "https://api.github.com/repos/symfony/config/zipball/8267214841c44d315a55242ea867684eb43c42ce", + "reference": "8267214841c44d315a55242ea867684eb43c42ce", "shasum": "" }, "require": { @@ -1928,20 +1930,20 @@ ], "description": "Symfony Config Component", "homepage": "https://symfony.com", - "time": "2019-09-19T15:51:53+00:00" + "time": "2019-11-08T08:31:27+00:00" }, { "name": "symfony/console", - "version": "v4.3.5", + "version": "v4.3.8", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "929ddf360d401b958f611d44e726094ab46a7369" + "reference": "831424efae0a1fe6642784bd52aae14ece6538e6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/929ddf360d401b958f611d44e726094ab46a7369", - "reference": "929ddf360d401b958f611d44e726094ab46a7369", + "url": "https://api.github.com/repos/symfony/console/zipball/831424efae0a1fe6642784bd52aae14ece6538e6", + "reference": "831424efae0a1fe6642784bd52aae14ece6538e6", "shasum": "" }, "require": { @@ -2003,11 +2005,11 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2019-10-07T12:36:49+00:00" + "time": "2019-11-13T07:29:07+00:00" }, { "name": "symfony/filesystem", - "version": "v4.3.5", + "version": "v4.3.8", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", @@ -2349,16 +2351,16 @@ }, { "name": "symfony/service-contracts", - "version": "v1.1.7", + "version": "v1.1.8", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "ffcde9615dc5bb4825b9f6aed07716f1f57faae0" + "reference": "ffc7f5692092df31515df2a5ecf3b7302b3ddacf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/ffcde9615dc5bb4825b9f6aed07716f1f57faae0", - "reference": "ffcde9615dc5bb4825b9f6aed07716f1f57faae0", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/ffc7f5692092df31515df2a5ecf3b7302b3ddacf", + "reference": "ffc7f5692092df31515df2a5ecf3b7302b3ddacf", "shasum": "" }, "require": { @@ -2403,20 +2405,20 @@ "interoperability", "standards" ], - "time": "2019-09-17T11:12:18+00:00" + "time": "2019-10-14T12:27:06+00:00" }, { "name": "symfony/yaml", - "version": "v4.3.5", + "version": "v4.3.8", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "41e16350a2a1c7383c4735aa2f9fce74cf3d1178" + "reference": "324cf4b19c345465fad14f3602050519e09e361d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/41e16350a2a1c7383c4735aa2f9fce74cf3d1178", - "reference": "41e16350a2a1c7383c4735aa2f9fce74cf3d1178", + "url": "https://api.github.com/repos/symfony/yaml/zipball/324cf4b19c345465fad14f3602050519e09e361d", + "reference": "324cf4b19c345465fad14f3602050519e09e361d", "shasum": "" }, "require": { @@ -2462,7 +2464,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2019-09-11T15:41:19+00:00" + "time": "2019-10-30T12:58:49+00:00" }, { "name": "yzalis/identicon", @@ -2846,16 +2848,16 @@ }, { "name": "cakephp/debug_kit", - "version": "3.20.3", + "version": "3.21.0", "source": { "type": "git", "url": "https://github.com/cakephp/debug_kit.git", - "reference": "2ebc6b61fdb4741e890c564ab4d55a9b1d29c47f" + "reference": "74c289cbd9ee07a531ce813dec744c9f2f472e14" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/debug_kit/zipball/2ebc6b61fdb4741e890c564ab4d55a9b1d29c47f", - "reference": "2ebc6b61fdb4741e890c564ab4d55a9b1d29c47f", + "url": "https://api.github.com/repos/cakephp/debug_kit/zipball/74c289cbd9ee07a531ce813dec744c9f2f472e14", + "reference": "74c289cbd9ee07a531ce813dec744c9f2f472e14", "shasum": "" }, "require": { @@ -2876,8 +2878,8 @@ "type": "cakephp-plugin", "autoload": { "psr-4": { - "DebugKit\\": "src", - "DebugKit\\Test\\Fixture\\": "tests\\Fixture" + "DebugKit\\": "src/", + "DebugKit\\Test\\Fixture\\": "tests/Fixture/" } }, "notification-url": "https://packagist.org/downloads/", @@ -2887,7 +2889,7 @@ "authors": [ { "name": "Mark Story", - "homepage": "http://mark-story.com", + "homepage": "https://mark-story.com", "role": "Author" }, { @@ -2902,20 +2904,20 @@ "debug", "kit" ], - "time": "2019-10-09T01:55:34+00:00" + "time": "2019-11-10T02:41:02+00:00" }, { "name": "composer/composer", - "version": "1.9.0", + "version": "1.9.1", "source": { "type": "git", "url": "https://github.com/composer/composer.git", - "reference": "314aa57fdcfc942065996f59fb73a8b3f74f3fa5" + "reference": "bb01f2180df87ce7992b8331a68904f80439dd2f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/composer/zipball/314aa57fdcfc942065996f59fb73a8b3f74f3fa5", - "reference": "314aa57fdcfc942065996f59fb73a8b3f74f3fa5", + "url": "https://api.github.com/repos/composer/composer/zipball/bb01f2180df87ce7992b8331a68904f80439dd2f", + "reference": "bb01f2180df87ce7992b8331a68904f80439dd2f", "shasum": "" }, "require": { @@ -2982,7 +2984,7 @@ "dependency", "package" ], - "time": "2019-08-02T18:55:33+00:00" + "time": "2019-11-01T16:20:17+00:00" }, { "name": "composer/semver", @@ -3108,24 +3110,24 @@ }, { "name": "composer/xdebug-handler", - "version": "1.3.3", + "version": "1.4.0", "source": { "type": "git", "url": "https://github.com/composer/xdebug-handler.git", - "reference": "46867cbf8ca9fb8d60c506895449eb799db1184f" + "reference": "cbe23383749496fe0f373345208b79568e4bc248" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/46867cbf8ca9fb8d60c506895449eb799db1184f", - "reference": "46867cbf8ca9fb8d60c506895449eb799db1184f", + "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/cbe23383749496fe0f373345208b79568e4bc248", + "reference": "cbe23383749496fe0f373345208b79568e4bc248", "shasum": "" }, "require": { - "php": "^5.3.2 || ^7.0", + "php": "^5.3.2 || ^7.0 || ^8.0", "psr/log": "^1.0" }, "require-dev": { - "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5" + "phpunit/phpunit": "^4.8.35 || ^5.7 || 6.5 - 8" }, "type": "library", "autoload": { @@ -3143,12 +3145,12 @@ "email": "john-stevenson@blueyonder.co.uk" } ], - "description": "Restarts a process without xdebug.", + "description": "Restarts a process without Xdebug.", "keywords": [ "Xdebug", "performance" ], - "time": "2019-05-27T17:52:04+00:00" + "time": "2019-11-06T16:40:04+00:00" }, { "name": "dnoegel/php-xdg-base-dir", @@ -3185,16 +3187,16 @@ }, { "name": "doctrine/instantiator", - "version": "1.2.0", + "version": "1.3.0", "source": { "type": "git", "url": "https://github.com/doctrine/instantiator.git", - "reference": "a2c590166b2133a4633738648b6b064edae0814a" + "reference": "ae466f726242e637cebdd526a7d991b9433bacf1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/a2c590166b2133a4633738648b6b064edae0814a", - "reference": "a2c590166b2133a4633738648b6b064edae0814a", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/ae466f726242e637cebdd526a7d991b9433bacf1", + "reference": "ae466f726242e637cebdd526a7d991b9433bacf1", "shasum": "" }, "require": { @@ -3237,7 +3239,7 @@ "constructor", "instantiate" ], - "time": "2019-03-17T17:37:11+00:00" + "time": "2019-10-21T16:45:58+00:00" }, { "name": "jakub-onderka/php-console-color", @@ -3490,23 +3492,23 @@ }, { "name": "justinrainbow/json-schema", - "version": "5.2.8", + "version": "5.2.9", "source": { "type": "git", "url": "https://github.com/justinrainbow/json-schema.git", - "reference": "dcb6e1006bb5fd1e392b4daa68932880f37550d4" + "reference": "44c6787311242a979fa15c704327c20e7221a0e4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/dcb6e1006bb5fd1e392b4daa68932880f37550d4", - "reference": "dcb6e1006bb5fd1e392b4daa68932880f37550d4", + "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/44c6787311242a979fa15c704327c20e7221a0e4", + "reference": "44c6787311242a979fa15c704327c20e7221a0e4", "shasum": "" }, "require": { "php": ">=5.3.3" }, "require-dev": { - "friendsofphp/php-cs-fixer": "~2.2.20", + "friendsofphp/php-cs-fixer": "~2.2.20||~2.15.1", "json-schema/json-schema-test-suite": "1.2.0", "phpunit/phpunit": "^4.8.35" }, @@ -3552,7 +3554,7 @@ "json", "schema" ], - "time": "2019-01-14T23:55:14+00:00" + "time": "2019-09-25T14:49:45+00:00" }, { "name": "myclabs/deep-copy", @@ -3604,16 +3606,16 @@ }, { "name": "nette/bootstrap", - "version": "v3.0.0", + "version": "v3.0.1", "source": { "type": "git", "url": "https://github.com/nette/bootstrap.git", - "reference": "e1075af05c211915e03e0c86542f3ba5433df4a3" + "reference": "b45a1e33b6a44beb307756522396551e5a9ff249" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/bootstrap/zipball/e1075af05c211915e03e0c86542f3ba5433df4a3", - "reference": "e1075af05c211915e03e0c86542f3ba5433df4a3", + "url": "https://api.github.com/repos/nette/bootstrap/zipball/b45a1e33b6a44beb307756522396551e5a9ff249", + "reference": "b45a1e33b6a44beb307756522396551e5a9ff249", "shasum": "" }, "require": { @@ -3621,6 +3623,9 @@ "nette/utils": "^3.0", "php": ">=7.1" }, + "conflict": { + "tracy/tracy": "<2.6" + }, "require-dev": { "latte/latte": "^2.2", "nette/application": "^3.0", @@ -3673,7 +3678,7 @@ "configurator", "nette" ], - "time": "2019-03-26T12:59:07+00:00" + "time": "2019-09-30T08:19:38+00:00" }, { "name": "nette/di", @@ -3994,16 +3999,16 @@ }, { "name": "nette/schema", - "version": "v1.0.0", + "version": "v1.0.1", "source": { "type": "git", "url": "https://github.com/nette/schema.git", - "reference": "6241d8d4da39e825dd6cb5bfbe4242912f4d7e4d" + "reference": "337117df1dade22e2ba1fdc4a4b832c1e9b06b76" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/schema/zipball/6241d8d4da39e825dd6cb5bfbe4242912f4d7e4d", - "reference": "6241d8d4da39e825dd6cb5bfbe4242912f4d7e4d", + "url": "https://api.github.com/repos/nette/schema/zipball/337117df1dade22e2ba1fdc4a4b832c1e9b06b76", + "reference": "337117df1dade22e2ba1fdc4a4b832c1e9b06b76", "shasum": "" }, "require": { @@ -4047,20 +4052,20 @@ "config", "nette" ], - "time": "2019-04-03T15:53:25+00:00" + "time": "2019-10-31T20:52:19+00:00" }, { "name": "nette/utils", - "version": "v3.0.1", + "version": "v3.0.2", "source": { "type": "git", "url": "https://github.com/nette/utils.git", - "reference": "bd961f49b211997202bda1d0fbc410905be370d4" + "reference": "c133e18c922dcf3ad07673077d92d92cef25a148" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/utils/zipball/bd961f49b211997202bda1d0fbc410905be370d4", - "reference": "bd961f49b211997202bda1d0fbc410905be370d4", + "url": "https://api.github.com/repos/nette/utils/zipball/c133e18c922dcf3ad07673077d92d92cef25a148", + "reference": "c133e18c922dcf3ad07673077d92d92cef25a148", "shasum": "" }, "require": { @@ -4076,6 +4081,7 @@ "ext-intl": "to use Strings::webalize(), toAscii(), normalize() and compare()", "ext-json": "to use Nette\\Utils\\Json", "ext-mbstring": "to use Strings::lower() etc...", + "ext-tokenizer": "to use Nette\\Utils\\Reflection::getUseStatements()", "ext-xml": "to use Strings::length() etc. when mbstring is not available" }, "type": "library", @@ -4123,20 +4129,20 @@ "utility", "validation" ], - "time": "2019-03-22T01:00:30+00:00" + "time": "2019-10-21T20:40:16+00:00" }, { "name": "nikic/php-parser", - "version": "v4.2.4", + "version": "v4.3.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "97e59c7a16464196a8b9c77c47df68e4a39a45c4" + "reference": "9a9981c347c5c49d6dfe5cf826bb882b824080dc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/97e59c7a16464196a8b9c77c47df68e4a39a45c4", - "reference": "97e59c7a16464196a8b9c77c47df68e4a39a45c4", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/9a9981c347c5c49d6dfe5cf826bb882b824080dc", + "reference": "9a9981c347c5c49d6dfe5cf826bb882b824080dc", "shasum": "" }, "require": { @@ -4144,6 +4150,7 @@ "php": ">=7.0" }, "require-dev": { + "ircmaxell/php-yacc": "0.0.5", "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0" }, "bin": [ @@ -4152,7 +4159,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.2-dev" + "dev-master": "4.3-dev" } }, "autoload": { @@ -4174,20 +4181,20 @@ "parser", "php" ], - "time": "2019-09-01T07:51:21+00:00" + "time": "2019-11-08T13:50:10+00:00" }, { "name": "ocramius/package-versions", - "version": "1.4.0", + "version": "1.4.2", "source": { "type": "git", "url": "https://github.com/Ocramius/PackageVersions.git", - "reference": "a4d4b60d0e60da2487bd21a2c6ac089f85570dbb" + "reference": "44af6f3a2e2e04f2af46bcb302ad9600cba41c7d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Ocramius/PackageVersions/zipball/a4d4b60d0e60da2487bd21a2c6ac089f85570dbb", - "reference": "a4d4b60d0e60da2487bd21a2c6ac089f85570dbb", + "url": "https://api.github.com/repos/Ocramius/PackageVersions/zipball/44af6f3a2e2e04f2af46bcb302ad9600cba41c7d", + "reference": "44af6f3a2e2e04f2af46bcb302ad9600cba41c7d", "shasum": "" }, "require": { @@ -4199,7 +4206,7 @@ "doctrine/coding-standard": "^5.0.1", "ext-zip": "*", "infection/infection": "^0.7.1", - "phpunit/phpunit": "^7.0.0" + "phpunit/phpunit": "^7.5.17" }, "type": "composer-plugin", "extra": { @@ -4224,7 +4231,7 @@ } ], "description": "Composer plugin that provides efficient querying for installed package versions (no runtime IO)", - "time": "2019-02-21T12:16:21+00:00" + "time": "2019-11-15T16:17:10+00:00" }, { "name": "phar-io/manifest", @@ -4683,16 +4690,16 @@ }, { "name": "phpstan/phpstan", - "version": "0.11.16", + "version": "0.11.19", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "635cf20f3b92ce34ee94a8d2f282d62eb9dc6e1b" + "reference": "63cc502f6957b7f74efbac444b4cf219dcadffd7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/635cf20f3b92ce34ee94a8d2f282d62eb9dc6e1b", - "reference": "635cf20f3b92ce34ee94a8d2f282d62eb9dc6e1b", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/63cc502f6957b7f74efbac444b4cf219dcadffd7", + "reference": "63cc502f6957b7f74efbac444b4cf219dcadffd7", "shasum": "" }, "require": { @@ -4700,6 +4707,7 @@ "jean85/pretty-package-versions": "^1.0.3", "nette/bootstrap": "^2.4 || ^3.0", "nette/di": "^2.4.7 || ^3.0", + "nette/neon": "^2.4.3 || ^3.0", "nette/robot-loader": "^3.0.1", "nette/schema": "^1.0", "nette/utils": "^2.4.5 || ^3.0", @@ -4753,7 +4761,7 @@ "MIT" ], "description": "PHPStan - PHP Static Analysis Tool", - "time": "2019-09-17T11:19:51+00:00" + "time": "2019-10-22T20:20:22+00:00" }, { "name": "phpunit/php-code-coverage", @@ -5783,16 +5791,16 @@ }, { "name": "seld/jsonlint", - "version": "1.7.1", + "version": "1.7.2", "source": { "type": "git", "url": "https://github.com/Seldaek/jsonlint.git", - "reference": "d15f59a67ff805a44c50ea0516d2341740f81a38" + "reference": "e2e5d290e4d2a4f0eb449f510071392e00e10d19" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/d15f59a67ff805a44c50ea0516d2341740f81a38", - "reference": "d15f59a67ff805a44c50ea0516d2341740f81a38", + "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/e2e5d290e4d2a4f0eb449f510071392e00e10d19", + "reference": "e2e5d290e4d2a4f0eb449f510071392e00e10d19", "shasum": "" }, "require": { @@ -5828,7 +5836,7 @@ "parser", "validator" ], - "time": "2018-01-24T12:46:19+00:00" + "time": "2019-10-24T14:27:39+00:00" }, { "name": "seld/phar-utils", @@ -5876,16 +5884,16 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "3.5.0", + "version": "3.5.2", "source": { "type": "git", "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "0afebf16a2e7f1e434920fa976253576151effe9" + "reference": "65b12cdeaaa6cd276d4c3033a95b9b88b12701e7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/0afebf16a2e7f1e434920fa976253576151effe9", - "reference": "0afebf16a2e7f1e434920fa976253576151effe9", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/65b12cdeaaa6cd276d4c3033a95b9b88b12701e7", + "reference": "65b12cdeaaa6cd276d4c3033a95b9b88b12701e7", "shasum": "" }, "require": { @@ -5923,11 +5931,11 @@ "phpcs", "standards" ], - "time": "2019-09-26T23:12:26+00:00" + "time": "2019-10-28T04:36:32+00:00" }, { "name": "symfony/css-selector", - "version": "v4.3.5", + "version": "v4.3.8", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", @@ -5980,16 +5988,16 @@ }, { "name": "symfony/dom-crawler", - "version": "v4.3.5", + "version": "v4.3.8", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "e9f7b4d19d69b133bd638eeddcdc757723b4211f" + "reference": "4b9efd5708c3a38593e19b6a33e40867f4f89d72" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/e9f7b4d19d69b133bd638eeddcdc757723b4211f", - "reference": "e9f7b4d19d69b133bd638eeddcdc757723b4211f", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/4b9efd5708c3a38593e19b6a33e40867f4f89d72", + "reference": "4b9efd5708c3a38593e19b6a33e40867f4f89d72", "shasum": "" }, "require": { @@ -6037,20 +6045,20 @@ ], "description": "Symfony DomCrawler Component", "homepage": "https://symfony.com", - "time": "2019-09-28T21:25:05+00:00" + "time": "2019-10-28T17:07:32+00:00" }, { "name": "symfony/finder", - "version": "v4.3.5", + "version": "v4.3.8", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "5e575faa95548d0586f6bedaeabec259714e44d1" + "reference": "72a068f77e317ae77c0a0495236ad292cfb5ce6f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/5e575faa95548d0586f6bedaeabec259714e44d1", - "reference": "5e575faa95548d0586f6bedaeabec259714e44d1", + "url": "https://api.github.com/repos/symfony/finder/zipball/72a068f77e317ae77c0a0495236ad292cfb5ce6f", + "reference": "72a068f77e317ae77c0a0495236ad292cfb5ce6f", "shasum": "" }, "require": { @@ -6086,20 +6094,20 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2019-09-16T11:29:48+00:00" + "time": "2019-10-30T12:53:54+00:00" }, { "name": "symfony/process", - "version": "v4.3.5", + "version": "v4.3.8", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "50556892f3cc47d4200bfd1075314139c4c9ff4b" + "reference": "3b2e0cb029afbb0395034509291f21191d1a4db0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/50556892f3cc47d4200bfd1075314139c4c9ff4b", - "reference": "50556892f3cc47d4200bfd1075314139c4c9ff4b", + "url": "https://api.github.com/repos/symfony/process/zipball/3b2e0cb029afbb0395034509291f21191d1a4db0", + "reference": "3b2e0cb029afbb0395034509291f21191d1a4db0", "shasum": "" }, "require": { @@ -6135,20 +6143,20 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2019-09-26T21:17:10+00:00" + "time": "2019-10-28T17:07:32+00:00" }, { "name": "symfony/var-dumper", - "version": "v4.3.5", + "version": "v4.3.8", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "bde8957fc415fdc6964f33916a3755737744ff05" + "reference": "ea4940845535c85ff5c505e13b3205b0076d07bf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/bde8957fc415fdc6964f33916a3755737744ff05", - "reference": "bde8957fc415fdc6964f33916a3755737744ff05", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/ea4940845535c85ff5c505e13b3205b0076d07bf", + "reference": "ea4940845535c85ff5c505e13b3205b0076d07bf", "shasum": "" }, "require": { @@ -6211,7 +6219,7 @@ "debug", "dump" ], - "time": "2019-10-04T19:48:13+00:00" + "time": "2019-10-13T12:02:04+00:00" }, { "name": "theseer/tokenizer", @@ -6255,16 +6263,16 @@ }, { "name": "twig/twig", - "version": "v1.42.3", + "version": "v1.42.4", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "201baee843e0ffe8b0b956f336dd42b2a92fae4e" + "reference": "e587180584c3d2d6cb864a0454e777bb6dcb6152" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/201baee843e0ffe8b0b956f336dd42b2a92fae4e", - "reference": "201baee843e0ffe8b0b956f336dd42b2a92fae4e", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/e587180584c3d2d6cb864a0454e777bb6dcb6152", + "reference": "e587180584c3d2d6cb864a0454e777bb6dcb6152", "shasum": "" }, "require": { @@ -6317,7 +6325,7 @@ "keywords": [ "templating" ], - "time": "2019-08-24T12:51:03+00:00" + "time": "2019-11-11T16:49:32+00:00" }, { "name": "umpirsky/twig-php-function", diff --git a/config/Migrations/20191231081631_Saito5x6x0.php b/config/Migrations/20191231081631_Saito5x6x0.php new file mode 100755 index 000000000..b3ce25002 --- /dev/null +++ b/config/Migrations/20191231081631_Saito5x6x0.php @@ -0,0 +1,33 @@ +execute('UPDATE drafts SET pid=0 WHERE pid IS NULL'); + $this->table('drafts') + ->changeColumn('pid', 'integer', [ + 'default' => null, + 'limit' => 11, + 'null' => false, + ]) + ->update(); + } + + public function down() + { + + $this->table('drafts') + ->changeColumn('pid', 'integer', [ + 'default' => null, + 'length' => 11, + 'null' => true, + ]) + ->update(); + $this->execute('UPDATE drafts SET pid=NULL WHERE pid=0'); + } +} + diff --git a/config/geshi.php b/config/geshi.php index bbe293106..addb7bb59 100644 --- a/config/geshi.php +++ b/config/geshi.php @@ -1,11 +1,13 @@ set_header_type(GESHI_HEADER_DIV); $geshi->enable_line_numbers(GESHI_FANCY_LINE_NUMBERS, 2); -$geshi->set_line_style('background: white;'); +$geshi->set_line_style('background: #f0fcef;'); // $geshi->enable_classes(); $geshi->set_tab_width(2); $geshi->set_code_style('line-height: inherit;', true); diff --git a/config/permissions.php b/config/permissions.php index 4b7d74fda..514f84389 100644 --- a/config/permissions.php +++ b/config/permissions.php @@ -36,9 +36,9 @@ * everbody > owner > role */ $config['Saito']['Permission']['Resources'] = (new Resources()) - /** - * Allow roles access to resource based on roles - */ + /*********************************************************** + * Core * + ***********************************************************/ // Access to the administration backend ->add((new Resource('saito.core.admin.backend')) ->allow((new ResourceAC())->asRole('admin'))) @@ -63,6 +63,9 @@ // Merge postings ->add((new Resource('saito.core.posting.merge')) ->allow((new ResourceAC())->asRole('mod'))) + // Allow posting to be marked as solution + ->add((new Resource('saito.core.posting.solves.set')) + ->allow((new ResourceAC())->onOwn())) // Show a user's activation status ->add((new Resource('saito.core.user.activate.view')) ->allow((new ResourceAC())->asRole('admin'))) @@ -96,6 +99,9 @@ ->add((new Resource('saito.core.user.password.set')) ->allow((new ResourceAC())->asRole('admin')->onRoles('mod', 'user')) ->allow((new ResourceAC())->asRole('owner'))) + // Use the register form + ->add((new Resource('saito.core.user.register')) + ->allow((new ResourceAC())->asEverybody())) // Change a user's role. Allowed ranks: all the current user has but not // their own rank. ->add((new Resource('saito.core.user.role.set.restricted')) @@ -104,12 +110,28 @@ // their own rank. ->add((new Resource('saito.core.user.role.set.unrestricted')) ->allow((new ResourceAC())->asRole('owner'))) + + /*********************************************************** + * Bookmarks * + ***********************************************************/ // Deleting bookmarks ->add((new Resource('saito.plugin.bookmarks.delete')) ->allow((new ResourceAC())->onOwn())) - // Use the register form - ->add((new Resource('saito.core.user.register')) - ->allow((new ResourceAC())->asEverybody())) + + /*********************************************************** + * Uploader * + ***********************************************************/ + // Allow uploads + ->add((new Resource('saito.plugin.uploader.add')) + ->allow((new ResourceAC())->onOwn())) + // Allow deleting uploads + ->add((new Resource('saito.plugin.uploader.delete')) + ->allow((new ResourceAC())->asRole('admin')) + ->allow((new ResourceAC())->onOwn())) + // View the uploader + ->add((new Resource('saito.plugin.uploader.view')) + ->allow((new ResourceAC())->asRole('admin')) + ->allow((new ResourceAC())->onOwn())) ; return $config; diff --git a/config/saito_config.php b/config/saito_config.php index de9452b61..75b741cef 100644 --- a/config/saito_config.php +++ b/config/saito_config.php @@ -117,9 +117,11 @@ */ ->addType('audio/mpeg') ->addType('audio/mp4') + ->addType('audio/ogg') + ->addType('audio/opus') ->addType('audio/webm') ->addType('image/jpeg', '19MB') - ->addType('image/png', '19MB') + ->addType('image/png', '19MB') ->addType('image/svg+xml') ->addType('text/plain') ->addType('video/mp4') diff --git a/dev/docker/php7/apache/Dockerfile b/dev/docker/php7/apache/Dockerfile index 4d4494cf6..20c9a510c 100644 --- a/dev/docker/php7/apache/Dockerfile +++ b/dev/docker/php7/apache/Dockerfile @@ -33,8 +33,9 @@ RUN docker-php-ext-configure pdo_mysql --with-pdo-mysql=mysqlnd \ opcache # Install apcu -RUN pecl install apcu-5.1.17 +RUN pecl install apcu-5.1.18 RUN docker-php-ext-enable apcu +RUN echo "apc.enable_cli=1" >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini # Install xdebug RUN pecl install xdebug-2.7.1 diff --git a/docs/customizing.md b/docs/customizing.md new file mode 100644 index 000000000..6e1f12e65 --- /dev/null +++ b/docs/customizing.md @@ -0,0 +1,40 @@ + +# Customizing # + +## Themes ## + +The default theme *Bota* is implemented as a [CakePHP 3 theme plugin](https://book.cakephp.org/3.0/en/views/themes.html) and lives in *plugins/Bota*. The UI is implemented as [Bootstrap 4](https://getbootstrap.com/docs/4.3/getting-started/introduction/) theme. + +To start your own theme I recommend using SASS and referencing and customizing the default theme. + +Duplicate the *Bota* plugin folder and rename it to *YourTheme*. + +Activate *YourTheme* by setting it as default theme in *config/saito_config.php*. + +Replace everything *plugins/YourTheme/webroot/css/theme.scss* with: + +``` +@import "../../../../../plugins/Bota/webroot/css/src/theme"; +``` + +This include Bota's *theme.scss*. Compiling it with SASS should give you the same look as the default theme. Now customize the theme: + +``` +/// Configure Bootstrap and Saito theme-variables before importing the theme. +$body-color: #222; +... + +/// Import the default theme. +@import "../../../../../plugins/Bota/webroot/css/src/theme"; + +/// Additional customizations +body {...} +... +``` + +Theming resources: + +- [Bootstrap theming](https://getbootstrap.com/docs/4.3/getting-started/theming/) +- [Boostrap variables](https://github.com/twbs/bootstrap/blob/v4.3.0/scss/_variables.scss) +- [SASS documentation](https://sass-lang.com/documentation) +- [Simple GUI crossplatform SASS processor](https://scout-app.io/) diff --git a/frontend/src/app/app.ts b/frontend/src/app/app.ts index 198f8f4f3..cf70b78c0 100644 --- a/frontend/src/app/app.ts +++ b/frontend/src/app/app.ts @@ -16,7 +16,9 @@ import moment from 'moment'; /// Load numeral.js import numeral from 'numeral'; // load locales for numeral.js -require('numeral/locales') +/* tslint:disable */ +require('numeral/locales'); +/* tslint:enable */ interface ISaitoCallbacks { beforeAppInit: CallableFunction[]; diff --git a/frontend/src/locale/de.po b/frontend/src/locale/de.po index df48c3633..c3ec10fcb 100644 --- a/frontend/src/locale/de.po +++ b/frontend/src/locale/de.po @@ -52,23 +52,23 @@ msgid "answer.subject.t" msgstr "Betreff" #: frontend/src/modules/answering/answering.ts:109 -#: frontend/src/modules/answering/answering.ts:304 +#: frontend/src/modules/answering/answering.ts:305 msgid "answer.submit.e.t" msgstr "Fehler: Beitrag wurde nicht gesichert" #: frontend/src/modules/answering/answering.ts:109 -#: frontend/src/modules/answering/answering.ts:261 -#: frontend/src/modules/answering/answering.ts:303 +#: frontend/src/modules/answering/answering.ts:262 +#: frontend/src/modules/answering/answering.ts:304 msgid "api.generic.e.exp" msgstr "Es konnte keine Verbindung zum Internet-Server hergestellt werden." #: frontend/src/modules/answering/answering.ts:109 -#: frontend/src/modules/answering/answering.ts:262 +#: frontend/src/modules/answering/answering.ts:263 msgid "api.generic.e.t" msgstr "Fehler: Keine Verbindung zum Server" #: frontend/src/modules/bookmarks/views/bookmarkItemVw.ts:23 -#: frontend/src/modules/bookmarks/views/bookmarkItemVw.ts:88 +#: frontend/src/modules/bookmarks/views/bookmarkItemVw.ts:90 msgid "bkm.delete.failure" msgstr "Fehler: Lesezeichen konnte nicht gelöscht werden." @@ -166,8 +166,8 @@ msgstr "Abbrechen" msgid "posting.delete.title" msgstr "Beitrag löschen" -#: frontend/src/views/postingActionSolves.ts:22 -#: frontend/src/views/postingActionSolves.ts:33 +#: frontend/src/views/postingActionSolves.ts:23 +#: frontend/src/views/postingActionSolves.ts:34 msgid "posting.helpful" msgstr "Beitrag als hilfreich markieren." @@ -206,55 +206,90 @@ msgstr "Größe" msgid "upl.add.speed.t" msgstr "Geschwindigkeit" -#: frontend/src/modules/uploader/templates/uploaderAddTpl.html:12 -#: frontend/src/modules/uploader/templates/uploaderAddTpl.html:13 +#: frontend/src/modules/uploader/templates/uploaderAddTpl.html:10 +#: frontend/src/modules/uploader/templates/uploaderAddTpl.html:11 msgid "upl.btn.abort.title" msgstr "Abbrechen" -#: frontend/src/modules/answering/editor/MenuButton/MenuButtonUploadView.ts:25 +#: frontend/src/modules/answering/editor/MenuButton/MenuButtonUploadView.ts:23 msgid "upl.btn.insert" msgstr "Einfügen" -#: frontend/src/modules/uploader/templates/uploaderAddTpl.html:22 -#: frontend/src/modules/uploader/templates/uploaderAddTpl.html:23 +#: frontend/src/modules/uploader/templates/uploaderAddTpl.html:20 +#: frontend/src/modules/uploader/templates/uploaderAddTpl.html:21 msgid "upl.btn.title" msgstr "Datei auswählen…" -#: frontend/src/modules/uploader/views/uploaderItemFooterVw.ts:30 +#: frontend/src/modules/uploader/views/uploaderItemFooterVw.ts:32 msgid "upl.del.btn" msgstr "Datei löschen" -#: frontend/src/modules/uploader/views/uploaderAddVw.ts:19 -#: frontend/src/modules/uploader/views/uploaderAddVw.ts:155 +#: frontend/src/modules/uploader/views/uploaderAddVw.ts:26 +#: frontend/src/modules/uploader/views/uploaderAddVw.ts:163 msgid "upl.failure" msgstr "Beim Hochladen ist ein Fehler aufgetreten." -#: frontend/src/modules/uploader/templates/uploadItemAudioTpl.html:4 -#: frontend/src/modules/uploader/templates/uploadItemImageTpl.html:4 -#: frontend/src/modules/uploader/templates/uploadItemVideoTpl.html:4 -#: frontend/src/modules/uploader/templates/uploadItemAudioTpl.html:5 -#: frontend/src/modules/uploader/templates/uploadItemImageTpl.html:5 -#: frontend/src/modules/uploader/templates/uploadItemVideoTpl.html:5 -msgid "upl.loading" -msgstr "Lade" - -#: frontend/src/modules/uploader/views/uploaderCollectionVw.ts:11 -#: frontend/src/modules/uploader/views/uploaderCollectionVw.ts:27 +#: frontend/src/modules/uploader/views/menu/uploaderMenuTitleVw.ts:9 +#: frontend/src/modules/uploader/views/menu/uploaderMenuTitleVw.ts:12 +msgid "upl.menu.search.t" +msgstr "Suche" + +#: frontend/src/modules/uploader/views/menu/uploaderMenuSortVw.ts:28 +#: frontend/src/modules/uploader/views/menu/uploaderMenuSortVw.ts:40 +msgid "upl.menu.sort.size" +msgstr "Größe" + +#: frontend/src/modules/uploader/views/menu/uploaderMenuSortVw.ts:28 +#: frontend/src/modules/uploader/views/menu/uploaderMenuSortVw.ts:39 +msgid "upl.menu.sort.time" +msgstr "Zeit" + +#: frontend/src/modules/uploader/views/menu/uploaderMenuTypeVw.ts:19 +msgid "upl.menu.type.all" +msgstr "Art: Alle" + +#: frontend/src/modules/uploader/views/menu/uploaderMenuTypeVw.ts:19 +#: frontend/src/modules/uploader/views/menu/uploaderMenuTypeVw.ts:39 +msgid "upl.mime.type.app" +msgstr "Anwendungsdatei" + +#: frontend/src/modules/uploader/views/menu/uploaderMenuTypeVw.ts:19 +#: frontend/src/modules/uploader/views/menu/uploaderMenuTypeVw.ts:43 +msgid "upl.mime.type.audio" +msgstr "Audio" + +#: frontend/src/modules/uploader/views/menu/uploaderMenuTypeVw.ts:19 +#: frontend/src/modules/uploader/views/menu/uploaderMenuTypeVw.ts:47 +msgid "upl.mime.type.image" +msgstr "Bild" + +#: frontend/src/modules/uploader/views/menu/uploaderMenuTypeVw.ts:19 +#: frontend/src/modules/uploader/views/menu/uploaderMenuTypeVw.ts:51 +msgid "upl.mime.type.text" +msgstr "Text" + +#: frontend/src/modules/uploader/views/menu/uploaderMenuTypeVw.ts:19 +#: frontend/src/modules/uploader/views/menu/uploaderMenuTypeVw.ts:55 +msgid "upl.mime.type.video" +msgstr "Video" + +#: frontend/src/modules/uploader/views/uploaderCollectionVw.ts:12 +#: frontend/src/modules/uploader/views/uploaderCollectionVw.ts:32 msgid "upl.ncy" -msgstr "Noch nichts hochgeladen." +msgstr "Keine Uploads gefunden." -#: frontend/src/modules/uploader/views/uploaderAdd/uploaderAddDragAreaVw.ts:42 -#: frontend/src/modules/uploader/views/uploaderAdd/uploaderAddDragAreaVw.ts:65 +#: frontend/src/modules/uploader/views/uploaderAdd/uploaderAddDragAreaVw.ts:40 +#: frontend/src/modules/uploader/views/uploaderAdd/uploaderAddDragAreaVw.ts:63 msgid "upl.new.title" msgstr "Datei hier hineinziehen" -#: frontend/src/modules/answering/editor/MenuButton/MenuButtonUploadView.ts:27 -#: frontend/src/modules/uploader/views/uploaderAdd/uploaderAddDragAreaVw.ts:39 -#: frontend/src/modules/answering/editor/MenuButton/MenuButtonUploadView.ts:72 +#: frontend/src/modules/answering/editor/MenuButton/MenuButtonUploadView.ts:25 +#: frontend/src/modules/uploader/views/uploaderAdd/uploaderAddDragAreaVw.ts:38 +#: frontend/src/modules/answering/editor/MenuButton/MenuButtonUploadView.ts:77 msgid "upl.title" msgstr "Hochladen" -#: frontend/src/modules/user/userVw.ts:25 +#: frontend/src/modules/user/userVw.ts:27 msgid "upl.title.pl" msgstr "Uploads" @@ -268,7 +303,7 @@ msgstr "Datei wurde nicht erkannt." msgid "upl.vald.e.fileExists" msgstr "Datei mit gleichen Namen wurde bereits hochgeladen." -#: src/Template/Users/view.ctp:323 +#: src/Template/Users/view.ctp:325 msgid "user.block.hours" msgstr "{hours} Stunden" diff --git a/frontend/src/locale/en.po b/frontend/src/locale/en.po index a89b896e2..7a0022bc1 100644 --- a/frontend/src/locale/en.po +++ b/frontend/src/locale/en.po @@ -52,24 +52,24 @@ msgid "answer.subject.t" msgstr "Subject" #: frontend/src/modules/answering/answering.ts:109 -#: frontend/src/modules/answering/answering.ts:304 +#: frontend/src/modules/answering/answering.ts:305 msgid "answer.submit.e.t" msgstr "Error: Posting Could Not Be Saved" #: frontend/src/modules/answering/answering.ts:109 -#: frontend/src/modules/answering/answering.ts:261 -#: frontend/src/modules/answering/answering.ts:303 +#: frontend/src/modules/answering/answering.ts:262 +#: frontend/src/modules/answering/answering.ts:304 msgid "api.generic.e.exp" msgstr "" "Couldn't reach the internet server. Check your connection and try again." #: frontend/src/modules/answering/answering.ts:109 -#: frontend/src/modules/answering/answering.ts:262 +#: frontend/src/modules/answering/answering.ts:263 msgid "api.generic.e.t" msgstr "Error: Couldn't Connect to Server" #: frontend/src/modules/bookmarks/views/bookmarkItemVw.ts:23 -#: frontend/src/modules/bookmarks/views/bookmarkItemVw.ts:88 +#: frontend/src/modules/bookmarks/views/bookmarkItemVw.ts:90 msgid "bkm.delete.failure" msgstr "Error: Bookmark could not be deleted." @@ -167,8 +167,8 @@ msgstr "Abort" msgid "posting.delete.title" msgstr "Delete Posting" -#: frontend/src/views/postingActionSolves.ts:22 -#: frontend/src/views/postingActionSolves.ts:33 +#: frontend/src/views/postingActionSolves.ts:23 +#: frontend/src/views/postingActionSolves.ts:34 msgid "posting.helpful" msgstr "Mark entry as helpful." @@ -207,55 +207,90 @@ msgstr "Size" msgid "upl.add.speed.t" msgstr "Speed" -#: frontend/src/modules/uploader/templates/uploaderAddTpl.html:12 -#: frontend/src/modules/uploader/templates/uploaderAddTpl.html:13 +#: frontend/src/modules/uploader/templates/uploaderAddTpl.html:10 +#: frontend/src/modules/uploader/templates/uploaderAddTpl.html:11 msgid "upl.btn.abort.title" msgstr "Abort upload" -#: frontend/src/modules/answering/editor/MenuButton/MenuButtonUploadView.ts:25 +#: frontend/src/modules/answering/editor/MenuButton/MenuButtonUploadView.ts:23 msgid "upl.btn.insert" msgstr "Insert" -#: frontend/src/modules/uploader/templates/uploaderAddTpl.html:22 -#: frontend/src/modules/uploader/templates/uploaderAddTpl.html:23 +#: frontend/src/modules/uploader/templates/uploaderAddTpl.html:20 +#: frontend/src/modules/uploader/templates/uploaderAddTpl.html:21 msgid "upl.btn.title" msgstr "Chose file…" -#: frontend/src/modules/uploader/views/uploaderItemFooterVw.ts:30 +#: frontend/src/modules/uploader/views/uploaderItemFooterVw.ts:32 msgid "upl.del.btn" msgstr "Delete file" -#: frontend/src/modules/uploader/views/uploaderAddVw.ts:19 -#: frontend/src/modules/uploader/views/uploaderAddVw.ts:155 +#: frontend/src/modules/uploader/views/uploaderAddVw.ts:26 +#: frontend/src/modules/uploader/views/uploaderAddVw.ts:163 msgid "upl.failure" msgstr "Error occurred on upload." -#: frontend/src/modules/uploader/templates/uploadItemAudioTpl.html:4 -#: frontend/src/modules/uploader/templates/uploadItemImageTpl.html:4 -#: frontend/src/modules/uploader/templates/uploadItemVideoTpl.html:4 -#: frontend/src/modules/uploader/templates/uploadItemAudioTpl.html:5 -#: frontend/src/modules/uploader/templates/uploadItemImageTpl.html:5 -#: frontend/src/modules/uploader/templates/uploadItemVideoTpl.html:5 -msgid "upl.loading" -msgstr "Loading" - -#: frontend/src/modules/uploader/views/uploaderCollectionVw.ts:11 -#: frontend/src/modules/uploader/views/uploaderCollectionVw.ts:27 +#: frontend/src/modules/uploader/views/menu/uploaderMenuTitleVw.ts:9 +#: frontend/src/modules/uploader/views/menu/uploaderMenuTitleVw.ts:12 +msgid "upl.menu.search.t" +msgstr "Search" + +#: frontend/src/modules/uploader/views/menu/uploaderMenuSortVw.ts:28 +#: frontend/src/modules/uploader/views/menu/uploaderMenuSortVw.ts:40 +msgid "upl.menu.sort.size" +msgstr "Size" + +#: frontend/src/modules/uploader/views/menu/uploaderMenuSortVw.ts:28 +#: frontend/src/modules/uploader/views/menu/uploaderMenuSortVw.ts:39 +msgid "upl.menu.sort.time" +msgstr "Time" + +#: frontend/src/modules/uploader/views/menu/uploaderMenuTypeVw.ts:19 +msgid "upl.menu.type.all" +msgstr "Type: All" + +#: frontend/src/modules/uploader/views/menu/uploaderMenuTypeVw.ts:19 +#: frontend/src/modules/uploader/views/menu/uploaderMenuTypeVw.ts:39 +msgid "upl.mime.type.app" +msgstr "Application file" + +#: frontend/src/modules/uploader/views/menu/uploaderMenuTypeVw.ts:19 +#: frontend/src/modules/uploader/views/menu/uploaderMenuTypeVw.ts:43 +msgid "upl.mime.type.audio" +msgstr "Audio" + +#: frontend/src/modules/uploader/views/menu/uploaderMenuTypeVw.ts:19 +#: frontend/src/modules/uploader/views/menu/uploaderMenuTypeVw.ts:47 +msgid "upl.mime.type.image" +msgstr "Image" + +#: frontend/src/modules/uploader/views/menu/uploaderMenuTypeVw.ts:19 +#: frontend/src/modules/uploader/views/menu/uploaderMenuTypeVw.ts:51 +msgid "upl.mime.type.text" +msgstr "Text" + +#: frontend/src/modules/uploader/views/menu/uploaderMenuTypeVw.ts:19 +#: frontend/src/modules/uploader/views/menu/uploaderMenuTypeVw.ts:55 +msgid "upl.mime.type.video" +msgstr "Video" + +#: frontend/src/modules/uploader/views/uploaderCollectionVw.ts:12 +#: frontend/src/modules/uploader/views/uploaderCollectionVw.ts:32 msgid "upl.ncy" -msgstr "No uploads yet." +msgstr "No uploads found." -#: frontend/src/modules/uploader/views/uploaderAdd/uploaderAddDragAreaVw.ts:42 -#: frontend/src/modules/uploader/views/uploaderAdd/uploaderAddDragAreaVw.ts:65 +#: frontend/src/modules/uploader/views/uploaderAdd/uploaderAddDragAreaVw.ts:40 +#: frontend/src/modules/uploader/views/uploaderAdd/uploaderAddDragAreaVw.ts:63 msgid "upl.new.title" msgstr "Drop File Here" -#: frontend/src/modules/answering/editor/MenuButton/MenuButtonUploadView.ts:27 -#: frontend/src/modules/uploader/views/uploaderAdd/uploaderAddDragAreaVw.ts:39 -#: frontend/src/modules/answering/editor/MenuButton/MenuButtonUploadView.ts:72 +#: frontend/src/modules/answering/editor/MenuButton/MenuButtonUploadView.ts:25 +#: frontend/src/modules/uploader/views/uploaderAdd/uploaderAddDragAreaVw.ts:38 +#: frontend/src/modules/answering/editor/MenuButton/MenuButtonUploadView.ts:77 msgid "upl.title" msgstr "Uploads" -#: frontend/src/modules/user/userVw.ts:25 +#: frontend/src/modules/user/userVw.ts:27 msgid "upl.title.pl" msgstr "Uploads" @@ -269,7 +304,7 @@ msgstr "Didn't find a file." msgid "upl.vald.e.fileExists" msgstr "File with same name already uploaded." -#: src/Template/Users/view.ctp:323 +#: src/Template/Users/view.ctp:325 msgid "user.block.hours" msgstr "{hours} hours" diff --git a/frontend/src/models/PostingMdl.ts b/frontend/src/models/PostingMdl.ts index 0a2494195..c29dff126 100644 --- a/frontend/src/models/PostingMdl.ts +++ b/frontend/src/models/PostingMdl.ts @@ -19,14 +19,20 @@ export default abstract class PostingModel extends JsonApiModel { _.defaults(defaults, { category_id: undefined, id: undefined, - pid: undefined, + pid: 0, + solves: 0, subject: '', - text: '', + text: undefined, }); super(defaults, options); } public isRoot(): boolean { - return !this.get('pid'); + const pid = this.get('pid'); + if (!_.isNumber(pid)) { + throw new Error('pid is not a number.'); + } + return pid === 0; } + } diff --git a/frontend/src/modules/answering/Draft.ts b/frontend/src/modules/answering/Draft.ts index cb70fe077..bc265e06f 100644 --- a/frontend/src/modules/answering/Draft.ts +++ b/frontend/src/modules/answering/Draft.ts @@ -169,13 +169,16 @@ export default class DraftView extends View { if (!this.enabled) { return; } - if (!this.model.get('id')) { - // Do only when creating a new draft, not on an existing one. + + /// Send empty subject and text only on existing draft to delete it. + const isNewDraft = !this.model.get('id'); + if (isNewDraft) { if (!this.model.get('subject') && !this.model.get('text')) { // Don't send empty data. return; } } + this.model.save(null, { success: (model, response, options) => { this.showSaved(); }, }); diff --git a/frontend/src/modules/answering/editor/MenuButton/MenuButtonUploadView.ts b/frontend/src/modules/answering/editor/MenuButton/MenuButtonUploadView.ts index 560c7702b..e18106339 100644 --- a/frontend/src/modules/answering/editor/MenuButton/MenuButtonUploadView.ts +++ b/frontend/src/modules/answering/editor/MenuButton/MenuButtonUploadView.ts @@ -1,11 +1,18 @@ +/** + * Saito - The Threaded Web Forum + * + * @copyright Copyright (c) the Saito Project Developers + * @link https://github.com/Schlaefer/Saito + * @license http://opensource.org/licenses/MIT + */ + import { Model } from 'backbone'; import { View } from 'backbone.marionette'; -import { Channel } from 'backbone.radio'; import BbcodeTag from 'lib/saito/Editor/Bbcode/BbcodeTag'; import App from 'models/app'; import ModalDialog from 'modules/modalDialog/modalDialog'; import UploaderVw from 'modules/uploader/uploader'; -import * as _ from 'underscore'; +import { defaults, template } from 'underscore'; import { AbstractMenuButtonView } from './AbstractMenuButtonView'; /** @@ -18,10 +25,9 @@ class InsertVw extends View { * @param options marionette init */ public constructor(options: object = {}) { - _.defaults(options, { - className: 'imageUploader-action', + options = defaults(options, { events: { 'click @ui.button': 'onButtonClick' }, - template: _.template(` + template: template(` `), @@ -67,9 +73,20 @@ class MenuButtonUploadView extends AbstractMenuButtonView { () => { return new InsertVw({ channel: this.channel }); }); - const uploadsView = new UploaderVw(); + const uploadsView = new UploaderVw({ + permission: { + 'saito.plugin.uploader.add': true, + 'saito.plugin.uploader.delete': true, + 'saito.plugin.uploader.view': true, + }, + userId: App.currentUser.get('id'), + }); - ModalDialog.show(uploadsView, { title: $.i18n.__('upl.title'), width: 'max' }); + ModalDialog.show(uploadsView, { + title: $.i18n.__('upl.title'), + trailing: true, + width: 'max', + }); } } diff --git a/frontend/src/modules/answering/views/SubjectInputVw.ts b/frontend/src/modules/answering/views/SubjectInputVw.ts index 80587ab2a..0456e4a6e 100644 --- a/frontend/src/modules/answering/views/SubjectInputVw.ts +++ b/frontend/src/modules/answering/views/SubjectInputVw.ts @@ -184,9 +184,8 @@ export default class SubjectInputView extends View { private setProgress(cssClass: ProgressBarState) { const $progress = this.getUI('progressBar'); Object.keys(ProgressBarState).forEach((key) => { - // @td bogus - const k = key as unknown as number; - $progress.removeClass(ProgressBarState[k]); + const state = ProgressBarState[key as keyof typeof ProgressBarState]; + $progress.removeClass(state); }); $progress.addClass(cssClass); } diff --git a/frontend/src/modules/bookmarks/views/bookmarkItemVw.ts b/frontend/src/modules/bookmarks/views/bookmarkItemVw.ts index cdb2f3dc1..c1823383f 100644 --- a/frontend/src/modules/bookmarks/views/bookmarkItemVw.ts +++ b/frontend/src/modules/bookmarks/views/bookmarkItemVw.ts @@ -78,19 +78,22 @@ export default class extends Mn.View { protected handleDelete() { this._deactivateInteractions(); - this.$el.hide('slide', null, 500); - this.model.destroy({ - error: () => { - this._activateInteractions(); - this.$el.show('slide', null, 500); - const notification = { - code: 1527277946, - message: $.i18n.__('bkm.delete.failure'), - type: 'error', - }; - App.eventBus.trigger('notification', notification); - }, - wait: true, + this.$el.hide('slide', null, 500, () => { + // Wait until the animation finished, so it isn't interrupted by the + // Ma-colleciton redraw on model removal. + this.model.destroy({ + error: () => { + this._activateInteractions(); + this.$el.show('slide', null, 500); + const notification = { + code: 1527277946, + message: $.i18n.__('bkm.delete.failure'), + type: 'error', + }; + App.eventBus.trigger('notification', notification); + }, + wait: true, + }); }); } diff --git a/frontend/src/modules/modalDialog/modalDialog.ts b/frontend/src/modules/modalDialog/modalDialog.ts index fe5a0351d..c970a9b93 100644 --- a/frontend/src/modules/modalDialog/modalDialog.ts +++ b/frontend/src/modules/modalDialog/modalDialog.ts @@ -1,16 +1,36 @@ +/** + * Saito - The Threaded Web Forum + * + * @copyright Copyright (c) the Saito Project Developers + * @link https://github.com/Schlaefer/Saito + * @license http://opensource.org/licenses/MIT + */ + import { Model } from 'backbone'; -import { View } from 'backbone.marionette'; +import { View, ViewOptions } from 'backbone.marionette'; import App from 'models/app'; import Tpl from 'modules/modalDialog/templates/modalDialog.html'; -import _ from 'underscore'; +import { defaults, delay } from 'underscore'; + +interface IModalDialogOptions { + /** + * Insert content after modal dialog is fully shown + */ + trailing: boolean; + title: string; + width: string; +} class ModalDialogView extends View { - // el: '#saito-modal-dialog', + /** + * View which will be rendered as main content into the modal dialog + */ + protected contentView: View|undefined; - private defaults: object; + private defaults: Partial; public constructor(options: any = {}) { - _.defaults(options, { + options = defaults(options, { regions: { content: '#saito-modal-dialog-content', }, @@ -18,8 +38,10 @@ class ModalDialogView extends View { }); super(options); this.defaults = { + trailing: false, width: 'normal', }; + this.contentView = undefined; } public initialize() { @@ -32,15 +54,20 @@ class ModalDialogView extends View { * @param {Marionette.View} content * @param {Object} */ - public show(content: View, options: any) { - options = _.defaults(options, this.defaults); + public show(content: View, options: Partial = {}) { + const showOptions = defaults(options, this.defaults) as IModalDialogOptions; this.model.set('title', options.title || ''); this.render(); - // puts content into dialog - this.showChildView('content', content); + this.setWidth(showOptions.width); - this.setWidth(options.width); + if (showOptions.trailing) { + // Insert content after showing the modal + this.contentView = content; + } else { + // Insert content before showing the modal + this.showContent(content); + } // shows BS dialog this.$el.parent().on('shown.bs.modal', () => { @@ -63,11 +90,29 @@ class ModalDialogView extends View { public invalidInput() { this.$el.addClass('animation shake'); - _.delay(() => { + delay(() => { this.$el.removeClass('animation shake', 1000); }); } + /** + * Called after the modal dialog is fully shown + */ + protected onShown() { + // Show trailing + if (this.contentView !== undefined) { + this.showContent(this.contentView); + this.contentView = undefined; + } + } + + /** + * Shows content + */ + protected showContent(contentView: View) { + this.showChildView('content', contentView); + } + private setWidth(width: string) { switch (width) { case 'max': diff --git a/frontend/src/modules/posting/Geshi.ts b/frontend/src/modules/posting/Geshi.ts index 1ac21a4d6..768c66b7e 100644 --- a/frontend/src/modules/posting/Geshi.ts +++ b/frontend/src/modules/posting/Geshi.ts @@ -68,7 +68,7 @@ class GeshiView extends View { private renderText() { if (this.model.get('isPlaintext') && this.plainText) { - this.block.text(this.plainText).wrapInner('
');
+            this.block.text(this.plainText).wrapInner('
');
         } else if (this.htmlText) {
             this.block.html(this.htmlText);
         }
diff --git a/frontend/src/modules/posting/models/PostingModel.ts b/frontend/src/modules/posting/models/PostingModel.ts
index 6638173ae..eaf038d08 100644
--- a/frontend/src/modules/posting/models/PostingModel.ts
+++ b/frontend/src/modules/posting/models/PostingModel.ts
@@ -1,25 +1,26 @@
 import { Model } from 'backbone';
 import * as $ from 'jquery';
 import App from 'models/app';
+import PostingMdl from 'models/PostingMdl';
 import _ from 'underscore';
 
-class PostingModel extends Model {
-    public defaults() {
-        const posting = {
-            text: null,
-        };
-        const meta = {
+class PostingModel extends PostingMdl {
+    public saitoUrl: string;
+
+    public constructor(defaults: any = {}, options: any = {}) {
+        _.defaults(defaults, {
             html: '',
             isAnsweringFormShown: false,
             isBookmarked: false,
-            isSolves: false,
-        };
+        });
+        super(defaults, options);
 
-        return _.extend(posting, meta);
+        // This model is currently not used for sending
+        this.saitoUrl = 'foo';
     }
 
     public initialize() {
-        this.listenTo(this, 'change:isSolves', this.syncSolved);
+        this.listenTo(this, 'change:solves', this.onChangeSolves);
     }
 
     public fetchHtml(options: any) {
@@ -34,15 +35,7 @@ class PostingModel extends Model {
         });
     }
 
-    public isRoot(): boolean {
-        const pid = this.get('pid');
-        if (!_.isNumber(pid)) {
-            throw new Error('pid is not a number.');
-        }
-        return pid === 0;
-    }
-
-    private syncSolved() {
+    private onChangeSolves() {
         $.ajax({
             dataType: 'json',
             type: 'POST',
diff --git a/frontend/src/modules/uploader/collections/leftToRenderCl.ts b/frontend/src/modules/uploader/collections/leftToRenderCl.ts
new file mode 100644
index 000000000..d728dadef
--- /dev/null
+++ b/frontend/src/modules/uploader/collections/leftToRenderCl.ts
@@ -0,0 +1,25 @@
+/**
+ * Saito - The Threaded Web Forum
+ *
+ * @copyright Copyright (c) the Saito Project Developers
+ * @link https://github.com/Schlaefer/Saito
+ * @license http://opensource.org/licenses/MIT
+ */
+
+import { Collection, Model } from 'backbone';
+
+class LeftToRenderCl extends Collection {
+    public constructor() {
+        super();
+        this.setComparator('time');
+    }
+
+    public setComparator(after: string = 'time') {
+        after = (after === 'time') ? 'id' : after;
+        this.comparator = (model: Model) => {
+            return -1 * model.get(after);
+        };
+    }
+}
+
+export default LeftToRenderCl;
diff --git a/frontend/src/modules/uploader/collections/uploads.ts b/frontend/src/modules/uploader/collections/uploads.ts
index 534d4def4..ab362b04d 100644
--- a/frontend/src/modules/uploader/collections/uploads.ts
+++ b/frontend/src/modules/uploader/collections/uploads.ts
@@ -1,4 +1,13 @@
+/**
+ * Saito - The Threaded Web Forum
+ *
+ * @copyright Copyright (c) the Saito Project Developers
+ * @link https://github.com/Schlaefer/Saito
+ * @license http://opensource.org/licenses/MIT
+ */
+
 import { JsonApiCollection, JsonApiModel } from 'lib/backbone/jsonApi';
+import UploadFilter from '../lib/uploadFilter';
 
 class UploadsModel extends JsonApiModel {
     protected saitoUrl = 'uploads/';
@@ -8,11 +17,17 @@ export default class extends JsonApiCollection {
     /** Bb collection model */
     public model = UploadsModel;
 
+    public uploadFilter!: UploadFilter;
+
     protected saitoUrl = 'uploads/';
 
-    /** Bb comparator */
-    public comparator = (model: UploadsModel) => {
-        // sort by latest first (negate ID for DESC)
-        return -1 * model.get('id');
+    public initialize() {
+        this.uploadFilter = new UploadFilter();
+    }
+
+    public getFiltered() {
+        return this.filter((model) => {
+            return this.uploadFilter.filter(model);
+        });
     }
 }
diff --git a/frontend/src/modules/uploader/lib/uploadFilter.ts b/frontend/src/modules/uploader/lib/uploadFilter.ts
new file mode 100644
index 000000000..cbe268658
--- /dev/null
+++ b/frontend/src/modules/uploader/lib/uploadFilter.ts
@@ -0,0 +1,82 @@
+/**
+ * Saito - The Threaded Web Forum
+ *
+ * @copyright Copyright (c) the Saito Project Developers
+ * @link https://github.com/Schlaefer/Saito
+ * @license http://opensource.org/licenses/MIT
+ */
+
+import { Model } from 'backbone';
+import { isEmpty } from 'underscore';
+
+/**
+ * Implements filtering of upload models
+ */
+class UploadFilter {
+    /**
+     * Search for upload file title/name
+     */
+    protected title: string|undefined;
+
+    /**
+     * Search string for upload type
+     */
+    protected mime: string|undefined;
+
+    /**
+     * Mime-type setter
+     * @param type Set mime subtype to check against
+     */
+    public setMime(type: string): void {
+        this.mime = isEmpty(type) ? undefined : type;
+    }
+
+    /**
+     * Title search setter
+     * @param title Title search string
+     */
+    public setTitle(title: string): void {
+        this.title = isEmpty(title) ? undefined : title;
+    }
+
+    /**
+     * Reset filter (unfiltered)
+     */
+    public reset(): void {
+        this.mime = undefined;
+        this.title = undefined;
+    }
+
+    /**
+     * Filter callback to check if a model should be shown
+     * @param model Model to apply the filter to
+     * @returns True if model should be shown, false otherwise.
+     */
+    public filter(model: Model): boolean {
+        /// Allow other cards (i.e. add new upload) without filtering
+        const isCardOfUploadedItem: boolean = (model.get('mime') !== undefined);
+        if (!isCardOfUploadedItem) {
+            return true;
+        }
+
+        /// Check for mime type
+        if (this.mime !== undefined) {
+            if (model.get('mime').indexOf(this.mime) !== 0) {
+                return false;
+            }
+        }
+
+        /// Check for title
+        if (this.title !== undefined) {
+            const title = model.get('title') + ' ' + model.get('name');
+            if (title.toLowerCase().indexOf(this.title.toLowerCase()) === -1) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+}
+
+export default UploadFilter;
diff --git a/frontend/src/modules/uploader/templates/uploadItemAudioTpl.html b/frontend/src/modules/uploader/templates/uploadItemAudioTpl.html
index c5e576e3a..3634a627d 100644
--- a/frontend/src/modules/uploader/templates/uploadItemAudioTpl.html
+++ b/frontend/src/modules/uploader/templates/uploadItemAudioTpl.html
@@ -1,12 +1,7 @@
 
     

-        
-        

 
-

-

+

+

diff --git a/frontend/src/modules/uploader/templates/uploadItemGenericTpl.html b/frontend/src/modules/uploader/templates/uploadItemGenericTpl.html
index 82eca1a25..df5f28193 100644
--- a/frontend/src/modules/uploader/templates/uploadItemGenericTpl.html
+++ b/frontend/src/modules/uploader/templates/uploadItemGenericTpl.html
@@ -5,5 +5,5 @@
         
     
 
-

-

+

+

diff --git a/frontend/src/modules/uploader/templates/uploadItemImageTpl.html b/frontend/src/modules/uploader/templates/uploadItemImageTpl.html
index 3749fb515..6437b7c9f 100644
--- a/frontend/src/modules/uploader/templates/uploadItemImageTpl.html
+++ b/frontend/src/modules/uploader/templates/uploadItemImageTpl.html
@@ -1,18 +1,13 @@
 
     

-            
-            
-                    data-src="<%= thumbnail_url %>"
+                    src="<%= thumbnail_url %>"
                 <% } else { %>
-                    data-src="<%= url %>"
+                    src="<%= url %>"
                 <% }  %>
             >
     

 
-

-

+

+

diff --git a/frontend/src/modules/uploader/templates/uploadItemVideoTpl.html b/frontend/src/modules/uploader/templates/uploadItemVideoTpl.html
index d800a6e94..bd4ce73f6 100644
--- a/frontend/src/modules/uploader/templates/uploadItemVideoTpl.html
+++ b/frontend/src/modules/uploader/templates/uploadItemVideoTpl.html
@@ -1,12 +1,7 @@
 
     

-        
-        

 
-

-

+

+

diff --git a/frontend/src/modules/uploader/templates/uploaderAddTpl.html b/frontend/src/modules/uploader/templates/uploaderAddTpl.html
index 9c8c16edb..c6eb4f83c 100644
--- a/frontend/src/modules/uploader/templates/uploaderAddTpl.html
+++ b/frontend/src/modules/uploader/templates/uploaderAddTpl.html
@@ -7,27 +7,24 @@
         

     
     

-        

-        

-            
+        

+            <%
+            // To present a nice upload button we generate a stayled fake button.
+            // Beneath the styled dummy button is the actual input file upload,
+            // but it's hidden behind the opacity: 0 curtain div.
+            // z-index: 2000 to have the button above the jQuery UI modal.
+            %>
+            
-            

-                <%
-                // To present a nice upload button we generate a stayled fake button.
-                // Beneath the styled dummy button is the actual input file upload,
-                // but it's hidden behind the opacity: 0 curtain div.
-                // z-index: 2000 to have the button above the jQuery UI modal.
-                %>
-                
-                

-                    
-                

+            

+                
             

         

     

diff --git a/frontend/src/modules/uploader/uploader.ts b/frontend/src/modules/uploader/uploader.ts
index d1e71af5a..1b72ba7b8 100644
--- a/frontend/src/modules/uploader/uploader.ts
+++ b/frontend/src/modules/uploader/uploader.ts
@@ -1,37 +1,185 @@
-import { Model } from 'backbone';
-import { View } from 'backbone.marionette';
-import _ from 'underscore';
+/**
+ * Saito - The Threaded Web Forum
+ *
+ * @copyright Copyright (c) the Saito Project Developers
+ * @link https://github.com/Schlaefer/Saito
+ * @license http://opensource.org/licenses/MIT
+ */
+
+import { Collection, Model } from 'backbone';
+import { CollectionViewOptions, View } from 'backbone.marionette';
+import { debounce, defaults, template, throttle } from 'underscore';
 import { SpinnerView } from 'views/SpinnerView';
+import LeftToRenderCl from './collections/leftToRenderCl';
 import UploadsCollection from './collections/uploads';
+import UploaderMenuMdl from './views/menu/uploaderMenuMdl';
+import UploaderMenuVw from './views/menu/uploaderMenuVw';
+import UploaderAddVw from './views/uploaderAddVw';
 import UploaderClVw from './views/uploaderCollectionVw';
 
+interface IUploaderPermissions {
+    'saito.plugin.uploader.add': boolean;
+    'saito.plugin.uploader.delete': boolean;
+    'saito.plugin.uploader.view': boolean;
+}
+
+interface IUploaderOptions extends CollectionViewOptions {
+    userId: string;
+    permission: IUploaderPermissions;
+}
+
 class UploaderVw extends View {
-    public constructor(options: object = {}) {
-        _.defaults(options, {
+    public collection!: UploadsCollection;
+    /**
+     * Temporary bucket filled with views left to render with lazy loading
+     */
+    protected collectionLeftToRender: LeftToRenderCl;
+
+    protected throttledRender: () => void;
+
+    protected uploaderClVw!: UploaderClVw;
+
+    protected uploaderMenuMdl!: UploaderMenuMdl;
+
+    public constructor(options: IUploaderOptions) {
+        options = defaults(options, {
             className: 'imageUploader',
+            collection: new UploadsCollection(),
+            modelEvents: {
+                'change:open': 'onChangeOpen',
+            },
             regions: {
-                addRegion: '.js-imageUploader-add',
                 collectionRegion: '.js-imageUploader-list',
+                menuRg: '.js-menuRg',
             },
-            template: _.template('
'),
+            template: template(`
+                

+                

+            `),
         });
         super(options);
-    }
 
-    public initialize() {
-        this.collection = new UploadsCollection();
+        this.collectionLeftToRender = new LeftToRenderCl();
+
+        // Debounce filter reset when many filter criteria change at once
+        this.renderCollection = debounce(this.renderCollection, 20);
+        this.throttledRender = throttle(() => this.iterativeRender(), 500);
     }
 
     public onRender() {
         this.showChildView('collectionRegion', new SpinnerView());
 
         this.collection.fetch({
+            data: {
+                id: this.getOption('userId'),
+            },
             success: (collection) => {
-                const clV = new UploaderClVw({ collection });
-                this.showChildView('collectionRegion', clV);
+                this.renderMenu();
+                this.uploaderClVw = new UploaderClVw({
+                    collection: new Collection(),
+                    permission: this.getOption('permission'),
+                    userId: this.getOption('userId'),
+                });
+                // Preset before first rendering (prevents "no content" display)
+                this.resetCollectionToRender();
+                this.showChildView('collectionRegion', this.uploaderClVw);
+                // Render without delay
+                this.iterativeRender();
+                this.initLazyLoading();
             },
         });
     }
+
+    public onDestroy() {
+        document.removeEventListener('scroll', this.throttledRender);
+        window.removeEventListener('resize', this.throttledRender);
+    }
+
+    protected initLazyLoading() {
+        this.listenTo(this.collection, 'add', () => {
+            this.uploaderMenuMdl.reset();
+            this.renderCollection();
+        });
+        document.addEventListener('scroll', this.throttledRender, true);
+        window.addEventListener('resize', this.throttledRender, true);
+    }
+
+    protected iterativeRender() {
+        const shouldRenderAnother = (minimum: number = 5, belowFold: number = 10) => {
+            const children = this.uploaderClVw.children as unknown as any;
+            if (children.length <= minimum) {
+                return true;
+            }
+            const view = children.last(belowFold + 1)[0];
+            const rect = view.$el[0].getBoundingClientRect();
+            const windowBottom = window.innerHeight;
+            return rect.top < windowBottom;
+        };
+
+        while (shouldRenderAnother()) {
+            if (this.collectionLeftToRender.length === 0) {
+                break;
+            }
+            this.uploaderClVw.collection.add(this.collectionLeftToRender.shift());
+        }
+    }
+
+    protected renderCollection() {
+        this.resetCollectionToRender();
+        this.iterativeRender();
+    }
+
+    protected resetCollectionToRender() {
+        this.uploaderClVw.collection.reset();
+        if (this.getOption('permission')['saito.plugin.uploader.add']) {
+            const addView = new UploaderAddVw({
+                collection: this.collection,
+                userId: this.getOption('userId'),
+            });
+            this.uploaderClVw.addChildView(addView, 0);
+        }
+        this.collectionLeftToRender.reset(this.collection.getFiltered());
+    }
+
+    protected renderMenu() {
+        this.uploaderMenuMdl = new UploaderMenuMdl();
+
+        this.showChildView('menuRg', new UploaderMenuVw({
+            collection: this.collection,
+            model: this.uploaderMenuMdl,
+        }));
+
+        this.listenTo(this.uploaderMenuMdl, 'change:open', this.onChangeOpen);
+        this.listenTo(this.uploaderMenuMdl, 'change:filterTitle', this.onChangeFilterTitle);
+        this.listenTo(this.uploaderMenuMdl, 'change:filterType', this.onChangeFilterType);
+        this.listenTo(this.uploaderMenuMdl, 'change:sort', this.onChangeSort);
+    }
+
+    protected onChangeOpen(model: UploaderMenuMdl) {
+        if (!model.get('open')) {
+            model.reset();
+        }
+    }
+
+    protected onChangeFilterType(model: UploaderMenuMdl) {
+        this.collection.uploadFilter.setMime(model.get('filterType'));
+        this.renderCollection();
+    }
+
+    protected onChangeFilterTitle(model: UploaderMenuMdl) {
+        this.collection.uploadFilter.setTitle(model.get('filterTitle'));
+        this.renderCollection();
+    }
+
+    protected onChangeSort(model: UploaderMenuMdl) {
+        this.collectionLeftToRender.setComparator(model.get('sort'));
+        this.renderCollection();
+    }
+
 }
 
 export default UploaderVw;
+export {
+    IUploaderOptions,
+    UploaderVw,
+};
diff --git a/frontend/src/modules/uploader/views/menu/uploaderMenuMdl.ts b/frontend/src/modules/uploader/views/menu/uploaderMenuMdl.ts
new file mode 100644
index 000000000..6a2459cb3
--- /dev/null
+++ b/frontend/src/modules/uploader/views/menu/uploaderMenuMdl.ts
@@ -0,0 +1,28 @@
+/**
+ * Saito - The Threaded Web Forum
+ *
+ * @copyright Copyright (c) the Saito Project Developers
+ * @link https://github.com/Schlaefer/Saito
+ * @license http://opensource.org/licenses/MIT
+ */
+
+import { Model } from 'backbone';
+
+class UploaderMenuMdl extends Model {
+    public defaults() {
+        return {
+            filterTitle: undefined,
+            filterType: undefined,
+            open: false,
+            sort: 'time',
+        };
+    }
+
+    public reset() {
+        const defaults = this.defaults();
+        delete defaults.open;
+        this.set(defaults);
+    }
+}
+
+export default UploaderMenuMdl;
diff --git a/frontend/src/modules/uploader/views/menu/uploaderMenuSortVw.ts b/frontend/src/modules/uploader/views/menu/uploaderMenuSortVw.ts
new file mode 100644
index 000000000..175762522
--- /dev/null
+++ b/frontend/src/modules/uploader/views/menu/uploaderMenuSortVw.ts
@@ -0,0 +1,70 @@
+/**
+ * Saito - The Threaded Web Forum
+ *
+ * @copyright Copyright (c) the Saito Project Developers
+ * @link https://github.com/Schlaefer/Saito
+ * @license http://opensource.org/licenses/MIT
+ */
+
+import { Model } from 'backbone';
+import { View, ViewOptions } from 'backbone.marionette';
+import $ from 'jquery';
+import { defaults, template, unique } from 'underscore';
+import UploaderMenuMdl from './uploaderMenuMdl';
+
+/**
+ * Sort
+ */
+class UploaderMenuSortVw extends View {
+    public constructor(options: ViewOptions = {}) {
+        defaults(options, {
+            events: {
+                'change input[type=radio]': 'onChangeSorting',
+            },
+            model: UploaderMenuMdl,
+            modelEvents: {
+                'change:sort': 'onChangeSort',
+            },
+            template: template(`
+<% for ([index, field] of fields.entries()) { %>
+    

+         checked="" <% } %>>
+        
+    

+<% } %>
+            `),
+        });
+
+        super(options);
+    }
+
+    public templateContext() {
+        return {
+            fields: [
+                { id: 'time', label: $.i18n.__('upl.menu.sort.time')},
+                { id: 'size', label: $.i18n.__('upl.menu.sort.size')},
+            ],
+        };
+    }
+
+    protected onChangeSorting(event: JQueryEventObject) {
+        const value = $(event.target).val();
+        this.model.set('sort', value);
+    }
+
+    protected onChangeSort(model: UploaderMenuMdl) {
+        const newSort = model.get('sort');
+        const input = this.$('input[value=' + newSort + ']')[0] as HTMLFormElement;
+        if (!input.checked) {
+            input.checked = true;
+        }
+    }
+}
+
+export default UploaderMenuSortVw;
diff --git a/frontend/src/modules/uploader/views/menu/uploaderMenuTitleVw.ts b/frontend/src/modules/uploader/views/menu/uploaderMenuTitleVw.ts
new file mode 100644
index 000000000..f44d2fad8
--- /dev/null
+++ b/frontend/src/modules/uploader/views/menu/uploaderMenuTitleVw.ts
@@ -0,0 +1,62 @@
+/**
+ * Saito - The Threaded Web Forum
+ *
+ * @copyright Copyright (c) the Saito Project Developers
+ * @link https://github.com/Schlaefer/Saito
+ * @license http://opensource.org/licenses/MIT
+ */
+
+import { $, Model } from 'backbone';
+import { View, ViewOptions } from 'backbone.marionette';
+import { debounce, defaults, isEmpty, noop} from 'underscore';
+import UploaderMenuMdl from './uploaderMenuMdl';
+
+/**
+ * Filter by filename or title
+ */
+class UploaderMenuTitleVw extends View {
+    public constructor(options: ViewOptions = {}) {
+        defaults(options, {
+            attributes: {
+                placeholder: $.i18n.__('upl.menu.search.t'),
+                type: 'text',
+            },
+            className: 'form-control',
+            events: {
+                keyup: 'onChangeInput',
+            },
+            model: UploaderMenuMdl,
+            modelEvents: {
+                'change:filterTitle': 'onChangeFilterTitle',
+            },
+            tagName: 'input',
+            template: noop,
+            ui: {
+                input: 'input',
+            },
+        });
+
+        super(options);
+
+        // Don't render results on each keystroke
+        this.setFilterTitle = debounce(this.setFilterTitle, 500);
+    }
+
+    protected onChangeInput(event: JQueryEventObject) {
+        const element = event.target as HTMLInputElement;
+        this.setFilterTitle(element.value);
+    }
+
+    protected setFilterTitle(value: string) {
+        this.model.set('filterTitle', value);
+    }
+
+    protected onChangeFilterTitle(model: UploaderMenuMdl) {
+        const newTitle = model.get('filterTitle');
+        if (newTitle === undefined) {
+            this.el.value = '';
+        }
+    }
+}
+
+export default UploaderMenuTitleVw;
diff --git a/frontend/src/modules/uploader/views/menu/uploaderMenuTypeVw.ts b/frontend/src/modules/uploader/views/menu/uploaderMenuTypeVw.ts
new file mode 100644
index 000000000..66a6ec37b
--- /dev/null
+++ b/frontend/src/modules/uploader/views/menu/uploaderMenuTypeVw.ts
@@ -0,0 +1,90 @@
+/**
+ * Saito - The Threaded Web Forum
+ *
+ * @copyright Copyright (c) the Saito Project Developers
+ * @link https://github.com/Schlaefer/Saito
+ * @license http://opensource.org/licenses/MIT
+ */
+
+import { Collection, Model } from 'backbone';
+import { View, ViewOptions } from 'backbone.marionette';
+import $ from 'jquery';
+import { defaults, escape, template, unique } from 'underscore';
+import UploaderMenuMdl from './uploaderMenuMdl';
+
+/**
+ * Shows mime-type selector
+ */
+class UploaderMenuTypeVw extends View {
+    public constructor(options: ViewOptions & {collection: Collection}) {
+        defaults(options, {
+            className: 'form-control',
+            events: {
+                change: 'onChangeSelect',
+            },
+            model: UploaderMenuMdl,
+            modelEvents: {
+                'change:filterType': 'onChangeFilterType',
+            },
+            tagName: 'select',
+            template: template(`
+                
+            `),
+            ui: {
+                select: 'select',
+            },
+        });
+
+        super(options);
+    }
+
+    public onRender() {
+        const types = unique(this.collection.pluck('mime').map((s) => s.split('/')[0])).sort();
+        for (const type of types) {
+            let l10n;
+            let value;
+            // Have every type string written out for l10n in po files
+            switch (type) {
+                case 'application':
+                    value = 'application';
+                    l10n =  $.i18n.__('upl.mime.type.app');
+                    break;
+                case 'audio':
+                    value = 'audio';
+                    l10n =  $.i18n.__('upl.mime.type.audio');
+                    break;
+                case 'image':
+                    value = 'image';
+                    l10n =  $.i18n.__('upl.mime.type.image');
+                    break;
+                case 'text':
+                    value = 'text';
+                    l10n =  $.i18n.__('upl.mime.type.text');
+                    break;
+                case 'video':
+                    value = 'video';
+                    l10n =  $.i18n.__('upl.mime.type.video');
+                    break;
+                default:
+                    // Filtering for unknown/misc formats not implemented.
+                    // PRs welcome.
+                    continue;
+            }
+            this.$el.append('');
+        }
+    }
+
+    protected onChangeSelect(event: JQueryEventObject) {
+        const select = event.target as HTMLSelectElement;
+        this.model.set('filterType', select.value);
+    }
+
+    protected onChangeFilterType(model: UploaderMenuMdl) {
+        if (model.get('filterType') === undefined) {
+            const select = this.el as HTMLSelectElement;
+            select.selectedIndex = 0;
+        }
+    }
+}
+
+export default UploaderMenuTypeVw;
diff --git a/frontend/src/modules/uploader/views/menu/uploaderMenuVw.ts b/frontend/src/modules/uploader/views/menu/uploaderMenuVw.ts
new file mode 100644
index 000000000..c718f133a
--- /dev/null
+++ b/frontend/src/modules/uploader/views/menu/uploaderMenuVw.ts
@@ -0,0 +1,84 @@
+/**
+ * Saito - The Threaded Web Forum
+ *
+ * @copyright Copyright (c) the Saito Project Developers
+ * @link https://github.com/Schlaefer/Saito
+ * @license http://opensource.org/licenses/MIT
+ */
+
+import { View, ViewOptions } from 'backbone.marionette';
+import { defaults, template } from 'underscore';
+import UploaderMenuMdl from './uploaderMenuMdl';
+import UploaderMenuSortVw from './uploaderMenuSortVw';
+import UploaderMenuTitleVw from './uploaderMenuTitleVw';
+import UploaderMenuTypeVw from './uploaderMenuTypeVw';
+
+class UploaderMenuVw extends View {
+    public constructor(options: ViewOptions = {}) {
+        options = defaults(options, {
+            className: 'd-flex justify-content-end align-items-center',
+            events: {
+                'click @ui.btnMenu': 'onClickBtnMenu',
+                'click @ui.btnReset': 'onClickBtnReset',
+            },
+            model: UploaderMenuMdl,
+            modelEvents: {
+                'change:open': 'onChangeOpen',
+            },
+            regions: {
+                sortRg: '.js-sortRg',
+                titleRg: '.js-titleRg',
+                typeRg: '.js-typeRg',
+            },
+            template: template(`
+

+    
+

+
+            `),
+            ui: {
+                btnMenu: '.js-btnMenu',
+                btnReset: '.js-btnReset',
+                filter: '.js-filter',
+            },
+        });
+        super(options);
+    }
+
+    public onRender() {
+        this.showChildView('sortRg', new UploaderMenuSortVw({ model: this.model }));
+        this.showChildView('typeRg', new UploaderMenuTypeVw({
+            collection: this.collection,
+            model: this.model,
+        }));
+        this.showChildView('titleRg', new UploaderMenuTitleVw({ model: this.model }));
+    }
+
+    protected onClickBtnMenu() {
+        this.model.set('open', !this.model.get('open'));
+    }
+
+    protected onClickBtnReset() {
+        this.model.reset();
+    }
+
+    protected onChangeOpen(model: UploaderMenuMdl) {
+        const $filter = this.getUI('filter');
+        if (model.get('open')) {
+            $filter.slideDown();
+        } else {
+            $filter.slideUp();
+        }
+    }
+}
+
+export default UploaderMenuVw;
diff --git a/frontend/src/modules/uploader/views/uploaderAdd/uploaderAddStatsVw.ts b/frontend/src/modules/uploader/views/uploaderAdd/uploaderAddStatsVw.ts
index f69ae0274..0761e1666 100644
--- a/frontend/src/modules/uploader/views/uploaderAdd/uploaderAddStatsVw.ts
+++ b/frontend/src/modules/uploader/views/uploaderAdd/uploaderAddStatsVw.ts
@@ -8,9 +8,9 @@
 
 import { Model } from 'backbone';
 import { View } from 'backbone.marionette';
-import * as _ from 'underscore';
 import moment from 'moment';
 import numeral from 'numeral';
+import * as _ from 'underscore';
 
 class StatsVw extends View {
     /**
@@ -21,8 +21,8 @@ class StatsVw extends View {
         _.defaults(options, {
             classTag: 'imageUploader-card-details',
             modelEvents: {
+                'change:fileToUpload': 'onChangeFile',
                 'change:progress': 'onChangeProgress',
-                'change:fileToUpload': 'onChangeFile'
             },
             template: _.template(`
             
    
@@ -42,8 +42,8 @@ class StatsVw extends View {
             `),
             ui: {
                 speed: '.js-speed',
-                total: '.js-total',
                 time: '.js-time',
+                total: '.js-total',
             },
         });
         super(...arguments);
@@ -75,7 +75,6 @@ class StatsVw extends View {
         }
         this.getUI('speed').html(numeral(bitrate).format('0 b') + '/s');
 
-
         const total = model.get('fileToUpload').size;
         let remaining = Math.floor((total - model.get('loaded')) / bitrate) + 1;
         remaining = remaining >= 0 ? remaining : 0;
diff --git a/frontend/src/modules/uploader/views/uploaderAddVw.ts b/frontend/src/modules/uploader/views/uploaderAddVw.ts
index 2d6be6a29..80621a2ab 100644
--- a/frontend/src/modules/uploader/views/uploaderAddVw.ts
+++ b/frontend/src/modules/uploader/views/uploaderAddVw.ts
@@ -7,7 +7,7 @@
  */
 
 import { Model } from 'backbone';
-import { View } from 'backbone.marionette';
+import { View, ViewOptions } from 'backbone.marionette';
 import App from 'models/app';
 import * as _ from 'underscore';
 import Template from '../templates/uploaderAddTpl.html';
@@ -16,6 +16,13 @@ import UploaderAddMdl from './uploaderAdd/uploaderAddMdl';
 import ProgressBarVw from './uploaderAdd/uploaderAddProgressVw';
 import StatsVw from './uploaderAdd/uploaderAddStatsVw';
 
+interface IUploaderAddOptions extends ViewOptions {
+    /**
+     * The ID of the user account the file will be uploaded to.
+     */
+    userId: string;
+}
+
 class UploaderAddVw extends View {
     private xhr: XMLHttpRequest|undefined;
 
@@ -24,7 +31,7 @@ class UploaderAddVw extends View {
      *
      * @param options Ma view options
      */
-    public constructor(options: any = {}) {
+    public constructor(options: IUploaderAddOptions) {
         _.defaults(options, {
             className: 'imageUploader-card imageUploader-add card',
             events: {
@@ -49,6 +56,7 @@ class UploaderAddVw extends View {
             },
         });
         super(...arguments);
+        this.model.set('userId', options.userId);
     }
 
     /**
@@ -63,8 +71,7 @@ class UploaderAddVw extends View {
     /**
      * Ma onBeforeDestroy callback
      */
-    public onBeforeDestroy()
-    {
+    public onBeforeDestroy() {
         if (this.model.get('uploadInProgress')) {
             this.onAbortBtn();
         }
@@ -141,6 +148,7 @@ class UploaderAddVw extends View {
 
         const formData = new FormData();
         formData.append('upload[0][file]', file);
+        formData.append('userId', this.model.get('userId'));
 
         xhr.send(formData);
     }
diff --git a/frontend/src/modules/uploader/views/uploaderCollectionVw.ts b/frontend/src/modules/uploader/views/uploaderCollectionVw.ts
index 5397f5d33..cf85b5e00 100644
--- a/frontend/src/modules/uploader/views/uploaderCollectionVw.ts
+++ b/frontend/src/modules/uploader/views/uploaderCollectionVw.ts
@@ -1,24 +1,26 @@
+/**
+ * Saito - The Threaded Web Forum
+ *
+ * @copyright Copyright (c) the Saito Project Developers
+ * @link https://github.com/Schlaefer/Saito
+ * @license http://opensource.org/licenses/MIT
+ */
+
 import { Collection, Model } from 'backbone';
 import { CollectionView, View } from 'backbone.marionette';
-import Blazy from 'blazy';
 import $ from 'jquery';
-import App from 'models/app';
 import * as _ from 'underscore';
 import { NoContentView as EmptyView } from 'views/NoContentView';
+import { IUploaderOptions } from '../uploader';
 import UploaderItemVw from './uploaderItemVw';
-import UploaderAddVw from './uploaderAddVw';
 
 class UploaderClVw extends CollectionView, Collection> {
-    private blazy!: BlazyInstance;
-
-    private throttledLoader: any;
-
-    public constructor(options: any = {}) {
+    public constructor(options: IUploaderOptions) {
         _.defaults(options, {
             childView: UploaderItemVw,
-            childViewEvents: {
-                // new image was uploaded and inserted
-                'dom:refresh': 'initLazyLoading',
+            childViewOptions: {
+                permission: options.permission,
+                userId: options.userId,
             },
             className: 'imageUploader-cards',
             emptyView: EmptyView,
@@ -30,47 +32,6 @@ class UploaderClVw extends CollectionView, Collection> {
         });
         super(...arguments);
     }
-    public onRender() {
-        const addVw = new UploaderAddVw({collection: this.collection});
-        this.addChildView(addVw, 0);
-        this.listenTo(App.eventBus, 'app:modal:shown', this.initLazyLoading);
-        this.initLazyLoading();
-    }
-
-    /**
-     * Initializes the lazy loading
-     *
-     * Throttle the initial dom:refresh-events from exisiting uploads
-     */
-    public initLazyLoading() {
-        if (!this.throttledLoader) {
-            this.throttledLoader = _.throttle(() => {
-                // Uploader is displayed in modal dialog which isn't fully shown yet.
-                // Blazy doesn't see those images and wont load them.
-                const isVisisble = $('.imageUploader:visible').length > 0;
-                if (!isVisisble) {
-                    return;
-                }
-
-                if (this.blazy) {
-                    this.blazy.revalidate();
-                    return;
-                }
-
-                this.blazy = new Blazy({
-                    // lazy load elements inside a scrolling container: selector of the container
-                    // if you change test that lazy loading in modal dialog and static page is working
-                    container: '#saito-modal-dialog',
-                    success: (el) => {
-                        // ugly hack to get to the parent here
-                        $(el).parent().parent().find('.image-uploader-spinner').remove();
-                    },
-                });
-            }, 300);
-        }
-
-        this.throttledLoader();
-    }
 }
 
 export default UploaderClVw;
diff --git a/frontend/src/modules/uploader/views/uploaderItemFooterVw.ts b/frontend/src/modules/uploader/views/uploaderItemFooterVw.ts
index e64c8b5c7..a916f851e 100644
--- a/frontend/src/modules/uploader/views/uploaderItemFooterVw.ts
+++ b/frontend/src/modules/uploader/views/uploaderItemFooterVw.ts
@@ -1,12 +1,13 @@
 import { Model } from 'backbone';
 import { View } from 'backbone.marionette';
-import numeral from 'numeral';
 import App from 'models/app';
+import numeral from 'numeral';
 import { defaults, template } from 'underscore';
 import TextElipsisVw from 'views/TextElipsisVw';
+import { IUploaderOptions } from '../uploader';
 
 class UploaderItemFooterVw extends View {
-    public constructor(options: any = {}) {
+    public constructor(options: IUploaderOptions) {
         defaults(options, {
             className: 'imageUploader-card-details',
             events: {
@@ -27,9 +28,11 @@ class UploaderItemFooterVw extends View {
                         <%- filesize %>
                     
                 

-                
+                <% if (permission['saito.plugin.uploader.delete']) { %>
+                    
+                <% } %>
             `),
         });
         super(...arguments);
@@ -59,6 +62,7 @@ class UploaderItemFooterVw extends View {
             created: new Date(this.model.get('created'))
                 .toLocaleDateString(App.settings.get('language')),
             filesize: numeral(this.model.get('size')).format('0.0 b'),
+            permission: this.getOption('permission'),
         };
     }
 }
diff --git a/frontend/src/modules/uploader/views/uploaderItemVw.ts b/frontend/src/modules/uploader/views/uploaderItemVw.ts
index 9945d4ca7..70f87e57d 100644
--- a/frontend/src/modules/uploader/views/uploaderItemVw.ts
+++ b/frontend/src/modules/uploader/views/uploaderItemVw.ts
@@ -1,23 +1,32 @@
+/**
+ * Saito - The Threaded Web Forum
+ *
+ * @copyright Copyright (c) the Saito Project Developers
+ * @link https://github.com/Schlaefer/Saito
+ * @license http://opensource.org/licenses/MIT
+ */
+
 import { Model } from 'backbone';
 import { View } from 'backbone.marionette';
 import App from 'models/app';
-import * as _ from 'underscore';
+import { defaults } from 'underscore';
 import AudioTpl from '../templates/uploadItemAudioTpl.html';
 import GenericTpl from '../templates/uploadItemGenericTpl.html';
 import ImageTpl from '../templates/uploadItemImageTpl.html';
 import VideoTpl from '../templates/uploadItemVideoTpl.html';
+import { IUploaderOptions } from '../uploader';
 import UploaderItemFooterVw from './uploaderItemFooterVw';
 
 class UploaderItemVw extends View {
-    public constructor(options: any = {}) {
-        _.defaults(options, {
+    public constructor(options: IUploaderOptions) {
+        options = defaults(options, {
             className: 'card imageUploader-card',
             regions: {
                 footer: '.js-footer',
                 rgForm: '.js-rgForm',
             },
         });
-        super(...arguments);
+        super(options);
     }
 
     public getTemplate() {
@@ -36,20 +45,17 @@ class UploaderItemVw extends View {
     }
 
     public onRender() {
-        this.showChildView('footer', new UploaderItemFooterVw({ model: this.model }));
+        this.showChildView('footer', new UploaderItemFooterVw({
+            model: this.model,
+            permission: this.getOption('permission'),
+            userId: this.getOption('userId'),
+        }));
 
         const actionView = App.eventBus.request('uploader:item:action');
         if (actionView) {
             actionView.model = this.model;
             this.showChildView('rgForm', actionView);
-        } else {
-            this.removeRegion('rgForm');
-            this.$('.js-rgForm').remove();
         }
-
-        //// delay display of loading spinner
-        this.$('.image-uploader-spinner').css('visibility', 'hidden');
-        _.delay(() => { this.$('.image-uploader-spinner').css('visibility', 'visible'); }, 2000);
     }
 }
 
diff --git a/frontend/src/modules/user/userVw.ts b/frontend/src/modules/user/userVw.ts
index ffc62ca4a..59d40e625 100644
--- a/frontend/src/modules/user/userVw.ts
+++ b/frontend/src/modules/user/userVw.ts
@@ -21,6 +21,8 @@ export default class extends Mn.View {
         <%- $.i18n.__('bkm.title.pl') %>
     
     
+<% } %>
+<% if (permission['saito.plugin.uploader.view']) { %>
     
  • 
     
         <%- $.i18n.__('upl.title.pl') %>
@@ -60,6 +62,7 @@ export default class extends Mn.View {
     private templateContext() {
         return {
             current: App.currentUser.get('id') === this.model.get('id'),
+            permission: this.model.get('permission'),
         };
     }
 
@@ -72,7 +75,10 @@ export default class extends Mn.View {
 
     private handleBtnUploads() {
         if (!this.getRegion('rgUploads').hasView()) {
-            this.showChildView('rgUploads', new UploaderVw());
+            this.showChildView('rgUploads', new UploaderVw({
+                permission: this.model.get('permission'),
+                userId: this.model.get('id'),
+            }));
         }
         this.scrollToTop();
     }
diff --git a/frontend/src/views/TextElipsisVw.ts b/frontend/src/views/TextElipsisVw.ts
index 126dc44d7..5239f1b75 100644
--- a/frontend/src/views/TextElipsisVw.ts
+++ b/frontend/src/views/TextElipsisVw.ts
@@ -14,8 +14,8 @@ class TextElipsisVw extends View {
     public constructor(options: {field?: string, model: Model, modelEvents?: any}) {
         _.defaults(options, {
             cutOff: 5,
-            modelEvents: {},
             field: 'title',
+            modelEvents: {},
             template: _.template(`
             
    
                 
    
@@ -47,7 +47,7 @@ class TextElipsisVw extends View {
             title: text || '',
             titleStart: text ? sliceStart(text, cutOff) : '',
             titleTrunc: text ? sliceEnd(text, cutOff) : '',
-        }
+        };
     }
 }
 
diff --git a/frontend/src/views/app.ts b/frontend/src/views/app.ts
index ef9bb5f4c..e962bc5be 100644
--- a/frontend/src/views/app.ts
+++ b/frontend/src/views/app.ts
@@ -126,8 +126,7 @@ class AppView extends View {
     }
 
     public _initUser(element: JQuery) {
-        const id = Number.parseInt(element.data('id'), 10);
-        const model = new Bb.Model({ id });
+        const model = new Bb.Model(element.data('user'));
         const User = new UserVw({ el: element, model });
         User.render();
     }
diff --git a/frontend/src/views/postingActionSolves.ts b/frontend/src/views/postingActionSolves.ts
index 7aaf9c8c7..44c83e39e 100644
--- a/frontend/src/views/postingActionSolves.ts
+++ b/frontend/src/views/postingActionSolves.ts
@@ -2,6 +2,7 @@ import { View } from 'backbone.marionette';
 import $ from 'jquery';
 import App from 'models/app';
 import _ from 'underscore';
+import { isNumber } from 'util';
 import PostingModel from '../models/PostingMdl';
 
 export default class extends View {
@@ -16,7 +17,7 @@ export default class extends View {
             },
 
             modelEvents: {
-                'change:isSolves': '_toggle',
+                'change:solves': 'onChangeSolves',
             },
             tagName: 'a',
             template: _.template(''),
@@ -40,38 +41,38 @@ export default class extends View {
     }
 
     private _shouldRender() {
-        if (!App.currentUser.isLoggedIn()) {
-            return false;
-        }
-        if (this.model.isRoot()) {
-            return false;
-        }
-        if (this.model.get('rootEntryUserId') !== App.currentUser.get('id')) {
-            return false;
-        }
-        return true;
+        return this.model.get('showSolvedBtn');
     }
 
     private _onClick(event: Event) {
         event.preventDefault();
-        this.model.toggle('isSolves');
+        const solves = this.model.get('solves');
+        if (isNumber(solves) && solves > 0) {
+            this.model.set('solves', 0);
+        } else {
+            this.model.set('solves', this.model.get('tid'));
+        }
+    }
+
+    private onChangeSolves() {
+        this._toggle();
     }
 
     private _toggle() {
         const $icon = this.$('i');
-        const isSolves = this.model.get('isSolves');
+        const isSolves = this.model.get('solves');
         let html = '';
 
-        if (isSolves) {
+        if (isSolves === 0) {
+            $icon.removeClass('fa-badge-solves');
+            $icon.addClass('fa-badge-solves-o');
+            $icon.removeClass('solves-isSolved');
+        } else {
             $icon.addClass('solves-isSolved');
             $icon.removeClass('fa-badge-solves-o');
             $icon.addClass('fa-badge-solves');
             html = this.$el.html();
             $(html).removeClass('fa-lg');
-        } else {
-            $icon.removeClass('fa-badge-solves');
-            $icon.addClass('fa-badge-solves-o');
-            $icon.removeClass('solves-isSolved');
         }
         this._toggleGlobal(html);
     }
diff --git a/frontend/test/modules/answering/DraftSpec.js b/frontend/test/modules/answering/DraftSpec.js
index 527ea9b41..8c28a0ec6 100644
--- a/frontend/test/modules/answering/DraftSpec.js
+++ b/frontend/test/modules/answering/DraftSpec.js
@@ -21,7 +21,7 @@ describe('answering form', () => {
           expect(view.send).toHaveBeenCalled();
 
           const request = $.ajax.calls.mostRecent().args[0];
-          expect(JSON.parse(request.data)).toEqual(data);
+          expect(JSON.parse(request.data)).toEqual(jasmine.objectContaining(data));
           expect(request.type).toEqual('POST');
           expect(request.url).toEqual('/test/root/api/v2/drafts/');
 
@@ -46,7 +46,7 @@ describe('answering form', () => {
 
       setTimeout(
         () => {
-          expect(view.send).not.toHaveBeenCalled();
+          expect($.ajax).not.toHaveBeenCalled();
           done();
         },
         4 // wait for long and short timer to fire
@@ -69,9 +69,10 @@ describe('answering form', () => {
       setTimeout(
         () => {
           expect(view.send).toHaveBeenCalled();
+          expect($.ajax).toHaveBeenCalled();
 
           const request = $.ajax.calls.mostRecent().args[0];
-          expect(JSON.parse(request.data)).toEqual(data);
+          expect(JSON.parse(request.data)).toEqual(jasmine.objectContaining(data));
           expect(request.type).toEqual('PUT');
           expect(request.url).toEqual('/test/root/api/v2/drafts/5');
 
@@ -97,9 +98,10 @@ describe('answering form', () => {
       setTimeout(
         () => {
           expect(view.send).toHaveBeenCalled();
+          expect($.ajax).toHaveBeenCalled();
 
           const request = $.ajax.calls.mostRecent().args[0];
-          expect(JSON.parse(request.data)).toEqual(data);
+          expect(JSON.parse(request.data)).toEqual(jasmine.objectContaining(data));
           expect(request.type).toEqual('PUT');
           expect(request.url).toEqual('/test/root/api/v2/drafts/5');
 
diff --git a/frontend/test/modules/answering/models/AnswerModelSpec.js b/frontend/test/modules/answering/models/AnswerModelSpec.js
index 92d13e295..82117b473 100644
--- a/frontend/test/modules/answering/models/AnswerModelSpec.js
+++ b/frontend/test/modules/answering/models/AnswerModelSpec.js
@@ -17,11 +17,11 @@ describe('answer model', function () {
     });
 
     it('text', () => {
-      expect(model.get('text')).toEqual('');
+      expect(model.get('text')).toBeUndefined();
     });
 
     it('pid', () => {
-      expect(model.get('pid')).toBeUndefined();
+      expect(model.get('pid')).toEqual(0);
     });
   })
 });
diff --git a/karma.conf.js b/karma.conf.js
index 195bb8fb3..1bea6b66b 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -20,6 +20,8 @@ module.exports = function (config) {
     frameworks: ['jasmine-jquery', 'jasmine-ajax', 'jasmine', 'jasmine-matchers'],
 
 
+    plugins: ['@metahub/karma-jasmine-jquery', 'karma-*'],
+
     // list of files / patterns to load in the browser
     files: [
       // 'test/**/*.js',
diff --git a/package.json b/package.json
index 1e9c6a850..e1e6aaa61 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,6 @@
     "backbone.babysitter": "^0.1.0",
     "backbone.localstorage": "^2.0.0",
     "backbone.marionette": "^4.0.0",
-    "blazy": "^1.8.2",
     "bootstrap": "^4.3.0",
     "datatables.net": "^1.10.19",
     "datatables.net-bs4": "^1.10.16",
@@ -33,9 +32,9 @@
     "yarn": "^1.15.2"
   },
   "devDependencies": {
+    "@metahub/karma-jasmine-jquery": "^3.0.0",
     "@types/autosize": "^3.0.6",
     "@types/backbone.marionette": "^3.3.10",
-    "@types/blazy": "^1.5",
     "@types/bootstrap": "^4.1.0",
     "@types/jquery": "^3.3.2",
     "@types/jqueryui": "^1.12.2",
@@ -68,7 +67,6 @@
     "karma-cli": "^1.0.1",
     "karma-jasmine": "^1.1.2",
     "karma-jasmine-ajax": "^0.1.13",
-    "karma-jasmine-jquery": "^0.1.1",
     "karma-jasmine-matchers": "^3.7.0",
     "karma-mocha-reporter": "^2.2.5",
     "karma-webpack": "^3.0.0",
diff --git a/plugins/Admin/src/Template/Categories/index.ctp b/plugins/Admin/src/Template/Categories/index.ctp
index a81beee14..dcd8b5d00 100644
--- a/plugins/Admin/src/Template/Categories/index.ctp
+++ b/plugins/Admin/src/Template/Categories/index.ctp
@@ -33,11 +33,11 @@
         >
             get('category_order'); ?>
                  
-            get('category'); ?> 
-            get('description'); ?>  
-            get('accession')) ?> 
-            get('accession_new_thread')) ?> 
-            get('accession_new_posting')) ?> 
+            get('category')) ?> 
+            get('description')) ?>  
+            get('accession'))) ?> 
+            get('accession_new_thread'))) ?> 
+            get('accession_new_posting'))) ?> 
             
                 Html->link(
diff --git a/plugins/Admin/tests/TestCase/Controller/AdminsControllerTest.php b/plugins/Admin/tests/TestCase/Controller/AdminsControllerTest.php
index ef8e4f408..e1a1b2baf 100644
--- a/plugins/Admin/tests/TestCase/Controller/AdminsControllerTest.php
+++ b/plugins/Admin/tests/TestCase/Controller/AdminsControllerTest.php
@@ -12,10 +12,8 @@
 
 namespace App\Test\TestCase\Controller;
 
-use App\Controller\ToolsController;
 use Cake\Cache\Cache;
-use Cake\Event\EventManager;
-use Cake\Http\Exception\ForbiddenException;
+use Saito\Exception\SaitoForbiddenException;
 use Saito\Test\IntegrationTestCase;
 
 /**
@@ -55,7 +53,7 @@ public function testAdminEmptyCachesUser()
     {
         $this->_loginUser(2);
         $url = '/admin/admins/emptyCaches';
-        $this->expectException(ForbiddenException::class);
+        $this->expectException(SaitoForbiddenException::class);
         $this->get($url);
     }
 
diff --git a/plugins/Bookmarks/src/Controller/BookmarksController.php b/plugins/Bookmarks/src/Controller/BookmarksController.php
index b01adfb04..05f19dfdd 100644
--- a/plugins/Bookmarks/src/Controller/BookmarksController.php
+++ b/plugins/Bookmarks/src/Controller/BookmarksController.php
@@ -154,7 +154,8 @@ private function getBookmark(int $bookmarkId): EntityInterface
         );
         if (!$allowed) {
             throw new SaitoForbiddenException(
-                "Attempt to access bookmark $bookmarkId."
+                "Attempt to access bookmark $bookmarkId.",
+                ['CurrentUser' => $this->CurrentUser]
             );
         }
 
diff --git a/plugins/Bota/dev/favicon.kra b/plugins/Bota/dev/favicon.kra
new file mode 100644
index 000000000..01870c357
Binary files /dev/null and b/plugins/Bota/dev/favicon.kra differ
diff --git a/plugins/Bota/src/Template/Layout/default.ctp b/plugins/Bota/src/Template/Layout/default.ctp
index 0b476301e..acc9b7271 100644
--- a/plugins/Bota/src/Template/Layout/default.ctp
+++ b/plugins/Bota/src/Template/Layout/default.ctp
@@ -5,24 +5,29 @@ $this->extend('_default');
 
 $this->start('theme_head');
 ?>
-    
+    
 
     
     
 
 start('theme_header');
 $this->end();
 
 $this->start('theme_footer');
-    echo $this->Html->script('Bota.theme.js', ['async' => 'true']);
+    echo $this->Html->script($this->getTheme() . '.theme.js', ['async' => 'true']);
 $this->end();
 
 echo $this->fetch('content');
diff --git a/plugins/Bota/webroot/css/src/basics/_mixins.scss b/plugins/Bota/webroot/css/src/basics/_mixins.scss
index e45afa4f7..1ff946490 100644
--- a/plugins/Bota/webroot/css/src/basics/_mixins.scss
+++ b/plugins/Bota/webroot/css/src/basics/_mixins.scss
@@ -29,27 +29,44 @@
   }
 }
 
-/* flex-lefty
-// ------------------------------------- */
-.flex-lefty {
-  display: flex;
-  flex-direction: row;
-}
+/******************************************************************************
+ * Lefty
+ ******************************************************************************/
 
-.flex-lefty-aside {
+/* lefty
+/* ------------------------------------- */
+
+.lefty-aside {
   @extend .px-2;
   @extend .py-1;
   @extend .py-lg-2;
 
   @include border-radius($card-inner-border-radius $card-inner-border-radius 0 0);
 
-  // padding: $card-spacer-y $card-spacer-x;
-
   flex: 0;
   display: flex;
   flex-direction: column;
 }
 
+@media only screen and (max-width: map-get($grid-breakpoints, lg)) {
+  .lefty-aside {
+    align-items: center;
+    flex-direction: row;
+  }
+}
+
+/* flex-lefty
+/* ------------------------------------- */
+.flex-lefty {
+  display: flex;
+  flex-direction: row;
+}
+
+.flex-lefty-aside {
+  @extend .lefty-aside;
+  // padding: $card-spacer-y $card-spacer-x;
+}
+
 .flex-lefty-item {
   flex: auto;
 }
@@ -59,11 +76,19 @@
     flex-direction: column;
   }
 
-  .flex-lefty-aside {
-    align-items: center;
-    flex-direction: row;
+  .flex-lefty-item {
   }
+}
 
-  .flex-lefty-item {
+/* grid-lefty
+/* ------------------------------------- */
+.grid-lefty {
+  display: grid;
+  grid-template-columns: fit-content(20%) auto;
+}
+
+@media only screen and (max-width: map-get($grid-breakpoints, lg)) {
+  .grid-lefty {
+    grid-template-columns: 1fr;
   }
 }
diff --git a/plugins/Bota/webroot/css/src/basics/_uploads.scss b/plugins/Bota/webroot/css/src/basics/_uploads.scss
index 3e37921f4..532d493e6 100755
--- a/plugins/Bota/webroot/css/src/basics/_uploads.scss
+++ b/plugins/Bota/webroot/css/src/basics/_uploads.scss
@@ -81,6 +81,15 @@
 .imageUploader-action {
   @extend .card-footer;
   text-align: center;
+
+  /// Profile page: Add card has actions, View cards don't
+  // Show empty action area on View cards with background (first row)
+  height: 100%;
+  // Hide if action area is empty
+  &:empty {
+    border: none;
+    padding: 0 !important;
+  }
 }
 
 .imageUploader-action-btn {
@@ -88,12 +97,12 @@
 }
 
 .imageUploader-cards {
-  display: flex;
-  flex-wrap: wrap;
+  display: grid;
+  grid-template-columns: repeat(auto-fit, 15rem);
   justify-content: center;
 
   .card-upload-container {
-    height: 7rem;
+    height: 9rem;
     margin: 0 auto;
     padding: 4px;
     display: flex;
@@ -129,14 +138,14 @@
 }
 
 .imageUploader-card {
-  width: 13rem;
+  @extend .shadow-sm;
 }
 
 @include media-breakpoint-down(xs) {
-  .imageUploader-card {
-  // Phone: There will only fit one card horizontally anyway, so make the
-  // card full width for better optics.
-    width: 100%;
+  .imageUploader-cards {
+    // Phone: There will only fit one card horizontally anyway, so make the
+    // card full width for better optics.
+    grid-template-columns: 1fr;
   }
 
   .imageUploader-cards .card-upload-container {
@@ -145,10 +154,8 @@
 }
 
 @include media-breakpoint-up(xl) {
-  .imageUploader-card {
-  // Phone: There will only fit one card horizontally anyway, so make the
-  // card full width for better optics.
-    width: 17rem;
+  .imageUploader-cards {
+    grid-template-columns: repeat(auto-fit, 19rem);
   }
   .imageUploader-cards .card-upload-container {
     height: 10rem;
diff --git a/plugins/Bota/webroot/css/src/night.scss b/plugins/Bota/webroot/css/src/night.scss
index d56d42ee7..9d1bd1f02 100644
--- a/plugins/Bota/webroot/css/src/night.scss
+++ b/plugins/Bota/webroot/css/src/night.scss
@@ -2,23 +2,23 @@
  * Bootstrap variables
  ******************************************************************************/
 
-$body-bg: #28282b !default;
+$body-bg: #1d1d1f !default;
 $modal-content-bg: $body-bg !default;
 
+$primary: rgb(255, 184, 30) !default;
 $body-color: #decab2 !default;
-$border-color: $body-color !default;
+
+$border-color: darken($primary, 35%) !default;
 $close-color: $body-color !default;
 $input-color: $body-color !default;
 
 $text-muted: #9a866d !default;
 
-$primary: rgb(255, 184, 30) !default;
-
-$input-border-color: darken($primary, 40%) !default;
-$input-focus-border-color: lighten($input-border-color, 10%) !default;
+$input-border-color: darken($primary, 35%) !default;
+$input-focus-border-color: lighten($input-border-color, 15%) !default;
 $nav-tabs-link-active-color: $primary;
 
-$form-bg: #1e1e20 !default;
+$form-bg: #28282b !default;
 $card-cap-bg: lighten($form-bg, 10%) !default;
 $card-bg: $form-bg !default;
 $list-group-bg: $form-bg !default;
@@ -45,6 +45,15 @@ $toast-background-color: $body-bg !default;
 $toast-header-background-color: $form-bg !default;
 $toast-header-color: $body-color !default;
 
+/// Dropdown Menu
+$dropdown-link-color: $body-color !default;
+$dropdown-bg: $body-bg !default;
+$dropdown-link-hover-color: $body-bg !default;
+$dropdown-link-hover-bg: $primary !default;
+$dropdown-border: $border-color !default;
+$dropdown-border-color: $dropdown-border !default;
+$dropdown-divider-bg: $border-color !default;
+
 /******************************************************************************
  * Core Theme Include
  ******************************************************************************/
@@ -67,3 +76,7 @@ iframe,
 video {
   filter: contrast(80%) brightness(90%) sepia(50%);
 }
+
+.geshi-wrapper ol {
+  filter: invert(0.9);
+}
diff --git a/plugins/Bota/webroot/css/src/partials/__theme.scss b/plugins/Bota/webroot/css/src/partials/__theme.scss
index 882912aa8..fb976c7ec 100644
--- a/plugins/Bota/webroot/css/src/partials/__theme.scss
+++ b/plugins/Bota/webroot/css/src/partials/__theme.scss
@@ -20,7 +20,7 @@ $font-color-reply: $link-color !default;
  * Saito Variables
  ******************************************************************************/
 
-$readingWidth: 60em !default;
+$readingWidth: 42em !default;
 
 /******************************************************************************
  * Import basic Saito elements required for core functionality
diff --git a/plugins/Bota/webroot/css/src/partials/_base.scss b/plugins/Bota/webroot/css/src/partials/_base.scss
index 4ce5f2733..12c7fc52c 100644
--- a/plugins/Bota/webroot/css/src/partials/_base.scss
+++ b/plugins/Bota/webroot/css/src/partials/_base.scss
@@ -61,5 +61,6 @@ u {
 code,
 pre,
 tt {
+  color: $body-color;
   line-height: inherit;
 }
diff --git a/plugins/Bota/webroot/css/src/partials/_cards-panels-dialogs.scss b/plugins/Bota/webroot/css/src/partials/_cards-panels-dialogs.scss
index f95803e06..5a64baf64 100644
--- a/plugins/Bota/webroot/css/src/partials/_cards-panels-dialogs.scss
+++ b/plugins/Bota/webroot/css/src/partials/_cards-panels-dialogs.scss
@@ -23,10 +23,17 @@
   @extend .p-3;
 }
 
+.panel-fixedWidth {
+  @extend .panel;
+
+  max-width: $readingWidth;
+}
+
+
 .panel-center {
   @extend .mb-3;
 
-  max-width: 40rem;
+  max-width: $readingWidth;
   margin: 0 auto;
 }
 
diff --git a/plugins/Bota/webroot/css/src/partials/_posting.scss b/plugins/Bota/webroot/css/src/partials/_posting.scss
index cc2d811d1..c199ebd39 100644
--- a/plugins/Bota/webroot/css/src/partials/_posting.scss
+++ b/plugins/Bota/webroot/css/src/partials/_posting.scss
@@ -12,20 +12,27 @@
   @extend .text-success;
 }
 
-.postingLayout {
-  max-width: $readingWidth;
-  margin: 0 auto;
-}
-
 .postingLayout-main {
-  @extend .flex-lefty;
+  @extend .grid-lefty;
+
+  grid-template-areas:
+    'aside content'
+    '. compose';
+
+  @media only screen and (max-width: map-get($grid-breakpoints, lg)) {
+    grid-template-areas:
+      'aside'
+      'content'
+      'compose';
+  }
 }
 
 .postingLayout-aside {
-  @extend .flex-lefty-aside;
   @extend .panel-info;
   @extend .small;
   @extend .text-center;
+
+  grid-area: aside;
 }
 
 .postingLayout-aside-item {
@@ -34,7 +41,9 @@
 }
 
 .postingLayout-body {
-  width: 100%;
+  grid-area: content;
+
+  max-width: $readingWidth;
 
   @media only screen and (max-width: map-get($grid-breakpoints, lg)) {
     margin-top: 1em;
@@ -93,9 +102,17 @@
 .postingLayout-slider {
   @extend .panel;
 
+  grid-area: compose;
+
   display: none;
 }
 
+@media only screen and (max-width: map-get($grid-breakpoints, lg)) {
+  .postingLayout-slider {
+    padding: 0 !important;
+  }
+}
+
 .postingBody-signature {
   @extend .mb-3;
   @extend .small;
diff --git a/plugins/Bota/webroot/css/src/partials/_postingform.scss b/plugins/Bota/webroot/css/src/partials/_postingform.scss
index 46bfc6dc1..b825980df 100644
--- a/plugins/Bota/webroot/css/src/partials/_postingform.scss
+++ b/plugins/Bota/webroot/css/src/partials/_postingform.scss
@@ -11,7 +11,9 @@
 
 .preview-wrapper,
 .postingform {
-  @extend .panel-center;
+  @extend .panel-fixedWidth;
+
+  padding: 0 !important;
 }
 
 .preview-wrapper {
diff --git a/plugins/Bota/webroot/css/src/partials/_richtext.scss b/plugins/Bota/webroot/css/src/partials/_richtext.scss
index d0617c479..767c6e27a 100644
--- a/plugins/Bota/webroot/css/src/partials/_richtext.scss
+++ b/plugins/Bota/webroot/css/src/partials/_richtext.scss
@@ -52,9 +52,12 @@
 .geshi-wrapper {
   @extend .p-3;
 
+  .geshi-plain, ol {
+    @extend .py-2;
+  }
+
   ol {
     color: #333;
-    background: #f0fcef;
 
     li {
       list-style: decimal;
diff --git a/plugins/Bota/webroot/css/src/partials/_thread.scss b/plugins/Bota/webroot/css/src/partials/_thread.scss
index 669a28c26..f4394cfe6 100644
--- a/plugins/Bota/webroot/css/src/partials/_thread.scss
+++ b/plugins/Bota/webroot/css/src/partials/_thread.scss
@@ -158,9 +158,6 @@ $btn-strip-top-width: 25px;
 .viewEntry {
   @extend .panel;
 
-  max-width: $readingWidth;
-  margin: 0 auto;
-
   @media only screen and (max-width: map-get($grid-breakpoints, sm)) {
     padding-left: 0 !important;
     padding-right: 0 !important;
diff --git a/plugins/ImageUploader/src/Controller/UploadsController.php b/plugins/ImageUploader/src/Controller/UploadsController.php
index effbacbe9..a524bedbc 100644
--- a/plugins/ImageUploader/src/Controller/UploadsController.php
+++ b/plugins/ImageUploader/src/Controller/UploadsController.php
@@ -14,11 +14,14 @@
 
 use Api\Controller\ApiAppController;
 use Api\Error\Exception\GenericApiException;
+use App\Model\Entity\User;
 use Cake\Cache\Cache;
 use Cake\Utility\Security;
+use ImageUploader\Model\Entity\Upload;
 use ImageUploader\Model\Table\UploadsTable;
 use Saito\Exception\SaitoForbiddenException;
 use Saito\User\CurrentUser\CurrentUserInterface;
+use Saito\User\Permission\ResourceAI;
 
 /**
  * Upload Controller
@@ -30,6 +33,15 @@ class UploadsController extends ApiAppController
 {
     public $helpers = ['ImageUploader.ImageUploader'];
 
+    /**
+     * {@inheritDoc}
+     */
+    public function initialize()
+    {
+        parent::initialize();
+        $this->loadModel('Users');
+    }
+
     /**
      * View uploads
      *
@@ -37,7 +49,20 @@ class UploadsController extends ApiAppController
      */
     public function index()
     {
-        $userId = $this->CurrentUser->getId();
+        $userId = (int)$this->getRequest()->getQuery('id');
+        /** @var User */
+        $user = $this->Users->get($userId);
+        $permission = $this->CurrentUser->permission(
+            'saito.plugin.uploader.view',
+            (new ResourceAI())->onRole($user->getRole())->onOwner($user->getId())
+        );
+        if (!$permission) {
+            throw new SaitoForbiddenException(
+                sprintf('Attempt to index uploads of "%s".', $userId),
+                ['CurrentUser' => $this->CurrentUser]
+            );
+        }
+
         $images = $this->Uploads->find()
             ->where(['user_id' => $userId])
             ->order(['id' => 'DESC'])
@@ -56,6 +81,21 @@ public function add()
         if (!is_array($submitted)) {
             throw new GenericApiException(__d('image_uploader', 'add.failure'));
         }
+
+        $userId = (int)$this->getRequest()->getData('userId');
+        /** @var User */
+        $user = $this->Users->get($userId);
+        $permission = $this->CurrentUser->permission(
+            'saito.plugin.uploader.add',
+            (new ResourceAI())->onRole($user->getRole())->onOwner($user->getId())
+        );
+        if (!$permission) {
+            throw new SaitoForbiddenException(
+                sprintf('Attempt to add uploads for "%s".', $userId),
+                ['CurrentUser' => $this->CurrentUser]
+            );
+        }
+
         $parts = explode('.', $submitted['name']);
         $ext = array_pop($parts);
         $name = $this->CurrentUser->getId() .
@@ -68,7 +108,7 @@ public function add()
             'name' => $name,
             'title' => $submitted['name'],
             'size' => $submitted['size'],
-            'user_id' => $this->CurrentUser->getId(),
+            'user_id' => $userId,
         ];
         $document = $this->Uploads->newEntity($data);
 
@@ -89,10 +129,15 @@ public function add()
      */
     public function delete($imageId)
     {
-        $upload = $this->Uploads->get($imageId);
-        if ($upload->get('user_id') !== $this->CurrentUser->getId()) {
+        /** @var Upload */
+        $upload = $this->Uploads->get($imageId, ['contain' => ['Users']]);
+        $permission = $this->CurrentUser->permission(
+            'saito.plugin.uploader.delete',
+            (new ResourceAI())->onRole($upload->user->getRole())->onOwner($upload->user->getId())
+        );
+        if (!$permission) {
             throw new SaitoForbiddenException(
-                'Attempt to delete upload.',
+                sprintf('Attempt to delete upload "%s".', $imageId),
                 ['CurrentUser' => $this->CurrentUser]
             );
         }
diff --git a/plugins/ImageUploader/src/Locale/en/image_uploader.po b/plugins/ImageUploader/src/Locale/en/image_uploader.po
index 2c0d30e81..05a33f995 100755
--- a/plugins/ImageUploader/src/Locale/en/image_uploader.po
+++ b/plugins/ImageUploader/src/Locale/en/image_uploader.po
@@ -16,7 +16,7 @@ msgstr ""
 
 msgid "add.failure"
 msgstr ""
-"Error: Server didnd't receive a file. Check that the file size doesn't exceed"
+"Error: Server didnd't receive a file. The filesize probably exceeds the"
 " the server limit."
 
 msgid "delete.failure"
diff --git a/plugins/ImageUploader/src/Model/Entity/Upload.php b/plugins/ImageUploader/src/Model/Entity/Upload.php
index 2517472fd..5f0c065a5 100644
--- a/plugins/ImageUploader/src/Model/Entity/Upload.php
+++ b/plugins/ImageUploader/src/Model/Entity/Upload.php
@@ -12,11 +12,17 @@
 
 namespace ImageUploader\Model\Entity;
 
+use App\Model\Entity\User;
 use Cake\Core\Configure;
 use Cake\Filesystem\File;
 use Cake\ORM\Entity;
 use Cake\Utility\Text;
 
+/**
+ * Upload entity
+ *
+ * @property User $user
+ */
 class Upload extends Entity
 {
     /**
diff --git a/plugins/ImageUploader/tests/TestCase/Controller/UploadsControllerTest.php b/plugins/ImageUploader/tests/TestCase/Controller/UploadsControllerTest.php
index 29710083a..6d9bc173c 100644
--- a/plugins/ImageUploader/tests/TestCase/Controller/UploadsControllerTest.php
+++ b/plugins/ImageUploader/tests/TestCase/Controller/UploadsControllerTest.php
@@ -16,6 +16,7 @@
 use Authentication\Authenticator\UnauthenticatedException;
 use Cake\Core\Configure;
 use Cake\Core\Plugin;
+use Cake\Datasource\Exception\RecordNotFoundException;
 use Cake\Filesystem\File;
 use Cake\ORM\TableRegistry;
 use ImageUploader\Model\Table\UploadsTable;
@@ -64,6 +65,24 @@ public function testAddNotAuthorized()
         $this->post('api/v2/uploads', []);
     }
 
+    public function testAddFailureUploadBelongsToDifferentUser()
+    {
+        $this->loginJwt(3);
+
+        $this->expectException(SaitoForbiddenException::class);
+
+        $this->upload($this->file, 1);
+    }
+
+    public function testAddFailureUserDoesNotExist()
+    {
+        $this->loginJwt(1);
+
+        $this->expectException(RecordNotFoundException::class);
+
+        $this->upload($this->file, 9999);
+    }
+
     /**
      * png is successfully uploaded and converted to jpeg
      */
@@ -71,7 +90,7 @@ public function testAddSuccess()
     {
         $this->loginJwt(1);
 
-        $this->upload($this->file);
+        $this->upload($this->file, 1);
         $response = json_decode((string)$this->_response->getBody(), true);
 
         $this->assertResponseCode(200);
@@ -283,11 +302,20 @@ public function testIndexNoAuthorization()
         $this->get('api/v2/uploads');
     }
 
+    public function testIndexFailureUploadBelongsToDifferentUser()
+    {
+        $this->loginJwt(3);
+
+        $this->expectException(SaitoForbiddenException::class);
+
+        $this->get('api/v2/uploads/?id=1');
+    }
+
     public function testIndexSuccess()
     {
         $this->loginJwt(3);
 
-        $this->get('api/v2/uploads');
+        $this->get('api/v2/uploads?id=3');
 
         $response = json_decode((string)$this->_response->getBody(), true);
 
@@ -326,6 +354,22 @@ public function testDeleteNoAuthorization()
         $this->delete('api/v2/uploads/1');
     }
 
+    public function testDeleteFailureUploadBelongsToDifferentUser()
+    {
+        $this->loginJwt(3);
+
+        $this->expectException(SaitoForbiddenException::class);
+
+        $this->delete('api/v2/uploads/1');
+    }
+
+    public function testUploadDeleteFailureNotFound()
+    {
+        $this->loginJwt(1);
+        $this->expectException(RecordNotFoundException::class);
+        $this->delete('api/v2/uploads/9999');
+    }
+
     public function testDeleteSuccess()
     {
         $this->loginJwt(1);
@@ -343,21 +387,13 @@ public function testDeleteSuccess()
         $this->assertFalse($Uploads->exists(1));
     }
 
-    public function testDeleteFailureUploadBelongsToDifferentUser()
-    {
-        $this->loginJwt(3);
-
-        $this->expectException(SaitoForbiddenException::class);
-
-        $this->delete('api/v2/uploads/1');
-    }
-
     /**
      * Sends a file to upload api
      *
      * @param File $file The file to send
+     * @param mixed $userId The user-ID to upload to
      */
-    private function upload(File $file)
+    private function upload(File $file, $userId = 1)
     {
         $data = [
             'upload' => [
@@ -371,6 +407,9 @@ private function upload(File $file)
                 ]
             ]
         ];
+        if ($userId) {
+            $data['userId'] = (string)$userId;
+        }
         $this->post('api/v2/uploads.json', $data);
     }
 }
diff --git a/plugins/SaitoSearch/src/Controller/SearchesController.php b/plugins/SaitoSearch/src/Controller/SearchesController.php
index 3ee2ff4c9..14138384b 100644
--- a/plugins/SaitoSearch/src/Controller/SearchesController.php
+++ b/plugins/SaitoSearch/src/Controller/SearchesController.php
@@ -162,7 +162,10 @@ public function advanced()
         if (!empty($queryData['category_id'])) {
             $category = $queryData['category_id'];
             if (!in_array($category, $categories)) {
-                throw new SaitoForbiddenException("Tried to search category $category.");
+                throw new SaitoForbiddenException(
+                    "Tried to search category $category.",
+                    ['CurrentUser' => $this->CurrentUser]
+                );
             }
             $categories = [$category];
         }
diff --git a/plugins/SaitoSearch/src/Lib/SimpleSearchString.php b/plugins/SaitoSearch/src/Lib/SimpleSearchString.php
index 4d8e399a8..bdcde2511 100644
--- a/plugins/SaitoSearch/src/Lib/SimpleSearchString.php
+++ b/plugins/SaitoSearch/src/Lib/SimpleSearchString.php
@@ -43,7 +43,7 @@ class SimpleSearchString
      */
     public function __construct($string)
     {
-        $this->_string = $string;
+        $this->_string = trim($string);
     }
 
     /**
@@ -126,8 +126,12 @@ protected function _split($string)
     public function replaceOperators()
     {
         $string = $this->_fulltextHyphenFix($this->_string);
+        // Collapse multiple whitespaces into one.
+        $string = preg_replace('/\s+/', ' ', $string);
+        // Add + operator to words
+        $string = ltrim(preg_replace('/(^|\s)(?![-+><])/i', ' +', $string));
 
-        return ltrim(preg_replace('/(^|\s)(?![-+><])/i', ' +', $string));
+        return $string;
     }
 
     /**
diff --git a/plugins/SaitoSearch/src/Model/Behavior/SaitoSearchBehavior.php b/plugins/SaitoSearch/src/Model/Behavior/SaitoSearchBehavior.php
index 9eeb6c47e..91c55ad93 100644
--- a/plugins/SaitoSearch/src/Model/Behavior/SaitoSearchBehavior.php
+++ b/plugins/SaitoSearch/src/Model/Behavior/SaitoSearchBehavior.php
@@ -12,7 +12,6 @@
 
 namespace SaitoSearch\Model\Behavior;
 
-use App\Model\Table\EntriesTable;
 use Cake\ORM\Behavior;
 use Cake\ORM\Query;
 
@@ -29,12 +28,8 @@ class SaitoSearchBehavior extends Behavior
      */
     public function findSimpleSearchByTime(Query $query, array $options): Query
     {
-        $connection = $this->getTable()->getConnection();
-        $q = $connection->quote($options['searchTerm']->replaceOperators());
-        $query = $this->prepareFindSimpleSearch($query, $options)
-            ->where([
-                "MATCH (Entries.subject, Entries.text, Entries.name) AGAINST ($q IN BOOLEAN MODE)"
-            ])
+        $query = $this
+            ->findSimpleSearchByRank($query, $options)
             ->order(['`Entries`.`time`' => 'DESC']);
 
         return $query;
@@ -53,21 +48,8 @@ public function findSimpleSearchByTime(Query $query, array $options): Query
      */
     public function findSimpleSearchByRank(Query $query, array $options): Query
     {
-        /** @var EntriesTable */
-        $table = $this->getTable();
-        $connection = $table->getConnection();
-        // $q = $connection->quote($options['searchTerm']->replaceOperators());
-        $connection->getDriver()->enableAutoQuoting(false);
         $query = $this->prepareFindSimpleSearch($query, $options)
-            ->select(
-                [
-                    'relSubject' => 'MATCH (Entries.subject) AGAINST (:q IN BOOLEAN MODE)',
-                    'relText' => 'MATCH (Entries.text) AGAINST (:q IN BOOLEAN MODE)',
-                    'relName' => 'MATCH (Entries.name) AGAINST (:q IN BOOLEAN MODE)'
-                ] + $table->getFieldset()
-            )
-            ->where("MATCH (`Entries`.`subject`, `Entries`.`text`, `Entries`.`name`) AGAINST (:q IN BOOLEAN MODE)")
-            ->order(['(2*relSubject + relText + 4*relName)' => 'DESC', '`Entries`.`time`' => 'DESC'])
+            ->where(['MATCH (`Entries`.`subject`, `Entries`.`text`, `Entries`.`name`) AGAINST (:q IN BOOLEAN MODE)'])
             ->bind(':q', $options['searchTerm']->replaceOperators());
 
         return $query;
diff --git a/plugins/SaitoSearch/tests/TestCase/Controller/SearchesControllerTest.php b/plugins/SaitoSearch/tests/TestCase/Controller/SearchesControllerTest.php
index bc9cfc0f2..c37dada99 100644
--- a/plugins/SaitoSearch/tests/TestCase/Controller/SearchesControllerTest.php
+++ b/plugins/SaitoSearch/tests/TestCase/Controller/SearchesControllerTest.php
@@ -15,7 +15,7 @@
 use Saito\Exception\SaitoForbiddenException;
 use Saito\Test\IntegrationTestCase;
 
- /*
+/*
 class SearchesMockController extends SearchesController
 {
 
@@ -45,6 +45,23 @@ class SearchesControllerTest extends IntegrationTestCase
         'app.UserOnline',
     ];
 
+    /**
+     * Sorting search results by rank
+     */
+    public function testSimpleSortByRank()
+    {
+        $this->skipOnDataSource('Postgres');
+        $this->_loginUser(1);
+
+        $this->get('/searches/simple?searchTerm="Second_Subject"&order=rank');
+
+        $this->assertResponseCode(200);
+
+        $result = $this->viewVariable('results');
+        $this->assertEquals(2, $result->first()->get('id'));
+        $this->assertEquals(5, $result->skip(1)->first()->get('id'));
+    }
+
     /**
      * Admin Category results should be in search results for admin
      */
diff --git a/plugins/SaitoSearch/tests/TestCase/Lib/SimpleSearchStringTest.php b/plugins/SaitoSearch/tests/TestCase/Lib/SimpleSearchStringTest.php
index 79b70a02b..ec9fedf99 100644
--- a/plugins/SaitoSearch/tests/TestCase/Lib/SimpleSearchStringTest.php
+++ b/plugins/SaitoSearch/tests/TestCase/Lib/SimpleSearchStringTest.php
@@ -20,16 +20,15 @@ class SimpleSearchStringTest extends SaitoTestCase
 
     public function testReplaceOperators()
     {
-        $length = 4;
-        $in = 'zap -foo-bar baz';
-        $S = new SimpleSearchString($in, $length);
+        $in = '  zap  -foo-bar   baz  ';
+        $S = new SimpleSearchString($in);
 
         $result = $S->replaceOperators();
         $expected = '+zap -"foo-bar" +baz';
         $this->assertEquals($expected, $result);
 
         $in = 'zap "foo-bar" baz';
-        $S = new SimpleSearchString($in, $length);
+        $S = new SimpleSearchString($in);
         $result = $S->replaceOperators();
         $expected = '+zap +"foo-bar" +baz';
         $this->assertEquals($expected, $result);
@@ -37,54 +36,53 @@ public function testReplaceOperators()
 
     public function testValidateMinWordLength()
     {
-        $length = 4;
         $in = '+test -fooo';
-        $S = new SimpleSearchString($in, $length);
+        $S = new SimpleSearchString($in);
         $result = $S->validateLength();
         $this->assertTrue($result);
 
         $in = '+tes -foo';
-        $S = new SimpleSearchString($in, $length);
+        $S = new SimpleSearchString($in);
         $result = $S->validateLength();
         $this->assertFalse($result);
 
         $in = 'test +foo';
-        $S = new SimpleSearchString($in, $length);
+        $S = new SimpleSearchString($in);
         $result = $S->validateLength();
         $this->assertFalse($result);
 
         $in = 'wm-foo';
-        $S = new SimpleSearchString($in, $length);
+        $S = new SimpleSearchString($in);
         $result = $S->validateLength();
         $this->assertTrue($result);
 
         $in = 'w-m';
-        $S = new SimpleSearchString($in, $length);
+        $S = new SimpleSearchString($in);
         $result = $S->validateLength();
         $this->assertFalse($result);
 
         $in = 'wmf';
-        $S = new SimpleSearchString($in, $length);
+        $S = new SimpleSearchString($in);
         $result = $S->validateLength();
         $this->assertFalse($result);
 
         $in = '';
-        $S = new SimpleSearchString($in, $length);
+        $S = new SimpleSearchString($in);
         $result = $S->validateLength();
         $this->assertFalse($result);
 
         $in = 'wm foo';
-        $S = new SimpleSearchString($in, $length);
+        $S = new SimpleSearchString($in);
         $result = $S->validateLength();
         $this->assertFalse($result);
 
         $in = '"wm foo';
-        $S = new SimpleSearchString($in, $length);
+        $S = new SimpleSearchString($in);
         $result = $S->validateLength();
         $this->assertFalse($result);
 
         $in = '"wm foo"';
-        $S = new SimpleSearchString($in, $length);
+        $S = new SimpleSearchString($in);
         $result = $S->validateLength();
         $this->assertTrue($result);
     }
diff --git a/src/Controller/AppController.php b/src/Controller/AppController.php
index 1e058c8c8..a33516894 100644
--- a/src/Controller/AppController.php
+++ b/src/Controller/AppController.php
@@ -27,6 +27,8 @@
 use Cake\Event\Event;
 use Cake\Http\Response;
 use Cake\I18n\I18n;
+use Cake\ORM\TableRegistry;
+use Saito\App\Registry;
 use Saito\App\SettingsImmutable;
 use Saito\Event\SaitoEventManager;
 use Saito\User\CurrentUser\CurrentUserInterface;
@@ -100,12 +102,18 @@ public function initialize()
             $this->request->getSession()->start();
         }
 
+        Registry::get('Permissions')->buildCategories(TableRegistry::getTableLocator()->get('Categories'));
+
         // Leave in front to have it available in all Components
         $this->loadComponent('Detectors.Detectors');
         $this->loadComponent('Cookie');
         $this->loadComponent('Authentication.Authentication');
         $this->loadComponent('Security', ['blackHoleCallback' => 'blackhole']);
         $this->loadComponent('Csrf', ['expiry' => time() + 10800]);
+        if (PHP_SAPI !== 'cli') {
+            // if: The security mock in testing doesn't allow seeting cookie-name.
+            $this->Csrf->setConfig('cookieName', Configure::read('Session.cookie') . '-CSRF');
+        }
         $this->loadComponent('RequestHandler', ['enableBeforeRedirect' => false]);
         $this->loadComponent('Cron.Cron');
         $this->loadComponent('CacheSupport');
diff --git a/src/Controller/Component/AuthUserComponent.php b/src/Controller/Component/AuthUserComponent.php
index 06d569053..1e952c68c 100755
--- a/src/Controller/Component/AuthUserComponent.php
+++ b/src/Controller/Component/AuthUserComponent.php
@@ -25,6 +25,7 @@
 use Cake\ORM\TableRegistry;
 use DateTimeImmutable;
 use Firebase\JWT\JWT;
+use Saito\Exception\SaitoForbiddenException;
 use Saito\RememberTrait;
 use Saito\User\Cookie\Storage;
 use Saito\User\CurrentUser\CurrentUser;
@@ -120,7 +121,7 @@ public function initialize(array $config)
     public function startup()
     {
         if (!$this->isAuthorized($this->CurrentUser)) {
-            throw new ForbiddenException(null, 1571852880);
+            throw new SaitoForbiddenException(null, ['CurrentUser' => $this->CurrentUser]);
         }
     }
 
diff --git a/src/Controller/Component/PostingComponent.php b/src/Controller/Component/PostingComponent.php
new file mode 100644
index 000000000..dc10934e3
--- /dev/null
+++ b/src/Controller/Component/PostingComponent.php
@@ -0,0 +1,121 @@
+getTable()->get($data['pid']);
+            $data = $this->prepareChildPosting($parent, $data);
+        } else {
+            /// if no pid is provided the new posting is root-posting
+            $data['pid'] = 0;
+            // We can't wait for entity-validation cause we check the category
+            // in permissions.
+            if (!isset($data['category_id'])) {
+                throw new \InvalidArgumentException(
+                    'No category for new posting provided.',
+                    1573123345
+                );
+            }
+        }
+
+        $posting = new Posting($data + ['id' => 0]);
+        $action = $posting->isRoot() ? 'thread' : 'answer';
+        // @td better return !$posting->isAnsweringForbidden();
+        $allowed = $CurrentUser->getCategories()->permission($action, $posting->get('category_id'));
+        if ($allowed !== true) {
+            throw new SaitoForbiddenException('Creating new posting not allowed.');
+        }
+
+        return $this->getTable()->createEntry($data);
+    }
+
+    /**
+     * Updates an existing posting
+     *
+     * @param Entry $entry the posting to update
+     * @param array $data data the posting should be updated with
+     * @param CurrentUserInterface $CurrentUser the current-user
+     * @return Entry|null the posting which was asked to update
+     */
+    public function update(Entry $entry, array $data, CurrentUserInterface $CurrentUser): ?Entry
+    {
+        $isRoot = $entry->isRoot();
+
+        if (!$isRoot) {
+            $parent = $this->getTable()->get($entry->get('pid'));
+            $data = $this->prepareChildPosting($parent, $data);
+        }
+
+        $allowed = $entry->toPosting()->withCurrentUser($CurrentUser)->isEditingAllowed();
+        if ($allowed !== true) {
+            throw new SaitoForbiddenException('Updating posting not allowed.');
+        }
+
+        return $this->getTable()->updateEntry($entry, $data);
+    }
+
+    /**
+     * Populates data of an child derived from its parent-posting
+     *
+     * @param BasicPostingInterface $parent parent data
+     * @param array $data current posting data
+     * @return array populated $data
+     */
+    public function prepareChildPosting(BasicPostingInterface $parent, array $data): array
+    {
+        if (empty($data['subject'])) {
+            // if new subject is empty use the parent's subject
+            $data['subject'] = $parent->get('subject');
+        }
+
+        $data['category_id'] = $data['category_id'] ?? $parent->get('category_id');
+        $data['tid'] = $parent->get('tid');
+
+        return $data;
+    }
+
+    /**
+     * Get Entries table
+     *
+     * @return EntriesTable
+     */
+    protected function getTable(): EntriesTable
+    {
+        /** @var EntriesTable */
+        $table = TableRegistry::getTableLocator()->get('Entries');
+
+        return $table;
+    }
+}
diff --git a/src/Controller/EntriesController.php b/src/Controller/EntriesController.php
index 808ab6207..c50b523b9 100644
--- a/src/Controller/EntriesController.php
+++ b/src/Controller/EntriesController.php
@@ -14,6 +14,7 @@
 
 use App\Controller\Component\AutoReloadComponent;
 use App\Controller\Component\MarkAsReadComponent;
+use App\Controller\Component\PostingComponent;
 use App\Controller\Component\RefererComponent;
 use App\Controller\Component\ThreadsComponent;
 use App\Model\Table\EntriesTable;
@@ -21,7 +22,6 @@
 use Cake\Datasource\Exception\RecordNotFoundException;
 use Cake\Event\Event;
 use Cake\Http\Exception\BadRequestException;
-use Cake\Http\Exception\ForbiddenException;
 use Cake\Http\Exception\MethodNotAllowedException;
 use Cake\Http\Exception\NotFoundException;
 use Cake\Http\Response;
@@ -29,6 +29,7 @@
 use Saito\Exception\SaitoForbiddenException;
 use Saito\Posting\Basic\BasicPostingInterface;
 use Saito\User\CurrentUser\CurrentUserInterface;
+use Saito\User\Permission\ResourceAI;
 use Stopwatch\Lib\Stopwatch;
 
 /**
@@ -37,6 +38,7 @@
  * @property CurrentUserInterface $CurrentUser
  * @property EntriesTable $Entries
  * @property MarkAsReadComponent $MarkAsRead
+ * @property PostingComponent $Posting
  * @property RefererComponent $Referer
  * @property ThreadsComponent $Threads
  */
@@ -53,6 +55,7 @@ public function initialize()
     {
         parent::initialize();
 
+        $this->loadComponent('Posting');
         $this->loadComponent('MarkAsRead');
         $this->loadComponent('Referer');
         $this->loadComponent('Threads', ['table' => $this->Entries]);
@@ -176,26 +179,12 @@ public function source($id = null)
      * @param string $id posting-ID
      * @return \Cake\Network\Response|void
      */
-    public function view($id = null)
+    public function view(string $id)
     {
+        $id = (int)$id;
         Stopwatch::start('Entries->view()');
 
-        // redirect if no id is given
-        if (!$id) {
-            $this->Flash->set(__('Invalid post'), ['element' => 'error']);
-
-            return $this->redirect(['action' => 'index']);
-        }
-
         $entry = $this->Entries->get($id);
-
-        // redirect if posting doesn't exists
-        if ($entry == false) {
-            $this->Flash->set(__('Invalid post'));
-
-            return $this->redirect('/');
-        }
-
         $posting = $entry->toPosting()->withCurrentUser($this->CurrentUser);
 
         if (!$this->CurrentUser->getCategories()->permission('read', $posting->get('category'))) {
@@ -243,16 +232,10 @@ public function add()
      * @throws NotFoundException
      * @throws BadRequestException
      */
-    public function edit($id = null)
+    public function edit(string $id)
     {
-        if (empty($id)) {
-            throw new BadRequestException;
-        }
-
+        $id = (int)$id;
         $entry = $this->Entries->get($id);
-        if (empty($entry)) {
-            throw new NotFoundException;
-        }
         $posting = $entry->toPosting()->withCurrentUser($this->CurrentUser);
 
         if (!$posting->isEditingAllowed()) {
@@ -318,15 +301,12 @@ public function delete(string $id)
         }
         /* @var Entry $posting */
         $posting = $this->Entries->get($id);
-        if (!$posting) {
-            throw new NotFoundException;
-        }
 
         $action = $posting->isRoot() ? 'thread' : 'answer';
         $allowed = $this->CurrentUser->getCategories()
             ->permission($action, $posting->get('category_id'));
         if (!$allowed) {
-            throw new ForbiddenException(null, 1571309481);
+            throw new SaitoForbiddenException();
         }
 
         $success = $this->Entries->deletePosting($id);
@@ -377,23 +357,25 @@ public function solve($id)
                 throw new \InvalidArgumentException('Posting to mark solved not found.');
             }
 
-            if ($posting->isRoot()) {
-                throw new \InvalidArgumentException('Root postings cannot mark themself solved.');
-            }
-
             $rootId = $posting->get('tid');
             $rootPosting = $this->Entries->get($rootId);
-            if ($rootPosting->get('user_id') !== $this->CurrentUser->getId()) {
+
+            $allowed = $this->CurrentUser->permission(
+                'saito.core.posting.solves.set',
+                (new ResourceAI())->onRole($rootPosting->get('user')->getRole())->onOwner($rootPosting->get('user_id'))
+            );
+            if (!$allowed) {
                 throw new SaitoForbiddenException(
                     sprintf('Attempt to mark posting %s as solution.', $posting->get('id')),
                     ['CurrentUser' => $this->CurrentUser]
                 );
             }
 
-            $success = $this->Entries->toggleSolve($posting);
+            $value = $posting->get('solves') ? 0 : $rootPosting->get('tid');
+            $success = $this->Entries->updateEntry($posting, ['solves' => $value]);
 
             if (!$success) {
-                throw new BadRequestException;
+                throw new BadRequestException();
             }
         } catch (\Exception $e) {
             throw new BadRequestException();
@@ -408,9 +390,10 @@ public function solve($id)
      * @throws NotFoundException
      * @td put into admin entries controller
      */
-    public function merge($sourceId = null)
+    public function merge(string $sourceId = null)
     {
-        if (!$sourceId) {
+        $sourceId = (int)$sourceId;
+        if (empty($sourceId)) {
             throw new NotFoundException();
         }
 
@@ -456,15 +439,12 @@ public function ajaxToggle($id = null, $toggle = null)
             throw new BadRequestException;
         }
 
-        $current = $this->Entries->toggle((int)$id, $toggle);
-        if ($current) {
-            $out['html'] = __d('nondynamic', $toggle . '_unset_entry_link');
-        } else {
-            $out['html'] = __d('nondynamic', $toggle . '_set_entry_link');
-        }
+        $posting = $this->Entries->get($id);
+        $data = ['id' => (int)$id, $toggle => !$posting->get($toggle)];
+        $this->Posting->update($posting, $data, $this->CurrentUser);
 
         $this->response = $this->response->withType('json');
-        $this->response = $this->response->withStringBody(json_encode($out));
+        $this->response = $this->response->withStringBody(json_encode('OK'));
 
         return $this->response;
     }
@@ -572,8 +552,9 @@ protected function _setRootEntry(BasicPostingInterface $posting)
     {
         if (!$posting->isRoot()) {
             $root = $this->Entries->find()
-                ->select(['user_id'])
-                ->where(['id' => $posting->get('tid')])
+                ->select(['user_id', 'Users.user_type'])
+                ->where(['Entries.id' => $posting->get('tid')])
+                ->contain(['Users'])
                 ->first();
         } else {
             $root = $posting;
diff --git a/src/Controller/PostingsController.php b/src/Controller/PostingsController.php
index 7481bedfb..6052b6717 100644
--- a/src/Controller/PostingsController.php
+++ b/src/Controller/PostingsController.php
@@ -13,6 +13,7 @@
 namespace App\Controller;
 
 use Api\Controller\ApiAppController;
+use App\Controller\Component\PostingComponent;
 use App\Model\Entity\Entry;
 use App\Model\Table\EntriesTable;
 use Cake\Core\Configure;
@@ -25,6 +26,7 @@
  * Endpoint for adding/POST and editing/PUT posting
  *
  * @property EntriesTable $Entries
+ * @property PostingComponent $Posting
  */
 class PostingsController extends ApiAppController
 {
@@ -35,6 +37,7 @@ public function initialize()
     {
         parent::initialize();
         $this->loadModel('Entries');
+        $this->loadComponent('Posting');
     }
 
     /**
@@ -44,10 +47,17 @@ public function initialize()
      */
     public function add(): void
     {
-        $data = $this->request->getData();
+        $data = $this->getRequest()->getData();
+        $allowedFields = ['category_id', 'edited', 'edited_by', 'pid', 'subject', 'text'];
+        $data = array_intersect_key($data, array_fill_keys($allowedFields, 1));
+
+        $data += [
+            'name' => $this->CurrentUser->get('username'),
+            'user_id' => $this->CurrentUser->getId(),
+        ];
 
         /** @var Entry */
-        $posting = $this->Entries->createPosting($data, $this->CurrentUser);
+        $posting = $this->Posting->create($data, $this->CurrentUser);
 
         if (empty($posting)) {
             throw new BadRequestException();
@@ -73,19 +83,27 @@ public function add(): void
      */
     public function edit(string $id): void
     {
-        $data = $this->request->getData();
+        $id = $this->getRequest()->getData('id', null);
 
-        if (empty($data['id'])) {
+        if (empty($id)) {
             throw new BadRequestException('No posting-id provided.');
         }
 
-        $id = $data['id'];
         $posting = $this->Entries->get($id);
         if (!$posting) {
             throw new NotFoundException('Posting not found.');
         }
 
-        $updatedPosting = $this->Entries->updatePosting($posting, $data, $this->CurrentUser);
+        $data = $this->getRequest()->getData();
+        $allowedFields = ['category_id', 'edited', 'edited_by', 'subject', 'text'];
+        $data = array_intersect_key($data, array_fill_keys($allowedFields, 1));
+
+        $data += [
+            'edited' => bDate(),
+            'edited_by' => $this->CurrentUser->get('username'),
+        ];
+
+        $updatedPosting = $this->Posting->update($posting, $data, $this->CurrentUser);
 
         if (!$updatedPosting) {
             throw new BadRequestException('Posting could not be saved.');
@@ -144,7 +162,9 @@ public function meta(?string $id = null): void
         } else {
             /// We currently don't save drafts for edits
             $where = ['user_id' => $this->CurrentUser->getId()];
-            ($pid) ? $where['pid'] = $pid : $where[] = 'pid IS NULL';
+            if (is_numeric($pid)) {
+                $where['pid'] = $pid;
+            }
             $draft = $this->Entries->Drafts->find()->where($where)->first();
 
             if ($draft) {
diff --git a/src/Controller/PreviewController.php b/src/Controller/PreviewController.php
index d0d620b32..379e68854 100644
--- a/src/Controller/PreviewController.php
+++ b/src/Controller/PreviewController.php
@@ -13,6 +13,7 @@
 namespace App\Controller;
 
 use Api\Controller\ApiAppController;
+use App\Controller\Component\PostingComponent;
 use App\Model\Table\EntriesTable;
 use Cake\I18n\Time;
 use Cake\View\Helper\IdGeneratorTrait;
@@ -21,6 +22,7 @@
  * Class EntriesController
  *
  * @property EntriesTable $Entries
+ * @property PostingComponent $Posting
  */
 class PreviewController extends ApiAppController
 {
@@ -34,6 +36,7 @@ class PreviewController extends ApiAppController
     public function preview()
     {
         $this->loadModel('Entries');
+        $this->loadComponent('Posting');
 
         $data = [
             'category_id' => $this->request->getData('category_id'),
@@ -54,7 +57,7 @@ public function preview()
 
         if (!empty($data['pid'])) {
             $parent = $this->Entries->get($data['pid']);
-            $data = $this->Entries->prepareChildPosting($parent, $data);
+            $data = $this->Posting->prepareChildPosting($parent, $data);
         }
 
         /** @var \App\Model\Entity\Entry */
diff --git a/src/Controller/UsersController.php b/src/Controller/UsersController.php
index d9e5686bc..47739b492 100644
--- a/src/Controller/UsersController.php
+++ b/src/Controller/UsersController.php
@@ -432,7 +432,7 @@ public function view($id = null)
 
         $blockForm = new BlockForm();
         $solved = $this->Users->countSolved($id);
-        $this->set(compact('blockForm', 'isEditingAllowed', 'solved', 'user'));
+        $this->set(compact('blockForm', 'solved', 'user'));
         $this->set('titleForLayout', $user->get('username'));
     }
 
@@ -560,13 +560,9 @@ public function delete($id)
             (new ResourceAI())->onRole($readUser->getRole())
         );
         if (!$permission) {
-            throw new ForbiddenException(
-                sprintf(
-                    'User "%s" is not allowed to delete user "%s".',
-                    $this->CurrentUser->get('username'),
-                    $readUser->get('username')
-                ),
-                1571811593
+            throw new SaitoForbiddenException(
+                'Not allowed to delete a user.',
+                ['CurrentUser' => $this->CurrentUser, 'user_id' => $readUser->get('username')]
             );
         }
 
@@ -631,7 +627,10 @@ public function lock()
             (new ResourceAI())->onRole($readUser->getRole())
         );
         if (!$permission) {
-            throw new ForbiddenException(null, 1571316877);
+            throw new SaitoForbiddenException(
+                null,
+                ['CurrentUser' => $this->CurrentUser]
+            );
         }
 
         if ($this->CurrentUser->isUser($readUser)) {
@@ -679,7 +678,10 @@ public function unlock(string $id)
             (new ResourceAI())->onRole($user->getRole())
         );
         if (!$permission) {
-            throw new ForbiddenException(null, 1571316877);
+            throw new SaitoForbiddenException(
+                null,
+                ['CurrentUser' => $this->CurrentUser]
+            );
         }
 
         if (!$this->Users->UserBlocks->unblock($id)) {
@@ -814,7 +816,10 @@ public function role($id)
         $unrestricted = $this->CurrentUser->permission('saito.core.user.role.set.unrestricted', $identifier);
         $restricted = $this->CurrentUser->permission('saito.core.user.role.set.restricted', $identifier);
         if (!$restricted && !$unrestricted) {
-            throw new ForbiddenException();
+            throw new SaitoForbiddenException(
+                null,
+                ['CurrentUser' => $this->CurrentUser]
+            );
         }
 
         /** @var Permissions */
diff --git a/src/Lib/Model/Table/AppSettingTable.php b/src/Lib/Model/Table/AppSettingTable.php
index 5f9252122..8e98b23aa 100644
--- a/src/Lib/Model/Table/AppSettingTable.php
+++ b/src/Lib/Model/Table/AppSettingTable.php
@@ -52,7 +52,7 @@ public function afterDelete()
      */
     public function clearCache()
     {
-        $this->_dispatchEvent(
+        $this->dispatchDbEvent(
             'Cmd.Cache.clear',
             ['cache' => ['Saito', 'Thread']]
         );
diff --git a/src/Lib/Model/Table/AppTable.php b/src/Lib/Model/Table/AppTable.php
index 044b3d114..5743b04a4 100644
--- a/src/Lib/Model/Table/AppTable.php
+++ b/src/Lib/Model/Table/AppTable.php
@@ -36,26 +36,6 @@ class AppTable extends Table
      */
     protected $_SEM;
 
-    /**
-     * Toggle bool field value.
-     *
-     * @param int $recordId The record-ID.
-     * @param string $field The name of the field to toggle.
-     * @return int new field The new value after the toggle.
-     */
-    public function toggle($recordId, $field)
-    {
-        $entity = $this->query()
-            ->select(['id', $field])
-            ->where(['id' => $recordId])
-            ->first();
-        $new = ($entity->get($field) == 0) ? 1 : 0;
-        $this->patchEntity($entity, [$field => $new]);
-        $this->save($entity);
-
-        return $new;
-    }
-
     /**
      * Check that a record exists.
      *
@@ -110,7 +90,7 @@ public function increment($where, $field, $amount = 1)
      * @param array $data additional event data
      * @return void
      */
-    protected function _dispatchEvent($event, $data = [])
+    public function dispatchDbEvent($event, $data = [])
     {
         EventManager::instance()->dispatch(new Event($event, $this, $data));
         // propagate event on Saito's event bus
diff --git a/src/Lib/Saito/App/Registry.php b/src/Lib/Saito/App/Registry.php
index ac9f3248f..c2460904d 100644
--- a/src/Lib/Saito/App/Registry.php
+++ b/src/Lib/Saito/App/Registry.php
@@ -15,7 +15,6 @@
 use Aura\Di\Container;
 use Aura\Di\ContainerBuilder;
 use Cake\Core\Configure;
-use Cake\ORM\TableRegistry;
 use Cron\Lib\Cron;
 use Saito\Markup\MarkupSettings;
 use Saito\User\Permission\Permissions;
@@ -45,7 +44,6 @@ public static function initialize()
         $dic->set('Permissions', $dic->lazyNew(Permissions::class));
         $dic->params[Permissions::class]['roles'] = Configure::read('Saito.Permission.Roles');
         $dic->params[Permissions::class]['resources'] = Configure::read('Saito.Permission.Resources');
-        $dic->params[Permissions::class]['categories'] = TableRegistry::getTableLocator()->get('Categories');
 
         $dic->set('AppStats', $dic->lazyNew('\Saito\App\Stats'));
 
diff --git a/src/Lib/Saito/Exception/SaitoForbiddenException.php b/src/Lib/Saito/Exception/SaitoForbiddenException.php
index 3cbcbdb58..f4bdf8aea 100644
--- a/src/Lib/Saito/Exception/SaitoForbiddenException.php
+++ b/src/Lib/Saito/Exception/SaitoForbiddenException.php
@@ -25,6 +25,8 @@ public function __construct($message = null, $data = [])
     {
         $logger = new ForbiddenLogger;
         $logger->write($message, $data);
-        parent::__construct($message, 403);
+
+        $publicMessage = __('exc.forbidden');
+        parent::__construct($publicMessage, 403);
     }
 }
diff --git a/src/Lib/Saito/Test/IntegrationTestCase.php b/src/Lib/Saito/Test/IntegrationTestCase.php
index 4ea2b25d4..e747c94c9 100644
--- a/src/Lib/Saito/Test/IntegrationTestCase.php
+++ b/src/Lib/Saito/Test/IntegrationTestCase.php
@@ -17,12 +17,12 @@
 use Cake\Core\Configure;
 use Cake\Event\Event;
 use Cake\Event\EventManager;
-use Cake\Http\Exception\ForbiddenException;
 use Cake\Http\Response;
 use Cake\ORM\TableRegistry;
 use Cake\Routing\Router;
 use Cake\TestSuite\IntegrationTestTrait;
 use Cake\TestSuite\TestCase;
+use Saito\Exception\SaitoForbiddenException;
 
 /**
  * Setup/teardown, helper and assumptions for Saito integration tests
@@ -145,18 +145,47 @@ protected function _unsetUserAgent()
      * @param array $methods methods to mock
      * @return mixed
      */
-    public function getMockForTable($table, array $methods = [])
+    protected function getMockForTable($table, array $methods = [])
+    {
+        $mock = $this->getMockForTableParent($table, $methods);
+        $this->attachToController($table, $mock);
+
+        return $mock;
+    }
+
+    /**
+     * Mocks a property on a controller (e.g. empty Component).
+     *
+     * @param string $name Property to mock
+     * @param array $methods Methods to mock
+     * @return mixed
+     */
+    protected function getMockOnController(string $name, array $methods = [])
+    {
+        $mock = $this->getMockBuilder('stdClass')
+            ->setMethods($methods)
+            ->getMock();
+        $this->attachToController($name, $mock);
+
+        return $mock;
+    }
+
+    /**
+     * Attaches an property to the controller
+     *
+     * @param string $name Property name
+     * @param mixed $item Item
+     * @return void
+     */
+    private function attachToController(string $name, $item): void
     {
-        $Mock = $this->getMockForTableParent($table, $methods);
         EventManager::instance()->on(
             'Controller.initialize',
-            function (Event $event) use ($table, $Mock) {
+            function (Event $event) use ($name, $item) {
                 $Controller = $event->getSubject();
-                $Controller->{$table} = $Mock;
+                $Controller->{$name} = $item;
             }
         );
-
-        return $Mock;
     }
 
     /**
@@ -290,7 +319,7 @@ public function assertRouteForRole($route, $role, $referer = true, $method = 'GE
                 $cought = false;
                 try {
                     $this->{$method}($route);
-                } catch (ForbiddenException $e) {
+                } catch (SaitoForbiddenException $e) {
                     $cought = true;
                 }
 
diff --git a/src/Lib/Saito/Test/TestCaseTrait.php b/src/Lib/Saito/Test/TestCaseTrait.php
index 648ff6ac3..f5976c388 100644
--- a/src/Lib/Saito/Test/TestCaseTrait.php
+++ b/src/Lib/Saito/Test/TestCaseTrait.php
@@ -17,6 +17,7 @@
 use Cake\Filesystem\File;
 use Cake\I18n\I18n;
 use Cake\Mailer\TransportFactory;
+use Cake\ORM\TableRegistry;
 use Cake\Utility\Inflector;
 use Saito\App\Registry;
 use Saito\Cache\CacheSupport;
@@ -121,6 +122,17 @@ public function getMockForTable($table, array $methods = [])
         return $Mock;
     }
 
+    /**
+     * Insert categories into permissions
+     *
+     * @return void
+     */
+    protected function insertCategoryPermissions(): void
+    {
+        Registry::get('Permissions')
+            ->buildCategories(TableRegistry::getTableLocator()->get('Categories'));
+    }
+
     /**
      * Mock mailtransporter
      *
diff --git a/src/Lib/Saito/Thread/Renderer/ThreadHtmlRenderer.php b/src/Lib/Saito/Thread/Renderer/ThreadHtmlRenderer.php
index cc45727b8..828f82662 100644
--- a/src/Lib/Saito/Thread/Renderer/ThreadHtmlRenderer.php
+++ b/src/Lib/Saito/Thread/Renderer/ThreadHtmlRenderer.php
@@ -126,13 +126,10 @@ protected function _renderThreadLine(PostingInterface $node, array $posting, int
             $categoryId = $posting['category']['id'];
             if (!isset(self::$_catL10n[$categoryId])) {
                 $accession = $posting['category']['accession'];
-                $catAcs = h(
-                    __d('nondynamic', 'category_acs_' . $accession . '_exp')
-                );
                 $catDesc = h($posting['category']['description']);
                 $catTitle = h($posting['category']['category']);
                 $category = <<
+
 	($catTitle)
 
 EOF;
diff --git a/src/Lib/Saito/User/Permission/Permissions.php b/src/Lib/Saito/User/Permission/Permissions.php
index 8ef5be3e9..d76bfa338 100644
--- a/src/Lib/Saito/User/Permission/Permissions.php
+++ b/src/Lib/Saito/User/Permission/Permissions.php
@@ -38,36 +38,17 @@ class Permissions
     /** @var Resources */
     protected $resources;
 
-    /** @var CategoriesTable */
-    protected $categories;
-
     /**
      * Constructor
      *
      * @param Roles $roles The roles
      * @param Resources $resources The resources collection
-     * @param CategoriesTable $categories Categories for accession permissions
      */
-    public function __construct(Roles $roles, Resources $resources, CategoriesTable $categories)
+    public function __construct(Roles $roles, Resources $resources)
     {
         Stopwatch::start('Permission::__construct()');
         $this->roles = $roles;
         $this->resources = $resources;
-        $this->categories = $categories;
-
-        $categories = Cache::remember(
-            'saito.core.permission.categories',
-            function () {
-                return $this->bootstrapCategories();
-            }
-        );
-        foreach ($categories as $category) {
-            $this->resources->add(
-                (new Resource($category['resource']))
-                ->allow((new ResourceAC())
-                    ->asRole($category['role']))
-            );
-        }
 
         Stopwatch::stop('Permission::__construct()');
     }
@@ -97,35 +78,49 @@ public function getRoles(): Roles
     }
 
     /**
-     * convert category-accessions and insert them as resources
-     *
-     * Resource: `saito.core.category..`
+     * Build category permissions
      *
-     * @return array [['resource' => , 'role' => ]]
+     * @param CategoriesTable $categories Categories for accession permissions
+     * @return void
      */
-    protected function bootstrapCategories(): array
+    public function buildCategories(CategoriesTable $categories): void
     {
-        $resources = [];
-        $categories = $this->categories->getAllCategories();
-        $roles = $this->roles->getAvailable(true);
-        $accessions = array_combine(array_column($roles, 'id'), array_column($roles, 'type'));
-        $actions = [
-            'read' => 'accession',
-            'thread' => 'accession_new_thread',
-            'answer' => 'accession_new_posting'
-        ];
-        foreach ($categories as $category) {
-            foreach ($actions as $action => $field) {
-                if (empty($accessions[$category->get($field)])) {
-                    continue;
+        $categories = Cache::remember(
+            'saito.core.permission.categories',
+            function () use ($categories): array {
+                $resources = [];
+                $categories = $categories->getAllCategories();
+                $roles = $this->roles->getAvailable(true);
+                $accessions = array_combine(array_column($roles, 'id'), array_column($roles, 'type'));
+                $actions = [
+                    'read' => 'accession',
+                    'thread' => 'accession_new_thread',
+                    'answer' => 'accession_new_posting'
+                ];
+                foreach ($categories as $category) {
+                    foreach ($actions as $action => $field) {
+                        if (empty($accessions[$category->get($field)])) {
+                            continue;
+                        }
+                        $role = $accessions[$category->get($field)];
+                        $categoryId = $category->get('id');
+                        $resource = "saito.core.category.{$categoryId}.{$action}";
+                        $resources[] = ['resource' => $resource, 'role' => $role];
+                    }
                 }
-                $role = $accessions[$category->get($field)];
-                $categoryId = $category->get('id');
-                $resource = "saito.core.category.{$categoryId}.{$action}";
-                $resources[] = ['resource' => $resource, 'role' => $role];
+
+                // array [['resource' => , 'role' => ]]
+                // Resource: `saito.core.category..`
+                return $resources;
             }
-        }
+        );
 
-        return $resources;
+        foreach ($categories as $category) {
+            $this->resources->add(
+                (new Resource($category['resource']))
+                ->allow((new ResourceAC())
+                    ->asRole($category['role']))
+            );
+        }
     }
 }
diff --git a/src/Lib/Saito/Validation/SaitoValidationProvider.php b/src/Lib/Saito/Validation/SaitoValidationProvider.php
index 7a783a204..ce172a19b 100644
--- a/src/Lib/Saito/Validation/SaitoValidationProvider.php
+++ b/src/Lib/Saito/Validation/SaitoValidationProvider.php
@@ -12,37 +12,8 @@
 
 namespace Saito\Validation;
 
-use Cake\ORM\TableRegistry;
-use Saito\RememberTrait;
-
 class SaitoValidationProvider
 {
-    use RememberTrait;
-
-    /**
-     * validator checking if associated value exists
-     *
-     * @param int $value - ID in assocciated table.
-     * @param string $table - Name of associated table e.g. 'Comments'.
-     * @param array $context - Context.
-     * @return bool
-     */
-    public static function validateAssoc($value, $table, array $context)
-    {
-        if (!is_numeric($value)) {
-            return false;
-        }
-        $value = (int)$value;
-
-        $key = $table . $value;
-
-        return static::rememberStatic($key, function () use ($value, $table) {
-            $Table = TableRegistry::get($table);
-
-            return $Table->exists(['id' => $value]);
-        });
-    }
-
     /**
      * validator checking if value is unique case insensitive
      *
diff --git a/src/Lib/version.php b/src/Lib/version.php
index 05a45a17b..68ce31022 100644
--- a/src/Lib/version.php
+++ b/src/Lib/version.php
@@ -13,7 +13,7 @@
 $config = [
     'Saito' =>
         [
-            'v' => '5.5.0',
+            'v' => '5.6.0',
             'saitoHomepage' => 'https://saito.siezi.com/'
         ]
 ];
diff --git a/src/Locale/de/default.po b/src/Locale/de/default.po
index a209f5b5e..70934d7ae 100644
--- a/src/Locale/de/default.po
+++ b/src/Locale/de/default.po
@@ -294,11 +294,6 @@ msgstr "Seite"
 msgid "view.type.mix"
 msgstr "Mix"
 
-#: src/Controller/EntriesController.php:200
-#: src/Controller/EntriesController.php:209
-msgid "Invalid post"
-msgstr "Posting konnte nicht gefunden werden."
-
 #: src/Controller/EntriesController.php:247
 msgid "Write a New Posting"
 msgstr "Neuen Beitrag verfassen"
@@ -1461,6 +1456,8 @@ msgstr "Nutzer löschen"
 msgid "user.del.ok.m"
 msgstr "Nutzer \"{0}\" wurde gelöscht."
 
+msgid "exc.forbidden"
+msgstr "Zugriff nicht erlaubt"
 
 #~ msgid "Ressources"
 #~ msgstr "Ressourcen"
diff --git a/src/Locale/de/nondynamic.po b/src/Locale/de/nondynamic.po
index 7a1084485..8218bd341 100644
--- a/src/Locale/de/nondynamic.po
+++ b/src/Locale/de/nondynamic.po
@@ -31,18 +31,6 @@ msgstr "Feld darf nicht leer sein."
 msgid "notEmpty"
 msgstr "Feld darf nicht leer sein."
 
-#
-msgid "category_acs_0_exp"
-msgstr "Kategorie für nicht eingeloggte Benutzer sichtbar"
-
-#
-msgid "category_acs_1_exp"
-msgstr "Kategorie nur für eingeloggte Benutzer sichtbar"
-
-#
-msgid "category_acs_2_exp"
-msgstr "Kategorie nur für Moderatoren sichtbar"
-
 #
 msgid "validation_error_pwConfirm"
 msgstr "Passwortbestätigung stimmt nicht überein."
diff --git a/src/Locale/en/default.po b/src/Locale/en/default.po
index f16bccc07..ee4f35937 100644
--- a/src/Locale/en/default.po
+++ b/src/Locale/en/default.po
@@ -288,11 +288,6 @@ msgstr ""
 msgid "view.type.mix"
 msgstr "Mix"
 
-#: src/Controller/EntriesController.php:200
-#: src/Controller/EntriesController.php:209
-msgid "Invalid post"
-msgstr ""
-
 #: src/Controller/EntriesController.php:247
 msgid "Write a New Posting"
 msgstr ""
@@ -1435,6 +1430,9 @@ msgstr "Delete user"
 msgid "user.del.ok.m"
 msgstr "User \"{0}\" was deleted."
 
+msgid "exc.forbidden"
+msgstr "Access forbidden"
+
 #, fuzzy
 #~ msgid "Uploads"
 #~ msgstr "Upload"
diff --git a/src/Locale/en/nondynamic.po b/src/Locale/en/nondynamic.po
index 03187b25c..90e96af3a 100644
--- a/src/Locale/en/nondynamic.po
+++ b/src/Locale/en/nondynamic.po
@@ -31,17 +31,6 @@ msgstr "Field must not be empty."
 msgid "notEmpty"
 msgstr "Field must not be empty."
 
-#
-msgid "category_acs_0_exp"
-msgstr "Category visible for non-logged in visitors"
-
-#
-msgid "category_acs_1_exp"
-msgstr "Category only visible for logged in users"
-
-#
-msgid "category_acs_2_exp"
-msgstr "Category only visible for moderators"
 #
 msgid "validation_error_pwConfirm"
 msgstr "Password confirmation does not match."
diff --git a/src/Model/Behavior/PostingBehavior.php b/src/Model/Behavior/PostingBehavior.php
index 34869e91f..1e6ceb2ee 100644
--- a/src/Model/Behavior/PostingBehavior.php
+++ b/src/Model/Behavior/PostingBehavior.php
@@ -12,14 +12,14 @@
 
 namespace App\Model\Behavior;
 
-use App\Lib\Model\Table\FieldFilter;
-use App\Model\Entity\Entry;
 use App\Model\Table\EntriesTable;
 use Cake\Cache\Cache;
 use Cake\Datasource\Exception\RecordNotFoundException;
+use Cake\Event\Event;
 use Cake\ORM\Behavior;
+use Cake\ORM\Entity;
 use Cake\ORM\Query;
-use Saito\Posting\Basic\BasicPostingInterface;
+use Cake\ORM\RulesChecker;
 use Saito\Posting\Posting;
 use Saito\Posting\PostingInterface;
 use Saito\Posting\TreeBuilder;
@@ -29,169 +29,70 @@
 
 class PostingBehavior extends Behavior
 {
-    /** @var CurrentUserInterface */
-    private $CurrentUser;
-
-    /** @var FieldFilter */
-    private $fieldFilter;
-
     /**
      * {@inheritDoc}
      */
-    public function initialize(array $config)
-    {
-        $this->fieldFilter = (new fieldfilter())
-            ->setConfig('create', ['category_id', 'pid', 'subject', 'text'])
-            ->setConfig('update', ['category_id', 'subject', 'text']);
-    }
-
-    /**
-     * Creates a new posting from user
-     *
-     * @param array $data raw posting data
-     * @param CurrentUserInterface $CurrentUser the current user
-     * @return Entry|null on success, null otherwise
-     */
-    public function createPosting(array $data, CurrentUserInterface $CurrentUser): ?Entry
+    public function buildRules(Event $event, RulesChecker $rules)
     {
-        $data = $this->fieldFilter->filterFields($data, 'create');
-
-        if (!empty($data['pid'])) {
-            /// new posting is answer to existing posting
-            $parent = $this->getTable()->get($data['pid']);
-
-            if (empty($parent)) {
-                throw new \InvalidArgumentException(
-                    'Parent posting for creating a new answer not found.',
-                    1564756571
-                );
-            }
-
-            $data = $this->prepareChildPosting($parent, $data);
-        } else {
-            /// if no pid is provided the new posting is root-posting
-            $data['pid'] = 0;
-        }
+        $rules->add(
+            function ($entity) {
+                return $entity->isDirty('locked') ? ($entity->get('pid') === 0) : true;
+            },
+            'checkOnlyRootCanBeLocked',
+            [
+                'errorField' => 'locked',
+                'message' => 'Only a root posting can be locked.',
+            ]
+        );
 
-        /// set user who created the posting
-        $data['user_id'] = $CurrentUser->getId();
-        $data['name'] = $CurrentUser->get('username');
+        $rules->addUpdate(
+            function ($entity) {
+                if ($entity->isDirty('category_id')) {
+                    return $entity->isRoot();
+                }
+
+                return true;
+            },
+            'checkCategoryChangeOnlyOnRootPostings',
+            [
+                'errorField' => 'category_id',
+                'message' => 'Cannot change category on non-root-postings.',
+            ]
+        );
 
-        $this->validatorSetup($CurrentUser);
+        $rules->add($rules->existsIn('category_id', 'Categories'));
 
-        /** @var EntriesTable */
-        $table = $this->getTable();
-
-        return $table->createEntry($data);
+        return $rules;
     }
 
     /**
-     * Updates an existing posting
-     *
-     * @param Entry $posting the posting to update
-     * @param array $data data the posting should be updated with
-     * @param CurrentUserInterface $CurrentUser the current-user
-     * @return Entry|null the posting which was asked to update
+     * {@inheritDoc}
      */
-    public function updatePosting(Entry $posting, array $data, CurrentUserInterface $CurrentUser): ?Entry
+    public function beforeSave(Event $event, Entity $entity)
     {
-        $data = $this->fieldFilter->filterFields($data, 'update');
-        $isRoot = $posting->isRoot();
+        $success = true;
 
-        if (!$isRoot) {
-            $parent = $this->getTable()->get($posting->get('pid'));
-            $data = $this->prepareChildPosting($parent, $data);
+        /// change category of thread if category of root entry changed
+        if (!$entity->isNew() && $entity->isDirty('category_id')) {
+            $success &= $this->threadChangeCategory(
+                $entity->get('id'),
+                $entity->get('category_id')
+            );
         }
 
-        $data['edited_by'] = $CurrentUser->get('username');
-
-        /// must be set for validation
-        $data['locked'] = $posting->get('locked');
-        $data['fixed'] = $posting->get('fixed');
-        $data['category_id'] = $data['category_id'] ?? $posting->get('category_id');
-
-        $data['pid'] = $posting->get('pid');
-        $data['time'] = $posting->get('time');
-        $data['user_id'] = $posting->get('user_id');
-
-        $this->validatorSetup($CurrentUser);
-        $this->getTable()->getValidator()->add(
-            'edited_by',
-            'isEditingAllowed',
-            ['rule' => [$this, 'validateEditingAllowed']]
-        );
-
-        /** @var EntriesTable */
-        $table = $this->getTable();
-
-        return $table->updateEntry($posting, $data);
-    }
-
-    /**
-     * Populates data of an answer derived from parent the parent-posting
-     *
-     * @param BasicPostingInterface $parent parent data
-     * @param array $data current posting data
-     * @return array populated $data
-     */
-    public function prepareChildPosting(BasicPostingInterface $parent, array $data): array
-    {
-        if (empty($data['subject'])) {
-            // if new subject is empty use the parent's subject
-            $data['subject'] = $parent->get('subject');
+        if (!$success) {
+            $event->stopPropagation();
         }
-
-        $data['category_id'] = $data['category_id'] ?? $parent->get('category_id');
-        $data['tid'] = $parent->get('tid');
-
-        return $data;
-    }
-
-    /**
-     * Sets-up validator for the table
-     *
-     * @param CurrentUserInterface $CurrentUser current user
-     * @return void
-     */
-    private function validatorSetup(CurrentUserInterface $CurrentUser): void
-    {
-        $this->CurrentUser = $CurrentUser;
-
-        $this->getTable()->getValidator()->add(
-            'category_id',
-            'isAllowed',
-            ['rule' => [$this, 'validateCategoryIsAllowed']]
-        );
-    }
-
-    /**
-     * check that entries are only in existing and allowed categories
-     *
-     * @param mixed $categoryId value
-     * @param array $context context
-     * @return bool
-     */
-    public function validateCategoryIsAllowed($categoryId, $context): bool
-    {
-        $isRoot = $context['data']['pid'] == 0;
-        $action = $isRoot ? 'thread' : 'answer';
-
-        // @td better return !$posting->isAnsweringForbidden();
-        return $this->CurrentUser->getCategories()->permission($action, $categoryId);
     }
 
     /**
-     * check editing allowed
-     *
-     * @param mixed $check value
-     * @param array $context context
-     * @return bool
+     * {@inheritDoc}
      */
-    public function validateEditingAllowed($check, $context): bool
+    public function afterSave(Event $event, Entity $entity)
     {
-        $posting = (new Posting($context['data']))->withCurrentUser($this->CurrentUser);
-
-        return $posting->isEditingAllowed();
+        if ($entity->isDirty('locked')) {
+            $this->lockThread($entity->get('tid'), $entity->get('locked'));
+        }
     }
 
     /**
@@ -408,4 +309,123 @@ public function findEntriesForThreads(Query $query, array $options): Query
 
         return $query;
     }
+
+    /**
+     * Locks or unlocks a thread
+     *
+     * The lock operation is supposed to be done on the root entry.
+     * All other entries in the same thread are set to locked too.
+     *
+     * @param int $tid ID of the thread to lock
+     * @param bool $locked True to lock, false to unlock
+     * @return void
+     */
+    protected function lockThread(int $tid, $locked = true)
+    {
+        $this->getTable()->updateAll(['locked' => $locked], ['tid' => $tid]);
+    }
+
+    /**
+     * Changes the category of a thread.
+     *
+     * Assigns the new category-id to all postings in that thread.
+     *
+     * @param int $tid thread-ID
+     * @param int $newCategoryId id for new category
+     * @return bool success
+     * @throws RecordNotFoundException
+     */
+    protected function threadChangeCategory(int $tid, int $newCategoryId): bool
+    {
+        $affected = $this->getTable()->updateAll(
+            ['category_id' => $newCategoryId],
+            ['tid' => $tid]
+        );
+
+        return $affected > 0;
+    }
+
+    /**
+     * Merge thread on to entry $targetId
+     *
+     * @param int $sourceId root-id of the posting that is merged onto another
+     *     thread
+     * @param int $targetId id of the posting the source-thread should be
+     *     appended to
+     * @return bool true if merge was successfull false otherwise
+     */
+    public function threadMerge(int $sourceId, int $targetId): bool
+    {
+        /** @var EntriesTable */
+        $table = $this->getTable();
+
+        $sourcePosting = $table->get($sourceId, ['return' => 'Entity']);
+
+        // check that source is thread-root and not an subposting
+        if (!$sourcePosting->isRoot()) {
+            return false;
+        }
+
+        $targetPosting = $table->get($targetId);
+
+        // check that target exists
+        if (!$targetPosting) {
+            return false;
+        }
+
+        // check that a thread is not merged onto itself
+        if ($targetPosting->get('tid') === $sourcePosting->get('tid')) {
+            return false;
+        }
+
+        // set target entry as new parent entry
+        $table->patchEntity(
+            $sourcePosting,
+            ['pid' => $targetPosting->get('id')]
+        );
+        if ($table->save($sourcePosting)) {
+            // associate all entries in source thread to target thread
+            $table->updateAll(
+                ['tid' => $targetPosting->get('tid')],
+                ['tid' => $sourcePosting->get('tid')]
+            );
+
+            // appended source entries get category of target thread
+            $this->threadChangeCategory(
+                $targetPosting->get('tid'),
+                $targetPosting->get('category_id')
+            );
+
+            // update target thread last answer if source is newer
+            $sourceLastAnswer = $sourcePosting->get('last_answer');
+            $targetLastAnswer = $targetPosting->get('last_answer');
+            if ($sourceLastAnswer->gt($targetLastAnswer)) {
+                $targetRoot = $table->get(
+                    $targetPosting->get('tid'),
+                    ['return' => 'Entity']
+                );
+                $targetRoot = $table->patchEntity(
+                    $targetRoot,
+                    ['last_answer' => $sourceLastAnswer]
+                );
+                $table->save($targetRoot);
+            }
+
+            // propagate pinned property from target to source
+            $isTargetPinned = $targetPosting->isLocked();
+            $isSourcePinned = $sourcePosting->isLocked();
+            if ($isSourcePinned !== $isTargetPinned) {
+                $this->lockThread($targetPosting->get('tid'), $isTargetPinned);
+            }
+
+            $table->dispatchDbEvent(
+                'Model.Thread.change',
+                ['subject' => $targetPosting->get('tid')]
+            );
+
+            return true;
+        }
+
+        return false;
+    }
 }
diff --git a/src/Model/Table/CategoriesTable.php b/src/Model/Table/CategoriesTable.php
index 63ef2dbf4..dafad03ad 100755
--- a/src/Model/Table/CategoriesTable.php
+++ b/src/Model/Table/CategoriesTable.php
@@ -17,7 +17,9 @@
 use Cake\Datasource\ResultSetInterface;
 use Cake\ORM\TableRegistry;
 use Cake\Validation\Validator;
+use Saito\App\Registry;
 use Saito\RememberTrait;
+use Saito\User\Permission\Permissions;
 
 /**
  * Class CategoriesTable
@@ -51,23 +53,23 @@ public function validationDefault(Validator $validator)
             )
             ->add(
                 'accession',
+                'validateRoleExists',
                 [
-                    'isNumeric' => ['rule' => 'numeric'],
-                    'range' => ['rule' => ['range', 0, 3]]
+                    'rule' => [$this, 'validateRoleExists'],
                 ]
             )
             ->add(
                 'accession_new_thread',
+                'validateRoleExists',
                 [
-                    'isNumeric' => ['rule' => 'numeric'],
-                    'range' => ['rule' => ['range', 1, 3]]
+                    'rule' => [$this, 'validateRoleExists'],
                 ]
             )
             ->add(
                 'accession_new_posting',
+                'validateRoleExists',
                 [
-                    'isNumeric' => ['rule' => 'numeric'],
-                    'range' => ['rule' => ['range', 1, 3]]
+                    'rule' => [$this, 'validateRoleExists'],
                 ]
             );
 
@@ -140,4 +142,20 @@ public function deleteWithAllEntries($categoryId)
         );
         $this->delete($category);
     }
+
+    /**
+     * Validate that a role for the category actually exists
+     *
+     * @param string $roleId The role-ID int
+     * @return bool
+     */
+    public function validateRoleExists($roleId): bool
+    {
+        /** @var Permissions */
+        $permissions = Registry::get('Permissions');
+        $roles = $permissions->getRoles()->getAvailable(true);
+        $roleIds = array_column($roles, 'id');
+
+        return in_array((int)$roleId, $roleIds);
+    }
 }
diff --git a/src/Model/Table/DraftsTable.php b/src/Model/Table/DraftsTable.php
index 7a7af4c65..11254546f 100644
--- a/src/Model/Table/DraftsTable.php
+++ b/src/Model/Table/DraftsTable.php
@@ -52,6 +52,10 @@ public function initialize(array $config)
      */
     public function validationDefault(Validator $validator)
     {
+        /// pid
+        $validator
+            ->requirePresence('pid', 'create');
+
         /// subject
         $validator
             ->allowEmptyString('subject')
@@ -67,6 +71,10 @@ public function validationDefault(Validator $validator)
         /// text
         $validator->allowEmptyString('text');
 
+        /// user_id
+        $validator
+            ->requirePresence('user_id', 'create');
+
         return $validator;
     }
 
@@ -91,7 +99,7 @@ public function buildRules(RulesChecker $rules)
     {
         $rules = parent::buildRules($rules);
 
-        $rules->addCreate(new IsUnique(['pid', 'user_id'], ['allowMultipleNulls' => false]));
+        $rules->addCreate(new IsUnique(['pid', 'user_id']));
 
         $rules->add(
             function ($entity) {
@@ -121,8 +129,7 @@ function ($entity) {
      */
     public function deleteDraftForPosting(Entry $entry): void
     {
-        $where = ['user_id' => $entry->get('user_id')];
-        $entry->isRoot() ? $where[] = 'pid IS NULL' : $where['pid'] = $entry->get('pid');
+        $where = ['pid' => $entry->get('pid'), 'user_id' => $entry->get('user_id')];
         $this->deleteAll($where);
     }
 
diff --git a/src/Model/Table/EntriesTable.php b/src/Model/Table/EntriesTable.php
index a7eee7a09..c72938b81 100644
--- a/src/Model/Table/EntriesTable.php
+++ b/src/Model/Table/EntriesTable.php
@@ -19,7 +19,6 @@
 use Bookmarks\Model\Table\BookmarksTable;
 use Cake\Datasource\Exception\RecordNotFoundException;
 use Cake\Event\Event;
-use Cake\Http\Exception\NotFoundException;
 use Cake\ORM\Entity;
 use Cake\ORM\Query;
 use Cake\ORM\RulesChecker;
@@ -47,6 +46,7 @@
  * @method bool deletePosting(int $id)
  * @method array postingsForThreads(array $tids, ?array $order = null, ?CurrentUserInterface $CU)
  * @method PostingInterface postingsForThread(int $tid, ?bool $complete = false, ?CurrentUserInterface $CU)
+ * @method threadMerge(int $sourceId, int $targetId)
  */
 class EntriesTable extends AppTable
 {
@@ -138,18 +138,7 @@ public function validationDefault(Validator $validator)
         $categoryRequiredL10N = __('vld.entries.categories.notEmpty');
         $validator
             ->notEmpty('category_id', $categoryRequiredL10N)
-            ->requirePresence('category_id', 'create', $categoryRequiredL10N)
-            ->add(
-                'category_id',
-                [
-                    'numeric' => ['rule' => 'numeric'],
-                    'assoc' => [
-                        'rule' => ['validateAssoc', 'Categories'],
-                        'last' => true,
-                        'provider' => 'saito'
-                    ]
-                ]
-            );
+            ->requirePresence('category_id', 'create', $categoryRequiredL10N);
 
         /// last_answer
         $validator
@@ -205,24 +194,68 @@ public function buildRules(RulesChecker $rules)
     {
         $rules = parent::buildRules($rules);
 
-        $rules->addUpdate(
+        $rules->add(
+            function ($entity) {
+                if (!$entity->isDirty('solves') || empty($entity->get('solves') > 0)) {
+                    return true;
+                }
+
+                return !$entity->isRoot();
+            },
+            'checkSolvesOnlyOnAnswers',
+            [
+                'errorField' => 'solves',
+                'message' => 'Root postings cannot mark themself solved.',
+            ]
+        );
+
+        $rules->add(
             function ($entity) {
-                if ($entity->isDirty('category_id')) {
-                    return $entity->isRoot();
+                if (!$entity->isDirty('solves') || empty($entity->get('solves') > 0)) {
+                    return true;
                 }
 
-                return true;
+                return !$entity->isRoot();
             },
-            'checkCategoryChangeOnlyOnRootPostings',
+            'checkSolvesOnlyOnAnswers',
             [
-                'errorField' => 'category_id',
-                'message' => 'Cannot change category on non-root-postings.',
+                'errorField' => 'solves',
+                'message' => 'Root postings cannot mark themself solved.',
             ]
         );
 
         return $rules;
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public function afterSave(Event $event, Entity $entity, \ArrayObject $options)
+    {
+        if ($entity->isNew()) {
+            $this->Drafts->deleteDraftForPosting($entity);
+
+            /** @var Entry */
+            $posting = $this->get($entity->get('id'));
+            if ($posting->isRoot()) {
+                /// New thread: set thread-ID to posting's own ID.
+                $patched = $this->patchEntity($posting, ['tid' => $entity->get('id')]);
+                if (!$this->save($patched)) {
+                    $event->stopPropagation();
+                }
+                // Set it in the entity returned by the the save
+                $entity->set('tid', $entity->get('id'));
+            } else {
+                /// New answer: update last answer time of root entry
+                // @td Is this really necessary?
+                $this->updateAll(
+                    ['last_answer' => $posting->get('last_answer')],
+                    ['id' => $posting->get('tid')]
+                );
+            }
+        }
+    }
+
     /**
      * Advanced search configuration from SaitoSearch plugin
      *
@@ -265,7 +298,8 @@ public function searchManager(): Manager
      *
      * @param int $primaryKey key
      * @param array $options options
-     * @return mixed Posting if found false otherwise
+     * @throws RecordNotFoundException if record isn't found
+     * @return mixed Posting
      */
     public function get($primaryKey, $options = [])
     {
@@ -274,8 +308,12 @@ public function get($primaryKey, $options = [])
             ->where([$this->getAlias() . '.id' => $primaryKey])
             ->first();
 
-        // @td throw exception here
-        return empty($result) ? false : $result;
+        if (empty($result)) {
+            $msg = sprintf('Posting with ID "%s" not found.', $primaryKey);
+            throw new RecordNotFoundException($msg);
+        }
+
+        return $result;
     }
 
     /**
@@ -338,6 +376,7 @@ public function getFieldset(bool $complete = false): array
             'Users.avatar',
             'Users.id',
             'Users.signature',
+            'Users.user_type',
             'Users.user_place'
         ];
 
@@ -391,43 +430,20 @@ public function createEntry(array $data): ?Entry
             return $posting;
         }
 
+        /** @var Entry */
         $posting = $this->save($posting);
-        if (!$posting) {
+        if (empty($posting)) {
             return null;
         }
 
-        $id = $posting->get('id');
-        /** @var Entry */
-        $posting = $this->get($id, ['return' => 'Entity']);
-
-        if ($posting->isRoot()) {
-            // posting started a new thread, so set thread-ID to posting's own ID
-            /** @var Entry */
-            $posting = $this->patchEntity($posting, ['tid' => $id]);
-            if (!$this->save($posting)) {
-                return $posting;
-            }
-
-            $this->_dispatchEvent('Model.Thread.create', ['subject' => $id, 'data' => $posting]);
-        } else {
-            // update last answer time of root entry
-            $this->updateAll(
-                ['last_answer' => $posting->get('last_answer')],
-                ['id' => $posting->get('tid')]
-            );
-
-            $eventData = ['subject' => $posting->get('pid'), 'data' => $posting];
-            $this->_dispatchEvent('Model.Entry.replyToEntry', $eventData);
-            $this->_dispatchEvent('Model.Entry.replyToThread', $eventData);
-        }
+        $eventData = ['subject' => $posting->get('pid'), 'data' => $posting];
+        $this->dispatchDbEvent('Model.Entry.replyToEntry', $eventData);
 
         return $posting;
     }
 
     /**
-     * Updates a posting
-     *
-     * fields in $data are filtered except for $id!
+     * Updates a posting with new data
      *
      * @param Entry $posting Entity
      * @param array $data data
@@ -436,7 +452,6 @@ public function createEntry(array $data): ?Entry
     public function updateEntry(Entry $posting, array $data): ?Entry
     {
         $data['id'] = $posting->get('id');
-        $data['edited'] = bDate();
 
         /** @var Entry */
         $patched = $this->patchEntity($posting, $data);
@@ -451,7 +466,7 @@ public function updateEntry(Entry $posting, array $data): ?Entry
             return null;
         }
 
-        $this->_dispatchEvent(
+        $this->dispatchDbEvent(
             'Model.Entry.update',
             ['subject' => $posting->get('id'), 'data' => $posting]
         );
@@ -459,55 +474,6 @@ public function updateEntry(Entry $posting, array $data): ?Entry
         return $new;
     }
 
-    /**
-     * Marks a sub-entry as solution to a root entry
-     *
-     * @param Entry $posting posting to toggle
-     * @return bool success
-     */
-    public function toggleSolve(Entry $posting)
-    {
-        if ($posting->get('solves')) {
-            $value = 0;
-        } else {
-            $value = $posting->get('tid');
-        }
-
-        $this->patchEntity($posting, ['solves' => $value]);
-        if (!$this->save($posting)) {
-            return false;
-        }
-
-        $this->_dispatchEvent(
-            'Model.Entry.update',
-            ['subject' => $posting->get('id'), 'data' => $posting]
-        );
-
-        return true;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function toggle($id, $key)
-    {
-        $result = parent::toggle($id, $key);
-        if ($key === 'locked') {
-            $this->_threadLock($id, $result);
-        }
-
-        $entry = $this->get($id);
-        $this->_dispatchEvent(
-            'Model.Entry.update',
-            [
-                'subject' => $entry->get('id'),
-                'data' => $entry
-            ]
-        );
-
-        return $result;
-    }
-
     /**
      * {@inheritDoc}
      */
@@ -567,91 +533,10 @@ public function anonymizeEntriesFromUser(int $userId): void
         );
 
         if ($success) {
-            $this->_dispatchEvent('Cmd.Cache.clear', ['cache' => 'Thread']);
+            $this->dispatchDbEvent('Cmd.Cache.clear', ['cache' => 'Thread']);
         }
     }
 
-    /**
-     * Merge thread on to entry $targetId
-     *
-     * @param int $sourceId root-id of the posting that is merged onto another
-     *     thread
-     * @param int $targetId id of the posting the source-thread should be
-     *     appended to
-     * @return bool true if merge was successfull false otherwise
-     */
-    public function threadMerge($sourceId, $targetId)
-    {
-        $sourcePosting = $this->get($sourceId, ['return' => 'Entity']);
-
-        // check that source is thread-root and not an subposting
-        if (!$sourcePosting->isRoot()) {
-            return false;
-        }
-
-        $targetPosting = $this->get($targetId);
-
-        // check that target exists
-        if (!$targetPosting) {
-            return false;
-        }
-
-        // check that a thread is not merged onto itself
-        if ($targetPosting->get('tid') === $sourcePosting->get('tid')) {
-            return false;
-        }
-
-        // set target entry as new parent entry
-        $this->patchEntity(
-            $sourcePosting,
-            ['pid' => $targetPosting->get('id')]
-        );
-        if ($this->save($sourcePosting)) {
-            // associate all entries in source thread to target thread
-            $this->updateAll(
-                ['tid' => $targetPosting->get('tid')],
-                ['tid' => $sourcePosting->get('tid')]
-            );
-
-            // appended source entries get category of target thread
-            $this->_threadChangeCategory(
-                $targetPosting->get('tid'),
-                $targetPosting->get('category_id')
-            );
-
-            // update target thread last answer if source is newer
-            $sourceLastAnswer = $sourcePosting->get('last_answer');
-            $targetLastAnswer = $targetPosting->get('last_answer');
-            if ($sourceLastAnswer->gt($targetLastAnswer)) {
-                $targetRoot = $this->get(
-                    $targetPosting->get('tid'),
-                    ['return' => 'Entity']
-                );
-                $targetRoot = $this->patchEntity(
-                    $targetRoot,
-                    ['last_answer' => $sourceLastAnswer]
-                );
-                $this->save($targetRoot);
-            }
-
-            // propagate pinned property from target to source
-            $isTargetPinned = $targetPosting->isLocked();
-            $isSourcePinned = $sourcePosting->isLocked();
-            if ($isSourcePinned !== $isTargetPinned) {
-                $this->_threadLock($targetPosting->get('tid'), $isTargetPinned);
-            }
-
-            $this->_dispatchEvent(
-                'Model.Thread.change',
-                ['subject' => $targetPosting->get('tid')]
-            );
-
-            return true;
-        }
-
-        return false;
-    }
-
     /**
      * Implements the custom find type 'index paginator'
      *
@@ -671,71 +556,4 @@ public function findIndexPaginator(Query $query, array $options)
 
         return $query;
     }
-
-    /**
-     * Un-/Locks thread: sets posting in thread $tid to $locked
-     *
-     * @param int $tid thread-ID
-     * @param bool $locked flag
-     * @return void
-     */
-    protected function _threadLock($tid, $locked)
-    {
-        $this->updateAll(['locked' => $locked], ['tid' => $tid]);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function beforeSave(Event $event, Entity $entity)
-    {
-        $success = true;
-
-        /// change category of thread if category of root entry changed
-        if (!$entity->isNew() && $entity->isDirty('category_id')) {
-            $success &= $this->_threadChangeCategory(
-                // rules checks that only roots are allowed to change category, so tid = id
-                $entity->get('id'),
-                $entity->get('category_id')
-            );
-        }
-
-        if (!$success) {
-            $event->stopPropagation();
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function afterSave(Event $event, Entity $entity, \ArrayObject $options)
-    {
-        if ($entity->isNew()) {
-            $this->Drafts->deleteDraftForPosting($entity);
-        }
-    }
-
-    /**
-     * Changes the category of a thread.
-     *
-     * Assigns the new category-id to all postings in that thread.
-     *
-     * @param int $tid thread-ID
-     * @param int $newCategoryId id for new category
-     * @return bool success
-     * @throws NotFoundException
-     */
-    protected function _threadChangeCategory(int $tid, int $newCategoryId): bool
-    {
-        $exists = $this->Categories->exists($newCategoryId);
-        if (!$exists) {
-            throw new NotFoundException();
-        }
-        $affected = $this->updateAll(
-            ['category_id' => $newCategoryId],
-            ['tid' => $tid]
-        );
-
-        return $affected > 0;
-    }
 }
diff --git a/src/Model/Table/UserIgnoresTable.php b/src/Model/Table/UserIgnoresTable.php
index 61f2d8322..a37dcfb28 100644
--- a/src/Model/Table/UserIgnoresTable.php
+++ b/src/Model/Table/UserIgnoresTable.php
@@ -14,8 +14,7 @@
 
 use App\Lib\Model\Table\AppTable;
 use Cake\ORM\Query;
-use Cake\Validation\Validator;
-use Saito\Validation\SaitoValidationProvider;
+use Cake\ORM\RulesChecker;
 
 class UserIgnoresTable extends AppTable
 {
@@ -46,39 +45,15 @@ public function initialize(array $config)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
-    public function validationDefault(Validator $validator)
+    public function buildRules(RulesChecker $rules)
     {
-        $validator->setProvider('saito', SaitoValidationProvider::class);
-
-        $validator->notEmpty('user_id')
-            ->add(
-                'user_id',
-                [
-                    'assoc' => [
-                        'rule' => ['validateAssoc', 'Users'],
-                        'last' => true,
-                        'provider' => 'saito'
-                    ]
-                ]
-            );
-
-        $validator->notEmpty('blocked_user_id')
-            ->add(
-                'blocked_user_id',
-                [
-                    'assoc' => [
-                        'rule' => ['validateAssoc', 'Users'],
-                        'last' => true,
-                        'provider' => 'saito'
-                    ]
-                ]
-            );
+        $rules->add($rules->existsIn('user_id', 'Users'));
 
-        $validator->notEmpty('timestamp');
+        $rules->add($rules->existsIn('blocked_user_id', 'Users'));
 
-        return $validator;
+        return $rules;
     }
 
     /**
@@ -102,7 +77,7 @@ public function ignore(int $userId, int $blockedUserId): void
         $entity = $this->newEntity($data);
         $this->save($entity);
 
-        $this->_dispatchEvent(
+        $this->dispatchDbEvent(
             'Event.Saito.User.afterIgnore',
             [
                 'blockedUserId' => $blockedUserId,
diff --git a/src/Model/Table/UsersTable.php b/src/Model/Table/UsersTable.php
index df328f728..117e5f660 100644
--- a/src/Model/Table/UsersTable.php
+++ b/src/Model/Table/UsersTable.php
@@ -465,7 +465,7 @@ public function deleteAllExceptEntries(int $userId)
         } catch (\Exception $e) {
             return false;
         }
-        $this->_dispatchEvent('Cmd.Cache.clear', ['cache' => 'Thread']);
+        $this->dispatchDbEvent('Cmd.Cache.clear', ['cache' => 'Thread']);
 
         return true;
     }
@@ -509,7 +509,7 @@ protected function updateUsername(Entity $entity)
             ['edited_by' => $entity->getOriginal('username')]
         );
 
-        $this->_dispatchEvent('Cmd.Cache.clear', ['cache' => 'Thread']);
+        $this->dispatchDbEvent('Cmd.Cache.clear', ['cache' => 'Thread']);
     }
 
     /**
@@ -756,7 +756,7 @@ public function activate(int $userId, string $code)
             return false;
         }
 
-        $this->_dispatchEvent('Model.User.afterActivate', ['User' => $user]);
+        $this->dispatchDbEvent('Model.User.afterActivate', ['User' => $user]);
 
         return ['status' => 'activated', 'User' => $user];
     }
diff --git a/src/Shell/SaitoDummyDataShell.php b/src/Shell/SaitoDummyDataShell.php
index fa39ee1f7..a58fb3601 100644
--- a/src/Shell/SaitoDummyDataShell.php
+++ b/src/Shell/SaitoDummyDataShell.php
@@ -140,18 +140,27 @@ public function generatePostings()
         for ($i = 0; $i < $nPostings; $i++) {
             $newThread = $i < $seed;
 
+            $user = $this->_randomUser();
             $posting = [
+                'name' => $user->get('username'),
                 'subject' => "$i",
                 'text' => rand(0, 1) ? $this->_randomText() : '',
+                'user_id' => $user->getId(),
             ];
             if ($newThread) {
+                $posting['pid'] = 0;
                 $posting['category_id'] = $this->_randomCategory();
             } else {
-                $posting['pid'] = array_rand($this->_Threads, 1);
+                $id = array_rand($this->_Threads, 1);
+                $posting['category_id'] = $this->_Threads[$id]['category_id'];
+                $posting['tid'] = $this->_Threads[$id]['tid'];
+                $posting['pid'] = $this->_Threads[$id]['id'];
             }
-            $user = $this->_randomUser();
 
-            $posting = $this->Entries->createPosting($posting, $user);
+            $posting = $this->Entries->createEntry($posting);
+            if ($posting->hasErrors()) {
+                var_dump($posting->errors());
+            }
 
             if (empty($posting)) {
                 throw new \RuntimeException(
@@ -162,7 +171,11 @@ public function generatePostings()
             $this->_progress($i, $nPostings);
 
             $id = $posting->get('id');
-            $this->_Threads[$id] = $id;
+            $this->_Threads[] = [
+                'category_id' => $posting->get('category_id'),
+                'id' => $id,
+                'tid' => $posting->get('tid'),
+            ];
         }
 
         $this->out();
diff --git a/src/Template/Element/entry/thread_cached_init.ctp b/src/Template/Element/entry/thread_cached_init.ctp
index ff1c97629..1dd74491a 100755
--- a/src/Template/Element/entry/thread_cached_init.ctp
+++ b/src/Template/Element/entry/thread_cached_init.ctp
@@ -35,7 +35,7 @@ foreach ($entriesSub as $entrySub) :
     ?>
     
    
         
-            
    
+            
    
                 
                     
                 
diff --git a/src/Template/Element/entry/view_content.ctp b/src/Template/Element/entry/view_content.ctp
index fc1bc12ec..292bfb7a2 100644
--- a/src/Template/Element/entry/view_content.ctp
+++ b/src/Template/Element/entry/view_content.ctp
@@ -30,8 +30,8 @@ $schemaMeta = [];