From dcf97d6b5b5715388412f18544c2e63f877ba19f Mon Sep 17 00:00:00 2001
From: Michael Foster <savetheinternet@tinyboard.org>
Date: Sun, 18 Aug 2013 18:17:12 +1000
Subject: Add optional modifier: <tinyboard is_file> to tell Tinyboard that
 even though an image might have a thumbnail, it could still be a non-image
 upload

---
 templates/post_reply.html  | 2 +-
 templates/post_thread.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'templates')

diff --git a/templates/post_reply.html b/templates/post_reply.html
index 65fd576c..bc3d36cd 100644
--- a/templates/post_reply.html
+++ b/templates/post_reply.html
@@ -91,7 +91,7 @@
 		)
 		</span>
 </p>
-	<a href="{{ config.uri_img }}{{ post.file }}" target="_blank"{% if post.thumb == 'file' %} class="file"{% endif %}>
+	<a href="{{ config.uri_img }}{{ post.file }}" target="_blank"{% if post.thumb == 'file' or post.modifiers['is_file'] == '1' %} class="file"{% endif %}>
 	<img class="post-image" src="
 		{% if post.thumb == 'file' %}
 			{{ config.root }}
diff --git a/templates/post_thread.html b/templates/post_thread.html
index 23a05e81..d5d6016e 100644
--- a/templates/post_thread.html
+++ b/templates/post_thread.html
@@ -41,7 +41,7 @@
 		{% endif %}
 	)
 	</span></p>
-<a href="{{ config.uri_img }}{{ post.file }}" target="_blank"{% if post.thumb == 'file' %} class="file"{% endif %}>
+<a href="{{ config.uri_img }}{{ post.file }}" target="_blank"{% if post.thumb == 'file' or post.modifiers['is_file'] == '1' %} class="file"{% endif %}>
 <img class="post-image" src="
 	{% if post.thumb == 'file' %}
 		{{ config.root }}
-- 
cgit v1.3


From 844a337e03b59c05b2b99cd2085aaec2c0648960 Mon Sep 17 00:00:00 2001
From: Michael Foster <savetheinternet@tinyboard.org>
Date: Sun, 18 Aug 2013 20:59:46 +1000
Subject: Make `file` and `thumb` 255 chars

---
 install.php         | 26 +++++++++++++++++---------
 templates/posts.sql |  4 ++--
 2 files changed, 19 insertions(+), 11 deletions(-)

(limited to 'templates')

diff --git a/install.php b/install.php
index 6971437a..95200459 100644
--- a/install.php
+++ b/install.php
@@ -1,7 +1,7 @@
 <?php
 
 // Installation/upgrade file	
-define('VERSION', 'v0.9.6-dev-11');
+define('VERSION', 'v0.9.6-dev-12');
 
 require 'inc/functions.php';
 
