eventespresso / event-espresso-core

admin_pages/messages/help_tabs/messages_settings_messengers.help_tab.php

Indentation +50 added lines, -50 removed lines

@@ -3,79 +3,79 @@
 </p>
 <p>
     <?php esc_html_e(
-        'You can select Messengers via the tabs across the top of the settings page. The available messengers you see depends on what version of Event Espresso you have and what addons are installed. Every install include an "Email" messenger tab.  When you click one of those tabs it will display that messenger.',
-        'event_espresso'
-    ); ?>
+		'You can select Messengers via the tabs across the top of the settings page. The available messengers you see depends on what version of Event Espresso you have and what addons are installed. Every install include an "Email" messenger tab.  When you click one of those tabs it will display that messenger.',
+		'event_espresso'
+	); ?>
 </p>
 <p>
     <?php esc_html_e(
-        'There are two ways to determine whether a messenger is active or not.  The first way is via the messenger tab itself.',
-        'event_espresso'
-    ); ?>
+		'There are two ways to determine whether a messenger is active or not.  The first way is via the messenger tab itself.',
+		'event_espresso'
+	); ?>
 </p>
 <p>
     <?php printf(
-        esc_html__(
-            'The green colored gear %s indicates that this messenger is currently active.',
-            'event_espresso'
-        ),
-        '<img class="inline-text" src="' . EE_MSG_ASSETS_URL . 'images/email-tab-active.png' . '"'
-        . ' alt="' . esc_attr__('Active Email Tab', 'event_espresso') . '" />'
-    );
-    printf(
-        esc_html__(
-            ' The white colored gear %s indicates the messenger is inactive. This is very helpful for seeing at a glance all the messengers that are active when you first view the page.',
-            'event_espresso'
-        ),
-        '<img class="inline-text" src="' . EE_MSG_ASSETS_URL . 'images/email-tab-inactive.png'
-        . '" alt="' . esc_attr__('Inactive Email Tab', 'event_espresso') . '" />'
-    ); ?>
+		esc_html__(
+			'The green colored gear %s indicates that this messenger is currently active.',
+			'event_espresso'
+		),
+		'<img class="inline-text" src="' . EE_MSG_ASSETS_URL . 'images/email-tab-active.png' . '"'
+		. ' alt="' . esc_attr__('Active Email Tab', 'event_espresso') . '" />'
+	);
+	printf(
+		esc_html__(
+			' The white colored gear %s indicates the messenger is inactive. This is very helpful for seeing at a glance all the messengers that are active when you first view the page.',
+			'event_espresso'
+		),
+		'<img class="inline-text" src="' . EE_MSG_ASSETS_URL . 'images/email-tab-inactive.png'
+		. '" alt="' . esc_attr__('Inactive Email Tab', 'event_espresso') . '" />'
+	); ?>
 </p>
 <p>
     <?php esc_html_e(
-        'The second way to determine whether a messenger is active or not is via the "on/off" button in the top right corner of the active messenger displayed content:',
-        'event_espresso'
-    ); ?>
+		'The second way to determine whether a messenger is active or not is via the "on/off" button in the top right corner of the active messenger displayed content:',
+		'event_espresso'
+	); ?>
 </p>
 <p>
     <?php printf(
-        esc_html__(
-            '%1$s means of course that the messenger is active and %2$s means the messenger is inactive.',
-            'event_espresso'
-        ),
-        '<div class="ee-switch">'
-        . '<input class="ee-switch__input" type="checkbox" checked disabled>'
-        . '<label class="ee-switch__toggle" for="ee-on-off-toggle-on"></label>'
-        . '</div>',
-        '<div class="ee-switch">'
-        . '<input class="ee-switch__input" type="checkbox" disabled>'
-        . '<label class="ee-switch__toggle" for="ee-on-off-toggle-off"></label>'
-        . '</div>'
-    ); ?>
+		esc_html__(
+			'%1$s means of course that the messenger is active and %2$s means the messenger is inactive.',
+			'event_espresso'
+		),
+		'<div class="ee-switch">'
+		. '<input class="ee-switch__input" type="checkbox" checked disabled>'
+		. '<label class="ee-switch__toggle" for="ee-on-off-toggle-on"></label>'
+		. '</div>',
+		'<div class="ee-switch">'
+		. '<input class="ee-switch__input" type="checkbox" disabled>'
+		. '<label class="ee-switch__toggle" for="ee-on-off-toggle-off"></label>'
+		. '</div>'
+	); ?>
 </p>
 <p>
     <?php
-    esc_html_e(
-        'The on/off toggle is also what you use to activate or deactivate a messenger.',
-        'event_espresso'
-    ); ?>
+	esc_html_e(
+		'The on/off toggle is also what you use to activate or deactivate a messenger.',
+		'event_espresso'
+	); ?>
 </p>
 <p>
     <?php esc_html_e(
-        'What happens when you click the toggle to activate is the messenger is activated and the system determines what default message types are activated with the messenger.  Then, if there are any default settings for either the messenger or message types those settings are saved.  Next, the system will generate any default templates (if none have been generated before, if there are previously generated templates then they are reactivated).  Finally, you will see the display change to reflect that the messenger is active. If the messenger has settings you can modify them then. Any message types that have settings will also automatically expand so you can see the default settings and make any changes as necessary to fit your needs. Usually the defaults are sufficient however.',
-        'event_espresso'
-    ); ?>
+		'What happens when you click the toggle to activate is the messenger is activated and the system determines what default message types are activated with the messenger.  Then, if there are any default settings for either the messenger or message types those settings are saved.  Next, the system will generate any default templates (if none have been generated before, if there are previously generated templates then they are reactivated).  Finally, you will see the display change to reflect that the messenger is active. If the messenger has settings you can modify them then. Any message types that have settings will also automatically expand so you can see the default settings and make any changes as necessary to fit your needs. Usually the defaults are sufficient however.',
+		'event_espresso'
+	); ?>
 </p>
 <p>
     <?php esc_html_e(
-        'When you deactivate a messenger, the system will first check if there are any custom event templates for that messenger. If there are you will be unable to deactivate the messenger. This is a fail safe to make sure you know that no messages will go out for those specific events so you don\'t accidentally deactivate.  If this check passes, then the system will deactivate any global templates for that messenger (note the templates are not erased, they just become inactive, so if you decide to reactivate the messenger later all your customizations are preserved). Then the display will change to reflect the deactivation.',
-        'event_espresso'
-    ); ?>
+		'When you deactivate a messenger, the system will first check if there are any custom event templates for that messenger. If there are you will be unable to deactivate the messenger. This is a fail safe to make sure you know that no messages will go out for those specific events so you don\'t accidentally deactivate.  If this check passes, then the system will deactivate any global templates for that messenger (note the templates are not erased, they just become inactive, so if you decide to reactivate the messenger later all your customizations are preserved). Then the display will change to reflect the deactivation.',
+		'event_espresso'
+	); ?>
 </p>
 <p>
     <strong><?php esc_html_e('Important', 'event_espresso'); ?></strong><br />
     <?php esc_html_e(
-        'Although customizations made to global templates are preserved when a messenger is deactivated, any settings for that messenger (or the message types that were attached to it) are lost on deactivation.  Also, once you deactivate a messenger, no more messages will be delivered using that messenger for any of your events.',
-        'event_espresso'
-    ); ?>
+		'Although customizations made to global templates are preserved when a messenger is deactivated, any settings for that messenger (or the message types that were attached to it) are lost on deactivation.  Also, once you deactivate a messenger, no more messages will be delivered using that messenger for any of your events.',
+		'event_espresso'
+	); ?>
 </p>

admin_pages/general_settings/templates/countries_settings.template.php

Indentation +18 added lines, -18 removed lines

@@ -14,9 +14,9 @@ 
 
     <h2 class="ee-admin-settings-hdr">
         <?php
-        echo esc_html__('Countries and States/Provinces', 'event_espresso');
-        echo EEH_Template::get_help_tab_link('country_select_info'); // already escaped
-        ?>
+		echo esc_html__('Countries and States/Provinces', 'event_espresso');
+		echo EEH_Template::get_help_tab_link('country_select_info'); // already escaped
+		?>
     </h2>
     <table class="ee-admin-two-column-layout form-table">
         <tbody>
@@ -26,28 +26,28 @@ 
     <br/>
     <p>
         <?php esc_html_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'
-        ); ?>
+			'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>
     <p id="country-currency-setting-disabled-pg" style="display: none;">
         <span class="reminder-spn">
             <?php printf(
-                esc_html__(
-                    'Currency setting inputs are currently only enabled for the country "%1$s" which is the selected country for the site. This can be changed in the "Contact Information" section under the "Your Organization" tab of the Event Espresso - General Settings.',
-                    'event_espresso'
-                ),
-                $CNT_name_for_site
-            ); ?>
+				esc_html__(
+					'Currency setting inputs are currently only enabled for the country "%1$s" which is the selected country for the site. This can be changed in the "Contact Information" section under the "Your Organization" tab of the Event Espresso - General Settings.',
+					'event_espresso'
+				),
+				$CNT_name_for_site
+			); ?>
         </span>
     </p>
     <div id="country-settings-dv" class="ee-layout-row">
         <div id="country-details-settings-dv">
             <h2 class="ee-admin-settings-hdr">
                 <?php
-                echo esc_html__('Country Details', 'event_espresso');
-                echo wp_kses(EEH_Template::get_help_tab_link('country_details_info'), AllowedTags::getAllowedTags());
-                ?>
+				echo esc_html__('Country Details', 'event_espresso');
+				echo wp_kses(EEH_Template::get_help_tab_link('country_details_info'), AllowedTags::getAllowedTags());
+				?>
             </h2>
             <div id="country-details-dv">
                 <?php echo wp_kses($country_details_settings, AllowedTags::getAllowedTags()); ?>
@@ -57,9 +57,9 @@ 
         <div id="country-states-settings-dv">
             <h2 class="ee-admin-settings-hdr">
                 <?php
-                echo esc_html__('States/Provinces', 'event_espresso');
-                echo wp_kses(EEH_Template::get_help_tab_link('country_states_info'), AllowedTags::getAllowedTags());
-                ?>
+				echo esc_html__('States/Provinces', 'event_espresso');
+				echo wp_kses(EEH_Template::get_help_tab_link('country_states_info'), AllowedTags::getAllowedTags());
+				?>
             </h2>
             <div id="country-states-dv">
                 <?php echo wp_kses($country_states_settings, AllowedTags::getAllowedTags()); ?>

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

Indentation +476 added lines, -476 removed lines

