@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | * Gets the html "type" attribute's value |
| 35 | 35 | * @return string |
| 36 | 36 | */ |
| 37 | - public function get_type(){ |
|
| 37 | + public function get_type(){ |
|
| 38 | 38 | if ( |
| 39 | 39 | $this->_type === 'email' |
| 40 | 40 | && ! apply_filters( 'FHEE__EE_Text_Input_Display_Strategy__use_html5_email', false ) |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | * |
| 51 | 51 | * @return string of html to display the field |
| 52 | 52 | */ |
| 53 | - public function display(){ |
|
| 53 | + public function display(){ |
|
| 54 | 54 | $input = '<input type="'. $this->get_type() .'"'; |
| 55 | 55 | $input .= ' name="' . $this->_input->html_name() . '"'; |
| 56 | 56 | $input .= ' id="' . $this->_input->html_id() . '"'; |
@@ -11,7 +11,7 @@ discard block |
||
| 11 | 11 | * @since 4.6 |
| 12 | 12 | * |
| 13 | 13 | */ |
| 14 | -class EE_Text_Input_Display_Strategy extends EE_Display_Strategy_Base{ |
|
| 14 | +class EE_Text_Input_Display_Strategy extends EE_Display_Strategy_Base { |
|
| 15 | 15 | /** |
| 16 | 16 | * The html "type" attribute value. default is "text" |
| 17 | 17 | * @var string |
@@ -23,7 +23,7 @@ discard block |
||
| 23 | 23 | /** |
| 24 | 24 | * @param string $type |
| 25 | 25 | */ |
| 26 | - public function __construct( $type = 'text' ) { |
|
| 26 | + public function __construct($type = 'text') { |
|
| 27 | 27 | $this->_type = $type; |
| 28 | 28 | parent::__construct(); |
| 29 | 29 | } |
@@ -34,10 +34,10 @@ discard block |
||
| 34 | 34 | * Gets the html "type" attribute's value |
| 35 | 35 | * @return string |
| 36 | 36 | */ |
| 37 | - public function get_type(){ |
|
| 37 | + public function get_type() { |
|
| 38 | 38 | if ( |
| 39 | 39 | $this->_type === 'email' |
| 40 | - && ! apply_filters( 'FHEE__EE_Text_Input_Display_Strategy__use_html5_email', false ) |
|
| 40 | + && ! apply_filters('FHEE__EE_Text_Input_Display_Strategy__use_html5_email', false) |
|
| 41 | 41 | ) { |
| 42 | 42 | return 'text'; |
| 43 | 43 | } |
@@ -50,16 +50,16 @@ discard block |
||
| 50 | 50 | * |
| 51 | 51 | * @return string of html to display the field |
| 52 | 52 | */ |
| 53 | - public function display(){ |
|
| 54 | - $input = '<input type="'. $this->get_type() .'"'; |
|
| 55 | - $input .= ' name="' . $this->_input->html_name() . '"'; |
|
| 56 | - $input .= ' id="' . $this->_input->html_id() . '"'; |
|
| 57 | - $class = $this->_input->required() ? $this->_input->required_css_class() . ' ' . $this->_input->html_class() : $this->_input->html_class(); |
|
| 58 | - $input .= ' class="' . $class . '"'; |
|
| 53 | + public function display() { |
|
| 54 | + $input = '<input type="'.$this->get_type().'"'; |
|
| 55 | + $input .= ' name="'.$this->_input->html_name().'"'; |
|
| 56 | + $input .= ' id="'.$this->_input->html_id().'"'; |
|
| 57 | + $class = $this->_input->required() ? $this->_input->required_css_class().' '.$this->_input->html_class() : $this->_input->html_class(); |
|
| 58 | + $input .= ' class="'.$class.'"'; |
|
| 59 | 59 | // add html5 required |
| 60 | 60 | $input .= $this->_input->required() ? ' required' : ''; |
| 61 | - $input .= ' value="' . $this->_input->raw_value_in_form() . '"'; |
|
| 62 | - $input .= ' style="' . $this->_input->html_style() . '"'; |
|
| 61 | + $input .= ' value="'.$this->_input->raw_value_in_form().'"'; |
|
| 62 | + $input .= ' style="'.$this->_input->html_style().'"'; |
|
| 63 | 63 | $input .= $this->_input->other_html_attributes(); |
| 64 | 64 | $input .= '/>'; |
| 65 | 65 | return $input; |
@@ -15,37 +15,37 @@ |
||
| 15 | 15 | { |
| 16 | 16 | |
| 17 | 17 | |
| 18 | - /** |
|
| 19 | - * @param array $input_settings |
|
| 20 | - */ |
|
| 21 | - public function __construct($input_settings = array()) |
|
| 22 | - { |
|
| 23 | - $this->_set_display_strategy( |
|
| 24 | - new EE_Number_Input_Display_Strategy( |
|
| 25 | - isset($input_settings['min_value']) |
|
| 26 | - ? $input_settings['min_value'] |
|
| 27 | - : null, |
|
| 28 | - isset($input_settings['max_value']) |
|
| 29 | - ? $input_settings['max_value'] |
|
| 30 | - : null |
|
| 31 | - ) |
|
| 32 | - ); |
|
| 33 | - $this->_set_normalization_strategy( |
|
| 34 | - new EE_Int_Normalization( |
|
| 35 | - isset($input_settings['validation_error_message']) |
|
| 36 | - ? $input_settings['validation_error_message'] |
|
| 37 | - : null |
|
| 38 | - ) |
|
| 39 | - ); |
|
| 40 | - $this->_add_validation_strategy( |
|
| 41 | - new EE_Int_Validation_Strategy( |
|
| 42 | - isset($input_settings['validation_error_message']) |
|
| 43 | - ? $input_settings['validation_error_message'] |
|
| 44 | - : null |
|
| 45 | - ) |
|
| 46 | - ); |
|
| 47 | - parent::__construct($input_settings); |
|
| 48 | - } |
|
| 18 | + /** |
|
| 19 | + * @param array $input_settings |
|
| 20 | + */ |
|
| 21 | + public function __construct($input_settings = array()) |
|
| 22 | + { |
|
| 23 | + $this->_set_display_strategy( |
|
| 24 | + new EE_Number_Input_Display_Strategy( |
|
| 25 | + isset($input_settings['min_value']) |
|
| 26 | + ? $input_settings['min_value'] |
|
| 27 | + : null, |
|
| 28 | + isset($input_settings['max_value']) |
|
| 29 | + ? $input_settings['max_value'] |
|
| 30 | + : null |
|
| 31 | + ) |
|
| 32 | + ); |
|
| 33 | + $this->_set_normalization_strategy( |
|
| 34 | + new EE_Int_Normalization( |
|
| 35 | + isset($input_settings['validation_error_message']) |
|
| 36 | + ? $input_settings['validation_error_message'] |
|
| 37 | + : null |
|
| 38 | + ) |
|
| 39 | + ); |
|
| 40 | + $this->_add_validation_strategy( |
|
| 41 | + new EE_Int_Validation_Strategy( |
|
| 42 | + isset($input_settings['validation_error_message']) |
|
| 43 | + ? $input_settings['validation_error_message'] |
|
| 44 | + : null |
|
| 45 | + ) |
|
| 46 | + ); |
|
| 47 | + parent::__construct($input_settings); |
|
| 48 | + } |
|
| 49 | 49 | |
| 50 | 50 | } |
| 51 | 51 | // End of file EE_Integer_Input.php |
@@ -16,6 +16,6 @@ |
||
| 16 | 16 | $this->_set_normalization_strategy(new EE_Float_Normalization( isset( $input_settings[ 'validation_error_message' ] ) ? $input_settings[ 'validation_error_message' ] : NULL ) ); |
| 17 | 17 | $this->_add_validation_strategy( new EE_Float_Validation_Strategy( isset( $input_settings[ 'validation_error_message' ] ) ? $input_settings[ 'validation_error_message' ] : NULL ) ); |
| 18 | 18 | parent::__construct($input_settings); |
| 19 | - $this->_other_html_attributes .= ' step="any"'; |
|
| 19 | + $this->_other_html_attributes .= ' step="any"'; |
|
| 20 | 20 | } |
| 21 | 21 | } |
| 22 | 22 | \ No newline at end of file |
@@ -6,15 +6,15 @@ |
||
| 6 | 6 | * @subpackage |
| 7 | 7 | * @author Mike Nelson |
| 8 | 8 | */ |
| 9 | -class EE_Float_Input extends EE_Form_Input_Base{ |
|
| 9 | +class EE_Float_Input extends EE_Form_Input_Base { |
|
| 10 | 10 | |
| 11 | 11 | /** |
| 12 | 12 | * @param array $input_settings |
| 13 | 13 | */ |
| 14 | - function __construct($input_settings = array()){ |
|
| 14 | + function __construct($input_settings = array()) { |
|
| 15 | 15 | $this->_set_display_strategy(new EE_Number_Input_Display_Strategy()); |
| 16 | - $this->_set_normalization_strategy(new EE_Float_Normalization( isset( $input_settings[ 'validation_error_message' ] ) ? $input_settings[ 'validation_error_message' ] : NULL ) ); |
|
| 17 | - $this->_add_validation_strategy( new EE_Float_Validation_Strategy( isset( $input_settings[ 'validation_error_message' ] ) ? $input_settings[ 'validation_error_message' ] : NULL ) ); |
|
| 16 | + $this->_set_normalization_strategy(new EE_Float_Normalization(isset($input_settings['validation_error_message']) ? $input_settings['validation_error_message'] : NULL)); |
|
| 17 | + $this->_add_validation_strategy(new EE_Float_Validation_Strategy(isset($input_settings['validation_error_message']) ? $input_settings['validation_error_message'] : NULL)); |
|
| 18 | 18 | parent::__construct($input_settings); |
| 19 | 19 | $this->_other_html_attributes .= ' step="any"'; |
| 20 | 20 | } |
@@ -1,4 +1,4 @@ discard block |
||
| 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 | |
@@ -61,7 +61,7 @@ discard block |
||
| 61 | 61 | */ |
| 62 | 62 | protected function _append_chars($string = '', $chars = '-') |
| 63 | 63 | { |
| 64 | - return $this->_remove_chars($string, $chars) . $chars; |
|
| 64 | + return $this->_remove_chars($string, $chars).$chars; |
|
| 65 | 65 | } |
| 66 | 66 | |
| 67 | 67 | |
@@ -1,5 +1,5 @@ discard block |
||
| 1 | 1 | <?php if (! defined('EVENT_ESPRESSO_VERSION')) { |
| 2 | - exit('No direct script access allowed'); |
|
| 2 | + exit('No direct script access allowed'); |
|
| 3 | 3 | } |
| 4 | 4 | |
| 5 | 5 | |
@@ -16,229 +16,229 @@ discard block |
||
| 16 | 16 | { |
| 17 | 17 | |
| 18 | 18 | |
| 19 | - /** |
|
| 20 | - * @var string $_tag |
|
| 21 | - */ |
|
| 22 | - protected $_tag = ''; |
|
| 19 | + /** |
|
| 20 | + * @var string $_tag |
|
| 21 | + */ |
|
| 22 | + protected $_tag = ''; |
|
| 23 | 23 | |
| 24 | 24 | |
| 25 | 25 | |
| 26 | 26 | |
| 27 | 27 | |
| 28 | - /** |
|
| 29 | - * returns HTML and javascript related to the displaying of this input |
|
| 30 | - * |
|
| 31 | - * @return string |
|
| 32 | - */ |
|
| 33 | - abstract public function display(); |
|
| 28 | + /** |
|
| 29 | + * returns HTML and javascript related to the displaying of this input |
|
| 30 | + * |
|
| 31 | + * @return string |
|
| 32 | + */ |
|
| 33 | + abstract public function display(); |
|
| 34 | 34 | |
| 35 | 35 | |
| 36 | 36 | |
| 37 | - /** |
|
| 38 | - * _remove_chars - takes an incoming string, and removes the string $chars from the end of it, but only if $chars |
|
| 39 | - * is already there |
|
| 40 | - * |
|
| 41 | - * @param string $string - the string being processed |
|
| 42 | - * @param string $chars - exact string of characters to remove |
|
| 43 | - * @return string |
|
| 44 | - */ |
|
| 45 | - protected function _remove_chars($string = '', $chars = '-') |
|
| 46 | - { |
|
| 47 | - $char_length = strlen($chars) * -1; |
|
| 48 | - // if last three characters of string is " - ", then remove it |
|
| 49 | - return substr($string, $char_length) === $chars ? substr($string, 0, $char_length) : $string; |
|
| 50 | - } |
|
| 37 | + /** |
|
| 38 | + * _remove_chars - takes an incoming string, and removes the string $chars from the end of it, but only if $chars |
|
| 39 | + * is already there |
|
| 40 | + * |
|
| 41 | + * @param string $string - the string being processed |
|
| 42 | + * @param string $chars - exact string of characters to remove |
|
| 43 | + * @return string |
|
| 44 | + */ |
|
| 45 | + protected function _remove_chars($string = '', $chars = '-') |
|
| 46 | + { |
|
| 47 | + $char_length = strlen($chars) * -1; |
|
| 48 | + // if last three characters of string is " - ", then remove it |
|
| 49 | + return substr($string, $char_length) === $chars ? substr($string, 0, $char_length) : $string; |
|
| 50 | + } |
|
| 51 | 51 | |
| 52 | 52 | |
| 53 | 53 | |
| 54 | - /** |
|
| 55 | - * _append_chars - takes an incoming string, and adds the string $chars to the end of it, but only if $chars is not |
|
| 56 | - * already there |
|
| 57 | - * |
|
| 58 | - * @param string $string - the string being processed |
|
| 59 | - * @param string $chars - exact string of characters to be added to end of string |
|
| 60 | - * @return string |
|
| 61 | - */ |
|
| 62 | - protected function _append_chars($string = '', $chars = '-') |
|
| 63 | - { |
|
| 64 | - return $this->_remove_chars($string, $chars) . $chars; |
|
| 65 | - } |
|
| 54 | + /** |
|
| 55 | + * _append_chars - takes an incoming string, and adds the string $chars to the end of it, but only if $chars is not |
|
| 56 | + * already there |
|
| 57 | + * |
|
| 58 | + * @param string $string - the string being processed |
|
| 59 | + * @param string $chars - exact string of characters to be added to end of string |
|
| 60 | + * @return string |
|
| 61 | + */ |
|
| 62 | + protected function _append_chars($string = '', $chars = '-') |
|
| 63 | + { |
|
| 64 | + return $this->_remove_chars($string, $chars) . $chars; |
|
| 65 | + } |
|
| 66 | 66 | |
| 67 | 67 | |
| 68 | - |
|
| 69 | - /** |
|
| 70 | - * Gets the HTML IDs of all the inputs |
|
| 71 | - * |
|
| 72 | - * @param bool $add_pound_sign |
|
| 73 | - * @return array |
|
| 74 | - */ |
|
| 75 | - public function get_html_input_ids($add_pound_sign = false) |
|
| 76 | - { |
|
| 77 | - return array($this->get_input()->html_id($add_pound_sign)); |
|
| 78 | - } |
|
| 79 | - |
|
| 80 | - |
|
| 81 | - |
|
| 82 | - /** |
|
| 83 | - * Adds js variables for localization to the $other_js_data. These should be put |
|
| 84 | - * in each form's "other_data" javascript object. |
|
| 85 | - * |
|
| 86 | - * @param array $other_js_data |
|
| 87 | - * @return array |
|
| 88 | - */ |
|
| 89 | - public function get_other_js_data($other_js_data = array()) |
|
| 90 | - { |
|
| 91 | - return $other_js_data; |
|
| 92 | - } |
|
| 93 | - |
|
| 94 | - |
|
| 95 | - |
|
| 96 | - /** |
|
| 97 | - * Opportunity for this display strategy to call wp_enqueue_script and wp_enqueue_style. |
|
| 98 | - * This should be called during wp_enqueue_scripts |
|
| 99 | - */ |
|
| 100 | - public function enqueue_js() |
|
| 101 | - { |
|
| 102 | - } |
|
| 103 | - |
|
| 104 | - |
|
| 105 | - |
|
| 106 | - /** |
|
| 107 | - * returns string like: '<tag' |
|
| 108 | - * |
|
| 109 | - * @param string $tag |
|
| 110 | - * @return string |
|
| 111 | - */ |
|
| 112 | - protected function _opening_tag($tag) |
|
| 113 | - { |
|
| 114 | - $this->_tag = $tag; |
|
| 115 | - return "<{$this->_tag}"; |
|
| 116 | - } |
|
| 117 | - |
|
| 118 | - |
|
| 119 | - |
|
| 120 | - /** |
|
| 121 | - * returns string like: '</tag> |
|
| 122 | - * |
|
| 123 | - * @return string |
|
| 124 | - */ |
|
| 125 | - protected function _closing_tag() |
|
| 126 | - { |
|
| 127 | - return "</{$this->_tag}>"; |
|
| 128 | - } |
|
| 129 | - |
|
| 130 | - |
|
| 131 | - |
|
| 132 | - /** |
|
| 133 | - * returns string like: '/>' |
|
| 134 | - * |
|
| 135 | - * @return string |
|
| 136 | - */ |
|
| 137 | - protected function _close_tag() |
|
| 138 | - { |
|
| 139 | - return '/>'; |
|
| 140 | - } |
|
| 141 | - |
|
| 142 | - |
|
| 143 | - |
|
| 144 | - /** |
|
| 145 | - * returns an array of standard HTML attributes that get added to nearly all inputs, |
|
| 146 | - * where string keys represent named attributes like id, class, etc |
|
| 147 | - * and numeric keys represent single attributes like 'required'. |
|
| 148 | - * Note: this does not include "value" because many inputs (like dropdowns, textareas, and checkboxes) don't use |
|
| 149 | - * it. |
|
| 150 | - * |
|
| 151 | - * @return array |
|
| 152 | - */ |
|
| 153 | - protected function _standard_attributes_array() |
|
| 154 | - { |
|
| 155 | - return array( |
|
| 156 | - 'name' => $this->_input->html_name(), |
|
| 157 | - 'id' => $this->_input->html_id(), |
|
| 158 | - 'class' => $this->_input->html_class(true), |
|
| 159 | - 0 => array('required', $this->_input->required()), |
|
| 160 | - 1 => $this->_input->other_html_attributes(), |
|
| 161 | - 'style' => $this->_input->html_style(), |
|
| 162 | - ); |
|
| 163 | - } |
|
| 164 | - |
|
| 165 | - |
|
| 166 | - |
|
| 167 | - /** |
|
| 168 | - * sets the attributes using the incoming array |
|
| 169 | - * and returns a string of all attributes rendered as valid HTML |
|
| 170 | - * |
|
| 171 | - * @param array $attributes |
|
| 172 | - * @return string |
|
| 173 | - */ |
|
| 174 | - protected function _attributes_string($attributes = array()) |
|
| 175 | - { |
|
| 176 | - $attributes = apply_filters( |
|
| 177 | - 'FHEE__EE_Display_Strategy_Base__attributes_string__attributes', |
|
| 178 | - $attributes, |
|
| 179 | - $this, |
|
| 180 | - $this->_input |
|
| 181 | - ); |
|
| 182 | - $attributes_string = ''; |
|
| 183 | - foreach ($attributes as $attribute => $value) { |
|
| 184 | - if (is_numeric($attribute)) { |
|
| 185 | - $add = true; |
|
| 186 | - if (is_array($value)) { |
|
| 187 | - $attribute = isset($value[0]) ? $value[0] : ''; |
|
| 188 | - $add = isset($value[1]) ? $value[1] : false; |
|
| 189 | - } else { |
|
| 190 | - $attribute = $value; |
|
| 191 | - } |
|
| 192 | - $attributes_string .= $this->_single_attribute($attribute, $add); |
|
| 193 | - } else { |
|
| 194 | - $attributes_string .= $this->_attribute($attribute, $value); |
|
| 195 | - } |
|
| 196 | - } |
|
| 197 | - return $attributes_string; |
|
| 198 | - } |
|
| 199 | - |
|
| 200 | - |
|
| 201 | - |
|
| 202 | - /** |
|
| 203 | - * returns string like: ' attribute="value"' |
|
| 204 | - * returns an empty string if $value is null |
|
| 205 | - * |
|
| 206 | - * @param string $attribute |
|
| 207 | - * @param string $value |
|
| 208 | - * @return string |
|
| 209 | - */ |
|
| 210 | - protected function _attribute($attribute, $value = '') |
|
| 211 | - { |
|
| 212 | - return $value !== null ? " {$attribute}=\"{$value}\"" : ''; |
|
| 213 | - } |
|
| 214 | - |
|
| 215 | - |
|
| 216 | - |
|
| 217 | - /** |
|
| 218 | - * returns string like: ' data-attribute="value"' |
|
| 219 | - * returns an empty string if $value is null |
|
| 220 | - * |
|
| 221 | - * @param string $attribute |
|
| 222 | - * @param string $value |
|
| 223 | - * @return string |
|
| 224 | - */ |
|
| 225 | - protected function _data_attribute($attribute, $value = '') |
|
| 226 | - { |
|
| 227 | - return $value !== null ? " data-{$attribute}=\"{$value}\"" : ''; |
|
| 228 | - } |
|
| 229 | - |
|
| 230 | - |
|
| 231 | - |
|
| 232 | - /** |
|
| 233 | - * returns string like: ' attribute' if $add is true |
|
| 234 | - * |
|
| 235 | - * @param string $attribute |
|
| 236 | - * @param boolean $add |
|
| 237 | - * @return string |
|
| 238 | - */ |
|
| 239 | - protected function _single_attribute($attribute, $add = true) |
|
| 240 | - { |
|
| 241 | - return $add ? " {$attribute}" : ''; |
|
| 242 | - } |
|
| 68 | + |
|
| 69 | + /** |
|
| 70 | + * Gets the HTML IDs of all the inputs |
|
| 71 | + * |
|
| 72 | + * @param bool $add_pound_sign |
|
| 73 | + * @return array |
|
| 74 | + */ |
|
| 75 | + public function get_html_input_ids($add_pound_sign = false) |
|
| 76 | + { |
|
| 77 | + return array($this->get_input()->html_id($add_pound_sign)); |
|
| 78 | + } |
|
| 79 | + |
|
| 80 | + |
|
| 81 | + |
|
| 82 | + /** |
|
| 83 | + * Adds js variables for localization to the $other_js_data. These should be put |
|
| 84 | + * in each form's "other_data" javascript object. |
|
| 85 | + * |
|
| 86 | + * @param array $other_js_data |
|
| 87 | + * @return array |
|
| 88 | + */ |
|
| 89 | + public function get_other_js_data($other_js_data = array()) |
|
| 90 | + { |
|
| 91 | + return $other_js_data; |
|
| 92 | + } |
|
| 93 | + |
|
| 94 | + |
|
| 95 | + |
|
| 96 | + /** |
|
| 97 | + * Opportunity for this display strategy to call wp_enqueue_script and wp_enqueue_style. |
|
| 98 | + * This should be called during wp_enqueue_scripts |
|
| 99 | + */ |
|
| 100 | + public function enqueue_js() |
|
| 101 | + { |
|
| 102 | + } |
|
| 103 | + |
|
| 104 | + |
|
| 105 | + |
|
| 106 | + /** |
|
| 107 | + * returns string like: '<tag' |
|
| 108 | + * |
|
| 109 | + * @param string $tag |
|
| 110 | + * @return string |
|
| 111 | + */ |
|
| 112 | + protected function _opening_tag($tag) |
|
| 113 | + { |
|
| 114 | + $this->_tag = $tag; |
|
| 115 | + return "<{$this->_tag}"; |
|
| 116 | + } |
|
| 117 | + |
|
| 118 | + |
|
| 119 | + |
|
| 120 | + /** |
|
| 121 | + * returns string like: '</tag> |
|
| 122 | + * |
|
| 123 | + * @return string |
|
| 124 | + */ |
|
| 125 | + protected function _closing_tag() |
|
| 126 | + { |
|
| 127 | + return "</{$this->_tag}>"; |
|
| 128 | + } |
|
| 129 | + |
|
| 130 | + |
|
| 131 | + |
|
| 132 | + /** |
|
| 133 | + * returns string like: '/>' |
|
| 134 | + * |
|
| 135 | + * @return string |
|
| 136 | + */ |
|
| 137 | + protected function _close_tag() |
|
| 138 | + { |
|
| 139 | + return '/>'; |
|
| 140 | + } |
|
| 141 | + |
|
| 142 | + |
|
| 143 | + |
|
| 144 | + /** |
|
| 145 | + * returns an array of standard HTML attributes that get added to nearly all inputs, |
|
| 146 | + * where string keys represent named attributes like id, class, etc |
|
| 147 | + * and numeric keys represent single attributes like 'required'. |
|
| 148 | + * Note: this does not include "value" because many inputs (like dropdowns, textareas, and checkboxes) don't use |
|
| 149 | + * it. |
|
| 150 | + * |
|
| 151 | + * @return array |
|
| 152 | + */ |
|
| 153 | + protected function _standard_attributes_array() |
|
| 154 | + { |
|
| 155 | + return array( |
|
| 156 | + 'name' => $this->_input->html_name(), |
|
| 157 | + 'id' => $this->_input->html_id(), |
|
| 158 | + 'class' => $this->_input->html_class(true), |
|
| 159 | + 0 => array('required', $this->_input->required()), |
|
| 160 | + 1 => $this->_input->other_html_attributes(), |
|
| 161 | + 'style' => $this->_input->html_style(), |
|
| 162 | + ); |
|
| 163 | + } |
|
| 164 | + |
|
| 165 | + |
|
| 166 | + |
|
| 167 | + /** |
|
| 168 | + * sets the attributes using the incoming array |
|
| 169 | + * and returns a string of all attributes rendered as valid HTML |
|
| 170 | + * |
|
| 171 | + * @param array $attributes |
|
| 172 | + * @return string |
|
| 173 | + */ |
|
| 174 | + protected function _attributes_string($attributes = array()) |
|
| 175 | + { |
|
| 176 | + $attributes = apply_filters( |
|
| 177 | + 'FHEE__EE_Display_Strategy_Base__attributes_string__attributes', |
|
| 178 | + $attributes, |
|
| 179 | + $this, |
|
| 180 | + $this->_input |
|
| 181 | + ); |
|
| 182 | + $attributes_string = ''; |
|
| 183 | + foreach ($attributes as $attribute => $value) { |
|
| 184 | + if (is_numeric($attribute)) { |
|
| 185 | + $add = true; |
|
| 186 | + if (is_array($value)) { |
|
| 187 | + $attribute = isset($value[0]) ? $value[0] : ''; |
|
| 188 | + $add = isset($value[1]) ? $value[1] : false; |
|
| 189 | + } else { |
|
| 190 | + $attribute = $value; |
|
| 191 | + } |
|
| 192 | + $attributes_string .= $this->_single_attribute($attribute, $add); |
|
| 193 | + } else { |
|
| 194 | + $attributes_string .= $this->_attribute($attribute, $value); |
|
| 195 | + } |
|
| 196 | + } |
|
| 197 | + return $attributes_string; |
|
| 198 | + } |
|
| 199 | + |
|
| 200 | + |
|
| 201 | + |
|
| 202 | + /** |
|
| 203 | + * returns string like: ' attribute="value"' |
|
| 204 | + * returns an empty string if $value is null |
|
| 205 | + * |
|
| 206 | + * @param string $attribute |
|
| 207 | + * @param string $value |
|
| 208 | + * @return string |
|
| 209 | + */ |
|
| 210 | + protected function _attribute($attribute, $value = '') |
|
| 211 | + { |
|
| 212 | + return $value !== null ? " {$attribute}=\"{$value}\"" : ''; |
|
| 213 | + } |
|
| 214 | + |
|
| 215 | + |
|
| 216 | + |
|
| 217 | + /** |
|
| 218 | + * returns string like: ' data-attribute="value"' |
|
| 219 | + * returns an empty string if $value is null |
|
| 220 | + * |
|
| 221 | + * @param string $attribute |
|
| 222 | + * @param string $value |
|
| 223 | + * @return string |
|
| 224 | + */ |
|
| 225 | + protected function _data_attribute($attribute, $value = '') |
|
| 226 | + { |
|
| 227 | + return $value !== null ? " data-{$attribute}=\"{$value}\"" : ''; |
|
| 228 | + } |
|
| 229 | + |
|
| 230 | + |
|
| 231 | + |
|
| 232 | + /** |
|
| 233 | + * returns string like: ' attribute' if $add is true |
|
| 234 | + * |
|
| 235 | + * @param string $attribute |
|
| 236 | + * @param boolean $add |
|
| 237 | + * @return string |
|
| 238 | + */ |
|
| 239 | + protected function _single_attribute($attribute, $add = true) |
|
| 240 | + { |
|
| 241 | + return $add ? " {$attribute}" : ''; |
|
| 242 | + } |
|
| 243 | 243 | |
| 244 | 244 | } |
| 245 | 245 | \ No newline at end of file |
@@ -9,40 +9,40 @@ |
||
| 9 | 9 | abstract class EE_Form_Input_Strategy_Base |
| 10 | 10 | { |
| 11 | 11 | |
| 12 | - /** |
|
| 13 | - * Form Input to display |
|
| 14 | - * |
|
| 15 | - * @var EE_Form_Input_Base |
|
| 16 | - */ |
|
| 17 | - protected $_input; |
|
| 12 | + /** |
|
| 13 | + * Form Input to display |
|
| 14 | + * |
|
| 15 | + * @var EE_Form_Input_Base |
|
| 16 | + */ |
|
| 17 | + protected $_input; |
|
| 18 | 18 | |
| 19 | 19 | |
| 20 | 20 | |
| 21 | - public function __construct() |
|
| 22 | - { |
|
| 23 | - } |
|
| 21 | + public function __construct() |
|
| 22 | + { |
|
| 23 | + } |
|
| 24 | 24 | |
| 25 | 25 | |
| 26 | 26 | |
| 27 | - /** |
|
| 28 | - * The form input on which this strategy is to perform |
|
| 29 | - * |
|
| 30 | - * @param EE_Form_Input_Base $form_input |
|
| 31 | - */ |
|
| 32 | - public function _construct_finalize(EE_Form_Input_Base $form_input) |
|
| 33 | - { |
|
| 34 | - $this->_input = $form_input; |
|
| 35 | - } |
|
| 27 | + /** |
|
| 28 | + * The form input on which this strategy is to perform |
|
| 29 | + * |
|
| 30 | + * @param EE_Form_Input_Base $form_input |
|
| 31 | + */ |
|
| 32 | + public function _construct_finalize(EE_Form_Input_Base $form_input) |
|
| 33 | + { |
|
| 34 | + $this->_input = $form_input; |
|
| 35 | + } |
|
| 36 | 36 | |
| 37 | 37 | |
| 38 | 38 | |
| 39 | - /** |
|
| 40 | - * Gets this strategy's input |
|
| 41 | - * |
|
| 42 | - * @return EE_Form_Input_Base |
|
| 43 | - */ |
|
| 44 | - public function get_input() |
|
| 45 | - { |
|
| 46 | - return $this->_input; |
|
| 47 | - } |
|
| 39 | + /** |
|
| 40 | + * Gets this strategy's input |
|
| 41 | + * |
|
| 42 | + * @return EE_Form_Input_Base |
|
| 43 | + */ |
|
| 44 | + public function get_input() |
|
| 45 | + { |
|
| 46 | + return $this->_input; |
|
| 47 | + } |
|
| 48 | 48 | } |
| 49 | 49 | \ No newline at end of file |
@@ -1,5 +1,5 @@ discard block |
||
| 1 | -<?php if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) { |
|
| 2 | - exit( 'No direct script access allowed' ); |
|
| 1 | +<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { |
|
| 2 | + exit('No direct script access allowed'); |
|
| 3 | 3 | } |
| 4 | 4 | /** |
| 5 | 5 | * Event Espresso |
@@ -37,9 +37,9 @@ discard block |
||
| 37 | 37 | * date_format and the second value is the time format |
| 38 | 38 | * @return EE_Question |
| 39 | 39 | */ |
| 40 | - public static function new_instance( $props_n_values = array(), $timezone = null, $date_formats = array() ) { |
|
| 41 | - $has_object = parent::_check_for_object( $props_n_values, __CLASS__, $timezone, $date_formats ); |
|
| 42 | - return $has_object ? $has_object : new self( $props_n_values, false, $timezone, $date_formats ); |
|
| 40 | + public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array()) { |
|
| 41 | + $has_object = parent::_check_for_object($props_n_values, __CLASS__, $timezone, $date_formats); |
|
| 42 | + return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats); |
|
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 | |
@@ -50,8 +50,8 @@ discard block |
||
| 50 | 50 | * the website will be used. |
| 51 | 51 | * @return EE_Question |
| 52 | 52 | */ |
| 53 | - public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) { |
|
| 54 | - return new self( $props_n_values, TRUE, $timezone ); |
|
| 53 | + public static function new_instance_from_db($props_n_values = array(), $timezone = null) { |
|
| 54 | + return new self($props_n_values, TRUE, $timezone); |
|
| 55 | 55 | } |
| 56 | 56 | |
| 57 | 57 | |
@@ -62,8 +62,8 @@ discard block |
||
| 62 | 62 | * @access public |
| 63 | 63 | * @param string $QST_display_text |
| 64 | 64 | */ |
| 65 | - public function set_display_text( $QST_display_text = '' ) { |
|
| 66 | - $this->set( 'QST_display_text', $QST_display_text ); |
|
| 65 | + public function set_display_text($QST_display_text = '') { |
|
| 66 | + $this->set('QST_display_text', $QST_display_text); |
|
| 67 | 67 | } |
| 68 | 68 | |
| 69 | 69 | |
@@ -74,8 +74,8 @@ discard block |
||
| 74 | 74 | * @access public |
| 75 | 75 | * @param string $QST_admin_label |
| 76 | 76 | */ |
| 77 | - public function set_admin_label( $QST_admin_label = '' ) { |
|
| 78 | - $this->set( 'QST_admin_label', $QST_admin_label ); |
|
| 77 | + public function set_admin_label($QST_admin_label = '') { |
|
| 78 | + $this->set('QST_admin_label', $QST_admin_label); |
|
| 79 | 79 | } |
| 80 | 80 | |
| 81 | 81 | |
@@ -86,8 +86,8 @@ discard block |
||
| 86 | 86 | * @access public |
| 87 | 87 | * @param mixed $QST_system |
| 88 | 88 | */ |
| 89 | - public function set_system_ID( $QST_system = '' ) { |
|
| 90 | - $this->set( 'QST_system', $QST_system ); |
|
| 89 | + public function set_system_ID($QST_system = '') { |
|
| 90 | + $this->set('QST_system', $QST_system); |
|
| 91 | 91 | } |
| 92 | 92 | |
| 93 | 93 | |
@@ -98,8 +98,8 @@ discard block |
||
| 98 | 98 | * @access public |
| 99 | 99 | * @param string $QST_type |
| 100 | 100 | */ |
| 101 | - public function set_question_type( $QST_type = '' ) { |
|
| 102 | - $this->set( 'QST_type', $QST_type ); |
|
| 101 | + public function set_question_type($QST_type = '') { |
|
| 102 | + $this->set('QST_type', $QST_type); |
|
| 103 | 103 | } |
| 104 | 104 | |
| 105 | 105 | |
@@ -110,8 +110,8 @@ discard block |
||
| 110 | 110 | * @access public |
| 111 | 111 | * @param bool $QST_required |
| 112 | 112 | */ |
| 113 | - public function set_required( $QST_required = FALSE ) { |
|
| 114 | - $this->set( 'QST_required', $QST_required ); |
|
| 113 | + public function set_required($QST_required = FALSE) { |
|
| 114 | + $this->set('QST_required', $QST_required); |
|
| 115 | 115 | } |
| 116 | 116 | |
| 117 | 117 | |
@@ -122,8 +122,8 @@ discard block |
||
| 122 | 122 | * @access public |
| 123 | 123 | * @param string $QST_required_text |
| 124 | 124 | */ |
| 125 | - public function set_required_text( $QST_required_text = '' ) { |
|
| 126 | - $this->set( 'QST_required_text', $QST_required_text ); |
|
| 125 | + public function set_required_text($QST_required_text = '') { |
|
| 126 | + $this->set('QST_required_text', $QST_required_text); |
|
| 127 | 127 | } |
| 128 | 128 | |
| 129 | 129 | |
@@ -134,8 +134,8 @@ discard block |
||
| 134 | 134 | * @access public |
| 135 | 135 | * @param int $QST_order |
| 136 | 136 | */ |
| 137 | - public function set_order( $QST_order = 0 ) { |
|
| 138 | - $this->set( 'QST_order', $QST_order ); |
|
| 137 | + public function set_order($QST_order = 0) { |
|
| 138 | + $this->set('QST_order', $QST_order); |
|
| 139 | 139 | } |
| 140 | 140 | |
| 141 | 141 | |
@@ -146,8 +146,8 @@ discard block |
||
| 146 | 146 | * @access public |
| 147 | 147 | * @param bool $QST_admin_only |
| 148 | 148 | */ |
| 149 | - public function set_admin_only( $QST_admin_only = FALSE ) { |
|
| 150 | - $this->set( 'QST_admin_only', $QST_admin_only ); |
|
| 149 | + public function set_admin_only($QST_admin_only = FALSE) { |
|
| 150 | + $this->set('QST_admin_only', $QST_admin_only); |
|
| 151 | 151 | } |
| 152 | 152 | |
| 153 | 153 | |
@@ -158,8 +158,8 @@ discard block |
||
| 158 | 158 | * @access public |
| 159 | 159 | * @param int $QST_wp_user |
| 160 | 160 | */ |
| 161 | - public function set_wp_user( $QST_wp_user = 1 ) { |
|
| 162 | - $this->set( 'QST_wp_user', $QST_wp_user ); |
|
| 161 | + public function set_wp_user($QST_wp_user = 1) { |
|
| 162 | + $this->set('QST_wp_user', $QST_wp_user); |
|
| 163 | 163 | } |
| 164 | 164 | |
| 165 | 165 | |
@@ -175,8 +175,8 @@ discard block |
||
| 175 | 175 | * @access public |
| 176 | 176 | * @param bool $QST_deleted |
| 177 | 177 | */ |
| 178 | - public function set_deleted( $QST_deleted = FALSE ) { |
|
| 179 | - $this->set( 'QST_deleted', $QST_deleted ); |
|
| 178 | + public function set_deleted($QST_deleted = FALSE) { |
|
| 179 | + $this->set('QST_deleted', $QST_deleted); |
|
| 180 | 180 | } |
| 181 | 181 | |
| 182 | 182 | |
@@ -187,7 +187,7 @@ discard block |
||
| 187 | 187 | * @return string |
| 188 | 188 | */ |
| 189 | 189 | public function display_text() { |
| 190 | - return $this->get( 'QST_display_text' ); |
|
| 190 | + return $this->get('QST_display_text'); |
|
| 191 | 191 | } |
| 192 | 192 | |
| 193 | 193 | |
@@ -198,7 +198,7 @@ discard block |
||
| 198 | 198 | * @return string |
| 199 | 199 | */ |
| 200 | 200 | public function admin_label() { |
| 201 | - return $this->get( 'QST_admin_label' ); |
|
| 201 | + return $this->get('QST_admin_label'); |
|
| 202 | 202 | } |
| 203 | 203 | |
| 204 | 204 | |
@@ -209,7 +209,7 @@ discard block |
||
| 209 | 209 | * @return string |
| 210 | 210 | */ |
| 211 | 211 | public function system_ID() { |
| 212 | - return $this->get( 'QST_system' ); |
|
| 212 | + return $this->get('QST_system'); |
|
| 213 | 213 | } |
| 214 | 214 | |
| 215 | 215 | |
@@ -220,7 +220,7 @@ discard block |
||
| 220 | 220 | * @return boolean |
| 221 | 221 | */ |
| 222 | 222 | public function required() { |
| 223 | - return $this->get( 'QST_required' ); |
|
| 223 | + return $this->get('QST_required'); |
|
| 224 | 224 | } |
| 225 | 225 | |
| 226 | 226 | |
@@ -232,7 +232,7 @@ discard block |
||
| 232 | 232 | * @return string |
| 233 | 233 | */ |
| 234 | 234 | public function required_text() { |
| 235 | - return $this->get( 'QST_required_text' ); |
|
| 235 | + return $this->get('QST_required_text'); |
|
| 236 | 236 | } |
| 237 | 237 | |
| 238 | 238 | |
@@ -243,7 +243,7 @@ discard block |
||
| 243 | 243 | * @return string |
| 244 | 244 | */ |
| 245 | 245 | public function type() { |
| 246 | - return $this->get( 'QST_type' ); |
|
| 246 | + return $this->get('QST_type'); |
|
| 247 | 247 | } |
| 248 | 248 | |
| 249 | 249 | |
@@ -255,7 +255,7 @@ discard block |
||
| 255 | 255 | * @return int |
| 256 | 256 | */ |
| 257 | 257 | public function order() { |
| 258 | - return $this->get( 'QST_order' ); |
|
| 258 | + return $this->get('QST_order'); |
|
| 259 | 259 | } |
| 260 | 260 | |
| 261 | 261 | |
@@ -267,7 +267,7 @@ discard block |
||
| 267 | 267 | * @return boolean |
| 268 | 268 | */ |
| 269 | 269 | public function admin_only() { |
| 270 | - return $this->get( 'QST_admin_only' ); |
|
| 270 | + return $this->get('QST_admin_only'); |
|
| 271 | 271 | } |
| 272 | 272 | |
| 273 | 273 | |
@@ -278,7 +278,7 @@ discard block |
||
| 278 | 278 | * @return int |
| 279 | 279 | */ |
| 280 | 280 | public function wp_user() { |
| 281 | - return $this->get( 'QST_wp_user' ); |
|
| 281 | + return $this->get('QST_wp_user'); |
|
| 282 | 282 | } |
| 283 | 283 | |
| 284 | 284 | |
@@ -289,7 +289,7 @@ discard block |
||
| 289 | 289 | * @return boolean |
| 290 | 290 | */ |
| 291 | 291 | public function deleted() { |
| 292 | - return $this->get( 'QST_deleted' ); |
|
| 292 | + return $this->get('QST_deleted'); |
|
| 293 | 293 | } |
| 294 | 294 | |
| 295 | 295 | |
@@ -299,7 +299,7 @@ discard block |
||
| 299 | 299 | * @return EE_Answer[] |
| 300 | 300 | */ |
| 301 | 301 | public function answers() { |
| 302 | - return $this->get_many_related( 'Answer' ); |
|
| 302 | + return $this->get_many_related('Answer'); |
|
| 303 | 303 | } |
| 304 | 304 | |
| 305 | 305 | |
@@ -309,7 +309,7 @@ discard block |
||
| 309 | 309 | * @return boolean true = has answers, false = no answers. |
| 310 | 310 | */ |
| 311 | 311 | public function has_answers() { |
| 312 | - return $this->count_related( 'Answer' ) > 0 ? TRUE : FALSE; |
|
| 312 | + return $this->count_related('Answer') > 0 ? TRUE : FALSE; |
|
| 313 | 313 | } |
| 314 | 314 | |
| 315 | 315 | |
@@ -319,7 +319,7 @@ discard block |
||
| 319 | 319 | * @return EE_Question_Group[] |
| 320 | 320 | */ |
| 321 | 321 | public function question_groups() { |
| 322 | - return $this->get_many_related( 'Question_Group' ); |
|
| 322 | + return $this->get_many_related('Question_Group'); |
|
| 323 | 323 | } |
| 324 | 324 | |
| 325 | 325 | |
@@ -333,24 +333,24 @@ discard block |
||
| 333 | 333 | * whether it was trashed or not. |
| 334 | 334 | * @return EE_Question_Option[] |
| 335 | 335 | */ |
| 336 | - public function options( $notDeletedOptionsOnly = TRUE, $selected_value_to_always_include = NULL ) { |
|
| 337 | - if ( ! $this->ID() ) { |
|
| 336 | + public function options($notDeletedOptionsOnly = TRUE, $selected_value_to_always_include = NULL) { |
|
| 337 | + if ( ! $this->ID()) { |
|
| 338 | 338 | return array(); |
| 339 | 339 | } |
| 340 | 340 | $query_params = array(); |
| 341 | - if ( $selected_value_to_always_include ) { |
|
| 342 | - if ( is_array( $selected_value_to_always_include ) ) { |
|
| 343 | - $query_params[ 0 ][ 'OR*options-query' ][ 'QSO_value' ] = array( 'IN', $selected_value_to_always_include ); |
|
| 341 | + if ($selected_value_to_always_include) { |
|
| 342 | + if (is_array($selected_value_to_always_include)) { |
|
| 343 | + $query_params[0]['OR*options-query']['QSO_value'] = array('IN', $selected_value_to_always_include); |
|
| 344 | 344 | } else { |
| 345 | - $query_params[ 0 ][ 'OR*options-query' ][ 'QSO_value' ] = $selected_value_to_always_include; |
|
| 345 | + $query_params[0]['OR*options-query']['QSO_value'] = $selected_value_to_always_include; |
|
| 346 | 346 | } |
| 347 | 347 | } |
| 348 | - if ( $notDeletedOptionsOnly ) { |
|
| 349 | - $query_params[ 0 ][ 'OR*options-query' ][ 'QSO_deleted' ] = FALSE; |
|
| 348 | + if ($notDeletedOptionsOnly) { |
|
| 349 | + $query_params[0]['OR*options-query']['QSO_deleted'] = FALSE; |
|
| 350 | 350 | } |
| 351 | 351 | //order by QSO_order |
| 352 | - $query_params[ 'order_by' ] = array( 'QSO_order' => 'ASC' ); |
|
| 353 | - return $this->get_many_related( 'Question_Option', $query_params ); |
|
| 352 | + $query_params['order_by'] = array('QSO_order' => 'ASC'); |
|
| 353 | + return $this->get_many_related('Question_Option', $query_params); |
|
| 354 | 354 | } |
| 355 | 355 | |
| 356 | 356 | |
@@ -360,7 +360,7 @@ discard block |
||
| 360 | 360 | * @return \EE_Question_Option[] |
| 361 | 361 | */ |
| 362 | 362 | public function temp_options() { |
| 363 | - return $this->_model_relations[ 'Question_Option' ]; |
|
| 363 | + return $this->_model_relations['Question_Option']; |
|
| 364 | 364 | } |
| 365 | 365 | |
| 366 | 366 | |
@@ -371,8 +371,8 @@ discard block |
||
| 371 | 371 | * @param EE_Question_Option $option |
| 372 | 372 | * @return boolean success |
| 373 | 373 | */ |
| 374 | - public function add_option( EE_Question_Option $option ) { |
|
| 375 | - return $this->_add_relation_to( $option, 'Question_Option' ); |
|
| 374 | + public function add_option(EE_Question_Option $option) { |
|
| 375 | + return $this->_add_relation_to($option, 'Question_Option'); |
|
| 376 | 376 | } |
| 377 | 377 | |
| 378 | 378 | |
@@ -382,8 +382,8 @@ discard block |
||
| 382 | 382 | * @param EE_Question_Option $option |
| 383 | 383 | * @return boolean success |
| 384 | 384 | */ |
| 385 | - public function add_temp_option( EE_Question_Option $option ) { |
|
| 386 | - $this->_model_relations[ 'Question_Option' ][ ] = $option; |
|
| 385 | + public function add_temp_option(EE_Question_Option $option) { |
|
| 386 | + $this->_model_relations['Question_Option'][] = $option; |
|
| 387 | 387 | return TRUE; |
| 388 | 388 | } |
| 389 | 389 | |
@@ -394,8 +394,8 @@ discard block |
||
| 394 | 394 | * @param EE_Question_Option $option |
| 395 | 395 | * @return boolean success |
| 396 | 396 | */ |
| 397 | - public function remove_option( EE_Question_Option $option ) { |
|
| 398 | - return $this->_remove_relation_to( $option, 'Question_Option' ); |
|
| 397 | + public function remove_option(EE_Question_Option $option) { |
|
| 398 | + return $this->_remove_relation_to($option, 'Question_Option'); |
|
| 399 | 399 | } |
| 400 | 400 | |
| 401 | 401 | |
@@ -404,8 +404,8 @@ discard block |
||
| 404 | 404 | * @return bool |
| 405 | 405 | */ |
| 406 | 406 | public function is_system_question() { |
| 407 | - $system_ID = $this->get( 'QST_system' ); |
|
| 408 | - return ! empty( $system_ID ) ? TRUE : FALSE; |
|
| 407 | + $system_ID = $this->get('QST_system'); |
|
| 408 | + return ! empty($system_ID) ? TRUE : FALSE; |
|
| 409 | 409 | } |
| 410 | 410 | |
| 411 | 411 | |
@@ -418,8 +418,8 @@ discard block |
||
| 418 | 418 | */ |
| 419 | 419 | public function set_order_to_latest() { |
| 420 | 420 | $latest_order = $this->get_model()->get_latest_question_order(); |
| 421 | - $latest_order ++; |
|
| 422 | - $this->set( 'QST_order', $latest_order ); |
|
| 421 | + $latest_order++; |
|
| 422 | + $this->set('QST_order', $latest_order); |
|
| 423 | 423 | } |
| 424 | 424 | |
| 425 | 425 | |
@@ -438,20 +438,20 @@ discard block |
||
| 438 | 438 | * Duplicates this question and its question options |
| 439 | 439 | * @return \EE_Question |
| 440 | 440 | */ |
| 441 | - public function duplicate( $options = array() ) { |
|
| 441 | + public function duplicate($options = array()) { |
|
| 442 | 442 | $new_question = clone $this; |
| 443 | - $new_question->set( 'QST_ID', null ); |
|
| 444 | - $new_question->set_display_text( sprintf( __( '%s **Duplicate**', 'event_espresso' ), $this->display_text() ) ); |
|
| 445 | - $new_question->set_admin_label( sprintf( __( '%s **Duplicate**', 'event_espresso' ), $this->admin_label() ) ); |
|
| 446 | - $new_question->set_system_ID( null ); |
|
| 447 | - $new_question->set_wp_user( get_current_user_id() ); |
|
| 443 | + $new_question->set('QST_ID', null); |
|
| 444 | + $new_question->set_display_text(sprintf(__('%s **Duplicate**', 'event_espresso'), $this->display_text())); |
|
| 445 | + $new_question->set_admin_label(sprintf(__('%s **Duplicate**', 'event_espresso'), $this->admin_label())); |
|
| 446 | + $new_question->set_system_ID(null); |
|
| 447 | + $new_question->set_wp_user(get_current_user_id()); |
|
| 448 | 448 | //if we're duplicating a trashed question, assume we don't want the new one to be trashed |
| 449 | - $new_question->set_deleted( false ); |
|
| 449 | + $new_question->set_deleted(false); |
|
| 450 | 450 | $success = $new_question->save(); |
| 451 | - if( $success ) { |
|
| 451 | + if ($success) { |
|
| 452 | 452 | //we don't totally want to duplicate the question options, because we want them to be for the NEW question |
| 453 | - foreach( $this->options() as $question_option ) { |
|
| 454 | - $question_option->duplicate( array( 'QST_ID' => $new_question->ID() ) ); |
|
| 453 | + foreach ($this->options() as $question_option) { |
|
| 454 | + $question_option->duplicate(array('QST_ID' => $new_question->ID())); |
|
| 455 | 455 | } |
| 456 | 456 | return $new_question; |
| 457 | 457 | } else { |
@@ -464,7 +464,7 @@ discard block |
||
| 464 | 464 | * @return int|float |
| 465 | 465 | */ |
| 466 | 466 | public function max() { |
| 467 | - return $this->get( 'QST_max' ); |
|
| 467 | + return $this->get('QST_max'); |
|
| 468 | 468 | } |
| 469 | 469 | |
| 470 | 470 | /** |
@@ -472,8 +472,8 @@ discard block |
||
| 472 | 472 | * @param int|float $new_max |
| 473 | 473 | * @return void |
| 474 | 474 | */ |
| 475 | - public function set_max( $new_max ) { |
|
| 476 | - $this->set( 'QST_max', $new_max ); |
|
| 475 | + public function set_max($new_max) { |
|
| 476 | + $this->set('QST_max', $new_max); |
|
| 477 | 477 | } |
| 478 | 478 | |
| 479 | 479 | |
@@ -485,7 +485,7 @@ discard block |
||
| 485 | 485 | * @param array $input_constructor_args |
| 486 | 486 | * @return EE_Form_Input_Base |
| 487 | 487 | */ |
| 488 | - public function generate_form_input( $registration = null, $answer = null, $input_constructor_args = array() ) { |
|
| 488 | + public function generate_form_input($registration = null, $answer = null, $input_constructor_args = array()) { |
|
| 489 | 489 | $identifier = $this->is_system_question() ? $this->system_ID() : $this->ID(); |
| 490 | 490 | |
| 491 | 491 | $input_constructor_args = array_merge( |
@@ -496,29 +496,29 @@ discard block |
||
| 496 | 496 | ), |
| 497 | 497 | $input_constructor_args |
| 498 | 498 | ); |
| 499 | - if( ! $answer instanceof EE_Answer && $registration instanceof EE_Registration ) { |
|
| 500 | - $answer = EEM_Answer::instance()->get_registration_question_answer_object( $registration, $this->ID() ); |
|
| 499 | + if ( ! $answer instanceof EE_Answer && $registration instanceof EE_Registration) { |
|
| 500 | + $answer = EEM_Answer::instance()->get_registration_question_answer_object($registration, $this->ID()); |
|
| 501 | 501 | } |
| 502 | 502 | // has this question been answered ? |
| 503 | - if ( $answer instanceof EE_Answer |
|
| 503 | + if ($answer instanceof EE_Answer |
|
| 504 | 504 | && $answer->value() !== '' |
| 505 | 505 | ) { |
| 506 | 506 | //answer gets htmlspecialchars called on it, undo that please |
| 507 | 507 | //because the form input's display strategy may call esc_attr too |
| 508 | 508 | //which also does html special characters |
| 509 | 509 | $values_with_html_special_chars = $answer->value(); |
| 510 | - if( is_array( $values_with_html_special_chars ) ) { |
|
| 511 | - $default_value = array_map( 'htmlspecialchars_decode', $values_with_html_special_chars ); |
|
| 510 | + if (is_array($values_with_html_special_chars)) { |
|
| 511 | + $default_value = array_map('htmlspecialchars_decode', $values_with_html_special_chars); |
|
| 512 | 512 | } else { |
| 513 | - $default_value = htmlspecialchars_decode( $values_with_html_special_chars ); |
|
| 513 | + $default_value = htmlspecialchars_decode($values_with_html_special_chars); |
|
| 514 | 514 | } |
| 515 | 515 | $input_constructor_args['default'] = $default_value; |
| 516 | 516 | } |
| 517 | - $max_max_for_question = EEM_Question::instance()->absolute_max_for_system_question( $this->system_ID() ); |
|
| 518 | - if( EEM_Question::instance()->question_type_is_in_category( $this->type(), 'text' ) ) { |
|
| 519 | - $input_constructor_args[ 'validation_strategies' ][] = new EE_Max_Length_Validation_Strategy( |
|
| 517 | + $max_max_for_question = EEM_Question::instance()->absolute_max_for_system_question($this->system_ID()); |
|
| 518 | + if (EEM_Question::instance()->question_type_is_in_category($this->type(), 'text')) { |
|
| 519 | + $input_constructor_args['validation_strategies'][] = new EE_Max_Length_Validation_Strategy( |
|
| 520 | 520 | null, |
| 521 | - min( $max_max_for_question, $this->max() ) |
|
| 521 | + min($max_max_for_question, $this->max()) |
|
| 522 | 522 | ); |
| 523 | 523 | } |
| 524 | 524 | $input_constructor_args = apply_filters( |
@@ -530,22 +530,22 @@ discard block |
||
| 530 | 530 | ); |
| 531 | 531 | |
| 532 | 532 | $result = null; |
| 533 | - switch ( $this->type() ) { |
|
| 533 | + switch ($this->type()) { |
|
| 534 | 534 | // Text |
| 535 | 535 | case EEM_Question::QST_type_text : |
| 536 | - $result = new EE_Text_Input( $input_constructor_args ); |
|
| 536 | + $result = new EE_Text_Input($input_constructor_args); |
|
| 537 | 537 | break; |
| 538 | 538 | // Textarea |
| 539 | 539 | case EEM_Question::QST_type_textarea : |
| 540 | - $result = new EE_Text_Area_Input( $input_constructor_args ); |
|
| 540 | + $result = new EE_Text_Area_Input($input_constructor_args); |
|
| 541 | 541 | break; |
| 542 | 542 | // Radio Buttons |
| 543 | 543 | case EEM_Question::QST_type_radio : |
| 544 | - $result = new EE_Radio_Button_Input( $this->options(), $input_constructor_args ); |
|
| 544 | + $result = new EE_Radio_Button_Input($this->options(), $input_constructor_args); |
|
| 545 | 545 | break; |
| 546 | 546 | // Dropdown |
| 547 | 547 | case EEM_Question::QST_type_dropdown : |
| 548 | - $result = new EE_Select_Input( $this->options(), $input_constructor_args ); |
|
| 548 | + $result = new EE_Select_Input($this->options(), $input_constructor_args); |
|
| 549 | 549 | break; |
| 550 | 550 | // State Dropdown |
| 551 | 551 | case EEM_Question::QST_type_state : |
@@ -556,7 +556,7 @@ discard block |
||
| 556 | 556 | $registration, |
| 557 | 557 | $answer |
| 558 | 558 | ); |
| 559 | - $result = new EE_State_Select_Input( $state_options, $input_constructor_args ); |
|
| 559 | + $result = new EE_State_Select_Input($state_options, $input_constructor_args); |
|
| 560 | 560 | break; |
| 561 | 561 | // Country Dropdown |
| 562 | 562 | case EEM_Question::QST_type_country : |
@@ -567,47 +567,47 @@ discard block |
||
| 567 | 567 | $registration, |
| 568 | 568 | $answer |
| 569 | 569 | ); |
| 570 | - $result = new EE_Country_Select_Input( $country_options, $input_constructor_args ); |
|
| 570 | + $result = new EE_Country_Select_Input($country_options, $input_constructor_args); |
|
| 571 | 571 | break; |
| 572 | 572 | // Checkboxes |
| 573 | 573 | case EEM_Question::QST_type_checkbox : |
| 574 | - $result = new EE_Checkbox_Multi_Input( $this->options(), $input_constructor_args ); |
|
| 574 | + $result = new EE_Checkbox_Multi_Input($this->options(), $input_constructor_args); |
|
| 575 | 575 | break; |
| 576 | 576 | // Date |
| 577 | 577 | case EEM_Question::QST_type_date : |
| 578 | - $result = new EE_Datepicker_Input( $input_constructor_args ); |
|
| 578 | + $result = new EE_Datepicker_Input($input_constructor_args); |
|
| 579 | 579 | break; |
| 580 | 580 | case EEM_Question::QST_type_html_textarea : |
| 581 | - $input_constructor_args[ 'validation_strategies' ][] = new EE_Simple_HTML_Validation_Strategy(); |
|
| 582 | - $result = new EE_Text_Area_Input( $input_constructor_args ); |
|
| 583 | - $result->remove_validation_strategy( 'EE_Plaintext_Validation_Strategy' ); |
|
| 581 | + $input_constructor_args['validation_strategies'][] = new EE_Simple_HTML_Validation_Strategy(); |
|
| 582 | + $result = new EE_Text_Area_Input($input_constructor_args); |
|
| 583 | + $result->remove_validation_strategy('EE_Plaintext_Validation_Strategy'); |
|
| 584 | 584 | break; |
| 585 | 585 | case EEM_Question::QST_type_email : |
| 586 | - $result = new EE_Email_Input( $input_constructor_args ); |
|
| 586 | + $result = new EE_Email_Input($input_constructor_args); |
|
| 587 | 587 | break; |
| 588 | 588 | case EEM_Question::QST_type_us_phone : |
| 589 | - $result = new EE_Phone_Input( $input_constructor_args ); |
|
| 589 | + $result = new EE_Phone_Input($input_constructor_args); |
|
| 590 | 590 | break; |
| 591 | 591 | case EEM_Question::QST_type_int : |
| 592 | - $result = new EE_Integer_Input( $input_constructor_args ); |
|
| 592 | + $result = new EE_Integer_Input($input_constructor_args); |
|
| 593 | 593 | break; |
| 594 | 594 | case EEM_Question::QST_type_decimal : |
| 595 | - $result = new EE_Float_Input( $input_constructor_args ); |
|
| 595 | + $result = new EE_Float_Input($input_constructor_args); |
|
| 596 | 596 | break; |
| 597 | 597 | case EEM_Question::QST_type_url : |
| 598 | - $input_constructor_args[ 'validation_strategies' ][] = new EE_URL_Validation_Strategy(); |
|
| 599 | - $result = new EE_Text_Input( $input_constructor_args ); |
|
| 598 | + $input_constructor_args['validation_strategies'][] = new EE_URL_Validation_Strategy(); |
|
| 599 | + $result = new EE_Text_Input($input_constructor_args); |
|
| 600 | 600 | break; |
| 601 | 601 | case EEM_Question::QST_type_year : |
| 602 | 602 | $result = new EE_Year_Input( |
| 603 | 603 | $input_constructor_args, |
| 604 | - apply_filters( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__year_question__four_digit', true, $this ), |
|
| 605 | - apply_filters( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__year_question__early_range', 100, $this ), |
|
| 606 | - apply_filters( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__year_question__end_range', 100, $this ) |
|
| 604 | + apply_filters('FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__year_question__four_digit', true, $this), |
|
| 605 | + apply_filters('FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__year_question__early_range', 100, $this), |
|
| 606 | + apply_filters('FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__year_question__end_range', 100, $this) |
|
| 607 | 607 | ); |
| 608 | 608 | break; |
| 609 | 609 | case EEM_Question::QST_type_multi_select : |
| 610 | - $result = new EE_Select_Multiple_Input( $this->options(), $input_constructor_args ); |
|
| 610 | + $result = new EE_Select_Multiple_Input($this->options(), $input_constructor_args); |
|
| 611 | 611 | break; |
| 612 | 612 | // fallback |
| 613 | 613 | default : |
@@ -618,12 +618,12 @@ discard block |
||
| 618 | 618 | $this, |
| 619 | 619 | $input_constructor_args |
| 620 | 620 | ); |
| 621 | - if( ! $default_input ){ |
|
| 622 | - $default_input = new EE_Text_Input( $input_constructor_args ); |
|
| 621 | + if ( ! $default_input) { |
|
| 622 | + $default_input = new EE_Text_Input($input_constructor_args); |
|
| 623 | 623 | } |
| 624 | 624 | $result = $default_input; |
| 625 | 625 | } |
| 626 | - return apply_filters( 'FHEE__EE_Question__generate_form_input__return', $result, $registration, $this, $answer ); |
|
| 626 | + return apply_filters('FHEE__EE_Question__generate_form_input__return', $result, $registration, $this, $answer); |
|
| 627 | 627 | } |
| 628 | 628 | |
| 629 | 629 | |
@@ -14,56 +14,56 @@ |
||
| 14 | 14 | class EE_Number_Input_Display_Strategy extends EE_Display_Strategy_Base |
| 15 | 15 | { |
| 16 | 16 | |
| 17 | - /** |
|
| 18 | - * minimum value for number field |
|
| 19 | - * |
|
| 20 | - * @var int|null $min |
|
| 21 | - */ |
|
| 22 | - protected $min; |
|
| 17 | + /** |
|
| 18 | + * minimum value for number field |
|
| 19 | + * |
|
| 20 | + * @var int|null $min |
|
| 21 | + */ |
|
| 22 | + protected $min; |
|
| 23 | 23 | |
| 24 | - /** |
|
| 25 | - * maximum value for number field |
|
| 26 | - * |
|
| 27 | - * @var int|null $max |
|
| 28 | - */ |
|
| 29 | - protected $max; |
|
| 24 | + /** |
|
| 25 | + * maximum value for number field |
|
| 26 | + * |
|
| 27 | + * @var int|null $max |
|
| 28 | + */ |
|
| 29 | + protected $max; |
|
| 30 | 30 | |
| 31 | 31 | |
| 32 | 32 | |
| 33 | - /** |
|
| 34 | - * EE_Number_Input_Display_Strategy constructor. |
|
| 35 | - * |
|
| 36 | - * @param int $min |
|
| 37 | - * @param int $max |
|
| 38 | - */ |
|
| 39 | - public function __construct($min = null, $max = null) |
|
| 40 | - { |
|
| 41 | - $this->min = $min; |
|
| 42 | - $this->max = $max; |
|
| 43 | - } |
|
| 33 | + /** |
|
| 34 | + * EE_Number_Input_Display_Strategy constructor. |
|
| 35 | + * |
|
| 36 | + * @param int $min |
|
| 37 | + * @param int $max |
|
| 38 | + */ |
|
| 39 | + public function __construct($min = null, $max = null) |
|
| 40 | + { |
|
| 41 | + $this->min = $min; |
|
| 42 | + $this->max = $max; |
|
| 43 | + } |
|
| 44 | 44 | |
| 45 | 45 | |
| 46 | 46 | |
| 47 | - /** |
|
| 48 | - * @return string of html to display the field |
|
| 49 | - */ |
|
| 50 | - public function display() |
|
| 51 | - { |
|
| 52 | - $input = $this->_opening_tag('input'); |
|
| 53 | - $input .= $this->_attributes_string( |
|
| 54 | - array_merge( |
|
| 55 | - $this->_standard_attributes_array(), |
|
| 56 | - array( |
|
| 57 | - 'type' => 'number', |
|
| 58 | - 'min' => $this->min, |
|
| 59 | - 'max' => $this->max, |
|
| 60 | - 'value' => $this->_input->raw_value_in_form() |
|
| 61 | - ) |
|
| 62 | - ) |
|
| 63 | - ); |
|
| 64 | - $input .= $this->_close_tag(); |
|
| 65 | - return $input; |
|
| 66 | - } |
|
| 47 | + /** |
|
| 48 | + * @return string of html to display the field |
|
| 49 | + */ |
|
| 50 | + public function display() |
|
| 51 | + { |
|
| 52 | + $input = $this->_opening_tag('input'); |
|
| 53 | + $input .= $this->_attributes_string( |
|
| 54 | + array_merge( |
|
| 55 | + $this->_standard_attributes_array(), |
|
| 56 | + array( |
|
| 57 | + 'type' => 'number', |
|
| 58 | + 'min' => $this->min, |
|
| 59 | + 'max' => $this->max, |
|
| 60 | + 'value' => $this->_input->raw_value_in_form() |
|
| 61 | + ) |
|
| 62 | + ) |
|
| 63 | + ); |
|
| 64 | + $input .= $this->_close_tag(); |
|
| 65 | + return $input; |
|
| 66 | + } |
|
| 67 | 67 | |
| 68 | 68 | } |
| 69 | 69 | // End of file EE_Number_Input_Display_Strategy.php |
@@ -17,7 +17,7 @@ |
||
| 17 | 17 | |
| 18 | 18 | /** |
| 19 | 19 | * @param string $value_to_normalize |
| 20 | - * @return int|mixed|string |
|
| 20 | + * @return null|integer |
|
| 21 | 21 | * @throws \EE_Validation_Error |
| 22 | 22 | */ |
| 23 | 23 | public function normalize($value_to_normalize) |
@@ -1,5 +1,5 @@ discard block |
||
| 1 | 1 | <?php if (! defined('EVENT_ESPRESSO_VERSION')) { |
| 2 | - exit('No direct script access allowed'); |
|
| 2 | + exit('No direct script access allowed'); |
|
| 3 | 3 | } |
| 4 | 4 | |
| 5 | 5 | |
@@ -15,89 +15,89 @@ discard block |
||
| 15 | 15 | class EE_Int_Normalization extends EE_Normalization_Strategy_Base |
| 16 | 16 | { |
| 17 | 17 | |
| 18 | - /* |
|
| 18 | + /* |
|
| 19 | 19 | * regex pattern that matches for the following: |
| 20 | 20 | * * optional negative sign |
| 21 | 21 | * * one or more digits |
| 22 | 22 | */ |
| 23 | - const REGEX = '/^(-?)(\d+)(?:\.0+)?$/'; |
|
| 23 | + const REGEX = '/^(-?)(\d+)(?:\.0+)?$/'; |
|
| 24 | 24 | |
| 25 | 25 | |
| 26 | - /** |
|
| 27 | - * @param string $value_to_normalize |
|
| 28 | - * @return int|mixed|string |
|
| 29 | - * @throws \EE_Validation_Error |
|
| 30 | - */ |
|
| 31 | - public function normalize($value_to_normalize) |
|
| 32 | - { |
|
| 33 | - if ($value_to_normalize === null) { |
|
| 34 | - return null; |
|
| 35 | - } |
|
| 36 | - if (is_int($value_to_normalize) || is_float($value_to_normalize)) { |
|
| 37 | - return (int)$value_to_normalize; |
|
| 38 | - } |
|
| 39 | - if (! is_string($value_to_normalize)) { |
|
| 40 | - throw new EE_Validation_Error( |
|
| 41 | - sprintf( |
|
| 42 | - __('The value "%s" must be a string submitted for normalization, it was %s', 'event_espresso'), |
|
| 43 | - print_r($value_to_normalize, true), |
|
| 44 | - gettype($value_to_normalize) |
|
| 45 | - ) |
|
| 46 | - ); |
|
| 47 | - } |
|
| 48 | - $value_to_normalize = filter_var( |
|
| 49 | - $value_to_normalize, |
|
| 50 | - FILTER_SANITIZE_NUMBER_FLOAT, |
|
| 51 | - FILTER_FLAG_ALLOW_FRACTION |
|
| 52 | - ); |
|
| 53 | - if ($value_to_normalize === '') { |
|
| 54 | - return null; |
|
| 55 | - } |
|
| 56 | - $matches = array(); |
|
| 57 | - if (preg_match(EE_Int_Normalization::REGEX, $value_to_normalize, $matches)) { |
|
| 58 | - if (count($matches) === 3) { |
|
| 59 | - // if first match is the negative sign, |
|
| 60 | - // then the number needs to be multiplied by -1 to remain negative |
|
| 61 | - return $matches[1] === '-' |
|
| 62 | - ? (int)$matches[2] * -1 |
|
| 63 | - : (int)$matches[2]; |
|
| 64 | - } |
|
| 65 | - } |
|
| 66 | - //find if this input has a int validation strategy |
|
| 67 | - //in which case, use its message |
|
| 68 | - $validation_error_message = null; |
|
| 69 | - foreach ($this->_input->get_validation_strategies() as $validation_strategy) { |
|
| 70 | - if ($validation_strategy instanceof EE_Int_Validation_Strategy) { |
|
| 71 | - $validation_error_message = $validation_strategy->get_validation_error_message(); |
|
| 72 | - } |
|
| 73 | - } |
|
| 74 | - //this really shouldn't ever happen because fields with a int normalization strategy |
|
| 75 | - //should also have a int validation strategy, but in case it doesn't use the default |
|
| 76 | - if (! $validation_error_message) { |
|
| 77 | - $default_validation_strategy = new EE_Int_Validation_Strategy(); |
|
| 78 | - $validation_error_message = $default_validation_strategy->get_validation_error_message(); |
|
| 79 | - } |
|
| 80 | - throw new EE_Validation_Error($validation_error_message, 'numeric_only'); |
|
| 81 | - } |
|
| 26 | + /** |
|
| 27 | + * @param string $value_to_normalize |
|
| 28 | + * @return int|mixed|string |
|
| 29 | + * @throws \EE_Validation_Error |
|
| 30 | + */ |
|
| 31 | + public function normalize($value_to_normalize) |
|
| 32 | + { |
|
| 33 | + if ($value_to_normalize === null) { |
|
| 34 | + return null; |
|
| 35 | + } |
|
| 36 | + if (is_int($value_to_normalize) || is_float($value_to_normalize)) { |
|
| 37 | + return (int)$value_to_normalize; |
|
| 38 | + } |
|
| 39 | + if (! is_string($value_to_normalize)) { |
|
| 40 | + throw new EE_Validation_Error( |
|
| 41 | + sprintf( |
|
| 42 | + __('The value "%s" must be a string submitted for normalization, it was %s', 'event_espresso'), |
|
| 43 | + print_r($value_to_normalize, true), |
|
| 44 | + gettype($value_to_normalize) |
|
| 45 | + ) |
|
| 46 | + ); |
|
| 47 | + } |
|
| 48 | + $value_to_normalize = filter_var( |
|
| 49 | + $value_to_normalize, |
|
| 50 | + FILTER_SANITIZE_NUMBER_FLOAT, |
|
| 51 | + FILTER_FLAG_ALLOW_FRACTION |
|
| 52 | + ); |
|
| 53 | + if ($value_to_normalize === '') { |
|
| 54 | + return null; |
|
| 55 | + } |
|
| 56 | + $matches = array(); |
|
| 57 | + if (preg_match(EE_Int_Normalization::REGEX, $value_to_normalize, $matches)) { |
|
| 58 | + if (count($matches) === 3) { |
|
| 59 | + // if first match is the negative sign, |
|
| 60 | + // then the number needs to be multiplied by -1 to remain negative |
|
| 61 | + return $matches[1] === '-' |
|
| 62 | + ? (int)$matches[2] * -1 |
|
| 63 | + : (int)$matches[2]; |
|
| 64 | + } |
|
| 65 | + } |
|
| 66 | + //find if this input has a int validation strategy |
|
| 67 | + //in which case, use its message |
|
| 68 | + $validation_error_message = null; |
|
| 69 | + foreach ($this->_input->get_validation_strategies() as $validation_strategy) { |
|
| 70 | + if ($validation_strategy instanceof EE_Int_Validation_Strategy) { |
|
| 71 | + $validation_error_message = $validation_strategy->get_validation_error_message(); |
|
| 72 | + } |
|
| 73 | + } |
|
| 74 | + //this really shouldn't ever happen because fields with a int normalization strategy |
|
| 75 | + //should also have a int validation strategy, but in case it doesn't use the default |
|
| 76 | + if (! $validation_error_message) { |
|
| 77 | + $default_validation_strategy = new EE_Int_Validation_Strategy(); |
|
| 78 | + $validation_error_message = $default_validation_strategy->get_validation_error_message(); |
|
| 79 | + } |
|
| 80 | + throw new EE_Validation_Error($validation_error_message, 'numeric_only'); |
|
| 81 | + } |
|
| 82 | 82 | |
| 83 | 83 | |
| 84 | 84 | |
| 85 | - /** |
|
| 86 | - * Converts the int into a string for use in teh html form |
|
| 87 | - * |
|
| 88 | - * @param int $normalized_value |
|
| 89 | - * @return string |
|
| 90 | - */ |
|
| 91 | - public function unnormalize($normalized_value) |
|
| 92 | - { |
|
| 93 | - if ($normalized_value === null || $normalized_value === '') { |
|
| 94 | - return ''; |
|
| 95 | - } |
|
| 96 | - if (empty($normalized_value)) { |
|
| 97 | - return '0'; |
|
| 98 | - } |
|
| 99 | - return "$normalized_value"; |
|
| 100 | - } |
|
| 85 | + /** |
|
| 86 | + * Converts the int into a string for use in teh html form |
|
| 87 | + * |
|
| 88 | + * @param int $normalized_value |
|
| 89 | + * @return string |
|
| 90 | + */ |
|
| 91 | + public function unnormalize($normalized_value) |
|
| 92 | + { |
|
| 93 | + if ($normalized_value === null || $normalized_value === '') { |
|
| 94 | + return ''; |
|
| 95 | + } |
|
| 96 | + if (empty($normalized_value)) { |
|
| 97 | + return '0'; |
|
| 98 | + } |
|
| 99 | + return "$normalized_value"; |
|
| 100 | + } |
|
| 101 | 101 | } |
| 102 | 102 | |
| 103 | 103 | // End of file EE_Int_Normalization.strategy.php |
| 104 | 104 | \ No newline at end of file |
@@ -1,4 +1,4 @@ discard block |
||
| 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 | |
@@ -34,9 +34,9 @@ discard block |
||
| 34 | 34 | return null; |
| 35 | 35 | } |
| 36 | 36 | if (is_int($value_to_normalize) || is_float($value_to_normalize)) { |
| 37 | - return (int)$value_to_normalize; |
|
| 37 | + return (int) $value_to_normalize; |
|
| 38 | 38 | } |
| 39 | - if (! is_string($value_to_normalize)) { |
|
| 39 | + if ( ! is_string($value_to_normalize)) { |
|
| 40 | 40 | throw new EE_Validation_Error( |
| 41 | 41 | sprintf( |
| 42 | 42 | __('The value "%s" must be a string submitted for normalization, it was %s', 'event_espresso'), |
@@ -59,8 +59,8 @@ discard block |
||
| 59 | 59 | // if first match is the negative sign, |
| 60 | 60 | // then the number needs to be multiplied by -1 to remain negative |
| 61 | 61 | return $matches[1] === '-' |
| 62 | - ? (int)$matches[2] * -1 |
|
| 63 | - : (int)$matches[2]; |
|
| 62 | + ? (int) $matches[2] * -1 |
|
| 63 | + : (int) $matches[2]; |
|
| 64 | 64 | } |
| 65 | 65 | } |
| 66 | 66 | //find if this input has a int validation strategy |
@@ -73,7 +73,7 @@ discard block |
||
| 73 | 73 | } |
| 74 | 74 | //this really shouldn't ever happen because fields with a int normalization strategy |
| 75 | 75 | //should also have a int validation strategy, but in case it doesn't use the default |
| 76 | - if (! $validation_error_message) { |
|
| 76 | + if ( ! $validation_error_message) { |
|
| 77 | 77 | $default_validation_strategy = new EE_Int_Validation_Strategy(); |
| 78 | 78 | $validation_error_message = $default_validation_strategy->get_validation_error_message(); |
| 79 | 79 | } |
@@ -33,14 +33,14 @@ |
||
| 33 | 33 | * @return array |
| 34 | 34 | */ |
| 35 | 35 | function get_jquery_validation_rule_array(){ |
| 36 | - return array( |
|
| 37 | - 'number'=>true, |
|
| 38 | - 'step' => 1, |
|
| 39 | - 'messages' => array( |
|
| 40 | - 'number' => $this->get_validation_error_message(), |
|
| 41 | - 'step' => $this->get_validation_error_message() |
|
| 42 | - ) |
|
| 43 | - ); |
|
| 36 | + return array( |
|
| 37 | + 'number'=>true, |
|
| 38 | + 'step' => 1, |
|
| 39 | + 'messages' => array( |
|
| 40 | + 'number' => $this->get_validation_error_message(), |
|
| 41 | + 'step' => $this->get_validation_error_message() |
|
| 42 | + ) |
|
| 43 | + ); |
|
| 44 | 44 | } |
| 45 | 45 | } |
| 46 | 46 | |
@@ -6,16 +6,16 @@ discard block |
||
| 6 | 6 | * @subpackage Expression package is undefined on line 19, column 19 in Templates/Scripting/PHPClass.php. |
| 7 | 7 | * @author Mike Nelson |
| 8 | 8 | */ |
| 9 | -class EE_Int_Validation_Strategy extends EE_Validation_Strategy_Base{ |
|
| 9 | +class EE_Int_Validation_Strategy extends EE_Validation_Strategy_Base { |
|
| 10 | 10 | |
| 11 | 11 | /** |
| 12 | 12 | * @param null $validation_error_message |
| 13 | 13 | */ |
| 14 | - public function __construct( $validation_error_message = NULL ) { |
|
| 15 | - if( ! $validation_error_message ){ |
|
| 14 | + public function __construct($validation_error_message = NULL) { |
|
| 15 | + if ( ! $validation_error_message) { |
|
| 16 | 16 | $validation_error_message = __("Only digits are allowed.", "event_espresso"); |
| 17 | 17 | } |
| 18 | - parent::__construct( $validation_error_message ); |
|
| 18 | + parent::__construct($validation_error_message); |
|
| 19 | 19 | } |
| 20 | 20 | |
| 21 | 21 | |
@@ -32,7 +32,7 @@ discard block |
||
| 32 | 32 | /** |
| 33 | 33 | * @return array |
| 34 | 34 | */ |
| 35 | - function get_jquery_validation_rule_array(){ |
|
| 35 | + function get_jquery_validation_rule_array() { |
|
| 36 | 36 | return array( |
| 37 | 37 | 'number'=>true, |
| 38 | 38 | 'step' => 1, |