eventespresso / event-espresso-core

core/libraries/shortcodes/EE_Primary_Registration_Details_Shortcodes.lib.php

Indentation +192 added lines, -192 removed lines

@@ -19,200 +19,200 @@
 {
 
 
-    protected function _init_props()
-    {
-        $this->label = __('Primary_Registration Details Shortcodes', 'event_espresso');
-        $this->description = __('All shortcodes specific primary registrant data', 'event_espresso');
-        $this->_shortcodes = array(
-            '[PRIMARY_REGISTRANT_FNAME]'                  => __(
-                'Parses to the first name of the primary registration for the transaction.',
-                'event_espresso'
-            ),
-            '[PRIMARY_REGISTRANT_LNAME]'                  => __(
-                'Parses to the last name of the primary registration for the transaction.',
-                'event_espresso'
-            ),
-            '[PRIMARY_REGISTRANT_EMAIL]'                  => __(
-                'Parses to the email address of the primary registration for the transaction.',
-                'event_espresso'
-            ),
-            '[PRIMARY_REGISTRANT_REGISTRATION_ID]'        => __(
-                'Parses to the registration ID of the primary registrant for the transaction.',
-                'event_espresso'
-            ),
-            '[PRIMARY_REGISTRANT_REGISTRATION_CODE]'      => __(
-                'Parses to the registration code of the primary registrant for the transaction.',
-                'event_espresso'
-            ),
-            '[PRIMARY_REGISTRANT_PHONE_NUMBER]'           => __(
-                'The Phone Number for the primary registrant for the transaction.',
-                'event_espresso'
-            ),
-            '[PRIMARY_REGISTRANT_ADDRESS]'                => __(
-                'The Address for the primary registrant for the transaction.',
-                'event_espresso'
-            ),
-            '[PRIMARY_REGISTRANT_ADDRESS2]'               => __(
-                'Whatever was in the address 2 field for the primary registrant for the transaction.',
-                'event_espresso'
-            ),
-            '[PRIMARY_REGISTRANT_CITY]'                   => __(
-                'The city for the primary registrant for the transaction.',
-                'event_espresso'
-            ),
-            '[PRIMARY_REGISTRANT_ZIP_PC]'                 => __(
-                'The ZIP (or Postal) Code for the primary registrant for the transaction.',
-                'event_espresso'
-            ),
-            '[PRIMARY_REGISTRANT_ADDRESS_STATE]'          => __(
-                'The state/province for the primary registrant for the transaction.',
-                'event_espresso'
-            ),
-            '[PRIMARY_REGISTRANT_COUNTRY]'                => __(
-                'The country for the primary registrant for the transaction.',
-                'event_espresso'
-            ),
-            '[PRIMARY_REGISTRANT_REGISTRATION_DATE]'      => __(
-                'The date the registration occured for the primary registration.',
-                'event_espresso'
-            ),
-            '[PRIMARY_REGISTRANT_FRONTEND_EDIT_REG_LINK]' => __(
-                'Generates a link for the given registration to edit this registration details on the frontend.',
-                'event_espresso'
-            ),
-            '[PRIMARY_REGISTRANT_ANSWER_*]'               => __(
-                'This is a special dynamic shortcode.  After the "*", add the exact text of an existing question, and if there is an answer for that question for this primary registrant, then it will be output in place of this shortcode.',
-                'event_espresso'
-            ),
-        );
-    }
-
-
-    protected function _parser($shortcode)
-    {
-        // make sure we end up with a copy of the EE_Messages_Addressee object
-        $primary_registration = $this->_data instanceof EE_Messages_Addressee ? $this->_data : null;
-        $primary_registration = ! $primary_registration instanceof EE_Messages_Addressee && is_array(
-            $this->_data
-        ) && isset($this->_data['data']) && $this->_data['data'] instanceof EE_Messages_Addressee ? $this->_data['data']
-            : $primary_registration;
-        $primary_registration = ! $primary_registration instanceof EE_Messages_Addressee && ! empty($this->_extra_data['data']) && $this->_extra_data['data'] instanceof EE_Messages_Addressee
-            ? $this->_extra_data['data'] : $primary_registration;
-
-        if (! $primary_registration instanceof EE_Messages_Addressee) {
-            return '';
-        }
-
-        $attendee = $primary_registration->primary_att_obj;
-        $primary_reg = $primary_registration->primary_reg_obj;
-
-        if (! $attendee instanceof EE_Attendee || ! $primary_reg instanceof EE_Registration) {
-            return '';
-        }
-
-        switch ($shortcode) {
-            case '[PRIMARY_REGISTRANT_FNAME]':
-                return $attendee->fname();
-                break;
-
-            case '[PRIMARY_REGISTRANT_LNAME]':
-                return $attendee->lname();
-                break;
-
-            case '[PRIMARY_REGISTRANT_EMAIL]':
-                return $attendee->email();
-                break;
-
-            case '[PRIMARY_REGISTRANT_REGISTRATION_ID]':
-                return $primary_reg->ID();
-                break;
-
-            case '[PRIMARY_REGISTRANT_REGISTRATION_CODE]':
-                return $primary_reg->reg_code();
-                break;
-
-            case '[PRIMARY_REGISTRANT_PHONE_NUMBER]':
-                return $attendee->phone();
-                break;
-
-            case '[PRIMARY_REGISTRANT_ADDRESS]':
-                return $attendee->address();
-                break;
-
-            case '[PRIMARY_REGISTRANT_ADDRESS2]':
-                return $attendee->address2();
-                break;
-
-            case '[PRIMARY_REGISTRANT_CITY]':
-                return $attendee->city();
-                break;
-
-            case '[PRIMARY_REGISTRANT_ZIP_PC]':
-                return $attendee->zip();
-                break;
-
-            case '[PRIMARY_REGISTRANT_ADDRESS_STATE]':
-                $state_obj = $attendee->state_obj();
-                return $state_obj instanceof EE_State ? $state_obj->name() : '';
-                break;
-
-            case '[PRIMARY_REGISTRANT_COUNTRY]':
-                $country_obj = $attendee->country_obj();
-                return $country_obj instanceof EE_Country ? $country_obj->name() : '';
-                break;
-
-            case '[PRIMARY_REGISTRANT_REGISTRATION_DATE]':
-                if (! $primary_registration->primary_reg_obj instanceof EE_Registration) {
-                    return '';
-                }
-                return $primary_registration->primary_reg_obj->get_i18n_datetime('REG_date', get_option('date_format'));
-                break;
-
-            case '[PRIMARY_REGISTRANT_FRONTEND_EDIT_REG_LINK]':
-                return $primary_reg->edit_attendee_information_url();
-                break;
-        }
-
-        if (strpos($shortcode, '[PRIMARY_REGISTRANT_ANSWER_*') !== false) {
-            $shortcode = str_replace('[PRIMARY_REGISTRANT_ANSWER_*', '', $shortcode);
-            $shortcode = trim(str_replace(']', '', $shortcode));
-
-
-            // now let's figure out what question has this text
-            if (empty($primary_registration->questions)) {
-                return '';
-            }
-
-            foreach ($primary_registration->questions as $ansid => $question) {
-                if ($question instanceof EE_Question
-                    && trim($question->get('QST_display_text')) === trim($shortcode)
-                    && isset($primary_registration->registrations[ $primary_reg->ID() ]['ans_objs'][ $ansid ])
-                ) {
-                    $primary_reg_ansid = $primary_registration->registrations[ $primary_reg->ID() ]['ans_objs'][ $ansid ];
+	protected function _init_props()
+	{
+		$this->label = __('Primary_Registration Details Shortcodes', 'event_espresso');
+		$this->description = __('All shortcodes specific primary registrant data', 'event_espresso');
+		$this->_shortcodes = array(
+			'[PRIMARY_REGISTRANT_FNAME]'                  => __(
+				'Parses to the first name of the primary registration for the transaction.',
+				'event_espresso'
+			),
+			'[PRIMARY_REGISTRANT_LNAME]'                  => __(
+				'Parses to the last name of the primary registration for the transaction.',
+				'event_espresso'
+			),
+			'[PRIMARY_REGISTRANT_EMAIL]'                  => __(
+				'Parses to the email address of the primary registration for the transaction.',
+				'event_espresso'
+			),
+			'[PRIMARY_REGISTRANT_REGISTRATION_ID]'        => __(
+				'Parses to the registration ID of the primary registrant for the transaction.',
+				'event_espresso'
+			),
+			'[PRIMARY_REGISTRANT_REGISTRATION_CODE]'      => __(
+				'Parses to the registration code of the primary registrant for the transaction.',
+				'event_espresso'
+			),
+			'[PRIMARY_REGISTRANT_PHONE_NUMBER]'           => __(
+				'The Phone Number for the primary registrant for the transaction.',
+				'event_espresso'
+			),
+			'[PRIMARY_REGISTRANT_ADDRESS]'                => __(
+				'The Address for the primary registrant for the transaction.',
+				'event_espresso'
+			),
+			'[PRIMARY_REGISTRANT_ADDRESS2]'               => __(
+				'Whatever was in the address 2 field for the primary registrant for the transaction.',
+				'event_espresso'
+			),
+			'[PRIMARY_REGISTRANT_CITY]'                   => __(
+				'The city for the primary registrant for the transaction.',
+				'event_espresso'
+			),
+			'[PRIMARY_REGISTRANT_ZIP_PC]'                 => __(
+				'The ZIP (or Postal) Code for the primary registrant for the transaction.',
+				'event_espresso'
+			),
+			'[PRIMARY_REGISTRANT_ADDRESS_STATE]'          => __(
+				'The state/province for the primary registrant for the transaction.',
+				'event_espresso'
+			),
+			'[PRIMARY_REGISTRANT_COUNTRY]'                => __(
+				'The country for the primary registrant for the transaction.',
+				'event_espresso'
+			),
+			'[PRIMARY_REGISTRANT_REGISTRATION_DATE]'      => __(
+				'The date the registration occured for the primary registration.',
+				'event_espresso'
+			),
+			'[PRIMARY_REGISTRANT_FRONTEND_EDIT_REG_LINK]' => __(
+				'Generates a link for the given registration to edit this registration details on the frontend.',
+				'event_espresso'
+			),
+			'[PRIMARY_REGISTRANT_ANSWER_*]'               => __(
+				'This is a special dynamic shortcode.  After the "*", add the exact text of an existing question, and if there is an answer for that question for this primary registrant, then it will be output in place of this shortcode.',
+				'event_espresso'
+			),
+		);
+	}
+
+
+	protected function _parser($shortcode)
+	{
+		// make sure we end up with a copy of the EE_Messages_Addressee object
+		$primary_registration = $this->_data instanceof EE_Messages_Addressee ? $this->_data : null;
+		$primary_registration = ! $primary_registration instanceof EE_Messages_Addressee && is_array(
+			$this->_data
+		) && isset($this->_data['data']) && $this->_data['data'] instanceof EE_Messages_Addressee ? $this->_data['data']
+			: $primary_registration;
+		$primary_registration = ! $primary_registration instanceof EE_Messages_Addressee && ! empty($this->_extra_data['data']) && $this->_extra_data['data'] instanceof EE_Messages_Addressee
+			? $this->_extra_data['data'] : $primary_registration;
+
+		if (! $primary_registration instanceof EE_Messages_Addressee) {
+			return '';
+		}
+
+		$attendee = $primary_registration->primary_att_obj;
+		$primary_reg = $primary_registration->primary_reg_obj;
+
+		if (! $attendee instanceof EE_Attendee || ! $primary_reg instanceof EE_Registration) {
+			return '';
+		}
+
+		switch ($shortcode) {
+			case '[PRIMARY_REGISTRANT_FNAME]':
+				return $attendee->fname();
+				break;
+
+			case '[PRIMARY_REGISTRANT_LNAME]':
+				return $attendee->lname();
+				break;
+
+			case '[PRIMARY_REGISTRANT_EMAIL]':
+				return $attendee->email();
+				break;
+
+			case '[PRIMARY_REGISTRANT_REGISTRATION_ID]':
+				return $primary_reg->ID();
+				break;
+
+			case '[PRIMARY_REGISTRANT_REGISTRATION_CODE]':
+				return $primary_reg->reg_code();
+				break;
+
+			case '[PRIMARY_REGISTRANT_PHONE_NUMBER]':
+				return $attendee->phone();
+				break;
+
+			case '[PRIMARY_REGISTRANT_ADDRESS]':
+				return $attendee->address();
+				break;
+
+			case '[PRIMARY_REGISTRANT_ADDRESS2]':
+				return $attendee->address2();
+				break;
+
+			case '[PRIMARY_REGISTRANT_CITY]':
+				return $attendee->city();
+				break;
+
+			case '[PRIMARY_REGISTRANT_ZIP_PC]':
+				return $attendee->zip();
+				break;
+
+			case '[PRIMARY_REGISTRANT_ADDRESS_STATE]':
+				$state_obj = $attendee->state_obj();
+				return $state_obj instanceof EE_State ? $state_obj->name() : '';
+				break;
+
+			case '[PRIMARY_REGISTRANT_COUNTRY]':
+				$country_obj = $attendee->country_obj();
+				return $country_obj instanceof EE_Country ? $country_obj->name() : '';
+				break;
+
+			case '[PRIMARY_REGISTRANT_REGISTRATION_DATE]':
+				if (! $primary_registration->primary_reg_obj instanceof EE_Registration) {
+					return '';
+				}
+				return $primary_registration->primary_reg_obj->get_i18n_datetime('REG_date', get_option('date_format'));
+				break;
+
+			case '[PRIMARY_REGISTRANT_FRONTEND_EDIT_REG_LINK]':
+				return $primary_reg->edit_attendee_information_url();
+				break;
+		}
+
+		if (strpos($shortcode, '[PRIMARY_REGISTRANT_ANSWER_*') !== false) {
+			$shortcode = str_replace('[PRIMARY_REGISTRANT_ANSWER_*', '', $shortcode);
+			$shortcode = trim(str_replace(']', '', $shortcode));
+
+
+			// now let's figure out what question has this text
+			if (empty($primary_registration->questions)) {
+				return '';
+			}
+
+			foreach ($primary_registration->questions as $ansid => $question) {
+				if ($question instanceof EE_Question
+					&& trim($question->get('QST_display_text')) === trim($shortcode)
+					&& isset($primary_registration->registrations[ $primary_reg->ID() ]['ans_objs'][ $ansid ])
+				) {
+					$primary_reg_ansid = $primary_registration->registrations[ $primary_reg->ID() ]['ans_objs'][ $ansid ];
                     
-                    // what we show for the answer depends on the question type!
-                    switch ($question->get('QST_type')) {
-                        case EEM_Question::QST_type_state:
-                            $state = EEM_State::instance()->get_one_by_ID($primary_reg_ansid->get('ANS_value'));
-                            $answer = $state instanceof EE_State ? $state->name() : '';
-                            break;
+					// what we show for the answer depends on the question type!
+					switch ($question->get('QST_type')) {
+						case EEM_Question::QST_type_state:
+							$state = EEM_State::instance()->get_one_by_ID($primary_reg_ansid->get('ANS_value'));
+							$answer = $state instanceof EE_State ? $state->name() : '';
+							break;
     
-                        case EEM_Question::QST_type_country:
-                            $country = EEM_Country::instance()->get_one_by_ID($primary_reg_ansid->get('ANS_value'));
-                            $answer = $country instanceof EE_Country ? $country->name() : '';
-                            break;
+						case EEM_Question::QST_type_country:
+							$country = EEM_Country::instance()->get_one_by_ID($primary_reg_ansid->get('ANS_value'));
+							$answer = $country instanceof EE_Country ? $country->name() : '';
+							break;
     
-                        default:
-                            $answer = $primary_reg_ansid->get_pretty('ANS_value', 'no_wpautop');
-                            break;
-                    }
+						default:
+							$answer = $primary_reg_ansid->get_pretty('ANS_value', 'no_wpautop');
+							break;
+					}
                     
-                    return $answer;
-                    break;
-                }
-            }
-        }
-
-        return '';
-    }
+					return $answer;
+					break;
+				}
+			}
+		}
+
+		return '';
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -99,14 +99,14 @@ 
         $primary_registration = ! $primary_registration instanceof EE_Messages_Addressee && ! empty($this->_extra_data['data']) && $this->_extra_data['data'] instanceof EE_Messages_Addressee
             ? $this->_extra_data['data'] : $primary_registration;
 
-        if (! $primary_registration instanceof EE_Messages_Addressee) {
+        if ( ! $primary_registration instanceof EE_Messages_Addressee) {
             return '';
         }
 
         $attendee = $primary_registration->primary_att_obj;
         $primary_reg = $primary_registration->primary_reg_obj;
 
-        if (! $attendee instanceof EE_Attendee || ! $primary_reg instanceof EE_Registration) {
+        if ( ! $attendee instanceof EE_Attendee || ! $primary_reg instanceof EE_Registration) {
             return '';
         }
 
@@ -162,7 +162,7 @@ 
                 break;
 
             case '[PRIMARY_REGISTRANT_REGISTRATION_DATE]':
-                if (! $primary_registration->primary_reg_obj instanceof EE_Registration) {
+                if ( ! $primary_registration->primary_reg_obj instanceof EE_Registration) {
                     return '';
                 }
                 return $primary_registration->primary_reg_obj->get_i18n_datetime('REG_date', get_option('date_format'));
@@ -186,9 +186,9 @@ 
             foreach ($primary_registration->questions as $ansid => $question) {
                 if ($question instanceof EE_Question
                     && trim($question->get('QST_display_text')) === trim($shortcode)
-                    && isset($primary_registration->registrations[ $primary_reg->ID() ]['ans_objs'][ $ansid ])
+                    && isset($primary_registration->registrations[$primary_reg->ID()]['ans_objs'][$ansid])
                 ) {
-                    $primary_reg_ansid = $primary_registration->registrations[ $primary_reg->ID() ]['ans_objs'][ $ansid ];
+                    $primary_reg_ansid = $primary_registration->registrations[$primary_reg->ID()]['ans_objs'][$ansid];
                     
                     // what we show for the answer depends on the question type!
                     switch ($question->get('QST_type')) {

core/libraries/shortcodes/EE_Recipient_Details_Shortcodes.lib.php

Indentation +346 added lines, -346 removed lines

@@ -19,354 +19,354 @@
 class EE_Recipient_Details_Shortcodes extends EE_Shortcodes
 {
 
-    protected $_recipient;
-
-    protected $_registrations_for_recipient;
-
-
-    protected function _init_props()
-    {
-        $this->label = esc_html__('Recipient Details Shortcodes', 'event_espresso');
-        $this->description = esc_html__('All shortcodes specific to recipient registration data', 'event_espresso');
-        $this->_shortcodes = array(
-            '[RECIPIENT_FNAME]'                  => esc_html__(
-                'Parses to the first name of the recipient for the message.',
-                'event_espresso'
-            ),
-            '[RECIPIENT_LNAME]'                  => esc_html__(
-                'Parses to the last name of the recipient for the message.',
-                'event_espresso'
-            ),
-            '[RECIPIENT_EMAIL]'                  => esc_html__(
-                'Parses to the email address of the recipient for the message.',
-                'event_espresso'
-            ),
-            '[RECIPIENT_REGISTRATION_ID]'        => esc_html__(
-                'Parses to the registration ID of the recipient for the message.',
-                'event_espresso'
-            ),
-            '[RECIPIENT_REGISTRATION_CODE]'      => esc_html__(
-                'Parses to the registration code of the recipient for the message.',
-                'event_espresso'
-            ),
-            '[RECIPIENT_EDIT_REGISTRATION_LINK]' => esc_html__(
-                'Parses to a link for frontend editing of the registration for the recipient.',
-                'event_espresso'
-            ),
-            '[RECIPIENT_PHONE_NUMBER]'           => esc_html__(
-                'The Phone Number for the recipient of the message.',
-                'event_espresso'
-            ),
-            '[RECIPIENT_ADDRESS]'                => esc_html__(
-                'The Address for the recipient of the message.',
-                'event_espresso'
-            ),
-            '[RECIPIENT_ADDRESS2]'               => esc_html__(
-                'Whatever was in the address 2 field for the recipient of the message.',
-                'event_espresso'
-            ),
-            '[RECIPIENT_CITY]'                   => esc_html__(
-                'The city for the recipient of the message.',
-                'event_espresso'
-            ),
-            '[RECIPIENT_ZIP_PC]'                 => esc_html__(
-                'The ZIP (or Postal) Code for the recipient of the message.',
-                'event_espresso'
-            ),
-            '[RECIPIENT_ADDRESS_STATE]'          => esc_html__(
-                'The state/province for the recipient of the message.',
-                'event_espresso'
-            ),
-            '[RECIPIENT_COUNTRY]'                => esc_html__(
-                'The country for the recipient of the message.',
-                'event_espresso'
-            ),
-            '[RECIPIENT_ANSWER_*]'               => esc_html__(
-                'This is a special dynamic shortcode.  After the "*", add the exact text of an existing question, and if there is an answer for that question for this recipient, then it will be output in place of this shortcode.',
-                'event_espresso'
-            ),
-            '[RECIPIENT_TOTAL_AMOUNT_PAID]'      => esc_html__(
-                'If a single registration related to the recipient is available, that is used to retrieve the total amount that has been paid for this recipient.  Otherwise the value of 0 is printed.',
-                'event_espresso'
-            ),
-        );
-    }
-
-
-    /**
-     * @access protected
-     * @param  string $shortcode the shortcode to be parsed.
-     * @return string parsed shortcode
-     */
-    protected function _parser($shortcode)
-    {
-
-        // make sure we end up with a copy of the EE_Messages_Addressee object
-        $this->_recipient = $this->_data instanceof EE_Messages_Addressee ? $this->_data : null;
-        $this->_recipient = ! $this->_recipient instanceof EE_Messages_Addressee
-                            && is_array($this->_data)
-                            && isset($this->_data['data'])
-                            && $this->_data['data'] instanceof EE_Messages_Addressee
-            ? $this->_data['data']
-            :
-            $this->_recipient;
-        $this->_recipient = ! $this->_recipient instanceof EE_Messages_Addressee
-                            && ! empty($this->_extra_data['data'])
-                            && $this->_extra_data['data'] instanceof EE_Messages_Addressee
-            ? $this->_extra_data['data']
-            : $this->_recipient;
-
-        if (! $this->_recipient instanceof EE_Messages_Addressee) {
-            return '';
-        }
-
-        $attendee = $this->_recipient->att_obj;
-        if (! $attendee instanceof EE_Attendee) {
-            return '';
-        }
-
-        $this->_registrations_for_recipient = isset($this->_recipient->attendees[ $attendee->ID() ]['reg_objs'])
-            ? $this->_recipient->attendees[ $attendee->ID() ]['reg_objs']
-            : array();
-
-        switch ($shortcode) {
-            case '[RECIPIENT_FNAME]':
-                return $attendee->fname();
-                break;
-
-            case '[RECIPIENT_LNAME]':
-                return $attendee->lname();
-                break;
-
-            case '[RECIPIENT_EMAIL]':
-                return $attendee->email();
-                break;
-
-            case '[RECIPIENT_REGISTRATION_ID]':
-                if (! $this->_recipient->reg_obj instanceof EE_Registration) {
-                    return '';
-                }
-                return $this->_get_reg_id();
-                break;
-
-            case '[RECIPIENT_REGISTRATION_CODE]':
-                if (! $this->_recipient->reg_obj instanceof EE_Registration) {
-                    return '';
-                }
-                return $this->_get_reg_code();
-                break;
-
-            case '[RECIPIENT_EDIT_REGISTRATION_LINK]':
-                if (! $this->_recipient->reg_obj instanceof EE_Registration) {
-                    return '';
-                }
-                return $this->_recipient->reg_obj->edit_attendee_information_url();
-                break;
-
-            case '[RECIPIENT_PHONE_NUMBER]':
-                return $attendee->phone();
-                break;
-
-            case '[RECIPIENT_ADDRESS]':
-                return $attendee->address();
-                break;
-
-            case '[RECIPIENT_ADDRESS2]':
-                return $attendee->address2();
-                break;
-
-            case '[RECIPIENT_CITY]':
-                return $attendee->city();
-                break;
-
-            case '[RECIPIENT_ZIP_PC]':
-                return $attendee->zip();
-                break;
-
-            case '[RECIPIENT_ADDRESS_STATE]':
-                $state_obj = $attendee->state_obj();
-                return $state_obj instanceof EE_State ? $state_obj->name() : '';
-                break;
-
-            case '[RECIPIENT_COUNTRY]':
-                $country_obj = $attendee->country_obj();
-                return $country_obj instanceof EE_Country ? $country_obj->name() : '';
-                break;
-            case '[RECIPIENT_TOTAL_AMOUNT_PAID]':
-                return $this->_recipient->reg_obj instanceof EE_Registration
-                    ? $this->_recipient->reg_obj->pretty_paid()
-                    : 0;
-                break;
-        }
-
-        if (strpos($shortcode, '[RECIPIENT_ANSWER_*') !== false) {
-            $shortcode = str_replace('[RECIPIENT_ANSWER_*', '', $shortcode);
-            $shortcode = trim(str_replace(']', '', $shortcode));
-
-
-            // now let's figure out what question has this text
-            if (empty($this->_recipient->questions) || ! $this->_recipient->reg_obj instanceof EE_Registration) {
-                return '';
-            }
-
-            foreach ($this->_recipient->questions as $ansid => $question) {
-                if ($question instanceof EE_Question
-                    && trim($question->display_text()) === trim($shortcode)
-                    && isset($this->_recipient->registrations[ $this->_recipient->reg_obj->ID() ]['ans_objs'][ $ansid ])
-                ) {
-                    $recipient_ansid = $this->_recipient->registrations[ $this->_recipient->reg_obj->ID() ]['ans_objs'][ $ansid ];
+	protected $_recipient;
+
+	protected $_registrations_for_recipient;
+
+
+	protected function _init_props()
+	{
+		$this->label = esc_html__('Recipient Details Shortcodes', 'event_espresso');
+		$this->description = esc_html__('All shortcodes specific to recipient registration data', 'event_espresso');
+		$this->_shortcodes = array(
+			'[RECIPIENT_FNAME]'                  => esc_html__(
+				'Parses to the first name of the recipient for the message.',
+				'event_espresso'
+			),
+			'[RECIPIENT_LNAME]'                  => esc_html__(
+				'Parses to the last name of the recipient for the message.',
+				'event_espresso'
+			),
+			'[RECIPIENT_EMAIL]'                  => esc_html__(
+				'Parses to the email address of the recipient for the message.',
+				'event_espresso'
+			),
+			'[RECIPIENT_REGISTRATION_ID]'        => esc_html__(
+				'Parses to the registration ID of the recipient for the message.',
+				'event_espresso'
+			),
+			'[RECIPIENT_REGISTRATION_CODE]'      => esc_html__(
+				'Parses to the registration code of the recipient for the message.',
+				'event_espresso'
+			),
+			'[RECIPIENT_EDIT_REGISTRATION_LINK]' => esc_html__(
+				'Parses to a link for frontend editing of the registration for the recipient.',
+				'event_espresso'
+			),
+			'[RECIPIENT_PHONE_NUMBER]'           => esc_html__(
+				'The Phone Number for the recipient of the message.',
+				'event_espresso'
+			),
+			'[RECIPIENT_ADDRESS]'                => esc_html__(
+				'The Address for the recipient of the message.',
+				'event_espresso'
+			),
+			'[RECIPIENT_ADDRESS2]'               => esc_html__(
+				'Whatever was in the address 2 field for the recipient of the message.',
+				'event_espresso'
+			),
+			'[RECIPIENT_CITY]'                   => esc_html__(
+				'The city for the recipient of the message.',
+				'event_espresso'
+			),
+			'[RECIPIENT_ZIP_PC]'                 => esc_html__(
+				'The ZIP (or Postal) Code for the recipient of the message.',
+				'event_espresso'
+			),
+			'[RECIPIENT_ADDRESS_STATE]'          => esc_html__(
+				'The state/province for the recipient of the message.',
+				'event_espresso'
+			),
+			'[RECIPIENT_COUNTRY]'                => esc_html__(
+				'The country for the recipient of the message.',
+				'event_espresso'
+			),
+			'[RECIPIENT_ANSWER_*]'               => esc_html__(
+				'This is a special dynamic shortcode.  After the "*", add the exact text of an existing question, and if there is an answer for that question for this recipient, then it will be output in place of this shortcode.',
+				'event_espresso'
+			),
+			'[RECIPIENT_TOTAL_AMOUNT_PAID]'      => esc_html__(
+				'If a single registration related to the recipient is available, that is used to retrieve the total amount that has been paid for this recipient.  Otherwise the value of 0 is printed.',
+				'event_espresso'
+			),
+		);
+	}
+
+
+	/**
+	 * @access protected
+	 * @param  string $shortcode the shortcode to be parsed.
+	 * @return string parsed shortcode
+	 */
+	protected function _parser($shortcode)
+	{
+
+		// make sure we end up with a copy of the EE_Messages_Addressee object
+		$this->_recipient = $this->_data instanceof EE_Messages_Addressee ? $this->_data : null;
+		$this->_recipient = ! $this->_recipient instanceof EE_Messages_Addressee
+							&& is_array($this->_data)
+							&& isset($this->_data['data'])
+							&& $this->_data['data'] instanceof EE_Messages_Addressee
+			? $this->_data['data']
+			:
+			$this->_recipient;
+		$this->_recipient = ! $this->_recipient instanceof EE_Messages_Addressee
+							&& ! empty($this->_extra_data['data'])
+							&& $this->_extra_data['data'] instanceof EE_Messages_Addressee
+			? $this->_extra_data['data']
+			: $this->_recipient;
+
+		if (! $this->_recipient instanceof EE_Messages_Addressee) {
+			return '';
+		}
+
+		$attendee = $this->_recipient->att_obj;
+		if (! $attendee instanceof EE_Attendee) {
+			return '';
+		}
+
+		$this->_registrations_for_recipient = isset($this->_recipient->attendees[ $attendee->ID() ]['reg_objs'])
+			? $this->_recipient->attendees[ $attendee->ID() ]['reg_objs']
+			: array();
+
+		switch ($shortcode) {
+			case '[RECIPIENT_FNAME]':
+				return $attendee->fname();
+				break;
+
+			case '[RECIPIENT_LNAME]':
+				return $attendee->lname();
+				break;
+
+			case '[RECIPIENT_EMAIL]':
+				return $attendee->email();
+				break;
+
+			case '[RECIPIENT_REGISTRATION_ID]':
+				if (! $this->_recipient->reg_obj instanceof EE_Registration) {
+					return '';
+				}
+				return $this->_get_reg_id();
+				break;
+
+			case '[RECIPIENT_REGISTRATION_CODE]':
+				if (! $this->_recipient->reg_obj instanceof EE_Registration) {
+					return '';
+				}
+				return $this->_get_reg_code();
+				break;
+
+			case '[RECIPIENT_EDIT_REGISTRATION_LINK]':
+				if (! $this->_recipient->reg_obj instanceof EE_Registration) {
+					return '';
+				}
+				return $this->_recipient->reg_obj->edit_attendee_information_url();
+				break;
+
+			case '[RECIPIENT_PHONE_NUMBER]':
+				return $attendee->phone();
+				break;
+
+			case '[RECIPIENT_ADDRESS]':
+				return $attendee->address();
+				break;
+
+			case '[RECIPIENT_ADDRESS2]':
+				return $attendee->address2();
+				break;
+
+			case '[RECIPIENT_CITY]':
+				return $attendee->city();
+				break;
+
+			case '[RECIPIENT_ZIP_PC]':
+				return $attendee->zip();
+				break;
+
+			case '[RECIPIENT_ADDRESS_STATE]':
+				$state_obj = $attendee->state_obj();
+				return $state_obj instanceof EE_State ? $state_obj->name() : '';
+				break;
+
+			case '[RECIPIENT_COUNTRY]':
+				$country_obj = $attendee->country_obj();
+				return $country_obj instanceof EE_Country ? $country_obj->name() : '';
+				break;
+			case '[RECIPIENT_TOTAL_AMOUNT_PAID]':
+				return $this->_recipient->reg_obj instanceof EE_Registration
+					? $this->_recipient->reg_obj->pretty_paid()
+					: 0;
+				break;
+		}
+
+		if (strpos($shortcode, '[RECIPIENT_ANSWER_*') !== false) {
+			$shortcode = str_replace('[RECIPIENT_ANSWER_*', '', $shortcode);
+			$shortcode = trim(str_replace(']', '', $shortcode));
+
+
+			// now let's figure out what question has this text
+			if (empty($this->_recipient->questions) || ! $this->_recipient->reg_obj instanceof EE_Registration) {
+				return '';
+			}
+
+			foreach ($this->_recipient->questions as $ansid => $question) {
+				if ($question instanceof EE_Question
+					&& trim($question->display_text()) === trim($shortcode)
+					&& isset($this->_recipient->registrations[ $this->_recipient->reg_obj->ID() ]['ans_objs'][ $ansid ])
+				) {
+					$recipient_ansid = $this->_recipient->registrations[ $this->_recipient->reg_obj->ID() ]['ans_objs'][ $ansid ];
                     
-                    // what we show for the answer depends on the question type!
-                    switch ($question->get('QST_type')) {
-                        case EEM_Question::QST_type_state:
-                            $state = EEM_State::instance()->get_one_by_ID($recipient_ansid->get('ANS_value'));
-                            $answer = $state instanceof EE_State ? $state->name() : '';
-                            break;
+					// what we show for the answer depends on the question type!
+					switch ($question->get('QST_type')) {
+						case EEM_Question::QST_type_state:
+							$state = EEM_State::instance()->get_one_by_ID($recipient_ansid->get('ANS_value'));
+							$answer = $state instanceof EE_State ? $state->name() : '';
+							break;
     
-                        case EEM_Question::QST_type_country:
-                            $country = EEM_Country::instance()->get_one_by_ID($recipient_ansid->get('ANS_value'));
-                            $answer = $country instanceof EE_Country ? $country->name() : '';
-                            break;
+						case EEM_Question::QST_type_country:
+							$country = EEM_Country::instance()->get_one_by_ID($recipient_ansid->get('ANS_value'));
+							$answer = $country instanceof EE_Country ? $country->name() : '';
+							break;
     
-                        default:
-                            $answer = $recipient_ansid->get_pretty('ANS_value', 'no_wpautop');
-                            break;
-                    }
+						default:
+							$answer = $recipient_ansid->get_pretty('ANS_value', 'no_wpautop');
+							break;
+					}
                     
-                    return $answer;
-                    break;
-                }
-            }
-        }
-
-        return '';
-    }
-
-
-    /**
-     * Returns the EE_Messages_Addressee object for the recipient.
-     *
-     * @since 4.5.0
-     *
-     * @return EE_Messages_Addressee
-     */
-    public function get_recipient()
-    {
-        return $this->_recipient;
-    }
-
-
-    /**
-     * returns the reg code for the recipient depending on the context and whether the recipient has multiple
-     * registrations or not.
-     *
-     * @return string
-     */
-    protected function _get_reg_code()
-    {
-
-        // if only one related registration for the recipient then just return that reg code.
-        if (count($this->_registrations_for_recipient) <= 1) {
-            return $this->_recipient->reg_obj->reg_code();
-        }
-
-        // k more than one registration so let's see if we can get specific to context
-        // are we parsing event_list?
-        if ($this->_data instanceof EE_Event) {
-            $reg_code = array();
-            // loop through registrations for recipient and see if there is a match for this event
-            foreach ($this->_registrations_for_recipient as $reg) {
-                if ($reg instanceof EE_Registration && $reg->event_ID() == $this->_data->ID()) {
-                    $reg_code[] = $reg->reg_code();
-                }
-            }
-            return implode(', ', $reg_code);
-        }
-
-        // are we parsing ticket list?
-        if ($this->_data instanceof EE_Ticket) {
-            $reg_code = array();
-            // loop through each registration for recipient and see if there is a match for this ticket
-            foreach ($this->_registrations_for_recipient as $reg) {
-                if ($reg instanceof EE_Registration && $reg->ticket_ID() == $this->_data->ID()) {
-                    $reg_code = $reg->reg_code();
-                }
-            }
-            return implode(', ', $reg_code);
-        }
-
-        // do we have a specific reg_obj?  Let's use it
-        if ($this->_data instanceof EE_Messages_Addressee && $this->_data->reg_obj instanceof EE_Registration) {
-            return $this->_data->reg_obj->reg_code();
-        }
-
-        // do we have a specific reg_obj?  Let's use it
-        if ($this->_data instanceof EE_Messages_Addressee && $this->_data->reg_obj instanceof EE_Registration) {
-            return $this->_data->reg_obj->reg_code();
-        }
-
-        // not able to determine the single reg code so let's return a comma delimited list of reg codes.
-        $reg_code = array();
-        foreach ($this->_registrations_for_recipient as $reg) {
-            if ($reg instanceof EE_Registration) {
-                $reg_code[] = $reg->reg_code();
-            }
-        }
-        return implode(', ', $reg_code);
-    }
-
-
-    /**
-     * returns the reg ID for the recipient depending on the context and whether the recipient has multiple
-     * registrations or not.
-     *
-     * @return int|string
-     */
-    protected function _get_reg_id()
-    {
-
-        // if only one related registration for the recipient then just return that reg code.
-        if (count($this->_registrations_for_recipient) <= 1) {
-            return $this->_recipient->reg_obj->ID();
-        }
-
-        // k more than one registration so let's see if we can get specific to context
-        // are we parsing event_list?
-        if ($this->_data instanceof EE_Event) {
-            $registration_ids = array();
-            // loop through registrations for recipient and see if there is a match for this event
-            foreach ($this->_registrations_for_recipient as $reg) {
-                if ($reg instanceof EE_Registration && $reg->event_ID() == $this->_data->ID()) {
-                    $registration_ids[] = $reg->ID();
-                }
-            }
-            return implode(', ', $registration_ids);
-        }
-
-        // are we parsing ticket list?
-        if ($this->_data instanceof EE_Ticket) {
-            $registration_ids = array();
-            // loop through each registration for recipient and see if there is a match for this ticket
-            foreach ($this->_registrations_for_recipient as $reg) {
-                if ($reg instanceof EE_Registration && $reg->ticket_ID() == $this->_data->ID()) {
-                    $registration_ids = $reg->ID();
-                }
-            }
-            return implode(', ', $registration_ids);
-        }
-
-        // do we have a specific reg_obj?  Let's use it
-        if ($this->_data instanceof EE_Messages_Addressee && $this->_data->reg_obj instanceof EE_Registration) {
-            return $this->_data->reg_obj->ID();
-        }
-
-        // not able to determine the single reg code so let's return a comma delimited list of reg codes.
-        $registration_ids = array();
-        foreach ($this->_registrations_for_recipient as $reg) {
-            if ($reg instanceof EE_Registration) {
-                $registration_ids[] = $reg->ID();
-            }
-        }
-        return implode(', ', $registration_ids);
-    }
+					return $answer;
+					break;
+				}
+			}
+		}
+
+		return '';
+	}
+
+
+	/**
+	 * Returns the EE_Messages_Addressee object for the recipient.
+	 *
+	 * @since 4.5.0
+	 *
+	 * @return EE_Messages_Addressee
+	 */
+	public function get_recipient()
+	{
+		return $this->_recipient;
+	}
+
+
+	/**
+	 * returns the reg code for the recipient depending on the context and whether the recipient has multiple
+	 * registrations or not.
+	 *
+	 * @return string
+	 */
+	protected function _get_reg_code()
+	{
+
+		// if only one related registration for the recipient then just return that reg code.
+		if (count($this->_registrations_for_recipient) <= 1) {
+			return $this->_recipient->reg_obj->reg_code();
+		}
+
+		// k more than one registration so let's see if we can get specific to context
+		// are we parsing event_list?
+		if ($this->_data instanceof EE_Event) {
+			$reg_code = array();
+			// loop through registrations for recipient and see if there is a match for this event
+			foreach ($this->_registrations_for_recipient as $reg) {
+				if ($reg instanceof EE_Registration && $reg->event_ID() == $this->_data->ID()) {
+					$reg_code[] = $reg->reg_code();
+				}
+			}
+			return implode(', ', $reg_code);
+		}
+
+		// are we parsing ticket list?
+		if ($this->_data instanceof EE_Ticket) {
+			$reg_code = array();
+			// loop through each registration for recipient and see if there is a match for this ticket
+			foreach ($this->_registrations_for_recipient as $reg) {
+				if ($reg instanceof EE_Registration && $reg->ticket_ID() == $this->_data->ID()) {
+					$reg_code = $reg->reg_code();
+				}
+			}
+			return implode(', ', $reg_code);
+		}
+
+		// do we have a specific reg_obj?  Let's use it
+		if ($this->_data instanceof EE_Messages_Addressee && $this->_data->reg_obj instanceof EE_Registration) {
+			return $this->_data->reg_obj->reg_code();
+		}
+
+		// do we have a specific reg_obj?  Let's use it
+		if ($this->_data instanceof EE_Messages_Addressee && $this->_data->reg_obj instanceof EE_Registration) {
+			return $this->_data->reg_obj->reg_code();
+		}
+
+		// not able to determine the single reg code so let's return a comma delimited list of reg codes.
+		$reg_code = array();
+		foreach ($this->_registrations_for_recipient as $reg) {
+			if ($reg instanceof EE_Registration) {
+				$reg_code[] = $reg->reg_code();
+			}
+		}
+		return implode(', ', $reg_code);
+	}
+
+
+	/**
+	 * returns the reg ID for the recipient depending on the context and whether the recipient has multiple
+	 * registrations or not.
+	 *
+	 * @return int|string
+	 */
+	protected function _get_reg_id()
+	{
+
+		// if only one related registration for the recipient then just return that reg code.
+		if (count($this->_registrations_for_recipient) <= 1) {
+			return $this->_recipient->reg_obj->ID();
+		}
+
+		// k more than one registration so let's see if we can get specific to context
+		// are we parsing event_list?
+		if ($this->_data instanceof EE_Event) {
+			$registration_ids = array();
+			// loop through registrations for recipient and see if there is a match for this event
+			foreach ($this->_registrations_for_recipient as $reg) {
+				if ($reg instanceof EE_Registration && $reg->event_ID() == $this->_data->ID()) {
+					$registration_ids[] = $reg->ID();
+				}
+			}
+			return implode(', ', $registration_ids);
+		}
+
+		// are we parsing ticket list?
+		if ($this->_data instanceof EE_Ticket) {
+			$registration_ids = array();
+			// loop through each registration for recipient and see if there is a match for this ticket
+			foreach ($this->_registrations_for_recipient as $reg) {
+				if ($reg instanceof EE_Registration && $reg->ticket_ID() == $this->_data->ID()) {
+					$registration_ids = $reg->ID();
+				}
+			}
+			return implode(', ', $registration_ids);
+		}
+
+		// do we have a specific reg_obj?  Let's use it
+		if ($this->_data instanceof EE_Messages_Addressee && $this->_data->reg_obj instanceof EE_Registration) {
+			return $this->_data->reg_obj->ID();
+		}
+
+		// not able to determine the single reg code so let's return a comma delimited list of reg codes.
+		$registration_ids = array();
+		foreach ($this->_registrations_for_recipient as $reg) {
+			if ($reg instanceof EE_Registration) {
+				$registration_ids[] = $reg->ID();
+			}
+		}
+		return implode(', ', $registration_ids);
+	}
 }

Spacing +9 added lines, -9 removed lines

@@ -116,17 +116,17 @@ 
             ? $this->_extra_data['data']
             : $this->_recipient;
 
-        if (! $this->_recipient instanceof EE_Messages_Addressee) {
+        if ( ! $this->_recipient instanceof EE_Messages_Addressee) {
             return '';
         }
 
         $attendee = $this->_recipient->att_obj;
-        if (! $attendee instanceof EE_Attendee) {
+        if ( ! $attendee instanceof EE_Attendee) {
             return '';
         }
 
-        $this->_registrations_for_recipient = isset($this->_recipient->attendees[ $attendee->ID() ]['reg_objs'])
-            ? $this->_recipient->attendees[ $attendee->ID() ]['reg_objs']
+        $this->_registrations_for_recipient = isset($this->_recipient->attendees[$attendee->ID()]['reg_objs'])
+            ? $this->_recipient->attendees[$attendee->ID()]['reg_objs']
             : array();
 
         switch ($shortcode) {
@@ -143,21 +143,21 @@ 
                 break;
 
             case '[RECIPIENT_REGISTRATION_ID]':
-                if (! $this->_recipient->reg_obj instanceof EE_Registration) {
+                if ( ! $this->_recipient->reg_obj instanceof EE_Registration) {
                     return '';
                 }
                 return $this->_get_reg_id();
                 break;
 
             case '[RECIPIENT_REGISTRATION_CODE]':
-                if (! $this->_recipient->reg_obj instanceof EE_Registration) {
+                if ( ! $this->_recipient->reg_obj instanceof EE_Registration) {
                     return '';
                 }
                 return $this->_get_reg_code();
                 break;
 
             case '[RECIPIENT_EDIT_REGISTRATION_LINK]':
-                if (! $this->_recipient->reg_obj instanceof EE_Registration) {
+                if ( ! $this->_recipient->reg_obj instanceof EE_Registration) {
                     return '';
                 }
                 return $this->_recipient->reg_obj->edit_attendee_information_url();
@@ -212,9 +212,9 @@ 
             foreach ($this->_recipient->questions as $ansid => $question) {
                 if ($question instanceof EE_Question
                     && trim($question->display_text()) === trim($shortcode)
-                    && isset($this->_recipient->registrations[ $this->_recipient->reg_obj->ID() ]['ans_objs'][ $ansid ])
+                    && isset($this->_recipient->registrations[$this->_recipient->reg_obj->ID()]['ans_objs'][$ansid])
                 ) {
-                    $recipient_ansid = $this->_recipient->registrations[ $this->_recipient->reg_obj->ID() ]['ans_objs'][ $ansid ];
+                    $recipient_ansid = $this->_recipient->registrations[$this->_recipient->reg_obj->ID()]['ans_objs'][$ansid];
                     
                     // what we show for the answer depends on the question type!
                     switch ($question->get('QST_type')) {

public/Espresso_Arabica_2014/content-espresso_events-details.php

Spacing +13 added lines, -13 removed lines

@@ -3,33 +3,33 @@
 global $post;
 ?>
 <div class="event-content">
-<?php if ( apply_filters( 'FHEE__content_espresso_events_details_template__display_entry_meta', TRUE )): ?>
+<?php if (apply_filters('FHEE__content_espresso_events_details_template__display_entry_meta', TRUE)): ?>
 	<div class="entry-meta">
-		<span class="tags-links"><?php espresso_event_categories( $post->ID, TRUE, TRUE ); ?></span>
+		<span class="tags-links"><?php espresso_event_categories($post->ID, TRUE, TRUE); ?></span>
 	<?php
-		if ( ! post_password_required() && ( comments_open() || get_comments_number() ) ) :
+		if ( ! post_password_required() && (comments_open() || get_comments_number())) :
 	?>
-	<span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'event_espresso' ), __( '1 Comment', 'event_espresso' ), __( '% Comments', 'event_espresso' ) ); ?></span>
+	<span class="comments-link"><?php comments_popup_link(__('Leave a comment', 'event_espresso'), __('1 Comment', 'event_espresso'), __('% Comments', 'event_espresso')); ?></span>
 	<?php
 		endif;
-		edit_post_link( __( 'Edit', 'event_espresso' ), '<span class="edit-link">', '</span>' );
+		edit_post_link(__('Edit', 'event_espresso'), '<span class="edit-link">', '</span>');
 	?>
 	</div>
 <?php endif;
-	$event_phone = espresso_event_phone( $post->ID, FALSE );
-	if ( $event_phone != '' ) : ?>
+	$event_phone = espresso_event_phone($post->ID, FALSE);
+	if ($event_phone != '') : ?>
 	<p class="event-phone">
-		<span class="small-text"><strong><?php esc_html_e( 'Event Phone:', 'event_espresso' ); ?> </strong></span> <?php echo $event_phone; ?>
+		<span class="small-text"><strong><?php esc_html_e('Event Phone:', 'event_espresso'); ?> </strong></span> <?php echo $event_phone; ?>
 	</p>
-<?php endif;  ?>
+<?php endif; ?>
 <?php
-	if ( apply_filters( 'FHEE__content_espresso_events_details_template__display_the_content', true ) ) {
-		do_action( 'AHEE_event_details_before_the_content', $post );
+	if (apply_filters('FHEE__content_espresso_events_details_template__display_the_content', true)) {
+		do_action('AHEE_event_details_before_the_content', $post);
 		echo apply_filters(
 			'FHEE__content_espresso_events_details_template__the_content',
-			espresso_event_content_or_excerpt( 55, null, false ) 
+			espresso_event_content_or_excerpt(55, null, false) 
 		);
-		do_action( 'AHEE_event_details_after_the_content', $post );
+		do_action('AHEE_event_details_after_the_content', $post);
 	}
  ?>
 </div>

core/domain/services/admin/privacy/erasure/EraseAttendeeData.php

Indentation +61 added lines, -61 removed lines

@@ -16,74 +16,74 @@
 class EraseAttendeeData implements PersonalDataEraserInterface
 {
 
-    /**
-     * @var EEM_Attendee
-     */
-    protected $attendee_model;
+	/**
+	 * @var EEM_Attendee
+	 */
+	protected $attendee_model;
 
 
-    /**
-     * EraseAttendeeData constructor.
-     *
-     * @param EEM_Attendee $attendee_model
-     */
-    public function __construct(EEM_Attendee $attendee_model)
-    {
-        $this->attendee_model = $attendee_model;
-    }
+	/**
+	 * EraseAttendeeData constructor.
+	 *
+	 * @param EEM_Attendee $attendee_model
+	 */
+	public function __construct(EEM_Attendee $attendee_model)
+	{
+		$this->attendee_model = $attendee_model;
+	}
 
 
-    /**
-     * Gets a translated string name for the data eraser
-     *
-     * @return string
-     */
-    public function name()
-    {
-        return esc_html__('Event Espresso Attendee Data', 'event_espresso');
-    }
+	/**
+	 * Gets a translated string name for the data eraser
+	 *
+	 * @return string
+	 */
+	public function name()
+	{
+		return esc_html__('Event Espresso Attendee Data', 'event_espresso');
+	}
 
 
-    /**
-     * Erases a "page" of personal user data
-     *
-     * @return array {
-     * @type boolean $items_removed  whether items were removed successfully or not
-     * @type boolean $items_retained whether any items were skipped or not
-     * @type array   $messages       values are messages to show
-     * @type boolean $done           whether this eraser is done or has more pages
-     *               }
-     * @throws \EE_Error
-     */
-    public function erase($email_address, $page = 1)
-    {
-        $rows_updated = $this->attendee_model->update(
-            array(
-                'ATT_fname'    => esc_html__('Anonymous', 'event_espresso'),
-                'ATT_lname'    => '',
-                'ATT_email'    => '',
-                'ATT_address'  => '',
-                'ATT_address2' => '',
-                'ATT_city'     => '',
-                'STA_ID'       => 0,
-                'CNT_ISO'      => '',
-                'ATT_zip'      => '',
-                'ATT_phone'    => '',
-            ),
-            array(
-                array(
-                    'ATT_email' => $email_address,
-                ),
-            )
-        );
+	/**
+	 * Erases a "page" of personal user data
+	 *
+	 * @return array {
+	 * @type boolean $items_removed  whether items were removed successfully or not
+	 * @type boolean $items_retained whether any items were skipped or not
+	 * @type array   $messages       values are messages to show
+	 * @type boolean $done           whether this eraser is done or has more pages
+	 *               }
+	 * @throws \EE_Error
+	 */
+	public function erase($email_address, $page = 1)
+	{
+		$rows_updated = $this->attendee_model->update(
+			array(
+				'ATT_fname'    => esc_html__('Anonymous', 'event_espresso'),
+				'ATT_lname'    => '',
+				'ATT_email'    => '',
+				'ATT_address'  => '',
+				'ATT_address2' => '',
+				'ATT_city'     => '',
+				'STA_ID'       => 0,
+				'CNT_ISO'      => '',
+				'ATT_zip'      => '',
+				'ATT_phone'    => '',
+			),
+			array(
+				array(
+					'ATT_email' => $email_address,
+				),
+			)
+		);
 
-        return array(
-            'items_removed'  => (bool) $rows_updated,
-            'items_retained' => false, // always false in this example
-            'messages'       => array(),
-            'done'           => true,
-        );
-    }
+		return array(
+			'items_removed'  => (bool) $rows_updated,
+			'items_retained' => false, // always false in this example
+			'messages'       => array(),
+			'done'           => true,
+		);
+	}
 }
 // End of file EraseAttendeeData.php
 // Location: EventEspresso\core\domain\services\privacy\erasure/EraseAttendeeData.php

admin_pages/registrations/templates/reg_admin_details_main_meta_box_reg_questions.template.php

Indentation +10 added lines, -10 removed lines

@@ -1,9 +1,9 @@ 
 <div id="admin-primary-mbox-questions-dv" class="admin-primary-mbox-dv">
     <p>
         <?php _e(
-            'This displays the custom questions and answers for this registrant.  Please note that any answers to system questions have been saved with the contact record.  You can edit those answers via the "View/Edit this Contact" link in the Contact Details metabox in the sidebar.',
-            'event_espresso'
-        ); ?></p>
+			'This displays the custom questions and answers for this registrant.  Please note that any answers to system questions have been saved with the contact record.  You can edit those answers via the "View/Edit this Contact" link in the Contact Details metabox in the sidebar.',
+			'event_espresso'
+		); ?></p>
 
     <form name="reg-admin-attendee-questions-frm" id="reg-admin-attendee-questions-frm"
           action="<?php echo REG_ADMIN_URL; ?>" method="post">
@@ -16,19 +16,19 @@ 
         <?php echo $att_questions; ?>
         <?php if (! empty($att_questions)) : ?>
             <?php if (EE_Registry::instance()->CAP->current_user_can(
-                'ee_edit_registration',
-                'edit-reg-questions-mbox',
-                $REG_ID
-            )) : ?>
+				'ee_edit_registration',
+				'edit-reg-questions-mbox',
+				$REG_ID
+			)) : ?>
             <input id="reg-admin-attendee-questions-submit" class="button-primary" value="Update Registration Questions"
                    type="submit"/>
             <?php endif; ?>
         <?php else : ?>
             <p class="ee-attention">
                 <?php _e(
-                    'There were no custom questions asked for this registration.',
-                    'event_espresso'
-                ); ?></p>
+					'There were no custom questions asked for this registration.',
+					'event_espresso'
+				); ?></p>
         <?php endif; ?>
 
     </form>

Spacing +2 added lines, -2 removed lines

@@ -7,14 +7,14 @@
 
     <form name="reg-admin-attendee-questions-frm" id="reg-admin-attendee-questions-frm"
           action="<?php echo REG_ADMIN_URL; ?>" method="post">
-        <?php wp_nonce_field($reg_questions_form_action . '_nonce', $reg_questions_form_action . '_nonce'); ?>
+        <?php wp_nonce_field($reg_questions_form_action.'_nonce', $reg_questions_form_action.'_nonce'); ?>
         <input type="hidden" name="page" value="<?php echo REG_PG_SLUG; ?>"/>
         <input type="hidden" name="action" value="<?php echo $reg_questions_form_action; ?>"/>
         <input type="hidden" name="_REG_ID" value="<?php echo $REG_ID; ?>"/>
         <input type="hidden" name="espresso_ajax" id="espresso-ajax" value="0"/>
         <input type="hidden" name="noheader" id="reg-admin-noheader-inp" value="true"/>
         <?php echo $att_questions; ?>
-        <?php if (! empty($att_questions)) : ?>
+        <?php if ( ! empty($att_questions)) : ?>
             <?php if (EE_Registry::instance()->CAP->current_user_can(
                 'ee_edit_registration',
                 'edit-reg-questions-mbox',

Braces +5 added lines, -2 removed lines

@@ -23,12 +23,15 @@
             <input id="reg-admin-attendee-questions-submit" class="button-primary" value="Update Registration Questions"
                    type="submit"/>
             <?php endif; ?>
-        <?php else : ?>
+        <?php else {
+	: ?>
             <p class="ee-attention">
                 <?php _e(
                     'There were no custom questions asked for this registration.',
                     'event_espresso'
-                ); ?></p>
+                );
+}
+?></p>
         <?php endif; ?>
 
     </form>

core/db_models/strategies/EE_Restriction_Generator_Event_Related_Protected.strategy.php

Indentation +81 added lines, -81 removed lines

@@ -17,89 +17,89 @@
 class EE_Restriction_Generator_Event_Related_Protected extends EE_Restriction_Generator_Base
 {
 
-    /**
-     * Path to the event model from the model this restriction generator will be applied to;
-     * including the event model itself. Eg "Ticket.Datetime.Event"
-     * @var string
-     */
-    protected $_path_to_event_model = null;
+	/**
+	 * Path to the event model from the model this restriction generator will be applied to;
+	 * including the event model itself. Eg "Ticket.Datetime.Event"
+	 * @var string
+	 */
+	protected $_path_to_event_model = null;
 
-    /**
-     * Capability context on event model when creating restrictions.
-     * Eg, although we may want capability restrictions relating to deleting datetimes,
-     * they don't need to be able to DELETE EVENTS, they just need to be able to
-     * EDIT EVENTS in order to DELETE DATETIMES.
-     * @var string one of EEM_Base::valid_cap_contexts()
-     */
-    protected $_cap_context_on_event_model = null;
-    /**
-     *
-     * @param string $path_to_event_model
-     * @param string $cap_context_on_event_model  capability context on event model when creating restrictions.
-     * Eg, although we may want capability restrictions relating to deleting datetimes,
-     * they don't need to be able to DELETE EVENTS, they just need to be able to
-     * EDIT EVENTS in order to DELETE DATETIMES. If none if provided, assumed to be the same
-     * as on the primary model.
-     */
-    public function __construct($path_to_event_model, $cap_context_on_event_model = null)
-    {
-        if (substr($path_to_event_model, -1, 1) != '.') {
-            $path_to_event_model .= '.';
-        }
-        $this->_path_to_event_model = $path_to_event_model;
-        $this->_cap_context_on_event_model = $cap_context_on_event_model;
-    }
+	/**
+	 * Capability context on event model when creating restrictions.
+	 * Eg, although we may want capability restrictions relating to deleting datetimes,
+	 * they don't need to be able to DELETE EVENTS, they just need to be able to
+	 * EDIT EVENTS in order to DELETE DATETIMES.
+	 * @var string one of EEM_Base::valid_cap_contexts()
+	 */
+	protected $_cap_context_on_event_model = null;
+	/**
+	 *
+	 * @param string $path_to_event_model
+	 * @param string $cap_context_on_event_model  capability context on event model when creating restrictions.
+	 * Eg, although we may want capability restrictions relating to deleting datetimes,
+	 * they don't need to be able to DELETE EVENTS, they just need to be able to
+	 * EDIT EVENTS in order to DELETE DATETIMES. If none if provided, assumed to be the same
+	 * as on the primary model.
+	 */
+	public function __construct($path_to_event_model, $cap_context_on_event_model = null)
+	{
+		if (substr($path_to_event_model, -1, 1) != '.') {
+			$path_to_event_model .= '.';
+		}
+		$this->_path_to_event_model = $path_to_event_model;
+		$this->_cap_context_on_event_model = $cap_context_on_event_model;
+	}
 
-    /**
-     * Returns `$this->_cap_context_on_event_model`, the relevant action ("read",
-     * "read_admin", "edit" or "delete") for the EVENT related to this model.
-     * @see EE_Restriction_Generator_Event_Related_Protected::__construct()
-     * @return string one of EEM_Base::valid_cap_contexts()
-     */
-    protected function action_for_event()
-    {
-        if ($this->_cap_context_on_event_model) {
-            return $this->_cap_context_on_event_model;
-        } else {
-            return $this->action();
-        }
-    }
+	/**
+	 * Returns `$this->_cap_context_on_event_model`, the relevant action ("read",
+	 * "read_admin", "edit" or "delete") for the EVENT related to this model.
+	 * @see EE_Restriction_Generator_Event_Related_Protected::__construct()
+	 * @return string one of EEM_Base::valid_cap_contexts()
+	 */
+	protected function action_for_event()
+	{
+		if ($this->_cap_context_on_event_model) {
+			return $this->_cap_context_on_event_model;
+		} else {
+			return $this->action();
+		}
+	}
 
-    /**
-     *
-     * @return \EE_Default_Where_Conditions
-     */
-    protected function _generate_restrictions()
-    {
-        // if there are no standard caps for this model, then for now all we know
-        // if they need the default cap to access this
-        if (! $this->model()->cap_slug()) {
-            return array(
-                self::get_default_restrictions_cap() => new EE_Return_None_Where_Conditions()
-            );
-        }
+	/**
+	 *
+	 * @return \EE_Default_Where_Conditions
+	 */
+	protected function _generate_restrictions()
+	{
+		// if there are no standard caps for this model, then for now all we know
+		// if they need the default cap to access this
+		if (! $this->model()->cap_slug()) {
+			return array(
+				self::get_default_restrictions_cap() => new EE_Return_None_Where_Conditions()
+			);
+		}
 
-        $event_model = EEM_Event::instance();
-        return array(
-            // first: basically access to non-defaults is essentially controlled by which events are accessible
-            // if they don't have the basic event cap, they can't access ANY non-default items
-            EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action_for_event())              => new EE_Return_None_Where_Conditions(),
-            // if they don't have the others event cap, they can't access others' non-default items
-            EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action_for_event() . '_others')  => new EE_Default_Where_Conditions(
-                array( $this->_path_to_event_model . 'EVT_wp_user' => EE_Default_Where_Conditions::current_user_placeholder )
-            ),
-            // if they have basic and others, but not private, they can't access others' private non-default items
-            EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action_for_event() . '_private') => new EE_Default_Where_Conditions(
-                array(
-                    'OR*no_' . EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action_for_event() . '_private') => $this->addPublishedPostConditions(
-                        array(
-                            $this->_path_to_event_model . 'EVT_wp_user' => EE_Default_Where_Conditions::current_user_placeholder,
-                        ),
-                        false,
-                        $this->_path_to_event_model
-                    )
-                )
-            ),
-        );
-    }
+		$event_model = EEM_Event::instance();
+		return array(
+			// first: basically access to non-defaults is essentially controlled by which events are accessible
+			// if they don't have the basic event cap, they can't access ANY non-default items
+			EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action_for_event())              => new EE_Return_None_Where_Conditions(),
+			// if they don't have the others event cap, they can't access others' non-default items
+			EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action_for_event() . '_others')  => new EE_Default_Where_Conditions(
+				array( $this->_path_to_event_model . 'EVT_wp_user' => EE_Default_Where_Conditions::current_user_placeholder )
+			),
+			// if they have basic and others, but not private, they can't access others' private non-default items
+			EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action_for_event() . '_private') => new EE_Default_Where_Conditions(
+				array(
+					'OR*no_' . EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action_for_event() . '_private') => $this->addPublishedPostConditions(
+						array(
+							$this->_path_to_event_model . 'EVT_wp_user' => EE_Default_Where_Conditions::current_user_placeholder,
+						),
+						false,
+						$this->_path_to_event_model
+					)
+				)
+			),
+		);
+	}
 }

Spacing +6 added lines, -6 removed lines

@@ -73,7 +73,7 @@ 
     {
         // if there are no standard caps for this model, then for now all we know
         // if they need the default cap to access this
-        if (! $this->model()->cap_slug()) {
+        if ( ! $this->model()->cap_slug()) {
             return array(
                 self::get_default_restrictions_cap() => new EE_Return_None_Where_Conditions()
             );
@@ -85,15 +85,15 @@ 
             // if they don't have the basic event cap, they can't access ANY non-default items
             EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action_for_event())              => new EE_Return_None_Where_Conditions(),
             // if they don't have the others event cap, they can't access others' non-default items
-            EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action_for_event() . '_others')  => new EE_Default_Where_Conditions(
-                array( $this->_path_to_event_model . 'EVT_wp_user' => EE_Default_Where_Conditions::current_user_placeholder )
+            EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action_for_event().'_others')  => new EE_Default_Where_Conditions(
+                array($this->_path_to_event_model.'EVT_wp_user' => EE_Default_Where_Conditions::current_user_placeholder)
             ),
             // if they have basic and others, but not private, they can't access others' private non-default items
-            EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action_for_event() . '_private') => new EE_Default_Where_Conditions(
+            EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action_for_event().'_private') => new EE_Default_Where_Conditions(
                 array(
-                    'OR*no_' . EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action_for_event() . '_private') => $this->addPublishedPostConditions(
+                    'OR*no_'.EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action_for_event().'_private') => $this->addPublishedPostConditions(
                         array(
-                            $this->_path_to_event_model . 'EVT_wp_user' => EE_Default_Where_Conditions::current_user_placeholder,
+                            $this->_path_to_event_model.'EVT_wp_user' => EE_Default_Where_Conditions::current_user_placeholder,
                         ),
                         false,
                         $this->_path_to_event_model

core/db_models/strategies/EE_Restriction_Generator_Event_Related_Public.strategy.php

Indentation +67 added lines, -67 removed lines

@@ -17,72 +17,72 @@
 class EE_Restriction_Generator_Event_Related_Public extends EE_Restriction_Generator_Base
 {
 
-    /**
-     * Path to the event model from the model this restriction generator will be applied to;
-     * including the event model itself. Eg "Ticket.Datetime.Event"
-     * @var string
-     */
-    protected $_path_to_event_model;
-    /**
-     *
-     * @param string $path_to_event_model
-     */
-    public function __construct($path_to_event_model)
-    {
-        if (substr($path_to_event_model, -1, 1) != '.') {
-            $path_to_event_model .= '.';
-        }
-        $this->_path_to_event_model = $path_to_event_model;
-    }
-    /**
-     *
-     * @return \EE_Default_Where_Conditions
-     */
-    protected function _generate_restrictions()
-    {
-        // if there are no standard caps for this model, then for now all we know
-        // if they need the default cap to access this
-        if (! $this->model()->cap_slug()) {
-            return array(
-                self::get_default_restrictions_cap() => new EE_Return_None_Where_Conditions()
-            );
-        }
+	/**
+	 * Path to the event model from the model this restriction generator will be applied to;
+	 * including the event model itself. Eg "Ticket.Datetime.Event"
+	 * @var string
+	 */
+	protected $_path_to_event_model;
+	/**
+	 *
+	 * @param string $path_to_event_model
+	 */
+	public function __construct($path_to_event_model)
+	{
+		if (substr($path_to_event_model, -1, 1) != '.') {
+			$path_to_event_model .= '.';
+		}
+		$this->_path_to_event_model = $path_to_event_model;
+	}
+	/**
+	 *
+	 * @return \EE_Default_Where_Conditions
+	 */
+	protected function _generate_restrictions()
+	{
+		// if there are no standard caps for this model, then for now all we know
+		// if they need the default cap to access this
+		if (! $this->model()->cap_slug()) {
+			return array(
+				self::get_default_restrictions_cap() => new EE_Return_None_Where_Conditions()
+			);
+		}
 
-        $event_model = EEM_Event::instance();
-        return array(
-            // first: basically access to non-defaults is essentially controlled by which events are accessible
-            // if they don't have the basic event cap, they can only read things for published events
-            EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action()) => new EE_Default_Where_Conditions(
-                $this->addPublishedPostConditions(
-                    array(),
-                    true,
-                    $this->_path_to_event_model
-                )
-            ),
-            // if they don't have the others event cap, they can't access others' non-default items
-            EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action() . '_others') => new EE_Default_Where_Conditions(
-                array(
-                    'OR*' . EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action() . '_others') => $this->addPublishedPostConditions(
-                        array(
-                            $this->_path_to_event_model . 'EVT_wp_user' => EE_Default_Where_Conditions::current_user_placeholder,
-                        ),
-                        true,
-                        $this->_path_to_event_model
-                    )
-                )
-            ),
-            // if they have basic and others, but not private, they can't access others' private non-default items
-            EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action() . '_private') => new EE_Default_Where_Conditions(
-                array(
-                    'OR*no_' . EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action() . '_private') => $this->addPublishedPostConditions(
-                        array(
-                            $this->_path_to_event_model . 'EVT_wp_user' => EE_Default_Where_Conditions::current_user_placeholder,
-                        ),
-                        false,
-                        $this->_path_to_event_model
-                    )
-                )
-            ),
-        );
-    }
+		$event_model = EEM_Event::instance();
+		return array(
+			// first: basically access to non-defaults is essentially controlled by which events are accessible
+			// if they don't have the basic event cap, they can only read things for published events
+			EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action()) => new EE_Default_Where_Conditions(
+				$this->addPublishedPostConditions(
+					array(),
+					true,
+					$this->_path_to_event_model
+				)
+			),
+			// if they don't have the others event cap, they can't access others' non-default items
+			EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action() . '_others') => new EE_Default_Where_Conditions(
+				array(
+					'OR*' . EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action() . '_others') => $this->addPublishedPostConditions(
+						array(
+							$this->_path_to_event_model . 'EVT_wp_user' => EE_Default_Where_Conditions::current_user_placeholder,
+						),
+						true,
+						$this->_path_to_event_model
+					)
+				)
+			),
+			// if they have basic and others, but not private, they can't access others' private non-default items
+			EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action() . '_private') => new EE_Default_Where_Conditions(
+				array(
+					'OR*no_' . EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action() . '_private') => $this->addPublishedPostConditions(
+						array(
+							$this->_path_to_event_model . 'EVT_wp_user' => EE_Default_Where_Conditions::current_user_placeholder,
+						),
+						false,
+						$this->_path_to_event_model
+					)
+				)
+			),
+		);
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -42,7 +42,7 @@ 
     {
         // if there are no standard caps for this model, then for now all we know
         // if they need the default cap to access this
-        if (! $this->model()->cap_slug()) {
+        if ( ! $this->model()->cap_slug()) {
             return array(
                 self::get_default_restrictions_cap() => new EE_Return_None_Where_Conditions()
             );
@@ -60,11 +60,11 @@ 
                 )
             ),
             // if they don't have the others event cap, they can't access others' non-default items
-            EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action() . '_others') => new EE_Default_Where_Conditions(
+            EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action().'_others') => new EE_Default_Where_Conditions(
                 array(
-                    'OR*' . EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action() . '_others') => $this->addPublishedPostConditions(
+                    'OR*'.EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action().'_others') => $this->addPublishedPostConditions(
                         array(
-                            $this->_path_to_event_model . 'EVT_wp_user' => EE_Default_Where_Conditions::current_user_placeholder,
+                            $this->_path_to_event_model.'EVT_wp_user' => EE_Default_Where_Conditions::current_user_placeholder,
                         ),
                         true,
                         $this->_path_to_event_model
@@ -72,11 +72,11 @@ 
                 )
             ),
             // if they have basic and others, but not private, they can't access others' private non-default items
