Version upgrade (0.7.0)

When trying to search for hidden or disliked posts, it was impossible to search
by any aliases because of some hardcoded stuff. This commit removes the
hardcoded part altogether and fixes aliases support for these search terms.

.gitmodules

@@ -4,6 +4,6 @@
 [submodule "php-markdown"]
 	path = lib/php-markdown
 	url = https://github.com/michelf/php-markdown.git
-[submodule "redbean"]
-	path = lib/redbean
-	url = https://github.com/gabordemooij/redbean.git
+[submodule "lib/chibi-sql"]
+	path = lib/chibi-sql
+	url = https://github.com/rr-/chibi-sql.git

data/config.ini

@@ -1,33 +1,51 @@
 [chibi]
-prettyPrint=1
+enableCache=1
 
 [main]
-dbPath=./db.sqlite
-filesPath=./files/
-thumbsPath=./thumbs/
-mediaPath=./public_html/media/
-title=szurubooru
+dbDriver   = "sqlite"
+dbLocation = "./data/db.sqlite"
+dbUser     = "test"
+dbPass     = "test"
+filesPath  = "./data/files/"
+thumbsPath = "./data/thumbs/"
+logsPath   = "./data/logs/"
+mediaPath  = "./public_html/media/"
+title      = "szurubooru"
 salt       = "1A2/$_4xVa"
-logsPath=./logs/
 
 [misc]
 featuredPostMaxDays=7
 debugQueries=0
+logAnonymousUploads=1
+
+[help]
+title=Help
+subTitles[help]=General help
+subTitles[rules]=Rules
+subTitles[privacy]=Privacy policy
+paths[help]=./data/help.md
+paths[rules]=./data/rules.md
+paths[privacy]=./data/privacy.md
 
 [browsing]
 usersPerPage=8
 postsPerPage=20
+logsPerPage=250
+tagsPerPage=100
 thumbWidth=150
 thumbHeight=150
 thumbStyle=outside
 endlessScrollingDefault=1
+showPostTagTitlesDefault=0
+showDislikedPostsDefault=1
 maxSearchTokens=4
 maxRelatedPosts=50
 
 [comments]
 minLength = 5
 maxLength = 2000
-commentsPerPage = 20
+commentsPerPage = 10
+maxCommentsInList = 5
 
 [registration]
 staffActivation   = 0
@@ -44,29 +62,18 @@ confirmationEmailEnabled = 1
 confirmationEmailSenderName = "{host} mailing system"
 confirmationEmailSenderEmail = "noreply@{host}"
 confirmationEmailSubject = "{host} - account activation"
-confirmationEmailBody = "Hello,
-
-You received this e-mail because someone registered a user with this e-mail address at {host}. If it's you, visit {link} to finish registration process, otherwise you may ignore and delete this e-mail.
-
-Kind regards,
-{host} mailing system"
-
+confirmationEmailBody = "Hello,{nl}{nl}You received this e-mail because someone registered a user with this e-mail address at {host}. If it's you, visit {link} to finish registration process, otherwise you may ignore and delete this e-mail.{nl}{nl}Kind regards,{nl}{host} mailing system"
 passwordResetEmailSenderName = "{host} mailing system"
 passwordResetEmailSenderEmail = "noreply@{host}"
 passwordResetEmailSubject = "{host} - password reset"
-passwordResetEmailBody = "Hello,
-
-You received this e-mail because someone requested a password reset for user with this e-mail address at {host}. If it's you, visit {link} to finish password reset process, otherwise you may ignore and delete this e-mail.
-
-Kind regards,
-{host} mailing system"
+passwordResetEmailBody = "Hello,{nl}{nl}You received this e-mail because someone requested a password reset for user with this e-mail address at {host}. If it's you, visit {link} to finish password reset process, otherwise you may ignore and delete this e-mail.{nl}{nl}Kind regards,{nl}{host} mailing system"
 
 [privileges]
 uploadPost=registered
 listPosts=anonymous
 listPosts.sketchy=registered
 listPosts.unsafe=registered
-listPosts.hidden=nobody
+listPosts.hidden=admin
 viewPost=anonymous
 viewPost.sketchy=registered
 viewPost.unsafe=registered
@@ -80,10 +87,11 @@ editPostThumb=moderator
 editPostSource=moderator
 editPostRelations.own=registered
 editPostRelations.all=moderator
-hidePost.own=moderator
-hidePost.all=moderator
-deletePost.own=moderator
-deletePost.all=moderator
+editPostFile=moderator
+massTag.own=registered
+massTag.all=power-user
+hidePost=moderator
+deletePost=moderator
 featurePost=moderator
 scorePost=registered
 flagPost=registered
@@ -111,11 +119,12 @@ listComments=anonymous
 addComment=registered
 deleteComment.own=registered
 deleteComment.all=moderator
+editComment.own=registered
+editComment.all=admin
 
 listTags=anonymous
 mergeTags=moderator
 renameTags=moderator
-massTag=moderator
 
 listLogs=moderator
 viewLog=moderator

data/help.md

@@ -0,0 +1,64 @@
+# Browsing
+
+Clicking the Browse button at the top will take you to the list of recent posts. Use the search box in the top right corner to find posts you want to see.
+
+If you’re not a registered user, you will only see public (Safe) posts. Logging in to your account will enable you to filter content by its rating: Safe, Sketchy, and NSFW.
+
+You can use your keyboard to navigate around the site. There are a few shortcuts:
+
+- focus search field: `[Q]`
+- scroll up/down: `[W]` and `[S]`
+- go to newer/older post or page: `[A]` and `[D]`
+- edit post: `[E]`
+- focus first post in post list: `[P]`
+
+# Search syntax
+
+- contatining tag "Haruhi": [search]Haruhi[/search]
+- **not** contatining tag "Kyon": [search]-Kyon[/search]
+- uploaded by David: [search]submit:David[/search] (note no spaces)
+- favorited by David: [search]fav:David[/search]
+- favorited by at least four users: [search]favmin:4[/search]
+- commented by David: [search]comment:David[/search]
+- having at least three comments: [search]commentmin:3[/search]
+- having minimum score of 4: [search]scoremin:4[/search]
+- tagged with at least seven tags: [search]tagmin:7[/search]
+- exactly from the specified date: [search]date:2001[/search], [search]date:2012-09-29[/search] (yyyy-mm-dd format)
+- from the specified date onwards: [search]datemin:2001-01-01[/search]
+- up to the specified date: [search]datemax:2004-07[/search]
+- having specific ID: [search]id:1,2,3,8[/search]
+- having ID no less than specified value: [search]idmin:28[/search]
+- by content type: [search]type:img[/search], [search]type:swf[/search], [search]type:yt[/search] (images, flash files and YouTube videos, respectively)
+- scored up/down by currently logged in user: [search]special:likes[/search] and [search]special:dislikes[/search]
+
+You can combine tags and negate any of them for interesting results. [search]sea -favmin:8 type:swf submit:Pirate[/search] will show you **flash files** tagged as **sea**, that were **liked by seven people** at most, uploaded by user **Pirate**.
+
+All of the above can be sorted using additional sorting tags:
+
+- as random as it can get: [search]order:random[/search]
+- newest to oldest: [search]order:date[/search] (pretty much default browse view)
+- oldest to newest: [search]-order:date[/search]
+- most commented first: [search]order:comments[/search]
+- loved by most: [search]order:favs[/search]
+- highest scored: [search]order:score[/search]
+- with most tags: [search]order:tags[/search]
+
+As shown with [search]-order:date[/search], any of them can be reversed in the same way as negating other tags: by placing a dash before the tag. If there is a "min" tag, there’s also its "max" counterpart, e.g. [search]favmax:7[/search].
+
+# Registration
+
+The e-mail you enter during account creation is only used to retrieve your [Gravatar](http://gravatar.com) and activate your account. Only you can see it (well, except the database staff… we won’t spam your mailbox anyway).
+
+Oh, and you can delete your account at any time. Posts you uploaded will stay, unless some angry admin removes them.
+
+# Comments
+
+Registered users can post comments. Comments support [Markdown syntax](http://daringfireball.net/projects/markdown/syntax), extended by some handy tags:
+
+- permalink to post number 426: @426
+- link to tag "Dragon_Ball": #Dragon_Ball
+- mark text as spoiler and hide it: [spoiler][spoiler]There is no spoon.[/spoiler][/spoiler]
+
+# Uploads
+
+After registering and activating your account, you gain the power to upload files to the service for everyone else to see.

data/privacy.md

@@ -0,0 +1,11 @@
+# Stored information
+
+Posts, comments, favorites and ratings linked to your account will be stored in the site’s database and publicly available.
+
+The "Upload anonymously" option allows you to post content without linking it to your account - meaning your nickname will not be stored in the database nor shown in the "Uploader" field.
+
+Your actions related to posts (uploading, tagging, etc.) are logged, along with your nickname and IP.
+
+# Cookies
+
+Cookies are used to store your session data and browsing preferences, such as endless scrolling or visibility of NSFW posts.

data/rules.md

@@ -0,0 +1,8 @@
+# Site rules
+
+- Don’t spam, [troll](http://www.urbandictionary.com/define.php?term=troll) or offend anyone. Be nice.
+- You are not allowed to post any form of [cp](http://www.urbandictionary.com/define.php?term=cp). If you possess it, we ask you to leave immediately and never come back.
+- Don’t use the site to host your personal images (e.g. forum avatars).
+  - This kind of content is not welcome and will be removed.
+  - If you notice such content, please flag it for moderation.
+- Owners of the site are not responsible for content uploaded by users.

init.php

@@ -1,8 +1,8 @@
 <?php
 require_once 'src/core.php';
 $config = \Chibi\Registry::getConfig();
-$fontsPath = $config->main->mediaPath . DS . 'fonts' . DS;
-$libPath = $config->main->mediaPath . DS . 'lib' . DS;
+$fontsPath = TextHelper::absolutePath($config->main->mediaPath . DS . 'fonts');
+$libPath = TextHelper::absolutePath($config->main->mediaPath . DS . 'lib');
 
 
 
@@ -29,10 +29,11 @@ function download($source, $destination = null)
 
 
 //jQuery
-download('http://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js', $libPath . 'jquery' . DS . 'jquery.min.js');
+download('http://code.jquery.com/jquery-2.0.3.min.js', $libPath . DS . 'jquery' . DS . 'jquery.min.js');
+download('http://code.jquery.com/jquery-2.0.3.min.map', $libPath . DS . 'jquery' . DS . 'jquery.min.map');
 
 //jQuery UI
-download('http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.3/jquery-ui.min.js', $libPath . 'jquery-ui' . DS . 'jquery-ui.min.js');
+download('http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.3/jquery-ui.min.js', $libPath . DS . 'jquery-ui' . DS . 'jquery-ui.min.js');
 $manifest = download('http://ajax.googleapis.com/ajax/libs/jqueryui/1/MANIFEST');
 $lines = explode("\n", str_replace("\r", '', $manifest));
 foreach ($lines as $line)
@@ -40,21 +41,21 @@ foreach ($lines as $line)
 	if (preg_match('/themes\/flick\/(.*?) /', $line, $matches))
 	{
 		$srcUrl = 'http://ajax.googleapis.com/ajax/libs/jqueryui/1/' . $matches[0];
-		$dstUrl = $libPath . 'jquery-ui' . DS . $matches[1];
+		$dstUrl = $libPath . DS . 'jquery-ui' . DS . $matches[1];
 		download($srcUrl, $dstUrl);
 	}
 }
 
 //jQuery Tag-it!
-download('http://raw.github.com/aehlke/tag-it/master/css/jquery.tagit.css', $libPath . 'tagit' . DS . 'jquery.tagit.css');
-download('http://raw.github.com/aehlke/tag-it/master/js/tag-it.min.js', $libPath . 'tagit' . DS . 'jquery.tagit.js');
+download('http://raw.github.com/aehlke/tag-it/master/css/jquery.tagit.css', $libPath . DS . 'tagit' . DS . 'jquery.tagit.css');
+download('http://raw.github.com/aehlke/tag-it/master/js/tag-it.min.js', $libPath . DS . 'tagit' . DS . 'jquery.tagit.js');
 
 //Mousetrap
-download('http://raw.github.com/ccampbell/mousetrap/master/mousetrap.min.js', $libPath . 'mousetrap' . DS . 'mousetrap.min.js');
+download('http://raw.github.com/ccampbell/mousetrap/master/mousetrap.min.js', $libPath . DS . 'mousetrap' . DS . 'mousetrap.min.js');
 
 //fonts
-download('http://googlefontdirectory.googlecode.com/hg/apache/droidsans/DroidSans.ttf', $fontsPath . 'DroidSans.ttf');
-download('http://googlefontdirectory.googlecode.com/hg/apache/droidsans/DroidSans-Bold.ttf', $fontsPath . 'DroidSans-Bold.ttf');
+download('http://googlefontdirectory.googlecode.com/hg/apache/droidsans/DroidSans.ttf', $fontsPath . DS . 'DroidSans.ttf');
+download('http://googlefontdirectory.googlecode.com/hg/apache/droidsans/DroidSans-Bold.ttf', $fontsPath . DS . 'DroidSans-Bold.ttf');
 
 
 

public_html/.htaccess

@@ -10,3 +10,40 @@ RewriteCond %{REQUEST_FILENAME} !-f
 RewriteCond %{REQUEST_FILENAME} !-d
 RewriteRule ^.*$ /dispatch.php
 RewriteRule ^/?$ /dispatch.php
+
+<IfModule mod_deflate.c>
+AddOutputFilterByType DEFLATE text/javascript
+AddOutputFilterByType DEFLATE text/plain
+AddOutputFilterByType DEFLATE text/html
+AddOutputFilterByType DEFLATE text/xml
+AddOutputFilterByType DEFLATE text/css
+AddOutputFilterByType DEFLATE application/xml
+AddOutputFilterByType DEFLATE application/xhtml+xml
+AddOutputFilterByType DEFLATE application/rss+xml
+AddOutputFilterByType DEFLATE application/javascript
+AddOutputFilterByType DEFLATE application/x-javascript
+</IfModule>
+
+<IfModule mod_mime.c>
+AddType text/plain .map
+</IfModule>
+
+<IfModule mod_expires.c>
+ExpiresActive on
+ExpiresByType image/jpg "access plus 2 years"
+ExpiresByType image/gif "access plus 2 years"
+ExpiresByType image/jpg "access plus 2 years"
+ExpiresByType image/jpeg "access plus 2 years"
+ExpiresByType image/png "access plus 2 years"
+
+ExpiresByType image/x-icon "access plus 2 years"
+ExpiresByType image/icon "access plus 2 years"
+ExpiresByType application/x-ico "access plus 2 years"
+ExpiresByType application/ico "access plus 2 years"
+
+ExpiresByType text/plain "access plus 1 year"
+ExpiresByType text/css "access plus 1 year"
+ExpiresByType text/javascript "access plus 1 year"
+ExpiresByType application/javascript "access plus 1 year"
+ExpiresByType application/x-javascript "access plus 1 year"
+</IfModule>

public_html/dispatch.php

@@ -1,6 +1,5 @@
 <?php
-chdir('..');
-require_once 'src/core.php';
+require_once '../src/core.php';
 
 $query = $_SERVER['REQUEST_URI'];
 \Chibi\Facade::run($query, new Bootstrap());

public_html/media/css/auth.css

@@ -1,30 +1,30 @@
-form.auth {
+#content form {
 	margin: 0 auto;
 	max-width: 400px;
 }
 
-form.auth label.left {
+#content form label {
 	width: 35%;
 }
 
-form.auth p {
+#content form p {
 	text-align: center;
 	margin: 10px 0;
 }
 
-form.auth .help {
+#content form .help {
 	opacity: .5;
 	margin-top: 1em;
 	font-size: small;
 }
-form.auth .help p {
+#content form .help p {
 	margin: 0;
 	text-align: left;
 }
-form.auth .help label+div {
+#content form .help label+div {
 	float: left;
 }
-form.auth .help ul {
+#content form .help ul {
 	margin: 0;
 	padding: 0;
 }

public_html/media/css/comment-edit.css

@@ -0,0 +1,12 @@
+.preview {
+	border: 1px solid yellow;
+	background: url('../img/preview.png') lemonchiffon;
+	padding: 0.5em;
+	display: none;
+}
+
+form.edit-comment textarea,
+form.add-comment textarea {
+	width: 50em;
+	height: 8em;
+}

public_html/media/css/comment-list.css

@@ -26,3 +26,8 @@
 .small-screen .comment-group .comments {
 	margin-left: 0;
 }
+
+.hellip {
+	margin-bottom: 2em;
+	display: inline-block;
+}

public_html/media/css/comment-small.css

@@ -22,27 +22,35 @@
 .comment {
 	clear: left;
 }
-.comment .date:before {
-	content: ' on ';
-	margin: 0 0.2em;
-}
 .comment .date {
+	margin: 0 0.2em 0 0.75em;
 	color: silver;
 }
 
 .comment .date,
+.comment .edit,
 .comment .delete {
 	font-size: small;
 }
+.comment .edit:before,
 .comment .delete:before {
 	margin-left: 0.2em;
 	content: ' [';
 	color: silver;
 }
+.comment .edit:after,
 .comment .delete:after {
 	content: ']';
 	color: silver;
 }
+.comment .edit a,
 .comment .delete a {
 	color: silver;
 }
+
+.comment .edit a:hover,
+.comment .delete a:hover,
+.comment .edit a:focus,
+.comment .delete a:focus {
+	color: red;
+}

public_html/media/css/core.css

@@ -17,6 +17,8 @@ body {
 	color: black;
 	margin: 0;
 	padding: 0;
+	overflow-x: auto;
+	overflow-y: scroll;
 	font-family: 'Droid Sans', sans-serif;
 	font-size: 12pt;
 }
@@ -33,11 +35,15 @@ body {
 }
 
 .main-wrapper {
-	margin: 0 1.5em;
+	margin: 0 auto;
+	padding: 0 30px;
 }
 
 
 
+#top-nav .clear {
+	background: white;
+}
 #top-nav ul.main-nav {
 	margin: 0 0 0 -0.75em;
 	padding: 0;
@@ -45,6 +51,12 @@ body {
 }
 #top-nav li.main-nav-item {
 	display: inline-block;
+	float: left;
+}
+#top-nav li.main-nav-item.active a {
+	border-bottom: 3px solid #f7f7f7;
+	margin-bottom: 0;
+	background: #f7f7f7;
 }
 
 #top-nav li input,
@@ -61,12 +73,13 @@ body {
 }
 #top-nav li.main-nav-item a:focus,
 #top-nav li.main-nav-item a:hover {
-	color: firebrick;
-	border-bottom: 3px solid firebrick;
+	color: hsl(0,70%,45%);
+	border-bottom: 3px solid hsl(0,70%,45%);
 	margin-bottom: 0;
 }
 
 #top-nav li.search {
+	display: inline-block;
 	float: right;
 	background: white;
 	margin: 5px 0;
@@ -75,14 +88,14 @@ body {
 }
 #top-nav li.search input {
 	border: 0;
-	height: 20px;
-	line-height: 20px;
-	padding: 4px 10px;
+	height: 28px;
+	line-height: 28px;
+	padding: 0 10px;
 	margin: 0;
-	box-sizing: content-box;
 }
 
 #top-nav li.safety {
+	display: inline-block;
 	float: right;
 	margin-left: 5px;
 }
@@ -120,11 +133,9 @@ body {
 
 
 
-footer {
+footer .main-wrapper {
 	text-align: center;
-	margin: 1em 0;
-	padding-top: 0.5em;
-	border-top: 1px solid #eee;
+	margin-top: 1em;
 	font-size: small;
 	color: silver;
 }
@@ -140,11 +151,16 @@ footer a {
 
 #sidebar {
 	float: left;
-	width: 256px;
-	margin-right: 2em;
+	width: 240px;
+	margin-right: 15px;
 }
 #sidebar h1 {
 	margin-top: 0;
+	margin-bottom: 10px;
+}
+#sidebar+#inner-content {
+	margin-left: 255px;
+	overflow: hidden;
 }
 
 
@@ -158,34 +174,25 @@ footer a {
 	white-space: nowrap;
 }
 
-#inner-content {
-	overflow: hidden;
-	padding-bottom: 2em;
+.unit {
+	margin: 2.5em 0;
 }
+#sidebar .unit:first-child {
+	margin-top: 0;
+}
+#small-screen { display: none; }
 
-.small-screen #sidebar {
+@media only screen and (max-width:700px) {
+	#small-screen { display: block; }
+	body #sidebar {
 		float: none;
 		width: 100%;
-	padding: 0 0 1em 0;
-}
-.small-screen #inner-content {
-	float: none;
+	}
+	#inner-content {
 		width: auto;
-}
-
-.bottom-unit {
-	padding: 0.5em 1em;
-	border: 1px solid #eee;
-	border-bottom: 0;
-	padding-bottom: 0;
-	margin: 1em 0 2em 0;
-}
-.left-unit {
-	margin: 0 0 1.5em 0;
-	padding: 0.75em;
-	border: 1px solid #eee;
-	padding-left: 0;
-	border-left: 0;
+		margin-left: 0;
+		margin-bottom: 2em;
+	}
 }
 
 
@@ -206,7 +213,7 @@ hr {
 }
 
 a {
-	color: firebrick;
+	color: hsl(0,70%,45%);
 	text-decoration: none;
 	outline: 0;
 }
@@ -221,7 +228,7 @@ i[class*='icon-'] {
 	display: inline-block;
 }
 a i[class*='icon-'] {
-	background-color: firebrick;
+	background-color: hsl(0,70%,45%);
 }
 a:focus i[class*='icon-'],
 a:hover i[class*='icon-'] {
@@ -230,42 +237,38 @@ a:hover i[class*='icon-'] {
 
 
 
-form.aligned input,
-form.aligned button {
-	vertical-align: text-top;
-}
-form.aligned label {
+.form-row>label {
+	display: inline-block;
 	text-align: right;
 	vertical-align: middle;
-}
-form.aligned label.left {
-	display: inline-block;
 	padding-right: 1em;
-	width: 5em;
+	width: 7em;
 	min-height: 1em;
 	float: left;
 }
-form.aligned>div {
-	margin-bottom: 0.5em;
-	clear: left;
-}
-form.aligned label,
-form.aligned input,
-form.aligned select,
-form.aligned button {
+label,
+input:not([type=radio]):not([type=checkbox]):not([type=file]),
+select,
+button {
+	-webkit-box-sizing: border-box !important;
+	-moz-box-sizing: border-box !important;
+	box-sizing: border-box !important;
 	vertical-align: middle;
-	line-height: 20px;
+	line-height: 24px;
+	height: 34px;
 }
-form.aligned label,
-form.aligned input,
-form.aligned select {
+label,
+input,
+select {
 	padding: 5px;
+	font-family: inherit;
+	font-size: 11pt;
 }
-form.aligned input[type=file] {
+input[type=file] {
 	padding: 5px 0;
 }
-form.aligned input[type=radio],
-form.aligned input[type=checkbox] {
+input[type=radio],
+input[type=checkbox] {
 	width: auto;
 	max-width: auto;
 	margin: 0 10px 0 0;
@@ -273,51 +276,82 @@ form.aligned input[type=checkbox] {
 	vertical-align: middle;
 }
 
+button {
+	font-size: 12pt;
+	border-radius: 5px;
+	padding: 5px 15px;
+	-moz-box-sizing: border-box;
+	color: white;
+	background: hsl(0,70%,60%);
+	border: 0;
+}
+button:hover {
+	background-color: hsl(0,75%,50%);
+	cursor: pointer;
+}
+
+.form-row {
+	margin: 0.25em 0;
+	clear: left;
+}
 .input-wrapper {
 	overflow: hidden;
 	display: block;
 }
-.input-wrapper ul.tagit,
-.input-wrapper input,
-.input-wrapper textarea,
-.input-wrapper select {
-	width: 100%;
-	max-width: 100%;
-	-webkit-box-sizing: border-box;
-	-moz-box-sizing: border-box;
-	box-sizing: border-box;
-}
 
-label {
-	display: inline-block;
-}
-label,
-input,
-select,
-button {
-	font-family: inherit;
-	font-size: 11pt;
-}
 ul.tagit,
 select,
 textarea,
 input:not([type=radio]):not([type=checkbox]):not([type=file]) {
+	width: 100%;
+	max-width: 100%;
 	border: 1px solid #ccc;
-	border-radius: 3px;
+	border-radius: 5px;
+}
+
+ul.tagit {
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
 }
 ul.tagit input {
 	border: 0 !important;
+	line-height: auto !important;
+	height: auto !important;
+	margin: -4px 0 !important;
 }
-button {
-	font-size: 115%;
-	padding: 0.2em 0.7em;
-	color: white;
-	background: cornflowerblue;
-	border: 0;
+
+
+
+.tabs ul {
+	list-style-type: none;
+	margin: 0 0 1em 0;
+	padding: 0;
+	border-bottom: 3px solid #eee;
 }
-button:hover {
-	background-color: royalblue;
-	cursor: pointer;
+.tabs li {
+	display: inline-block;
+}
+
+.tabs li a {
+	display: inline-block;
+	padding: 0.5em 1em;
+	vertical-align: middle;
+	border: 3px solid rgba(238, 238, 238, 0);
+	border-bottom: 3px solid #eee;
+	color: silver;
+	margin: 0 0 -3px 0;
+}
+.tabs li.selected a {
+	border: 3px solid #eee;
+	border-bottom-color: rgba(238, 238, 238, 0);
+	color: inherit;
+	background: white;
+}
+
+.tabs li a:hover,
+.tabs li a:focus {
+	color: hsl(0,70%,45%);
 }
 
 
@@ -328,7 +362,7 @@ button:hover {
 	border-style: solid;
 	border-width: 1px;
 	max-width: 500px;
-	margin: 0 auto;
+	margin: 2em auto;
 }
 
 .alert-success {
@@ -352,11 +386,9 @@ button:hover {
 .clear {
 	display: block;
 	clear: both;
-}
-
-pre.debug {
-	text-align: left;
-	color: black;
+	height: 1px; /* ghost top margin in firefox */
+	width: 100%;
+	margin: -1px 0 0 0;
 }
 
 .spoiler:before,
@@ -380,3 +412,22 @@ pre.debug {
 img {
 	border: 0;
 }
+
+blockquote {
+	margin-left: 0;
+	border-left: 3px solid #eee;
+	background: ghostwhite;
+	padding: 0.5em;
+}
+blockquote>*:first-child {
+	margin-top: 0;
+}
+blockquote>*:last-child {
+	margin-bottom: 0;
+}
+
+.ui-state-default,
+.ui-widget-content .ui-state-default,
+.ui-widget-header .ui-state-default {
+	color: hsla(0,70%,45%,0.8) !important;
+}

public_html/media/css/debug.css

@@ -0,0 +1,30 @@
+div.debug {
+	background: #f5f5f5;
+	font-size: 90%;
+	margin: 1em 0;
+	padding: 1em;
+	color: black;
+	text-align: left;
+}
+div.debug pre {
+	margin-left: 1em;
+	white-space: normal;
+	text-indent: -1em;
+}
+div.debug pre.query {
+	color: maroon;
+}
+div.debug pre.bindings {
+	color: gray;
+}
+div.debug pre.bindings .value {
+	color: green;
+	font-weight: bold;
+	margin-right: 1em;
+}
+div.debug pre.query span {
+	background: rgba(255, 0, 0, 0.05);
+}
+div.debug pre.query span:hover {
+	background: white;
+}

public_html/media/css/index-help.css

@@ -1,9 +1,7 @@
 code {
 	margin: 0 0.5em;
 }
-span.comma {
-	margin-left: -0.5em;
-}
-h1 {
-	margin-top: 2em;
+
+.tab-content {
+	padding-left: 1em;
 }

public_html/media/css/index-index.css

@@ -16,16 +16,15 @@
 	margin-bottom: 0;
 }
 
-#content {
+#content .main-wrapper>* {
 	margin: 0 auto;
 	width: 70%;
-	min-width: 500px;
 	position: relative;
 }
-.small-screen #content {
+@media only screen and (max-width:700px) {
+	#content .main-wrapper>* {
 		width: 100%;
-	min-width: 0;
-	max-width: 500px;
+	}
 }
 
 #content .body {
@@ -45,7 +44,7 @@
 #content .footer {
 	font-size: small;
 	color: dimgray;
-	margin: 0.5em 0 3em 0;
+	margin: 0.5em auto 3em auto;
 }
 #content .footer .left {
 	float: left;

public_html/media/css/logs.css

@@ -1,11 +1,15 @@
+#content form {
+	margin-bottom: 1em;
+}
+
 #content input {
 	margin: 0 1em;
-	height: 25px;
-	vertical-align: middle;
+	max-width: 50%;
 }
 
 pre {
 	font-size: 11pt;
+	margin: 0;
 }
 
 pre strong {

public_html/media/css/paginator.css

@@ -10,12 +10,12 @@
 
 .paginator li {
 	display: inline-block;
+	margin-right: 0.5em;
 }
 
 .paginator li a {
 	display: inline-block;
 	padding: 0.2em 0.5em;
-	margin-right: 0.5em;
 	background: #eee;
 	border: 1px solid silver;
 	color: black;
@@ -34,6 +34,6 @@
 
 .paginator li a:focus,
 .paginator li a:hover {
-	border: 1px solid firebrick;
+	border: 1px solid hsl(0,70%,50%);
 	background: pink;
 }

public_html/media/css/post-list.css

@@ -1,28 +1,29 @@
 .post {
-	margin: 0.5em;
+	margin: 8px;
 }
 .posts-wrapper {
 	text-align: center;
 }
 .posts {
-	margin: 0 auto;
+	margin: -8px auto 0 auto;
 }
 
 .form-wrapper {
 	text-align: center;
+	margin-bottom: 1em;
 }
 .small-screen .form-wrapper {
 	width: 100%;
 }
-form.aligned {
+#content form {
 	margin: 0 auto;
 	width: 24em;
 	text-align: left;
 }
-form.aligned label.left {
-	width: 7em;
+#content form label {
+	width: 9em;
 }
-form h1 {
+#content form h1 {
 	display: none;
 }
 

public_html/media/css/post-small.css

@@ -63,7 +63,7 @@
 
 .post .link:focus,
 .post .link:hover {
-	border: 1px solid firebrick;
+	border: 1px solid hsl(0,70%,50%);
 	box-shadow: 0.25em 0.25em pink;
 }
 .post .link:focus img.thumb,
@@ -82,12 +82,17 @@
 	vertical-align: top;
 }
 
+.post .info-bar:before {
+	border-top: 1px solid hsl(0,70%,50%);
+	margin-bottom: -1px;
+	content: '';
+	display: block;
+}
 .post .info-bar {
 	display: none;
-	border-top: 1px solid firebrick;
 	background: rgba(255, 128, 128, 0.75);
 	position: absolute;
-	z-indeX: 3;
+	z-index: 3;
 	left: 1px; /* border */
 	right: 1px; /* border */
 	bottom: 1px; /* border */

public_html/media/css/post-upload.css

@@ -8,13 +8,10 @@
 	float: left;
 }
 
-.tab {
-	margin-bottom: 1em;
+#upload-step1 {
+	display: table;
+	width: 100%;
 }
-.tab.url {
-	display: none;
-}
-
 #file-handler-wrapper {
 	display: table;
 	width: 100%;
@@ -30,13 +27,21 @@
 }
 #file-handler.active {
 	background: #eee;
-	border-color: firebrick;
+	border-color: hsl(0,70%,50%);
 }
 
-#url-handler textarea {
-	width: 100%;
-	height: 10em;
-	margin-bottom: 0.5em;
+#url-handler {
+	margin-top: 0.5em;
+	position: relative;
+}
+#url-handler .input-wrapper {
+	margin-right: 8.5em;
+}
+#url-handler button {
+	position: absolute;
+	top: 0;
+	right: 0;
+	width: 8em;
 }
 
 .post .thumbnail {
@@ -109,19 +114,6 @@
 	font-size: 130%;
 }
 
-.post label {
-	line-height: 33px;
-}
-.post label.left {
-	display: inline-block;
-	width: 60px;
-	padding-right: 10px;
-	float: left;
-}
-.post .safety label:not(.left) {
-	margin-right: 0.75em;
-}
-
 .post .file-name strong {
 	overflow: hidden;
 	text-overflow: ellipsis;
@@ -129,7 +121,7 @@
 	white-space: pre;
 	display: inline-block;
 	vertical-align: middle;
-	line-height: 33px;
+	padding: 0.5em 0;
 }
 
 .safety-safe {
@@ -149,10 +141,30 @@ ul.tagit {
 	font-size: 1em;
 }
 
+.submit-wrapper {
+	text-align: center;
+}
 #the-submit {
-	margin: 0 0 0 205px;
+	margin: 0 auto;
+	font-size: 14.5pt;
+	padding: 0.35em 2em;
+	height: auto;
+	line-height: auto;
 }
 
 .post .form-wrapper {
 	overflow: hidden;
 }
+
+#lightbox {
+	display: none;
+	position: absolute;
+	pointer-events: none;
+	max-width: 400px;
+	max-height: 400px;
+	margin-top: -50%;
+	margin-left: -50%;
+	background: white;
+	border: 0.5em solid white;
+	box-shadow: 0 0 0 3px #eee;
+}

public_html/media/css/post-view.css

@@ -12,8 +12,9 @@ embed {
 .post-type-image img {
 	/*background: url('../img/bk-image.png') lemonchiffon;*/
 }
-.post-type-flash embed {
-	background: url('../img/bk-swf.png') lemonchiffon;
+.post-type-flash iframe {
+	border: 0;
+	/*background: url('../img/bk-swf.png') lemonchiffon;*/
 }
 
 #sidebar .relations ul,
@@ -31,29 +32,47 @@ embed {
 	color: silver;
 }
 
-#sidebar nav {
+#around {
 	margin-bottom: 2em;
 }
-#sidebar nav .left {
+#around .text {
+	font-size: 90%;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	text-align: center;
+	margin-top: 0.75em;
+}
+#around .left {
 	float: left;
 }
-#sidebar nav .right {
+#around .right {
 	float: right;
 }
-#sidebar nav a.disabled {
+#around a.disabled {
 	color: silver;
 }
