eventespresso / event-espresso-core

core/db_models/strategies/EE_Restriction_Generator_Reg_Form.strategy.php

Indentation +44 added lines, -44 removed lines

@@ -15,51 +15,51 @@
 class EE_Restriction_Generator_Reg_Form extends EE_Restriction_Generator_Base
 {
 
-    /**
-     *
-     * @var string the name of the field that indicates whether or not this is a system thing
-     */
-    protected $_system_field_name = null;
+	/**
+	 *
+	 * @var string the name of the field that indicates whether or not this is a system thing
+	 */
+	protected $_system_field_name = null;
 
-    /**
-     * Accepts the name of the field that indicates whether or not an object is a "system" one or not
-     * @param string $system_field_name
-     */
-    public function __construct($system_field_name)
-    {
-        $this->_system_field_name = $system_field_name;
-    }
+	/**
+	 * Accepts the name of the field that indicates whether or not an object is a "system" one or not
+	 * @param string $system_field_name
+	 */
+	public function __construct($system_field_name)
+	{
+		$this->_system_field_name = $system_field_name;
+	}
 
 
-    /**
-     *
-     * @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(
-                EE_Restriction_Generator_Base::get_default_restrictions_cap() => new EE_Return_None_Where_Conditions()
-            );
-        }
-        $restrictions = array(
-            EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action()) => new EE_Return_None_Where_Conditions(),
-        );
-        // there is no "ee_read_system_questions" cap; in order to read reg form items you only need "ee_read_{model_name}".
-        // there is also no "ee_delete_system_questions" cap. But folks shouldn't be deleting system questions anyway
-        if ($this->action() !== EEM_Base::caps_read) {
-            $restrictions[ EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_system') ] = new EE_Default_Where_Conditions(
-                array(
-                    'OR*no_' . EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_system') => array(
-                        $this->_system_field_name       => array('IN', array('', 0)),
-                        $this->_system_field_name . '*' => array('IS_NULL')
-                    )
-                )
-            );
-        }
-        return $restrictions;
-    }
+	/**
+	 *
+	 * @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(
+				EE_Restriction_Generator_Base::get_default_restrictions_cap() => new EE_Return_None_Where_Conditions()
+			);
+		}
+		$restrictions = array(
+			EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action()) => new EE_Return_None_Where_Conditions(),
+		);
+		// there is no "ee_read_system_questions" cap; in order to read reg form items you only need "ee_read_{model_name}".
+		// there is also no "ee_delete_system_questions" cap. But folks shouldn't be deleting system questions anyway
+		if ($this->action() !== EEM_Base::caps_read) {
+			$restrictions[ EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_system') ] = new EE_Default_Where_Conditions(
+				array(
+					'OR*no_' . EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_system') => array(
+						$this->_system_field_name       => array('IN', array('', 0)),
+						$this->_system_field_name . '*' => array('IS_NULL')
+					)
+				)
+			);
+		}
+		return $restrictions;
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -40,7 +40,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(
                 EE_Restriction_Generator_Base::get_default_restrictions_cap() => new EE_Return_None_Where_Conditions()
             );
@@ -51,11 +51,11 @@ 
         // there is no "ee_read_system_questions" cap; in order to read reg form items you only need "ee_read_{model_name}".
         // there is also no "ee_delete_system_questions" cap. But folks shouldn't be deleting system questions anyway
         if ($this->action() !== EEM_Base::caps_read) {
-            $restrictions[ EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_system') ] = new EE_Default_Where_Conditions(
+            $restrictions[EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action().'_system')] = new EE_Default_Where_Conditions(
                 array(
-                    'OR*no_' . EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_system') => array(
+                    'OR*no_'.EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action().'_system') => array(
                         $this->_system_field_name       => array('IN', array('', 0)),
-                        $this->_system_field_name . '*' => array('IS_NULL')
+                        $this->_system_field_name.'*' => array('IS_NULL')
                     )
                 )
             );

core/db_models/strategies/EE_Restriction_Generator_Event_Related_Protected.strategy.php

Indentation +78 added lines, -78 removed lines

@@ -17,86 +17,86 @@
 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') => array(
-                        $this->_path_to_event_model . 'EVT_wp_user' => EE_Default_Where_Conditions::current_user_placeholder,
-                        $this->_path_to_event_model . 'status'      => array( '!=', 'private' )
-                    )
-                )
-            ),
-        );
-    }
+		$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') => array(
+						$this->_path_to_event_model . 'EVT_wp_user' => EE_Default_Where_Conditions::current_user_placeholder,
+						$this->_path_to_event_model . 'status'      => array( '!=', 'private' )
+					)
+				)
+			),
+		);
+	}
 }

Spacing +7 added lines, -7 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') => array(
-                        $this->_path_to_event_model . 'EVT_wp_user' => EE_Default_Where_Conditions::current_user_placeholder,
-                        $this->_path_to_event_model . 'status'      => array( '!=', 'private' )
+                    'OR*no_'.EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action_for_event().'_private') => array(
+                        $this->_path_to_event_model.'EVT_wp_user' => EE_Default_Where_Conditions::current_user_placeholder,
+                        $this->_path_to_event_model.'status'      => array('!=', 'private')
                     )
                 )
             ),

core/db_models/strategies/EE_Restriction_Generator_Default_Protected.strategy.php

Indentation +75 added lines, -75 removed lines

@@ -17,85 +17,85 @@
  */
 class EE_Restriction_Generator_Default_Protected 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
-     */
-    protected function _generate_restrictions()
-    {
-        // if there are no standard caps for this model, then for now all we know is
-        // 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 is
+		// 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( $this->_default_field_name => true )),
-            // 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*no_' . EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action() . '_others') => array(
-                    $this->_path_to_event_model . 'EVT_wp_user' => EE_Default_Where_Conditions::current_user_placeholder ),
-                    $this->_default_field_name => true )),
-            // 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') => array(
-                $this->_path_to_event_model . 'EVT_wp_user' => EE_Default_Where_Conditions::current_user_placeholder,
-                $this->_path_to_event_model . 'status' => array( '!=', 'private' ),
-                $this->_default_field_name => true ) )),
-            // second: access to defaults is controlled by the defaulty capabilities
-            // if they don't have the 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 they don't have the "others" default capability, restrict access to only their default ones, and non-default ones
-             );
-        if (EE_Restriction_Generator_Base::is_cap($this->model(), $this->action() . '_others_default')) {
-            $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(
-                            $this->_path_to_event_model . 'EVT_wp_user' => 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( $this->_default_field_name => true )),
+			// 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*no_' . EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action() . '_others') => array(
+					$this->_path_to_event_model . 'EVT_wp_user' => EE_Default_Where_Conditions::current_user_placeholder ),
+					$this->_default_field_name => true )),
+			// 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') => array(
+				$this->_path_to_event_model . 'EVT_wp_user' => EE_Default_Where_Conditions::current_user_placeholder,
+				$this->_path_to_event_model . 'status' => array( '!=', 'private' ),
+				$this->_default_field_name => true ) )),
+			// second: access to defaults is controlled by the defaulty capabilities
+			// if they don't have the 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 they don't have the "others" default capability, restrict access to only their default ones, and non-default ones
+			 );
+		if (EE_Restriction_Generator_Base::is_cap($this->model(), $this->action() . '_others_default')) {
+			$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(
+							$this->_path_to_event_model . 'EVT_wp_user' => EE_Default_Where_Conditions::current_user_placeholder,
+							$this->_default_field_name => true
+							),
+						$this->_default_field_name => false
+					) ));
+		}
+		return $restrictions;
+	}
 }

