@@ -11,51 +11,51 @@ |
||
11 | 11 | class EE_Enum_Validation_Strategy extends EE_Validation_Strategy_Base |
12 | 12 | { |
13 | 13 | |
14 | - /** |
|
15 | - * Check that the value is in the allowed list |
|
16 | - * @param $normalized_value |
|
17 | - * @throws EE_Error |
|
18 | - * @throws EE_Validation_Error |
|
19 | - * @return boolean |
|
20 | - */ |
|
21 | - public function validate($normalized_value) |
|
22 | - { |
|
23 | - parent::validate($normalized_value); |
|
24 | - if (! $this->_input instanceof EE_Form_Input_With_Options_Base) { |
|
25 | - throw new EE_Error(sprintf(__("Cannot use Enum Validation Strategy with an input that doesn't have options", "event_espresso"))); |
|
26 | - } |
|
27 | - $enum_options = $this->_input->flat_options(); |
|
28 | - if ($normalized_value === true) { |
|
29 | - $normalized_value = 1; |
|
30 | - } elseif ($normalized_value === false) { |
|
31 | - $normalized_value = 0; |
|
32 | - } |
|
33 | - if ($normalized_value !== null && ! array_key_exists($normalized_value, $enum_options)) { |
|
34 | - throw new EE_Validation_Error( |
|
35 | - $this->get_validation_error_message(), |
|
36 | - 'invalid_enum_value' |
|
37 | - ); |
|
38 | - } else { |
|
39 | - return true; |
|
40 | - } |
|
41 | - } |
|
14 | + /** |
|
15 | + * Check that the value is in the allowed list |
|
16 | + * @param $normalized_value |
|
17 | + * @throws EE_Error |
|
18 | + * @throws EE_Validation_Error |
|
19 | + * @return boolean |
|
20 | + */ |
|
21 | + public function validate($normalized_value) |
|
22 | + { |
|
23 | + parent::validate($normalized_value); |
|
24 | + if (! $this->_input instanceof EE_Form_Input_With_Options_Base) { |
|
25 | + throw new EE_Error(sprintf(__("Cannot use Enum Validation Strategy with an input that doesn't have options", "event_espresso"))); |
|
26 | + } |
|
27 | + $enum_options = $this->_input->flat_options(); |
|
28 | + if ($normalized_value === true) { |
|
29 | + $normalized_value = 1; |
|
30 | + } elseif ($normalized_value === false) { |
|
31 | + $normalized_value = 0; |
|
32 | + } |
|
33 | + if ($normalized_value !== null && ! array_key_exists($normalized_value, $enum_options)) { |
|
34 | + throw new EE_Validation_Error( |
|
35 | + $this->get_validation_error_message(), |
|
36 | + 'invalid_enum_value' |
|
37 | + ); |
|
38 | + } else { |
|
39 | + return true; |
|
40 | + } |
|
41 | + } |
|
42 | 42 | |
43 | - /** |
|
44 | - * If we are using the default validation error message, make it dynamic based |
|
45 | - * on the allowed options. |
|
46 | - * @return string |
|
47 | - */ |
|
48 | - public function get_validation_error_message() |
|
49 | - { |
|
50 | - $parent_validation_error_message = parent::get_validation_error_message(); |
|
51 | - if (! $parent_validation_error_message) { |
|
52 | - $enum_options = $this->_input instanceof EE_Form_Input_With_Options_Base ? $this->_input->flat_options() : ''; |
|
53 | - return sprintf( |
|
54 | - __("This is not allowed option. Allowed options are %s.", "event_espresso"), |
|
55 | - implode(', ', $enum_options) |
|
56 | - ); |
|
57 | - } else { |
|
58 | - return $parent_validation_error_message; |
|
59 | - } |
|
60 | - } |
|
43 | + /** |
|
44 | + * If we are using the default validation error message, make it dynamic based |
|
45 | + * on the allowed options. |
|
46 | + * @return string |
|
47 | + */ |
|
48 | + public function get_validation_error_message() |
|
49 | + { |
|
50 | + $parent_validation_error_message = parent::get_validation_error_message(); |
|
51 | + if (! $parent_validation_error_message) { |
|
52 | + $enum_options = $this->_input instanceof EE_Form_Input_With_Options_Base ? $this->_input->flat_options() : ''; |
|
53 | + return sprintf( |
|
54 | + __("This is not allowed option. Allowed options are %s.", "event_espresso"), |
|
55 | + implode(', ', $enum_options) |
|
56 | + ); |
|
57 | + } else { |
|
58 | + return $parent_validation_error_message; |
|
59 | + } |
|
60 | + } |
|
61 | 61 | } |
@@ -21,7 +21,7 @@ discard block |
||
21 | 21 | public function validate($normalized_value) |
22 | 22 | { |
23 | 23 | parent::validate($normalized_value); |
24 | - if (! $this->_input instanceof EE_Form_Input_With_Options_Base) { |
|
24 | + if ( ! $this->_input instanceof EE_Form_Input_With_Options_Base) { |
|
25 | 25 | throw new EE_Error(sprintf(__("Cannot use Enum Validation Strategy with an input that doesn't have options", "event_espresso"))); |
26 | 26 | } |
27 | 27 | $enum_options = $this->_input->flat_options(); |
@@ -48,7 +48,7 @@ discard block |
||
48 | 48 | public function get_validation_error_message() |
49 | 49 | { |
50 | 50 | $parent_validation_error_message = parent::get_validation_error_message(); |
51 | - if (! $parent_validation_error_message) { |
|
51 | + if ( ! $parent_validation_error_message) { |
|
52 | 52 | $enum_options = $this->_input instanceof EE_Form_Input_With_Options_Base ? $this->_input->flat_options() : ''; |
53 | 53 | return sprintf( |
54 | 54 | __("This is not allowed option. Allowed options are %s.", "event_espresso"), |
@@ -11,97 +11,97 @@ |
||
11 | 11 | { |
12 | 12 | |
13 | 13 | |
14 | - protected $_validation_error_message = ''; |
|
15 | - |
|
16 | - |
|
17 | - |
|
18 | - /** |
|
19 | - * @param null $validation_error_message |
|
20 | - */ |
|
21 | - public function __construct($validation_error_message = null) |
|
22 | - { |
|
23 | - $this->_validation_error_message = $validation_error_message === null |
|
24 | - ? __('Input invalid', 'event_espresso') |
|
25 | - : $validation_error_message; |
|
26 | - parent::__construct(); |
|
27 | - } |
|
28 | - |
|
29 | - |
|
30 | - |
|
31 | - /** |
|
32 | - * Performs validation on the request data that corresponds to this field. |
|
33 | - * If validation fails, should throw an EE_Validation_Error. |
|
34 | - * Note: most validate() functions should allow $normalized_value to be empty, |
|
35 | - * as its the job of the EE_Required_Validation_Strategy to ensure that the field isn't empty. |
|
36 | - * |
|
37 | - * @param mixed $normalized_value ready for validation. May very well be NULL (which, unless |
|
38 | - * this validation strategy is the 'required' validation strategy, |
|
39 | - * most should be OK with a null, empty string, etc) |
|
40 | - */ |
|
41 | - public function validate($normalized_value) |
|
42 | - { |
|
43 | - // by default, the validation strategy does no validation. this should be implemented |
|
44 | - } |
|
45 | - |
|
46 | - |
|
47 | - |
|
48 | - /** |
|
49 | - * Gets the JS code for use in the jQuery validation js corresponding to this field when displaying. |
|
50 | - * For documentation, see http://jqueryvalidation.org/ |
|
51 | - * Eg to generate the following js for validation, <br><code> |
|
52 | - * $( "#myform" ).validate({ |
|
53 | - * rules: { |
|
54 | - * field_name: { |
|
55 | - * required: true, |
|
56 | - * minlength: 3, |
|
57 | - * equalTo: "#password" |
|
58 | - * } |
|
59 | - * } |
|
60 | - * }); |
|
61 | - * </code> |
|
62 | - * this function should return array('required'=>true,'minlength'=>3,'equalTo'=>'"#password"' ). |
|
63 | - * This is done so that if we are applying multiple sanitization strategies to a field, |
|
64 | - * we can easily combine them. |
|
65 | - * |
|
66 | - * @return array |
|
67 | - */ |
|
68 | - public function get_jquery_validation_rule_array() |
|
69 | - { |
|
70 | - return array(); |
|
71 | - } |
|
72 | - |
|
73 | - |
|
74 | - |
|
75 | - /** |
|
76 | - * Gets the i18n validation error message for when this validation strategy finds |
|
77 | - * the input is invalid. Used for both frontend and backend validation. |
|
78 | - * |
|
79 | - * @return string |
|
80 | - */ |
|
81 | - public function get_validation_error_message() |
|
82 | - { |
|
83 | - return $this->_validation_error_message; |
|
84 | - } |
|
85 | - |
|
86 | - |
|
87 | - |
|
88 | - /** |
|
89 | - * Adds js variables for localization to the $other_js_data. These should be put |
|
90 | - * in each form's "other_data" javascript object. |
|
91 | - * |
|
92 | - * @param array $other_js_data |
|
93 | - * @return array |
|
94 | - */ |
|
95 | - public function get_other_js_data($other_js_data = array()) |
|
96 | - { |
|
97 | - return $other_js_data; |
|
98 | - } |
|
14 | + protected $_validation_error_message = ''; |
|
15 | + |
|
16 | + |
|
17 | + |
|
18 | + /** |
|
19 | + * @param null $validation_error_message |
|
20 | + */ |
|
21 | + public function __construct($validation_error_message = null) |
|
22 | + { |
|
23 | + $this->_validation_error_message = $validation_error_message === null |
|
24 | + ? __('Input invalid', 'event_espresso') |
|
25 | + : $validation_error_message; |
|
26 | + parent::__construct(); |
|
27 | + } |
|
28 | + |
|
29 | + |
|
30 | + |
|
31 | + /** |
|
32 | + * Performs validation on the request data that corresponds to this field. |
|
33 | + * If validation fails, should throw an EE_Validation_Error. |
|
34 | + * Note: most validate() functions should allow $normalized_value to be empty, |
|
35 | + * as its the job of the EE_Required_Validation_Strategy to ensure that the field isn't empty. |
|
36 | + * |
|
37 | + * @param mixed $normalized_value ready for validation. May very well be NULL (which, unless |
|
38 | + * this validation strategy is the 'required' validation strategy, |
|
39 | + * most should be OK with a null, empty string, etc) |
|
40 | + */ |
|
41 | + public function validate($normalized_value) |
|
42 | + { |
|
43 | + // by default, the validation strategy does no validation. this should be implemented |
|
44 | + } |
|
45 | + |
|
46 | + |
|
47 | + |
|
48 | + /** |
|
49 | + * Gets the JS code for use in the jQuery validation js corresponding to this field when displaying. |
|
50 | + * For documentation, see http://jqueryvalidation.org/ |
|
51 | + * Eg to generate the following js for validation, <br><code> |
|
52 | + * $( "#myform" ).validate({ |
|
53 | + * rules: { |
|
54 | + * field_name: { |
|
55 | + * required: true, |
|
56 | + * minlength: 3, |
|
57 | + * equalTo: "#password" |
|
58 | + * } |
|
59 | + * } |
|
60 | + * }); |
|
61 | + * </code> |
|
62 | + * this function should return array('required'=>true,'minlength'=>3,'equalTo'=>'"#password"' ). |
|
63 | + * This is done so that if we are applying multiple sanitization strategies to a field, |
|
64 | + * we can easily combine them. |
|
65 | + * |
|
66 | + * @return array |
|
67 | + */ |
|
68 | + public function get_jquery_validation_rule_array() |
|
69 | + { |
|
70 | + return array(); |
|
71 | + } |
|
72 | + |
|
73 | + |
|
74 | + |
|
75 | + /** |
|
76 | + * Gets the i18n validation error message for when this validation strategy finds |
|
77 | + * the input is invalid. Used for both frontend and backend validation. |
|
78 | + * |
|
79 | + * @return string |
|
80 | + */ |
|
81 | + public function get_validation_error_message() |
|
82 | + { |
|
83 | + return $this->_validation_error_message; |
|
84 | + } |
|
85 | + |
|
86 | + |
|
87 | + |
|
88 | + /** |
|
89 | + * Adds js variables for localization to the $other_js_data. These should be put |
|
90 | + * in each form's "other_data" javascript object. |
|
91 | + * |
|
92 | + * @param array $other_js_data |
|
93 | + * @return array |
|
94 | + */ |
|
95 | + public function get_other_js_data($other_js_data = array()) |
|
96 | + { |
|
97 | + return $other_js_data; |
|
98 | + } |
|
99 | 99 | |
100 | - /** |
|
101 | - * Opportunity for this display strategy to call wp_enqueue_script and wp_enqueue_style. |
|
102 | - * This should be called during wp_enqueue_scripts |
|
103 | - */ |
|
104 | - public function enqueue_js() |
|
105 | - { |
|
106 | - } |
|
100 | + /** |
|
101 | + * Opportunity for this display strategy to call wp_enqueue_script and wp_enqueue_style. |
|
102 | + * This should be called during wp_enqueue_scripts |
|
103 | + */ |
|
104 | + public function enqueue_js() |
|
105 | + { |
|
106 | + } |
|
107 | 107 | } |
@@ -11,18 +11,18 @@ |
||
11 | 11 | */ |
12 | 12 | class EE_Credit_Card_Sensitive_Data_Removal extends EE_Sensitive_Data_Removal_Base |
13 | 13 | { |
14 | - public function remove_sensitive_data($normalized_value) |
|
15 | - { |
|
16 | - // Get the cc Length |
|
17 | - $cc_length = strlen($normalized_value); |
|
18 | - // Replace all characters of credit card except the last four and dashes |
|
19 | - for ($i=0; $i<$cc_length-4; $i++) { |
|
20 | - if ($normalized_value[ $i ] == '-') { |
|
21 | - continue; |
|
22 | - } |
|
23 | - $normalized_value[ $i ] = 'X'; |
|
24 | - } |
|
25 | - // Return the masked Credit Card # |
|
26 | - return $normalized_value; |
|
27 | - } |
|
14 | + public function remove_sensitive_data($normalized_value) |
|
15 | + { |
|
16 | + // Get the cc Length |
|
17 | + $cc_length = strlen($normalized_value); |
|
18 | + // Replace all characters of credit card except the last four and dashes |
|
19 | + for ($i=0; $i<$cc_length-4; $i++) { |
|
20 | + if ($normalized_value[ $i ] == '-') { |
|
21 | + continue; |
|
22 | + } |
|
23 | + $normalized_value[ $i ] = 'X'; |
|
24 | + } |
|
25 | + // Return the masked Credit Card # |
|
26 | + return $normalized_value; |
|
27 | + } |
|
28 | 28 | } |
@@ -16,11 +16,11 @@ |
||
16 | 16 | // Get the cc Length |
17 | 17 | $cc_length = strlen($normalized_value); |
18 | 18 | // Replace all characters of credit card except the last four and dashes |
19 | - for ($i=0; $i<$cc_length-4; $i++) { |
|
20 | - if ($normalized_value[ $i ] == '-') { |
|
19 | + for ($i = 0; $i < $cc_length - 4; $i++) { |
|
20 | + if ($normalized_value[$i] == '-') { |
|
21 | 21 | continue; |
22 | 22 | } |
23 | - $normalized_value[ $i ] = 'X'; |
|
23 | + $normalized_value[$i] = 'X'; |
|
24 | 24 | } |
25 | 25 | // Return the masked Credit Card # |
26 | 26 | return $normalized_value; |
@@ -11,16 +11,16 @@ |
||
11 | 11 | */ |
12 | 12 | abstract class EE_Sensitive_Data_Removal_Base extends EE_Form_Input_Strategy_Base |
13 | 13 | { |
14 | - /** |
|
15 | - * Removes all the sensitive data from this normalized value. |
|
16 | - * For example, should could 'mask' a credit card from |
|
17 | - * '1234 1234 1234 1234' TO '**** **** **** 1234'. |
|
18 | - * Or turn a ccv number from |
|
19 | - * '123' to '***', |
|
20 | - * or turn a password from |
|
21 | - * 'CantHac7Th15' to '*************', |
|
22 | - * or just leave htevalue as-is |
|
23 | - * @return mixed |
|
24 | - */ |
|
25 | - abstract public function remove_sensitive_data($normalized_value); |
|
14 | + /** |
|
15 | + * Removes all the sensitive data from this normalized value. |
|
16 | + * For example, should could 'mask' a credit card from |
|
17 | + * '1234 1234 1234 1234' TO '**** **** **** 1234'. |
|
18 | + * Or turn a ccv number from |
|
19 | + * '123' to '***', |
|
20 | + * or turn a password from |
|
21 | + * 'CantHac7Th15' to '*************', |
|
22 | + * or just leave htevalue as-is |
|
23 | + * @return mixed |
|
24 | + */ |
|
25 | + abstract public function remove_sensitive_data($normalized_value); |
|
26 | 26 | } |
@@ -11,23 +11,23 @@ |
||
11 | 11 | */ |
12 | 12 | class EE_All_Sensitive_Data_Removal extends EE_Sensitive_Data_Removal_Base |
13 | 13 | { |
14 | - public function remove_sensitive_data($normalized_value) |
|
15 | - { |
|
16 | - switch (gettype($normalized_value)) { |
|
17 | - case "boolean": |
|
18 | - return false; |
|
19 | - case "integer": |
|
20 | - case "double": |
|
21 | - return 0; |
|
22 | - case "string": |
|
23 | - return ''; |
|
24 | - case "array": |
|
25 | - return array(); |
|
26 | - case "object": |
|
27 | - case "resource": |
|
28 | - case "NULL": |
|
29 | - default: |
|
30 | - return null; |
|
31 | - } |
|
32 | - } |
|
14 | + public function remove_sensitive_data($normalized_value) |
|
15 | + { |
|
16 | + switch (gettype($normalized_value)) { |
|
17 | + case "boolean": |
|
18 | + return false; |
|
19 | + case "integer": |
|
20 | + case "double": |
|
21 | + return 0; |
|
22 | + case "string": |
|
23 | + return ''; |
|
24 | + case "array": |
|
25 | + return array(); |
|
26 | + case "object": |
|
27 | + case "resource": |
|
28 | + case "NULL": |
|
29 | + default: |
|
30 | + return null; |
|
31 | + } |
|
32 | + } |
|
33 | 33 | } |
@@ -11,18 +11,18 @@ |
||
11 | 11 | */ |
12 | 12 | class EE_CCV_Sensitive_Data_Removal extends EE_Sensitive_Data_Removal_Base |
13 | 13 | { |
14 | - public function remove_sensitive_data($normalized_value) |
|
15 | - { |
|
16 | - // Get the ccv Length |
|
17 | - $ccv_lenght = strlen($normalized_value); |
|
18 | - // Replace all characters of credit card except the last four and dashes |
|
19 | - for ($i=0; $i<$ccv_lenght; $i++) { |
|
20 | - if ($normalized_value[ $i ] == '-') { |
|
21 | - continue; |
|
22 | - } |
|
23 | - $normalized_value[ $i ] = 'X'; |
|
24 | - } |
|
25 | - // Return the masked Credit Card # |
|
26 | - return $normalized_value; |
|
27 | - } |
|
14 | + public function remove_sensitive_data($normalized_value) |
|
15 | + { |
|
16 | + // Get the ccv Length |
|
17 | + $ccv_lenght = strlen($normalized_value); |
|
18 | + // Replace all characters of credit card except the last four and dashes |
|
19 | + for ($i=0; $i<$ccv_lenght; $i++) { |
|
20 | + if ($normalized_value[ $i ] == '-') { |
|
21 | + continue; |
|
22 | + } |
|
23 | + $normalized_value[ $i ] = 'X'; |
|
24 | + } |
|
25 | + // Return the masked Credit Card # |
|
26 | + return $normalized_value; |
|
27 | + } |
|
28 | 28 | } |
@@ -16,11 +16,11 @@ |
||
16 | 16 | // Get the ccv Length |
17 | 17 | $ccv_lenght = strlen($normalized_value); |
18 | 18 | // Replace all characters of credit card except the last four and dashes |
19 | - for ($i=0; $i<$ccv_lenght; $i++) { |
|
20 | - if ($normalized_value[ $i ] == '-') { |
|
19 | + for ($i = 0; $i < $ccv_lenght; $i++) { |
|
20 | + if ($normalized_value[$i] == '-') { |
|
21 | 21 | continue; |
22 | 22 | } |
23 | - $normalized_value[ $i ] = 'X'; |
|
23 | + $normalized_value[$i] = 'X'; |
|
24 | 24 | } |
25 | 25 | // Return the masked Credit Card # |
26 | 26 | return $normalized_value; |
@@ -11,8 +11,8 @@ |
||
11 | 11 | */ |
12 | 12 | class EE_No_Sensitive_Data_Removal extends EE_Sensitive_Data_Removal_Base |
13 | 13 | { |
14 | - public function remove_sensitive_data($normalized_value) |
|
15 | - { |
|
16 | - return $normalized_value; |
|
17 | - } |
|
14 | + public function remove_sensitive_data($normalized_value) |
|
15 | + { |
|
16 | + return $normalized_value; |
|
17 | + } |
|
18 | 18 | } |
@@ -14,30 +14,30 @@ |
||
14 | 14 | class EE_Form_Section_HTML extends EE_Form_Section_Base |
15 | 15 | { |
16 | 16 | |
17 | - protected $_html = ''; |
|
17 | + protected $_html = ''; |
|
18 | 18 | |
19 | 19 | |
20 | 20 | |
21 | - /** |
|
22 | - * @param string $html |
|
23 | - * @param array $options_array |
|
24 | - */ |
|
25 | - public function __construct($html = '', $options_array = array()) |
|
26 | - { |
|
27 | - $this->_html = $html; |
|
28 | - parent::__construct($options_array); |
|
29 | - } |
|
21 | + /** |
|
22 | + * @param string $html |
|
23 | + * @param array $options_array |
|
24 | + */ |
|
25 | + public function __construct($html = '', $options_array = array()) |
|
26 | + { |
|
27 | + $this->_html = $html; |
|
28 | + parent::__construct($options_array); |
|
29 | + } |
|
30 | 30 | |
31 | 31 | |
32 | 32 | |
33 | - /** |
|
34 | - * Returns the HTML |
|
35 | - * @return string |
|
36 | - */ |
|
37 | - public function get_html() |
|
38 | - { |
|
39 | - return $this->_html; |
|
40 | - } |
|
33 | + /** |
|
34 | + * Returns the HTML |
|
35 | + * @return string |
|
36 | + */ |
|
37 | + public function get_html() |
|
38 | + { |
|
39 | + return $this->_html; |
|
40 | + } |
|
41 | 41 | } |
42 | 42 | |
43 | 43 | // End of file EE_Form_Section_HTML.form.php |
@@ -11,11 +11,11 @@ |
||
11 | 11 | */ |
12 | 12 | class EE_Form_Section_HTML_From_Template extends EE_Form_Section_HTML |
13 | 13 | { |
14 | - public function __construct($template_file, $args = array(), $options_array = array()) |
|
15 | - { |
|
16 | - $html = EEH_Template::locate_template($template_file, $args); |
|
14 | + public function __construct($template_file, $args = array(), $options_array = array()) |
|
15 | + { |
|
16 | + $html = EEH_Template::locate_template($template_file, $args); |
|
17 | 17 | |
18 | 18 | // echo " filepath:$template_file html $html"; |
19 | - parent::__construct($html, $options_array); |
|
20 | - } |
|
19 | + parent::__construct($html, $options_array); |
|
20 | + } |
|
21 | 21 | } |