allow the previous not only for ban action, but also for reject action, or a nul one
This commit is contained in:
parent
a940ee9abb
commit
50091e28a9
@ -118,6 +118,16 @@ class Filter {
|
|||||||
public function action() {
|
public function action() {
|
||||||
global $board;
|
global $board;
|
||||||
|
|
||||||
|
$this->add_note = isset($this->add_note) ? $this->add_note : false;
|
||||||
|
if ($this->add_note) {
|
||||||
|
$query = prepare('INSERT INTO ``ip_notes`` VALUES (NULL, :ip, :mod, :time, :body)');
|
||||||
|
$query->bindValue(':ip', $_SERVER['REMOTE_ADDR']);
|
||||||
|
$query->bindValue(':mod', -1);
|
||||||
|
$query->bindValue(':time', time());
|
||||||
|
$query->bindValue(':body', "Autoban message: ".$this->post['body']);
|
||||||
|
$query->execute() or error(db_error($query));
|
||||||
|
}
|
||||||
|
|
||||||
switch($this->action) {
|
switch($this->action) {
|
||||||
case 'reject':
|
case 'reject':
|
||||||
error(isset($this->message) ? $this->message : 'Posting throttled by filter.');
|
error(isset($this->message) ? $this->message : 'Posting throttled by filter.');
|
||||||
@ -128,19 +138,9 @@ class Filter {
|
|||||||
$this->expires = isset($this->expires) ? $this->expires : false;
|
$this->expires = isset($this->expires) ? $this->expires : false;
|
||||||
$this->reject = isset($this->reject) ? $this->reject : true;
|
$this->reject = isset($this->reject) ? $this->reject : true;
|
||||||
$this->all_boards = isset($this->all_boards) ? $this->all_boards : false;
|
$this->all_boards = isset($this->all_boards) ? $this->all_boards : false;
|
||||||
$this->add_note = isset($this->add_note) ? $this->add_note : false;
|
|
||||||
|
|
||||||
Bans::new_ban($_SERVER['REMOTE_ADDR'], $this->reason, $this->expires, $this->all_boards ? false : $board['uri'], -1);
|
Bans::new_ban($_SERVER['REMOTE_ADDR'], $this->reason, $this->expires, $this->all_boards ? false : $board['uri'], -1);
|
||||||
|
|
||||||
if ($this->add_note) {
|
|
||||||
$query = prepare('INSERT INTO ``ip_notes`` VALUES (NULL, :ip, :mod, :time, :body)');
|
|
||||||
$query->bindValue(':ip', $_SERVER['REMOTE_ADDR']);
|
|
||||||
$query->bindValue(':mod', -1);
|
|
||||||
$query->bindValue(':time', time());
|
|
||||||
$query->bindValue(':body', "Autoban message: ".$this->post['body']);
|
|
||||||
$query->execute() or error(db_error($query));
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($this->reject) {
|
if ($this->reject) {
|
||||||
if (isset($this->message))
|
if (isset($this->message))
|
||||||
error($message);
|
error($message);
|
||||||
|
Loading…
Reference in New Issue
Block a user