Spacing +15 added lines, -15 removed lines

@@ -56,7 +56,7 @@ 
     {
         // if there are no standard caps for this model, then for now all we know is
         // 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()
             );
@@ -64,33 +64,33 @@ 
 
         $event_model = EEM_Event::instance();
 
-        $restrictions =  array(
+        $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( $this->_default_field_name => true )),
+            EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action()) => new EE_Default_Where_Conditions(array($this->_default_field_name => true)),
             // 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*no_' . EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action() . '_others') => 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().'_others') => new EE_Default_Where_Conditions(array(
+                'OR*no_'.EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action().'_others') => array(
+                    $this->_path_to_event_model.'EVT_wp_user' => EE_Default_Where_Conditions::current_user_placeholder ),
                     $this->_default_field_name => true )),
             // 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') => array(
-                $this->_path_to_event_model . 'EVT_wp_user' => EE_Default_Where_Conditions::current_user_placeholder,
-                $this->_path_to_event_model . 'status' => array( '!=', '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') => array(
+                $this->_path_to_event_model.'EVT_wp_user' => EE_Default_Where_Conditions::current_user_placeholder,
+                $this->_path_to_event_model.'status' => array('!=', 'private'),
                 $this->_default_field_name => true ) )),
             // second: access to defaults is controlled by the defaulty capabilities
             // if they don't have the 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 they don't have the "others" default capability, restrict access to only their default ones, and non-default ones
              );
