eventespresso / event-espresso-core

core/db_models/strategies/EE_Restriction_Generator_Event_Related_Public.strategy.php

Spacing +15 added lines, -15 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 /**
@@ -30,8 +30,8 @@ 
 	 *
 	 * @param string $path_to_event_model
 	 */
-	public function __construct( $path_to_event_model ) {
-		if( substr( $path_to_event_model, -1, 1 ) != '.' ) {
+	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;
@@ -43,7 +43,7 @@ 
 	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() ) {
+		if ( ! $this->model()->cap_slug()) {
 			return array(
 				self::get_default_restrictions_cap() => new EE_Return_None_Where_Conditions()
 			);
@@ -53,24 +53,24 @@ 
 		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(
-				array( $this->_path_to_event_model . 'status' => 'publish' )
+			EE_Restriction_Generator_Base::get_cap_name($event_model, $this->action()) => new EE_Default_Where_Conditions(
+				array($this->_path_to_event_model.'status' => 'publish')
 			),
 			//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' ) => array(
-						$this->_path_to_event_model . 'EVT_wp_user' => EE_Default_Where_Conditions::current_user_placeholder,
-						$this->_path_to_event_model . 'status'      => 'publish'
+					'OR*'.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->_path_to_event_model.'status'      => 'publish'
 					)
 				)
 			),
 			//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' ) => 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().'_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_Global.strategy.php

Spacing +9 added lines, -9 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 /**
@@ -33,7 +33,7 @@ 
 	 * @param string $global_field_name name of the model field that indicates whether or not
 	 * a model object is "global"
 	 */
-	public function __construct( $global_field_name ) {
+	public function __construct($global_field_name) {
 		$this->_global_field_name = $global_field_name;
 	}
 
@@ -44,21 +44,21 @@ 
 
 		//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(
 				EE_Restriction_Generator_Base::get_default_restrictions_cap() => new EE_Return_None_Where_Conditions()
 			);
 		}
 		return array(
-			EE_Restriction_Generator_Base::get_cap_name( $this->model(), $this->action() ) => new EE_Return_None_Where_Conditions(),
-			EE_Restriction_Generator_Base::get_cap_name( $this->model(), $this->action() . '_others' ) => new EE_Default_Where_Conditions( array(
+			EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action()) => new EE_Return_None_Where_Conditions(),
+			EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action().'_others') => new EE_Default_Where_Conditions(array(
 				//I need to be the owner, or it must be a global item
-				'OR*no_' . EE_Restriction_Generator_Base::get_cap_name( $this->model(), $this->action() . '_others' ) => array(
+				'OR*no_'.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->_global_field_name                                => true
 				)
-			) ),
-			EE_Restriction_Generator_Base::get_cap_name( $this->model(), $this->action() . '_global' ) => new EE_Default_Where_Conditions( array(
+			)),
+			EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action().'_global') => new EE_Default_Where_Conditions(array(
 					//it mustn't be global
 					$this->_global_field_name => false
 				)

core/db_models/strategies/EE_Restriction_Generator_Protected.strategy.php

Spacing +14 added lines, -14 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 /**
@@ -25,7 +25,7 @@ 
  * @author				Mike Nelson
  *
  */
-class EE_Restriction_Generator_Protected extends EE_Restriction_Generator_Base{
+class EE_Restriction_Generator_Protected extends EE_Restriction_Generator_Base {
 
 	/**
 	 * @return \EE_Default_Where_Conditions
@@ -34,7 +34,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()
 			);
@@ -42,31 +42,31 @@ 
 
 		$restrictions = array();
 		//does the basic cap exist? (eg 'ee_read_registrations')
-		if ( EE_Restriction_Generator_Base::is_cap( $this->model(), $this->action() ) ) {
-			$restrictions[ EE_Restriction_Generator_Base::get_cap_name( $this->model(), $this->action() ) ] = new EE_Return_None_Where_Conditions();
+		if (EE_Restriction_Generator_Base::is_cap($this->model(), $this->action())) {
+			$restrictions[EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action())] = new EE_Return_None_Where_Conditions();
 			//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
-				$restrictions[ EE_Restriction_Generator_Base::get_cap_name( $this->model(), $this->action() . '_others' ) ] = new EE_Default_Where_Conditions(
+			if (EE_Restriction_Generator_Base::is_cap($this->model(), $this->action().'_others')) {//both caps exist
+				$restrictions[EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action().'_others')] = new EE_Default_Where_Conditions(
 					array(
 						EE_Default_Where_Conditions::user_field_name_placeholder => EE_Default_Where_Conditions::current_user_placeholder
 					)
 				);
 				//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*no_' . EE_Restriction_Generator_Base::get_cap_name( $this->model(), $this->action() . '_private' ) => array(
+							'OR*no_'.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')
 							)
 						)
 					);
 				}
 			}
-		}else{
+		} else {
 			//there is no basic cap. So they can only access this if they have the default admin cap
-			$restrictions[ EE_Restriction_Generator_Base::get_default_restrictions_cap() ] = new EE_Return_None_Where_Conditions();
+			$restrictions[EE_Restriction_Generator_Base::get_default_restrictions_cap()] = new EE_Return_None_Where_Conditions();
 		}
 		return $restrictions;
 	}

Braces +1 added lines, -1 removed lines

@@ -90,7 +90,7 @@
 		//so in case teh IPN is arriving later, let's try to process an IPN!
 		if($_SERVER['REQUEST_METHOD'] == 'POST'){
 			return $this->handle_ipn($_POST, $transaction );
-		}else{
+		} else{
 			return parent::finalize_payment_for( $transaction );
 		}
 	}

core/db_models/strategies/EE_Restriction_Generator_Public.strategy.php

Spacing +22 added lines, -22 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 /**
@@ -13,44 +13,44 @@ 
  * @author				Mike Nelson
  *
  */
-class EE_Restriction_Generator_Public extends EE_Restriction_Generator_Base{
+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() ) {
+		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' )
+		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 )
+			} 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 ) {
+			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'
 							)
 						) );
