eventespresso / event-espresso-core

core/domain/entities/RegCode.php

Indentation +43 added lines, -43 removed lines

@@ -14,49 +14,49 @@
 {
 
 
-    /*
+	/*
      * @var string $reg_code
      */
-    private $reg_code;
-
-
-    /**
-     * RegCode constructor.
-     *
-     * @param RegUrlLink      $reg_url_link
-     * @param \EE_Transaction $transaction
-     * @param \EE_Ticket      $ticket
-     */
-    public function __construct(
-        RegUrlLink $reg_url_link,
-        \EE_Transaction $transaction,
-        \EE_Ticket $ticket
-    ) {
-        // figure out where to start parsing the reg code
-        $chars = strpos($reg_url_link, '-') + 5;
-        // TXN_ID + TKT_ID + first 3 and last 3 chars of reg_url_link
-        $this->reg_code = array(
-            $transaction->ID(),
-            $ticket->ID(),
-            substr($reg_url_link, 0, $chars),
-        );
-        // now put it all together
-        $this->reg_code = apply_filters(
-            'FHEE__Create__regCode__new_reg_code',
-            implode('-', $this->reg_code),
-            $transaction,
-            $ticket
-        );
-    }
-
-
-    /**
-     * Return the object as a string
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->reg_code;
-    }
+	private $reg_code;
+
+
+	/**
+	 * RegCode constructor.
+	 *
+	 * @param RegUrlLink      $reg_url_link
+	 * @param \EE_Transaction $transaction
+	 * @param \EE_Ticket      $ticket
+	 */
+	public function __construct(
+		RegUrlLink $reg_url_link,
+		\EE_Transaction $transaction,
+		\EE_Ticket $ticket
+	) {
+		// figure out where to start parsing the reg code
+		$chars = strpos($reg_url_link, '-') + 5;
+		// TXN_ID + TKT_ID + first 3 and last 3 chars of reg_url_link
+		$this->reg_code = array(
+			$transaction->ID(),
+			$ticket->ID(),
+			substr($reg_url_link, 0, $chars),
+		);
+		// now put it all together
+		$this->reg_code = apply_filters(
+			'FHEE__Create__regCode__new_reg_code',
+			implode('-', $this->reg_code),
+			$transaction,
+			$ticket
+		);
+	}
+
+
+	/**
+	 * Return the object as a string
+	 *
+	 * @return string
+	 */
+	public function __toString()
+	{
+		return $this->reg_code;
+	}
 }

core/domain/entities/shortcodes/EspressoThankYou.php

Indentation +60 added lines, -60 removed lines