-        if (EE_Restriction_Generator_Base::is_cap($this->model(), $this->action() . '_others_default')) {
-            $restrictions[ EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action() . '_others_default') ] = new EE_Default_Where_Conditions(array(
+        if (EE_Restriction_Generator_Base::is_cap($this->model(), $this->action().'_others_default')) {
+            $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(
-                            $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
                             ),
                         $this->_default_field_name => false

core/db_models/strategies/EE_Restriction_Generator_Base.strategy.php

Indentation +135 added lines, -135 removed lines

@@ -27,150 +27,150 @@
 abstract class EE_Restriction_Generator_Base
 {
 
-    /**
-     * The restrictions generated by this object. FALSE before any are made.
-     * @var EE_Default_Where_Conditions[]
-     */
-    protected $_cap_restrictions_generated = false;
+	/**
+	 * The restrictions generated by this object. FALSE before any are made.
+	 * @var EE_Default_Where_Conditions[]
+	 */
+	protected $_cap_restrictions_generated = false;
 
-    /**
-     * Model for which restrictions are generated
-     * @var EEM_Base
-     */
-    protected $_model;
+	/**
+	 * Model for which restrictions are generated
+	 * @var EEM_Base
+	 */
+	protected $_model;
 
-    /**
-     * One of EEM_Base::valid_cap_contexts()
-     * @var string
-     */
-    protected $_action;
-    /**
-     * Puts the last necessary info onto the restriction generator class. This is usually
-     * called by EEM_Base during its constructor, so child classes don't have to
-     * always provide this info.
-     * @param EEM_Base $model
-     * @param string $action
-     */
-    public function _construct_finalize(EEM_Base $model, $action)
-    {
-        $this->_model = $model;
-        $this->_action = $action;
-    }
+	/**
+	 * One of EEM_Base::valid_cap_contexts()
+	 * @var string
+	 */
+	protected $_action;
+	/**
+	 * Puts the last necessary info onto the restriction generator class. This is usually
+	 * called by EEM_Base during its constructor, so child classes don't have to
+	 * always provide this info.
+	 * @param EEM_Base $model
+	 * @param string $action
+	 */
+	public function _construct_finalize(EEM_Base $model, $action)
+	{
+		$this->_model = $model;
+		$this->_action = $action;
+	}
 
-    /**
-     * Returns the model set for this restriction generator
-     *
-     * @throws EE_Error
-     * @return EEM_Base | EEM_Soft_Delete_Base
-     */
-    public function model()
-    {
-        if (! $this->_model instanceof EEM_Base) {
-            throw new EE_Error(sprintf(__('Cannot generate capability restrictions because model has not yet been set on the %s. Please ensure _construct_finalize() was called', 'event_espresso'), get_class($this)));
-        }
-        return $this->_model;
-    }
+	/**
+	 * Returns the model set for this restriction generator
+	 *
+	 * @throws EE_Error
+	 * @return EEM_Base | EEM_Soft_Delete_Base
+	 */
+	public function model()
+	{
+		if (! $this->_model instanceof EEM_Base) {
+			throw new EE_Error(sprintf(__('Cannot generate capability restrictions because model has not yet been set on the %s. Please ensure _construct_finalize() was called', 'event_espresso'), get_class($this)));
+		}
+		return $this->_model;
+	}
 
-    /**
-     * Returns the action this restriction generator will generate restrictions for.
-     * It should be one of EEM_Base::valid_cap_contexts()
-     *
-     * @throws EE_Error
-     * @return string
-     */
-    public function action()
-    {
-        if (! $this->_action) {
-            throw new EE_Error(sprintf(__('Cannot generate capability restrictions because model has not yet been set on the %s. Please ensure _construct_finalize() was called', 'event_espresso'), get_class($this)));
-        }
-        return $this->_action;
-    }
+	/**
+	 * Returns the action this restriction generator will generate restrictions for.
+	 * It should be one of EEM_Base::valid_cap_contexts()
+	 *
+	 * @throws EE_Error
+	 * @return string
+	 */
+	public function action()
+	{
+		if (! $this->_action) {
+			throw new EE_Error(sprintf(__('Cannot generate capability restrictions because model has not yet been set on the %s. Please ensure _construct_finalize() was called', 'event_espresso'), get_class($this)));
+		}
+		return $this->_action;
+	}
 
-    /**
-     * Returns whether or not _construct_finalize() has been called on this restriction generator object
-     * @return boolean
-     */
-    public function construction_finalized()
-    {
-        if ($this->_model instanceof EEM_Base  && $this->_action) {
-            return true;
-        } else {
-            return false;
-        }
-    }
+	/**
+	 * Returns whether or not _construct_finalize() has been called on this restriction generator object
+	 * @return boolean
+	 */
+	public function construction_finalized()
+	{
+		if ($this->_model instanceof EEM_Base  && $this->_action) {
+			return true;
+		} else {
+			return false;
+		}
+	}
 
-    /**
-     * Gets the capability restrictions generated by this object. Caches them in
-     * case they are required for subsequent requests
-     * @return array @see EEM_Base::_cap_restrictions
-     */
-    public function generate_restrictions()
-    {
-        if ($this->_cap_restrictions_generated === false) {
-            $this->_cap_restrictions_generated = apply_filters('FHEE__EE_Restriction_Generator_Base__generate_restrictions__first_time', $this->_generate_restrictions(), $this);
-        }
-        return apply_filters('FHEE__EE_Restriction_Generator_Base__generate_restrictions__every_time', $this->_cap_restrictions_generated, $this);
-    }
+	/**
+	 * Gets the capability restrictions generated by this object. Caches them in
+	 * case they are required for subsequent requests
+	 * @return array @see EEM_Base::_cap_restrictions
+	 */
+	public function generate_restrictions()
+	{
+		if ($this->_cap_restrictions_generated === false) {
+			$this->_cap_restrictions_generated = apply_filters('FHEE__EE_Restriction_Generator_Base__generate_restrictions__first_time', $this->_generate_restrictions(), $this);
+		}
+		return apply_filters('FHEE__EE_Restriction_Generator_Base__generate_restrictions__every_time', $this->_cap_restrictions_generated, $this);
+	}
 
-    /**
-     * Provided with the model, and using global knowledge about what capabilities exist,
-     * generates an array for use in one of the sub-arrays in EEM_Base::_cap_restrictions,
-     * where keys are capability names, and values are children of EE_Default_Where_Conditions
-     * @return array @see EEM_Base::_cap_restrictions
-     */
-    abstract protected function _generate_restrictions();
+	/**
+	 * Provided with the model, and using global knowledge about what capabilities exist,
+	 * generates an array for use in one of the sub-arrays in EEM_Base::_cap_restrictions,
+	 * where keys are capability names, and values are children of EE_Default_Where_Conditions
+	 * @return array @see EEM_Base::_cap_restrictions
+	 */
+	abstract protected function _generate_restrictions();
 
-    /**
-     * Whether or not this restriction generator has already done its job of
-     * making restrictions and caching them on itself in case its asked later
-     * @return boolean
-     */
-    public function has_generated_cap_restrictions()
-    {
-        if ($this->_cap_restrictions_generated === false) {
-            return false;
-        } else {
-            return true;
-        }
-    }
+	/**
+	 * Whether or not this restriction generator has already done its job of
+	 * making restrictions and caching them on itself in case its asked later
+	 * @return boolean
+	 */
+	public function has_generated_cap_restrictions()
+	{
+		if ($this->_cap_restrictions_generated === false) {
+			return false;
+		} else {
+			return true;
+		}
+	}
 
-    /**
-     * Given an action like 'edit' generates the cap name based off
-     * the EEM_Base::_cap_slug, which for events would be 'events', to generate the
-     * cap name like 'ee_edit_events'.
-     * If a $qualifier is passed,
-     * @param EEM_Base $model
-     * @param string $action
-     * @return string
-     */
-    public static function get_cap_name($model, $action)
-    {
-        return apply_filters('FHEE__EE_Restriction_Generator__get_cap_name', ( $model->is_wp_core_model() ? '' : 'ee_' ) . $action . '_' . $model->cap_slug(), $model, $action);
-    }
+	/**
+	 * Given an action like 'edit' generates the cap name based off
+	 * the EEM_Base::_cap_slug, which for events would be 'events', to generate the
+	 * cap name like 'ee_edit_events'.
+	 * If a $qualifier is passed,
+	 * @param EEM_Base $model
+	 * @param string $action
+	 * @return string
+	 */
+	public static function get_cap_name($model, $action)
+	{
+		return apply_filters('FHEE__EE_Restriction_Generator__get_cap_name', ( $model->is_wp_core_model() ? '' : 'ee_' ) . $action . '_' . $model->cap_slug(), $model, $action);
+	}
 
-    /**
-     * Checks if there is a cap for this model and this action
-     * @param EEM_Base $model
-     * @param string $action
-     * @return boolean
-     */
-    public static function is_cap($model, $action)
-    {
-        $caps_for_admin = EE_Registry::instance()->CAP->get_ee_capabilities('administrator');
-        if (in_array(self::get_cap_name($model, $action), $caps_for_admin)) {
-            return true;
-        } else {
-            return false;
-        }
-    }
+	/**
+	 * Checks if there is a cap for this model and this action
+	 * @param EEM_Base $model
+	 * @param string $action
+	 * @return boolean
+	 */
+	public static function is_cap($model, $action)
+	{
+		$caps_for_admin = EE_Registry::instance()->CAP->get_ee_capabilities('administrator');
+		if (in_array(self::get_cap_name($model, $action), $caps_for_admin)) {
+			return true;
+		} else {
+			return false;
+		}
+	}
 
-    /**
-     * Returns the default capability used to determine if the current user can
-     * access something.
-     * @return string
-     */
-    public static function get_default_restrictions_cap()
-    {
-        return apply_filters('FHEE__EE_Restriction_Generator_Base__default_restrictions_cap', 'manage_options');
-    }
+	/**
+	 * Returns the default capability used to determine if the current user can
+	 * access something.
+	 * @return string
+	 */
+	public static function get_default_restrictions_cap()
+	{
+		return apply_filters('FHEE__EE_Restriction_Generator_Base__default_restrictions_cap', 'manage_options');
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -65,7 +65,7 @@ 
      */
     public function model()
     {
-        if (! $this->_model instanceof EEM_Base) {
+        if ( ! $this->_model instanceof EEM_Base) {
             throw new EE_Error(sprintf(__('Cannot generate capability restrictions because model has not yet been set on the %s. Please ensure _construct_finalize() was called', 'event_espresso'), get_class($this)));
         }
         return $this->_model;
@@ -80,7 +80,7 @@ 
      */
     public function action()
     {
-        if (! $this->_action) {
+        if ( ! $this->_action) {
             throw new EE_Error(sprintf(__('Cannot generate capability restrictions because model has not yet been set on the %s. Please ensure _construct_finalize() was called', 'event_espresso'), get_class($this)));
         }
         return $this->_action;
@@ -92,7 +92,7 @@ 
      */
     public function construction_finalized()
     {
-        if ($this->_model instanceof EEM_Base  && $this->_action) {
+        if ($this->_model instanceof EEM_Base && $this->_action) {
             return true;
         } else {
             return false;
@@ -145,7 +145,7 @@ 
      */
     public static function get_cap_name($model, $action)
     {
-        return apply_filters('FHEE__EE_Restriction_Generator__get_cap_name', ( $model->is_wp_core_model() ? '' : 'ee_' ) . $action . '_' . $model->cap_slug(), $model, $action);
+        return apply_filters('FHEE__EE_Restriction_Generator__get_cap_name', ($model->is_wp_core_model() ? '' : 'ee_').$action.'_'.$model->cap_slug(), $model, $action);
     }
 
     /**

core/db_models/strategies/EE_Restriction_Generator_Public.strategy.php

Indentation +65 added lines, -65 removed lines

@@ -12,70 +12,70 @@
  */
 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(
-                    array( 'status' => 'publish' )
-                );
-            } 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') => array(
-                                EE_Default_Where_Conditions::user_field_name_placeholder => EE_Default_Where_Conditions::current_user_placeholder,
-                                'status' => 'publish'
-                            )
-                        )
-                    );
-                } 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') => array(
-                                EE_Default_Where_Conditions::user_field_name_placeholder => EE_Default_Where_Conditions::current_user_placeholder,
-                                'status' => array( '!=', 'private' )
-                            )
-                        )
-                    );
-                }
-            }
-        } 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(
+					array( 'status' => 'publish' )
+				);
+			} 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') => array(
+								EE_Default_Where_Conditions::user_field_name_placeholder => EE_Default_Where_Conditions::current_user_placeholder,
+								'status' => 'publish'
+							)
+						)
+					);
+				} 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') => array(
+								EE_Default_Where_Conditions::user_field_name_placeholder => EE_Default_Where_Conditions::current_user_placeholder,
+								'status' => array( '!=', 'private' )
+							)
+						)
+					);
+				}
+			}
+		} else {
+			// there is no basic cap. So allow full access
+			$restrictions = array();
+		}
+		return $restrictions;
+	}
 }

