From f67f839e0f5c63e3fe6d11d5279a3aec16f3c3ba Mon Sep 17 00:00:00 2001 From: Fredrick Brennan Date: Sat, 20 Sep 2014 15:21:09 +0000 Subject: [PATCH] fuck splitting this one up, misc changes --- inc/instance-config.php | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/inc/instance-config.php b/inc/instance-config.php index 9bc06a12..3430933a 100644 --- a/inc/instance-config.php +++ b/inc/instance-config.php @@ -23,9 +23,9 @@ require_once "8chan-functions.php"; $config['cookies']['mod'] = 'mod'; $config['cookies']['salt'] = 'YTBmNTUzZThkYWY5ZjYxNjIzOGQxYj'; - $config['flood_time'] = 10; + $config['flood_time'] = 2; $config['flood_time_ip'] = 120; - $config['flood_time_same'] = 30; + $config['flood_time_same'] = 5; $config['max_body'] = 5000; $config['reply_limit'] = 250; $config['max_links'] = 20; @@ -33,11 +33,13 @@ require_once "8chan-functions.php"; $config['thumb_height'] = 255; $config['max_width'] = 10000; $config['max_height'] = 10000; - $config['threads_per_page'] = 10; + $config['threads_per_page'] = 15; $config['max_pages'] = 10; $config['threads_preview'] = 5; $config['root'] = '/'; $config['secure_trip_salt'] = 'OGNkMjQ4MGM5MDFkYmVhYWFhOGYwOG'; + $config['always_noko'] = true; + $config['allow_no_country'] = true; // Image shit $config['thumb_method'] = 'gm+gifsicle'; @@ -45,7 +47,7 @@ require_once "8chan-functions.php"; $config['thumb_keep_animation_frames'] = 100; $config['show_ratio'] = true; $config['allow_upload_by_url'] = true; - $config['max_filesize'] = 1024 * 1024 * 2; // 2MB + $config['max_filesize'] = 1024 * 1024 * 5; // 5MB $config['disable_images'] = false; $config['spoiler_images'] = true; $config['image_reject_repost'] = false; @@ -75,7 +77,7 @@ require_once "8chan-functions.php"; $config['additional_javascript'][] = 'js/jquery.min.js'; $config['additional_javascript'][] = 'js/jquery.tablesorter.min.js'; $config['additional_javascript'][] = 'js/post-hover.js'; - $config['additional_javascript'][] = 'js/update_boards.js'; + $config['additional_javascript'][] = 'js/favorites.js'; $config['additional_javascript'][] = 'js/show-op.js'; $config['additional_javascript'][] = 'js/hide-threads.js'; //$config['additional_javascript'][] = 'js/smartphone-spoiler.js'; @@ -95,16 +97,20 @@ require_once "8chan-functions.php"; $config['additional_javascript'][] = 'js/local-time.js'; $config['additional_javascript'][] = 'js/no-animated-gif.js'; $config['additional_javascript'][] = 'js/expand.js'; + $config['additional_javascript'][] = 'js/auto-reload.js'; + $config['additional_javascript'][] = 'js/quick-reply.js'; $config['font_awesome_css'] = '//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css'; + $config['stylesheets']['Dark'] = 'dark.css'; + $config['stylesheets_board'] = true; $config['markup'][] = array("/^[ |\t]*==(.+?)==[ |\t]*$/m", "\$1"); $config['markup'][] = array("/\[spoiler\](.+?)\[\/spoiler\]/", "\$1"); $config['markup'][] = array("/~~(.+?)~~/", "\$1"); - $config['boards'] = array(array('' => '/', '' => '/boards.html', '' => '/faq.html', '' => '/random.php', '' => '/create.php', '' => '/search.php', '' => '/mod.php', '' => 'https://qchat.rizon.net/?channels=#8chan'), array('b', 'meta', 'int'), array(''=>'https://twitter.com/infinitechan')); + $config['boards'] = array(array('' => '/', '' => '/boards.html', '' => '/faq.html', '' => '/random.php', '' => '/create.php', '' => '/search.php', '' => '/mod.php', '' => 'https://qchat.rizon.net/?channels=#8chan'), array('b', 'meta', 'int'), array('v', 'a', 'tg', 'fit', 'pol', 'tech', 'mu', 'co'), array(''=>'https://twitter.com/infinitechan')); $config['footer'][] = 'Proprietary Tinyboard changes & 8chan.co trademark and logo © 2013-2014 Fredrick Brennan'; $config['footer'][] = 'To make a DMCA request or report illegal content, please email admin@8chan.co or use the "Global Report" functionality on every page.'; @@ -114,7 +120,7 @@ require_once "8chan-functions.php"; //$config['debug'] = true; $config['syslog'] = true; - $config['flood_time'] = 2; + $config['flood_time'] = 0; // Minimum time between between each post with the exact same content AND same IP address. $config['flood_time_ip'] = 120; // Same as above but by a different IP address. (Same content, not necessarily same IP address.) @@ -221,6 +227,7 @@ require_once "8chan-functions.php"; $show_sages = isset($_POST['show_sages']) ? 'true' : 'false'; $auto_unicode = isset($_POST['auto_unicode']) ? 'true' : 'false'; $meta_noindex = isset($_POST['meta_noindex']) ? 'true' : 'false'; + $allow_roll = isset($_POST['allow_roll']) ? 'true' : 'false'; $code_tags = isset($_POST['code_tags']) ? '$config[\'additional_javascript\'][] = \'js/code_tags/run_prettify.js\';$config[\'markup\'][] = array("/\[code\](.+?)\[\/code\]/ms", "
\$1
");' : ''; $mathjax = isset($_POST['mathjax']) ? '$config[\'mathjax\'] = true;$config[\'additional_javascript\'][] = \'js/mathjax-MathJax-727332c/MathJax.js?config=TeX-AMS_HTML-full\';' : ''; $oekaki_js = <<