Completed
Push — 1.10.x ( 23ca11...187186 )
by Julito
106:28 queued 51:04
created
main/inc/lib/pear/HTML/QuickForm/input.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
      * @access    public
48 48
      * @return    void
49 49
      */
50
-    public function __construct($elementName=null, $elementLabel=null, $attributes=null)
50
+    public function __construct($elementName = null, $elementLabel = null, $attributes = null)
51 51
     {
52 52
         parent::__construct($elementName, $elementLabel, $attributes);
53 53
     } //end constructor
@@ -146,7 +146,7 @@  discard block
 block discarded – undo
146 146
         if ($this->_flagFrozen) {
147 147
             return $this->getFrozenHtml();
148 148
         } else {
149
-            return $this->_getTabs() . '<input' . $this->_getAttrString($this->_attributes) . ' />';
149
+            return $this->_getTabs().'<input'.$this->_getAttrString($this->_attributes).' />';
150 150
         }
151 151
     } //end func toHtml
152 152
 
Please login to merge, or discard this patch.
main/inc/lib/pear/HTML/QuickForm/static.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -131,7 +131,7 @@
 block discarded – undo
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
     // }}}
Please login to merge, or discard this patch.
main/inc/lib/pear/HTML/QuickForm/RuleRegistry.php 1 patch
Spacing   +94 added lines, -94 removed lines patch added patch discarded remove patch
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 
Please login to merge, or discard this patch.
main/inc/lib/pear/HTML/QuickForm/checkbox.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -124,7 +124,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
     }
Please login to merge, or discard this patch.
main/inc/lib/pear/HTML/QuickForm/Rule/Email.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
Please login to merge, or discard this patch.
main/inc/lib/pear/HTML/QuickForm/Rule/Callback.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -106,10 +106,10 @@
 block discarded – undo
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})");
Please login to merge, or discard this patch.
main/inc/lib/pear/HTML/QuickForm/Rule/Required.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -48,14 +48,14 @@
 block discarded – undo
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
             }
Please login to merge, or discard this patch.
main/inc/lib/pear/HTML/QuickForm/Rule/Compare.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -78,9 +78,9 @@
 block discarded – undo
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]);
Please login to merge, or discard this patch.
main/inc/lib/pear/HTML/QuickForm/Rule/Regex.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -61,11 +61,11 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
Please login to merge, or discard this patch.