Spacing +14 added lines, -14 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(
-                    array( 'status' => 'publish' )
+                $restrictions[EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action())] = new EE_Default_Where_Conditions(
+                    array('status' => 'publish')
                 );
             } 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') => 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,
                                 'status' => 'publish'
                             )
@@ -48,9 +48,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
                             )
@@ -60,13 +60,13 @@ 
                     // 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') => array(
+                            'OR*'.EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action().'_private') => array(
                                 EE_Default_Where_Conditions::user_field_name_placeholder => EE_Default_Where_Conditions::current_user_placeholder,
-                                'status' => array( '!=', 'private' )
+                                'status' => array('!=', 'private')
                             )
                         )
                     );

core/db_models/strategies/EE_Restriction_Generator_Taxonomy_Protected.strategy.php

Indentation +35 added lines, -35 removed lines

@@ -13,40 +13,40 @@
 class EE_Restriction_Generator_Taxonomy_Protected extends EE_Restriction_Generator_Base
 {
 
-    /**
-     * Model chain/path to taxonomy model, including the term_taxonomy model itself
-     * @var string
-     */
-    protected $_path_to_taxonomy_model;
-    /**
-     *
-     * @param string $path_to_taxonomy_model Model chain/path to taxonomy model, including the term_taxonomy model itself
-     */
-    public function __construct($path_to_taxonomy_model)
-    {
-        if ($path_to_taxonomy_model !== '' && substr($path_to_taxonomy_model, -1, 1) != '.') {
-            $path_to_taxonomy_model .= '.';
-        }
-        $this->_path_to_taxonomy_model = $path_to_taxonomy_model;
-    }
-    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(
-            );
-        }
+	/**
+	 * Model chain/path to taxonomy model, including the term_taxonomy model itself
+	 * @var string
+	 */
+	protected $_path_to_taxonomy_model;
+	/**
+	 *
+	 * @param string $path_to_taxonomy_model Model chain/path to taxonomy model, including the term_taxonomy model itself
+	 */
+	public function __construct($path_to_taxonomy_model)
+	{
+		if ($path_to_taxonomy_model !== '' && substr($path_to_taxonomy_model, -1, 1) != '.') {
+			$path_to_taxonomy_model .= '.';
+		}
+		$this->_path_to_taxonomy_model = $path_to_taxonomy_model;
+	}
+	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(
+			);
+		}
 