-            EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action() . '_private') => new EE_Default_Where_Conditions(
+            EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action().'_private') => new EE_Default_Where_Conditions(
                 array(
-                    'OR*no_' . EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action() . '_private') => $this->addPublishedPostConditions(
+                    'OR*no_'.EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action().'_private') => $this->addPublishedPostConditions(
                         array(
-                            $this->_path_to_event_model . 'EVT_wp_user' => EE_Default_Where_Conditions::current_user_placeholder,
+                            $this->_path_to_event_model.'EVT_wp_user' => EE_Default_Where_Conditions::current_user_placeholder,
                         ),
                         false,
                         $this->_path_to_event_model

core/db_models/strategies/EE_Restriction_Generator_Public.strategy.php

Indentation +69 added lines, -69 removed lines

@@ -12,74 +12,74 @@
  */
 class EE_Restriction_Generator_Public extends EE_Restriction_Generator_Base
 {
-    protected function _generate_restrictions()
-    {
-        // if there are no standard caps for this model, then for allow full access
-        if (! $this->model()->cap_slug()) {
-            return array(
-            );
-        }
+	protected function _generate_restrictions()
+	{
+		// if there are no standard caps for this model, then for allow full access
+		if (! $this->model()->cap_slug()) {
+			return array(
+			);
+		}
 
-        $restrictions = array();
-        // does the basic cap exist? (eg 'ee_read_registrations')
-        if (EE_Restriction_Generator_Base::is_cap($this->model(), $this->action())) {
-            if ($this->model() instanceof EEM_CPT_Base) {
-                $restrictions[ EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action()) ] = new EE_Default_Where_Conditions(
-                    $this->addPublishedPostConditions()
-                );
-            } elseif ($this->model() instanceof EEM_Soft_Delete_Base) {
-                $restrictions[ EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action()) ] = new EE_Default_Where_Conditions(
-                    array( $this->model()->deleted_field_name() => false )
-                );
-            } else {
-                // don't impose any restrictions if they don't have the basic reading cap
-            }
-            // does the others cap exist? (eg 'ee_read_others_registrations')
-            if (EE_Restriction_Generator_Base::is_cap($this->model(), $this->action() . '_others')) {// both caps exist
-                if ($this->model() instanceof EEM_CPT_Base) {
-                    // then if they don't have the others cap, AT MOST show them their own and other published ones
-                    $restrictions[ EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_others') ] = new EE_Default_Where_Conditions(
-                        array(
-                            'OR*' . EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_others') => $this->addPublishedPostConditions(
-                                array(
-                                    EE_Default_Where_Conditions::user_field_name_placeholder => EE_Default_Where_Conditions::current_user_placeholder,
-                                )
-                            )
-                        )
-                    );
-                } elseif ($this->model() instanceof EEM_Soft_Delete_Base) {
-                    // then if they don't have the other cap, AT MOST show them their own or non deleted ones
-                    $restrictions[ EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_others') ] = new EE_Default_Where_Conditions(
-                        array(
-                            'OR*' . EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_others') => array(
-                                EE_Default_Where_Conditions::user_field_name_placeholder => EE_Default_Where_Conditions::current_user_placeholder,
-                                $this->model()->deleted_field_name() => false
-                            )
-                        )
-                    );
-                } else {
-                    // again, if they don't have the others cap, continue showing all because there are no inherently hidden ones
-                }
-                // does the private cap exist (eg 'ee_read_others_private_events')
-                if (EE_Restriction_Generator_Base::is_cap($this->model(), $this->action() . '_private') && $this->model() instanceof EEM_CPT_Base) {
-                    // if they have basic and others, but not private, restrict them to see theirs and others' that aren't private
-                    $restrictions[ EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_private') ] = new EE_Default_Where_Conditions(
-                        array(
-                            'OR*' . EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_private') => $this->addPublishedPostConditions(
-                                array(
-                                    EE_Default_Where_Conditions::user_field_name_placeholder => EE_Default_Where_Conditions::current_user_placeholder,
-                                ),
-                                false,
-                                ''
-                            )
-                        )
-                    );
-                }
-            }
-        } else {
-            // there is no basic cap. So allow full access
-            $restrictions = array();
-        }
-        return $restrictions;
-    }
+		$restrictions = array();
+		// does the basic cap exist? (eg 'ee_read_registrations')
+		if (EE_Restriction_Generator_Base::is_cap($this->model(), $this->action())) {
+			if ($this->model() instanceof EEM_CPT_Base) {
+				$restrictions[ EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action()) ] = new EE_Default_Where_Conditions(
+					$this->addPublishedPostConditions()
+				);
+			} elseif ($this->model() instanceof EEM_Soft_Delete_Base) {
+				$restrictions[ EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action()) ] = new EE_Default_Where_Conditions(
+					array( $this->model()->deleted_field_name() => false )
+				);
+			} else {
+				// don't impose any restrictions if they don't have the basic reading cap
+			}
+			// does the others cap exist? (eg 'ee_read_others_registrations')
+			if (EE_Restriction_Generator_Base::is_cap($this->model(), $this->action() . '_others')) {// both caps exist
+				if ($this->model() instanceof EEM_CPT_Base) {
+					// then if they don't have the others cap, AT MOST show them their own and other published ones
+					$restrictions[ EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_others') ] = new EE_Default_Where_Conditions(
+						array(
+							'OR*' . EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_others') => $this->addPublishedPostConditions(
+								array(
+									EE_Default_Where_Conditions::user_field_name_placeholder => EE_Default_Where_Conditions::current_user_placeholder,
+								)
+							)
+						)
+					);
+				} elseif ($this->model() instanceof EEM_Soft_Delete_Base) {
+					// then if they don't have the other cap, AT MOST show them their own or non deleted ones
+					$restrictions[ EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_others') ] = new EE_Default_Where_Conditions(
+						array(
+							'OR*' . EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_others') => array(
+								EE_Default_Where_Conditions::user_field_name_placeholder => EE_Default_Where_Conditions::current_user_placeholder,
+								$this->model()->deleted_field_name() => false
+							)
+						)
+					);
+				} else {
+					// again, if they don't have the others cap, continue showing all because there are no inherently hidden ones
+				}
+				// does the private cap exist (eg 'ee_read_others_private_events')
+				if (EE_Restriction_Generator_Base::is_cap($this->model(), $this->action() . '_private') && $this->model() instanceof EEM_CPT_Base) {
+					// if they have basic and others, but not private, restrict them to see theirs and others' that aren't private
+					$restrictions[ EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_private') ] = new EE_Default_Where_Conditions(
+						array(
+							'OR*' . EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_private') => $this->addPublishedPostConditions(
+								array(
+									EE_Default_Where_Conditions::user_field_name_placeholder => EE_Default_Where_Conditions::current_user_placeholder,
+								),
+								false,
+								''
+							)
+						)
+					);
+				}
+			}
+		} else {
+			// there is no basic cap. So allow full access
+			$restrictions = array();
+		}
+		return $restrictions;
+	}
 }

