From 9070b061ee6c3ccd2ee8fa4988e57f63acc0f5fc Mon Sep 17 00:00:00 2001
From: Fredrick Brennan <admin@8chan.co>
Date: Sat, 20 Sep 2014 15:20:00 +0000
Subject: Bug fix: users were banned from /0/ if they had a ban anywhere else

Conflicts:
	inc/bans.php
---
 inc/bans.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'inc')

diff --git a/inc/bans.php b/inc/bans.php
index d5225e95..c5132ef3 100644
--- a/inc/bans.php
+++ b/inc/bans.php
@@ -122,13 +122,13 @@ class Bans {
 		
 		$query = prepare('SELECT ``bans``.*' . ($get_mod_info ? ', `username`' : '') . ' FROM ``bans``
 		' . ($get_mod_info ? 'LEFT JOIN ``mods`` ON ``mods``.`id` = `creator`' : '') . '
-		WHERE
-			(' . ($board ? '(`board` IS NULL OR `board` = :board) AND' : '') . '
-			(`ipstart` = :ip OR (:ip >= `ipstart` AND :ip <= `ipend`)))
+		WHERE ' . ($id ? 'id = :id' : '
+			(' . ($board !== false ? '(`board` IS NULL OR `board` = :board) AND' : '') . '
+			(`ipstart` = :ip OR (:ip >= `ipstart` AND :ip <= `ipend`)))') . '
 		ORDER BY `expires` IS NULL, `expires` DESC');
 		
-		if ($board)
-			$query->bindValue(':board', $board);
+		if ($board !== false)
+			$query->bindValue(':board', $board, PDO::PARAM_STR);
 		
 		$query->bindValue(':ip', inet_pton($ip));
 		$query->execute() or error(db_error($query));
-- 
cgit v1.3


From 23c73ca83943fb720addebe461286bc4ff3679b9 Mon Sep 17 00:00:00 2001
From: Fredrick Brennan <admin@8chan.co>
Date: Sat, 20 Sep 2014 15:21:50 +0000
Subject: Allow the user to decide whether or not he wants to display his
 country

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

(limited to 'inc')

diff --git a/inc/config.php b/inc/config.php
index 3dd8eb6c..e2cc2ebd 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -274,6 +274,7 @@
 		'file_url',
 		'json_response',
 		'user_flag',
+		'no_country'
 	);
 
 	// Enable reCaptcha to make spam even harder. Rarely necessary.
@@ -531,6 +532,9 @@
 	// Attach country flags to posts.
 	$config['country_flags'] = false;
 
+	// Allow the user to decide whether or not he wants to display his country
+	$config['allow_no_country'] = false;
+
 	// Load all country flags from one file
 	$config['country_flags_condensed'] = true;
 	$config['country_flags_condensed_css'] = 'static/flags/flags.css';
diff --git a/js/quick-reply.js b/js/quick-reply.js
index 93cab334..07fe4aef 100644
--- a/js/quick-reply.js
+++ b/js/quick-reply.js
@@ -266,6 +266,8 @@
 							$postForm.find('input[type="file"]').parent()
 								.removeAttr('colspan')
 								.after($('<td class="spoiler"></td>').append(this, ' ', $('<label for="q-spoiler-image">').text(_('Spoiler Image'))));
+						} else if ($(this).attr('name') == 'no_country') {
+							$td.find('label,input[type="checkbox"]').remove();
 						} else {
 							$(tr).remove();
 						}
diff --git a/post.php b/post.php
index 033e5ab5..2763d4d3 100644
--- a/post.php
+++ b/post.php
@@ -487,7 +487,7 @@ if (isset($_POST['delete'])) {
 		$post['body'] .= "\n<tinyboard raw html>1</tinyboard>";
 	}
 	
-	if ($config['country_flags']) {
+	if (($config['country_flags'] && !$config['allow_no_country']) || ($config['country_flags'] && $config['allow_no_country'] && !isset($_POST['no_country']))) {
 		require 'inc/lib/geoip/geoip.inc';
 		$gi=geoip\geoip_open('inc/lib/geoip/GeoIPv6.dat', GEOIP_STANDARD);
 	
diff --git a/templates/post_form.html b/templates/post_form.html
index 3e425245..1846adb5 100644
--- a/templates/post_form.html
+++ b/templates/post_form.html
@@ -15,7 +15,7 @@
 				{{ antibot.html() }}
 			</th>
 			<td>
-				<input type="text" name="name" size="25" maxlength="35" autocomplete="off">
+				<input type="text" name="name" size="25" maxlength="35" autocomplete="off"> {% if config.allow_no_country and config.country_flags %}<input id="no_country" name="no_country" type="checkbox"> <label for="no_country">{% trans %}Don't show my flag{% endtrans %}</label>{% endif %}
 				{{ antibot.html() }}
 			</td>
 		</tr>{% endif %}
-- 
cgit v1.3


From 7288f1dec786844a159af30f0286be5912b13db6 Mon Sep 17 00:00:00 2001
From: Fredrick Brennan <admin@8chan.co>
Date: Sat, 20 Sep 2014 16:49:32 +0000
Subject: Fix last commit

---
 inc/bans.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'inc')

diff --git a/inc/bans.php b/inc/bans.php
index c5132ef3..ed81c6e4 100644
--- a/inc/bans.php
+++ b/inc/bans.php
@@ -122,9 +122,9 @@ class Bans {
 		
 		$query = prepare('SELECT ``bans``.*' . ($get_mod_info ? ', `username`' : '') . ' FROM ``bans``
 		' . ($get_mod_info ? 'LEFT JOIN ``mods`` ON ``mods``.`id` = `creator`' : '') . '
-		WHERE ' . ($id ? 'id = :id' : '
+		WHERE
 			(' . ($board !== false ? '(`board` IS NULL OR `board` = :board) AND' : '') . '
-			(`ipstart` = :ip OR (:ip >= `ipstart` AND :ip <= `ipend`)))') . '
+			(`ipstart` = :ip OR (:ip >= `ipstart` AND :ip <= `ipend`)))
 		ORDER BY `expires` IS NULL, `expires` DESC');
 		
 		if ($board !== false)
-- 
cgit v1.3