Initial attempt a switch to composer and PHP-8.1 compatibility

31 files changed, 82 insertions, 81 deletions

diff --git a/templates/generic_page.html b/templates/generic_page.html
index e8362098..0cf18fd9 100644
--- a/templates/generic_page.html
+++ b/templates/generic_page.html
@@ -49,8 +49,8 @@
 		{% for footer in config.footer %}<p class="unimportant" style="text-align:center;">{{ footer }}</p>{% endfor %}
 	</footer>
 	</div>
-	<script type="text/javascript">{% raw %}
+	<script type="text/javascript">{% verbatim %}
 		ready();
-	{% endraw %}</script>
+	{% endverbatim %}</script>
 </body>
 </html>
diff --git a/templates/header.html b/templates/header.html
index 6c1e6346..b038ed4b 100644
--- a/templates/header.html
+++ b/templates/header.html
@@ -22,7 +22,7 @@
 		{% endif %}
 		{% if config.recaptcha %}
 		<script src="//www.google.com/recaptcha/api.js"></script>
-		<style type="text/css">{% raw %}
+		<style type="text/css">
 			#recaptcha_area {
 				float: none !important;
 				padding: 0 !important;
@@ -50,4 +50,4 @@
 			.recaptchatable, #recaptcha_area tr, #recaptcha_area td, #recaptcha_area th {
 				padding: 0 !important;
 			}
-		{% endraw %}</style>{% endif %}
+		</style>{% endif %}
diff --git a/templates/index.html b/templates/index.html
index 6dc4803b..b6ca72e6 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -112,9 +112,10 @@
 
 
 	</div>
-	<script type="text/javascript">{% raw %}
+	<script type="text/javascript"> {% verbatim %}
 		ready();
-	{% endraw %}</script>
+		{% endverbatim %}
+	</script>
 	
 </body>
 </html>
