Changeset 761 for sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-admin.php

Timestamp:

07/25/2014 12:24:11 AM (11 years ago)

Author:

iandunn

Message:

WordCamp Post Type: Require an e-mail address before setting as pending.

There are automated emails that get sent when the post is promoted to a pending status, so we need an e-mail
address at that time or we can't send them.

File:

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

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

@@ -502 +502 @@
 
     /**
-     * Prevent WordCamp posts from being published until all the required fields are completed.
+     * Prevent WordCamp posts from being set to pending or published until all the required fields are completed.
      *
      * @param array $post_data
@@ -512 +512 @@
         $min_site_id = apply_filters( 'wcpt_require_complete_meta_min_site_id', '2416297' );
 
-        $required_fields = array(
+        $required_pending_fields = array( 'E-mail Address' );
+
+        $required_publish_fields = array(
             // WordCamp
             'Start Date (YYYY-mm-dd)',
@@ -539 +541 @@
         );
 
+        // Check pending posts
+        if ( WCPT_POST_TYPE_ID == $post_data['post_type'] && 'pending' == $post_data['post_status'] && absint( $_POST['post_ID'] ) > $min_site_id ) {
+            foreach( $required_pending_fields as $field ) {
+                $value = $_POST[ wcpt_key_to_str( $field, 'wcpt_' ) ];
+
+                if ( empty( $value ) || 'null' == $value ) {
+                    $post_data['post_status']     = 'draft';
+                    $this->active_admin_notices[] = 3;
+                    break;
+                }
+            }
+        }
+
+        // Check published posts
         if ( WCPT_POST_TYPE_ID == $post_data['post_type'] && 'publish' == $post_data['post_status'] && absint( $_POST['post_ID'] ) > $min_site_id ) {
-            foreach( $required_fields as $field ) {
+            foreach( $required_publish_fields as $field ) {
                 $value = $_POST[ wcpt_key_to_str( $field, 'wcpt_' ) ];
 
@@ -609 +625 @@
                     $post->post_status
                 )
+            ),
+
+            3 => array(
+                'type'   => 'error',
+                'notice' => __( 'This WordCamp cannot be set to pending until all of its required metadata is filled in.', 'wordcamporg' ),
             ),
         );