eventespresso / event-espresso-core

core/EE_Load_Espresso_Core.core.php

Spacing +34 added lines, -34 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  *
@@ -52,7 +52,7 @@ 
 	 */
 	public function __construct() {
 		// deprecated functions
-		espresso_load_required( 'EventEspresso\core\Factory', EE_CORE . 'Factory.php' );
+		espresso_load_required('EventEspresso\core\Factory', EE_CORE.'Factory.php');
 	}
 
 
@@ -68,16 +68,16 @@ 
 	 * @param 	EE_Response $response
 	 * @return 	EE_Response
 	 */
-	public function handle_request( EE_Request $request, EE_Response $response ) {
+	public function handle_request(EE_Request $request, EE_Response $response) {
 		$this->request = $request;
 		$this->response = $response;
 		// info about how to load classes required by other classes
 		$this->dependency_map = $this->_load_dependency_map();
 		// central repository for classes
 		$this->registry = $this->_load_registry();
-		do_action( 'EE_Load_Espresso_Core__handle_request__initialize_core_loading' );
+		do_action('EE_Load_Espresso_Core__handle_request__initialize_core_loading');
 		// PSR4 Autoloaders
-		$this->registry->load_core( 'EE_Psr4AutoloaderInit' );
+		$this->registry->load_core('EE_Psr4AutoloaderInit');
 		// build DI container
 		$OpenCoffeeShop = new EventEspresso\core\services\container\OpenCoffeeShop();
 		$OpenCoffeeShop->addRecipes();
@@ -87,20 +87,20 @@ 
 			'CommandBusInterface',
 			array(
 				null,
-				$this->registry->create( 'CapChecker' )
+				$this->registry->create('CapChecker')
 			),
 			true
 		);
 		// workarounds for PHP < 5.3
 		$this->_load_class_tools();
 		// load interfaces
-		espresso_load_required( 'EEI_Payment_Method_Interfaces', EE_LIBRARIES . 'payment_methods' . DS . 'EEI_Payment_Method_Interfaces.php' );
+		espresso_load_required('EEI_Payment_Method_Interfaces', EE_LIBRARIES.'payment_methods'.DS.'EEI_Payment_Method_Interfaces.php');
 		// deprecated functions
-		espresso_load_required( 'EE_Deprecated', EE_CORE . 'EE_Deprecated.core.php' );
+		espresso_load_required('EE_Deprecated', EE_CORE.'EE_Deprecated.core.php');
 		// WP cron jobs
-		$this->registry->load_core( 'Cron_Tasks' );
-		$this->registry->load_core( 'EE_Request_Handler' );
-		$this->registry->load_core( 'EE_System' );
+		$this->registry->load_core('Cron_Tasks');
+		$this->registry->load_core('EE_Request_Handler');
+		$this->registry->load_core('EE_System');
 
 		return $this->response;
 	}
