Completed
Branch FET-8365-add-indexes (4b9253)
by
unknown
527:08 queued 512:28
created
core/db_models/helpers/EE_Primary_Key_Index.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -4,7 +4,7 @@
 block discarded – undo
4 4
  * Used to indicate  a primary key index - ie, a set of fields which, when used in combination,
5 5
  * also uniquely identify a model object in the database (in case there is no primary key field).
6 6
  */
7
-class EE_Primary_Key_Index extends EE_Unique_Index{
7
+class EE_Primary_Key_Index extends EE_Unique_Index {
8 8
 	//yep, actually the same as unique index right now
9 9
 	
10 10
 }
Please login to merge, or discard this patch.
core/db_models/helpers/EE_Primary_Table.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -4,8 +4,8 @@  discard block
 block discarded – undo
4 4
  * For defining the main table of the model. This is the table with the model's primary key's field. So for CPT models, this will
5 5
  * probably be the wp_posts table (so the table name supplied will be 'posts', as the 'wp_' varies). For models only using one table, this will be that table.
6 6
  */
7
-require_once( EE_MODELS . 'helpers/EE_Table_Base.php');
8
-class EE_Primary_Table extends EE_Table_Base{
7
+require_once(EE_MODELS.'helpers/EE_Table_Base.php');
8
+class EE_Primary_Table extends EE_Table_Base {
9 9
 
10 10
 	/**
11 11
 	 *
@@ -15,14 +15,14 @@  discard block
 block discarded – undo
15 15
 	 * @param boolean $global whether the table is "global" as in there is only 1 table on an entire multisite install,
16 16
 	 *					or whether each site on a multisite install has a copy of this table
17 17
 	 */
18
-	function __construct($table_name, $pk_column = null, $global = false){
19
-		parent::__construct($table_name, $pk_column, $global );
18
+	function __construct($table_name, $pk_column = null, $global = false) {
19
+		parent::__construct($table_name, $pk_column, $global);
20 20
 	}
21 21
 	/**
22 22
 	 * Gets SQL for this table and assigning it an alias. Eg " wp_esp_attendee AS Attendee "
23 23
 	 * @return string
24 24
 	 */
25
-	function get_table_sql(){
25
+	function get_table_sql() {
26 26
 		return " ".$this->get_table_name()." AS ".$this->get_table_alias()." ";
27 27
 	}
28 28
 
Please login to merge, or discard this patch.
core/db_models/helpers/EE_Table_Base.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -4,7 +4,7 @@  discard block
 block discarded – undo
4 4
  * Base class for defining the tables that comprise models. This is used to store information
5 5
  * about the table\s alias, private key, etc.
6 6
  */
7
-abstract class EE_Table_Base{
7
+abstract class EE_Table_Base {
8 8
 	var $_table_name;
9 9
 	var $_table_alias;
10 10
 	/**
@@ -21,30 +21,30 @@  discard block
 block discarded – undo
21 21
 	 * @param boolean $global whether the table is "global" as in there is only 1 table on an entire multisite install,
22 22
 	 *					or whether each site on a multisite install has a copy of this table
23 23
 	 */
24
-	function __construct($table_name, $pk_column, $global = false ){
24
+	function __construct($table_name, $pk_column, $global = false) {
25 25
 		global $wpdb;
26
-		if( $global ) {
26
+		if ($global) {
27 27
 			$prefix = $wpdb->base_prefix;
28 28
 		} else {
29 29
 			$prefix = $wpdb->prefix;
30 30
 		}
31 31
 		//if they didn't add the prefix, let's add it
32
-		if( strpos( $table_name, $prefix ) !== 0 ) {
33
-			$table_name = $prefix . $table_name;
32
+		if (strpos($table_name, $prefix) !== 0) {
33
+			$table_name = $prefix.$table_name;
34 34
 		}
35 35
 		$this->_table_name = $table_name;
36 36
 		$this->_pk_column = $pk_column;
37 37
 	}
38 38
 
39
-	function _construct_finalize_with_alias($table_alias){
39
+	function _construct_finalize_with_alias($table_alias) {
40 40
 		$this->_table_alias = $table_alias;
41 41
 	}
42 42
 
43
-	function get_table_name(){
43
+	function get_table_name() {
44 44
 		return $this->_table_name;
45 45
 	}
46
-	function get_table_alias(){
47
-		if( ! $this->_table_alias){
46
+	function get_table_alias() {
47
+		if ( ! $this->_table_alias) {
48 48
 			throw new EE_Error("You must call _construct_finalize_with_alias before using the EE_Table_Base. Did you forget to call parent::__construct at the end of your EEMerimental_Base child's __construct?");
49 49
 		}
50 50
 		return $this->_table_alias;
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
 	 *
55 55
 	 * @return string name of column of PK
56 56
 	 */
57
-	function get_pk_column(){
57
+	function get_pk_column() {
58 58
 		return $this->_pk_column;
59 59
 	}
60 60
 
@@ -64,8 +64,8 @@  discard block
 block discarded – undo
64 64
 	 * returns a string with the table alias, a period, and the private key's column.
65 65
 	 * @return string
66 66
 	 */
67
-	function get_fully_qualified_pk_column(){
68
-		$sql =  $this->get_table_alias().".".$this->get_pk_column();
67
+	function get_fully_qualified_pk_column() {
68
+		$sql = $this->get_table_alias().".".$this->get_pk_column();
69 69
 		return $sql;
70 70
 	}
71 71
 
@@ -74,9 +74,9 @@  discard block
 block discarded – undo
74 74
 	 * returns the special sql for a inner select with a limit.
75 75
 	 * @return string    SQL select
76 76
 	 */
77
-	public function get_select_join_limit( $limit ) {
78
-		$limit = is_array( $limit ) ? 'LIMIT ' . implode(',', array_map( 'intval', $limit ) ) : 'LIMIT ' . (int) $limit;
79
-		$SQL = SP . '(SELECT * FROM ' . $this->_table_name . SP . $limit . ') AS ' . $this->_table_alias;
77
+	public function get_select_join_limit($limit) {
78
+		$limit = is_array($limit) ? 'LIMIT '.implode(',', array_map('intval', $limit)) : 'LIMIT '.(int) $limit;
79
+		$SQL = SP.'(SELECT * FROM '.$this->_table_name.SP.$limit.') AS '.$this->_table_alias;
80 80
 		return $SQL;
81 81
 	}
82 82
 }
Please login to merge, or discard this patch.
core/db_models/helpers/EE_Unique_Index.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -4,7 +4,7 @@
 block discarded – undo
4 4
  * Used to indicate  a UNIQUE key index - ie, a set of fields which must be unique
5 5
  * for ALL the model objects of this type
6 6
  */
7
-class EE_Unique_Index extends EE_Index{
7
+class EE_Unique_Index extends EE_Index {
8 8
 	//yep, actually the same as index right now
9 9
 	
10 10
 }
Please login to merge, or discard this patch.
core/db_models/relations/EE_Belongs_To_Any_Relation.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -6,7 +6,7 @@  discard block
 block discarded – undo
6 6
  * in order to specify which model the foreign key points to (eg, the foreign key may have a value of 34, but is that Transaction with
7 7
  * ID 34 or Registration with ID 34? The EE_Any_Foreign_Model_name_Field specifies which of the two). 
8 8
  */
9
-require_once( EE_MODELS . 'relations/EE_Belongs_To_Relation.php');
9
+require_once(EE_MODELS.'relations/EE_Belongs_To_Relation.php');
10 10
 
11 11
 class EE_Belongs_To_Any_Relation extends EE_Belongs_To_Relation {
12 12
 
@@ -19,8 +19,8 @@  discard block
 block discarded – undo
19 19
 		
20 20
 		
21 21
 		$other_table_pk_field = $this->get_other_model()->get_primary_key_field();
22
-		$this_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($model_relation_chain,$this->get_this_model()->get_this_model_name()) . $this_table_fk_field->get_table_alias();
23
-		$other_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($model_relation_chain, $this->get_other_model()->get_this_model_name()) . $other_table_pk_field->get_table_alias();
22
+		$this_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($model_relation_chain, $this->get_this_model()->get_this_model_name()).$this_table_fk_field->get_table_alias();
23
+		$other_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($model_relation_chain, $this->get_other_model()->get_this_model_name()).$other_table_pk_field->get_table_alias();
24 24
 		$other_table = $this->get_other_model()->get_table_for_alias($other_table_alias);
25 25
 		return $this->_left_join($other_table, 
26 26
 				$other_table_alias, 
@@ -58,12 +58,12 @@  discard block
 block discarded – undo
58 58
 	 */
59 59
 	function remove_relation_to($this_obj_or_id, $other_obj_or_id) {
60 60
 		$this_model_obj = $this->get_this_model()->ensure_is_obj($this_obj_or_id, true);
61
-		$other_model_obj = $this->get_other_model()->ensure_is_obj( $other_obj_or_id );
61
+		$other_model_obj = $this->get_other_model()->ensure_is_obj($other_obj_or_id);
62 62
 		//find the field on th eother model which is a foreign key to this model
63 63
 		$fk_on_this_model = $this->get_this_model()->get_foreign_key_to($this->get_other_model()->get_this_model_name());
64 64
 		//set that field on the other model to this model's ID
65 65
 		$this_model_obj->set($fk_on_this_model->get_name(), null, true);
66
-		$this_model_obj->set($this->get_this_model()->get_field_containing_related_model_name()->get_name(),null,true);
66
+		$this_model_obj->set($this->get_this_model()->get_field_containing_related_model_name()->get_name(), null, true);
67 67
 		$this_model_obj->save();
68 68
 		return $other_model_obj;
69 69
 	}
Please login to merge, or discard this patch.
core/db_models/relations/EE_Belongs_To_Relation.php 3 patches
Indentation   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -1,16 +1,16 @@
 block discarded – undo
1 1
 <?php
2 2
 require_once( EE_MODELS . 'relations/EE_Model_Relation_Base.php');
3 3
 /**
4
- * Class EE_Belongs_To_Relation
5
- *
6
- * The current model has the foreign key pointing to the other model. Eg, Registration belongs to Transaction
7
- * (because Registration's TXN_ID field is on Registration, and points to the Transaction's PK)
8
- *
9
- * @package            Event Espresso
10
- * @subpackage    core
11
- * @author                MIke Nelson
12
- *
13
- */
4
+	 * Class EE_Belongs_To_Relation
5
+	 *
6
+	 * The current model has the foreign key pointing to the other model. Eg, Registration belongs to Transaction
7
+	 * (because Registration's TXN_ID field is on Registration, and points to the Transaction's PK)
8
+	 *
9
+	 * @package            Event Espresso
10
+	 * @subpackage    core
11
+	 * @author                MIke Nelson
12
+	 *
13
+	 */
14 14
 class EE_Belongs_To_Relation extends EE_Model_Relation_Base {
15 15
 
16 16
 	/**
Please login to merge, or discard this patch.
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-require_once( EE_MODELS . 'relations/EE_Model_Relation_Base.php');
2
+require_once(EE_MODELS.'relations/EE_Model_Relation_Base.php');
3 3
 /**
4 4
  * Class EE_Belongs_To_Relation
5 5
  *
@@ -36,10 +36,10 @@  discard block
 block discarded – undo
36 36
 		//create the sql string like
37 37
 		$this_table_fk_field = $this->get_this_model()->get_foreign_key_to($this->get_other_model()->get_this_model_name());
38 38
 		$other_table_pk_field = $this->get_other_model()->get_primary_key_field();
39
-		$this_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($model_relation_chain, $this->get_this_model()->get_this_model_name()) . $this_table_fk_field->get_table_alias();
40
-		$other_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($model_relation_chain, $this->get_other_model()->get_this_model_name()) . $other_table_pk_field->get_table_alias();
39
+		$this_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($model_relation_chain, $this->get_this_model()->get_this_model_name()).$this_table_fk_field->get_table_alias();
40
+		$other_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($model_relation_chain, $this->get_other_model()->get_this_model_name()).$other_table_pk_field->get_table_alias();
41 41
 		$other_table = $this->get_other_model()->get_table_for_alias($other_table_alias);
42
-		return $this->_left_join($other_table, $other_table_alias, $other_table_pk_field->get_table_column(), $this_table_alias, $this_table_fk_field->get_table_column()) . $this->get_other_model()->_construct_internal_join_to_table_with_alias($other_table_alias);
42
+		return $this->_left_join($other_table, $other_table_alias, $other_table_pk_field->get_table_column(), $this_table_alias, $this_table_fk_field->get_table_column()).$this->get_other_model()->_construct_internal_join_to_table_with_alias($other_table_alias);
43 43
 	}
44 44
 
45 45
 	/**
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
 		$other_model_obj = $this->get_other_model()->ensure_is_obj($other_obj_or_id, true);
54 54
 		//find the field on the other model which is a foreign key to this model
55 55
 		$fk_on_this_model = $this->get_this_model()->get_foreign_key_to($this->get_other_model()->get_this_model_name());
56
-		if ( $this_model_obj->get($fk_on_this_model->get_name()) != $other_model_obj->ID()){
56
+		if ($this_model_obj->get($fk_on_this_model->get_name()) != $other_model_obj->ID()) {
57 57
 			//set that field on the other model to this model's ID
58 58
 			$this_model_obj->set($fk_on_this_model->get_name(), $other_model_obj->ID());
59 59
 			$this_model_obj->save();
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
 	 */
70 70
 	function remove_relation_to($this_obj_or_id, $other_obj_or_id) {
71 71
 		$this_model_obj = $this->get_this_model()->ensure_is_obj($this_obj_or_id, true);
72
-		$other_model_obj = $this->get_other_model()->ensure_is_obj( $other_obj_or_id );
72
+		$other_model_obj = $this->get_other_model()->ensure_is_obj($other_obj_or_id);
73 73
 		//find the field on the other model which is a foreign key to this model
74 74
 		$fk_on_this_model = $this->get_this_model()->get_foreign_key_to($this->get_other_model()->get_this_model_name());
75 75
 		//set that field on the other model to this model's ID
@@ -89,9 +89,9 @@  discard block
 block discarded – undo
89 89
 		//get column on this model object which is a foreign key to the other model
90 90
 		$fk_field_obj = $this->get_this_model()->get_foreign_key_to($this->get_other_model()->get_this_model_name());
91 91
 		//get its value
92
-		if( $model_obj_or_id instanceof EE_Base_Class){
92
+		if ($model_obj_or_id instanceof EE_Base_Class) {
93 93
 			$model_obj = $model_obj_or_id;
94
-		}else{
94
+		} else {
95 95
 			$model_obj = $this->get_this_model()->ensure_is_obj($model_obj_or_id);
96 96
 		}
97 97
 		$ID_value_on_other_model = $model_obj->get($fk_field_obj->get_name());
Please login to merge, or discard this patch.
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -90,7 +90,7 @@
 block discarded – undo
90 90
 		//so in case teh IPN is arriving later, let's try to process an IPN!
91 91
 		if($_SERVER['REQUEST_METHOD'] == 'POST'){
92 92
 			return $this->handle_ipn($_POST, $transaction );
93
-		}else{
93
+		} else{
94 94
 			return parent::finalize_payment_for( $transaction );
95 95
 		}
96 96
 	}
Please login to merge, or discard this patch.
core/db_models/relations/EE_Has_Many_Relation.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -4,8 +4,8 @@  discard block
 block discarded – undo
4 4
 /**
5 5
  * In this relation, the OTHER model ahs the foreign key pointing to this model
6 6
  */
7
-require_once( EE_MODELS . 'relations/EE_Model_Relation_Base.php');
8
-class EE_Has_Many_Relation extends EE_Model_Relation_Base{	
7
+require_once(EE_MODELS.'relations/EE_Model_Relation_Base.php');
8
+class EE_Has_Many_Relation extends EE_Model_Relation_Base {	
9 9
 	
10 10
 	/**
11 11
 	 * Object representing the relationship between two models. Has_Many_Relations are where the OTHER model has the foreign key
@@ -15,16 +15,16 @@  discard block
 block discarded – undo
15 15
 	 * @param boolean $block_deletes For this type of relation, we block by default. If there are related models across this relation, block (prevent and add an error) the deletion of this model
16 16
 	 * @param type $blocking_delete_error_message a customized error message on blocking deletes instead of the default
17 17
 	 */
18
-	function __construct($block_deletes = true, $blocking_delete_error_message = null){
18
+	function __construct($block_deletes = true, $blocking_delete_error_message = null) {
19 19
 		parent::__construct($block_deletes, $blocking_delete_error_message);
20 20
 	}
21
-	function get_join_statement($model_relation_chain){
21
+	function get_join_statement($model_relation_chain) {
22 22
 		//create the sql string like
23 23
 		// LEFT JOIN other_table AS table_alias ON this_table_alias.pk = other_table_alias.fk extra_join_conditions
24 24
 		$this_table_pk_field = $this->get_this_model()->get_primary_key_field();
25 25
 		$other_table_fk_field = $this->get_other_model()->get_foreign_key_to($this->get_this_model()->get_this_model_name());
26
-		$pk_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($model_relation_chain, $this->get_this_model()->get_this_model_name()) . $this_table_pk_field->get_table_alias();
27
-		$fk_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($model_relation_chain, $this->get_other_model()->get_this_model_name()) . $other_table_fk_field->get_table_alias();
26
+		$pk_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($model_relation_chain, $this->get_this_model()->get_this_model_name()).$this_table_pk_field->get_table_alias();
27
+		$fk_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($model_relation_chain, $this->get_other_model()->get_this_model_name()).$other_table_fk_field->get_table_alias();
28 28
 		$fk_table = $this->get_other_model()->get_table_for_alias($fk_table_alias);
29 29
 		
30 30
 		return $this->_left_join($fk_table, $fk_table_alias, $other_table_fk_field->get_table_column(), $pk_table_alias, $this_table_pk_field->get_table_column()).$this->get_other_model()->_construct_internal_join_to_table_with_alias($fk_table_alias);
@@ -35,13 +35,13 @@  discard block
 block discarded – undo
35 35
 	 * @param EE_Base_Class/int $other_obj_or_id
36 36
 	 * @return EE_Base_Class
37 37
 	 */
38
-	 function add_relation_to($this_obj_or_id, $other_obj_or_id ){
38
+	 function add_relation_to($this_obj_or_id, $other_obj_or_id) {
39 39
 		 $this_model_obj = $this->get_this_model()->ensure_is_obj($this_obj_or_id, true);
40 40
 		 $other_model_obj = $this->get_other_model()->ensure_is_obj($other_obj_or_id, true);
41 41
 		 
42 42
 		 //find the field on th eother model which is a foreign key to this model
43 43
 		 $fk_field_on_other_model = $this->get_other_model()->get_foreign_key_to($this->get_this_model()->get_this_model_name());
44
-		 if($other_model_obj->get($fk_field_on_other_model->get_name()) != $this_model_obj->ID()){
44
+		 if ($other_model_obj->get($fk_field_on_other_model->get_name()) != $this_model_obj->ID()) {
45 45
 			//set that field on the other model to this model's ID
46 46
 			$other_model_obj->set($fk_field_on_other_model->get_name(), $this_model_obj->ID());
47 47
 			$other_model_obj->save();
@@ -55,12 +55,12 @@  discard block
 block discarded – undo
55 55
 	 * @param EE_Base_Class/int $other_obj_or_id
56 56
 	 * @return EE_Base_Class
57 57
 	 */
58
-	 function remove_relation_to($this_obj_or_id, $other_obj_or_id){
58
+	 function remove_relation_to($this_obj_or_id, $other_obj_or_id) {
59 59
 		 $other_model_obj = $this->get_other_model()->ensure_is_obj($other_obj_or_id, true);
60 60
 		 //find the field on th eother model which is a foreign key to this model
61 61
 		 $fk_field_on_other_model = $this->get_other_model()->get_foreign_key_to($this->get_this_model()->get_this_model_name());
62 62
 		 //set that field on the other model to this model's ID
63
-		 $other_model_obj->set($fk_field_on_other_model->get_name(),null, true);
63
+		 $other_model_obj->set($fk_field_on_other_model->get_name(), null, true);
64 64
 		 $other_model_obj->save();
65 65
 		 return $other_model_obj;
66 66
 	 }
Please login to merge, or discard this patch.
core/db_models/strategies/EE_Default_Where_Conditions.strategy.php 2 patches
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -4,7 +4,7 @@  discard block
 block discarded – undo
4 4
  * Strategy to be used for getting default where conditions for EEM_Base children.
5 5
  * Should be initialized and set on construction of model
6 6
  */
7
-class EE_Default_Where_Conditions{
7
+class EE_Default_Where_Conditions {
8 8
 	/**
9 9
 	 * This const can be used in EE_Default_Where_Conditions values, and at the time of querying it will be
10 10
 	 * replaced with the current user's ID (because we don't want to use the current user's ID at time of
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
 	 * onto any field names
37 37
 	 * @param array $custom_where_conditions
38 38
 	 */
39
-	public function __construct( $custom_where_conditions = array() ) {
39
+	public function __construct($custom_where_conditions = array()) {
40 40
 		$this->_where_conditions_provided = $custom_where_conditions;
41 41
 	}
42 42
 
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
 	 * for querying of the model.
46 46
 	 * @param EEM_Base $model
47 47
 	 */
48
-	function _finalize_construct(EEM_Base $model){
48
+	function _finalize_construct(EEM_Base $model) {
49 49
 		$this->_model = $model;
50 50
 	}
51 51
 	/**
@@ -60,15 +60,15 @@  discard block
 block discarded – undo
60 60
 	 * @param string $model_relation_chain
61 61
 	 * @return array like what's expected in EEM_Base::get_all()'s $query_params[0]
62 62
 	 */
63
-	function get_default_where_conditions( $model_relation_chain = '' ){
64
-		return $this->prepare_where_conditions_for_querying( array_merge( $this->_get_default_where_conditions(), $this->get_where_conditions_provided() ), $model_relation_chain );
63
+	function get_default_where_conditions($model_relation_chain = '') {
64
+		return $this->prepare_where_conditions_for_querying(array_merge($this->_get_default_where_conditions(), $this->get_where_conditions_provided()), $model_relation_chain);
65 65
 	}
66 66
 	/**
67 67
 	 * Gets the default where conditions that are specific to this child of EE_Default_Where_Conditions.
68 68
 	 * Adding model relation chains is handled by the public method get_default_where_conditions
69 69
 	 * @return array
70 70
 	 */
71
-	protected function _get_default_where_conditions(){
71
+	protected function _get_default_where_conditions() {
72 72
 		return array();
73 73
 	}
74 74
 
@@ -82,33 +82,33 @@  discard block
 block discarded – undo
82 82
 	 * @return array
83 83
 	 * @throws \EE_Error
84 84
 	 */
85
-	public function prepare_where_conditions_for_querying( $where_conditions, $model_relation_chain ) {
85
+	public function prepare_where_conditions_for_querying($where_conditions, $model_relation_chain) {
86 86
 		$where_conditions_with_model_relation_chain_prefixes = array();
87
-		if( ! is_array( $where_conditions ) ){
87
+		if ( ! is_array($where_conditions)) {
88 88
 			$where_conditions = array();
89 89
 		}
90
-		foreach( $where_conditions as $key => $value ) {
91
-			if( in_array( $key, array( 'OR', 'AND', 'NOT' ) ) ||
92
-			strpos( $key, 'OR*' )  !== false ||
93
-					strpos( $key, 'AND*' ) !== false ||
94
-					strpos( $key, 'NOT*' ) !== false ){
95
-				$where_conditions_with_model_relation_chain_prefixes[ $key ] = $this->prepare_where_conditions_for_querying( $value, $model_relation_chain );
96
-			}else{
97
-				if($model_relation_chain != '' && $model_relation_chain[strlen($model_relation_chain)-1] !='.'){
98
-					$model_relation_chain=$model_relation_chain.".";
90
+		foreach ($where_conditions as $key => $value) {
91
+			if (in_array($key, array('OR', 'AND', 'NOT')) ||
92
+			strpos($key, 'OR*') !== false ||
93
+					strpos($key, 'AND*') !== false ||
94
+					strpos($key, 'NOT*') !== false) {
95
+				$where_conditions_with_model_relation_chain_prefixes[$key] = $this->prepare_where_conditions_for_querying($value, $model_relation_chain);
96
+			} else {
97
+				if ($model_relation_chain != '' && $model_relation_chain[strlen($model_relation_chain) - 1] != '.') {
98
+					$model_relation_chain = $model_relation_chain.".";
99 99
 				}
100 100
 				//check for the current user id place holder, and if present change it
101
-				if( $value === self::current_user_placeholder ){
101
+				if ($value === self::current_user_placeholder) {
102 102
 					$value = get_current_user_id();
103 103
 				}
104 104
 				//check for user field placeholder
105
-				if( $key == self::user_field_name_placeholder ) {
106
-					if( ! $this->_model->wp_user_field_name() ) {
107
-						throw new EE_Error( sprintf( __( 'There is no foreign key to the WP_User model on model %s. Please either modify your default where conditions, add a _model_chain_to_wp_user onto the model, or a proper EE_WP_User_Field onto the model', 'event_espresso' ), $this->_model->get_this_model_name() ) );
105
+				if ($key == self::user_field_name_placeholder) {
106
+					if ( ! $this->_model->wp_user_field_name()) {
107
+						throw new EE_Error(sprintf(__('There is no foreign key to the WP_User model on model %s. Please either modify your default where conditions, add a _model_chain_to_wp_user onto the model, or a proper EE_WP_User_Field onto the model', 'event_espresso'), $this->_model->get_this_model_name()));
108 108
 					}
109 109
 					$key = $this->_model->wp_user_field_name();
110 110
 				}
111
-				$where_conditions_with_model_relation_chain_prefixes[ $model_relation_chain . $key ] = $value;
111
+				$where_conditions_with_model_relation_chain_prefixes[$model_relation_chain.$key] = $value;
112 112
 			}
113 113
 		}
114 114
 		return $where_conditions_with_model_relation_chain_prefixes;
Please login to merge, or discard this patch.
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@
 block discarded – undo
33 33
 		if( $normalized_value ){
34 34
 			if (filter_var($normalized_value, FILTER_VALIDATE_URL) === false){
35 35
 				throw new EE_Validation_Error( $this->get_validation_error_message(), 'invalid_url');
36
-			}else{
36
+			} else{
37 37
 				EE_Registry::instance()->load_helper('URL');
38 38
 				if( ! EEH_URL::remote_file_exists(
39 39
 						$normalized_value,
Please login to merge, or discard this patch.
core/db_models/strategies/EE_Restriction_Generator_Base.strategy.php 2 patches
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
3
-	exit( 'No direct script access allowed' );
2
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
3
+	exit('No direct script access allowed');
4 4
 }
5 5
 
6 6
 /**
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
 	 * @param EEM_Base $model
54 54
 	 * @param string $action
55 55
 	 */
56
-	public function _construct_finalize( EEM_Base $model, $action ){
56
+	public function _construct_finalize(EEM_Base $model, $action) {
57 57
 		$this->_model = $model;
58 58
 		$this->_action = $action;
59 59
 	}
@@ -65,8 +65,8 @@  discard block
 block discarded – undo
65 65
 	 * @return EEM_Base | EEM_Soft_Delete_Base
66 66
 	 */
67 67
 	public function model() {
68
-		if( ! $this->_model instanceof EEM_Base ) {
69
-			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 ) ) );
68
+		if ( ! $this->_model instanceof EEM_Base) {
69
+			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)));
70 70
 		}
71 71
 		return $this->_model;
72 72
 	}
@@ -79,8 +79,8 @@  discard block
 block discarded – undo
79 79
 	 * @return string
80 80
 	 */
81 81
 	public function action() {
82
-		if( ! $this->_action ) {
83
-			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 ) ) );
82
+		if ( ! $this->_action) {
83
+			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)));
84 84
 		}
85 85
 		return $this->_action;
86 86
 	}
@@ -89,10 +89,10 @@  discard block
 block discarded – undo
89 89
 	 * Returns whether or not _construct_finalize() has been called on this restriction generator object
90 90
 	 * @return boolean
91 91
 	 */
92
-	public function construction_finalized(){
93
-		if( $this->_model instanceof EEM_Base  && $this->_action ){
92
+	public function construction_finalized() {
93
+		if ($this->_model instanceof EEM_Base && $this->_action) {
94 94
 			return true;
95
-		}else{
95
+		} else {
96 96
 			return false;
97 97
 		}
98 98
 	}
@@ -103,10 +103,10 @@  discard block
 block discarded – undo
103 103
 	 * @return array @see EEM_Base::_cap_restrictions
104 104
 	 */
105 105
 	public function generate_restrictions() {
106
-		if( $this->_cap_restrictions_generated === false ) {
107
-			$this->_cap_restrictions_generated = apply_filters( 'FHEE__EE_Restriction_Generator_Base__generate_restrictions__first_time', $this->_generate_restrictions(), $this );
106
+		if ($this->_cap_restrictions_generated === false) {
107
+			$this->_cap_restrictions_generated = apply_filters('FHEE__EE_Restriction_Generator_Base__generate_restrictions__first_time', $this->_generate_restrictions(), $this);
108 108
 		}
109
-		return apply_filters( 'FHEE__EE_Restriction_Generator_Base__generate_restrictions__every_time', $this->_cap_restrictions_generated, $this );
109
+		return apply_filters('FHEE__EE_Restriction_Generator_Base__generate_restrictions__every_time', $this->_cap_restrictions_generated, $this);
110 110
 	}
111 111
 
112 112
 	/**
@@ -122,10 +122,10 @@  discard block
 block discarded – undo
122 122
 	 * making restrictions and caching them on itself in case its asked later
123 123
 	 * @return boolean
124 124
 	 */
125
-	public function has_generated_cap_restrictions(){
126
-		if( $this->_cap_restrictions_generated === false ){
125
+	public function has_generated_cap_restrictions() {
126
+		if ($this->_cap_restrictions_generated === false) {
127 127
 			return false;
128
-		}else{
128
+		} else {
129 129
 			return true;
130 130
 		}
131 131
 	}
@@ -139,8 +139,8 @@  discard block
 block discarded – undo
139 139
 	 * @param string $action
140 140
 	 * @return string
141 141
 	 */
142
-	public static function get_cap_name( $model, $action ) {
143
-		return apply_filters( 'FHEE__EE_Restriction_Generator__get_cap_name', ( $model->is_wp_core_model() ? '' : 'ee_' ) . $action . '_' . $model->cap_slug(), $model, $action );
142
+	public static function get_cap_name($model, $action) {
143
+		return apply_filters('FHEE__EE_Restriction_Generator__get_cap_name', ($model->is_wp_core_model() ? '' : 'ee_').$action.'_'.$model->cap_slug(), $model, $action);
144 144
 	}
145 145
 
146 146
 	/**
@@ -149,11 +149,11 @@  discard block
 block discarded – undo
149 149
 	 * @param string $action
150 150
 	 * @return boolean
151 151
 	 */
152
-	public static function is_cap( $model, $action ) {
153
-		$caps_for_admin = EE_Registry::instance()->CAP->get_ee_capabilities( 'administrator' );
154
-		if( in_array( self::get_cap_name( $model, $action ), $caps_for_admin ) ) {
152
+	public static function is_cap($model, $action) {
153
+		$caps_for_admin = EE_Registry::instance()->CAP->get_ee_capabilities('administrator');
154
+		if (in_array(self::get_cap_name($model, $action), $caps_for_admin)) {
155 155
 			return true;
156
-		}else{
156
+		} else {
157 157
 			return false;
158 158
 		}
159 159
 	}
@@ -164,7 +164,7 @@  discard block
 block discarded – undo
164 164
 	 * @return string
165 165
 	 */
166 166
 	public static function get_default_restrictions_cap() {
167
-		return apply_filters( 'FHEE__EE_Restriction_Generator_Base__default_restrictions_cap', 'manage_options' );
167
+		return apply_filters('FHEE__EE_Restriction_Generator_Base__default_restrictions_cap', 'manage_options');
168 168
 	}
169 169
 }
170 170
 
Please login to merge, or discard this patch.
Braces   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
 	public function construction_finalized(){
93 93
 		if( $this->_model instanceof EEM_Base  && $this->_action ){
94 94
 			return true;
95
-		}else{
95
+		} else{
96 96
 			return false;
97 97
 		}
98 98
 	}
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
 	public function has_generated_cap_restrictions(){
126 126
 		if( $this->_cap_restrictions_generated === false ){
127 127
 			return false;
128
-		}else{
128
+		} else{
129 129
 			return true;
130 130
 		}
131 131
 	}
@@ -153,7 +153,7 @@  discard block
 block discarded – undo
153 153
 		$caps_for_admin = EE_Registry::instance()->CAP->get_ee_capabilities( 'administrator' );
154 154
 		if( in_array( self::get_cap_name( $model, $action ), $caps_for_admin ) ) {
155 155
 			return true;
156
-		}else{
156
+		} else{
157 157
 			return false;
158 158
 		}
159 159
 	}
Please login to merge, or discard this patch.