Changeset 2962

Timestamp:

04/15/2016 01:50:06 PM (9 years ago)

Author:

kovshenin

Message:

WordCamp.org: Create a new site a bit later.

The wcpt_metabox_save action is a bit misleading because
it runs multiple times, so the multi-sponsor region is saved
after the WordCamp URL is saved, causing our "create site"
functionality to fail the first time.

This commit creates a new wcpt_metabox_save_done action which
is called when all metabox fields are saved. Moves the site
creation process to that new action.

Location:

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

Files:

• wcpt-admin.php (modified) (2 diffs)
• wcpt-wordcamp/wordcamp-admin.php (modified) (1 diff)
• wcpt-wordcamp/wordcamp-new-site.php (modified) (7 diffs)

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

@@ -59 +59 @@
     function metabox () {
         do_action( 'wcpt_metabox' );
-    }
-
-    /**
-     * metabox_save ()
-     *
-     * Pass the metabox values before saving
-     *
-     * @param int $post_id
-     * @return int
-     */
-    function metabox_save ( $post_id ) {
-        if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE )
-            return $post_id;
-
-        if ( !current_user_can( 'edit_post', $post_id ) )
-            return $post_id;
-
-        do_action( 'wcpt_metabox_save' );
     }
 
@@ -189 +171 @@
 }
 endif; // class_exists check
-
-?>

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

@@ -206 +206 @@
             }
         }
+
+        do_action( 'wcpt_metabox_save_done', $post_id );
 
         $this->validate_and_add_note( $post_id );

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

@@ -12 +12 @@
         add_action( 'wcpt_metabox_value', array( $this, 'render_site_url_field' ), 10, 3 );
         add_action( 'wcpt_metabox_save',  array( $this, 'save_site_url_field' ), 10, 3 );
+        add_action( 'wcpt_metabox_save_done', array( $this, 'maybe_create_new_site' ), 10, 1 );
     }
 
@@ -72 +73 @@
 
         if ( 'URL' == $key && 'wc-url' == $field_type && isset( $_POST[ $field_name ] ) ) {
-            // todo use https instead of http
             $url = strtolower( substr( $_POST[ $field_name ], 0, 4 ) ) == 'http' ? $_POST[ $field_name ] : 'http://' . $_POST[ $field_name ];
             $url = set_url_scheme( esc_url_raw( $url ), 'https' );
             update_post_meta( $wordcamp_id, $key, esc_url( $url ) );
-
-            if ( isset( $_POST[ wcpt_key_to_str( 'create-site-in-network', 'wcpt_' ) ] ) && ! empty( $url ) ) {
-                $this->create_new_site( $wordcamp_id, $url );
-            }
-        }
-    }
-
-
-    /**
-     * Create a new site in the network
+        }
+    }
+
+
+    /**
+     * Maybe create a new site in the network
      *
      * @param int    $wordcamp_id
-     * @param string $url
-     */
-    protected function create_new_site( $wordcamp_id, $url ) {
+     */
+    protected function maybe_create_new_site( $wordcamp_id ) {
         if ( ! current_user_can( 'manage_sites' ) ) {
             return;
@@ -97 +92 @@
         // The sponsor region is required so we can import the relevant sponsors and levels
         if ( ! get_post_meta( $wordcamp_id, 'Multi-Event Sponsor Region', true ) ) {
+            return;
+        }
+
+        $url = get_post_meta( $wordcamp_id, 'URL', true );
+        if ( ! isset( $_POST[ wcpt_key_to_str( 'create-site-in-network', 'wcpt_' ) ] ) || empty( $url ) ) {
             return;
         }
@@ -372 +372 @@
                 'content' =>
                     '<p>' . __( "<em>Organizers note:</em> Upload photos to this page and they'll automagically appear in a slideshow!", 'wordcamporg' ) . '</p> ' .
-                    '<p>[slideshow]</p>',
+                    '<p>[slideshow]</p>',
                 'status'  => 'draft',
                 'type'    => 'page',
@@ -459 +459 @@
             array(
                 'title'   => __( 'Call for Sponsors', 'wordcamporg' ),
-                'content' => 
+                'content' =>
                     '<p>' . __( '<em>Organizers note:</em> Make sure you update the "to" address and other fields before publishing this page!', 'wordcamporg' ) . '</p> ' .
                     '<p>' . __( 'Blurb with information for potential sponsors.', 'wordcamporg' ) . '</p> ' .
@@ -489 +489 @@
             array(
                 'title'   => __( 'Call for Speakers', 'wordcamporg' ),
-                'content' => 
+                'content' =>
                     '<p>' . __( '<em>Organizers note:</em> Submissions to this form will automatically create draft posts for the Speaker and Session post types. Feel free to customize the form, but deleting or renaming the following fields will break the automation: Name, Email, WordPress.org Username, Your Bio, Session Title, Session Description.', 'wordcamporg' ) . '</p>' .
                     '<p>' . __( "If you'd like to propose multiple topics, please submit the form multiple times, once for each topic. [Other speaker instructions/info goes here.]", 'wordcamporg' ) . '</p>' .
@@ -524 +524 @@
             array(
                 'title'   => __( 'Call for Volunteers', 'wordcamporg' ),
-                'content' => 
+                'content' =>
                     '<p>' . __( '<em>Organizers note:</em> Make sure you update the "to" address and other fields before publishing this page!', 'wordcamporg' ) . '</p> ' .
                     '<p>' . __( 'Blurb with information for potential volunteers.', 'wordcamporg' ) . '</p> ' .