@@ -130,11 +130,11 @@ 
 	 * @throws \EE_Error
 	 */
 	public function dependency_map() {
-		if ( ! $this->dependency_map instanceof EE_Dependency_Map ) {
+		if ( ! $this->dependency_map instanceof EE_Dependency_Map) {
 			throw new EE_Error(
 				sprintf(
-					__( 'Invalid EE_Dependency_Map: "%1$s"', 'event_espresso' ),
-					print_r( $this->dependency_map, true )
+					__('Invalid EE_Dependency_Map: "%1$s"', 'event_espresso'),
+					print_r($this->dependency_map, true)
 				)
 			);
 		}
@@ -148,11 +148,11 @@ 
 	 * @throws \EE_Error
 	 */
 	public function registry() {
-		if ( ! $this->registry instanceof EE_Registry ) {
+		if ( ! $this->registry instanceof EE_Registry) {
 			throw new EE_Error(
 				sprintf(
-					__( 'Invalid EE_Registry: "%1$s"', 'event_espresso' ),
-					print_r( $this->registry, true )
+					__('Invalid EE_Registry: "%1$s"', 'event_espresso'),
+					print_r($this->registry, true)
 				)
 			);
 		}
@@ -168,15 +168,15 @@ 
 	 * 	@return EE_Dependency_Map
 	 */
 	private function _load_dependency_map() {
-		if ( ! is_readable( EE_CORE . 'EE_Dependency_Map.core.php' ) ) {
+		if ( ! is_readable(EE_CORE.'EE_Dependency_Map.core.php')) {
 			EE_Error::add_error(
-				__( 'The EE_Dependency_Map core class could not be loaded.', 'event_espresso' ),
+				__('The EE_Dependency_Map core class could not be loaded.', 'event_espresso'),
 				__FILE__, __FUNCTION__, __LINE__
 			);
-			wp_die( EE_Error::get_notices() );
+			wp_die(EE_Error::get_notices());
 		}
-		require_once( EE_CORE . 'EE_Dependency_Map.core.php' );
-		return EE_Dependency_Map::instance( $this->request, $this->response );
+		require_once(EE_CORE.'EE_Dependency_Map.core.php');
+		return EE_Dependency_Map::instance($this->request, $this->response);
 	}
 
 
@@ -188,15 +188,15 @@ 
 	 * 	@return EE_Registry
 	 */
 	private function _load_registry() {
-		if ( ! is_readable( EE_CORE . 'EE_Registry.core.php' )) {
+		if ( ! is_readable(EE_CORE.'EE_Registry.core.php')) {
 			EE_Error::add_error(
-				__( 'The EE_Registry core class could not be loaded.', 'event_espresso' ),
+				__('The EE_Registry core class could not be loaded.', 'event_espresso'),
 				__FILE__, __FUNCTION__, __LINE__
 			);
-			wp_die( EE_Error::get_notices() );
+			wp_die(EE_Error::get_notices());
 		}
-		require_once( EE_CORE . 'EE_Registry.core.php' );
-		return EE_Registry::instance( $this->dependency_map );
+		require_once(EE_CORE.'EE_Registry.core.php');
+		return EE_Registry::instance($this->dependency_map);
 	}
 
 
@@ -207,13 +207,13 @@ 
 	 * 	@return void
 	 */
 	private function _load_class_tools() {
-		if ( ! is_readable( EE_HELPERS . 'EEH_Class_Tools.helper.php' )) {
+		if ( ! is_readable(EE_HELPERS.'EEH_Class_Tools.helper.php')) {
 			EE_Error::add_error(
-				__( 'The EEH_Class_Tools helper could not be loaded.', 'event_espresso' ),
+				__('The EEH_Class_Tools helper could not be loaded.', 'event_espresso'),
 				__FILE__, __FUNCTION__, __LINE__
 			);
 		}
-		require_once( EE_HELPERS . 'EEH_Class_Tools.helper.php' );
+		require_once(EE_HELPERS.'EEH_Class_Tools.helper.php');
 	}
 
 
@@ -227,13 +227,13 @@ 
 	 * @param \EE_Request $request
 	 * @param \EE_Response $response
 	 */
-	public function handle_response( EE_Request $request, EE_Response $response ) {
+	public function handle_response(EE_Request $request, EE_Response $response) {
 		//\EEH_Debug_Tools::printr( __FUNCTION__, __CLASS__, __FILE__, __LINE__, 2 );
 		//EEH_Debug_Tools::printr( $request, '$request', __FILE__, __LINE__ );
 		//EEH_Debug_Tools::printr( $response, '$response', __FILE__, __LINE__ );
 		//die();
-		if ( $response->plugin_deactivated() ) {
-			espresso_deactivate_plugin( EE_PLUGIN_BASENAME );
+		if ($response->plugin_deactivated()) {
+			espresso_deactivate_plugin(EE_PLUGIN_BASENAME);
 		}
 	}
 

payment_methods/Paypal_Express/help_tabs/payment_methods_overview_paypal_express.help_tab.php

Spacing +12 added lines, -12 removed lines

@@ -1,11 +1,11 @@ 
 <p>
-	<strong><?php _e( 'PayPal Express Checkout', 'event_espresso' ); ?></strong>
+	<strong><?php _e('PayPal Express Checkout', 'event_espresso'); ?></strong>
 </p>
 <p>
 	<?php _e('Please be sure to update the settings for the PayPal Express Checkout payment method.', 'event_espresso'); ?>
 </p>
 <p>
-	<?php printf( __('For more information on how to get your API credentials, please view the %1$sPayPal Documentation%2$s.', 'event_espresso'), '<a target="_blank" href="https://developer.paypal.com/docs/classic/api/apiCredentials/#create-an-api-signature">', '</a>' ); ?>
+	<?php printf(__('For more information on how to get your API credentials, please view the %1$sPayPal Documentation%2$s.', 'event_espresso'), '<a target="_blank" href="https://developer.paypal.com/docs/classic/api/apiCredentials/#create-an-api-signature">', '</a>'); ?>
 </p>
 
 
@@ -14,25 +14,25 @@ 
 </p>
 <ul>
 	<li>
-		<strong><?php _e( 'API Username', 'event_espresso' ); ?></strong><br/>
-		<?php _e( 'Your PayPal API Username.'); ?>
+		<strong><?php _e('API Username', 'event_espresso'); ?></strong><br/>
+		<?php _e('Your PayPal API Username.'); ?>
 	</li>
 	<li>
-		<strong><?php _e( 'API Password', 'event_espresso' ); ?></strong><br/>
-		<?php _e( 'Your PayPal API Password.' ); ?>
+		<strong><?php _e('API Password', 'event_espresso'); ?></strong><br/>
+		<?php _e('Your PayPal API Password.'); ?>
 	</li>
 	<li>
-		<strong><?php _e( 'API Signature', 'event_espresso' ); ?></strong><br/>
-		<?php _e( 'Your PayPal Account Signature.' ); ?>
+		<strong><?php _e('API Signature', 'event_espresso'); ?></strong><br/>
+		<?php _e('Your PayPal Account Signature.'); ?>
 	</li>
 	<li>
-		<strong><?php _e( 'Request Shipping Address', 'event_espresso' ); ?></strong><br/>
-		<?php _e( 'Indicates whether or not you require the buyer\'s shipping address on file with PayPal be a confirmed address.' ); ?>
+		<strong><?php _e('Request Shipping Address', 'event_espresso'); ?></strong><br/>
+		<?php _e('Indicates whether or not you require the buyer\'s shipping address on file with PayPal be a confirmed address.'); ?>
 	</li>
 </ul>
 <p>
-	<?php printf( __('For testing please use a %1$s PaypPal Sandbox account%2$s.', 'event_espresso'), '<a target="_blank" href="https://developer.paypal.com">', '</a>' ); ?>
+	<?php printf(__('For testing please use a %1$s PaypPal Sandbox account%2$s.', 'event_espresso'), '<a target="_blank" href="https://developer.paypal.com">', '</a>'); ?>
 </p>
 <p>
-	<?php printf( __('Don\'t have PayPal? %1$sSign up for an account%2$s to get start right away.', 'event_espresso'), '<a target="_blank" href="hhttps://eventespresso.com/go/paypalstandard/">', '</a>' ); ?>
+	<?php printf(__('Don\'t have PayPal? %1$sSign up for an account%2$s to get start right away.', 'event_espresso'), '<a target="_blank" href="hhttps://eventespresso.com/go/paypalstandard/">', '</a>'); ?>
 </p>
\ No newline at end of file

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>
 

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

Spacing +57 added lines, -57 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION')){
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
 	exit('No direct script access allowed');
 }
 /**
@@ -79,12 +79,12 @@ 
 	 *	@type $name string the name for this form section, if you want to explicitly define it
 	 * }
 	 */
-	public function __construct( $options_array = array() ) {
+	public function __construct($options_array = array()) {
 		// used by display strategies
 		// assign incoming values to properties
-		foreach( $options_array as $key => $value ) {
-			$key = '_' . $key;
-			if ( property_exists( $this, $key ) && empty( $this->{$key} )) {
+		foreach ($options_array as $key => $value) {
+			$key = '_'.$key;
+			if (property_exists($this, $key) && empty($this->{$key} )) {
 				$this->{$key} = $value;
 			}
 		}
@@ -97,10 +97,10 @@ 
 	 * @param $name
 	 * @throws \EE_Error
 	 */
-	protected function _construct_finalize( $parent_form_section, $name ){
+	protected function _construct_finalize($parent_form_section, $name) {
 		$this->_construction_finalized = TRUE;
 		$this->_parent_section = $parent_form_section;
-		if( $name !== null ) {
+		if ($name !== null) {
 			$this->_name = $name;
 		}
 	}
@@ -111,9 +111,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);
 		}
 	}
 
@@ -131,7 +131,7 @@ 
 	/**
 	 * @param string $action
 	 */
-	public function set_action( $action ) {
+	public function set_action($action) {
 		$this->_action = $action;
 	}
 
@@ -141,7 +141,7 @@ 
 	 * @return string
 	 */
 	public function method() {
-		return ! empty( $this->_method ) ? $this->_method : 'POST';
+		return ! empty($this->_method) ? $this->_method : 'POST';
 	}
 
 
@@ -149,8 +149,8 @@ 
 	/**
 	 * @param string $method
 	 */
-	public function set_method( $method ) {
-		switch ( $method ) {
+	public function set_method($method) {
+		switch ($method) {
 			case 'get' :
 			case 'GET' :
 				$this->_method = 'GET';
@@ -169,12 +169,12 @@ 
 	 *
 	 * @throws \EE_Error
 	 */
-	protected function _set_default_html_id_if_empty(){
-		if( ! $this->_html_id ){
-			if( $this->_parent_section && $this->_parent_section instanceof EE_Form_Section_Proper ){
-				$this->_html_id = $this->_parent_section->html_id() . '-' . $this->_prep_name_for_html_id( $this->name() );
-			}else{
-				$this->_html_id = $this->_prep_name_for_html_id( $this->name() );
+	protected function _set_default_html_id_if_empty() {
+		if ( ! $this->_html_id) {
+			if ($this->_parent_section && $this->_parent_section instanceof EE_Form_Section_Proper) {
+				$this->_html_id = $this->_parent_section->html_id().'-'.$this->_prep_name_for_html_id($this->name());
+			} else {
+				$this->_html_id = $this->_prep_name_for_html_id($this->name());
 			}
 		}
 	}
@@ -186,8 +186,8 @@ 
 	 * @param $name
 	 * @return string
 	 */
-	private function _prep_name_for_html_id( $name ) {
-		return sanitize_key( str_replace( array( '&nbsp;', ' ', '_' ), '-', $name ));
+	private function _prep_name_for_html_id($name) {
+		return sanitize_key(str_replace(array('&nbsp;', ' ', '_'), '-', $name));
 	}
 
 
@@ -201,7 +201,7 @@ 
 	 * and so might stop working anytime.
 	 * @return string
 	 */
-	public function get_html_and_js(){
+	public function get_html_and_js() {
 		return $this->get_html();
 	}
 	
@@ -217,9 +217,9 @@ 
 	 * @param bool $add_pound_sign
 	 * @return string
 	 */
-	public function html_id( $add_pound_sign = FALSE ){
+	public function html_id($add_pound_sign = FALSE) {
 		$this->_set_default_html_id_if_empty();
-		return $add_pound_sign ? '#' . $this->_html_id : $this->_html_id;
+		return $add_pound_sign ? '#'.$this->_html_id : $this->_html_id;
 	}
 
 
@@ -227,7 +227,7 @@ 
 	/**
 	 * @return string
 	 */
-	public function html_class(){
+	public function html_class() {
 		return $this->_html_class;
 	}
 
@@ -236,7 +236,7 @@ 
 	/**
 	 * @return string
 	 */
-	public function html_style(){
+	public function html_style() {
 		return $this->_html_style;
 	}
 
@@ -245,7 +245,7 @@ 
 	/**
 	 * @param mixed $html_class
 	 */
-	public function set_html_class( $html_class ) {
+	public function set_html_class($html_class) {
 		$this->_html_class = $html_class;
 	}
 
@@ -254,7 +254,7 @@ 
 	/**
 	 * @param mixed $html_id
 	 */
-	public function set_html_id( $html_id ) {
+	public function set_html_id($html_id) {
 		$this->_html_id = $html_id;
 	}
 
@@ -263,7 +263,7 @@ 
 	/**
 	 * @param mixed $html_style
 	 */
-	public function set_html_style( $html_style ) {
+	public function set_html_style($html_style) {
 		$this->_html_style = $html_style;
 	}
 
@@ -272,7 +272,7 @@ 
 	/**
 	 * @param string $other_html_attributes
 	 */
-	public function set_other_html_attributes( $other_html_attributes ) {
+	public function set_other_html_attributes($other_html_attributes) {
 		$this->_other_html_attributes = $other_html_attributes;
 	}
 
@@ -292,9 +292,9 @@ 
 	 * @throws EE_Error
 	 * @return string
 	 */
-	public function name(){
-		if( ! $this->_construction_finalized ){
-			throw new EE_Error(sprintf( __( 'You cannot use the form section\s name until _construct_finalize has been called on it (when we set the name). It was called on a form section of type \'s\'', 'event_espresso' ), get_class($this) ) );
+	public function name() {
+		if ( ! $this->_construction_finalized) {
+			throw new EE_Error(sprintf(__('You cannot use the form section\s name until _construct_finalize has been called on it (when we set the name). It was called on a form section of type \'s\'', 'event_espresso'), get_class($this)));
 		}
 		return $this->_name;
 	}
@@ -305,7 +305,7 @@ 
 	 * Gets the parent section
 	 * @return EE_Form_Section_Proper
 	 */
-	public function parent_section(){
+	public function parent_section() {
 		return $this->_parent_section;
 	}
 
@@ -318,18 +318,18 @@ 
 	 * @param string $other_attributes anything else added to the form open tag, MUST BE VALID HTML
 	 * @return string
 	 */
-	public function form_open( $action = '', $method = '', $other_attributes = '' ) {
-		if ( ! empty( $action )) {
-			$this->set_action( $action );
+	public function form_open($action = '', $method = '', $other_attributes = '') {
+		if ( ! empty($action)) {
+			$this->set_action($action);
 		}
-		if ( ! empty( $method )) {
-			$this->set_method( $method );
+		if ( ! empty($method)) {
+			$this->set_method($method);
 		}
-		$html = EEH_HTML::nl( 1, 'form' ) . '<form';
-		$html .= $this->html_id() !== '' ? ' id="' . $this->html_id() . '"' : '';
-		$html .= ' action="' . $this->action() . '"';
-		$html .= ' method="' . $this->method() . '"';
-		$html .= $other_attributes . '>';
+		$html = EEH_HTML::nl(1, 'form').'<form';
+		$html .= $this->html_id() !== '' ? ' id="'.$this->html_id().'"' : '';
+		$html .= ' action="'.$this->action().'"';
+		$html .= ' method="'.$this->method().'"';
+		$html .= $other_attributes.'>';
 		return $html;
 	}
 
@@ -340,7 +340,7 @@ 
 	 * @return string
 	 */
 	public function form_close() {
-		return EEH_HTML::nl( -1, 'form' ) . '</form>' . EEH_HTML::nl() . '<!-- end of ee-' . $this->html_id() . '-form -->' . EEH_HTML::nl();
+		return EEH_HTML::nl( -1, 'form' ).'</form>'.EEH_HTML::nl().'<!-- end of ee-'.$this->html_id().'-form -->'.EEH_HTML::nl();
 	}
 	
 	/**
@@ -349,7 +349,7 @@ 
 	 * Default does nothing, but child classes can override
 	 * @return void
 	 */
-	public function enqueue_js(){
+	public function enqueue_js() {
 		//defaults to enqueue NO js or css
 	}
 
@@ -365,7 +365,7 @@ 
 	 * @param array $form_other_js_data
 	 * @return array
 	 */
-	public function get_other_js_data( $form_other_js_data = array() ) {
+	public function get_other_js_data($form_other_js_data = array()) {
 		return $form_other_js_data;
 	}
 
@@ -383,20 +383,20 @@ 
 	 * @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 ) {		
-		if( strpos( $form_section_path, '/' ) === 0 ) {
-			$form_section_path = substr( $form_section_path, strlen( '/' ) );
+	public function find_section_from_path($form_section_path) {		
+		if (strpos($form_section_path, '/') === 0) {
+			$form_section_path = substr($form_section_path, strlen('/'));
 		}
-		if( empty( $form_section_path ) ) {
+		if (empty($form_section_path)) {
 			return $this;
 		}
-		if( strpos( $form_section_path, '../' ) === 0 ) {
+		if (strpos($form_section_path, '../') === 0) {
 			$parent = $this->parent_section();
 			
-			$form_section_path = substr( $form_section_path, strlen( '../' ) );
-			if( $parent instanceof EE_Form_Section_Base ) {
-				return $parent->find_section_from_path( $form_section_path );
-			} elseif( empty( $form_section_path ) ) {
+			$form_section_path = substr($form_section_path, strlen('../'));
+			if ($parent instanceof EE_Form_Section_Base) {
+				return $parent->find_section_from_path($form_section_path);
+			} elseif (empty($form_section_path)) {
 				return $this;
 			}
 		}

Braces +1 added lines, -1 removed lines

@@ -173,7 +173,7 @@
 		if( ! $this->_html_id ){
 			if( $this->_parent_section && $this->_parent_section instanceof EE_Form_Section_Proper ){
 				$this->_html_id = $this->_parent_section->html_id() . '-' . $this->_prep_name_for_html_id( $this->name() );
-			}else{
+			} else{
 				$this->_html_id = $this->_prep_name_for_html_id( $this->name() );
 			}
 		}

payment_methods/Paypal_Standard/EE_Paypal_Standard_Form.form.php

Indentation +5 added lines, -5 removed lines

@@ -57,11 +57,11 @@
 
 
 
-    /**
-     * @param array $req_data
-     * @throws EE_Error
-     */
-    public function _normalize( $req_data ) {
+	/**
+	 * @param array $req_data
+	 * @throws EE_Error
+	 */
+	public function _normalize( $req_data ) {
 		parent::_normalize( $req_data );
 		$paypal_calculates_shipping = $this->get_input_value( 'paypal_shipping' );
 		$paypal_calculates_taxes = $this->get_input_value( 'paypal_taxes' );

Spacing +37 added lines, -37 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 /**
@@ -21,35 +21,35 @@ 
 	/**
 	 * @param EE_PMT_Paypal_Standard $payment_method_type
 	 */
-	public function __construct( $payment_method_type ){
+	public function __construct($payment_method_type) {
 		parent::__construct(
 			array(
 				'payment_method_type'          => $payment_method_type,
 				'extra_meta_inputs'            => array(
-					'paypal_id'        => new EE_Text_Input( array(
-						'html_label_text' => sprintf( __( "Paypal Email %s", 'event_espresso' ), $payment_method_type->get_help_tab_link() ),
-						'html_help_text'  => __( "Typically payment@example-domain.com", 'event_espresso' ),
+					'paypal_id'        => new EE_Text_Input(array(
+						'html_label_text' => sprintf(__("Paypal Email %s", 'event_espresso'), $payment_method_type->get_help_tab_link()),
+						'html_help_text'  => __("Typically payment@example-domain.com", 'event_espresso'),
 						'required'        => true
-					) ),
-					'image_url'        => new EE_Admin_File_Uploader_Input( array(
-						'html_help_text'  => __( "Used for your business/personal logo on the PayPal page", 'event_espresso' ),
-						'html_label_text' => __( 'Image URL', 'event_espresso' )
-					) ),
-					'paypal_taxes'     => new EE_Yes_No_Input( array(
-						'html_label_text' => sprintf( __( 'Paypal Calculates Taxes %s', 'event_espresso' ), $payment_method_type->get_help_tab_link() ),
-						'html_help_text'  => __( 'Whether Paypal should add taxes to the order', 'event_espresso' ),
+					)),
+					'image_url'        => new EE_Admin_File_Uploader_Input(array(
+						'html_help_text'  => __("Used for your business/personal logo on the PayPal page", 'event_espresso'),
+						'html_label_text' => __('Image URL', 'event_espresso')
+					)),
+					'paypal_taxes'     => new EE_Yes_No_Input(array(
+						'html_label_text' => sprintf(__('Paypal Calculates Taxes %s', 'event_espresso'), $payment_method_type->get_help_tab_link()),
+						'html_help_text'  => __('Whether Paypal should add taxes to the order', 'event_espresso'),
 						'default'         => false
-					) ),
-					'paypal_shipping'  => new EE_Yes_No_Input( array(
-						'html_label_text' => sprintf( __( 'Paypal Calculates Shipping %s', 'event_espresso' ), $payment_method_type->get_help_tab_link() ),
-						'html_help_text'  => __( 'Whether Paypal should add shipping surcharges', 'event_espresso' ),
+					)),
+					'paypal_shipping'  => new EE_Yes_No_Input(array(
+						'html_label_text' => sprintf(__('Paypal Calculates Shipping %s', 'event_espresso'), $payment_method_type->get_help_tab_link()),
+						'html_help_text'  => __('Whether Paypal should add shipping surcharges', 'event_espresso'),
 						'default'         => false
-					) ),
-					'shipping_details' => new EE_Select_Input( array(
-						EE_PMT_Paypal_Standard::shipping_info_none     => __( "Do not prompt for an address", 'event_espresso' ),
-						EE_PMT_Paypal_Standard::shipping_info_optional => __( "Prompt for an address, but do not require it", 'event_espresso' ),
-						EE_PMT_Paypal_Standard::shipping_info_required => __( "Prompt for an address, and require it", 'event_espresso' )
-					) )
+					)),
+					'shipping_details' => new EE_Select_Input(array(
+						EE_PMT_Paypal_Standard::shipping_info_none     => __("Do not prompt for an address", 'event_espresso'),
+						EE_PMT_Paypal_Standard::shipping_info_optional => __("Prompt for an address, but do not require it", 'event_espresso'),
+						EE_PMT_Paypal_Standard::shipping_info_required => __("Prompt for an address, and require it", 'event_espresso')
+					))
 				)
 			)
 		);
@@ -61,28 +61,28 @@ 
      * @param array $req_data
      * @throws EE_Error
      */
-    public function _normalize( $req_data ) {
-		parent::_normalize( $req_data );
-		$paypal_calculates_shipping = $this->get_input_value( 'paypal_shipping' );
-		$paypal_calculates_taxes = $this->get_input_value( 'paypal_taxes' );
-		$paypal_requests_address_info = $this->get_input_value( 'shipping_details' );
+    public function _normalize($req_data) {
+		parent::_normalize($req_data);
+		$paypal_calculates_shipping = $this->get_input_value('paypal_shipping');
+		$paypal_calculates_taxes = $this->get_input_value('paypal_taxes');
+		$paypal_requests_address_info = $this->get_input_value('shipping_details');
 		if (
-			( $paypal_calculates_shipping || $paypal_calculates_taxes ) &&
+			($paypal_calculates_shipping || $paypal_calculates_taxes) &&
 			$paypal_requests_address_info == EE_PMT_Paypal_Standard::shipping_info_none
 		) {
 			//they want paypal to calculate taxes or shipping. They need to ask for
 			//address info, otherwise paypal can't calculate taxes or shipping
 			/** @type EE_Select_Input $shipping_details_input */
-			$shipping_details_input = $this->get_input( 'shipping_details' );
-			$shipping_details_input->set_default( EE_PMT_Paypal_Standard::shipping_info_optional );
+			$shipping_details_input = $this->get_input('shipping_details');
+			$shipping_details_input->set_default(EE_PMT_Paypal_Standard::shipping_info_optional);
 			$shipping_details_input_options = $shipping_details_input->options();
 			EE_Error::add_attention(
 				sprintf(
-					__( 'Automatically set "%s" to "%s" because Paypal requires address info in order to calculate shipping or taxes.', 'event_espresso' ),
-					strip_tags( $shipping_details_input->html_label_text() ),
-					isset( $shipping_details_input_options[ EE_PMT_Paypal_Standard::shipping_info_optional ] )
-						? $shipping_details_input_options[ EE_PMT_Paypal_Standard::shipping_info_optional ]
-						: __( 'Unknown', 'event_espresso' )
+					__('Automatically set "%s" to "%s" because Paypal requires address info in order to calculate shipping or taxes.', 'event_espresso'),
+					strip_tags($shipping_details_input->html_label_text()),
+					isset($shipping_details_input_options[EE_PMT_Paypal_Standard::shipping_info_optional])
+						? $shipping_details_input_options[EE_PMT_Paypal_Standard::shipping_info_optional]
+						: __('Unknown', 'event_espresso')
 				),
 				__FILE__, __FUNCTION__, __LINE__
 			);

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 );
 	}

core/CPTs/EE_CPT_Event_Strategy.core.php

Spacing +33 added lines, -33 removed lines

@@ -39,13 +39,13 @@ 
 	 * @param WP_Query $wp_query
 	 * @param array $CPT
 	 */
-	public function __construct( $wp_query, $CPT = array() ) {
-		if ( $wp_query instanceof WP_Query ) {
+	public function __construct($wp_query, $CPT = array()) {
+		if ($wp_query instanceof WP_Query) {
 			$WP_Query = $wp_query;
 			$this->CPT = $CPT;
 		} else {
-			$WP_Query = isset( $wp_query[ 'WP_Query' ] ) ? $wp_query[ 'WP_Query' ] : null;
-			$this->CPT = isset( $wp_query[ 'CPT' ] ) ? $wp_query[ 'CPT' ] : null;
+			$WP_Query = isset($wp_query['WP_Query']) ? $wp_query['WP_Query'] : null;
+			$this->CPT = isset($wp_query['CPT']) ? $wp_query['CPT'] : null;
 		}
 		// !!!!!!!!!!  IMPORTANT !!!!!!!!!!!!
 		// here's the list of available filters in the WP_Query object
@@ -59,10 +59,10 @@ 
 		// 'posts_fields'
 		// 'posts_join'
 		$this->_add_filters();
-		if ( $WP_Query instanceof WP_Query ) {
-			$WP_Query->is_espresso_event_single = is_singular() && isset( $WP_Query->query->post_type ) && $WP_Query->query->post_type == 'espresso_events' ? TRUE : FALSE;
+		if ($WP_Query instanceof WP_Query) {
+			$WP_Query->is_espresso_event_single = is_singular() && isset($WP_Query->query->post_type) && $WP_Query->query->post_type == 'espresso_events' ? TRUE : FALSE;
 			$WP_Query->is_espresso_event_archive = is_post_type_archive('espresso_events') ? TRUE : FALSE;
-			$WP_Query->is_espresso_event_taxonomy = is_tax( 'espresso_event_categories' ) ? TRUE : FALSE;
+			$WP_Query->is_espresso_event_taxonomy = is_tax('espresso_event_categories') ? TRUE : FALSE;
 		}
 
 	}
@@ -74,13 +74,13 @@ 
 	 * (which will get removed in case the next call to get_posts ISN'T
 	 * for event CPTs)
 	 */
-	protected function _add_filters(){
-		add_filter( 'posts_fields', array( $this, 'posts_fields' ), 1, 2 );
-		add_filter( 'posts_join', array( $this, 'posts_join' ), 1, 2 );
-		add_filter( 'posts_where', array( $this, 'posts_where' ), 10, 2 );
+	protected function _add_filters() {
+		add_filter('posts_fields', array($this, 'posts_fields'), 1, 2);
+		add_filter('posts_join', array($this, 'posts_join'), 1, 2);
+		add_filter('posts_where', array($this, 'posts_where'), 10, 2);
 		// add_filter( 'the_posts', array( $this, 'the_posts' ), 1, 2 );
-		add_filter( 'posts_orderby', array( $this, 'posts_orderby' ), 1, 2 );
-		add_filter( 'posts_groupby', array( $this, 'posts_groupby' ), 1, 2 );
+		add_filter('posts_orderby', array($this, 'posts_orderby'), 1, 2);
+		add_filter('posts_groupby', array($this, 'posts_groupby'), 1, 2);
 	}
 
 
@@ -90,13 +90,13 @@ 
 	 * This is to avoid applying this CPT strategy for other posts or CPTs (eg,
 	 * we don't want to join to the datetime table when querying for venues, do we!?)
 	 */
-	protected function _remove_filters(){
-		remove_filter( 'posts_fields', array( $this, 'posts_fields' ), 1 );
-		remove_filter( 'posts_join', array( $this, 'posts_join' ), 1 );
-		remove_filter( 'posts_where', array( $this, 'posts_where' ), 10 );
+	protected function _remove_filters() {
+		remove_filter('posts_fields', array($this, 'posts_fields'), 1);
+		remove_filter('posts_join', array($this, 'posts_join'), 1);
+		remove_filter('posts_where', array($this, 'posts_where'), 10);
 		// remove_filter( 'the_posts', array( $this, 'the_posts' ), 1 );
-		remove_filter( 'posts_orderby', array( $this, 'posts_orderby' ), 1 );
-		remove_filter( 'posts_groupby', array( $this, 'posts_groupby' ), 1 );
+		remove_filter('posts_orderby', array($this, 'posts_orderby'), 1);
+		remove_filter('posts_groupby', array($this, 'posts_groupby'), 1);
 	}
 
 
@@ -109,7 +109,7 @@ 
 	 * @param WP_Query $wp_query
 	 * @return    string
 	 */
-	public function posts_fields( $SQL, WP_Query $wp_query ) {
+	public function posts_fields($SQL, WP_Query $wp_query) {
 		if (
 			$wp_query instanceof WP_Query
 			&&
@@ -120,11 +120,11 @@ 
 			)
 		) {
 			// adds something like ", wp_esp_datetime.* " to WP Query SELECT statement
-			$SQL .= ', ' . EEM_Datetime::instance()->table() . '.* ' ;
-			if ( $wp_query->is_espresso_event_archive || $wp_query->is_espresso_event_taxonomy ) {
+			$SQL .= ', '.EEM_Datetime::instance()->table().'.* ';
+			if ($wp_query->is_espresso_event_archive || $wp_query->is_espresso_event_taxonomy) {
 				// because we only want to retrieve the next upcoming datetime for each event:
 				// add something like ", MIN( wp_esp_datetime.DTT_EVT_start ) as event_start_date " to WP Query SELECT statement
-				$SQL .= ', MIN( ' . EEM_Datetime::instance()->table() . '.DTT_EVT_start ) as event_start_date ' ;
+				$SQL .= ', MIN( '.EEM_Datetime::instance()->table().'.DTT_EVT_start ) as event_start_date ';
 			}
 		}
 		return $SQL;
@@ -141,7 +141,7 @@ 
 	 * @internal  param \WP_Query $WP_Query
 	 * @return    string
 	 */
-	public function posts_join( $SQL, WP_Query $wp_query ) {
+	public function posts_join($SQL, WP_Query $wp_query) {
 		if (
 			$wp_query instanceof WP_Query
 			&&
@@ -152,7 +152,7 @@ 
 			)
 		) {
 			// adds something like " LEFT JOIN wp_esp_datetime ON ( wp_esp_datetime.EVT_ID = wp_posts.ID ) " to WP Query JOIN statement
-			$SQL .= ' INNER JOIN ' . EEM_Datetime::instance()->table() . ' ON ( ' . EEM_Event::instance()->table() . '.ID = ' . EEM_Datetime::instance()->table() . '.' . EEM_Event::instance()->primary_key_name() . ' ) ';
+			$SQL .= ' INNER JOIN '.EEM_Datetime::instance()->table().' ON ( '.EEM_Event::instance()->table().'.ID = '.EEM_Datetime::instance()->table().'.'.EEM_Event::instance()->primary_key_name().' ) ';
 		}
 		return $SQL;
 	}
@@ -167,7 +167,7 @@ 
 	 * @param WP_Query $wp_query
 	 * @return    string
 	 */
-	public function posts_where( $SQL, WP_Query $wp_query ) {
+	public function posts_where($SQL, WP_Query $wp_query) {
 //		global $wpdb;
 		if (
 			$wp_query instanceof WP_Query
@@ -177,8 +177,8 @@ 
 				|| $wp_query->is_espresso_event_taxonomy
 			)
 		) {
-			if ( ! isset( EE_Registry::instance()->CFG->template_settings->EED_Events_Archive ) || ! isset( EE_Registry::instance()->CFG->template_settings->EED_Events_Archive->display_expired_events ) || ! EE_Registry::instance()->CFG->template_settings->EED_Events_Archive->display_expired_events ) {
-				$SQL .=  ' AND ' . EEM_Datetime::instance()->table() . ".DTT_EVT_end > '" . current_time( 'mysql', true ) . "' ";
+			if ( ! isset(EE_Registry::instance()->CFG->template_settings->EED_Events_Archive) || ! isset(EE_Registry::instance()->CFG->template_settings->EED_Events_Archive->display_expired_events) || ! EE_Registry::instance()->CFG->template_settings->EED_Events_Archive->display_expired_events) {
+				$SQL .= ' AND '.EEM_Datetime::instance()->table().".DTT_EVT_end > '".current_time('mysql', true)."' ";
 			}
 		}
 		return $SQL;
@@ -194,7 +194,7 @@ 
 	 * @param 	WP_Query $wp_query
 	 * @return 	string
 	 */
-	public function posts_orderby( $SQL, WP_Query $wp_query ) {
+	public function posts_orderby($SQL, WP_Query $wp_query) {
 		if (
 			$wp_query instanceof WP_Query
 			&&
@@ -218,7 +218,7 @@ 
 	 * @param WP_Query $wp_query
 	 * @return    string
 	 */
-	public function posts_groupby( $SQL, WP_Query $wp_query ) {
+	public function posts_groupby($SQL, WP_Query $wp_query) {
 		if (
 			$wp_query instanceof WP_Query
 			&&
@@ -231,7 +231,7 @@ 
 			// we're joining to the datetimes table, where there can be MANY datetimes for a single event, but we want to only show each event only once
 			// (whereas if we didn't group them by the post's ID, then we would end up with many repeats)
 			global $wpdb;
-			$SQL = $wpdb->posts . '.ID ';
+			$SQL = $wpdb->posts.'.ID ';
 		}
 		return $SQL;
 	}
@@ -246,7 +246,7 @@ 
 	 * @param WP_Query $wp_query
 	 * @return    array
 	 */
-	public function the_posts( $posts, WP_Query $wp_query ) {
+	public function the_posts($posts, WP_Query $wp_query) {
 		return $posts;
 	}
 
@@ -262,7 +262,7 @@ 
 	 * @param      $single
 	 * @return    string
 	 */
-	public function get_EE_post_type_metadata( $meta_value = NULL, $post_id, $meta_key, $single ) {
+	public function get_EE_post_type_metadata($meta_value = NULL, $post_id, $meta_key, $single) {
 		return $meta_value;
 	}
 

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  * Event Espresso
  *

core/libraries/messages/messenger/EE_Email_messenger.class.php

Spacing +55 added lines, -55 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -29,7 +29,7 @@ 
 /**
  * This sets up the email messenger for the EE_messages (notifications) subsystem in EE.
  */
-class EE_Email_messenger extends EE_messenger  {
+class EE_Email_messenger extends EE_messenger {
 
 	/**
 	 * The following are the properties that email requires for the message going out.
@@ -77,7 +77,7 @@ 
 	protected function _set_valid_shortcodes() {
 		//remember by leaving the other fields not set, those fields will inherit the valid shortcodes from the message type.
 		$this->_valid_shortcodes = array(
-			'to' => array('email','event_author', 'primary_registration_details', 'recipient_details'),
+			'to' => array('email', 'event_author', 'primary_registration_details', 'recipient_details'),
 			'from' => array('email', 'event_author', 'primary_registration_details', 'recipient_details')
 			);
 	}
@@ -111,7 +111,7 @@ 
 				'shortcodes' => array('organization', 'primary_registration_details', 'event_author', 'primary_registration_details', 'recipient_details')
 				),
 			'content' => array(
-				'shortcodes' => array('event_list','attendee_list', 'ticket_list', 'organization', 'primary_registration_details', 'primary_registration_list', 'event_author', 'recipient_details', 'recipient_list', 'transaction', 'messenger')
+				'shortcodes' => array('event_list', 'attendee_list', 'ticket_list', 'organization', 'primary_registration_details', 'primary_registration_list', 'event_author', 'recipient_details', 'recipient_list', 'transaction', 'messenger')
 				),
 			'attendee_list' => array(
 				'shortcodes' => array('attendee', 'event_list', 'ticket_list'),
@@ -122,7 +122,7 @@ 
 				'required' => array('[EVENT_LIST]')
 				),
 			'ticket_list' => array(
-				'shortcodes' => array('event_list', 'attendee_list', 'ticket', 'datetime_list','primary_registration_details', 'recipient_details'),
+				'shortcodes' => array('event_list', 'attendee_list', 'ticket', 'datetime_list', 'primary_registration_details', 'recipient_details'),
 				'required' => array('[TICKET_LIST]')
 				),
 			'datetime_list' => array(
@@ -141,21 +141,21 @@ 
 	 *
 	 * @since 4.5.0
 	 */
-	public function do_secondary_messenger_hooks( $sending_messenger_name ) {
-		if ( $sending_messenger_name = 'html' ) {
-			add_filter( 'FHEE__EE_Messages_Template_Pack__get_variation', array( $this, 'add_email_css' ), 10, 8 );
+	public function do_secondary_messenger_hooks($sending_messenger_name) {
+		if ($sending_messenger_name = 'html') {
+			add_filter('FHEE__EE_Messages_Template_Pack__get_variation', array($this, 'add_email_css'), 10, 8);
 		}
 	}
 
 
 
 
-	public function add_email_css( $variation_path, $messenger, $message_type, $type, $variation, $file_extension, $url, EE_Messages_Template_Pack $template_pack ) {
+	public function add_email_css($variation_path, $messenger, $message_type, $type, $variation, $file_extension, $url, EE_Messages_Template_Pack $template_pack) {
 		//prevent recursion on this callback.
-		remove_filter( 'FHEE__EE_Messages_Template_Pack__get_variation', array( $this, 'add_email_css' ), 10 );
-		$variation = $this->get_variation( $template_pack, $message_type, $url, 'main', $variation, FALSE  );
+		remove_filter('FHEE__EE_Messages_Template_Pack__get_variation', array($this, 'add_email_css'), 10);
+		$variation = $this->get_variation($template_pack, $message_type, $url, 'main', $variation, FALSE);
 
-		add_filter( 'FHEE__EE_Messages_Template_Pack__get_variation', array( $this, 'add_email_css' ), 10, 8 );
+		add_filter('FHEE__EE_Messages_Template_Pack__get_variation', array($this, 'add_email_css'), 10, 8);
 		return $variation;
 	}
 
@@ -187,7 +187,7 @@ 
 				'required' => FALSE,
 				'validation' => FALSE,
 				'format' => '%s',
-				'value' => sprintf( __('Test email sent from %s', 'event_espresso'), get_bloginfo('name') ),
+				'value' => sprintf(__('Test email sent from %s', 'event_espresso'), get_bloginfo('name')),
 				'default'=> '',
 				'css_class' => ''
 				)
@@ -349,16 +349,16 @@ 
 	 * @return bool | WP_Error  true if message delivered, false if it didn't deliver OR bubble up any error object if present.
 	 */
 	protected function _send_message() {
-		$success =  wp_mail(
-			html_entity_decode( $this->_to, ENT_QUOTES, "UTF-8" ),
-			stripslashes( html_entity_decode( $this->_subject, ENT_QUOTES, "UTF-8" )),
+		$success = wp_mail(
+			html_entity_decode($this->_to, ENT_QUOTES, "UTF-8"),
+			stripslashes(html_entity_decode($this->_subject, ENT_QUOTES, "UTF-8")),
 			$this->_body(),
 			$this->_headers()
 		);
-		if ( ! $success ) {
+		if ( ! $success) {
 			EE_Error::add_error(
 				sprintf(
-					__( 'The email did not send successfully.%3$sThe WordPress wp_mail function is used for sending mails but does not give any useful information when an email fails to send.%3$sIt is possible the "to" address (%1$s) or "from" address (%2$s) is invalid.%3$s', 'event_espresso'),
+					__('The email did not send successfully.%3$sThe WordPress wp_mail function is used for sending mails but does not give any useful information when an email fails to send.%3$sIt is possible the "to" address (%1$s) or "from" address (%2$s) is invalid.%3$s', 'event_espresso'),
 					$this->_to,
 					$this->_from,
 					'<br />'
@@ -377,7 +377,7 @@ 
 	 * @return string html body of the message content and the related css.
 	 */
 	protected function _preview() {
-		return $this->_body( true );
+		return $this->_body(true);
 	}
 
 
@@ -392,18 +392,18 @@ 
 	 */
 	protected function _headers() {
 		$this->_ensure_has_from_email_address();
-		$from = stripslashes_deep( html_entity_decode($this->_from,  ENT_QUOTES,"UTF-8" ) );
+		$from = stripslashes_deep(html_entity_decode($this->_from, ENT_QUOTES, "UTF-8"));
 		$headers = array(
 			'MIME-Version: 1.0',
-			'From:' . $from,
-			'Reply-To:' . $from,
+			'From:'.$from,
+			'Reply-To:'.$from,
 			'Content-Type:text/html; charset=utf-8'
 			);
 
 		//but wait!  Header's for the from is NOT reliable because some plugins don't respect From: as set in the header.
-		add_filter( 'wp_mail_from',  array( $this, 'set_from_address' ), 100 );
-		add_filter( 'wp_mail_from_name', array( $this, 'set_from_name' ), 100 );
-		return apply_filters( 'FHEE__EE_Email_messenger___headers', $headers, $this->_incoming_message_type, $this );
+		add_filter('wp_mail_from', array($this, 'set_from_address'), 100);
+		add_filter('wp_mail_from_name', array($this, 'set_from_name'), 100);
+		return apply_filters('FHEE__EE_Email_messenger___headers', $headers, $this->_incoming_message_type, $this);
 	}
 
 
@@ -412,7 +412,7 @@ 
 	 * address for the from address to avoid problems with sending emails.
 	 */
 	protected function _ensure_has_from_email_address() {
-		if ( empty( $this->_from ) ) {
+		if (empty($this->_from)) {
 			$this->_from = get_bloginfo('admin_email');
 		}
 	}
@@ -429,21 +429,21 @@ 
 	 * @return array
 	 */
 	private function _parse_from() {
-		if ( strpos( $this->_from, '<' ) !== false ) {
-			$from_name = substr( $this->_from, 0, strpos( $this->_from, '<' ) - 1 );
-			$from_name = str_replace( '"', '', $from_name );
-			$from_name = trim( $from_name );
-
-			$from_email = substr( $this->_from, strpos( $this->_from, '<' ) + 1 );
-			$from_email = str_replace( '>', '', $from_email );
-			$from_email = trim( $from_email );
-		} elseif ( trim( $this->_from ) !== '' ) {
+		if (strpos($this->_from, '<') !== false) {
+			$from_name = substr($this->_from, 0, strpos($this->_from, '<') - 1);
+			$from_name = str_replace('"', '', $from_name);
+			$from_name = trim($from_name);
+
+			$from_email = substr($this->_from, strpos($this->_from, '<') + 1);
+			$from_email = str_replace('>', '', $from_email);
+			$from_email = trim($from_email);
+		} elseif (trim($this->_from) !== '') {
 			$from_name = '';
-			$from_email = trim( $this->_from );
+			$from_email = trim($this->_from);
 		} else {
 			$from_name = $from_email = '';
 		}
-		return array( $from_name, $from_email );
+		return array($from_name, $from_email);
 	}
 
 
@@ -456,10 +456,10 @@ 
 	 *
 	 * @param string $from_email What the original from_email is.
 	 */
-	public function set_from_address( $from_email ) {
+	public function set_from_address($from_email) {
 		$parsed_from = $this->_parse_from();
 		//includes fallback if the parsing failed.
-		$from_email = is_array( $parsed_from ) && ! empty( $parsed_from[1] ) ? $parsed_from[1] : get_bloginfo( 'admin_email' );
+		$from_email = is_array($parsed_from) && ! empty($parsed_from[1]) ? $parsed_from[1] : get_bloginfo('admin_email');
 		return $from_email;
 	}
 
@@ -473,16 +473,16 @@ 
 	 *
 	 * @param string $from_name The original from_name.
 	 */
-	public function set_from_name( $from_name ) {
+	public function set_from_name($from_name) {
 		$parsed_from = $this->_parse_from();
-		if ( is_array( $parsed_from) && ! empty( $parsed_from[0] ) ) {
-			$from_name =  $parsed_from[0];
+		if (is_array($parsed_from) && ! empty($parsed_from[0])) {
+			$from_name = $parsed_from[0];
 		}
 
 		//if from name is "WordPress" let's sub in the site name instead (more friendly!)
 		$from_name = $from_name == 'WordPress' ? get_bloginfo() : $from_name;
 
-		return stripslashes_deep( html_entity_decode($from_name,  ENT_QUOTES,"UTF-8" ) );
+		return stripslashes_deep(html_entity_decode($from_name, ENT_QUOTES, "UTF-8"));
 	}
 
 
@@ -493,14 +493,14 @@ 
 	 * @param bool $preview will determine whether this is preview template or not.
 	 * @return string formatted body for email.
 	 */
-	protected function _body( $preview = false ) {
+	protected function _body($preview = false) {
 		//setup template args!
 		$this->_template_args = array(
 			'subject' => $this->_subject,
 			'from' => $this->_from,
-			'main_body' => wpautop(stripslashes_deep( html_entity_decode($this->_content,  ENT_QUOTES,"UTF-8" ) ))
+			'main_body' => wpautop(stripslashes_deep(html_entity_decode($this->_content, ENT_QUOTES, "UTF-8")))
 			);
-		$body =  $this->_get_main_template( $preview );
+		$body = $this->_get_main_template($preview);
 
 		/**
 		 * This filter allows one to bypass the CSSToInlineStyles tool and leave the body untouched.
@@ -508,17 +508,17 @@ 
 		 * @type    bool    $preview    Indicates whether a preview is being generated or not.
 		 * @return  bool    true  indicates to use the inliner, false bypasses it.
 		 */
-		if ( apply_filters( 'FHEE__EE_Email_messenger__apply_CSSInliner ', true, $preview ) ) {
+		if (apply_filters('FHEE__EE_Email_messenger__apply_CSSInliner ', true, $preview)) {
 
 			//require CssToInlineStyles library and its dependencies via composer autoloader
-			require_once EE_THIRD_PARTY . 'cssinliner/vendor/autoload.php';
+			require_once EE_THIRD_PARTY.'cssinliner/vendor/autoload.php';
 
 			//now if this isn't a preview, let's setup the body so it has inline styles
-			if ( ! $preview || ( $preview && defined( 'DOING_AJAX' ) ) ) {
-				$style = file_get_contents( $this->get_variation( $this->_tmp_pack, $this->_incoming_message_type->name, FALSE, 'main', $this->_variation ), TRUE );
-				$CSS = new TijsVerkoyen\CssToInlineStyles\CssToInlineStyles( $body, $style );
-				$body = ltrim( $CSS->convert( true ), ">\n" ); //for some reason the library has a bracket and new line at the beginning.  This takes care of that.
-				$body = ltrim( $body, "<?" ); //see https://events.codebasehq.com/projects/event-espresso/tickets/8609
+			if ( ! $preview || ($preview && defined('DOING_AJAX'))) {
+				$style = file_get_contents($this->get_variation($this->_tmp_pack, $this->_incoming_message_type->name, FALSE, 'main', $this->_variation), TRUE);
+				$CSS = new TijsVerkoyen\CssToInlineStyles\CssToInlineStyles($body, $style);
+				$body = ltrim($CSS->convert(true), ">\n"); //for some reason the library has a bracket and new line at the beginning.  This takes care of that.
+				$body = ltrim($body, "<?"); //see https://events.codebasehq.com/projects/event-espresso/tickets/8609
 			}
 
 		}
@@ -537,8 +537,8 @@ 
 	public function get_existing_test_settings() {
 		$settings = parent::get_existing_test_settings();
 		//override subject if present because we always want it to be fresh.
-		if ( is_array( $settings ) && ! empty( $settings['subject'] ) ) {
-			$settings['subject'] = sprintf( __('Test email sent from %s', 'event_espresso'), get_bloginfo('name') );
+		if (is_array($settings) && ! empty($settings['subject'])) {
+			$settings['subject'] = sprintf(__('Test email sent from %s', 'event_espresso'), get_bloginfo('name'));
 		}
 		return $settings;
 	}

Doc Comments +1 added lines, -1 removed lines

@@ -426,7 +426,7 @@
 	 *
 	 * @since 4.3.1
 	 *
-	 * @return array
+	 * @return string[]
 	 */
 	private function _parse_from() {
 		if ( strpos( $this->_from, '<' ) !== false ) {

Braces +2 added lines, -1 removed lines

@@ -1,6 +1,7 @@
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * Event Espresso