Merge branch 'master' of github.com:vichan-devel/Tinyboard

This commit is contained in:
czaks 2015-02-26 21:44:52 +01:00
commit a93f168c79
3 changed files with 8 additions and 1 deletions

View File

@ -1,5 +1,5 @@
# License of vichan
Copyright (c) 2012-2014 vichan-devel
Copyright (c) 2012-2015 vichan-devel
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal

View File

@ -286,6 +286,9 @@
// Public and private key pair from https://www.google.com/recaptcha/admin/create
$config['recaptcha_public'] = '6LcXTcUSAAAAAKBxyFWIt2SO8jwx4W7wcSMRoN3f';
$config['recaptcha_private'] = '6LcXTcUSAAAAAOGVbVdhmEM1_SyRF4xTKe8jbzf_';
// Ability to lock a board for normal users and still allow mods to post. Could also be useful for making an archive board
$config['board_locked'] = false;
/*
* Custom filters detect certain posts and reject/ban accordingly. They are made up of a condition and an

View File

@ -16,6 +16,10 @@ if (get_magic_quotes_gpc()) {
$_POST = strip_array($_POST);
}
if (!$_POST['mod'] && $config['board_locked']) {
error("Board is locked");
}
if (isset($_POST['delete'])) {
// Delete