-#sidebar nav a.disabled i[class*='icon-'] {
+#around a.disabled i[class*='icon-'] {
 	background-color: silver;
 }
 
-#sidebar .uploader img {
-	vertical-align: middle;
-	margin: 0 0.5em 0 0;
-	width: 16px;
-	height: 16px;
-	background-image: url('http://www.gravatar.com/avatar/0?f=y&d=mm&s=16');
+#sidebar .uploader .date {
+	font-size: 9pt !important;
+	color: gray;
+	display: inline-block;
+	position: relative;
+	top: -5px;
 }
+#sidebar .uploader img {
+	vertical-align: text-top;
+	float: left;
+	margin: 3px 8px 0 0;
+	width: 25px;
+	height: 25px;
+	background-image: url('http://www.gravatar.com/avatar/0?f=y&d=mm&s=25');
+}
+
+#sidebar .unit.details { margin-bottom: 1.5em; }
+#sidebar .unit.hl-options { margin-top: 1.5em; }
 
 #sidebar .safety-safe {
 	color: #43aa43;
@@ -72,17 +91,19 @@ embed {
 
 i.icon-prev {
 	background-position: -12px -1px;
+	margin-left: 8px;
 }
 i.icon-next {
 	background-position: -1px -1px;
+	margin-right: 8px;
 }
 i.icon-prev,
 i.icon-next {
-	margin: 0 8px;
 	vertical-align: middle;
 	width: 8px;
 	height: 20px;
 }
+
 i.icon-dl {
 	margin: 0;
 	width: 20px;
@@ -90,14 +111,33 @@ i.icon-dl {
 	background-position: -22px -1px;
 }
 
-.permalink {
-	margin: 1em 0;
+i.icon-edit {
+	margin: 0;
+	width: 20px;
+	height: 20px;
+	background-position: -43px -22px;
 }
-.permalink .icon-dl {
+
+i.icon-fav {
+	margin: 0;
+	width: 20px;
+	height: 20px;
+}
+.add-fav i.icon-fav {
+	background-position: -1px -22px;
+}
+.rem-fav i.icon-fav {
+	background-position: -22px -22px;
+}
+
+.hl-option {
+	margin: 0.4em 0;
+}
+.hl-option i[class^='icon'] {
 	vertical-align: middle;
-	margin-right: 1em;
 }
-.permalink span {
+.hl-option span {
+	padding-left: 0.6em;
 	vertical-align: middle;
 }
 .permalink .ext:after {
@@ -125,11 +165,27 @@ i.icon-dl {
 	margin: 2px;
 }
 
-form.edit-post {
+#inner-content {
+	position: relative;
+}
+.unit.edit-post {
+	position: absolute;
+	margin-top: 0;
+	padding: 1em;
+	background: rgba(255, 255, 255, 0.8);
+	box-shadow: 0 0 1em 1em rgba(255, 255, 255, 0.8);
+	z-index: 99;
+	top: 0;
+	left: 0;
+	right: 0;
 	display: none;
 }
-form.edit-post .safety label:not(.left) {
-	margin-right: 0.75em;
+.unit.edit-post ul.tagit,
+.unit.edit-post input:not([type=file]) {
+	background: rgba(255, 255, 255, 0.75);
+}
+.unit.edit-post ul.tagit input {
+	background: transparent;
 }
 ul.tagit {
 	display: block;
@@ -137,15 +193,3 @@ ul.tagit {
 	margin: 0;
 	font-size: 1em;
 }
-
-.preview {
-	border: 1px solid yellow;
-	background: url('../img/preview.png') lemonchiffon;
-	padding: 0.5em;
-	display: none;
-}
-
-form.add-comment textarea {
-	width: 50em;
-	height: 8em;
-}

public_html/media/css/tabs.css

@@ -1,30 +0,0 @@
-.tabs ul {
-	list-style-type: none;
-	margin: 0 0 1em 0;
-	padding: 0;
-	border-bottom: 1px solid #ccc;
-}
-.tabs li {
-	display: inline-block;
-}
-
-.tabs li a {
-	display: inline-block;
-	padding: 0.5em 1em;
-	margin-bottom: -1px;
-}
-
-.tabs li a {
-	border: 1px solid white;
-	border-bottom: 1px solid #ccc;
-	color: silver;
-}
-.tabs li.selected a {
-	border: 1px solid #ccc;
-	border-bottom: 1px solid white;
-	color: inherit;
-}
-
-.tabs li a:focus {
-	color: firebrick;
-}

public_html/media/css/tag-list.css

@@ -6,9 +6,6 @@
 	-moz-column-width: 14em;
 	-webkit-column-width: 14em;
 }
-.tags li a:hover {
-	opacity: 1 !important;
-}
 .tags li {
 	margin: 0.2em 0.5em;
 	text-align: top;
@@ -20,21 +17,42 @@
 }
 
 .form-wrapper {
-	width: 50%;
 	max-width: 24em;
-	display: inline-block;
-	text-align: center;
 }
 .small-screen .form-wrapper {
 	width: 100%;
 }
-form.aligned {
-	text-align: left;
-	margin: 0 auto;
+#content form label {
+	width: 9em;
 }
-form.aligned label.left {
-	width: 7em;
-}
-form h1 {
+#content form h1 {
 	display: none;
 }
+
+.frequency0 { color: #ecc8c8; }
+.frequency1 { color: #e6b7b7; }
+.frequency2 { color: #e0a7a7; }
+.frequency3 { color: #db9696; }
+.frequency4 { color: #d58686; }
+.frequency5 { color: #cf7575; }
+.frequency6 { color: #c96464; }
+.frequency7 { color: #c35454; }
+.frequency8 { color: #be4343; }
+.frequency9 { color: #b83333; }
+.frequency10 { color: #b22222; }
+
+nav.sort-styles ul {
+	list-style-type: none;
+	margin: 0 0 2.5em 0;
+	text-align: center;
+	padding: 0;
+}
+nav.sort-styles li {
+	display: inline-block;
+	font-size: 105%;
+	margin: 0 1em;
+	padding-bottom: 0.2em;
+}
+nav.sort-styles li.active {
+	border-bottom: 3px solid hsl(0,70%,50%);
+}

public_html/media/css/user-list.css

@@ -1,30 +1,6 @@
-.user img {
-	width: 100px;
-	height: 100px;
-	float: left;
-	margin-right: 0.5em;
-}
-.user h1 {
-	margin-top: 0;
-	margin-bottom: 0.25em;
-}
-
-.user {
-	line-height: 1.5em;
-	margin-bottom: 1em;
-	margin-right: 1em;
-	display: inline-block;
-}
-
-.user .details {
-	display: inline-block;
-	max-width: 25em;
-	white-space: pre;
-}
-
 nav.sort-styles ul {
 	list-style-type: none;
-	margin: 0 0 1em 0;
+	margin: 0 0 2.5em 0;
 	text-align: center;
 	padding: 0;
 }
@@ -35,5 +11,41 @@ nav.sort-styles li {
 	padding-bottom: 0.2em;
 }
 nav.sort-styles li.active {
-	border-bottom: 3px solid firebrick;
+	border-bottom: 3px solid hsl(0,70%,50%);
+}
+
+.users-wrapper {
+	text-align: center;
+}
+.users {
+	column-width: 20em;
+	-moz-column-width: 20em;
+	-webkit-column-width: 20em;
+}
+
+.user {
+	text-align: initial;
+	line-height: 1.5em;
+	margin-bottom: 1em;
+	margin-right: 1em;
+	white-space: pre;
+}
+
+.user a.avatar {
+	display: block;
+	float: left;
+}
+.user img {
+	width: 100px;
+	height: 100px;
+	margin-right: 1em;
+}
+.user .details {
+	display: inline-block;
+	text-overflow: ellipsis;
+}
+
+.user h1 {
+	margin-top: 0;
+	margin-bottom: 0.25em;
 }

public_html/media/css/user-view.css

@@ -1,5 +1,4 @@
 #sidebar {
-	width: 220px;
 	font-size: 90%;
 }
 
@@ -13,22 +12,12 @@
 	padding: 0;
 }
 
-form.settings label.left,
-form.delete label.left,
-form.edit label.left {
-	width: 9em;
+#content form {
+	max-width: 30em;
 }
-
-form.settings .alert,
-form.delete .alert,
-form.edit .alert {
+#content form label {
+	width: 10em;
+}
+#content form .alert {
 	margin: 1em 0;
 }
-
-form.settings input,
-form.delete input,
-form.edit select,
-form.edit input {
-	width: 16em;
-	max-width: 90%;
-}

public_html/media/js/comment-edit.js

@@ -0,0 +1,125 @@
+$(function()
+{
+	function onDomUpdate()
+	{
+		$('form.edit-comment textarea, form.add-comment textarea')
+			.bindOnce('exit-confirmation', 'change keyp', function(e)
+		{
+			enableExitConfirmation();
+		});
+
+		$('form.edit-comment, form.add-comment')
+			.bindOnce('comment-submit', 'submit', function(e)
+		{
+			e.preventDefault();
+			rememberLastSearchQuery();
+
+			var formDom = $(this);
+			if (formDom.hasClass('inactive'))
+				return;
+			formDom.addClass('inactive');
+			formDom.find(':input').attr('readonly', true);
+
+			var url = formDom.attr('action') + '?json';
+			var fd = new FormData(formDom[0]);
+
+			var preview = false;
+			$.each(formDom.serializeArray(), function(i, x)
+			{
+				if (x.name == 'sender' && x.value == 'preview')
+					preview = true;
+			});
+
+			var ajaxData =
+			{
+				url: url,
+				data: fd,
+				processData: false,
+				contentType: false,
+				type: 'POST',
+
+				success: function(data)
+				{
+					if (data['success'])
+					{
+						if (preview)
+						{
+							formDom.find('.preview').html(data['textPreview']).show();
+						}
+						else
+						{
+							disableExitConfirmation();
+
+							formDom.find('.preview').hide();
+							var cb = function()
+							{
+								$.get(window.location.href, function(data)
+								{
+									$('.comments-wrapper').replaceWith($(data).find('.comments-wrapper'));
+									$('body').trigger('dom-update');
+								});
+							}
+							if (formDom.hasClass('add-comment'))
+							{
+								cb();
+								formDom.find('textarea').val('');
+							}
+							else
+							{
+								formDom.slideUp(function()
+								{
+									cb();
+									$(this).remove();
+								});
+							}
+						}
+						formDom.find(':input').attr('readonly', false);
+						formDom.removeClass('inactive');
+					}
+					else
+					{
+						alert(data['message']);
+						formDom.find(':input').attr('readonly', false);
+						formDom.removeClass('inactive');
+					}
+				},
+				error: function()
+				{
+					alert('Fatal error');
+					formDom.find(':input').attr('readonly', false);
+					formDom.removeClass('inactive');
+				}
+			};
+
+			$.ajax(ajaxData);
+		});
+
+		$('.comment .edit a').bindOnce('edit-comment', 'click', function(e)
+		{
+			e.preventDefault();
+			var commentDom = $(this).parents('.comment');
+			var formDom = commentDom.find('form.edit-comment');
+			var cb = function(formDom)
+			{
+				formDom.slideToggle();
+				$('body').trigger('dom-update');
+			};
+
+			if (formDom.length == 0)
+			{
+				$.get($(this).attr('href'), function(data)
+				{
+					var otherForm = $(data).find('form.edit-comment');
+					otherForm.hide();
+					commentDom.find('.body').append(otherForm);
+					formDom = commentDom.find('form.edit-comment');
+					cb(formDom);
+				});
+			}
+			else
+				cb(formDom);
+		});
+	}
+
+	$('body').bind('dom-update', onDomUpdate);
+});

public_html/media/js/core.js

@@ -1,25 +1,52 @@
+function setCookie(name, value, exdays)
+{
+	var exdate = new Date();
+	exdate.setDate(exdate.getDate() + exdays);
+	value = escape(value) + '; path=/' + ((exdays == null) ? '' : '; expires=' + exdate.toUTCString());
+	document.cookie = name + '=' + value;
+}
+
+function getCookie(name)
+{
+	var value = document.cookie;
+	var start = value.indexOf(' ' + name + '=');
+
+	if (start == -1)
+		start = value.indexOf(name + '=');
+
+	if (start == -1)
+		return null;
+
+	start = value.indexOf('=', start) + 1;
+	var end = value.indexOf(';', start);
+	if (end == -1)
+		end = value.length;
+
+	return unescape(value.substring(start, end));
+}
+
+function rememberLastSearchQuery()
+{
+	//lastSearchQuery variable is obtained from layout
+	setCookie('last-search-query', lastSearchQuery);
+}
+
 //core functionalities, prototypes
 $.fn.hasAttr = function(name)
 {
 	return this.attr(name) !== undefined;
 };
 
-if ($.when.all === undefined)
+$.fn.bindOnce = function(name, eventName, callback)
 {
-	$.when.all = function(deferreds)
+	$.each(this, function(i, item)
 	{
-		var deferred = new $.Deferred();
-		$.when.apply($, deferreds).then(function()
-		{
-			deferred.resolve(Array.prototype.slice.call(arguments, 0));
-		}, function()
-		{
-			deferred.fail(Array.prototype.slice.call(arguments, 0));
+		if ($(item).data(name) == name)
+			return;
+		$(item).data(name, name);
+		$(item).on(eventName, callback);
 	});
-
-		return deferred;
-	}
-}
+};
 
 
 
@@ -36,12 +63,15 @@ $(function()
 		aDom.addClass('inactive');
 
 		var url = $(this).attr('href') + '?json';
-		$.get(url, function(data)
+		$.get(url).always(function(data)
 		{
 			if (data['success'])
 				window.location.reload();
 			else
-				alert(data['message']);
+			{
+				alert(data['message'] ? data['message'] : 'Fatal error');
+				aDom.removeClass('inactive');
+			}
 		});
 	});
 });
@@ -53,6 +83,7 @@ $(function()
 {
 	$('body').bind('dom-update', function()
 	{
+		//event confirmations
 		function confirmEvent(e)
 		{
 			if (!confirm($(this).attr('data-confirm-text')))
@@ -62,15 +93,18 @@ $(function()
 			}
 		}
 
-		$('form[data-confirm-text]').submit(confirmEvent);
-		$('a[data-confirm-text]').click(confirmEvent);
+		$('form.confirmable').bindOnce('confirmation', 'submit', confirmEvent);
+		$('a.confirmable').bindOnce('confirmation', 'click', confirmEvent);
 
-		$('a.simple-action').click(function(e)
+
+		//simple action buttons
+		$('a.simple-action').bindOnce('simple-action', 'click', function(e)
 		{
-			if(e.isPropagationStopped())
+			if (e.isPropagationStopped())
 				return;
 
 			e.preventDefault();
+			rememberLastSearchQuery();
 
 			var aDom = $(this);
 			if (aDom.hasClass('inactive'))
@@ -78,7 +112,7 @@ $(function()
 			aDom.addClass('inactive');
 
 			var url = $(this).attr('href') + '?json';
-			$.get(url, {submit: 1}, function(data)
+			$.get(url, {submit: 1}).always(function(data)
 			{
 				if (data['success'])
 				{
@@ -91,7 +125,7 @@ $(function()
 				}
 				else
 				{
-					alert(data['message']);
+					alert(data['message'] ? data['message'] : 'Fatal error');
 					aDom.removeClass('inactive');
 				}
 			});
@@ -99,9 +133,9 @@ $(function()
 
 
 		//attach data from submit buttons to forms before .submit() gets called
-		$(':submit').each(function()
+		$('.submit').each(function()
 		{
-			$(this).click(function()
+			$(this).bindOnce('submit-faux-input', 'click', function()
 			{
 				var form = $(this).closest('form');
 				form.find('.faux-submit').remove();
@@ -113,6 +147,10 @@ $(function()
 			});
 		});
 	});
+
+
+	//try to remember last search query
+	window.onbeforeunload = rememberLastSearchQuery;
 });
 
 
@@ -120,31 +158,39 @@ $(function()
 //modify DOM on small viewports
 function processSidebar()
 {
-	$('#inner-content .unit').addClass('bottom-unit');
-	if ($('body').width() < 600)
-	{
-		$('body').addClass('small-screen');
+	if ($('#small-screen').is(':visible'))
 		$('#sidebar').insertAfter($('#inner-content'));
-		$('#sidebar .unit').removeClass('left-unit').addClass('bottom-unit');
-	}
 	else
-	{
-		$('body').removeClass('small-screen');
 		$('#sidebar').insertBefore($('#inner-content'));
-		$('#sidebar .unit').removeClass('bottom-unit').addClass('left-unit');
-	}
-	$('body').data('last-width', $('body').width());
 }
 $(function()
 {
 	$(window).resize(function()
 	{
+		fixSize();
 		if ($('body').width() == $('body').data('last-width'))
 			return;
+		$('body').data('last-width', $('body').width());
+		$('body').trigger('dom-update');
 	});
 	$('body').bind('dom-update', processSidebar);
+	fixSize();
 });
 
+var fixedEvenOnce = false;
+function fixSize()
+{
+	var multiply = 168;
+	var oldWidth = $('.main-wrapper:eq(0)').width();
+	$('.main-wrapper:eq(0)').width('');
+	var newWidth = $('.main-wrapper:eq(0)').width();
+	if (oldWidth != newWidth || !fixedEvenOnce)
+	{
+		$('.main-wrapper').width(multiply * Math.floor(newWidth / multiply));
+		fixedEvenOnce = true;
+	}
+}
+
 
 
 //autocomplete
@@ -158,76 +204,102 @@ function extractLast(term)
     return split(term).pop();
 }
 
+function retrieveTags(searchTerm, cb)
+{
+	var options = { filter: searchTerm + ' order:popularity,desc' };
+	$.getJSON('/tags?json', options, function(data)
+	{
+		var tags = $.map(data.tags.slice(0, 15), function(tag)
+		{
+			var ret =
+			{
+				label: tag.name + ' (' + tag.count + ')',
+				value: tag.name,
+			};
+			return ret;
+		});
+
+		cb(tags);
+	});
+}
+
 $(function()
 {
-	$('[data-autocomplete-url]').each(function()
+	$('.autocomplete').each(function()
 	{
-		var searchInput = $(this);
-		searchInput
-		// don't navigate away from the field on tab when selecting an item
-		.bind("keydown", function(event)
+		var options =
 		{
-			if (event.keyCode === $.ui.keyCode.TAB && $(this).data("autocomplete").menu.active)
-			{
-				event.preventDefault();
-			}
-		}).autocomplete({
 			minLength: 1,
 			source: function(request, response)
 			{
 				var term = extractLast(request.term);
 				if (term != '')
-					$.get(searchInput.attr('data-autocomplete-url') + '?json', {filter: term}, function(data)
-					{
-						response($.map(data.tags, function(tag) { return { label: tag.name, value: tag.name }; }));
-					});
+					retrieveTags(term, response);
 			},
-			focus: function()
+			focus: function(e)
 			{
 				// prevent value inserted on focus
-				return false;
+				e.preventDefault();
 			},
-			select: function(event, ui)
+			select: function(e, ui)
 			{
+				e.preventDefault();
 				var terms = split(this.value);
 				terms.pop();
 				terms.push(ui.item.value);
 				terms.push('');
 				this.value = terms.join(' ');
-				return false;
 			}
-		});
+		};
+
+		if ($(this).parents('#top-nav').length != 0)
+		{
+			options['position'] =
+			{
+				my: 'right top',
+				at: 'right bottom'
+			};
+		}
+
+		var searchInput = $(this);
+		searchInput
+		// don't navigate away from the field on tab when selecting an item
+		.bind('keydown', function(e)
+		{
+			if (e.keyCode === $.ui.keyCode.TAB && $(this).data('autocomplete').menu.active)
+				e.preventDefault();
+		}).autocomplete(options);
 	});
 });
 
-function getTagItOptions()
+function attachTagIt(element)
 {
-	return {
+	var tagItOptions =
+	{
 		caseSensitive: false,
 		autocomplete:
 		{
 			source:
 				function(request, response)
 				{
-					var term = request.term.toLowerCase();
-					var tags = $.map(this.options.availableTags, function(a)
+					var tagit = this;
+					retrieveTags(request.term.toLowerCase(), function(tags)
 					{
-						return a.name;
-					});
-					var results = $.grep(tags, function(a)
+						if (!tagit.options.allowDuplicates)
 						{
-						if (term.length < 3)
-							return a.toLowerCase().indexOf(term) == 0;
-						else
-							return a.toLowerCase().indexOf(term) != -1;
+							tags = $.grep(tags, function(tag)
+							{
+								return tagit.assignedTags().indexOf(tag.value) == -1;
+							});
+						}
+						response(tags);
 					});
-					results = results.slice(0, 15);
-					if (!this.options.allowDuplicates)
-						results = this._subtractArray(results, this.assignedTags());
-					response(results);
 				},
 		}
 	};
+
+	tagItOptions.placeholderText = element.attr('placeholder');
+	element.tagit(tagItOptions);
 }
 
 
@@ -244,7 +316,16 @@ $(function()
 });
 
 
-$(function()
+
+function enableExitConfirmation()
 {
-	$('body').trigger('dom-update');
-});
+	$(window).bind('beforeunload', function(e)
+	{
+		return 'There are unsaved changes.';
+	});
+}
+
+function disableExitConfirmation()
+{
+	$(window).unbind('beforeunload');
+}

public_html/media/js/post-list.js

@@ -2,37 +2,36 @@ $(function()
 {
 	$('body').bind('dom-update', function()
 	{
-		$('.post a.toggle-tag').click(function(e)
+		$('.post a.toggle-tag').bindOnce('toggle-tag', 'click', function(e)
 		{
-			if(e.isPropagationStopped())
-				return;
-
 			e.preventDefault();
-			e.stopPropagation();
 
 			var aDom = $(this);
 			if (aDom.hasClass('inactive'))
 				return;
 			aDom.addClass('inactive');
 
+			var enable = !aDom.parents('.post').hasClass('tagged');
 			var url = $(this).attr('href') + '?json';
-			$.get(url, {submit: 1}, function(data)
+			url = url.replace('_enable_', enable ? '1' : '0');
+			$.get(url, {submit: 1}).always(function(data)
 			{
 				if (data['success'])
 				{
 					aDom.removeClass('inactive');
-					aDom.parents('.post').toggleClass('tagged');
-					aDom.text(aDom.parents('.post').hasClass('tagged')
+					aDom.parents('.post').removeClass('tagged');
+					if (enable)
+						aDom.parents('.post').addClass('tagged');
+					aDom.text(enable
 						? aDom.attr('data-text-tagged')
 						: aDom.attr('data-text-untagged'));
 				}
 				else
 				{
-					alert(data['message']);
+					alert(data['message'] ? data['message'] : 'Fatal error');
 					aDom.removeClass('inactive');
 				}
 			});
 		});
 	});
-	$('body').trigger('dom-update');
 });

public_html/media/js/post-upload.js

@@ -1,19 +1,13 @@
 $(function()
 {
-	$('.tabs nav a').click(function(e)
+	$('.tabs a').click(function(e)
 	{
 		e.preventDefault();
 		var className = $(this).parents('li').attr('class').replace('selected', '').replace(/^\s+|\s+$/, '');
-		$('.tabs nav li').removeClass('selected');
+		$('.tabs li').removeClass('selected');
 		$(this).parents('li').addClass('selected');
-		$('.tab').hide();
-		$('.tab.' + className).show();
-	});
-
-	var tags = [];
-	$.getJSON('/tags?json', function(data)
-	{
-		tags = data['tags'];
+		$('.tab-content').hide();
+		$('.tab-content.' + className).show();
 	});
 
 	$('#file-handler').on('dragenter', function(e)
@@ -42,24 +36,30 @@ $(function()
 
 
 
+	$('#url-handler-wrapper input').keydown(function(e)
+	{
+		if (e.which == 13)
+		{
+			$('#url-handler-wrapper button').trigger('click');
+			e.preventDefault();
+		}
+	});
 	$('#url-handler-wrapper button').click(function(e)
 	{
-		var urls = [];
-		$.each($('#url-handler-wrapper textarea').val().split(/\s+/), function(i, url)
-		{
+		var url = $('#url-handler-wrapper input').val();
 		url = url.replace(/^\s+|\s+$/, '');
 		if (url == '')
 			return;
-			urls.push(url);
-		});
-		$('#url-handler-wrapper textarea').val('');
-		handleURLs(urls);
+		$('#url-handler-wrapper input').val('');
+		handleURLs([url]);
 	});
 
 
 
 	$('.post .move-down-trigger, .post .move-up-trigger').on('click', function()
 	{
+		if ($('#the-submit').hasClass('inactive'))
+			return;
 		var dir = $(this).hasClass('move-down-trigger') ? 'd' : 'u';
 		var post = $(this).parents('.post');
 			if (dir == 'u')
@@ -69,6 +69,8 @@ $(function()
 	});
 	$('.post .remove-trigger').on('click', function()
 	{
+		if ($('#the-submit').hasClass('inactive'))
+			return;
 		$(this).parents('.post').slideUp(function()
 		{
 			$(this).remove();
@@ -89,7 +91,6 @@ $(function()
 
 		var postDom = posts.first();
 		var url = postDom.find('form').attr('action') + '?json';
-		console.log(postDom.find('form').get(0));
 		var fd = new FormData(postDom.find('form').get(0));
 
 		fd.append('file', postDom.data('file'));
@@ -119,6 +120,11 @@ $(function()
 					postDom.find('.alert').html(data['messageHtml']).slideDown();
 					enableUpload();
 				}
+			},
+			error: function(data)
+			{
+				postDom.find('.alert').html('Fatal error').slideDown();
+				enableUpload();
 			}
 		};
 
@@ -127,6 +133,7 @@ $(function()
 
 	function uploadFinished()
 	{
+		disableExitConfirmation();
 		window.location.href = $('#upload-step2').attr('data-redirect-url');
 	}
 
@@ -152,6 +159,8 @@ $(function()
 	{
 		e.preventDefault();
 		var theSubmit = $(this);
+		if (theSubmit.hasClass('inactive'))
+			return;
 		disableUpload();
 		sendNextPost();
 	});
@@ -171,8 +180,7 @@ $(function()
 				{
 					return function(e)
 					{
-						img.css('background-image', 'none');
-						img.attr('src', e.target.result);
+						changeThumb(img, e.target.result);
 					};
 				})(file, img);
 				reader.readAsDataURL(file);
@@ -180,6 +188,14 @@ $(function()
 		});
 	}
 
+	function changeThumb(img, url)
+	{
+		$(img)
+			.css('background-image', 'none')
+			.attr('src', url)
+			.data('custom-thumb', true);
+	}
+
 	function handleURLs(urls)
 	{
 		handleInputs(urls, function(postDom, url)
@@ -193,18 +209,13 @@ $(function()
 				{
 					postDom.find('.file-name strong')
 						.text(data.data.title);
-					postDom.find('img')
-						.css('background-image', 'none')
-						.attr('src', data.data.thumbnail.hqDefault);
+					changeThumb(postDom.find('img'), data.data.thumbnail.hqDefault);
 				});
 			}
 			else
 			{
-				postDom.find('.file-name strong')
-					.text(url);
-				postDom.find('img')
-					.css('background-image', 'none')
-					.attr('src', url);
+				postDom.find('.file-name strong').text(url);
+				changeThumb(postDom.find('img'), url);
 			}
 		});
 	}
@@ -221,16 +232,39 @@ $(function()
 			$('.posts').append(postDom);
 
 			postDom.show();
-			var tagItOptions = getTagItOptions();
-			tagItOptions.availableTags = tags;
-			tagItOptions.placeholderText = $('.tags input').attr('placeholder');
-			$('.tags input', postDom).tagit(tagItOptions);
+			attachTagIt($('.tags input', postDom));
 
 			callback(postDom, input);
 		}
 		if ($('.posts .post').length == 0)
+		{
+			disableExitConfirmation();
 			$('#upload-step2').fadeOut();
+		}
 		else
+		{
+			enableExitConfirmation();
 			$('#upload-step2').fadeIn();
 		}
+	}
+
+	$('.post img').mouseenter(function(e)
+	{
+		if ($(this).data('custom-thumb') != true)
+			return;
+
+		$('#lightbox')
+			.attr('src', $(this).attr('src'))
+			.show()
+			.position({
+				of: $(this),
+				my: 'center center',
+				at: 'center center',
+			})
+			.show();
+	});
+	$('.post img').mouseleave(function(e)
+	{
+		$('#lightbox').hide();
+	});
 });

public_html/media/js/post-view.js

@@ -1,6 +1,8 @@
-function onDomUpdate()
+$(function()
 {
-	$('li.edit a').click(function(e)
+	function onDomUpdate()
+	{
+		$('#sidebar a.edit-post').bindOnce('edit-post', 'click', function(e)
 		{
 			e.preventDefault();
 
@@ -9,32 +11,65 @@ function onDomUpdate()
 				return;
 			aDom.addClass('inactive');
 
-		var tags = [];
-		$.getJSON('/tags?json', function(data)
-		{
-			aDom.removeClass('inactive');
 			var formDom = $('form.edit-post');
-			tags = data['tags'];
+			if (formDom.find('.tagit').length == 0)
+			{
+				attachTagIt($('.tags input'));
+				aDom.removeClass('inactive');
 
+				formDom.find('input[type=text]:visible:eq(0)').focus();
+				formDom.find('textarea, input').bind('change keyup', function()
+				{
+					if (formDom.serialize() != formDom.data('original-data'))
+						enableExitConfirmation();
+				});
+			}
+			else
+				aDom.removeClass('inactive');
+
+			var editUnit =  formDom.parents('.unit');
+			var postUnit = $('.post-wrapper');
 			if (!$(formDom).is(':visible'))
 			{
-				var tagItOptions = getTagItOptions();
-				tagItOptions.availableTags = tags;
-				tagItOptions.placeholderText = $('.tags input').attr('placeholder');
-				$('.tags input').tagit(tagItOptions);
-				formDom.show().css('height', formDom.height()).hide().slideDown();
+				formDom.data('original-data', formDom.serialize());
+
+				editUnit.show();
+				var editUnitHeight = formDom.height();
+				editUnit.css('height', editUnitHeight);
+				editUnit.hide();
+
+				if (postUnit.height() < editUnitHeight)
+					postUnit.animate({height: editUnitHeight + 'px'}, 'fast');
+
+				editUnit.slideDown('fast', function()
+					{
+						$(this).css('height', 'auto');
+					});
+			}
+			else
+			{
+				editUnit.slideUp('fast');
+
+				var postUnitOldHeight = postUnit.height();
+				postUnit.height('auto');
+				var postUnitHeight = postUnit.height();
+				postUnit.height(postUnitOldHeight);
+				if (postUnitHeight != postUnitOldHeight)
+					postUnit.animate({height: postUnitHeight + 'px'});
+
+				if ($('.post-wrapper').height() < editUnitHeight)
+					$('.post-wrapper').animate({height: editUnitHeight + 'px'});
+				return;
 			}
 
 			formDom.find('input[type=text]:visible:eq(0)').focus();
-			$('html, body').animate({ scrollTop: $(formDom).offset().top + 'px' }, 'fast');
-		});
 		});
 
 		$('.comments.unit a.simple-action').data('callback', function()
 		{
 			$.get(window.location.href, function(data)
 			{
-			$('.comments.unit').replaceWith($(data).find('.comments.unit'));
+				$('.comments-wrapper').replaceWith($(data).find('.comments-wrapper'));
 				$('body').trigger('dom-update');
 			});
 		});
@@ -47,16 +82,14 @@ function onDomUpdate()
 				$('body').trigger('dom-update');
 			});
 		});
-}
+	}
 
-$(function()
-{
 	$('body').bind('dom-update', onDomUpdate);
-	onDomUpdate();
 
 	$('form.edit-post').submit(function(e)
 	{
 		e.preventDefault();
+		rememberLastSearchQuery();
 
 		var formDom = $(this);
 		if (formDom.hasClass('inactive'))
@@ -79,81 +112,35 @@ $(function()
 			{
 				if (data['success'])
 				{
-					window.location.reload();
-				}
-				else
-				{
-					alert(data['message']);
-					formDom.find(':input').attr('readonly', false);
-					formDom.removeClass('inactive');
-				}
-			}
-		};
+					disableExitConfirmation();
 
-		$.ajax(ajaxData);
-	});
-
-	$('form.add-comment').submit(function(e)
-	{
-		e.preventDefault();
-
-		var formDom = $(this);
-		if (formDom.hasClass('inactive'))
-			return;
-		formDom.addClass('inactive');
-		formDom.find(':input').attr('readonly', true);
-
-		var url = formDom.attr('action') + '?json';
-		var fd = new FormData(formDom[0]);
-
-		var preview = false;
-		$.each(formDom.serializeArray(), function(i, x)
-		{
-			if (x.name == 'sender' && x.value == 'preview')
-				preview = true;
-		});
-
-		var ajaxData =
-		{
-			url: url,
-			data: fd,
-			processData: false,
-			contentType: false,
-			type: 'POST',
-
-			success: function(data)
-			{
-				if (data['success'])
-				{
-					if (preview)
-					{
-						formDom.find('.preview').html(data['textPreview']).show();
-					}
-					else
-					{
 					$.get(window.location.href, function(data)
 					{
-							$('.comments.unit').replaceWith($(data).find('.comments.unit'));
+						$('#sidebar').replaceWith($(data).find('#sidebar'));
+						$('#edit-token').replaceWith($(data).find('#edit-token'));
 						$('body').trigger('dom-update');
 					});
-						formDom.find('textarea').val('');
-					}
-					formDom.find(':input').attr('readonly', false);
-					formDom.removeClass('inactive');
+					formDom.parents('.unit').hide();
 				}
 				else
 				{
 					alert(data['message']);
+				}
+				formDom.find(':input').attr('readonly', false);
+				formDom.removeClass('inactive');
+			},
+			error: function()
+			{
+				alert('Fatal error');
 				formDom.find(':input').attr('readonly', false);
 				formDom.removeClass('inactive');
-				}
 			}
 		};
 
 		$.ajax(ajaxData);
 	});
 
-	Mousetrap.bind('a', function() { var url = $('#sidebar .left a').attr('href'); if (typeof url !== 'undefined') window.location.href = url; }, 'keyup');
-	Mousetrap.bind('d', function() { var url = $('#sidebar .right a').attr('href'); if (typeof url !== 'undefined') window.location.href = url; }, 'keyup');
-	Mousetrap.bind('e', function() { $('li.edit a').trigger('click'); return false; }, 'keyup');
+	Mousetrap.bind('a', function() { var a = $('#sidebar .left a'); var url = a.attr('href'); if (typeof url !== 'undefined') { a.click(); window.location.href = url; } }, 'keyup');
+	Mousetrap.bind('d', function() { var a = $('#sidebar .right a'); var url = a.attr('href'); if (typeof url !== 'undefined') { a.click(); window.location.href = url; } }, 'keyup');
+	Mousetrap.bind('e', function() { $('a.edit-post').trigger('click'); return false; }, 'keyup');
 });

scripts/find-posts.php

@@ -12,7 +12,6 @@ array_shift($argv);
 if (empty($argv))
 	usage() and die;
 
-$filesPath = rtrim(\Chibi\Registry::getConfig()->main->filesPath, DS);
 $query = array_shift($argv);
 $posts = Model_Post::getEntities($query, null, null);
 foreach ($posts as $post)
@@ -21,7 +20,7 @@ foreach ($posts as $post)
 	[
 		$post->id,
 		$post->name,
-		$filesPath . DS . $post->name,
+		Model_Post::getFullPath($post->name),
 		$post->mimeType,
 	]). PHP_EOL;
 }

scripts/process-detached-files.php

@@ -1,6 +1,5 @@
 <?php
 require_once __DIR__ . '/../src/core.php';
-$config = \Chibi\Registry::getConfig();
 
 function usage()
 {
@@ -31,24 +30,21 @@ switch ($action)
 			mkdir($dir, 0755, true);
 		if (!is_dir($dir))
 			die($dir . ' is not a dir' . PHP_EOL);
-		$func = function($name) use ($dir, $config)
+		$func = function($name) use ($dir)
 		{
 			echo $name . PHP_EOL;
-			static $filesPath = null;
-			if ($filesPath == null)
-				$filesPath = $config->main->filesPath;
-			rename($filesPath . DS . $name, $dir . DS . $name);
+			$srcPath = Model_Post::getFullPath($name);
+			$dstPath = $dir . DS . $name;
+			rename($srcPath, $dstPath);
 		};
 		break;
 
 	case '-purge':
-		$func = function($name) use ($dir, $config)
+		$func = function($name)
 		{
 			echo $name . PHP_EOL;
-			static $filesPath = null;
-			if ($filesPath == null)
-				$filesPath = $config->main->filesPath;
-			unlink($filesPath . DS . $name);
+			$srcPath = Model_Post::getFullPath($name);
+			unlink($srcPath);
 		};
 		break;
 
@@ -63,8 +59,8 @@ foreach (R::findAll('post') as $post)
 }
 $names = array_flip($names);
 
-$filesPath = $config->main->filesPath;
-foreach (glob($filesPath . DS . '*') as $name)
+$config = \Chibi\Registry::getConfig();
+foreach (glob(TextHelper::absolutePath($config->main->filesPath) . DS . '*') as $name)
 {
 	$name = basename($name);
 	if (!isset($names[$name]))

scripts/process-old-users.php

@@ -32,7 +32,7 @@ switch ($action)
 		$func = function($user)
 		{
 			printUser($user);
-			R::trash($user);
+			Model_User::remove($user);
 		};
 		break;
 

scripts/remove-letterbox.sh

@@ -3,7 +3,7 @@
 process () {
 	x="$1";
 	echo "$x";
-	convert "$x" -fuzz 5% -trim +repage tmp && mv tmp "$x"
+	convert "$x" -fuzz 7% -trim +repage tmp && mv tmp "$x"
 }
 
 while read x; do

src/Bootstrap.php

@@ -1,25 +1,23 @@
 <?php
+use \Chibi\Database as Database;
+
 class Bootstrap
 {
+	public function render($callback = null)
+	{
+		if ($callback !== null)
+			$callback();
+		else
+			(new \Chibi\View())->renderFile($this->context->layoutName);
+	}
+
 	public function workWrapper($workCallback)
 	{
 		$this->config->chibi->baseUrl = 'http://' . rtrim($_SERVER['HTTP_HOST'], '/') . '/';
 		session_start();
 
 		$this->context->handleExceptions = false;
-		$this->context->title = $this->config->main->title;
-		$this->context->stylesheets =
-		[
-			'../lib/jquery-ui/jquery-ui.css',
-			'core.css',
-		];
-		$this->context->scripts =
-		[
-			'../lib/jquery/jquery.min.js',
-			'../lib/jquery-ui/jquery-ui.min.js',
-			'../lib/mousetrap/mousetrap.min.js',
-			'core.js',
-		];
+		CustomAssetViewDecorator::setTitle($this->config->main->title);
 
 		$this->context->json = isset($_GET['json']);
 		$this->context->layoutName = $this->context->json
@@ -32,35 +30,40 @@ class Bootstrap
 
 		if (empty($this->context->route))
 		{
+			http_response_code(404);
 			$this->context->viewName = 'error-404';
-			(new \Chibi\View())->renderFile($this->context->layoutName);
+			$this->render();
 			return;
 		}
 
+		$this->context->viewDecorators []= new CustomAssetViewDecorator();
+		$this->context->viewDecorators []= new \Chibi\PrettyPrintViewDecorator();
 		try
 		{
-			$workCallback();
+			$this->render($workCallback);
 		}
 		catch (\Chibi\MissingViewFileException $e)
 		{
 			$this->context->json = true;
 			$this->context->layoutName = 'layout-json';
-			(new \Chibi\View())->renderFile($this->context->layoutName);
+			$this->render();
 		}
 		catch (SimpleException $e)
 		{
-			StatusHelper::failure(rtrim($e->getMessage(), '.') . '.');
+			if ($e instanceof SimpleNotFoundException)
+				http_response_code(404);
+			StatusHelper::failure($e->getMessage());
 			if (!$this->context->handleExceptions)
 				$this->context->viewName = 'message';
-			(new \Chibi\View())->renderFile($this->context->layoutName);
+			$this->render();
 		}
 		catch (Exception $e)
 		{
-			StatusHelper::failure(rtrim($e->getMessage(), '.') . '.');
+			StatusHelper::failure($e->getMessage());
 			$this->context->transport->exception = $e;
-			$this->context->transport->queries = array_map(function($x) { return preg_replace('/\s+/', ' ', $x); }, queryLogger()->getLogs());
+			$this->context->transport->queries = Database::getLogs();
 			$this->context->viewName = 'error-exception';
-			(new \Chibi\View())->renderFile($this->context->layoutName);
+			$this->render();
 		}
 
 		AuthController::observeWorkFinish();

src/Controllers/AuthController.php

@@ -17,15 +17,15 @@ class AuthController
 		$config = \Chibi\Registry::getConfig();
 		$context = \Chibi\Registry::getContext();
 
-		$dbUser = R::findOne('user', 'name = ?', [$name]);
+		$dbUser = UserModel::findByNameOrEmail($name, false);
 		if ($dbUser === null)
 			throw new SimpleException('Invalid username');
 
-		$passwordHash = Model_User::hashPassword($password, $dbUser->pass_salt);
-		if ($passwordHash != $dbUser->pass_hash)
+		$passwordHash = UserModel::hashPassword($password, $dbUser->passSalt);
+		if ($passwordHash != $dbUser->passHash)
 			throw new SimpleException('Invalid password');
 
-		if (!$dbUser->staff_confirmed and $config->registration->staffActivation)
+		if (!$dbUser->staffConfirmed and $config->registration->staffActivation)
 			throw new SimpleException('Staff hasn\'t confirmed your registration yet');
 
 		if ($dbUser->banned)
@@ -55,8 +55,6 @@ class AuthController
 	public function loginAction()
 	{
 		$this->context->handleExceptions = true;
-		$this->context->stylesheets []= 'auth.css';
-		$this->context->subTitle = 'authentication form';
 
 		//check if already logged in
 		if ($this->context->loggedIn)
@@ -105,20 +103,22 @@ class AuthController
 		{
 			if (!empty($context->user) and $context->user->id)
 			{
-				$dbUser = R::findOne('user', 'id = ?', [$context->user->id]);
+				$dbUser = UserModel::findById($context->user->id);
+				$context->user->lastLoginDate = time();
+				UserModel::save($context->user);
 				$_SESSION['user'] = serialize($dbUser);
 			}
 			else
 			{
-				$dummy = R::dispense('user');
-				$dummy->name = 'Anonymous';
-				$dummy->access_rank = AccessRank::Anonymous;
-				$dummy->anonymous = true;
+				$dummy = UserModel::spawn();
+				$dummy->name = UserModel::getAnonymousName();
+				$dummy->accessRank = AccessRank::Anonymous;
 				$_SESSION['user'] = serialize($dummy);
 			}
 		}
+
 		$context->user = unserialize($_SESSION['user']);
-		$context->loggedIn = $context->user->anonymous ? false : true;
+		$context->loggedIn = $context->user->accessRank != AccessRank::Anonymous;
 		if (!$context->loggedIn)
 		{
 			try
@@ -135,7 +135,7 @@ class AuthController
 	{
 		$context = \Chibi\Registry::getContext();
 		if ($context->user !== null)
-			$_SESSION['user'] = serialize($context->user);
+			self::doLogOut();
 		self::doLogIn();
 	}
 

src/Controllers/CommentController.php

@@ -8,32 +8,30 @@ class CommentController
 	*/
 	public function listAction($page)
 	{
-		$this->context->stylesheets []= 'post-small.css';
-		$this->context->stylesheets []= 'comment-list.css';
-		$this->context->stylesheets []= 'comment-small.css';
-		$this->context->stylesheets []= 'paginator.css';
-		if ($this->context->user->hasEnabledEndlessScrolling())
-			$this->context->scripts []= 'paginator-endless.js';
-
-		$page = intval($page);
-		$commentsPerPage = intval($this->config->comments->commentsPerPage);
-		$this->context->subTitle = 'comments';
 		PrivilegesHelper::confirmWithException(Privilege::ListComments);
 
-		$commentCount = Model_Comment::getEntityCount(null);
-		$pageCount = ceil($commentCount / $commentsPerPage);
-		$page = max(1, min($pageCount, $page));
-		$comments = Model_Comment::getEntities(null, $commentsPerPage, $page);
+		$page = max(1, intval($page));
+		$commentsPerPage = intval($this->config->comments->commentsPerPage);
+		$searchQuery = 'comment_min:1 order:comment_date,desc';
+
+		$posts = PostSearchService::getEntities($searchQuery, $commentsPerPage, $page);
+		$postCount = PostSearchService::getEntityCount($searchQuery);
+		$pageCount = ceil($postCount / $commentsPerPage);
+		PostModel::preloadTags($posts);
+		PostModel::preloadComments($posts);
+		$comments = [];
+		foreach ($posts as $post)
+			$comments = array_merge($comments, $post->getComments());
+		CommentModel::preloadCommenters($comments);
 
-		R::preload($comments, ['commenter' => 'user', 'post', 'post.uploader' => 'user']);
 		$this->context->postGroups = true;
+		$this->context->transport->posts = $posts;
 		$this->context->transport->paginator = new StdClass;
 		$this->context->transport->paginator->page = $page;
 		$this->context->transport->paginator->pageCount = $pageCount;
-		$this->context->transport->paginator->entityCount = $commentCount;
-		$this->context->transport->paginator->entities = $comments;
+		$this->context->transport->paginator->entityCount = $postCount;
+		$this->context->transport->paginator->entities = $posts;
 		$this->context->transport->paginator->params = func_get_args();
-		$this->context->transport->comments = $comments;
 	}
 
 
@@ -48,23 +46,57 @@ class CommentController
 		if ($this->config->registration->needEmailForCommenting)
 			PrivilegesHelper::confirmEmail($this->context->user);
 
-		$post = Model_Post::locate($postId);
+		$post = PostModel::findById($postId);
+		$this->context->transport->post = $post;
 
 		if (InputHelper::get('submit'))
 		{
 			$text = InputHelper::get('text');
-			$text = Model_Comment::validateText($text);
+			$text = CommentModel::validateText($text);
 
-			$comment = R::dispense('comment');
-			$comment->post = $post;
+			$comment = CommentModel::spawn();
+			$comment->setPost($post);
 			if ($this->context->loggedIn)
-				$comment->commenter = $this->context->user;
-			$comment->comment_date = time();
+				$comment->setCommenter($this->context->user);
+			else
+				$comment->setCommenter(null);
+			$comment->commentDate = time();
 			$comment->text = $text;
+
 			if (InputHelper::get('sender') != 'preview')
 			{
-				R::store($comment);
-				LogHelper::logEvent('comment-add', '{user} commented on {post}', ['post' => TextHelper::reprPost($post->id)]);
+				CommentModel::save($comment);
+				LogHelper::log('{user} commented on {post}', ['post' => TextHelper::reprPost($post->id)]);
+			}
+			$this->context->transport->textPreview = $comment->getText();
+			StatusHelper::success();
+		}
+	}
+
+
+
+	/**
+	* @route /comment/{id}/edit
+	* @validate id [0-9]+
+	*/
+	public function editAction($id)
+	{
+		$comment = CommentModel::findById($id);
+		$this->context->transport->comment = $comment;
+
+		PrivilegesHelper::confirmWithException(Privilege::EditComment, PrivilegesHelper::getIdentitySubPrivilege($comment->getCommenter()));
+
+		if (InputHelper::get('submit'))
+		{
+			$text = InputHelper::get('text');
+			$text = CommentModel::validateText($text);
+
+			$comment->text = $text;
+
+			if (InputHelper::get('sender') != 'preview')
+			{
+				CommentModel::save($comment);
+				LogHelper::log('{user} edited comment in {post}', ['post' => TextHelper::reprPost($comment->getPost())]);
 			}
 			$this->context->transport->textPreview = $comment->getText();
 			StatusHelper::success();
@@ -79,11 +111,12 @@ class CommentController
 	*/
 	public function deleteAction($id)
 	{
-		$comment = Model_Comment::locate($id);
-		R::preload($comment, ['commenter' => 'user']);
-		PrivilegesHelper::confirmWithException(Privilege::DeleteComment, PrivilegesHelper::getIdentitySubPrivilege($comment->commenter));
-		LogHelper::logEvent('comment-del', '{user} removed comment from {post}', ['post' => TextHelper::reprPost($comment->post)]);
-		R::trash($comment);
+		$comment = CommentModel::findById($id);
+
+		PrivilegesHelper::confirmWithException(Privilege::DeleteComment, PrivilegesHelper::getIdentitySubPrivilege($comment->getCommenter()));
+		CommentModel::remove($comment);
+
+		LogHelper::log('{user} removed comment from {post}', ['post' => TextHelper::reprPost($comment->getPost())]);
 		StatusHelper::success();
 	}
 }

src/Controllers/IndexController.php

@@ -7,50 +7,48 @@ class IndexController
 	*/
 	public function indexAction()
 	{
-		$this->context->subTitle = 'home';
-		$this->context->stylesheets []= 'index-index.css';
-		$this->context->transport->postCount = R::$f->begin()->select('count(1)')->as('count')->from('post')->get('row')['count'];
+		$this->context->transport->postCount = PostModel::getCount();
 
-		$featuredPostRotationTime = $this->config->misc->featuredPostMaxDays * 24 * 3600;
-
-		$featuredPostId = Model_Property::get(Model_Property::FeaturedPostId);
-		$featuredPostUserId = Model_Property::get(Model_Property::FeaturedPostUserId);
-		$featuredPostDate = Model_Property::get(Model_Property::FeaturedPostDate);
-		if (!$featuredPostId or $featuredPostDate + $featuredPostRotationTime < time())
+		$featuredPost = $this->getFeaturedPost();
+		if ($featuredPost)
 		{
-			$featuredPostId = R::$f->begin()
-				->select('id')
-				->from('post')
-				->where('type = ?')->put(PostType::Image)
-				->and('safety = ?')->put(PostSafety::Safe)
-				->orderBy('random()')
-				->desc()
-				->get('row')['id'];
-			$featuredPostUserId = null;
-			$featuredPostDate = time();
-			Model_Property::set(Model_Property::FeaturedPostId, $featuredPostId);
-			Model_Property::set(Model_Property::FeaturedPostUserId, $featuredPostUserId);
-			Model_Property::set(Model_Property::FeaturedPostDate, $featuredPostDate);
-		}
-
-		if ($featuredPostId !== null)
-		{
-			$featuredPost = Model_Post::locate($featuredPostId);
-			R::preload($featuredPost, ['user', 'comment', 'favoritee']);
-			$featuredPostUser = R::findOne('user', 'id = ?', [$featuredPostUserId]);
 			$this->context->featuredPost = $featuredPost;
-			$this->context->featuredPostUser = $featuredPostUser;
-			$this->context->featuredPostDate = $featuredPostDate;
-			$this->context->pageThumb = \Chibi\UrlHelper::route('post', 'thumb', ['name' => $featuredPost->name]);
+			$this->context->featuredPostDate = PropertyModel::get(PropertyModel::FeaturedPostDate);
+			$this->context->featuredPostUser = UserModel::findByNameOrEmail(PropertyModel::get(PropertyModel::FeaturedPostUserName), false);
 		}
 	}
 
 	/**
 	* @route /help
+	* @route /help/{tab}
 	*/
-	public function helpAction()
+	public function helpAction($tab = null)
 	{
-		$this->context->stylesheets []= 'index-help.css';
-		$this->context->subTitle = 'help';
+		if (empty($this->config->help->paths) or empty($this->config->help->title))
+			throw new SimpleException('Help is disabled');
+		$tab = $tab ?: array_keys($this->config->help->subTitles)[0];
+		if (!isset($this->config->help->paths[$tab]))
+			throw new SimpleException('Invalid tab');
+		$this->context->path = TextHelper::absolutePath($this->config->help->paths[$tab]);
+		$this->context->tab = $tab;
+	}
+
+	private function getFeaturedPost()
+	{
+		$featuredPostRotationTime = $this->config->misc->featuredPostMaxDays * 24 * 3600;
+
+		$featuredPostId = PropertyModel::get(PropertyModel::FeaturedPostId);
+		$featuredPostDate = PropertyModel::get(PropertyModel::FeaturedPostDate);
+
+		//check if too old
+		if (!$featuredPostId or $featuredPostDate + $featuredPostRotationTime < time())
+			return $this->featureNewPost();
+
+		//check if post was deleted
+		$featuredPost = PostModel::findById($featuredPostId, false);
+		if (!$featuredPost)
+			return PropertyModel::featureNewPost();
+
+		return $featuredPost;
 	}
 }

src/Controllers/LogController.php

@@ -6,11 +6,9 @@ class LogController
 	*/
 	public function listAction()
 	{
-		$this->context->subTitle = 'latest logs';
 		PrivilegesHelper::confirmWithException(Privilege::ListLogs);
 
-		$path = $this->context->rootDir . DS . $this->config->main->logsPath;
-		$path = TextHelper::cleanPath($path);
+		$path = TextHelper::absolutePath($this->config->main->logsPath);
 
 		$logs = [];
 		foreach (glob($path . DS . '*.log') as $log)
@@ -26,23 +24,40 @@ class LogController
 
 	/**
 	* @route /log/{name}
+	* @route /log/{name}/{page}
+	* @route /log/{name}/{page}/{filter}
 	* @validate name [0-9a-zA-Z._-]+
+	* @validate page \d*
+	* @validate filter .*
 	*/
-	public function viewAction($name)
+	public function viewAction($name, $page = 1, $filter = '')
 	{
-		$this->context->subTitle = 'logs (' . $name . ')';
-		$this->context->stylesheets []= 'logs.css';
-		$this->context->scripts []= 'logs.js';
+		//redirect requests in form of ?query=... to canonical address
+		$formQuery = InputHelper::get('query');
+		if ($formQuery !== null)
+		{
+			\Chibi\UrlHelper::forward(
+				\Chibi\UrlHelper::route(
+					'log',
+					'view',
+					[
+						'name' => $name,
+						'filter' => $formQuery,
+						'page' => 1
+					]));
+			return;
+		}
+
 		PrivilegesHelper::confirmWithException(Privilege::ViewLog);
 
+		//parse input
+		$page = max(1, intval($page));
 		$name = str_replace(['/', '\\'], '', $name); //paranoia mode
-		$path = $this->context->rootDir . DS . $this->config->main->logsPath . DS . $name;
-		$path = TextHelper::cleanPath($path);
+		$path = TextHelper::absolutePath($this->config->main->logsPath . DS . $name);
 		if (!file_exists($path))
-			throw new SimpleException('Specified log doesn\'t exist');
-
-		$filter = InputHelper::get('filter');
+			throw new SimpleNotFoundException('Specified log doesn\'t exist');
 
+		//load lines
 		$lines = file_get_contents($path);
 		$lines = explode(PHP_EOL, str_replace(["\r", "\n"], PHP_EOL, $lines));
 		$lines = array_reverse($lines);
@@ -50,6 +65,13 @@ class LogController
 		if (!empty($filter))
 			$lines = array_filter($lines, function($line) use ($filter) { return stripos($line, $filter) !== false; });
 
+		$lineCount = count($lines);
+		$logsPerPage = intval($this->config->browsing->logsPerPage);
+		$pageCount = ceil($lineCount / $logsPerPage);
+		$page = min($pageCount, $page);
+
+		$lines = array_slice($lines, ($page - 1) * $logsPerPage, $logsPerPage);
+
 		//stylize important lines
 		foreach ($lines as &$line)
 			if (strpos($line, 'flag') !== false)
@@ -57,11 +79,16 @@ class LogController
 		unset($line);
 
 		$lines = join(PHP_EOL, $lines);
-		$lines = TextHelper::parseMarkdown($lines);
+		$lines = TextHelper::parseMarkdown($lines, true);
 		$lines = trim($lines);
 
+		$this->context->transport->paginator = new StdClass;
+		$this->context->transport->paginator->page = $page;
+		$this->context->transport->paginator->pageCount = $pageCount;
+		$this->context->transport->paginator->entityCount = $lineCount;
+		$this->context->transport->paginator->entities = $lines;
+		$this->context->transport->lines = $lines;
 		$this->context->transport->filter = $filter;
 		$this->context->transport->name = $name;
-		$this->context->transport->log = $lines;
 	}
 }

src/Controllers/TagController.php

@@ -3,18 +3,27 @@ class TagController
 {
 	/**
 	* @route /tags
+	* @route /tags/{page}
+	* @route /tags/{filter}
+	* @route /tags/{filter}/{page}
+	* @validate filter [a-zA-Z\32:,_-]+
+	* @validate page \d*
 	*/
-	public function listAction()
+	public function listAction($filter = null, $page = 1)
 	{
-		$this->context->stylesheets []= 'tag-list.css';
-		$this->context->stylesheets []= 'tabs.css';
-		$this->context->subTitle = 'tags';
 		$this->context->viewName = 'tag-list-wrapper';
-
 		PrivilegesHelper::confirmWithException(Privilege::ListTags);
-		$suppliedFilter = InputHelper::get('filter');
 
-		$tags = Model_Tag::getEntitiesRows($suppliedFilter, null, null);
+		$suppliedFilter = $filter ?: InputHelper::get('filter') ?: 'order:alpha,asc';
+		$page = max(1, intval($page));
+		$tagsPerPage = intval($this->config->browsing->tagsPerPage);
+
+		$tags = TagSearchService::getEntitiesRows($suppliedFilter, $tagsPerPage, $page);
+		$tagCount = TagSearchService::getEntityCount($suppliedFilter);
+		$pageCount = ceil($tagCount / $tagsPerPage);
+		$page = min($pageCount, $page);
+
+		$this->context->filter = $suppliedFilter;
 		$this->context->transport->tags = $tags;
 
 		if ($this->context->json)
@@ -22,89 +31,67 @@ class TagController
 			$this->context->transport->tags = array_values(array_map(function($tag) {
 				return ['name' => $tag['name'], 'count' => $tag['post_count']];
 			}, $this->context->transport->tags));
-			usort($this->context->transport->tags, function($a, $b) {
-				return $a['count'] > $b['count'] ? -1 : 1;
-			});
 		}
 		else
 		{
-			uasort($this->context->transport->tags, function($a, $b) {
-				return strnatcasecmp($a['name'], $b['name']);
-			});
+			$this->context->highestUsage = TagSearchService::getMostUsedTag()['post_count'];
+			$this->context->transport->paginator = new StdClass;
+			$this->context->transport->paginator->page = $page;
+			$this->context->transport->paginator->pageCount = $pageCount;
+			$this->context->transport->paginator->entityCount = $tagCount;
+			$this->context->transport->paginator->entities = $tags;
 		}
 	}
 
 	/**
-	* @route /tags/merge
+	* @route /tag/merge
 	*/
 	public function mergeAction()
 	{
-		$this->context->stylesheets []= 'tag-list.css';
-		$this->context->stylesheets []= 'tabs.css';
-		$this->context->subTitle = 'tags';
 		$this->context->viewName = 'tag-list-wrapper';
+		$this->context->handleExceptions = true;
 
 		PrivilegesHelper::confirmWithException(Privilege::MergeTags);
 		if (InputHelper::get('submit'))
 		{
+			TagModel::removeUnused();
+
 			$suppliedSourceTag = InputHelper::get('source-tag');
-			$suppliedSourceTag = Model_Tag::validateTag($suppliedSourceTag);
-			$sourceTag = Model_Tag::locate($suppliedSourceTag);
+			$suppliedSourceTag = TagModel::validateTag($suppliedSourceTag);
 
 			$suppliedTargetTag = InputHelper::get('target-tag');
-			$suppliedTargetTag = Model_Tag::validateTag($suppliedTargetTag);
-			$targetTag = Model_Tag::locate($suppliedTargetTag);
+			$suppliedTargetTag = TagModel::validateTag($suppliedTargetTag);
 
-			if ($sourceTag->id == $targetTag->id)
-				throw new SimpleException('Source and target tag are the same');
+			TagModel::merge($suppliedSourceTag, $suppliedTargetTag);
 
-			R::preload($sourceTag, 'post');
-
-			foreach ($sourceTag->sharedPost as $post)
-			{
-				foreach ($post->sharedTag as $key => $postTag)
-					if ($postTag->id == $sourceTag->id)
-						unset($post->sharedTag[$key]);
-				$post->sharedTag []= $targetTag;
-				R::store($post);
-			}
-			R::trash($sourceTag);
-
-			\Chibi\UrlHelper::forward(\Chibi\UrlHelper::route('tag', 'list'));
-			LogHelper::logEvent('tag-merge', '{user} merged {source} with {target}', ['source' => TextHelper::reprTag($suppliedSourceTag), 'target' => TextHelper::reprTag($suppliedTargetTag)]);
-			StatusHelper::success();
+			LogHelper::log('{user} merged {source} with {target}', ['source' => TextHelper::reprTag($suppliedSourceTag), 'target' => TextHelper::reprTag($suppliedTargetTag)]);
+			StatusHelper::success('Tags merged successfully.');
 		}
 	}
 
 	/**
-	* @route /tags/rename
+	* @route /tag/rename
 	*/
 	public function renameAction()
 	{
-		$this->context->stylesheets []= 'tag-list.css';
-		$this->context->stylesheets []= 'tabs.css';
-		$this->context->subTitle = 'tags';
 		$this->context->viewName = 'tag-list-wrapper';
+		$this->context->handleExceptions = true;
 
 		PrivilegesHelper::confirmWithException(Privilege::MergeTags);
 		if (InputHelper::get('submit'))
 		{
+			TagModel::removeUnused();
+
 			$suppliedSourceTag = InputHelper::get('source-tag');
-			$suppliedSourceTag = Model_Tag::validateTag($suppliedSourceTag);
+			$suppliedSourceTag = TagModel::validateTag($suppliedSourceTag);
 
 			$suppliedTargetTag = InputHelper::get('target-tag');
-			$suppliedTargetTag = Model_Tag::validateTag($suppliedTargetTag);
-			$targetTag = Model_Tag::locate($suppliedTargetTag, false);
-			if ($targetTag)
-				throw new SimpleException('Target tag already exists');
+			$suppliedTargetTag = TagModel::validateTag($suppliedTargetTag);
 
-			$sourceTag = Model_Tag::locate($suppliedSourceTag);
-			$sourceTag->name = $suppliedTargetTag;
-			R::store($sourceTag);
+			TagModel::rename($suppliedSourceTag, $suppliedTargetTag);
 
-			\Chibi\UrlHelper::forward(\Chibi\UrlHelper::route('tag', 'list'));
-			LogHelper::logEvent('tag-rename', '{user} renamed {source} to {target}', ['source' => TextHelper::reprTag($suppliedSourceTag), 'target' => TextHelper::reprTag($suppliedTargetTag)]);
-			StatusHelper::success();
+			LogHelper::log('{user} renamed {source} to {target}', ['source' => TextHelper::reprTag($suppliedSourceTag), 'target' => TextHelper::reprTag($suppliedTargetTag)]);
+			StatusHelper::success('Tag renamed successfully.');
 		}
 	}
 
@@ -113,20 +100,24 @@ class TagController
 	*/
 	public function massTagRedirectAction()
 	{
-		$this->context->stylesheets []= 'tag-list.css';
-		$this->context->stylesheets []= 'tabs.css';
-		$this->context->subTitle = 'tags';
 		$this->context->viewName = 'tag-list-wrapper';
 
 		PrivilegesHelper::confirmWithException(Privilege::MassTag);
 		if (InputHelper::get('submit'))
 		{
+			$suppliedOldPage = intval(InputHelper::get('old-page'));
+			$suppliedOldQuery = InputHelper::get('old-query');
 			$suppliedQuery = InputHelper::get('query');
-			if (!$suppliedQuery)
-				$suppliedQuery = ' ';
 			$suppliedTag = InputHelper::get('tag');
-			$suppliedTag = Model_Tag::validateTag($suppliedTag);
-			\Chibi\UrlHelper::forward(\Chibi\UrlHelper::route('post', 'list', ['source' => 'mass-tag', 'query' => $suppliedQuery, 'additionalInfo' => $suppliedTag]));
+
+			$params = [
+				'source' => 'mass-tag',
+				'query' => $suppliedQuery ?: ' ',
+				'additionalInfo' => $suppliedTag ? TagModel::validateTag($suppliedTag) : '',
+			];
+			if ($suppliedOldPage != 0 and $suppliedOldQuery == $suppliedQuery)
+				$params['page'] = $suppliedOldPage;
+			\Chibi\UrlHelper::forward(\Chibi\UrlHelper::route('post', 'list', $params));
 		}
 	}
 }

src/Controllers/UserController.php

@@ -8,9 +8,6 @@ class UserController
 		$this->context->transport->user = $user;
 		$this->context->handleExceptions = true;
 		$this->context->viewName = 'user-view';
-		$this->context->stylesheets []= 'tabs.css';
-		$this->context->stylesheets []= 'user-view.css';
-		$this->context->subTitle = $user->name;
 	}
 
 	private static function sendTokenizedEmail(
@@ -23,24 +20,20 @@ class UserController
 		$linkActionName)
 	{
 		//prepare unique user token
-		do
-		{
-			$tokenText =  md5(mt_rand() . uniqid());
-		}
-		while (R::findOne('usertoken', 'token = ?', [$tokenText]) !== null);
-		$token = R::dispense('usertoken');
-		$token->user = $user;
-		$token->token = $tokenText;
+		$token = TokenModel::spawn();
+		$token->setUser($user);
+		$token->token = TokenModel::forgeUnusedToken();
 		$token->used = false;
 		$token->expires = null;
-		R::store($token);
+		TokenModel::save($token);
 
 		\Chibi\Registry::getContext()->mailSent = true;
 		$tokens = [];
 		$tokens['host'] = $_SERVER['HTTP_HOST'];
-		$tokens['token'] = $tokenText;
+		$tokens['token'] = $token->token; //gosh this code looks so silly
+		$tokens['nl'] = PHP_EOL;
 		if ($linkActionName !== null)
-			$tokens['link'] = \Chibi\UrlHelper::route('user', $linkActionName, ['token' => $tokenText]);
+			$tokens['link'] = \Chibi\UrlHelper::route('user', $linkActionName, ['token' => $token->token]);
 
 		$body = wordwrap(TextHelper::replaceTokens($body, $tokens), 70);
 		$subject = TextHelper::replaceTokens($subject, $tokens);
@@ -65,7 +58,7 @@ class UserController
 		$encodedSubject = '=?UTF-8?B?' . base64_encode($subject) . '?=';
 		mail($recipientEmail, $encodedSubject, $body, implode("\r\n", $headers), '-f' . $senderEmail);
 
-		LogHelper::logEvent('mail', 'Sending e-mail with subject "{subject}" to {mail}', ['subject' => $subject, 'mail' => $recipientEmail]);
+		LogHelper::log('Sending e-mail with subject "{subject}" to {mail}', ['subject' => $subject, 'mail' => $recipientEmail]);
 	}
 
 	private static function sendEmailChangeConfirmation($user)
@@ -73,8 +66,8 @@ class UserController
 		$regConfig = \Chibi\Registry::getConfig()->registration;
 		if (!$regConfig->confirmationEmailEnabled)
 		{
-			$user->email_confirmed = $user->email_unconfirmed;
-			$user->email_unconfirmed = null;
+			$user->emailConfirmed = $user->emailUnconfirmed;
+			$user->emailUnconfirmed = null;
 			return;
 		}
 
@@ -84,7 +77,7 @@ class UserController
 			$regConfig->confirmationEmailSubject,
 			$regConfig->confirmationEmailSenderName,
 			$regConfig->confirmationEmailSenderEmail,
-			$user->email_unconfirmed,
+			$user->emailUnconfirmed,
 			'activation');
 	}
 
@@ -98,7 +91,7 @@ class UserController
 			$regConfig->passwordResetEmailSubject,
 			$regConfig->passwordResetEmailSenderName,
 			$regConfig->passwordResetEmailSenderEmail,
-			$user->email_confirmed,
+			$user->emailConfirmed,
 			'password-reset');
 	}
 
@@ -107,41 +100,32 @@ class UserController
 	/**
 	* @route /users
 	* @route /users/{page}
-	* @route /users/{sortStyle}
-	* @route /users/{sortStyle}/{page}
-	* @validate sortStyle alpha|alpha,asc|alpha,desc|date,asc|date,desc|pending
+	* @route /users/{filter}
+	* @route /users/{filter}/{page}
+	* @validate filter [a-zA-Z\32:,_-]+
 	* @validate page [0-9]+
 	*/
-	public function listAction($sortStyle, $page)
+	public function listAction($filter, $page)
 	{
-		$this->context->stylesheets []= 'user-list.css';
-		$this->context->stylesheets []= 'paginator.css';
-		if ($this->context->user->hasEnabledEndlessScrolling())
-			$this->context->scripts []= 'paginator-endless.js';
-
-		if ($sortStyle == '' or $sortStyle == 'alpha')
-			$sortStyle = 'alpha,asc';
-		if ($sortStyle == 'date')
-			$sortStyle = 'date,asc';
-
-		$page = intval($page);
-		$usersPerPage = intval($this->config->browsing->usersPerPage);
-		$this->context->subTitle = 'users';
 		PrivilegesHelper::confirmWithException(Privilege::ListUsers);
 
-		$userCount = Model_User::getEntityCount($sortStyle);
-		$pageCount = ceil($userCount / $usersPerPage);
-		$page = max(1, min($pageCount, $page));
-		$users = Model_User::getEntities($sortStyle, $usersPerPage, $page);
+		$suppliedFilter = $filter ?: InputHelper::get('filter') ?: 'order:alpha,asc';
+		$page = max(1, intval($page));
+		$usersPerPage = intval($this->config->browsing->usersPerPage);
 
-		$this->context->sortStyle = $sortStyle;
+		$users = UserSearchService::getEntities($suppliedFilter, $usersPerPage, $page);
+		$userCount = UserSearchService::getEntityCount($suppliedFilter);
+		$pageCount = ceil($userCount / $usersPerPage);
+		$page = min($pageCount, $page);
+
+		$this->context->filter = $suppliedFilter;
+		$this->context->transport->users = $users;
 		$this->context->transport->paginator = new StdClass;
 		$this->context->transport->paginator->page = $page;
 		$this->context->transport->paginator->pageCount = $pageCount;
 		$this->context->transport->paginator->entityCount = $userCount;
 		$this->context->transport->paginator->entities = $users;
 		$this->context->transport->paginator->params = func_get_args();
-		$this->context->transport->users = $users;
 	}
 
 
@@ -152,8 +136,8 @@ class UserController
 	*/
 	public function flagAction($name)
 	{
-		$user = Model_User::locate($name);
-		PrivilegesHelper::confirmWithException(Privilege::FlagUser);
+		$user = UserModel::findByNameOrEmail($name);
+		PrivilegesHelper::confirmWithException(Privilege::FlagUser, PrivilegesHelper::getIdentitySubPrivilege($user));
 
 		if (InputHelper::get('submit'))
 		{
@@ -165,7 +149,7 @@ class UserController
 			$flagged []= $key;
 			SessionHelper::set('flagged', $flagged);
 
-			LogHelper::logEvent('user-flag', '{user} flagged {subject} for moderator attention', ['subject' => TextHelper::reprUser($user)]);
+			LogHelper::log('{user} flagged {subject} for moderator attention', ['subject' => TextHelper::reprUser($user)]);
 			StatusHelper::success();
 		}
 	}
@@ -178,15 +162,15 @@ class UserController
 	*/
 	public function banAction($name)
 	{
-		$user = Model_User::locate($name);
+		$user = UserModel::findByNameOrEmail($name);
 		PrivilegesHelper::confirmWithException(Privilege::BanUser, PrivilegesHelper::getIdentitySubPrivilege($user));
 
 		if (InputHelper::get('submit'))
 		{
 			$user->banned = true;
-			R::store($user);
+			UserModel::save($user);
 
-			LogHelper::logEvent('ban', '{user} banned {subject}', ['subject' => TextHelper::reprUser($user)]);
+			LogHelper::log('{user} banned {subject}', ['subject' => TextHelper::reprUser($user)]);
 			StatusHelper::success();
 		}
 	}
@@ -199,15 +183,15 @@ class UserController
 	*/
 	public function unbanAction($name)
 	{
-		$user = Model_User::locate($name);
+		$user = UserModel::findByNameOrEmail($name);
 		PrivilegesHelper::confirmWithException(Privilege::BanUser, PrivilegesHelper::getIdentitySubPrivilege($user));
 
 		if (InputHelper::get('submit'))
 		{
 			$user->banned = false;
-			R::store($user);
+			UserModel::save($user);
 
-			LogHelper::logEvent('unban', '{user} unbanned {subject}', ['subject' => TextHelper::reprUser($user)]);
+			LogHelper::log('{user} unbanned {subject}', ['subject' => TextHelper::reprUser($user)]);
 			StatusHelper::success();
 		}
 	}
@@ -220,13 +204,13 @@ class UserController
 	*/
 	public function acceptRegistrationAction($name)
 	{
-		$user = Model_User::locate($name);
+		$user = UserModel::findByNameOrEmail($name);
 		PrivilegesHelper::confirmWithException(Privilege::AcceptUserRegistration);
 		if (InputHelper::get('submit'))
 		{
-			$user->staff_confirmed = true;
-			R::store($user);
-			LogHelper::logEvent('reg-accept', '{user} confirmed account for {subject}', ['subject' => TextHelper::reprUser($user)]);
+			$user->staffConfirmed = true;
+			UserModel::save($user);
+			LogHelper::log('{user} confirmed {subject}\'s account', ['subject' => TextHelper::reprUser($user)]);
 			StatusHelper::success();
 		}
 	}
@@ -239,7 +223,7 @@ class UserController
 	*/
 	public function deleteAction($name)
 	{
-		$user = Model_User::locate($name);
+		$user = UserModel::findByNameOrEmail($name);
 		PrivilegesHelper::confirmWithException(Privilege::ViewUser, PrivilegesHelper::getIdentitySubPrivilege($user));
 		PrivilegesHelper::confirmWithException(Privilege::DeleteUser, PrivilegesHelper::getIdentitySubPrivilege($user));
 
@@ -253,29 +237,18 @@ class UserController
 			$name = $user->name;
 			if ($this->context->user->id == $user->id)
 			{
-				$suppliedPasswordHash = Model_User::hashPassword($suppliedCurrentPassword, $user->pass_salt);
-				if ($suppliedPasswordHash != $user->pass_hash)
+				$suppliedPasswordHash = UserModel::hashPassword($suppliedCurrentPassword, $user->passSalt);
+				if ($suppliedPasswordHash != $user->passHash)
 					throw new SimpleException('Must supply valid password');
 			}
-			R::trashAll(R::find('postscore', 'user_id = ?', [$user->id]));
-			foreach ($user->alias('commenter')->ownComment as $comment)
-			{
-				$comment->commenter = null;
-				R::store($comment);
-			}
-			foreach ($user->alias('uploader')->ownPost as $post)
-			{
-				$post->uploader = null;
-				R::store($post);
-			}
-			$user->ownFavoritee = [];
-			if ($user->id == $this->context->user->id)
+
+			$oldId = $user->id;
+			UserModel::remove($user);
+			if ($oldId == $this->context->user->id)
 				AuthController::doLogOut();
-			R::store($user);
-			R::trash($user);
 
 			\Chibi\UrlHelper::forward(\Chibi\UrlHelper::route('index', 'index'));
-			LogHelper::logEvent('user-del', '{user} removed account for {subject}', ['subject' => TextHelper::reprUser($name)]);
+			LogHelper::log('{user} removed {subject}\'s account', ['subject' => TextHelper::reprUser($name)]);
 			StatusHelper::success();
 		}
 	}
@@ -288,7 +261,7 @@ class UserController
 	*/
 	public function settingsAction($name)
 	{
-		$user = Model_User::locate($name);
+		$user = UserModel::findByNameOrEmail($name);
 		PrivilegesHelper::confirmWithException(Privilege::ViewUser, PrivilegesHelper::getIdentitySubPrivilege($user));
 		PrivilegesHelper::confirmWithException(Privilege::ChangeUserSettings, PrivilegesHelper::getIdentitySubPrivilege($user));
 
@@ -304,8 +277,11 @@ class UserController
 				$user->enableSafety($safety, in_array($safety, $suppliedSafety));
 
 			$user->enableEndlessScrolling(InputHelper::get('endless-scrolling'));
+			$user->enablePostTagTitles(InputHelper::get('post-tag-titles'));
+			$user->enableHidingDislikedPosts(InputHelper::get('hide-disliked-posts'));
 
-			R::store($user);
+			if ($user->accessRank != AccessRank::Anonymous)
+				UserModel::save($user);
 			if ($user->id == $this->context->user->id)
 				$this->context->user = $user;
 			AuthController::doReLog();
@@ -323,7 +299,7 @@ class UserController
 	{
 		try
 		{
-			$user = Model_User::locate($name);
+			$user = UserModel::findByNameOrEmail($name);
 			PrivilegesHelper::confirmWithException(Privilege::ViewUser, PrivilegesHelper::getIdentitySubPrivilege($user));
 
 			$this->loadUserView($user);
@@ -335,7 +311,7 @@ class UserController
 			$this->context->suppliedPassword2 = $suppliedPassword2 = InputHelper::get('password2');
 			$this->context->suppliedEmail = $suppliedEmail = InputHelper::get('email');
 			$this->context->suppliedAccessRank = $suppliedAccessRank = InputHelper::get('access-rank');
-			$currentPasswordHash = $user->pass_hash;
+			$currentPasswordHash = $user->passHash;
 
 			if (InputHelper::get('submit'))
 			{
@@ -345,10 +321,10 @@ class UserController
 				if ($suppliedName != '' and $suppliedName != $user->name)
 				{
 					PrivilegesHelper::confirmWithException(Privilege::ChangeUserName, PrivilegesHelper::getIdentitySubPrivilege($user));
-					$suppliedName = Model_User::validateUserName($suppliedName);
+					$suppliedName = UserModel::validateUserName($suppliedName);
 					$oldName = $user->name;
 					$user->name = $suppliedName;
-					LogHelper::logEvent('user-edit', '{user} renamed {old} to {new}', ['old' => TextHelper::reprUser($oldName), 'new' => TextHelper::reprUser($suppliedName)]);
+					LogHelper::log('{user} renamed {old} to {new}', ['old' => TextHelper::reprUser($oldName), 'new' => TextHelper::reprUser($suppliedName)]);
 				}
 
 				if ($suppliedPassword1 != '')
@@ -356,45 +332,47 @@ class UserController
 					PrivilegesHelper::confirmWithException(Privilege::ChangeUserPassword, PrivilegesHelper::getIdentitySubPrivilege($user));
 					if ($suppliedPassword1 != $suppliedPassword2)
 						throw new SimpleException('Specified passwords must be the same');
-					$suppliedPassword = Model_User::validatePassword($suppliedPassword1);
-					$user->pass_hash = Model_User::hashPassword($suppliedPassword, $user->pass_salt);
-					LogHelper::logEvent('user-edit', '{user} changed password for {subject}', ['subject' => TextHelper::reprUser($user)]);
+					$suppliedPassword = UserModel::validatePassword($suppliedPassword1);
+					$user->passHash = UserModel::hashPassword($suppliedPassword, $user->passSalt);
+					LogHelper::log('{user} changed {subject}\'s password', ['subject' => TextHelper::reprUser($user)]);
 				}
 
-				if ($suppliedEmail != '' and $suppliedEmail != $user->email_confirmed)
+				if ($suppliedEmail != '' and $suppliedEmail != $user->emailConfirmed)
 				{
 					PrivilegesHelper::confirmWithException(Privilege::ChangeUserEmail, PrivilegesHelper::getIdentitySubPrivilege($user));
-					$suppliedEmail = Model_User::validateEmail($suppliedEmail);
+					$suppliedEmail = UserModel::validateEmail($suppliedEmail);
 					if ($this->context->user->id == $user->id)
 					{
-						$user->email_unconfirmed = $suppliedEmail;
-						if (!empty($user->email_unconfirmed))
+						$user->emailUnconfirmed = $suppliedEmail;
+						if (!empty($user->emailUnconfirmed))
 							$confirmMail = true;
-						LogHelper::logEvent('user-edit', '{user} changed e-mail to {mail}', ['mail' => $suppliedEmail]);
+						LogHelper::log('{user} changed e-mail to {mail}', ['mail' => $suppliedEmail]);
 					}
 					else
 					{
-						$user->email_unconfirmed = null;
-						$user->email_confirmed = $suppliedEmail;
-						LogHelper::logEvent('user-edit', '{user} changed e-mail for {subject} to {mail}', ['subject' => TextHelper::reprUser($user), 'mail' => $suppliedEmail]);
+						$user->emailUnconfirmed = null;
+						$user->emailConfirmed = $suppliedEmail;
+						LogHelper::log('{user} changed {subject}\'s e-mail to {mail}', ['subject' => TextHelper::reprUser($user), 'mail' => $suppliedEmail]);
 					}
 				}
 
-				if ($suppliedAccessRank != '' and $suppliedAccessRank != $user->access_rank)
+				if ($suppliedAccessRank != '' and $suppliedAccessRank != $user->accessRank)
 				{
 					PrivilegesHelper::confirmWithException(Privilege::ChangeUserAccessRank, PrivilegesHelper::getIdentitySubPrivilege($user));
-					$suppliedAccessRank = Model_User::validateAccessRank($suppliedAccessRank);
-					$user->access_rank = $suppliedAccessRank;
-					LogHelper::logEvent('user-edit', '{user} changed access rank for {subject} to {rank}', ['subject' => TextHelper::reprUser($user), 'rank' => AccessRank::toString($suppliedAccessRank)]);
+					$suppliedAccessRank = UserModel::validateAccessRank($suppliedAccessRank);
+					$user->accessRank = $suppliedAccessRank;
+					LogHelper::log('{user} changed {subject}\'s access rank to {rank}', ['subject' => TextHelper::reprUser($user), 'rank' => AccessRank::toString($suppliedAccessRank)]);
 				}
 
 				if ($this->context->user->id == $user->id)
 				{
-					$suppliedPasswordHash = Model_User::hashPassword($suppliedCurrentPassword, $user->pass_salt);
+					$suppliedPasswordHash = UserModel::hashPassword($suppliedCurrentPassword, $user->passSalt);
 					if ($suppliedPasswordHash != $currentPasswordHash)
 						throw new SimpleException('Must supply valid current password');
 				}
-				R::store($user);
+				UserModel::save($user);
+				if ($this->context->user->id == $user->id)
+					AuthController::doReLog();
 
 				if ($confirmMail)
 					self::sendEmailChangeConfirmation($user);
@@ -408,7 +386,7 @@ class UserController
 		}
 		catch (Exception $e)
 		{
-			$this->context->transport->user = Model_User::locate($name);
+			$this->context->transport->user = UserModel::findByNameOrEmail($name);
 			throw $e;
 		}
 	}
@@ -416,16 +394,16 @@ class UserController
 
 
 	/**
-	* @route /user/{name}
+	* @route /user/{name}/{tab}
 	* @route /user/{name}/{tab}/{page}
 	* @validate name [^\/]+
 	* @validate tab favs|uploads
 	* @validate page \d*
 	*/
-	public function viewAction($name, $tab, $page)
+	public function viewAction($name, $tab = 'favs', $page)
 	{
 		$postsPerPage = intval($this->config->browsing->postsPerPage);
-		$user = Model_User::locate($name);
+		$user = UserModel::findByNameOrEmail($name);
 		if ($tab === null)
 			$tab = 'favs';
 		if ($page === null)
@@ -433,11 +411,6 @@ class UserController
 
 		PrivilegesHelper::confirmWithException(Privilege::ViewUser, PrivilegesHelper::getIdentitySubPrivilege($user));
 		$this->loadUserView($user);
-		$this->context->stylesheets []= 'post-list.css';
-		$this->context->stylesheets []= 'post-small.css';
-		$this->context->stylesheets []= 'paginator.css';
-		if ($this->context->user->hasEnabledEndlessScrolling())
-			$this->context->scripts []= 'paginator-endless.js';
 
 		$query = '';
 		if ($tab == 'uploads')
@@ -447,12 +420,14 @@ class UserController
 		else
 			throw new SimpleException('Wrong tab');
 
-		$postCount = Model_Post::getEntityCount($query);
+		$page = max(1, $page);
+		$posts = PostSearchService::getEntities($query, $postsPerPage, $page);
+		$postCount = PostSearchService::getEntityCount($query, $postsPerPage, $page);
 		$pageCount = ceil($postCount / $postsPerPage);
-		$page = max(1, min($pageCount, $page));
-		$posts = Model_Post::getEntities($query, $postsPerPage, $page);
+		PostModel::preloadTags($posts);
 
 		$this->context->transport->tab = $tab;
+		$this->context->transport->lastSearchQuery = $query;
 		$this->context->transport->paginator = new StdClass;
 		$this->context->transport->paginator->page = $page;
 		$this->context->transport->paginator->pageCount = $pageCount;
@@ -476,9 +451,9 @@ class UserController
 		$this->context->user->enableSafety($safety,
 			!$this->context->user->hasEnabledSafety($safety));
 
+		if ($this->context->user->accessRank != AccessRank::Anonymous)
+			UserModel::save($this->context->user);
 		AuthController::doReLog();
-		if (!$this->context->user->anonymous)
-			R::store($this->context->user);
 
 		StatusHelper::success();
 	}
@@ -491,8 +466,6 @@ class UserController
 	public function registrationAction()
 	{
 		$this->context->handleExceptions = true;
-		$this->context->stylesheets []= 'auth.css';
-		$this->context->subTitle = 'registration form';
 
 		//check if already logged in
 		if ($this->context->loggedIn)
@@ -512,43 +485,42 @@ class UserController
 
 		if (InputHelper::get('submit'))
 		{
-			$suppliedName = Model_User::validateUserName($suppliedName);
+			$suppliedName = UserModel::validateUserName($suppliedName);
 
 			if ($suppliedPassword1 != $suppliedPassword2)
 				throw new SimpleException('Specified passwords must be the same');
-			$suppliedPassword = Model_User::validatePassword($suppliedPassword1);
+			$suppliedPassword = UserModel::validatePassword($suppliedPassword1);
 
-			$suppliedEmail = Model_User::validateEmail($suppliedEmail);
+			$suppliedEmail = UserModel::validateEmail($suppliedEmail);
 			if (empty($suppliedEmail) and $this->config->registration->needEmailForRegistering)
 				throw new SimpleException('E-mail address is required - you will be sent confirmation e-mail.');
 
 			//register the user
-			$dbUser = R::dispense('user');
+			$dbUser = UserModel::spawn();
 			$dbUser->name = $suppliedName;
-			$dbUser->pass_salt = md5(mt_rand() . uniqid());
-			$dbUser->pass_hash = Model_User::hashPassword($suppliedPassword, $dbUser->pass_salt);
-			$dbUser->email_unconfirmed = $suppliedEmail;
+			$dbUser->passHash = UserModel::hashPassword($suppliedPassword, $dbUser->passSalt);
+			$dbUser->emailUnconfirmed = $suppliedEmail;
 
-			$dbUser->join_date = time();
-			if (R::findOne('user') === null)
+			$dbUser->joinDate = time();
+			if (UserModel::getCount() == 0)
 			{
 				//very first user
-				$dbUser->access_rank = AccessRank::Admin;
-				$dbUser->staff_confirmed = true;
-				$dbUser->email_unconfirmed = null;
-				$dbUser->email_confirmed = $suppliedEmail;
+				$dbUser->accessRank = AccessRank::Admin;
+				$dbUser->staffConfirmed = true;
+				$dbUser->emailUnconfirmed = null;
+				$dbUser->emailConfirmed = $suppliedEmail;
 			}
 			else
 			{
-				$dbUser->access_rank = AccessRank::Registered;
-				$dbUser->staff_confirmed = false;
-				$dbUser->staff_confirmed = null;
+				$dbUser->accessRank = AccessRank::Registered;
+				$dbUser->staffConfirmed = false;
+				$dbUser->staffConfirmed = null;
 			}
 
 			//save the user to db if everything went okay
-			R::store($dbUser);
+			UserModel::save($dbUser);
 
-			if (!empty($dbUser->email_unconfirmed))
+			if (!empty($dbUser->emailUnconfirmed))
 				self::sendEmailChangeConfirmation($dbUser);
 
 			$message = 'Congratulations, your account was created.';
@@ -561,7 +533,7 @@ class UserController
 			elseif ($this->config->registration->staffActivation)
 				$message .= ' Your registration must be now confirmed by staff.';
 
-			LogHelper::logEvent('user-reg', '{subject} just signed up', ['subject' => TextHelper::reprUser($dbUser)]);
+			LogHelper::log('{subject} just signed up', ['subject' => TextHelper::reprUser($dbUser)]);
 			StatusHelper::success($message);
 
 			if (!$this->config->registration->needEmailForRegistering and !$this->config->registration->staffActivation)
@@ -579,19 +551,20 @@ class UserController
 	*/
 	public function activationAction($token)
 	{
-		$this->context->subTitle = 'account activation';
 		$this->context->viewName = 'message';
+		LayoutHelper::setSubTitle('account activation');
 
-		$dbToken = Model_Token::locate($token);
+		$dbToken = TokenModel::findByToken($token);
+		TokenModel::checkValidity($dbToken);
 
-		$dbUser = $dbToken->user;
-		$dbUser->email_confirmed = $dbUser->email_unconfirmed;
-		$dbUser->email_unconfirmed = null;
+		$dbUser = $dbToken->getUser();
+		$dbUser->emailConfirmed = $dbUser->emailUnconfirmed;
+		$dbUser->emailUnconfirmed = null;
 		$dbToken->used = true;
-		R::store($dbToken);
-		R::store($dbUser);
+		TokenModel::save($dbToken);
+		UserModel::save($dbUser);
 
-		LogHelper::logEvent('user-activation', '{subject} just activated account', ['subject' => TextHelper::reprUser($dbUser)]);
+		LogHelper::log('{subject} just activated account', ['subject' => TextHelper::reprUser($dbUser)]);
 		$message = 'Activation completed successfully.';
 		if ($this->config->registration->staffActivation)
 			$message .= ' However, your account still must be confirmed by staff.';
@@ -611,10 +584,11 @@ class UserController
 	*/
 	public function passwordResetAction($token)
 	{
-		$this->context->subTitle = 'password reset';
 		$this->context->viewName = 'message';
+		LayoutHelper::setSubTitle('password reset');
 
-		$dbToken = Model_Token::locate($token);
+		$dbToken = TokenModel::findByToken($token);
+		TokenModel::checkValidity($dbToken);
 
 		$alphabet = array_merge(range('A', 'Z'), range('a', 'z'), range('0', '9'));
 		$randomPassword = join('', array_map(function($x) use ($alphabet)
@@ -622,13 +596,13 @@ class UserController
 			return $alphabet[$x];
 		}, array_rand($alphabet, 8)));
 
-		$dbUser = $dbToken->user;
-		$dbUser->pass_hash = Model_User::hashPassword($randomPassword, $dbUser->pass_salt);
+		$dbUser = $dbToken->getUser();
+		$dbUser->passHash = UserModel::hashPassword($randomPassword, $dbUser->passSalt);
 		$dbToken->used = true;
-		R::store($dbToken);
-		R::store($dbUser);
+		TokenModel::save($dbToken);
+		UserModel::save($dbUser);
 
-		LogHelper::logEvent('user-pass-reset', '{subject} just reset password', ['subject' => TextHelper::reprUser($dbUser)]);
+		LogHelper::log('{subject} just reset password', ['subject' => TextHelper::reprUser($dbUser)]);
 		$message = 'Password reset successful. Your new password is **' . $randomPassword . '**.';
 		StatusHelper::success($message);
 
@@ -644,15 +618,14 @@ class UserController
 	*/
 	public function passwordResetProxyAction()
 	{
-		$this->context->subTtile = 'password reset';
 		$this->context->viewName = 'user-select';
-		$this->context->stylesheets []= 'auth.css';
+		LayoutHelper::setSubTitle('password reset');
 
 		if (InputHelper::get('submit'))
 		{
 			$name = InputHelper::get('name');
-			$user = Model_User::locate($name);
-			if (empty($user->email_confirmed))
+			$user = UserModel::findByNameOrEmail($name);
+			if (empty($user->emailConfirmed))
 				throw new SimpleException('This user has no e-mail confirmed; password reset cannot proceed');
 
 			self::sendPasswordResetConfirmation($user);
@@ -665,17 +638,16 @@ class UserController
 	*/
 	public function activationProxyAction()
 	{
-		$this->context->subTitle = 'account activation';
 		$this->context->viewName = 'user-select';
-		$this->context->stylesheets []= 'auth.css';
+		LayoutHelper::setSubTitle('account activation');
 
 		if (InputHelper::get('submit'))
 		{
 			$name = InputHelper::get('name');
-			$user = Model_User::locate($name);
-			if (empty($user->email_unconfirmed))
+			$user = UserModel::findByNameOrEmail($name);
+			if (empty($user->emailUnconfirmed))
 			{
-				if (!empty($user->email_confirmed))
+				if (!empty($user->emailConfirmed))
 					throw new SimpleException('E-mail was already confirmed; activation skipped');
 				else
 					throw new SimpleException('This user has no e-mail specified; activation cannot proceed');

src/CustomMarkdown.php

@@ -1,10 +1,14 @@
 <?php
 class CustomMarkdown extends \Michelf\Markdown
 {
-	public function __construct()
+	protected $simple = false;
+
+	public function __construct($simple = false)
 	{
+		$this->simple = $simple;
 		$this->no_markup = true;
 		$this->span_gamut += ['doSpoilers' => 71];
+		$this->span_gamut += ['doSearchPermalinks' => 72];
 		$this->span_gamut += ['doStrike' => 6];
 		$this->span_gamut += ['doUsers' => 7];
 		$this->span_gamut += ['doPosts' => 8];
@@ -23,13 +27,53 @@ class CustomMarkdown extends \Michelf\Markdown
 		parent::__construct();
 	}
 
-	protected function doAutoLinks2($text)
+	//make atx-style headers require space after hash
+	protected function doHeaders($text)
 	{
-		$text = preg_replace_callback('{(?<!<)((https?|ftp):[^\'"><\s]+)}i', [&$this, '_doAutoLinks_url_callback'], $text);
-		$text = preg_replace_callback('{(?<!\w)(www\.[^\'"><\s]+)}i', [&$this, '_doAutoLinks_url_callback'], $text);
+		$text = preg_replace_callback('{ ^(.+?)[ ]*\n(=+|-+)[ ]*\n+ }mx', [&$this, '_doHeaders_callback_setext'], $text);
+		$text = preg_replace_callback('{^(\#{1,6})[ ]+(.+?)[ ]*\#*\n+}xm', [&$this, '_doHeaders_callback_atx'], $text);
 		return $text;
 	}
 
+	//disable paragraph forming when using simple markdown
+	protected function formParagraphs($text)
+	{
+		if ($this->simple)
+		{
+			$text = preg_replace('/\A\n+|\n+\z/', '', $text);
+			$grafs = preg_split('/\n{2,}/', $text, -1, PREG_SPLIT_NO_EMPTY);
+			foreach ($grafs as $key => $value)
+			{
+				if (!preg_match('/^B\x1A[0-9]+B$/', $value))
+				{
+					$value = $this->runSpanGamut($value);
+					$grafs[$key] = $this->unhash($value);
+				}
+				else
+				{
+					$grafs[$key] = $this->html_hashes[$value];
+				}
+			}
+			return implode("\n\n", $grafs);
+		}
+		return parent::formParagraphs($text);
+	}
+
+	public static function simpleTransform($text)
+	{
+		$parser = new self(true);
+		return $parser->transform($text);
+	}
+
+	//automatically form links out of http://(...) and www.(...)
+	protected function doAutoLinks2($text)
+	{
+		$text = preg_replace_callback('{(?<!<)((https?|ftp):[^\'"><\s(){}]+)}i', [&$this, '_doAutoLinks_url_callback'], $text);
+		$text = preg_replace_callback('{(?<![^\s\(\)\[\]])(www\.[^\'"><\s(){}]+)}i', [&$this, '_doAutoLinks_url_callback'], $text);
+		return $text;
+	}
+
+	//extend anchors callback for doAutolinks2
 	protected function _doAnchors_inline_callback($matches)
 	{
 		if ($matches[3] == '')
@@ -41,47 +85,79 @@ class CustomMarkdown extends \Michelf\Markdown
 		return parent::_doAnchors_inline_callback($matches);
 	}
 
+	//handle white characters inside code blocks
+	//so that they won't be optimized away by prettifying HTML
+	protected function _doCodeBlocks_callback($matches)
+	{
+		$codeblock = $matches[1];
+
+		$codeblock = $this->outdent($codeblock);
+		$codeblock = htmlspecialchars($codeblock, ENT_NOQUOTES);
+
+		$codeblock = preg_replace('/\A\n+|\n+\z/', '', $codeblock);
+		$codeblock = preg_replace('/\n/', '<br/>', $codeblock);
+		$codeblock = preg_replace('/\t/', '&tab;', $codeblock);
+		$codeblock = preg_replace('/ /', '&nbsp;', $codeblock);
+
+		$codeblock = "<pre><code>$codeblock\n</code></pre>";
+		return "\n\n".$this->hashBlock($codeblock)."\n\n";
+	}
+
+	//change hard breaks trigger - simple \n followed by text
+	//instead of two spaces followed by \n
 	protected function doHardBreaks($text)
 	{
-		return preg_replace_callback('/\n/', [&$this, '_doHardBreaks_callback'], $text);
+		return preg_replace_callback('/\n(?=[\[\]\(\)\w])/', [&$this, '_doHardBreaks_callback'], $text);
 	}
 
 	protected function doStrike($text)
 	{
 		return preg_replace_callback('{(~~|---)([^~]+)\1}', function($x)
 		{
-			return $this->hashPart('<del>') . $x[2] . $this->hashPart('</del>');
+			return $this->hashPart('<del>' . $x[2] . '</del>');
 		}, $text);
 	}
 
 	protected function doSpoilers($text)
 	{
 		if (is_array($text))
-			$text = $this->hashPart('<span class="spoiler">') . $text[1] . $this->hashPart('</span>');
+			$text = $this->hashBlock('<span class="spoiler">') . $this->runSpanGamut($text[1]) . $this->hashBlock('</span>');
 		return preg_replace_callback('{\[spoiler\]((?:[^\[]|\[(?!\/?spoiler\])|(?R))+)\[\/spoiler\]}is', [__CLASS__, 'doSpoilers'], $text);
 	}
 
 	protected function doPosts($text)
 	{
-		return preg_replace_callback('/(?:(?<!\w))@(\d+)/', function($x)
+		$link = \Chibi\UrlHelper::route('post', 'view', ['id' => '_post_']);
+		return preg_replace_callback('/(?:(?<![^\s\(\)\[\]]))@(\d+)/', function($x) use ($link)
 		{
-			return $this->hashPart('<a href="' . \Chibi\UrlHelper::route('post', 'view', ['id' => $x[1]]) . '">') . $x[0] . $this->hashPart('</a>');
+			return $this->hashPart('<a href="' . str_replace('_post_', $x[1], $link) . '">' . $x[0] . '</a>');
 		}, $text);
 	}
 
 	protected function doTags($text)
 	{
-		return preg_replace_callback('/(?:(?<!\w))#([a-zA-Z0-9_-]+)/', function($x)
+		$link = \Chibi\UrlHelper::route('post', 'list', ['query' => '_query_']);
+		return preg_replace_callback('/(?:(?<![^\s\(\)\[\]]))#([()\[\]a-zA-Z0-9_.-]+)/', function($x) use ($link)
 		{
-			return $this->hashPart('<a href="' . \Chibi\UrlHelper::route('post', 'list', ['query' => $x[1]]) . '">') . $x[0] . $this->hashPart('</a>');
+			return $this->hashPart('<a href="' . str_replace('_query_', $x[1], $link) . '">' . $x[0] . '</a>');
 		}, $text);
 	}
 
 	protected function doUsers($text)
 	{
-		return preg_replace_callback('/(?:(?<!\w))\+([a-zA-Z0-9_-]+)/', function($x)
+		$link = \Chibi\UrlHelper::route('user', 'view', ['name' => '_name_']);
+		return preg_replace_callback('/(?:(?<![^\s\(\)\[\]]))\+([a-zA-Z0-9_-]+)/', function($x) use ($link)
 		{
-			return $this->hashPart('<a href="' . \Chibi\UrlHelper::route('user', 'view', ['name' => $x[1]]) . '">') . $x[0] . $this->hashPart('</a>');
+			return $this->hashPart('<a href="' . str_replace('_name_', $x[1], $link) . '">' . $x[0] . '</a>');
+		}, $text);
+	}
+
+	protected function doSearchPermalinks($text)
+	{
+		$link = \Chibi\UrlHelper::route('post', 'list', ['query' => '_query_']);
+		return preg_replace_callback('{\[search\]((?:[^\[]|\[(?!\/?search\]))+)\[\/search\]}is', function($x) use ($link)
+		{
+			return $this->hashPart('<a href="' . str_replace('_query_', urlencode($x[1]), $link) . '">' . $x[1] . '</a>');
 		}, $text);
 	}
 }

src/Helpers/CustomAssetViewDecorator.php

@@ -0,0 +1,40 @@
+<?php
+class CustomAssetViewDecorator extends \Chibi\AssetViewDecorator
+{
+	private static $pageThumb = null;
+	private static $subTitle = null;
+
+	public static function setSubTitle($text)
+	{
+		self::$subTitle = $text;
+	}
+
+	public static function setPageThumb($path)
+	{
+		self::$pageThumb = $path;
+	}
+
+	public function transformHtml($html)
+	{
+		self::$title = isset(self::$subTitle)
+			? sprintf('%s&nbsp;&ndash;&nbsp;%s', self::$title, self::$subTitle)
+			: self::$title;
+
+		$html = parent::transformHtml($html);
+
+		$headSnippet = '<meta property="og:title" content="' . self::$title . '"/>';
+		$headSnippet .= '<meta property="og:url" content="' . \Chibi\UrlHelper::currentUrl() . '"/>';
+		if (!empty(self::$pageThumb))
+			$headSnippet .= '<meta property="og:image" content="' . self::$pageThumb . '"/>';
+
+		$bodySnippet = '<script type="text/javascript">';
+		$bodySnippet .= '$(function() {';
+		$bodySnippet .= '$(\'body\').trigger(\'dom-update\');';
+		$bodySnippet .= '});';
+		$bodySnippet .= '</script>';
+
+		$html = str_replace('</head>', $headSnippet . '</head>', $html);
+		$html = str_replace('</body>', $bodySnippet . '</body>', $html);
+		return $html;
+	}
+}

src/Helpers/LogHelper.php

@@ -1,20 +1,15 @@
 <?php
 class LogHelper
 {
-	static $path;
 	static $context;
 	static $config;
 	static $autoFlush;
-	static $content;
+	static $buffer;
 
 	public static function init()
 	{
-		self::$config = \Chibi\Registry::getConfig();
-		self::$context = \Chibi\Registry::getContext();
-		self::$path = self::$config->main->logsPath . date('Y-m') . '.log';
 		self::$autoFlush = true;
-
-		self::$content = '';
+		self::$buffer = [];
 	}
 
 	public static function bufferChanges()
@@ -29,40 +24,75 @@ class LogHelper
 			throw new SimpleException('Cannot write to log files');
 		if (flock($fh, LOCK_EX))
 		{
-			fwrite($fh, self::$content);
+			foreach (self::$buffer as $logEvent)
+				fwrite($fh, $logEvent->getFullText() . PHP_EOL);
 			fflush($fh);
 			flock($fh, LOCK_UN);
 			fclose($fh);
 		}
-		self::$content = '';
+		self::$buffer = [];
 		self::$autoFlush = true;
 	}
 
 	public static function getLogPath()
 	{
-		return self::$path;
+		return TextHelper::absolutePath(
+			\Chibi\Registry::getConfig()->main->logsPath . DS . date('Y-m') . '.log');
 	}
 
 	public static function log($text, array $tokens = [])
 	{
-		if (isset(self::$context->user))
-			$tokens['user'] = TextHelper::reprUser(self::$context->user->name);
-
-		$text = TextHelper::replaceTokens($text, $tokens);
-
-		$timestamp = date('Y-m-d H:i:s');
-		$ip = isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : '0.0.0.0';
-		$line = sprintf('[%s] %s: %s' . PHP_EOL, $timestamp, $ip, $text);
-
-		self::$content .= $line;
-
+		self::$buffer []= new LogEvent($text, $tokens);
 		if (self::$autoFlush)
 			self::flush();
 	}
 
-	public static function logEvent($event, $text, array $tokens = [])
+	//methods for manipulating buffered logs
+	public static function getBuffer()
 	{
-		return self::log(sprintf('[%s] %s', $event, $text), $tokens);
+		return self::$buffer;
+	}
+
+	public static function setBuffer(array $buffer)
+	{
+		self::$buffer = $buffer;
+	}
+}
+
+class LogEvent
+{
+	public $timestamp;
+	public $text;
+	public $ip;
+	public $tokens;
+
+	public function __construct($text, array $tokens = [])
+	{
+		$this->timestamp = time();
+		$this->text = $text;
+		$this->ip = isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : '0.0.0.0';
+
+		$context = \Chibi\Registry::getContext();
+		$tokens['anon'] = UserModel::getAnonymousName();
+		if ($context->loggedIn and isset($context->user))
+			$tokens['user'] = TextHelper::reprUser($context->user->name);
+		else
+			$tokens['user'] = $tokens['anon'];
+		$this->tokens = $tokens;
+	}
+
+	public function getText()
+	{
+		return TextHelper::replaceTokens($this->text, $this->tokens);
+	}
+
+	public function getFullText()
+	{
+		$date = date('Y-m-d H:i:s', $this->timestamp);
+		$ip = $this->ip;
+		$text = $this->getText();
+		$line = sprintf('[%s] %s: %s', $date, $ip, $text);
+		return $line;
 	}
 }
 

src/Helpers/PrivilegesHelper.php

@@ -17,6 +17,12 @@ class PrivilegesHelper
 
 			$minAccessRank = TextHelper::resolveConstant($minAccessRankName, 'AccessRank');
 			self::$privileges[$key] = $minAccessRank;
+
+			if (!isset(self::$privileges[$privilegeName]) or
+				self::$privileges[$privilegeName] > $minAccessRank)
+			{
+				self::$privileges[$privilegeName] = $minAccessRank;
+			}
 		}
 	}
 
@@ -42,16 +48,14 @@ class PrivilegesHelper
 			}
 		}
 
-		return intval($user->access_rank) >= $minAccessRank;
+		return intval($user->accessRank) >= $minAccessRank;
 	}
 
 	public static function confirmWithException($privilege, $subPrivilege = null)
 	{
 		if (!self::confirm($privilege, $subPrivilege))
-		{
 			throw new SimpleException('Insufficient privileges');
 	}
-	}
 
 	public static function getIdentitySubPrivilege($user)
 	{
@@ -63,7 +67,7 @@ class PrivilegesHelper
 
 	public static function confirmEmail($user)
 	{
-		if (!$user->email_confirmed)
+		if (!$user->emailConfirmed)
 			throw new SimpleException('Need e-mail address confirmation to continue');
 	}
 

src/Helpers/StatusHelper.php

@@ -6,6 +6,9 @@ class StatusHelper
 		$context = \Chibi\Registry::getContext();
 		if (!empty($message))
 		{
+			if (!preg_match('/[.?!]$/', $message))
+				$message .= '.';
+
 			$context->transport->message = $message;
 			$context->transport->messageHtml = TextHelper::parseMarkdown($message, true);
 		}

src/Helpers/TextHelper.php

@@ -17,9 +17,21 @@ class TextHelper
 		return $text;
 	}
 
+	//todo: convert to enum and make one method
+	public static function snakeCaseToCamelCase($string, $lower = false)
+	{
+		$string = explode('_', $string);
+		$string = array_map('trim', $string);
+		$string = array_map('ucfirst', $string);
+		$string = join('', $string);
+		if ($lower)
+			$string = lcfirst($string);
+		return $string;
+	}
+
 	public static function kebabCaseToCamelCase($string)
 	{
-		$string = preg_split('/-/', $string);
+		$string = explode('-', $string);
 		$string = array_map('trim', $string);
 		$string = array_map('ucfirst', $string);
 		$string = join('', $string);
@@ -75,33 +87,44 @@ class TextHelper
 	{
 		$suffix = substr($string, -1, 1);
 		$index = array_search($suffix, $suffixes);
-		if ($index === false)
-			return $string;
-		$number = intval($string);
-		for ($i = 0; $i < $index; $i ++)
-			$number *= $base;
-		return $number;
+		return floatval($string) * pow($base, $index !== false ? $index : 0);
 	}
 
-	private static function useUnits($number, $base, $suffixes)
+	private static function useUnits($number, $base, $suffixes, $fmtCallback = null)
 	{
 		$suffix = array_shift($suffixes);
-		if ($number < $base)
-		{
-			return sprintf('%d%s', $number, $suffix);
-		}
-		do
+
+		while ($number >= $base and !empty($suffixes))
 		{
 			$suffix = array_shift($suffixes);
 			$number /= (float) $base;
 		}
-		while ($number >= $base and !empty($suffixes));
+
+		if ($fmtCallback === null)
+		{
+			$fmtCallback = function($number, $suffix)
+			{
+				if ($suffix == '')
+					return $number;
 				return sprintf('%.01f%s', $number, $suffix);
+			};
+		}
+
+		return $fmtCallback($number, $suffix);
 	}
 
 	public static function useBytesUnits($number)
 	{
-		return self::useUnits($number, 1024, ['B', 'K', 'M', 'G']);
+		return self::useUnits(
+			$number,
+			1024,
+			['B', 'K', 'M', 'G'],
+			function($number, $suffix)
+			{
+				if ($number < 20 and $suffix != 'B')
+					return sprintf('%.01f%s', $number, $suffix);
+				return sprintf('%.0f%s', $number, $suffix);
+			});
 	}
 
 	public static function useDecimalUnits($number)
@@ -146,38 +169,30 @@ class TextHelper
 	public static function jsonEncode($obj, $illegalKeysRegex = '')
 	{
 		if (is_array($obj))
-		{
+			$set = function($key, $val) use ($obj) { $obj[$key] = $val; };
+		else
+			$set = function($key, $val) use ($obj) { $obj->$key = $val; };
+
 		foreach ($obj as $key => $val)
 		{
-				if ($val instanceof RedBean_OODBBean)
+			if ($val instanceof Exception)
 			{
-					$obj[$key] = R::exportAll($val);
-				}
-			}
-		}
-		elseif (is_object($obj))
-		{
-			foreach ($obj as $key => $val)
-			{
-				if ($val instanceof RedBean_OODBBean)
-				{
-					$obj->$key = R::exportAll($val);
-				}
+				$set($key, ['message' => $val->getMessage(), 'trace' => explode("\n", $val->getTraceAsString())]);
 			}
 		}
 
 		if (!empty($illegalKeysRegex))
 			self::removeUnsafeKeys($obj, $illegalKeysRegex);
 
-		return json_encode($obj);
+		return json_encode($obj, JSON_UNESCAPED_UNICODE);
 	}
 
-	public static function parseMarkdown($text, $inline = false)
+	public static function parseMarkdown($text, $simple = false)
 	{
-		$output = CustomMarkdown::defaultTransform($text);
-		if ($inline)
-			$output = preg_replace('{</?p>}', '', $output);
-		return $output;
+		if ($simple)
+			return CustomMarkdown::simpleTransform($text);
+		else
+			return CustomMarkdown::defaultTransform($text);
 	}
 
 	public static function reprPost($post)
@@ -201,6 +216,15 @@ class TextHelper
 		return '#' . $tag->name;
 	}
 
+	public static function reprTags($tags)
+	{
+		$x = [];
+		foreach ($tags as $tag)
+			$x []= self::reprTag($tag);
+		natcasesort($x);
+		return join(', ', $x);
+	}
+
 	public static function encrypt($text)
 	{
 		$salt = \Chibi\Registry::getConfig()->main->salt;
@@ -228,4 +252,103 @@ class TextHelper
 		$path = rtrim($path, DS);
 		return $path;
 	}
+
+	public static function absolutePath($path)
+	{
+		if ($path{0} != DS)
+			$path = \Chibi\Registry::getContext()->rootDir . DS . $path;
+
+		$path = self::cleanPath($path);
+		return $path;
+	}
+
+	public static function secureWhitespace($text)
+	{
+		$text = str_replace(["\r\n", "\r", "\n"], '&#10;', $text);
+		$text = str_replace(' ', '&#32;', $text);
+		return $text;
+	}
+
+	const HTML_OPEN = 1;
+	const HTML_CLOSE = 2;
+	const HTML_LEAF = 3;
+
+	public static function htmlTag($tagName, $tagStyle, array $attributes = [])
+	{
+		$html = '<';
+		if ($tagStyle == self::HTML_CLOSE)
+			$html .= '/';
+
+		$html .= $tagName;
+
+		if ($tagStyle == self::HTML_OPEN or $tagStyle == self::HTML_LEAF)
+		{
+			foreach ($attributes as $key => $value)
+			{
+				$html .= ' ' . $key . '="' . $value . '"';
+			}
+		}
+
+		if ($tagStyle == self::HTML_LEAF)
+			$html .= '/';
+		$html .= '>';
+
+		return $html;
+	}
+
+	public static function formatDate($date, $plain = true)
+	{
+		if (!$date)
+			return 'Unknown';
+		if ($plain)
+			return date('Y-m-d H:i:s', $date);
+
+		$now = time();
+		$diff = abs($now - $date);
+		$future = $now < $date;
+
+		$mul = 60;
+		if ($diff < $mul)
+			return $future ? 'in a few seconds' : 'just now';
+		if ($diff < $mul * 2)
+			return $future ? 'in a minute' : 'a minute ago';
+
+		$prevMul = $mul; $mul *= 60;
+		if ($diff < $mul)
+			return $future ? 'in ' . round($diff / $prevMul) . ' minutes' : round($diff / $prevMul) . ' minutes ago';
+		if ($diff < $mul * 2)
+			return $future ? 'in an hour' : 'an hour ago';
+
+		$prevMul = $mul; $mul *= 24;
+		if ($diff < $mul)
+			return $future ? 'in ' . round($diff / $prevMul) . ' hours' : round($diff / $prevMul) . ' hours ago';
+		if ($diff < $mul * 2)
+			return $future ? 'tomorrow' : 'yesterday';
+
+		$prevMul = $mul; $mul *= 30.42;
+		if ($diff < $mul)
+			return $future ? 'in ' . round($diff / $prevMul) . ' days' : round($diff / $prevMul) . ' days ago';
+		if ($diff < $mul * 2)
+			return $future ? 'in a month' : 'a month ago';
+
+		$prevMul = $mul; $mul *= 12;
+		if ($diff < $mul)
+			return $future ? 'in ' . round($diff / $prevMul) . ' months' : round($diff / $prevMul) . ' months ago';
+		if ($diff < $mul * 2)
+			return $future ? 'in a year' : 'a year ago';
+
+		return $future ? 'in ' . round($diff / $mul) . ' years' : round($diff / $prevMul) . ' years ago';
+	}
+
+	public static function resolveMimeType($mimeType)
+	{
+		$mimeTypes = [
+			'image/jpeg' => 'jpg',
+			'image/gif' => 'gif',
+			'image/png' => 'png',
+			'application/x-shockwave-flash' => 'swf'];
+		return isset($mimeTypes[$mimeType])
+			? $mimeTypes[$mimeType]
+			: null;
+	}
 }

src/Models/AbstractCrudModel.php

@@ -0,0 +1,149 @@
+<?php
+use \Chibi\Sql as Sql;
+use \Chibi\Database as Database;
+
+abstract class AbstractCrudModel implements IModel
+{
+	public static function spawn()
+	{
+		$entityClassName = static::getEntityClassName();
+		return new $entityClassName();
+	}
+
+	public static function remove($entities)
+	{
+		throw new NotImplementedException();
+	}
+
+	public static function save($entity)
+	{
+		throw new NotImplementedException();
+	}
+
+
+
+	public static function findById($key, $throw = true)
+	{
+		$stmt = new Sql\SelectStatement();
+		$stmt->setColumn('*');
+		$stmt->setTable(static::getTableName());
+		$stmt->setCriterion(new Sql\EqualsFunctor('id', new Sql\Binding($key)));
+
+		$row = Database::fetchOne($stmt);
+		if ($row)
+			return self::convertRow($row);
+
+		if ($throw)
+			throw new SimpleNotFoundException('Invalid ' . static::getTableName() . ' ID "' . $key . '"');
+		return null;
+	}
+
+	public static function findByIds(array $ids)
+	{
+		$stmt = new Sql\SelectStatement();
+		$stmt->setColumn('*');
+		$stmt->setTable(static::getTableName());
+		$stmt->setCriterion(Sql\InFunctor::fromArray('id', Sql\Binding::fromArray(array_unique($ids))));
+
+		$rows = Database::fetchAll($stmt);
+		if ($rows)
+			return self::convertRows($rows);
+
+		return [];
+	}
+
+	public static function getCount()
+	{
+		$stmt = new Sql\SelectStatement();
+		$stmt->setColumn(new Sql\AliasFunctor(new Sql\CountFunctor('1'), 'count'));
+		$stmt->setTable(static::getTableName());
+		return Database::fetchOne($stmt)['count'];
+	}
+
+
+
+
+	public static function getEntityClassName()
+	{
+		$modelClassName = get_called_class();
+		$entityClassName = str_replace('Model', 'Entity', $modelClassName);
+		return $entityClassName;
+	}
+
+	public static function convertRow($row)
+	{
+		$entity = self::spawn();
+		foreach ($row as $key => $val)
+		{
+			$key = TextHelper::snakeCaseToCamelCase($key, true);
+			$entity->$key = $val;
+		}
+		return $entity;
+	}
+
+	public static function convertRows(array $rows)
+	{
+		$keyCache = [];
+		$entities = [];
+		foreach ($rows as $i => $row)
+		{
+			$entity = self::spawn();
+			foreach ($row as $key => $val)
+			{
+				if (isset($keyCache[$key]))
+					$key = $keyCache[$key];
+				else
+					$key = $keyCache[$key] = TextHelper::snakeCaseToCamelCase($key, true);
+				$entity->$key = $val;
+			}
+			$entities[$i] = $entity;
+		}
+		return $entities;
+	}
+
+
+
+	public static function forgeId($entity)
+	{
+		$table = static::getTableName();
+		if (!Database::inTransaction())
+			throw new Exception('Can be run only within transaction');
+		if (!$entity->id)
+		{
+			$stmt = new Sql\InsertStatement();
+			$stmt->setTable($table);
+			Database::exec($stmt);
+			$entity->id = Database::lastInsertId();
+		}
+	}
+
+	public static function preloadOneToMany($entities,
+		$foreignEntityLocalSelector,
+		$foreignEntityForeignSelector,
+		$foreignEntityProcessor,
+		$foreignEntitySetter)
+	{
+		if (empty($entities))
+			return;
+
+		$foreignIds = [];
+		$entityMap = [];
+		foreach ($entities as $entity)
+		{
+			$foreignId = $foreignEntityLocalSelector($entity);
+			if (!isset($entityMap[$foreignId]))
+				$entityMap[$foreignId] = [];
+			$entityMap[$foreignId] []= $entity;
+			$foreignIds []= $foreignId;
+		}
+
+		$foreignEntities = $foreignEntityProcessor($foreignIds);
+
+		foreach ($foreignEntities as $foreignEntity)
+		{
+			$key = $foreignEntityForeignSelector($foreignEntity);
+			foreach ($entityMap[$key] as $entity)
+				$foreignEntitySetter($entity, $foreignEntity);
+		}
+	}
+}

src/Models/AbstractModel.php

@@ -1,53 +0,0 @@
-<?php
-abstract class AbstractModel extends RedBean_SimpleModel
-{
-	public static function getTableName()
-	{
-		throw new SimpleException('Not implemented.');
-	}
-
-	public static function getQueryBuilder()
-	{
-		throw new SimpleException('Not implemented.');
-	}
-
-	public static function getEntitiesRows($query, $perPage = null, $page = 1)
-	{
-		$table = static::getTableName();
-		$dbQuery = R::$f->getNew()->begin();
-		$dbQuery->select($table . '.*');
-		$builder = static::getQueryBuilder();
-		if ($builder)
-			$builder::build($dbQuery, $query);
-		else
-			$dbQuery->from($table);
-		if ($perPage !== null)
-		{
-			$dbQuery->limit('?')->put($perPage);
-			$dbQuery->offset('?')->put(($page - 1) * $perPage);
-		}
-		$rows = $dbQuery->get();
-		return $rows;
-	}
-
-	public static function getEntities($query, $perPage = null, $page = 1)
-	{
-		$table = static::getTableName();
-		$rows = self::getEntitiesRows($query, $perPage, $page);
-		$entities = R::convertToBeans($table, $rows);
-		return $entities;
-	}
-
-	public static function getEntityCount($query)
-	{
-		$table = static::getTableName();
-		$dbQuery = R::$f->getNew()->begin();
-		$dbQuery->select('COUNT(1)')->as('count');
-		$builder = static::getQueryBuilder();
-		if ($builder)
-			$builder::build($dbQuery, $query);
-		else
-			$dbQuery->from($table);
-		return intval($dbQuery->get('row')['count']);
-	}
-}

src/Models/AbstractQueryBuilder.php

@@ -1,5 +0,0 @@
-<?php
-interface AbstractQueryBuilder
-{
-	public static function build($dbQuery, $query);
-}

src/Models/CommentModel.php

@@ -0,0 +1,103 @@
+<?php
+use \Chibi\Sql as Sql;
+use \Chibi\Database as Database;
+
+class CommentModel extends AbstractCrudModel
+{
+	public static function getTableName()
+	{
+		return 'comment';
+	}
+
+	public static function spawn()
+	{
+		$comment = new CommentEntity;
+		$comment->commentDate = time();
+		return $comment;
+	}
+
+	public static function save($comment)
+	{
+		Database::transaction(function() use ($comment)
+		{
+			self::forgeId($comment);
+
+			$bindings = [
+				'text' => $comment->text,
+				'post_id' => $comment->postId,
+				'comment_date' => $comment->commentDate,
+				'commenter_id' => $comment->commenterId];
+
+			$stmt = new Sql\UpdateStatement();
+			$stmt->setTable('comment');
+			$stmt->setCriterion(new Sql\EqualsFunctor('id', new Sql\Binding($comment->id)));
+
+			foreach ($bindings as $key => $val)
+				$stmt->setColumn($key, new Sql\Binding($val));
+
+			Database::exec($stmt);
+		});
+	}
+
+	public static function remove($comment)
+	{
+		Database::transaction(function() use ($comment)
+		{
+			$stmt = new Sql\DeleteStatement();
+			$stmt->setTable('comment');
+			$stmt->setCriterion(new Sql\EqualsFunctor('id', new Sql\Binding($comment->id)));
+			Database::exec($stmt);
+		});
+	}
+
+
+
+	public static function findAllByPostId($key)
+	{
+		$stmt = new Sql\SelectStatement();
+		$stmt->setColumn('comment.*');
+		$stmt->setTable('comment');
+		$stmt->setCriterion(new Sql\EqualsFunctor('post_id', new Sql\Binding($key)));
+
+		$rows = Database::fetchAll($stmt);
+		if ($rows)
+			return self::convertRows($rows);
+		return [];
+	}
+
+
+
+	public static function preloadCommenters($comments)
+	{
+		self::preloadOneToMany($comments,
+			function($comment) { return $comment->commenterId; },
+			function($user) { return $user->id; },
+			function($userIds) { return UserModel::findByIds($userIds); },
+			function($comment, $user) { return $comment->setCache('commenter', $user); });
+	}
+
+	public static function preloadPosts($comments)
+	{
+		self::preloadOneToMany($comments,
+			function($comment) { return $comment->postId; },
+			function($post) { return $post->id; },
+			function($postIds) { return PostModel::findByIds($postIds); },
+			function($comment, $post) { $comment->setCache('post', $post); });
+	}
+
+
+
+	public static function validateText($text)
+	{
+		$text = trim($text);
+		$config = \Chibi\Registry::getConfig();
+
+		if (strlen($text) < $config->comments->minLength)
+			throw new SimpleException(sprintf('Comment must have at least %d characters', $config->comments->minLength));
+
+		if (strlen($text) > $config->comments->maxLength)
+			throw new SimpleException(sprintf('Comment must have at most %d characters', $config->comments->maxLength));
+
+		return $text;
+	}
+}

src/Models/Entities/AbstractEntity.php

@@ -0,0 +1,23 @@
+<?php
+class AbstractEntity
+{
+	public $id;
+	protected $__cache;
+
+	public function setCache($key, $value)
+	{
+		$this->__cache[$key] = $value;
+	}
+
+	public function getCache($key)
+	{
+		return isset($this->__cache[$key])
+			? $this->__cache[$key]
+			: null;
+	}
+
+	public function hasCache($key)
+	{
+		return isset($this->__cache[$key]);
+	}
+}

src/Models/Entities/CommentEntity.php

@@ -0,0 +1,43 @@
+<?php
+class CommentEntity extends AbstractEntity
+{
+	public $text;
+	public $postId;
+	public $commentDate;
+	public $commenterId;
+
+	public function getText()
+	{
+		return TextHelper::parseMarkdown($this->text);
+	}
+
+	public function setPost($post)
+	{
+		$this->setCache('post', $post);
+		$this->postId = $post->id;
+	}
+
+	public function setCommenter($user)
+	{
+		$this->setCache('commenter', $user);
+		$this->commenterId = $user ? $user->id : null;
+	}
+
+	public function getPost()
+	{
+		if ($this->hasCache('post'))
+			return $this->getCache('post');
+		$post = PostModel::findById($this->postId);
+		$this->setCache('post', $post);
+		return $post;
+	}
+
+	public function getCommenter()
+	{
+		if ($this->hasCache('commenter'))
+			return $this->getCache('commenter');
+		$user = UserModel::findById($this->commenterId, false);
+		$this->setCache('commenter', $user);
+		return $user;
+	}
+}

src/Models/Entities/PostEntity.php

@@ -0,0 +1,448 @@
+<?php
+use \Chibi\Sql as Sql;
+use \Chibi\Database as Database;
+
+class PostEntity extends AbstractEntity
+{
+	public $type;
+	public $name;
+	public $origName;
+	public $fileHash;
+	public $fileSize;
+	public $mimeType;
+	public $safety;
+	public $hidden;
+	public $uploadDate;
+	public $imageWidth;
+	public $imageHeight;
+	public $uploaderId;
+	public $source;
+	public $commentCount;
+	public $favCount;
+	public $score;
+
+	public function getUploader()
+	{
+		if ($this->hasCache('uploader'))
+			return $this->getCache('uploader');
+		$uploader = UserModel::findById($this->uploaderId, false);
+		$this->setCache('uploader', $uploader);
+		return $uploader;
+	}
+
+	public function setUploader($user)
+	{
+		$this->uploaderId = $user->id;
+		$this->setCache('uploader', $user);
+	}
+
+
+
+	public function getComments()
+	{
+		if ($this->hasCache('comments'))
+			return $this->getCache('comments');
+		$comments = CommentModel::findAllByPostId($this->id);
+		$this->setCache('comments', $comments);
+		return $comments;
+	}
+
+
+
+
+	public function getFavorites()
+	{
+		if ($this->hasCache('favoritee'))
+			return $this->getCache('favoritee');
+		$stmt = new Sql\SelectStatement();
+		$stmt->setColumn('user.*');
+		$stmt->setTable('user');
+		$stmt->addInnerJoin('favoritee', new Sql\EqualsFunctor('favoritee.user_id', 'user.id'));
+		$stmt->setCriterion(new Sql\EqualsFunctor('favoritee.post_id', new Sql\Binding($this->id)));
+		$rows = Database::fetchAll($stmt);
+		$favorites = UserModel::convertRows($rows);
+		$this->setCache('favoritee', $favorites);
+		return $favorites;
+	}
+
+
+
+	public function getRelations()
+	{
+		if ($this->hasCache('relations'))
+			return $this->getCache('relations');
+
+		$stmt = new Sql\SelectStatement();
+		$stmt->setColumn('post.*');
+		$stmt->setTable('post');
+		$binding = new Sql\Binding($this->id);
+		$stmt->addInnerJoin('crossref', (new Sql\DisjunctionFunctor)
+			->add(
+				(new Sql\ConjunctionFunctor)
+					->add(new Sql\EqualsFunctor('post.id', 'crossref.post2_id'))
+					->add(new Sql\EqualsFunctor('crossref.post_id', $binding)))
+			->add(
+				(new Sql\ConjunctionFunctor)
+					->add(new Sql\EqualsFunctor('post.id', 'crossref.post_id'))
+					->add(new Sql\EqualsFunctor('crossref.post2_id', $binding))));
+		$rows = Database::fetchAll($stmt);
+		$posts = PostModel::convertRows($rows);
+		$this->setCache('relations', $posts);
+		return $posts;
+	}
+
+	public function setRelations(array $relations)
+	{
+		foreach ($relations as $relatedPost)
+			if (!$relatedPost->id)
+				throw new Exception('All related posts must be saved');
+		$uniqueRelations = [];
+		foreach ($relations as $relatedPost)
+			$uniqueRelations[$relatedPost->id] = $relatedPost;
+		$relations = array_values($uniqueRelations);
+		$this->setCache('relations', $relations);
+	}
+
+	public function setRelationsFromText($relationsText)
+	{
+		$config = \Chibi\Registry::getConfig();
+		$relatedIds = array_filter(preg_split('/\D/', $relationsText));
+
+		$relatedPosts = [];
+		foreach ($relatedIds as $relatedId)
+		{
+			if ($relatedId == $this->id)
+				continue;
+
+			if (count($relatedPosts) > $config->browsing->maxRelatedPosts)
+				throw new SimpleException('Too many related posts (maximum: ' . $config->browsing->maxRelatedPosts . ')');
+
+			$relatedPosts []= PostModel::findById($relatedId);
+		}
+
+		$this->setRelations($relatedPosts);
+	}
+
+
+
+	public function getTags()
+	{
+		if ($this->hasCache('tags'))
+			return $this->getCache('tags');
+		$tags = TagModel::findAllByPostId($this->id);
+		$this->setCache('tags', $tags);
+		return $tags;
+	}
+
+	public function setTags(array $tags)
+	{
+		foreach ($tags as $tag)
+			if (!$tag->id)
+				throw new Exception('All tags must be saved');
+		$uniqueTags = [];
+		foreach ($tags as $tag)
+			$uniqueTags[$tag->id] = $tag;
+		$tags = array_values($uniqueTags);
+		$this->setCache('tags', $tags);
+	}
+
+	public function setTagsFromText($tagsText)
+	{
+		$tagNames = TagModel::validateTags($tagsText);
+		$tags = [];
+		foreach ($tagNames as $tagName)
+		{
+			$tag = TagModel::findByName($tagName, false);
+			if (!$tag)
+			{
+				$tag = TagModel::spawn();
+				$tag->name = $tagName;
+				TagModel::save($tag);
+			}
+			$tags []= $tag;
+		}
+		$this->setTags($tags);
+	}
+
+	public function isTaggedWith($tagName)
+	{
+		$tagName = trim(strtolower($tagName));
+		foreach ($this->getTags() as $tag)
+			if (trim(strtolower($tag->name)) == $tagName)
+				return true;
+		return false;
+	}
+
+
+
+
+	public function setHidden($hidden)
+	{
+		$this->hidden = boolval($hidden);
+	}
+
+	public function setSafety($safety)
+	{
+		$this->safety = PostModel::validateSafety($safety);
+	}
+
+	public function setSource($source)
+	{
+		$this->source = PostModel::validateSource($source);
+	}
+
+
+	public function getThumbCustomPath($width = null, $height = null)
+	{
+		return PostModel::getThumbCustomPath($this->name, $width, $height);
+	}
+
+	public function getThumbDefaultPath($width = null, $height = null)
+	{
+		return PostModel::getThumbDefaultPath($this->name, $width, $height);
+	}
+
+	public function getFullPath()
+	{
+		return PostModel::getFullPath($this->name);
+	}
+
+	public function hasCustomThumb($width = null, $height = null)
+	{
+		$thumbPath = $this->getThumbCustomPath($width, $height);
+		return file_exists($thumbPath);
+	}
+
+	public function setCustomThumbnailFromPath($srcPath)
+	{
+		$config = \Chibi\Registry::getConfig();
+
+		$mimeType = mime_content_type($srcPath);
+		if (!in_array($mimeType, ['image/gif', 'image/png', 'image/jpeg']))
+			throw new SimpleException('Invalid thumbnail type "' . $mimeType . '"');
+
+		list ($imageWidth, $imageHeight) = getimagesize($srcPath);
+		if ($imageWidth != $config->browsing->thumbWidth)
+			throw new SimpleException('Invalid thumbnail width (should be ' . $config->browsing->thumbWidth . ')');
+		if ($imageHeight != $config->browsing->thumbHeight)
+			throw new SimpleException('Invalid thumbnail height (should be ' . $config->browsing->thumbHeight . ')');
+
+		$dstPath = $this->getThumbCustomPath();
+
+		if (is_uploaded_file($srcPath))
+			move_uploaded_file($srcPath, $dstPath);
+		else
+			rename($srcPath, $dstPath);
+	}
+
+	public function makeThumb($width = null, $height = null)
+	{
+		list ($width, $height) = PostModel::validateThumbSize($width, $height);
+		$dstPath = $this->getThumbDefaultPath($width, $height);
+		$srcPath = $this->getFullPath();
+
+		if ($this->type == PostType::Youtube)
+		{
+			$tmpPath = tempnam(sys_get_temp_dir(), 'thumb') . '.jpg';
+			$contents = file_get_contents('http://img.youtube.com/vi/' . $this->fileHash . '/mqdefault.jpg');
+			file_put_contents($tmpPath, $contents);
+			if (file_exists($tmpPath))
+				$srcImage = imagecreatefromjpeg($tmpPath);
+		}
+		else switch ($this->mimeType)
+		{
+			case 'image/jpeg':
+				$srcImage = imagecreatefromjpeg($srcPath);
+				break;
+			case 'image/png':
+				$srcImage = imagecreatefrompng($srcPath);
+				break;
+			case 'image/gif':
+				$srcImage = imagecreatefromgif($srcPath);
+				break;
+			case 'application/x-shockwave-flash':
+				$srcImage = null;
+				exec('which dump-gnash', $tmp, $exitCode);
+				if ($exitCode == 0)
+				{
+					$tmpPath = tempnam(sys_get_temp_dir(), 'thumb') . '.png';
+					exec('dump-gnash --screenshot last --screenshot-file ' . $tmpPath . ' -1 -r1 --max-advances 15 ' . $srcPath);
+					if (file_exists($tmpPath))
+						$srcImage = imagecreatefrompng($tmpPath);
+				}
+				if (!$srcImage)
+				{
+					exec('which swfrender', $tmp, $exitCode);
+					if ($exitCode == 0)
+					{
+						$tmpPath = tempnam(sys_get_temp_dir(), 'thumb') . '.png';
+						exec('swfrender ' . $srcPath . ' -o ' . $tmpPath);
+						if (file_exists($tmpPath))
+							$srcImage = imagecreatefrompng($tmpPath);
+					}
+				}
+				break;
+			default:
+				break;
+		}
+
+		if (isset($tmpPath))
+			unlink($tmpPath);
+
+		if (!isset($srcImage))
+			return false;
+
+		$config = \Chibi\Registry::getConfig();
+		switch ($config->browsing->thumbStyle)
+		{
+			case 'outside':
+				$dstImage = ThumbnailHelper::cropOutside($srcImage, $width, $height);
+				break;
+			case 'inside':
+				$dstImage = ThumbnailHelper::cropInside($srcImage, $width, $height);
+				break;
+			default:
+				throw new SimpleException('Unknown thumbnail crop style');
+		}
+
+		imagejpeg($dstImage, $dstPath);
+		imagedestroy($srcImage);
+		imagedestroy($dstImage);
+
+		return true;
+	}
+
+
+
+	public function setContentFromPath($srcPath)
+	{
+		$this->fileSize = filesize($srcPath);
+		$this->fileHash = md5_file($srcPath);
+
+		if ($this->fileSize == 0)
+			throw new SimpleException('Specified file is empty');
+
+		$this->mimeType = mime_content_type($srcPath);
+		switch ($this->mimeType)
+		{
+			case 'image/gif':
+			case 'image/png':
+			case 'image/jpeg':
+				list ($imageWidth, $imageHeight) = getimagesize($srcPath);
+				$this->type = PostType::Image;
+				$this->imageWidth = $imageWidth;
+				$this->imageHeight = $imageHeight;
+				break;
+			case 'application/x-shockwave-flash':
+				list ($imageWidth, $imageHeight) = getimagesize($srcPath);
+				$this->type = PostType::Flash;
+				$this->imageWidth = $imageWidth;
+				$this->imageHeight = $imageHeight;
+				break;
+			default:
+				throw new SimpleException('Invalid file type "' . $this->mimeType . '"');
+		}
+
+		$duplicatedPost = PostModel::findByHash($this->fileHash, false);
+		if ($duplicatedPost !== null and (!$this->id or $this->id != $duplicatedPost->id))
+			throw new SimpleException('Duplicate upload: @' . $duplicatedPost->id);
+
+		$dstPath = $this->getFullPath();
+
+		if (is_uploaded_file($srcPath))
+			move_uploaded_file($srcPath, $dstPath);
+		else
+			rename($srcPath, $dstPath);
+
+		$thumbPath = $this->getThumbDefaultPath();
+		if (file_exists($thumbPath))
+			unlink($thumbPath);
+	}
+
+	public function setContentFromUrl($srcUrl)
+	{
+		if (!preg_match('/^https?:\/\//', $srcUrl))
+			throw new SimpleException('Invalid URL "' . $srcUrl . '"');
+
+		if (preg_match('/youtube.com\/watch.*?=([a-zA-Z0-9_-]+)/', $srcUrl, $matches))
+		{
+			$youtubeId = $matches[1];
+			$this->type = PostType::Youtube;
+			$this->mimeType = null;
+			$this->fileSize = null;
+			$this->fileHash = $youtubeId;
+			$this->imageWidth = null;
+			$this->imageHeight = null;
+
+			$thumbPath = $this->getThumbDefaultPath();
+			if (file_exists($thumbPath))
+				unlink($thumbPath);
+
+			$duplicatedPost = PostModel::findByHash($youtubeId, false);
+			if ($duplicatedPost !== null and (!$this->id or $this->id != $duplicatedPost->id))
+				throw new SimpleException('Duplicate upload: @' . $duplicatedPost->id);
+			return;
+		}
+
+		$srcPath = tempnam(sys_get_temp_dir(), 'upload') . '.dat';
+
+		//warning: low level sh*t ahead
+		//download the URL $srcUrl into $srcPath
+		$maxBytes = TextHelper::stripBytesUnits(ini_get('upload_max_filesize'));
+		set_time_limit(0);
+		$urlFP = fopen($srcUrl, 'rb');
+		if (!$urlFP)
+			throw new SimpleException('Cannot open URL for reading');
+		$srcFP = fopen($srcPath, 'w+b');
+		if (!$srcFP)
+		{
+			fclose($urlFP);
+			throw new SimpleException('Cannot open file for writing');
+		}
+
+		try
+		{
+			while (!feof($urlFP))
+			{
+				$buffer = fread($urlFP, 4 * 1024);
+				if (fwrite($srcFP, $buffer) === false)
+					throw new SimpleException('Cannot write into file');
+				fflush($srcFP);
+				if (ftell($srcFP) > $maxBytes)
+					throw new SimpleException('File is too big (maximum allowed size: ' . TextHelper::useBytesUnits($maxBytes) . ')');
+			}
+		}
+		finally
+		{
+			fclose($urlFP);
+			fclose($srcFP);
+		}
+
+		try
+		{
+			$this->setContentFromPath($srcPath);
+		}
+		finally
+		{
+			if (file_exists($srcPath))
+				unlink($srcPath);
+		}
+	}
+
+
+
+	public function getEditToken()
+	{
+		$x = [];
+		foreach ($this->getTags() as $tag)
+			$x []= TextHelper::reprTag($tag->name);
+		foreach ($this->getRelations() as $relatedPost)
+			$x []= TextHelper::reprPost($relatedPost);
+		$x []= $this->safety;
+		$x []= $this->source;
+		$x []= $this->fileHash;
+		natcasesort($x);
+		$x = join(' ', $x);
+		return md5($x);
+	}
+}

src/Models/Entities/TagEntity.php

@@ -0,0 +1,17 @@
+<?php
+use \Chibi\Sql as Sql;
+use \Chibi\Database as Database;
+
+class TagEntity extends AbstractEntity
+{
+	public $name;
+
+	public function getPostCount()
+	{
+		$stmt = new Sql\SelectStatement();
+		$stmt->setColumn(new Sql\AliasFunctor(new Sql\CountFunctor('1'), 'count'));
+		$stmt->setTable('post_tag');
+		$stmt->setCriterion(new Sql\EqualsFunctor('tag_id', new Sql\Binding($this->id)));
+		return Database::fetchOne($stmt)['count'];
+	}
+}

src/Models/Entities/TokenEntity.php

@@ -0,0 +1,18 @@
+<?php
+class TokenEntity extends AbstractEntity
+{
+	public $userId;
+	public $token;
+	public $used;
+	public $expires;
+
+	public function getUser()
+	{
+		return UserModel::findById($this->userId);
+	}
+
+	public function setUser($user)
+	{
+		$this->userId = $user ? $user->id : null;
+	}
+}

src/Models/Entities/UserEntity.php

@@ -0,0 +1,166 @@
+<?php
+use \Chibi\Sql as Sql;
+use \Chibi\Database as Database;
+
+class UserEntity extends AbstractEntity
+{
+	public $name;
+	public $passSalt;
+	public $passHash;
+	public $staffConfirmed;
+	public $emailUnconfirmed;
+	public $emailConfirmed;
+	public $joinDate;
+	public $lastLoginDate;
+	public $accessRank;
+	public $settings;
+	public $banned;
+
+	public function getAvatarUrl($size = 32)
+	{
+		$subject = !empty($this->emailConfirmed)
+			? $this->emailConfirmed
+			: $this->passSalt . $this->name;
+		$hash = md5(strtolower(trim($subject)));
+		$url = 'http://www.gravatar.com/avatar/' . $hash . '?s=' . $size . '&d=retro';
+		return $url;
+	}
+
+	public function getSetting($key)
+	{
+		$settings = json_decode($this->settings, true);
+		return isset($settings[$key])
+			? $settings[$key]
+			: null;
+	}
+
+	public function setSetting($key, $value)
+	{
+		$settings = json_decode($this->settings, true);
+		$settings[$key] = $value;
+		$settings = json_encode($settings);
+		if (strlen($settings) > 200)
+			throw new SimpleException('Too much data');
+		$this->settings = $settings;
+	}
+
+	public function hasEnabledSafety($safety)
+	{
+		$all = $this->getSetting(UserModel::SETTING_SAFETY);
+		if (!$all)
+			return $safety == PostSafety::Safe;
+		return $all & PostSafety::toFlag($safety);
+	}
+
+	public function enableSafety($safety, $enabled)
+	{
+		$all = $this->getSetting(UserModel::SETTING_SAFETY);
+		if (!$all)
+			$all = PostSafety::toFlag(PostSafety::Safe);
+
+		$new = $all;
+		if (!$enabled)
+		{
+			$new &= ~PostSafety::toFlag($safety);
+			if (!$new)
+				$new = PostSafety::toFlag(PostSafety::Safe);
+		}
+		else
+		{
+			$new |= PostSafety::toFlag($safety);
+		}
+
+		$this->setSetting(UserModel::SETTING_SAFETY, $new);
+	}
+
+	public function hasEnabledHidingDislikedPosts()
+	{
+		$ret = $this->getSetting(UserModel::SETTING_HIDE_DISLIKED_POSTS);
+		if ($ret === null)
+			$ret = !\Chibi\Registry::getConfig()->browsing->showDislikedPostsDefault;
+		return $ret;
+	}
+
+	public function enableHidingDislikedPosts($enabled)
+	{
+		$this->setSetting(UserModel::SETTING_HIDE_DISLIKED_POSTS, $enabled ? 1 : 0);
+	}
+
+	public function hasEnabledPostTagTitles()
+	{
+		$ret = $this->getSetting(UserModel::SETTING_POST_TAG_TITLES);
+		if ($ret === null)
+			$ret = \Chibi\Registry::getConfig()->browsing->showPostTagTitlesDefault;
+		return $ret;
+	}
+
+	public function enablePostTagTitles($enabled)
+	{
+		$this->setSetting(UserModel::SETTING_POST_TAG_TITLES, $enabled ? 1 : 0);
+	}
+
+	public function hasEnabledEndlessScrolling()
+	{
+		$ret = $this->getSetting(UserModel::SETTING_ENDLESS_SCROLLING);
+		if ($ret === null)
+			$ret = \Chibi\Registry::getConfig()->browsing->endlessScrollingDefault;
+		return $ret;
+	}
+
+	public function enableEndlessScrolling($enabled)
+	{
+		$this->setSetting(UserModel::SETTING_ENDLESS_SCROLLING, $enabled ? 1 : 0);
+	}
+
+	public function hasFavorited($post)
+	{
+		$stmt = new Sql\SelectStatement();
+		$stmt->setColumn(new Sql\AliasFunctor(new Sql\CountFunctor('1'), 'count'));
+		$stmt->setTable('favoritee');
+		$stmt->setCriterion((new Sql\ConjunctionFunctor)
+			->add(new Sql\EqualsFunctor('user_id', new Sql\Binding($this->id)))
+			->add(new Sql\EqualsFunctor('post_id', new Sql\Binding($post->id))));
+		return Database::fetchOne($stmt)['count'] == 1;
+	}
+
+	public function getScore($post)
+	{
+		$stmt = new Sql\SelectStatement();
+		$stmt->setColumn('score');
+		$stmt->setTable('post_score');
+		$stmt->setCriterion((new Sql\ConjunctionFunctor)
+			->add(new Sql\EqualsFunctor('user_id', new Sql\Binding($this->id)))
+			->add(new Sql\EqualsFunctor('post_id', new Sql\Binding($post->id))));
+		$row = Database::fetchOne($stmt);
+		if ($row)
+			return intval($row['score']);
+		return null;
+	}
+
+	public function getFavoriteCount()
+	{
+		$stmt = new Sql\SelectStatement();
+		$stmt->setColumn(new Sql\AliasFunctor(new Sql\CountFunctor('1'), 'count'));
+		$stmt->setTable('favoritee');
+		$stmt->setCriterion(new Sql\EqualsFunctor('user_id', new Sql\Binding($this->id)));
+		return Database::fetchOne($stmt)['count'];
+	}
+
+	public function getCommentCount()
+	{
+		$stmt = new Sql\SelectStatement();
+		$stmt->setColumn(new Sql\AliasFunctor(new Sql\CountFunctor('1'), 'count'));
+		$stmt->setTable('comment');
+		$stmt->setCriterion(new Sql\EqualsFunctor('commenter_id', new Sql\Binding($this->id)));
+		return Database::fetchOne($stmt)['count'];
+	}
+
+	public function getPostCount()
+	{
+		$stmt = new Sql\SelectStatement();
+		$stmt->setColumn(new Sql\AliasFunctor(new Sql\CountFunctor('1'), 'count'));
+		$stmt->setTable('post');
+		$stmt->setCriterion(new Sql\EqualsFunctor('uploader_id', new Sql\Binding($this->id)));
+		return Database::fetchOne($stmt)['count'];
+	}
+}

src/Models/Enums/Privilege.php

@@ -11,6 +11,7 @@ class Privilege extends Enum
 	const EditPostThumb = 8;
 	const EditPostSource = 26;
 	const EditPostRelations = 30;
+	const EditPostFile = 36;
 	const HidePost = 9;
 	const DeletePost = 10;
 	const FeaturePost = 25;
@@ -33,6 +34,7 @@ class Privilege extends Enum
 	const ListComments = 20;
 	const AddComment = 23;
 	const DeleteComment = 24;
+	const EditComment = 37;
 
 	const ListTags = 21;
 	const MergeTags = 27;

src/Models/IModel.php

@@ -0,0 +1,5 @@
+<?php
+interface IModel
+{
+	static function getTableName();
+}

src/Models/Model_Comment.php

@@ -1,44 +0,0 @@
-<?php
-class Model_Comment extends AbstractModel
-{
-	public static function getTableName()
-	{
-		return 'comment';
-	}
-
-	public static function getQueryBuilder()
-	{
-		return 'Model_Comment_QueryBuilder';
-	}
-
-	public static function locate($key, $throw = true)
-	{
-		$comment = R::findOne(self::getTableName(), 'id = ?', [$key]);
-		if (!$comment)
-		{
-			if ($throw)
-				throw new SimpleException('Invalid comment ID "' . $key . '"');
-			return null;
-		}
-		return $comment;
-	}
-
-	public static function validateText($text)
-	{
-		$text = trim($text);
-		$config = \Chibi\Registry::getConfig();
-
-		if (strlen($text) < $config->comments->minLength)
-			throw new SimpleException(sprintf('Comment must have at least %d characters', $config->comments->minLength));
-
-		if (strlen($text) > $config->comments->maxLength)
-			throw new SimpleException(sprintf('Comment must have at most %d characters', $config->comments->maxLength));
-
-		return $text;
-	}
-
-	public function getText()
-	{
-		return TextHelper::parseMarkdown($this->text);
-	}
-}

src/Models/Model_Comment_QueryBuilder.php

@@ -1,13 +0,0 @@
-<?php
-class Model_Comment_QueryBuilder implements AbstractQueryBuilder
-{
-	public static function build($dbQuery, $query)
-	{
-		$dbQuery
-			->from('comment')
-			->where('post_id')
-			->is()->not('NULL')
-			->orderBy('id')
-			->desc();
-	}
-}

src/Models/Model_Post.php

@@ -1,59 +0,0 @@
-<?php
-class Model_Post extends AbstractModel
-{
-	public static function locate($key, $disallowNumeric = false, $throw = true)
-	{
-		if (is_numeric($key) and !$disallowNumeric)
-		{
-			$post = R::findOne(self::getTableName(), 'id = ?', [$key]);
-			if (!$post)
-			{
-				if ($throw)
-					throw new SimpleException('Invalid post ID "' . $key . '"');
-				return null;
-			}
-		}
-		else
-		{
-			$post = R::findOne(self::getTableName(), 'name = ?', [$key]);
-			if (!$post)
-			{
-				if ($throw)
-					throw new SimpleException('Invalid post name "' . $key . '"');
-				return null;
-			}
-		}
-		return $post;
-	}
-
-	public static function validateSafety($safety)
-	{
-		$safety = intval($safety);
-
-		if (!in_array($safety, PostSafety::getAll()))
-			throw new SimpleException('Invalid safety type "' . $safety . '"');
-
-		return $safety;
-	}
-
-	public static function validateSource($source)
-	{
-		$source = trim($source);
-
-		$maxLength = 200;
-		if (strlen($source) > $maxLength)
-			throw new SimpleException('Source must have at most ' . $maxLength . ' characters');
-
-		return $source;
-	}
-
-	public static function getTableName()
-	{
-		return 'post';
-	}
-
-	public static function getQueryBuilder()
-	{
-		return 'Model_Post_QueryBuilder';
-	}
-}

src/Models/Model_Post_QueryBuilder.php

@@ -1,394 +0,0 @@
-<?php
-class Model_Post_QueryBuilder implements AbstractQueryBuilder
-{
-	protected static function attachTableCount($dbQuery, $tableName, $shortName)
-	{
-		$dbQuery
-			->addSql(', ')
-			->open()
-			->select('COUNT(1)')
-			->from($tableName)
-			->where($tableName . '.post_id = post.id')
-			->close()
-			->as($shortName . '_count');
-	}
-
-	protected static function attachCommentCount($dbQuery)
-	{
-		self::attachTableCount($dbQuery, 'comment', 'comment');
-	}
-
-	protected static function attachFavCount($dbQuery)
-	{
-		self::attachTableCount($dbQuery, 'favoritee', 'fav');
-	}
-
-	protected static function attachTagCount($dbQuery)
-	{
-		self::attachTableCount($dbQuery, 'post_tag', 'tag');
-	}
-
-	protected static function filterUserSafety($dbQuery)
-	{
-		$allowedSafety = PrivilegesHelper::getAllowedSafety();
-		$dbQuery->addSql('safety')->in('(' . R::genSlots($allowedSafety) . ')');
-		foreach ($allowedSafety as $s)
-			$dbQuery->put($s);
-	}
-
-	protected static function filterUserHidden($dbQuery)
-	{
-		if (!PrivilegesHelper::confirm(Privilege::ListPosts, 'hidden'))
-			$dbQuery->not()->addSql('hidden');
-		else
-			$dbQuery->addSql('1');
-	}
-
-	protected static function filterChain($dbQuery)
-	{
-		if (isset($dbQuery->__chained))
-			$dbQuery->and();
-		else
-			$dbQuery->where();
-		$dbQuery->__chained = true;
-	}
-
-	protected static function filterNegate($dbQuery)
-	{
-		$dbQuery->not();
-	}
-
-	protected static function filterTag($dbQuery, $val)
-	{
-		$dbQuery
-			->exists()
-			->open()
-			->select('1')
-			->from('post_tag')
-			->innerJoin('tag')
-			->on('post_tag.tag_id = tag.id')
-			->where('post_id = post.id')
-			->and('LOWER(tag.name) = LOWER(?)')->put($val)
-			->close();
-	}
-
-	protected static function filterTokenId($dbQuery, $val)
-	{
-		$ids = preg_split('/[;,]/', $val);
-		$ids = array_map('intval', $ids);
-		$dbQuery->addSql('id')->in('(' . R::genSlots($ids) . ')');
-		foreach ($ids as $id)
-			$dbQuery->put($id);
-	}
-
-	protected static function filterTokenIdMin($dbQuery, $val)
-	{
-		$dbQuery->addSql('id >= ?')->put(intval($val));
-	}
-
-	protected static function filterTokenIdMax($dbQuery, $val)
-	{
-		$dbQuery->addSql('id <= ?')->put(intval($val));
-	}
-
-	protected static function filterTokenScoreMin($dbQuery, $val)
-	{
-		$dbQuery->addSql('score >= ?')->put(intval($val));
-	}
-
-	protected static function filterTokenScoreMax($dbQuery, $val)
-	{
-		$dbQuery->addSql('score <= ?')->put(intval($val));
-	}
-
-	protected static function filterTokenTagMin($dbQuery, $val)
-	{
-		$dbQuery->addSql('tag_count >= ?')->put(intval($val));
-	}
-
-	protected static function filterTokenTagMax($dbQuery, $val)
-	{
-		$dbQuery->addSql('tag_count <= ?')->put(intval($val));
-	}
-
-	protected static function filterTokenFavMin($dbQuery, $val)
-	{
-		$dbQuery->addSql('fav_count >= ?')->put(intval($val));
-	}
-
-	protected static function filterTokenFavMax($dbQuery, $val)
-	{
-		$dbQuery->addSql('fav_count <= ?')->put(intval($val));
-	}
-
-	protected static function filterTokenCommentMin($dbQuery, $val)
-	{
-		$dbQuery->addSql('comment_count >= ?')->put(intval($val));
-	}
-
-	protected static function filterTokenCommentMax($dbQuery, $val)
-	{
-		$dbQuery->addSql('comment_count <= ?')->put(intval($val));
-	}
-
-	protected static function filterTokenType($dbQuery, $val)
-	{
-		switch ($val)
-		{
-			case 'swf':
-				$type = PostType::Flash;
-				break;
-			case 'img':
-				$type = PostType::Image;
-				break;
-			case 'yt':
-			case 'youtube':
-				$type = PostType::Youtube;
-				break;
-			default:
-				throw new SimpleException('Unknown type "' . $val . '"');
-		}
-		$dbQuery->addSql('type = ?')->put($type);
-	}
-
-	protected static function __filterTokenDateParser($val)
-	{
-		list ($year, $month, $day) = explode('-', $val . '-0-0');
-		$yearMin = $yearMax = intval($year);
-		$monthMin = $monthMax = intval($month);
-		$monthMin = $monthMin ?: 1;
-		$monthMax = $monthMax ?: 12;
-		$dayMin = $dayMax = intval($day);
-		$dayMin = $dayMin ?: 1;
-		$dayMax = $dayMax ?: intval(date('t', mktime(0, 0, 0, $monthMax, 1, $year)));
-		$timeMin = mktime(0, 0, 0, $monthMin, $dayMin, $yearMin);
-		$timeMax = mktime(0, 0, -1, $monthMax, $dayMax+1, $yearMax);
-		return [$timeMin, $timeMax];
-	}
-
-	protected static function filterTokenDate($dbQuery, $val)
-	{
-		list ($timeMin, $timeMax) = self::__filterTokenDateParser($val);
-		$dbQuery
-			->addSql('upload_date >= ?')->and('upload_date <= ?')
-			->put($timeMin)
-			->put($timeMax);
-	}
-
-	protected static function filterTokenDateMin($dbQuery, $val)
-	{
-		list ($timeMin, $timeMax) = self::__filterTokenDateParser($val);
-		$dbQuery->addSql('upload_date >= ?')->put($timeMin);
-	}
-
-	protected static function filterTokenDateMax($dbQuery, $val)
-	{
-		list ($timeMin, $timeMax) = self::__filterTokenDateParser($val);
-		$dbQuery->addSql('upload_date <= ?')->put($timeMax);
-	}
-
-	protected static function filterTokenFav($dbQuery, $val)
-	{
-		$dbQuery
-			->exists()
-			->open()
-			->select('1')
-			->from('favoritee')
-			->innerJoin('user')
-			->on('favoritee.user_id = user.id')
-			->where('post_id = post.id')
-			->and('user.name = ?')->put($val)
-			->close();
-	}
-
-	protected static function filterTokenFavs($dbQuery, $val)
-	{
-		return self::filterTokenFav($dbQuery, $val);
-	}
-
-	protected static function filterTokenFavitee($dbQuery, $val)
-	{
-		return self::filterTokenFav($dbQuery, $val);
-	}
-
-	protected static function filterTokenFaviter($dbQuery, $val)
-	{
-		return self::filterTokenFav($dbQuery, $val);
-	}
-
-	protected static function filterTokenSubmit($dbQuery, $val)
-	{
-		$dbQuery
-			->addSql('uploader_id = ')
-			->open()
-			->select('user.id')
-			->from('user')
-			->where('name = ?')->put($val)
-			->close();
-	}
-
-	protected static function filterTokenUploader($dbQuery, $val)
-	{
-		return self::filterTokenSubmit($dbQuery, $val);
-	}
-
-	protected static function filterTokenUpload($dbQuery, $val)
-	{
-		return self::filterTokenSubmit($dbQuery, $val);
-	}
-
-	protected static function filterTokenUploaded($dbQuery, $val)
-	{
-		return self::filterTokenSubmit($dbQuery, $val);
-	}
-
-
-
-	protected static function order($dbQuery, $val)
-	{
-		$randomReset = true;
-
-		$orderDir = 1;
-		if (substr($val, -4) == 'desc')
-		{
-			$orderDir = 1;
-			$val = rtrim(substr($val, 0, -4), ',');
-		}
-		elseif (substr($val, -3) == 'asc')
-		{
-			$orderDir = -1;
-			$val = rtrim(substr($val, 0, -3), ',');
-		}
-		if ($val{0} == '-')
-		{
-			$orderDir *= -1;
-			$val = substr($val, 1);
-		}
-
-		switch ($val)
-		{
-			case 'id':
-				$orderColumn = 'post.id';
-				break;
-			case 'date':
-				$orderColumn = 'post.upload_date';
-				break;
-			case 'comment':
-			case 'comments':
-			case 'commentcount':
-				$orderColumn = 'comment_count';
-				break;
-			case 'fav':
-			case 'favs':
-			case 'favcount':
-				$orderColumn = 'fav_count';
-				break;
-			case 'score':
-				$orderDir *= -1;
-				$orderColumn = 'score';
-				break;
-			case 'tag':
-			case 'tags':
-			case 'tagcount':
-				$orderColumn = 'tag_count';
-				break;
-			case 'random':
-				//seeding works like this: if you visit anything
-				//that triggers order other than random, the seed
-				//is going to reset. however, it stays the same as
-				//long as you keep visiting pages with order:random
-				//specified.
-				$randomReset = false;
-				if (!isset($_SESSION['browsing-seed']))
-					$_SESSION['browsing-seed'] = mt_rand();
-				$seed = $_SESSION['browsing-seed'];
-				$orderColumn = 'SUBSTR(id * ' . $seed .', LENGTH(id) + 2)';
-				break;
-			default:
-				throw new SimpleException('Unknown key "' . $val . '"');
-		}
-
-		if ($randomReset and isset($_SESSION['browsing-seed']))
-			unset($_SESSION['browsing-seed']);
-
-		$dbQuery->orderBy($orderColumn);
-		if ($orderDir == 1)
-			$dbQuery->desc();
-		else
-			$dbQuery->asc();
-	}
-
-
-
-	public static function build($dbQuery, $query)
-	{
-		$config = \Chibi\Registry::getConfig();
-
-		self::attachCommentCount($dbQuery);
-		self::attachFavCount($dbQuery);
-		self::attachTagCount($dbQuery);
-
-		$dbQuery->from('post');
-
-		self::filterChain($dbQuery);
-		self::filterUserSafety($dbQuery);
-		self::filterChain($dbQuery);
-		self::filterUserHidden($dbQuery);
-
-		/* query tokens */
-		$tokens = array_filter(array_unique(explode(' ', $query)), function($x) { return $x != ''; });
-		if (count($tokens) > $config->browsing->maxSearchTokens)
-			throw new SimpleException('Too many search tokens (maximum: ' . $config->browsing->maxSearchTokens . ')');
-
-		$orderToken = 'id';
-		foreach ($tokens as $token)
-		{
-			if ($token{0} == '-')
-			{
-				$token = substr($token, 1);
-				$neg = true;
-			}
-			else
-			{
-				$neg = false;
-			}
-
-			$pos = strpos($token, ':');
-			if ($pos === false)
-			{
-				self::filterChain($dbQuery);
-				if ($neg)
-					self::filterNegate($dbQuery);
-				self::filterTag($dbQuery, $token);
-				continue;
-			}
-
-			$key = substr($token, 0, $pos);
-			$val = substr($token, $pos + 1);
-
-			$methodName = 'filterToken' . TextHelper::kebabCaseToCamelCase($key);
-			if (method_exists(__CLASS__, $methodName))
-			{
-				self::filterChain($dbQuery);
-				if ($neg)
-					self::filterNegate($dbQuery);
-				self::$methodName($dbQuery, $val);
-			}
-
-			elseif ($key == 'order')
-			{
-				if ($neg)
-					$orderToken = $val;
-				else
-					$orderToken = '-' . $val;
-			}
-
-			else
-			{
-				throw new SimpleException('Unknown key "' . $key . '"');
-			}
-		}
-
-		self::order($dbQuery, $orderToken);
-	}
-}

src/Models/Model_Property.php

@@ -1,37 +0,0 @@
-<?php
-class Model_Property extends RedBean_SimpleModel
-{
-	const FeaturedPostId = 0;
-	const FeaturedPostUserId = 1;
-	const FeaturedPostDate = 2;
-
-	static $allProperties = null;
-
-	public static function get($propertyId)
-	{
-		if (self::$allProperties === null)
-		{
-			self::$allProperties = [];
-			foreach (R::find('property') as $prop)
-			{
-				self::$allProperties[$prop->prop_id] = $prop->value;
-			}
-		}
-		return isset(self::$allProperties[$propertyId])
-			? self::$allProperties[$propertyId]
-			: null;
-	}
-
-	public static function set($propertyId, $value)
-	{
-		$row = R::findOne('property', 'prop_id = ?', [$propertyId]);
-		if (!$row)
-		{
-			$row = R::dispense('property');
-			$row->prop_id = $propertyId;
-		}
-		$row->value = $value;
-		self::$allProperties[$propertyId] = $value;
-		R::store($row);
-	}
-}

src/Models/Model_Tag.php

@@ -1,104 +0,0 @@
-<?php
-class Model_Tag extends AbstractModel
-{
-	public static function locate($key, $throw = true)
-	{
-		$tag = R::findOne(self::getTableName(), 'LOWER(name) = LOWER(?)', [$key]);
-		if (!$tag)
-		{
-			if ($throw)
-				throw new SimpleException('Invalid tag name "' . $key . '"');
-			return null;
-		}
-		return $tag;
-	}
-
-	public static function removeUnused()
-	{
-		$dbQuery = R::$f
-			->begin()
-			->select('id, name')
-			->from(self::getTableName())
-			->where()
-			->not()->exists()
-			->open()
-				->select('1')
-				->from('post_tag')
-				->where('post_tag.tag_id = tag.id')
-			->close();
-		$rows = $dbQuery->get();
-		$entities = R::convertToBeans(self::getTableName(), $rows);
-		R::trashAll($entities);
-	}
-
-	public static function insertOrUpdate($tags)
-	{
-		$dbTags = [];
-		foreach ($tags as $tag)
-		{
-			$dbTag = self::locate($tag, false);
-			if (!$dbTag)
-			{
-				$dbTag = R::dispense(self::getTableName());
-				$dbTag->name = $tag;
-				R::store($dbTag);
-			}
-			$dbTags []= $dbTag;
-		}
-		return $dbTags;
-	}
-
-	public static function validateTag($tag)
-	{
-		$tag = trim($tag);
-
-		$minLength = 1;
-		$maxLength = 64;
-		if (strlen($tag) < $minLength)
-			throw new SimpleException('Tag must have at least ' . $minLength . ' characters');
-		if (strlen($tag) > $maxLength)
-			throw new SimpleException('Tag must have at most ' . $maxLength . ' characters');
-
-		if (!preg_match('/^[a-zA-Z0-9_.-]+$/i', $tag))
-			throw new SimpleException('Invalid tag "' . $tag . '"');
-
-		if (preg_match('/^\.\.?$/', $tag))
-			throw new SimpleException('Invalid tag "' . $tag . '"');
-
-		return $tag;
-	}
-
-	public function getPostCount()
-	{
-		if ($this->bean->getMeta('post_count'))
-			return $this->bean->getMeta('post_count');
-		return $this->bean->countShared('post');
-	}
-
-
-	public static function validateTags($tags)
-	{
-		$tags = trim($tags);
-		$tags = preg_split('/[,;\s]+/', $tags);
-		$tags = array_filter($tags, function($x) { return $x != ''; });
-		$tags = array_unique($tags);
-
-		foreach ($tags as $key => $tag)
-			$tags[$key] = self::validateTag($tag);
-
-		if (empty($tags))
-			throw new SimpleException('No tags set');
-
-		return $tags;
-	}
-
-	public static function getTableName()
-	{
-		return 'tag';
-	}
-
-	public static function getQueryBuilder()
-	{
-		return 'Model_Tag_Querybuilder';
-	}
-}

src/Models/Model_Tag_QueryBuilder.php

@@ -1,37 +0,0 @@
-<?php
-class model_Tag_QueryBuilder implements AbstractQueryBuilder
-{
-	public static function build($dbQuery, $query)
-	{
-		$allowedSafety = PrivilegesHelper::getAllowedSafety();
-		$limitQuery = false;
-		$dbQuery
-			->addSql(', COUNT(post_tag.post_id)')
-			->as('post_count')
-			->from('tag')
-			->innerJoin('post_tag')
-			->on('tag.id = post_tag.tag_id')
-			->innerJoin('post')
-			->on('post.id = post_tag.post_id')
-			->where('safety IN (' . R::genSlots($allowedSafety) . ')');
-		foreach ($allowedSafety as $s)
-			$dbQuery->put($s);
-
-		if ($query !== null)
-		{
-			$limitQuery = true;
-			if (strlen($query) >= 3)
-				$query = '%' . $query;
-			$query .= '%';
-			$dbQuery
-				->and('LOWER(tag.name)')
-				->like('LOWER(?)')
-				->put($query);
-		}
-
-		$dbQuery->groupBy('tag.id');
-
-		if ($limitQuery)
-			$dbQuery->limit(15);
-	}
-}

src/Models/Model_Token.php

@@ -1,25 +0,0 @@
-<?php
-class Model_Token extends AbstractModel
-{
-	public static function locate($key, $throw = true)
-	{
-		if (empty($key))
-			throw new SimpleException('Invalid security token');
-
-		$token = R::findOne('usertoken', 'token = ?', [$key]);
-		if ($token === null)
-		{
-			if ($throw)
-				throw new SimpleException('No user with security token');
-			return null;
-		}
-
-		if ($token->used)
-			throw new SimpleException('This token was already used');
-
-		if ($token->expires !== null and time() > $token->expires)
-			throw new SimpleException('This token has expired');
-
-		return $token;
-	}
-}

src/Models/Model_User.php

@@ -1,180 +0,0 @@
-<?php
-class Model_User extends AbstractModel
-{
-	public static function locate($key, $throw = true)
-	{
-		$user = R::findOne(self::getTableName(), 'name = ?', [$key]);
-		if ($user)
-			return $user;
-
-		$user = R::findOne(self::getTableName(), 'LOWER(email_confirmed) = LOWER(?)', [trim($key)]);
-		if ($user)
-			return $user;
-
-		if ($throw)
-			throw new SimpleException('Invalid user name "' . $key . '"');
-
-		return null;
-	}
-
-	public function getAvatarUrl($size = 32)
-	{
-		$subject = !empty($this->email_confirmed)
-			? $this->email_confirmed
-			: $this->pass_salt . $this->name;
-		$hash = md5(strtolower(trim($subject)));
-		$url = 'http://www.gravatar.com/avatar/' . $hash . '?s=' . $size . '&d=retro';
-		return $url;
-	}
-
-	public function getSetting($key)
-	{
-		$settings = json_decode($this->settings, true);
-		return isset($settings[$key])
-			? $settings[$key]
-			: null;
-	}
-
-	public function setSetting($key, $value)
-	{
-		$settings = json_decode($this->settings, true);
-		$settings[$key] = $value;
-		$settings = json_encode($settings);
-		if (strlen($settings) > 200)
-			throw new SimpleException('Too much data');
-		$this->settings = $settings;
-	}
-
-
-	const SETTING_SAFETY = 1;
-	const SETTING_ENDLESS_SCROLLING = 2;
-
-	public function hasEnabledSafety($safety)
-	{
-		$all = $this->getSetting(self::SETTING_SAFETY);
-		if (!$all)
-			return $safety == PostSafety::Safe;
-		return $all & PostSafety::toFlag($safety);
-	}
-
-	public function enableSafety($safety, $enabled)
-	{
-		$all = $this->getSetting(self::SETTING_SAFETY);
-		if (!$all)
-			$all = PostSafety::toFlag(PostSafety::Safe);
-
-		$new = $all;
-		if (!$enabled)
-		{
-			$new &= ~PostSafety::toFlag($safety);
-			if (!$new)
-				$new = PostSafety::toFlag(PostSafety::Safe);
-		}
-		else
-		{
-			$new |= PostSafety::toFlag($safety);
-		}
-
-		$this->setSetting(self::SETTING_SAFETY, $new);
-	}
-
-	public function hasEnabledEndlessScrolling()
-	{
-		$ret = $this->getSetting(self::SETTING_ENDLESS_SCROLLING);
-		if ($ret === null)
-			$ret = \Chibi\Registry::getConfig()->browsing->endlessScrollingDefault;
-		return $ret;
-	}
-
-	public function enableEndlessScrolling($enabled)
-	{
-		$this->setSetting(self::SETTING_ENDLESS_SCROLLING, $enabled ? 1 : 0);
-	}
-
-
-
-	public static function validateUserName($userName)
-	{
-		$userName = trim($userName);
-
-		$dbUser = R::findOne(self::getTableName(), 'name = ?', [$userName]);
-		if ($dbUser !== null)
-		{
-			if (!$dbUser->email_confirmed and \Chibi\Registry::getConfig()->registration->needEmailForRegistering)
-				throw new SimpleException('User with this name is already registered and awaits e-mail confirmation');
-
-			if (!$dbUser->staff_confirmed and \Chibi\Registry::getConfig()->registration->staffActivation)
-				throw new SimpleException('User with this name is already registered and awaits staff confirmation');
-
-			throw new SimpleException('User with this name is already registered');
-		}
-
-		$userNameMinLength = intval(\Chibi\Registry::getConfig()->registration->userNameMinLength);
-		$userNameMaxLength = intval(\Chibi\Registry::getConfig()->registration->userNameMaxLength);
-		$userNameRegex = \Chibi\Registry::getConfig()->registration->userNameRegex;
-
-		if (strlen($userName) < $userNameMinLength)
-			throw new SimpleException(sprintf('User name must have at least %d characters', $userNameMinLength));
-
-		if (strlen($userName) > $userNameMaxLength)
-			throw new SimpleException(sprintf('User name must have at most %d characters', $userNameMaxLength));
-
-		if (!preg_match($userNameRegex, $userName))
-			throw new SimpleException('User name contains invalid characters');
-
-		return $userName;
-	}
-
-	public static function validatePassword($password)
-	{
-		$passMinLength = intval(\Chibi\Registry::getConfig()->registration->passMinLength);
-		$passRegex = \Chibi\Registry::getConfig()->registration->passRegex;
-
-		if (strlen($password) < $passMinLength)
-			throw new SimpleException(sprintf('Password must have at least %d characters', $passMinLength));
-
-		if (!preg_match($passRegex, $password))
-			throw new SimpleException('Password contains invalid characters');
-
-		return $password;
-	}
-
-	public static function validateEmail($email)
-	{
-		$email = trim($email);
-
-		if (!empty($email) and !TextHelper::isValidEmail($email))
-			throw new SimpleException('E-mail address appears to be invalid');
-
-		return $email;
-	}
-
-	public static function validateAccessRank($accessRank)
-	{
-		$accessRank = intval($accessRank);
-
-		if (!in_array($accessRank, AccessRank::getAll()))
-			throw new SimpleException('Invalid access rank type "' . $accessRank . '"');
-
-		if ($accessRank == AccessRank::Nobody)
-			throw new SimpleException('Cannot set special accesss rank "' . $accessRank . '"');
-
-		return $accessRank;
-	}
-
-	public static function hashPassword($pass, $salt2)
-	{
-		$salt1 = \Chibi\Registry::getConfig()->main->salt;
-		return sha1($salt1 . $salt2 . $pass);
-	}
-
-	public static function getTableName()
-	{
-		return 'user';
-	}
-
-	public static function getQueryBuilder()
-	{
-		return 'Model_User_QueryBuilder';
-	}
-}

src/Models/Model_User_QueryBuilder.php

@@ -1,31 +0,0 @@
-<?php
-class Model_User_QueryBuilder implements AbstractQueryBuilder
-{
-	public static function build($dbQuery, $query)
-	{
-		$sortStyle = $query;
-		$dbQuery->from('user');
-
-		switch ($sortStyle)
-		{
-			case 'alpha,asc':
-				$dbQuery->orderBy('name')->asc();
-				break;
-			case 'alpha,desc':
-				$dbQuery->orderBy('name')->desc();
-				break;
-			case 'date,asc':
-				$dbQuery->orderBy('join_date')->asc();
-				break;
-			case 'date,desc':
-				$dbQuery->orderBy('join_date')->desc();
-				break;
-			case 'pending':
-				$dbQuery->where('staff_confirmed IS NULL');
-				$dbQuery->or('staff_confirmed = 0');
-				break;
-			default:
-				throw new SimpleException('Unknown sort style');
-		}
-	}
-}

src/Models/PostModel.php

@@ -0,0 +1,321 @@
+<?php
+use \Chibi\Sql as Sql;
+use \Chibi\Database as Database;
+
+class PostModel extends AbstractCrudModel
+{
+	protected static $config;
+
+	public static function getTableName()
+	{
+		return 'post';
+	}
+
+	public static function init()
+	{
+		self::$config = \Chibi\Registry::getConfig();
+	}
+
+	public static function spawn()
+	{
+		$post = new PostEntity;
+		$post->hidden = false;
+		$post->uploadDate = time();
+		do
+		{
+			$post->name = md5(mt_rand() . uniqid());
+		}
+		while (file_exists($post->getFullPath()));
+		return $post;
+	}
+
+	public static function save($post)
+	{
+		Database::transaction(function() use ($post)
+		{
+			self::forgeId($post);
+
+			$bindings = [
+				'type' => $post->type,
+				'name' => $post->name,
+				'orig_name' => $post->origName,
+				'file_hash' => $post->fileHash,
+				'file_size' => $post->fileSize,
+				'mime_type' => $post->mimeType,
+				'safety' => $post->safety,
+				'hidden' => $post->hidden,
+				'upload_date' => $post->uploadDate,
+				'image_width' => $post->imageWidth,
+				'image_height' => $post->imageHeight,
+				'uploader_id' => $post->uploaderId,
+				'source' => $post->source,
+				];
+
+			$stmt = new Sql\UpdateStatement();
+			$stmt->setTable('post');
+
+			foreach ($bindings as $key => $value)
+				$stmt->setColumn($key, new Sql\Binding($value));
+
+			$stmt->setCriterion(new Sql\EqualsFunctor('id', new Sql\Binding($post->id)));
+			Database::exec($stmt);
+
+			//tags
+			$tags = $post->getTags();
+
+			$stmt = new Sql\DeleteStatement();
+			$stmt->setTable('post_tag');
+			$stmt->setCriterion(new Sql\EqualsFunctor('post_id', new Sql\Binding($post->id)));
+			Database::exec($stmt);
+
+			foreach ($tags as $postTag)
+			{
+				$stmt = new Sql\InsertStatement();
+				$stmt->setTable('post_tag');
+				$stmt->setColumn('post_id', new Sql\Binding($post->id));
+				$stmt->setColumn('tag_id', new Sql\Binding($postTag->id));
+				Database::exec($stmt);
+			}
+
+			//relations
+			$relations = $post->getRelations();
+
+			$stmt = new Sql\DeleteStatement();
+			$stmt->setTable('crossref');
+			$binding = new Sql\Binding($post->id);
+			$stmt->setCriterion((new Sql\DisjunctionFunctor)
+				->add(new Sql\EqualsFunctor('post_id', $binding))
+				->add(new Sql\EqualsFunctor('post2_id', $binding)));
+			Database::exec($stmt);
+
+			foreach ($relations as $relatedPost)
+			{
+				$stmt = new Sql\InsertStatement();
+				$stmt->setTable('crossref');
+				$stmt->setColumn('post_id', new Sql\Binding($post->id));
+				$stmt->setColumn('post2_id', new Sql\Binding($relatedPost->id));
+				Database::exec($stmt);
+			}
+		});
+	}
+
+	public static function remove($post)
+	{
+		Database::transaction(function() use ($post)
+		{
+			$binding = new Sql\Binding($post->id);
+
+			$stmt = new Sql\DeleteStatement();
+			$stmt->setTable('post_score');
+			$stmt->setCriterion(new Sql\EqualsFunctor('post_id', $binding));
+			Database::exec($stmt);
+
+			$stmt->setTable('post_tag');
+			Database::exec($stmt);
+
+			$stmt->setTable('favoritee');
+			Database::exec($stmt);
+
+			$stmt->setTable('comment');
+			Database::exec($stmt);
+
+			$stmt->setTable('crossref');
+			$stmt->setCriterion((new Sql\DisjunctionFunctor)
+				->add(new Sql\EqualsFunctor('post_id', $binding))
+				->add(new Sql\EqualsFunctor('post_id', $binding)));
+			Database::exec($stmt);
+
+			$stmt->setTable('post');
+			$stmt->setCriterion(new Sql\EqualsFunctor('id', $binding));
+			Database::exec($stmt);
+		});
+	}
+
+
+
+
+	public static function findByName($key, $throw = true)
+	{
+		$stmt = new Sql\SelectStatement();
+		$stmt->setColumn('*');
+		$stmt->setTable('post');
+		$stmt->setCriterion(new Sql\EqualsFunctor('name', new Sql\Binding($key)));
+
+		$row = Database::fetchOne($stmt);
+		if ($row)
+			return self::convertRow($row);
+
+		if ($throw)
+			throw new SimpleNotFoundException('Invalid post name "' . $key . '"');
+		return null;
+	}
+
+	public static function findByIdOrName($key, $throw = true)
+	{
+		if (is_numeric($key))
+			$post = self::findById($key, $throw);
+		else
+			$post = self::findByName($key, $throw);
+		return $post;
+	}
+
+	public static function findByHash($key, $throw = true)
+	{
+		$stmt = new Sql\SelectStatement();
+		$stmt->setColumn('*');
+		$stmt->setTable('post');
+		$stmt->setCriterion(new Sql\EqualsFunctor('file_hash', new Sql\Binding($key)));
+
+		$row = Database::fetchOne($stmt);
+		if ($row)
+			return self::convertRow($row);
+
+		if ($throw)
+			throw new SimpleNotFoundException('Invalid post hash "' . $hash . '"');
+		return null;
+	}
+
+
+
+	public static function preloadComments($posts)
+	{
+		if (empty($posts))
+			return;
+
+		$postMap = [];
+		$tagsMap = [];
+		foreach ($posts as $post)
+		{
+			$postId = $post->id;
+			$postMap[$postId] = $post;
+			$commentMap[$postId] = [];
+		}
+		$postIds = array_unique(array_keys($postMap));
+
+		$stmt = new Sql\SelectStatement();
+		$stmt->setTable('comment');
+		$stmt->addColumn('comment.*');
+		$stmt->addColumn('post_id');
+		$stmt->setCriterion(Sql\InFunctor::fromArray('post_id', Sql\Binding::fromArray($postIds)));
+		$rows = Database::fetchAll($stmt);
+
+		foreach ($rows as $row)
+		{
+			if (isset($comments[$row['id']]))
+				continue;
+			unset($row['post_id']);
+			$comment = CommentModel::convertRow($row);
+			$comments[$row['id']] = $comment;
+		}
+
+		foreach ($rows as $row)
+		{
+			$postId = $row['post_id'];
+			$commentMap[$postId] []= $comments[$row['id']];
+		}
+
+		foreach ($commentMap as $postId => $comments)
+			$postMap[$postId]->setCache('comments', $comments);
+	}
+
+	public static function preloadTags($posts)
+	{
+		if (empty($posts))
+			return;
+
+		$postMap = [];
+		$tagsMap = [];
+		foreach ($posts as $post)
+		{
+			$postId = $post->id;
+			$postMap[$postId] = $post;
+			$tagsMap[$postId] = [];
+		}
+		$postIds = array_unique(array_keys($postMap));
+
+		$stmt = new Sql\SelectStatement();
+		$stmt->setTable('tag');
+		$stmt->addColumn('tag.*');
+		$stmt->addColumn('post_id');
+		$stmt->addInnerJoin('post_tag', new Sql\EqualsFunctor('post_tag.tag_id', 'tag.id'));
+		$stmt->setCriterion(Sql\InFunctor::fromArray('post_id', Sql\Binding::fromArray($postIds)));
+		$rows = Database::fetchAll($stmt);
+
+		foreach ($rows as $row)
+		{
+			if (isset($tags[$row['id']]))
+				continue;
+			unset($row['post_id']);
+			$tag = TagModel::convertRow($row);
+			$tags[$row['id']] = $tag;
+		}
+
+		foreach ($rows as $row)
+		{
+			$postId = $row['post_id'];
+			$tagsMap[$postId] []= $tags[$row['id']];
+		}
+
+		foreach ($tagsMap as $postId => $tags)
+			$postMap[$postId]->setCache('tags', $tags);
+	}
+
+
+
+	public static function validateSafety($safety)
+	{
+		$safety = intval($safety);
+
+		if (!in_array($safety, PostSafety::getAll()))
+			throw new SimpleException('Invalid safety type "' . $safety . '"');
+
+		return $safety;
+	}
+
+	public static function validateSource($source)
+	{
+		$source = trim($source);
+
+		$maxLength = 200;
+		if (strlen($source) > $maxLength)
+			throw new SimpleException('Source must have at most ' . $maxLength . ' characters');
+
+		return $source;
+	}
+
+	public static function validateThumbSize($width, $height)
+	{
+		$width = $width === null ? self::$config->browsing->thumbWidth : $width;
+		$height = $height === null ? self::$config->browsing->thumbHeight : $height;
+		$width = min(1000, max(1, $width));
+		$height = min(1000, max(1, $height));
+		return [$width, $height];
+	}
+
+	private static function getThumbPathTokenized($text, $name, $width = null, $height = null)
+	{
+		list ($width, $height) = self::validateThumbSize($width, $height);
+
+		return TextHelper::absolutePath(TextHelper::replaceTokens($text, [
+			'fullpath' => self::$config->main->thumbsPath . DS . $name,
+			'width' => $width,
+			'height' => $height]));
+	}
+
+	public static function getThumbCustomPath($name, $width = null, $height = null)
+	{
+		return self::getThumbPathTokenized('{fullpath}.custom', $name, $width, $height);
+	}
+
+	public static function getThumbDefaultPath($name, $width = null, $height = null)
+	{
+		return self::getThumbPathTokenized('{fullpath}-{width}x{height}.default', $name, $width, $height);
+	}
+
+	public static function getFullPath($name)
+	{
+		return TextHelper::absolutePath(self::$config->main->filesPath . DS . $name);
+	}
+}
+
+PostModel::init();

src/Models/PropertyModel.php

@@ -0,0 +1,90 @@
+<?php
+use \Chibi\Sql as Sql;
+use \Chibi\Database as Database;
+
+class PropertyModel implements IModel
+{
+	const FeaturedPostId = 0;
+	const FeaturedPostUserName = 1;
+	const FeaturedPostDate = 2;
+	const DbVersion = 3;
+
+	static $allProperties = null;
+	static $loaded = false;
+
+	public static function getTableName()
+	{
+		return 'property';
+	}
+
+	public static function loadIfNecessary()
+	{
+		if (!self::$loaded)
+		{
+			self::$loaded = true;
+			self::$allProperties = [];
+			$stmt = new Sql\SelectStatement();
+			$stmt ->setColumn('*');
+			$stmt ->setTable('property');
+			foreach (Database::fetchAll($stmt) as $row)
+				self::$allProperties[$row['prop_id']] = $row['value'];
+		}
+	}
+
+	public static function get($propertyId)
+	{
+		self::loadIfNecessary();
+		return isset(self::$allProperties[$propertyId])
+			? self::$allProperties[$propertyId]
+			: null;
+	}
+
+	public static function set($propertyId, $value)
+	{
+		self::loadIfNecessary();
+		Database::transaction(function() use ($propertyId, $value)
+		{
+			$stmt = new Sql\SelectStatement();
+			$stmt->setColumn('id');
+			$stmt->setTable('property');
+			$stmt->setCriterion(new Sql\EqualsFunctor('prop_id', new Sql\Binding($propertyId)));
+			$row = Database::fetchOne($stmt);
+
+			if ($row)
+			{
+				$stmt = new Sql\UpdateStatement();
+				$stmt->setCriterion(new Sql\EqualsFunctor('prop_id', new Sql\Binding($propertyId)));
+			}
+			else
+			{
+				$stmt = new Sql\InsertStatement();
+				$stmt->setColumn('prop_id', new Sql\Binding($propertyId));
+			}
+			$stmt->setTable('property');
+			$stmt->setColumn('value', new Sql\Binding($value));
+
+			Database::exec($stmt);
+
+			self::$allProperties[$propertyId] = $value;
+		});
+	}
+
+	public static function featureNewPost()
+	{
+		$stmt = (new Sql\SelectStatement)
+			->setColumn('id')
+			->setTable('post')
+			->setCriterion((new Sql\ConjunctionFunctor)
+				->add(new Sql\EqualsFunctor('type', new Sql\Binding(PostType::Image)))
+				->add(new Sql\EqualsFunctor('safety', new Sql\Binding(PostSafety::Safe))))
+			->setOrderBy(new Sql\RandomFunctor(), Sql\SelectStatement::ORDER_DESC);
+		$featuredPostId = Database::fetchOne($stmt)['id'];
+		if (!$featuredPostId)
+			return null;
+
+		self::set(self::FeaturedPostId, $featuredPostId);
+		self::set(self::FeaturedPostDate, time());
+		self::set(self::FeaturedPostUserName, null);
+		return PostModel::findById($featuredPostId);
+	}
+}

src/Models/SearchParsers/AbstractSearchParser.php

@@ -0,0 +1,101 @@
+<?php
+use \Chibi\Sql as Sql;
+
+abstract class AbstractSearchParser
+{
+	protected $statement;
+
+	public function decorate(Sql\SelectStatement $statement, $filterString)
+	{
+		$this->statement = $statement;
+
+		$tokens = preg_split('/\s+/', $filterString);
+		$tokens = array_filter($tokens);
+		$tokens = array_unique($tokens);
+		$this->processSetup($tokens);
+
+		foreach ($tokens as $token)
+		{
+			$neg = false;
+			if ($token{0} == '-')
+			{
+				$token = substr($token, 1);
+				$neg = true;
+			}
+
+			if (strpos($token, ':') !== false)
+			{
+				list ($key, $value) = explode(':', $token, 2);
+				$key = strtolower($key);
+
+				if ($key == 'order')
+				{
+					$this->internalProcessOrderToken($value, $neg);
+				}
+				else
+				{
+					if (!$this->processComplexToken($key, $value, $neg))
+						throw new SimpleException('Invalid search token: ' . $key);
+				}
+			}
+			else
+			{
+				if (!$this->processSimpleToken($token, $neg))
+					throw new SimpleException('Invalid search token: ' . $token);
+			}
+		}
+		$this->processTeardown();
+	}
+
+	protected function processSetup(&$tokens)
+	{
+	}
+
+	protected function processTeardown()
+	{
+	}
+
+	protected function internalProcessOrderToken($orderToken, $neg)
+	{
+		$arr = preg_split('/[;,]/', $orderToken);
+		if (count($arr) == 1)
+			$arr []= 'asc';
+
+		if (count($arr) != 2)
+			throw new SimpleException('Invalid search order token: ' . $orderToken);
+
+		$orderByString = strtolower(array_shift($arr));
+		$orderDirString = strtolower(array_shift($arr));
+		if ($orderDirString == 'asc')
+			$orderDir = Sql\SelectStatement::ORDER_ASC;
+		elseif ($orderDirString == 'desc')
+			$orderDir = Sql\SelectStatement::ORDER_DESC;
+		else
+			throw new SimpleException('Invalid search order direction: ' . $searchOrderDir);
+
+		if ($neg)
+		{
+			$orderDir = $orderDir == Sql\SelectStatement::ORDER_ASC
+				? Sql\SelectStatement::ORDER_DESC
+				: Sql\SelectStatement::ORDER_ASC;
+		}
+
+		if (!$this->processOrderToken($orderByString, $orderDir))
+			throw new SimpleException('Invalid search order type: ' . $orderByString);
+	}
+
+	protected function processComplexToken($key, $value, $neg)
+	{
+		return false;
+	}
+
+	protected function processSimpleToken($value, $neg)
+	{
+		return false;
+	}
+
+	protected function processOrderToken($orderToken, $orderDir)
+	{
+		return false;
+	}
+}

src/Models/SearchParsers/CommentSearchParser.php

@@ -0,0 +1,18 @@
+<?php
+use \Chibi\Sql as Sql;
+
+class CommentSearchParser extends AbstractSearchParser
+{
+	protected function processSetup(&$tokens)
+	{
+		$this->statement->addInnerJoin('post', new Sql\EqualsFunctor('post_id', 'post.id'));
+
+		$allowedSafety = PrivilegesHelper::getAllowedSafety();
+		$this->statement->setCriterion(new Sql\ConjunctionFunctor());
+		$this->statement->getCriterion()->add(Sql\InFunctor::fromArray('post.safety', Sql\Binding::fromArray($allowedSafety)));
+		if (!PrivilegesHelper::confirm(Privilege::ListPosts, 'hidden'))
+			$this->statement->getCriterion()->add(new Sql\NegationFunctor(new Sql\StringExpression('hidden')));
+
+		$this->statement->addOrderBy('comment.id', Sql\SelectStatement::ORDER_DESC);
+	}
+}

src/Models/SearchParsers/PostSearchParser.php

@@ -0,0 +1,284 @@
+<?php
+use \Chibi\Sql as Sql;
+
+class PostSearchParser extends AbstractSearchParser
+{
+	private $tags;
+	private $showHidden = false;
+	private $showDisliked = false;
+
+	protected function processSetup(&$tokens)
+	{
+		$config = \Chibi\Registry::getConfig();
+
+		$this->tags = [];
+		$this->statement->setCriterion(new Sql\ConjunctionFunctor());
+
+		$allowedSafety = PrivilegesHelper::getAllowedSafety();
+		$this->statement->getCriterion()->add(Sql\InFunctor::fromArray('safety', Sql\Binding::fromArray($allowedSafety)));
+
+		if (count($tokens) > $config->browsing->maxSearchTokens)
+			throw new SimpleException('Too many search tokens (maximum: ' . $config->browsing->maxSearchTokens . ')');
+	}
+
+	protected function processTeardown()
+	{
+		if (\Chibi\Registry::getContext()->user->hasEnabledHidingDislikedPosts() and !$this->showDisliked)
+			$this->processComplexToken('special', 'disliked', true);
+
+		if (!PrivilegesHelper::confirm(Privilege::ListPosts, 'hidden') or !$this->showHidden)
+			$this->processComplexToken('special', 'hidden', true);
+
+		foreach ($this->tags as $item)
+		{
+			list ($tagName, $neg) = $item;
+			$tag = TagModel::findByName($tagName);
+			$innerStmt = new Sql\SelectStatement();
+			$innerStmt->setTable('post_tag');
+			$innerStmt->setCriterion((new Sql\ConjunctionFunctor)
+				->add(new Sql\EqualsFunctor('post_tag.post_id', 'post.id'))
+				->add(new Sql\EqualsFunctor('post_tag.tag_id', new Sql\Binding($tag->id))));
+			$operator = new Sql\ExistsFunctor($innerStmt);
+			if ($neg)
+				$operator = new Sql\NegationFunctor($operator);
+			$this->statement->getCriterion()->add($operator);
+		}
+
+		$this->statement->addOrderBy('post.id',
+			empty($this->statement->getOrderBy())
+				? Sql\SelectStatement::ORDER_DESC
+				: $this->statement->getOrderBy()[0][1]);
+	}
+
+	protected function processSimpleToken($value, $neg)
+	{
+		$this->tags []= [$value, $neg];
+		return true;
+	}
+
+	protected function prepareCriterionForComplexToken($key, $value)
+	{
+		if (in_array($key, ['id', 'ids']))
+		{
+			$ids = preg_split('/[;,]/', $value);
+			$ids = array_map('intval', $ids);
+			return Sql\InFunctor::fromArray('post.id', Sql\Binding::fromArray($ids));
+		}
+
+		elseif (in_array($key, ['fav', 'favs']))
+		{
+			$user = UserModel::findByNameOrEmail($value);
+			$innerStmt = (new Sql\SelectStatement)
+				->setTable('favoritee')
+				->setCriterion((new Sql\ConjunctionFunctor)
+					->add(new Sql\EqualsFunctor('favoritee.post_id', 'post.id'))
+					->add(new Sql\EqualsFunctor('favoritee.user_id', new Sql\Binding($user->id))));
+			return new Sql\ExistsFunctor($innerStmt);
+		}
+
+		elseif (in_array($key, ['comment', 'commenter']))
+		{
+			$user = UserModel::findByNameOrEmail($value);
+			$innerStmt = (new Sql\SelectStatement)
+				->setTable('comment')
+				->setCriterion((new Sql\ConjunctionFunctor)
+					->add(new Sql\EqualsFunctor('comment.post_id', 'post.id'))
+					->add(new Sql\EqualsFunctor('comment.commenter_id', new Sql\Binding($user->id))));
+			return new Sql\ExistsFunctor($innerStmt);
+		}
+
+		elseif (in_array($key, ['submit', 'upload', 'uploader', 'uploaded']))
+		{
+			$user = UserModel::findByNameOrEmail($value);
+			return new Sql\EqualsFunctor('uploader_id', new Sql\Binding($user->id));
+		}
+
+		elseif (in_array($key, ['idmin', 'id_min']))
+			return new Sql\EqualsOrGreaterFunctor('post.id', new Sql\Binding(intval($value)));
+
+		elseif (in_array($key, ['idmax', 'id_max']))
+			return new Sql\EqualsOrLesserFunctor('post.id', new Sql\Binding(intval($value)));
+
+		elseif (in_array($key, ['scoremin', 'score_min']))
+			return new Sql\EqualsOrGreaterFunctor('score', new Sql\Binding(intval($value)));
+
+		elseif (in_array($key, ['scoremax', 'score_max']))
+			return new Sql\EqualsOrLesserFunctor('score', new Sql\Binding(intval($value)));
+
+		elseif (in_array($key, ['tagmin', 'tag_min']))
+			return new Sql\EqualsOrGreaterFunctor('tag_count', new Sql\Binding(intval($value)));
+
+		elseif (in_array($key, ['tagmax', 'tag_max']))
+			return new Sql\EqualsOrLesserFunctor('tag_count', new Sql\Binding(intval($value)));
+
+		elseif (in_array($key, ['favmin', 'fav_min']))
+			return new Sql\EqualsOrGreaterFunctor('fav_count', new Sql\Binding(intval($value)));
+
+		elseif (in_array($key, ['favmax', 'fav_max']))
+			return new Sql\EqualsOrLesserFunctor('fav_count', new Sql\Binding(intval($value)));
+
+		elseif (in_array($key, ['commentmin', 'comment_min']))
+			return new Sql\EqualsOrGreaterFunctor('comment_count', new Sql\Binding(intval($value)));
+
+		elseif (in_array($key, ['commentmax', 'comment_max']))
+			return new Sql\EqualsOrLesserFunctor('comment_count', new Sql\Binding(intval($value)));
+
+		elseif (in_array($key, ['date']))
+		{
+			list ($dateMin, $dateMax) = self::parseDate($value);
+			return (new Sql\ConjunctionFunctor)
+				->add(new Sql\EqualsOrLesserFunctor('upload_date', new Sql\Binding($dateMax)))
+				->add(new Sql\EqualsOrGreaterFunctor('upload_date', new Sql\Binding($dateMin)));
+		}
+
+		elseif (in_array($key, ['datemin', 'date_min']))
+		{
+			list ($dateMin, $dateMax) = self::parseDate($value);
+			return new Sql\EqualsOrGreaterFunctor('upload_date', new Sql\Binding($dateMin));
+		}
+
+		elseif (in_array($key, ['datemax', 'date_max']))
+		{
+			list ($dateMin, $dateMax) = self::parseDate($value);
+			return new Sql\EqualsOrLesserFunctor('upload_date', new Sql\Binding($dateMax));
+		}
+
+		elseif ($key == 'special')
+		{
+			$context = \Chibi\Registry::getContext();
+			$value = strtolower($value);
+			if (in_array($value, ['fav', 'favs', 'favd', 'favorite', 'favorites']))
+			{
+				return $this->prepareCriterionForComplexToken('fav', $context->user->name);
+			}
+
+			elseif (in_array($value, ['like', 'liked', 'likes']))
+			{
+				if (!$this->statement->isTableJoined('post_score'))
+				{
+					$this->statement->addLeftOuterJoin('post_score', (new Sql\ConjunctionFunctor)
+						->add(new Sql\EqualsFunctor('post_score.post_id', 'post.id'))
+						->add(new Sql\EqualsFunctor('post_score.user_id', new Sql\Binding($context->user->id))));
+				}
+				return new Sql\EqualsFunctor(new Sql\IfNullFunctor('post_score.score', '0'), '1');
+			}
+
+			elseif (in_array($value, ['dislike', 'disliked', 'dislikes']))
+			{
+				$this->showDisliked = true;
+				if (!$this->statement->isTableJoined('post_score'))
+				{
+					$this->statement->addLeftOuterJoin('post_score', (new Sql\ConjunctionFunctor)
+						->add(new Sql\EqualsFunctor('post_score.post_id', 'post.id'))
+						->add(new Sql\EqualsFunctor('post_score.user_id', new Sql\Binding($context->user->id))));
+				}
+				return new Sql\EqualsFunctor(new Sql\IfNullFunctor('post_score.score', '0'), '-1');
+			}
+
+			elseif ($value == 'hidden')
+			{
+				$this->showHidden = true;
+				return new Sql\StringExpression('hidden');
+			}
+
+			else
+				throw new SimpleException('Invalid special token: ' . $value);
+		}
+
+		elseif ($key == 'type')
+		{
+			$value = strtolower($value);
+			if ($value == 'swf')
+				$type = PostType::Flash;
+			elseif ($value == 'img')
+				$type = PostType::Image;
+			elseif ($value == 'yt' or $value == 'youtube')
+				$type = PostType::Youtube;
+			else
+				throw new SimpleException('Invalid post type: ' . $value);
+
+			return new Sql\EqualsFunctor('type', new Sql\Binding($type));
+		}
+
+		return null;
+	}
+
+	protected function processComplexToken($key, $value, $neg)
+	{
+		$criterion = $this->prepareCriterionForComplexToken($key, $value);
+		if (!$criterion)
+			return false;
+
+		if ($neg)
+			$criterion = new Sql\NegationFunctor($criterion);
+
+		$this->statement->getCriterion()->add($criterion);
+		return true;
+	}
+
+	protected function processOrderToken($orderByString, $orderDir)
+	{
+		$randomReset = true;
+
+		if (in_array($orderByString, ['id']))
+			$orderColumn = 'post.id';
+
+		elseif (in_array($orderByString, ['date']))
+			$orderColumn = 'upload_date';
+
+		elseif (in_array($orderByString, ['comment', 'comments', 'commentcount', 'comment_count']))
+			$orderColumn = 'comment_count';
+
+		elseif (in_array($orderByString, ['fav', 'favs', 'favcount', 'fav_count']))
+			$orderColumn = 'fav_count';
+
+		elseif (in_array($orderByString, ['score']))
+			$orderColumn = 'score';
+
+		elseif (in_array($orderByString, ['tag', 'tags', 'tagcount', 'tag_count']))
+			$orderColumn = 'tag_count';
+
+		elseif (in_array($orderByString, ['commentdate', 'comment_date']))
+			$orderColumn = 'comment_date';
+
+		elseif ($orderByString == 'random')
+		{
+			//seeding works like this: if you visit anything
+			//that triggers order other than random, the seed
+			//is going to reset. however, it stays the same as
+			//long as you keep visiting pages with order:random
+			//specified.
+			$randomReset = false;
+			if (!isset($_SESSION['browsing-seed']))
+				$_SESSION['browsing-seed'] = mt_rand();
+			$seed = $_SESSION['browsing-seed'];
+			$orderColumn = new Sql\SubstrFunctor(
+				new Sql\MultiplicationFunctor('post.id', $seed),
+				new Sql\AdditionFunctor(new Sql\LengthFunctor('post.id'), '2'));
+		}
+
+		else
+			return false;
+
+		if ($randomReset and isset($_SESSION['browsing-seed']))
+			unset($_SESSION['browsing-seed']);
+
+		$this->statement->setOrderBy($orderColumn, $orderDir);
+		return true;
+	}
+
+	protected static function parseDate($value)
+	{
+		list ($year, $month, $day) = explode('-', $value . '-0-0');
+		$yearMin = $yearMax = intval($year);
+		$monthMin = $monthMax = intval($month);
+		$monthMin = $monthMin ?: 1;
+		$monthMax = $monthMax ?: 12;
+		$dayMin = $dayMax = intval($day);
+		$dayMin = $dayMin ?: 1;
+		$dayMax = $dayMax ?: intval(date('t', mktime(0, 0, 0, $monthMax, 1, $year)));
+		$timeMin = mktime(0, 0, 0, $monthMin, $dayMin, $yearMin);
+		$timeMax = mktime(0, 0, -1, $monthMax, $dayMax+1, $yearMax);
+		return [$timeMin, $timeMax];
+	}
+}

src/Models/SearchParsers/TagSearchParser.php

@@ -0,0 +1,39 @@
+<?php
+use \Chibi\Sql as Sql;
+
+class TagSearchParser extends AbstractSearchParser
+{
+	protected function processSetup(&$tokens)
+	{
+		$allowedSafety = PrivilegesHelper::getAllowedSafety();
+		$this->statement
+			->addInnerJoin('post_tag', new Sql\EqualsFunctor('tag.id', 'post_tag.tag_id'))
+			->addInnerJoin('post', new Sql\EqualsFunctor('post.id', 'post_tag.post_id'))
+			->setCriterion((new Sql\ConjunctionFunctor)->add(Sql\InFunctor::fromArray('safety', Sql\Binding::fromArray($allowedSafety))))
+			->setGroupBy('tag.id');
+	}
+
+	protected function processSimpleToken($value, $neg)
+	{
+		if ($neg)
+			return false;
+
+		if (strlen($value) >= 3)
+			$value = '%' . $value;
+		$value .= '%';
+
+		$this->statement->getCriterion()->add(new Sql\NoCaseFunctor(new Sql\LikeFunctor('tag.name', new Sql\Binding($value))));
+		return true;
+	}
+
+	protected function processOrderToken($orderByString, $orderDir)
+	{
+		if ($orderByString == 'popularity')
+			$this->statement->setOrderBy('post_count', $orderDir);
+		elseif ($orderByString == 'alpha')
+			$this->statement->setOrderBy('tag.name', $orderDir);
+		else
+			return false;
+		return true;
+	}
+}

src/Models/SearchParsers/UserSearchParser.php

@@ -0,0 +1,32 @@
+<?php
+use \Chibi\Sql as Sql;
+
+class UserSearchParser extends AbstractSearchParser
+{
+	protected function processSimpleToken($value, $neg)
+	{
+		if ($neg)
+			return false;
+
+		if ($value == 'pending')
+		{
+			$this->statement->setCriterion((new Sql\DisjunctionFunctor)
+				->add(new Sql\IsFunctor('staff_confirmed', new Sql\NullFunctor()))
+				->add(new Sql\EqualsFunctor('staff_confirmed', '0')));
+			return true;
+		}
+		return false;
+	}
+
+	protected function processOrderToken($orderByString, $orderDir)
+	{
+		if ($orderByString == 'alpha')
+			$this->statement->setOrderBy(new Sql\NoCaseFunctor('name'), $orderDir);
+		elseif ($orderByString == 'date')
+			$this->statement->setOrderBy('join_date', $orderDir);
+		else
+			return false;
+
+		return true;
+	}
+}

src/Models/SearchServices/AbstractSearchService.php

@@ -0,0 +1,79 @@
+<?php
+use \Chibi\Sql as Sql;
+use \Chibi\Database as Database;
+
+abstract class AbstractSearchService
+{
+	protected static function getModelClassName()
+	{
+		$searchServiceClassName = get_called_class();
+		$modelClassName = str_replace('SearchService', 'Model', $searchServiceClassName);
+		return $modelClassName;
+	}
+
+	protected static function getParserClassName()
+	{
+		$searchServiceClassName = get_called_class();
+		$parserClassName = str_replace('SearchService', 'SearchParser', $searchServiceClassName);
+		return $parserClassName;
+	}
+
+	protected static function decorateParser(Sql\SelectStatement $stmt, $searchQuery)
+	{
+		$parserClassName = self::getParserClassName();
+		(new $parserClassName)->decorate($stmt, $searchQuery);
+	}
+
+	protected static function decorateCustom(Sql\SelectStatement $stmt)
+	{
+	}
+
+	protected static function decoratePager(Sql\SelectStatement $stmt, $perPage, $page)
+	{
+		if ($perPage === null)
+			return;
+		$stmt->setLimit(
+			new Sql\Binding($perPage),
+			new Sql\Binding(($page - 1) * $perPage));
+	}
+
+	public static function getEntitiesRows($searchQuery, $perPage = null, $page = 1)
+	{
+		$modelClassName = self::getModelClassName();
+		$table = $modelClassName::getTableName();
+
+		$stmt = new Sql\SelectStatement();
+		$stmt->setColumn($table . '.*');
+		$stmt->setTable($table);
+		static::decorateParser($stmt, $searchQuery);
+		static::decorateCustom($stmt);
+		static::decoratePager($stmt, $perPage, $page);
+
+		return Database::fetchAll($stmt);
+	}
+
+	public static function getEntities($searchQuery, $perPage = null, $page = 1)
+	{
+		$modelClassName = self::getModelClassName();
+		$rows = static::getEntitiesRows($searchQuery, $perPage, $page);
+		return $modelClassName::convertRows($rows);
+	}
+
+	public static function getEntityCount($searchQuery)
+	{
+		$modelClassName = self::getModelClassName();
+		$table = $modelClassName::getTableName();
+
+		$innerStmt = new Sql\SelectStatement();
+		$innerStmt->setTable($table);
+		static::decorateParser($innerStmt, $searchQuery);
+		static::decorateCustom($innerStmt);
+		$innerStmt->resetOrderBy();
+
+		$stmt = new Sql\SelectStatement();
+		$stmt->setColumn(new Sql\AliasFunctor(new Sql\CountFunctor('1'), 'count'));
+		$stmt->setSource($innerStmt);
+
+		return Database::fetchOne($stmt)['count'];
+	}
+}

src/Models/SearchServices/CommentSearchService.php

@@ -0,0 +1,4 @@
+<?php
+class CommentSearchService extends AbstractSearchService
+{
+}

src/Models/SearchServices/PostSearchService.php

@@ -0,0 +1,50 @@
+<?php
+use \Chibi\Sql as Sql;
+use \Chibi\Database as Database;
+
+class PostSearchService extends AbstractSearchService
+{
+	public static function getPostIdsAround($searchQuery, $postId)
+	{
+		return Database::transaction(function() use ($searchQuery, $postId)
+		{
+			$stmt = new Sql\RawStatement('CREATE TEMPORARY TABLE IF NOT EXISTS post_search(id INTEGER PRIMARY KEY, post_id INTEGER)');
+			Database::exec($stmt);
+
+			$stmt = new Sql\DeleteStatement();
+			$stmt->setTable('post_search');
+			Database::exec($stmt);
+
+			$innerStmt = new Sql\SelectStatement($searchQuery);
+			$innerStmt->setColumn('post.id');
+			$innerStmt->setTable('post');
+			self::decorateParser($innerStmt, $searchQuery);
+			$stmt = new Sql\InsertStatement();
+			$stmt->setTable('post_search');
+			$stmt->setSource(['post_id'], $innerStmt);
+			Database::exec($stmt);
+
+			$stmt = new Sql\SelectStatement();
+			$stmt->setTable('post_search');
+			$stmt->setColumn('id');
+			$stmt->setCriterion(new Sql\EqualsFunctor('post_id', new Sql\Binding($postId)));
+			$rowId = Database::fetchOne($stmt)['id'];
+
+			//it's possible that given post won't show in search results:
+			//it can be hidden, it can have prohibited safety etc.
+			if (!$rowId)
+				return [null, null];
+
+			$rowId = intval($rowId);
+			$stmt->setColumn('post_id');
+
+			$stmt->setCriterion(new Sql\EqualsFunctor('id', new Sql\Binding($rowId - 1)));
+			$nextPostId = Database::fetchOne($stmt)['post_id'];
+
+			$stmt->setCriterion(new Sql\EqualsFunctor('id', new Sql\Binding($rowId + 1)));
+			$prevPostId = Database::fetchOne($stmt)['post_id'];
+
+			return [$prevPostId, $nextPostId];
+		});
+	}
+}

src/Models/SearchServices/TagSearchService.php

@@ -0,0 +1,23 @@
+<?php
+use \Chibi\Sql as Sql;
+use \Chibi\Database as Database;
+
+class TagSearchService extends AbstractSearchService
+{
+	public static function decorateCustom(Sql\SelectStatement $stmt)
+	{
+		$stmt->addColumn(new Sql\AliasFunctor(new Sql\CountFunctor('post_tag.post_id'), 'post_count'));
+	}
+
+	public static function getMostUsedTag()
+	{
+		$stmt = new Sql\SelectStatement();
+		$stmt->setTable('post_tag');
+		$stmt->addColumn('tag_id');
+		$stmt->addColumn(new Sql\AliasFunctor(new Sql\CountFunctor('post_tag.post_id'), 'post_count'));
+		$stmt->setGroupBy('post_tag.tag_id');
+		$stmt->setOrderBy('post_count', Sql\SelectStatement::ORDER_DESC);
+		$stmt->setLimit(1, 0);
+		return Database::fetchOne($stmt);
+	}
+}

src/Models/SearchServices/UserSearchService.php

@@ -0,0 +1,4 @@
+<?php
+class UserSearchService extends AbstractSearchService
+{
+}

src/Models/TagModel.php

@@ -0,0 +1,189 @@
+<?php
+use \Chibi\Sql as Sql;
+use \Chibi\Database as Database;
+
+class TagModel extends AbstractCrudModel
+{
+	public static function getTableName()
+	{
+		return 'tag';
+	}
+
+	public static function save($tag)
+	{
+		Database::transaction(function() use ($tag)
+		{
+			self::forgeId($tag, 'tag');
+
+			$stmt = new Sql\UpdateStatement();
+			$stmt->setTable('tag');
+			$stmt->setColumn('name', new Sql\Binding($tag->name));
+			$stmt->setCriterion(new Sql\EqualsFunctor('id', new Sql\Binding($tag->id)));
+
+			Database::exec($stmt);
+		});
+		return $tag->id;
+	}
+
+	public static function remove($tag)
+	{
+		$binding = new Sql\Binding($tag->id);
+
+		$stmt = new Sql\DeleteStatement();
+		$stmt->setTable('post_tag');
+		$stmt->setCriterion(new Sql\EqualsFunctor('tag_id', $binding));
+		Database::exec($stmt);
+
+		$stmt = new Sql\DeleteStatement();
+		$stmt->setTable('tag');
+		$stmt->setCriterion(new Sql\EqualsFunctor('id', $binding));
+		Database::exec($stmt);
+	}
+
+	public static function rename($sourceName, $targetName)
+	{
+		Database::transaction(function() use ($sourceName, $targetName)
+		{
+			$sourceTag = TagModel::findByName($sourceName);
+			$targetTag = TagModel::findByName($targetName, false);
+
+			if ($targetTag and $targetTag->id != $sourceTag->id)
+				throw new SimpleException('Target tag already exists');
+
+			$sourceTag->name = $targetName;
+			self::save($sourceTag);
+		});
+	}
+
+	public static function merge($sourceName, $targetName)
+	{
+		Database::transaction(function() use ($sourceName, $targetName)
+		{
+			$sourceTag = TagModel::findByName($sourceName);
+			$targetTag = TagModel::findByName($targetName);
+
+			if ($sourceTag->id == $targetTag->id)
+				throw new SimpleException('Source and target tag are the same');
+
+			$stmt = new Sql\SelectStatement();
+			$stmt->setColumn('post.id');
+			$stmt->setTable('post');
+			$stmt->setCriterion(
+				(new Sql\ConjunctionFunctor)
+				->add(
+					new Sql\ExistsFunctor(
+						(new Sql\SelectStatement)
+							->setTable('post_tag')
+							->setCriterion(
+								(new Sql\ConjunctionFunctor)
+									->add(new Sql\EqualsFunctor('post_tag.post_id', 'post.id'))
+									->add(new Sql\EqualsFunctor('post_tag.tag_id', new Sql\Binding($sourceTag->id))))))
+				->add(
+					new Sql\NegationFunctor(
+					new Sql\ExistsFunctor(
+						(new Sql\SelectStatement)
+							->setTable('post_tag')
+							->setCriterion(
+								(new Sql\ConjunctionFunctor)
+									->add(new Sql\EqualsFunctor('post_tag.post_id', 'post.id'))
+									->add(new Sql\EqualsFunctor('post_tag.tag_id', new Sql\Binding($targetTag->id))))))));
+			$rows = Database::fetchAll($stmt);
+			$postIds = array_map(function($row) { return $row['id']; }, $rows);
+
+			self::remove($sourceTag);
+
+			foreach ($postIds as $postId)
+			{
+				$stmt = new Sql\InsertStatement();
+				$stmt->setTable('post_tag');
+				$stmt->setColumn('post_id', new Sql\Binding($postId));
+				$stmt->setColumn('tag_id', new Sql\Binding($targetTag->id));
+				Database::exec($stmt);
+			}
+		});
+	}
+
+
+	public static function findAllByPostId($key)
+	{
+		$stmt = new Sql\SelectStatement();
+		$stmt->setColumn('tag.*');
+		$stmt->setTable('tag');
+		$stmt->addInnerJoin('post_tag', new Sql\EqualsFunctor('post_tag.tag_id', 'tag.id'));
+		$stmt->setCriterion(new Sql\EqualsFunctor('post_tag.post_id', new Sql\Binding($key)));
+
+		$rows = Database::fetchAll($stmt);
+		if ($rows)
+			return self::convertRows($rows);
+		return [];
+	}
+
+	public static function findByName($key, $throw = true)
+	{
+		$stmt = new Sql\SelectStatement();
+		$stmt->setColumn('tag.*');
+		$stmt->setTable('tag');
+		$stmt->setCriterion(new Sql\NoCaseFunctor(new Sql\EqualsFunctor('name', new Sql\Binding($key))));
+
+		$row = Database::fetchOne($stmt);
+		if ($row)
+			return self::convertRow($row);
+
+		if ($throw)
+			throw new SimpleNotFoundException('Invalid tag name "' . $key . '"');
+		return null;
+	}
+
+
+
+	public static function removeUnused()
+	{
+		$stmt = (new Sql\DeleteStatement)
+			->setTable('tag')
+			->setCriterion(
+				new Sql\NegationFunctor(
+					new Sql\ExistsFunctor(
+						(new Sql\SelectStatement)
+							->setTable('post_tag')
+							->setCriterion(new Sql\EqualsFunctor('post_tag.tag_id', 'tag.id')))));
+		Database::exec($stmt);
+	}
+
+
+
+	public static function validateTag($tag)
+	{
+		$tag = trim($tag);
+
+		$minLength = 1;
+		$maxLength = 64;
+		if (strlen($tag) < $minLength)
+			throw new SimpleException('Tag must have at least ' . $minLength . ' characters');
+		if (strlen($tag) > $maxLength)
+			throw new SimpleException('Tag must have at most ' . $maxLength . ' characters');
+
+		if (!preg_match('/^[()\[\]a-zA-Z0-9_.-]+$/i', $tag))
+			throw new SimpleException('Invalid tag "' . $tag . '"');
+
+		if (preg_match('/^\.\.?$/', $tag))
+			throw new SimpleException('Invalid tag "' . $tag . '"');
+
+		return $tag;
+	}
+
+	public static function validateTags($tags)
+	{
+		$tags = trim($tags);
+		$tags = preg_split('/[,;\s]+/', $tags);
+		$tags = array_filter($tags, function($x) { return $x != ''; });
+		$tags = array_unique($tags);
+
+		foreach ($tags as $key => $tag)
+			$tags[$key] = self::validateTag($tag);
+
+		if (empty($tags))
+			throw new SimpleException('No tags set');
+
+		return $tags;
+	}
+}

src/Models/TokenModel.php

@@ -0,0 +1,79 @@
+<?php
+use \Chibi\Sql as Sql;
+use \Chibi\Database as Database;
+
+class TokenModel extends AbstractCrudModel
+{
+	public static function getTableName()
+	{
+		return 'user_token';
+	}
+
+	public static function save($token)
+	{
+		Database::transaction(function() use ($token)
+		{
+			self::forgeId($token);
+
+			$bindings = [
+				'user_id' => $token->userId,
+				'token' => $token->token,
+				'used' => $token->used,
+				'expires' => $token->expires,
+				];
+
+			$stmt = new Sql\UpdateStatement();
+			$stmt->setTable('user_token');
+			$stmt->setCriterion(new Sql\EqualsFunctor('id', new Sql\Binding($token->id)));
+
+			foreach ($bindings as $key => $val)
+				$stmt->setColumn($key, new Sql\Binding($val));
+
+			Database::exec($stmt);
+
+		});
+	}
+
+	public static function findByToken($key, $throw = true)
+	{
+		if (empty($key))
+			throw new SimpleNotFoundException('Invalid security token');
+
+		$stmt = new Sql\SelectStatement();
+		$stmt->setTable('user_token');
+		$stmt->setColumn('*');
+		$stmt->setCriterion(new Sql\EqualsFunctor('token', new Sql\Binding($key)));
+
+		$row = Database::fetchOne($stmt);
+		if ($row)
+			return self::convertRow($row);
+
+		if ($throw)
+			throw new SimpleNotFoundException('No user with such security token');
+		return null;
+	}
+
+	public static function checkValidity($token)
+	{
+		if (empty($token))
+			throw new SimpleException('Invalid security token');
+
+		if ($token->used)
+			throw new SimpleException('This token was already used');
+
+		if ($token->expires !== null and time() > $token->expires)
+			throw new SimpleException('This token has expired');
+	}
+
+	public static function forgeUnusedToken()
+	{
+		$tokenText = '';
+		while (true)
+		{
+			$tokenText =  md5(mt_rand() . uniqid());
+			$token = self::findByToken($tokenText, false);
+			if (!$token)
+				return $tokenText;
+		}
+	}
+}

src/Models/UserModel.php

@@ -0,0 +1,259 @@
+<?php
+use \Chibi\Sql as Sql;
+use \Chibi\Database as Database;
+
+class UserModel extends AbstractCrudModel
+{
+	const SETTING_SAFETY = 1;
+	const SETTING_ENDLESS_SCROLLING = 2;
+	const SETTING_POST_TAG_TITLES = 3;
+	const SETTING_HIDE_DISLIKED_POSTS = 4;
+
+	public static function getTableName()
+	{
+		return 'user';
+	}
+
+	public static function spawn()
+	{
+		$user = new UserEntity();
+		$user->passSalt = md5(mt_rand() . uniqid());
+		return $user;
+	}
+
+	public static function save($user)
+	{
+		if ($user->accessRank == AccessRank::Anonymous)
+			throw new Exception('Trying to save anonymous user into database');
+		Database::transaction(function() use ($user)
+		{
+			self::forgeId($user);
+
+			$bindings = [
+				'name' => $user->name,
+				'pass_salt' => $user->passSalt,
+				'pass_hash' => $user->passHash,
+				'staff_confirmed' => $user->staffConfirmed,
+				'email_unconfirmed' => $user->emailUnconfirmed,
+				'email_confirmed' => $user->emailConfirmed,
+				'join_date' => $user->joinDate,
+				'last_login_date' => $user->lastLoginDate,
+				'access_rank' => $user->accessRank,
+				'settings' => $user->settings,
+				'banned' => $user->banned
+				];
+
+			$stmt = (new Sql\UpdateStatement)
+				->setTable('user')
+				->setCriterion(new Sql\EqualsFunctor('id', new Sql\Binding($user->id)));
+
+			foreach ($bindings as $key => $val)
+				$stmt->setColumn($key, new Sql\Binding($val));
+
+			Database::exec($stmt);
+		});
+	}
+
+	public static function remove($user)
+	{
+		Database::transaction(function() use ($user)
+		{
+			$binding = new Sql\Binding($user->id);
+
+			$stmt = new Sql\DeleteStatement();
+			$stmt->setTable('post_score');
+			$stmt->setCriterion(new Sql\EqualsFunctor('user_id', $binding));
+			Database::exec($stmt);
+
+			$stmt->setTable('favoritee');
+			Database::exec($stmt);
+
+			$stmt->setTable('user');
+			$stmt->setCriterion(new Sql\EqualsFunctor('id', $binding));
+			Database::exec($stmt);
+
+			$stmt = new Sql\UpdateStatement();
+			$stmt->setTable('comment');
+			$stmt->setCriterion(new Sql\EqualsFunctor('commenter_id', $binding));
+			$stmt->setColumn('commenter_id', new Sql\NullFunctor());
+			Database::exec($stmt);
+
+			$stmt = new Sql\UpdateStatement();
+			$stmt->setTable('post');
+			$stmt->setCriterion(new Sql\EqualsFunctor('uploader_id', $binding));
+			$stmt->setColumn('uploader_id', new Sql\NullFunctor());
+			Database::exec($stmt);
+		});
+	}
+
+
+
+	public static function findByName($key, $throw = true)
+	{
+		$stmt = new Sql\SelectStatement();
+		$stmt->setColumn('*');
+		$stmt->setTable('user');
+		$stmt->setCriterion(new Sql\NoCaseFunctor(new Sql\EqualsFunctor('name', new Sql\Binding(trim($key)))));
+
+		$row = Database::fetchOne($stmt);
+		if ($row)
+			return self::convertRow($row);
+
+		if ($throw)
+			throw new SimpleNotFoundException('Invalid user name "' . $key . '"');
+		return null;
+	}
+
+	public static function findByNameOrEmail($key, $throw = true)
+	{
+		$stmt = new Sql\SelectStatement();
+		$stmt->setColumn('*');
+		$stmt->setTable('user');
+		$stmt->setCriterion((new Sql\DisjunctionFunctor)
+			->add(new Sql\NoCaseFunctor(new Sql\EqualsFunctor('name', new Sql\Binding(trim($key)))))
+			->add(new Sql\NoCaseFunctor(new Sql\EqualsFunctor('email_confirmed', new Sql\Binding(trim($key))))));
+
+		$row = Database::fetchOne($stmt);
+		if ($row)
+			return self::convertRow($row);
+
+		if ($throw)
+			throw new SimpleNotFoundException('Invalid user name "' . $key . '"');
+		return null;
+	}
+
+
+
+	public static function updateUserScore($user, $post, $score)
+	{
+		Database::transaction(function() use ($user, $post, $score)
+		{
+			$stmt = new Sql\DeleteStatement();
+			$stmt->setTable('post_score');
+			$stmt->setCriterion((new Sql\ConjunctionFunctor)
+				->add(new Sql\EqualsFunctor('post_id', new Sql\Binding($post->id)))
+				->add(new Sql\EqualsFunctor('user_id', new Sql\Binding($user->id))));
+			Database::exec($stmt);
+			$score = intval($score);
+			if ($score != 0)
+			{
+				$stmt = new Sql\InsertStatement();
+				$stmt->setTable('post_score');
+				$stmt->setColumn('post_id', new Sql\Binding($post->id));
+				$stmt->setColumn('user_id', new Sql\Binding($user->id));
+				$stmt->setColumn('score', new Sql\Binding($score));
+				Database::exec($stmt);
+			}
+		});
+	}
+
+	public static function addToUserFavorites($user, $post)
+	{
+		Database::transaction(function() use ($user, $post)
+		{
+			self::removeFromUserFavorites($user, $post);
+			$stmt = new Sql\InsertStatement();
+			$stmt->setTable('favoritee');
+			$stmt->setColumn('post_id', new Sql\Binding($post->id));
+			$stmt->setColumn('user_id', new Sql\Binding($user->id));
+			Database::exec($stmt);
+		});
+	}
+
+	public static function removeFromUserFavorites($user, $post)
+	{
+		Database::transaction(function() use ($user, $post)
+		{
+			$stmt = new Sql\DeleteStatement();
+			$stmt->setTable('favoritee');
+			$stmt->setCriterion((new Sql\ConjunctionFunctor)
+				->add(new Sql\EqualsFunctor('post_id', new Sql\Binding($post->id)))
+				->add(new Sql\EqualsFunctor('user_id', new Sql\Binding($user->id))));
+			Database::exec($stmt);
+		});
+	}
+
+
+
+	public static function validateUserName($userName)
+	{
+		$userName = trim($userName);
+
+		$dbUser = self::findByName($userName, false);
+		if ($dbUser !== null)
+		{
+			if (!$dbUser->emailConfirmed and \Chibi\Registry::getConfig()->registration->needEmailForRegistering)
+				throw new SimpleException('User with this name is already registered and awaits e-mail confirmation');
+
+			if (!$dbUser->staffConfirmed and \Chibi\Registry::getConfig()->registration->staffActivation)
+				throw new SimpleException('User with this name is already registered and awaits staff confirmation');
+
+			throw new SimpleException('User with this name is already registered');
+		}
+
+		$userNameMinLength = intval(\Chibi\Registry::getConfig()->registration->userNameMinLength);
+		$userNameMaxLength = intval(\Chibi\Registry::getConfig()->registration->userNameMaxLength);
+		$userNameRegex = \Chibi\Registry::getConfig()->registration->userNameRegex;
+
+		if (strlen($userName) < $userNameMinLength)
+			throw new SimpleException(sprintf('User name must have at least %d characters', $userNameMinLength));
+
+		if (strlen($userName) > $userNameMaxLength)
+			throw new SimpleException(sprintf('User name must have at most %d characters', $userNameMaxLength));
+
+		if (!preg_match($userNameRegex, $userName))
+			throw new SimpleException('User name contains invalid characters');
+
+		return $userName;
+	}
+
+	public static function validatePassword($password)
+	{
+		$passMinLength = intval(\Chibi\Registry::getConfig()->registration->passMinLength);
+		$passRegex = \Chibi\Registry::getConfig()->registration->passRegex;
+
+		if (strlen($password) < $passMinLength)
+			throw new SimpleException(sprintf('Password must have at least %d characters', $passMinLength));
+
+		if (!preg_match($passRegex, $password))
+			throw new SimpleException('Password contains invalid characters');
+
+		return $password;
+	}
+
+	public static function validateEmail($email)
+	{
+		$email = trim($email);
+
+		if (!empty($email) and !TextHelper::isValidEmail($email))
+			throw new SimpleException('E-mail address appears to be invalid');
+
+		return $email;
+	}
+
+	public static function validateAccessRank($accessRank)
+	{
+		$accessRank = intval($accessRank);
+
+		if (!in_array($accessRank, AccessRank::getAll()))
+			throw new SimpleException('Invalid access rank type "' . $accessRank . '"');
+
+		if ($accessRank == AccessRank::Nobody)
+			throw new SimpleException('Cannot set special accesss rank "' . $accessRank . '"');
+
+		return $accessRank;
+	}
+
+
+
+	public static function getAnonymousName()
+	{
+		return '[Anonymous user]';
+	}
+
+	public static function hashPassword($pass, $salt2)
+	{
+		$salt1 = \Chibi\Registry::getConfig()->main->salt;
+		return sha1($salt1 . $salt2 . $pass);
+	}
+}

src/SimpleNotFoundException.php

@@ -0,0 +1,4 @@
+<?php
+class SimpleNotFoundException extends SimpleException
+{
+}

src/Upgrades/mysql/Upgrade1.sql

@@ -0,0 +1,84 @@
+CREATE TABLE property
+(
+	id INTEGER PRIMARY KEY AUTO_INCREMENT,
+	prop_id INTEGER,
+	value TEXT
+);
+
+CREATE TABLE user
+(
+	id INTEGER PRIMARY KEY AUTO_INCREMENT,
+	name TEXT,
+	pass_salt TEXT,
+	pass_hash TEXT,
+	staff_confirmed INTEGER,
+	email_unconfirmed TEXT,
+	email_confirmed TEXT,
+	email_token TEXT,
+	join_date INTEGER,
+	access_rank INTEGER,
+	settings TEXT
+);
+
+CREATE TABLE post
+(
+	id INTEGER PRIMARY KEY AUTO_INCREMENT,
+	type INTEGER,
+	name TEXT,
+	orig_name TEXT,
+	file_hash TEXT,
+	file_size INTEGER,
+	mime_type TEXT,
+	safety INTEGER,
+	hidden INTEGER,
+	upload_date INTEGER,
+	image_width INTEGER,
+	image_height INTEGER,
+	uploader_id INTEGER,
+	source TEXT,
+	FOREIGN KEY(uploader_id) REFERENCES user(id) ON DELETE SET NULL ON UPDATE SET NULL
+);
+CREATE INDEX idx_fk_post_uploader_id ON post(uploader_id);
+
+CREATE TABLE tag
+(
+	id INTEGER PRIMARY KEY AUTO_INCREMENT,
+	name TEXT
+);
+
+CREATE TABLE post_tag
+(
+	id INTEGER PRIMARY KEY AUTO_INCREMENT,
+	tag_id INTEGER,
+	post_id INTEGER,
+	FOREIGN KEY(tag_id) REFERENCES tag(id) ON DELETE CASCADE ON UPDATE SET NULL,
+	FOREIGN KEY(post_id) REFERENCES post(id) ON DELETE CASCADE ON UPDATE SET NULL
+);
+CREATE INDEX idx_fk_post_tag_post_id ON post_tag(post_id);
+CREATE INDEX idx_fk_post_tag_tag_id ON post_tag(tag_id);
+CREATE UNIQUE INDEX idx_uq_post_tag_tag_id_post_id ON post_tag(tag_id, post_id);
+
+CREATE TABLE favoritee
+(
+	id INTEGER PRIMARY KEY AUTO_INCREMENT,
+	post_id INTEGER,
+	user_id INTEGER,
+	FOREIGN KEY(user_id) REFERENCES user(id) ON DELETE CASCADE ON UPDATE SET NULL,
+	FOREIGN KEY(post_id) REFERENCES post(id) ON DELETE CASCADE ON UPDATE SET NULL
+);
+CREATE INDEX idx_fk_favoritee_post_id ON favoritee(post_id);
+CREATE INDEX idx_fk_favoritee_user_id ON favoritee(user_id);
+CREATE UNIQUE INDEX idx_uq_favoritee_post_id_user_id ON favoritee(post_id, user_id);
+
+CREATE TABLE comment
+(
+	id INTEGER PRIMARY KEY AUTO_INCREMENT,
+	post_id INTEGER,
+	commenter_id INTEGER,
+	comment_date INTEGER,
+	text TEXT,
+	FOREIGN KEY(post_id) REFERENCES post(id) ON DELETE CASCADE ON UPDATE SET NULL,
+	FOREIGN KEY(commenter_id) REFERENCES user(id) ON DELETE SET NULL ON UPDATE SET NULL
+);
+CREATE INDEX idx_fk_comment_commenter_id ON comment(commenter_id);
+CREATE INDEX idx_fk_comment_post_id ON comment(post_id);

src/Upgrades/mysql/Upgrade10.sql

@@ -0,0 +1 @@
+ALTER TABLE user ADD COLUMN last_login_date INTEGER DEFAULT NULL;