Completed
Branch FET-8347-separate-logging (f2247f)
by
unknown
43:49 queued 34:52
created
core/db_models/fields/EE_Model_Field_Base.php 3 patches
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -74,7 +74,7 @@
 block discarded – undo
74 74
 	function get_name(){
75 75
 		if($this->_name){
76 76
 			return $this->_name;
77
-		}else{
77
+		} else{
78 78
 			throw new EE_Error(sprintf(__("Model field '%s' has no name set. Did you make a model and forget to call the parent model constructor?", "event_espresso"),get_class($this)));
79 79
 		}
80 80
 	}
Please login to merge, or discard this patch.
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -102,7 +102,7 @@
 block discarded – undo
102 102
 	 * the field's type. Eg, we may want ot serialize it, strip tags, etc. By default,
103 103
 	 * we simply return it.
104 104
 	 * @param mixed $value_of_field_on_model_object
105
-	 * @return mixed
105
+	 * @return double
106 106
 	 */
107 107
 	function prepare_for_get($value_of_field_on_model_object){
108 108
 		return $value_of_field_on_model_object;
Please login to merge, or discard this patch.
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@  discard block
 block discarded – undo
10 10
  * should be considered a string when inserting, updating, or using in a where clause for any queries (get_wpdb_data_type()),
11 11
  * should be unserialized when being retrieved from the db (prepare_for_set_from_db()), and whatever else.
12 12
  */
13
-abstract class EE_Model_Field_Base{
13
+abstract class EE_Model_Field_Base {
14 14
 	var $_table_alias;
15 15
 	var $_table_column;
16 16
 	var $_name;
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
 	 * @param      $nullable
27 27
 	 * @param null $default_value
28 28
 	 */
29
-	function __construct($table_column, $nicename, $nullable, $default_value = null){
29
+	function __construct($table_column, $nicename, $nullable, $default_value = null) {
30 30
 		$this->_table_column = $table_column;
31 31
 		$this->_nicename = $nicename;
32 32
 		$this->_nullable = $nullable;
@@ -37,22 +37,22 @@  discard block
 block discarded – undo
37 37
 	 * @param $table_alias
38 38
 	 * @param $name
39 39
 	 */
40
-	function _construct_finalize($table_alias, $name, $model_name){
40
+	function _construct_finalize($table_alias, $name, $model_name) {
41 41
 		$this->_table_alias = $table_alias;
42 42
 		$this->_name = $name;
43 43
 		$this->_model_name = $model_name;
44 44
 	}
45
-	function get_table_alias(){
45
+	function get_table_alias() {
46 46
 		return $this->_table_alias;
47 47
 	}
48
-	function get_table_column(){
48
+	function get_table_column() {
49 49
 		return $this->_table_column;
50 50
 	}
51 51
 	/**
52 52
 	 * Returns the name of the model this field is on. Eg 'Event' or 'Ticket_Datetime'
53 53
 	 * @return string
54 54
 	 */
55
-	function get_model_name(){
55
+	function get_model_name() {
56 56
 		return $this->_model_name;
57 57
 	}
58 58
 
@@ -60,17 +60,17 @@  discard block
 block discarded – undo
60 60
 	 * @throws \EE_Error
61 61
 	 * @return string
62 62
 	 */
63
-	function get_name(){
64
-		if($this->_name){
63
+	function get_name() {
64
+		if ($this->_name) {
65 65
 			return $this->_name;
66
-		}else{
67
-			throw new EE_Error(sprintf(__("Model field '%s' has no name set. Did you make a model and forget to call the parent model constructor?", "event_espresso"),get_class($this)));
66
+		} else {
67
+			throw new EE_Error(sprintf(__("Model field '%s' has no name set. Did you make a model and forget to call the parent model constructor?", "event_espresso"), get_class($this)));
68 68
 		}
69 69
 	}
70
-	function get_nicename(){
70
+	function get_nicename() {
71 71
 		return $this->_nicename;
72 72
 	}
73
-	function is_nullable(){
73
+	function is_nullable() {
74 74
 		return $this->_nullable;
75 75
 	}
76 76
 	/**
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
 	 * on insertion it can be null. However, on updates it must be present.
79 79
 	 * @return boolean
80 80
 	 */
81
-	function is_auto_increment(){
81
+	function is_auto_increment() {
82 82
 		return false;
83 83
 	}
84 84
 	/**
@@ -86,14 +86,14 @@  discard block
 block discarded – undo
86 86
 	 * value domains at the top of EEM_Base
87 87
 	 * @return mixed
88 88
 	 */
89
-	function get_default_value(){
89
+	function get_default_value() {
90 90
 		return $this->_default_value;
91 91
 	}
92 92
 
93 93
 	/**
94 94
 	 * @return string
95 95
 	 */
96
-	function get_qualified_column(){
96
+	function get_qualified_column() {
97 97
 		return $this->get_table_alias().".".$this->get_table_column();
98 98
 	}
99 99
 	/**
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
 	 * @param mixed $value_of_field_on_model_object
105 105
 	 * @return mixed
106 106
 	 */
107
-	function prepare_for_get($value_of_field_on_model_object){
107
+	function prepare_for_get($value_of_field_on_model_object) {
108 108
 		return $value_of_field_on_model_object;
109 109
 	}
110 110
 	/**
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
114 114
 	 * @param mixed $value_of_field_on_model_object
115 115
 	 * @return mixed
116 116
 	 */
117
-	function prepare_for_use_in_db($value_of_field_on_model_object){
117
+	function prepare_for_use_in_db($value_of_field_on_model_object) {
118 118
 		return $value_of_field_on_model_object;
119 119
 	}
120 120
 
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
 	 * @param mixed $value_inputted_for_field_on_model_object
126 126
 	 * @return mixed
127 127
 	 */
128
-	function prepare_for_set($value_inputted_for_field_on_model_object){
128
+	function prepare_for_set($value_inputted_for_field_on_model_object) {
129 129
 		return $value_inputted_for_field_on_model_object;
130 130
 	}
131 131
 
@@ -136,7 +136,7 @@  discard block
 block discarded – undo
136 136
 	 * @param mixed $value_found_in_db_for_model_object
137 137
 	 * @return mixed
138 138
 	 */
139
-	function prepare_for_set_from_db($value_found_in_db_for_model_object){
139
+	function prepare_for_set_from_db($value_found_in_db_for_model_object) {
140 140
 		return $this->prepare_for_set($value_found_in_db_for_model_object);
141 141
 	}
142 142
 
@@ -147,7 +147,7 @@  discard block
 block discarded – undo
147 147
 	 * @param mixed $value_on_field_to_be_outputted
148 148
 	 * @return mixed
149 149
 	 */
150
-	function prepare_for_pretty_echoing( $value_on_field_to_be_outputted ){
150
+	function prepare_for_pretty_echoing($value_on_field_to_be_outputted) {
151 151
 		return $value_on_field_to_be_outputted;
152 152
 	}
153 153
 
@@ -162,7 +162,7 @@  discard block
 block discarded – undo
162 162
 	 * By default, all fields aren't db-only.
163 163
 	 * @return boolean
164 164
 	 */
165
-	function is_db_only_field(){
165
+	function is_db_only_field() {
166 166
 		return false;
167 167
 	}
168 168
 }
169 169
\ No newline at end of file
Please login to merge, or discard this patch.
core/db_models/fields/EE_Money_Field.php 2 patches
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -2,8 +2,8 @@  discard block
 block discarded – undo
2 2
 /**
3 3
  * Text_Fields is a base class for any fields which are have float value. (Exception: foreign and private key fields. Wish PHP had multiple-inheritance for this...)
4 4
  */
5
-class EE_Money_Field extends EE_Float_Field{
6
-	function get_wpdb_data_type(){
5
+class EE_Money_Field extends EE_Float_Field {
6
+	function get_wpdb_data_type() {
7 7
 		return '%f';
8 8
 	}
9 9
 	/**
@@ -15,21 +15,21 @@  discard block
 block discarded – undo
15 15
 	 * @param type $schema
16 16
 	 * @return string
17 17
 	 */
18
-	function prepare_for_pretty_echoing($value_on_field_to_be_outputted,$schema = null){
18
+	function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = null) {
19 19
 		$pretty_float = parent::prepare_for_pretty_echoing($value_on_field_to_be_outputted);
20 20
 
21
-		if($schema == 'localized_float'){
21
+		if ($schema == 'localized_float') {
22 22
 			return $pretty_float;
23 23
 		}
24
-		EE_Registry::instance()->load_helper( 'Template' );
25
-		if($schema == 'no_currency_code'){
24
+		EE_Registry::instance()->load_helper('Template');
25
+		if ($schema == 'no_currency_code') {
26 26
 //			echo "schema no currency!";
27 27
 			$display_code = false;
28
-		}else{
28
+		} else {
29 29
 			$display_code = true;
30 30
 		}
31 31
 		//we don't use the $pretty_float because format_currency will take care of it.
32
-		return EEH_Template::format_currency( $value_on_field_to_be_outputted, false, $display_code );
32
+		return EEH_Template::format_currency($value_on_field_to_be_outputted, false, $display_code);
33 33
 	}
34 34
 
35 35
 	/**
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
 		//now it's a float-style string or number
49 49
 		$float_val = parent::prepare_for_set($value_inputted_for_field_on_model_object);
50 50
 		//round to the correctly number of decimal places for this  currency
51
-		$rounded_value = round($float_val,  EE_Registry::instance()->CFG->currency->dec_plc);
51
+		$rounded_value = round($float_val, EE_Registry::instance()->CFG->currency->dec_plc);
52 52
 		return $rounded_value;
53 53
 	}
54 54
 
Please login to merge, or discard this patch.
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@
 block discarded – undo
25 25
 		if($schema == 'no_currency_code'){
26 26
 //			echo "schema no currency!";
27 27
 			$display_code = false;
28
-		}else{
28
+		} else{
29 29
 			$display_code = true;
30 30
 		}
31 31
 		//we don't use the $pretty_float because format_currency will take care of it.
Please login to merge, or discard this patch.
core/db_models/fields/EE_Plain_Text_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_Plain_Text_Field extends EE_Text_Field_Base{
2
+require_once(EE_MODELS.'fields/EE_Text_Field_Base.php');
3
+class EE_Plain_Text_Field extends EE_Text_Field_Base {
4 4
 	/**
5 5
 	 * removes all tags when setting
6 6
 	 * @param string $value_inputted_for_field_on_model_object
Please login to merge, or discard this patch.
core/db_models/fields/EE_Post_Content_Field.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -3,14 +3,14 @@
 block discarded – undo
3 3
  * Field to only allow tags that are normally allowed on post_content:
4 4
  * address,a,abbr,acronym,area,article,aside,b,big,blockquote,br,button,caption,cite,code,col,del,dd,dfn,details,div,dl,dt,em,fieldset,figure,figcaption,font,footer,form,h1,h2,h3,h4,h5,h6,header,hgroup,hr,i,img,ins,kbd,label,legend,li,map,mark,menu,nav,p,pre,q,s,samp,span,section,small,strike,strong,sub,summary,sup,table,tbody,td,textarea,tfoot,th,thead,title,tr,tt,u,ul,ol,var
5 5
  */
6
-class EE_Post_Content_Field extends EE_Text_Field_Base{
6
+class EE_Post_Content_Field extends EE_Text_Field_Base {
7 7
 	/**
8 8
 	 * removes all tags which a WP Post wouldn't allow in its content normally
9 9
 	 * @param string $value_inputted_for_field_on_model_object
10 10
 	 * @return string
11 11
 	 */
12 12
 	function prepare_for_set($value_inputted_for_field_on_model_object) {
13
-		$value_with_select_tags =  wp_kses("$value_inputted_for_field_on_model_object",wp_kses_allowed_html( 'post' ));
13
+		$value_with_select_tags = wp_kses("$value_inputted_for_field_on_model_object", wp_kses_allowed_html('post'));
14 14
 		return parent::prepare_for_set($value_with_select_tags);
15 15
 	}
16 16
 	
Please login to merge, or discard this patch.
core/db_models/fields/EE_Serialized_Text_Field.php 2 patches
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -7,8 +7,8 @@  discard block
 block discarded – undo
7 7
  * However, when inserting into the DB, it should be serialized.
8 8
  * Upon retrieval from the DB, it should be unserialized back into an array.
9 9
  */
10
-require_once( EE_MODELS . 'fields/EE_Text_Field_Base.php' );
11
-class EE_Serialized_Text_Field extends EE_Text_Field_Base{
10
+require_once(EE_MODELS.'fields/EE_Text_Field_Base.php');
11
+class EE_Serialized_Text_Field extends EE_Text_Field_Base {
12 12
 	/**
13 13
 	 * Value SHOULD be an array, and we want to now convert it to a serialized string
14 14
 	 * @param array $value_of_field_on_model_object
@@ -18,11 +18,11 @@  discard block
 block discarded – undo
18 18
 		return maybe_serialize($value_of_field_on_model_object);
19 19
 	}
20 20
 	function prepare_for_set($value_inputted_for_field_on_model_object) {
21
-		if(is_string($value_inputted_for_field_on_model_object)){
21
+		if (is_string($value_inputted_for_field_on_model_object)) {
22 22
 			return parent::prepare_for_set($value_inputted_for_field_on_model_object);
23
-		}elseif(is_array($value_inputted_for_field_on_model_object)){
24
-			return array_map(array($this,'prepare_for_set'), $value_inputted_for_field_on_model_object);
25
-		}else{//so they passed NULL or an INT or something wack
23
+		}elseif (is_array($value_inputted_for_field_on_model_object)) {
24
+			return array_map(array($this, 'prepare_for_set'), $value_inputted_for_field_on_model_object);
25
+		} else {//so they passed NULL or an INT or something wack
26 26
 			return $value_inputted_for_field_on_model_object;
27 27
 		}
28 28
 	}
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
 		//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.
37 37
 		$token = 'C';
38 38
 		$data = is_string($data) ? trim($data) : $data;
39
-		if ( is_string($data) && strlen($data) > 1 && $data[0] == $token  && preg_match( "/^{$token}:[0-9]+:/s", $data ) ) {
39
+		if (is_string($data) && strlen($data) > 1 && $data[0] == $token && preg_match("/^{$token}:[0-9]+:/s", $data)) {
40 40
 			return unserialize($data);
41 41
 		} else {
42 42
 			return $data;
@@ -50,16 +50,16 @@  discard block
 block discarded – undo
50 50
 	 * @return string
51 51
 	 */
52 52
 	function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = null) {
53
-		switch($schema){
53
+		switch ($schema) {
54 54
 			case 'print_r':
55
-				$pretty_value = print_r($value_on_field_to_be_outputted,true);
55
+				$pretty_value = print_r($value_on_field_to_be_outputted, true);
56 56
 				break;
57 57
 			case 'as_table':
58 58
 				EE_Registry::instance()->load_helper('Template');
59 59
 				$pretty_value = EEH_Template::layout_array_as_table($value_on_field_to_be_outputted);
60 60
 				break;
61 61
 			default:
62
-				$pretty_value = implode(", ",$value_on_field_to_be_outputted);
62
+				$pretty_value = implode(", ", $value_on_field_to_be_outputted);
63 63
 		}
64 64
 		return $pretty_value;
65 65
 	}
Please login to merge, or discard this patch.
Braces   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -20,9 +20,9 @@
 block discarded – undo
20 20
 	function prepare_for_set($value_inputted_for_field_on_model_object) {
21 21
 		if(is_string($value_inputted_for_field_on_model_object)){
22 22
 			return parent::prepare_for_set($value_inputted_for_field_on_model_object);
23
-		}elseif(is_array($value_inputted_for_field_on_model_object)){
23
+		} elseif(is_array($value_inputted_for_field_on_model_object)){
24 24
 			return array_map(array($this,'prepare_for_set'), $value_inputted_for_field_on_model_object);
25
-		}else{//so they passed NULL or an INT or something wack
25
+		} else{//so they passed NULL or an INT or something wack
26 26
 			return $value_inputted_for_field_on_model_object;
27 27
 		}
28 28
 	}
Please login to merge, or discard this patch.
core/db_models/fields/EE_Simple_HTML_Field.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@  discard block
 block discarded – undo
1 1
 <?php
2
-require_once( EE_MODELS . 'fields/EE_Text_Field_Base.php' );
2
+require_once(EE_MODELS.'fields/EE_Text_Field_Base.php');
3 3
 /**
4 4
  * Only allows a select, small number of html tags: a,abbr,acronym,b,blockquote,cite,code,del,em,i,q,strike,strong,ol,ul,li
5 5
  * If you want more use EE_Post_Content_Field, or if you want to allow ALL, use EE_Full_HTML_Field.
6 6
  * If you want NONE, use EE_Plain_Text_Field.
7 7
  */
8
-class EE_Simple_HTML_Field extends EE_Text_Field_Base{
8
+class EE_Simple_HTML_Field extends EE_Text_Field_Base {
9 9
 	/**
10 10
 	 * removes all tags when setting
11 11
 	 * @param string $value_inputted_for_field_on_model_object
@@ -13,10 +13,10 @@  discard block
 block discarded – undo
13 13
 	 */
14 14
 	function prepare_for_set($value_inputted_for_field_on_model_object) {
15 15
 		global $allowedtags;
16
-		$allowedtags['ol']=array();
17
-		$allowedtags['ul']=array();
18
-		$allowedtags['li']=array();
19
-		$value_with_select_tags =  wp_kses("$value_inputted_for_field_on_model_object",$allowedtags);
16
+		$allowedtags['ol'] = array();
17
+		$allowedtags['ul'] = array();
18
+		$allowedtags['li'] = array();
19
+		$value_with_select_tags = wp_kses("$value_inputted_for_field_on_model_object", $allowedtags);
20 20
 		return parent::prepare_for_set($value_with_select_tags);
21 21
 	}
22 22
 
Please login to merge, or discard this patch.
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.