From 91e8547b0469e0e046bc15cd9c86f7d7abe86999 Mon Sep 17 00:00:00 2001
From: Macil Tech <maciltech@gmail.com>
Date: Wed, 14 Nov 2012 13:33:27 -0700
Subject: Add image_reject_repost_in_thread option

---
 inc/config.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'inc/config.php')

diff --git a/inc/config.php b/inc/config.php
index f4951a40..e977f066 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -445,8 +445,10 @@
 	// Maximum image dimensions
 	$config['max_width'] = 10000;
 	$config['max_height'] = $config['max_width']; // 1:1
-	// Reject dupliate image uploads
+	// Reject duplicate image uploads
 	$config['image_reject_repost'] = true;
+	// Reject duplicate image uploads within the same thread. Doesn't change anything if image_reject_repost is true.
+	$config['image_reject_repost_in_thread'] = false;
 	
 	// Display the aspect ratio in a post's file info
 	$config['show_ratio'] = false;
@@ -667,6 +669,7 @@
 	$config['error']['maxsize']		= _('The file was too big.');
 	$config['error']['invalidzip']		= _('Invalid archive!');
 	$config['error']['fileexists']		= _('That file <a href="%s">already exists</a>!');
+	$config['error']['fileexistsinthread']	= _('That file <a href="%s">already exists</a> in this thread!');
 	$config['error']['delete_too_soon']	= _('You\'ll have to wait another %s before deleting that.');
 	$config['error']['mime_exploit']	= _('MIME type detection XSS exploit (IE) detected; post discarded.');
 	$config['error']['invalid_embed']	= _('Couldn\'t make sense of the URL of the video you tried to embed.');
-- 
cgit v1.3


From 0da1c18a7ff2328a3cdd422e3f67d4b4bf403fb5 Mon Sep 17 00:00:00 2001
From: Macil Tech <maciltech@gmail.com>
Date: Thu, 30 Aug 2012 04:07:23 -0600
Subject: Add field_disable_subject and field_disable_reply_subject config
 options.

---
 inc/config.php           | 4 ++++
 post.php                 | 8 +++++++-
 templates/post_form.html | 8 +++++++-
 3 files changed, 18 insertions(+), 2 deletions(-)

(limited to 'inc/config.php')

diff --git a/inc/config.php b/inc/config.php
index e977f066..ea936032 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -348,6 +348,10 @@
 	$config['field_disable_name'] = false;
 	// When true, no email will be able to be set.
 	$config['field_disable_email'] = false;
+	// When true, no subject will be able to be set.
+	$config['field_disable_subject'] = false;
+	// When true, no subject will be able to be set in replies.
+	$config['field_disable_reply_subject'] = false;
 	// When true, a blank password will be used for files (not usable for deletion).
 	$config['field_disable_password'] = false;
 	
diff --git a/post.php b/post.php
index 98da7486..54065832 100644
--- a/post.php
+++ b/post.php
@@ -139,7 +139,7 @@ if (isset($_POST['delete'])) {
 	header('Location: ' . $root . $board['dir'] . $config['file_index'], true, $config['redirect_http']);
 } elseif (isset($_POST['post'])) {
 	
-	if (!isset($_POST['subject'], $_POST['body'], $_POST['board']))
+	if (!isset($_POST['body'], $_POST['board']))
 		error($config['error']['bot']);
 	
 	if (!isset($_POST['name']))
@@ -148,6 +148,9 @@ if (isset($_POST['delete'])) {
 	if (!isset($_POST['email']))
 		$_POST['email'] = '';
 	
+	if (!isset($_POST['subject']))
+		$_POST['subject'] = '';
+	
 	if (!isset($_POST['password']))
 		$_POST['password'] = '';
 	
@@ -271,6 +274,9 @@ if (isset($_POST['delete'])) {
 	
 		if ($config['field_disable_password'])
 			$_POST['password'] = '';
+	
+		if ($config['field_disable_subject'] || (!$post['op'] && $config['field_disable_reply_subject']))
+			$_POST['subject'] = '';
 	}
 	
 	// Check for a file
diff --git a/templates/post_form.html b/templates/post_form.html
index 8b7350c7..aa051f5f 100644
--- a/templates/post_form.html
+++ b/templates/post_form.html
@@ -27,12 +27,18 @@
 			</td>
 		</tr>{% endif %}
 		<tr>
-			<th>
+			{% if not (config.field_disable_subject or (id and config.field_disable_reply_subject)) or (mod and post.mod|hasPermission(config.mod.bypass_field_disable, board.uri)) %}<th>
 				{% trans %}Subject{% endtrans %}
 				{{ antibot.html() }}
 			</th>
 			<td>
 				<input style="float:left;" type="text" name="subject" size="25" maxlength="100" autocomplete="off">
+			{% else %}<th>
+				{% trans %}Submit{% endtrans %}
+				{{ antibot.html() }}
+			</th>
+			<td>
+			{% endif %}
 				<input accesskey="s" style="margin-left:2px;" type="submit" name="post" value="{% if id %}{{ config.button_reply }}{% else %}{{ config.button_newtopic }}{% endif %}" />{% if config.spoiler_images %} <input id="spoiler" name="spoiler" type="checkbox"> <label for="spoiler">{% trans %}Spoiler Image{% endtrans %}</label>{% endif %}
 			</td>
 		</tr>
-- 
cgit v1.3