Spacing +12 added lines, -12 removed lines

@@ -15,7 +15,7 @@ 
     protected function _generate_restrictions()
     {
         // if there are no standard caps for this model, then for allow full access
-        if (! $this->model()->cap_slug()) {
+        if ( ! $this->model()->cap_slug()) {
             return array(
             );
         }
@@ -24,23 +24,23 @@ 
         // does the basic cap exist? (eg 'ee_read_registrations')
         if (EE_Restriction_Generator_Base::is_cap($this->model(), $this->action())) {
             if ($this->model() instanceof EEM_CPT_Base) {
-                $restrictions[ EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action()) ] = new EE_Default_Where_Conditions(
+                $restrictions[EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action())] = new EE_Default_Where_Conditions(
                     $this->addPublishedPostConditions()
                 );
             } elseif ($this->model() instanceof EEM_Soft_Delete_Base) {
-                $restrictions[ EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action()) ] = new EE_Default_Where_Conditions(
-                    array( $this->model()->deleted_field_name() => false )
+                $restrictions[EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action())] = new EE_Default_Where_Conditions(
+                    array($this->model()->deleted_field_name() => false)
                 );
             } else {
                 // don't impose any restrictions if they don't have the basic reading cap
             }
             // does the others cap exist? (eg 'ee_read_others_registrations')
-            if (EE_Restriction_Generator_Base::is_cap($this->model(), $this->action() . '_others')) {// both caps exist
+            if (EE_Restriction_Generator_Base::is_cap($this->model(), $this->action().'_others')) {// both caps exist
                 if ($this->model() instanceof EEM_CPT_Base) {
                     // then if they don't have the others cap, AT MOST show them their own and other published ones
-                    $restrictions[ EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_others') ] = new EE_Default_Where_Conditions(
+                    $restrictions[EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action().'_others')] = new EE_Default_Where_Conditions(
                         array(
-                            'OR*' . EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_others') => $this->addPublishedPostConditions(
+                            'OR*'.EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action().'_others') => $this->addPublishedPostConditions(
                                 array(
                                     EE_Default_Where_Conditions::user_field_name_placeholder => EE_Default_Where_Conditions::current_user_placeholder,
                                 )
@@ -49,9 +49,9 @@ 
                     );
                 } elseif ($this->model() instanceof EEM_Soft_Delete_Base) {
                     // then if they don't have the other cap, AT MOST show them their own or non deleted ones
-                    $restrictions[ EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_others') ] = new EE_Default_Where_Conditions(
+                    $restrictions[EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action().'_others')] = new EE_Default_Where_Conditions(
                         array(
-                            'OR*' . EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_others') => array(
+                            'OR*'.EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action().'_others') => array(
                                 EE_Default_Where_Conditions::user_field_name_placeholder => EE_Default_Where_Conditions::current_user_placeholder,
                                 $this->model()->deleted_field_name() => false
                             )
@@ -61,11 +61,11 @@ 
                     // again, if they don't have the others cap, continue showing all because there are no inherently hidden ones
                 }
                 // does the private cap exist (eg 'ee_read_others_private_events')
-                if (EE_Restriction_Generator_Base::is_cap($this->model(), $this->action() . '_private') && $this->model() instanceof EEM_CPT_Base) {
+                if (EE_Restriction_Generator_Base::is_cap($this->model(), $this->action().'_private') && $this->model() instanceof EEM_CPT_Base) {
                     // if they have basic and others, but not private, restrict them to see theirs and others' that aren't private
-                    $restrictions[ EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_private') ] = new EE_Default_Where_Conditions(
+                    $restrictions[EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action().'_private')] = new EE_Default_Where_Conditions(
                         array(
-                            'OR*' . EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_private') => $this->addPublishedPostConditions(
+                            'OR*'.EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action().'_private') => $this->addPublishedPostConditions(
                                 array(
                                     EE_Default_Where_Conditions::user_field_name_placeholder => EE_Default_Where_Conditions::current_user_placeholder,
                                 ),

core/db_models/strategies/EE_Restriction_Generator_Default_Public.strategy.php

Indentation +102 added lines, -102 removed lines

@@ -18,110 +18,110 @@
 class EE_Restriction_Generator_Default_Public extends EE_Restriction_Generator_Base
 {
 /**
-     * Name of the field on this model (or a related model, including the model chain to it)
-     * that is a boolean indicating whether or not a model object is considered "Default" or not
-     * @var string
-     */
-    protected $_default_field_name;
+ * Name of the field on this model (or a related model, including the model chain to it)
+ * that is a boolean indicating whether or not a model object is considered "Default" or not
+ * @var string
+ */
+	protected $_default_field_name;
 
-    /**
-     * The model chain to follow to get to the event model, including the event model itself.
-     * Eg 'Ticket.Datetime.Event'
-     * @var string
-     */
-    protected $_path_to_event_model;
-    /**
-     *
-     * @param string $default_field_name the name of the field Name of the field on this model (or a related model, including the model chain to it)
-     * that is a boolean indicating whether or not a model object is considered "Default" or not
-     * @param string $path_to_event_model The model chain to follow to get to the event model, including the event model itself.
-     * Eg 'Ticket.Datetime.Event'
-     */
-    public function __construct($default_field_name, $path_to_event_model)
-    {
-        $this->_default_field_name = $default_field_name;
-        if (substr($path_to_event_model, -1, 1) != '.') {
-            $path_to_event_model .= '.';
-        }
-        $this->_path_to_event_model = $path_to_event_model;
-    }
+	/**
+	 * The model chain to follow to get to the event model, including the event model itself.
+	 * Eg 'Ticket.Datetime.Event'
+	 * @var string
+	 */
+	protected $_path_to_event_model;
+	/**
+	 *
+	 * @param string $default_field_name the name of the field Name of the field on this model (or a related model, including the model chain to it)
+	 * that is a boolean indicating whether or not a model object is considered "Default" or not
+	 * @param string $path_to_event_model The model chain to follow to get to the event model, including the event model itself.
+	 * Eg 'Ticket.Datetime.Event'
+	 */
+	public function __construct($default_field_name, $path_to_event_model)
+	{
+		$this->_default_field_name = $default_field_name;
+		if (substr($path_to_event_model, -1, 1) != '.') {
+			$path_to_event_model .= '.';
+		}
+		$this->_path_to_event_model = $path_to_event_model;
+	}
 
-    /**
-     * @return EE_Default_Where_Conditions
-     * @throws EE_Error
-     */
-    protected function _generate_restrictions()
-    {
-        // if there are no standard caps for this model, then for now all we know
-        // if they need the default cap to access this
-        if (!$this->model()->cap_slug()) {
-            return array(
-                self::get_default_restrictions_cap() => new EE_Return_None_Where_Conditions()
-            );
-        }
+	/**
+	 * @return EE_Default_Where_Conditions
+	 * @throws EE_Error
+	 */
+	protected function _generate_restrictions()
+	{
+		// if there are no standard caps for this model, then for now all we know
+		// if they need the default cap to access this
+		if (!$this->model()->cap_slug()) {
+			return array(
+				self::get_default_restrictions_cap() => new EE_Return_None_Where_Conditions()
+			);
+		}
 
-        $event_model = EEM_Event::instance();
+		$event_model = EEM_Event::instance();
 
-        $restrictions = array(
-            // first: basically access to non-defaults is essentially controlled by which events are accessible
-            // if they don't have the basic event cap, they can't access ANY non-default items
-            EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action()) => new EE_Default_Where_Conditions(array(
-                'OR*no_' . EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action()) => $this->addPublishedPostConditions(
-                    array(
-                        $this->_default_field_name             => true,
-                    ),
-                    true,
-                    $this->_path_to_event_model
-                )
-            )),
-            // if they don't have the others event cap, they can only access their own, others' that are for published events, or defaults
-            EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action() . '_others') => new EE_Default_Where_Conditions(
-                array(
-                    'OR*no_' . EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action() . '_others') => $this->addPublishedPostConditions(
-                        array(
-                            $this->_path_to_event_model . 'EVT_wp_user' => EE_Default_Where_Conditions::current_user_placeholder,
-                            $this->_default_field_name => true,
-                        ),
-                        true,
-                        $this->_path_to_event_model
-                    )
-                )
-            ),
-            // if they have basic and others, but not private, they can access default, their own, and others' that aren't private
-            EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action() . '_private')   => new EE_Default_Where_Conditions(
-                array(
-                    'OR*no_' . EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action() . '_private') => $this->addPublishedPostConditions(
-                        array(
-                            $this->_path_to_event_model . 'EVT_wp_user' => EE_Default_Where_Conditions::current_user_placeholder,
-                            $this->_default_field_name => true
-                        ),
-                        false,
-                        $this->_path_to_event_model
-                    )
-                )
-            ),
-            // second: access to defaults is controlled by the default capabilities
-            // if they don't have the basic default capability, restrict access to only non-default items
-            EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_default') => new EE_Default_Where_Conditions(
-                array( $this->_default_field_name => false )
-            ),
-        );
-        if (EE_Restriction_Generator_Base::is_cap($this->model(), $this->action() . '_others_default')) {
-            // if they don't have the "others" default capability, restrict access to only their default ones, and non-default ones
-            $restrictions[ EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_others_default') ] = new EE_Default_Where_Conditions(
-                array(
-                    // if they don't have the others default cap, they can't access others default items (but they can access
-                    // their own default items, and non-default items)
-                    'OR*no_' . EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_others_default') => array(
-                        'AND' => array(
-                            EE_Default_Where_Conditions::user_field_name_placeholder => EE_Default_Where_Conditions::current_user_placeholder,
-                            $this->_default_field_name => true
-                        ),
-                        $this->_default_field_name => false
-                    )
-                )
-            );
-        }
-        return $restrictions;
-    }
+		$restrictions = array(
+			// first: basically access to non-defaults is essentially controlled by which events are accessible
+			// if they don't have the basic event cap, they can't access ANY non-default items
+			EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action()) => new EE_Default_Where_Conditions(array(
+				'OR*no_' . EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action()) => $this->addPublishedPostConditions(
+					array(
+						$this->_default_field_name             => true,
+					),
+					true,
+					$this->_path_to_event_model
+				)
+			)),
+			// if they don't have the others event cap, they can only access their own, others' that are for published events, or defaults
+			EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action() . '_others') => new EE_Default_Where_Conditions(
+				array(
+					'OR*no_' . EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action() . '_others') => $this->addPublishedPostConditions(
+						array(
+							$this->_path_to_event_model . 'EVT_wp_user' => EE_Default_Where_Conditions::current_user_placeholder,
+							$this->_default_field_name => true,
+						),
+						true,
+						$this->_path_to_event_model
+					)
+				)
+			),
+			// if they have basic and others, but not private, they can access default, their own, and others' that aren't private
+			EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action() . '_private')   => new EE_Default_Where_Conditions(
+				array(
+					'OR*no_' . EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action() . '_private') => $this->addPublishedPostConditions(
+						array(
+							$this->_path_to_event_model . 'EVT_wp_user' => EE_Default_Where_Conditions::current_user_placeholder,
+							$this->_default_field_name => true
+						),
+						false,
+						$this->_path_to_event_model
+					)
+				)
+			),
+			// second: access to defaults is controlled by the default capabilities
+			// if they don't have the basic default capability, restrict access to only non-default items
+			EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_default') => new EE_Default_Where_Conditions(
+				array( $this->_default_field_name => false )
+			),
+		);
+		if (EE_Restriction_Generator_Base::is_cap($this->model(), $this->action() . '_others_default')) {
+			// if they don't have the "others" default capability, restrict access to only their default ones, and non-default ones
+			$restrictions[ EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_others_default') ] = new EE_Default_Where_Conditions(
+				array(
+					// if they don't have the others default cap, they can't access others default items (but they can access
+					// their own default items, and non-default items)
+					'OR*no_' . EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_others_default') => array(
+						'AND' => array(
+							EE_Default_Where_Conditions::user_field_name_placeholder => EE_Default_Where_Conditions::current_user_placeholder,
+							$this->_default_field_name => true
+						),
+						$this->_default_field_name => false
+					)
+				)
+			);
+		}
+		return $restrictions;
+	}
 }