-				} elseif ( $this->model() instanceof EEM_Soft_Delete_Base ) {
+				} 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
 							)
@@ -59,13 +59,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_Reg_Form.strategy.php

Spacing +10 added lines, -10 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 /**
@@ -15,7 +15,7 @@ 
  * @author				Mike Nelson
  *
  */
-class EE_Restriction_Generator_Reg_Form extends EE_Restriction_Generator_Base{
+class EE_Restriction_Generator_Reg_Form extends EE_Restriction_Generator_Base {
 
 	/**
 	 *
@@ -27,7 +27,7 @@ 
 	 * 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 ) {
+	public function __construct($system_field_name) {
 		$this->_system_field_name = $system_field_name;
 	}
 
@@ -40,18 +40,18 @@ 
 	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() ) {
+		if ( ! $this->model()->cap_slug()) {
 			return array(
 				EE_Restriction_Generator_Base::get_default_restrictions_cap() => new EE_Return_None_Where_Conditions()
 			);
 		}
 		return array(
-			EE_Restriction_Generator_Base::get_cap_name( $this->model(), $this->action() ) => new EE_Return_None_Where_Conditions(),
-			EE_Restriction_Generator_Base::get_cap_name( $this->model(), $this->action() . '_system' ) => new EE_Default_Where_Conditions(
+			EE_Restriction_Generator_Base::get_cap_name($this->model(), $this->action()) => new EE_Return_None_Where_Conditions(),
+			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' )
+					'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')
 					)
 				)
 			)

core/db_models/strategies/EE_Restriction_Generator_Taxonomy_Protected.strategy.php

Spacing +12 added lines, -12 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 /**
@@ -13,7 +13,7 @@ 
  * @author				Mike Nelson
  *
  */
-class EE_Restriction_Generator_Taxonomy_Protected extends EE_Restriction_Generator_Base{
+class EE_Restriction_Generator_Taxonomy_Protected extends EE_Restriction_Generator_Base {
 
 	/**
 	 * Model chain/path to taxonomy model, including the term_taxonomy model itself
@@ -24,28 +24,28 @@ 
 	 *
 	 * @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 ) != '.' ) {
+	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() ) {
+		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_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_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' )
+			'ee_manage_event_types' => new EE_Default_Where_Conditions(array(
+				$this->_path_to_taxonomy_model.'taxonomy*ee_manage_event_types' => array('!=', 'espresso_event_types')
 			)),
 		);
 	}

core/db_models/strategies/EE_Restriction_Generator_WP_User.strategy.php

Spacing +4 added lines, -4 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 /**
@@ -15,7 +15,7 @@ 
  * @author				Mike Nelson
  *
  */
-class EE_Restriction_Generator_WP_User extends EE_Restriction_Generator_Base{
+class EE_Restriction_Generator_WP_User extends EE_Restriction_Generator_Base {
 
 	/**
 	 * @return \EE_Default_Where_Conditions
@@ -24,7 +24,7 @@ 
 
 		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_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/strategies/EE_Return_None_Where_Conditions.strategy.php

Spacing +8 added lines, -8 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 /**
@@ -14,12 +14,12 @@ 
  *
  */
 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'));
 		}
 	}
 }

Braces +1 added lines, -1 removed lines

@@ -90,7 +90,7 @@
 		//so in case teh IPN is arriving later, let's try to process an IPN!
 		if($_SERVER['REQUEST_METHOD'] == 'POST'){
 			return $this->handle_ipn($_POST, $transaction );
-		}else{
+		} else{
 			return parent::finalize_payment_for( $transaction );
 		}
 	}

core/helpers/EEH_Array.helper.php

Braces +2 added lines, -2 removed lines

@@ -61,10 +61,10 @@
 			$first_item = reset($arr);
 			if(is_array($first_item)){
 				return true;//yep, there's at least 2 levels to this array
-			}else{
+			} else{
 				return false;//nope, only 1 level
 			}
-		}else{
+		} else{
 			return false;//its not an array at all!
 		}
 	}