@@ -23,6 +23,15 @@ if (file_exists($config['has_installed'])) {
 	if (empty($version))
 		$version = 'v0.9.1';
 	
+	function __query($sql) {
+		sql_open();
+		
+		if (mysql_version() >= 50503)
+			return query($sql);
+		else
+			return query(str_replace('utf8mb4', 'utf8', $sql));
+	}
+	
 	$boards = listBoards();
 	
 	switch ($version) {
@@ -249,14 +258,6 @@ if (file_exists($config['has_installed'])) {
 				}
 			}
 		case 'v0.9.6-dev-9':
-			sql_open();
-			function __query($sql) {
-				if (mysql_version() >= 50503)
-					return query($sql);
-				else
-					return query(str_replace('utf8mb4', 'utf8', $sql));
-			}
-			
 			foreach ($boards as &$board) {
 				__query(sprintf("ALTER TABLE `posts_%s`
 					CHANGE `subject` `subject` VARCHAR(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
@@ -356,6 +357,13 @@ if (file_exists($config['has_installed'])) {
 				CHANGE  `boards`  `boards` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL;") or error(db_error());
 			query("ALTER TABLE  `reports`
 				CHANGE  `board`  `board` VARCHAR( 58 ) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL;") or error(db_error());
+		case 'v0.9.6-dev-11':
+			foreach ($boards as &$board) {
+				__query(sprintf("ALTER TABLE  `posts_%s`
+					CHANGE  `thumb`  `thumb` VARCHAR( 255 ) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+					CHANGE  `file`  `file` VARCHAR( 255 ) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL ;",
+					$board['uri'])) or error(db_error());
+			}
 		case false:
 			// Update version number
 			file_write($config['has_installed'], VERSION);
diff --git a/templates/posts.sql b/templates/posts.sql
index ca2ec304..4eef3a0d 100644
--- a/templates/posts.sql
+++ b/templates/posts.sql
@@ -10,10 +10,10 @@ CREATE TABLE IF NOT EXISTS ``posts_{{ board }}`` (
    `body_nomarkup` text,
    `time` int(11) NOT NULL,
    `bump` int(11) DEFAULT NULL,
-   `thumb` varchar(50) DEFAULT NULL,
+   `thumb` varchar(255) DEFAULT NULL,
    `thumbwidth` int(11) DEFAULT NULL,
    `thumbheight` int(11) DEFAULT NULL,
-   `file` varchar(50) DEFAULT NULL,
+   `file` varchar(255) DEFAULT NULL,
    `filewidth` int(11) DEFAULT NULL,
    `fileheight` int(11) DEFAULT NULL,
    `filesize` int(11) DEFAULT NULL,
-- 
cgit v1.3


From 5051e0572a1f0618156cd84c1cb93107e2d584a9 Mon Sep 17 00:00:00 2001
From: Michael Foster <savetheinternet@tinyboard.org>
Date: Mon, 19 Aug 2013 02:03:54 +1000
Subject: Missing theme conf type "checkbox"

---
 inc/mod/pages.php               |  5 ++++-
 templates/mod/theme_config.html | 19 ++++++++++++++-----
 2 files changed, 18 insertions(+), 6 deletions(-)

(limited to 'templates')

diff --git a/inc/mod/pages.php b/inc/mod/pages.php
index fe55b513..887be16b 100644
--- a/inc/mod/pages.php
+++ b/inc/mod/pages.php
@@ -2155,7 +2155,10 @@ function mod_theme_configure($theme_name) {
 			$query = prepare("INSERT INTO ``theme_settings`` VALUES(:theme, :name, :value)");
 			$query->bindValue(':theme', $theme_name);
 			$query->bindValue(':name', $conf['name']);
-			$query->bindValue(':value', $_POST[$conf['name']]);
+			if ($conf['type'] == 'checkbox')
+				$query->bindValue(':value', isset($_POST[$conf['name']]) ? 1 : 0);
+			else
+				$query->bindValue(':value', $_POST[$conf['name']]);
 			$query->execute() or error(db_error($query));
 		}
 		
diff --git a/templates/mod/theme_config.html b/templates/mod/theme_config.html
index 2dbb8397..d85b5df1 100644
--- a/templates/mod/theme_config.html
+++ b/templates/mod/theme_config.html
@@ -7,12 +7,21 @@
 				<tr>
 					<th>{{ conf.title }}</th>
 					<td>
-						<input type="text" name="{{ conf.name }}" 
-						{% if settings[conf.name] %}value="{{ settings[conf.name] }}"{% else %}{% if conf.default %}value="{{ conf.default }}"{% endif %}{% endif %}
-						{% if conf.size %}
-							size="{{ conf.size }}"
+						{% if conf.type == 'checkbox' %}
+							<input type="checkbox" name="{{ conf.name }}"
+							{% if settings[conf.name] or (not settings[conf.name] is defined and conf.default) %}
+								checked
+							{% endif %}>
+						{% else %}
+							<input type="text" name="{{ conf.name }}" 
+							{% if settings[conf.name] %}
+								value="{{ settings[conf.name] }}"
+							{% else %}
+								{% if conf.default %}value="{{ conf.default }}"{% endif %}{% endif %}
+							{% if conf.size %}
+								size="{{ conf.size }}"
+							{% endif %}>
 						{% endif %}
-						/>
 					{% if conf.comment %}
 						 <span class="unimportant">{{ conf.comment }}</span>
 					{% endif %}
-- 
cgit v1.3


From f8837ad60cac5aa7ec1457819986822d14661681 Mon Sep 17 00:00:00 2001
From: ctrlcctrlv <wizardchan@hush.com>
Date: Sun, 18 Aug 2013 16:26:54 +0000
Subject: Add option to update catalog on new posts as well as new threads

---
 templates/themes/catalog/info.php  | 8 ++++++++
 templates/themes/catalog/theme.php | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'templates')

diff --git a/templates/themes/catalog/info.php b/templates/themes/catalog/info.php
index 1b9831ae..c68c9e09 100644
--- a/templates/themes/catalog/info.php
+++ b/templates/themes/catalog/info.php
@@ -38,5 +38,13 @@
 		'comment' => '(eg. "catalog.css")'
 	);
 	
+	$theme['config'][] = Array(
+		'title' => 'Update on new posts',
+		'name' => 'update_on_posts',
+		'type' => 'checkbox',
+		'default' => false,
+		'comment' => 'Without this checked, the catalog only updates on new threads.'
+	);
+
 	// Unique function name for building everything
 	$theme['build_function'] = 'catalog_build';
diff --git a/templates/themes/catalog/theme.php b/templates/themes/catalog/theme.php
index 4e2d40db..96550683 100644
--- a/templates/themes/catalog/theme.php
+++ b/templates/themes/catalog/theme.php
@@ -20,7 +20,7 @@
 				$b = new Catalog();
 				$b->build($settings, $board);
 			}
-		} elseif ($action == 'post-thread' && in_array($board, $boards)) {
+		} elseif ($action == 'post-thread' || ($settings['update_on_posts'] && $action == 'post') && in_array($board, $boards)) {
 			$b = new Catalog();
 			$b->build($settings, $board);
 		}
-- 
cgit v1.3