1
0
mirror of https://github.com/vichan-devel/vichan.git synced 2025-01-19 01:24:05 +01:00

Merge ../http

This commit is contained in:
8chan 2014-09-23 15:32:19 +00:00
commit fa28b5b370
3 changed files with 9 additions and 2 deletions

View File

@ -48,7 +48,7 @@ foreach($boards as $board) {
} else {// no one ever logged in, try board creation time
$query = query("SELECT UNIX_TIMESTAMP(time) AS time FROM board_create WHERE uri = '$board'");
$crt = $query->fetchAll(PDO::FETCH_COLUMN);
$last_activity_date->setTimestamp($crt[0]);
if (!empty($crt)) $last_activity_date->setTimestamp($crt[0]);
$last_mod_date = false;
}
}

View File

@ -75,6 +75,7 @@ require_once "8chan-functions.php";
$config['mod']['search'] = SUPERMOD;
$config['mod']['debug_recent'] = ADMIN;
$config['mod']['debug_antispam'] = ADMIN;
$config['mod']['recent_reports'] = 65535;
// Board shit
$config['url_banner'] = '/banners.php';
@ -139,6 +140,8 @@ require_once "8chan-functions.php";
// Same as above but by a different IP address. (Same content, not necessarily same IP address.)
$config['flood_time_same'] = 30;
$config['wordfilters'][] = array('\rule', ''); // 'true' means it's a regular expression
if (!function_exists('prettify_textarea')){
function prettify_textarea($s){
return str_replace("\t", '	', str_replace("\n", '
', htmlentities($s)));
@ -241,6 +244,7 @@ require_once "8chan-functions.php";
$auto_unicode = isset($_POST['auto_unicode']) ? 'true' : 'false';
$meta_noindex = isset($_POST['meta_noindex']) ? 'true' : 'false';
$allow_roll = isset($_POST['allow_roll']) ? 'true' : 'false';
$allow_flash = isset($_POST['allow_flash']) ? '$config[\'allowed_ext_files\'][] = \'swf\';' : '';
$code_tags = isset($_POST['code_tags']) ? '$config[\'additional_javascript\'][] = \'js/code_tags/run_prettify.js\';$config[\'markup\'][] = array("/\[code\](.+?)\[\/code\]/ms", "<code><pre class=\'prettyprint\' style=\'display:inline-block\'>\$1</pre></code>");' : '';
$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\';' : '';
$oekaki_js = <<<OEKAKI
@ -316,7 +320,7 @@ OEKAKI;
\$config['blotter'] = base64_decode('$blotter');
\$config['stylesheets']['Custom'] = 'board/$b.css';
\$config['default_stylesheet'] = array('Custom', \$config['stylesheets']['Custom']);
$code_tags $katex $oekaki $replace $multiimage
$code_tags $katex $oekaki $replace $multiimage $allow_flash
if (\$config['disable_images'])
\$config['max_pages'] = 10000;

View File

@ -720,3 +720,6 @@ pre {
height: 100%;
margin-top: 0px;
}
.mentioned {
word-wrap: break-word;
}