Merge branch 'master' of https://github.com/savetheinternet/Tinyboard

Conflicts:
	inc/config.php
	inc/functions.php
	install.php
	stylesheets/dark_roach.css

1 files changed, 30 insertions, 2 deletions

diff --git a/install.php b/install.php
index 8453d2ae..a029659e 100644
--- a/install.php
+++ b/install.php
@@ -1,7 +1,7 @@
 <?php
 
 // Installation/upgrade file	
-define('VERSION', 'v0.9.6-dev-12 + <a href="https://int.vichan.net/devel/">vichan-devel-4.0.11-gold</a>');
+define('VERSION', 'v0.9.6-dev-14 + <a href="https://int.vichan.net/devel/">vichan-devel-4.0.12</a>');
 
 require 'inc/functions.php';
 
@@ -377,6 +377,12 @@ if (file_exists($config['has_installed'])) {
 			}
 		case 'v0.9.6-dev-12':
 		case 'v0.9.6-dev-12 + <a href="https://int.vichan.net/devel/">vichan-devel-4.0.10</a>':
+		case 'v0.9.6-dev-12 + <a href="https://int.vichan.net/devel/">vichan-devel-4.0.11-gold</a>':
+			foreach ($boards as &$board) {
+				query(sprintf("ALTER TABLE  ``posts_%s`` ADD INDEX `ip` (`ip`)", $board['uri'])) or error(db_error());
+			}
+		case 'v0.9.6-dev-13':
+			query("ALTER TABLE ``antispam`` ADD INDEX `expires` (`expires`)") or error(db_error());
 		case false:
 			// Update version number
 			file_write($config['has_installed'], VERSION);
@@ -527,6 +533,13 @@ if ($step == 0) {
 		),
 		array(
 			'category' => 'Image processing',
+			'name' => '`gm` (command-line GraphicsMagick)',
+			'result' => $can_exec && shell_exec('which gm'),
+			'required' => false,
+			'message' => '(Optional) `gm` was not found or executable; command-line GraphicsMagick (faster than ImageMagick) cannot be enabled.',
+		),
+		array(
+			'category' => 'Image processing',
 			'name' => '`gifsicle` (command-line animted GIF thumbnailing)',
 			'result' => $can_exec && shell_exec('which gifsicle'),
 			'required' => false,
@@ -541,10 +554,25 @@ if ($step == 0) {
 		),
 		array(
 			'category' => 'File permissions',
+			'name' => getcwd() . '/templates/cache',
+			'result' => is_writable('templates') && (!is_dir('templates/cache') || is_writable('templates/cache')),
+			'required' => true,
+			'message' => 'You must give Tinyboard permission to create (and write to) the <code>templates/cache</code> directory or performance will be drastically reduced.'
+		),
+		array(
+			'category' => 'File permissions',
 			'name' => getcwd() . '/inc/instance-config.php',
 			'result' => is_writable('inc/instance-config.php'),
 			'required' => false,
-			'message' => 'Tinyboard does not have permission to make changes to inc/instance-config.php. To complete the installation, you will be asked to manually copy and paste code into the file instead.'
+			'message' => 'Tinyboard does not have permission to make changes to <code>inc/instance-config.php</code>. To complete the installation, you will be asked to manually copy and paste code into the file instead.'
+		),
+		array(
+			'category' => 'Misc',
+			'name' => 'Caching available (APC, XCache, Memcached or Redis)',
+			'result' => extension_loaded('apc') || extension_loaded('xcache')
+				|| extension_loaded('memcached') || extension_loaded('redis'),
+			'required' => false,
+			'message' => 'You will not be able to enable the additional caching system, designed to minimize SQL queries and significantly improve performance. <a href="http://php.net/manual/en/book.apc.php">APC</a> is the recommended method of caching, but <a href="http://xcache.lighttpd.net/">XCache</a>, <a href="http://www.php.net/manual/en/intro.memcached.php">Memcached</a> and <a href="http://pecl.php.net/package/redis">Redis</a> are also supported.'
 		),
 		array(
 			'category' => 'Misc',