Spacing +31 added lines, -31 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('NO direct script access allowed'); }
 
-require_once( EE_HELPERS . 'EEH_Base.helper.php' );
+require_once(EE_HELPERS.'EEH_Base.helper.php');
 
 /**
  * EE_Array
@@ -26,8 +26,8 @@ 
 	 * @param  array $array2 an array of objects
 	 * @return array         an array of objects found in array 1 that aren't found in array 2.
 	 */
-	public static function object_array_diff( $array1, $array2 ) {
-		return array_udiff( $array1, $array2, array('self', '_compare_objects' ));
+	public static function object_array_diff($array1, $array2) {
+		return array_udiff($array1, $array2, array('self', '_compare_objects'));
 	}
 
 	/**
@@ -36,8 +36,8 @@ 
 	 * @param array $array
 	 * @return boolean
 	 */
-	public static function is_associative_array( array $array ) {
-		return array_keys( $array ) !== range( 0, count( $array ) - 1 );
+	public static function is_associative_array(array $array) {
+		return array_keys($array) !== range(0, count($array) - 1);
 	}
 
 	/**
@@ -46,7 +46,7 @@ 
 	 * @param array $arr
 	 * @return mixed what ever is in the array
 	 */
-	public static function get_one_item_from_array($arr){
+	public static function get_one_item_from_array($arr) {
 		$item = end($arr);
 		reset($arr);
 		return $item;
@@ -57,16 +57,16 @@ 
 	 * @param mixed $arr
 	 * @return boolean
 	 */
-	public static function is_multi_dimensional_array($arr){
-		if(is_array($arr)){
+	public static function is_multi_dimensional_array($arr) {
+		if (is_array($arr)) {
 			$first_item = reset($arr);
-			if(is_array($first_item)){
-				return true;//yep, there's at least 2 levels to this array
-			}else{
-				return false;//nope, only 1 level
+			if (is_array($first_item)) {
+				return true; //yep, there's at least 2 levels to this array
+			} else {
+				return false; //nope, only 1 level
 			}
-		}else{
-			return false;//its not an array at all!
+		} else {
+			return false; //its not an array at all!
 		}
 	}
 
@@ -77,8 +77,8 @@ 
 	 * @param mixed $default
 	 * @return mixed
 	 */
-	public static function is_set( $arr, $index, $default ) {
-		return isset( $arr[ $index ] ) ? $arr[ $index ] : $default;
+	public static function is_set($arr, $index, $default) {
+		return isset($arr[$index]) ? $arr[$index] : $default;
 	}
 
 	/**
@@ -86,12 +86,12 @@ 
 	 * @param mixed $value usually a string, but could be an array or object
 	 * @return mixed the UN-serialized data
 	 */
-	public static function maybe_unserialize( $value ) {
+	public static function maybe_unserialize($value) {
 		$data = maybe_unserialize($value);
 		//it's possible that this still has serialized data if its the session.  WP has a bug, http://core.trac.wordpress.org/ticket/26118 that doesnt' unserialize this automatically.
 		$token = 'C';
 		$data = is_string($data) ? trim($data) : $data;
-		if ( is_string($data) && strlen($data) > 1 && $data[0] == $token  && preg_match( "/^{$token}:[0-9]+:/s", $data ) ) {
+		if (is_string($data) && strlen($data) > 1 && $data[0] == $token && preg_match("/^{$token}:[0-9]+:/s", $data)) {
 			return unserialize($data);
 		} else {
 			return $data;
@@ -110,30 +110,30 @@ 
 	 * @param bool $preserve_keys 		whether or not to reset numerically indexed arrays
 	 * @return array
 	 */
-	public static function insert_into_array( $target_array = array(), $array_to_insert = array(), $offset = null, $add_before = true, $preserve_keys = true ) {
+	public static function insert_into_array($target_array = array(), $array_to_insert = array(), $offset = null, $add_before = true, $preserve_keys = true) {
 		// ensure incoming arrays are actually arrays
-		$target_array 		= (array)$target_array;
-		$array_to_insert	= (array)$array_to_insert;
+		$target_array = (array) $target_array;
+		$array_to_insert = (array) $array_to_insert;
 		// if no offset key was supplied
-		if ( empty( $offset )) {
+		if (empty($offset)) {
 			// use start or end of $target_array based on whether we are adding before or not
-			$offset = $add_before ? 0 : count( $target_array );
+			$offset = $add_before ? 0 : count($target_array);
 		}
 		// if offset key is a string, then find the corresponding numeric location for that element
-		$offset = is_int( $offset ) ? $offset : array_search( $offset, array_keys( $target_array ) );
+		$offset = is_int($offset) ? $offset : array_search($offset, array_keys($target_array));
 		// add one to the offset if adding after
 		$offset = $add_before ? $offset : $offset + 1;
 		// but ensure offset does not exceed the length of the array
-		$offset = $offset > count( $target_array ) ? count( $target_array ) : $offset;
+		$offset = $offset > count($target_array) ? count($target_array) : $offset;
 		// reindex array ???
-		if ( $preserve_keys ) {
+		if ($preserve_keys) {
 			// take a slice of the target array from the beginning till the offset,
 			// then add the new data
 			// then add another slice that starts at the offset and goes till the end
-			return array_slice( $target_array, 0, $offset, true ) + $array_to_insert + array_slice( $target_array, $offset, null, true );
+			return array_slice($target_array, 0, $offset, true) + $array_to_insert + array_slice($target_array, $offset, null, true);
 		} else {
 			// since we don't want to preserve keys, we can use array_splice
-			array_splice( $target_array, $offset, 0, $array_to_insert );
+			array_splice($target_array, $offset, 0, $array_to_insert);
 			return $target_array;
 		}
 	}
@@ -151,9 +151,9 @@ 
 	 * @param array $array2
 	 * @return array
 	 */
-	public static function merge_arrays_and_overwrite_keys( array $array1, array $array2 ) {
-		foreach ( $array2 as $key => $value ) {
-			$array1[ $key ] = $value;
+	public static function merge_arrays_and_overwrite_keys(array $array1, array $array2) {
+		foreach ($array2 as $key => $value) {
+			$array1[$key] = $value;
 		}
 		return $array1;
 	}