Patch 10

.gitignore

@@ -1,20 +1,49 @@
-# static html
-*.html
-
-# instance-config
-/inc/instance-config.php
-
-# .installed
-/.installed
-
-# script file
-/main.js
-
-# templates cache
-/templates/cache
-
-# other stuff
-.DS_Store
-thumbs.db
-Icon?
-Thumbs.db
+# static html and json
+/*/*.html
+/*/*.json
+/*/res
+/*/src
+/*/thumb
+/*/config.php
+/*.html
+
+# include some files though
+!/templates/*.html
+!/inc/config.php
+
+# minify
+/inc/lib/minify
+
+# instance-config
+/inc/instance-config.php
+
+# .installed
+/.installed
+
+# script file
+/main.js
+
+# templates cache
+/templates/cache
+
+# other stuff
+.DS_Store
+.htaccess
+thumbs.db
+Icon?
+Thumbs.db
+*.patch
+*.diff
+*.rej
+*.orig
+*~
+
+# tmp filesystem
+/tmp/cache/*
+/tmp/locks/*
+!/tmp/cache/.gitkeep
+!/tmp/locks/.gitkeep
+
+#vichan custom
+favicon.ico
+/static/spoiler.png

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "js/wPaint"]
+	path = js/wPaint
+	url = https://github.com/vichan-devel/wPaint.git

LICENSE.Tinyboard.md

@@ -0,0 +1,22 @@
+# License
+Copyright (c) 2010-2014 Tinyboard Development Group (tinyboard.org)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+All copyright notices and permission notices (including this file) shall be
+included and remain unedited in all copies or substantial portions of the
+Software. This explicitly includes but is not limited to the Tinyboard copyright
+notices found in the footers of some template files.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

LICENSE.md

@@ -1,4 +1,32 @@
-# License
+# License of vichan
+Copyright (c) 2012-2015 vichan-devel
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+All copyright notices and permission notices (including this file) shall be
+included and remain unedited in all copies or substantial portions of the
+Software. This explicitly includes but is not limited to the vichan copyright
+notices found in the footers of some template files.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+# License of Tinyboard
+This code is licensed under BOTH a vichan license and a Tinyboard license.
+You must agree to both (not either) licensing terms in order to use this
+software. The original Tinyboard license can be found in a LICENSE.Tinyboard.md
+file, it is included below for your convenience:
+
 Copyright (c) 2010-2014 Tinyboard Development Group (tinyboard.org)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -12,11 +40,23 @@ All copyright notices and permission notices (including this file) shall be
 included and remain unedited in all copies or substantial portions of the
 Software. This explicitly includes but is not limited to the Tinyboard copyright
 notices found in the footers of some template files.
-
+                
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
+
+# Brief
+This section is not a law code, it just describes the license in a
+human-friendly way.
+
+Both licenses are slight modifications of the MIT/X11 license. This is a
+permissive license, you can do anything with code, but you just have to leave
+copyright notices untouched. Beside, we give you absolutely no guarantees.
+
+Tinyboard and vichan licenses also clarify, that the copyright notices found
+in the template footers are also covered by the copyright notice preservation
+clause.

README.md

@@ -1,31 +1,39 @@
-Tinyboard - A lightweight PHP imageboard.
-==========================================
+vichan - A lightweight and full featured PHP imageboard.
+========================================================
 
 About
 ------------
-Tinyboard is a free light-weight, fast, highly configurable and user-friendly
+vichan is a free light-weight, fast, highly configurable and user-friendly
 imageboard software package. It is written in PHP and has few dependencies.
 
+vichan is a fork of (now defunc'd) [Tinyboard](http://github.com/savetheinternet/Tinyboard),
+a great imageboard package, actively building on it and adding a lot of features and other
+improvements.
+
+Support and announcements: https://engine.vichan.net/
+
 Requirements
 ------------
-1.	PHP >= 5.3
-2.	MySQL server
+1.	PHP >= 5.4 (we still try to keep compatibility with php 5.3 as much as possible)
+2.	MySQL/MariaDB server
 3.	[mbstring](http://www.php.net/manual/en/mbstring.installation.php) 
 4.	[PHP GD](http://www.php.net/manual/en/intro.image.php)
 5.	[PHP PDO](http://www.php.net/manual/en/intro.pdo.php)
 
-We try to make sure Tinyboard is compatible with all major web servers and
-operating systems. Tinyboard does not include an Apache ```.htaccess``` file nor does
+We try to make sure vichan is compatible with all major web servers and
+operating systems. vichan does not include an Apache ```.htaccess``` file nor does
 it need one.
 
 ### Recommended
-1.	MySQL server >= 5.5.3
+1.	MySQL/MariaDB server >= 5.5.3
 2.	ImageMagick (command-line ImageMagick or GraphicsMagick preferred).
-3.	[APC (Alternative PHP Cache)](http://php.net/manual/en/book.apc.php), [XCache](http://xcache.lighttpd.net/) or [Memcached](http://www.php.net/manual/en/intro.memcached.php)
+3.	[APC (Alternative PHP Cache)](http://php.net/manual/en/book.apc.php),
+	[XCache](http://xcache.lighttpd.net/) or
+	[Memcached](http://www.php.net/manual/en/intro.memcached.php)
 
 Contributing
 ------------
-You can contribute to Tinyboard by:
+You can contribute to vichan by:
 *	Developing patches/improvements/translations and using GitHub to submit pull requests
 *	Providing feedback and suggestions
 *	Writing/editing documentation
@@ -37,33 +45,94 @@ Installation
 1.	Download and extract Tinyboard to your web directory or get the latest
 	development version with:
 
-        git clone git://github.com/savetheinternet/Tinyboard.git
+        git clone git://github.com/vichan-devel/vichan.git
 
 2.	Navigate to ```install.php``` in your web browser and follow the
 	prompts.
-3.	Tinyboard should now be installed. Log in to ```mod.php``` with the
+3.	vichan should now be installed. Log in to ```mod.php``` with the
 	default username and password combination: **admin / password**.
 
 Please remember to change the administrator account password.
 
 See also: [Configuration Basics](http://tinyboard.org/docs/?p=Config).
 
+Upgrade
+-------
+To upgrade from any version of Tinyboard or vichan:
+
+Either run ```git pull``` to update your files, if you used git, or
+backup your ```inc/instance-config.php```, replace all your files in place
+(don't remove boards etc.), then put ```inc/instance-config.php``` back and
+finally run ```install.php```.
+
+To migrate from a Kusaba X board, use http://github.com/vichan-devel/Tinyboard-Migration
+
 Support
 --------
-Tinyboard is still beta software -- there are bound to be bugs. If you find a
+vichan is still beta software -- there are bound to be bugs. If you find a
 bug, please report it.
 
-If you need assistance with installing, configuring, or using Tinyboard, you may
+If you need assistance with installing, configuring, or using vichan, you may
 find support from a variety of sources:
 
 *	If you're unsure about how to enable or configure certain features, make
 	sure you have read the comments in ```inc/config.php```.
-*	Documentation can be found [here](http://tinyboard.org/docs/).
-*	You can join Tinyboard's IRC channel for support and general queries: 
-	[irc.datnode.net #tinyboard](irc://irc.datnode.net/tinyboard).
-*	You may find help at [tinyboard.org](http://tinyboard.org/#help).
+*	Check out an [official vichan board](http://int.vichan.net/devel/).
+*	You can join vichan's IRC channel for support
+	[irc.6irc.net #vichan-devel](irc://irc.6irc.net/vichan-devel)
+
+### Tinyboard support
+vichan is based on a Tinyboard, so both engines have very much in common. These
+links may be helpful for you as well: 
+
+*	Tinyboard documentation can be found [here](https://web.archive.org/web/20121016074303/http://tinyboard.org/docs/?p=Main_Page).
+
+Donations
+---------
+Do you like our work? You can motivate us financially to do better ;)
+* Bitcoin: 1GjZEdLaTQ8JWVFGZW921Yv4x59f9oiZME
+
+You can also ask us to develop some feature specially for you <3. Join our IRC
+channel and ask for a quote (there are a few of us, who work with the codebase
+and are skilled enough to develop such features pretty quickly).
+
+CLI tools
+-----------------
+There are a few command line interface tools, based on Tinyboard-Tools. These need
+to be launched from a Unix shell account (SSH, or something). They are located in a ```tools/```
+directory.
+
+You actually don't need these tools for your imageboard functioning, they are aimed
+at the power users. You won't be able to run these from shared hosting accounts
+(i.e. all free web servers).
+
+Localisation
+------------
+Wanting to have vichan in your language? You can contribute your translations at this URL:
+
+https://www.transifex.com/projects/p/tinyboard-vichan-devel/
+
+Oekaki
+------
+vichan makes use of [wPaint](https://github.com/websanova/wPaint) for oekaki. After you pull the repository, however, you will need to download wPaint separately using git's `submodule` feature. Use the following commands:
+
+```
+git submodule init
+git submodule update
+```
+
+To enable oekaki, add all the scripts listed in `js/wpaint.js` to your `instance-config.php`.
+
+WebM support
+------------
+Read `inc/lib/webm/README.md` for information about enabling webm.
+
+vichan API
+----------
+vichan provides by default a 4chan-compatible JSON API. For documentation on this, see:
+https://github.com/vichan-devel/vichan-API/ .
 
 License
 --------
-See [LICENSE.md](http://github.com/savetheinternet/Tinyboard/blob/master/LICENSE.md).
+See [LICENSE.md](http://github.com/vichan-devel/vichan/blob/master/LICENSE.md).
 

banned.php

@@ -0,0 +1,8 @@
+<?php
+ require_once 'inc/functions.php';
+ require_once 'inc/bans.php';
+ checkBan();
+ print "<!doctype html><html><head><meta charset='utf-8'><title>"._("Banned?")."</title></head><body>";
+ print "<h1>"._("You are not banned.")."</h1>";
+ print "</body></html>";
+?>