@@ -16,71 +16,71 @@
 class EspressoThankYou extends EspressoShortcode
 {
 
-    /**
-     * @var boolean $is_thank_you_page
-     */
-    private $is_thank_you_page = false;
+	/**
+	 * @var boolean $is_thank_you_page
+	 */
+	private $is_thank_you_page = false;
 
-    /**
-     * the actual shortcode tag that gets registered with WordPress
-     *
-     * @return string
-     */
-    public function getTag()
-    {
-        return 'ESPRESSO_THANK_YOU';
-    }
+	/**
+	 * the actual shortcode tag that gets registered with WordPress
+	 *
+	 * @return string
+	 */
+	public function getTag()
+	{
+		return 'ESPRESSO_THANK_YOU';
+	}
 
 
-    /**
-     * the time in seconds to cache the results of the processShortcode() method
-     * 0 means the processShortcode() results will NOT be cached at all
-     *
-     * @return int
-     */
-    public function cacheExpiration()
-    {
-        return 0;
-    }
+	/**
+	 * the time in seconds to cache the results of the processShortcode() method
+	 * 0 means the processShortcode() results will NOT be cached at all
+	 *
+	 * @return int
+	 */
+	public function cacheExpiration()
+	{
+		return 0;
+	}
 
 
-    /**
-     * a place for adding any initialization code that needs to run prior to wp_header().
-     * this may be required for shortcodes that utilize a corresponding module,
-     * and need to enqueue assets for that module
-     *
-     * @return void
-     * @throws \EE_Error
-     */
-    public function initializeShortcode()
-    {
-        global $wp_query;
-        if (empty($wp_query->posts) || count($wp_query->posts) > 1) {
-            return;
-        }
-        $post = reset($wp_query->posts);
-        if (! $post instanceof WP_Post || $post->ID !== EE_Registry::instance()->CFG->core->thank_you_page_id) {
-            return;
-        }
-        $this->is_thank_you_page = true;
-        \EED_Thank_You_Page::instance()->load_resources();
-        $this->shortcodeHasBeenInitialized();
-    }
+	/**
+	 * a place for adding any initialization code that needs to run prior to wp_header().
+	 * this may be required for shortcodes that utilize a corresponding module,
+	 * and need to enqueue assets for that module
+	 *
+	 * @return void
+	 * @throws \EE_Error
+	 */
+	public function initializeShortcode()
+	{
+		global $wp_query;
+		if (empty($wp_query->posts) || count($wp_query->posts) > 1) {
+			return;
+		}
+		$post = reset($wp_query->posts);
+		if (! $post instanceof WP_Post || $post->ID !== EE_Registry::instance()->CFG->core->thank_you_page_id) {
+			return;
+		}
+		$this->is_thank_you_page = true;
+		\EED_Thank_You_Page::instance()->load_resources();
+		$this->shortcodeHasBeenInitialized();
+	}
 
 
-    /**
-     * callback that runs when the shortcode is encountered in post content.
-     * IMPORTANT !!!
-     * remember that shortcode content should be RETURNED and NOT echoed out
-     *
-     * @param array $attributes
-     * @return string
-     * @throws \EE_Error
-     */
-    public function processShortcode($attributes = array())
-    {
-        return $this->is_thank_you_page
-            ? \EED_Thank_You_Page::instance()->thank_you_page_results()
-            : '';
-    }
+	/**
+	 * callback that runs when the shortcode is encountered in post content.
+	 * IMPORTANT !!!
+	 * remember that shortcode content should be RETURNED and NOT echoed out
+	 *
+	 * @param array $attributes
+	 * @return string
+	 * @throws \EE_Error
+	 */
+	public function processShortcode($attributes = array())
+	{
+		return $this->is_thank_you_page
+			? \EED_Thank_You_Page::instance()->thank_you_page_results()
+			: '';
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
             return;
         }
         $post = reset($wp_query->posts);
-        if (! $post instanceof WP_Post || $post->ID !== EE_Registry::instance()->CFG->core->thank_you_page_id) {
+        if ( ! $post instanceof WP_Post || $post->ID !== EE_Registry::instance()->CFG->core->thank_you_page_id) {
             return;
         }
         $this->is_thank_you_page = true;

core/domain/entities/shortcodes/EspressoCheckout.php

Indentation +45 added lines, -45 removed lines

@@ -18,55 +18,55 @@
 {
 
 
-    /**
-     * the actual shortcode tag that gets registered with WordPress
-     *
-     * @return string
-     */
-    public function getTag()
-    {
-        return 'ESPRESSO_CHECKOUT';
-    }
+	/**
+	 * the actual shortcode tag that gets registered with WordPress
+	 *
+	 * @return string
+	 */
+	public function getTag()
+	{
+		return 'ESPRESSO_CHECKOUT';
+	}
 
 
-    /**
-     * the time in seconds to cache the results of the processShortcode() method
-     * 0 means the processShortcode() results will NOT be cached at all
-     *
-     * @return int
-     */
-    public function cacheExpiration()
-    {
-        return 0;
-    }
+	/**
+	 * the time in seconds to cache the results of the processShortcode() method
+	 * 0 means the processShortcode() results will NOT be cached at all
+	 *
+	 * @return int
+	 */
+	public function cacheExpiration()
+	{
+		return 0;
+	}
 
 
-    /**
-     * a place for adding any initialization code that needs to run prior to wp_header().
-     * this may be required for shortcodes that utilize a corresponding module,
-     * and need to enqueue assets for that module
-     *
-     * @return void
-     * @throws \EE_Error
-     */
-    public function initializeShortcode()
-    {
-        global $wp_query;
-        EED_Single_Page_Checkout::init($wp_query);
-        $this->shortcodeHasBeenInitialized();
-    }
+	/**
+	 * a place for adding any initialization code that needs to run prior to wp_header().
+	 * this may be required for shortcodes that utilize a corresponding module,
+	 * and need to enqueue assets for that module
+	 *
+	 * @return void
+	 * @throws \EE_Error
+	 */
+	public function initializeShortcode()
+	{
+		global $wp_query;
+		EED_Single_Page_Checkout::init($wp_query);
+		$this->shortcodeHasBeenInitialized();
+	}
 
 
-    /**
-     * callback that runs when the shortcode is encountered in post content.
-     * IMPORTANT !!!
-     * remember that shortcode content should be RETURNED and NOT echoed out
-     *
-     * @param array $attributes
-     * @return string
-     */
-    public function processShortcode($attributes = array())
-    {
-        return EE_Registry::instance()->REQ->get_output();
-    }
+	/**
+	 * callback that runs when the shortcode is encountered in post content.
+	 * IMPORTANT !!!
+	 * remember that shortcode content should be RETURNED and NOT echoed out
+	 *
+	 * @param array $attributes
+	 * @return string
+	 */
+	public function processShortcode($attributes = array())
+	{
+		return EE_Registry::instance()->REQ->get_output();
+	}
 }

core/domain/entities/shortcodes/EspressoTxnPage.php

Indentation +77 added lines, -77 removed lines

@@ -22,87 +22,87 @@
 {
 
 
-    /**
-     * the actual shortcode tag that gets registered with WordPress
-     *
-     * @return string
-     */
-    public function getTag()
-    {
-        return 'ESPRESSO_TXN_PAGE';
-    }
+	/**
+	 * the actual shortcode tag that gets registered with WordPress
+	 *
+	 * @return string
+	 */
+	public function getTag()
+	{
+		return 'ESPRESSO_TXN_PAGE';
+	}
 
 
-    /**
-     * the time in seconds to cache the results of the processShortcode() method
-     * 0 means the processShortcode() results will NOT be cached at all
-     *
-     * @return int
-     */
-    public function cacheExpiration()
-    {
-        return 0;
-    }
+	/**
+	 * the time in seconds to cache the results of the processShortcode() method
+	 * 0 means the processShortcode() results will NOT be cached at all
+	 *
+	 * @return int
+	 */
+	public function cacheExpiration()
+	{
+		return 0;
+	}
 
 
-    /**
-     * a place for adding any initialization code that needs to run prior to wp_header().
-     * this may be required for shortcodes that utilize a corresponding module,
-     * and need to enqueue assets for that module
-     *
-     * @return void
-     * @throws \Exception
-     * @throws \EE_Error
-     */
-    public function initializeShortcode()
-    {
-        $transaction = null;
-        if (EE_Registry::instance()->REQ->is_set('e_reg_url_link')) {
-            /** @var EEM_Transaction $EEM_Transaction */
-            $EEM_Transaction = EE_Registry::instance()->load_model('Transaction');
-            $transaction = $EEM_Transaction->get_transaction_from_reg_url_link();
-        }
-        if ($transaction instanceof EE_Transaction) {
-            $payment_method = null;
-            $payment_method_slug = EE_Registry::instance()->REQ->get('ee_payment_method', null);
-            if ($payment_method_slug) {
-                $payment_method = EEM_Payment_Method::instance()->get_one_by_slug($payment_method_slug);
-            }
-            if ($payment_method instanceof EE_Payment_Method && $payment_method->is_off_site()) {
-                $gateway = $payment_method->type_obj()->get_gateway();
-                if ($gateway instanceof EE_Offsite_Gateway
-                    && $gateway->handle_IPN_in_this_request(
-                        \EE_Registry::instance()->REQ->params(),
-                        true
-                    )
-                ) {
-                    /** @type EE_Payment_Processor $payment_processor */
-                    $payment_processor = EE_Registry::instance()->load_core('Payment_Processor');
-                    $payment_processor->process_ipn($_REQUEST, $transaction, $payment_method);
-                }
-            }
-            // allow gateways to add a filter to stop rendering the page
-            if (apply_filters('FHEE__EES_Espresso_Txn_Page__run__exit', false)) {
-                exit;
-            }
-        }
-        $this->shortcodeHasBeenInitialized();
-    }
+	/**
+	 * a place for adding any initialization code that needs to run prior to wp_header().
+	 * this may be required for shortcodes that utilize a corresponding module,
+	 * and need to enqueue assets for that module
+	 *
+	 * @return void
+	 * @throws \Exception
+	 * @throws \EE_Error
+	 */
+	public function initializeShortcode()
+	{
+		$transaction = null;
+		if (EE_Registry::instance()->REQ->is_set('e_reg_url_link')) {
+			/** @var EEM_Transaction $EEM_Transaction */
+			$EEM_Transaction = EE_Registry::instance()->load_model('Transaction');
+			$transaction = $EEM_Transaction->get_transaction_from_reg_url_link();
+		}
+		if ($transaction instanceof EE_Transaction) {
+			$payment_method = null;
+			$payment_method_slug = EE_Registry::instance()->REQ->get('ee_payment_method', null);
+			if ($payment_method_slug) {
+				$payment_method = EEM_Payment_Method::instance()->get_one_by_slug($payment_method_slug);
+			}
+			if ($payment_method instanceof EE_Payment_Method && $payment_method->is_off_site()) {
+				$gateway = $payment_method->type_obj()->get_gateway();
+				if ($gateway instanceof EE_Offsite_Gateway
+					&& $gateway->handle_IPN_in_this_request(
+						\EE_Registry::instance()->REQ->params(),
+						true
+					)
+				) {
+					/** @type EE_Payment_Processor $payment_processor */
+					$payment_processor = EE_Registry::instance()->load_core('Payment_Processor');
+					$payment_processor->process_ipn($_REQUEST, $transaction, $payment_method);
+				}
+			}
+			// allow gateways to add a filter to stop rendering the page
+			if (apply_filters('FHEE__EES_Espresso_Txn_Page__run__exit', false)) {
+				exit;
+			}
+		}
+		$this->shortcodeHasBeenInitialized();
+	}
 
 
-    /**
-     * callback that runs when the shortcode is encountered in post content.
-     * IMPORTANT !!!
-     * remember that shortcode content should be RETURNED and NOT echoed out
-     *
-     * @param array $attributes
-     * @return string
-     */
-    public function processShortcode($attributes = array())
-    {
-        return esc_html__(
-            'This is the Event Espresso Transactions page. This page receives instant payment notification (IPN) requests and should have a status of published, but should not be easily accessible by site visitors. Do not add it to your website\'s navigation menu or link to it from another page. Also, do not delete it or change its status to private.',
-            'event_espresso'
-        );
-    }
+	/**
+	 * callback that runs when the shortcode is encountered in post content.
+	 * IMPORTANT !!!
+	 * remember that shortcode content should be RETURNED and NOT echoed out
+	 *
+	 * @param array $attributes
+	 * @return string
+	 */
+	public function processShortcode($attributes = array())
+	{
+		return esc_html__(
+			'This is the Event Espresso Transactions page. This page receives instant payment notification (IPN) requests and should have a status of published, but should not be easily accessible by site visitors. Do not add it to your website\'s navigation menu or link to it from another page. Also, do not delete it or change its status to private.',
+			'event_espresso'
+		);
+	}
 }

core/Factory.php

Indentation +49 added lines, -49 removed lines

@@ -16,54 +16,54 @@
 class Factory
 {
 
-    /**
-     * @param string $class_name
-     * @param array  $arguments
-     * @return mixed|null
-     * @throws \EE_Error
-     */
-    public static function create($class_name, $arguments = array())
-    {
-        if (empty($class_name)) {
-            throw new \EE_Error(
-                __('You must provide a class name in order to instantiate it.', 'event_espresso')
-            );
-        }
-        // if ( ! class_exists( $class_name ) ) {
-        //     throw new \EE_Error(
-        //         sprintf(
-        //             __('The "%1$s" class was not found. Please include the correct file or set an autoloader for it',
-        //                 'event_espresso'),
-        //             $class_name
-        //         )
-        //     );
-        // }
-        $object = null;
-        switch ($class_name) {
-            case 'EE_Request':
-                $object = new \EE_Request($_GET, $_POST, $_COOKIE);
-                break;
-            case 'Iframe':
-                $title = isset($arguments['title']) ? $arguments['title'] : null;
-                $content = isset($arguments['content']) ? $arguments['content'] : null;
-                $object = new Iframe($title, $content);
-                break;
-            default:
-                $object = new $class_name($arguments);
-        }
+	/**
+	 * @param string $class_name
+	 * @param array  $arguments
+	 * @return mixed|null
+	 * @throws \EE_Error
+	 */
+	public static function create($class_name, $arguments = array())
+	{
+		if (empty($class_name)) {
+			throw new \EE_Error(
+				__('You must provide a class name in order to instantiate it.', 'event_espresso')
+			);
+		}
+		// if ( ! class_exists( $class_name ) ) {
+		//     throw new \EE_Error(
+		//         sprintf(
+		//             __('The "%1$s" class was not found. Please include the correct file or set an autoloader for it',
+		//                 'event_espresso'),
+		//             $class_name
+		//         )
+		//     );
+		// }
+		$object = null;
+		switch ($class_name) {
+			case 'EE_Request':
+				$object = new \EE_Request($_GET, $_POST, $_COOKIE);
+				break;
+			case 'Iframe':
+				$title = isset($arguments['title']) ? $arguments['title'] : null;
+				$content = isset($arguments['content']) ? $arguments['content'] : null;
+				$object = new Iframe($title, $content);
+				break;
+			default:
+				$object = new $class_name($arguments);
+		}
 
-        // if ( ! $object instanceof $class_name ) {
-        //     throw new \EE_Error(
-        //         sprintf(
-        //             __(
-        //                 'An error occurred during class instantiation and the requested object could not be created. The result was: %1$s %2$s',
-        //                 'event_espresso'
-        //             ),
-        //             '<br />',
-        //             var_export($object, true)
-        //         )
-        //     );
-        // }
-        return $object;
-    }
+		// if ( ! $object instanceof $class_name ) {
+		//     throw new \EE_Error(
+		//         sprintf(
+		//             __(
+		//                 'An error occurred during class instantiation and the requested object could not be created. The result was: %1$s %2$s',
+		//                 'event_espresso'
+		//             ),
+		//             '<br />',
+		//             var_export($object, true)
+		//         )
+		//     );
+		// }
+		return $object;
+	}
 }

core/admin/PostShortcodeTracking.php

Indentation +134 added lines, -134 removed lines

@@ -12,138 +12,138 @@
 class PostShortcodeTracking
 {
 
-    /**
-     * @deprecated 4.9.26
-     * @return    void
-     */
-    public static function set_hooks_admin()
-    {
-        \EE_Error::doing_it_wrong(__METHOD__, __('Usage is deprecated.', 'event_espresso'), '4.9.26');
-    }
-
-
-    /**
-     * @deprecated 4.9.26
-     * @param $post_ID
-     * @param $post
-     * @return void
-     */
-    public static function parse_post_content_on_save($post_ID, $post)
-    {
-        \EE_Error::doing_it_wrong(__METHOD__, __('Usage is deprecated.', 'event_espresso'), '4.9.26');
-    }
-
-
-    /**
-     * @deprecated 4.9.26
-     * @param $page_for_posts
-     * @return void
-     */
-    protected static function set_post_shortcodes_for_posts_page($page_for_posts)
-    {
-        \EE_Error::doing_it_wrong(__METHOD__, __('Usage is deprecated.', 'event_espresso'), '4.9.26');
-    }
-
-
-    /**
-     * @deprecated 4.9.26
-     * @param $page_for_posts
-     * @param $EES_Shortcode
-     * @param $post_ID
-     * @return void
-     */
-    protected static function set_post_shortcode_for_posts_page($page_for_posts, $EES_Shortcode, $post_ID)
-    {
-        \EE_Error::doing_it_wrong(__METHOD__, __('Usage is deprecated.', 'event_espresso'), '4.9.26');
-    }
-
-
-    /**
-     * @deprecated 4.9.26
-     * @param $ID
-     * @return void
-     */
-    public static function unset_post_shortcodes_on_delete($ID)
-    {
-        \EE_Error::doing_it_wrong(__METHOD__, __('Usage is deprecated.', 'event_espresso'), '4.9.26');
-    }
-
-
-    /**
-     * @deprecated 4.9.26
-     * @param      $ID
-     * @param      $shortcode_class
-     * @param      $shortcode_posts
-     * @param      $page_for_posts
-     * @param bool $update_post_shortcodes
-     * @return void
-     */
-    protected static function unset_posts_page_shortcode_for_post(
-        $ID,
-        $shortcode_class,
-        $shortcode_posts,
-        $page_for_posts,
-        $update_post_shortcodes = false
-    ) {
-        \EE_Error::doing_it_wrong(__METHOD__, __('Usage is deprecated.', 'event_espresso'), '4.9.26');
-    }
-
-
-    /**
-     * @deprecated 4.9.26
-     * @param string $page_for_posts
-     * @return void
-     */
-    public static function update_post_shortcodes($page_for_posts = '')
-    {
-        \EE_Error::doing_it_wrong(__METHOD__, __('Usage is deprecated.', 'event_espresso'), '4.9.26');
-    }
-
-
-    /**
-     * @deprecated 4.9.26
-     * @param $option
-     * @param $value
-     * @return void
-     */
-    public static function reset_page_for_posts_on_initial_set($option, $value)
-    {
-        \EE_Error::doing_it_wrong(__METHOD__, __('Usage is deprecated.', 'event_espresso'), '4.9.26');
-    }
-
-
-    /**
-     * @deprecated 4.9.26
-     * @param        $option
-     * @param string $old_value
-     * @param string $value
-     * @return void
-     */
-    public static function reset_page_for_posts_on_change($option, $old_value = '', $value = '')
-    {
-        \EE_Error::doing_it_wrong(__METHOD__, __('Usage is deprecated.', 'event_espresso'), '4.9.26');
-    }
-
-
-    /**
-     * @deprecated 4.9.26
-     * @param $option
-     * @return void
-     */
-    public static function reset_page_for_posts_on_delete($option)
-    {
-        \EE_Error::doing_it_wrong(__METHOD__, __('Usage is deprecated.', 'event_espresso'), '4.9.26');
-    }
-
-
-    /**
-     * @deprecated 4.9.26
-     * @param      $shortcodes
-     * @param bool $index_results
-     * @return void
-     */
-    public static function get_post_ids_for_shortcode($shortcodes, $index_results = true)
-    {
-        \EE_Error::doing_it_wrong(__METHOD__, __('Usage is deprecated.', 'event_espresso'), '4.9.26');
-    }
+	/**
+	 * @deprecated 4.9.26
+	 * @return    void
+	 */
+	public static function set_hooks_admin()
+	{
+		\EE_Error::doing_it_wrong(__METHOD__, __('Usage is deprecated.', 'event_espresso'), '4.9.26');
+	}
+
+
+	/**
+	 * @deprecated 4.9.26
+	 * @param $post_ID
+	 * @param $post
+	 * @return void
+	 */
+	public static function parse_post_content_on_save($post_ID, $post)
+	{
+		\EE_Error::doing_it_wrong(__METHOD__, __('Usage is deprecated.', 'event_espresso'), '4.9.26');
+	}
+
+
+	/**
+	 * @deprecated 4.9.26
+	 * @param $page_for_posts
+	 * @return void
+	 */
+	protected static function set_post_shortcodes_for_posts_page($page_for_posts)
+	{
+		\EE_Error::doing_it_wrong(__METHOD__, __('Usage is deprecated.', 'event_espresso'), '4.9.26');
+	}
+
+
+	/**
+	 * @deprecated 4.9.26
+	 * @param $page_for_posts
+	 * @param $EES_Shortcode
+	 * @param $post_ID
+	 * @return void
+	 */
+	protected static function set_post_shortcode_for_posts_page($page_for_posts, $EES_Shortcode, $post_ID)
+	{
+		\EE_Error::doing_it_wrong(__METHOD__, __('Usage is deprecated.', 'event_espresso'), '4.9.26');
+	}
+
+
+	/**
+	 * @deprecated 4.9.26
+	 * @param $ID
+	 * @return void
+	 */
+	public static function unset_post_shortcodes_on_delete($ID)
+	{
+		\EE_Error::doing_it_wrong(__METHOD__, __('Usage is deprecated.', 'event_espresso'), '4.9.26');
+	}
+
+
+	/**
+	 * @deprecated 4.9.26
+	 * @param      $ID
+	 * @param      $shortcode_class
+	 * @param      $shortcode_posts
+	 * @param      $page_for_posts
+	 * @param bool $update_post_shortcodes
+	 * @return void
+	 */
+	protected static function unset_posts_page_shortcode_for_post(
+		$ID,
+		$shortcode_class,
+		$shortcode_posts,
+		$page_for_posts,
+		$update_post_shortcodes = false
+	) {
+		\EE_Error::doing_it_wrong(__METHOD__, __('Usage is deprecated.', 'event_espresso'), '4.9.26');
+	}
+
+
+	/**
+	 * @deprecated 4.9.26
+	 * @param string $page_for_posts
+	 * @return void
+	 */
+	public static function update_post_shortcodes($page_for_posts = '')
+	{
+		\EE_Error::doing_it_wrong(__METHOD__, __('Usage is deprecated.', 'event_espresso'), '4.9.26');
+	}
+
+
+	/**
+	 * @deprecated 4.9.26
+	 * @param $option
+	 * @param $value
+	 * @return void
+	 */
+	public static function reset_page_for_posts_on_initial_set($option, $value)
+	{
+		\EE_Error::doing_it_wrong(__METHOD__, __('Usage is deprecated.', 'event_espresso'), '4.9.26');
+	}
+
+
+	/**
+	 * @deprecated 4.9.26
+	 * @param        $option
+	 * @param string $old_value
+	 * @param string $value
+	 * @return void
+	 */
+	public static function reset_page_for_posts_on_change($option, $old_value = '', $value = '')
+	{
+		\EE_Error::doing_it_wrong(__METHOD__, __('Usage is deprecated.', 'event_espresso'), '4.9.26');
+	}
+
+
+	/**
+	 * @deprecated 4.9.26
+	 * @param $option
+	 * @return void
+	 */
+	public static function reset_page_for_posts_on_delete($option)
+	{
+		\EE_Error::doing_it_wrong(__METHOD__, __('Usage is deprecated.', 'event_espresso'), '4.9.26');
+	}
+
+
+	/**
+	 * @deprecated 4.9.26
+	 * @param      $shortcodes
+	 * @param bool $index_results
+	 * @return void
+	 */
+	public static function get_post_ids_for_shortcode($shortcodes, $index_results = true)
+	{
+		\EE_Error::doing_it_wrong(__METHOD__, __('Usage is deprecated.', 'event_espresso'), '4.9.26');
+	}
 }

core/domain/entities/Context.php

Indentation +47 added lines, -47 removed lines

@@ -14,62 +14,62 @@
 class Context implements ContextInterface
 {
 
-    /**
-     * @var string $slug
-     */
-    private $slug;
+	/**
+	 * @var string $slug
+	 */
+	private $slug;
 
-    /**
-     * @var string $description
-     */
-    private $description;
+	/**
+	 * @var string $description
+	 */
+	private $description;
 
 
-    /**
-     * Context constructor.
-     *
-     * @param string $slug
-     * @param string $description
-     */
-    public function __construct($slug, $description)
-    {
-        $this->setSlug($slug);
-        $this->setDescription($description);
-    }
+	/**
+	 * Context constructor.
+	 *
+	 * @param string $slug
+	 * @param string $description
+	 */
+	public function __construct($slug, $description)
+	{
+		$this->setSlug($slug);
+		$this->setDescription($description);
+	}
 
 
-    /**
-     * @return string
-     */
-    public function slug()
-    {
-        return $this->slug;
-    }
+	/**
+	 * @return string
+	 */
+	public function slug()
+	{
+		return $this->slug;
+	}
 
 
-    /**
-     * @param string $slug
-     */
-    private function setSlug($slug)
-    {
-        $this->slug = sanitize_key($slug);
-    }
+	/**
+	 * @param string $slug
+	 */
+	private function setSlug($slug)
+	{
+		$this->slug = sanitize_key($slug);
+	}
 
 
-    /**
-     * @return string
-     */
-    public function description()
-    {
-        return $this->description;
-    }
+	/**
+	 * @return string
+	 */
+	public function description()
+	{
+		return $this->description;
+	}
 
 
-    /**
-     * @param string $description
-     */
-    private function setDescription($description)
-    {
-        $this->description = sanitize_text_field($description);
-    }
+	/**
+	 * @param string $description
+	 */
+	private function setDescription($description)
+	{
+		$this->description = sanitize_text_field($description);
+	}
 }

admin_pages/general_settings/AdminOptionsSettings.php

Indentation +204 added lines, -204 removed lines

@@ -26,219 +26,219 @@
 class AdminOptionsSettings extends FormHandler
 {
 
-    protected $template_args = array();
+	protected $template_args = array();
 
-    /**
-     * Form constructor.
-     *
-     * @param \EE_Registry $registry
-     */
-    public function __construct(\EE_Registry $registry)
-    {
-        parent::__construct(
-            esc_html__('Admin Options', 'event_espresso'),
-            esc_html__('Admin Options', 'event_espresso'),
-            'admin_option_settings',
-            '',
-            FormHandler::DO_NOT_SETUP_FORM,
-            $registry
-        );
-    }
+	/**
+	 * Form constructor.
+	 *
+	 * @param \EE_Registry $registry
+	 */
+	public function __construct(\EE_Registry $registry)
+	{
+		parent::__construct(
+			esc_html__('Admin Options', 'event_espresso'),
+			esc_html__('Admin Options', 'event_espresso'),
+			'admin_option_settings',
+			'',
+			FormHandler::DO_NOT_SETUP_FORM,
+			$registry
+		);
+	}
 
 
-    /**
-     * @param array $template_args
-     */
-    public function setTemplateArgs(array $template_args)
-    {
-        $this->template_args = $template_args;
-    }
+	/**
+	 * @param array $template_args
+	 */
+	public function setTemplateArgs(array $template_args)
+	{
+		$this->template_args = $template_args;
+	}
 
 
-    /**
-     * creates and returns the actual form
-     *
-     * @return EE_Form_Section_Proper
-     * @throws \EE_Error
-     */
-    public function generate()
-    {
-        $form = new \EE_Form_Section_Proper(
-            array(
-                'name'            => 'admin_option_settings',
-                'html_id'         => 'admin_option_settings',
-                'layout_strategy' => new EE_Admin_Two_Column_Layout(),
-                'subsections'     => array(
-                    'help_tour_activation_hdr' => new EE_Form_Section_HTML(
-                        EEH_HTML::h2(
-                            esc_html__('Help Tour Global Activation', 'event_espresso')
-                            . ' '
-                            . EEH_HTML::span(
-                                EEH_Template::get_help_tab_link('help_tour_activation_info'),
-                                'help_tour_activation'
-                            ),
-                            '',
-                            'ee-admin-settings-hdr'
-                        )
-                    ),
-                    'help_tour_activation'     => new EE_Yes_No_Input(
-                        array(
-                            'html_label_text' => esc_html__('Activate Global Help Tours?', 'event_espresso'),
-                            'html_help_text'  => esc_html__(
-                                'This toggles whether the Event Espresso help tours are active globally or not.',
-                                'event_espresso'
-                            ),
-                            'default'         => isset($this->registry->CFG->admin->help_tour_activation)
-                                ? filter_var($this->registry->CFG->admin->help_tour_activation, FILTER_VALIDATE_BOOLEAN)
-                                : true,
-                            'required'        => false,
-                        )
-                    ),
-                    'compatibility_hdr'        => new EE_Form_Section_HTML(
-                        EEH_HTML::h2(
-                            esc_html__('Compatibility Settings', 'event_espresso'),
-                            '',
-                            'ee-admin-settings-hdr'
-                        )
-                    ),
-                    'encode_session_data'      => new EE_Yes_No_Input(
-                        array(
-                            'html_label_text' => esc_html__('Encode Session Data?', 'event_espresso'),
-                            'html_help_text'  => sprintf(
-                                esc_html__(
-                                    'Some servers and database configurations can cause problems when saving the Event Espresso session data. Setting this option to "Yes" adds an extra layer of encoding to session data to prevent serialization errors, but can be incompatible with some server configurations.%1$sIf you receive "500 internal server" type errors during registration, try turning this option on.%1$sIf you get fatal PHP errors regarding missing base64 functions, then turn this option off.',
-                                    'event_espresso'
-                                ),
-                                '<br>'
-                            ),
-                            'default'         => $this->registry->CFG->admin->encode_session_data(),
-                            'required'        => false,
-                        )
-                    ),
-                ),
-            )
-        );
-        if ($this->registry->CAP->current_user_can(
-            'manage_options',
-            'display_admin_settings_options_promote_and_affiliate'
-        )) {
-            $form->add_subsections(
-                array(
-                    'promote_ee_hdr'  => new EE_Form_Section_HTML(
-                        EEH_HTML::h2(
-                            esc_html__('Promote Event Espresso', 'event_espresso')
-                            . ' '
-                            . EEH_HTML::span(
-                                EEH_Template::get_help_tab_link('affiliate_info'),
-                                'affiliate_info'
-                            ),
-                            '',
-                            'ee-admin-settings-hdr'
-                        )
-                    ),
-                    'show_reg_footer' => new EE_Yes_No_Input(
-                        array(
-                            'html_label_text' => esc_html__(
-                                'Link to Event Espresso in your Registration Page?',
-                                'event_espresso'
-                            )
-                            . EEH_Template::get_help_tab_link('email_validation_info'),
-                            'html_help_text'  => esc_html__(
-                                'adds an unobtrusive link to Event Espresso\'s website in the footer of your registration form. Get an affiliate link (see below) and make money if people click the link and purchase Event Espresso.',
-                                'event_espresso'
-                            ),
-                            'default'         => isset($this->registry->CFG->admin->show_reg_footer)
-                                ? filter_var($this->registry->CFG->admin->show_reg_footer, FILTER_VALIDATE_BOOLEAN)
-                                : true,
-                            'required'        => false,
-                        )
-                    ),
-                    'affiliate_id'    => new EE_Text_Input(
-                        array(
-                            'html_label_text' => sprintf(
-                                esc_html__('Event Espresso %1$sAffiliate%2$s ID', 'event_espresso'),
-                                '<a href="http://eventespresso.com/affiliates/" target="_blank">',
-                                '</a>'
-                            ),
-                            'html_help_text'  => esc_html__(
-                                'Earn cash for promoting Event Espresso.',
-                                'event_espresso'
-                            ),
-                            'html_class'      => 'regular-text',
-                            'default'         => isset($this->registry->CFG->admin->affiliate_id)
-                                ? $this->registry->CFG->admin->get_pretty('affiliate_id')
-                                : '',
-                            'required'        => false,
-                        )
-                    ),
-                ),
-                'help_tour_activation_hdr'
-            );
-        }
-        return $form;
-    }
+	/**
+	 * creates and returns the actual form
+	 *
+	 * @return EE_Form_Section_Proper
+	 * @throws \EE_Error
+	 */
+	public function generate()
+	{
+		$form = new \EE_Form_Section_Proper(
+			array(
+				'name'            => 'admin_option_settings',
+				'html_id'         => 'admin_option_settings',
+				'layout_strategy' => new EE_Admin_Two_Column_Layout(),
+				'subsections'     => array(
+					'help_tour_activation_hdr' => new EE_Form_Section_HTML(
+						EEH_HTML::h2(
+							esc_html__('Help Tour Global Activation', 'event_espresso')
+							. ' '
+							. EEH_HTML::span(
+								EEH_Template::get_help_tab_link('help_tour_activation_info'),
+								'help_tour_activation'
+							),
+							'',
+							'ee-admin-settings-hdr'
+						)
+					),
+					'help_tour_activation'     => new EE_Yes_No_Input(
+						array(
+							'html_label_text' => esc_html__('Activate Global Help Tours?', 'event_espresso'),
+							'html_help_text'  => esc_html__(
+								'This toggles whether the Event Espresso help tours are active globally or not.',
+								'event_espresso'
+							),
+							'default'         => isset($this->registry->CFG->admin->help_tour_activation)
+								? filter_var($this->registry->CFG->admin->help_tour_activation, FILTER_VALIDATE_BOOLEAN)
+								: true,
+							'required'        => false,
+						)
+					),
+					'compatibility_hdr'        => new EE_Form_Section_HTML(
+						EEH_HTML::h2(
+							esc_html__('Compatibility Settings', 'event_espresso'),
+							'',
+							'ee-admin-settings-hdr'
+						)
+					),
+					'encode_session_data'      => new EE_Yes_No_Input(
+						array(
+							'html_label_text' => esc_html__('Encode Session Data?', 'event_espresso'),
+							'html_help_text'  => sprintf(
+								esc_html__(
+									'Some servers and database configurations can cause problems when saving the Event Espresso session data. Setting this option to "Yes" adds an extra layer of encoding to session data to prevent serialization errors, but can be incompatible with some server configurations.%1$sIf you receive "500 internal server" type errors during registration, try turning this option on.%1$sIf you get fatal PHP errors regarding missing base64 functions, then turn this option off.',
+									'event_espresso'
+								),
+								'<br>'
+							),
+							'default'         => $this->registry->CFG->admin->encode_session_data(),
+							'required'        => false,
+						)
+					),
+				),
+			)
+		);
+		if ($this->registry->CAP->current_user_can(
+			'manage_options',
+			'display_admin_settings_options_promote_and_affiliate'
+		)) {
+			$form->add_subsections(
+				array(
+					'promote_ee_hdr'  => new EE_Form_Section_HTML(
+						EEH_HTML::h2(
+							esc_html__('Promote Event Espresso', 'event_espresso')
+							. ' '
+							. EEH_HTML::span(
+								EEH_Template::get_help_tab_link('affiliate_info'),
+								'affiliate_info'
+							),
+							'',
+							'ee-admin-settings-hdr'
+						)
+					),
+					'show_reg_footer' => new EE_Yes_No_Input(
+						array(
+							'html_label_text' => esc_html__(
+								'Link to Event Espresso in your Registration Page?',
+								'event_espresso'
+							)
+							. EEH_Template::get_help_tab_link('email_validation_info'),
+							'html_help_text'  => esc_html__(
+								'adds an unobtrusive link to Event Espresso\'s website in the footer of your registration form. Get an affiliate link (see below) and make money if people click the link and purchase Event Espresso.',
+								'event_espresso'
+							),
+							'default'         => isset($this->registry->CFG->admin->show_reg_footer)
+								? filter_var($this->registry->CFG->admin->show_reg_footer, FILTER_VALIDATE_BOOLEAN)
+								: true,
+							'required'        => false,
+						)
+					),
+					'affiliate_id'    => new EE_Text_Input(
+						array(
+							'html_label_text' => sprintf(
+								esc_html__('Event Espresso %1$sAffiliate%2$s ID', 'event_espresso'),
+								'<a href="http://eventespresso.com/affiliates/" target="_blank">',
+								'</a>'
+							),
+							'html_help_text'  => esc_html__(
+								'Earn cash for promoting Event Espresso.',
+								'event_espresso'
+							),
+							'html_class'      => 'regular-text',
+							'default'         => isset($this->registry->CFG->admin->affiliate_id)
+								? $this->registry->CFG->admin->get_pretty('affiliate_id')
+								: '',
+							'required'        => false,
+						)
+					),
+				),
+				'help_tour_activation_hdr'
+			);
+		}
+		return $form;
+	}
 
 
-    /**
-     * takes the generated form and displays it along with ony other non-form HTML that may be required
-     * returns a string of HTML that can be directly echoed in a template
-     *
-     * @return string
-     * @throws LogicException
-     * @throws \EE_Error
-     */
-    public function display()
-    {
-        add_filter(
-            'FHEE__EventEspresso_core_libraries_form_sections_form_handlers_FormHandler__display__before_form',
-            array($this, 'handleOldAdminOptionsSettingsAction')
-        );
-        return parent::display();
-    }
+	/**
+	 * takes the generated form and displays it along with ony other non-form HTML that may be required
+	 * returns a string of HTML that can be directly echoed in a template
+	 *
+	 * @return string
+	 * @throws LogicException
+	 * @throws \EE_Error
+	 */
+	public function display()
+	{
+		add_filter(
+			'FHEE__EventEspresso_core_libraries_form_sections_form_handlers_FormHandler__display__before_form',
+			array($this, 'handleOldAdminOptionsSettingsAction')
+		);
+		return parent::display();
+	}
 
 
-    /**
-     * @return string
-     */
-    public function handleOldAdminOptionsSettingsAction()
-    {
-        ob_start();
-        do_action('AHEE__admin_option_settings__template__before', $this->template_args);
-        return ob_get_clean();
-    }
+	/**
+	 * @return string
+	 */
+	public function handleOldAdminOptionsSettingsAction()
+	{
+		ob_start();
+		do_action('AHEE__admin_option_settings__template__before', $this->template_args);
+		return ob_get_clean();
+	}
 
 
-    /**
-     * handles processing the form submission
-     * returns true or false depending on whether the form was processed successfully or not
-     *
-     * @param array $form_data
-     * @return bool
-     * @throws InvalidFormSubmissionException
-     * @throws EE_Error
-     * @throws LogicException
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     */
-    public function process($form_data = array())
-    {
-        // process form
-        $valid_data = (array) parent::process($form_data);
-        if (empty($valid_data)) {
-            return false;
-        }
-        $this->registry->CFG->admin->show_reg_footer = isset($form_data['show_reg_footer'])
-            ? absint($form_data['show_reg_footer'])
-            : $this->registry->CFG->admin->show_reg_footer;
-        $this->registry->CFG->admin->affiliate_id = isset($form_data['affiliate_id'])
-            ? sanitize_text_field($form_data['affiliate_id'])
-            : $this->registry->CFG->admin->affiliate_id;
-        $this->registry->CFG->admin->help_tour_activation = isset($form_data['help_tour_activation'])
-            ? absint($form_data['help_tour_activation'])
-            : $this->registry->CFG->admin->help_tour_activation;
-        if (isset($form_data['encode_session_data'])) {
-            $this->registry->CFG->admin->set_encode_session_data($form_data['encode_session_data']);
-        }
-        return false;
-    }
+	/**
+	 * handles processing the form submission
+	 * returns true or false depending on whether the form was processed successfully or not
+	 *
+	 * @param array $form_data
+	 * @return bool
+	 * @throws InvalidFormSubmissionException
+	 * @throws EE_Error
+	 * @throws LogicException
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 */
+	public function process($form_data = array())
+	{
+		// process form
+		$valid_data = (array) parent::process($form_data);
+		if (empty($valid_data)) {
+			return false;
+		}
+		$this->registry->CFG->admin->show_reg_footer = isset($form_data['show_reg_footer'])
+			? absint($form_data['show_reg_footer'])
+			: $this->registry->CFG->admin->show_reg_footer;
+		$this->registry->CFG->admin->affiliate_id = isset($form_data['affiliate_id'])
+			? sanitize_text_field($form_data['affiliate_id'])
+			: $this->registry->CFG->admin->affiliate_id;
+		$this->registry->CFG->admin->help_tour_activation = isset($form_data['help_tour_activation'])
+			? absint($form_data['help_tour_activation'])
+			: $this->registry->CFG->admin->help_tour_activation;
+		if (isset($form_data['encode_session_data'])) {
+			$this->registry->CFG->admin->set_encode_session_data($form_data['encode_session_data']);
+		}
+		return false;
+	}
 }

modules/invalid_checkout_access/InvalidCheckoutAccess.php

Indentation +168 added lines, -168 removed lines

@@ -13,178 +13,178 @@
 class InvalidCheckoutAccess
 {
 
-    /**
-     * key used for saving invalid checkout access data to the wp_options table
-     */
-    const OPTION_KEY = 'ee_invalid_checkout_access';
+	/**
+	 * key used for saving invalid checkout access data to the wp_options table
+	 */
+	const OPTION_KEY = 'ee_invalid_checkout_access';
 
 
-    /**
-     * _block_bots
-     * checks that the incoming request has either of the following set:
-     *  a uts (unix timestamp) which indicates that the request was redirected from the Ticket Selector
-     *  a REG URL Link, which indicates that the request is a return visit to SPCO for a valid TXN
-     * so if you're not coming from the Ticket Selector nor returning for a valid IP...
-     * then where you coming from man?
-     *
-     * @param \EE_Checkout $checkout
-     * @return bool true if access to registration checkout appears to be invalid
-     */
-    public function checkoutAccessIsInvalid(\EE_Checkout $checkout)
-    {
-        if (! ($checkout->uts || $checkout->reg_url_link)
-            && ! (defined('DOING_AJAX') && DOING_AJAX)
-            && \EE_Config::instance()->registration->track_invalid_checkout_access()
-        ) {
-            /** @var \EE_Request $request */
-            $request = \EE_Registry::instance()->load_core('EE_Request');
-            $ip_address = $request->ip_address();
-            $ee_bot_checkout = get_option(InvalidCheckoutAccess::OPTION_KEY);
-            if ($ee_bot_checkout === false) {
-                $ee_bot_checkout = array();
-                add_option(InvalidCheckoutAccess::OPTION_KEY, $ee_bot_checkout, '', false);
-            }
-            if (! isset($ee_bot_checkout[ $ip_address ])) {
-                $ee_bot_checkout[ $ip_address ] = array();
-            }
-            $http_referer = isset($_SERVER['HTTP_REFERER'])
-                ? esc_attr($_SERVER['HTTP_REFERER'])
-                : 0;
-            if (! isset($ee_bot_checkout[ $ip_address ][ $http_referer ])) {
-                $ee_bot_checkout[ $ip_address ][ $http_referer ] = 0;
-            }
-            $ee_bot_checkout[ $ip_address ][ $http_referer ]++;
-            update_option(InvalidCheckoutAccess::OPTION_KEY, $ee_bot_checkout);
-            if (WP_DEBUG) {
-                \EE_Error::add_error(
-                    esc_html__('Direct access to the registration checkout page is not allowed.', 'event_espresso'),
-                    __FILE__,
-                    __FUNCTION__,
-                    __LINE__
-                );
-            }
-            return true;
-        }
-        return false;
-    }
+	/**
+	 * _block_bots
+	 * checks that the incoming request has either of the following set:
+	 *  a uts (unix timestamp) which indicates that the request was redirected from the Ticket Selector
+	 *  a REG URL Link, which indicates that the request is a return visit to SPCO for a valid TXN
+	 * so if you're not coming from the Ticket Selector nor returning for a valid IP...
+	 * then where you coming from man?
+	 *
+	 * @param \EE_Checkout $checkout
+	 * @return bool true if access to registration checkout appears to be invalid
+	 */
+	public function checkoutAccessIsInvalid(\EE_Checkout $checkout)
+	{
+		if (! ($checkout->uts || $checkout->reg_url_link)
+			&& ! (defined('DOING_AJAX') && DOING_AJAX)
+			&& \EE_Config::instance()->registration->track_invalid_checkout_access()
+		) {
+			/** @var \EE_Request $request */
+			$request = \EE_Registry::instance()->load_core('EE_Request');
+			$ip_address = $request->ip_address();
+			$ee_bot_checkout = get_option(InvalidCheckoutAccess::OPTION_KEY);
+			if ($ee_bot_checkout === false) {
+				$ee_bot_checkout = array();
+				add_option(InvalidCheckoutAccess::OPTION_KEY, $ee_bot_checkout, '', false);
+			}
+			if (! isset($ee_bot_checkout[ $ip_address ])) {
+				$ee_bot_checkout[ $ip_address ] = array();
+			}
+			$http_referer = isset($_SERVER['HTTP_REFERER'])
+				? esc_attr($_SERVER['HTTP_REFERER'])
+				: 0;
+			if (! isset($ee_bot_checkout[ $ip_address ][ $http_referer ])) {
+				$ee_bot_checkout[ $ip_address ][ $http_referer ] = 0;
+			}
+			$ee_bot_checkout[ $ip_address ][ $http_referer ]++;
+			update_option(InvalidCheckoutAccess::OPTION_KEY, $ee_bot_checkout);
+			if (WP_DEBUG) {
+				\EE_Error::add_error(
+					esc_html__('Direct access to the registration checkout page is not allowed.', 'event_espresso'),
+					__FILE__,
+					__FUNCTION__,
+					__LINE__
+				);
+			}
+			return true;
+		}
+		return false;
+	}
 
 
-    /**
-     * _invalid_checkout_access_form
-     *
-     * @return \EE_Form_Section_Proper
-     * @throws \EE_Error
-     */
-    public function getForm()
-    {
-        return new \EE_Form_Section_Proper(
-            array(
-                'name'            => 'invalid_checkout_access',
-                'html_id'         => 'invalid_checkout_access',
-                'layout_strategy' => new \EE_Admin_Two_Column_Layout(),
-                'subsections'     => array(
-                    'invalid_checkout_access_hdr'   => new \EE_Form_Section_HTML(
-                        \EEH_HTML::h2(esc_html__('Invalid Checkout Access', 'event_espresso'))
-                    ),
-                    'ee_bot_checkout_data'          => new \EE_Text_Area_Input(
-                        array(
-                            'html_label_text' => esc_html__('Invalid Checkout Data', 'event_espresso'),
-                            'default'         => var_export(
-                                get_option(InvalidCheckoutAccess::OPTION_KEY, array()),
-                                true
-                            ),
-                            'required'        => false,
-                            'html_help_text'  => esc_html__(
-                                'Event Espresso blocks any attempt to directly access the registration checkout page, that is NOT from a Ticket Selector or for a return visit for a valid transaction. These are not valid requests accessing your checkout page, so we track the IP addresses, what web page they just came from, and the number of times that they have attempted to access your registration page. This information may help you with protecting your site by other means, such as firewalls, etc, but please note that IP addresses are almost guaranteed to be spoofed by malicious agents.',
-                                'event_espresso'
-                            ),
-                        )
-                    ),
-                    'track_invalid_checkout_access' => new \EE_Yes_No_Input(
-                        array(
-                            'html_label_text'         => __('Track Invalid Checkout Access?', 'event_espresso'),
-                            'html_help_text'          => esc_html__(
-                                'Controls whether or not invalid attempts to directly access the registration checkout page should be tracked. Setting this to "No" means that the above data will no longer be collected.',
-                                'event_espresso'
-                            ),
-                            'default'                 => \EE_Config::instance()
-                                ->registration
-                                ->track_invalid_checkout_access(),
-                            'display_html_label_text' => false,
-                        )
-                    ),
-                    'delete_invalid_checkout_data'  => new \EE_Yes_No_Input(
-                        array(
-                            'html_label_text'         => __('Reset Invalid Checkout Data', 'event_espresso'),
-                            'html_help_text'          => esc_html__(
-                                'Setting this to "Yes" will delete all existing invalid checkout access data.',
-                                'event_espresso'
-                            ),
-                            'default'                 => false,
-                            'display_html_label_text' => false,
-                        )
-                    ),
-                ),
-            )
-        );
-    }
+	/**
+	 * _invalid_checkout_access_form
+	 *
+	 * @return \EE_Form_Section_Proper
+	 * @throws \EE_Error
+	 */
+	public function getForm()
+	{
+		return new \EE_Form_Section_Proper(
+			array(
+				'name'            => 'invalid_checkout_access',
+				'html_id'         => 'invalid_checkout_access',
+				'layout_strategy' => new \EE_Admin_Two_Column_Layout(),
+				'subsections'     => array(
+					'invalid_checkout_access_hdr'   => new \EE_Form_Section_HTML(
+						\EEH_HTML::h2(esc_html__('Invalid Checkout Access', 'event_espresso'))
+					),
+					'ee_bot_checkout_data'          => new \EE_Text_Area_Input(
+						array(
+							'html_label_text' => esc_html__('Invalid Checkout Data', 'event_espresso'),
+							'default'         => var_export(
+								get_option(InvalidCheckoutAccess::OPTION_KEY, array()),
+								true
+							),
+							'required'        => false,
+							'html_help_text'  => esc_html__(
+								'Event Espresso blocks any attempt to directly access the registration checkout page, that is NOT from a Ticket Selector or for a return visit for a valid transaction. These are not valid requests accessing your checkout page, so we track the IP addresses, what web page they just came from, and the number of times that they have attempted to access your registration page. This information may help you with protecting your site by other means, such as firewalls, etc, but please note that IP addresses are almost guaranteed to be spoofed by malicious agents.',
+								'event_espresso'
+							),
+						)
+					),
+					'track_invalid_checkout_access' => new \EE_Yes_No_Input(
+						array(
+							'html_label_text'         => __('Track Invalid Checkout Access?', 'event_espresso'),
+							'html_help_text'          => esc_html__(
+								'Controls whether or not invalid attempts to directly access the registration checkout page should be tracked. Setting this to "No" means that the above data will no longer be collected.',
+								'event_espresso'
+							),
+							'default'                 => \EE_Config::instance()
+								->registration
+								->track_invalid_checkout_access(),
+							'display_html_label_text' => false,
+						)
+					),
+					'delete_invalid_checkout_data'  => new \EE_Yes_No_Input(
+						array(
+							'html_label_text'         => __('Reset Invalid Checkout Data', 'event_espresso'),
+							'html_help_text'          => esc_html__(
+								'Setting this to "Yes" will delete all existing invalid checkout access data.',
+								'event_espresso'
+							),
+							'default'                 => false,
+							'display_html_label_text' => false,
+						)
+					),
+				),
+			)
+		);
+	}
 
 
-    /**
-     * update_invalid_checkout_access_form
-     *
-     * @param \EE_Registration_Config $EE_Registration_Config
-     * @return \EE_Registration_Config
-     */
-    public function processForm(\EE_Registration_Config $EE_Registration_Config)
-    {
-        try {
-            $invalid_checkout_access_form = $this->getForm();
-            // if not displaying a form, then check for form submission
-            if ($invalid_checkout_access_form->was_submitted()) {
-                // capture form data
-                $invalid_checkout_access_form->receive_form_submission();
-                // validate form data
-                if ($invalid_checkout_access_form->is_valid()) {
-                    // grab validated data from form
-                    $valid_data = $invalid_checkout_access_form->valid_data();
-                    // ensure form inputs we want are set
-                    if (isset(
-                        $valid_data['track_invalid_checkout_access'],
-                        $valid_data['delete_invalid_checkout_data']
-                    )) {
-                        $EE_Registration_Config->set_track_invalid_checkout_access(
-                            $valid_data['track_invalid_checkout_access']
-                        );
-                        // if deleting, then update option with empty array
-                        if (filter_var($valid_data['delete_invalid_checkout_data'], FILTER_VALIDATE_BOOLEAN)) {
-                            update_option(InvalidCheckoutAccess::OPTION_KEY, array());
-                        }
-                    } else {
-                        \EE_Error::add_error(
-                            esc_html__(
-                                'Invalid or missing Invalid Checkout Access form data. Please refresh the form and try again.',
-                                'event_espresso'
-                            ),
-                            __FILE__,
-                            __FUNCTION__,
-                            __LINE__
-                        );
-                    }
-                } else {
-                    if ($invalid_checkout_access_form->submission_error_message() !== '') {
-                        \EE_Error::add_error(
-                            $invalid_checkout_access_form->submission_error_message(),
-                            __FILE__,
-                            __FUNCTION__,
-                            __LINE__
-                        );
-                    }
-                }
-            }
-        } catch (\EE_Error $e) {
-            $e->get_error();
-        }
-        return $EE_Registration_Config;
-    }
+	/**
+	 * update_invalid_checkout_access_form
+	 *
+	 * @param \EE_Registration_Config $EE_Registration_Config
+	 * @return \EE_Registration_Config
+	 */
+	public function processForm(\EE_Registration_Config $EE_Registration_Config)
+	{
+		try {
+			$invalid_checkout_access_form = $this->getForm();
+			// if not displaying a form, then check for form submission
+			if ($invalid_checkout_access_form->was_submitted()) {
+				// capture form data
+				$invalid_checkout_access_form->receive_form_submission();
+				// validate form data
+				if ($invalid_checkout_access_form->is_valid()) {
+					// grab validated data from form
+					$valid_data = $invalid_checkout_access_form->valid_data();
+					// ensure form inputs we want are set
+					if (isset(
+						$valid_data['track_invalid_checkout_access'],
+						$valid_data['delete_invalid_checkout_data']
+					)) {
+						$EE_Registration_Config->set_track_invalid_checkout_access(
+							$valid_data['track_invalid_checkout_access']
+						);
+						// if deleting, then update option with empty array
+						if (filter_var($valid_data['delete_invalid_checkout_data'], FILTER_VALIDATE_BOOLEAN)) {
+							update_option(InvalidCheckoutAccess::OPTION_KEY, array());
+						}
+					} else {
+						\EE_Error::add_error(
+							esc_html__(
+								'Invalid or missing Invalid Checkout Access form data. Please refresh the form and try again.',
+								'event_espresso'
+							),
+							__FILE__,
+							__FUNCTION__,
+							__LINE__
+						);
+					}
+				} else {
+					if ($invalid_checkout_access_form->submission_error_message() !== '') {
+						\EE_Error::add_error(
+							$invalid_checkout_access_form->submission_error_message(),
+							__FILE__,
+							__FUNCTION__,
+							__LINE__
+						);
+					}
+				}
+			}
+		} catch (\EE_Error $e) {
+			$e->get_error();
+		}
+		return $EE_Registration_Config;
+	}
 }

Spacing +6 added lines, -6 removed lines

@@ -32,7 +32,7 @@ 
      */
     public function checkoutAccessIsInvalid(\EE_Checkout $checkout)
     {
-        if (! ($checkout->uts || $checkout->reg_url_link)
+        if ( ! ($checkout->uts || $checkout->reg_url_link)
             && ! (defined('DOING_AJAX') && DOING_AJAX)
             && \EE_Config::instance()->registration->track_invalid_checkout_access()
         ) {
@@ -44,16 +44,16 @@ 
                 $ee_bot_checkout = array();
                 add_option(InvalidCheckoutAccess::OPTION_KEY, $ee_bot_checkout, '', false);
             }
-            if (! isset($ee_bot_checkout[ $ip_address ])) {
-                $ee_bot_checkout[ $ip_address ] = array();
+            if ( ! isset($ee_bot_checkout[$ip_address])) {
+                $ee_bot_checkout[$ip_address] = array();
             }
             $http_referer = isset($_SERVER['HTTP_REFERER'])
                 ? esc_attr($_SERVER['HTTP_REFERER'])
                 : 0;
-            if (! isset($ee_bot_checkout[ $ip_address ][ $http_referer ])) {
-                $ee_bot_checkout[ $ip_address ][ $http_referer ] = 0;
+            if ( ! isset($ee_bot_checkout[$ip_address][$http_referer])) {
+                $ee_bot_checkout[$ip_address][$http_referer] = 0;
             }
-            $ee_bot_checkout[ $ip_address ][ $http_referer ]++;
+            $ee_bot_checkout[$ip_address][$http_referer]++;
             update_option(InvalidCheckoutAccess::OPTION_KEY, $ee_bot_checkout);
             if (WP_DEBUG) {
                 \EE_Error::add_error(