Merge /srv/http

404.php

@@ -37,7 +37,7 @@ $page = <<<EOT
 
 				$.each(faves, function(k, v) {
 					if ((window.location.pathname === '/' + v + '/') || (window.location.pathname === '/' + v)) {
-						faves.pop(v);
+						faves.splice(k, 1);
 						localStorage.favorites = JSON.stringify(faves);
 
 						alert('As /' + v + '/ no longer exists, it has been removed from your favorites.');

faq.php

@@ -26,6 +26,7 @@ $body = <<<EOT
 <li>Do not post, request, or link to any content illegal in the United States of America. Do not create boards with the sole purpose of posting or spreading such content.</li>
 </ul>
 <p>Other than that, you are free to institute whatever rules you want on your board.</p>
+<p><a href="https://8chan.co/obscenity.html">More information about US obscenity laws and how they relate to 8chan boards</a></p>
 <h2>How do I add more volunteers?</h2>
 <p>You may do this in your board settings, click on "Edit board volunteers".
 <h2>How do I manage my board?</h2>

inc/8chan-mod-pages.php

@@ -262,7 +262,7 @@
 				error($config['error']['invalidimg']);
 			}
 
-			if ($size[0] > 20 or $size[0] < 11 or $size[1] != 11){
+			if ($size[0] > 20 or $size[0] < 11 or $size[1] > 16 or $size[1] < 11){
 				error(_('Image wrong size!'));
 			}
 			if (sizeof($banners) > 256) {
@@ -405,6 +405,7 @@ FLAGS;
 			$katex = isset($_POST['katex']) ? '$config[\'katex\'] = true;$config[\'additional_javascript\'][] = \'js/katex/katex.min.js\'; $config[\'markup\'][] = array("/\[tex\](.+?)\[\/tex\]/ms", "<span class=\'tex\'>\$1</span>"); $config[\'additional_javascript\'][] = \'js/katex-enable.js\';' : '';
 			$user_flags = isset($_POST['user_flags']) ? "if (file_exists('$b/flags.php')) { include 'flags.php'; }\n" : '';
 			$captcha = isset($_POST['captcha']) ? 'true' : 'false';
+			$force_subject_op = isset($_POST['force_subject_op']) ? 'true' : 'false';
 
 
 $oekaki_js = <<<OEKAKI
@@ -482,6 +483,7 @@ OEKAKI;
 \$config['stylesheets']['Custom'] = 'board/$b.css';
 \$config['default_stylesheet'] = array('Custom', \$config['stylesheets']['Custom']);
 \$config['captcha']['enabled'] = $captcha;
+\$config['force_subject_op'] = $force_subject_op;
 $code_tags $katex $oekaki $replace $multiimage $allow_flash $allow_pdf $user_flags
 if (\$config['disable_images'])
 	\$config['max_pages'] = 10000;

inc/instance-config.php

@@ -140,6 +140,7 @@
 	$config['additional_javascript'][] = 'js/catalog-search.js';
 	$config['additional_javascript'][] = 'js/thread-stats.js';
 	$config['additional_javascript'][] = 'js/quote-selection.js';
+	$config['additional_javascript'][] = 'js/twemoji/twemoji.js';
 
 	//$config['font_awesome_css'] = '/netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css';
 	

js/expand-too-long.js

@@ -26,6 +26,9 @@ $(function() {
 					var content = $(data).find('#'+url.split('#')[1]).parent().parent().find(".body").first().html();
 
 					body.html(content);
+
+					var post = $(body).parents('.post');
+					$(document).trigger('new_post', post);
 				}
 			});
 		});