eventespresso / event-espresso-core

core/domain/services/admin/registrations/list_table/QueryBuilder.php

Spacing +9 added lines, -9 removed lines

@@ -82,7 +82,7 @@ 
             'caps'                     => EEM_Registration::caps_read_admin,
             'default_where_conditions' => 'this_model_only',
         ];
-        if (! $count_query) {
+        if ( ! $count_query) {
             $query_params = array_merge(
                 $query_params,
                 $this->getOrderbyClause(),
@@ -228,12 +228,12 @@ 
                 [
                     $this->registration_model->convert_datetime_for_query(
                         'REG_date',
-                        $now . ' 00:00:00',
+                        $now.' 00:00:00',
                         'Y-m-d H:i:s'
                     ),
                     $this->registration_model->convert_datetime_for_query(
                         'REG_date',
-                        $now . ' 23:59:59',
+                        $now.' 23:59:59',
                         'Y-m-d H:i:s'
                     ),
                 ],
@@ -248,12 +248,12 @@ 
                 [
                     $this->registration_model->convert_datetime_for_query(
                         'REG_date',
-                        $current_year_and_month . '-01 00:00:00',
+                        $current_year_and_month.'-01 00:00:00',
                         'Y-m-d H:i:s'
                     ),
                     $this->registration_model->convert_datetime_for_query(
                         'REG_date',
-                        $current_year_and_month . '-' . $days_this_month . ' 23:59:59',
+                        $current_year_and_month.'-'.$days_this_month.' 23:59:59',
                         'Y-m-d H:i:s'
                     ),
                 ],
@@ -272,18 +272,18 @@ 
                 : '';
             // if there is not a month or year then we can't go further
             if ($month_requested && $year_requested) {
-                $days_in_month = date('t', strtotime($year_requested . '-' . $month_requested . '-' . '01'));
+                $days_in_month = date('t', strtotime($year_requested.'-'.$month_requested.'-'.'01'));
                 $this->where_params['REG_date'] = [
                     'BETWEEN',
                     [
                         $this->registration_model->convert_datetime_for_query(
                             'REG_date',
-                            $year_requested . '-' . $month_requested . '-01 00:00:00',
+                            $year_requested.'-'.$month_requested.'-01 00:00:00',
                             'Y-m-d H:i:s'
                         ),
                         $this->registration_model->convert_datetime_for_query(
                             'REG_date',
-                            $year_requested . '-' . $month_requested . '-' . $days_in_month . ' 23:59:59',
+                            $year_requested.'-'.$month_requested.'-'.$days_in_month.' 23:59:59',
                             'Y-m-d H:i:s'
                         ),
                     ],
@@ -300,7 +300,7 @@ 
     {
         $search = $this->request->getRequestParam('s');
         if ($search) {
-            $search_string = '%' . sanitize_text_field($search) . '%';
+            $search_string = '%'.sanitize_text_field($search).'%';
             $this->where_params['OR*search_conditions'] = [
                 'Event.EVT_name'                          => ['LIKE', $search_string],
                 'Event.EVT_desc'                          => ['LIKE', $search_string],

Indentation +378 added lines, -378 removed lines

@@ -20,382 +20,382 @@
  */
 class QueryBuilder
 {
-    /**
-     * @var RequestInterface $request
-     */
-    protected $request;
-
-    /**
-     * @var EEM_Registration $registration_model
-     */
-    protected $registration_model;
-
-    /**
-     * @var string $view
-     */
-    protected $view;
-
-    /**
-     * @var array $where_params
-     */
-    protected $where_params;
-
-
-    /**
-     * QueryBuilder constructor.
-     *
-     * @param RequestInterface $request
-     * @param EEM_Registration $registration_model
-     * @param array            $extra_request_params
-     */
-    public function __construct(
-        RequestInterface $request,
-        EEM_Registration $registration_model,
-        array $extra_request_params = []
-    ) {
-        $this->request = $request;
-        $this->registration_model = $registration_model;
-        foreach ($extra_request_params as $key => $value) {
-            $this->request->setRequestParam($key, $value);
-        }
-        $this->view = $this->request->getRequestParam('status', '');
-        $this->where_params = [];
-    }
-
-
-    /**
-     * Sets up the where conditions for the registrations query.
-     *
-     * @param int  $per_page
-     * @param bool $count_query
-     * @return array
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function getQueryParams($per_page = 10, $count_query = false)
-    {
-        $query_params = [
-            0                          => $this->getWhereClause(),
-            'caps'                     => EEM_Registration::caps_read_admin,
-            'default_where_conditions' => 'this_model_only',
-        ];
-        if (! $count_query) {
-            $query_params = array_merge(
-                $query_params,
-                $this->getOrderbyClause(),
-                $this->getLimitClause($per_page)
-            );
-        }
-
-        return $query_params;
-    }
-
-
-    /**
-     * Sets up the where conditions for the registrations query.
-     *
-     * @return array
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    protected function getWhereClause()
-    {
-        $this->addAttendeeIdToWhereConditions();
-        $this->addEventIdToWhereConditions();
-        $this->addCategoryIdToWhereConditions();
-        $this->addDatetimeIdToWhereConditions();
-        $this->addTicketIdToWhereConditions();
-        $this->addRegistrationStatusToWhereConditions();
-        $this->addDateToWhereConditions();
-        $this->addSearchToWhereConditions();
-        return apply_filters(
-            'FHEE__Registrations_Admin_Page___get_where_conditions_for_registrations_query',
-            $this->where_params,
-            $this->request->requestParams()
-        );
-    }
-
-
-    /**
-     * This will add ATT_ID to the provided $this->where_clause array for EE model query parameters.
-     */
-    protected function addAttendeeIdToWhereConditions()
-    {
-        $ATT_ID = $this->request->getRequestParam('attendee_id');
-        $ATT_ID = $this->request->getRequestParam('ATT_ID', $ATT_ID, 'int');
-        if ($ATT_ID) {
-            $this->where_params['ATT_ID'] = $ATT_ID;
-        }
-    }
-
-
-    /**
-     * This will add EVT_ID to the provided $this->where_clause array for EE model query parameters.
-     */
-    protected function addEventIdToWhereConditions()
-    {
-        $EVT_ID = $this->request->getRequestParam('event_id');
-        $EVT_ID = $this->request->getRequestParam('EVT_ID', $EVT_ID, 'int');
-        if ($EVT_ID) {
-            $this->where_params['EVT_ID'] = $EVT_ID;
-        }
-    }
-
-
-    /**
-     * Adds category ID if it exists in the request to the where conditions for the registrations query.
-     */
-    protected function addCategoryIdToWhereConditions()
-    {
-        $EVT_CAT = (int) $this->request->getRequestParam('EVT_CAT', 0, 'int');
-        if ($EVT_CAT > 0) {
-            $this->where_params['Event.Term_Taxonomy.term_id'] = $EVT_CAT;
-        }
-    }
-
-
-    /**
-     * Adds the datetime ID if it exists in the request to the where conditions for the registrations query.
-     */
-    protected function addDatetimeIdToWhereConditions()
-    {
-        // first look for 'datetime_id' then 'DTT_ID' using first result as fallback default value
-        $DTT_ID = $this->request->getRequestParam('datetime_id');
-        $DTT_ID = $this->request->getRequestParam('DTT_ID', $DTT_ID, 'int');
-        if ($DTT_ID) {
-            $this->where_params['Ticket.Datetime.DTT_ID'] = $DTT_ID;
-        }
-    }
-
-
-    /**
-     * Adds the ticket ID if it exists in the request to the where conditions for the registrations query.
-     */
-    protected function addTicketIdToWhereConditions()
-    {
-        // first look for 'ticket_id' then 'TKT_ID' using first result as fallback default value
-        $TKT_ID = $this->request->getRequestParam('ticket_id');
-        $TKT_ID = $this->request->getRequestParam('TKT_ID', $TKT_ID, 'int');
-        if ($TKT_ID) {
-            $this->where_params['TKT_ID'] = $TKT_ID;
-        }
-    }
-
-
-    /**
-     * Adds the correct registration status to the where conditions for the registrations query.
-     * If filtering by registration status, then we show registrations matching that status.
-     * If not filtering by specified status, then we show all registrations excluding incomplete registrations
-     * UNLESS viewing trashed registrations.
-     */
-    protected function addRegistrationStatusToWhereConditions()
-    {
-        $registration_status = $this->request->getRequestParam('_reg_status');
-        if ($registration_status) {
-            $this->where_params['STS_ID'] = sanitize_text_field($registration_status);
-            return;
-        }
-        // make sure we exclude incomplete registrations, but only if not trashed.
-        if ($this->view === 'trash') {
-            $this->where_params['REG_deleted'] = true;
-            return;
-        }
-        $this->where_params['STS_ID'] = $this->view === 'incomplete'
-            ? EEM_Registration::status_id_incomplete
-            : ['!=', EEM_Registration::status_id_incomplete];
-    }
-
-
-    /**
-     * Adds any provided date restraints to the where conditions for the registrations query.
-     *
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    protected function addDateToWhereConditions()
-    {
-        if ($this->view === 'today') {
-            $now = date('Y-m-d', current_time('timestamp'));
-            $this->where_params['REG_date'] = [
-                'BETWEEN',
-                [
-                    $this->registration_model->convert_datetime_for_query(
-                        'REG_date',
-                        $now . ' 00:00:00',
-                        'Y-m-d H:i:s'
-                    ),
-                    $this->registration_model->convert_datetime_for_query(
-                        'REG_date',
-                        $now . ' 23:59:59',
-                        'Y-m-d H:i:s'
-                    ),
-                ],
-            ];
-            return;
-        }
-        if ($this->view === 'month') {
-            $current_year_and_month = date('Y-m', current_time('timestamp'));
-            $days_this_month = date('t', current_time('timestamp'));
-            $this->where_params['REG_date'] = [
-                'BETWEEN',
-                [
-                    $this->registration_model->convert_datetime_for_query(
-                        'REG_date',
-                        $current_year_and_month . '-01 00:00:00',
-                        'Y-m-d H:i:s'
-                    ),
-                    $this->registration_model->convert_datetime_for_query(
-                        'REG_date',
-                        $current_year_and_month . '-' . $days_this_month . ' 23:59:59',
-                        'Y-m-d H:i:s'
-                    ),
-                ],
-            ];
-            return;
-        }
-        $month_range = $this->request->getRequestParam('month_range');
-        if ($month_range) {
-            $month_range = sanitize_text_field($month_range);
-            $pieces = explode(' ', $month_range, 3);
-            $month_requested = ! empty($pieces[0])
-                ? date('m', EEH_DTT_Helper::first_of_month_timestamp($pieces[0]))
-                : '';
-            $year_requested = ! empty($pieces[1])
-                ? $pieces[1]
-                : '';
-            // if there is not a month or year then we can't go further
-            if ($month_requested && $year_requested) {
-                $days_in_month = date('t', strtotime($year_requested . '-' . $month_requested . '-' . '01'));
-                $this->where_params['REG_date'] = [
-                    'BETWEEN',
-                    [
-                        $this->registration_model->convert_datetime_for_query(
-                            'REG_date',
-                            $year_requested . '-' . $month_requested . '-01 00:00:00',
-                            'Y-m-d H:i:s'
-                        ),
-                        $this->registration_model->convert_datetime_for_query(
-                            'REG_date',
-                            $year_requested . '-' . $month_requested . '-' . $days_in_month . ' 23:59:59',
-                            'Y-m-d H:i:s'
-                        ),
-                    ],
-                ];
-            }
-        }
-    }
-
-
-    /**
-     * Adds any provided search restraints to the where conditions for the registrations query
-     */
-    protected function addSearchToWhereConditions()
-    {
-        $search = $this->request->getRequestParam('s');
-        if ($search) {
-            $search_string = '%' . sanitize_text_field($search) . '%';
-            $this->where_params['OR*search_conditions'] = [
-                'Event.EVT_name'                          => ['LIKE', $search_string],
-                'Event.EVT_desc'                          => ['LIKE', $search_string],
-                'Event.EVT_short_desc'                    => ['LIKE', $search_string],
-                'Attendee.ATT_full_name'                  => ['LIKE', $search_string],
-                'Attendee.ATT_fname'                      => ['LIKE', $search_string],
-                'Attendee.ATT_lname'                      => ['LIKE', $search_string],
-                'Attendee.ATT_short_bio'                  => ['LIKE', $search_string],
-                'Attendee.ATT_email'                      => ['LIKE', $search_string],
-                'Attendee.ATT_address'                    => ['LIKE', $search_string],
-                'Attendee.ATT_address2'                   => ['LIKE', $search_string],
-                'Attendee.ATT_city'                       => ['LIKE', $search_string],
-                'REG_final_price'                         => ['LIKE', $search_string],
-                'REG_code'                                => ['LIKE', $search_string],
-                'REG_count'                               => ['LIKE', $search_string],
-                'REG_group_size'                          => ['LIKE', $search_string],
-                'Ticket.TKT_name'                         => ['LIKE', $search_string],
-                'Ticket.TKT_description'                  => ['LIKE', $search_string],
-                'Transaction.Payment.PAY_txn_id_chq_nmbr' => ['LIKE', $search_string],
-            ];
-        }
-    }
-
-
-    /**
-     * Sets up the orderby for the registrations query.
-     *
-     * @return array
-     */
-    protected function getOrderbyClause()
-    {
-        $orderby_field = $this->request->getRequestParam('orderby');
-        $orderby_field = $orderby_field ? sanitize_text_field($orderby_field) : '_REG_date';
-        switch ($orderby_field) {
-            case '_REG_ID':
-                $orderby = ['REG_ID'];
-                break;
-            case '_Reg_status':
-                $orderby = ['STS_ID'];
-                break;
-            case 'ATT_fname':
-                $orderby = ['Attendee.ATT_fname', 'Attendee.ATT_lname'];
-                break;
-            case 'ATT_lname':
-                $orderby = ['Attendee.ATT_lname', 'Attendee.ATT_fname'];
-                break;
-            case 'event_name':
-                $orderby = ['Event.EVT_name'];
-                break;
-            case 'DTT_EVT_start':
-                $orderby = ['Event.Datetime.DTT_EVT_start'];
-                break;
-            case '_REG_date':
-                $orderby = ['REG_date'];
-                break;
-            default:
-                $orderby = [$orderby_field];
-                break;
-        }
-        $order = $this->request->getRequestParam('order');
-        $order = $order ? sanitize_text_field($order) : 'DESC';
-
-        $orderby = array_combine(
-            $orderby,
-            array_fill(0, count($orderby), $order)
-        );
-        // because there are many registrations with the same date, define
-        // a secondary way to order them, otherwise MySQL seems to be a bit random
-        if (empty($orderby['REG_ID'])) {
-            $orderby['REG_ID'] = $order;
-        }
-
-        $orderby = apply_filters(
-            'FHEE__Registrations_Admin_Page___get_orderby_for_registrations_query',
-            $orderby,
-            $this->request->requestParams()
-        );
-        return ['order_by' => $orderby];
-    }
-
-
-    /**
-     * Sets up the limit for the registrations query.
-     *
-     * @param $per_page
-     * @return array
-     */
-    protected function getLimitClause($per_page)
-    {
-        $current_page = $this->request->getRequestParam('paged', 1, 'int');
-        $per_page = $this->request->getRequestParam('perpage', $per_page, 'int');
-        // -1 means return all results so get out if that's set.
-        if ($per_page === -1) {
-            return [];
-        }
-        $offset = ($current_page - 1) * $per_page;
-        return ['limit' => [$offset, $per_page]];
-    }
+	/**
+	 * @var RequestInterface $request
+	 */
+	protected $request;
+
+	/**
+	 * @var EEM_Registration $registration_model
+	 */
+	protected $registration_model;
+
+	/**
+	 * @var string $view
+	 */
+	protected $view;
+
+	/**
+	 * @var array $where_params
+	 */
+	protected $where_params;
+
+
+	/**
+	 * QueryBuilder constructor.
+	 *
+	 * @param RequestInterface $request
+	 * @param EEM_Registration $registration_model
+	 * @param array            $extra_request_params
+	 */
+	public function __construct(
+		RequestInterface $request,
+		EEM_Registration $registration_model,
+		array $extra_request_params = []
+	) {
+		$this->request = $request;
+		$this->registration_model = $registration_model;
+		foreach ($extra_request_params as $key => $value) {
+			$this->request->setRequestParam($key, $value);
+		}
+		$this->view = $this->request->getRequestParam('status', '');
+		$this->where_params = [];
+	}
+
+
+	/**
+	 * Sets up the where conditions for the registrations query.
+	 *
+	 * @param int  $per_page
+	 * @param bool $count_query
+	 * @return array
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function getQueryParams($per_page = 10, $count_query = false)
+	{
+		$query_params = [
+			0                          => $this->getWhereClause(),
+			'caps'                     => EEM_Registration::caps_read_admin,
+			'default_where_conditions' => 'this_model_only',
+		];
+		if (! $count_query) {
+			$query_params = array_merge(
+				$query_params,
+				$this->getOrderbyClause(),
+				$this->getLimitClause($per_page)
+			);
+		}
+
+		return $query_params;
+	}
+
+
+	/**
+	 * Sets up the where conditions for the registrations query.
+	 *
+	 * @return array
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	protected function getWhereClause()
+	{
+		$this->addAttendeeIdToWhereConditions();
+		$this->addEventIdToWhereConditions();
+		$this->addCategoryIdToWhereConditions();
+		$this->addDatetimeIdToWhereConditions();
+		$this->addTicketIdToWhereConditions();
+		$this->addRegistrationStatusToWhereConditions();
+		$this->addDateToWhereConditions();
+		$this->addSearchToWhereConditions();
+		return apply_filters(
+			'FHEE__Registrations_Admin_Page___get_where_conditions_for_registrations_query',
+			$this->where_params,
+			$this->request->requestParams()
+		);
+	}
+
+
+	/**
+	 * This will add ATT_ID to the provided $this->where_clause array for EE model query parameters.
+	 */
+	protected function addAttendeeIdToWhereConditions()
+	{
+		$ATT_ID = $this->request->getRequestParam('attendee_id');
+		$ATT_ID = $this->request->getRequestParam('ATT_ID', $ATT_ID, 'int');
+		if ($ATT_ID) {
+			$this->where_params['ATT_ID'] = $ATT_ID;
+		}
+	}
+
+
+	/**
+	 * This will add EVT_ID to the provided $this->where_clause array for EE model query parameters.
+	 */
+	protected function addEventIdToWhereConditions()
+	{
+		$EVT_ID = $this->request->getRequestParam('event_id');
+		$EVT_ID = $this->request->getRequestParam('EVT_ID', $EVT_ID, 'int');
+		if ($EVT_ID) {
+			$this->where_params['EVT_ID'] = $EVT_ID;
+		}
+	}
+
+
+	/**
+	 * Adds category ID if it exists in the request to the where conditions for the registrations query.
+	 */
+	protected function addCategoryIdToWhereConditions()
+	{
+		$EVT_CAT = (int) $this->request->getRequestParam('EVT_CAT', 0, 'int');
+		if ($EVT_CAT > 0) {
+			$this->where_params['Event.Term_Taxonomy.term_id'] = $EVT_CAT;
+		}
+	}
+
+
+	/**
+	 * Adds the datetime ID if it exists in the request to the where conditions for the registrations query.
+	 */
+	protected function addDatetimeIdToWhereConditions()
+	{
+		// first look for 'datetime_id' then 'DTT_ID' using first result as fallback default value
+		$DTT_ID = $this->request->getRequestParam('datetime_id');
+		$DTT_ID = $this->request->getRequestParam('DTT_ID', $DTT_ID, 'int');
+		if ($DTT_ID) {
+			$this->where_params['Ticket.Datetime.DTT_ID'] = $DTT_ID;
+		}
+	}
+
+
+	/**
+	 * Adds the ticket ID if it exists in the request to the where conditions for the registrations query.
+	 */
+	protected function addTicketIdToWhereConditions()
+	{
+		// first look for 'ticket_id' then 'TKT_ID' using first result as fallback default value
+		$TKT_ID = $this->request->getRequestParam('ticket_id');
+		$TKT_ID = $this->request->getRequestParam('TKT_ID', $TKT_ID, 'int');
+		if ($TKT_ID) {
+			$this->where_params['TKT_ID'] = $TKT_ID;
+		}
+	}
+
+
+	/**
+	 * Adds the correct registration status to the where conditions for the registrations query.
+	 * If filtering by registration status, then we show registrations matching that status.
+	 * If not filtering by specified status, then we show all registrations excluding incomplete registrations
+	 * UNLESS viewing trashed registrations.
+	 */
+	protected function addRegistrationStatusToWhereConditions()
+	{
+		$registration_status = $this->request->getRequestParam('_reg_status');
+		if ($registration_status) {
+			$this->where_params['STS_ID'] = sanitize_text_field($registration_status);
+			return;
+		}
+		// make sure we exclude incomplete registrations, but only if not trashed.
+		if ($this->view === 'trash') {
+			$this->where_params['REG_deleted'] = true;
+			return;
+		}
+		$this->where_params['STS_ID'] = $this->view === 'incomplete'
+			? EEM_Registration::status_id_incomplete
+			: ['!=', EEM_Registration::status_id_incomplete];
+	}
+
+
+	/**
+	 * Adds any provided date restraints to the where conditions for the registrations query.
+	 *
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	protected function addDateToWhereConditions()
+	{
+		if ($this->view === 'today') {
+			$now = date('Y-m-d', current_time('timestamp'));
+			$this->where_params['REG_date'] = [
+				'BETWEEN',
+				[
+					$this->registration_model->convert_datetime_for_query(
+						'REG_date',
+						$now . ' 00:00:00',
+						'Y-m-d H:i:s'
+					),
+					$this->registration_model->convert_datetime_for_query(
+						'REG_date',
+						$now . ' 23:59:59',
+						'Y-m-d H:i:s'
+					),
+				],
+			];
+			return;
+		}
+		if ($this->view === 'month') {
+			$current_year_and_month = date('Y-m', current_time('timestamp'));
+			$days_this_month = date('t', current_time('timestamp'));
+			$this->where_params['REG_date'] = [
+				'BETWEEN',
+				[
+					$this->registration_model->convert_datetime_for_query(
+						'REG_date',
+						$current_year_and_month . '-01 00:00:00',
+						'Y-m-d H:i:s'
+					),
+					$this->registration_model->convert_datetime_for_query(
+						'REG_date',
+						$current_year_and_month . '-' . $days_this_month . ' 23:59:59',
+						'Y-m-d H:i:s'
+					),
+				],
+			];
+			return;
+		}
+		$month_range = $this->request->getRequestParam('month_range');
+		if ($month_range) {
+			$month_range = sanitize_text_field($month_range);
+			$pieces = explode(' ', $month_range, 3);
+			$month_requested = ! empty($pieces[0])
+				? date('m', EEH_DTT_Helper::first_of_month_timestamp($pieces[0]))
+				: '';
+			$year_requested = ! empty($pieces[1])
+				? $pieces[1]
+				: '';
+			// if there is not a month or year then we can't go further
+			if ($month_requested && $year_requested) {
+				$days_in_month = date('t', strtotime($year_requested . '-' . $month_requested . '-' . '01'));
+				$this->where_params['REG_date'] = [
+					'BETWEEN',
+					[
+						$this->registration_model->convert_datetime_for_query(
+							'REG_date',
+							$year_requested . '-' . $month_requested . '-01 00:00:00',
+							'Y-m-d H:i:s'
+						),
+						$this->registration_model->convert_datetime_for_query(
+							'REG_date',
+							$year_requested . '-' . $month_requested . '-' . $days_in_month . ' 23:59:59',
+							'Y-m-d H:i:s'
+						),
+					],
+				];
+			}
+		}
+	}
+
+
+	/**
+	 * Adds any provided search restraints to the where conditions for the registrations query
+	 */
+	protected function addSearchToWhereConditions()
+	{
+		$search = $this->request->getRequestParam('s');
+		if ($search) {
+			$search_string = '%' . sanitize_text_field($search) . '%';
+			$this->where_params['OR*search_conditions'] = [
+				'Event.EVT_name'                          => ['LIKE', $search_string],
+				'Event.EVT_desc'                          => ['LIKE', $search_string],
+				'Event.EVT_short_desc'                    => ['LIKE', $search_string],
+				'Attendee.ATT_full_name'                  => ['LIKE', $search_string],
+				'Attendee.ATT_fname'                      => ['LIKE', $search_string],
+				'Attendee.ATT_lname'                      => ['LIKE', $search_string],
+				'Attendee.ATT_short_bio'                  => ['LIKE', $search_string],
+				'Attendee.ATT_email'                      => ['LIKE', $search_string],
+				'Attendee.ATT_address'                    => ['LIKE', $search_string],
+				'Attendee.ATT_address2'                   => ['LIKE', $search_string],
+				'Attendee.ATT_city'                       => ['LIKE', $search_string],
+				'REG_final_price'                         => ['LIKE', $search_string],
+				'REG_code'                                => ['LIKE', $search_string],
+				'REG_count'                               => ['LIKE', $search_string],
+				'REG_group_size'                          => ['LIKE', $search_string],
+				'Ticket.TKT_name'                         => ['LIKE', $search_string],
+				'Ticket.TKT_description'                  => ['LIKE', $search_string],
+				'Transaction.Payment.PAY_txn_id_chq_nmbr' => ['LIKE', $search_string],
+			];
+		}
+	}
+
+
+	/**
+	 * Sets up the orderby for the registrations query.
+	 *
+	 * @return array
+	 */
+	protected function getOrderbyClause()
+	{
+		$orderby_field = $this->request->getRequestParam('orderby');
+		$orderby_field = $orderby_field ? sanitize_text_field($orderby_field) : '_REG_date';
+		switch ($orderby_field) {
+			case '_REG_ID':
+				$orderby = ['REG_ID'];
+				break;
+			case '_Reg_status':
+				$orderby = ['STS_ID'];
+				break;
+			case 'ATT_fname':
+				$orderby = ['Attendee.ATT_fname', 'Attendee.ATT_lname'];
+				break;
+			case 'ATT_lname':
+				$orderby = ['Attendee.ATT_lname', 'Attendee.ATT_fname'];
+				break;
+			case 'event_name':
+				$orderby = ['Event.EVT_name'];
+				break;
+			case 'DTT_EVT_start':
+				$orderby = ['Event.Datetime.DTT_EVT_start'];
+				break;
+			case '_REG_date':
+				$orderby = ['REG_date'];
+				break;
+			default:
+				$orderby = [$orderby_field];
+				break;
+		}
+		$order = $this->request->getRequestParam('order');
+		$order = $order ? sanitize_text_field($order) : 'DESC';
+
+		$orderby = array_combine(
+			$orderby,
+			array_fill(0, count($orderby), $order)
+		);
+		// because there are many registrations with the same date, define
+		// a secondary way to order them, otherwise MySQL seems to be a bit random
+		if (empty($orderby['REG_ID'])) {
+			$orderby['REG_ID'] = $order;
+		}
+
+		$orderby = apply_filters(
+			'FHEE__Registrations_Admin_Page___get_orderby_for_registrations_query',
+			$orderby,
+			$this->request->requestParams()
+		);
+		return ['order_by' => $orderby];
+	}
+
+
+	/**
+	 * Sets up the limit for the registrations query.
+	 *
+	 * @param $per_page
+	 * @return array
+	 */
+	protected function getLimitClause($per_page)
+	{
+		$current_page = $this->request->getRequestParam('paged', 1, 'int');
+		$per_page = $this->request->getRequestParam('perpage', $per_page, 'int');
+		// -1 means return all results so get out if that's set.
+		if ($per_page === -1) {
+			return [];
+		}
+		$offset = ($current_page - 1) * $per_page;
+		return ['limit' => [$offset, $per_page]];
+	}
 }

core/domain/values/assets/BrowserAsset.php

Indentation +144 added lines, -144 removed lines

@@ -17,148 +17,148 @@
 abstract class BrowserAsset extends Asset
 {
 
-    /**
-     * @var string $source
-     */
-    private $source;
-
-    /**
-     * @var array $dependencies
-     */
-    private $dependencies;
-
-    /**
-     * @var string $version
-     */
-    private $version;
-
-
-    /**
-     * Asset constructor.
-     *
-     * @param string          $type
-     * @param string          $handle
-     * @param string          $source
-     * @param array           $dependencies
-     * @param DomainInterface $domain
-     * @param string          $version
-     * @throws DomainException
-     * @throws InvalidDataTypeException
-     */
-    public function __construct($type, $handle, $source, array $dependencies, DomainInterface $domain, $version = '')
-    {
-        parent::__construct($type, $handle, $domain);
-        $this->setSource($source);
-        $this->setDependencies($dependencies);
-        $this->setVersion($version, false);
-    }
-
-
-    /**
-     * @since 4.9.62.p
-     */
-    abstract public function enqueueAsset();
-
-
-    /**
-     * @return array
-     */
-    public function dependencies()
-    {
-        return $this->dependencies;
-    }
-
-
-    /**
-     * @param array $dependencies
-     */
-    private function setDependencies(array $dependencies)
-    {
-        $this->dependencies = $dependencies;
-    }
-
-
-    /**
-     * @since 4.9.62.p
-     * @return bool
-     */
-    public function hasDependencies()
-    {
-        return count($this->dependencies) > 0;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function source()
-    {
-        return $this->source;
-    }
-
-
-    /**
-     * @param string $source
-     * @throws InvalidDataTypeException
-     */
-    private function setSource($source)
-    {
-        if (! is_string($source)) {
-            throw new InvalidDataTypeException(
-                '$source',
-                $source,
-                'string'
-            );
-        }
-        $this->source = $source;
-    }
-
-
-    /**
-     * @return string
-     * @throws InvalidDataTypeException
-     * @throws DomainException
-     */
-    public function version()
-    {
-        return $this->version;
-    }
-
-
-    /**
-     * @param string $version
-     * @param bool   $fluent
-     * @return BrowserAsset|null
-     * @throws DomainException
-     * @throws InvalidDataTypeException
-     */
-    public function setVersion($version, $fluent = true)
-    {
-        // if version is NOT set and this asset was NOT built for distribution,
-        // then set the version equal to the EE core plugin version
-        if (empty($version) && ! $this->isBuiltDistributionSource()) {
-            $version = $this->domain->version();
-        }
-        if (! is_string($version)) {
-            throw new InvalidDataTypeException(
-                '$version',
-                $version,
-                'string'
-            );
-        }
-        $this->version = $version;
-        if ($fluent) {
-            return $this;
-        }
-        return null;
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function isBuiltDistributionSource() {
-        return substr($this->source, -8) === Asset::FILE_EXTENSION_DISTRIBUTION_JS
-               || substr($this->source, -9) === Asset::FILE_EXTENSION_DISTRIBUTION_CSS;
-    }
+	/**
+	 * @var string $source
+	 */
+	private $source;
+
+	/**
+	 * @var array $dependencies
+	 */
+	private $dependencies;
+
+	/**
+	 * @var string $version
+	 */
+	private $version;
+
+
+	/**
+	 * Asset constructor.
+	 *
+	 * @param string          $type
+	 * @param string          $handle
+	 * @param string          $source
+	 * @param array           $dependencies
+	 * @param DomainInterface $domain
+	 * @param string          $version
+	 * @throws DomainException
+	 * @throws InvalidDataTypeException
+	 */
+	public function __construct($type, $handle, $source, array $dependencies, DomainInterface $domain, $version = '')
+	{
+		parent::__construct($type, $handle, $domain);
+		$this->setSource($source);
+		$this->setDependencies($dependencies);
+		$this->setVersion($version, false);
+	}
+
+
+	/**
+	 * @since 4.9.62.p
+	 */
+	abstract public function enqueueAsset();
+
+
+	/**
+	 * @return array
+	 */
+	public function dependencies()
+	{
+		return $this->dependencies;
+	}
+
+
+	/**
+	 * @param array $dependencies
+	 */
+	private function setDependencies(array $dependencies)
+	{
+		$this->dependencies = $dependencies;
+	}
+
+
+	/**
+	 * @since 4.9.62.p
+	 * @return bool
+	 */
+	public function hasDependencies()
+	{
+		return count($this->dependencies) > 0;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function source()
+	{
+		return $this->source;
+	}
+
+
+	/**
+	 * @param string $source
+	 * @throws InvalidDataTypeException
+	 */
+	private function setSource($source)
+	{
+		if (! is_string($source)) {
+			throw new InvalidDataTypeException(
+				'$source',
+				$source,
+				'string'
+			);
+		}
+		$this->source = $source;
+	}
+
+
+	/**
+	 * @return string
+	 * @throws InvalidDataTypeException
+	 * @throws DomainException
+	 */
+	public function version()
+	{
+		return $this->version;
+	}
+
+
+	/**
+	 * @param string $version
+	 * @param bool   $fluent
+	 * @return BrowserAsset|null
+	 * @throws DomainException
+	 * @throws InvalidDataTypeException
+	 */
+	public function setVersion($version, $fluent = true)
+	{
+		// if version is NOT set and this asset was NOT built for distribution,
+		// then set the version equal to the EE core plugin version
+		if (empty($version) && ! $this->isBuiltDistributionSource()) {
+			$version = $this->domain->version();
+		}
+		if (! is_string($version)) {
+			throw new InvalidDataTypeException(
+				'$version',
+				$version,
+				'string'
+			);
+		}
+		$this->version = $version;
+		if ($fluent) {
+			return $this;
+		}
+		return null;
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function isBuiltDistributionSource() {
+		return substr($this->source, -8) === Asset::FILE_EXTENSION_DISTRIBUTION_JS
+			   || substr($this->source, -9) === Asset::FILE_EXTENSION_DISTRIBUTION_CSS;
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -103,7 +103,7 @@ 
      */
     private function setSource($source)
     {
-        if (! is_string($source)) {
+        if ( ! is_string($source)) {
             throw new InvalidDataTypeException(
                 '$source',
                 $source,
@@ -139,7 +139,7 @@ 
         if (empty($version) && ! $this->isBuiltDistributionSource()) {
             $version = $this->domain->version();
         }
-        if (! is_string($version)) {
+        if ( ! is_string($version)) {
             throw new InvalidDataTypeException(
                 '$version',
                 $version,

core/domain/values/assets/JavascriptAsset.php

Indentation +141 added lines, -141 removed lines

@@ -18,145 +18,145 @@
 class JavascriptAsset extends BrowserAsset
 {
 
-    /**
-     * @var boolean $load_in_footer
-     */
-    private $load_in_footer = false;
-
-    /**
-     * @var boolean $requires_translation
-     */
-    private $requires_translation = false;
-
-    /**
-     * @var boolean $has_inline_data
-     */
-    private $has_inline_data = false;
-
-    /**
-     * @var Closure $inline_data_callback
-     */
-    private $inline_data_callback;
-
-
-    /**
-     * Asset constructor.
-     *
-     * @param string          $handle
-     * @param string          $source
-     * @param array           $dependencies
-     * @param bool            $load_in_footer
-     * @param DomainInterface $domain
-     * @param string          $version
-     * @throws InvalidDataTypeException
-     * @throws DomainException
-     */
-    public function __construct(
-        $handle,
-        $source,
-        array $dependencies,
-        $load_in_footer,
-        DomainInterface $domain,
-        $version = ''
-    ) {
-        parent::__construct(Asset::TYPE_JS, $handle, $source, $dependencies, $domain, $version);
-        $this->setLoadInFooter($load_in_footer);
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function loadInFooter()
-    {
-        return $this->load_in_footer;
-    }
-
-
-    /**
-     * @param bool $load_in_footer
-     */
-    private function setLoadInFooter($load_in_footer = true)
-    {
-        $this->load_in_footer = filter_var($load_in_footer, FILTER_VALIDATE_BOOLEAN);
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function requiresTranslation()
-    {
-        return $this->requires_translation;
-    }
-
-
-    /**
-     * @param bool $requires_translation
-     * @return JavascriptAsset
-     */
-    public function setRequiresTranslation($requires_translation = true)
-    {
-        $this->requires_translation = filter_var($requires_translation, FILTER_VALIDATE_BOOLEAN);
-        return $this;
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function hasInlineData()
-    {
-        return $this->has_inline_data;
-    }
-
-
-    /**
-     * @param bool $has_inline_data
-     * @return JavascriptAsset
-     */
-    public function setHasInlineData($has_inline_data = true)
-    {
-        $this->has_inline_data = filter_var($has_inline_data, FILTER_VALIDATE_BOOLEAN);
-        return $this;
-    }
-
-
-    /**
-     * @return Closure
-     */
-    public function inlineDataCallback()
-    {
-        return $this->inline_data_callback;
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function hasInlineDataCallback()
-    {
-        return $this->inline_data_callback instanceof Closure;
-    }
-
-
-    /**
-     * @param Closure $inline_data_callback
-     * @return JavascriptAsset
-     */
-    public function setInlineDataCallback(Closure $inline_data_callback)
-    {
-        $this->inline_data_callback = $inline_data_callback;
-        $this->setHasInlineData();
-        return $this;
-    }
-
-
-    /**
-     * @since 4.9.62.p
-     */
-    public function enqueueAsset()
-    {
-        wp_enqueue_script($this->handle());
-    }
+	/**
+	 * @var boolean $load_in_footer
+	 */
+	private $load_in_footer = false;
+
+	/**
+	 * @var boolean $requires_translation
+	 */
+	private $requires_translation = false;
+
+	/**
+	 * @var boolean $has_inline_data
+	 */
+	private $has_inline_data = false;
+
+	/**
+	 * @var Closure $inline_data_callback
+	 */
+	private $inline_data_callback;
+
+
+	/**
+	 * Asset constructor.
+	 *
+	 * @param string          $handle
+	 * @param string          $source
+	 * @param array           $dependencies
+	 * @param bool            $load_in_footer
+	 * @param DomainInterface $domain
+	 * @param string          $version
+	 * @throws InvalidDataTypeException
+	 * @throws DomainException
+	 */
+	public function __construct(
+		$handle,
+		$source,
+		array $dependencies,
+		$load_in_footer,
+		DomainInterface $domain,
+		$version = ''
+	) {
+		parent::__construct(Asset::TYPE_JS, $handle, $source, $dependencies, $domain, $version);
+		$this->setLoadInFooter($load_in_footer);
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function loadInFooter()
+	{
+		return $this->load_in_footer;
+	}
+
+
+	/**
+	 * @param bool $load_in_footer
+	 */
+	private function setLoadInFooter($load_in_footer = true)
+	{
+		$this->load_in_footer = filter_var($load_in_footer, FILTER_VALIDATE_BOOLEAN);
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function requiresTranslation()
+	{
+		return $this->requires_translation;
+	}
+
+
+	/**
+	 * @param bool $requires_translation
+	 * @return JavascriptAsset
+	 */
+	public function setRequiresTranslation($requires_translation = true)
+	{
+		$this->requires_translation = filter_var($requires_translation, FILTER_VALIDATE_BOOLEAN);
+		return $this;
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function hasInlineData()
+	{
+		return $this->has_inline_data;
+	}
+
+
+	/**
+	 * @param bool $has_inline_data
+	 * @return JavascriptAsset
+	 */
+	public function setHasInlineData($has_inline_data = true)
+	{
+		$this->has_inline_data = filter_var($has_inline_data, FILTER_VALIDATE_BOOLEAN);
+		return $this;
+	}
+
+
+	/**
+	 * @return Closure
+	 */
+	public function inlineDataCallback()
+	{
+		return $this->inline_data_callback;
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function hasInlineDataCallback()
+	{
+		return $this->inline_data_callback instanceof Closure;
+	}
+
+
+	/**
+	 * @param Closure $inline_data_callback
+	 * @return JavascriptAsset
+	 */
+	public function setInlineDataCallback(Closure $inline_data_callback)
+	{
+		$this->inline_data_callback = $inline_data_callback;
+		$this->setHasInlineData();
+		return $this;
+	}
+
+
+	/**
+	 * @since 4.9.62.p
+	 */
+	public function enqueueAsset()
+	{
+		wp_enqueue_script($this->handle());
+	}
 }

core/data_migration_scripts/EE_DMS_Core_4_10_0.dms.php

Spacing +6 added lines, -6 removed lines

@@ -12,12 +12,12 @@ 
 // unfortunately, this needs to be done upon INCLUSION of this file,
 // instead of construction, because it only gets constructed on first page load
 // (all other times it gets resurrected from a wordpress option)
-$stages = glob(EE_CORE . 'data_migration_scripts/4_10_0_stages/*');
+$stages = glob(EE_CORE.'data_migration_scripts/4_10_0_stages/*');
 $class_to_filepath = [];
 foreach ($stages as $filepath) {
     $matches = [];
     preg_match('~4_10_0_stages/(.*).dmsstage.php~', $filepath, $matches);
-    $class_to_filepath[ $matches[1] ] = $filepath;
+    $class_to_filepath[$matches[1]] = $filepath;
 }
 // give addons a chance to autoload their stages too
 $class_to_filepath = apply_filters('FHEE__EE_DMS_4_10_0__autoloaded_stages', $class_to_filepath);
@@ -67,10 +67,10 @@ 
         $version_string = $version_array['Core'];
         if (version_compare($version_string, '4.10.0.decaf', '<') && version_compare($version_string, '4.9.0.decaf', '>=')) {
             return true;
-        } elseif (! $version_string) {
+        } elseif ( ! $version_string) {
             //          echo "no version string provided: $version_string";
             // no version string provided... this must be pre 4.3
-            return false;// changed mind. dont want people thinking they should migrate yet because they cant
+            return false; // changed mind. dont want people thinking they should migrate yet because they cant
         }
         return false;
     }
@@ -82,7 +82,7 @@ 
      */
     public function schema_changes_before_migration()
     {
-        require_once(EE_HELPERS . 'EEH_Activation.helper.php');
+        require_once(EE_HELPERS.'EEH_Activation.helper.php');
         $now_in_mysql = current_time('mysql', true);
         $table_name = 'esp_answer';
         $sql = " ANS_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -633,7 +633,7 @@ 
     {
         global $wpdb;
         $wpdb->update(
-            $wpdb->prefix . 'esp_payment_method',
+            $wpdb->prefix.'esp_payment_method',
             [
                 'PMD_type' => 'Admin_Only',
                 'PMD_scope' => serialize(array())

Indentation +216 added lines, -216 removed lines

@@ -15,9 +15,9 @@ 
 $stages = glob(EE_CORE . 'data_migration_scripts/4_10_0_stages/*');
 $class_to_filepath = [];
 foreach ($stages as $filepath) {
-    $matches = [];
-    preg_match('~4_10_0_stages/(.*).dmsstage.php~', $filepath, $matches);
-    $class_to_filepath[ $matches[1] ] = $filepath;
+	$matches = [];
+	preg_match('~4_10_0_stages/(.*).dmsstage.php~', $filepath, $matches);
+	$class_to_filepath[ $matches[1] ] = $filepath;
 }
 // give addons a chance to autoload their stages too
 $class_to_filepath = apply_filters('FHEE__EE_DMS_4_10_0__autoloaded_stages', $class_to_filepath);
@@ -35,66 +35,66 @@ 
  */
 class EE_DMS_Core_4_10_0 extends EE_Data_Migration_Script_Base
 {
-    /**
-     *
-     * @param TableManager  $table_manager
-     * @param TableAnalysis $table_analysis
-     */
-    public function __construct(
-        TableManager $table_manager = null,
-        TableAnalysis $table_analysis = null,
-        EE_DMS_Core_4_9_0 $dms_4_9
-    ) {
-        $this->previous_dms = $dms_4_9;
-        $this->_pretty_name = esc_html__("Data Update to Event Espresso 4.10.0", "event_espresso");
-        $this->_priority = 10;
-        $this->_migration_stages = array(
-            new EE_DMS_4_10_0_Event_Question_Group(),
-        );
-        parent::__construct($table_manager, $table_analysis);
-    }
+	/**
+	 *
+	 * @param TableManager  $table_manager
+	 * @param TableAnalysis $table_analysis
+	 */
+	public function __construct(
+		TableManager $table_manager = null,
+		TableAnalysis $table_analysis = null,
+		EE_DMS_Core_4_9_0 $dms_4_9
+	) {
+		$this->previous_dms = $dms_4_9;
+		$this->_pretty_name = esc_html__("Data Update to Event Espresso 4.10.0", "event_espresso");
+		$this->_priority = 10;
+		$this->_migration_stages = array(
+			new EE_DMS_4_10_0_Event_Question_Group(),
+		);
+		parent::__construct($table_manager, $table_analysis);
+	}
 
 
 
-    /**
-     * Whether to migrate or not.
-     *
-     * @param array $version_array
-     * @return bool
-     */
-    public function can_migrate_from_version($version_array)
-    {
-        $version_string = $version_array['Core'];
-        if (version_compare($version_string, '4.10.0.decaf', '<') && version_compare($version_string, '4.9.0.decaf', '>=')) {
-            return true;
-        } elseif (! $version_string) {
-            //          echo "no version string provided: $version_string";
-            // no version string provided... this must be pre 4.3
-            return false;// changed mind. dont want people thinking they should migrate yet because they cant
-        }
-        return false;
-    }
+	/**
+	 * Whether to migrate or not.
+	 *
+	 * @param array $version_array
+	 * @return bool
+	 */
+	public function can_migrate_from_version($version_array)
+	{
+		$version_string = $version_array['Core'];
+		if (version_compare($version_string, '4.10.0.decaf', '<') && version_compare($version_string, '4.9.0.decaf', '>=')) {
+			return true;
+		} elseif (! $version_string) {
+			//          echo "no version string provided: $version_string";
+			// no version string provided... this must be pre 4.3
+			return false;// changed mind. dont want people thinking they should migrate yet because they cant
+		}
+		return false;
+	}
 
 
 
-    /**
-     * @return bool
-     */
-    public function schema_changes_before_migration()
-    {
-        require_once(EE_HELPERS . 'EEH_Activation.helper.php');
-        $now_in_mysql = current_time('mysql', true);
-        $table_name = 'esp_answer';
-        $sql = " ANS_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+	/**
+	 * @return bool
+	 */
+	public function schema_changes_before_migration()
+	{
+		require_once(EE_HELPERS . 'EEH_Activation.helper.php');
+		$now_in_mysql = current_time('mysql', true);
+		$table_name = 'esp_answer';
+		$sql = " ANS_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					REG_ID int(10) unsigned NOT NULL,
 					QST_ID int(10) unsigned NOT NULL,
 					ANS_value text NOT NULL,
 					PRIMARY KEY  (ANS_ID),
 					KEY REG_ID (REG_ID),
 					KEY QST_ID (QST_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_attendee_meta';
-        $sql = "ATTM_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_attendee_meta';
+		$sql = "ATTM_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				ATT_ID bigint(20) unsigned NOT NULL,
 				ATT_fname varchar(45) NOT NULL,
 				ATT_lname varchar(45) NOT NULL,
@@ -111,9 +111,9 @@ 
 				KEY ATT_email (ATT_email(191)),
 				KEY ATT_lname (ATT_lname),
 				KEY ATT_fname (ATT_fname)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB ');
-        $table_name = 'esp_checkin';
-        $sql = "CHK_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB ');
+		$table_name = 'esp_checkin';
+		$sql = "CHK_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				REG_ID int(10) unsigned NOT NULL,
 				DTT_ID int(10) unsigned NOT NULL,
 				CHK_in tinyint(1) unsigned NOT NULL DEFAULT 1,
@@ -121,9 +121,9 @@ 
 				PRIMARY KEY  (CHK_ID),
 				KEY REG_ID (REG_ID),
 				KEY DTT_ID (DTT_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_country';
-        $sql = "CNT_ISO varchar(2) NOT NULL,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_country';
+		$sql = "CNT_ISO varchar(2) NOT NULL,
 				CNT_ISO3 varchar(3) NOT NULL,
 				RGN_ID tinyint(3) unsigned DEFAULT NULL,
 				CNT_name varchar(45) NOT NULL,
@@ -139,29 +139,29 @@ 
 				CNT_is_EU tinyint(1) DEFAULT '0',
 				CNT_active tinyint(1) DEFAULT '0',
 				PRIMARY KEY  (CNT_ISO)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_currency';
-        $sql = "CUR_code varchar(6) NOT NULL,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_currency';
+		$sql = "CUR_code varchar(6) NOT NULL,
 				CUR_single varchar(45) DEFAULT 'dollar',
 				CUR_plural varchar(45) DEFAULT 'dollars',
 				CUR_sign varchar(45) DEFAULT '$',
 				CUR_dec_plc varchar(1) NOT NULL DEFAULT '2',
 				CUR_active tinyint(1) DEFAULT '0',
 				PRIMARY KEY  (CUR_code)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        // note: although this table is no longer in use,
-        // it hasn't been removed because then queries to the model will have errors.
-        // but you should expect this table and its corresponding model to be removed in
-        // the next few months
-        $table_name = 'esp_currency_payment_method';
-        $sql = "CPM_ID int(11) NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		// note: although this table is no longer in use,
+		// it hasn't been removed because then queries to the model will have errors.
+		// but you should expect this table and its corresponding model to be removed in
+		// the next few months
+		$table_name = 'esp_currency_payment_method';
+		$sql = "CPM_ID int(11) NOT NULL AUTO_INCREMENT,
 				CUR_code varchar(6) NOT NULL,
 				PMD_ID int(11) NOT NULL,
 				PRIMARY KEY  (CPM_ID),
 				KEY PMD_ID (PMD_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB ');
-        $table_name = 'esp_datetime';
-        $sql = "DTT_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB ');
+		$table_name = 'esp_datetime';
+		$sql = "DTT_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				EVT_ID bigint(20) unsigned NOT NULL,
 				DTT_name varchar(255) NOT NULL DEFAULT '',
 				DTT_description text NOT NULL,
@@ -178,25 +178,25 @@ 
 				KEY DTT_EVT_start (DTT_EVT_start),
 				KEY EVT_ID (EVT_ID),
 				KEY DTT_is_primary (DTT_is_primary)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = "esp_datetime_ticket";
-        $sql = "DTK_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = "esp_datetime_ticket";
+		$sql = "DTK_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				DTT_ID int(10) unsigned NOT NULL,
 				TKT_ID int(10) unsigned NOT NULL,
 				PRIMARY KEY  (DTK_ID),
 				KEY DTT_ID (DTT_ID),
 				KEY TKT_ID (TKT_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_event_message_template';
-        $sql = "EMT_ID bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_event_message_template';
+		$sql = "EMT_ID bigint(20) unsigned NOT NULL AUTO_INCREMENT,
 				EVT_ID bigint(20) unsigned NOT NULL DEFAULT 0,
 				GRP_ID int(10) unsigned NOT NULL DEFAULT 0,
 				PRIMARY KEY  (EMT_ID),
 				KEY EVT_ID (EVT_ID),
 				KEY GRP_ID (GRP_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_event_meta';
-        $sql = "EVTM_ID int(10) NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_event_meta';
+		$sql = "EVTM_ID int(10) NOT NULL AUTO_INCREMENT,
 				EVT_ID bigint(20) unsigned NOT NULL,
 				EVT_display_desc tinyint(1) unsigned NOT NULL DEFAULT 1,
 				EVT_display_ticket_selector tinyint(1) unsigned NOT NULL DEFAULT 1,
@@ -211,9 +211,9 @@ 
 				EVT_donations tinyint(1) NULL,
 				PRIMARY KEY  (EVTM_ID),
 				KEY EVT_ID (EVT_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_event_question_group';
-        $sql = "EQG_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_event_question_group';
+		$sql = "EQG_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				EVT_ID bigint(20) unsigned NOT NULL,
 				QSG_ID int(10) unsigned NOT NULL,
 				EQG_primary tinyint(1) unsigned NOT NULL DEFAULT 0,
@@ -221,25 +221,25 @@ 
 				PRIMARY KEY  (EQG_ID),
 				KEY EVT_ID (EVT_ID),
 				KEY QSG_ID (QSG_ID)";
-        $this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_event_venue';
-        $sql = "EVV_ID int(11) NOT NULL AUTO_INCREMENT,
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_event_venue';
+		$sql = "EVV_ID int(11) NOT NULL AUTO_INCREMENT,
 				EVT_ID bigint(20) unsigned NOT NULL,
 				VNU_ID bigint(20) unsigned NOT NULL,
 				EVV_primary tinyint(1) unsigned NOT NULL DEFAULT 0,
 				PRIMARY KEY  (EVV_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_extra_meta';
-        $sql = "EXM_ID int(11) NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_extra_meta';
+		$sql = "EXM_ID int(11) NOT NULL AUTO_INCREMENT,
 				OBJ_ID int(11) DEFAULT NULL,
 				EXM_type varchar(45) DEFAULT NULL,
 				EXM_key varchar(45) DEFAULT NULL,
 				EXM_value text,
 				PRIMARY KEY  (EXM_ID),
 				KEY EXM_type (EXM_type,OBJ_ID,EXM_key)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_extra_join';
-        $sql = "EXJ_ID int(11) NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_extra_join';
+		$sql = "EXJ_ID int(11) NOT NULL AUTO_INCREMENT,
 				EXJ_first_model_id varchar(6) NOT NULL,
 				EXJ_first_model_name varchar(20) NOT NULL,
 				EXJ_second_model_id varchar(6) NOT NULL,
@@ -247,9 +247,9 @@ 
 				PRIMARY KEY  (EXJ_ID),
 				KEY first_model (EXJ_first_model_name,EXJ_first_model_id),
 				KEY second_model (EXJ_second_model_name,EXJ_second_model_id)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB ');
-        $table_name = 'esp_line_item';
-        $sql = "LIN_ID int(11) NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB ');
+		$table_name = 'esp_line_item';
+		$sql = "LIN_ID int(11) NOT NULL AUTO_INCREMENT,
 				LIN_code varchar(245) NOT NULL DEFAULT '',
 				TXN_ID int(11) DEFAULT NULL,
 				LIN_name varchar(245) NOT NULL DEFAULT '',
@@ -270,9 +270,9 @@ 
 				KEY txn_type_timestamp (TXN_ID,LIN_type,LIN_timestamp),
 				KEY txn_obj_id_obj_type (TXN_ID,OBJ_ID,OBJ_type),
 				KEY obj_id_obj_type (OBJ_ID,OBJ_type)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_log';
-        $sql = "LOG_ID int(11) NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_log';
+		$sql = "LOG_ID int(11) NOT NULL AUTO_INCREMENT,
 				LOG_time datetime DEFAULT NULL,
 				OBJ_ID varchar(45) DEFAULT NULL,
 				OBJ_type varchar(45) DEFAULT NULL,
@@ -283,9 +283,9 @@ 
 				KEY LOG_time (LOG_time),
 				KEY OBJ (OBJ_type,OBJ_ID),
 				KEY LOG_type (LOG_type)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_message';
-        $sql = "MSG_ID bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_message';
+		$sql = "MSG_ID bigint(20) unsigned NOT NULL AUTO_INCREMENT,
 				GRP_ID int(10) unsigned NULL,
 				MSG_token varchar(255) NULL,
 				TXN_ID int(10) unsigned NULL,
@@ -317,18 +317,18 @@ 
 				KEY STS_ID (STS_ID),
 				KEY MSG_created (MSG_created),
 				KEY MSG_modified (MSG_modified)";
-        $this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_message_template';
-        $sql = "MTP_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_message_template';
+		$sql = "MTP_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				GRP_ID int(10) unsigned NOT NULL,
 				MTP_context varchar(50) NOT NULL,
 				MTP_template_field varchar(30) NOT NULL,
 				MTP_content text NOT NULL,
 				PRIMARY KEY  (MTP_ID),
 				KEY GRP_ID (GRP_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_message_template_group';
-        $sql = "GRP_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_message_template_group';
+		$sql = "GRP_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				MTP_user_id int(10) NOT NULL DEFAULT '1',
 				MTP_name varchar(245) NOT NULL DEFAULT '',
 				MTP_description varchar(245) NOT NULL DEFAULT '',
@@ -340,9 +340,9 @@ 
 				MTP_is_active tinyint(1) NOT NULL DEFAULT '1',
 				PRIMARY KEY  (GRP_ID),
 				KEY MTP_user_id (MTP_user_id)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_payment';
-        $sql = "PAY_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_payment';
+		$sql = "PAY_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				TXN_ID int(10) unsigned DEFAULT NULL,
 				STS_ID varchar(3) DEFAULT NULL,
 				PAY_timestamp datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
@@ -359,9 +359,9 @@ 
 				PRIMARY KEY  (PAY_ID),
 				KEY PAY_timestamp (PAY_timestamp),
 				KEY TXN_ID (TXN_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB ');
-        $table_name = 'esp_payment_method';
-        $sql = "PMD_ID int(11) NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB ');
+		$table_name = 'esp_payment_method';
+		$sql = "PMD_ID int(11) NOT NULL AUTO_INCREMENT,
 				PMD_type varchar(124) DEFAULT NULL,
 				PMD_name varchar(255) DEFAULT NULL,
 				PMD_desc text,
@@ -377,24 +377,24 @@ 
 				PRIMARY KEY  (PMD_ID),
 				UNIQUE KEY PMD_slug_UNIQUE (PMD_slug),
 				KEY PMD_type (PMD_type)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB ');
-        $table_name = "esp_ticket_price";
-        $sql = "TKP_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB ');
+		$table_name = "esp_ticket_price";
+		$sql = "TKP_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				TKT_ID int(10) unsigned NOT NULL,
 				PRC_ID int(10) unsigned NOT NULL,
 				PRIMARY KEY  (TKP_ID),
 				KEY TKT_ID (TKT_ID),
 				KEY PRC_ID (PRC_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = "esp_ticket_template";
-        $sql = "TTM_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = "esp_ticket_template";
+		$sql = "TTM_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				TTM_name varchar(45) NOT NULL,
 				TTM_description text,
 				TTM_file varchar(45),
 				PRIMARY KEY  (TTM_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_question';
-        $sql = 'QST_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_question';
+		$sql = 'QST_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				QST_display_text text NOT NULL,
 				QST_admin_label varchar(255) NOT NULL,
 				QST_system varchar(25) DEFAULT NULL,
@@ -408,18 +408,18 @@ 
 				QST_deleted tinyint(2) unsigned NOT NULL DEFAULT 0,
 				PRIMARY KEY  (QST_ID),
 				KEY QST_order (QST_order)';
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_question_group_question';
-        $sql = "QGQ_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_question_group_question';
+		$sql = "QGQ_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				QSG_ID int(10) unsigned NOT NULL,
 				QST_ID int(10) unsigned NOT NULL,
 				QGQ_order int(10) unsigned NOT NULL DEFAULT 0,
 				PRIMARY KEY  (QGQ_ID),
 				KEY QST_ID (QST_ID),
 				KEY QSG_ID_order (QSG_ID,QGQ_order)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_question_option';
-        $sql = "QSO_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_question_option';
+		$sql = "QSO_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				QSO_value varchar(255) NOT NULL,
 				QSO_desc text NOT NULL,
 				QST_ID int(10) unsigned NOT NULL,
@@ -429,9 +429,9 @@ 
 				PRIMARY KEY  (QSO_ID),
 				KEY QST_ID (QST_ID),
 				KEY QSO_order (QSO_order)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_registration';
-        $sql = "REG_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_registration';
+		$sql = "REG_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				EVT_ID bigint(20) unsigned NOT NULL,
 				ATT_ID bigint(20) unsigned NOT NULL,
 				TXN_ID int(10) unsigned NOT NULL,
@@ -455,18 +455,18 @@ 
 				KEY TKT_ID (TKT_ID),
 				KEY EVT_ID (EVT_ID),
 				KEY STS_ID (STS_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB ');
-        $table_name = 'esp_registration_payment';
-        $sql = "RPY_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB ');
+		$table_name = 'esp_registration_payment';
+		$sql = "RPY_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					  REG_ID int(10) unsigned NOT NULL,
 					  PAY_ID int(10) unsigned NULL,
 					  RPY_amount decimal(12,3) NOT NULL DEFAULT '0.00',
 					  PRIMARY KEY  (RPY_ID),
 					  KEY REG_ID (REG_ID),
 					  KEY PAY_ID (PAY_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB ');
-        $table_name = 'esp_state';
-        $sql = "STA_ID smallint(5) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB ');
+		$table_name = 'esp_state';
+		$sql = "STA_ID smallint(5) unsigned NOT NULL AUTO_INCREMENT,
 				CNT_ISO varchar(2) NOT NULL,
 				STA_abbrev varchar(24) NOT NULL,
 				STA_name varchar(100) NOT NULL,
@@ -474,9 +474,9 @@ 
 				PRIMARY KEY  (STA_ID),
 				KEY STA_abbrev (STA_abbrev),
 				KEY CNT_ISO (CNT_ISO)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_status';
-        $sql = "STS_ID varchar(3) NOT NULL,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_status';
+		$sql = "STS_ID varchar(3) NOT NULL,
 				STS_code varchar(45) NOT NULL,
 				STS_type varchar(45) NOT NULL,
 				STS_can_edit tinyint(1) NOT NULL DEFAULT 0,
@@ -484,9 +484,9 @@ 
 				STS_open tinyint(1) NOT NULL DEFAULT 1,
 				UNIQUE KEY STS_ID_UNIQUE (STS_ID),
 				KEY STS_type (STS_type)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_transaction';
-        $sql = "TXN_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_transaction';
+		$sql = "TXN_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				TXN_timestamp datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
 				TXN_total decimal(12,3) DEFAULT '0.00',
 				TXN_paid decimal(12,3) NOT NULL DEFAULT '0.00',
@@ -498,9 +498,9 @@ 
 				PRIMARY KEY  (TXN_ID),
 				KEY TXN_timestamp (TXN_timestamp),
 				KEY STS_ID (STS_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_venue_meta';
-        $sql = "VNUM_ID int(11) NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_venue_meta';
+		$sql = "VNUM_ID int(11) NOT NULL AUTO_INCREMENT,
 			VNU_ID bigint(20) unsigned NOT NULL DEFAULT 0,
 			VNU_address varchar(255) DEFAULT NULL,
 			VNU_address2 varchar(255) DEFAULT NULL,
@@ -519,10 +519,10 @@ 
 			KEY VNU_ID (VNU_ID),
 			KEY STA_ID (STA_ID),
 			KEY CNT_ISO (CNT_ISO)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        // modified tables
-        $table_name = "esp_price";
-        $sql = "PRC_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		// modified tables
+		$table_name = "esp_price";
+		$sql = "PRC_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				PRT_ID tinyint(3) unsigned NOT NULL,
 				PRC_amount decimal(12,3) NOT NULL DEFAULT '0.00',
 				PRC_name varchar(245) NOT NULL,
@@ -535,9 +535,9 @@ 
 				PRC_parent int(10) unsigned DEFAULT 0,
 				PRIMARY KEY  (PRC_ID),
 				KEY PRT_ID (PRT_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = "esp_price_type";
-        $sql = "PRT_ID tinyint(3) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = "esp_price_type";
+		$sql = "PRT_ID tinyint(3) unsigned NOT NULL AUTO_INCREMENT,
 				PRT_name varchar(45) NOT NULL,
 				PBT_ID tinyint(3) unsigned NOT NULL DEFAULT '1',
 				PRT_is_percent tinyint(1) NOT NULL DEFAULT '0',
@@ -546,9 +546,9 @@ 
 				PRT_deleted tinyint(1) NOT NULL DEFAULT '0',
 				UNIQUE KEY PRT_name_UNIQUE (PRT_name),
 				PRIMARY KEY  (PRT_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB ');
-        $table_name = "esp_ticket";
-        $sql = "TKT_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB ');
+		$table_name = "esp_ticket";
+		$sql = "TKT_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				TTM_ID int(10) unsigned NOT NULL,
 				TKT_name varchar(245) NOT NULL DEFAULT '',
 				TKT_description text NOT NULL,
@@ -571,9 +571,9 @@ 
 				TKT_deleted tinyint(1) NOT NULL DEFAULT '0',
 				PRIMARY KEY  (TKT_ID),
 				KEY TKT_start_date (TKT_start_date)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_question_group';
-        $sql = 'QSG_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_question_group';
+		$sql = 'QSG_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				QSG_name varchar(255) NOT NULL,
 				QSG_identifier varchar(100) NOT NULL,
 				QSG_desc text NULL,
@@ -586,70 +586,70 @@ 
 				PRIMARY KEY  (QSG_ID),
 				UNIQUE KEY QSG_identifier_UNIQUE (QSG_identifier),
 				KEY QSG_order (QSG_order)';
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $this->insert_default_data();
-        return true;
-    }
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$this->insert_default_data();
+		return true;
+	}
 
-    /**
-     * Inserts default data on new installs
-     * @since 4.10.0.p
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function insert_default_data()
-    {
-        $this->previous_dms->insert_default_data();
-        $this->removeMijirehPM();
-    }
+	/**
+	 * Inserts default data on new installs
+	 * @since 4.10.0.p
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function insert_default_data()
+	{
+		$this->previous_dms->insert_default_data();
+		$this->removeMijirehPM();
+	}
 
 
 
-    /**
-     * @return boolean
-     */
-    public function schema_changes_after_migration()
-    {
-        return true;
-    }
+	/**
+	 * @return boolean
+	 */
+	public function schema_changes_after_migration()
+	{
+		return true;
+	}
 
 
 
-    public function migration_page_hooks()
-    {
-    }
+	public function migration_page_hooks()
+	{
+	}
 
-    /**
-     * Mijireh was removed in 4.10.3.p, but let's avoid having an error message because its files were removed, and don't
-     * show old payments made with it as being by "Unknown". The fix is to make it an "Admin_Only" payment method
-     * (like Invoice or Check) but don't allow it to be used in the admin either... so it's usable nowhere from now on,
-     * but it still exists so there's no problems.
-     * @since 4.10.3.p
-     */
-    protected function removeMijirehPM()
-    {
-        global $wpdb;
-        $wpdb->update(
-            $wpdb->prefix . 'esp_payment_method',
-            [
-                'PMD_type' => 'Admin_Only',
-                'PMD_scope' => serialize(array())
-            ],
-            [
-                'PMD_type' => 'Mijireh'
-            ],
-            [
-                // update formats
-                '%s', // PMD_type
-                '%s', // PMD_scope
-            ],
-            [
-                // where formats
-                '%s'
-            ]
-        );
-    }
+	/**
+	 * Mijireh was removed in 4.10.3.p, but let's avoid having an error message because its files were removed, and don't
+	 * show old payments made with it as being by "Unknown". The fix is to make it an "Admin_Only" payment method
+	 * (like Invoice or Check) but don't allow it to be used in the admin either... so it's usable nowhere from now on,
+	 * but it still exists so there's no problems.
+	 * @since 4.10.3.p
+	 */
+	protected function removeMijirehPM()
+	{
+		global $wpdb;
+		$wpdb->update(
+			$wpdb->prefix . 'esp_payment_method',
+			[
+				'PMD_type' => 'Admin_Only',
+				'PMD_scope' => serialize(array())
+			],
+			[
+				'PMD_type' => 'Mijireh'
+			],
+			[
+				// update formats
+				'%s', // PMD_type
+				'%s', // PMD_scope
+			],
+			[
+				// where formats
+				'%s'
+			]
+		);
+	}
 }

core/domain/services/custom_post_types/RewriteRules.php

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
         if (get_option(RewriteRules::OPTION_KEY_FLUSH_REWRITE_RULES, true)) {
             add_action(
                 'shutdown',
-                static function () {
+                static function() {
                     flush_rewrite_rules();
                     update_option(RewriteRules::OPTION_KEY_FLUSH_REWRITE_RULES, false);
                 }

Indentation +27 added lines, -27 removed lines

@@ -12,35 +12,35 @@
  */
 class RewriteRules
 {
-    const OPTION_KEY_FLUSH_REWRITE_RULES = 'ee_flush_rewrite_rules';
+	const OPTION_KEY_FLUSH_REWRITE_RULES = 'ee_flush_rewrite_rules';
 
 
-    /**
-     * This will flush rewrite rules on demand.  This actually gets called around wp init priority level 100.
-     *
-     * @return void
-     */
-    public function flush()
-    {
-        update_option(RewriteRules::OPTION_KEY_FLUSH_REWRITE_RULES, true);
-    }
+	/**
+	 * This will flush rewrite rules on demand.  This actually gets called around wp init priority level 100.
+	 *
+	 * @return void
+	 */
+	public function flush()
+	{
+		update_option(RewriteRules::OPTION_KEY_FLUSH_REWRITE_RULES, true);
+	}
 
 
-    /**
-     * This will flush rewrite rules on demand.  This actually gets called around wp init priority level 100.
-     *
-     * @return void
-     */
-    public function flushRewriteRules()
-    {
-        if (get_option(RewriteRules::OPTION_KEY_FLUSH_REWRITE_RULES, true)) {
-            add_action(
-                'shutdown',
-                static function () {
-                    flush_rewrite_rules();
-                    update_option(RewriteRules::OPTION_KEY_FLUSH_REWRITE_RULES, false);
-                }
-            );
-        }
-    }
+	/**
+	 * This will flush rewrite rules on demand.  This actually gets called around wp init priority level 100.
+	 *
+	 * @return void
+	 */
+	public function flushRewriteRules()
+	{
+		if (get_option(RewriteRules::OPTION_KEY_FLUSH_REWRITE_RULES, true)) {
+			add_action(
+				'shutdown',
+				static function () {
+					flush_rewrite_rules();
+					update_option(RewriteRules::OPTION_KEY_FLUSH_REWRITE_RULES, false);
+				}
+			);
+		}
+	}
 }

core/services/orm/tree_traversal/BaseNode.php

Spacing +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
      */
     public function visit($model_objects_to_identify)
     {
-        if (! $this->isDiscovered()) {
+        if ( ! $this->isDiscovered()) {
             $this->discover();
         }
         if ($this->isComplete()) {

Indentation +88 added lines, -88 removed lines

@@ -31,105 +31,105 @@
  */
 abstract class BaseNode
 {
-    /**
-     * @var boolean
-     */
-    protected $complete;
+	/**
+	 * @var boolean
+	 */
+	protected $complete;
 
 
-    /**
-     * @var array of model names we don't want to traverse
-     */
-    protected $dont_traverse_models;
+	/**
+	 * @var array of model names we don't want to traverse
+	 */
+	protected $dont_traverse_models;
 
-    /**
-     * Whether this item has already been initialized
-     */
-    abstract protected function isDiscovered();
+	/**
+	 * Whether this item has already been initialized
+	 */
+	abstract protected function isDiscovered();
 
-    /**
-     * Determines if the work is done yet or not. Requires you to have first discovered what work exists by calling
-     * discover().
-     * @since 4.10.12.p
-     * @return boolean
-     */
-    abstract public function isComplete();
+	/**
+	 * Determines if the work is done yet or not. Requires you to have first discovered what work exists by calling
+	 * discover().
+	 * @since 4.10.12.p
+	 * @return boolean
+	 */
+	abstract public function isComplete();
 
-    /**
-     * Discovers what work needs to be done to complete traversing this node and its children.
-     * Note that this is separate from the constructor, so we can create child nodes without
-     * discovering them immediately.
-     * @since 4.10.12.p
-     * @return mixed
-     */
-    abstract protected function discover();
+	/**
+	 * Discovers what work needs to be done to complete traversing this node and its children.
+	 * Note that this is separate from the constructor, so we can create child nodes without
+	 * discovering them immediately.
+	 * @since 4.10.12.p
+	 * @return mixed
+	 */
+	abstract protected function discover();
 
-    /**
-     * Identifies model objects, up to the limit $model_objects_to_identify.
-     * @since 4.10.12.p
-     * @param int $model_objects_to_identify
-     * @return int units of work done
-     */
-    abstract protected function work($model_objects_to_identify);
+	/**
+	 * Identifies model objects, up to the limit $model_objects_to_identify.
+	 * @since 4.10.12.p
+	 * @param int $model_objects_to_identify
+	 * @return int units of work done
+	 */
+	abstract protected function work($model_objects_to_identify);
 
-    /**
-     * Shows the entity/relation node as an array.
-     * @since 4.10.12.p
-     * @return array
-     */
-    abstract public function toArray();
+	/**
+	 * Shows the entity/relation node as an array.
+	 * @since 4.10.12.p
+	 * @return array
+	 */
+	abstract public function toArray();
 
-    /**
-     * Discovers how much work there is to do, double-checks the work isn't already finished, and then does the work.
-     * Note: do not call when site is in maintenance mode level 2.
-     *
-     * @since 4.10.12.p
-     * @param $model_objects_to_identify
-     * @return int number of model objects we want to identify during this call. On subsequent calls we'll continue
-     * where we left off.
-     */
-    public function visit($model_objects_to_identify)
-    {
-        if (! $this->isDiscovered()) {
-            $this->discover();
-        }
-        if ($this->isComplete()) {
-            return 0;
-        }
-        return $this->work($model_objects_to_identify);
-    }
+	/**
+	 * Discovers how much work there is to do, double-checks the work isn't already finished, and then does the work.
+	 * Note: do not call when site is in maintenance mode level 2.
+	 *
+	 * @since 4.10.12.p
+	 * @param $model_objects_to_identify
+	 * @return int number of model objects we want to identify during this call. On subsequent calls we'll continue
+	 * where we left off.
+	 */
+	public function visit($model_objects_to_identify)
+	{
+		if (! $this->isDiscovered()) {
+			$this->discover();
+		}
+		if ($this->isComplete()) {
+			return 0;
+		}
+		return $this->work($model_objects_to_identify);
+	}
 
-    /**
-     * Gets the IDs of completely identified model objects that can be deleted.
-     * @since 4.10.12.p
-     * @return mixed
-     */
-    abstract public function getIds();
+	/**
+	 * Gets the IDs of completely identified model objects that can be deleted.
+	 * @since 4.10.12.p
+	 * @return mixed
+	 */
+	abstract public function getIds();
 
-    /**
-     * Make sure we encode whether its complete or not, but don't use such a long name.
-     * @since 4.10.12.p
-     * @return array
-     */
-    public function __sleep()
-    {
-        $this->c = $this->complete;
-        $this->dtm = $this->dont_traverse_models;
-        return [
-            'c',
-            'dtm'
-        ];
-    }
+	/**
+	 * Make sure we encode whether its complete or not, but don't use such a long name.
+	 * @since 4.10.12.p
+	 * @return array
+	 */
+	public function __sleep()
+	{
+		$this->c = $this->complete;
+		$this->dtm = $this->dont_traverse_models;
+		return [
+			'c',
+			'dtm'
+		];
+	}
 
-    /**
-     * Use the dynamic property to set the "complete" property.
-     * @since 4.10.12.p
-     */
-    public function __wakeup()
-    {
-        $this->complete = $this->c;
-        $this->dont_traverse_models = $this->dtm;
-    }
+	/**
+	 * Use the dynamic property to set the "complete" property.
+	 * @since 4.10.12.p
+	 */
+	public function __wakeup()
+	{
+		$this->complete = $this->c;
+		$this->dont_traverse_models = $this->dtm;
+	}
 }
 // End of file BaseNode.php
 // Location: EventEspresso\core\services\orm\tree_traversal/BaseNode.php

core/services/orm/tree_traversal/NodeGroupDao.php

Spacing +5 added lines, -5 removed lines

@@ -49,12 +49,12 @@ 
      */
     public function getModelObjNodesInGroup($code)
     {
-        if (! $code) {
+        if ( ! $code) {
             throw new Exception(esc_html__('We aren’t sure which job you are performing. Please press back in your browser and try again.', 'event_espresso'));
         }
-        $deletion_data = get_option($this->getOptionPrefix() . $code, []);
+        $deletion_data = get_option($this->getOptionPrefix().$code, []);
         foreach ($deletion_data as $root) {
-            if (! $root instanceof ModelObjNode) {
+            if ( ! $root instanceof ModelObjNode) {
                 throw new UnexpectedEntityException($root, 'ModelObjNode');
             }
         }
@@ -111,7 +111,7 @@ 
     public function persistModelObjNodesGroup($model_obj_nodes, $code)
     {
         return add_option(
-            $this->getOptionPrefix() . $code,
+            $this->getOptionPrefix().$code,
             $model_obj_nodes,
             null,
             'no'
@@ -126,7 +126,7 @@ 
      */
     public function deleteModelObjNodesInGroup($code)
     {
-        return delete_option($this->getOptionPrefix() . $code);
+        return delete_option($this->getOptionPrefix().$code);
     }
 }
 // End of file NodeGroupDao.php

Indentation +100 added lines, -100 removed lines

@@ -22,112 +22,112 @@
  */
 class NodeGroupDao
 {
-    /**
-     * @since 4.10.12.p
-     * @return mixed|void
-     */
-    public function generateGroupCode()
-    {
-        return wp_generate_password(6, false);
-    }
+	/**
+	 * @since 4.10.12.p
+	 * @return mixed|void
+	 */
+	public function generateGroupCode()
+	{
+		return wp_generate_password(6, false);
+	}
 
-    /**
-     * Gets the string we put in front of the WP Option name used to store the jobs.
-     * @since 4.10.12.p
-     * @return string
-     */
-    private function getOptionPrefix()
-    {
-        return 'ee_deletion_';
-    }
+	/**
+	 * Gets the string we put in front of the WP Option name used to store the jobs.
+	 * @since 4.10.12.p
+	 * @return string
+	 */
+	private function getOptionPrefix()
+	{
+		return 'ee_deletion_';
+	}
 
-    /**
-     * @since 4.10.12.p
-     * @param $code
-     * @return ModelObjNode[]
-     * @throws UnexpectedEntityException
-     */
-    public function getModelObjNodesInGroup($code)
-    {
-        if (! $code) {
-            throw new Exception(esc_html__('We aren’t sure which job you are performing. Please press back in your browser and try again.', 'event_espresso'));
-        }
-        $deletion_data = get_option($this->getOptionPrefix() . $code, []);
-        foreach ($deletion_data as $root) {
-            if (! $root instanceof ModelObjNode) {
-                throw new UnexpectedEntityException($root, 'ModelObjNode');
-            }
-        }
-        return $deletion_data;
-    }
+	/**
+	 * @since 4.10.12.p
+	 * @param $code
+	 * @return ModelObjNode[]
+	 * @throws UnexpectedEntityException
+	 */
+	public function getModelObjNodesInGroup($code)
+	{
+		if (! $code) {
+			throw new Exception(esc_html__('We aren’t sure which job you are performing. Please press back in your browser and try again.', 'event_espresso'));
+		}
+		$deletion_data = get_option($this->getOptionPrefix() . $code, []);
+		foreach ($deletion_data as $root) {
+			if (! $root instanceof ModelObjNode) {
+				throw new UnexpectedEntityException($root, 'ModelObjNode');
+			}
+		}
+		return $deletion_data;
+	}
 
-    /**
-     * Gets an array indicating what database rows are contained in the job.
-     * Each top-level key is a model name, and its value is an array of IDs.
-     * @since 4.10.12.p
-     * @param ModelObjNode[] $model_obj_nodes
-     * @return array
-     * @throws EE_Error
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     */
-    public function getModelsAndIdsContainedIn($model_obj_nodes)
-    {
-        $models_and_ids_to_delete = [];
-        foreach ($model_obj_nodes as $root) {
-            $models_and_ids_to_delete = array_replace_recursive($models_and_ids_to_delete, $root->getIds());
-        }
-        return $models_and_ids_to_delete;
-    }
+	/**
+	 * Gets an array indicating what database rows are contained in the job.
+	 * Each top-level key is a model name, and its value is an array of IDs.
+	 * @since 4.10.12.p
+	 * @param ModelObjNode[] $model_obj_nodes
+	 * @return array
+	 * @throws EE_Error
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 */
+	public function getModelsAndIdsContainedIn($model_obj_nodes)
+	{
+		$models_and_ids_to_delete = [];
+		foreach ($model_obj_nodes as $root) {
+			$models_and_ids_to_delete = array_replace_recursive($models_and_ids_to_delete, $root->getIds());
+		}
+		return $models_and_ids_to_delete;
+	}
 
-    /**
-     * Gets an array indicating what database rows are contained in the job.
-     * Each top-level key is a model name, and its value is an array of IDs.
-     * @since 4.10.12.p
-     * @param string $code
-     * @return array
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     * @throws UnexpectedEntityException
-     */
-    public function getModelsAndIdsFromGroup($code)
-    {
-        $model_obj_nodes = $this->getModelObjNodesInGroup($code);
-        return $this->getModelsAndIdsContainedIn($model_obj_nodes);
-    }
+	/**
+	 * Gets an array indicating what database rows are contained in the job.
+	 * Each top-level key is a model name, and its value is an array of IDs.
+	 * @since 4.10.12.p
+	 * @param string $code
+	 * @return array
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 * @throws UnexpectedEntityException
+	 */
+	public function getModelsAndIdsFromGroup($code)
+	{
+		$model_obj_nodes = $this->getModelObjNodesInGroup($code);
+		return $this->getModelsAndIdsContainedIn($model_obj_nodes);
+	}
 
-    /**
-     * Persists the ModelObjNodes for future requests, using the code for reference.
-     * @since 4.10.12.p
-     * @param ModelObjNode[] $model_obj_nodes
-     * @param string $code
-     * @return bool
-     */
-    public function persistModelObjNodesGroup($model_obj_nodes, $code)
-    {
-        return add_option(
-            $this->getOptionPrefix() . $code,
-            $model_obj_nodes,
-            null,
-            'no'
-        );
-    }
+	/**
+	 * Persists the ModelObjNodes for future requests, using the code for reference.
+	 * @since 4.10.12.p
+	 * @param ModelObjNode[] $model_obj_nodes
+	 * @param string $code
+	 * @return bool
+	 */
+	public function persistModelObjNodesGroup($model_obj_nodes, $code)
+	{
+		return add_option(
+			$this->getOptionPrefix() . $code,
+			$model_obj_nodes,
+			null,
+			'no'
+		);
+	}
 
-    /**
-     * Forgets about the group of ModelObjNodes. Doesn't delete the rows in the database they reference though.
-     * @since 4.10.12.p
-     * @param $code
-     * @return bool
-     */
-    public function deleteModelObjNodesInGroup($code)
-    {
-        return delete_option($this->getOptionPrefix() . $code);
-    }
+	/**
+	 * Forgets about the group of ModelObjNodes. Doesn't delete the rows in the database they reference though.
+	 * @since 4.10.12.p
+	 * @param $code
+	 * @return bool
+	 */
+	public function deleteModelObjNodesInGroup($code)
+	{
+		return delete_option($this->getOptionPrefix() . $code);
+	}
 }
 // End of file NodeGroupDao.php
 // Location: EventEspresso\core\services\orm\tree_traversal/NodeGroupDao.php

core/libraries/batch/JobHandlers/ExecuteBatchDeletion.php

Indentation +148 added lines, -148 removed lines

@@ -32,158 +32,158 @@
  */
 class ExecuteBatchDeletion extends JobHandler
 {
-    /**
-     * @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;
-    }
+	/**
+	 * @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;
+	}
 
 
-    // phpcs:disable PSR1.Methods.CamelCapsMethodName.NotCamelCaps
-    /**
-     *
-     * @param JobParameters $job_parameters
-     * @throws BatchRequestException
-     * @return JobStepResponse
-     */
-    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 $model_name => $ids) {
-            $job_size += count($ids);
-        }
-        $job_parameters->set_job_size($job_size);
-        return new JobStepResponse(
-            $job_parameters,
-            esc_html__('Beginning to delete items...', 'event_espresso')
-        );
-    }
+	// phpcs:disable PSR1.Methods.CamelCapsMethodName.NotCamelCaps
+	/**
+	 *
+	 * @param JobParameters $job_parameters
+	 * @throws BatchRequestException
+	 * @return JobStepResponse
+	 */
+	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 $model_name => $ids) {
+			$job_size += count($ids);
+		}
+		$job_parameters->set_job_size($job_size);
+		return new JobStepResponse(
+			$job_parameters,
+			esc_html__('Beginning to delete items...', 'event_espresso')
+		);
+	}
 
-    /**
-     * Performs another step of the job
-     * @param JobParameters $job_parameters
-     * @param int $batch_size
-     * @return JobStepResponse
-     * @throws BatchRequestException
-     */
-    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 ] = $models_and_ids_to_delete[ $model_name ];
-            }
-        }
-        $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,
-                esc_html__('Deletion complete.', 'event_espresso')
-            );
-        }
-        $job_parameters->add_extra_data('models_and_ids_to_delete', $models_and_ids_remaining);
-        return new JobStepResponse(
-            $job_parameters,
-            sprintf(
-                esc_html__('Deleted %d items.', 'event_espresso'),
-                $units_processed
-            )
-        );
-    }
+	/**
+	 * Performs another step of the job
+	 * @param JobParameters $job_parameters
+	 * @param int $batch_size
+	 * @return JobStepResponse
+	 * @throws BatchRequestException
+	 */
+	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 ] = $models_and_ids_to_delete[ $model_name ];
+			}
+		}
+		$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,
+				esc_html__('Deletion complete.', 'event_espresso')
+			);
+		}
+		$job_parameters->add_extra_data('models_and_ids_to_delete', $models_and_ids_remaining);
+		return new JobStepResponse(
+			$job_parameters,
+			sprintf(
+				esc_html__('Deleted %d items.', 'event_espresso'),
+				$units_processed
+			)
+		);
+	}
 
-    /**
-     * 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->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);
-        }
-        return new JobStepResponse(
-            $job_parameters,
-            esc_html__('All done', 'event_espresso')
-        );
-    }
+	/**
+	 * 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->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);
+		}
+		return new JobStepResponse(
+			$job_parameters,
+			esc_html__('All done', 'event_espresso')
+		);
+	}
 }
 // End of file EventDeletion.php
 // Location: EventEspressoBatchRequest\JobHandlers/EventDeletion.php

Spacing +4 added lines, -4 removed lines

@@ -58,7 +58,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());
@@ -112,7 +112,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!
@@ -128,10 +128,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 ] = $models_and_ids_to_delete[ $model_name ];
+                $models_and_ids_remaining[$model_name] = $models_and_ids_to_delete[$model_name];
             }
         }
         $job_parameters->mark_processed($units_processed);

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

Spacing +4 added lines, -4 removed lines

@@ -89,17 +89,17 @@ 
         $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 = isset($models_and_ids_to_delete['Event']) ? $models_and_ids_to_delete['Event'] : array();
-        if (empty($event_ids) || !is_array($event_ids)) {
+        if (empty($event_ids) || ! is_array($event_ids)) {
             throw new EE_Error(
                 esc_html__('No Events were found to delete.', 'event_espresso')
             );
         }
         $datetime_ids = isset($models_and_ids_to_delete['Datetime']) ? $models_and_ids_to_delete['Datetime'] : array();
-        if (!is_array($datetime_ids)) {
+        if ( ! is_array($datetime_ids)) {
             throw new UnexpectedEntityException($datetime_ids, 'array');
         }
         $registration_ids = isset($models_and_ids_to_delete['Registration']) ? $models_and_ids_to_delete['Registration'] : array();
-        if (!is_array($registration_ids)) {
+        if ( ! is_array($registration_ids)) {
             throw new UnexpectedEntityException($registration_ids, 'array');
         }
         $num_registrations_to_show = 10;
@@ -135,7 +135,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,

Indentation +116 added lines, -116 removed lines

@@ -31,127 +31,127 @@
  */
 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.
-     * @since 4.10.12.p
-     * @param $request_data
-     * @param $admin_base_url
-     * @return array
-     * @throws UnexpectedEntityException
-     * @throws DomainException
-     * @throws EE_Error
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     */
-    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);
-        $event_ids = isset($models_and_ids_to_delete['Event']) ? $models_and_ids_to_delete['Event'] : array();
-        if (empty($event_ids) || !is_array($event_ids)) {
-            throw new EE_Error(
-                esc_html__('No Events were found to delete.', 'event_espresso')
-            );
-        }
-        $datetime_ids = isset($models_and_ids_to_delete['Datetime']) ? $models_and_ids_to_delete['Datetime'] : array();
-        if (!is_array($datetime_ids)) {
-            throw new UnexpectedEntityException($datetime_ids, 'array');
-        }
-        $registration_ids = isset($models_and_ids_to_delete['Registration']) ? $models_and_ids_to_delete['Registration'] : array();
-        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.
+	 * @since 4.10.12.p
+	 * @param $request_data
+	 * @param $admin_base_url
+	 * @return array
+	 * @throws UnexpectedEntityException
+	 * @throws DomainException
+	 * @throws EE_Error
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 */
+	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);
+		$event_ids = isset($models_and_ids_to_delete['Event']) ? $models_and_ids_to_delete['Event'] : array();
+		if (empty($event_ids) || !is_array($event_ids)) {
+			throw new EE_Error(
+				esc_html__('No Events were found to delete.', 'event_espresso')
+			);
+		}
+		$datetime_ids = isset($models_and_ids_to_delete['Datetime']) ? $models_and_ids_to_delete['Datetime'] : array();
+		if (!is_array($datetime_ids)) {
+			throw new UnexpectedEntityException($datetime_ids, 'array');
+		}
+		$registration_ids = isset($models_and_ids_to_delete['Registration']) ? $models_and_ids_to_delete['Registration'] : array();
+		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