Spacing +13 added lines, -13 removed lines

@@ -54,7 +54,7 @@ 
     {
         // if there are no standard caps for this model, then for now all we know
         // if they need the default cap to access this
-        if (!$this->model()->cap_slug()) {
+        if ( ! $this->model()->cap_slug()) {
             return array(
                 self::get_default_restrictions_cap() => new EE_Return_None_Where_Conditions()
             );
@@ -66,7 +66,7 @@ 
             // first: basically access to non-defaults is essentially controlled by which events are accessible
             // if they don't have the basic event cap, they can't access ANY non-default items
             EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action()) => new EE_Default_Where_Conditions(array(
-                'OR*no_' . EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action()) => $this->addPublishedPostConditions(
+                'OR*no_'.EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action()) => $this->addPublishedPostConditions(
                     array(
                         $this->_default_field_name             => true,
                     ),
@@ -75,11 +75,11 @@ 
                 )
             )),
             // if they don't have the others event cap, they can only access their own, others' that are for published events, or defaults
-            EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action() . '_others') => new EE_Default_Where_Conditions(
+            EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action().'_others') => new EE_Default_Where_Conditions(
                 array(
-                    'OR*no_' . EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action() . '_others') => $this->addPublishedPostConditions(
+                    'OR*no_'.EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action().'_others') => $this->addPublishedPostConditions(
                         array(
-                            $this->_path_to_event_model . 'EVT_wp_user' => EE_Default_Where_Conditions::current_user_placeholder,
+                            $this->_path_to_event_model.'EVT_wp_user' => EE_Default_Where_Conditions::current_user_placeholder,
                             $this->_default_field_name => true,
                         ),
                         true,
@@ -88,11 +88,11 @@ 
                 )
             ),
             // if they have basic and others, but not private, they can access default, their own, and others' that aren't private