@@ -14,486 +14,486 @@
  */
 abstract class EE_Form_Section_Base
 {
-    /**
-     * the URL the form is submitted to
-     *
-     * @var string
-     */
-    protected $_action;
-
-    /**
-     * POST (default) or GET
-     *
-     * @var string
-     */
-    protected $_method;
-
-    /**
-     * html_id and html_name are derived from this by default
-     *
-     * @var string
-     */
-    protected $_name;
-
-    /**
-     * $_html_id
-     * @var string
-     */
-    protected $_html_id;
-
-    /**
-     * $_html_class
-     * @var string
-     */
-    protected $_html_class;
-
-    /**
-     * $_html_style
-     * @var string
-     */
-    protected $_html_style;
-
-    /**
-     * $_other_html_attributes
-     * @var string
-     */
-    protected $_other_html_attributes;
-
-    /**
-     * The form section of which this form section is a part
-     *
-     * @var EE_Form_Section_Proper
-     */
-    protected $_parent_section;
-
-    /**
-     * flag indicating that _construct_finalize has been called.
-     * If it has not been called and we try to use functions which require it, we call it
-     * with no parameters. But normally, _construct_finalize should be called by the instantiating class
-     *
-     * @var boolean
-     */
-    protected $_construction_finalized;
-
-    /**
-     * Strategy for parsing the form HTML upon display
-     *
-     * @var FormHtmlFilter
-     */
-    protected $_form_html_filter;
-
-
-    /**
-     * @param array $options_array {
-     * @type        $name          string the name for this form section, if you want to explicitly define it
-     *                             }
-     * @throws InvalidDataTypeException
-     */
-    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})) {
-                $this->{$key} = $value;
-                if ($key === '_subsections' && ! is_array($value)) {
-                    throw new InvalidDataTypeException($key, $value, 'array');
-                }
-            }
-        }
-        // set parser which allows the form section's rendered HTML to be filtered
-        if (isset($options_array['form_html_filter']) && $options_array['form_html_filter'] instanceof FormHtmlFilter) {
-            $this->_form_html_filter = $options_array['form_html_filter'];
-        }
-    }
-
-
-
-    /**
-     * @param $parent_form_section
-     * @param $name
-     * @throws \EE_Error
-     */
-    protected function _construct_finalize($parent_form_section, $name)
-    {
-        $this->_construction_finalized = true;
-        $this->_parent_section = $parent_form_section;
-        if ($name !== null) {
-            $this->_name = $name;
-        }
-    }
-
-
-
-    /**
-     * make sure construction finalized was called, otherwise children might not be ready
-     *
-     * @return void
-     * @throws \EE_Error
-     */
-    public function ensure_construct_finalized_called()
-    {
-        if (! $this->_construction_finalized) {
-            $this->_construct_finalize($this->_parent_section, $this->_name);
-        }
-    }
-
-
-
-    /**
-     * @return string
-     */
-    public function action()
-    {
-        return $this->_action;
-    }
-
-
-
-    /**
-     * @param string $action
-     */
-    public function set_action($action)
-    {
-        $this->_action = $action;
-    }
-
-
-
-    /**
-     * @return string
-     */
-    public function method()
-    {
-        return ! empty($this->_method) ? $this->_method : 'POST';
-    }
-
-
-
-    /**
-     * @param string $method
-     */
-    public function set_method($method)
-    {
-        switch ($method) {
-            case 'get':
-            case 'GET':
-                $this->_method = 'GET';
-                break;
-            default:
-                $this->_method = 'POST';
-        }
-    }
-
-
-
-    /**
-     * Sets the html_id to its default value, if none was specified in the constructor.
-     * Calculation involves using the name and the parent's html id
-     * return void
-     *
-     * @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());
-            }
-        }
-    }
-
-
-
-    /**
-     * _prep_name_for_html_id
-     *
-     * @param $name
-     * @return string
-     */
-    private function _prep_name_for_html_id($name)
-    {
-        return sanitize_key(str_replace(array(' ', ' ', '_'), '-', $name));
-    }
+	/**
+	 * the URL the form is submitted to
+	 *
+	 * @var string
+	 */
+	protected $_action;
+
+	/**
+	 * POST (default) or GET
+	 *
+	 * @var string
+	 */
+	protected $_method;
+
+	/**
+	 * html_id and html_name are derived from this by default
+	 *
+	 * @var string
+	 */
+	protected $_name;
+
+	/**
+	 * $_html_id
+	 * @var string
+	 */
+	protected $_html_id;
+
+	/**
+	 * $_html_class
+	 * @var string
+	 */
+	protected $_html_class;
+
+	/**
+	 * $_html_style
+	 * @var string
+	 */
+	protected $_html_style;
+
+	/**
+	 * $_other_html_attributes
+	 * @var string
+	 */
+	protected $_other_html_attributes;
+
+	/**
+	 * The form section of which this form section is a part
+	 *
+	 * @var EE_Form_Section_Proper
+	 */
+	protected $_parent_section;
+
+	/**
+	 * flag indicating that _construct_finalize has been called.
+	 * If it has not been called and we try to use functions which require it, we call it
+	 * with no parameters. But normally, _construct_finalize should be called by the instantiating class
+	 *
+	 * @var boolean
+	 */
+	protected $_construction_finalized;
+
+	/**
+	 * Strategy for parsing the form HTML upon display
+	 *
+	 * @var FormHtmlFilter
+	 */
+	protected $_form_html_filter;
+
+
+	/**
+	 * @param array $options_array {
+	 * @type        $name          string the name for this form section, if you want to explicitly define it
+	 *                             }
+	 * @throws InvalidDataTypeException
+	 */
+	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})) {
+				$this->{$key} = $value;
+				if ($key === '_subsections' && ! is_array($value)) {
+					throw new InvalidDataTypeException($key, $value, 'array');
+				}
+			}
+		}
+		// set parser which allows the form section's rendered HTML to be filtered
+		if (isset($options_array['form_html_filter']) && $options_array['form_html_filter'] instanceof FormHtmlFilter) {
+			$this->_form_html_filter = $options_array['form_html_filter'];
+		}
+	}
+
+
+
+	/**
+	 * @param $parent_form_section
+	 * @param $name
+	 * @throws \EE_Error
+	 */
+	protected function _construct_finalize($parent_form_section, $name)
+	{
+		$this->_construction_finalized = true;
+		$this->_parent_section = $parent_form_section;
+		if ($name !== null) {
+			$this->_name = $name;
+		}
+	}
+
+
+
+	/**
+	 * make sure construction finalized was called, otherwise children might not be ready
+	 *
+	 * @return void
+	 * @throws \EE_Error
+	 */
+	public function ensure_construct_finalized_called()
+	{
+		if (! $this->_construction_finalized) {
+			$this->_construct_finalize($this->_parent_section, $this->_name);
+		}
+	}
+
+
+
+	/**
+	 * @return string
+	 */
+	public function action()
+	{
+		return $this->_action;
+	}
+
+
+
+	/**
+	 * @param string $action
+	 */
+	public function set_action($action)
+	{
+		$this->_action = $action;
+	}
+
+
+
+	/**
+	 * @return string
+	 */
+	public function method()
+	{
+		return ! empty($this->_method) ? $this->_method : 'POST';
+	}
+
+
+
+	/**
+	 * @param string $method
+	 */
+	public function set_method($method)
+	{
+		switch ($method) {
+			case 'get':
+			case 'GET':
+				$this->_method = 'GET';
+				break;
+			default:
+				$this->_method = 'POST';
+		}
+	}
+
+
+
+	/**
+	 * Sets the html_id to its default value, if none was specified in the constructor.
+	 * Calculation involves using the name and the parent's html id
+	 * return void
+	 *
+	 * @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());
+			}
+		}
+	}
+
+
+
+	/**
+	 * _prep_name_for_html_id
+	 *
+	 * @param $name
+	 * @return string
+	 */
+	private function _prep_name_for_html_id($name)
+	{
+		return sanitize_key(str_replace(array(' ', ' ', '_'), '-', $name));
+	}
 
 
 