-        return array(
-            'ee_manage_event_categories' => new EE_Default_Where_Conditions(array(
-                $this->_path_to_taxonomy_model . 'taxonomy*no_ee_manage_event_categories' => array( '!=', 'espresso_event_categories' )
-            )),
-            'ee_manage_venue_categories' => new EE_Default_Where_Conditions(array(
-                $this->_path_to_taxonomy_model . 'taxonomy*no_ee_manage_venue_categories' => array( '!=', 'espresso_venue_categories' )
-            )),
-            'ee_manage_event_types' => new EE_Default_Where_Conditions(array(
-                $this->_path_to_taxonomy_model . 'taxonomy*ee_manage_event_types' => array( '!=', 'espresso_event_types' )
-            )),
-        );
-    }
+		return array(
+			'ee_manage_event_categories' => new EE_Default_Where_Conditions(array(
+				$this->_path_to_taxonomy_model . 'taxonomy*no_ee_manage_event_categories' => array( '!=', 'espresso_event_categories' )
+			)),
+			'ee_manage_venue_categories' => new EE_Default_Where_Conditions(array(
+				$this->_path_to_taxonomy_model . 'taxonomy*no_ee_manage_venue_categories' => array( '!=', 'espresso_venue_categories' )
+			)),
+			'ee_manage_event_types' => new EE_Default_Where_Conditions(array(
+				$this->_path_to_taxonomy_model . 'taxonomy*ee_manage_event_types' => array( '!=', 'espresso_event_types' )
+			)),
+		);
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -32,20 +32,20 @@
     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(
             );
         }
 
         return array(
             'ee_manage_event_categories' => new EE_Default_Where_Conditions(array(
-                $this->_path_to_taxonomy_model . 'taxonomy*no_ee_manage_event_categories' => array( '!=', 'espresso_event_categories' )
+                $this->_path_to_taxonomy_model.'taxonomy*no_ee_manage_event_categories' => array('!=', 'espresso_event_categories')
             )),
             'ee_manage_venue_categories' => new EE_Default_Where_Conditions(array(
-                $this->_path_to_taxonomy_model . 'taxonomy*no_ee_manage_venue_categories' => array( '!=', 'espresso_venue_categories' )
+                $this->_path_to_taxonomy_model.'taxonomy*no_ee_manage_venue_categories' => array('!=', 'espresso_venue_categories')
             )),
             'ee_manage_event_types' => new EE_Default_Where_Conditions(array(
-                $this->_path_to_taxonomy_model . 'taxonomy*ee_manage_event_types' => array( '!=', 'espresso_event_types' )
+                $this->_path_to_taxonomy_model.'taxonomy*ee_manage_event_types' => array('!=', 'espresso_event_types')
             )),
         );
     }

