From f508db9e4c249711c573c56efd0e3abbdb072780 Mon Sep 17 00:00:00 2001
From: 8chan Admin <admin@8chan.co>
Date: Sun, 27 Oct 2013 15:12:21 +0000
Subject: [PATCH] Fix custom stylesheets & fix bug where couldn't post if
 previously banned

---
 inc/bans.php          |  2 +-
 templates/index.html  |  2 +-
 templates/main.js     | 47 ++++++++++++++++++++++---------------------
 templates/thread.html |  2 +-
 4 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/inc/bans.php b/inc/bans.php
index fbf341c6..69861353 100644
--- a/inc/bans.php
+++ b/inc/bans.php
@@ -198,7 +198,7 @@ class Bans {
 			return false;
 		}
 
-		if ($mod['boards'][0] != '*' && !in_array($ban['board'], $mod['boards']))
+		if ($mod && $mod['boards'][0] != '*' && !in_array($ban['board'], $mod['boards']))
 			error($config['error']['noaccess']);		
 			
 		if ($modlog) {
diff --git a/templates/index.html b/templates/index.html
index b6fef53e..25e5f3cd 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -64,7 +64,7 @@
 			{% endraw %}
 			{% for name, uri in config.stylesheets %}{% raw %}'{% endraw %}{{ name|addslashes }}{% raw %}' : '{% endraw %}/stylesheets/{{ uri|addslashes }}{% raw %}',
 			{% endraw %}{% endfor %}{% raw %}
-		};
+		}; onready(init);
 	{% endraw %}</script>
 
 	<script type="text/javascript">{% raw %}
diff --git a/templates/main.js b/templates/main.js
index cb426424..dd942ce0 100644
--- a/templates/main.js
+++ b/templates/main.js
@@ -74,9 +74,27 @@ function changeStyle(styleName, link) {
 
 
 {% endraw %}
+
+function init_stylechooser() {
+	var newElement = document.createElement('div');
+	newElement.className = 'styles';
+	
+	for (styleName in styles) {
+		var style = document.createElement('a');
+		style.innerHTML = '[' + styleName + ']';
+		style.onclick = function() {
+			changeStyle(this.innerHTML.substring(1, this.innerHTML.length - 1), this);
+		};
+		if (styleName == selectedstyle) {
+			style.className = 'selected';
+		}
+		style.href = 'javascript:void(0);';
+		newElement.appendChild(style);
+	}	
+	
+	document.getElementsByTagName('body')[0].insertBefore(newElement, document.getElementsByTagName('body')[0].lastChild.nextSibling);
 {% if config.stylesheets_board %}
 	{# This is such an unacceptable mess. There needs to be an easier way. #}
-	var matches = document.URL.match(/\/(\w+)\/($|{{ config.dir.res|replace({'/': '\\/'}) }}{{ config.file_page|replace({'%d': '\\d+', '.': '\\.'}) }}|{{ config.file_index|replace({'.': '\\.'}) }}|{{ config.file_page|replace({'%d': '\\d+', '.': '\\.'}) }})/);
 	{% raw %}
 	if (matches) {
 		board_name = matches[1];
@@ -86,7 +104,6 @@ function changeStyle(styleName, link) {
 		localStorage.board_stylesheets = '{}';
 	}
 	
-	var stylesheet_choices = JSON.parse(localStorage.board_stylesheets);
 	if (board_name && stylesheet_choices[board_name]) {
 		for (var styleName in styles) {
 			if (styleName == stylesheet_choices[board_name]) {
@@ -109,27 +126,13 @@ function changeStyle(styleName, link) {
 	{% endraw %}
 {% endif %}
 {% raw %}
-
-function init_stylechooser() {
-	var newElement = document.createElement('div');
-	newElement.className = 'styles';
-	
-	for (styleName in styles) {
-		var style = document.createElement('a');
-		style.innerHTML = '[' + styleName + ']';
-		style.onclick = function() {
-			changeStyle(this.innerHTML.substring(1, this.innerHTML.length - 1), this);
-		};
-		if (styleName == selectedstyle) {
-			style.className = 'selected';
-		}
-		style.href = 'javascript:void(0);';
-		newElement.appendChild(style);
-	}	
-	
-	document.getElementsByTagName('body')[0].insertBefore(newElement, document.getElementsByTagName('body')[0].lastChild.nextSibling);
 }
 
+var stylesheet_choices = JSON.parse(localStorage.board_stylesheets); {% endraw %} 
+var matches = document.URL.match(/\/(\w+)\/($|{{ config.dir.res|replace({'/': '\\/'}) }}{{ config.file_page|replace({'%d': '\\d+', '.': '\\.'}) }}|{{ config.file_index|replace({'.': '\\.'}) }}|{{ config.file_page|replace({'%d': '\\d+', '.': '\\.'}) }})/);
+
+{% raw %}
+
 function get_cookie(cookie_name) {
 	var results = document.cookie.match ( '(^|;) ?' + cookie_name + '=([^;]*)(;|$)');
 	if (results)
@@ -286,8 +289,6 @@ function ready() {
 	}
 }
 
-onready(init);
-
 {% endraw %}{% if config.google_analytics %}{% raw %}
 
 var _gaq = _gaq || [];_gaq.push(['_setAccount', '{% endraw %}{{ config.google_analytics }}{% raw %}']);{% endraw %}{% if config.google_analytics_domain %}{% raw %}_gaq.push(['_setDomainName', '{% endraw %}{{ config.google_analytics_domain }}{% raw %}']){% endraw %}{% endif %}{% if not config.google_analytics_domain %}{% raw %}_gaq.push(['_setDomainName', 'none']){% endraw %}{% endif %}{% raw %};_gaq.push(['_trackPageview']);(function() {var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);})();{% endraw %}{% endif %}
diff --git a/templates/thread.html b/templates/thread.html
index 3ed961ff..c93957b6 100644
--- a/templates/thread.html
+++ b/templates/thread.html
@@ -47,7 +47,7 @@
 			{% endraw %}
 			{% for name, uri in config.stylesheets %}{% raw %}'{% endraw %}{{ name|addslashes }}{% raw %}' : '{% endraw %}/stylesheets/{{ uri|addslashes }}{% raw %}',
 			{% endraw %}{% endfor %}{% raw %}
-		};
+		}; onready(init);
 	{% endraw %}</script>
 
 	<script type="text/javascript">{% raw %}