diff --git a/inc/mod/pages.php b/inc/mod/pages.php index 5af6dc10..ce7bdffb 100644 --- a/inc/mod/pages.php +++ b/inc/mod/pages.php @@ -2328,11 +2328,21 @@ function mod_debug_recent_posts() { $query = query($query) or error(db_error()); $posts = $query->fetchAll(PDO::FETCH_ASSOC); + // Fetch recent posts from flood prevention cache + $query = query("SELECT * FROM ``flood`` ORDER BY `time` DESC") or error(db_error()); + $flood_posts = $query->fetchAll(PDO::FETCH_ASSOC); + foreach ($posts as &$post) { $post['snippet'] = pm_snippet($post['body']); + foreach ($flood_posts as $flood_post) { + if ($flood_post['time'] == $post['time'] && + $flood_post['posthash'] == make_comment_hex($post['body_nomarkup']) && + $flood_post['filehash'] == $post['filehash']) + $post['in_flood_table'] = true; + } } - mod_page(_('Debug: Recent posts'), 'mod/debug/recent_posts.html', array('posts' => $posts)); + mod_page(_('Debug: Recent posts'), 'mod/debug/recent_posts.html', array('posts' => $posts, 'flood_posts' => $flood_posts)); } function mod_debug_sql() { diff --git a/templates/mod/debug/antispam.html b/templates/mod/debug/antispam.html index 95aa61a6..9979a093 100644 --- a/templates/mod/debug/antispam.html +++ b/templates/mod/debug/antispam.html @@ -14,11 +14,14 @@ {{ config.board_abbreviation|sprintf(hash.board) }} - {% if hash.thread %} + {% if hash.thread > 0 %} {{ hash.thread }} + {% elseif hash.thread < 0 %} + Index (page {{ - hash.thread }}) {% else %} - - {% endif %} + {% endif %} + {{ hash.hash }} @@ -28,7 +31,11 @@ {% if hash.expires %} - {{ hash.expires|until }} + {% if hash.expires < time() %} + {{ hash.expires|ago }} ago + {% else %} + {{ hash.expires|until }} + {% endif %} {% else %} - @@ -55,11 +62,14 @@ {{ config.board_abbreviation|sprintf(hash.board) }} - {% if hash.thread %} + {% if hash.thread > 0 %} {{ hash.thread }} + {% elseif hash.thread < 0 %} + Index (page {{ - hash.thread }}) {% else %} - - {% endif %} + {% endif %} + {{ hash.hash }} @@ -69,7 +79,11 @@ {% if hash.expires %} - {{ hash.expires|until }} + {% if hash.expires < time() %} + {{ hash.expires|ago }} ago + {% else %} + {{ hash.expires|until }} + {% endif %} {% else %} - diff --git a/templates/mod/debug/recent_posts.html b/templates/mod/debug/recent_posts.html index b84d24ab..e4eb4f3a 100644 --- a/templates/mod/debug/recent_posts.html +++ b/templates/mod/debug/recent_posts.html @@ -1,3 +1,40 @@ +

+ Flood prevention cache: +

+ + + + + + + + + {% for post in flood_posts %} + + + + + + + + {% endfor %} +
#TimeBoardPost hashFile hash
{{ post.id }} + {{ post.time | ago }} ago + + + {{ config.board_abbreviation|sprintf(post.board) }} + + {{ post.posthash }} + {% if post.filehash %} + {{ post.filehash }} + {% else %} + No file + {% endif %} +
+ +

+ Most recent {{ posts|count }} posts: +

@@ -12,11 +49,13 @@ {% for post in posts %} -
Time
+ {{ post.time | ago }} ago - {{ config.board_abbreviation|sprintf(post.board) }} + + {{ config.board_abbreviation|sprintf(post.board) }} + {% if post.thread %}