-    /**
-     * Returns the HTML, JS, and CSS necessary to display this form section on a page.
-     * Note however, it's recommended that you instead call enqueue_js on the "wp_enqueue_scripts" action,
-     * and call get_html when you want to output the html. Calling get_html_and_js after
-     * "wp_enqueue_scripts" has already fired seems to work for now, but is contrary
-     * to the instructions on https://developer.wordpress.org/reference/functions/wp_enqueue_script/
-     * and so might stop working anytime.
-     *
-     * @return string
-     */
-    public function get_html_and_js()
-    {
-        return $this->get_html();
-    }
+	/**
+	 * Returns the HTML, JS, and CSS necessary to display this form section on a page.
+	 * Note however, it's recommended that you instead call enqueue_js on the "wp_enqueue_scripts" action,
+	 * and call get_html when you want to output the html. Calling get_html_and_js after
+	 * "wp_enqueue_scripts" has already fired seems to work for now, but is contrary
+	 * to the instructions on https://developer.wordpress.org/reference/functions/wp_enqueue_script/
+	 * and so might stop working anytime.
+	 *
+	 * @return string
+	 */
+	public function get_html_and_js()
+	{
+		return $this->get_html();
+	}
 
 
-
-    /**
-     * Gets the HTML for displaying this form section
-     *
-     * @return string
-     */
-    abstract public function get_html();
-
-
-    /**
-     * @param bool $add_pound_sign
-     * @return string
-     * @throws EE_Error
-     */
-    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 string
-     */
-    public function html_class()
-    {
-        return $this->_html_class;
-    }
-
-
-
-    /**
-     * @return string
-     */
-    public function html_style()
-    {
-        return $this->_html_style;
-    }
-
-
-
-    /**
-     * @param mixed $html_class
-     */
-    public function set_html_class($html_class)
-    {
-        $this->_html_class = $html_class;
-    }
-
-
-
-    /**
-     * @param mixed $html_id
-     */
-    public function set_html_id($html_id)
-    {
-        $this->_html_id = $html_id;
-    }
-
-
-
-    /**
-     * @param mixed $html_style
-     */
-    public function set_html_style($html_style)
-    {
-        $this->_html_style = $html_style;
-    }
-
-
-
-    /**
-     * @param string $other_html_attributes
-     */
-    public function set_other_html_attributes($other_html_attributes)
-    {
-        $this->_other_html_attributes = $other_html_attributes;
-    }
-
-
-
-    /**
-     * @return string
-     */
-    public function other_html_attributes()
-    {
-        return ! empty($this->_other_html_attributes) ? ' ' . $this->_other_html_attributes : '';
-    }
-
-
-
-    /**
-     * Gets the name of the form section. This is not the same as the HTML name.
-     *
-     * @throws EE_Error
-     * @return string
-     */
-    public function name()
-    {
-        if (! $this->_construction_finalized) {
-            throw new EE_Error(sprintf(esc_html__(
-                '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;
-    }
-
-
-
-    /**
-     * Gets the parent section
-     *
-     * @return EE_Form_Section_Proper
-     */
-    public function parent_section()
-    {
-        return $this->_parent_section;
-    }
-
-
-    /**
-     * returns HTML for generating the opening form HTML tag (<form>)
-     *
-     * @param string $action           the URL the form is submitted to
-     * @param string $method           POST (default) or GET
-     * @param string $other_attributes anything else added to the form open tag, MUST BE VALID HTML
-     * @return string
-     * @throws EE_Error
-     */
-    public function form_open($action = '', $method = '', $other_attributes = '')
-    {
-        if (! empty($action)) {
-            $this->set_action($action);
-        }
-        if (! empty($method)) {
-            $this->set_method($method);
-        }
-        $html = EEH_HTML::nl(1, 'form') . '<form';
-        $html .= $this->html_id() !== '' ? ' id="' . $this->get_html_id_for_form($this->html_id()) . '"' : '';
-        $html .= ' action="' . esc_url_raw($this->action()) . '"';
-        $html .= ' method="' . $this->method() . '"';
-        $html .= ' name="' . $this->name() . '"';
-        $html .= $other_attributes . '>';
-        return $html;
-    }
-
-
-
-    /**
-     * ensures that html id for form either ends in "-form" or "-frm"
-     * so that id doesn't conflict/collide with other elements
-     *
-     * @param string $html_id
-     * @return string
-     */
-    protected function get_html_id_for_form($html_id)
-    {
-        $strlen = strlen($html_id);
-        $html_id = strpos($html_id, '-form') === $strlen - 5 || strpos($html_id, '-frm') === $strlen - 4
-            ? $html_id
-            : $html_id . '-frm';
-        return $html_id;
-    }
-
-
-    /**
-     * returns HTML for generating the closing form HTML tag (</form>)
-     *
-     * @return string
-     * @throws EE_Error
-     */
-    public function form_close()
-    {
-        return EEH_HTML::nl(-1, 'form')
-               . '</form>'
-               . EEH_HTML::nl()
-               . '<!-- end of ee-'
-               . $this->html_id()
-               . '-form -->'
-               . EEH_HTML::nl();
-    }
-
-
-
-    /**
-     * enqueues JS (and CSS) for the form (ie immediately call wp_enqueue_script and
-     * wp_enqueue_style; the scripts could have optionally been registered earlier)
-     * Default does nothing, but child classes can override
-     *
-     * @return void
-     */
-    public function enqueue_js()
-    {
-        // defaults to enqueue NO js or css
-    }
-
-
-
-    /**
-     * Adds any extra data needed by js. Eventually we'll call wp_localize_script
-     * with it, and it will be on each form section's 'other_data' property.
-     * By default nothing is added, but child classes can extend this method to add something.
-     * Eg, if you have an input that will cause a modal dialog to appear,
-     * here you could add an entry like 'modal_dialog_inputs' to this array
-     * to map between the input's html ID and the modal dialogue's ID, so that
-     * your JS code will know where to find the modal dialog when the input is pressed.
-     * Eg $form_other_js_data['modal_dialog_inputs']['some-input-id']='modal-dialog-id';
-     *
-     * @param array $form_other_js_data
-     * @return array
-     */
-    public function get_other_js_data($form_other_js_data = array())
-    {
-        return $form_other_js_data;
-    }
-
-
-
-    /**
-     * This isn't just the name of an input, it's a path pointing to an input. The
-     * path is similar to a folder path: slash (/) means to descend into a subsection,
-     * dot-dot-slash (../) means to ascend into the parent section.
-     * After a series of slashes and dot-dot-slashes, there should be the name of an input,
-     * which will be returned.
-     * Eg, if you want the related input to be conditional on a sibling input name 'foobar'
-     * just use 'foobar'. If you want it to be conditional on an aunt/uncle input name
-     * 'baz', use '../baz'. If you want it to be conditional on a cousin input,
-     * the child of 'baz_section' named 'baz_child', use '../baz_section/baz_child'.
-     * Etc
-     *
-     * @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('/'));
-        }
-        if (empty($form_section_path)) {
-            return $this;
-        }
-        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);
-            }
-            if (empty($form_section_path)) {
-                return $this;
-            }
-        }
-        // couldn't find it using simple parent following
-        return null;
-    }
+
+	/**
+	 * Gets the HTML for displaying this form section
+	 *
+	 * @return string
+	 */
+	abstract public function get_html();
+
+
+	/**
+	 * @param bool $add_pound_sign
+	 * @return string
+	 * @throws EE_Error
+	 */
+	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 string
+	 */
+	public function html_class()
+	{
+		return $this->_html_class;
+	}
+
+
+
+	/**
+	 * @return string
+	 */
+	public function html_style()
+	{
+		return $this->_html_style;
+	}
+
+
+
+	/**
+	 * @param mixed $html_class
+	 */
+	public function set_html_class($html_class)
+	{
+		$this->_html_class = $html_class;
+	}
+
+
+
+	/**
+	 * @param mixed $html_id
+	 */
+	public function set_html_id($html_id)
+	{
+		$this->_html_id = $html_id;
+	}
+
+
+
+	/**
+	 * @param mixed $html_style
+	 */
+	public function set_html_style($html_style)
+	{
+		$this->_html_style = $html_style;
+	}
+
+
+
+	/**
+	 * @param string $other_html_attributes
+	 */
+	public function set_other_html_attributes($other_html_attributes)
+	{
+		$this->_other_html_attributes = $other_html_attributes;
+	}
+
+
+
+	/**
+	 * @return string
+	 */
+	public function other_html_attributes()
+	{
+		return ! empty($this->_other_html_attributes) ? ' ' . $this->_other_html_attributes : '';
+	}
+
+
+
+	/**
+	 * Gets the name of the form section. This is not the same as the HTML name.
+	 *
+	 * @throws EE_Error
+	 * @return string
+	 */
+	public function name()
+	{
+		if (! $this->_construction_finalized) {
+			throw new EE_Error(sprintf(esc_html__(
+				'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;
+	}
+
+
+
+	/**
+	 * Gets the parent section
+	 *
+	 * @return EE_Form_Section_Proper
+	 */
+	public function parent_section()
+	{
+		return $this->_parent_section;
+	}
+
+
+	/**
+	 * returns HTML for generating the opening form HTML tag (<form>)
+	 *
+	 * @param string $action           the URL the form is submitted to
+	 * @param string $method           POST (default) or GET
+	 * @param string $other_attributes anything else added to the form open tag, MUST BE VALID HTML
+	 * @return string
+	 * @throws EE_Error
+	 */
+	public function form_open($action = '', $method = '', $other_attributes = '')
+	{
+		if (! empty($action)) {
+			$this->set_action($action);
+		}
+		if (! empty($method)) {
+			$this->set_method($method);
+		}
+		$html = EEH_HTML::nl(1, 'form') . '<form';
+		$html .= $this->html_id() !== '' ? ' id="' . $this->get_html_id_for_form($this->html_id()) . '"' : '';
+		$html .= ' action="' . esc_url_raw($this->action()) . '"';
+		$html .= ' method="' . $this->method() . '"';
+		$html .= ' name="' . $this->name() . '"';
+		$html .= $other_attributes . '>';
+		return $html;
+	}
+
+
+
+	/**
+	 * ensures that html id for form either ends in "-form" or "-frm"
+	 * so that id doesn't conflict/collide with other elements
+	 *
+	 * @param string $html_id
+	 * @return string
+	 */
+	protected function get_html_id_for_form($html_id)
+	{
+		$strlen = strlen($html_id);
+		$html_id = strpos($html_id, '-form') === $strlen - 5 || strpos($html_id, '-frm') === $strlen - 4
+			? $html_id
+			: $html_id . '-frm';
+		return $html_id;
+	}
+
+
+	/**
+	 * returns HTML for generating the closing form HTML tag (</form>)
+	 *
+	 * @return string
+	 * @throws EE_Error
+	 */
+	public function form_close()
+	{
+		return EEH_HTML::nl(-1, 'form')
+			   . '</form>'
+			   . EEH_HTML::nl()
+			   . '<!-- end of ee-'
+			   . $this->html_id()
+			   . '-form -->'
+			   . EEH_HTML::nl();
+	}
+
+
+
+	/**
+	 * enqueues JS (and CSS) for the form (ie immediately call wp_enqueue_script and
+	 * wp_enqueue_style; the scripts could have optionally been registered earlier)
+	 * Default does nothing, but child classes can override
+	 *
+	 * @return void
+	 */
+	public function enqueue_js()
+	{
+		// defaults to enqueue NO js or css
+	}
+
+
+
+	/**
+	 * Adds any extra data needed by js. Eventually we'll call wp_localize_script
+	 * with it, and it will be on each form section's 'other_data' property.
+	 * By default nothing is added, but child classes can extend this method to add something.
+	 * Eg, if you have an input that will cause a modal dialog to appear,
+	 * here you could add an entry like 'modal_dialog_inputs' to this array
+	 * to map between the input's html ID and the modal dialogue's ID, so that
+	 * your JS code will know where to find the modal dialog when the input is pressed.
+	 * Eg $form_other_js_data['modal_dialog_inputs']['some-input-id']='modal-dialog-id';
+	 *
+	 * @param array $form_other_js_data
+	 * @return array
+	 */
+	public function get_other_js_data($form_other_js_data = array())
+	{
+		return $form_other_js_data;
+	}
+
+
+
+	/**
+	 * This isn't just the name of an input, it's a path pointing to an input. The
+	 * path is similar to a folder path: slash (/) means to descend into a subsection,
+	 * dot-dot-slash (../) means to ascend into the parent section.
+	 * After a series of slashes and dot-dot-slashes, there should be the name of an input,
+	 * which will be returned.
+	 * Eg, if you want the related input to be conditional on a sibling input name 'foobar'
+	 * just use 'foobar'. If you want it to be conditional on an aunt/uncle input name
+	 * 'baz', use '../baz'. If you want it to be conditional on a cousin input,
+	 * the child of 'baz_section' named 'baz_child', use '../baz_section/baz_child'.
+	 * Etc
+	 *
+	 * @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('/'));
+		}
+		if (empty($form_section_path)) {
+			return $this;
+		}
+		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);
+			}
+			if (empty($form_section_path)) {
+				return $this;
+			}
+		}
+		// couldn't find it using simple parent following
+		return null;
+	}
 }
 // End of file EE_Form_Section_Base.form.php

Spacing +15 added lines, -15 removed lines

@@ -94,7 +94,7 @@ 
         // used by display strategies
         // assign incoming values to properties
         foreach ($options_array as $key => $value) {
-            $key = '_' . $key;
+            $key = '_'.$key;
             if (property_exists($this, $key) && empty($this->{$key})) {
                 $this->{$key} = $value;
                 if ($key === '_subsections' && ! is_array($value)) {
@@ -134,7 +134,7 @@ 
      */
     public function ensure_construct_finalized_called()
     {
-        if (! $this->_construction_finalized) {
+        if ( ! $this->_construction_finalized) {
             $this->_construct_finalize($this->_parent_section, $this->_name);
         }
     }
@@ -197,7 +197,7 @@ 
      */
     protected function _set_default_html_id_if_empty()
     {
-        if (! $this->_html_id) {
+        if ( ! $this->_html_id) {
             if ($this->_parent_section && $this->_parent_section instanceof EE_Form_Section_Proper) {
                 $this->_html_id = $this->_parent_section->html_id()
                                   . '-'
@@ -256,7 +256,7 @@ 
     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;
     }
 
 
@@ -326,7 +326,7 @@ 
      */
     public function other_html_attributes()
     {
-        return ! empty($this->_other_html_attributes) ? ' ' . $this->_other_html_attributes : '';
+        return ! empty($this->_other_html_attributes) ? ' '.$this->_other_html_attributes : '';
     }
 
 
@@ -339,7 +339,7 @@ 
      */
     public function name()
     {
-        if (! $this->_construction_finalized) {
+        if ( ! $this->_construction_finalized) {
             throw new EE_Error(sprintf(esc_html__(
                 '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'
@@ -372,18 +372,18 @@ 
      */
     public function form_open($action = '', $method = '', $other_attributes = '')
     {
-        if (! empty($action)) {
+        if ( ! empty($action)) {
             $this->set_action($action);
         }
-        if (! empty($method)) {
+        if ( ! empty($method)) {
             $this->set_method($method);
         }
-        $html = EEH_HTML::nl(1, 'form') . '<form';
-        $html .= $this->html_id() !== '' ? ' id="' . $this->get_html_id_for_form($this->html_id()) . '"' : '';
-        $html .= ' action="' . esc_url_raw($this->action()) . '"';
-        $html .= ' method="' . $this->method() . '"';
-        $html .= ' name="' . $this->name() . '"';
-        $html .= $other_attributes . '>';
+        $html = EEH_HTML::nl(1, 'form').'<form';
+        $html .= $this->html_id() !== '' ? ' id="'.$this->get_html_id_for_form($this->html_id()).'"' : '';
+        $html .= ' action="'.esc_url_raw($this->action()).'"';
+        $html .= ' method="'.$this->method().'"';
+        $html .= ' name="'.$this->name().'"';
+        $html .= $other_attributes.'>';
         return $html;
     }
 
@@ -401,7 +401,7 @@ 
         $strlen = strlen($html_id);
         $html_id = strpos($html_id, '-form') === $strlen - 5 || strpos($html_id, '-frm') === $strlen - 4
             ? $html_id
-            : $html_id . '-frm';
+            : $html_id.'-frm';
         return $html_id;
     }
 

core/libraries/batch/JobHandlers/PreviewEventDeletion.php

Indentation +215 added lines, -215 removed lines

@@ -33,144 +33,144 @@ 
  */
 class PreviewEventDeletion extends JobHandler
 {
-    /**
-     * @var NodeGroupDao
-     */
-    protected $model_obj_node_group_persister;
+	/**
+	 * @var NodeGroupDao
+	 */
+	protected $model_obj_node_group_persister;
 
-    public function __construct(NodeGroupDao $model_obj_node_group_persister)
-    {
-        $this->model_obj_node_group_persister = $model_obj_node_group_persister;
-    }
+	public function __construct(NodeGroupDao $model_obj_node_group_persister)
+	{
+		$this->model_obj_node_group_persister = $model_obj_node_group_persister;
+	}
 
-    // phpcs:disable PSR1.Methods.CamelCapsMethodName.NotCamelCaps
+	// phpcs:disable PSR1.Methods.CamelCapsMethodName.NotCamelCaps
 
-    /**
-     *
-     * @param JobParameters $job_parameters
-     * @return JobStepResponse
-     * @throws EE_Error
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     */
-    public function create_job(JobParameters $job_parameters)
-    {
-        // Set the "root" model objects we will want to delete (record their ID and model)
-        $event_ids = $job_parameters->request_datum('EVT_IDs', array());
-        // Find all the root nodes to delete (this isn't just events, because there's other data, like related tickets,
-        // prices, message templates, etc, whose model definition doesn't make them dependent on events. But,
-        // we have no UI to access them independent of events, so they may as well get deleted too.)
-        $roots = [];
-        foreach ($event_ids as $event_id) {
-            $roots[] = new ModelObjNode(
-                $event_id,
-                EEM_Event::instance()
-            );
-            // Also, we want to delete their related, non-global, tickets, prices and message templates
-            $related_non_global_tickets = EEM_Ticket::instance()->get_all_deleted_and_undeleted(
-                [
-                    [
-                        'TKT_is_default' => false,
-                        'Datetime.EVT_ID' => $event_id
-                    ]
-                ]
-            );
-            foreach ($related_non_global_tickets as $ticket) {
-                $roots[] = new ModelObjNode(
-                    $ticket->ID(),
-                    $ticket->get_model(),
-                    ['Registration']
-                );
-            }
-            $related_non_global_prices = EEM_Price::instance()->get_all_deleted_and_undeleted(
-                [
-                    [
-                        'PRC_is_default' => false,
-                        'Ticket.Datetime.EVT_ID' => $event_id
-                    ]
-                ]
-            );
-            foreach ($related_non_global_prices as $price) {
-                $roots[] = new ModelObjNode(
-                    $price->ID(),
-                    $price->get_model()
-                );
-            }
-        }
-        $transactions_ids = $this->getTransactionsToDelete($event_ids);
-        foreach ($transactions_ids as $transaction_id) {
-            $roots[] = new ModelObjNode(
-                $transaction_id,
-                EEM_Transaction::instance(),
-                ['Registration']
-            );
-        }
-        $job_parameters->add_extra_data('roots', $roots);
-        // Set an estimate of how long this will take (we're discovering as we go, so it seems impossible to give
-        // an accurate count.)
-        $estimated_work_per_model_obj = 10;
-        $count_regs = EEM_Registration::instance()->count(
-            [
-                [
-                    'EVT_ID' => ['IN', $event_ids]
-                ]
-            ]
-        );
-        $job_parameters->set_job_size((count($roots) + $count_regs) * $estimated_work_per_model_obj);
-        $this->updateTextHeader(esc_html__('Generating preview of data to be deleted...', 'event_espresso'));
-        return new JobStepResponse($job_parameters, $this->feedback);
-    }
+	/**
+	 *
+	 * @param JobParameters $job_parameters
+	 * @return JobStepResponse
+	 * @throws EE_Error
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 */
+	public function create_job(JobParameters $job_parameters)
+	{
+		// Set the "root" model objects we will want to delete (record their ID and model)
+		$event_ids = $job_parameters->request_datum('EVT_IDs', array());
+		// Find all the root nodes to delete (this isn't just events, because there's other data, like related tickets,
+		// prices, message templates, etc, whose model definition doesn't make them dependent on events. But,
+		// we have no UI to access them independent of events, so they may as well get deleted too.)
+		$roots = [];
+		foreach ($event_ids as $event_id) {
+			$roots[] = new ModelObjNode(
+				$event_id,
+				EEM_Event::instance()
+			);
+			// Also, we want to delete their related, non-global, tickets, prices and message templates
+			$related_non_global_tickets = EEM_Ticket::instance()->get_all_deleted_and_undeleted(
+				[
+					[
+						'TKT_is_default' => false,
+						'Datetime.EVT_ID' => $event_id
+					]
+				]
+			);
+			foreach ($related_non_global_tickets as $ticket) {
+				$roots[] = new ModelObjNode(
+					$ticket->ID(),
+					$ticket->get_model(),
+					['Registration']
+				);
+			}
+			$related_non_global_prices = EEM_Price::instance()->get_all_deleted_and_undeleted(
+				[
+					[
+						'PRC_is_default' => false,
+						'Ticket.Datetime.EVT_ID' => $event_id
+					]
+				]
+			);
+			foreach ($related_non_global_prices as $price) {
+				$roots[] = new ModelObjNode(
+					$price->ID(),
+					$price->get_model()
+				);
+			}
+		}
+		$transactions_ids = $this->getTransactionsToDelete($event_ids);
+		foreach ($transactions_ids as $transaction_id) {
+			$roots[] = new ModelObjNode(
+				$transaction_id,
+				EEM_Transaction::instance(),
+				['Registration']
+			);
+		}
+		$job_parameters->add_extra_data('roots', $roots);
+		// Set an estimate of how long this will take (we're discovering as we go, so it seems impossible to give
+		// an accurate count.)
+		$estimated_work_per_model_obj = 10;
+		$count_regs = EEM_Registration::instance()->count(
+			[
+				[
+					'EVT_ID' => ['IN', $event_ids]
+				]
+			]
+		);
+		$job_parameters->set_job_size((count($roots) + $count_regs) * $estimated_work_per_model_obj);
+		$this->updateTextHeader(esc_html__('Generating preview of data to be deleted...', 'event_espresso'));
+		return new JobStepResponse($job_parameters, $this->feedback);
+	}
 
-    /**
-     * @since 4.10.12.p
-     * @param EE_Base_Class[] $model_objs
-     * @param array $dont_traverse_models
-     * @return array
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    protected function createModelObjNodes($model_objs, array $dont_traverse_models = [])
-    {
-        $nodes = [];
-        foreach ($model_objs as $model_obj) {
-            $nodes[] = new ModelObjNode(
-                $model_obj->ID(),
-                $model_obj->get_model(),
-                $dont_traverse_models
-            );
-        }
-        return $nodes;
-    }
+	/**
+	 * @since 4.10.12.p
+	 * @param EE_Base_Class[] $model_objs
+	 * @param array $dont_traverse_models
+	 * @return array
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	protected function createModelObjNodes($model_objs, array $dont_traverse_models = [])
+	{
+		$nodes = [];
+		foreach ($model_objs as $model_obj) {
+			$nodes[] = new ModelObjNode(
+				$model_obj->ID(),
+				$model_obj->get_model(),
+				$dont_traverse_models
+			);
+		}
+		return $nodes;
+	}
 
-    /**
-     * Gets all the transactions related to these events that aren't related to other events. They'll be deleted too.
-     * (Ones that are related to other events can stay around until those other events are deleted too.)
-     * @since 4.10.12.p
-     * @param $event_ids
-     * @return array of transaction IDs
-     */
-    protected function getTransactionsToDelete($event_ids)
-    {
-        if (empty($event_ids)) {
-            return [];
-        }
-        global $wpdb;
-        $event_ids = array_map('absint', $event_ids);
-        $imploded_sanitized_event_ids = implode(',', $event_ids);
-        // Select transactions with registrations for the events $event_ids which also don't have registrations
-        // for any events NOT in $event_ids.
-        // Notice the outer query searched for transactions whose registrations ARE in $event_ids,
-        // whereas the inner query checks if the outer query's transaction has any registrations that are
-        // NOT IN $event_ids (ie, don't have registrations for events we're not just about to delete.)
-        return array_map(
-            'absint',
-            $wpdb->get_col(
-                "SELECT
+	/**
+	 * Gets all the transactions related to these events that aren't related to other events. They'll be deleted too.
+	 * (Ones that are related to other events can stay around until those other events are deleted too.)
+	 * @since 4.10.12.p
+	 * @param $event_ids
+	 * @return array of transaction IDs
+	 */
+	protected function getTransactionsToDelete($event_ids)
+	{
+		if (empty($event_ids)) {
+			return [];
+		}
+		global $wpdb;
+		$event_ids = array_map('absint', $event_ids);
+		$imploded_sanitized_event_ids = implode(',', $event_ids);
+		// Select transactions with registrations for the events $event_ids which also don't have registrations
+		// for any events NOT in $event_ids.
+		// Notice the outer query searched for transactions whose registrations ARE in $event_ids,
+		// whereas the inner query checks if the outer query's transaction has any registrations that are
+		// NOT IN $event_ids (ie, don't have registrations for events we're not just about to delete.)
+		return array_map(
+			'absint',
+			$wpdb->get_col(
+				"SELECT
                       DISTINCT t.TXN_ID
                     FROM
                       {$wpdb->prefix}esp_transaction t INNER JOIN
@@ -188,90 +188,90 @@ 
                            tsub.TXN_ID=t.TXN_ID AND
                            rsub.EVT_ID NOT IN ({$imploded_sanitized_event_ids})
                        )"
-            )
-        );
-    }
+			)
+		);
+	}
 
-    /**
-     * Performs another step of the job
-     * @param JobParameters $job_parameters
-     * @param int $batch_size
-     * @return JobStepResponse
-     */
-    public function continue_job(JobParameters $job_parameters, $batch_size = 50)
-    {
-        // Serializing and unserializing is what really makes this drag on (eg on localhost, the ajax requests took
-        // about 4 seconds when the batch size was 250, but 3 seconds when the batch size was 50. So like
-        // 50% of the request is just serializing and unserializing.) So, make the batches much bigger.
-        $batch_size *= 3;
-        $units_processed = 0;
-        foreach ($job_parameters->extra_datum('roots', array()) as $root_node) {
-            if ($units_processed >= $batch_size) {
-                break;
-            }
-            if (!$root_node instanceof ModelObjNode) {
-                throw new InvalidClassException('ModelObjNode');
-            }
-            if ($root_node->isComplete()) {
-                continue;
-            }
-            $units_processed += $root_node->visit($batch_size - $units_processed);
-        }
-        $job_parameters->mark_processed($units_processed);
-        // If the most-recently processed root node is complete, we must be all done because we're doing them
-        // sequentially.
-        if (! isset($root_node) || ($root_node instanceof ModelObjNode && $root_node->isComplete())) {
-            $job_parameters->set_status(JobParameters::status_complete);
-            // Show a full progress bar.
-            $job_parameters->set_units_processed($job_parameters->job_size());
-            $deletion_job_code = $job_parameters->request_datum('deletion_job_code');
-            $this->model_obj_node_group_persister->persistModelObjNodesGroup(
-                $job_parameters->extra_datum('roots'),
-                $deletion_job_code
-            );
-            return new JobStepResponse($job_parameters, $this->feedback);
-        }
-        // Because the job size was a guess, it may have likely been proven wrong.
-        // We don't want to show more work done than we originally said there would be.
-        // So adjust the estimate.
-        if (($job_parameters->units_processed() / $job_parameters->job_size()) > .8) {
-            $job_parameters->set_job_size($job_parameters->job_size() * 2);
-        }
-        $this->displayJobStepResults(
-            $units_processed,
-            esc_html__('Identified up to %d potential items for deletion.', 'event_espresso')
-        );
-        return new JobStepResponse($job_parameters, $this->feedback);
-    }
+	/**
+	 * Performs another step of the job
+	 * @param JobParameters $job_parameters
+	 * @param int $batch_size
+	 * @return JobStepResponse
+	 */
+	public function continue_job(JobParameters $job_parameters, $batch_size = 50)
+	{
+		// Serializing and unserializing is what really makes this drag on (eg on localhost, the ajax requests took
+		// about 4 seconds when the batch size was 250, but 3 seconds when the batch size was 50. So like
+		// 50% of the request is just serializing and unserializing.) So, make the batches much bigger.
+		$batch_size *= 3;
+		$units_processed = 0;
+		foreach ($job_parameters->extra_datum('roots', array()) as $root_node) {
+			if ($units_processed >= $batch_size) {
+				break;
+			}
+			if (!$root_node instanceof ModelObjNode) {
+				throw new InvalidClassException('ModelObjNode');
+			}
+			if ($root_node->isComplete()) {
+				continue;
+			}
+			$units_processed += $root_node->visit($batch_size - $units_processed);
+		}
+		$job_parameters->mark_processed($units_processed);
+		// If the most-recently processed root node is complete, we must be all done because we're doing them
+		// sequentially.
+		if (! isset($root_node) || ($root_node instanceof ModelObjNode && $root_node->isComplete())) {
+			$job_parameters->set_status(JobParameters::status_complete);
+			// Show a full progress bar.
+			$job_parameters->set_units_processed($job_parameters->job_size());
+			$deletion_job_code = $job_parameters->request_datum('deletion_job_code');
+			$this->model_obj_node_group_persister->persistModelObjNodesGroup(
+				$job_parameters->extra_datum('roots'),
+				$deletion_job_code
+			);
+			return new JobStepResponse($job_parameters, $this->feedback);
+		}
+		// Because the job size was a guess, it may have likely been proven wrong.
+		// We don't want to show more work done than we originally said there would be.
+		// So adjust the estimate.
+		if (($job_parameters->units_processed() / $job_parameters->job_size()) > .8) {
+			$job_parameters->set_job_size($job_parameters->job_size() * 2);
+		}
+		$this->displayJobStepResults(
+			$units_processed,
+			esc_html__('Identified up to %d potential items for deletion.', 'event_espresso')
+		);
+		return new JobStepResponse($job_parameters, $this->feedback);
+	}
 
-    /**
-     * Performs any clean-up logic when we know the job is completed
-     * @param JobParameters $job_parameters
-     * @return JobStepResponse
-     */
-    public function cleanup_job(JobParameters $job_parameters)
-    {
-        $this->displayJobFinalResults(
-            $job_parameters,
-            esc_html__('found %d potential items for deletion.', 'event_espresso')
-        );
-        $this->updateText(
-            $this->infoWrapper(
-                sprintf(
-                    esc_html__(
-                        'If not automatically redirected in %1$s seconds, click here to %2$scontinue to the confirmation step%3$s',
-                        'event_espresso'
-                    ),
-                    '<span id="ee-redirect-timer">10</span>',
-                    '<a href="' . $job_parameters->request_datum('return_url') . '">',
-                    '</a>'
-                )
-            )
-        );
-        // Nothing much to do.
-        // We can't delete the option with the built tree because we may need it in a moment for the deletion
-        return new JobStepResponse($job_parameters, $this->feedback);
-    }
+	/**
+	 * Performs any clean-up logic when we know the job is completed
+	 * @param JobParameters $job_parameters
+	 * @return JobStepResponse
+	 */
+	public function cleanup_job(JobParameters $job_parameters)
+	{
+		$this->displayJobFinalResults(
+			$job_parameters,
+			esc_html__('found %d potential items for deletion.', 'event_espresso')
+		);
+		$this->updateText(
+			$this->infoWrapper(
+				sprintf(
+					esc_html__(
+						'If not automatically redirected in %1$s seconds, click here to %2$scontinue to the confirmation step%3$s',
+						'event_espresso'
+					),
+					'<span id="ee-redirect-timer">10</span>',
+					'<a href="' . $job_parameters->request_datum('return_url') . '">',
+					'</a>'
+				)
+			)
+		);
+		// Nothing much to do.
+		// We can't delete the option with the built tree because we may need it in a moment for the deletion
+		return new JobStepResponse($job_parameters, $this->feedback);
+	}
 }
 // End of file EventDeletion.php
 // Location: EventEspressoBatchRequest\JobHandlers/EventDeletion.php

Spacing +3 added lines, -3 removed lines

@@ -209,7 +209,7 @@ 
             if ($units_processed >= $batch_size) {
                 break;
             }
-            if (!$root_node instanceof ModelObjNode) {
+            if ( ! $root_node instanceof ModelObjNode) {
                 throw new InvalidClassException('ModelObjNode');
             }
             if ($root_node->isComplete()) {
@@ -220,7 +220,7 @@ 
         $job_parameters->mark_processed($units_processed);
         // If the most-recently processed root node is complete, we must be all done because we're doing them
         // sequentially.
-        if (! isset($root_node) || ($root_node instanceof ModelObjNode && $root_node->isComplete())) {
+        if ( ! isset($root_node) || ($root_node instanceof ModelObjNode && $root_node->isComplete())) {
             $job_parameters->set_status(JobParameters::status_complete);
             // Show a full progress bar.
             $job_parameters->set_units_processed($job_parameters->job_size());
@@ -263,7 +263,7 @@ 
                         'event_espresso'
                     ),
                     '<span id="ee-redirect-timer">10</span>',
-                    '<a href="' . $job_parameters->request_datum('return_url') . '">',
+                    '<a href="'.$job_parameters->request_datum('return_url').'">',
                     '</a>'
                 )
             )

core/libraries/batch/JobHandlers/ExecuteBatchDeletion.php

Indentation +165 added lines, -165 removed lines

@@ -26,181 +26,181 @@
  */
 class ExecuteBatchDeletion extends JobHandler
 {
-    /**
-     * @var NodeGroupDao
-     */
-    protected $model_obj_node_group_persister;
+	/**
+	 * @var NodeGroupDao
+	 */
+	protected $model_obj_node_group_persister;
 
 
-    /**
-     * @param NodeGroupDao $model_obj_node_group_persister
-     */
-    public function __construct(NodeGroupDao $model_obj_node_group_persister)
-    {
-        $this->model_obj_node_group_persister = $model_obj_node_group_persister;
-    }
+	/**
+	 * @param NodeGroupDao $model_obj_node_group_persister
+	 */
+	public function __construct(NodeGroupDao $model_obj_node_group_persister)
+	{
+		$this->model_obj_node_group_persister = $model_obj_node_group_persister;
+	}
 
 
-    // phpcs:disable PSR1.Methods.CamelCapsMethodName.NotCamelCaps
+	// phpcs:disable PSR1.Methods.CamelCapsMethodName.NotCamelCaps
 
 
-    /**
-     *
-     * @param JobParameters $job_parameters
-     * @return JobStepResponse
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @throws Exception
-     */
-    public function create_job(JobParameters $job_parameters)
-    {
-        $deletion_job_code = $job_parameters->request_datum('deletion_job_code', null);
-        $roots = $this->model_obj_node_group_persister->getModelObjNodesInGroup($deletion_job_code);
-        if ($roots === null) {
-            throw new UnexpectedEntityException($roots, 'array', esc_html__('The job seems to be stale. Please press the back button in your browser twice.', 'event_espresso'));
-        }
-        $models_and_ids_to_delete = [];
-        foreach ($roots as $root) {
-            if (! $root instanceof ModelObjNode) {
-                throw new UnexpectedEntityException($root, 'ModelObjNode');
-            }
-            $models_and_ids_to_delete = array_replace_recursive($models_and_ids_to_delete, $root->getIds());
-        }
-        $job_parameters->set_extra_data(
-            [
-                'models_and_ids_to_delete' => $models_and_ids_to_delete
-            ]
-        );
-        // Find the job's actual size.
-        $job_size = 0;
-        foreach ($models_and_ids_to_delete as $ids) {
-            $job_size += count($ids);
-        }
-        $job_parameters->set_job_size($job_size);
-        $this->updateTextHeader(esc_html__('Beginning to delete items...', 'event_espresso'));
-        return new JobStepResponse($job_parameters, $this->feedback);
-    }
+	/**
+	 *
+	 * @param JobParameters $job_parameters
+	 * @return JobStepResponse
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @throws Exception
+	 */
+	public function create_job(JobParameters $job_parameters)
+	{
+		$deletion_job_code = $job_parameters->request_datum('deletion_job_code', null);
+		$roots = $this->model_obj_node_group_persister->getModelObjNodesInGroup($deletion_job_code);
+		if ($roots === null) {
+			throw new UnexpectedEntityException($roots, 'array', esc_html__('The job seems to be stale. Please press the back button in your browser twice.', 'event_espresso'));
+		}
+		$models_and_ids_to_delete = [];
+		foreach ($roots as $root) {
+			if (! $root instanceof ModelObjNode) {
+				throw new UnexpectedEntityException($root, 'ModelObjNode');
+			}
+			$models_and_ids_to_delete = array_replace_recursive($models_and_ids_to_delete, $root->getIds());
+		}
+		$job_parameters->set_extra_data(
+			[
+				'models_and_ids_to_delete' => $models_and_ids_to_delete
+			]
+		);
+		// Find the job's actual size.
+		$job_size = 0;
+		foreach ($models_and_ids_to_delete as $ids) {
+			$job_size += count($ids);
+		}
+		$job_parameters->set_job_size($job_size);
+		$this->updateTextHeader(esc_html__('Beginning to delete items...', 'event_espresso'));
+		return new JobStepResponse($job_parameters, $this->feedback);
+	}
 
 
-    /**
-     * Performs another step of the job
-     *
-     * @param JobParameters $job_parameters
-     * @param int           $batch_size
-     * @return JobStepResponse
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function continue_job(JobParameters $job_parameters, $batch_size = 50)
-    {
-        // We already have the items IDs. So deleting is really fast. Let's speed it up.
-        $batch_size *= 10;
-        $units_processed = 0;
-        $models_and_ids_to_delete = $job_parameters->extra_datum('models_and_ids_to_delete', []);
-        // Build a new list of everything leftover after this request's of deletions.
-        $models_and_ids_remaining = [];
-        foreach ($models_and_ids_to_delete as $model_name => $ids_to_delete) {
-            if ($units_processed < $batch_size) {
-                $model = EE_Registry::instance()->load_model($model_name);
-                $ids_to_delete_this_query = array_slice($ids_to_delete, 0, $batch_size - $units_processed, true);
-                if ($model->has_primary_key_field()) {
-                    $where_conditions = [
-                        $model->primary_key_name() => [
-                            'IN',
-                            $ids_to_delete_this_query
-                        ]
-                    ];
-                } else {
-                    $where_conditions = [
-                        'OR' => []
-                    ];
-                    foreach ($ids_to_delete_this_query as $index_primary_key_string) {
-                        $keys_n_values = $model->parse_index_primary_key_string($index_primary_key_string);
-                        $where_conditions['OR'][ 'AND*' . $index_primary_key_string ] = $keys_n_values;
-                    }
-                }
-                // Deleting time!
-                // The model's deletion method reports every ROW deleted, and in the case of CPT models that will be
-                // two rows deleted for event CPT item. So don't rely on it for the count of items deleted.
-                $model->delete_permanently(
-                    [
-                        $where_conditions
-                    ],
-                    false
-                );
-                $units_processed += count($ids_to_delete_this_query);
-                $remaining_ids = array_diff_key($ids_to_delete, $ids_to_delete_this_query);
-                // If there's any more from this model, we'll do them next time.
-                if (count($remaining_ids) > 0) {
-                    $models_and_ids_remaining[ $model_name ] = $remaining_ids;
-                }
-            } else {
-                $models_and_ids_remaining[ $model_name ] = $ids_to_delete;
-            }
-        }
-        $job_parameters->mark_processed($units_processed);
-        // All done deleting for this request. Is there anything to do next time?
-        if (empty($models_and_ids_remaining)) {
-            $job_parameters->set_status(JobParameters::status_complete);
-            return new JobStepResponse($job_parameters, $this->feedback);
-        }
-        $job_parameters->add_extra_data('models_and_ids_to_delete', $models_and_ids_remaining);
-        $this->displayJobStepResults(
-            $units_processed,
-            esc_html__('Deleted %d items.', 'event_espresso')
-        );
-        return new JobStepResponse($job_parameters, $this->feedback);
-    }
+	/**
+	 * Performs another step of the job
+	 *
+	 * @param JobParameters $job_parameters
+	 * @param int           $batch_size
+	 * @return JobStepResponse
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function continue_job(JobParameters $job_parameters, $batch_size = 50)
+	{
+		// We already have the items IDs. So deleting is really fast. Let's speed it up.
+		$batch_size *= 10;
+		$units_processed = 0;
+		$models_and_ids_to_delete = $job_parameters->extra_datum('models_and_ids_to_delete', []);
+		// Build a new list of everything leftover after this request's of deletions.
+		$models_and_ids_remaining = [];
+		foreach ($models_and_ids_to_delete as $model_name => $ids_to_delete) {
+			if ($units_processed < $batch_size) {
+				$model = EE_Registry::instance()->load_model($model_name);
+				$ids_to_delete_this_query = array_slice($ids_to_delete, 0, $batch_size - $units_processed, true);
+				if ($model->has_primary_key_field()) {
+					$where_conditions = [
+						$model->primary_key_name() => [
+							'IN',
+							$ids_to_delete_this_query
+						]
+					];
+				} else {
+					$where_conditions = [
+						'OR' => []
+					];
+					foreach ($ids_to_delete_this_query as $index_primary_key_string) {
+						$keys_n_values = $model->parse_index_primary_key_string($index_primary_key_string);
+						$where_conditions['OR'][ 'AND*' . $index_primary_key_string ] = $keys_n_values;
+					}
+				}
+				// Deleting time!
+				// The model's deletion method reports every ROW deleted, and in the case of CPT models that will be
+				// two rows deleted for event CPT item. So don't rely on it for the count of items deleted.
+				$model->delete_permanently(
+					[
+						$where_conditions
+					],
+					false
+				);
+				$units_processed += count($ids_to_delete_this_query);
+				$remaining_ids = array_diff_key($ids_to_delete, $ids_to_delete_this_query);
+				// If there's any more from this model, we'll do them next time.
+				if (count($remaining_ids) > 0) {
+					$models_and_ids_remaining[ $model_name ] = $remaining_ids;
+				}
+			} else {
+				$models_and_ids_remaining[ $model_name ] = $ids_to_delete;
+			}
+		}
+		$job_parameters->mark_processed($units_processed);
+		// All done deleting for this request. Is there anything to do next time?
+		if (empty($models_and_ids_remaining)) {
+			$job_parameters->set_status(JobParameters::status_complete);
+			return new JobStepResponse($job_parameters, $this->feedback);
+		}
+		$job_parameters->add_extra_data('models_and_ids_to_delete', $models_and_ids_remaining);
+		$this->displayJobStepResults(
+			$units_processed,
+			esc_html__('Deleted %d items.', 'event_espresso')
+		);
+		return new JobStepResponse($job_parameters, $this->feedback);
+	}
 
 
-    /**
-     * Performs any clean-up logic when we know the job is completed
-     *
-     * @param JobParameters $job_parameters
-     * @return JobStepResponse
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function cleanup_job(JobParameters $job_parameters)
-    {
-        $this->model_obj_node_group_persister->deleteModelObjNodesInGroup(
-            $job_parameters->request_datum('deletion_job_code')
-        );
-        // For backwards compatibility with how we used to delete events, make sure we still trigger the old action.
-        $models_and_ids_to_delete = $job_parameters->extra_datum('models_and_ids_to_delete', []);
-        foreach ($models_and_ids_to_delete['Event'] as $event_id) {
-            // Create a log entry so we know who and when this event was permanently deleted.
-            (EE_Change_Log::new_instance(
-                [
-                    'OBJ_ID' => $event_id,
-                    'OBJ_type' => 'Event',
-                    'LOG_message' => sprintf(
-                        esc_html__('Event %1$d permanently deleted using ExecuteBatchDeletion.', 'event_espresso'),
-                        $event_id
-                    )
-                ]
-            ))->save();
-            do_action('AHEE__Events_Admin_Page___permanently_delete_event__after_event_deleted', $event_id);
-        }
-        $this->displayJobFinalResults(
-            $job_parameters,
-            esc_html__('All Done. Deleted a total of %d items.', 'event_espresso')
-        );
-        $this->updateText(
-            $this->infoWrapper(
-                sprintf(
-                    esc_html__(
-                        'If not automatically redirected in %1$s seconds, click here to return to the %2$sprevious admin screen%3$s',
-                        'event_espresso'
-                    ),
-                    '<span id="ee-redirect-timer">10</span>',
-                    '<a href="' . $job_parameters->request_datum('return_url') . '">',
-                    '</a>'
-                )
-            )
-        );
-        return new JobStepResponse($job_parameters, $this->feedback);
-    }
+	/**
+	 * Performs any clean-up logic when we know the job is completed
+	 *
+	 * @param JobParameters $job_parameters
+	 * @return JobStepResponse
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function cleanup_job(JobParameters $job_parameters)
+	{
+		$this->model_obj_node_group_persister->deleteModelObjNodesInGroup(
+			$job_parameters->request_datum('deletion_job_code')
+		);
+		// For backwards compatibility with how we used to delete events, make sure we still trigger the old action.
+		$models_and_ids_to_delete = $job_parameters->extra_datum('models_and_ids_to_delete', []);
+		foreach ($models_and_ids_to_delete['Event'] as $event_id) {
+			// Create a log entry so we know who and when this event was permanently deleted.
+			(EE_Change_Log::new_instance(
+				[
+					'OBJ_ID' => $event_id,
+					'OBJ_type' => 'Event',
+					'LOG_message' => sprintf(
+						esc_html__('Event %1$d permanently deleted using ExecuteBatchDeletion.', 'event_espresso'),
+						$event_id
+					)
+				]
+			))->save();
+			do_action('AHEE__Events_Admin_Page___permanently_delete_event__after_event_deleted', $event_id);
+		}
+		$this->displayJobFinalResults(
+			$job_parameters,
+			esc_html__('All Done. Deleted a total of %d items.', 'event_espresso')
+		);
+		$this->updateText(
+			$this->infoWrapper(
+				sprintf(
+					esc_html__(
+						'If not automatically redirected in %1$s seconds, click here to return to the %2$sprevious admin screen%3$s',
+						'event_espresso'
+					),
+					'<span id="ee-redirect-timer">10</span>',
+					'<a href="' . $job_parameters->request_datum('return_url') . '">',
+					'</a>'
+				)
+			)
+		);
+		return new JobStepResponse($job_parameters, $this->feedback);
+	}
 }
 // End of file EventDeletion.php
 // Location: EventEspressoBatchRequest\JobHandlers/EventDeletion.php

Spacing +5 added lines, -5 removed lines

@@ -61,7 +61,7 @@ 
         }
         $models_and_ids_to_delete = [];
         foreach ($roots as $root) {
-            if (! $root instanceof ModelObjNode) {
+            if ( ! $root instanceof ModelObjNode) {
                 throw new UnexpectedEntityException($root, 'ModelObjNode');
             }
             $models_and_ids_to_delete = array_replace_recursive($models_and_ids_to_delete, $root->getIds());
@@ -116,7 +116,7 @@ 
                     ];
                     foreach ($ids_to_delete_this_query as $index_primary_key_string) {
                         $keys_n_values = $model->parse_index_primary_key_string($index_primary_key_string);
-                        $where_conditions['OR'][ 'AND*' . $index_primary_key_string ] = $keys_n_values;
+                        $where_conditions['OR']['AND*'.$index_primary_key_string] = $keys_n_values;
                     }
                 }
                 // Deleting time!
@@ -132,10 +132,10 @@ 
                 $remaining_ids = array_diff_key($ids_to_delete, $ids_to_delete_this_query);
                 // If there's any more from this model, we'll do them next time.
                 if (count($remaining_ids) > 0) {
-                    $models_and_ids_remaining[ $model_name ] = $remaining_ids;
+                    $models_and_ids_remaining[$model_name] = $remaining_ids;
                 }
             } else {
-                $models_and_ids_remaining[ $model_name ] = $ids_to_delete;
+                $models_and_ids_remaining[$model_name] = $ids_to_delete;
             }
         }
         $job_parameters->mark_processed($units_processed);
@@ -194,7 +194,7 @@ 
                         'event_espresso'
                     ),
                     '<span id="ee-redirect-timer">10</span>',
-                    '<a href="' . $job_parameters->request_datum('return_url') . '">',
+                    '<a href="'.$job_parameters->request_datum('return_url').'">',
                     '</a>'
                 )
             )

core/libraries/batch/JobHandlerBaseClasses/JobHandler.php

Indentation +238 added lines, -238 removed lines

@@ -17,271 +17,271 @@
  */
 abstract class JobHandler implements JobHandlerInterface
 {
-    /**
-     * @var array
-     */
-    protected $feedback = [];
-
-    /**
-     * incoming Request data
-     *
-     * @var array
-     */
-    protected $request_data = [];
-
-    /**
-     * Extra data to include as part of the response, literally gets set as JobStepResponse::$_extra_data
-     *
-     * @var array
-     */
-    protected $response_data = [];
-
-
-    /**
-     * utilized in newer batch job implementations, but forwarding to existing methods for now.
-     * Performs any necessary setup for starting the job. This is also a good
-     * place to setup the $job_arguments which will be used for subsequent HTTP requests
-     * when continue_job will be called
-     *
-     * @param JobParameters $job_parameters
-     * @return JobStepResponse
-     * @throws BatchRequestException
-     * @since $VID:$
-     */
-    public function createJob(JobParameters $job_parameters): JobStepResponse
-    {
-        return $this->create_job($job_parameters);
-    }
-
-
-    /**
-     * utilized in newer batch job implementations, but forwarding to existing methods for now.
-     * Performs another step of the job
-     *
-     * @param JobParameters $job_parameters
-     * @param int           $batch_size
-     * @return JobStepResponse
-     * @throws BatchRequestException
-     * @since $VID:$
-     */
-    public function continueJob(JobParameters $job_parameters, int $batch_size = 50): JobStepResponse
-    {
-        return $this->continue_job($job_parameters, $batch_size);
-    }
-
-
-    /**
-     * utilized in newer batch job implementations, but forwarding to existing methods for now.
-     * used to advance from one batch job to another
-     * primarily used for executing a job assessment phase where an accurate count of items to update can be made,
-     * followed by the actual update job.
-     *
-     * @param JobParameters $job_parameters
-     * @return JobStepResponse
-     * @since $VID:$
-     */
-    public function advanceJob(JobParameters $job_parameters): JobStepResponse
-    {
-        return $this->advance_job($job_parameters);
-    }
-
-    // phpcs:disable PSR1.Methods.CamelCapsMethodName.NotCamelCaps
-    /**
-     * used to advance from one batch job to another
-     * primarily used for executing a job assessment phase where an accurate count of items to update can be made,
-     * followed by the actual update job.
-     * By default, this function won't do anything until overridden in a chile class.
-     *
-     * @param JobParameters $job_parameters
-     * @return JobStepResponse
-     * @since $VID:$
-     */
-    public function advance_job(JobParameters $job_parameters): JobStepResponse
-    {
-        $job_parameters->set_status(JobParameters::status_continue);
-        return new JobStepResponse($job_parameters, $this->feedback);
-    }
-
-
-    /**
-     * utilized in newer batch job implementations, but forwarding to existing methods for now.
-     * Performs any clean-up logic when we know the job is completed
-     *
-     * @param JobParameters $job_parameters
-     * @return JobStepResponse
-     * @throws BatchRequestException
-     * @since $VID:$
-     */
-    public function cleanupJob(JobParameters $job_parameters): JobStepResponse
-    {
-        return $this->cleanup_job($job_parameters);
-    }
-
-
-    /**
-     * @return array
-     */
-    public function requestData(): array
-    {
-        return $this->request_data;
-    }
-
-
-    /**
-     * @return mixed
-     */
-    public function getRequestData($key)
-    {
-        return $this->request_data[ $key ] ?? null;
-    }
-
-
-    /**
-     * @param array $request_data
-     */
-    public function setRequestData(array $request_data): void
-    {
-        $this->request_data = $request_data;
-    }
-
-
-    /**
-     * @return array
-     */
-    public function responseData(): array
-    {
-        return $this->response_data;
-    }
-
-
-    /**
-     * @param array $response_data
-     */
-    public function addResponseData(array $response_data): void
-    {
-        $this->response_data += $response_data;
-    }
-
-
-
-    /**
-     * @param array $response_data
-     */
-    public function setResponseData(array $response_data): void
-    {
-        $this->response_data = $response_data;
-    }
-
-
-
-
-    protected function displayJobStepResults(int $processed, string $custom_message = '')
-    {
-        $this->feedback[] = '
+	/**
+	 * @var array
+	 */
+	protected $feedback = [];
+
+	/**
+	 * incoming Request data
+	 *
+	 * @var array
+	 */
+	protected $request_data = [];
+
+	/**
+	 * Extra data to include as part of the response, literally gets set as JobStepResponse::$_extra_data
+	 *
+	 * @var array
+	 */
+	protected $response_data = [];
+
+
+	/**
+	 * utilized in newer batch job implementations, but forwarding to existing methods for now.
+	 * Performs any necessary setup for starting the job. This is also a good
+	 * place to setup the $job_arguments which will be used for subsequent HTTP requests
+	 * when continue_job will be called
+	 *
+	 * @param JobParameters $job_parameters
+	 * @return JobStepResponse
+	 * @throws BatchRequestException
+	 * @since $VID:$
+	 */
+	public function createJob(JobParameters $job_parameters): JobStepResponse
+	{
+		return $this->create_job($job_parameters);
+	}
+
+
+	/**
+	 * utilized in newer batch job implementations, but forwarding to existing methods for now.
+	 * Performs another step of the job
+	 *
+	 * @param JobParameters $job_parameters
+	 * @param int           $batch_size
+	 * @return JobStepResponse
+	 * @throws BatchRequestException
+	 * @since $VID:$
+	 */
+	public function continueJob(JobParameters $job_parameters, int $batch_size = 50): JobStepResponse
+	{
+		return $this->continue_job($job_parameters, $batch_size);
+	}
+
+
+	/**
+	 * utilized in newer batch job implementations, but forwarding to existing methods for now.
+	 * used to advance from one batch job to another
+	 * primarily used for executing a job assessment phase where an accurate count of items to update can be made,
+	 * followed by the actual update job.
+	 *
+	 * @param JobParameters $job_parameters
+	 * @return JobStepResponse
+	 * @since $VID:$
+	 */
+	public function advanceJob(JobParameters $job_parameters): JobStepResponse
+	{
+		return $this->advance_job($job_parameters);
+	}
+
+	// phpcs:disable PSR1.Methods.CamelCapsMethodName.NotCamelCaps
+	/**
+	 * used to advance from one batch job to another
+	 * primarily used for executing a job assessment phase where an accurate count of items to update can be made,
+	 * followed by the actual update job.
+	 * By default, this function won't do anything until overridden in a chile class.
+	 *
+	 * @param JobParameters $job_parameters
+	 * @return JobStepResponse
+	 * @since $VID:$
+	 */
+	public function advance_job(JobParameters $job_parameters): JobStepResponse
+	{
+		$job_parameters->set_status(JobParameters::status_continue);
+		return new JobStepResponse($job_parameters, $this->feedback);
+	}
+
+
+	/**
+	 * utilized in newer batch job implementations, but forwarding to existing methods for now.
+	 * Performs any clean-up logic when we know the job is completed
+	 *
+	 * @param JobParameters $job_parameters
+	 * @return JobStepResponse
+	 * @throws BatchRequestException
+	 * @since $VID:$
+	 */
+	public function cleanupJob(JobParameters $job_parameters): JobStepResponse
+	{
+		return $this->cleanup_job($job_parameters);
+	}
+
+
+	/**
+	 * @return array
+	 */
+	public function requestData(): array
+	{
+		return $this->request_data;
+	}
+
+
+	/**
+	 * @return mixed
+	 */
+	public function getRequestData($key)
+	{
+		return $this->request_data[ $key ] ?? null;
+	}
+
+
+	/**
+	 * @param array $request_data
+	 */
+	public function setRequestData(array $request_data): void
+	{
+		$this->request_data = $request_data;
+	}
+
+
+	/**
+	 * @return array
+	 */
+	public function responseData(): array
+	{
+		return $this->response_data;
+	}
+
+
+	/**
+	 * @param array $response_data
+	 */
+	public function addResponseData(array $response_data): void
+	{
+		$this->response_data += $response_data;
+	}
+
+
+
+	/**
+	 * @param array $response_data
+	 */
+	public function setResponseData(array $response_data): void
+	{
+		$this->response_data = $response_data;
+	}
+
+
+
+
+	protected function displayJobStepResults(int $processed, string $custom_message = '')
+	{
+		$this->feedback[] = '
 			<div class="ee-batch-job-step-results">
 			' . $this->infoWrapper(
-            sprintf(
-                $custom_message !== ''
-                        ? $custom_message
-                        : esc_html__('processed this batch: %d', 'event_espresso'),
-                $processed
-            )
-        ) . '
+			sprintf(
+				$custom_message !== ''
+						? $custom_message
+						: esc_html__('processed this batch: %d', 'event_espresso'),
+				$processed
+			)
+		) . '
 			</div>';
-    }
+	}
 
 
-    protected function displayJobFinalResults(JobParameters $job_parameters, string $custom_message = '')
-    {
-        if ($job_parameters->status() === JobParameters::status_complete) {
-            $this->feedback[] = '
+	protected function displayJobFinalResults(JobParameters $job_parameters, string $custom_message = '')
+	{
+		if ($job_parameters->status() === JobParameters::status_complete) {
+			$this->feedback[] = '
 			<div class="ee-batch-job-final-results">
 				' . $this->okWrapper(
-                sprintf(
-                    $custom_message !== ''
-                            ? $custom_message
-                            : esc_html__('total units processed: %d', 'event_espresso'),
-                    $job_parameters->units_processed()
-                )
-            ) . '
+				sprintf(
+					$custom_message !== ''
+							? $custom_message
+							: esc_html__('total units processed: %d', 'event_espresso'),
+					$job_parameters->units_processed()
+				)
+			) . '
 				' . $this->jobStatusNotice($job_parameters) . '
 			</div>';
-        }
-    }
+		}
+	}
 
 
-    protected function jobStatusNotice(JobParameters $job_parameters): string
-    {
-        switch ($job_parameters->status()) {
-            case JobParameters::status_cleaned_up:
-            case JobParameters::status_continue:
-            case JobParameters::status_pause:
-                break;
-            case JobParameters::status_complete:
-                return $this->successWrapper('job status: COMPLETE');
-            case JobParameters::status_error:
-                return $this->errorWrapper('job status: ERROR');
-        }
-        return '';
-    }
+	protected function jobStatusNotice(JobParameters $job_parameters): string
+	{
+		switch ($job_parameters->status()) {
+			case JobParameters::status_cleaned_up:
+			case JobParameters::status_continue:
+			case JobParameters::status_pause:
+				break;
+			case JobParameters::status_complete:
+				return $this->successWrapper('job status: COMPLETE');
+			case JobParameters::status_error:
+				return $this->errorWrapper('job status: ERROR');
+		}
+		return '';
+	}
 
 
-    /**
-     * @param string $update_text
-     */
-    protected function updateText(string $update_text)
-    {
-        $this->feedback[] = "<p class='ee-batch-job-update'>$update_text</p>";
-    }
+	/**
+	 * @param string $update_text
+	 */
+	protected function updateText(string $update_text)
+	{
+		$this->feedback[] = "<p class='ee-batch-job-update'>$update_text</p>";
+	}
 
 
-    protected function updateTextHeader(string $update_text)
-    {
-        $this->feedback[] = "<h4 class='ee-batch-job-update-heading'>$update_text</h4>";
-    }
+	protected function updateTextHeader(string $update_text)
+	{
+		$this->feedback[] = "<h4 class='ee-batch-job-update-heading'>$update_text</h4>";
+	}
 
 
-    protected function attentionWrapper(string $update_text): string
-    {
-        return "<span class='ee-status-outline ee-status-bg--attention'>$update_text</span>";
-    }
+	protected function attentionWrapper(string $update_text): string
+	{
+		return "<span class='ee-status-outline ee-status-bg--attention'>$update_text</span>";
+	}
 
 
-    protected function errorWrapper(string $update_text): string
-    {
-        return "<span class='ee-status-outline ee-status-bg--error'>$update_text</span>";
-    }
+	protected function errorWrapper(string $update_text): string
+	{
+		return "<span class='ee-status-outline ee-status-bg--error'>$update_text</span>";
+	}
 
 
-    protected function infoWrapper(string $update_text): string
-    {
-        return "<span class='ee-status-outline ee-status-bg--info'>$update_text</span>";
-    }
+	protected function infoWrapper(string $update_text): string
+	{
+		return "<span class='ee-status-outline ee-status-bg--info'>$update_text</span>";
+	}
 
 
-    protected function okWrapper(string $update_text): string
-    {
-        return "<span class='ee-status-outline ee-status-bg--ok'>$update_text</span>";
-    }
+	protected function okWrapper(string $update_text): string
+	{
+		return "<span class='ee-status-outline ee-status-bg--ok'>$update_text</span>";
+	}
 
 
-    protected function successWrapper(string $update_text): string
-    {
-        return "<span class='ee-status-outline ee-status-bg--success'>$update_text</span>";
-    }
+	protected function successWrapper(string $update_text): string
+	{
+		return "<span class='ee-status-outline ee-status-bg--success'>$update_text</span>";
+	}
 
 
-    protected function warningWrapper(string $update_text): string
-    {
-        return "<span class='ee-status-outline ee-status-bg--warning'>$update_text</span>";
-    }
+	protected function warningWrapper(string $update_text): string
+	{
+		return "<span class='ee-status-outline ee-status-bg--warning'>$update_text</span>";
+	}
 
 
-    /**
-     * @return string
-     */
-    protected function spinner(): string
-    {
-        return '<span class="spinner"></span>';
-    }
+	/**
+	 * @return string
+	 */
+	protected function spinner(): string
+	{
+		return '<span class="spinner"></span>';
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -132,7 +132,7 @@ 
      */
     public function getRequestData($key)
     {
-        return $this->request_data[ $key ] ?? null;
+        return $this->request_data[$key] ?? null;
     }
 
 
@@ -186,7 +186,7 @@ 
                         : esc_html__('processed this batch: %d', 'event_espresso'),
                 $processed
             )
-        ) . '
+        ).'
 			</div>';
     }
 
@@ -203,8 +203,8 @@ 
                             : esc_html__('total units processed: %d', 'event_espresso'),
                     $job_parameters->units_processed()
                 )
-            ) . '
-				' . $this->jobStatusNotice($job_parameters) . '
+            ).'
+				' . $this->jobStatusNotice($job_parameters).'
 			</div>';
         }
     }

core/domain/services/admin/events/data/ConfirmDeletion.php

Indentation +78 added lines, -78 removed lines

@@ -29,89 +29,89 @@
  */
 class ConfirmDeletion
 {
-    /**
-     * @var NodeGroupDao
-     */
-    private $dao;
+	/**
+	 * @var NodeGroupDao
+	 */
+	private $dao;
 
 
-    /**
-     * ConfirmDeletion constructor.
-     *
-     * @param NodeGroupDao $dao
-     */
-    public function __construct(NodeGroupDao $dao)
-    {
-        $this->dao = $dao;
-    }
+	/**
+	 * ConfirmDeletion constructor.
+	 *
+	 * @param NodeGroupDao $dao
+	 */
+	public function __construct(NodeGroupDao $dao)
+	{
+		$this->dao = $dao;
+	}
 
 
-    /**
-     * Redirects to the batch job for deleting events if the form submission is valid, otherwise back to the deletion
-     * preview page.
-     *
-     * @param $request_data
-     * @param $admin_base_url
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     * @throws UnexpectedEntityException
-     * @since 4.10.12.p
-     */
-    public function handle($request_data, $admin_base_url)
-    {
-        $deletion_job_code        =
-            isset($request_data['deletion_job_code']) ? sanitize_key($request_data['deletion_job_code']) : '';
-        $models_and_ids_to_delete = $this->dao->getModelsAndIdsFromGroup($deletion_job_code);
-        $form                     = new ConfirmEventDeletionForm($models_and_ids_to_delete['Event']);
-        // Initialize the form from the request, and check if its valid.
-        $form->receive_form_submission($request_data);
-        if ($form->is_valid()) {
-            // Redirect the user to the deletion batch job.
-            EEH_URL::safeRedirectAndExit(
-                EE_Admin_Page::add_query_args_and_nonce(
-                    [
-                        'page'              => EED_Batch::PAGE_SLUG,
-                        'batch'             => EED_Batch::batch_job,
-                        'deletion_job_code' => $deletion_job_code,
-                        'job_handler'       => urlencode('EventEspressoBatchRequest\JobHandlers\ExecuteBatchDeletion'),
-                        'return_url'        => urlencode(
-                            add_query_arg(
-                                [
-                                    'status' => 'trash',
-                                ],
-                                EVENTS_ADMIN_URL
-                            )
-                        ),
-                    ],
-                    admin_url()
-                )
-            );
-        }
-        // Dont' use $form->submission_error_message() because it adds the form input's label in front
-        // of each validation error which ends up looking quite confusing.
-        $validation_errors = $form->get_validation_errors_accumulated();
-        foreach ($validation_errors as $validation_error) {
-            EE_Error::add_error(
-                $validation_error->getMessage(),
-                __FILE__,
-                __FUNCTION__,
-                __LINE__
-            );
-        }
+	/**
+	 * Redirects to the batch job for deleting events if the form submission is valid, otherwise back to the deletion
+	 * preview page.
+	 *
+	 * @param $request_data
+	 * @param $admin_base_url
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 * @throws UnexpectedEntityException
+	 * @since 4.10.12.p
+	 */
+	public function handle($request_data, $admin_base_url)
+	{
+		$deletion_job_code        =
+			isset($request_data['deletion_job_code']) ? sanitize_key($request_data['deletion_job_code']) : '';
+		$models_and_ids_to_delete = $this->dao->getModelsAndIdsFromGroup($deletion_job_code);
+		$form                     = new ConfirmEventDeletionForm($models_and_ids_to_delete['Event']);
+		// Initialize the form from the request, and check if its valid.
+		$form->receive_form_submission($request_data);
+		if ($form->is_valid()) {
+			// Redirect the user to the deletion batch job.
+			EEH_URL::safeRedirectAndExit(
+				EE_Admin_Page::add_query_args_and_nonce(
+					[
+						'page'              => EED_Batch::PAGE_SLUG,
+						'batch'             => EED_Batch::batch_job,
+						'deletion_job_code' => $deletion_job_code,
+						'job_handler'       => urlencode('EventEspressoBatchRequest\JobHandlers\ExecuteBatchDeletion'),
+						'return_url'        => urlencode(
+							add_query_arg(
+								[
+									'status' => 'trash',
+								],
+								EVENTS_ADMIN_URL
+							)
+						),
+					],
+					admin_url()
+				)
+			);
+		}
+		// Dont' use $form->submission_error_message() because it adds the form input's label in front
+		// of each validation error which ends up looking quite confusing.
+		$validation_errors = $form->get_validation_errors_accumulated();
+		foreach ($validation_errors as $validation_error) {
+			EE_Error::add_error(
+				$validation_error->getMessage(),
+				__FILE__,
+				__FUNCTION__,
+				__LINE__
+			);
+		}
 
-        EEH_URL::safeRedirectAndExit(
-            EE_Admin_Page::add_query_args_and_nonce(
-                [
-                    'action'            => 'preview_deletion',
-                    'deletion_job_code' => $deletion_job_code,
-                ],
-                $admin_base_url
-            )
-        );
-    }
+		EEH_URL::safeRedirectAndExit(
+			EE_Admin_Page::add_query_args_and_nonce(
+				[
+					'action'            => 'preview_deletion',
+					'deletion_job_code' => $deletion_job_code,
+				],
+				$admin_base_url
+			)
+		);
+	}
 }
 // End of file ConfirmDeletion.php
 // Location: EventEspresso\core\domain\services\admin\events\data/ConfirmDeletion.php

core/domain/services/admin/events/data/PreviewDeletion.php

Indentation +108 added lines, -108 removed lines

@@ -30,121 +30,121 @@
  */
 class PreviewDeletion
 {
-    /**
-     * @var NodeGroupDao
-     */
-    protected $dao;
+	/**
+	 * @var NodeGroupDao
+	 */
+	protected $dao;
 
-    /**
-     * @var EEM_Event
-     */
-    protected $event_model;
+	/**
+	 * @var EEM_Event
+	 */
+	protected $event_model;
 
-    /**
-     * @var EEM_Datetime
-     */
-    protected $datetime_model;
+	/**
+	 * @var EEM_Datetime
+	 */
+	protected $datetime_model;
 
-    /**
-     * @var EEM_Registration
-     */
-    protected $registration_model;
+	/**
+	 * @var EEM_Registration
+	 */
+	protected $registration_model;
 
 
-    /**
-     * PreviewDeletion constructor.
-     *
-     * @param NodeGroupDao     $dao
-     * @param EEM_Event        $event_model
-     * @param EEM_Datetime     $datetime_model
-     * @param EEM_Registration $registration_model
-     */
-    public function __construct(
-        NodeGroupDao $dao,
-        EEM_Event $event_model,
-        EEM_Datetime $datetime_model,
-        EEM_Registration $registration_model
-    ) {
-        $this->dao                = $dao;
-        $this->event_model        = $event_model;
-        $this->datetime_model     = $datetime_model;
-        $this->registration_model = $registration_model;
-    }
+	/**
+	 * PreviewDeletion constructor.
+	 *
+	 * @param NodeGroupDao     $dao
+	 * @param EEM_Event        $event_model
+	 * @param EEM_Datetime     $datetime_model
+	 * @param EEM_Registration $registration_model
+	 */
+	public function __construct(
+		NodeGroupDao $dao,
+		EEM_Event $event_model,
+		EEM_Datetime $datetime_model,
+		EEM_Registration $registration_model
+	) {
+		$this->dao                = $dao;
+		$this->event_model        = $event_model;
+		$this->datetime_model     = $datetime_model;
+		$this->registration_model = $registration_model;
+	}
 
 
-    /**
-     * Renders the preview deletion page.
-     *
-     * @param array  $request_data
-     * @param string $admin_base_url
-     * @return array
-     * @throws UnexpectedEntityException
-     * @throws DomainException
-     * @throws EE_Error
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     * @since 4.10.12.p
-     */
-    public function handle(array $request_data, string $admin_base_url): array
-    {
-        $deletion_job_code        = isset($request_data['deletion_job_code'])
-            ? sanitize_key($request_data['deletion_job_code'])
-            : '';
-        $models_and_ids_to_delete = $this->dao->getModelsAndIdsFromGroup($deletion_job_code);
-        $event_ids                = $models_and_ids_to_delete['Event'] ?? [];
-        if (empty($event_ids) || ! is_array($event_ids)) {
-            throw new EE_Error(
-                esc_html__('No Events were found to delete.', 'event_espresso')
-            );
-        }
-        $datetime_ids = $models_and_ids_to_delete['Datetime'] ?? [];
-        if (! is_array($datetime_ids)) {
-            throw new UnexpectedEntityException($datetime_ids, 'array');
-        }
-        $registration_ids = $models_and_ids_to_delete['Registration'] ?? [];
-        if (! is_array($registration_ids)) {
-            throw new UnexpectedEntityException($registration_ids, 'array');
-        }
-        $num_registrations_to_show = 10;
-        $reg_count                 = count($registration_ids);
-        if ($reg_count > $num_registrations_to_show) {
-            $registration_ids = array_slice($registration_ids, 0, $num_registrations_to_show);
-        }
-        $form                  = new ConfirmEventDeletionForm($event_ids);
-        $events                = $this->event_model->get_all_deleted_and_undeleted(
-            [['EVT_ID' => ['IN', $event_ids]]]
-        );
-        $datetimes             = $this->datetime_model->get_all_deleted_and_undeleted(
-            [['DTT_ID' => ['IN', $datetime_ids]]]
-        );
-        $registrations         = $this->registration_model->get_all_deleted_and_undeleted(
-            [['REG_ID' => ['IN', $registration_ids]]]
-        );
-        $confirm_deletion_args = [
-            'action'            => 'confirm_deletion',
-            'deletion_job_code' => $deletion_job_code,
-        ];
-        return [
-            'admin_page_content' => EEH_Template::display_template(
-                EVENTS_TEMPLATE_PATH . 'event_preview_deletion.template.php',
-                [
-                    'form_url'                  => EE_Admin_Page::add_query_args_and_nonce(
-                        $confirm_deletion_args,
-                        $admin_base_url
-                    ),
-                    'form'                      => $form,
-                    'events'                    => $events,
-                    'datetimes'                 => $datetimes,
-                    'registrations'             => $registrations,
-                    'reg_count'                 => $reg_count,
-                    'num_registrations_to_show' => $num_registrations_to_show,
-                ],
-                true
-            ),
-        ];
-    }
+	/**
+	 * Renders the preview deletion page.
+	 *
+	 * @param array  $request_data
+	 * @param string $admin_base_url
+	 * @return array
+	 * @throws UnexpectedEntityException
+	 * @throws DomainException
+	 * @throws EE_Error
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 * @since 4.10.12.p
+	 */
+	public function handle(array $request_data, string $admin_base_url): array
+	{
+		$deletion_job_code        = isset($request_data['deletion_job_code'])
+			? sanitize_key($request_data['deletion_job_code'])
+			: '';
+		$models_and_ids_to_delete = $this->dao->getModelsAndIdsFromGroup($deletion_job_code);
+		$event_ids                = $models_and_ids_to_delete['Event'] ?? [];
+		if (empty($event_ids) || ! is_array($event_ids)) {
+			throw new EE_Error(
+				esc_html__('No Events were found to delete.', 'event_espresso')
+			);
+		}
+		$datetime_ids = $models_and_ids_to_delete['Datetime'] ?? [];
+		if (! is_array($datetime_ids)) {
+			throw new UnexpectedEntityException($datetime_ids, 'array');
+		}
+		$registration_ids = $models_and_ids_to_delete['Registration'] ?? [];
+		if (! is_array($registration_ids)) {
+			throw new UnexpectedEntityException($registration_ids, 'array');
+		}
+		$num_registrations_to_show = 10;
+		$reg_count                 = count($registration_ids);
+		if ($reg_count > $num_registrations_to_show) {
+			$registration_ids = array_slice($registration_ids, 0, $num_registrations_to_show);
+		}
+		$form                  = new ConfirmEventDeletionForm($event_ids);
+		$events                = $this->event_model->get_all_deleted_and_undeleted(
+			[['EVT_ID' => ['IN', $event_ids]]]
+		);
+		$datetimes             = $this->datetime_model->get_all_deleted_and_undeleted(
+			[['DTT_ID' => ['IN', $datetime_ids]]]
+		);
+		$registrations         = $this->registration_model->get_all_deleted_and_undeleted(
+			[['REG_ID' => ['IN', $registration_ids]]]
+		);
+		$confirm_deletion_args = [
+			'action'            => 'confirm_deletion',
+			'deletion_job_code' => $deletion_job_code,
+		];
+		return [
+			'admin_page_content' => EEH_Template::display_template(
+				EVENTS_TEMPLATE_PATH . 'event_preview_deletion.template.php',
+				[
+					'form_url'                  => EE_Admin_Page::add_query_args_and_nonce(
+						$confirm_deletion_args,
+						$admin_base_url
+					),
+					'form'                      => $form,
+					'events'                    => $events,
+					'datetimes'                 => $datetimes,
+					'registrations'             => $registrations,
+					'reg_count'                 => $reg_count,
+					'num_registrations_to_show' => $num_registrations_to_show,
+				],
+				true
+			),
+		];
+	}
 }
 // End of file PreviewDeletion.php
 // Location: EventEspresso\core\domain\services\admin\events\data/PreviewDeletion.php

Spacing +3 added lines, -3 removed lines

@@ -100,11 +100,11 @@ 
             );
         }
         $datetime_ids = $models_and_ids_to_delete['Datetime'] ?? [];
-        if (! is_array($datetime_ids)) {
+        if ( ! is_array($datetime_ids)) {
             throw new UnexpectedEntityException($datetime_ids, 'array');
         }
         $registration_ids = $models_and_ids_to_delete['Registration'] ?? [];
-        if (! is_array($registration_ids)) {
+        if ( ! is_array($registration_ids)) {
             throw new UnexpectedEntityException($registration_ids, 'array');
         }
         $num_registrations_to_show = 10;
@@ -128,7 +128,7 @@ 
         ];
         return [
             'admin_page_content' => EEH_Template::display_template(
-                EVENTS_TEMPLATE_PATH . 'event_preview_deletion.template.php',
+                EVENTS_TEMPLATE_PATH.'event_preview_deletion.template.php',
                 [
                     'form_url'                  => EE_Admin_Page::add_query_args_and_nonce(
                         $confirm_deletion_args,

admin_pages/events/form_sections/ConfirmEventDeletionForm.php

Indentation +64 added lines, -64 removed lines

@@ -25,67 +25,67 @@ 
  */
 class ConfirmEventDeletionForm extends EE_Form_Section_Proper
 {
-    /**
-     * @throws ReflectionException
-     * @throws EE_Error
-     */
-    public function __construct($event_ids, $options_array = array())
-    {
-        if (! isset($options_array['subsections'])) {
-            $options_array['subsections'] = [];
-        }
-        if (
-            ! (
-                isset($options_array['subsections']['events'])
-                && $options_array['subsections']['events'] instanceof EE_Form_Section_Proper
-            )
-        ) {
-            $options_array['subsections']['events'] = new EE_Form_Section_Proper();
-        }
-        $events_subsection = $options_array['subsections']['events'];
-        $events = EEM_Event::instance()->get_all_deleted_and_undeleted(
-            [
-                [
-                    'EVT_ID' => ['IN',$event_ids]
-                ]
-            ]
-        );
-        if (! is_array($events)) {
-            throw new UnexpectedEntityException($event_ids, 'array');
-        }
-        $events_inputs = [];
-        foreach ($events as $event) {
-            if ($event instanceof EE_Event) {
-                $events_inputs[ $event->ID() ] = new EE_Checkbox_Multi_Input(
-                    [
-                        'yes' => $event->name(),
-                    ],
-                    [
-                        'html_label_text' => esc_html__('Please confirm you wish to delete:', 'event_espresso'),
-                        'required'        => true
-                    ]
-                );
-            }
-        }
-        $events_subsection->add_subsections($events_inputs);
-        $options_array['subsections']['backup'] = new EE_Checkbox_Multi_Input(
-            [
-                'yes' => esc_html__('I have backed up my database.', 'event_espresso')
-            ],
-            [
-                'html_label_text' => esc_html__('Deleting this data cannot be undone. Please confirm you have a usable database backup.', 'event_espresso'),
-                'required' => true
-            ]
-        );
-        $events_list_url = EE_Admin_Page::add_query_args_and_nonce(
-            [
-                'status' => 'trash',
-                'return' => 'default',
-            ],
-            EVENTS_ADMIN_URL
-        );
-        $options_array['subsections']['buttons'] = new EE_Form_Section_HTML(
-            "
+	/**
+	 * @throws ReflectionException
+	 * @throws EE_Error
+	 */
+	public function __construct($event_ids, $options_array = array())
+	{
+		if (! isset($options_array['subsections'])) {
+			$options_array['subsections'] = [];
+		}
+		if (
+			! (
+				isset($options_array['subsections']['events'])
+				&& $options_array['subsections']['events'] instanceof EE_Form_Section_Proper
+			)
+		) {
+			$options_array['subsections']['events'] = new EE_Form_Section_Proper();
+		}
+		$events_subsection = $options_array['subsections']['events'];
+		$events = EEM_Event::instance()->get_all_deleted_and_undeleted(
+			[
+				[
+					'EVT_ID' => ['IN',$event_ids]
+				]
+			]
+		);
+		if (! is_array($events)) {
+			throw new UnexpectedEntityException($event_ids, 'array');
+		}
+		$events_inputs = [];
+		foreach ($events as $event) {
+			if ($event instanceof EE_Event) {
+				$events_inputs[ $event->ID() ] = new EE_Checkbox_Multi_Input(
+					[
+						'yes' => $event->name(),
+					],
+					[
+						'html_label_text' => esc_html__('Please confirm you wish to delete:', 'event_espresso'),
+						'required'        => true
+					]
+				);
+			}
+		}
+		$events_subsection->add_subsections($events_inputs);
+		$options_array['subsections']['backup'] = new EE_Checkbox_Multi_Input(
+			[
+				'yes' => esc_html__('I have backed up my database.', 'event_espresso')
+			],
+			[
+				'html_label_text' => esc_html__('Deleting this data cannot be undone. Please confirm you have a usable database backup.', 'event_espresso'),
+				'required' => true
+			]
+		);
+		$events_list_url = EE_Admin_Page::add_query_args_and_nonce(
+			[
+				'status' => 'trash',
+				'return' => 'default',
+			],
+			EVENTS_ADMIN_URL
+		);
+		$options_array['subsections']['buttons'] = new EE_Form_Section_HTML(
+			"
         <div class='ee-admin-button-row ee-admin-button-row--align-start'>
             <input type='submit' 
                    class='button button--primary' 
@@ -95,9 +95,9 @@ 
                 " . esc_html__('Cancel', 'event_espresso') . "
             </a>
         </div>"
-        );
-        parent::__construct($options_array);
-    }
+		);
+		parent::__construct($options_array);
+	}
 }
 // End of file ConfirmEventDeletionForm.php
 // Location: EventEspresso\admin_pages\events\form_sections/ConfirmEventDeletionForm.php

Spacing +7 added lines, -7 removed lines

@@ -31,7 +31,7 @@ 
      */
     public function __construct($event_ids, $options_array = array())
     {
-        if (! isset($options_array['subsections'])) {
+        if ( ! isset($options_array['subsections'])) {
             $options_array['subsections'] = [];
         }
         if (
@@ -46,17 +46,17 @@ 
         $events = EEM_Event::instance()->get_all_deleted_and_undeleted(
             [
                 [
-                    'EVT_ID' => ['IN',$event_ids]
+                    'EVT_ID' => ['IN', $event_ids]
                 ]
             ]
         );
-        if (! is_array($events)) {
+        if ( ! is_array($events)) {
             throw new UnexpectedEntityException($event_ids, 'array');
         }
         $events_inputs = [];
         foreach ($events as $event) {
             if ($event instanceof EE_Event) {
-                $events_inputs[ $event->ID() ] = new EE_Checkbox_Multi_Input(
+                $events_inputs[$event->ID()] = new EE_Checkbox_Multi_Input(
                     [
                         'yes' => $event->name(),
                     ],
@@ -89,10 +89,10 @@ 
         <div class='ee-admin-button-row ee-admin-button-row--align-start'>
             <input type='submit' 
                    class='button button--primary' 
-                   value='" . esc_attr__('Confirm', 'event_espresso') . "'
+                   value='" . esc_attr__('Confirm', 'event_espresso')."'
             />
-            <a href='" . esc_url_raw($events_list_url) . ";' class='button button--secondary'>
-                " . esc_html__('Cancel', 'event_espresso') . "
+            <a href='" . esc_url_raw($events_list_url).";' class='button button--secondary'>
+                " . esc_html__('Cancel', 'event_espresso')."
             </a>
         </div>"
         );