Changeset 7500

Timestamp:

07/25/2018 06:39:38 PM (8 years ago)

Author:

coreymckrill

Message:

WordCamp applications: Adjustments to the rate limiter

The rate limiter was ignoring posts in the trash when determining if too many
had been sent during the hour time window. This fixes it by using
get_post_stati instead of specifying any, which ignores the trash.

This also prevents the submission form from rendering at all if the rate limit
has been triggered.

File:

• sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt/applications/wordcamp.php (modified) (2 diffs)

sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt/applications/wordcamp.php

@@ -46 +46 @@
     ob_start();
 
-    if ( isset( $_POST['submit-application'] ) ) {
+    if ( is_rate_limited() ) {
+        $message        = 'You have submitted too many applications recently. Please wait and try again in a few hours.';
+        $notice_classes = 'notice-error';
+
+        require( dirname( __DIR__ ) . '/views/applications/common/submission-results.php' );
+    } elseif ( isset( $_POST['submit-application'] ) ) {
         $application_data = validate_data( $_POST );
 
-        if ( is_rate_limited() ) {
-            $message        = 'You have submitted too many applications recently. Please wait and try again in a few hours.';
-            $notice_classes = 'notice-error';
-        } else if ( is_wp_error( $application_data ) ) {
+        if ( is_wp_error( $application_data ) ) {
             $message = $application_data->get_error_message();
             $notice_classes = 'notice-error';
@@ -85 +87 @@
     $previous_entries = get_posts( array(
         'post_type'      => WCPT_POST_TYPE_ID,
-        'post_status'    => 'any',
+        'post_status'    => get_post_stati(), // This will include trashed posts, unlike 'any'.
         'posts_per_page' => $limit,
         'orderby'        => 'date',