Completed
Branch BUG-9957-float-left-float-righ... (b7fc25)
by
unknown
32:42 queued 16:46
created
core/db_models/fields/EE_Slug_Field.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <?php
2
-require_once( EE_MODELS . 'fields/EE_Text_Field_Base.php' );
3
-class EE_Slug_Field extends EE_Text_Field_Base{
2
+require_once(EE_MODELS.'fields/EE_Text_Field_Base.php');
3
+class EE_Slug_Field extends EE_Text_Field_Base {
4 4
 	/**
5 5
 	 * ensures string is usable in URLs
6 6
 	 * @param string $value_inputted_for_field_on_model_object
Please login to merge, or discard this patch.
core/db_models/fields/EE_Text_Field_Base.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -2,13 +2,13 @@  discard block
 block discarded – undo
2 2
 /**
3 3
  * Text_Fields is a base class for any fields which are have text value. (Exception: foreign and private key fields. Wish PHP had multiple-inheritance for this...)
4 4
  */
5
-abstract class EE_Text_Field_Base extends EE_Model_Field_Base{
6
-	function get_wpdb_data_type(){
5
+abstract class EE_Text_Field_Base extends EE_Model_Field_Base {
6
+	function get_wpdb_data_type() {
7 7
 		return '%s';
8 8
 	}
9 9
 
10
-	function prepare_for_get( $value_of_field_on_model_object ) {
11
-		return is_string($value_of_field_on_model_object) ? stripslashes( $value_of_field_on_model_object ) : $value_of_field_on_model_object;
10
+	function prepare_for_get($value_of_field_on_model_object) {
11
+		return is_string($value_of_field_on_model_object) ? stripslashes($value_of_field_on_model_object) : $value_of_field_on_model_object;
12 12
 	}
13 13
 	
14 14
 	/**
@@ -18,7 +18,7 @@  discard block
 block discarded – undo
18 18
 	 * @return string
19 19
 	 */
20 20
 	function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = null) {
21
-		if($schema=='form_input'){
21
+		if ($schema == 'form_input') {
22 22
 			$value_on_field_to_be_outputted = htmlentities($value_on_field_to_be_outputted, ENT_QUOTES, 'UTF-8');
23 23
 		}
24 24
 		return parent::prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema);
@@ -30,6 +30,6 @@  discard block
 block discarded – undo
30 30
 	 * @return string
31 31
 	 */
32 32
 	function prepare_for_set($value_inputted_for_field_on_model_object) {
33
-		return stripslashes(html_entity_decode(parent::prepare_for_set($value_inputted_for_field_on_model_object),ENT_QUOTES,'UTF-8'));
33
+		return stripslashes(html_entity_decode(parent::prepare_for_set($value_inputted_for_field_on_model_object), ENT_QUOTES, 'UTF-8'));
34 34
 	}
35 35
 }
36 36
\ No newline at end of file
Please login to merge, or discard this patch.
core/db_models/fields/EE_Trashed_Flag_Field.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <?php
2
-require_once( EE_MODELS . 'fields/EE_Boolean_Field.php');
3
-class EE_Trashed_Flag_Field extends EE_Boolean_Field{
2
+require_once(EE_MODELS.'fields/EE_Boolean_Field.php');
3
+class EE_Trashed_Flag_Field extends EE_Boolean_Field {
4 4
 	//note: some client code simply checks if a field IS an EE_Trashed_Flag_Field
5 5
 	//...otherwise, these fields are mostly the same as boolean fields
6 6
 }
Please login to merge, or discard this patch.
core/db_models/fields/EE_WP_Post_Type_Field.php.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -2,13 +2,13 @@
 block discarded – undo
2 2
 /**
3 3
  * For CPT models who have a post type field
4 4
  */
5
-class EE_WP_Post_Type_Field extends EE_DB_Only_Text_Field{
5
+class EE_WP_Post_Type_Field extends EE_DB_Only_Text_Field {
6 6
 	/**
7 7
 	 * 
8 8
 	 * @param string $post_type the exact string to be used for the post type
9 9
 	 * of all these post type model objects/rows
10 10
 	 */
11
-	function __construct($post_type){
11
+	function __construct($post_type) {
12 12
 		parent::__construct('post_type', __("Post Type", 'event_espresso'), false, $post_type);
13 13
 	}
14 14
 }
15 15
\ No newline at end of file
Please login to merge, or discard this patch.
core/db_models/fields/EE_WP_User_Field.php 2 patches
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
  *
26 26
  * ------------------------------------------------------------------------
27 27
  */
28
-class EE_WP_User_Field extends EE_Foreign_Key_Int_Field{
28
+class EE_WP_User_Field extends EE_Foreign_Key_Int_Field {
29 29
 	/**
30 30
 	 * No need to provide a default or the model pointed to- the default is
31 31
 	 * always get_current_user_id() and the model pointed to is always WP_User
@@ -33,8 +33,8 @@  discard block
 block discarded – undo
33 33
 	 * @param string $nicename should eb internationalized with __('blah','event_espresso')
34 34
 	 * @param boolean $nullable
35 35
 	 */
36
-	function __construct($table_column, $nicename, $nullable){
37
-		parent::__construct($table_column, $nicename, $nullable, null, 'WP_User' );
36
+	function __construct($table_column, $nicename, $nullable) {
37
+		parent::__construct($table_column, $nicename, $nullable, null, 'WP_User');
38 38
 	}
39 39
 
40 40
 	/**
@@ -42,11 +42,11 @@  discard block
 block discarded – undo
42 42
 	 * constructing the model field because that's done before $current_user is set
43 43
 	 * @return mixed
44 44
 	 */
45
-	function get_default_value(){
46
-		if( did_action( 'init' ) ) {
45
+	function get_default_value() {
46
+		if (did_action('init')) {
47 47
 			return get_current_user_id();
48
-		}else{
49
-			EE_Error::doing_it_wrong('EE_WP_User_Field::get_default_value', __( 'You cant get a default value for a wp_User_Field because the "init" action is called, because current_user global hasnt yet been setup. Consider doing your business logic on the "init" hook or later.', 'event_espresso' ), '4.6.20' );
48
+		} else {
49
+			EE_Error::doing_it_wrong('EE_WP_User_Field::get_default_value', __('You cant get a default value for a wp_User_Field because the "init" action is called, because current_user global hasnt yet been setup. Consider doing your business logic on the "init" hook or later.', 'event_espresso'), '4.6.20');
50 50
 			return 1;
51 51
 		}
52 52
 	}
Please login to merge, or discard this patch.
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,4 +1,6 @@  discard block
 block discarded – undo
1
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
1
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
2
+	exit('No direct script access allowed');
3
+}
2 4
 /**
3 5
  * EEH_URL helper
4 6
  * Helper class for URL-related PHP functions
@@ -62,7 +64,7 @@  discard block
 block discarded – undo
62 64
 				isset($results['response']['code']) &&
63 65
 				$results['response']['code'] == '200'){
64 66
 			return true;
65
-		}else{
67
+		} else{
66 68
 			return false;
67 69
 		}
68 70
 	}
Please login to merge, or discard this patch.
core/db_models/helpers/EE_Index.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -4,18 +4,18 @@  discard block
 block discarded – undo
4 4
  * Parent class for indicating indexes on models. As of writing this, it is only used
5 5
  * when deleting model objects that have no primary key, but clearly this can be expanded
6 6
  */
7
-class EE_Index{
7
+class EE_Index {
8 8
 	protected $_name;
9 9
 	protected $_field_names;
10 10
 	protected $_model_name;
11
-	public function __construct($fields){
11
+	public function __construct($fields) {
12 12
 		$this->_field_names = $fields;
13 13
 	}
14
-	public function _construct_finalize($name,$model_name){
14
+	public function _construct_finalize($name, $model_name) {
15 15
 		$this->_name = $name;
16 16
 		$this->_model_name = $model_name;
17 17
 	}
18
-	public function field_names(){
18
+	public function field_names() {
19 19
 		return $this->_field_names;
20 20
 	}
21 21
 	/**
@@ -23,19 +23,19 @@  discard block
 block discarded – undo
23 23
 	 * @param string $model_name like Event, Question_Group, etc. omit the EEM_
24 24
 	 * @return EEM_Base
25 25
 	 */
26
-	protected function _get_model($model_name){
27
-		$modelInstance=call_user_func("EEM_".$model_name."::instance");
26
+	protected function _get_model($model_name) {
27
+		$modelInstance = call_user_func("EEM_".$model_name."::instance");
28 28
 		return $modelInstance;
29 29
 	}
30 30
 	/**
31 31
 	 * Gets all the fields for this index
32 32
 	 * @return EE_Model_Field_Base[]
33 33
 	 */
34
-	public function fields(){
34
+	public function fields() {
35 35
 		$fields = array();
36 36
 		$model = $this->_get_model($this->_model_name);
37
-		foreach($model->field_settings() as $field_name => $field_obj){
38
-			if(in_array($field_name,$this->field_names())){
37
+		foreach ($model->field_settings() as $field_name => $field_obj) {
38
+			if (in_array($field_name, $this->field_names())) {
39 39
 				$fields[$field_name] = $field_obj;
40 40
 			}
41 41
 		}
Please login to merge, or discard this patch.
core/db_models/helpers/EE_Model_Parser.php 3 patches
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,12 +1,12 @@
 block discarded – undo
1 1
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION'))
2 2
 	exit('No direct script access allowed');
3 3
 /**
4
- * EE_Model_Parser
5
- *
6
- * @package			Event Espresso
7
- * @subpackage
8
- * @author				Mike Nelson
9
- */
4
+	 * EE_Model_Parser
5
+	 *
6
+	 * @package			Event Espresso
7
+	 * @subpackage
8
+	 * @author				Mike Nelson
9
+	 */
10 10
 class EE_Model_Parser {
11 11
 	const table_alias_model_relation_chain_separator = '__';
12 12
 	const table_alias_model_relation_chain_prefix_end = '___';
Please login to merge, or discard this patch.
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
20 20
 	 * @param string $string_to_pad
21 21
 	 * @return string
22 22
 	 */
23
-	public static function pad_with_periods($string_to_pad){
23
+	public static function pad_with_periods($string_to_pad) {
24 24
 		return ".".$string_to_pad.".";
25 25
 	}
26 26
 	/**
@@ -28,8 +28,8 @@  discard block
 block discarded – undo
28 28
 	 * @param string $string_to_trim
29 29
 	 * @return string
30 30
 	 */
31
-	public static function trim_periods($string_to_trim){
32
-		return trim($string_to_trim,'.');
31
+	public static function trim_periods($string_to_trim) {
32
+		return trim($string_to_trim, '.');
33 33
 	}
34 34
 
35 35
 
@@ -40,22 +40,22 @@  discard block
 block discarded – undo
40 40
 	 * @param        $this_model_name
41 41
 	 * @return string which can be added onto table aliases to make them unique
42 42
 	 */
43
-	public static function extract_table_alias_model_relation_chain_prefix($model_relation_chain,$this_model_name){
43
+	public static function extract_table_alias_model_relation_chain_prefix($model_relation_chain, $this_model_name) {
44 44
 		//eg $model_relation_chain = 'Venue.Event_Venue.Event.Registration", and $this_model_name = 'Event'
45 45
 		$model_relation_chain = self::pad_with_periods($model_relation_chain);
46 46
 		$this_model_name = self::pad_with_periods($this_model_name);
47 47
 		//eg '.Venue.Event_Venue.Event.Registration." and '.Event.'
48 48
 		//remove this model name and everything afterwards
49
-		$pos_of_model_name = strpos($model_relation_chain,$this_model_name);
50
-		$model_relation_chain = substr($model_relation_chain,0,$pos_of_model_name);
49
+		$pos_of_model_name = strpos($model_relation_chain, $this_model_name);
50
+		$model_relation_chain = substr($model_relation_chain, 0, $pos_of_model_name);
51 51
 		//eg '.Venue.Event_Venue.'
52 52
 		//trim periods
53 53
 		$model_relation_chain = self::trim_periods($model_relation_chain);
54 54
 		//eg 'Venue.Event_Venue'
55 55
 		//replace periods with double-underscores
56
-		$model_relation_chain = str_replace(".",self::table_alias_model_relation_chain_separator,$model_relation_chain);
56
+		$model_relation_chain = str_replace(".", self::table_alias_model_relation_chain_separator, $model_relation_chain);
57 57
 		//eg 'Venue__Event_Venue'
58
-		if($model_relation_chain !=''){
58
+		if ($model_relation_chain != '') {
59 59
 			$model_relation_chain = $model_relation_chain.self::table_alias_model_relation_chain_prefix_end;
60 60
 		}
61 61
 		//eg 'Venue_Event_Venue___'
@@ -66,14 +66,14 @@  discard block
 block discarded – undo
66 66
 	 * @param string $table_alias_with_model_relation_chain_prefix which CAN have a table alias model relation chain prefix (or not)
67 67
 	 * @return string
68 68
 	 */
69
-	public static function remove_table_alias_model_relation_chain_prefix($table_alias_with_model_relation_chain_prefix){
69
+	public static function remove_table_alias_model_relation_chain_prefix($table_alias_with_model_relation_chain_prefix) {
70 70
 		//does this actually have a table alias model relation chain prefix?
71
-		$pos = strpos($table_alias_with_model_relation_chain_prefix,self::table_alias_model_relation_chain_prefix_end);
72
-		if(  $pos !== FALSE){
71
+		$pos = strpos($table_alias_with_model_relation_chain_prefix, self::table_alias_model_relation_chain_prefix_end);
72
+		if ($pos !== FALSE) {
73 73
 			//yes
74 74
 			//find that triple underscore and remove it and everything before it
75 75
 			$table_alias = substr($table_alias_with_model_relation_chain_prefix, $pos + strlen(self::table_alias_model_relation_chain_prefix_end));
76
-		}else{
76
+		} else {
77 77
 			$table_alias = $table_alias_with_model_relation_chain_prefix;
78 78
 		}
79 79
 		return $table_alias;
@@ -83,14 +83,14 @@  discard block
 block discarded – undo
83 83
 	 * @param string $table_alias_with_model_relation_chain_prefix
84 84
 	 * @return string
85 85
 	 */
86
-	public static function get_prefix_from_table_alias_with_model_relation_chain_prefix($table_alias_with_model_relation_chain_prefix){
86
+	public static function get_prefix_from_table_alias_with_model_relation_chain_prefix($table_alias_with_model_relation_chain_prefix) {
87 87
 		//does this actually have a table alias model relation chain prefix?
88
-		$pos = strpos($table_alias_with_model_relation_chain_prefix,self::table_alias_model_relation_chain_prefix_end);
89
-		if(  $pos !== FALSE){
88
+		$pos = strpos($table_alias_with_model_relation_chain_prefix, self::table_alias_model_relation_chain_prefix_end);
89
+		if ($pos !== FALSE) {
90 90
 			//yes
91 91
 			//find that triple underscore and remove it and everything before it
92 92
 			$prefix = substr($table_alias_with_model_relation_chain_prefix, 0, $pos + strlen(self::table_alias_model_relation_chain_prefix_end));
93
-		}else{
93
+		} else {
94 94
 			$prefix = '';
95 95
 		}
96 96
 		return $prefix;
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
105 105
 	 * @param string $original_query_param
106 106
 	 * @return string
107 107
 	 */
108
-	public static function extract_table_alias_model_relation_chain_from_query_param($model_name, $original_query_param){
108
+	public static function extract_table_alias_model_relation_chain_from_query_param($model_name, $original_query_param) {
109 109
 		$relation_chain = self::extract_model_relation_chain($model_name, $original_query_param);
110 110
 		$table_alias_with_model_relation_chain_prefix = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($relation_chain, $model_name);
111 111
 		return $table_alias_with_model_relation_chain_prefix;
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
 	 * @param string $original_query_param
120 120
 	 * @return string
121 121
 	 */
122
-	public static function extract_model_relation_chain($model_name,$original_query_param){
122
+	public static function extract_model_relation_chain($model_name, $original_query_param) {
123 123
 		//prefix and postfix both with a period, as this facilitates searching
124 124
 		$model_name = EE_Model_Parser::pad_with_periods($model_name);
125 125
 		$original_query_param = EE_Model_Parser::pad_with_periods($original_query_param);
@@ -127,7 +127,7 @@  discard block
 block discarded – undo
127 127
 		//eg, if we're looking for the model relation chain from Event to Payment, the original query param is probably something like
128 128
 		//"Registration.Transaction.Payment.PAY_ID", $pos_of_model_string points to the 'P' or Payment. We want the string
129 129
 		//"Registration.Transaction.Payment"
130
-		$model_relation_chain = substr($original_query_param, 0,$pos_of_model_string+strlen($model_name));
130
+		$model_relation_chain = substr($original_query_param, 0, $pos_of_model_string + strlen($model_name));
131 131
 		return EE_Model_Parser::trim_periods($model_relation_chain);
132 132
 	}
133 133
 
@@ -142,11 +142,11 @@  discard block
 block discarded – undo
142 142
 	 * @param string $model_relation_chain
143 143
 	 * @return string
144 144
 	 */
145
-	public static function replace_model_name_with_join_model_name_in_model_relation_chain($model_name,$join_model_name,$model_relation_chain){
145
+	public static function replace_model_name_with_join_model_name_in_model_relation_chain($model_name, $join_model_name, $model_relation_chain) {
146 146
 		$model_name = EE_Model_Parser::pad_with_periods($model_name);
147 147
 		$join_model_name = EE_Model_Parser::pad_with_periods($join_model_name);
148 148
 		$model_relation_chain = EE_Model_Parser::pad_with_periods($model_relation_chain);
149
-		$replaced_with_periods = str_replace($model_name,$join_model_name,$model_relation_chain);
149
+		$replaced_with_periods = str_replace($model_name, $join_model_name, $model_relation_chain);
150 150
 		return EE_Model_Parser::trim_periods($replaced_with_periods);
151 151
 	}
152 152
 }
Please login to merge, or discard this patch.
Braces   +4 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,5 +1,6 @@  discard block
 block discarded – undo
1
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION'))
1
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
2 2
 	exit('No direct script access allowed');
3
+}
3 4
 /**
4 5
  * EE_Model_Parser
5 6
  *
@@ -73,7 +74,7 @@  discard block
 block discarded – undo
73 74
 			//yes
74 75
 			//find that triple underscore and remove it and everything before it
75 76
 			$table_alias = substr($table_alias_with_model_relation_chain_prefix, $pos + strlen(self::table_alias_model_relation_chain_prefix_end));
76
-		}else{
77
+		} else{
77 78
 			$table_alias = $table_alias_with_model_relation_chain_prefix;
78 79
 		}
79 80
 		return $table_alias;
@@ -90,7 +91,7 @@  discard block
 block discarded – undo
90 91
 			//yes
91 92
 			//find that triple underscore and remove it and everything before it
92 93
 			$prefix = substr($table_alias_with_model_relation_chain_prefix, 0, $pos + strlen(self::table_alias_model_relation_chain_prefix_end));
93
-		}else{
94
+		} else{
94 95
 			$prefix = '';
95 96
 		}
96 97
 		return $prefix;
Please login to merge, or discard this patch.
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.