Merge pull request 'Finish the work of the previous PR' (#107) from ip-note-queries-refactor-2 into config

Reviewed-on: leftypol/leftypol#107

inc/filters.php

@@ -4,23 +4,26 @@
  *  Copyright (c) 2010-2013 Tinyboard Development Group
  */
 
+use Vichan\Context;
+use Vichan\Data\IpNoteQueries;
+
 defined('TINYBOARD') or exit;
 
 class Filter {
     public $flood_check;
     private $condition;
     private $post;
-    
+
     public function __construct(array $arr) {
         foreach ($arr as $key => $value)
-            $this->$key = $value;       
+            $this->$key = $value;
     }
-    
+
     public function match($condition, $match) {
         $condition = strtolower($condition);
 
         $post = &$this->post;
-        
+
         switch($condition) {
             case 'custom':
                 if (!is_callable($match))
@@ -29,11 +32,11 @@ class Filter {
             case 'flood-match':
                 if (!is_array($match))
                     error('Filter condition "flood-match" must be an array.');
-                                
+
                 // Filter out "flood" table entries which do not match this filter.
-                
+
                 $flood_check_matched = array();
-                
+
                 foreach ($this->flood_check as $flood_post) {
                     foreach ($match as $flood_match_arg) {
                         switch ($flood_match_arg) {
@@ -69,10 +72,10 @@ class Filter {
                     }
                     $flood_check_matched[] = $flood_post;
                 }
-                
+
                 // is there any reason for this assignment?
                 $this->flood_check = $flood_check_matched;
-                
+
                 return !empty($this->flood_check);
             case 'flood-time':
                 foreach ($this->flood_check as $flood_post) {
@@ -135,46 +138,42 @@ class Filter {
                 error('Unknown filter condition: ' . $condition);
         }
     }
-    
+
-    public function action() {
+    public function action(Context $ctx) {
         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)');
+            $note_queries = $ctx->get(IpNoteQueries::class);
-                    $query->bindValue(':ip', $_SERVER['REMOTE_ADDR']);
+            $note_queries->add($_SERVER['REMOTE_ADDR'], -1, 'Autoban message: ' . $this->post['body']);
-                    $query->bindValue(':mod', -1);
+        }
-                    $query->bindValue(':time', time());
-                    $query->bindValue(':body', "Autoban message: ".$this->post['body']);
-                    $query->execute() or error(db_error($query));
-        }               
         if (isset ($this->action)) switch($this->action) {
             case 'reject':
                 error(isset($this->message) ? $this->message : 'Posting blocked by filter.');
             case 'ban':
                 if (!isset($this->reason))
                     error('The ban action requires a reason.');
-                
+
                 $this->expires = isset($this->expires) ? $this->expires : false;
                 $this->reject = isset($this->reject) ? $this->reject : true;
                 $this->all_boards = isset($this->all_boards) ? $this->all_boards : false;
-                
+
                 Bans::new_ban($_SERVER['REMOTE_ADDR'], $this->reason, $this->expires, $this->all_boards ? false : $board['uri'], -1);
 
                 if ($this->reject) {
                     if (isset($this->message))
                         error($message);
-                    
+
                     checkBan($board['uri']);
                     exit;
                 }
-                
+
                 break;
             default:
                 error('Unknown filter action: ' . $this->action);
         }
     }
-    
+
     public function check(array $post) {
         $this->post = $post;
         foreach ($this->condition as $condition => $value) {
@@ -184,7 +183,7 @@ class Filter {
             } else {
                 $NOT = false;
             }
-            
+
             if ($this->match($condition, $value) == $NOT)
                 return false;
         }
@@ -194,11 +193,11 @@ class Filter {
 
 function purge_flood_table() {
     global $config;
-    
+
     // Determine how long we need to keep a cache of posts for flood prevention. Unfortunately, it is not
     // aware of flood filters in other board configurations. You can solve this problem by settings the
     // config variable $config['flood_cache'] (seconds).
-    
+
     if (isset($config['flood_cache'])) {
         $max_time = &$config['flood_cache'];
     } else {
@@ -208,18 +207,18 @@ function purge_flood_table() {
                 $max_time = max($max_time, $filter['condition']['flood-time']);
         }
     }
-    
+
     $time = time() - $max_time;
-    
+
     query("DELETE FROM ``flood`` WHERE `time` < $time") or error(db_error());
 }
 
-function do_filters(array $post) {
+function do_filters(Context $ctx, array $post) {
     global $config;
 
     if (!isset($config['filters']) || empty($config['filters']))
         return;
-    
+
     foreach ($config['filters'] as $filter) {
         if (isset($filter['condition']['flood-match'])) {
             $has_flood = true;
@@ -232,15 +231,15 @@ function do_filters(array $post) {
     } else {
         $flood_check = false;
     }
-    
+
     foreach ($config['filters'] as $filter_array) {
         $filter = new Filter($filter_array);
         $filter->flood_check = $flood_check;
         if ($filter->check($post)) {
-            $filter->action();
+            $filter->action($ctx);
         }
     }
-    
+
     purge_flood_table();
 }
 

post.php

@@ -1315,7 +1315,7 @@ function handle_post(Context $ctx)
 
     if (!hasPermission($config['mod']['bypass_filters'], $board['uri']) && !$dropped_post) {
         require_once 'inc/filters.php';
-        do_filters($post);
+        do_filters($ctx, $post);
     }
 
     if ($post['has_file']) {
@@ -1631,7 +1631,7 @@ function handle_post(Context $ctx)
 
     // Do filters again if OCRing
     if ($config['tesseract_ocr'] && !hasPermission($config['mod']['bypass_filters'], $board['uri']) && !$dropped_post) {
-        do_filters($post);
+        do_filters($ctx, $post);
     }
 
     if (!hasPermission($config['mod']['postunoriginal'], $board['uri']) && $config['robot_enable'] && checkRobot($post['body_nomarkup']) && !$dropped_post) {