core/db_models/strategies/EE_Return_None_Where_Conditions.strategy.php

Indentation +9 added lines, -9 removed lines

@@ -12,13 +12,13 @@
  */
 class EE_Return_None_Where_Conditions extends EE_Default_Where_Conditions
 {
-    protected function _get_default_where_conditions()
-    {
-        if ($this->_model->has_primary_key_field()) {
-            return array( $this->_model->primary_key_name() => array('<', 0 ) );
-        } else {
-            $fk_field = $this->_model->get_a_field_of_type('EE_Foreign_Key_Field_Base');
-            return array( 'AND*impossible' => array( $fk_field->get_name() => array('IS_NULL'), $fk_field->get_name() => 'IS_NOT_NULL' ) );
-        }
-    }
+	protected function _get_default_where_conditions()
+	{
+		if ($this->_model->has_primary_key_field()) {
+			return array( $this->_model->primary_key_name() => array('<', 0 ) );
+		} else {
+			$fk_field = $this->_model->get_a_field_of_type('EE_Foreign_Key_Field_Base');
+			return array( 'AND*impossible' => array( $fk_field->get_name() => array('IS_NULL'), $fk_field->get_name() => 'IS_NOT_NULL' ) );
+		}
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -15,10 +15,10 @@
     protected function _get_default_where_conditions()
     {
         if ($this->_model->has_primary_key_field()) {
-            return array( $this->_model->primary_key_name() => array('<', 0 ) );
+            return array($this->_model->primary_key_name() => array('<', 0));
         } else {
             $fk_field = $this->_model->get_a_field_of_type('EE_Foreign_Key_Field_Base');
-            return array( 'AND*impossible' => array( $fk_field->get_name() => array('IS_NULL'), $fk_field->get_name() => 'IS_NOT_NULL' ) );
+            return array('AND*impossible' => array($fk_field->get_name() => array('IS_NULL'), $fk_field->get_name() => 'IS_NOT_NULL'));
         }
     }
 }

core/db_models/strategies/EE_Restriction_Generator_WP_User.strategy.php

Indentation +12 added lines, -12 removed lines

@@ -15,18 +15,18 @@
 class EE_Restriction_Generator_WP_User extends EE_Restriction_Generator_Base
 {
 
-    /**
-     * @return \EE_Default_Where_Conditions
-     */
-    protected function _generate_restrictions()
-    {
+	/**
+	 * @return \EE_Default_Where_Conditions
+	 */
+	protected function _generate_restrictions()
+	{
 
-        return array(
-            // if they can't access users, they can still access themselves
-            EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action()) => new EE_Default_Where_Conditions(array(
-                EE_Default_Where_Conditions::user_field_name_placeholder => EE_Default_Where_Conditions::current_user_placeholder
-            )),
+		return array(
+			// if they can't access users, they can still access themselves
+			EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action()) => new EE_Default_Where_Conditions(array(
+				EE_Default_Where_Conditions::user_field_name_placeholder => EE_Default_Where_Conditions::current_user_placeholder
+			)),
 
-        );
-    }
+		);
+	}
 }

