diff --git a/inc/8chan-mod-pages.php b/inc/8chan-mod-pages.php index 72e065a4..b87a97ae 100644 --- a/inc/8chan-mod-pages.php +++ b/inc/8chan-mod-pages.php @@ -130,7 +130,7 @@ $query->bindValue(':mod', $mods[0]['username']); $query->execute(); - $body = "Thanks for your interest in this board. Kindly find the username and password below. You can login at 8chan.co/mod.php.
Username: {$mods[0]['username']}
Password: {$password}
Thanks for using 8chan.co!"; + $body = "Thanks for your interest in this board. Kindly find the username and password below. You can login at https://8ch.net/mod.php.
Username: {$mods[0]['username']}
Password: {$password}
Thanks for using 8chan!"; mod_page(_('Edit reassign'), 'blank.html', array('board'=>$board,'token'=>make_secure_link_token('reassign/'.$board['uri']),'body'=>$body)); }; @@ -384,6 +384,7 @@ FLAGS; error("Could not open board!"); $possible_languages = array_diff(scandir('inc/locale/'), array('..', '.', '.tx', 'README.md')); + $allowed_urls = array('https://i.imgur.com/', 'https://media.8ch.net/', 'https://media.8chan.co/', 'https://a.pomf.se/', 'https://fonts.googleapis.com/', 'https://fonts.gstatic.com/', 'https://jp.8ch.net/'); if ($_SERVER['REQUEST_METHOD'] == 'POST') { $title = $_POST['title']; @@ -520,8 +521,6 @@ EOT; preg_match_all("#$match_urls#im", $clean_css, $matched); - $allowed_urls = array('https://i.imgur.com/', 'https://media.8chan.co/', 'https://a.pomf.se/', 'https://fonts.googleapis.com/', 'https://fonts.gstatic.com/', 'http://8ch.net/', 'https://8chan.co/'); - if (isset($matched[0])) { foreach ($matched[0] as $match) { $match_okay = false; @@ -598,9 +597,10 @@ EOT; $rules = @file_get_contents($board['uri'] . '/rules.txt'); $css = @file_get_contents('stylesheets/board/' . $board['uri'] . '.css'); - if ($config['cache']['enabled']) + if ($config['cache']['enabled']) { cache::delete('board_' . $board['uri']); cache::delete('all_boards'); + } - mod_page(_('Board configuration'), 'mod/settings.html', array('board'=>$board, 'rules'=>prettify_textarea($rules), 'css'=>prettify_textarea($css), 'token'=>make_secure_link_token('settings/'.$board['uri']), 'languages'=>$possible_languages)); + mod_page(_('Board configuration'), 'mod/settings.html', array('board'=>$board, 'rules'=>prettify_textarea($rules), 'css'=>prettify_textarea($css), 'token'=>make_secure_link_token('settings/'.$board['uri']), 'languages'=>$possible_languages,'allowed_urls'=>$allowed_urls)); }; diff --git a/inc/instance-config.php b/inc/instance-config.php index 7dd777a6..f6ba4b64 100644 --- a/inc/instance-config.php +++ b/inc/instance-config.php @@ -75,7 +75,7 @@ $config['mod']['capcode'][GLOBALVOLUNTEER] = array('Global Volunteer'); $config['mod']['capcode'][ADMIN] = array('Admin', 'Global Volunteer'); $config['custom_capcode']['Admin'] = array( - ' 8chan.co Administrator', + ' 8chan Administrator', ); //$config['mod']['view_banlist'] = GLOBALVOLUNTEER; $config['mod']['recent_reports'] = 65535; @@ -159,7 +159,7 @@ $config['boards'] = array(array('' => '/', '' => '/boards.html', '' => '/faq.html', '' => '/random.php', '' => '/create.php', '' => '/bans.html', '' => '/search.php', '' => '/mod.php', '' => 'https://qchat.rizon.net/?channels=#8chan'), array('b', 'meta', 'news+'), 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', 'sp', 'boards'), array(''=>'https://twitter.com/infinitechan')); - $config['footer'][] = 'All posts on 8chan.co are the responsibility of the individual poster and not the administration of 8chan.co, pursuant to 47 U.S.C. § 230.'; + $config['footer'][] = 'All posts on 8chan are the responsibility of the individual poster and not the administration of 8chan, pursuant to 47 U.S.C. § 230.'; $config['footer'][] = 'We have not been served any secret court orders and are not under any gag orders.'; $config['footer'][] = 'To make a DMCA request or report illegal content, please email admin@8chan.co.'; @@ -229,6 +229,7 @@ $config['early_404_replies'] = 10; $config['cron_bans'] = true; $config['mask_db_error'] = true; $config['ban_appeals'] = true; +$config['show_sages'] = false; // 8chan specific mod pages require '8chan-mod-pages.php'; diff --git a/js/twemoji/twemoji.js b/js/twemoji/twemoji.js index 0fed6213..5d1dd36a 100644 --- a/js/twemoji/twemoji.js +++ b/js/twemoji/twemoji.js @@ -25,7 +25,7 @@ var twemoji = (function ( // default assets url, by default will be Twitter Inc. CDN base: (location.protocol === 'https:' ? 'https:' : 'http:') + - '//8chan.co/js/twemoji/', + '//8ch.net/js/twemoji/', // default assets file extensions, by default '.png' ext: '.png',