eventespresso / event-espresso-core

core/libraries/form_sections/strategies/display/EE_Radio_Button_Display_Strategy.strategy.php

Indentation +54 added lines, -54 removed lines

@@ -11,61 +11,61 @@
 class EE_Radio_Button_Display_Strategy extends EE_Compound_Input_Display_Strategy
 {
 
-    /**
-     *
-     * @throws EE_Error
-     * @return string of html to display the field
-     */
-    public function display()
-    {
-        $input = $this->get_input();
-        $input->set_label_sizes();
-        $label_size_class = $input->get_label_size_class();
-        $html = '';
-        foreach ($input->options() as $value => $display_text) {
-            $value = $input->get_normalization_strategy()->unnormalize($value);
+	/**
+	 *
+	 * @throws EE_Error
+	 * @return string of html to display the field
+	 */
+	public function display()
+	{
+		$input = $this->get_input();
+		$input->set_label_sizes();
+		$label_size_class = $input->get_label_size_class();
+		$html = '';
+		foreach ($input->options() as $value => $display_text) {
+			$value = $input->get_normalization_strategy()->unnormalize($value);
 
-            $html_id = $this->get_sub_input_id($value);
-            $html .= EEH_HTML::nl(0, 'radio');
+			$html_id = $this->get_sub_input_id($value);
+			$html .= EEH_HTML::nl(0, 'radio');
 
-            $html .= $this->_opening_tag('label');
-            $html .= $this->_attributes_string(
-                array(
-                    'for' => $html_id,
-                    'id' => $html_id . '-lbl',
-                    'class' => apply_filters(
-                        'FHEE__EE_Radio_Button_Display_Strategy__display__option_label_class',
-                        'ee-radio-label-after' . $label_size_class,
-                        $this,
-                        $input,
-                        $value
-                    )
-                )
-            );
-            $html .= '>';
-            $html .= EEH_HTML::nl(1, 'radio');
-            $html .= $this->_opening_tag('input');
-            $attributes = array(
-                'id' => $html_id,
-                'name' => $input->html_name(),
-                'class' => $input->html_class(),
-                'style' => $input->html_style(),
-                'type' => 'radio',
-                'value' => $value,
-                0 => $input->other_html_attributes(),
-                'data-question_label' => $input->html_label_id()
-            );
-            if ($input->raw_value() === $value) {
-                $attributes['checked'] = 'checked';
-            }
-            $html .= $this->_attributes_string($attributes);
+			$html .= $this->_opening_tag('label');
+			$html .= $this->_attributes_string(
+				array(
+					'for' => $html_id,
+					'id' => $html_id . '-lbl',
+					'class' => apply_filters(
+						'FHEE__EE_Radio_Button_Display_Strategy__display__option_label_class',
+						'ee-radio-label-after' . $label_size_class,
+						$this,
+						$input,
+						$value
+					)
+				)
+			);
+			$html .= '>';
+			$html .= EEH_HTML::nl(1, 'radio');
+			$html .= $this->_opening_tag('input');
+			$attributes = array(
+				'id' => $html_id,
+				'name' => $input->html_name(),
+				'class' => $input->html_class(),
+				'style' => $input->html_style(),
+				'type' => 'radio',
+				'value' => $value,
+				0 => $input->other_html_attributes(),
+				'data-question_label' => $input->html_label_id()
+			);
+			if ($input->raw_value() === $value) {
+				$attributes['checked'] = 'checked';
+			}
+			$html .= $this->_attributes_string($attributes);
 
-            $html .= '> ';
-            $html .= $display_text;
-            $html .= EEH_HTML::nl(-1, 'radio') . '</label>';
-        }
-        $html .= EEH_HTML::div('', '', 'clear-float');
-        $html .= EEH_HTML::divx();
-        return apply_filters('FHEE__EE_Radio_Button_Display_Strategy__display', $html, $this, $this->_input);
-    }
+			$html .= '>&nbsp;';
+			$html .= $display_text;
+			$html .= EEH_HTML::nl(-1, 'radio') . '</label>';
+		}
+		$html .= EEH_HTML::div('', '', 'clear-float');
+		$html .= EEH_HTML::divx();
+		return apply_filters('FHEE__EE_Radio_Button_Display_Strategy__display', $html, $this, $this->_input);
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -32,10 +32,10 @@ 
             $html .= $this->_attributes_string(
                 array(
                     'for' => $html_id,
-                    'id' => $html_id . '-lbl',
+                    'id' => $html_id.'-lbl',
                     'class' => apply_filters(
                         'FHEE__EE_Radio_Button_Display_Strategy__display__option_label_class',
-                        'ee-radio-label-after' . $label_size_class,
+                        'ee-radio-label-after'.$label_size_class,
                         $this,
                         $input,
                         $value
@@ -62,7 +62,7 @@ 
 
             $html .= '> ';
             $html .= $display_text;
-            $html .= EEH_HTML::nl(-1, 'radio') . '</label>';
+            $html .= EEH_HTML::nl(-1, 'radio').'</label>';
         }
         $html .= EEH_HTML::div('', '', 'clear-float');
         $html .= EEH_HTML::divx();

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

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

core/domain/entities/editor/BlockInterface.php

Indentation +66 added lines, -66 removed lines

@@ -22,70 +22,70 @@
 interface BlockInterface
 {
 
-    const NAME_SPACE = 'eventespresso';
-
-    /**
-     * Perform any early setup required by the block
-     * including setting the block type and supported post types
-     *
-     * @return void
-     */
-    public function initialize();
-
-
-    /**
-     * @return string
-     */
-    public function blockType();
-
-
-    /**
-     * AssetRegister that this editor block uses for asset registration
-     *
-     * @return BlockAssetManagerInterface
-     */
-    public function assetManager();
-
-
-    /**
-     * Registers the Editor Block with WP core;
-     * Returns the registered block type on success, or false on failure.
-     *
-     * @return WP_Block_Type|false
-     */
-    public function registerBlock();
-
-
-    /**
-     * Un-registers the Editor Block with WP core;
-     * Returns the registered block type on success, or false on failure.
-     *
-     * @return WP_Block_Type|false
-     */
-    public function unRegisterBlock();
-
-
-    /**
-     * returns an array of fully qualified class names
-     * for RouteMatchSpecificationInterface objects
-     * that specify routes that the block should be loaded for.
-     *
-     * @return array
-     */
-    public function supportedRoutes();
-
-
-    /**
-     * @return array
-     */
-    public function getEditorContainer();
-
-
-    /**
-     * returns the rendered HTML for the block
-     *
-     * @param array $attributes
-     * @return string
-     */
-    public function renderBlock(array $attributes = array());
+	const NAME_SPACE = 'eventespresso';
+
+	/**
+	 * Perform any early setup required by the block
+	 * including setting the block type and supported post types
+	 *
+	 * @return void
+	 */
+	public function initialize();
+
+
+	/**
+	 * @return string
+	 */
+	public function blockType();
+
+
+	/**
+	 * AssetRegister that this editor block uses for asset registration
+	 *
+	 * @return BlockAssetManagerInterface
+	 */
+	public function assetManager();
+
+
+	/**
+	 * Registers the Editor Block with WP core;
+	 * Returns the registered block type on success, or false on failure.
+	 *
+	 * @return WP_Block_Type|false
+	 */
+	public function registerBlock();
+
+
+	/**
+	 * Un-registers the Editor Block with WP core;
+	 * Returns the registered block type on success, or false on failure.
+	 *
+	 * @return WP_Block_Type|false
+	 */
+	public function unRegisterBlock();
+
+
+	/**
+	 * returns an array of fully qualified class names
+	 * for RouteMatchSpecificationInterface objects
+	 * that specify routes that the block should be loaded for.
+	 *
+	 * @return array
+	 */
+	public function supportedRoutes();
+
+
+	/**
+	 * @return array
+	 */
+	public function getEditorContainer();
+
+
+	/**
+	 * returns the rendered HTML for the block
+	 *
+	 * @param array $attributes
+	 * @return string
+	 */
+	public function renderBlock(array $attributes = array());
 }

core/domain/entities/route_match/RouteMatchSpecification.php

Indentation +12 added lines, -12 removed lines

@@ -24,17 +24,17 @@
 abstract class RouteMatchSpecification implements RouteMatchSpecificationInterface
 {
 
-    /**
-     * @var RequestInterface $request
-     */
-    protected $request;
+	/**
+	 * @var RequestInterface $request
+	 */
+	protected $request;
 
-    /**
-     * RouteMatch constructor.
-     * @param RequestInterface $request
-     */
-    public function __construct(RequestInterface $request)
-    {
-        $this->request = $request;
-    }
+	/**
+	 * RouteMatch constructor.
+	 * @param RequestInterface $request
+	 */
+	public function __construct(RequestInterface $request)
+	{
+		$this->request = $request;
+	}
 }

core/domain/entities/route_match/RouteMatchSpecificationDecorator.php

Indentation +13 added lines, -13 removed lines

@@ -13,18 +13,18 @@
 abstract class RouteMatchSpecificationDecorator implements RouteMatchSpecificationInterface
 {
 
-    /**
-     * @var RouteMatchSpecificationInterface $specification
-     */
-    protected $specification;
+	/**
+	 * @var RouteMatchSpecificationInterface $specification
+	 */
+	protected $specification;
 
-    /**
-     * RouteMatchSpecificationDecorator constructor.
-     *
-     * @param RouteMatchSpecificationInterface $specification
-     */
-    public function __construct(RouteMatchSpecificationInterface $specification)
-    {
-        $this->specification = $specification;
-    }
+	/**
+	 * RouteMatchSpecificationDecorator constructor.
+	 *
+	 * @param RouteMatchSpecificationInterface $specification
+	 */
+	public function __construct(RouteMatchSpecificationInterface $specification)
+	{
+		$this->specification = $specification;
+	}
 }