core/db_models/EEM_Question_Option.model.php

Indentation +32 added lines, -32 removed lines

@@ -11,39 +11,39 @@
 class EEM_Question_Option extends EEM_Soft_Delete_Base
 {
 
-    // private instance of the Attendee object
-    protected static $_instance = null;
+	// private instance of the Attendee object
+	protected static $_instance = null;
 
-    protected function __construct($timezone = null)
-    {
-        $this->singular_item = __('Question Option', 'event_espresso');
-        $this->plural_item = __('Question Options', 'event_espresso');
+	protected function __construct($timezone = null)
+	{
+		$this->singular_item = __('Question Option', 'event_espresso');
+		$this->plural_item = __('Question Options', 'event_espresso');
 
-        $this->_tables = array(
-            'Question_Option'=>new EE_Primary_Table('esp_question_option', 'QSO_ID')
-        );
-        $this->_fields = array(
-            'Question_Option'=>array(
-                    'QSO_ID'=>new EE_Primary_Key_Int_Field('QSO_ID', __('Question Option ID', 'event_espresso')),
-                    'QST_ID'=>new EE_Foreign_Key_Int_Field('QST_ID', __('Question ID', 'event_espresso'), false, 0, 'Question'),
-                    'QSO_value'=>new EE_Plain_Text_Field('QSO_value', __("Question Option Value", "event_espresso"), false, ''),
-                    'QSO_desc'=>new EE_Post_Content_Field('QSO_desc', __('Question Option Description', 'event_espresso'), false, ''),
-                    'QSO_order' => new EE_Integer_Field('QSO_order', __('Question Option Order', 'event_espresso'), false, 0),
-                    'QSO_system'=>new EE_Plain_Text_Field('QSO_system', __('Internal string ID for question option', 'event_espresso'), true, null),
-                    'QSO_deleted'=>new EE_Trashed_Flag_Field('QSO_deleted', __('Flag indicating Option was trashed', 'event_espresso'), false, false)
-                )
-        );
-        $this->_model_relations = array(
-            'Question'=>new EE_Belongs_To_Relation()
-        );
+		$this->_tables = array(
+			'Question_Option'=>new EE_Primary_Table('esp_question_option', 'QSO_ID')
+		);
+		$this->_fields = array(
+			'Question_Option'=>array(
+					'QSO_ID'=>new EE_Primary_Key_Int_Field('QSO_ID', __('Question Option ID', 'event_espresso')),
+					'QST_ID'=>new EE_Foreign_Key_Int_Field('QST_ID', __('Question ID', 'event_espresso'), false, 0, 'Question'),
+					'QSO_value'=>new EE_Plain_Text_Field('QSO_value', __("Question Option Value", "event_espresso"), false, ''),
+					'QSO_desc'=>new EE_Post_Content_Field('QSO_desc', __('Question Option Description', 'event_espresso'), false, ''),
+					'QSO_order' => new EE_Integer_Field('QSO_order', __('Question Option Order', 'event_espresso'), false, 0),
+					'QSO_system'=>new EE_Plain_Text_Field('QSO_system', __('Internal string ID for question option', 'event_espresso'), true, null),
+					'QSO_deleted'=>new EE_Trashed_Flag_Field('QSO_deleted', __('Flag indicating Option was trashed', 'event_espresso'), false, false)
+				)
+		);
+		$this->_model_relations = array(
+			'Question'=>new EE_Belongs_To_Relation()
+		);
 
-        $this->_model_chain_to_wp_user = 'Question';
-        // this model is generally available for reading
-        $this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public();
-        $this->_cap_restriction_generators[ EEM_Base::caps_read_admin ] = new EE_Restriction_Generator_Reg_Form('QSO_system');
-        $this->_cap_restriction_generators[ EEM_Base::caps_edit ] = new EE_Restriction_Generator_Reg_Form('QSO_system');
-        $this->_cap_restriction_generators[ EEM_Base::caps_delete ] = new EE_Restriction_Generator_Reg_Form('QSO_system');
-        $this->_caps_slug = 'questions';
-        parent::__construct($timezone);
-    }
+		$this->_model_chain_to_wp_user = 'Question';
+		// this model is generally available for reading
+		$this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public();
+		$this->_cap_restriction_generators[ EEM_Base::caps_read_admin ] = new EE_Restriction_Generator_Reg_Form('QSO_system');
+		$this->_cap_restriction_generators[ EEM_Base::caps_edit ] = new EE_Restriction_Generator_Reg_Form('QSO_system');
+		$this->_cap_restriction_generators[ EEM_Base::caps_delete ] = new EE_Restriction_Generator_Reg_Form('QSO_system');
+		$this->_caps_slug = 'questions';
+		parent::__construct($timezone);
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -39,10 +39,10 @@
 
         $this->_model_chain_to_wp_user = 'Question';
         // this model is generally available for reading
-        $this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public();
-        $this->_cap_restriction_generators[ EEM_Base::caps_read_admin ] = new EE_Restriction_Generator_Reg_Form('QSO_system');
-        $this->_cap_restriction_generators[ EEM_Base::caps_edit ] = new EE_Restriction_Generator_Reg_Form('QSO_system');
-        $this->_cap_restriction_generators[ EEM_Base::caps_delete ] = new EE_Restriction_Generator_Reg_Form('QSO_system');
+        $this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Public();
+        $this->_cap_restriction_generators[EEM_Base::caps_read_admin] = new EE_Restriction_Generator_Reg_Form('QSO_system');
+        $this->_cap_restriction_generators[EEM_Base::caps_edit] = new EE_Restriction_Generator_Reg_Form('QSO_system');
+        $this->_cap_restriction_generators[EEM_Base::caps_delete] = new EE_Restriction_Generator_Reg_Form('QSO_system');
         $this->_caps_slug = 'questions';
         parent::__construct($timezone);
     }