@@ -131,7 +131,7 @@ |
||
131 | 131 | */ |
132 | 132 | public function toHtml() |
133 | 133 | { |
134 | - return $this->_getTabs() . $this->_text; |
|
134 | + return $this->_getTabs().$this->_text; |
|
135 | 135 | } //end func toHtml |
136 | 136 | |
137 | 137 | // }}} |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | $type = strtolower($type); |
90 | 90 | if ($type == 'regex') { |
91 | 91 | // Regular expression |
92 | - $rule =& $this->getRule('regex'); |
|
92 | + $rule = & $this->getRule('regex'); |
|
93 | 93 | $rule->addData($ruleName, $data1); |
94 | 94 | |
95 | 95 | } elseif ($type == 'function' || $type == 'callback') { |
@@ -208,7 +208,7 @@ discard block |
||
208 | 208 | */ |
209 | 209 | function getValidationScript(&$element, $elementName, $ruleData) |
210 | 210 | { |
211 | - $reset = (isset($ruleData['reset'])) ? $ruleData['reset'] : false; |
|
211 | + $reset = (isset($ruleData['reset'])) ? $ruleData['reset'] : false; |
|
212 | 212 | $rule = $this->getRule($ruleData['type']); |
213 | 213 | if (!is_array($element)) { |
214 | 214 | list($jsValue, $jsReset) = $this->_getJsValue($element, $elementName, $reset, null); |
@@ -217,31 +217,31 @@ discard block |
||
217 | 217 | $jsReset = ''; |
218 | 218 | for ($i = 0; $i < count($element); $i++) { |
219 | 219 | list($tmp_value, $tmp_reset) = $this->_getJsValue($element[$i], $element[$i]->getName(), $reset, $i); |
220 | - $jsValue .= "\n" . $tmp_value; |
|
220 | + $jsValue .= "\n".$tmp_value; |
|
221 | 221 | $jsReset .= $tmp_reset; |
222 | 222 | } |
223 | 223 | } |
224 | - $jsField = isset($ruleData['group'])? $ruleData['group']: $elementName; |
|
224 | + $jsField = isset($ruleData['group']) ? $ruleData['group'] : $elementName; |
|
225 | 225 | list ($jsPrefix, $jsCheck) = $rule->getValidationScript($ruleData['format']); |
226 | 226 | if (!isset($ruleData['howmany'])) { |
227 | - $js = $jsValue . "\n" . $jsPrefix . |
|
228 | - " if (" . str_replace('{jsVar}', 'value', $jsCheck) . " && !errFlag['{$jsField}']) {\n" . |
|
229 | - " errFlag['{$jsField}'] = true;\n" . |
|
230 | - " _qfMsg = _qfMsg + '\\n - {$ruleData['message']}';\n" . |
|
231 | - $jsReset . |
|
227 | + $js = $jsValue."\n".$jsPrefix. |
|
228 | + " if (".str_replace('{jsVar}', 'value', $jsCheck)." && !errFlag['{$jsField}']) {\n". |
|
229 | + " errFlag['{$jsField}'] = true;\n". |
|
230 | + " _qfMsg = _qfMsg + '\\n - {$ruleData['message']}';\n". |
|
231 | + $jsReset. |
|
232 | 232 | " }\n"; |
233 | 233 | } else { |
234 | - $js = $jsValue . "\n" . $jsPrefix . |
|
235 | - " var res = 0;\n" . |
|
236 | - " for (var i = 0; i < value.length; i++) {\n" . |
|
237 | - " if (!(" . str_replace('{jsVar}', 'value[i]', $jsCheck) . ")) {\n" . |
|
238 | - " res++;\n" . |
|
239 | - " }\n" . |
|
240 | - " }\n" . |
|
241 | - " if (res < {$ruleData['howmany']} && !errFlag['{$jsField}']) {\n" . |
|
242 | - " errFlag['{$jsField}'] = true;\n" . |
|
243 | - " _qfMsg = _qfMsg + '\\n - {$ruleData['message']}';\n" . |
|
244 | - $jsReset . |
|
234 | + $js = $jsValue."\n".$jsPrefix. |
|
235 | + " var res = 0;\n". |
|
236 | + " for (var i = 0; i < value.length; i++) {\n". |
|
237 | + " if (!(".str_replace('{jsVar}', 'value[i]', $jsCheck).")) {\n". |
|
238 | + " res++;\n". |
|
239 | + " }\n". |
|
240 | + " }\n". |
|
241 | + " if (res < {$ruleData['howmany']} && !errFlag['{$jsField}']) {\n". |
|
242 | + " errFlag['{$jsField}'] = true;\n". |
|
243 | + " _qfMsg = _qfMsg + '\\n - {$ruleData['message']}';\n". |
|
244 | + $jsReset. |
|
245 | 245 | " }\n"; |
246 | 246 | } |
247 | 247 | return $js; |
@@ -262,72 +262,72 @@ discard block |
||
262 | 262 | */ |
263 | 263 | function _getJsValue(&$element, $elementName, $reset = false, $index = null) |
264 | 264 | { |
265 | - $jsIndex = isset($index)? '[' . $index . ']': ''; |
|
266 | - $tmp_reset = $reset? " var field = frm.elements['$elementName'];\n": ''; |
|
265 | + $jsIndex = isset($index) ? '['.$index.']' : ''; |
|
266 | + $tmp_reset = $reset ? " var field = frm.elements['$elementName'];\n" : ''; |
|
267 | 267 | if (is_a($element, 'html_quickform_group')) { |
268 | 268 | $value = " _qfGroups['{$elementName}'] = {"; |
269 | - $elements =& $element->getElements(); |
|
269 | + $elements = & $element->getElements(); |
|
270 | 270 | for ($i = 0, $count = count($elements); $i < $count; $i++) { |
271 | - $append = ($elements[$i]->getType() == 'select' && $elements[$i]->getMultiple())? '[]': ''; |
|
272 | - $value .= "'" . $element->getElementName($i) . $append . "': true" . |
|
273 | - ($i < $count - 1? ', ': ''); |
|
271 | + $append = ($elements[$i]->getType() == 'select' && $elements[$i]->getMultiple()) ? '[]' : ''; |
|
272 | + $value .= "'".$element->getElementName($i).$append."': true". |
|
273 | + ($i < $count - 1 ? ', ' : ''); |
|
274 | 274 | } |
275 | 275 | $value .= |
276 | - "};\n" . |
|
277 | - " value{$jsIndex} = new Array();\n" . |
|
278 | - " var valueIdx = 0;\n" . |
|
279 | - " for (var i = 0; i < frm.elements.length; i++) {\n" . |
|
280 | - " var _element = frm.elements[i];\n" . |
|
281 | - " if (_element.name in _qfGroups['{$elementName}']) {\n" . |
|
282 | - " switch (_element.type) {\n" . |
|
283 | - " case 'checkbox':\n" . |
|
284 | - " case 'radio':\n" . |
|
285 | - " if (_element.checked) {\n" . |
|
286 | - " value{$jsIndex}[valueIdx++] = _element.value;\n" . |
|
287 | - " }\n" . |
|
288 | - " break;\n" . |
|
289 | - " case 'select-one':\n" . |
|
290 | - " if (-1 != _element.selectedIndex) {\n" . |
|
291 | - " value{$jsIndex}[valueIdx++] = _element.options[_element.selectedIndex].value;\n" . |
|
292 | - " }\n" . |
|
293 | - " break;\n" . |
|
294 | - " case 'select-multiple':\n" . |
|
295 | - " var tmpVal = new Array();\n" . |
|
296 | - " var tmpIdx = 0;\n" . |
|
297 | - " for (var j = 0; j < _element.options.length; j++) {\n" . |
|
298 | - " if (_element.options[j].selected) {\n" . |
|
299 | - " tmpVal[tmpIdx++] = _element.options[j].value;\n" . |
|
300 | - " }\n" . |
|
301 | - " }\n" . |
|
302 | - " if (tmpIdx > 0) {\n" . |
|
303 | - " value{$jsIndex}[valueIdx++] = tmpVal;\n" . |
|
304 | - " }\n" . |
|
305 | - " break;\n" . |
|
306 | - " default:\n" . |
|
307 | - " value{$jsIndex}[valueIdx++] = _element.value;\n" . |
|
308 | - " }\n" . |
|
309 | - " }\n" . |
|
276 | + "};\n". |
|
277 | + " value{$jsIndex} = new Array();\n". |
|
278 | + " var valueIdx = 0;\n". |
|
279 | + " for (var i = 0; i < frm.elements.length; i++) {\n". |
|
280 | + " var _element = frm.elements[i];\n". |
|
281 | + " if (_element.name in _qfGroups['{$elementName}']) {\n". |
|
282 | + " switch (_element.type) {\n". |
|
283 | + " case 'checkbox':\n". |
|
284 | + " case 'radio':\n". |
|
285 | + " if (_element.checked) {\n". |
|
286 | + " value{$jsIndex}[valueIdx++] = _element.value;\n". |
|
287 | + " }\n". |
|
288 | + " break;\n". |
|
289 | + " case 'select-one':\n". |
|
290 | + " if (-1 != _element.selectedIndex) {\n". |
|
291 | + " value{$jsIndex}[valueIdx++] = _element.options[_element.selectedIndex].value;\n". |
|
292 | + " }\n". |
|
293 | + " break;\n". |
|
294 | + " case 'select-multiple':\n". |
|
295 | + " var tmpVal = new Array();\n". |
|
296 | + " var tmpIdx = 0;\n". |
|
297 | + " for (var j = 0; j < _element.options.length; j++) {\n". |
|
298 | + " if (_element.options[j].selected) {\n". |
|
299 | + " tmpVal[tmpIdx++] = _element.options[j].value;\n". |
|
300 | + " }\n". |
|
301 | + " }\n". |
|
302 | + " if (tmpIdx > 0) {\n". |
|
303 | + " value{$jsIndex}[valueIdx++] = tmpVal;\n". |
|
304 | + " }\n". |
|
305 | + " break;\n". |
|
306 | + " default:\n". |
|
307 | + " value{$jsIndex}[valueIdx++] = _element.value;\n". |
|
308 | + " }\n". |
|
309 | + " }\n". |
|
310 | 310 | " }\n"; |
311 | 311 | if ($reset) { |
312 | 312 | $tmp_reset = |
313 | - " for (var i = 0; i < frm.elements.length; i++) {\n" . |
|
314 | - " var _element = frm.elements[i];\n" . |
|
315 | - " if (_element.name in _qfGroups['{$elementName}']) {\n" . |
|
316 | - " switch (_element.type) {\n" . |
|
317 | - " case 'checkbox':\n" . |
|
318 | - " case 'radio':\n" . |
|
319 | - " _element.checked = _element.defaultChecked;\n" . |
|
320 | - " break;\n" . |
|
321 | - " case 'select-one':\n" . |
|
322 | - " case 'select-multiple':\n" . |
|
323 | - " for (var j = 0; j < _element.options.length; j++) {\n" . |
|
324 | - " _element.options[j].selected = _element.options[j].defaultSelected;\n" . |
|
325 | - " }\n" . |
|
326 | - " break;\n" . |
|
327 | - " default:\n" . |
|
328 | - " _element.value = _element.defaultValue;\n" . |
|
329 | - " }\n" . |
|
330 | - " }\n" . |
|
313 | + " for (var i = 0; i < frm.elements.length; i++) {\n". |
|
314 | + " var _element = frm.elements[i];\n". |
|
315 | + " if (_element.name in _qfGroups['{$elementName}']) {\n". |
|
316 | + " switch (_element.type) {\n". |
|
317 | + " case 'checkbox':\n". |
|
318 | + " case 'radio':\n". |
|
319 | + " _element.checked = _element.defaultChecked;\n". |
|
320 | + " break;\n". |
|
321 | + " case 'select-one':\n". |
|
322 | + " case 'select-multiple':\n". |
|
323 | + " for (var j = 0; j < _element.options.length; j++) {\n". |
|
324 | + " _element.options[j].selected = _element.options[j].defaultSelected;\n". |
|
325 | + " }\n". |
|
326 | + " break;\n". |
|
327 | + " default:\n". |
|
328 | + " _element.value = _element.defaultValue;\n". |
|
329 | + " }\n". |
|
330 | + " }\n". |
|
331 | 331 | " }\n"; |
332 | 332 | } |
333 | 333 | |
@@ -335,20 +335,20 @@ discard block |
||
335 | 335 | if ($element->getMultiple()) { |
336 | 336 | $elementName .= '[]'; |
337 | 337 | $value = |
338 | - " value{$jsIndex} = new Array();\n" . |
|
339 | - " var valueIdx = 0;\n" . |
|
340 | - " for (var i = 0; i < frm.elements['{$elementName}'].options.length; i++) {\n" . |
|
341 | - " if (frm.elements['{$elementName}'].options[i].selected) {\n" . |
|
342 | - " value{$jsIndex}[valueIdx++] = frm.elements['{$elementName}'].options[i].value;\n" . |
|
343 | - " }\n" . |
|
338 | + " value{$jsIndex} = new Array();\n". |
|
339 | + " var valueIdx = 0;\n". |
|
340 | + " for (var i = 0; i < frm.elements['{$elementName}'].options.length; i++) {\n". |
|
341 | + " if (frm.elements['{$elementName}'].options[i].selected) {\n". |
|
342 | + " value{$jsIndex}[valueIdx++] = frm.elements['{$elementName}'].options[i].value;\n". |
|
343 | + " }\n". |
|
344 | 344 | " }\n"; |
345 | 345 | } else { |
346 | 346 | $value = " value{$jsIndex} = frm.elements['{$elementName}'].selectedIndex == -1? '': frm.elements['{$elementName}'].options[frm.elements['{$elementName}'].selectedIndex].value;\n"; |
347 | 347 | } |
348 | 348 | if ($reset) { |
349 | 349 | $tmp_reset .= |
350 | - " for (var i = 0; i < field.options.length; i++) {\n" . |
|
351 | - " field.options[i].selected = field.options[i].defaultSelected;\n" . |
|
350 | + " for (var i = 0; i < field.options.length; i++) {\n". |
|
351 | + " field.options[i].selected = field.options[i].defaultSelected;\n". |
|
352 | 352 | " }\n"; |
353 | 353 | } |
354 | 354 | |
@@ -362,17 +362,17 @@ discard block |
||
362 | 362 | } |
363 | 363 | |
364 | 364 | } elseif ($element->getType() == 'radio') { |
365 | - $value = " value{$jsIndex} = '';\n" . |
|
365 | + $value = " value{$jsIndex} = '';\n". |
|
366 | 366 | // Fix for bug #5644 |
367 | - " var els = 'length' in frm.elements['$elementName']? frm.elements['$elementName']: [ frm.elements['$elementName'] ];\n" . |
|
368 | - " for (var i = 0; i < els.length; i++) {\n" . |
|
369 | - " if (els[i].checked) {\n" . |
|
370 | - " value{$jsIndex} = els[i].value;\n" . |
|
371 | - " }\n" . |
|
367 | + " var els = 'length' in frm.elements['$elementName']? frm.elements['$elementName']: [ frm.elements['$elementName'] ];\n". |
|
368 | + " for (var i = 0; i < els.length; i++) {\n". |
|
369 | + " if (els[i].checked) {\n". |
|
370 | + " value{$jsIndex} = els[i].value;\n". |
|
371 | + " }\n". |
|
372 | 372 | " }"; |
373 | 373 | if ($reset) { |
374 | - $tmp_reset .= " for (var i = 0; i < field.length; i++) {\n" . |
|
375 | - " field[i].checked = field[i].defaultChecked;\n" . |
|
374 | + $tmp_reset .= " for (var i = 0; i < field.length; i++) {\n". |
|
375 | + " field[i].checked = field[i].defaultChecked;\n". |
|
376 | 376 | " }"; |
377 | 377 | } |
378 | 378 |
@@ -124,7 +124,7 @@ discard block |
||
124 | 124 | */ |
125 | 125 | function getChecked() |
126 | 126 | { |
127 | - return (bool)$this->getAttribute('checked'); |
|
127 | + return (bool) $this->getAttribute('checked'); |
|
128 | 128 | } //end func getChecked |
129 | 129 | |
130 | 130 | // }}} |
@@ -147,9 +147,9 @@ discard block |
||
147 | 147 | $labelClass = $this->labelClass; |
148 | 148 | $checkboxClass = $this->checkboxClass; |
149 | 149 | |
150 | - $label =' |
|
150 | + $label = ' |
|
151 | 151 | <div class="'.$checkboxClass.'"> |
152 | - <label class="'.$labelClass.'">' . |
|
152 | + <label class="'.$labelClass.'">'. |
|
153 | 153 | HTML_QuickForm_input::toHtml().$this->_text. |
154 | 154 | '</label> |
155 | 155 | </div> |
@@ -158,7 +158,7 @@ discard block |
||
158 | 158 | return $label; |
159 | 159 | } |
160 | 160 | |
161 | - return HTML_QuickForm_input::toHtml() . $label; |
|
161 | + return HTML_QuickForm_input::toHtml().$label; |
|
162 | 162 | } //end func toHtml |
163 | 163 | |
164 | 164 | // }}} |
@@ -174,7 +174,7 @@ discard block |
||
174 | 174 | function getFrozenHtml() |
175 | 175 | { |
176 | 176 | if ($this->getChecked()) { |
177 | - return '<code>[x]</code>' . |
|
177 | + return '<code>[x]</code>'. |
|
178 | 178 | $this->_getPersistantData(); |
179 | 179 | } else { |
180 | 180 | return '<code>[ ]</code>'; |
@@ -295,7 +295,7 @@ discard block |
||
295 | 295 | { |
296 | 296 | $value = $this->_findValue($submitValues); |
297 | 297 | if (null === $value) { |
298 | - $value = $this->getChecked()? true: null; |
|
298 | + $value = $this->getChecked() ? true : null; |
|
299 | 299 | } |
300 | 300 | return $this->_prepareValue($value, $assoc); |
301 | 301 | } |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | function validate($email, $checkDomain = false) |
46 | 46 | { |
47 | 47 | // Fix for bug #10799: add 'D' modifier to regex |
48 | - if (preg_match($this->regex . 'D', $email)) { |
|
48 | + if (preg_match($this->regex.'D', $email)) { |
|
49 | 49 | if ($checkDomain && function_exists('checkdnsrr')) { |
50 | 50 | $tokens = explode('@', $email); |
51 | 51 | if (checkdnsrr($tokens[1], 'MX') || checkdnsrr($tokens[1], 'A')) { |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | |
62 | 62 | function getValidationScript($options = null) |
63 | 63 | { |
64 | - return array(" var regex = " . $this->regex . ";\n", "{jsVar} != '' && !regex.test({jsVar})"); |
|
64 | + return array(" var regex = ".$this->regex.";\n", "{jsVar} != '' && !regex.test({jsVar})"); |
|
65 | 65 | } // end func getValidationScript |
66 | 66 | |
67 | 67 | } // end class HTML_QuickForm_Rule_Email |
@@ -106,10 +106,10 @@ |
||
106 | 106 | { |
107 | 107 | if (isset($this->_data[$this->name])) { |
108 | 108 | $callback = $this->_data[$this->name][0]; |
109 | - $params = ($this->_BCMode[$this->name]? "'', {jsVar}": '{jsVar}') . |
|
110 | - (isset($options)? ", '{$options}'": ''); |
|
109 | + $params = ($this->_BCMode[$this->name] ? "'', {jsVar}" : '{jsVar}'). |
|
110 | + (isset($options) ? ", '{$options}'" : ''); |
|
111 | 111 | } else { |
112 | - $callback = is_array($options)? $options[1]: $options; |
|
112 | + $callback = is_array($options) ? $options[1] : $options; |
|
113 | 113 | $params = '{jsVar}'; |
114 | 114 | } |
115 | 115 | return array('', "{jsVar} != '' && !{$callback}({$params})"); |
@@ -48,14 +48,14 @@ |
||
48 | 48 | isset($value['tmp_name']) && |
49 | 49 | isset($value['size']) && |
50 | 50 | isset($value['error']) |
51 | - ){ |
|
51 | + ) { |
|
52 | 52 | if (empty($value['tmp_name'])) { |
53 | 53 | |
54 | 54 | return false; |
55 | 55 | } |
56 | 56 | } |
57 | 57 | } else { |
58 | - if ((string)$value == '') { |
|
58 | + if ((string) $value == '') { |
|
59 | 59 | |
60 | 60 | return false; |
61 | 61 | } |
@@ -78,9 +78,9 @@ |
||
78 | 78 | $operator = $this->_findOperator($operator); |
79 | 79 | |
80 | 80 | if ('===' != $operator && '!==' != $operator) { |
81 | - $compareFn = create_function('$a, $b', 'return floatval($a) ' . $operator . ' floatval($b);'); |
|
81 | + $compareFn = create_function('$a, $b', 'return floatval($a) '.$operator.' floatval($b);'); |
|
82 | 82 | } else { |
83 | - $compareFn = create_function('$a, $b', 'return strval($a) ' . $operator . ' strval($b);'); |
|
83 | + $compareFn = create_function('$a, $b', 'return strval($a) '.$operator.' strval($b);'); |
|
84 | 84 | } |
85 | 85 | |
86 | 86 | return $compareFn($values[0], $values[1]); |
@@ -61,11 +61,11 @@ discard block |
||
61 | 61 | { |
62 | 62 | // Fix for bug #10799: add 'D' modifier to regex |
63 | 63 | if (isset($this->_data[$this->name])) { |
64 | - if (!preg_match($this->_data[$this->name] . 'D', $value)) { |
|
64 | + if (!preg_match($this->_data[$this->name].'D', $value)) { |
|
65 | 65 | return false; |
66 | 66 | } |
67 | 67 | } else { |
68 | - if (!preg_match($regex . 'D', $value)) { |
|
68 | + if (!preg_match($regex.'D', $value)) { |
|
69 | 69 | return false; |
70 | 70 | } |
71 | 71 | } |
@@ -91,11 +91,11 @@ discard block |
||
91 | 91 | |
92 | 92 | // bug #12376, converting unicode escapes and stripping 'u' modifier |
93 | 93 | if ($pos = strpos($regex, 'u', strrpos($regex, '/'))) { |
94 | - $regex = substr($regex, 0, $pos) . substr($regex, $pos + 1); |
|
94 | + $regex = substr($regex, 0, $pos).substr($regex, $pos + 1); |
|
95 | 95 | $regex = preg_replace('/(?<!\\\\)(?>\\\\\\\\)*\\\\x{([a-fA-F0-9]+)}/', '\\u$1', $regex); |
96 | 96 | } |
97 | 97 | |
98 | - return array(" var regex = " . $regex . ";\n", "{jsVar} != '' && !regex.test({jsVar})"); |
|
98 | + return array(" var regex = ".$regex.";\n", "{jsVar} != '' && !regex.test({jsVar})"); |
|
99 | 99 | } // end func getValidationScript |
100 | 100 | |
101 | 101 | } // end class HTML_QuickForm_Rule_Regex |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | if (!empty($attributes['class'])) { |
87 | 87 | $oldClass = $attributes['class']; |
88 | 88 | } |
89 | - $attributes['class'] = $oldClass . ' selectpicker show-tick form-control'; |
|
89 | + $attributes['class'] = $oldClass.' selectpicker show-tick form-control'; |
|
90 | 90 | $attributes['data-live-search'] = 'true'; |
91 | 91 | } |
92 | 92 | $columnsSize = isset($attributes['cols-size']) ? $attributes['cols-size'] : null; |
@@ -196,7 +196,7 @@ discard block |
||
196 | 196 | function getPrivateName() |
197 | 197 | { |
198 | 198 | if ($this->getAttribute('multiple')) { |
199 | - return $this->getName() . '[]'; |
|
199 | + return $this->getName().'[]'; |
|
200 | 200 | } else { |
201 | 201 | return $this->getName(); |
202 | 202 | } |
@@ -312,7 +312,7 @@ discard block |
||
312 | 312 | */ |
313 | 313 | function getMultiple() |
314 | 314 | { |
315 | - return (bool)$this->getAttribute('multiple'); |
|
315 | + return (bool) $this->getAttribute('multiple'); |
|
316 | 316 | } //end func getMultiple |
317 | 317 | |
318 | 318 | // }}} |
@@ -332,7 +332,7 @@ discard block |
||
332 | 332 | function addOption($text, $value, $attributes = null, $return_array = false) |
333 | 333 | { |
334 | 334 | if (null === $attributes) { |
335 | - $attributes = array('value' => (string)$value); |
|
335 | + $attributes = array('value' => (string) $value); |
|
336 | 336 | } else { |
337 | 337 | $attributes = $this->_parseAttributes($attributes); |
338 | 338 | if (isset($attributes['selected'])) { |
@@ -344,7 +344,7 @@ discard block |
||
344 | 344 | $this->_values[] = $value; |
345 | 345 | } |
346 | 346 | } |
347 | - $this->_updateAttrArray($attributes, array('value' => (string)$value)); |
|
347 | + $this->_updateAttrArray($attributes, array('value' => (string) $value)); |
|
348 | 348 | } |
349 | 349 | if ($return_array) { |
350 | 350 | return array('text' => $text, 'attr' => $attributes); |
@@ -383,7 +383,7 @@ discard block |
||
383 | 383 | * @return PEAR_Error on error or true |
384 | 384 | * @throws PEAR_Error |
385 | 385 | */ |
386 | - function loadArray($arr, $values=null) |
|
386 | + function loadArray($arr, $values = null) |
|
387 | 387 | { |
388 | 388 | if (!is_array($arr)) { |
389 | 389 | return PEAR::raiseError('Argument 1 of HTML_Select::loadArray is not a valid array'); |
@@ -420,7 +420,7 @@ discard block |
||
420 | 420 | * @return PEAR_Error on error or true |
421 | 421 | * @throws PEAR_Error |
422 | 422 | */ |
423 | - function loadDbResult(&$result, $textCol=null, $valueCol=null, $values=null) |
|
423 | + function loadDbResult(&$result, $textCol = null, $valueCol = null, $values = null) |
|
424 | 424 | { |
425 | 425 | if (!is_object($result) || !is_a($result, 'db_result')) { |
426 | 426 | return PEAR::raiseError('Argument 1 of HTML_Select::loadDbResult is not a valid DB_result'); |
@@ -429,7 +429,7 @@ discard block |
||
429 | 429 | $this->setValue($values); |
430 | 430 | } |
431 | 431 | $fetchMode = ($textCol && $valueCol) ? DB_FETCHMODE_ASSOC : DB_FETCHMODE_ORDERED; |
432 | - while (is_array($row = $result->fetchRow($fetchMode)) ) { |
|
432 | + while (is_array($row = $result->fetchRow($fetchMode))) { |
|
433 | 433 | if ($fetchMode == DB_FETCHMODE_ASSOC) { |
434 | 434 | $this->addOption($row[$textCol], $row[$valueCol]); |
435 | 435 | } else { |
@@ -455,7 +455,7 @@ discard block |
||
455 | 455 | * @return void |
456 | 456 | * @throws PEAR_Error |
457 | 457 | */ |
458 | - function loadQuery(&$conn, $sql, $textCol=null, $valueCol=null, $values=null) |
|
458 | + function loadQuery(&$conn, $sql, $textCol = null, $valueCol = null, $values = null) |
|
459 | 459 | { |
460 | 460 | if (is_string($conn)) { |
461 | 461 | require_once('DB.php'); |
@@ -502,7 +502,7 @@ discard block |
||
502 | 502 | * @return PEAR_Error on error or true |
503 | 503 | * @throws PEAR_Error |
504 | 504 | */ |
505 | - function load(&$options, $param1=null, $param2=null, $param3=null, $param4=null) |
|
505 | + function load(&$options, $param1 = null, $param2 = null, $param3 = null, $param4 = null) |
|
506 | 506 | { |
507 | 507 | switch (true) { |
508 | 508 | case is_array($options): |
@@ -539,32 +539,32 @@ discard block |
||
539 | 539 | $strHtml = ''; |
540 | 540 | |
541 | 541 | if ($this->getComment() != '') { |
542 | - $strHtml .= $tabs . '<!-- ' . $this->getComment() . " //-->\n"; |
|
542 | + $strHtml .= $tabs.'<!-- '.$this->getComment()." //-->\n"; |
|
543 | 543 | } |
544 | 544 | |
545 | 545 | if (!$this->getMultiple()) { |
546 | 546 | $attrString = $this->_getAttrString($this->_attributes); |
547 | 547 | } else { |
548 | 548 | $myName = $this->getName(); |
549 | - $this->setName($myName . '[]'); |
|
549 | + $this->setName($myName.'[]'); |
|
550 | 550 | $attrString = $this->_getAttrString($this->_attributes); |
551 | 551 | $this->setName($myName); |
552 | 552 | } |
553 | 553 | |
554 | - $strHtml .= $tabs . '<select ' . $attrString . ">\n"; |
|
554 | + $strHtml .= $tabs.'<select '.$attrString.">\n"; |
|
555 | 555 | |
556 | - $strValues = is_array($this->_values)? array_map('strval', $this->_values): array(); |
|
556 | + $strValues = is_array($this->_values) ? array_map('strval', $this->_values) : array(); |
|
557 | 557 | |
558 | 558 | foreach ($this->_options as $option) { |
559 | 559 | |
560 | 560 | if (!empty($strValues) && in_array($option['attr']['value'], $strValues, true)) { |
561 | 561 | $option['attr']['selected'] = 'selected'; |
562 | 562 | } |
563 | - $strHtml .= $tabs . "<option" . $this->_getAttrString($option['attr']) . '>' . |
|
564 | - $option['text'] . "</option>"; |
|
563 | + $strHtml .= $tabs."<option".$this->_getAttrString($option['attr']).'>'. |
|
564 | + $option['text']."</option>"; |
|
565 | 565 | } |
566 | 566 | foreach ($this->_optgroups as $optgroup) { |
567 | - $strHtml .= $tabs . '<optgroup label="' . $optgroup['label'] . '">'; |
|
567 | + $strHtml .= $tabs.'<optgroup label="'.$optgroup['label'].'">'; |
|
568 | 568 | foreach ($optgroup['options'] as $option) { |
569 | 569 | $text = $option['text']; |
570 | 570 | unset($option['text']); |
@@ -573,11 +573,11 @@ discard block |
||
573 | 573 | $option['selected'] = 'selected'; |
574 | 574 | } |
575 | 575 | |
576 | - $strHtml .= $tabs . " <option" . $this->_getAttrString($option) . '>' .$text . "</option>"; |
|
576 | + $strHtml .= $tabs." <option".$this->_getAttrString($option).'>'.$text."</option>"; |
|
577 | 577 | } |
578 | 578 | $strHtml .= "</optgroup>"; |
579 | 579 | } |
580 | - return $strHtml . $tabs . '</select>'; |
|
580 | + return $strHtml.$tabs.'</select>'; |
|
581 | 581 | } |
582 | 582 | } |
583 | 583 | |
@@ -602,22 +602,22 @@ discard block |
||
602 | 602 | } |
603 | 603 | } |
604 | 604 | } |
605 | - $html = empty($value)? ' ': join('<br />', $value); |
|
605 | + $html = empty($value) ? ' ' : join('<br />', $value); |
|
606 | 606 | if ($this->_persistantFreeze) { |
607 | 607 | $name = $this->getPrivateName(); |
608 | 608 | // Only use id attribute if doing single hidden input |
609 | 609 | if (1 == count($value)) { |
610 | 610 | $id = $this->getAttribute('id'); |
611 | - $idAttr = isset($id)? array('id' => $id): array(); |
|
611 | + $idAttr = isset($id) ? array('id' => $id) : array(); |
|
612 | 612 | } else { |
613 | 613 | $idAttr = array(); |
614 | 614 | } |
615 | 615 | foreach ($value as $key => $item) { |
616 | - $html .= '<input' . $this->_getAttrString(array( |
|
616 | + $html .= '<input'.$this->_getAttrString(array( |
|
617 | 617 | 'type' => 'hidden', |
618 | 618 | 'name' => $name, |
619 | 619 | 'value' => $this->_values[$key] |
620 | - ) + $idAttr) . ' />'; |
|
620 | + ) + $idAttr).' />'; |
|
621 | 621 | } |
622 | 622 | } |
623 | 623 | return $html; |
@@ -635,7 +635,7 @@ discard block |
||
635 | 635 | $value = $this->_findValue($submitValues); |
636 | 636 | if (is_null($value)) { |
637 | 637 | $value = $this->getValue(); |
638 | - } elseif(!is_array($value)) { |
|
638 | + } elseif (!is_array($value)) { |
|
639 | 639 | $value = array($value); |
640 | 640 | } |
641 | 641 | if (is_array($value) && !empty($this->_options)) { |