Completed
Branch BUG-10669-spco-validation-msg (4c1309)
by
unknown
49:56 queued 37:41
created
strategies/normalization/EE_Credit_Card_Normalization.strategy.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -6,7 +6,7 @@
 block discarded – undo
6 6
  * @subpackage
7 7
  * @author				Mike Nelson
8 8
  */
9
-class EE_Credit_Card_Normalization extends EE_Text_Normalization{
9
+class EE_Credit_Card_Normalization extends EE_Text_Normalization {
10 10
 
11 11
 	/**
12 12
 	 * @param string $value_to_normalize
Please login to merge, or discard this patch.
strategies/normalization/EE_Normalization_Strategy_Base.strategy.php 2 patches
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -6,7 +6,7 @@  discard block
 block discarded – undo
6 6
  * @subpackage
7 7
  * @author				Mike Nelson
8 8
  */
9
-abstract class EE_Normalization_Strategy_Base extends EE_Form_Input_Strategy_Base{
9
+abstract class EE_Normalization_Strategy_Base extends EE_Form_Input_Strategy_Base {
10 10
 	/**
11 11
 	 * Takes the sanitized value for the input and casts it into the correct PHP type.
12 12
 	 * Eg, turns it into an int, float, string, boolean, datetime, etc. The validation
@@ -29,8 +29,8 @@  discard block
 block discarded – undo
29 29
 	 * @param string $individual_item_to_normalize
30 30
 	 * @return mixed
31 31
 	 */
32
-	public function normalize_one( $individual_item_to_normalize ){
33
-		return $this->normalize( $individual_item_to_normalize );
32
+	public function normalize_one($individual_item_to_normalize) {
33
+		return $this->normalize($individual_item_to_normalize);
34 34
 	}
35 35
 
36 36
 
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
 	 * @param $normalized_value
43 43
 	 * @return array|string the 'raw' value as used in the form, usually a string or array of strings.
44 44
 	 */
45
-	abstract function unnormalize( $normalized_value );
45
+	abstract function unnormalize($normalized_value);
46 46
 
47 47
 	/**
48 48
 	 * Normally the same as unnormalize, except it CANNOT be passed an array and
@@ -50,8 +50,8 @@  discard block
 block discarded – undo
50 50
 	 * @param mixed $individual_item_to_unnormalize NOT an array
51 51
 	 * @return string
52 52
 	 */
53
-	public function unnormalize_one( $individual_item_to_unnormalize ) {
54
-		return $this->unnormalize( $individual_item_to_unnormalize );
53
+	public function unnormalize_one($individual_item_to_unnormalize) {
54
+		return $this->unnormalize($individual_item_to_unnormalize);
55 55
 	}
56 56
 }
57 57
 
Please login to merge, or discard this patch.
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@
 block discarded – undo
40 40
 	 * the value you would use in the html form (for a Yes_No_Input this could be '1' or '0').
41 41
 	 *
42 42
 	 * @param $normalized_value
43
-	 * @return array|string the 'raw' value as used in the form, usually a string or array of strings.
43
+	 * @return string the 'raw' value as used in the form, usually a string or array of strings.
44 44
 	 */
45 45
 	abstract function unnormalize( $normalized_value );
46 46
 
Please login to merge, or discard this patch.
form_sections/strategies/normalization/EE_Slug_Normalization.strategy.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -7,7 +7,7 @@  discard block
 block discarded – undo
7 7
  * @subpackage
8 8
  * @author				Mike Nelson
9 9
  */
10
-class EE_Slug_Normalization extends EE_Normalization_Strategy_Base{
10
+class EE_Slug_Normalization extends EE_Normalization_Strategy_Base {
11 11
 
12 12
 	/**
13 13
 	 * @param string $value_to_normalize
@@ -22,8 +22,8 @@  discard block
 block discarded – undo
22 22
 	 * @param string $normalized_value
23 23
 	 * @return string
24 24
 	 */
25
-	public function unnormalize( $normalized_value ) {
26
-		return str_replace( "-", " ", $normalized_value );
25
+	public function unnormalize($normalized_value) {
26
+		return str_replace("-", " ", $normalized_value);
27 27
 	}
28 28
 
29 29
 }
Please login to merge, or discard this patch.
sensitive_data_removal/EE_All_Sensitive_Data_Removal.strategy.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-if (!defined('EVENT_ESPRESSO_VERSION'))
3
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
4 4
 	exit('No direct script access allowed');
5 5
 
6 6
 /**
@@ -25,9 +25,9 @@  discard block
 block discarded – undo
25 25
  *
26 26
  * ------------------------------------------------------------------------
27 27
  */
28
-class EE_All_Sensitive_Data_Removal extends EE_Sensitive_Data_Removal_Base{
28
+class EE_All_Sensitive_Data_Removal extends EE_Sensitive_Data_Removal_Base {
29 29
 	public function remove_sensitive_data($normalized_value) {
30
-		switch(gettype($normalized_value)){
30
+		switch (gettype($normalized_value)) {
31 31
 			case "boolean":
32 32
 				return false;
33 33
 			case "integer":
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,7 +1,8 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-if (!defined('EVENT_ESPRESSO_VERSION'))
3
+if (!defined('EVENT_ESPRESSO_VERSION')) {
4 4
 	exit('No direct script access allowed');
5
+}
5 6
 
6 7
 /**
7 8
  * Event Espresso
Please login to merge, or discard this patch.
sensitive_data_removal/EE_CCV_Sensitive_Data_Removal.strategy.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 2
 
3
-if (!defined('EVENT_ESPRESSO_VERSION'))
3
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
4 4
 	exit('No direct script access allowed');
5 5
 
6 6
 /**
@@ -25,13 +25,13 @@  discard block
 block discarded – undo
25 25
  *
26 26
  * ------------------------------------------------------------------------
27 27
  */
28
-class EE_CCV_Sensitive_Data_Removal extends EE_Sensitive_Data_Removal_Base{
29
-	public function remove_sensitive_data($normalized_value){
28
+class EE_CCV_Sensitive_Data_Removal extends EE_Sensitive_Data_Removal_Base {
29
+	public function remove_sensitive_data($normalized_value) {
30 30
 		// Get the ccv Length
31 31
 		$ccv_lenght = strlen($normalized_value);
32 32
 		// Replace all characters of credit card except the last four and dashes
33
-		for($i=0; $i<$ccv_lenght; $i++){
34
-			if($normalized_value[$i] == '-'){continue;}
33
+		for ($i = 0; $i < $ccv_lenght; $i++) {
34
+			if ($normalized_value[$i] == '-') {continue; }
35 35
 			$normalized_value[$i] = 'X';
36 36
 		}
37 37
 		// Return the masked Credit Card #
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,7 +1,8 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-if (!defined('EVENT_ESPRESSO_VERSION'))
3
+if (!defined('EVENT_ESPRESSO_VERSION')) {
4 4
 	exit('No direct script access allowed');
5
+}
5 6
 
6 7
 /**
7 8
  * Event Espresso
Please login to merge, or discard this patch.
sensitive_data_removal/EE_Credit_Card_Sensitive_Data_Removal.strategy.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 2
 
3
-if (!defined('EVENT_ESPRESSO_VERSION'))
3
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
4 4
 	exit('No direct script access allowed');
5 5
 
6 6
 /**
@@ -25,13 +25,13 @@  discard block
 block discarded – undo
25 25
  *
26 26
  * ------------------------------------------------------------------------
27 27
  */
28
-class EE_Credit_Card_Sensitive_Data_Removal extends EE_Sensitive_Data_Removal_Base{
29
-	public function remove_sensitive_data($normalized_value){
28
+class EE_Credit_Card_Sensitive_Data_Removal extends EE_Sensitive_Data_Removal_Base {
29
+	public function remove_sensitive_data($normalized_value) {
30 30
 		// Get the cc Length
31 31
 		$cc_length = strlen($normalized_value);
32 32
 		// Replace all characters of credit card except the last four and dashes
33
-		for($i=0; $i<$cc_length-4; $i++){
34
-			if($normalized_value[$i] == '-'){continue;}
33
+		for ($i = 0; $i < $cc_length - 4; $i++) {
34
+			if ($normalized_value[$i] == '-') {continue; }
35 35
 			$normalized_value[$i] = 'X';
36 36
 		}
37 37
 		// Return the masked Credit Card #
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,7 +1,8 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-if (!defined('EVENT_ESPRESSO_VERSION'))
3
+if (!defined('EVENT_ESPRESSO_VERSION')) {
4 4
 	exit('No direct script access allowed');
5
+}
5 6
 
6 7
 /**
7 8
  * Event Espresso
Please login to merge, or discard this patch.
strategies/sensitive_data_removal/EE_No_Sensitive_Data_Removal.strategy.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-if (!defined('EVENT_ESPRESSO_VERSION'))
3
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
4 4
 	exit('No direct script access allowed');
5 5
 
6 6
 /**
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
  *
26 26
  * ------------------------------------------------------------------------
27 27
  */
28
-class EE_No_Sensitive_Data_Removal extends EE_Sensitive_Data_Removal_Base{
28
+class EE_No_Sensitive_Data_Removal extends EE_Sensitive_Data_Removal_Base {
29 29
 	public function remove_sensitive_data($normalized_value) {
30 30
 		return $normalized_value;
31 31
 	}
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,7 +1,8 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-if (!defined('EVENT_ESPRESSO_VERSION'))
3
+if (!defined('EVENT_ESPRESSO_VERSION')) {
4 4
 	exit('No direct script access allowed');
5
+}
5 6
 
6 7
 /**
7 8
  * Event Espresso
Please login to merge, or discard this patch.
sensitive_data_removal/EE_Sensitive_Data_Removal_Base.strategy.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-if (!defined('EVENT_ESPRESSO_VERSION'))
3
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
4 4
 	exit('No direct script access allowed');
5 5
 
6 6
 /**
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
  *
26 26
  * ------------------------------------------------------------------------
27 27
  */
28
-abstract class EE_Sensitive_Data_Removal_Base extends EE_Form_Input_Strategy_Base{
28
+abstract class EE_Sensitive_Data_Removal_Base extends EE_Form_Input_Strategy_Base {
29 29
 	/**
30 30
 	 * Removes all the sensitive data from this normalized value.
31 31
 	 * For example, should could 'mask' a credit card from 
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,7 +1,8 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-if (!defined('EVENT_ESPRESSO_VERSION'))
3
+if (!defined('EVENT_ESPRESSO_VERSION')) {
4 4
 	exit('No direct script access allowed');
5
+}
5 6
 
6 7
 /**
7 8
  * Event Espresso
Please login to merge, or discard this patch.
strategies/validation/EE_Credit_Card_Validation_Strategy.strategy.php 2 patches
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -10,16 +10,16 @@  discard block
 block discarded – undo
10 10
  * @since 				4.6
11 11
  *
12 12
  */
13
-class EE_Credit_Card_Validation_Strategy extends EE_Text_Validation_Strategy{
13
+class EE_Credit_Card_Validation_Strategy extends EE_Text_Validation_Strategy {
14 14
 
15 15
 	/**
16 16
 	 * @param null $validation_error_message
17 17
 	 */
18
-	public function __construct( $validation_error_message = NULL ) {
19
-		if( ! $validation_error_message ){
18
+	public function __construct($validation_error_message = NULL) {
19
+		if ( ! $validation_error_message) {
20 20
 			$validation_error_message = __("Please enter a valid credit card number", "event_espresso");
21 21
 		}
22
-		parent::__construct( $validation_error_message );
22
+		parent::__construct($validation_error_message);
23 23
 	}
24 24
 
25 25
 	/**
@@ -29,8 +29,8 @@  discard block
 block discarded – undo
29 29
 	 * @return void
30 30
 	 */
31 31
 	function validate($normalized_value) {
32
-		if( $normalized_value && ! $this->verify_is_credit_card($normalized_value)){
33
-			throw new EE_Validation_Error( $this->get_validation_error_message(), 'required');
32
+		if ($normalized_value && ! $this->verify_is_credit_card($normalized_value)) {
33
+			throw new EE_Validation_Error($this->get_validation_error_message(), 'required');
34 34
 		}
35 35
 	}
36 36
 
@@ -41,8 +41,8 @@  discard block
 block discarded – undo
41 41
 	 *
42 42
 	 * @return array
43 43
 	 */
44
-	function get_jquery_validation_rule_array(){
45
-		return array('creditcard'=>true, 'messages' => array( 'creditcard' => $this->get_validation_error_message() ) );
44
+	function get_jquery_validation_rule_array() {
45
+		return array('creditcard'=>true, 'messages' => array('creditcard' => $this->get_validation_error_message()));
46 46
 	}
47 47
 
48 48
 	/**
@@ -50,12 +50,12 @@  discard block
 block discarded – undo
50 50
 	 * @param string $card_number
51 51
 	 * @return boolean
52 52
 	 */
53
-	private function verify_is_credit_card($card_number){
53
+	private function verify_is_credit_card($card_number) {
54 54
 		//Credit card: All major cards
55 55
 		$regex = '~^(?:4[0-9]{12}(?:[0-9]{3})?|5[1-5][0-9]{14}|6011[0-9]{12}|3(?:0[0-5]|[68][0-9])[0-9]{11}|3[47][0-9]{13})$~';
56 56
 		if (preg_match($regex, $card_number) || empty($card_number)) {
57 57
 			return true;
58
-		}else{
58
+		} else {
59 59
 			return false;
60 60
 		}
61 61
 
Please login to merge, or discard this patch.
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -55,7 +55,7 @@
 block discarded – undo
55 55
 		$regex = '~^(?:4[0-9]{12}(?:[0-9]{3})?|5[1-5][0-9]{14}|6011[0-9]{12}|3(?:0[0-5]|[68][0-9])[0-9]{11}|3[47][0-9]{13})$~';
56 56
 		if (preg_match($regex, $card_number) || empty($card_number)) {
57 57
 			return true;
58
-		}else{
58
+		} else{
59 59
 			return false;
60 60
 		}
61 61
 
Please login to merge, or discard this patch.