diff --git a/templates/main.js b/templates/main.js
index af665987..b4511d8b 100755
--- a/templates/main.js
+++ b/templates/main.js
@@ -1,4 +1,4 @@
-{% raw %}
+{% verbatim %}
 
 /* gettext-compatible _ function, example of usage:
  *
@@ -109,16 +109,16 @@ function alert(a, do_confirm, confirm_ok_action, confirm_cancel_action) {
 var saved = {};
 
 
-var selectedstyle = '{% endraw %}{{ config.default_stylesheet.0|addslashes }}{% raw %}';
+var selectedstyle = '{% endverbatim %}{{ config.default_stylesheet.0|addslashes }}{% verbatim %}';
 var styles = {
-	{% endraw %}
-	{% for stylesheet in stylesheets %}{% raw %}'{% endraw %}{{ stylesheet.name|addslashes }}{% raw %}' : '{% endraw %}{{ stylesheet.uri|addslashes }}{% raw %}',
-	{% endraw %}{% endfor %}{% raw %}
+	{% endverbatim %}
+	{% for stylesheet in stylesheets %}{% verbatim %}'{% endverbatim %}{{ stylesheet.name|addslashes }}{% verbatim %}' : '{% endverbatim %}{{ stylesheet.uri|addslashes }}{% verbatim %}',
+	{% endverbatim %}{% endfor %}{% verbatim %}
 };
 var codestyles = {
-	{% endraw %}
-	{% for stylesheet in code_stylesheets %}{% raw %}'{% endraw %}{{ stylesheet.name|addslashes }}{% raw %}' : '{% endraw %}{{ stylesheet.uri|addslashes }}{% raw %}',
-	{% endraw %}{% endfor %}{% raw %}
+	{% endverbatim %}
+	{% for stylesheet in code_stylesheets %}{% verbatim %}'{% endverbatim %}{{ stylesheet.name|addslashes }}{% verbatim %}' : '{% endverbatim %}{{ stylesheet.uri|addslashes }}{% verbatim %}',
+	{% endverbatim %}{% endfor %}{% verbatim %}
 };
 
 if (typeof board_name === 'undefined') {
@@ -126,16 +126,16 @@ if (typeof board_name === 'undefined') {
 }
 
 function changeStyle(styleName, link) {
-	{% endraw %}
-	{% if config.stylesheets_board %}{% raw %}
+	{% endverbatim %}
+	{% if config.stylesheets_board %}{% verbatim %}
 		if (board_name) {
 			stylesheet_choices[board_name] = styleName;
 			localStorage.board_stylesheets = JSON.stringify(stylesheet_choices);
 		}
-	{% endraw %}{% else %}
+	{% endverbatim %}{% else %}
 		localStorage.stylesheet = styleName;
 	{% endif %}
-	{% raw %}
+	{% verbatim %}
 	
 	// Main stylesheet
 	if (!document.getElementById('stylesheet')) {
@@ -178,9 +178,9 @@ function changeStyle(styleName, link) {
 }
 
 
-{% endraw %}
+{% endverbatim %}
 {% if config.stylesheets_board %}
-	{% raw %}
+	{% verbatim %}
 	
 	if (!localStorage.board_stylesheets) {
 		localStorage.board_stylesheets = '{}';
@@ -195,9 +195,9 @@ function changeStyle(styleName, link) {
 			}
 		}
 	}
-	{% endraw%}
+	{% endverbatim%}
 {% else %}
-	{% raw %}
+	{% verbatim %}
 	if (localStorage.stylesheet) {
 		for (var styleName in styles) {
 			if (styleName == localStorage.stylesheet) {
@@ -206,9 +206,9 @@ function changeStyle(styleName, link) {
 			}
 		}
 	}
-	{% endraw %}
+	{% endverbatim %}
 {% endif %}
-{% raw %}
+{% verbatim %}
 
 function init_stylechooser() {
 	var newElement = document.createElement('div');
@@ -261,7 +261,7 @@ function highlightReply(id) {
 
 function generatePassword() {
 	var pass = '';
-	var chars = '{% endraw %}{{ config.genpassword_chars }}{% raw %}';
+	var chars = '{% endverbatim %}{{ config.genpassword_chars }}{% verbatim %}';
 	for (var i = 0; i < 8; i++) {
 		var rnd = Math.floor(Math.random() * chars.length);
 		pass += chars.substring(rnd, rnd + 1);
@@ -341,15 +341,15 @@ function rememberStuff() {
 		
 		if (sessionStorage.body) {
 			var saved = JSON.parse(sessionStorage.body);
-			if (get_cookie('{% endraw %}{{ config.cookies.js }}{% raw %}')) {
+			if (get_cookie('{% endverbatim %}{{ config.cookies.js }}{% verbatim %}')) {
 				// Remove successful posts
-				var successful = JSON.parse(get_cookie('{% endraw %}{{ config.cookies.js }}{% raw %}'));
+				var successful = JSON.parse(get_cookie('{% endverbatim %}{{ config.cookies.js }}{% verbatim %}'));
 				for (var url in successful) {
 					saved[url] = null;
 				}
 				sessionStorage.body = JSON.stringify(saved);
 				
-				document.cookie = '{% endraw %}{{ config.cookies.js }}{% raw %}={};expires=0;path=/;';
+				document.cookie = '{% endverbatim %}{{ config.cookies.js }}{% verbatim %}={};expires=0;path=/;';
 			}
 			if (saved[document.location]) {
 				document.forms.post.body.value = saved[document.location];
@@ -377,13 +377,13 @@ var script_settings = function(script_name) {
 function init() {
 	init_stylechooser();
 
-	{% endraw %}	
+	{% endverbatim %}	
 	{% if config.allow_delete %}
 	if (document.forms.postcontrols) {
 		document.forms.postcontrols.password.value = localStorage.password;
 	}
 	{% endif %}
-	{% raw %}
+	{% verbatim %}
 	
 	if (window.location.hash.indexOf('q') != 1 && window.location.hash.substring(1))
 		highlightReply(window.location.hash.substring(1));
@@ -404,16 +404,16 @@ function ready() {
 	}
 }
 
-{% endraw %}
+{% endverbatim %}
 
 var post_date = "{{ config.post_date }}";
 var max_images = {{ config.max_images }};
 
 onready(init);
 
-{% if config.google_analytics %}{% raw %}
+{% if config.google_analytics %}{% verbatim %}
 
-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://' : 'http://') + 'stats.g.doubleclick.net/dc.js';var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);})();{% endraw %}{% endif %}
+var _gaq = _gaq || [];_gaq.push(['_setAccount', '{% endverbatim %}{{ config.google_analytics }}{% verbatim %}']);{% endverbatim %}{% if config.google_analytics_domain %}{% verbatim %}_gaq.push(['_setDomainName', '{% endverbatim %}{{ config.google_analytics_domain }}{% verbatim %}']){% endverbatim %}{% endif %}{% if not config.google_analytics_domain %}{% verbatim %}_gaq.push(['_setDomainName', 'none']){% endverbatim %}{% endif %}{% verbatim %};_gaq.push(['_trackPageview']);(function() {var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;ga.src = ('https:' == document.location.protocol ? 'https://' : 'http://') + 'stats.g.doubleclick.net/dc.js';var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);})();{% endverbatim %}{% endif %}
 
 {% if config.statcounter_project and config.statcounter_security %}
 var sc = document.createElement('script');
diff --git a/templates/mod/config-editor-php.html b/templates/mod/config-editor-php.html
index 8610316b..e265df79 100644
--- a/templates/mod/config-editor-php.html
+++ b/templates/mod/config-editor-php.html
@@ -2,7 +2,7 @@
 	<p>
 		Any changes you make here will simply be appended to <code>{{ file }}</code>. If you wish to make the most of Tinyboard's customizability, you can instead edit the file directly. This page is intended for making quick changes and for those who don't have a basic understanding of PHP code.
 	</p>
-	{% if boards|count %}
+	{% if boards|length %}
 		<ul>
 			{% if board %}
 				<li><a href="?/config">Edit site-wide config</a></li>
diff --git a/templates/mod/config-editor.html b/templates/mod/config-editor.html
index 411d55e6..1c3436cd 100644
--- a/templates/mod/config-editor.html
+++ b/templates/mod/config-editor.html
@@ -1,7 +1,7 @@
 <p>
 	Any changes you make here will simply be appended to <code>{{ file }}</code>. If you wish to make the most of Tinyboard's customizability, you can instead edit the file directly. This page is intended for making quick changes and for those who don't have a basic understanding of PHP code.
 </p>
-{% if boards|count %}
+{% if boards|length %}
 	<ul>
 		{% if board %}
 			<li><a href="?/config">Edit site-wide config</a></li>
@@ -23,7 +23,7 @@
 			<th>{% trans 'Description' %}</th>
 		</tr>
 		{% for var in conf if var.type != 'array' %}
-			{% if var.name|count == 1 %}
+			{% if var.name|length == 1 %}
 				{% set name = 'cf_' ~ var.name %}
 			{% else %}
 				{% set name = 'cf_' ~ var.name|join('/') %}
@@ -31,7 +31,7 @@
 			
 			<tr>
 				<th class="minimal">
-					{% if var.name|count == 1 %}
+					{% if var.name|length == 1 %}
 						{{ var.name }}
 					{% else %}
 						{{ var.name|join(' &rarr; ') }}
diff --git a/templates/mod/inbox.html b/templates/mod/inbox.html
index 97afe446..db0641e4 100644
--- a/templates/mod/inbox.html
+++ b/templates/mod/inbox.html
@@ -1,4 +1,4 @@
-{% if messages|count == 0 %}
+{% if messages|length == 0 %}
 	<p style="text-align:center" class="unimportant">({% trans 'No private messages for you.' %})</p>
 {% else %}
 	<table class="modlog">
diff --git a/templates/mod/log.html b/templates/mod/log.html
index a38b4af5..bb1be89e 100644
--- a/templates/mod/log.html
+++ b/templates/mod/log.html
@@ -49,7 +49,7 @@
 	{% endfor %}
 </table>
 
-{% if count > logs|count %}
+{% if count > logs|length %}
 	<p class="unimportant" style="text-align:center;word-wrap:break-word">
 		{% for i in range(0, (count - 1) / config.mod.modlog_page) %}
 			{% if public %}
diff --git a/templates/mod/merge.html b/templates/mod/merge.html
index 5f931d10..b1f4f928 100644
--- a/templates/mod/merge.html
+++ b/templates/mod/merge.html
@@ -15,7 +15,7 @@
 				<ul style="list-style:none;padding:0">
 					{% for targetboard in boards %}
 						<li>
-							<input type="radio" name="board" value="{{ targetboard.uri }}" id="ban-board-{{ targetboard.uri }}" {% if boards|count == 2 %}checked{% endif %}> 
+							<input type="radio" name="board" value="{{ targetboard.uri }}" id="ban-board-{{ targetboard.uri }}" {% if boards|length == 2 %}checked{% endif %}> 
 							<label style="display:inline" for="ban-board-{{ targetboard.uri }}">
 								{{ config.board_abbreviation|sprintf(targetboard.uri) }} - {{ targetboard.title|e }}
 							</label>
diff --git a/templates/mod/move.html b/templates/mod/move.html
index 59bd60f6..3fcd8c89 100644
--- a/templates/mod/move.html
+++ b/templates/mod/move.html
@@ -24,7 +24,7 @@
 				<ul style="list-style:none;padding:0">
 					{% for targetboard in boards if targetboard.uri != board %}
 						<li>
-							<input type="radio" name="board" value="{{ targetboard.uri }}" id="ban-board-{{ targetboard.uri }}" {% if boards|count == 2 %}checked{% endif %}> 
+							<input type="radio" name="board" value="{{ targetboard.uri }}" id="ban-board-{{ targetboard.uri }}" {% if boards|length == 2 %}checked{% endif %}> 
 							<label style="display:inline" for="ban-board-{{ targetboard.uri }}">
 								{{ config.board_abbreviation|sprintf(targetboard.uri) }} - {{ targetboard.title|e }}
 							</label>
diff --git a/templates/mod/move_reply.html b/templates/mod/move_reply.html
index bf7c2f75..4f878234 100644
--- a/templates/mod/move_reply.html
+++ b/templates/mod/move_reply.html
@@ -15,7 +15,7 @@
 				<ul style="list-style:none;padding:0">
 					{% for targetboard in boards %}
 						<li>
-							<input type="radio" name="board" value="{{ targetboard.uri }}" id="ban-board-{{ targetboard.uri }}" {% if boards|count == 2 %}checked{% endif %}> 
+							<input type="radio" name="board" value="{{ targetboard.uri }}" id="ban-board-{{ targetboard.uri }}" {% if boards|length == 2 %}checked{% endif %}> 
 							<label style="display:inline" for="ban-board-{{ targetboard.uri }}">
 								{{ config.board_abbreviation|sprintf(targetboard.uri) }} - {{ targetboard.title|e }}
 							</label>
diff --git a/templates/mod/news.html b/templates/mod/news.html
index 57058291..07b2bb86 100644
--- a/templates/mod/news.html
+++ b/templates/mod/news.html
@@ -62,7 +62,7 @@
 	</div>
 {% endfor %}
 
-{% if count > news|count %}
+{% if count > news|length %}
 	<p class="unimportant" style="text-align:center;word-wrap:break-word">
 		{% for i in range(0, (count - 1) / config.mod.news_page) %}
 			<a href="?/news/{{ i + 1 }}">[{{ i + 1 }}]</a> 
diff --git a/templates/mod/noticeboard.html b/templates/mod/noticeboard.html
index fc2e0aef..1036b129 100644
--- a/templates/mod/noticeboard.html
+++ b/templates/mod/noticeboard.html
@@ -57,7 +57,7 @@
 	</div>
 {% endfor %}
 
-{% if count > noticeboard|count %}
+{% if count > noticeboard|length %}
 	<p class="unimportant" style="text-align:center;word-wrap:break-word">
 		{% for i in range(0, (count - 1) / config.mod.noticeboard_page) %}
 			<a href="?/noticeboard/{{ i + 1 }}">[{{ i + 1 }}]</a> 
diff --git a/templates/mod/recent_posts.html b/templates/mod/recent_posts.html
index 349dcea9..c226eebd 100644
--- a/templates/mod/recent_posts.html
+++ b/templates/mod/recent_posts.html
@@ -1,5 +1,5 @@
 <script src="{{ config.additional_javascript_url }}js/mod/recent-posts.js"></script>
-{% if not posts|count %}
+{% if not posts|length %}
 	<p style="text-align:center" class="unimportant">({% trans 'There are no active posts.' %})</p>
 {% else %}
 	<h4>Viewing last {{ limit|e }} posts</h4>
diff --git a/templates/mod/search_results.html b/templates/mod/search_results.html
index abaad703..989b3989 100644
--- a/templates/mod/search_results.html
+++ b/templates/mod/search_results.html
@@ -259,7 +259,7 @@
 	</table>
 {% endif %}
 
-{% if result_count > results|count %}
+{% if result_count > results|length %}
 	<p class="unimportant" style="text-align:center;word-wrap:break-word">
 		{% for i in range(0, (result_count - 1) / config.mod.search_page) %}
 			<a href="?/search/{{ search_type }}/{{ search_query_escaped }}/{{ i + 1 }}">[{{ i + 1 }}]</a> 
diff --git a/templates/mod/themes.html b/templates/mod/themes.html
index b230bc48..36fbec64 100644
--- a/templates/mod/themes.html
+++ b/templates/mod/themes.html
@@ -1,4 +1,4 @@
-{% if themes|count == 0 %}
+{% if themes|length == 0 %}
 	<p style="text-align:center" class="unimportant">({% trans 'There are no themes available.' %})</p>
 {% else %}
 	<table class="modlog">
diff --git a/templates/mod/user.html b/templates/mod/user.html
index 08598fe5..f30f04fe 100644
--- a/templates/mod/user.html
+++ b/templates/mod/user.html
@@ -87,7 +87,7 @@
 	</ul>
 </form>
 
-{% if logs|count > 0  %}
+{% if logs|length > 0  %}
 	<table class="modlog" style="width:600px">
 		<tr>
 			<th>{% trans 'IP address' %}</th>			
diff --git a/templates/mod/view_ip.html b/templates/mod/view_ip.html
index 4bacc7f6..e2dbf14c 100644
--- a/templates/mod/view_ip.html
+++ b/templates/mod/view_ip.html
@@ -14,11 +14,11 @@
 {% if mod|hasPermission(config.mod.view_notes) %}
 	<fieldset id="notes">
 		<legend>
-			{% set notes_on_record = 'note' ~ (notes|count != 1 ? 's' : '') ~ ' on record' %}
-			<legend>{{ notes|count }} {% trans notes_on_record %}</legend>
+			{% set notes_on_record = 'note' ~ (notes|length != 1 ? 's' : '') ~ ' on record' %}
+			<legend>{{ notes|length }} {% trans notes_on_record %}</legend>
 		</legend>
 		
-		{% if notes|count > 0 %}
+		{% if notes|length > 0 %}
 			<table class="modlog">
 				<tr>
 					<th>{% trans 'Staff' %}</th>
@@ -81,10 +81,10 @@
 	</fieldset>
 {% endif %}
 
-{% if bans|count > 0 and mod|hasPermission(config.mod.view_ban) %}
+{% if bans|length > 0 and mod|hasPermission(config.mod.view_ban) %}
 	<fieldset id="bans">
-		{% set bans_on_record = 'ban' ~ (bans|count != 1 ? 's' : '') ~ ' on record' %}
-		<legend>{{ bans|count }} {% trans bans_on_record %}</legend>
+		{% set bans_on_record = 'ban' ~ (bans|length != 1 ? 's' : '') ~ ' on record' %}
+		<legend>{{ bans|length }} {% trans bans_on_record %}</legend>
 		
 		{% for ban in bans %}
 			<form action="" method="post" style="text-align:center">
@@ -174,7 +174,7 @@
 	</fieldset>
 {% endif %}
 
-{% if logs|count > 0  %}
+{% if logs|length > 0  %}
 	<fieldset id="history">
 		<legend>History</legend>
 		<table class="modlog" style="width:100%">
diff --git a/templates/page.html b/templates/page.html
index 82afd3e5..51bf0544 100644
--- a/templates/page.html
+++ b/templates/page.html
@@ -35,8 +35,8 @@
 
 	</footer>
 	<div class="pages"></div>
-	<script type="text/javascript">{% raw %}
+	<script type="text/javascript">{% verbatim %}
 		ready();
-	{% endraw %}</script>
+	{% endverbatim %}</script>
 </body>
 </html>
diff --git a/templates/post_form.html b/templates/post_form.html
index f9291f49..3066ee76 100644
--- a/templates/post_form.html
+++ b/templates/post_form.html
@@ -190,6 +190,6 @@
 <input type="hidden" name="hash" value="{{ antibot.hash() }}">
 </form>
 
-<script type="text/javascript">{% raw %}
+<script type="text/javascript">{% verbatim %}
 	rememberStuff();
-{% endraw %}</script>
+{% endverbatim %}</script>
diff --git a/templates/themes/basic/index.html b/templates/themes/basic/index.html
index 213e2ede..bcff0edf 100644
--- a/templates/themes/basic/index.html
+++ b/templates/themes/basic/index.html
@@ -49,9 +49,9 @@
                 <br><a href="https://engine.vichan.net/">vichan</a> Copyright &copy; 2012-2016 vichan-devel</p>
         </footer>
 	<div class="pages"></div>
-	<script type="text/javascript">{% raw %}
+	<script type="text/javascript">{% verbatim %}
 		ready();
-	{% endraw %}</script>
+	{% endverbatim %}</script>
 </body>
 </html>
 {% endfilter %}
diff --git a/templates/themes/calendar/calendar.html b/templates/themes/calendar/calendar.html
index 93712c0e..12113dcd 100644
--- a/templates/themes/calendar/calendar.html
+++ b/templates/themes/calendar/calendar.html
@@ -185,8 +185,8 @@
 
 		});
 	</script>
-	<script type="text/javascript">{% raw %}
+	<script type="text/javascript">{% verbatim %}
 		ready();
-	{% endraw %}</script>
+	{% endverbatim %}</script>
 </body>
 </html>
diff --git a/templates/themes/catalog/catalog.html b/templates/themes/catalog/catalog.html
index b5f2e832..84ad9c11 100644
--- a/templates/themes/catalog/catalog.html
+++ b/templates/themes/catalog/catalog.html
@@ -94,9 +94,9 @@
 	</footer>
 	<div class="pages"></div>
 
-	<script type="text/javascript">{% raw %}
+	<script type="text/javascript">{% verbatim %}
 		ready();
-	{% endraw %}</script>
+	{% endverbatim %}</script>
 </body>
 </html>
 {% endfilter %}
diff --git a/templates/themes/donate/donate.html b/templates/themes/donate/donate.html
index 2931f727..592b5a64 100644
--- a/templates/themes/donate/donate.html
+++ b/templates/themes/donate/donate.html
@@ -55,9 +55,9 @@
 
     </div>
 	<div class="pages"></div>
-	<script type="text/javascript">{% raw %}
+	<script type="text/javascript">{% verbatim %}
 		ready();
-	{% endraw %}</script>
+	{% endverbatim %}</script>
 
   </body>
 </html>
diff --git a/templates/themes/faq/index.html b/templates/themes/faq/index.html
index 95979fef..742c151f 100644
--- a/templates/themes/faq/index.html
+++ b/templates/themes/faq/index.html
@@ -159,9 +159,9 @@
                 <br><a href="https://engine.vichan.net/">vichan</a> Copyright &copy; 2012-2016 vichan-devel</p>
         </footer>
 	<div class="pages"></div>
-	<script type="text/javascript">{% raw %}
+	<script type="text/javascript">{% verbatim %}
 		ready();
-	{% endraw %}</script>
+	{% endverbatim %}</script>
 </body>
 </html>
 {% endfilter %}
diff --git a/templates/themes/irc/irc.html b/templates/themes/irc/irc.html
index 6d1ffb18..0b21aae5 100644
--- a/templates/themes/irc/irc.html
+++ b/templates/themes/irc/irc.html
@@ -27,9 +27,9 @@
         <iframe src="https://kiwiirc.com/nextclient/#irc://{{ settings.server }}:+{{ settings.port }}/#{{ settings.channel }}" width="800px" height="100%" scrolling="no"></iframe>
     </div>
 	<div class="pages"></div>
-	<script type="text/javascript">{% raw %}
+	<script type="text/javascript">{% verbatim %}
 		ready();
-	{% endraw %}</script>
+	{% endverbatim %}</script>
   </body>
 </html>
 {% endfilter %}
diff --git a/templates/themes/radio/radio.html b/templates/themes/radio/radio.html
index ed73b47e..fa3c3a2a 100644
--- a/templates/themes/radio/radio.html
+++ b/templates/themes/radio/radio.html
@@ -127,8 +127,8 @@ $(document).ready(function(){
      <p style="text-align:center;"> To upload a voice-over / bump to radio click <a href="{{ settings.httpprefix ~ 'bump.html'}}" >here </a> </p>
     </div>
 	<div class="pages"></div>
-	<script type="text/javascript">{% raw %}
+	<script type="text/javascript">{% verbatim %}
 		ready();
-	{% endraw %}</script>
+	{% endverbatim %}</script>
   </body>
 </html>
diff --git a/templates/themes/rules/rules.html b/templates/themes/rules/rules.html
index 490e3e63..d077a28e 100755
--- a/templates/themes/rules/rules.html
+++ b/templates/themes/rules/rules.html
@@ -26,9 +26,9 @@
 
     {% include 'rules.html' %}
 	<div class="pages"></div>
-	<script type="text/javascript">{% raw %}
+	<script type="text/javascript">{% verbatim %}
 		ready();
-	{% endraw %}</script>
+	{% endverbatim %}</script>
   </body>
 </html>
 {% endfilter %}
diff --git a/templates/themes/staffapplication/staffapplication.html b/templates/themes/staffapplication/staffapplication.html
index 6f723b67..916b505b 100644
--- a/templates/themes/staffapplication/staffapplication.html
+++ b/templates/themes/staffapplication/staffapplication.html
@@ -72,9 +72,9 @@
 		<br><a href="https://github.com/lainchan/lainchan">lainchan</a> Copyright &copy; 2014-2017 lainchan Administration</p>
         </footer>
 	<div class="pages"></div>
-	<script type="text/javascript">{% raw %}
+	<script type="text/javascript">{% verbatim %}
 		ready();
-	{% endraw %}</script>
+	{% endverbatim %}</script>
 </body>
 </html>
 {% endfilter %}
diff --git a/templates/themes/stream/stream.html b/templates/themes/stream/stream.html
index 7fa87920..fc4441da 100644
--- a/templates/themes/stream/stream.html
+++ b/templates/themes/stream/stream.html
@@ -172,8 +172,8 @@ function change_format(e) {
                 <br><a href="https://engine.vichan.net/">vichan</a> Copyright &copy; 2012-2015 vichan-devel</p>
         </footer>
 	<div class="pages"></div>
-	<script type="text/javascript">{% raw %}
+	<script type="text/javascript">{% verbatim %}
 		ready();
-	{% endraw %}</script>
+	{% endverbatim %}</script>
 </body>
 </html>
diff --git a/templates/thread.html b/templates/thread.html
index 0ba7c81a..17c89c2b 100644
--- a/templates/thread.html
+++ b/templates/thread.html
@@ -111,9 +111,9 @@
 		</div>
 		<div class=pages></div>
 	</div>
-	<script type="text/javascript">{% raw %}
+	<script type="text/javascript">{% verbatim %}
 		ready();
-	{% endraw %}</script>
+	{% endverbatim %}</script>
 	<a href="#" id="bottom"></a>
 </body>
 </html>