-            EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action() . '_private')   => new EE_Default_Where_Conditions(
+            EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action().'_private')   => new EE_Default_Where_Conditions(
                 array(
-                    'OR*no_' . EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action() . '_private') => $this->addPublishedPostConditions(
+                    'OR*no_'.EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action().'_private') => $this->addPublishedPostConditions(
                         array(
-                            $this->_path_to_event_model . 'EVT_wp_user' => EE_Default_Where_Conditions::current_user_placeholder,
+                            $this->_path_to_event_model.'EVT_wp_user' => EE_Default_Where_Conditions::current_user_placeholder,
                             $this->_default_field_name => true
                         ),
                         false,
@@ -102,17 +102,17 @@ 
             ),
             // second: access to defaults is controlled by the default capabilities
             // if they don't have the basic default capability, restrict access to only non-default items
-            EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_default') => new EE_Default_Where_Conditions(
-                array( $this->_default_field_name => false )
+            EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action().'_default') => new EE_Default_Where_Conditions(
+                array($this->_default_field_name => false)
             ),
         );
-        if (EE_Restriction_Generator_Base::is_cap($this->model(), $this->action() . '_others_default')) {
+        if (EE_Restriction_Generator_Base::is_cap($this->model(), $this->action().'_others_default')) {
             // if they don't have the "others" default capability, restrict access to only their default ones, and non-default ones
-            $restrictions[ EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_others_default') ] = new EE_Default_Where_Conditions(
+            $restrictions[EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action().'_others_default')] = new EE_Default_Where_Conditions(
                 array(
                     // if they don't have the others default cap, they can't access others default items (but they can access
                     // their own default items, and non-default items)
-                    'OR*no_' . EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_others_default') => array(
+                    'OR*no_'.EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action().'_others_default') => array(
                         'AND' => array(
                             EE_Default_Where_Conditions::user_field_name_placeholder => EE_Default_Where_Conditions::current_user_placeholder,
                             $this->_default_field_name => true