Completed
Branch FET-8347-separate-logging (f2247f)
by
unknown
27:29 queued 01:26
created
core/db_models/fields/EE_Email_Field.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@
 block discarded – undo
1 1
 <?php
2
-class EE_Email_Field extends EE_Text_Field_Base{
2
+class EE_Email_Field extends EE_Text_Field_Base {
3 3
 	function prepare_for_set($value_inputted_for_field_on_model_object) {
4 4
 		return sanitize_email($value_inputted_for_field_on_model_object);
5 5
 	}
Please login to merge, or discard this patch.
core/db_models/fields/EE_Float_Field.php 1 patch
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_Float_Field extends EE_Model_Field_Base{
6
-	function get_wpdb_data_type(){
5
+class EE_Float_Field extends EE_Model_Field_Base {
6
+	function get_wpdb_data_type() {
7 7
 		return '%f';
8 8
 	}
9 9
 	/**
@@ -17,26 +17,26 @@  discard block
 block discarded – undo
17 17
 	function prepare_for_set($value_inputted_for_field_on_model_object) {
18 18
 //		echo __LINE__."$value_inputted_for_field_on_model_object<br>";
19 19
 		//remove whitespaces and thousands separators
20
-		if(is_string($value_inputted_for_field_on_model_object)){
21
-			$value_inputted_for_field_on_model_object = str_replace(array(" ",EE_Config::instance()->currency->thsnds),"",$value_inputted_for_field_on_model_object);
20
+		if (is_string($value_inputted_for_field_on_model_object)) {
21
+			$value_inputted_for_field_on_model_object = str_replace(array(" ", EE_Config::instance()->currency->thsnds), "", $value_inputted_for_field_on_model_object);
22 22
 //echo __LINE__."$value_inputted_for_field_on_model_object<br>";
23 23
 //normalize it so periods are decimal marks (we don't care where you're from: we're talking PHP now)
24
-			$value_inputted_for_field_on_model_object = str_replace( EE_Config::instance()->currency->dec_mrk, ".", $value_inputted_for_field_on_model_object) ;
24
+			$value_inputted_for_field_on_model_object = str_replace(EE_Config::instance()->currency->dec_mrk, ".", $value_inputted_for_field_on_model_object);
25 25
 //echo __LINE__."$value_inputted_for_field_on_model_object<br>";
26 26
 //double-check there's absolutely nothing left on this string besides numbers
27
-			$value_inputted_for_field_on_model_object = preg_replace( "/[^0-9,.]/", "", $value_inputted_for_field_on_model_object);
27
+			$value_inputted_for_field_on_model_object = preg_replace("/[^0-9,.]/", "", $value_inputted_for_field_on_model_object);
28 28
 		}
29 29
 //		echo __LINE__."$value_inputted_for_field_on_model_object<br>";
30
-		return floatval( $value_inputted_for_field_on_model_object );
30
+		return floatval($value_inputted_for_field_on_model_object);
31 31
 	}
32 32
 	/**
33 33
 	 * Returns the number formatted according to local custom (set by the country of the blog).
34 34
 	 * @param float $value_on_field_to_be_outputted
35 35
 	 * @return string
36 36
 	 */
37
-	function prepare_for_pretty_echoing($value_on_field_to_be_outputted,$schema = null){
37
+	function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = null) {
38 38
 		$EE = EE_Registry::instance();
39
-		return number_format( $value_on_field_to_be_outputted, $EE->CFG->currency->dec_plc, $EE->CFG->currency->dec_mrk, $EE->CFG->currency->thsnds) ;
39
+		return number_format($value_on_field_to_be_outputted, $EE->CFG->currency->dec_plc, $EE->CFG->currency->dec_mrk, $EE->CFG->currency->thsnds);
40 40
 	}
41 41
 
42 42
 	function prepare_for_set_from_db($value_found_in_db_for_model_object) {
Please login to merge, or discard this patch.
core/db_models/fields/EE_Foreign_Key_Field_Base.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -4,6 +4,6 @@
 block discarded – undo
4 4
  * needed functions from its parent, but because all foreign key fields inherit from
5 5
  * this one, its easy ot check if a field is a foreign key.
6 6
  */
7
-abstract class EE_Foreign_Key_Field_Base extends EE_Field_With_Model_Name{
7
+abstract class EE_Foreign_Key_Field_Base extends EE_Field_With_Model_Name {
8 8
 	//all needed functionality inherited from parent
9 9
 }
Please login to merge, or discard this patch.
core/db_models/fields/EE_Foreign_Key_Int_Field.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,7 +1,7 @@  discard block
 block discarded – undo
1 1
 <?php
2
-require_once( EE_MODELS . 'fields/EE_Foreign_Key_Field_Base.php');
3
-class EE_Foreign_Key_Int_Field extends EE_Foreign_Key_Field_Base{
4
-	function get_wpdb_data_type(){
2
+require_once(EE_MODELS.'fields/EE_Foreign_Key_Field_Base.php');
3
+class EE_Foreign_Key_Int_Field extends EE_Foreign_Key_Field_Base {
4
+	function get_wpdb_data_type() {
5 5
 		return '%d';
6 6
 	}
7 7
 	/**
@@ -10,7 +10,7 @@  discard block
 block discarded – undo
10 10
 	 * @return int
11 11
 	 */
12 12
 	function prepare_for_set($value_inputted_for_field_on_model_object) {
13
-		if($this->is_model_obj_of_type_pointed_to($value_inputted_for_field_on_model_object)){
13
+		if ($this->is_model_obj_of_type_pointed_to($value_inputted_for_field_on_model_object)) {
14 14
 			$value_inputted_for_field_on_model_object = $value_inputted_for_field_on_model_object->ID();
15 15
 		}
16 16
 		return absint($value_inputted_for_field_on_model_object);
Please login to merge, or discard this patch.
core/db_models/fields/EE_Foreign_Key_String_Field.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,7 +1,7 @@  discard block
 block discarded – undo
1 1
 <?php
2
-require_once( EE_MODELS . 'fields/EE_Foreign_Key_Field_Base.php');
3
-class EE_Foreign_Key_String_Field extends EE_Foreign_Key_Field_Base{
4
-	function get_wpdb_data_type(){
2
+require_once(EE_MODELS.'fields/EE_Foreign_Key_Field_Base.php');
3
+class EE_Foreign_Key_String_Field extends EE_Foreign_Key_Field_Base {
4
+	function get_wpdb_data_type() {
5 5
 		return '%s';
6 6
 	}
7 7
 	/**
@@ -10,7 +10,7 @@  discard block
 block discarded – undo
10 10
 	 * @return string
11 11
 	 */
12 12
 	function prepare_for_set($value_inputted_for_field_on_model_object) {
13
-		if($this->is_model_obj_of_type_pointed_to($value_inputted_for_field_on_model_object)){
13
+		if ($this->is_model_obj_of_type_pointed_to($value_inputted_for_field_on_model_object)) {
14 14
 			$value_inputted_for_field_on_model_object = $value_inputted_for_field_on_model_object->ID();
15 15
 		}
16 16
 		return strtoupper(wp_strip_all_tags($value_inputted_for_field_on_model_object));
Please login to merge, or discard this patch.
core/db_models/fields/EE_Full_HTML_Field.php 2 patches
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2
-require_once( EE_MODELS . 'fields/EE_Text_Field_Base.php' );
3
-class EE_Full_HTML_Field extends EE_Text_Field_Base{
2
+require_once(EE_MODELS.'fields/EE_Text_Field_Base.php');
3
+class EE_Full_HTML_Field extends EE_Text_Field_Base {
4 4
 
5 5
 
6 6
 	/**
@@ -10,11 +10,11 @@  discard block
 block discarded – undo
10 10
 	 * @return string
11 11
 	 */
12 12
 	function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = null) {
13
-		if($schema =='form_input'){
13
+		if ($schema == 'form_input') {
14 14
 			return parent::prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema);
15
-		}elseif($schema == 'no_wpautop'){
15
+		}elseif ($schema == 'no_wpautop') {
16 16
 			return do_shortcode(parent::prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema));
17
-		}else{
17
+		} else {
18 18
 			return wpautop(do_shortcode(parent::prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema)));
19 19
 		}
20 20
 	}
Please login to merge, or discard this patch.
Braces   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -12,9 +12,9 @@
 block discarded – undo
12 12
 	function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = null) {
13 13
 		if($schema =='form_input'){
14 14
 			return parent::prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema);
15
-		}elseif($schema == 'no_wpautop'){
15
+		} elseif($schema == 'no_wpautop'){
16 16
 			return do_shortcode(parent::prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema));
17
-		}else{
17
+		} else{
18 18
 			return wpautop(do_shortcode(parent::prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema)));
19 19
 		}
20 20
 	}
Please login to merge, or discard this patch.
core/db_models/fields/EE_Infinite_Integer_Field.php 2 patches
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -7,32 +7,32 @@  discard block
 block discarded – undo
7 7
  * other than explicitly setting it to INF.
8 8
  * Makes use of constant EE_INF_IN_DB set in espresso.php, and INF, which is a PHP constant definedin the ether
9 9
  */
10
-class EE_Infinite_Integer_Field extends EE_Model_Field_Base{
11
-	function get_wpdb_data_type(){
10
+class EE_Infinite_Integer_Field extends EE_Model_Field_Base {
11
+	function get_wpdb_data_type() {
12 12
 		return '%d';
13 13
 	}
14 14
 	function prepare_for_use_in_db($value_of_field_on_model_object) {
15
-		if($value_of_field_on_model_object === INF){
15
+		if ($value_of_field_on_model_object === INF) {
16 16
 			return EE_INF_IN_DB;
17
-		}else{
17
+		} else {
18 18
 			return intval($value_of_field_on_model_object);
19 19
 		}
20 20
 	}
21 21
 	function prepare_for_set($value_inputted_for_field_on_model_object) {
22
-		if($value_inputted_for_field_on_model_object === EE_INF_IN_DB ||
22
+		if ($value_inputted_for_field_on_model_object === EE_INF_IN_DB ||
23 23
 				$value_inputted_for_field_on_model_object === INF ||
24 24
 				$value_inputted_for_field_on_model_object === "INF"
25
-				){
25
+				) {
26 26
 			return INF;
27
-		}else{
27
+		} else {
28 28
 			return intval($value_inputted_for_field_on_model_object);
29 29
 		}
30 30
 	}
31 31
 	function prepare_for_set_from_db($value_inputted_for_field_on_model_object) {
32 32
 		$intval = intval($value_inputted_for_field_on_model_object);
33
-		if($intval == EE_INF_IN_DB){
33
+		if ($intval == EE_INF_IN_DB) {
34 34
 			return INF;
35
-		}else{
35
+		} else {
36 36
 			return $intval;
37 37
 		}
38 38
 	}
@@ -45,9 +45,9 @@  discard block
 block discarded – undo
45 45
 	 * @param string $schema input, symbol, text; or any string you want to show if the value equals INF
46 46
 	 * @return string
47 47
 	 */
48
-	function prepare_for_pretty_echoing( $value_on_field_to_be_outputted, $schema = null ) {
49
-		if( $value_on_field_to_be_outputted === INF ){
50
-			switch($schema){
48
+	function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = null) {
49
+		if ($value_on_field_to_be_outputted === INF) {
50
+			switch ($schema) {
51 51
 				case 'input':
52 52
 					return '';
53 53
 				case 'symbol':
Please login to merge, or discard this patch.
Braces   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@  discard block
 block discarded – undo
14 14
 	function prepare_for_use_in_db($value_of_field_on_model_object) {
15 15
 		if($value_of_field_on_model_object === INF){
16 16
 			return EE_INF_IN_DB;
17
-		}else{
17
+		} else{
18 18
 			return intval($value_of_field_on_model_object);
19 19
 		}
20 20
 	}
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
 				$value_inputted_for_field_on_model_object === "INF"
25 25
 				){
26 26
 			return INF;
27
-		}else{
27
+		} else{
28 28
 			return intval($value_inputted_for_field_on_model_object);
29 29
 		}
30 30
 	}
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
 		$intval = intval($value_inputted_for_field_on_model_object);
33 33
 		if($intval == EE_INF_IN_DB){
34 34
 			return INF;
35
-		}else{
35
+		} else{
36 36
 			return $intval;
37 37
 		}
38 38
 	}
Please login to merge, or discard this patch.
core/db_models/fields/EE_Integer_Field.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -3,8 +3,8 @@
 block discarded – undo
3 3
 /**
4 4
  * Text_Fields is a base class for any fields which are have integer value. (Exception: foreign and private key fields. Wish PHP had multiple-inheritance for this...)
5 5
  */
6
-class EE_Integer_Field extends EE_Model_Field_Base{
7
-	function get_wpdb_data_type(){
6
+class EE_Integer_Field extends EE_Model_Field_Base {
7
+	function get_wpdb_data_type() {
8 8
 		return '%d';
9 9
 	}
10 10
 	function prepare_for_set($value_inputted_for_field_on_model_object) {
Please login to merge, or discard this patch.
core/db_models/fields/EE_Maybe_Serialized_Text_Field.php 2 patches
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -4,17 +4,17 @@  discard block
 block discarded – undo
4 4
 /**
5 5
  * For a db text column, which can either be an array in PHP code or a string.
6 6
  */
7
-require_once( EE_MODELS . 'fields/EE_Text_Field_Base.php' );
8
-class EE_Maybe_Serialized_Text_Field extends EE_Serialized_Text_Field{
7
+require_once(EE_MODELS.'fields/EE_Text_Field_Base.php');
8
+class EE_Maybe_Serialized_Text_Field extends EE_Serialized_Text_Field {
9 9
 	/**
10 10
 	 * Value could be an array or a string. If its an array, serialize it. Otherwise, leave it as a string
11 11
 	 * @param array|string $value_of_field_on_model_object
12 12
 	 * @return string (possibly serialized)
13 13
 	 */
14 14
 	function prepare_for_use_in_db($value_of_field_on_model_object) {
15
-		if(is_array($value_of_field_on_model_object)){
15
+		if (is_array($value_of_field_on_model_object)) {
16 16
 			return parent::prepare_for_use_in_db($value_of_field_on_model_object);
17
-		}else{
17
+		} else {
18 18
 			return $value_of_field_on_model_object;
19 19
 		}
20 20
 	}
@@ -26,9 +26,9 @@  discard block
 block discarded – undo
26 26
 	 */
27 27
 	function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = null) {
28 28
 		$pretty_value = null;
29
-		if(is_array($value_on_field_to_be_outputted)){
29
+		if (is_array($value_on_field_to_be_outputted)) {
30 30
 			$pretty_value = parent::prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema);
31
-		}else{
31
+		} else {
32 32
 			$pretty_value = $value_on_field_to_be_outputted;
33 33
 		}
34 34
 		return $pretty_value;
Please login to merge, or discard this patch.
Braces   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@  discard block
 block discarded – undo
14 14
 	function prepare_for_use_in_db($value_of_field_on_model_object) {
15 15
 		if(is_array($value_of_field_on_model_object)){
16 16
 			return parent::prepare_for_use_in_db($value_of_field_on_model_object);
17
-		}else{
17
+		} else{
18 18
 			return $value_of_field_on_model_object;
19 19
 		}
20 20
 	}
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
 		$pretty_value = null;
29 29
 		if(is_array($value_on_field_to_be_outputted)){
30 30
 			$pretty_value = parent::prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema);
31
-		}else{
31
+		} else{
32 32
 			$pretty_value = $value_on_field_to_be_outputted;
33 33
 		}
34 34
 		return $pretty_value;
Please login to merge, or discard this patch.