eventespresso / event-espresso-core

core/admin/templates/admin_details_wrapper_no_sidebar.template.php

Spacing +2 added lines, -2 removed lines

@@ -21,8 +21,8 @@
 
 
         <div id="postbox-container-2" class="postbox-container">
-            <?php do_meta_boxes( $current_page, 'normal', NULL ); ?>
-            <?php do_meta_boxes( $current_page, 'advanced', NULL ); ?>
+            <?php do_meta_boxes($current_page, 'normal', NULL); ?>
+            <?php do_meta_boxes($current_page, 'advanced', NULL); ?>
         </div>
         <!-- postbox-container-2 -->
         <div class="clear"></div>

core/admin/PostShortcodeTracking.php

Doc Comments +1 added lines, -1 removed lines

@@ -259,7 +259,7 @@
      * @param  int $ID
      * @param      $shortcode_class
      * @param      $shortcode_posts
-     * @param      $page_for_posts
+     * @param      string $page_for_posts
      * @param bool $update_post_shortcodes
      * @return bool
      */

Indentation +445 added lines, -445 removed lines

@@ -2,7 +2,7 @@ 
 namespace EventEspresso\core\admin;
 
 if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-    exit( 'No direct script access allowed' );
+	exit( 'No direct script access allowed' );
 }
 
 
@@ -19,450 +19,450 @@ 
 class PostShortcodeTracking
 {
 
-    /**
-     * set_hooks_admin
-     *
-     * @access    public
-     */
-    public static function set_hooks_admin()
-    {
-        add_action(
-            'save_post',
-            array( 'EventEspresso\core\admin\PostShortcodeTracking', 'parse_post_content_on_save' ),
-            100,
-            2
-        );
-        add_action(
-            'delete_post',
-            array( 'EventEspresso\core\admin\PostShortcodeTracking', 'unset_post_shortcodes_on_delete' ),
-            100,
-            1
-        );
-        add_action(
-            'add_option_page_for_posts',
-            array( 'EventEspresso\core\admin\PostShortcodeTracking', 'reset_page_for_posts_on_initial_set' ),
-            100,
-            2
-        );
-        add_action(
-            'update_option',
-            array( 'EventEspresso\core\admin\PostShortcodeTracking', 'reset_page_for_posts_on_change' ),
-            100,
-            3
-        );
-        add_action(
-            'delete_option',
-            array( 'EventEspresso\core\admin\PostShortcodeTracking', 'reset_page_for_posts_on_delete' ),
-            100,
-            1
-        );
-    }
-
-
-
-    /**
-     *    parse_post_content_on_save
-     *    any time a post is saved, we need to check for any EE shortcodes that may be embedded in the content,
-     *    and then track what posts those shortcodes are on, so that we can initialize shortcodes well before
-     *    the_content() runs. this allows us to do things like enqueue scripts for shortcodes ONLY on the pages the
-     *    shortcodes are actually used on
-     *
-     * @access    public
-     * @param int      $post_ID
-     * @param \WP_Post $post
-     * @return    void
-     */
-    public static function parse_post_content_on_save( $post_ID, $post )
-    {
-        // if the post is trashed, then let's remove our post shortcode tracking
-        if ( $post instanceof \WP_Post && $post->post_status === 'trash' ) {
-            PostShortcodeTracking::unset_post_shortcodes_on_delete( $post_ID );
-            return;
-        }
-        // default post types
-        $post_types = array( 'post' => 0, 'page' => 1 );
-        // add CPTs
-        $CPTs = \EE_Register_CPTs::get_CPTs();
-        $post_types = array_merge( $post_types, $CPTs );
-        // for default or CPT posts...
-        if ( isset( $post_types[ $post->post_type ] ) ) {
-            // post on frontpage ?
-            $page_for_posts = \EE_Config::get_page_for_posts();
-            if ( $post->post_name === $page_for_posts ) {
-                PostShortcodeTracking::set_post_shortcodes_for_posts_page( $page_for_posts );
-                return;
-            }
-            // array of shortcodes indexed by post name
-            \EE_Registry::CFG()->core->post_shortcodes = isset( \EE_Registry::CFG()->core->post_shortcodes )
-                ? \EE_Registry::CFG()->core->post_shortcodes
-                : array();
-            // whether to proceed with update
-            $update_post_shortcodes = false;
-            // empty both arrays
-            \EE_Registry::CFG()->core->post_shortcodes[ $post->post_name ] = array();
-            // check that posts page is already being tracked
-            if ( ! isset( \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ] ) ) {
-                // if not, then ensure that it is properly added
-                \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ] = array();
-            }
-            // loop thru shortcodes
-            foreach ( \EE_Registry::instance()->shortcodes as $EES_Shortcode => $shortcode_dir ) {
-                // convert to UPPERCASE to get actual shortcode
-                $EES_Shortcode = strtoupper( $EES_Shortcode );
-                // is the shortcode in the post_content ?
-                if ( strpos( $post->post_content, $EES_Shortcode ) !== false ) {
-                    // map shortcode to post names and post IDs
-                    \EE_Registry::CFG()->core->post_shortcodes[ $post->post_name ][ $EES_Shortcode ] = $post_ID;
-                    // and add this shortcode to the tracking for the blog page
-                    PostShortcodeTracking::set_post_shortcode_for_posts_page( $page_for_posts, $EES_Shortcode,
-                        $post_ID );
-                    $update_post_shortcodes = true;
-                } else {
-                    // shortcode is not present in post content, so check if we were tracking it previously
-                    // stop tracking if shortcode is not used in this specific post
-                    if ( isset( \EE_Registry::CFG()->core->post_shortcodes[ $post->post_name ][ $EES_Shortcode ] ) ) {
-                        unset( \EE_Registry::CFG()->core->post_shortcodes[ $post->post_name ][ $EES_Shortcode ] );
-                        $update_post_shortcodes = true;
-                    }
-                    // make sure that something is set for the shortcode posts (even though we may remove this)
-                    $shortcode_posts = isset(
-                        \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $EES_Shortcode ]
-                    )
-                        ? \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $EES_Shortcode ]
-                        : array();
-                    // and stop tracking for this shortcode on the blog page if it is not used
-                    $update_post_shortcodes = PostShortcodeTracking::unset_posts_page_shortcode_for_post(
-                        $post_ID,
-                        $EES_Shortcode,
-                        $shortcode_posts,
-                        $page_for_posts,
-                        $update_post_shortcodes
-                    )
-                        ? true
-                        : $update_post_shortcodes;
-                }
-            }
-            if ( $update_post_shortcodes ) {
-                PostShortcodeTracking::update_post_shortcodes( $page_for_posts );
-            }
-        }
-    }
-
-
-
-    /**
-     * set_post_shortcodes_for_posts_page (plz note: shortcodes is plural)
-     * called when updating the WordPress Posts Page,
-     * and adds shortcode tracking for the Posts Page, for all shortcodes currently tracked on individual posts
-     *
-     * @access protected
-     * @param  string $page_for_posts
-     * @return void
-     */
-    protected static function set_post_shortcodes_for_posts_page( $page_for_posts )
-    {
-        \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ] = array();
-        // loop thru shortcodes
-        foreach ( \EE_Registry::CFG()->core->post_shortcodes as $post_name => $post_shortcodes ) {
-            foreach ( $post_shortcodes as $EES_Shortcode => $post_ID ) {
-                PostShortcodeTracking::set_post_shortcode_for_posts_page( $page_for_posts, $EES_Shortcode, $post_ID );
-            }
-        }
-        PostShortcodeTracking::update_post_shortcodes( $page_for_posts );
-    }
-
-
-
-    /**
-     * set_post_shortcode_for_posts_page (plz note: shortcode is singular)
-     * adds Posts Page shortcode tracking for the supplied shortcode for an individual post
-     *
-     * @access protected
-     * @param  string $page_for_posts
-     * @param         $EES_Shortcode
-     * @param         $post_ID
-     */
-    protected static function set_post_shortcode_for_posts_page( $page_for_posts, $EES_Shortcode, $post_ID )
-    {
-        // critical page shortcodes that we do NOT want added to the Posts page (blog)
-        $critical_shortcodes = \EE_Registry::CFG()->core->get_critical_pages_shortcodes_array();
-        // if the shortcode is NOT one of the critical page shortcodes like ESPRESSO_TXN_PAGE
-        if ( in_array( $EES_Shortcode, $critical_shortcodes ) ) {
-            return;
-        }
-        // add shortcode to "Posts page" tracking
-        if ( isset( \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $EES_Shortcode ] ) ) {
-            // make sure tracking is in form of an array
-            if ( ! is_array( \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $EES_Shortcode ] ) ) {
-                \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $EES_Shortcode ] = array(
-                    \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $EES_Shortcode ] => true,
-                );
-            }
-            \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $EES_Shortcode ] += array( $post_ID => true );
-        } else {
-            \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $EES_Shortcode ] = array( $post_ID => true );
-        }
-    }
-
-
-
-    /**
-     * unset_post_shortcodes_on_delete
-     *
-     * @access protected
-     * @param  int $ID
-     * @return void
-     */
-    public static function unset_post_shortcodes_on_delete( $ID )
-    {
-        $update_post_shortcodes = false;
-        // post on frontpage ?
-        $page_for_posts = \EE_Config::get_page_for_posts();
-        // looking for any references to this post
-        foreach ( \EE_Registry::CFG()->core->post_shortcodes as $post_name => $post_shortcodes ) {
-            // is this the "Posts Page" (blog) ?
-            if ( $post_name === $page_for_posts ) {
-                // loop thru shortcodes registered for the posts page
-                foreach ( $post_shortcodes as $shortcode_class => $shortcode_posts ) {
-                    $update_post_shortcodes = PostShortcodeTracking::unset_posts_page_shortcode_for_post(
-                        $ID,
-                        $shortcode_class,
-                        $shortcode_posts,
-                        $page_for_posts,
-                        $update_post_shortcodes
-                    )
-                        ? true
-                        : $update_post_shortcodes;
-                }
-            } else {
-                // loop thru shortcodes registered for each page
-                foreach ( $post_shortcodes as $shortcode_class => $post_ID ) {
-                    // if this is page is being deleted, then don't track any post shortcodes for it
-                    if ( $post_ID === $ID ) {
-                        unset( \EE_Registry::CFG()->core->post_shortcodes[ $post_name ] );
-                        $update_post_shortcodes = true;
-                    }
-                }
-            }
-        }
-        if ( $update_post_shortcodes ) {
-            PostShortcodeTracking::update_post_shortcodes( $page_for_posts );
-        }
-    }
-
-
-
-    /**
-     * unset_post_shortcodes_on_delete
-     *
-     * @access protected
-     * @param  int $ID
-     * @param      $shortcode_class
-     * @param      $shortcode_posts
-     * @param      $page_for_posts
-     * @param bool $update_post_shortcodes
-     * @return bool
-     */
-    protected static function unset_posts_page_shortcode_for_post(
-        $ID,
-        $shortcode_class,
-        $shortcode_posts,
-        $page_for_posts,
-        $update_post_shortcodes = false
-    ) {
-        // make sure that an array of post IDs is being tracked for each  shortcode
-        if ( ! is_array( $shortcode_posts ) ) {
-            \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $shortcode_class ] = array(
-                $shortcode_posts => true,
-            );
-            $update_post_shortcodes = true;
-        }
-        // now if the ID of the post being deleted is in the $shortcode_posts array
-        if ( is_array( $shortcode_posts ) && isset( $shortcode_posts[ $ID ] ) ) {
-            unset( \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $shortcode_class ][ $ID ] );
-            $update_post_shortcodes = true;
-        }
-        // if nothing is registered for that shortcode anymore, then delete the shortcode altogether
-        if ( empty( \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $shortcode_class ] ) ) {
-            unset( \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $shortcode_class ] );
-            $update_post_shortcodes = true;
-        }
-        return $update_post_shortcodes;
-    }
-
-
-
-    /**
-     *    update_post_shortcodes
-     *
-     * @access    public
-     * @param $page_for_posts
-     * @return    void
-     */
-    public static function update_post_shortcodes( $page_for_posts = '' )
-    {
-        // make sure page_for_posts is set
-        $page_for_posts = ! empty( $page_for_posts )
-            ? $page_for_posts
-            : \EE_Config::get_page_for_posts();
-        // allow others to mess stuff up :D
-        do_action(
-            'AHEE__\EventEspresso\core\admin\PostShortcodeTracking__update_post_shortcodes',
-            \EE_Config::instance()->core->post_shortcodes,
-            $page_for_posts
-        );
-        // keep old hookpoint for now, will deprecate later
-        do_action(
-            'AHEE__EE_Config__update_post_shortcodes',
-            \EE_Config::instance()->core->post_shortcodes,
-            $page_for_posts
-        );
-        // verify that post_shortcodes is set
-        \EE_Config::instance()->core->post_shortcodes = isset( \EE_Config::instance()->core->post_shortcodes )
-                                                        && is_array( \EE_Config::instance()->core->post_shortcodes )
-            ? \EE_Config::instance()->core->post_shortcodes
-            : array();
-        // cycle thru post_shortcodes
-        foreach ( \EE_Config::instance()->core->post_shortcodes as $post_name => $shortcodes ) {
-            // are there any shortcodes to track ?
-            if ( ! empty( $shortcodes ) ) {
-                // skip the posts page, because we want all shortcodes registered for it
-                if ( $post_name === $page_for_posts ) {
-                    continue;
-                }
-                // loop thru list of tracked shortcodes
-                foreach ( $shortcodes as $shortcode => $post_id ) {
-                    // make sure post still exists
-                    $post = get_post( $post_id );
-                    // check that the post name matches what we have saved
-                    if ( $post && $post->post_name === $post_name ) {
-                        // if so, then break before hitting the unset below
-                        continue;
-                    }
-                    // we don't like missing posts around here >:(
-                    unset( \EE_Config::instance()->core->post_shortcodes[ $post_name ] );
-                }
-            } else {
-                // you got no shortcodes to keep track of !
-                unset( \EE_Config::instance()->core->post_shortcodes[ $post_name ] );
-            }
-        }
-        // critical page shortcodes that we do NOT want added to the Posts page (blog)
-        $critical_shortcodes = \EE_Config::instance()->core->get_critical_pages_shortcodes_array();
-        $critical_shortcodes = array_flip( $critical_shortcodes );
-        foreach ( $critical_shortcodes as $critical_shortcode ) {
-            unset( \EE_Config::instance()->core->post_shortcodes[ $page_for_posts ][ $critical_shortcode ] );
-        }
-        //only show errors
-        \EE_Config::instance()->update_espresso_config();
-    }
-
-
-
-    /**
-     * reset_page_for_posts_on_initial_set
-     * if an admin is on the WP Reading Settings page and sets the option for "Posts page",
-     * when it had previously been unset,
-     * then we need to attribute any actively used shortcodes to the new blog page
-     *
-     * @access public
-     * @param  string $option
-     * @param  string $value
-     * @return void
-     */
-    public static function reset_page_for_posts_on_initial_set( $option, $value )
-    {
-        PostShortcodeTracking::reset_page_for_posts_on_change( $option, '', $value );
-    }
-
-
-
-    /**
-     *    reset_page_for_posts_on_change
-     *    if an admin is on the WP Reading Settings page and changes the option for "Posts page",
-     * then we need to attribute any actively used shortcodes for the previous blog page to the new blog page
-     *
-     * @access public
-     * @param  string $option
-     * @param  string $old_value
-     * @param  string $value
-     * @return void
-     */
-    public static function reset_page_for_posts_on_change( $option, $old_value = '', $value = '' )
-    {
-        if ( $option === 'page_for_posts' ) {
-            global $wpdb;
-            $table = $wpdb->posts;
-            $SQL = "SELECT post_name from $table WHERE post_type='posts' OR post_type='page' AND post_status='publish' AND ID=%d";
-            $new_page_for_posts = $value ? $wpdb->get_var( $wpdb->prepare( $SQL, $value ) ) : 'posts';
-            PostShortcodeTracking::set_post_shortcodes_for_posts_page( $new_page_for_posts );
-        }
-    }
-
-
-
-    /**
-     * reset_page_for_posts_on_delete
-     * if an admin deletes a page designated as the WP "Posts page",
-     * then we need to attribute any actively used shortcodes for that blog page to a generic 'posts' page
-     *
-     * @access public
-     * @param  string $option
-     * @return void
-     */
-    public static function reset_page_for_posts_on_delete( $option )
-    {
-        if ( $option === 'page_for_posts' ) {
-            PostShortcodeTracking::set_post_shortcodes_for_posts_page( 'posts' );
-        }
-    }
-
-
-
-    /**
-     * @param array|string $shortcodes
-     * @param bool         $index_results if passing more than one shortcode for the $shortcodes parameter above,
-     *                                    then setting this to true, will return as associative array indexed by
-     *                                    the shortcodes. If false, then the returned array will be unindexed
-     * @return array
-     */
-    public static function get_post_ids_for_shortcode( $shortcodes, $index_results = true )
-    {
-        $post_ids = array();
-        if ( is_array( $shortcodes ) ) {
-            foreach ( $shortcodes as $shortcode ) {
-                $new_post_ids = PostShortcodeTracking::get_post_ids_for_shortcode(
-                    $shortcode,
-                    $index_results
-                );
-                foreach ( $new_post_ids as $new_post_id ) {
-                    if ( $index_results ) {
-                        $post_ids[ $shortcode ][ $new_post_id ] = $new_post_id;
-                    } else {
-                        $post_ids[ $new_post_id ] = $new_post_id;
-                    }
-                }
-            }
-        } else {
-            $shortcode = strtoupper( $shortcodes );
-            $shortcode = strpos( $shortcode, 'ESPRESSO_' ) !== 0 ? "ESPRESSO_{$shortcode}" : $shortcode;
-            $page_for_posts = \EE_Config::get_page_for_posts();
-            // looking for any references to this post
-            foreach ( \EE_Registry::CFG()->core->post_shortcodes as $post_name => $post_shortcodes ) {
-                // if this is the "Posts Page" (blog), then skip it
-                if ( $post_name === $page_for_posts ) {
-                    continue;
-                }
-                // loop thru shortcodes registered for each page, and grab post id for matches
-                foreach ( (array) $post_shortcodes as $post_shortcode => $post_ID ) {
-                    if ( $post_shortcode === $shortcode ) {
-                        $post_ids[ $post_ID ] = $post_ID;
-                    }
-                }
-            }
-        }
-        return $post_ids;
-    }
+	/**
+	 * set_hooks_admin
+	 *
+	 * @access    public
+	 */
+	public static function set_hooks_admin()
+	{
+		add_action(
+			'save_post',
+			array( 'EventEspresso\core\admin\PostShortcodeTracking', 'parse_post_content_on_save' ),
+			100,
+			2
+		);
+		add_action(
+			'delete_post',
+			array( 'EventEspresso\core\admin\PostShortcodeTracking', 'unset_post_shortcodes_on_delete' ),
+			100,
+			1
+		);
+		add_action(
+			'add_option_page_for_posts',
+			array( 'EventEspresso\core\admin\PostShortcodeTracking', 'reset_page_for_posts_on_initial_set' ),
+			100,
+			2
+		);
+		add_action(
+			'update_option',
+			array( 'EventEspresso\core\admin\PostShortcodeTracking', 'reset_page_for_posts_on_change' ),
+			100,
+			3
+		);
+		add_action(
+			'delete_option',
+			array( 'EventEspresso\core\admin\PostShortcodeTracking', 'reset_page_for_posts_on_delete' ),
+			100,
+			1
+		);
+	}
+
+
+
+	/**
+	 *    parse_post_content_on_save
+	 *    any time a post is saved, we need to check for any EE shortcodes that may be embedded in the content,
+	 *    and then track what posts those shortcodes are on, so that we can initialize shortcodes well before
+	 *    the_content() runs. this allows us to do things like enqueue scripts for shortcodes ONLY on the pages the
+	 *    shortcodes are actually used on
+	 *
+	 * @access    public
+	 * @param int      $post_ID
+	 * @param \WP_Post $post
+	 * @return    void
+	 */
+	public static function parse_post_content_on_save( $post_ID, $post )
+	{
+		// if the post is trashed, then let's remove our post shortcode tracking
+		if ( $post instanceof \WP_Post && $post->post_status === 'trash' ) {
+			PostShortcodeTracking::unset_post_shortcodes_on_delete( $post_ID );
+			return;
+		}
+		// default post types
+		$post_types = array( 'post' => 0, 'page' => 1 );
+		// add CPTs
+		$CPTs = \EE_Register_CPTs::get_CPTs();
+		$post_types = array_merge( $post_types, $CPTs );
+		// for default or CPT posts...
+		if ( isset( $post_types[ $post->post_type ] ) ) {
+			// post on frontpage ?
+			$page_for_posts = \EE_Config::get_page_for_posts();
+			if ( $post->post_name === $page_for_posts ) {
+				PostShortcodeTracking::set_post_shortcodes_for_posts_page( $page_for_posts );
+				return;
+			}
+			// array of shortcodes indexed by post name
+			\EE_Registry::CFG()->core->post_shortcodes = isset( \EE_Registry::CFG()->core->post_shortcodes )
+				? \EE_Registry::CFG()->core->post_shortcodes
+				: array();
+			// whether to proceed with update
+			$update_post_shortcodes = false;
+			// empty both arrays
+			\EE_Registry::CFG()->core->post_shortcodes[ $post->post_name ] = array();
+			// check that posts page is already being tracked
+			if ( ! isset( \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ] ) ) {
+				// if not, then ensure that it is properly added
+				\EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ] = array();
+			}
+			// loop thru shortcodes
+			foreach ( \EE_Registry::instance()->shortcodes as $EES_Shortcode => $shortcode_dir ) {
+				// convert to UPPERCASE to get actual shortcode
+				$EES_Shortcode = strtoupper( $EES_Shortcode );
+				// is the shortcode in the post_content ?
+				if ( strpos( $post->post_content, $EES_Shortcode ) !== false ) {
+					// map shortcode to post names and post IDs
+					\EE_Registry::CFG()->core->post_shortcodes[ $post->post_name ][ $EES_Shortcode ] = $post_ID;
+					// and add this shortcode to the tracking for the blog page
+					PostShortcodeTracking::set_post_shortcode_for_posts_page( $page_for_posts, $EES_Shortcode,
+						$post_ID );
+					$update_post_shortcodes = true;
+				} else {
+					// shortcode is not present in post content, so check if we were tracking it previously
+					// stop tracking if shortcode is not used in this specific post
+					if ( isset( \EE_Registry::CFG()->core->post_shortcodes[ $post->post_name ][ $EES_Shortcode ] ) ) {
+						unset( \EE_Registry::CFG()->core->post_shortcodes[ $post->post_name ][ $EES_Shortcode ] );
+						$update_post_shortcodes = true;
+					}
+					// make sure that something is set for the shortcode posts (even though we may remove this)
+					$shortcode_posts = isset(
+						\EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $EES_Shortcode ]
+					)
+						? \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $EES_Shortcode ]
+						: array();
+					// and stop tracking for this shortcode on the blog page if it is not used
+					$update_post_shortcodes = PostShortcodeTracking::unset_posts_page_shortcode_for_post(
+						$post_ID,
+						$EES_Shortcode,
+						$shortcode_posts,
+						$page_for_posts,
+						$update_post_shortcodes
+					)
+						? true
+						: $update_post_shortcodes;
+				}
+			}
+			if ( $update_post_shortcodes ) {
+				PostShortcodeTracking::update_post_shortcodes( $page_for_posts );
+			}
+		}
+	}
+
+
+
+	/**
+	 * set_post_shortcodes_for_posts_page (plz note: shortcodes is plural)
+	 * called when updating the WordPress Posts Page,
+	 * and adds shortcode tracking for the Posts Page, for all shortcodes currently tracked on individual posts
+	 *
+	 * @access protected
+	 * @param  string $page_for_posts
+	 * @return void
+	 */
+	protected static function set_post_shortcodes_for_posts_page( $page_for_posts )
+	{
+		\EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ] = array();
+		// loop thru shortcodes
+		foreach ( \EE_Registry::CFG()->core->post_shortcodes as $post_name => $post_shortcodes ) {
+			foreach ( $post_shortcodes as $EES_Shortcode => $post_ID ) {
+				PostShortcodeTracking::set_post_shortcode_for_posts_page( $page_for_posts, $EES_Shortcode, $post_ID );
+			}
+		}
+		PostShortcodeTracking::update_post_shortcodes( $page_for_posts );
+	}
+
+
+
+	/**
+	 * set_post_shortcode_for_posts_page (plz note: shortcode is singular)
+	 * adds Posts Page shortcode tracking for the supplied shortcode for an individual post
+	 *
+	 * @access protected
+	 * @param  string $page_for_posts
+	 * @param         $EES_Shortcode
+	 * @param         $post_ID
+	 */
+	protected static function set_post_shortcode_for_posts_page( $page_for_posts, $EES_Shortcode, $post_ID )
+	{
+		// critical page shortcodes that we do NOT want added to the Posts page (blog)
+		$critical_shortcodes = \EE_Registry::CFG()->core->get_critical_pages_shortcodes_array();
+		// if the shortcode is NOT one of the critical page shortcodes like ESPRESSO_TXN_PAGE
+		if ( in_array( $EES_Shortcode, $critical_shortcodes ) ) {
+			return;
+		}
+		// add shortcode to "Posts page" tracking
+		if ( isset( \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $EES_Shortcode ] ) ) {
+			// make sure tracking is in form of an array
+			if ( ! is_array( \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $EES_Shortcode ] ) ) {
+				\EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $EES_Shortcode ] = array(
+					\EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $EES_Shortcode ] => true,
+				);
+			}
+			\EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $EES_Shortcode ] += array( $post_ID => true );
+		} else {
+			\EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $EES_Shortcode ] = array( $post_ID => true );
+		}
+	}
+
+
+
+	/**
+	 * unset_post_shortcodes_on_delete
+	 *
+	 * @access protected
+	 * @param  int $ID
+	 * @return void
+	 */
+	public static function unset_post_shortcodes_on_delete( $ID )
+	{
+		$update_post_shortcodes = false;
+		// post on frontpage ?
+		$page_for_posts = \EE_Config::get_page_for_posts();
+		// looking for any references to this post
+		foreach ( \EE_Registry::CFG()->core->post_shortcodes as $post_name => $post_shortcodes ) {
+			// is this the "Posts Page" (blog) ?
+			if ( $post_name === $page_for_posts ) {
+				// loop thru shortcodes registered for the posts page
+				foreach ( $post_shortcodes as $shortcode_class => $shortcode_posts ) {
+					$update_post_shortcodes = PostShortcodeTracking::unset_posts_page_shortcode_for_post(
+						$ID,
+						$shortcode_class,
+						$shortcode_posts,
+						$page_for_posts,
+						$update_post_shortcodes
+					)
+						? true
+						: $update_post_shortcodes;
+				}
+			} else {
+				// loop thru shortcodes registered for each page
+				foreach ( $post_shortcodes as $shortcode_class => $post_ID ) {
+					// if this is page is being deleted, then don't track any post shortcodes for it
+					if ( $post_ID === $ID ) {
+						unset( \EE_Registry::CFG()->core->post_shortcodes[ $post_name ] );
+						$update_post_shortcodes = true;
+					}
+				}
+			}
+		}
+		if ( $update_post_shortcodes ) {
+			PostShortcodeTracking::update_post_shortcodes( $page_for_posts );
+		}
+	}
+
+
+
+	/**
+	 * unset_post_shortcodes_on_delete
+	 *
+	 * @access protected
+	 * @param  int $ID
+	 * @param      $shortcode_class
+	 * @param      $shortcode_posts
+	 * @param      $page_for_posts
+	 * @param bool $update_post_shortcodes
+	 * @return bool
+	 */
+	protected static function unset_posts_page_shortcode_for_post(
+		$ID,
+		$shortcode_class,
+		$shortcode_posts,
+		$page_for_posts,
+		$update_post_shortcodes = false
+	) {
+		// make sure that an array of post IDs is being tracked for each  shortcode
+		if ( ! is_array( $shortcode_posts ) ) {
+			\EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $shortcode_class ] = array(
+				$shortcode_posts => true,
+			);
+			$update_post_shortcodes = true;
+		}
+		// now if the ID of the post being deleted is in the $shortcode_posts array
+		if ( is_array( $shortcode_posts ) && isset( $shortcode_posts[ $ID ] ) ) {
+			unset( \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $shortcode_class ][ $ID ] );
+			$update_post_shortcodes = true;
+		}
+		// if nothing is registered for that shortcode anymore, then delete the shortcode altogether
+		if ( empty( \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $shortcode_class ] ) ) {
+			unset( \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $shortcode_class ] );
+			$update_post_shortcodes = true;
+		}
+		return $update_post_shortcodes;
+	}
+
+
+
+	/**
+	 *    update_post_shortcodes
+	 *
+	 * @access    public
+	 * @param $page_for_posts
+	 * @return    void
+	 */
+	public static function update_post_shortcodes( $page_for_posts = '' )
+	{
+		// make sure page_for_posts is set
+		$page_for_posts = ! empty( $page_for_posts )
+			? $page_for_posts
+			: \EE_Config::get_page_for_posts();
+		// allow others to mess stuff up :D
+		do_action(
+			'AHEE__\EventEspresso\core\admin\PostShortcodeTracking__update_post_shortcodes',
+			\EE_Config::instance()->core->post_shortcodes,
+			$page_for_posts
+		);
+		// keep old hookpoint for now, will deprecate later
+		do_action(
+			'AHEE__EE_Config__update_post_shortcodes',
+			\EE_Config::instance()->core->post_shortcodes,
+			$page_for_posts
+		);
+		// verify that post_shortcodes is set
+		\EE_Config::instance()->core->post_shortcodes = isset( \EE_Config::instance()->core->post_shortcodes )
+														&& is_array( \EE_Config::instance()->core->post_shortcodes )
+			? \EE_Config::instance()->core->post_shortcodes
+			: array();
+		// cycle thru post_shortcodes
+		foreach ( \EE_Config::instance()->core->post_shortcodes as $post_name => $shortcodes ) {
+			// are there any shortcodes to track ?
+			if ( ! empty( $shortcodes ) ) {
+				// skip the posts page, because we want all shortcodes registered for it
+				if ( $post_name === $page_for_posts ) {
+					continue;
+				}
+				// loop thru list of tracked shortcodes
+				foreach ( $shortcodes as $shortcode => $post_id ) {
+					// make sure post still exists
+					$post = get_post( $post_id );
+					// check that the post name matches what we have saved
+					if ( $post && $post->post_name === $post_name ) {
+						// if so, then break before hitting the unset below
+						continue;
+					}
+					// we don't like missing posts around here >:(
+					unset( \EE_Config::instance()->core->post_shortcodes[ $post_name ] );
+				}
+			} else {
+				// you got no shortcodes to keep track of !
+				unset( \EE_Config::instance()->core->post_shortcodes[ $post_name ] );
+			}
+		}
+		// critical page shortcodes that we do NOT want added to the Posts page (blog)
+		$critical_shortcodes = \EE_Config::instance()->core->get_critical_pages_shortcodes_array();
+		$critical_shortcodes = array_flip( $critical_shortcodes );
+		foreach ( $critical_shortcodes as $critical_shortcode ) {
+			unset( \EE_Config::instance()->core->post_shortcodes[ $page_for_posts ][ $critical_shortcode ] );
+		}
+		//only show errors
+		\EE_Config::instance()->update_espresso_config();
+	}
+
+
+
+	/**
+	 * reset_page_for_posts_on_initial_set
+	 * if an admin is on the WP Reading Settings page and sets the option for "Posts page",
+	 * when it had previously been unset,
+	 * then we need to attribute any actively used shortcodes to the new blog page
+	 *
+	 * @access public
+	 * @param  string $option
+	 * @param  string $value
+	 * @return void
+	 */
+	public static function reset_page_for_posts_on_initial_set( $option, $value )
+	{
+		PostShortcodeTracking::reset_page_for_posts_on_change( $option, '', $value );
+	}
+
+
+
+	/**
+	 *    reset_page_for_posts_on_change
+	 *    if an admin is on the WP Reading Settings page and changes the option for "Posts page",
+	 * then we need to attribute any actively used shortcodes for the previous blog page to the new blog page
+	 *
+	 * @access public
+	 * @param  string $option
+	 * @param  string $old_value
+	 * @param  string $value
+	 * @return void
+	 */
+	public static function reset_page_for_posts_on_change( $option, $old_value = '', $value = '' )
+	{
+		if ( $option === 'page_for_posts' ) {
+			global $wpdb;
+			$table = $wpdb->posts;
+			$SQL = "SELECT post_name from $table WHERE post_type='posts' OR post_type='page' AND post_status='publish' AND ID=%d";
+			$new_page_for_posts = $value ? $wpdb->get_var( $wpdb->prepare( $SQL, $value ) ) : 'posts';
+			PostShortcodeTracking::set_post_shortcodes_for_posts_page( $new_page_for_posts );
+		}
+	}
+
+
+
+	/**
+	 * reset_page_for_posts_on_delete
+	 * if an admin deletes a page designated as the WP "Posts page",
+	 * then we need to attribute any actively used shortcodes for that blog page to a generic 'posts' page
+	 *
+	 * @access public
+	 * @param  string $option
+	 * @return void
+	 */
+	public static function reset_page_for_posts_on_delete( $option )
+	{
+		if ( $option === 'page_for_posts' ) {
+			PostShortcodeTracking::set_post_shortcodes_for_posts_page( 'posts' );
+		}
+	}
+
+
+
+	/**
+	 * @param array|string $shortcodes
+	 * @param bool         $index_results if passing more than one shortcode for the $shortcodes parameter above,
+	 *                                    then setting this to true, will return as associative array indexed by
+	 *                                    the shortcodes. If false, then the returned array will be unindexed
+	 * @return array
+	 */
+	public static function get_post_ids_for_shortcode( $shortcodes, $index_results = true )
+	{
+		$post_ids = array();
+		if ( is_array( $shortcodes ) ) {
+			foreach ( $shortcodes as $shortcode ) {
+				$new_post_ids = PostShortcodeTracking::get_post_ids_for_shortcode(
+					$shortcode,
+					$index_results
+				);
+				foreach ( $new_post_ids as $new_post_id ) {
+					if ( $index_results ) {
+						$post_ids[ $shortcode ][ $new_post_id ] = $new_post_id;
+					} else {
+						$post_ids[ $new_post_id ] = $new_post_id;
+					}
+				}
+			}
+		} else {
+			$shortcode = strtoupper( $shortcodes );
+			$shortcode = strpos( $shortcode, 'ESPRESSO_' ) !== 0 ? "ESPRESSO_{$shortcode}" : $shortcode;
+			$page_for_posts = \EE_Config::get_page_for_posts();
+			// looking for any references to this post
+			foreach ( \EE_Registry::CFG()->core->post_shortcodes as $post_name => $post_shortcodes ) {
+				// if this is the "Posts Page" (blog), then skip it
+				if ( $post_name === $page_for_posts ) {
+					continue;
+				}
+				// loop thru shortcodes registered for each page, and grab post id for matches
+				foreach ( (array) $post_shortcodes as $post_shortcode => $post_ID ) {
+					if ( $post_shortcode === $shortcode ) {
+						$post_ids[ $post_ID ] = $post_ID;
+					}
+				}
+			}
+		}
+		return $post_ids;
+	}
 
 
 

