Merge pull request #212 from towards-a-new-leftypol/op_creation_time

Op creation time

inc/config.php

@@ -340,6 +340,8 @@
      * Read more: http://tinyboard.org/docs/index.php?p=Config/Filters
      */
 
+    // Minimum time between between each opening post.
+    $config['flood_time_any'] = 40;
     // Minimum time between between each post by the same IP address.
     $config['flood_time'] = 10;
     // Minimum time between between each post with the exact same content AND same IP address.
@@ -347,6 +349,18 @@
     // Same as above but by a different IP address. (Same content, not necessarily same IP address.)
     $config['flood_time_same'] = 30;
 
+    $config['filters'][] = array(
+        'condition' => array(
+            'flood-match' => array('isreply'), // Only match IP address
+            'OP' => true,
+            'flood-time-any' => &$config['flood_time_any']
+        ),
+        'noip' => true,
+        'find-time' => 60 * 60 * 1,
+        'action' => 'reject',
+        'message' => 'New threads are being created too quickly. Hmmm'
+    );
+
     // Minimum time between posts by the same IP address (all boards).
     $config['filters'][] = array(
         'condition' => array(

inc/filters.php

@@ -19,6 +19,7 @@ class Filter {
     }
     
     public function match($condition, $match) {
+        print_err("Filter condition: " . $condition);
         $condition = strtolower($condition);
 
         $post = &$this->post;
@@ -68,9 +69,18 @@ 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-any':
+                foreach ($this->flood_check as $flood_post) {
+                    if (time() - $flood_post['time'] <= $match) {
+                        print_err("rejecting post with flood id: " . $flood_post['id']);
+                        return true;
+                    }
+                }
+                return false;
             case 'flood-time':
                 foreach ($this->flood_check as $flood_post) {
                     if (time() - $flood_post['time'] <= $match) {
@@ -178,7 +188,9 @@ class Filter {
             if ($condition[0] == '!') {
                 $NOT = true;
                 $condition = substr($condition, 1);
-			} else $NOT = false;
+            } else {
+                $NOT = false;
+            }
             
             if ($this->match($condition, $value) == $NOT)
                 return false;
@@ -217,14 +229,26 @@ function do_filters(array $post) {
     if (!isset($config['filters']) || empty($config['filters']))
         return;
 
+    // look at the flood table regardless of IP
+    $noip = false;
+    
     foreach ($config['filters'] as $filter) {
-		if (isset($filter['condition']['flood-match'])) {
+        if (isset($filter['condition']['flood-match']) && (!isset($filter['noip']) || $filter['noip'] == false)) {
             $has_flood = true;
             break;
+        } else if ($filter['noip'] == true) {
+            print_err("filters noip is true");
+            $noip = true;
+            $find_time = time() - $filter['find-time'];
         }
     }
     
-	if (isset($has_flood)) {
+    if ($noip) {
+        print_err("SELECT * FROM flood WHERE time > " . strval($find_time));
+        $query = prepare("SELECT * FROM ``flood`` WHERE `time` > $find_time");
+        $query->execute() or error(db_error($query));
+        $flood_check = $query->fetchAll(PDO::FETCH_ASSOC);
+    } else if (isset($has_flood)) {
         if ($post['has_file']) {
             $query = prepare("SELECT * FROM ``flood`` WHERE `ip` = :ip OR `posthash` = :posthash OR `filehash` = :filehash");
             $query->bindValue(':ip', $_SERVER['REMOTE_ADDR']);
@@ -242,11 +266,13 @@ function do_filters(array $post) {
     }
     
     foreach ($config['filters'] as $filter_array) {
+        print_err("creating new filter, running check");
         $filter = new Filter($filter_array);
         $filter->flood_check = $flood_check;
-		if ($filter->check($post))
+        if ($filter->check($post)) {
             $filter->action();
         }
+    }
     
     purge_flood_table();
 }

inc/instance-config.php

@@ -82,6 +82,9 @@ $config['db']['password'] = '';
 $config['cookies']['mod'] = 'mod';
 $config['cookies']['salt'] = 'MGYwNjhlNjU5Y2QxNWU3YjQ3MzQ1Yj';
 
+
+$config['flood_cache'] = 60 * 15; // 15 minutes. The oldest a post can be in the flood table
+$config['flood_time_any'] = 40; // time between thread creation
 $config['flood_time'] = 30;
 $config['flood_time_ip'] = 60;
 $config['flood_time_same'] = 60;