Spacing +98 added lines, -98 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 namespace EventEspresso\core\admin;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-    exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+    exit('No direct script access allowed');
 }
 
 
@@ -28,31 +28,31 @@ 
     {
         add_action(
             'save_post',
-            array( 'EventEspresso\core\admin\PostShortcodeTracking', 'parse_post_content_on_save' ),
+            array('EventEspresso\core\admin\PostShortcodeTracking', 'parse_post_content_on_save'),
             100,
             2
         );
         add_action(
             'delete_post',
-            array( 'EventEspresso\core\admin\PostShortcodeTracking', 'unset_post_shortcodes_on_delete' ),
+            array('EventEspresso\core\admin\PostShortcodeTracking', 'unset_post_shortcodes_on_delete'),
             100,
             1
         );
         add_action(
             'add_option_page_for_posts',
-            array( 'EventEspresso\core\admin\PostShortcodeTracking', 'reset_page_for_posts_on_initial_set' ),
+            array('EventEspresso\core\admin\PostShortcodeTracking', 'reset_page_for_posts_on_initial_set'),
             100,
             2
         );
         add_action(
             'update_option',
-            array( 'EventEspresso\core\admin\PostShortcodeTracking', 'reset_page_for_posts_on_change' ),
+            array('EventEspresso\core\admin\PostShortcodeTracking', 'reset_page_for_posts_on_change'),
             100,
             3
         );
         add_action(
             'delete_option',
-            array( 'EventEspresso\core\admin\PostShortcodeTracking', 'reset_page_for_posts_on_delete' ),
+            array('EventEspresso\core\admin\PostShortcodeTracking', 'reset_page_for_posts_on_delete'),
             100,
             1
         );
@@ -72,63 +72,63 @@ 
      * @param \WP_Post $post
      * @return    void
      */
-    public static function parse_post_content_on_save( $post_ID, $post )
+    public static function parse_post_content_on_save($post_ID, $post)
     {
         // if the post is trashed, then let's remove our post shortcode tracking
-        if ( $post instanceof \WP_Post && $post->post_status === 'trash' ) {
-            PostShortcodeTracking::unset_post_shortcodes_on_delete( $post_ID );
+        if ($post instanceof \WP_Post && $post->post_status === 'trash') {
+            PostShortcodeTracking::unset_post_shortcodes_on_delete($post_ID);
             return;
         }
         // default post types
-        $post_types = array( 'post' => 0, 'page' => 1 );
+        $post_types = array('post' => 0, 'page' => 1);
         // add CPTs
         $CPTs = \EE_Register_CPTs::get_CPTs();
-        $post_types = array_merge( $post_types, $CPTs );
+        $post_types = array_merge($post_types, $CPTs);
         // for default or CPT posts...
-        if ( isset( $post_types[ $post->post_type ] ) ) {
+        if (isset($post_types[$post->post_type])) {
             // post on frontpage ?
             $page_for_posts = \EE_Config::get_page_for_posts();
-            if ( $post->post_name === $page_for_posts ) {
-                PostShortcodeTracking::set_post_shortcodes_for_posts_page( $page_for_posts );
+            if ($post->post_name === $page_for_posts) {
+                PostShortcodeTracking::set_post_shortcodes_for_posts_page($page_for_posts);
                 return;
             }
             // array of shortcodes indexed by post name
-            \EE_Registry::CFG()->core->post_shortcodes = isset( \EE_Registry::CFG()->core->post_shortcodes )
+            \EE_Registry::CFG()->core->post_shortcodes = isset(\EE_Registry::CFG()->core->post_shortcodes)
                 ? \EE_Registry::CFG()->core->post_shortcodes
                 : array();
             // whether to proceed with update
             $update_post_shortcodes = false;
             // empty both arrays
-            \EE_Registry::CFG()->core->post_shortcodes[ $post->post_name ] = array();
+            \EE_Registry::CFG()->core->post_shortcodes[$post->post_name] = array();
             // check that posts page is already being tracked
-            if ( ! isset( \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ] ) ) {
+            if ( ! isset(\EE_Registry::CFG()->core->post_shortcodes[$page_for_posts])) {
                 // if not, then ensure that it is properly added
-                \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ] = array();
+                \EE_Registry::CFG()->core->post_shortcodes[$page_for_posts] = array();
             }
             // loop thru shortcodes
-            foreach ( \EE_Registry::instance()->shortcodes as $EES_Shortcode => $shortcode_dir ) {
+            foreach (\EE_Registry::instance()->shortcodes as $EES_Shortcode => $shortcode_dir) {
                 // convert to UPPERCASE to get actual shortcode
-                $EES_Shortcode = strtoupper( $EES_Shortcode );
+                $EES_Shortcode = strtoupper($EES_Shortcode);
                 // is the shortcode in the post_content ?
-                if ( strpos( $post->post_content, $EES_Shortcode ) !== false ) {
+                if (strpos($post->post_content, $EES_Shortcode) !== false) {
                     // map shortcode to post names and post IDs
-                    \EE_Registry::CFG()->core->post_shortcodes[ $post->post_name ][ $EES_Shortcode ] = $post_ID;
+                    \EE_Registry::CFG()->core->post_shortcodes[$post->post_name][$EES_Shortcode] = $post_ID;
                     // and add this shortcode to the tracking for the blog page
-                    PostShortcodeTracking::set_post_shortcode_for_posts_page( $page_for_posts, $EES_Shortcode,
-                        $post_ID );
+                    PostShortcodeTracking::set_post_shortcode_for_posts_page($page_for_posts, $EES_Shortcode,
+                        $post_ID);
                     $update_post_shortcodes = true;
                 } else {
                     // shortcode is not present in post content, so check if we were tracking it previously
                     // stop tracking if shortcode is not used in this specific post
-                    if ( isset( \EE_Registry::CFG()->core->post_shortcodes[ $post->post_name ][ $EES_Shortcode ] ) ) {
-                        unset( \EE_Registry::CFG()->core->post_shortcodes[ $post->post_name ][ $EES_Shortcode ] );
+                    if (isset(\EE_Registry::CFG()->core->post_shortcodes[$post->post_name][$EES_Shortcode])) {
+                        unset(\EE_Registry::CFG()->core->post_shortcodes[$post->post_name][$EES_Shortcode]);
                         $update_post_shortcodes = true;
                     }
                     // make sure that something is set for the shortcode posts (even though we may remove this)
                     $shortcode_posts = isset(
-                        \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $EES_Shortcode ]
+                        \EE_Registry::CFG()->core->post_shortcodes[$page_for_posts][$EES_Shortcode]
                     )
-                        ? \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $EES_Shortcode ]
+                        ? \EE_Registry::CFG()->core->post_shortcodes[$page_for_posts][$EES_Shortcode]
                         : array();
                     // and stop tracking for this shortcode on the blog page if it is not used
                     $update_post_shortcodes = PostShortcodeTracking::unset_posts_page_shortcode_for_post(
@@ -142,8 +142,8 @@ 
                         : $update_post_shortcodes;
                 }
             }
-            if ( $update_post_shortcodes ) {
-                PostShortcodeTracking::update_post_shortcodes( $page_for_posts );
+            if ($update_post_shortcodes) {
+                PostShortcodeTracking::update_post_shortcodes($page_for_posts);
             }
         }
     }
@@ -159,16 +159,16 @@ 
      * @param  string $page_for_posts
      * @return void
      */
-    protected static function set_post_shortcodes_for_posts_page( $page_for_posts )
+    protected static function set_post_shortcodes_for_posts_page($page_for_posts)
     {
-        \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ] = array();
+        \EE_Registry::CFG()->core->post_shortcodes[$page_for_posts] = array();
         // loop thru shortcodes
-        foreach ( \EE_Registry::CFG()->core->post_shortcodes as $post_name => $post_shortcodes ) {
-            foreach ( $post_shortcodes as $EES_Shortcode => $post_ID ) {
-                PostShortcodeTracking::set_post_shortcode_for_posts_page( $page_for_posts, $EES_Shortcode, $post_ID );
+        foreach (\EE_Registry::CFG()->core->post_shortcodes as $post_name => $post_shortcodes) {
+            foreach ($post_shortcodes as $EES_Shortcode => $post_ID) {
+                PostShortcodeTracking::set_post_shortcode_for_posts_page($page_for_posts, $EES_Shortcode, $post_ID);
             }
         }
-        PostShortcodeTracking::update_post_shortcodes( $page_for_posts );
+        PostShortcodeTracking::update_post_shortcodes($page_for_posts);
     }
 
 
@@ -182,25 +182,25 @@ 
      * @param         $EES_Shortcode
      * @param         $post_ID
      */
-    protected static function set_post_shortcode_for_posts_page( $page_for_posts, $EES_Shortcode, $post_ID )
+    protected static function set_post_shortcode_for_posts_page($page_for_posts, $EES_Shortcode, $post_ID)
     {
         // critical page shortcodes that we do NOT want added to the Posts page (blog)
         $critical_shortcodes = \EE_Registry::CFG()->core->get_critical_pages_shortcodes_array();
         // if the shortcode is NOT one of the critical page shortcodes like ESPRESSO_TXN_PAGE
-        if ( in_array( $EES_Shortcode, $critical_shortcodes ) ) {
+        if (in_array($EES_Shortcode, $critical_shortcodes)) {
             return;
         }
         // add shortcode to "Posts page" tracking
-        if ( isset( \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $EES_Shortcode ] ) ) {
+        if (isset(\EE_Registry::CFG()->core->post_shortcodes[$page_for_posts][$EES_Shortcode])) {
             // make sure tracking is in form of an array
-            if ( ! is_array( \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $EES_Shortcode ] ) ) {
-                \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $EES_Shortcode ] = array(
-                    \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $EES_Shortcode ] => true,
+            if ( ! is_array(\EE_Registry::CFG()->core->post_shortcodes[$page_for_posts][$EES_Shortcode])) {
+                \EE_Registry::CFG()->core->post_shortcodes[$page_for_posts][$EES_Shortcode] = array(
+                    \EE_Registry::CFG()->core->post_shortcodes[$page_for_posts][$EES_Shortcode] => true,
                 );
             }
-            \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $EES_Shortcode ] += array( $post_ID => true );
+            \EE_Registry::CFG()->core->post_shortcodes[$page_for_posts][$EES_Shortcode] += array($post_ID => true);
         } else {
-            \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $EES_Shortcode ] = array( $post_ID => true );
+            \EE_Registry::CFG()->core->post_shortcodes[$page_for_posts][$EES_Shortcode] = array($post_ID => true);
         }
     }
 
@@ -213,17 +213,17 @@ 
      * @param  int $ID
      * @return void
      */
-    public static function unset_post_shortcodes_on_delete( $ID )
+    public static function unset_post_shortcodes_on_delete($ID)
     {
         $update_post_shortcodes = false;
         // post on frontpage ?
         $page_for_posts = \EE_Config::get_page_for_posts();
         // looking for any references to this post
-        foreach ( \EE_Registry::CFG()->core->post_shortcodes as $post_name => $post_shortcodes ) {
+        foreach (\EE_Registry::CFG()->core->post_shortcodes as $post_name => $post_shortcodes) {
             // is this the "Posts Page" (blog) ?
-            if ( $post_name === $page_for_posts ) {
+            if ($post_name === $page_for_posts) {
                 // loop thru shortcodes registered for the posts page
-                foreach ( $post_shortcodes as $shortcode_class => $shortcode_posts ) {
+                foreach ($post_shortcodes as $shortcode_class => $shortcode_posts) {
                     $update_post_shortcodes = PostShortcodeTracking::unset_posts_page_shortcode_for_post(
                         $ID,
                         $shortcode_class,
@@ -236,17 +236,17 @@ 
                 }
             } else {
                 // loop thru shortcodes registered for each page
-                foreach ( $post_shortcodes as $shortcode_class => $post_ID ) {
+                foreach ($post_shortcodes as $shortcode_class => $post_ID) {
                     // if this is page is being deleted, then don't track any post shortcodes for it
-                    if ( $post_ID === $ID ) {
-                        unset( \EE_Registry::CFG()->core->post_shortcodes[ $post_name ] );
+                    if ($post_ID === $ID) {
+                        unset(\EE_Registry::CFG()->core->post_shortcodes[$post_name]);
                         $update_post_shortcodes = true;
                     }
                 }
             }
         }
-        if ( $update_post_shortcodes ) {
-            PostShortcodeTracking::update_post_shortcodes( $page_for_posts );
+        if ($update_post_shortcodes) {
+            PostShortcodeTracking::update_post_shortcodes($page_for_posts);
         }
     }
 
@@ -271,20 +271,20 @@ 
         $update_post_shortcodes = false
     ) {
         // make sure that an array of post IDs is being tracked for each  shortcode
-        if ( ! is_array( $shortcode_posts ) ) {
-            \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $shortcode_class ] = array(
+        if ( ! is_array($shortcode_posts)) {
+            \EE_Registry::CFG()->core->post_shortcodes[$page_for_posts][$shortcode_class] = array(
                 $shortcode_posts => true,
             );
             $update_post_shortcodes = true;
         }
         // now if the ID of the post being deleted is in the $shortcode_posts array
-        if ( is_array( $shortcode_posts ) && isset( $shortcode_posts[ $ID ] ) ) {
-            unset( \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $shortcode_class ][ $ID ] );
+        if (is_array($shortcode_posts) && isset($shortcode_posts[$ID])) {
+            unset(\EE_Registry::CFG()->core->post_shortcodes[$page_for_posts][$shortcode_class][$ID]);
             $update_post_shortcodes = true;
         }
         // if nothing is registered for that shortcode anymore, then delete the shortcode altogether
-        if ( empty( \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $shortcode_class ] ) ) {
-            unset( \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $shortcode_class ] );
+        if (empty(\EE_Registry::CFG()->core->post_shortcodes[$page_for_posts][$shortcode_class])) {
+            unset(\EE_Registry::CFG()->core->post_shortcodes[$page_for_posts][$shortcode_class]);
             $update_post_shortcodes = true;
         }
         return $update_post_shortcodes;
@@ -299,10 +299,10 @@ 
      * @param $page_for_posts
      * @return    void
      */
-    public static function update_post_shortcodes( $page_for_posts = '' )
+    public static function update_post_shortcodes($page_for_posts = '')
     {
         // make sure page_for_posts is set
-        $page_for_posts = ! empty( $page_for_posts )
+        $page_for_posts = ! empty($page_for_posts)
             ? $page_for_posts
             : \EE_Config::get_page_for_posts();
         // allow others to mess stuff up :D
@@ -318,40 +318,40 @@ 
             $page_for_posts
         );
         // verify that post_shortcodes is set
-        \EE_Config::instance()->core->post_shortcodes = isset( \EE_Config::instance()->core->post_shortcodes )
-                                                        && is_array( \EE_Config::instance()->core->post_shortcodes )
+        \EE_Config::instance()->core->post_shortcodes = isset(\EE_Config::instance()->core->post_shortcodes)
+                                                        && is_array(\EE_Config::instance()->core->post_shortcodes)
             ? \EE_Config::instance()->core->post_shortcodes
             : array();
         // cycle thru post_shortcodes
-        foreach ( \EE_Config::instance()->core->post_shortcodes as $post_name => $shortcodes ) {
+        foreach (\EE_Config::instance()->core->post_shortcodes as $post_name => $shortcodes) {
             // are there any shortcodes to track ?
-            if ( ! empty( $shortcodes ) ) {
+            if ( ! empty($shortcodes)) {
                 // skip the posts page, because we want all shortcodes registered for it
-                if ( $post_name === $page_for_posts ) {
+                if ($post_name === $page_for_posts) {
                     continue;
                 }
                 // loop thru list of tracked shortcodes
-                foreach ( $shortcodes as $shortcode => $post_id ) {
+                foreach ($shortcodes as $shortcode => $post_id) {
                     // make sure post still exists
-                    $post = get_post( $post_id );
+                    $post = get_post($post_id);
                     // check that the post name matches what we have saved
-                    if ( $post && $post->post_name === $post_name ) {
+                    if ($post && $post->post_name === $post_name) {
                         // if so, then break before hitting the unset below
                         continue;
                     }
                     // we don't like missing posts around here >:(
-                    unset( \EE_Config::instance()->core->post_shortcodes[ $post_name ] );
+                    unset(\EE_Config::instance()->core->post_shortcodes[$post_name]);
                 }
             } else {
                 // you got no shortcodes to keep track of !
-                unset( \EE_Config::instance()->core->post_shortcodes[ $post_name ] );
+                unset(\EE_Config::instance()->core->post_shortcodes[$post_name]);
             }
         }
         // critical page shortcodes that we do NOT want added to the Posts page (blog)
         $critical_shortcodes = \EE_Config::instance()->core->get_critical_pages_shortcodes_array();
-        $critical_shortcodes = array_flip( $critical_shortcodes );
-        foreach ( $critical_shortcodes as $critical_shortcode ) {
-            unset( \EE_Config::instance()->core->post_shortcodes[ $page_for_posts ][ $critical_shortcode ] );
+        $critical_shortcodes = array_flip($critical_shortcodes);
+        foreach ($critical_shortcodes as $critical_shortcode) {
+            unset(\EE_Config::instance()->core->post_shortcodes[$page_for_posts][$critical_shortcode]);
         }
         //only show errors
         \EE_Config::instance()->update_espresso_config();
@@ -370,9 +370,9 @@ 
      * @param  string $value
      * @return void
      */
-    public static function reset_page_for_posts_on_initial_set( $option, $value )
+    public static function reset_page_for_posts_on_initial_set($option, $value)
     {
-        PostShortcodeTracking::reset_page_for_posts_on_change( $option, '', $value );
+        PostShortcodeTracking::reset_page_for_posts_on_change($option, '', $value);
     }
 
 
@@ -388,14 +388,14 @@ 
      * @param  string $value
      * @return void
      */
-    public static function reset_page_for_posts_on_change( $option, $old_value = '', $value = '' )
+    public static function reset_page_for_posts_on_change($option, $old_value = '', $value = '')
     {
-        if ( $option === 'page_for_posts' ) {
+        if ($option === 'page_for_posts') {
             global $wpdb;
             $table = $wpdb->posts;
             $SQL = "SELECT post_name from $table WHERE post_type='posts' OR post_type='page' AND post_status='publish' AND ID=%d";
-            $new_page_for_posts = $value ? $wpdb->get_var( $wpdb->prepare( $SQL, $value ) ) : 'posts';
-            PostShortcodeTracking::set_post_shortcodes_for_posts_page( $new_page_for_posts );
+            $new_page_for_posts = $value ? $wpdb->get_var($wpdb->prepare($SQL, $value)) : 'posts';
+            PostShortcodeTracking::set_post_shortcodes_for_posts_page($new_page_for_posts);
         }
     }
 
@@ -410,10 +410,10 @@ 
      * @param  string $option
      * @return void
      */
-    public static function reset_page_for_posts_on_delete( $option )
+    public static function reset_page_for_posts_on_delete($option)
     {
-        if ( $option === 'page_for_posts' ) {
-            PostShortcodeTracking::set_post_shortcodes_for_posts_page( 'posts' );
+        if ($option === 'page_for_posts') {
+            PostShortcodeTracking::set_post_shortcodes_for_posts_page('posts');
         }
     }
 
@@ -426,37 +426,37 @@ 
      *                                    the shortcodes. If false, then the returned array will be unindexed
      * @return array
      */
-    public static function get_post_ids_for_shortcode( $shortcodes, $index_results = true )
+    public static function get_post_ids_for_shortcode($shortcodes, $index_results = true)
     {
         $post_ids = array();
-        if ( is_array( $shortcodes ) ) {
-            foreach ( $shortcodes as $shortcode ) {
+        if (is_array($shortcodes)) {
+            foreach ($shortcodes as $shortcode) {
                 $new_post_ids = PostShortcodeTracking::get_post_ids_for_shortcode(
                     $shortcode,
                     $index_results
                 );
-                foreach ( $new_post_ids as $new_post_id ) {
-                    if ( $index_results ) {
-                        $post_ids[ $shortcode ][ $new_post_id ] = $new_post_id;
+                foreach ($new_post_ids as $new_post_id) {
+                    if ($index_results) {
+                        $post_ids[$shortcode][$new_post_id] = $new_post_id;
                     } else {
-                        $post_ids[ $new_post_id ] = $new_post_id;
+                        $post_ids[$new_post_id] = $new_post_id;
                     }
                 }
             }
         } else {
-            $shortcode = strtoupper( $shortcodes );
-            $shortcode = strpos( $shortcode, 'ESPRESSO_' ) !== 0 ? "ESPRESSO_{$shortcode}" : $shortcode;
+            $shortcode = strtoupper($shortcodes);
+            $shortcode = strpos($shortcode, 'ESPRESSO_') !== 0 ? "ESPRESSO_{$shortcode}" : $shortcode;
             $page_for_posts = \EE_Config::get_page_for_posts();
             // looking for any references to this post
-            foreach ( \EE_Registry::CFG()->core->post_shortcodes as $post_name => $post_shortcodes ) {
+            foreach (\EE_Registry::CFG()->core->post_shortcodes as $post_name => $post_shortcodes) {
                 // if this is the "Posts Page" (blog), then skip it
-                if ( $post_name === $page_for_posts ) {
+                if ($post_name === $page_for_posts) {
                     continue;
                 }
                 // loop thru shortcodes registered for each page, and grab post id for matches
-                foreach ( (array) $post_shortcodes as $post_shortcode => $post_ID ) {
-                    if ( $post_shortcode === $shortcode ) {
-                        $post_ids[ $post_ID ] = $post_ID;
+                foreach ((array) $post_shortcodes as $post_shortcode => $post_ID) {
+                    if ($post_shortcode === $shortcode) {
+                        $post_ids[$post_ID] = $post_ID;
                     }
                 }
             }

admin_pages/general_settings/templates/countries_settings.template.php

Spacing +4 added lines, -4 removed lines

@@ -5,10 +5,10 @@ 
 ?>
 <div class="padding">
 
-	<h2 class="ee-admin-settings-hdr"><?php _e('Countries and States/Provinces', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('country_select_info');?></h2>
+	<h2 class="ee-admin-settings-hdr"><?php _e('Countries and States/Provinces', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('country_select_info'); ?></h2>
 	<table class="form-table">
 		<tbody>
-        <?php echo EEH_Form_Fields::generate_form_input( $countries ); ?>
+        <?php echo EEH_Form_Fields::generate_form_input($countries); ?>
 		</tbody>
 	</table>
 	<br/>
@@ -16,12 +16,12 @@ 
         <?php _e('The country that is selected above will populate the Country Details settings and the options for States/Provinces. This information will be used throughout Event Espresso including for registration purposes and how currency is displayed. If you make a change to the country on this page, it is important that you also update your Contact Information on the Your Organization tab.', 'event_espresso'); ?>
 	</p>
 	<div id="country-details-settings-dv">
-		<h2 class="ee-admin-settings-hdr"><?php _e('Country Details', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('country_details_info');?></h2>
+		<h2 class="ee-admin-settings-hdr"><?php _e('Country Details', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('country_details_info'); ?></h2>
 		<div id="country-details-dv"><?php  echo $country_details_settings; ?></div>
 	</div>
 
 	<div id="country-states-settings-dv">
-		<h2 class="ee-admin-settings-hdr"><?php _e( 'States/Provinces', 'event_espresso' );?> <?php echo EEH_Template::get_help_tab_link('country_states_info');?></h2>
+		<h2 class="ee-admin-settings-hdr"><?php _e('States/Provinces', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('country_states_info'); ?></h2>
 		<div id="country-states-dv"><?php  echo $country_states_settings; ?></div>
 	</div>
 

admin_pages/general_settings/templates/admin_option_settings.template.php

Spacing +5 added lines, -5 removed lines

@@ -6,7 +6,7 @@ 
 ?>
 <div class="padding">
 
-	<?php do_action( 'AHEE__admin_option_settings__template__before', $template_args ); ?>
+	<?php do_action('AHEE__admin_option_settings__template__before', $template_args); ?>
 
 	<?php /* @todo put back once we have a dashboard widget to use
 	<h2 class="ee-admin-settings-hdr">
@@ -71,7 +71,7 @@ 
 	</table>
 <?php endif; */ ?>
 
-	<?php if ( EE_Registry::instance()->CAP->current_user_can( 'manage_options', 'display_admin_settings_options_promote_and_affiliate' ) ) : ?>
+	<?php if (EE_Registry::instance()->CAP->current_user_can('manage_options', 'display_admin_settings_options_promote_and_affiliate')) : ?>
 		<h2 class="ee-admin-settings-hdr">
 			<?php _e('Promote Event Espresso', 'event_espresso'); ?> <span id="affiliate_info"><?php echo EEH_Template::get_help_tab_link('affiliate_info'); ?></span>
 		</h2>
@@ -86,14 +86,14 @@ 
 						</label>
 					</th>
 					<td>
-						<?php echo EEH_Form_Fields::select_input('show_reg_footer', $values, $show_reg_footer ); ?>
+						<?php echo EEH_Form_Fields::select_input('show_reg_footer', $values, $show_reg_footer); ?>
 					</td>
 				</tr>
 
 				<tr>
 					<th>
                         <label for="affiliate_id">
-                        <?php printf( __('Event Espresso %sAffiliate%s ID', 'event_espresso'), '<a href="http://eventespresso.com/affiliates/" target="_blank">', '</a>' ); ?>
+                        <?php printf(__('Event Espresso %sAffiliate%s ID', 'event_espresso'), '<a href="http://eventespresso.com/affiliates/" target="_blank">', '</a>'); ?>
                         </label>
                     </th>
 					<td>
@@ -123,7 +123,7 @@ 
 					</label>
 				</th>
 				<td>
-					<?php echo EEH_Form_Fields::select_input('help_tour_activation', $values, $help_tour_activation ); ?>
+					<?php echo EEH_Form_Fields::select_input('help_tour_activation', $values, $help_tour_activation); ?>
 				</td>
 			</tr>
 		</tbody>

core/libraries/messages/data_class/EE_Messages_Registrations_incoming_data.class.php

Spacing +14 added lines, -14 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
 
 /**
  * This prepares data for message types that send messages for multiple registrations (that could span multiple
@@ -20,13 +20,13 @@ 
 	 * @throws EE_Error
 	 * @access protected
 	 */
-	public function __construct( $data = array() ) {
+	public function __construct($data = array()) {
 
 		//validate that the first element in the array is an EE_Registration object.
-		if ( ! reset( $data ) instanceof EE_Registration ) {
-			throw new EE_Error( __( 'The EE_Message_Registrations_incoming_data class expects an array of EE_Registration objects.', 'event_espresso' ) );
+		if ( ! reset($data) instanceof EE_Registration) {
+			throw new EE_Error(__('The EE_Message_Registrations_incoming_data class expects an array of EE_Registration objects.', 'event_espresso'));
 		}
-		parent::__construct( $data );
+		parent::__construct($data);
 	}
 
 
@@ -58,10 +58,10 @@ 
 	 *
 	 * @return EE_Registration[]   The data being prepared for the db
 	 */
-	static public function convert_data_for_persistent_storage( $registrations ) {
+	static public function convert_data_for_persistent_storage($registrations) {
 		if (
-			! is_array( $registrations )
-			|| ! reset( $registrations ) instanceof EE_Registration
+			! is_array($registrations)
+			|| ! reset($registrations) instanceof EE_Registration
 		) {
 			return array();
 		}
@@ -70,8 +70,8 @@ 
 
 		$registration_ids = array_filter(
 			array_map(
-				function( $registration ) {
-					if ( $registration instanceof EE_Registration ) {
+				function($registration) {
+					if ($registration instanceof EE_Registration) {
 						return $registration->ID();
 					}
 				},
@@ -95,16 +95,16 @@ 
 	 *
 	 * @return EE_Registration[]
 	 */
-	static public function convert_data_from_persistent_storage( $data ) {
+	static public function convert_data_from_persistent_storage($data) {
 		//since this was added later, we need to account of possible back compat issues where data already queued for generation
 		//is in the old format, which is an array of EE_Registration objects.  So if that's the case, then let's just return them
 		//@see https://events.codebasehq.com/projects/event-espresso/tickets/10127
-		if ( is_array( $data ) && reset( $data ) instanceof EE_Registration ) {
+		if (is_array($data) && reset($data) instanceof EE_Registration) {
 			return $data;
 		}
 
-		$registrations = is_array( $data )
-				? EEM_Registration::instance()->get_all( array( array( 'REG_ID' => array( 'IN', $data ) ) ) )
+		$registrations = is_array($data)
+				? EEM_Registration::instance()->get_all(array(array('REG_ID' => array('IN', $data))))
 				: array();
 		return $registrations;
 	}

core/libraries/form_sections/base/EE_Form_Section_Proper.form.php

Spacing +209 added lines, -209 removed lines

@@ -7,7 +7,7 @@ 
  * before the hook wp_enqueue_scripts is called (so that the form section can enqueue its needed scripts).
  * However, you may output the form (usually by calling get_html) anywhere you like.
  */
-class EE_Form_Section_Proper extends EE_Form_Section_Validatable{
+class EE_Form_Section_Proper extends EE_Form_Section_Validatable {
 
 	const SUBMITTED_FORM_DATA_SSN_KEY = 'submitted_form_data';
 
@@ -71,49 +71,49 @@ 
 	 *                               } @see EE_Form_Section_Validatable::__construct()
 	 * @throws \EE_Error
 	 */
-	public function __construct( $options_array = array() ){
-		$options_array = (array) apply_filters( 'FHEE__EE_Form_Section_Proper___construct__options_array', $options_array, $this );
+	public function __construct($options_array = array()) {
+		$options_array = (array) apply_filters('FHEE__EE_Form_Section_Proper___construct__options_array', $options_array, $this);
 		//call parent first, as it may be setting the name
 		parent::__construct($options_array);
 		//if they've included subsections in the constructor, add them now
-		if( isset( $options_array['include'] )){
+		if (isset($options_array['include'])) {
 			//we are going to make sure we ONLY have those subsections to include
 			//AND we are going to make sure they're in that specified order
 			$reordered_subsections = array();
-			foreach($options_array['include'] as $input_name){
-				if(isset($this->_subsections[$input_name])){
+			foreach ($options_array['include'] as $input_name) {
+				if (isset($this->_subsections[$input_name])) {
 					$reordered_subsections[$input_name] = $this->_subsections[$input_name];
 				}
 			}
 			$this->_subsections = $reordered_subsections;
 		}
-		if(isset($options_array['exclude'])){
+		if (isset($options_array['exclude'])) {
 			$exclude = $options_array['exclude'];
 			$this->_subsections = array_diff_key($this->_subsections, array_flip($exclude));
 		}
-		if(isset($options_array['layout_strategy'])){
+		if (isset($options_array['layout_strategy'])) {
 			$this->_layout_strategy = $options_array['layout_strategy'];
 		}
-		if( ! $this->_layout_strategy){
+		if ( ! $this->_layout_strategy) {
 			$this->_layout_strategy = is_admin() ? new EE_Admin_Two_Column_Layout() : new EE_Two_Column_Layout();
 		}
 		$this->_layout_strategy->_construct_finalize($this);
 
 		//ok so we are definitely going to want the forms JS,
 		//so enqueue it or remember to enqueue it during wp_enqueue_scripts
-		if( did_action( 'wp_enqueue_scripts' )
-			|| did_action( 'admin_enqueue_scripts' ) ) {
+		if (did_action('wp_enqueue_scripts')
+			|| did_action('admin_enqueue_scripts')) {
 			//ok so they've constructed this object after when they should have.
 			//just enqueue the generic form scripts and initialize the form immediately in the JS
-			\EE_Form_Section_Proper::wp_enqueue_scripts( true );
+			\EE_Form_Section_Proper::wp_enqueue_scripts(true);
 		} else {
-			add_action( 'wp_enqueue_scripts', array( 'EE_Form_Section_Proper', 'wp_enqueue_scripts' ));
-			add_action( 'admin_enqueue_scripts', array( 'EE_Form_Section_Proper', 'wp_enqueue_scripts' ));
+			add_action('wp_enqueue_scripts', array('EE_Form_Section_Proper', 'wp_enqueue_scripts'));
+			add_action('admin_enqueue_scripts', array('EE_Form_Section_Proper', 'wp_enqueue_scripts'));
 		}
-		add_action( 'wp_footer', array( $this, 'ensure_scripts_localized' ), 1 );
+		add_action('wp_footer', array($this, 'ensure_scripts_localized'), 1);
 
-		if( isset( $options_array[ 'name' ] ) ) {
-			$this->_construct_finalize( null, $options_array[ 'name' ] );
+		if (isset($options_array['name'])) {
+			$this->_construct_finalize(null, $options_array['name']);
 		}
 	}
 
@@ -126,25 +126,25 @@ 
 	 * @param string                 $name
 	 * @throws \EE_Error
 	 */
-	public function _construct_finalize( $parent_form_section, $name ) {
+	public function _construct_finalize($parent_form_section, $name) {
 		parent::_construct_finalize($parent_form_section, $name);
 		$this->_set_default_name_if_empty();
 		$this->_set_default_html_id_if_empty();
-		foreach( $this->_subsections as $subsection_name => $subsection ){
-			if ( $subsection instanceof EE_Form_Section_Base ) {
-				$subsection->_construct_finalize( $this, $subsection_name );
+		foreach ($this->_subsections as $subsection_name => $subsection) {
+			if ($subsection instanceof EE_Form_Section_Base) {
+				$subsection->_construct_finalize($this, $subsection_name);
 			} else {
 				throw new EE_Error(
 					sprintf(
-						__( 'Subsection "%s" is not an instanceof EE_Form_Section_Base on form "%s". It is a "%s"', 'event_espresso' ),
+						__('Subsection "%s" is not an instanceof EE_Form_Section_Base on form "%s". It is a "%s"', 'event_espresso'),
 						$subsection_name,
 						get_class($this),
-						$subsection ? get_class($subsection) : __( 'NULL', 'event_espresso' )
+						$subsection ? get_class($subsection) : __('NULL', 'event_espresso')
 					)
 				);
 			}
 		}
-		do_action( 'AHEE__EE_Form_Section_Proper___construct_finalize__end', $this, $parent_form_section, $name );
+		do_action('AHEE__EE_Form_Section_Proper___construct_finalize__end', $this, $parent_form_section, $name);
 	}
 
 
@@ -153,7 +153,7 @@ 
 	 * Gets the layout strategy for this form section
 	 * @return EE_Form_Section_Layout_Base
 	 */
-	public function get_layout_strategy(){
+	public function get_layout_strategy() {
 		return $this->_layout_strategy;
 	}
 
@@ -165,7 +165,7 @@ 
 	 * @param EE_Form_Input_Base $input
 	 * @return string
 	 */
-	public function get_html_for_input($input){
+	public function get_html_for_input($input) {
 		return $this->_layout_strategy->layout_input($input);
 	}
 
@@ -178,7 +178,7 @@ 
 	 * @param null $form_data
 	 * @return boolean
 	 */
-	public function was_submitted($form_data = NULL){
+	public function was_submitted($form_data = NULL) {
 		return $this->form_data_present_in($form_data);
 	}
 
@@ -203,21 +203,21 @@ 
 	 *                             (eg you validated the data then stored it in the DB)
 	 *                             you may want to skip this step.
 	 */
-	public function receive_form_submission( $req_data = null, $validate = true ){
-		$req_data = apply_filters( 'FHEE__EE_Form_Section_Proper__receive_form_submission__req_data', $req_data, $this, $validate );
-		if( $req_data === null ){
-			$req_data = array_merge( $_GET, $_POST );
+	public function receive_form_submission($req_data = null, $validate = true) {
+		$req_data = apply_filters('FHEE__EE_Form_Section_Proper__receive_form_submission__req_data', $req_data, $this, $validate);
+		if ($req_data === null) {
+			$req_data = array_merge($_GET, $_POST);
 		}
-		$req_data = apply_filters( 'FHEE__EE_Form_Section_Proper__receive_form_submission__request_data', $req_data, $this );
-		$this->_normalize( $req_data );
-		if( $validate ){
+		$req_data = apply_filters('FHEE__EE_Form_Section_Proper__receive_form_submission__request_data', $req_data, $this);
+		$this->_normalize($req_data);
+		if ($validate) {
 			$this->_validate();
 			//if it's invalid, we're going to want to re-display so remember what they submitted
-			if ( ! $this->is_valid() ) {
+			if ( ! $this->is_valid()) {
 				$this->store_submitted_form_data_in_session();
 			}
 		}
-		do_action( 'AHEE__EE_Form_Section_Proper__receive_form_submission__end', $req_data, $this, $validate );
+		do_action('AHEE__EE_Form_Section_Proper__receive_form_submission__end', $req_data, $this, $validate);
 	}
 
 
@@ -231,7 +231,7 @@ 
 	protected function store_submitted_form_data_in_session() {
 		return EE_Registry::instance()->SSN->set_session_data(
 			array(
-				\EE_Form_Section_Proper::SUBMITTED_FORM_DATA_SSN_KEY => $this->submitted_values( true )
+				\EE_Form_Section_Proper::SUBMITTED_FORM_DATA_SSN_KEY => $this->submitted_values(true)
 			)
 		);
 	}
@@ -246,7 +246,7 @@ 
 	 */
 	protected function get_submitted_form_data_from_session() {
 		$session = EE_Registry::instance()->SSN;
-		if( $session instanceof EE_Session ) {
+		if ($session instanceof EE_Session) {
 			return $session->get_session_data(
 				\EE_Form_Section_Proper::SUBMITTED_FORM_DATA_SSN_KEY
 			);
@@ -264,7 +264,7 @@ 
 	 */
 	protected function flush_submitted_form_data_from_session() {
 		return EE_Registry::instance()->SSN->reset_data(
-			array( \EE_Form_Section_Proper::SUBMITTED_FORM_DATA_SSN_KEY )
+			array(\EE_Form_Section_Proper::SUBMITTED_FORM_DATA_SSN_KEY)
 		);
 	}
 
@@ -280,12 +280,12 @@ 
 	 */
 	public function populate_from_session() {
 		$form_data_in_session = $this->get_submitted_form_data_from_session();
-		if ( empty( $form_data_in_session ) ) {
+		if (empty($form_data_in_session)) {
 			return false;
 		}
-		$this->receive_form_submission( $form_data_in_session );
+		$this->receive_form_submission($form_data_in_session);
 		$this->flush_submitted_form_data_from_session();
-		if ( $this->form_data_present_in( $form_data_in_session ) ) {
+		if ($this->form_data_present_in($form_data_in_session)) {
 			return true;
 		} else {
 			return false;
@@ -302,12 +302,12 @@ 
 	 * the value being an array formatted in teh same way
 	 * @param array $default_data
 	 */
-	public function populate_defaults($default_data){
-		foreach($this->subsections() as $subsection_name => $subsection){
-			if(isset($default_data[$subsection_name])){
-				if($subsection instanceof EE_Form_Input_Base){
+	public function populate_defaults($default_data) {
+		foreach ($this->subsections() as $subsection_name => $subsection) {
+			if (isset($default_data[$subsection_name])) {
+				if ($subsection instanceof EE_Form_Input_Base) {
 					$subsection->set_default($default_data[$subsection_name]);
-				}elseif($subsection instanceof EE_Form_Section_Proper){
+				}elseif ($subsection instanceof EE_Form_Section_Proper) {
 					$subsection->populate_defaults($default_data[$subsection_name]);
 				}
 			}
@@ -322,8 +322,8 @@ 
 	 * @param string $name
 	 * @return boolean
 	 */
-	public function subsection_exists( $name ){
-		return isset( $this->_subsections[ $name ] ) ? true : false;
+	public function subsection_exists($name) {
+		return isset($this->_subsections[$name]) ? true : false;
 	}
 
 
@@ -341,11 +341,11 @@ 
 	 * @return EE_Form_Section_Base
 	 * @throws \EE_Error
 	 */
-	public function get_subsection($name, $require_construction_to_be_finalized = TRUE ){
-		if( $require_construction_to_be_finalized ){
+	public function get_subsection($name, $require_construction_to_be_finalized = TRUE) {
+		if ($require_construction_to_be_finalized) {
 			$this->ensure_construct_finalized_called();
 		}
-		return $this->subsection_exists( $name ) ? $this->_subsections[$name] : NULL;
+		return $this->subsection_exists($name) ? $this->_subsections[$name] : NULL;
 	}
 
 
@@ -354,10 +354,10 @@ 
 	 * Gets all the validatable subsections of this form section
 	 * @return EE_Form_Section_Validatable[]
 	 */
-	public function get_validatable_subsections(){
+	public function get_validatable_subsections() {
 		$validatable_subsections = array();
-		foreach($this->subsections() as $name=>$obj){
-			if($obj instanceof EE_Form_Section_Validatable){
+		foreach ($this->subsections() as $name=>$obj) {
+			if ($obj instanceof EE_Form_Section_Validatable) {
 				$validatable_subsections[$name] = $obj;
 			}
 		}
@@ -377,9 +377,9 @@ 
 	 * @return EE_Form_Input_Base
 	 * @throws EE_Error
 	 */
-	public function get_input($name, $require_construction_to_be_finalized = TRUE ){
+	public function get_input($name, $require_construction_to_be_finalized = TRUE) {
 		$subsection = $this->get_subsection($name, $require_construction_to_be_finalized);
-		if( ! $subsection instanceof EE_Form_Input_Base){
+		if ( ! $subsection instanceof EE_Form_Input_Base) {
 			throw new EE_Error(
 				sprintf(
 					__(
@@ -387,8 +387,8 @@ 
 						'event_espresso'
 					),
 					$name,
-					get_class( $this ),
-					$subsection ? get_class( $subsection ) : __( "NULL", 'event_espresso' )
+					get_class($this),
+					$subsection ? get_class($subsection) : __("NULL", 'event_espresso')
 				)
 			);
 		}
@@ -408,14 +408,14 @@ 
 	 * @return EE_Form_Section_Proper
 	 * @throws EE_Error
 	 */
-	public function get_proper_subsection($name, $require_construction_to_be_finalized = TRUE ){
-		$subsection = $this->get_subsection( $name, $require_construction_to_be_finalized );
-		if( ! $subsection instanceof EE_Form_Section_Proper){
+	public function get_proper_subsection($name, $require_construction_to_be_finalized = TRUE) {
+		$subsection = $this->get_subsection($name, $require_construction_to_be_finalized);
+		if ( ! $subsection instanceof EE_Form_Section_Proper) {
 			throw new EE_Error(
 				sprintf(
-					__( "Subsection '%'s is not an instanceof EE_Form_Section_Proper on form '%s'", 'event_espresso' ),
+					__("Subsection '%'s is not an instanceof EE_Form_Section_Proper on form '%s'", 'event_espresso'),
 					$name,
-					get_class( $this )
+					get_class($this)
 				)
 			);
 		}
@@ -432,7 +432,7 @@ 
 	 * @return mixed depending on the input's type and its normalization strategy
 	 * @throws \EE_Error
 	 */
-	public function get_input_value($name){
+	public function get_input_value($name) {
 		$input = $this->get_input($name);
 		return $input->normalized_value();
 	}
@@ -445,7 +445,7 @@ 
 	 * @return boolean
 	 */
 	public function is_valid() {
-		if( ! $this->has_received_submission()){
+		if ( ! $this->has_received_submission()) {
 			throw new EE_Error(
 				sprintf(
 					__(
@@ -455,16 +455,16 @@ 
 				)
 			);
 		}
-		if( ! parent::is_valid() ) {
+		if ( ! parent::is_valid()) {
 			return false;
 		}
 		// ok so no general errors to this entire form section.
 		// so let's check the subsections, but only set errors if that hasn't been done yet
 		$set_submission_errors = $this->submission_error_message() === '' ? true : false;
-		foreach( $this->get_validatable_subsections() as $subsection ){
-			if( ! $subsection->is_valid() || $subsection->get_validation_error_string() !== '' ){
-				if ( $set_submission_errors ) {
-					$this->set_submission_error_message( $subsection->get_validation_error_string() );
+		foreach ($this->get_validatable_subsections() as $subsection) {
+			if ( ! $subsection->is_valid() || $subsection->get_validation_error_string() !== '') {
+				if ($set_submission_errors) {
+					$this->set_submission_error_message($subsection->get_validation_error_string());
 				}
 				return false;
 			}
@@ -478,11 +478,11 @@ 
 	 * gets teh default name of this form section if none is specified
 	 * @return string
 	 */
-	protected function _set_default_name_if_empty(){
-		if( ! $this->_name ){
+	protected function _set_default_name_if_empty() {
+		if ( ! $this->_name) {
 			$classname = get_class($this);
 			$default_name = str_replace("EE_", "", $classname);
-			$this->_name =  $default_name;
+			$this->_name = $default_name;
 		}
 	}
 
@@ -498,7 +498,7 @@ 
 	 *             and get_html when you are about to display the form.
 	 * @throws \EE_Error
 	 */
-	public function get_html_and_js(){
+	public function get_html_and_js() {
 		//no doing_it_wrong yet because we ourselves are still doing it wrong...
 		//and theoretically this CAN be used properly, provided its used during "wp_enqueue_scripts"
 		$this->enqueue_js();
@@ -513,9 +513,9 @@ 
 	 * @param bool $display_previously_submitted_data
 	 * @return string
 	 */
-	public function get_html( $display_previously_submitted_data = true ){
+	public function get_html($display_previously_submitted_data = true) {
 		$this->ensure_construct_finalized_called();
-		if ( $display_previously_submitted_data ) {
+		if ($display_previously_submitted_data) {
 			$this->populate_from_session();
 		}
 		return $this->_layout_strategy->layout_form();
@@ -529,9 +529,9 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	public function enqueue_js(){
+	public function enqueue_js() {
 		$this->_enqueue_and_localize_form_js();
-		foreach( $this->subsections() as $subsection ) {
+		foreach ($this->subsections() as $subsection) {
 			$subsection->enqueue_js();
 		}
 	}
@@ -550,19 +550,19 @@ 
 	 *                                                    to be triggered automatically or not
 	 * @return void
 	 */
-	public static function wp_enqueue_scripts( $init_form_validation_automatically = true ){
-		add_filter( 'FHEE_load_jquery_validate', '__return_true' );
+	public static function wp_enqueue_scripts($init_form_validation_automatically = true) {
+		add_filter('FHEE_load_jquery_validate', '__return_true');
 		wp_register_script(
 			'ee_form_section_validation',
-			EE_GLOBAL_ASSETS_URL . 'scripts' . DS . 'form_section_validation.js',
-			array( 'jquery-validate', 'jquery-ui-datepicker', 'jquery-validate-extra-methods' ),
+			EE_GLOBAL_ASSETS_URL.'scripts'.DS.'form_section_validation.js',
+			array('jquery-validate', 'jquery-ui-datepicker', 'jquery-validate-extra-methods'),
 			EVENT_ESPRESSO_VERSION,
 			true
 		);
 		wp_localize_script(
 			'ee_form_section_validation',
 			'ee_form_section_validation_init',
-			array( 'init' => $init_form_validation_automatically ? true : false )
+			array('init' => $init_form_validation_automatically ? true : false)
 		);
 	}
 	
@@ -573,14 +573,14 @@ 
 	 *
 	 * @throws \EE_Error
 	 */
-	public function _enqueue_and_localize_form_js(){
+	public function _enqueue_and_localize_form_js() {
 		$this->ensure_construct_finalized_called();
 		//actually, we don't want to localize just yet. There may be other forms on the page.
 		//so we need to add our form section data to a static variable accessible by all form sections
 		//and localize it just before the footer
 		$this->localize_validation_rules();
-		add_action( 'wp_footer', array( 'EE_Form_Section_Proper', 'localize_script_for_all_forms' ), 2 );
-		add_action( 'admin_footer', array( 'EE_Form_Section_Proper', 'localize_script_for_all_forms' ) );
+		add_action('wp_footer', array('EE_Form_Section_Proper', 'localize_script_for_all_forms'), 2);
+		add_action('admin_footer', array('EE_Form_Section_Proper', 'localize_script_for_all_forms'));
 	}
 
 
@@ -592,12 +592,12 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	public function localize_validation_rules( $return_for_subsection = FALSE ){
+	public function localize_validation_rules($return_for_subsection = FALSE) {
 		// we only want to localize vars ONCE for the entire form,
 		// so if the form section doesn't have a parent, then it must be the top dog
-		if ( $return_for_subsection || ! $this->parent_section() ) {
-			EE_Form_Section_Proper::$_js_localization['form_data'][ $this->html_id() ] = array(
-				'form_section_id'=> $this->html_id( TRUE ),
+		if ($return_for_subsection || ! $this->parent_section()) {
+			EE_Form_Section_Proper::$_js_localization['form_data'][$this->html_id()] = array(
+				'form_section_id'=> $this->html_id(TRUE),
 				'validation_rules'=> $this->get_jquery_validation_rules(),
 				'other_data' => $this->get_other_js_data(),
 				'errors'=> $this->subsection_validation_errors_by_html_name()
@@ -613,9 +613,9 @@ 
 	 * @param array $form_other_js_data
 	 * @return array
 	 */
-	public function get_other_js_data( $form_other_js_data = array() ) {
-		foreach( $this->subsections() as $subsection ) {
-			$form_other_js_data = $subsection->get_other_js_data( $form_other_js_data );
+	public function get_other_js_data($form_other_js_data = array()) {
+		foreach ($this->subsections() as $subsection) {
+			$form_other_js_data = $subsection->get_other_js_data($form_other_js_data);
 		}
 		return $form_other_js_data;
 	}
@@ -626,12 +626,12 @@ 
 	 * Keys are their form names, and values are the inputs themselves
 	 * @return EE_Form_Input_Base
 	 */
-	public function inputs_in_subsections(){
+	public function inputs_in_subsections() {
 		$inputs = array();
-		foreach($this->subsections() as $subsection){
-			if( $subsection instanceof EE_Form_Input_Base ){
-				$inputs[ $subsection->html_name() ] = $subsection;
-			}elseif($subsection instanceof EE_Form_Section_Proper ){
+		foreach ($this->subsections() as $subsection) {
+			if ($subsection instanceof EE_Form_Input_Base) {
+				$inputs[$subsection->html_name()] = $subsection;
+			}elseif ($subsection instanceof EE_Form_Section_Proper) {
 				$inputs += $subsection->inputs_in_subsections();
 			}
 		}
@@ -644,12 +644,12 @@ 
 	 * and values are a string of all their validation errors
 	 * @return string[]
 	 */
-	public function subsection_validation_errors_by_html_name(){
+	public function subsection_validation_errors_by_html_name() {
 		$inputs = $this->inputs();
 		$errors = array();
-		foreach( $inputs as $form_input ){
-			if ( $form_input instanceof EE_Form_Input_Base && $form_input->get_validation_errors() ){
-				$errors[ $form_input->html_name() ] = $form_input->get_validation_error_string();
+		foreach ($inputs as $form_input) {
+			if ($form_input instanceof EE_Form_Input_Base && $form_input->get_validation_errors()) {
+				$errors[$form_input->html_name()] = $form_input->get_validation_error_string();
 			}
 		}
 		return $errors;
@@ -661,15 +661,15 @@ 
 	 * passes all the form data required by the JS to the JS, and enqueues the few required JS files.
 	 * Should be setup by each form during the _enqueues_and_localize_form_js
 	 */
-	public static function localize_script_for_all_forms(){
+	public static function localize_script_for_all_forms() {
 		//allow inputs and stuff to hook in their JS and stuff here
-		do_action( 'AHEE__EE_Form_Section_Proper__localize_script_for_all_forms__begin' );
+		do_action('AHEE__EE_Form_Section_Proper__localize_script_for_all_forms__begin');
 		EE_Form_Section_Proper::$_js_localization['localized_error_messages'] = EE_Form_Section_Proper::_get_localized_error_messages();
-		$email_validation_level = isset( EE_Registry::instance()->CFG->registration->email_validation_level )
+		$email_validation_level = isset(EE_Registry::instance()->CFG->registration->email_validation_level)
 			? EE_Registry::instance()->CFG->registration->email_validation_level
 			: 'wp_default';
 		EE_Form_Section_Proper::$_js_localization['email_validation_level'] = $email_validation_level;
-		wp_enqueue_script( 'ee_form_section_validation' );
+		wp_enqueue_script('ee_form_section_validation');
 		wp_localize_script(
 			'ee_form_section_validation',
 			'ee_form_section_vars',
@@ -682,8 +682,8 @@ 
 	/**
 	 * ensure_scripts_localized
 	 */
-	public function ensure_scripts_localized(){
-		if ( ! EE_Form_Section_Proper::$_scripts_localized ) {
+	public function ensure_scripts_localized() {
+		if ( ! EE_Form_Section_Proper::$_scripts_localized) {
 			$this->_enqueue_and_localize_form_js();
 		}
 	}
@@ -695,10 +695,10 @@ 
 	 * is that the key here should be the same as the custom validation rule put in the JS file
 	 * @return array keys are custom validation rules, and values are internationalized strings
 	 */
-	private static function _get_localized_error_messages(){
+	private static function _get_localized_error_messages() {
 		return array(
 			'validUrl'=>  __("This is not a valid absolute URL. Eg, http://domain.com/monkey.jpg", "event_espresso"),
-			'regex' => __( 'Please check your input', 'event_espresso' ),
+			'regex' => __('Please check your input', 'event_espresso'),
 		);
 	}
 
@@ -728,9 +728,9 @@ 
 	 *
 	 * @return array
 	 */
-	public function get_jquery_validation_rules(){
+	public function get_jquery_validation_rules() {
 		$jquery_validation_rules = array();
-		foreach($this->get_validatable_subsections() as $subsection){
+		foreach ($this->get_validatable_subsections() as $subsection) {
 			$jquery_validation_rules = array_merge(
 				$jquery_validation_rules,
 				$subsection->get_jquery_validation_rules()
@@ -747,14 +747,14 @@ 
 	 * @param array $req_data like $_POST
 	 * @return void
 	 */
-	protected function _normalize( $req_data ) {
+	protected function _normalize($req_data) {
 		$this->_received_submission = true;
 		$this->_validation_errors = array();
-		foreach ( $this->get_validatable_subsections() as $subsection ) {
+		foreach ($this->get_validatable_subsections() as $subsection) {
 			try {
-				$subsection->_normalize( $req_data );
-			} catch ( EE_Validation_Error $e ) {
-				$subsection->add_validation_error( $e );
+				$subsection->_normalize($req_data);
+			} catch (EE_Validation_Error $e) {
+				$subsection->add_validation_error($e);
 			}
 		}
 	}
@@ -771,9 +771,9 @@ 
 	 * calling parent::_validate() first.
 	 */
 	protected function _validate() {
-		foreach($this->get_validatable_subsections() as $subsection_name => $subsection){
-			if(method_exists($this,'_validate_'.$subsection_name)){
-				call_user_func_array(array($this,'_validate_'.$subsection_name), array($subsection));
+		foreach ($this->get_validatable_subsections() as $subsection_name => $subsection) {
+			if (method_exists($this, '_validate_'.$subsection_name)) {
+				call_user_func_array(array($this, '_validate_'.$subsection_name), array($subsection));
 			}
 			$subsection->_validate();
 		}
@@ -785,13 +785,13 @@ 
 	 * Gets all the validated inputs for the form section
 	 * @return array
 	 */
-	public function valid_data(){
+	public function valid_data() {
 		$inputs = array();
-		foreach( $this->subsections() as $subsection_name =>$subsection ){
-			if ( $subsection instanceof EE_Form_Section_Proper ) {
-				$inputs[ $subsection_name ] = $subsection->valid_data();
-			} else if ( $subsection instanceof EE_Form_Input_Base ){
-				$inputs[ $subsection_name ] = $subsection->normalized_value();
+		foreach ($this->subsections() as $subsection_name =>$subsection) {
+			if ($subsection instanceof EE_Form_Section_Proper) {
+				$inputs[$subsection_name] = $subsection->valid_data();
+			} else if ($subsection instanceof EE_Form_Input_Base) {
+				$inputs[$subsection_name] = $subsection->normalized_value();
 			}
 		}
 		return $inputs;
@@ -803,11 +803,11 @@ 
 	 * Gets all the inputs on this form section
 	 * @return EE_Form_Input_Base[]
 	 */
-	public function inputs(){
+	public function inputs() {
 		$inputs = array();
-		foreach( $this->subsections() as $subsection_name =>$subsection ){
-			if ( $subsection instanceof EE_Form_Input_Base ){
-				$inputs[ $subsection_name ] = $subsection;
+		foreach ($this->subsections() as $subsection_name =>$subsection) {
+			if ($subsection instanceof EE_Form_Input_Base) {
+				$inputs[$subsection_name] = $subsection;
 			}
 		}
 		return $inputs;
@@ -819,10 +819,10 @@ 
 	 * Gets all the subsections which are a proper form
 	 * @return EE_Form_Section_Proper[]
 	 */
-	public function subforms(){
+	public function subforms() {
 		$form_sections = array();
-		foreach($this->subsections() as $name=>$obj){
-			if($obj instanceof EE_Form_Section_Proper){
+		foreach ($this->subsections() as $name=>$obj) {
+			if ($obj instanceof EE_Form_Section_Proper) {
 				$form_sections[$name] = $obj;
 			}
 		}
@@ -837,7 +837,7 @@ 
 	 * if you only want form inputs or proper form sections.
 	 * @return EE_Form_Section_Proper[]
 	 */
-	public function subsections(){
+	public function subsections() {
 		$this->ensure_construct_finalized_called();
 		return $this->_subsections;
 	}
@@ -859,8 +859,8 @@ 
 	 *                                        where keys are always subsection names and values are either
 	 *                                        the input's normalized value, or an array like the top-level array
 	 */
-	public function input_values( $include_subform_inputs = false, $flatten = false ){
-		return $this->_input_values( false, $include_subform_inputs, $flatten );
+	public function input_values($include_subform_inputs = false, $flatten = false) {
+		return $this->_input_values(false, $include_subform_inputs, $flatten);
 	}
 
 	/**
@@ -880,8 +880,8 @@ 
 	 *                                        where keys are always subsection names and values are either
 	 *                                        the input's normalized value, or an array like the top-level array
 	 */
-	public function input_pretty_values(  $include_subform_inputs = false, $flatten = false ){
-		return $this->_input_values( true, $include_subform_inputs, $flatten );
+	public function input_pretty_values($include_subform_inputs = false, $flatten = false) {
+		return $this->_input_values(true, $include_subform_inputs, $flatten);
 	}
 
 	/**
@@ -899,19 +899,19 @@ 
 	 *                                        where keys are always subsection names and values are either
 	 *                                        the input's normalized value, or an array like the top-level array
 	 */
-	public function _input_values( $pretty = false, $include_subform_inputs = false, $flatten = false ) {
+	public function _input_values($pretty = false, $include_subform_inputs = false, $flatten = false) {
 		$input_values = array();
-		foreach( $this->subsections() as $subsection_name => $subsection ) {
-			if( $subsection instanceof EE_Form_Input_Base ) {
-				$input_values[ $subsection_name ] = $pretty
+		foreach ($this->subsections() as $subsection_name => $subsection) {
+			if ($subsection instanceof EE_Form_Input_Base) {
+				$input_values[$subsection_name] = $pretty
 					? $subsection->pretty_value()
 					: $subsection->normalized_value();
-			} else if( $subsection instanceof EE_Form_Section_Proper && $include_subform_inputs ) {
-				$subform_input_values = $subsection->_input_values( $pretty, $include_subform_inputs, $flatten );
-				if( $flatten ) {
-					$input_values = array_merge( $input_values, $subform_input_values );
+			} else if ($subsection instanceof EE_Form_Section_Proper && $include_subform_inputs) {
+				$subform_input_values = $subsection->_input_values($pretty, $include_subform_inputs, $flatten);
+				if ($flatten) {
+					$input_values = array_merge($input_values, $subform_input_values);
 				} else {
-					$input_values[ $subsection_name ] = $subform_input_values;
+					$input_values[$subsection_name] = $subform_input_values;
 				}
 			}
 		}
@@ -932,23 +932,23 @@ 
 	 *                                   where keys are always subsection names and values are either
 	 *                                   the input's normalized value, or an array like the top-level array
 	 */
-	public function submitted_values( $include_subforms = false ) {
+	public function submitted_values($include_subforms = false) {
 		$submitted_values = array();
-		foreach( $this->subsections() as $subsection ) {
-			if( $subsection instanceof EE_Form_Input_Base ) {
+		foreach ($this->subsections() as $subsection) {
+			if ($subsection instanceof EE_Form_Input_Base) {
 				// is this input part of an array of inputs?
-				if ( strpos( $subsection->html_name(), '[' ) !== false ) {
+				if (strpos($subsection->html_name(), '[') !== false) {
 					$full_input_name = \EEH_Array::convert_array_values_to_keys(
-						explode( '[', str_replace( ']', '', $subsection->html_name() ) ),
+						explode('[', str_replace(']', '', $subsection->html_name())),
 						$subsection->raw_value()
 					);
-					$submitted_values = array_replace_recursive( $submitted_values, $full_input_name );
+					$submitted_values = array_replace_recursive($submitted_values, $full_input_name);
 				} else {
-					$submitted_values[ $subsection->html_name() ] = $subsection->raw_value();
+					$submitted_values[$subsection->html_name()] = $subsection->raw_value();
 				}
-			} else if( $subsection instanceof EE_Form_Section_Proper && $include_subforms ) {
-				$subform_input_values = $subsection->submitted_values( $include_subforms );
-				$submitted_values = array_replace_recursive( $submitted_values, $subform_input_values );
+			} else if ($subsection instanceof EE_Form_Section_Proper && $include_subforms) {
+				$subform_input_values = $subsection->submitted_values($include_subforms);
+				$submitted_values = array_replace_recursive($submitted_values, $subform_input_values);
 			}
 		}
 		return $submitted_values;
@@ -963,7 +963,7 @@ 
 	 * @return boolean
 	 * @throws \EE_Error
 	 */
-	public function has_received_submission(){
+	public function has_received_submission() {
 		$this->ensure_construct_finalized_called();
 		return $this->_received_submission;
 	}
@@ -976,8 +976,8 @@ 
 	 * @param array $inputs_to_exclude values are the input names
 	 * @return void
 	 */
-	public function exclude($inputs_to_exclude = array()){
-		foreach($inputs_to_exclude as $input_to_exclude_name){
+	public function exclude($inputs_to_exclude = array()) {
+		foreach ($inputs_to_exclude as $input_to_exclude_name) {
 			unset($this->_subsections[$input_to_exclude_name]);
 		}
 	}
@@ -988,8 +988,8 @@ 
 	 * @param array $inputs_to_hide
 	 * @throws \EE_Error
 	 */
-	public function hide($inputs_to_hide= array()){
-		foreach($inputs_to_hide as $input_to_hide){
+	public function hide($inputs_to_hide = array()) {
+		foreach ($inputs_to_hide as $input_to_hide) {
 			$input = $this->get_input($input_to_hide);
 
 			$input->set_display_strategy(new EE_Hidden_Display_Strategy());
@@ -1019,21 +1019,21 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	public function add_subsections( $new_subsections, $subsection_name_to_target = NULL, $add_before = true ){
-		foreach( $new_subsections as $subsection_name => $subsection ){
-			if( ! $subsection instanceof EE_Form_Section_Base ){
+	public function add_subsections($new_subsections, $subsection_name_to_target = NULL, $add_before = true) {
+		foreach ($new_subsections as $subsection_name => $subsection) {
+			if ( ! $subsection instanceof EE_Form_Section_Base) {
 				EE_Error::add_error(
 					sprintf(
 						__(
 							"Trying to add a %s as a subsection (it was named '%s') to the form section '%s'. It was removed.",
 							"event_espresso"
 						),
-						get_class( $subsection ),
+						get_class($subsection),
 						$subsection_name,
 						$this->name()
 					)
 				);
-				unset( $new_subsections[ $subsection_name ] );
+				unset($new_subsections[$subsection_name]);
 			}
 		}
 		$this->_subsections = EEH_Array::insert_into_array(
@@ -1044,8 +1044,8 @@ 
 		);
 
 
-		if( $this->_construction_finalized ){
-			foreach($this->_subsections as $name => $subsection){
+		if ($this->_construction_finalized) {
+			foreach ($this->_subsections as $name => $subsection) {
 				$subsection->_construct_finalize($this, $name);
 			}
 		}
@@ -1056,8 +1056,8 @@ 
 	/**
 	 * Just gets all validatable subsections to clean their sensitive data
 	 */
-	public function clean_sensitive_data(){
-		foreach($this->get_validatable_subsections() as $subsection){
+	public function clean_sensitive_data() {
+		foreach ($this->get_validatable_subsections() as $subsection) {
 			$subsection->clean_sensitive_data();
 		}
 	}
@@ -1067,10 +1067,10 @@ 
 	/**
 	 * @param string $form_submission_error_message
 	 */
-	public function set_submission_error_message( $form_submission_error_message = '' ) {
-		$this->_form_submission_error_message .= ! empty( $form_submission_error_message )
+	public function set_submission_error_message($form_submission_error_message = '') {
+		$this->_form_submission_error_message .= ! empty($form_submission_error_message)
 			? $form_submission_error_message
-			: __( 'Form submission failed due to errors', 'event_espresso' );
+			: __('Form submission failed due to errors', 'event_espresso');
 	}
 
 
@@ -1087,10 +1087,10 @@ 
 	/**
 	 * @param string $form_submission_success_message
 	 */
-	public function set_submission_success_message( $form_submission_success_message ) {
-		$this->_form_submission_success_message .= ! empty( $form_submission_success_message )
+	public function set_submission_success_message($form_submission_success_message) {
+		$this->_form_submission_success_message .= ! empty($form_submission_success_message)
 			? $form_submission_success_message
-			: __( 'Form submitted successfully', 'event_espresso' );
+			: __('Form submitted successfully', 'event_espresso');
 	}
 
 
@@ -1113,10 +1113,10 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	public function html_name_prefix(){
-		if( $this->parent_section() instanceof EE_Form_Section_Proper ){
-			return $this->parent_section()->html_name_prefix() . '[' . $this->name() . ']';
-		}else{
+	public function html_name_prefix() {
+		if ($this->parent_section() instanceof EE_Form_Section_Proper) {
+			return $this->parent_section()->html_name_prefix().'['.$this->name().']';
+		} else {
 			return $this->name();
 		}
 	}
@@ -1131,7 +1131,7 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	public function name(){
+	public function name() {
 		$this->ensure_construct_finalized_called();
 		return parent::name();
 	}
@@ -1142,7 +1142,7 @@ 
 	 * @return EE_Form_Section_Proper
 	 * @throws \EE_Error
 	 */
-	public function parent_section(){
+	public function parent_section() {
 		$this->ensure_construct_finalized_called();
 		return parent::parent_section();
 	}
@@ -1155,9 +1155,9 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	public function ensure_construct_finalized_called(){
-		if( ! $this->_construction_finalized ){
-			$this->_construct_finalize($this->_parent_section, $this->_name );
+	public function ensure_construct_finalized_called() {
+		if ( ! $this->_construction_finalized) {
+			$this->_construct_finalize($this->_parent_section, $this->_name);
 		}
 	}
 
@@ -1169,17 +1169,17 @@ 
 	 * @param array $req_data
 	 * @return boolean
 	 */
-	public function form_data_present_in( $req_data = NULL ) {
-		if( $req_data === NULL){
+	public function form_data_present_in($req_data = NULL) {
+		if ($req_data === NULL) {
 			$req_data = $_POST;
 		}
-		foreach( $this->subsections() as $subsection ) {
-			if($subsection instanceof EE_Form_Input_Base ) {
-				if( $subsection->form_data_present_in( $req_data ) ) {
+		foreach ($this->subsections() as $subsection) {
+			if ($subsection instanceof EE_Form_Input_Base) {
+				if ($subsection->form_data_present_in($req_data)) {
 					return TRUE;
 				}
-			}elseif( $subsection instanceof EE_Form_Section_Proper ) {
-				if( $subsection->form_data_present_in( $req_data ) ) {
+			}elseif ($subsection instanceof EE_Form_Section_Proper) {
+				if ($subsection->form_data_present_in($req_data)) {
 					return TRUE;
 				}
 			}
@@ -1196,14 +1196,14 @@ 
 	 */
 	public function get_validation_errors_accumulated() {
 		$validation_errors = $this->get_validation_errors();
-		foreach($this->get_validatable_subsections() as $subsection ) {
-			if( $subsection instanceof EE_Form_Section_Proper ) {
+		foreach ($this->get_validatable_subsections() as $subsection) {
+			if ($subsection instanceof EE_Form_Section_Proper) {
 				$validation_errors_on_this_subsection = $subsection->get_validation_errors_accumulated();
 			} else {
-				$validation_errors_on_this_subsection =  $subsection->get_validation_errors();
+				$validation_errors_on_this_subsection = $subsection->get_validation_errors();
 			}
-			if( $validation_errors_on_this_subsection ){
-				$validation_errors = array_merge( $validation_errors, $validation_errors_on_this_subsection );
+			if ($validation_errors_on_this_subsection) {
+				$validation_errors = array_merge($validation_errors, $validation_errors_on_this_subsection);
 			}
 		}
 		return $validation_errors;
@@ -1225,24 +1225,24 @@ 
 	 * @param string|false $form_section_path we accept false also because substr( '../', '../' ) = false
 	 * @return EE_Form_Section_Base
 	 */
-	public function find_section_from_path( $form_section_path ) {
+	public function find_section_from_path($form_section_path) {
 		//check if we can find the input from purely going straight up the tree
-		$input = parent::find_section_from_path( $form_section_path );
-		if( $input instanceof EE_Form_Section_Base ) {
+		$input = parent::find_section_from_path($form_section_path);
+		if ($input instanceof EE_Form_Section_Base) {
 			return $input;
 		}
 
-		$next_slash_pos = strpos( $form_section_path, '/' );
-		if( $next_slash_pos !== false ) {
-			$child_section_name = substr( $form_section_path, 0, $next_slash_pos );
-			$subpath = substr( $form_section_path, $next_slash_pos + 1 );
+		$next_slash_pos = strpos($form_section_path, '/');
+		if ($next_slash_pos !== false) {
+			$child_section_name = substr($form_section_path, 0, $next_slash_pos);
+			$subpath = substr($form_section_path, $next_slash_pos + 1);
 		} else {
 			$child_section_name = $form_section_path;
 			$subpath = '';
 		}
-		$child_section =  $this->get_subsection( $child_section_name );
-		if ( $child_section instanceof EE_Form_Section_Base ) {
-			return $child_section->find_section_from_path( $subpath );
+		$child_section = $this->get_subsection($child_section_name);
+		if ($child_section instanceof EE_Form_Section_Base) {
+			return $child_section->find_section_from_path($subpath);
 		} else {
 			return null;
 		}

core/libraries/form_sections/inputs/EE_Form_Input_Base.input.php

Spacing +148 added lines, -148 removed lines

@@ -8,7 +8,7 @@ 
  * @subpackage
  * @author				Mike Nelson
  */
-abstract class EE_Form_Input_Base extends EE_Form_Section_Validatable{
+abstract class EE_Form_Input_Base extends EE_Form_Section_Validatable {
 
 	/**
 	 * the input's name attribute
@@ -143,54 +143,54 @@ 
 	 *  @type EE_Validation_Strategy_Base[]  $validation_strategies
 	 * }
 	 */
-	public function __construct( $input_args = array() ){
-		$input_args = (array) apply_filters( 'FHEE__EE_Form_Input_Base___construct__input_args', $input_args, $this );
+	public function __construct($input_args = array()) {
+		$input_args = (array) apply_filters('FHEE__EE_Form_Input_Base___construct__input_args', $input_args, $this);
 		// the following properties must be cast as arrays
-		if ( isset( $input_args['validation_strategies'] ) ) {
-			foreach ( (array) $input_args['validation_strategies'] as $validation_strategy ) {
-				if ( $validation_strategy instanceof EE_Validation_Strategy_Base ) {
-					$this->_validation_strategies[ get_class( $validation_strategy ) ] = $validation_strategy;
+		if (isset($input_args['validation_strategies'])) {
+			foreach ((array) $input_args['validation_strategies'] as $validation_strategy) {
+				if ($validation_strategy instanceof EE_Validation_Strategy_Base) {
+					$this->_validation_strategies[get_class($validation_strategy)] = $validation_strategy;
 				}
 			}
-			unset( $input_args['validation_strategies'] );
+			unset($input_args['validation_strategies']);
 		}
 		// loop thru incoming options
-		foreach( $input_args as $key => $value ) {
+		foreach ($input_args as $key => $value) {
 			// add underscore to $key to match property names
-			$_key = '_' . $key;
-			if ( property_exists( $this, $_key )) {
+			$_key = '_'.$key;
+			if (property_exists($this, $_key)) {
 				$this->{$_key} = $value;
 			}
 		}
 		// ensure that "required" is set correctly
 		$this->set_required(
-			$this->_required, isset( $input_args[ 'required_validation_error_message' ] )
-				? $input_args[ 'required_validation_error_message' ]
+			$this->_required, isset($input_args['required_validation_error_message'])
+				? $input_args['required_validation_error_message']
 				: null
 		);
 
 		//$this->_html_name_specified = isset( $input_args['html_name'] ) ? TRUE : FALSE;
 
 		$this->_display_strategy->_construct_finalize($this);
-		foreach( $this->_validation_strategies as $validation_strategy ){
+		foreach ($this->_validation_strategies as $validation_strategy) {
 			$validation_strategy->_construct_finalize($this);
 		}
 
-		if( ! $this->_normalization_strategy){
+		if ( ! $this->_normalization_strategy) {
 			$this->_normalization_strategy = new EE_Text_Normalization();
 		}
 		$this->_normalization_strategy->_construct_finalize($this);
 
 		//at least we can use the normalization strategy to populate the default
-		if( isset( $input_args[ 'default' ] ) ) {
-			$this->set_default( $input_args[ 'default' ] );
+		if (isset($input_args['default'])) {
+			$this->set_default($input_args['default']);
 		}
 
-		if( ! $this->_sensitive_data_removal_strategy){
+		if ( ! $this->_sensitive_data_removal_strategy) {
 			$this->_sensitive_data_removal_strategy = new EE_No_Sensitive_Data_Removal();
 		}
 		$this->_sensitive_data_removal_strategy->_construct_finalize($this);
-		parent::__construct( $input_args );
+		parent::__construct($input_args);
 	}
 
 
@@ -201,11 +201,11 @@ 
 	 *
 	 * @throws \EE_Error
 	 */
-	protected function _set_default_html_name_if_empty(){
-		if( ! $this->_html_name){
+	protected function _set_default_html_name_if_empty() {
+		if ( ! $this->_html_name) {
 			$this->_html_name = $this->name();
-			if( $this->_parent_section && $this->_parent_section instanceof EE_Form_Section_Proper){
-				$this->_html_name = $this->_parent_section->html_name_prefix() . "[{$this->name()}]";
+			if ($this->_parent_section && $this->_parent_section instanceof EE_Form_Section_Proper) {
+				$this->_html_name = $this->_parent_section->html_name_prefix()."[{$this->name()}]";
 			}
 		}
 	}
@@ -220,10 +220,10 @@ 
 	public function _construct_finalize($parent_form_section, $name) {
 		parent::_construct_finalize($parent_form_section, $name);
 		$this->_set_default_html_name_if_empty();
-		if( $this->_html_label === null && $this->_html_label_text === null ){
-			$this->_html_label_text = ucwords( str_replace("_"," ",$name));
+		if ($this->_html_label === null && $this->_html_label_text === null) {
+			$this->_html_label_text = ucwords(str_replace("_", " ", $name));
 		}
-		do_action( 'AHEE__EE_Form_Input_Base___construct_finalize__end', $this, $parent_form_section, $name );
+		do_action('AHEE__EE_Form_Input_Base___construct_finalize__end', $this, $parent_form_section, $name);
 	}
 
 	 /**
@@ -231,8 +231,8 @@ 
 	  * @return EE_Display_Strategy_Base
 	  * @throws EE_Error
 	  */
-	protected function _get_display_strategy(){
-		if( ! $this->_display_strategy || ! $this->_display_strategy instanceof EE_Display_Strategy_Base){
+	protected function _get_display_strategy() {
+		if ( ! $this->_display_strategy || ! $this->_display_strategy instanceof EE_Display_Strategy_Base) {
 			throw new EE_Error(
 				sprintf(
 					__(
@@ -243,7 +243,7 @@ 
 					$this->html_id()
 				)
 			);
-		}else{
+		} else {
 			return $this->_display_strategy;
 		}
 	}
@@ -251,7 +251,7 @@ 
 	 * Sets the display strategy.
 	 * @param EE_Display_Strategy_Base $strategy
 	 */
-	protected function _set_display_strategy(EE_Display_Strategy_Base $strategy){
+	protected function _set_display_strategy(EE_Display_Strategy_Base $strategy) {
 		$this->_display_strategy = $strategy;
 	}
 
@@ -259,7 +259,7 @@ 
 	 * Sets the sanitization strategy
 	 * @param EE_Normalization_Strategy_Base $strategy
 	 */
-	protected function _set_normalization_strategy(EE_Normalization_Strategy_Base $strategy){
+	protected function _set_normalization_strategy(EE_Normalization_Strategy_Base $strategy) {
 		$this->_normalization_strategy = $strategy;
 	}
 
@@ -285,14 +285,14 @@ 
 	 * Gets the display strategy for this input
 	 * @return EE_Display_Strategy_Base
 	 */
-	public function get_display_strategy(){
+	public function get_display_strategy() {
 		return $this->_display_strategy;
 	}
 	/**
 	 * Overwrites the display strategy
 	 * @param EE_Display_Strategy_Base $display_strategy
 	 */
-	public function set_display_strategy($display_strategy){
+	public function set_display_strategy($display_strategy) {
 		$this->_display_strategy = $display_strategy;
 		$this->_display_strategy->_construct_finalize($this);
 	}
@@ -300,14 +300,14 @@ 
 	 * Gets the normalization strategy set on this input
 	 * @return EE_Normalization_Strategy_Base
 	 */
-	public function get_normalization_strategy(){
+	public function get_normalization_strategy() {
 		return $this->_normalization_strategy;
 	}
 	/**
 	 * Overwrites the normalization strategy
 	 * @param EE_Normalization_Strategy_Base $normalization_strategy
 	 */
-	public function set_normalization_strategy($normalization_strategy){
+	public function set_normalization_strategy($normalization_strategy) {
 		$this->_normalization_strategy = $normalization_strategy;
 		$this->_normalization_strategy->_construct_finalize($this);
 	}
@@ -316,7 +316,7 @@ 
 	 * Returns all teh validation strategies which apply to this field, numerically indexed
 	 * @return EE_Validation_Strategy_Base[]
 	 */
-	public function get_validation_strategies(){
+	public function get_validation_strategies() {
 		return $this->_validation_strategies;
 	}
 
@@ -327,8 +327,8 @@ 
 	 * @param EE_Validation_Strategy_Base $validation_strategy
 	 * @return void
 	 */
-	protected function _add_validation_strategy( EE_Validation_Strategy_Base $validation_strategy ){
-		$validation_strategy->_construct_finalize( $this );
+	protected function _add_validation_strategy(EE_Validation_Strategy_Base $validation_strategy) {
+		$validation_strategy->_construct_finalize($this);
 		$this->_validation_strategies[] = $validation_strategy;
 	}
 
@@ -339,8 +339,8 @@ 
 	 * @param EE_Validation_Strategy_Base $validation_strategy
 	 * @return void
 	 */
-	public function add_validation_strategy( EE_Validation_Strategy_Base $validation_strategy ) {
-		$this->_add_validation_strategy( $validation_strategy );
+	public function add_validation_strategy(EE_Validation_Strategy_Base $validation_strategy) {
+		$this->_add_validation_strategy($validation_strategy);
 	}
 
 
@@ -350,13 +350,13 @@ 
 	 *
 	 * @param string $validation_strategy_classname
 	 */
-	public function remove_validation_strategy( $validation_strategy_classname ) {
-		foreach( $this->_validation_strategies as $key => $validation_strategy ){
-			if(
+	public function remove_validation_strategy($validation_strategy_classname) {
+		foreach ($this->_validation_strategies as $key => $validation_strategy) {
+			if (
 				$validation_strategy instanceof $validation_strategy_classname
-				|| is_subclass_of( $validation_strategy, $validation_strategy_classname )
+				|| is_subclass_of($validation_strategy, $validation_strategy_classname)
 			) {
-				unset( $this->_validation_strategies[ $key ] );
+				unset($this->_validation_strategies[$key]);
 			}
 		}
 	}
@@ -369,12 +369,12 @@ 
 	 * @param array $validation_strategy_classnames
 	 * @return bool
 	 */
-	public function has_validation_strategy( $validation_strategy_classnames ) {
-		$validation_strategy_classnames = is_array( $validation_strategy_classnames )
+	public function has_validation_strategy($validation_strategy_classnames) {
+		$validation_strategy_classnames = is_array($validation_strategy_classnames)
 			? $validation_strategy_classnames
-			: array( $validation_strategy_classnames );
-		foreach( $this->_validation_strategies as $key => $validation_strategy ){
-			if( in_array( $key, $validation_strategy_classnames ) ) {
+			: array($validation_strategy_classnames);
+		foreach ($this->_validation_strategies as $key => $validation_strategy) {
+			if (in_array($key, $validation_strategy_classnames)) {
 				return true;
 			}
 		}
@@ -387,7 +387,7 @@ 
 	 * Gets the HTML
 	 * @return string
 	 */
-	public function get_html(){
+	public function get_html() {
 		return $this->_parent_section->get_html_for_input($this);
 	}
 
@@ -401,7 +401,7 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	public function get_html_for_input(){
+	public function get_html_for_input() {
 		return  $this->_get_display_strategy()->display();
 	}
 
@@ -411,7 +411,7 @@ 
 	 * @return string
 	 */
 	public function html_other_attributes() {
-		return ! empty( $this->_html_other_attributes ) ? ' ' . $this->_html_other_attributes : '';
+		return ! empty($this->_html_other_attributes) ? ' '.$this->_html_other_attributes : '';
 	}
 
 
@@ -419,7 +419,7 @@ 
 	/**
 	 * @param string $html_other_attributes
 	 */
-	public function set_html_other_attributes( $html_other_attributes ) {
+	public function set_html_other_attributes($html_other_attributes) {
 		$this->_html_other_attributes = $html_other_attributes;
 	}
 
@@ -428,7 +428,7 @@ 
 	 * according to the form section's layout strategy
 	 * @return string
 	 */
-	public function get_html_for_label(){
+	public function get_html_for_label() {
 		return $this->_parent_section->get_layout_strategy()->display_label($this);
 	}
 	/**
@@ -436,7 +436,7 @@ 
 	 * according to the form section's layout strategy
 	 * @return string
 	 */
-	public function get_html_for_errors(){
+	public function get_html_for_errors() {
 		return $this->_parent_section->get_layout_strategy()->display_errors($this);
 	}
 	/**
@@ -444,7 +444,7 @@ 
 	 * according to the form section's layout strategy
 	 * @return string
 	 */
-	public function get_html_for_help(){
+	public function get_html_for_help() {
 		return $this->_parent_section->get_layout_strategy()->display_help_text($this);
 	}
 	/**
@@ -453,18 +453,18 @@ 
 	 * @return boolean
 	 */
 	protected function _validate() {
-		foreach($this->_validation_strategies as $validation_strategy){
-			if ( $validation_strategy instanceof EE_Validation_Strategy_Base ) {
-				try{
+		foreach ($this->_validation_strategies as $validation_strategy) {
+			if ($validation_strategy instanceof EE_Validation_Strategy_Base) {
+				try {
 					$validation_strategy->validate($this->normalized_value());
-				}catch(EE_Validation_Error $e){
+				} catch (EE_Validation_Error $e) {
 					$this->add_validation_error($e);
 				}
 			}
 		}
-		if( $this->get_validation_errors()){
+		if ($this->get_validation_errors()) {
 			return false;
-		}else{
+		} else {
 			return true;
 		}
 	}
@@ -478,8 +478,8 @@ 
 	 * @param string $value
 	 * @return null|string
 	 */
-	private function _sanitize( $value ) {
-		return $value !== null ? stripslashes( html_entity_decode( trim( $value ) ) ) : null;
+	private function _sanitize($value) {
+		return $value !== null ? stripslashes(html_entity_decode(trim($value))) : null;
 	}
 
 
@@ -493,25 +493,25 @@ 
 	 * @return boolean whether or not there was an error
 	 * @throws \EE_Error
 	 */
-	protected function _normalize( $req_data ) {
+	protected function _normalize($req_data) {
 		//any existing validation errors don't apply so clear them
 		$this->_validation_errors = array();
 		try {
-			$raw_input = $this->find_form_data_for_this_section( $req_data );
+			$raw_input = $this->find_form_data_for_this_section($req_data);
 			//super simple sanitization for now
-			if ( is_array( $raw_input )) {
+			if (is_array($raw_input)) {
 				$raw_value = array();
-				foreach( $raw_input as $key => $value ) {
-					$raw_value[ $key ] = $this->_sanitize( $value );
+				foreach ($raw_input as $key => $value) {
+					$raw_value[$key] = $this->_sanitize($value);
 				}
-				$this->_set_raw_value( $raw_value );
+				$this->_set_raw_value($raw_value);
 			} else {
-				$this->_set_raw_value( $this->_sanitize( $raw_input ) );
+				$this->_set_raw_value($this->_sanitize($raw_input));
 			}
 			//we want to mostly leave the input alone in case we need to re-display it to the user
-			$this->_set_normalized_value( $this->_normalization_strategy->normalize( $this->raw_value() ) );
-		} catch ( EE_Validation_Error $e ) {
-			$this->add_validation_error( $e );
+			$this->_set_normalized_value($this->_normalization_strategy->normalize($this->raw_value()));
+		} catch (EE_Validation_Error $e) {
+			$this->add_validation_error($e);
 		}
 	}
 
@@ -520,7 +520,7 @@ 
 	/**
 	 * @return string
 	 */
-	public function html_name(){
+	public function html_name() {
 		return $this->_html_name;
 	}
 
@@ -529,8 +529,8 @@ 
 	/**
 	 * @return string
 	 */
-	public function html_label_id(){
-		return ! empty( $this->_html_label_id ) ? $this->_html_label_id : $this->_html_id . '-lbl';
+	public function html_label_id() {
+		return ! empty($this->_html_label_id) ? $this->_html_label_id : $this->_html_id.'-lbl';
 	}
 
 
@@ -538,7 +538,7 @@ 
 	/**
 	 * @return string
 	 */
-	public function html_label_class(){
+	public function html_label_class() {
 		return $this->_html_label_class;
 	}
 
@@ -547,7 +547,7 @@ 
 	/**
 	 * @return string
 	 */
-	public function html_label_style(){
+	public function html_label_style() {
 		return $this->_html_label_style;
 	}
 
@@ -556,7 +556,7 @@ 
 	/**
 	 * @return string
 	 */
-	public function html_label_text(){
+	public function html_label_text() {
 		return $this->_html_label_text;
 	}
 
@@ -565,7 +565,7 @@ 
 	/**
 	 * @return string
 	 */
-	public function html_help_text(){
+	public function html_help_text() {
 		return $this->_html_help_text;
 	}
 
@@ -574,7 +574,7 @@ 
 	/**
 	 * @return string
 	 */
-	public function html_help_class(){
+	public function html_help_class() {
 		return $this->_html_help_class;
 	}
 
@@ -583,7 +583,7 @@ 
 	/**
 	 * @return string
 	 */
-	public function html_help_style(){
+	public function html_help_style() {
 		return $this->_html_style;
 	}
 	/**
@@ -596,7 +596,7 @@ 
 	 * in which case, we would have stored the malicious content to our database.
 	 * @return string
 	 */
-	public function raw_value(){
+	public function raw_value() {
 		return $this->_raw_value;
 	}
 	/**
@@ -604,15 +604,15 @@ 
 	 * it escapes all html entities
 	 * @return string
 	 */
-	public function raw_value_in_form(){
-		return htmlentities($this->raw_value(),ENT_QUOTES, 'UTF-8');
+	public function raw_value_in_form() {
+		return htmlentities($this->raw_value(), ENT_QUOTES, 'UTF-8');
 	}
 	/**
 	 * returns the value after it's been sanitized, and then converted into it's proper type
 	 * in PHP. Eg, a string, an int, an array,
 	 * @return mixed
 	 */
-	public function normalized_value(){
+	public function normalized_value() {
 		return $this->_normalized_value;
 	}
 
@@ -622,7 +622,7 @@ 
 	 * the best thing to display
 	 * @return string
 	 */
-	public function pretty_value(){
+	public function pretty_value() {
 		return $this->_normalized_value;
 	}
 	/**
@@ -641,19 +641,19 @@ 
 		  }</code>
 	 * @return array
 	 */
-	public function get_jquery_validation_rules(){
+	public function get_jquery_validation_rules() {
 		$jquery_validation_js = array();
 		$jquery_validation_rules = array();
-		foreach($this->get_validation_strategies() as $validation_strategy){
+		foreach ($this->get_validation_strategies() as $validation_strategy) {
 			$jquery_validation_rules = array_replace_recursive(
 				$jquery_validation_rules,
 				$validation_strategy->get_jquery_validation_rule_array()
 			);
 		}
 
-		if(! empty($jquery_validation_rules)){
-			foreach( $this->get_display_strategy()->get_html_input_ids( true ) as $html_id_with_pound_sign ) {
-				$jquery_validation_js[ $html_id_with_pound_sign ] = $jquery_validation_rules;
+		if ( ! empty($jquery_validation_rules)) {
+			foreach ($this->get_display_strategy()->get_html_input_ids(true) as $html_id_with_pound_sign) {
+				$jquery_validation_js[$html_id_with_pound_sign] = $jquery_validation_rules;
 			}
 		}
 		return $jquery_validation_js;
@@ -665,16 +665,16 @@ 
 	 * @param mixed $value
 	 * @return void
 	 */
-	public function set_default($value){
-		$this->_set_normalized_value( $value );
-		$this->_set_raw_value( $value );
+	public function set_default($value) {
+		$this->_set_normalized_value($value);
+		$this->_set_raw_value($value);
 	}
 	
 	/**
 	 * Sets the normalized value on this input
 	 * @param mixed $value
 	 */
-	protected function _set_normalized_value( $value ) {
+	protected function _set_normalized_value($value) {
 		$this->_normalized_value = $value;
 	}
 	
@@ -682,8 +682,8 @@ 
 	 * Sets the raw value on this input (ie, exactly as the user submitted it)
 	 * @param mixed $value
 	 */
-	protected function _set_raw_value( $value ) {
-		$this->_raw_value = $this->_normalization_strategy->unnormalize( $value );
+	protected function _set_raw_value($value) {
+		$this->_raw_value = $this->_normalization_strategy->unnormalize($value);
 	}
 
 	/**
@@ -691,7 +691,7 @@ 
 	 * @param string $label
 	 * @return void
 	 */
-	public function set_html_label_text($label){
+	public function set_html_label_text($label) {
 		$this->_html_label_text = $label;
 	}
 
@@ -705,13 +705,13 @@ 
 	 * @param boolean $required boolean
 	 * @param null    $required_text
 	 */
-	public function set_required($required = true, $required_text = NULL ){
-		$required = filter_var( $required, FILTER_VALIDATE_BOOLEAN  );
+	public function set_required($required = true, $required_text = NULL) {
+		$required = filter_var($required, FILTER_VALIDATE_BOOLEAN);
 		//whether $required is a string or a boolean, we want to add a required validation strategy
-		if ( $required ) {
-			$this->_add_validation_strategy( new EE_Required_Validation_Strategy( $required_text ) );
+		if ($required) {
+			$this->_add_validation_strategy(new EE_Required_Validation_Strategy($required_text));
 		} else {
-			$this->remove_validation_strategy( 'EE_Required_Validation_Strategy' );
+			$this->remove_validation_strategy('EE_Required_Validation_Strategy');
 		}
 		$this->_required = $required;
 	}
@@ -719,7 +719,7 @@ 
 	 * Returns whether or not this field is required
 	 * @return boolean
 	 */
-	public function required(){
+	public function required() {
 		return $this->_required;
 	}
 
@@ -728,7 +728,7 @@ 
 	/**
 	 * @param string $required_css_class
 	 */
-	public function set_required_css_class( $required_css_class ) {
+	public function set_required_css_class($required_css_class) {
 		$this->_required_css_class = $required_css_class;
 	}
 
@@ -747,7 +747,7 @@ 
 	 * Sets the help text, in case
 	 * @param string $text
 	 */
-	public function set_html_help_text($text){
+	public function set_html_help_text($text) {
 		$this->_html_help_text = $text;
 	}
 	/**
@@ -759,9 +759,9 @@ 
 	public function clean_sensitive_data() {
 		//if we do ANY kind of sensitive data removal on this, then just clear out the raw value
 		//if we need more logic than this we'll make a strategy for it
-		if( $this->_sensitive_data_removal_strategy &&
-				! $this->_sensitive_data_removal_strategy instanceof EE_No_Sensitive_Data_Removal ){
-			$this->_set_raw_value( null );
+		if ($this->_sensitive_data_removal_strategy &&
+				! $this->_sensitive_data_removal_strategy instanceof EE_No_Sensitive_Data_Removal) {
+			$this->_set_raw_value(null);
 		}
 		//and clean the normalized value according to the appropriate strategy
 		$this->_set_normalized_value(
@@ -778,10 +778,10 @@ 
 	 * @param string $button_size
 	 * @param string $other_attributes
 	 */
-	public function set_button_css_attributes( $primary = TRUE, $button_size = '', $other_attributes = '' ) {
+	public function set_button_css_attributes($primary = TRUE, $button_size = '', $other_attributes = '') {
 		$button_css_attributes = 'button';
 		$button_css_attributes .= $primary === TRUE ? ' button-primary' : ' button-secondary';
-		switch ( $button_size ) {
+		switch ($button_size) {
 			case 'xs' :
 			case 'extra-small' :
 				$button_css_attributes .= ' button-xs';
@@ -802,8 +802,8 @@ 
 			default :
 				$button_css_attributes .= '';
 		}
-		$this->_button_css_attributes .= ! empty( $other_attributes )
-			? $button_css_attributes . ' ' . $other_attributes
+		$this->_button_css_attributes .= ! empty($other_attributes)
+			? $button_css_attributes.' '.$other_attributes
 			: $button_css_attributes;
 	}
 
@@ -813,7 +813,7 @@ 
 	 * @return string
 	 */
 	public function button_css_attributes() {
-		if ( empty( $this->_button_css_attributes )) {
+		if (empty($this->_button_css_attributes)) {
 			$this->set_button_css_attributes();
 		}
 		return $this->_button_css_attributes;
@@ -835,26 +835,26 @@ 
 	 * @return mixed whatever the raw value of this form section is in the request data
 	 * @throws \EE_Error
 	 */
-	public function find_form_data_for_this_section( $req_data ){
+	public function find_form_data_for_this_section($req_data) {
 		// break up the html name by "[]"
-		if ( strpos( $this->html_name(), '[' ) !== FALSE ) {
-			$before_any_brackets = substr( $this->html_name(), 0, strpos($this->html_name(), '[') );
+		if (strpos($this->html_name(), '[') !== FALSE) {
+			$before_any_brackets = substr($this->html_name(), 0, strpos($this->html_name(), '['));
 		} else {
 			$before_any_brackets = $this->html_name();
 		}
 		// grab all of the segments
-		preg_match_all('~\[([^]]*)\]~',$this->html_name(), $matches);
-		if( isset( $matches[ 1 ] ) && is_array( $matches[ 1 ] ) ){
-			$name_parts = $matches[ 1 ];
+		preg_match_all('~\[([^]]*)\]~', $this->html_name(), $matches);
+		if (isset($matches[1]) && is_array($matches[1])) {
+			$name_parts = $matches[1];
 			array_unshift($name_parts, $before_any_brackets);
-		}else{
-			$name_parts = array( $before_any_brackets );
+		} else {
+			$name_parts = array($before_any_brackets);
 		}
 		// now get the value for the input
 		$value = $this->_find_form_data_for_this_section_using_name_parts($name_parts, $req_data);
 		// check if this thing's name is at the TOP level of the request data
-		if( $value === null && isset( $req_data[ $this->name() ] ) ){
-			$value = $req_data[ $this->name() ];
+		if ($value === null && isset($req_data[$this->name()])) {
+			$value = $req_data[$this->name()];
 		}
 		return $value;
 	}
@@ -867,18 +867,18 @@ 
 	 * @param array $req_data
 	 * @return array | NULL
 	 */
-	public function _find_form_data_for_this_section_using_name_parts($html_name_parts, $req_data){
-		$first_part_to_consider = array_shift( $html_name_parts );
-		if( isset( $req_data[ $first_part_to_consider ] ) ){
-			if( empty($html_name_parts ) ){
-				return $req_data[ $first_part_to_consider ];
-			}else{
+	public function _find_form_data_for_this_section_using_name_parts($html_name_parts, $req_data) {
+		$first_part_to_consider = array_shift($html_name_parts);
+		if (isset($req_data[$first_part_to_consider])) {
+			if (empty($html_name_parts)) {
+				return $req_data[$first_part_to_consider];
+			} else {
 				return $this->_find_form_data_for_this_section_using_name_parts(
 					$html_name_parts,
-					$req_data[ $first_part_to_consider ]
+					$req_data[$first_part_to_consider]
 				);
 			}
-		}else{
+		} else {
 			return NULL;
 		}
 	}
@@ -892,14 +892,14 @@ 
 	 * @return boolean
 	 * @throws \EE_Error
 	 */
-	public function form_data_present_in($req_data = NULL){
-		if( $req_data === NULL ){
+	public function form_data_present_in($req_data = NULL) {
+		if ($req_data === NULL) {
 			$req_data = $_POST;
 		}
-		$checked_value = $this->find_form_data_for_this_section( $req_data );
-		if( $checked_value !== null ){
+		$checked_value = $this->find_form_data_for_this_section($req_data);
+		if ($checked_value !== null) {
 			return TRUE;
-		}else{
+		} else {
 			return FALSE;
 		}
 	}
@@ -910,8 +910,8 @@ 
 	 * @param array $form_other_js_data
 	 * @return array
 	 */
-	public function get_other_js_data( $form_other_js_data = array() ) {
-		$form_other_js_data = $this->get_other_js_data_from_strategies( $form_other_js_data );
+	public function get_other_js_data($form_other_js_data = array()) {
+		$form_other_js_data = $this->get_other_js_data_from_strategies($form_other_js_data);
 		return $form_other_js_data;
 	}
 
@@ -924,10 +924,10 @@ 
 	 * @param array $form_other_js_data
 	 * @return array
 	 */
-	public function get_other_js_data_from_strategies( $form_other_js_data = array() ) {
-		$form_other_js_data = $this->get_display_strategy()->get_other_js_data( $form_other_js_data );
-		foreach( $this->get_validation_strategies() as $validation_strategy ) {
-			$form_other_js_data = $validation_strategy->get_other_js_data( $form_other_js_data );
+	public function get_other_js_data_from_strategies($form_other_js_data = array()) {
+		$form_other_js_data = $this->get_display_strategy()->get_other_js_data($form_other_js_data);
+		foreach ($this->get_validation_strategies() as $validation_strategy) {
+			$form_other_js_data = $validation_strategy->get_other_js_data($form_other_js_data);
 		}
 		return $form_other_js_data;
 	}
@@ -936,7 +936,7 @@ 
 	 * Override parent because we want to give our strategies an opportunity to enqueue some js and css
 	 * @return void
 	 */
-	public function enqueue_js(){
+	public function enqueue_js() {
 		//ask our display strategy and validation strategies if they have js to enqueue
 		$this->enqueue_js_from_strategies();
 	}
@@ -947,7 +947,7 @@ 
 	 */
 	public function enqueue_js_from_strategies() {
 		$this->get_display_strategy()->enqueue_js();
-		foreach( $this->get_validation_strategies() as $validation_strategy ) {
+		foreach ($this->get_validation_strategies() as $validation_strategy) {
 			$validation_strategy->enqueue_js();
 		}
 	}

admin_pages/messages/EE_Message_List_Table.class.php

Spacing +105 added lines, -105 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') ){
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
 	exit('NO direct script access allowed');
 }
 /**
@@ -26,8 +26,8 @@ 
 
 
 	protected function _setup_data() {
-		$this->_data = $this->_get_messages( $this->_per_page, $this->_view );
-		$this->_all_data_count = $this->_get_messages( $this->_per_page, $this->_view, true );
+		$this->_data = $this->_get_messages($this->_per_page, $this->_view);
+		$this->_all_data_count = $this->_get_messages($this->_per_page, $this->_view, true);
 	}
 
 
@@ -35,32 +35,32 @@ 
 
 	protected function _set_properties() {
 		$this->_wp_list_args = array(
-			'singular' => __( 'Message', 'event_espresso' ),
-			'plural' => __( 'Messages', 'event_espresso' ),
+			'singular' => __('Message', 'event_espresso'),
+			'plural' => __('Messages', 'event_espresso'),
 			'ajax' => true,
 			'screen' => $this->get_admin_page()->get_current_screen()->id
 		);
 
 		$this->_columns = array(
 			'cb' => '<input type="checkbox" />',
-			'to' => __( 'To', 'event_espresso' ),
-			'from' => __( 'From', 'event_espresso' ),
-			'messenger' => __( 'Messenger', 'event_espresso' ),
-			'message_type' => __( 'Message Type', 'event_espresso' ),
-			'context' => __( 'Context', 'event_espresso' ),
-			'modified' => __( 'Modified', 'event_espresso' ),
-			'action' => __( 'Actions', 'event_espresso' ),
-			'msg_id' => __( 'ID', 'event_espresso' ),
+			'to' => __('To', 'event_espresso'),
+			'from' => __('From', 'event_espresso'),
+			'messenger' => __('Messenger', 'event_espresso'),
+			'message_type' => __('Message Type', 'event_espresso'),
+			'context' => __('Context', 'event_espresso'),
+			'modified' => __('Modified', 'event_espresso'),
+			'action' => __('Actions', 'event_espresso'),
+			'msg_id' => __('ID', 'event_espresso'),
 		);
 
 		$this->_sortable_columns = array(
-			'modified' => array( 'MSG_modified' => true ),
-			'message_type' => array( 'MSG_message_type' => false ),
-			'messenger' => array( 'MSG_messenger' => false ),
-			'to' => array( 'MSG_to' => false ),
-			'from' => array( 'MSG_from' => false ),
-			'context' => array( 'MSG_context' => false ),
-			'msg_id' => array( 'MSG_ID', false ),
+			'modified' => array('MSG_modified' => true),
+			'message_type' => array('MSG_message_type' => false),
+			'messenger' => array('MSG_messenger' => false),
+			'to' => array('MSG_to' => false),
+			'from' => array('MSG_from' => false),
+			'context' => array('MSG_context' => false),
+			'msg_id' => array('MSG_ID', false),
 		);
 
 		$this->_primary_column = 'to';
@@ -78,11 +78,11 @@ 
 	 * @param  object $item the current item
 	 * @return string
 	 */
-	protected function _get_row_class( $item ) {
-		$class = parent::_get_row_class( $item );
+	protected function _get_row_class($item) {
+		$class = parent::_get_row_class($item);
 		//add status class
-		$class .= ' ee-status-strip msg-status-' . $item->STS_ID();
-		if ( $this->_has_checkbox_column ) {
+		$class .= ' ee-status-strip msg-status-'.$item->STS_ID();
+		if ($this->_has_checkbox_column) {
 			$class .= ' has-checkbox-column';
 		}
 		return $class;
@@ -110,8 +110,8 @@ 
 		);
 
 		//set filters to select inputs if they aren't empty
-		foreach ( $select_inputs as $select_input ) {
-			if ( $select_input ) {
+		foreach ($select_inputs as $select_input) {
+			if ($select_input) {
 				$filters[] = $select_input;
 			}
 		}
@@ -121,8 +121,8 @@ 
 
 
 	protected function _add_view_counts() {
-		foreach ( $this->_views as $view => $args ) {
-			$this->_views[ $view ]['count'] = $this->_get_messages( $this->_per_page, $view, true, true );
+		foreach ($this->_views as $view => $args) {
+			$this->_views[$view]['count'] = $this->_get_messages($this->_per_page, $view, true, true);
 		}
 	}
 
@@ -133,8 +133,8 @@ 
 	 * @return string   checkbox
 	 * @throws \EE_Error
 	 */
-	public function column_cb( $message ) {
-		return sprintf( '<input type="checkbox" name="MSG_ID[%s]" value="1" />', $message->ID() );
+	public function column_cb($message) {
+		return sprintf('<input type="checkbox" name="MSG_ID[%s]" value="1" />', $message->ID());
 	}
 
 
@@ -144,7 +144,7 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	public function column_msg_id( EE_Message $message ) {
+	public function column_msg_id(EE_Message $message) {
 		return $message->ID();
 	}
 
@@ -155,8 +155,8 @@ 
 	 * @return string    The recipient of the message
 	 * @throws \EE_Error
 	 */
-	public function column_to( EE_Message $message ) {
-		EE_Registry::instance()->load_helper( 'URL' );
+	public function column_to(EE_Message $message) {
+		EE_Registry::instance()->load_helper('URL');
 		$actions = array();
 		$actions['delete'] = '<a href="'
 			. EEH_URL::add_query_args_and_nonce(
@@ -165,10 +165,10 @@ 
 					'action' => 'delete_ee_message',
 					'MSG_ID' => $message->ID()
 				),
-				admin_url( 'admin.php' )
+				admin_url('admin.php')
 			)
-			. '">' . __( 'Delete', 'event_espresso' ) . '</a>';
-		return esc_html( $message->to() ) . $this->row_actions( $actions );
+			. '">'.__('Delete', 'event_espresso').'</a>';
+		return esc_html($message->to()).$this->row_actions($actions);
 	}
 
 
@@ -176,8 +176,8 @@ 
 	 * @param EE_Message $message
 	 * @return string   The sender of the message
 	 */
-	public function column_from( EE_Message $message ) {
-		return esc_html( $message->from() );
+	public function column_from(EE_Message $message) {
+		return esc_html($message->from());
 	}
 
 
@@ -186,8 +186,8 @@ 
 	 * @param EE_Message $message
 	 * @return string  The messenger used to send the message.
 	 */
-	public function column_messenger( EE_Message $message ) {
-		return ucwords( $message->messenger_label() );
+	public function column_messenger(EE_Message $message) {
+		return ucwords($message->messenger_label());
 	}
 
 
@@ -195,8 +195,8 @@ 
 	 * @param EE_Message $message
 	 * @return string  The message type used to generate the message.
 	 */
-	public function column_message_type( EE_Message $message ) {
-		return ucwords( $message->message_type_label() );
+	public function column_message_type(EE_Message $message) {
+		return ucwords($message->message_type_label());
 	}
 
 
@@ -204,7 +204,7 @@ 
 	 * @param EE_Message $message
 	 * @return string  The context the message was generated for.
 	 */
-	public function column_context( EE_Message $message ) {
+	public function column_context(EE_Message $message) {
 		return $message->context_label();
 	}
 
@@ -213,7 +213,7 @@ 
 	 * @param EE_Message $message
 	 * @return string    The timestamp when this message was last modified.
 	 */
-	public function column_modified( EE_Message $message ) {
+	public function column_modified(EE_Message $message) {
 		return $message->modified();
 	}
 
@@ -222,36 +222,36 @@ 
 	 * @param EE_Message $message
 	 * @return string   Actions that can be done on the current message.
 	 */
-	public function column_action( EE_Message $message ) {
-		EE_Registry::instance()->load_helper( 'MSG_Template' );
+	public function column_action(EE_Message $message) {
+		EE_Registry::instance()->load_helper('MSG_Template');
 		$action_links = array(
-			'view' => EEH_MSG_Template::get_message_action_link( 'view', $message ),
-			'error' => EEH_MSG_Template::get_message_action_link( 'error', $message ),
-			'generate_now' => EEH_MSG_Template::get_message_action_link( 'generate_now', $message ),
-			'send_now' => EEH_MSG_Template::get_message_action_link( 'send_now', $message ),
-			'queue_for_resending' => EEH_MSG_Template::get_message_action_link( 'queue_for_resending', $message ),
-			'view_transaction' => EEH_MSG_Template::get_message_action_link( 'view_transaction', $message ),
+			'view' => EEH_MSG_Template::get_message_action_link('view', $message),
+			'error' => EEH_MSG_Template::get_message_action_link('error', $message),
+			'generate_now' => EEH_MSG_Template::get_message_action_link('generate_now', $message),
+			'send_now' => EEH_MSG_Template::get_message_action_link('send_now', $message),
+			'queue_for_resending' => EEH_MSG_Template::get_message_action_link('queue_for_resending', $message),
+			'view_transaction' => EEH_MSG_Template::get_message_action_link('view_transaction', $message),
 		);
 		$content = '';
-		switch ( $message->STS_ID() ) {
+		switch ($message->STS_ID()) {
 			case EEM_Message::status_sent :
-				$content = $action_links['view'] . $action_links['queue_for_resending'] . $action_links['view_transaction'];
+				$content = $action_links['view'].$action_links['queue_for_resending'].$action_links['view_transaction'];
 				break;
 			case EEM_Message::status_resend :
-				$content = $action_links['view'] . $action_links['send_now'] . $action_links['view_transaction'];
+				$content = $action_links['view'].$action_links['send_now'].$action_links['view_transaction'];
 				break;
 			case EEM_Message::status_retry :
-				$content = $action_links['view'] . $action_links['send_now'] . $action_links['error'] . $action_links['view_transaction'];
+				$content = $action_links['view'].$action_links['send_now'].$action_links['error'].$action_links['view_transaction'];
 				break;
 			case EEM_Message::status_failed :
 			case EEM_Message::status_debug_only :
-				$content = $action_links['error'] . $action_links['view_transaction'];
+				$content = $action_links['error'].$action_links['view_transaction'];
 				break;
 			case EEM_Message::status_idle :
-				$content = $action_links['view'] . $action_links['send_now'] . $action_links['view_transaction'];
+				$content = $action_links['view'].$action_links['send_now'].$action_links['view_transaction'];
 				break;
 			case EEM_Message::status_incomplete;
-				$content = $action_links['generate_now'] . $action_links['view_transaction'];
+				$content = $action_links['generate_now'].$action_links['view_transaction'];
 				break;
 		}
 		return $content;
@@ -269,54 +269,54 @@ 
 	 * @return int | EE_Message[]
 	 * @throws \EE_Error
 	 */
-	protected function _get_messages( $perpage = 10, $view = 'all', $count = false, $all = false ) {
+	protected function _get_messages($perpage = 10, $view = 'all', $count = false, $all = false) {
 
-		$current_page = isset( $this->_req_data['paged'] ) && ! empty( $this->_req_data['paged'] )
+		$current_page = isset($this->_req_data['paged']) && ! empty($this->_req_data['paged'])
 			? $this->_req_data['paged']
 			: 1;
 
-		$per_page = isset( $this->_req_data['perpage'] ) && ! empty( $this->_req_data['perpage'] )
+		$per_page = isset($this->_req_data['perpage']) && ! empty($this->_req_data['perpage'])
 			? $this->_req_data['perpage']
 			: $perpage;
 
-		$offset = ( $current_page - 1 ) * $per_page;
-		$limit = $all || $count ? null : array( $offset, $per_page );
+		$offset = ($current_page - 1) * $per_page;
+		$limit = $all || $count ? null : array($offset, $per_page);
 		$query_params = array(
-			'order_by' => empty( $this->_req_data[ 'orderby' ] ) ? 'MSG_modified' : $this->_req_data[ 'orderby' ],
-			'order'    => empty( $this->_req_data[ 'order' ] ) ? 'DESC' : $this->_req_data[ 'order' ],
+			'order_by' => empty($this->_req_data['orderby']) ? 'MSG_modified' : $this->_req_data['orderby'],
+			'order'    => empty($this->_req_data['order']) ? 'DESC' : $this->_req_data['order'],
 			'limit'    => $limit,
 		);
 
 		/**
 		 * Any filters coming in from other routes?
 		 */
-		if ( isset( $this->_req_data['filterby'] ) ) {
-			$query_params = array_merge( $query_params, EEM_Message::instance()->filter_by_query_params() );
-			if ( ! $count ) {
+		if (isset($this->_req_data['filterby'])) {
+			$query_params = array_merge($query_params, EEM_Message::instance()->filter_by_query_params());
+			if ( ! $count) {
 				$query_params['group_by'] = 'MSG_ID';
 			}
 		}
 
 		//view conditionals
-		if ( $view !== 'all' && $count && $all ) {
+		if ($view !== 'all' && $count && $all) {
 			$query_params[0]['AND*view_conditional'] = array(
-				'STS_ID' => strtoupper( $view ),
+				'STS_ID' => strtoupper($view),
 			);
 		}
 
-		if ( ! $all && ! empty( $this->_req_data['status'] ) && $this->_req_data['status'] !== 'all' ) {
+		if ( ! $all && ! empty($this->_req_data['status']) && $this->_req_data['status'] !== 'all') {
 			$query_params[0]['AND*view_conditional'] = array(
-				'STS_ID' => strtoupper( $this->_req_data['status'] ),
+				'STS_ID' => strtoupper($this->_req_data['status']),
 			);
 		}
 
-		if ( ! $all && ! empty( $this->_req_data['s'] ) ) {
-			$search_string = '%' . $this->_req_data['s'] . '%';
+		if ( ! $all && ! empty($this->_req_data['s'])) {
+			$search_string = '%'.$this->_req_data['s'].'%';
 			$query_params[0]['OR'] = array(
-				'MSG_to' => array( 'LIKE', $search_string ),
-				'MSG_from' => array( 'LIKE', $search_string ),
-				'MSG_subject' => array( 'LIKE', $search_string ),
-				'MSG_content' => array( 'LIKE', $search_string ),
+				'MSG_to' => array('LIKE', $search_string),
+				'MSG_from' => array('LIKE', $search_string),
+				'MSG_subject' => array('LIKE', $search_string),
+				'MSG_content' => array('LIKE', $search_string),
 			);
 		}
 
@@ -324,16 +324,16 @@ 
 		//the messages system is in debug mode.
 		//Note: for backward compat with previous iterations, this is necessary because there may be EEM_Message::status_debug_only
 		//messages in the database.
-		if ( ! EEM_Message::debug() ) {
+		if ( ! EEM_Message::debug()) {
 			$query_params[0]['AND*debug_only_conditional'] = array(
-				'STS_ID' => array( '!=', EEM_Message::status_debug_only )
+				'STS_ID' => array('!=', EEM_Message::status_debug_only)
 			);
 		}
 
 		//account for filters
 		if (
 			! $all
-			&& isset( $this->_req_data['ee_messenger_filter_by'] )
+			&& isset($this->_req_data['ee_messenger_filter_by'])
 			&& $this->_req_data['ee_messenger_filter_by'] !== 'none_selected'
 		) {
 			$query_params[0]['AND*messenger_filter'] = array(
@@ -342,7 +342,7 @@ 
 		}
 		if (
 			! $all
-			&& ! empty( $this->_req_data['ee_message_type_filter_by'] )
+			&& ! empty($this->_req_data['ee_message_type_filter_by'])
 			&& $this->_req_data['ee_message_type_filter_by'] !== 'none_selected'
 		) {
 			$query_params[0]['AND*message_type_filter'] = array(
@@ -352,17 +352,17 @@ 
 
 		if (
 			! $all
-			&& ! empty( $this->_req_data['ee_context_filter_by'] )
+			&& ! empty($this->_req_data['ee_context_filter_by'])
 			&& $this->_req_data['ee_context_filter_by'] !== 'none_selected'
 		) {
 			$query_params[0]['AND*context_filter'] = array(
-				'MSG_context' => array( 'IN', explode( ',', $this->_req_data['ee_context_filter_by'] ) )
+				'MSG_context' => array('IN', explode(',', $this->_req_data['ee_context_filter_by']))
 			);
 		}
 
 		return $count
-			? EEM_Message::instance()->count( $query_params, null, true )
-			: EEM_Message::instance()->get_all( $query_params );
+			? EEM_Message::instance()->count($query_params, null, true)
+			: EEM_Message::instance()->get_all($query_params);
 	}
 
 
@@ -372,15 +372,15 @@ 
 	 */
 	protected function _get_messengers_dropdown_filter() {
 		$messenger_options = array();
-		$active_messages_grouped_by_messenger = EEM_Message::instance()->get_all( array( 'group_by' => 'MSG_messenger' ) );
+		$active_messages_grouped_by_messenger = EEM_Message::instance()->get_all(array('group_by' => 'MSG_messenger'));
 
 		//setup array of messenger options
-		foreach ( $active_messages_grouped_by_messenger as $active_message ) {
-			if ( $active_message instanceof EE_Message ) {
-				$messenger_options[ $active_message->messenger() ] = ucwords( $active_message->messenger_label() );
+		foreach ($active_messages_grouped_by_messenger as $active_message) {
+			if ($active_message instanceof EE_Message) {
+				$messenger_options[$active_message->messenger()] = ucwords($active_message->messenger_label());
 			}
 		}
-		return $this->get_admin_page()->get_messengers_select_input( $messenger_options );
+		return $this->get_admin_page()->get_messengers_select_input($messenger_options);
 	}
 
 
@@ -391,15 +391,15 @@ 
 	 */
 	protected function _get_message_types_dropdown_filter() {
 		$message_type_options = array();
-		$active_messages_grouped_by_message_type = EEM_Message::instance()->get_all( array( 'group_by' => 'MSG_message_type' ) );
+		$active_messages_grouped_by_message_type = EEM_Message::instance()->get_all(array('group_by' => 'MSG_message_type'));
 
 		//setup array of message type options
-		foreach ( $active_messages_grouped_by_message_type as $active_message ) {
-			if ( $active_message instanceof EE_Message ) {
-				$message_type_options[ $active_message->message_type() ] = ucwords( $active_message->message_type_label() );
+		foreach ($active_messages_grouped_by_message_type as $active_message) {
+			if ($active_message instanceof EE_Message) {
+				$message_type_options[$active_message->message_type()] = ucwords($active_message->message_type_label());
 			}
 		}
-		return $this->get_admin_page()->get_message_types_select_input( $message_type_options );
+		return $this->get_admin_page()->get_message_types_select_input($message_type_options);
 	}
 
 
@@ -409,21 +409,21 @@ 
 	 */
 	protected function _get_contexts_for_message_types_dropdown_filter() {
 		$context_options = array();
-		$active_messages_grouped_by_context = EEM_Message::instance()->get_all( array( 'group_by' => 'MSG_context' ) );
+		$active_messages_grouped_by_context = EEM_Message::instance()->get_all(array('group_by' => 'MSG_context'));
 
 		//setup array of context options
-		foreach ( $active_messages_grouped_by_context as $active_message ) {
-			if ( $active_message instanceof EE_Message ) {
+		foreach ($active_messages_grouped_by_context as $active_message) {
+			if ($active_message instanceof EE_Message) {
 				$message_type = $active_message->message_type_object();
-				if ( $message_type instanceof EE_message_type ) {
-					foreach ( $message_type->get_contexts() as $context => $context_details ) {
-						if ( isset( $context_details['label'] ) ) {
-							$context_options[ $context ] = $context_details['label'];
+				if ($message_type instanceof EE_message_type) {
+					foreach ($message_type->get_contexts() as $context => $context_details) {
+						if (isset($context_details['label'])) {
+							$context_options[$context] = $context_details['label'];
 						}
 					}
 				}
 			}
 		}
-		return $this->get_admin_page()->get_contexts_for_message_types_select_input( $context_options );
+		return $this->get_admin_page()->get_contexts_for_message_types_select_input($context_options);
 	}
 } //end EE_Message_List_Table class
\ No newline at end of file

caffeinated/core/libraries/messages/message_type/newsletter/EE_Messages_Contacts_incoming_data.class.php

Spacing +12 added lines, -12 removed lines

@@ -27,14 +27,14 @@ 
 	 * @throws EE_Error
 	 * @access protected
 	 */
-	public function __construct( $data = array() ) {
+	public function __construct($data = array()) {
 
 		//validate that the first element in the array is an EE_Attendee object.  Note that the array may be indexed by REG_ID so we will just shift off the first element.
-		$ctc_chk = reset( $data );
-		if ( ! $ctc_chk instanceof EE_Attendee )
-			throw new EE_Error(__('The EE_Message_Contacts_incoming_data class expects an array of EE_Attendee objects.', 'event_espresso') );
+		$ctc_chk = reset($data);
+		if ( ! $ctc_chk instanceof EE_Attendee)
+			throw new EE_Error(__('The EE_Message_Contacts_incoming_data class expects an array of EE_Attendee objects.', 'event_espresso'));
 
-		parent::__construct( $data );
+		parent::__construct($data);
 	}
 
 
@@ -43,11 +43,11 @@ 
 	 * @param array $attendees
 	 * @return array
 	 */
-	public static function convert_data_for_persistent_storage( $attendees ) {
+	public static function convert_data_for_persistent_storage($attendees) {
 		$attendee_ids = array_filter(
 			array_map(
-				function( $attendee ) {
-					if ( $attendee instanceof EE_Attendee ) {
+				function($attendee) {
+					if ($attendee instanceof EE_Attendee) {
 						return $attendee->ID();
 					}
 					return false;
@@ -66,11 +66,11 @@ 
 	 * @param array $attendee_ids
 	 * @return EE_Attendee[]
 	 */
-	public static function convert_data_from_persistent_storage( $attendee_ids ) {
+	public static function convert_data_from_persistent_storage($attendee_ids) {
 		$attendee_ids = (array) $attendee_ids;
 		$attendees = EEM_Attendee::instance()->get_all(
 		  array(
-			  array( 'ATT_ID' => array( 'IN', $attendee_ids ) )
+			  array('ATT_ID' => array('IN', $attendee_ids))
 		  )
 		);
 		return $attendees;
@@ -99,7 +99,7 @@ 
 		$this->payment = NULL;
 		$this->billing = array();
 		$this->reg_objs = array();
-		$this->attendees = $this->events = $this->tickets = $this->datetimes = $this->questions = $this->answer =  $this->registrations = array();
+		$this->attendees = $this->events = $this->tickets = $this->datetimes = $this->questions = $this->answer = $this->registrations = array();
 		$this->total_ticket_count = 0;
 		$this->primary_attendee_data = array(
 			'registration_id' => 0,
@@ -109,7 +109,7 @@ 
 			'primary_reg_obj' => NULL
 			);
 
-		foreach ( $this->_data as $contact ) {
+		foreach ($this->_data as $contact) {
 			$id = $contact->ID();
 			$reg = $contact->get_first_related('Registration');
 			$this->attendees[$id]['att_obj'] = $contact;

Braces +6 added lines, -3 removed lines

@@ -5,7 +5,9 @@ 
  * @subpackage helpers
  * @since           4.3.0
  */
-if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 
 /**
  * This prepares data for message types that send messages for multiple contacts and handles
@@ -31,8 +33,9 @@ 
 
 		//validate that the first element in the array is an EE_Attendee object.  Note that the array may be indexed by REG_ID so we will just shift off the first element.
 		$ctc_chk = reset( $data );
-		if ( ! $ctc_chk instanceof EE_Attendee )
-			throw new EE_Error(__('The EE_Message_Contacts_incoming_data class expects an array of EE_Attendee objects.', 'event_espresso') );
+		if ( ! $ctc_chk instanceof EE_Attendee ) {
+					throw new EE_Error(__('The EE_Message_Contacts_incoming_data class expects an array of EE_Attendee objects.', 'event_espresso') );
+		}
 
 		parent::__construct( $data );
 	}