chamilo / chamilo-lms

main/inc/lib/pear/HTML/QuickForm/Rule.php

Doc Comments +1 added lines, -1 removed lines

@@ -71,7 +71,7 @@
      *
      * @param     mixed     Options for the rule
      * @access    public
-     * @return    array     first element is code to setup validation, second is the check itself
+     * @return    string[]     first element is code to setup validation, second is the check itself
      * @abstract
      */
     function getValidationScript($options = null)

Indentation +21 added lines, -21 removed lines

@@ -33,34 +33,34 @@
  */
 class HTML_QuickForm_Rule
 {
-   /**
-    * Name of the rule to use in validate method
-    *
-    * This property is used in more global rules like Callback and Regex
-    * to determine which callback and which regex is to be used for validation
-    *
-    * @var  string
-    * @access   public
-    */
+    /**
+     * Name of the rule to use in validate method
+     *
+     * This property is used in more global rules like Callback and Regex
+     * to determine which callback and which regex is to be used for validation
+     *
+     * @var  string
+     * @access   public
+     */
     var $name;
 
-   /**
-    * Validates a value
-    *
-    * @access public
-    * @abstract
-    */
+    /**
+     * Validates a value
+     *
+     * @access public
+     * @abstract
+     */
     function validate($value, $options)
     {
         return true;
     }
 
-   /**
-    * Sets the rule name
-    *
-    * @param  string    rule name
-    * @access public
-    */
+    /**
+     * Sets the rule name
+     *
+     * @param  string    rule name
+     * @access public
+     */
     function setName($ruleName)
     {
         $this->name = $ruleName;

main/inc/lib/pear/HTML/QuickForm/Rule/Compare.php

Doc Comments +3 added lines

@@ -73,6 +73,9 @@
     }
 
 
+    /**
+     * @param integer[] $values
+     */
     function validate($values, $operator = null)
     {
         $operator = $this->_findOperator($operator);

Indentation +12 added lines, -12 removed lines

@@ -35,11 +35,11 @@ 
  */
 class HTML_QuickForm_Rule_Compare extends HTML_QuickForm_Rule
 {
-   /**
-    * Possible operators to use
-    * @var array
-    * @access private
-    */
+    /**
+     * Possible operators to use
+     * @var array
+     * @access private
+     */
     var $_operators = array(
         'eq'  => '===',
         'neq' => '!==',
@@ -51,13 +51,13 @@ 
         '!='  => '!=='
     );
 
-   /**
-    * Returns the operator to use for comparing the values
-    *
-    * @access private
-    * @param  string     operator name
-    * @return string     operator to use for validation
-    */
+    /**
+     * Returns the operator to use for comparing the values
+     *
+     * @access private
+     * @param  string     operator name
+     * @return string     operator to use for validation
+     */
     function _findOperator($name)
     {
         $name = trim($name);

Spacing +2 added lines, -2 removed lines

@@ -78,9 +78,9 @@
         $operator = $this->_findOperator($operator);
 
         if ('===' != $operator && '!==' != $operator) {
-            $compareFn = create_function('$a, $b', 'return floatval($a) ' . $operator . ' floatval($b);');
+            $compareFn = create_function('$a, $b', 'return floatval($a) '.$operator.' floatval($b);');
         } else {
-            $compareFn = create_function('$a, $b', 'return strval($a) ' . $operator . ' strval($b);');
+            $compareFn = create_function('$a, $b', 'return strval($a) '.$operator.' strval($b);');
         }
 
         return $compareFn($values[0], $values[1]);

main/inc/lib/pear/HTML/QuickForm/Rule/Date.php

Doc Comments +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
 	/**
 	 * Function to check a date
 	 * @see HTML_QuickForm_Rule
-	 * @param array $date An array with keys F (month), d (day) and Y (year)
+	 * @param string $date An array with keys F (month), d (day) and Y (year)
 	 * @return boolean True if date is valid
 	 */
 	function validate($date, $options)

Indentation +10 added lines, -10 removed lines

@@ -6,15 +6,15 @@
  */
 class Html_Quickform_Rule_Date extends HTML_QuickForm_Rule
 {
-	/**
-	 * Function to check a date
-	 * @see HTML_QuickForm_Rule
-	 * @param array $date An array with keys F (month), d (day) and Y (year)
-	 * @return boolean True if date is valid
-	 */
-	function validate($date, $options)
-	{
-		$compareDate = create_function('$a', 'return checkdate($a[\'M\'],$a[\'d\'],$a[\'Y\']);');
+    /**
+     * Function to check a date
+     * @see HTML_QuickForm_Rule
+     * @param array $date An array with keys F (month), d (day) and Y (year)
+     * @return boolean True if date is valid
+     */
+    function validate($date, $options)
+    {
+        $compareDate = create_function('$a', 'return checkdate($a[\'M\'],$a[\'d\'],$a[\'Y\']);');
         return $compareDate($date);
-	}
+    }
 }

main/inc/lib/pear/HTML/QuickForm/RuleRegistry.php

Doc Comments +2 added lines, -1 removed lines

@@ -174,7 +174,7 @@ 
      * @param     mixed    $values          Can be a scalar or an array of values
      *                                      to be validated
      * @param     mixed    $options         Options used by the rule
-     * @param     mixed    $multiple        Whether to validate an array of values altogether
+     * @param     boolean    $multiple        Whether to validate an array of values altogether
      * @access    public
      * @return    mixed    true if no error found, int of valid values (when an array of values is given) or false if error
      */
@@ -258,6 +258,7 @@ 
     *                                   the value
     * @param  integer                   value's index in the array (only used for
     *                                   multielement rules)
+    * @param integer $index
     * @return array     first item is value javascript, second is reset
     */
     function _getJsValue(&$element, $elementName, $reset = false, $index = null)

Indentation +38 added lines, -38 removed lines

@@ -225,41 +225,41 @@ 
         list ($jsPrefix, $jsCheck) = $rule->getValidationScript($ruleData['format']);
         if (!isset($ruleData['howmany'])) {
             $js = $jsValue . "\n" . $jsPrefix .
-                  "  if (" . str_replace('{jsVar}', 'value', $jsCheck) . " && !errFlag['{$jsField}']) {\n" .
-                  "    errFlag['{$jsField}'] = true;\n" .
-                  "    _qfMsg = _qfMsg + '\\n - {$ruleData['message']}';\n" .
-                  $jsReset .
-                  "  }\n";
+                    "  if (" . str_replace('{jsVar}', 'value', $jsCheck) . " && !errFlag['{$jsField}']) {\n" .
+                    "    errFlag['{$jsField}'] = true;\n" .
+                    "    _qfMsg = _qfMsg + '\\n - {$ruleData['message']}';\n" .
+                    $jsReset .
+                    "  }\n";
         } else {
             $js = $jsValue . "\n" . $jsPrefix .
-                  "  var res = 0;\n" .
-                  "  for (var i = 0; i < value.length; i++) {\n" .
-                  "    if (!(" . str_replace('{jsVar}', 'value[i]', $jsCheck) . ")) {\n" .
-                  "      res++;\n" .
-                  "    }\n" .
-                  "  }\n" .
-                  "  if (res < {$ruleData['howmany']} && !errFlag['{$jsField}']) {\n" .
-                  "    errFlag['{$jsField}'] = true;\n" .
-                  "    _qfMsg = _qfMsg + '\\n - {$ruleData['message']}';\n" .
-                  $jsReset .
-                  "  }\n";
+                    "  var res = 0;\n" .
+                    "  for (var i = 0; i < value.length; i++) {\n" .
+                    "    if (!(" . str_replace('{jsVar}', 'value[i]', $jsCheck) . ")) {\n" .
+                    "      res++;\n" .
+                    "    }\n" .
+                    "  }\n" .
+                    "  if (res < {$ruleData['howmany']} && !errFlag['{$jsField}']) {\n" .
+                    "    errFlag['{$jsField}'] = true;\n" .
+                    "    _qfMsg = _qfMsg + '\\n - {$ruleData['message']}';\n" .
+                    $jsReset .
+                    "  }\n";
         }
         return $js;
     } // end func getValidationScript
 
 
-   /**
-    * Returns JavaScript to get and to reset the element's value
-    *
-    * @access private
-    * @param  HTML_QuickForm_element    element being processed
-    * @param  string                    element's name
-    * @param  bool                      whether to generate JavaScript to reset
-    *                                   the value
-    * @param  integer                   value's index in the array (only used for
-    *                                   multielement rules)
-    * @return array     first item is value javascript, second is reset
-    */
+    /**
+     * Returns JavaScript to get and to reset the element's value
+     *
+     * @access private
+     * @param  HTML_QuickForm_element    element being processed
+     * @param  string                    element's name
+     * @param  bool                      whether to generate JavaScript to reset
+     *                                   the value
+     * @param  integer                   value's index in the array (only used for
+     *                                   multielement rules)
+     * @return array     first item is value javascript, second is reset
+     */
     function _getJsValue(&$element, $elementName, $reset = false, $index = null)
     {
         $jsIndex = isset($index)? '[' . $index . ']': '';
@@ -270,7 +270,7 @@ 
             for ($i = 0, $count = count($elements); $i < $count; $i++) {
                 $append = ($elements[$i]->getType() == 'select' && $elements[$i]->getMultiple())? '[]': '';
                 $value .= "'" . $element->getElementName($i) . $append . "': true" .
-                          ($i < $count - 1? ', ': '');
+                            ($i < $count - 1? ', ': '');
             }
             $value .=
                 "};\n" .
@@ -363,17 +363,17 @@ 
 
         } elseif ($element->getType() == 'radio') {
             $value = "  value{$jsIndex} = '';\n" .
-                     // Fix for bug #5644
-                     "  var els = 'length' in frm.elements['$elementName']? frm.elements['$elementName']: [ frm.elements['$elementName'] ];\n" .
-                     "  for (var i = 0; i < els.length; i++) {\n" .
-                     "    if (els[i].checked) {\n" .
-                     "      value{$jsIndex} = els[i].value;\n" .
-                     "    }\n" .
-                     "  }";
+                        // Fix for bug #5644
+                        "  var els = 'length' in frm.elements['$elementName']? frm.elements['$elementName']: [ frm.elements['$elementName'] ];\n" .
+                        "  for (var i = 0; i < els.length; i++) {\n" .
+                        "    if (els[i].checked) {\n" .
+                        "      value{$jsIndex} = els[i].value;\n" .
+                        "    }\n" .
+                        "  }";
             if ($reset) {
                 $tmp_reset .= "    for (var i = 0; i < field.length; i++) {\n" .
-                              "      field[i].checked = field[i].defaultChecked;\n" .
-                              "    }";
+                                "      field[i].checked = field[i].defaultChecked;\n" .
+                                "    }";
             }
 
         } else {

Spacing +94 added lines, -94 removed lines

@@ -89,7 +89,7 @@ 
         $type = strtolower($type);
         if ($type == 'regex') {
             // Regular expression
-            $rule =& $this->getRule('regex');
+            $rule = & $this->getRule('regex');
             $rule->addData($ruleName, $data1);
 
         } elseif ($type == 'function' || $type == 'callback') {
@@ -208,7 +208,7 @@ 
      */
     function getValidationScript(&$element, $elementName, $ruleData)
     {
-        $reset =  (isset($ruleData['reset'])) ? $ruleData['reset'] : false;
+        $reset = (isset($ruleData['reset'])) ? $ruleData['reset'] : false;
         $rule  = $this->getRule($ruleData['type']);
         if (!is_array($element)) {
             list($jsValue, $jsReset) = $this->_getJsValue($element, $elementName, $reset, null);
@@ -217,31 +217,31 @@ 
             $jsReset = '';
             for ($i = 0; $i < count($element); $i++) {
                 list($tmp_value, $tmp_reset) = $this->_getJsValue($element[$i], $element[$i]->getName(), $reset, $i);
-                $jsValue .= "\n" . $tmp_value;
+                $jsValue .= "\n".$tmp_value;
                 $jsReset .= $tmp_reset;
             }
         }
-        $jsField = isset($ruleData['group'])? $ruleData['group']: $elementName;
+        $jsField = isset($ruleData['group']) ? $ruleData['group'] : $elementName;
         list ($jsPrefix, $jsCheck) = $rule->getValidationScript($ruleData['format']);
         if (!isset($ruleData['howmany'])) {
-            $js = $jsValue . "\n" . $jsPrefix .
-                  "  if (" . str_replace('{jsVar}', 'value', $jsCheck) . " && !errFlag['{$jsField}']) {\n" .
-                  "    errFlag['{$jsField}'] = true;\n" .
-                  "    _qfMsg = _qfMsg + '\\n - {$ruleData['message']}';\n" .
-                  $jsReset .
+            $js = $jsValue."\n".$jsPrefix.
+                  "  if (".str_replace('{jsVar}', 'value', $jsCheck)." && !errFlag['{$jsField}']) {\n".
+                  "    errFlag['{$jsField}'] = true;\n".
+                  "    _qfMsg = _qfMsg + '\\n - {$ruleData['message']}';\n".
+                  $jsReset.
                   "  }\n";
         } else {
-            $js = $jsValue . "\n" . $jsPrefix .
-                  "  var res = 0;\n" .
-                  "  for (var i = 0; i < value.length; i++) {\n" .
-                  "    if (!(" . str_replace('{jsVar}', 'value[i]', $jsCheck) . ")) {\n" .
-                  "      res++;\n" .
-                  "    }\n" .
-                  "  }\n" .
-                  "  if (res < {$ruleData['howmany']} && !errFlag['{$jsField}']) {\n" .
-                  "    errFlag['{$jsField}'] = true;\n" .
-                  "    _qfMsg = _qfMsg + '\\n - {$ruleData['message']}';\n" .
-                  $jsReset .
+            $js = $jsValue."\n".$jsPrefix.
+                  "  var res = 0;\n".
+                  "  for (var i = 0; i < value.length; i++) {\n".
+                  "    if (!(".str_replace('{jsVar}', 'value[i]', $jsCheck).")) {\n".
+                  "      res++;\n".
+                  "    }\n".
+                  "  }\n".
+                  "  if (res < {$ruleData['howmany']} && !errFlag['{$jsField}']) {\n".
+                  "    errFlag['{$jsField}'] = true;\n".
+                  "    _qfMsg = _qfMsg + '\\n - {$ruleData['message']}';\n".
+                  $jsReset.
                   "  }\n";
         }
         return $js;
@@ -262,72 +262,72 @@ 
     */
     function _getJsValue(&$element, $elementName, $reset = false, $index = null)
     {
-        $jsIndex = isset($index)? '[' . $index . ']': '';
-        $tmp_reset = $reset? "    var field = frm.elements['$elementName'];\n": '';
+        $jsIndex = isset($index) ? '['.$index.']' : '';
+        $tmp_reset = $reset ? "    var field = frm.elements['$elementName'];\n" : '';
         if (is_a($element, 'html_quickform_group')) {
             $value = "  _qfGroups['{$elementName}'] = {";
-            $elements =& $element->getElements();
+            $elements = & $element->getElements();
             for ($i = 0, $count = count($elements); $i < $count; $i++) {
-                $append = ($elements[$i]->getType() == 'select' && $elements[$i]->getMultiple())? '[]': '';
-                $value .= "'" . $element->getElementName($i) . $append . "': true" .
-                          ($i < $count - 1? ', ': '');
+                $append = ($elements[$i]->getType() == 'select' && $elements[$i]->getMultiple()) ? '[]' : '';
+                $value .= "'".$element->getElementName($i).$append."': true".
+                          ($i < $count - 1 ? ', ' : '');
             }
             $value .=
-                "};\n" .
-                "  value{$jsIndex} = new Array();\n" .
-                "  var valueIdx = 0;\n" .
-                "  for (var i = 0; i < frm.elements.length; i++) {\n" .
-                "    var _element = frm.elements[i];\n" .
-                "    if (_element.name in _qfGroups['{$elementName}']) {\n" .
-                "      switch (_element.type) {\n" .
-                "        case 'checkbox':\n" .
-                "        case 'radio':\n" .
-                "          if (_element.checked) {\n" .
-                "            value{$jsIndex}[valueIdx++] = _element.value;\n" .
-                "          }\n" .
-                "          break;\n" .
-                "        case 'select-one':\n" .
-                "          if (-1 != _element.selectedIndex) {\n" .
-                "            value{$jsIndex}[valueIdx++] = _element.options[_element.selectedIndex].value;\n" .
-                "          }\n" .
-                "          break;\n" .
-                "        case 'select-multiple':\n" .
-                "          var tmpVal = new Array();\n" .
-                "          var tmpIdx = 0;\n" .
-                "          for (var j = 0; j < _element.options.length; j++) {\n" .
-                "            if (_element.options[j].selected) {\n" .
-                "              tmpVal[tmpIdx++] = _element.options[j].value;\n" .
-                "            }\n" .
-                "          }\n" .
-                "          if (tmpIdx > 0) {\n" .
-                "            value{$jsIndex}[valueIdx++] = tmpVal;\n" .
-                "          }\n" .
-                "          break;\n" .
-                "        default:\n" .
-                "          value{$jsIndex}[valueIdx++] = _element.value;\n" .
-                "      }\n" .
-                "    }\n" .
+                "};\n".
+                "  value{$jsIndex} = new Array();\n".
+                "  var valueIdx = 0;\n".
+                "  for (var i = 0; i < frm.elements.length; i++) {\n".
+                "    var _element = frm.elements[i];\n".
+                "    if (_element.name in _qfGroups['{$elementName}']) {\n".
+                "      switch (_element.type) {\n".
+                "        case 'checkbox':\n".
+                "        case 'radio':\n".
+                "          if (_element.checked) {\n".
+                "            value{$jsIndex}[valueIdx++] = _element.value;\n".
+                "          }\n".
+                "          break;\n".
+                "        case 'select-one':\n".
+                "          if (-1 != _element.selectedIndex) {\n".
+                "            value{$jsIndex}[valueIdx++] = _element.options[_element.selectedIndex].value;\n".
+                "          }\n".
+                "          break;\n".
+                "        case 'select-multiple':\n".
+                "          var tmpVal = new Array();\n".
+                "          var tmpIdx = 0;\n".
+                "          for (var j = 0; j < _element.options.length; j++) {\n".
+                "            if (_element.options[j].selected) {\n".
+                "              tmpVal[tmpIdx++] = _element.options[j].value;\n".
+                "            }\n".
+                "          }\n".
+                "          if (tmpIdx > 0) {\n".
+                "            value{$jsIndex}[valueIdx++] = tmpVal;\n".
+                "          }\n".
+                "          break;\n".
+                "        default:\n".
+                "          value{$jsIndex}[valueIdx++] = _element.value;\n".
+                "      }\n".
+                "    }\n".
                 "  }\n";
             if ($reset) {
                 $tmp_reset =
-                    "    for (var i = 0; i < frm.elements.length; i++) {\n" .
-                    "      var _element = frm.elements[i];\n" .
-                    "      if (_element.name in _qfGroups['{$elementName}']) {\n" .
-                    "        switch (_element.type) {\n" .
-                    "          case 'checkbox':\n" .
-                    "          case 'radio':\n" .
-                    "            _element.checked = _element.defaultChecked;\n" .
-                    "            break;\n" .
-                    "          case 'select-one':\n" .
-                    "          case 'select-multiple':\n" .
-                    "            for (var j = 0; j < _element.options.length; j++) {\n" .
-                    "              _element.options[j].selected = _element.options[j].defaultSelected;\n" .
-                    "            }\n" .
-                    "            break;\n" .
-                    "          default:\n" .
-                    "            _element.value = _element.defaultValue;\n" .
-                    "        }\n" .
-                    "      }\n" .
+                    "    for (var i = 0; i < frm.elements.length; i++) {\n".
+                    "      var _element = frm.elements[i];\n".
+                    "      if (_element.name in _qfGroups['{$elementName}']) {\n".
+                    "        switch (_element.type) {\n".
+                    "          case 'checkbox':\n".
+                    "          case 'radio':\n".
+                    "            _element.checked = _element.defaultChecked;\n".
+                    "            break;\n".
+                    "          case 'select-one':\n".
+                    "          case 'select-multiple':\n".
+                    "            for (var j = 0; j < _element.options.length; j++) {\n".
+                    "              _element.options[j].selected = _element.options[j].defaultSelected;\n".
+                    "            }\n".
+                    "            break;\n".
+                    "          default:\n".
+                    "            _element.value = _element.defaultValue;\n".
+                    "        }\n".
+                    "      }\n".
                     "    }\n";
             }
 
@@ -335,20 +335,20 @@ 
             if ($element->getMultiple()) {
                 $elementName .= '[]';
                 $value =
-                    "  value{$jsIndex} = new Array();\n" .
-                    "  var valueIdx = 0;\n" .
-                    "  for (var i = 0; i < frm.elements['{$elementName}'].options.length; i++) {\n" .
-                    "    if (frm.elements['{$elementName}'].options[i].selected) {\n" .
-                    "      value{$jsIndex}[valueIdx++] = frm.elements['{$elementName}'].options[i].value;\n" .
-                    "    }\n" .
+                    "  value{$jsIndex} = new Array();\n".
+                    "  var valueIdx = 0;\n".
+                    "  for (var i = 0; i < frm.elements['{$elementName}'].options.length; i++) {\n".
+                    "    if (frm.elements['{$elementName}'].options[i].selected) {\n".
+                    "      value{$jsIndex}[valueIdx++] = frm.elements['{$elementName}'].options[i].value;\n".
+                    "    }\n".
                     "  }\n";
             } else {
                 $value = "  value{$jsIndex} = frm.elements['{$elementName}'].selectedIndex == -1? '': frm.elements['{$elementName}'].options[frm.elements['{$elementName}'].selectedIndex].value;\n";
             }
             if ($reset) {
                 $tmp_reset .=
-                    "    for (var i = 0; i < field.options.length; i++) {\n" .
-                    "      field.options[i].selected = field.options[i].defaultSelected;\n" .
+                    "    for (var i = 0; i < field.options.length; i++) {\n".
+                    "      field.options[i].selected = field.options[i].defaultSelected;\n".
                     "    }\n";
             }
 
@@ -362,17 +362,17 @@ 
             }
 
         } elseif ($element->getType() == 'radio') {
-            $value = "  value{$jsIndex} = '';\n" .
+            $value = "  value{$jsIndex} = '';\n".
                      // Fix for bug #5644
-                     "  var els = 'length' in frm.elements['$elementName']? frm.elements['$elementName']: [ frm.elements['$elementName'] ];\n" .
-                     "  for (var i = 0; i < els.length; i++) {\n" .
-                     "    if (els[i].checked) {\n" .
-                     "      value{$jsIndex} = els[i].value;\n" .
-                     "    }\n" .
+                     "  var els = 'length' in frm.elements['$elementName']? frm.elements['$elementName']: [ frm.elements['$elementName'] ];\n".
+                     "  for (var i = 0; i < els.length; i++) {\n".
+                     "    if (els[i].checked) {\n".
+                     "      value{$jsIndex} = els[i].value;\n".
+                     "    }\n".
                      "  }";
             if ($reset) {
-                $tmp_reset .= "    for (var i = 0; i < field.length; i++) {\n" .
-                              "      field[i].checked = field[i].defaultChecked;\n" .
+                $tmp_reset .= "    for (var i = 0; i < field.length; i++) {\n".
+                              "      field[i].checked = field[i].defaultChecked;\n".
                               "    }";
             }
 

main/inc/lib/pear/HTML/QuickForm/select.php

Doc Comments +5 added lines, -8 removed lines

@@ -145,7 +145,7 @@ 
      *
      * @since     1.0
      * @access    public
-     * @return    array of selected values
+     * @return    string of selected values
      */
     function getSelected()
     {
@@ -208,7 +208,7 @@ 
     /**
      * Sets the value of the form element
      *
-     * @param     mixed    $values  Array or comma delimited string of selected values
+     * @param     mixed    $value  Array or comma delimited string of selected values
      * @since     1.0
      * @access    public
      * @return    void
@@ -226,7 +226,7 @@ 
      *
      * @since     1.0
      * @access    public
-     * @return    array of selected values
+     * @return    string of selected values
      */
     function getValue()
     {
@@ -257,7 +257,7 @@ 
      *
      * @since     1.0
      * @access    public
-     * @return    int
+     * @return    string|null
      */
     function getSize()
     {
@@ -357,12 +357,9 @@ 
         /**
      * Adds a new OPTION to the SELECT
      *
-     * @param     string    $text       Display text for the OPTION
-     * @param     string    $value      Value for the OPTION
-     * @param     mixed     $attributes Either a typical HTML attribute string
-     *                                  or an associative array
      * @since     1.0
      * @access    public
+     * @param string $label
      * @return    void
      */
     function addOptGroup($options, $label)

Indentation +18 added lines, -18 removed lines

@@ -355,16 +355,16 @@ 
 
 
         /**
-     * Adds a new OPTION to the SELECT
-     *
-     * @param     string    $text       Display text for the OPTION
-     * @param     string    $value      Value for the OPTION
-     * @param     mixed     $attributes Either a typical HTML attribute string
-     *                                  or an associative array
-     * @since     1.0
-     * @access    public
-     * @return    void
-     */
+         * Adds a new OPTION to the SELECT
+         *
+         * @param     string    $text       Display text for the OPTION
+         * @param     string    $value      Value for the OPTION
+         * @param     mixed     $attributes Either a typical HTML attribute string
+         *                                  or an associative array
+         * @since     1.0
+         * @access    public
+         * @return    void
+         */
     function addOptGroup($options, $label)
     {
         foreach ($options as $option) {
@@ -614,10 +614,10 @@ 
             }
             foreach ($value as $key => $item) {
                 $html .= '<input' . $this->_getAttrString(array(
-                             'type'  => 'hidden',
-                             'name'  => $name,
-                             'value' => $this->_values[$key]
-                         ) + $idAttr) . ' />';
+                                'type'  => 'hidden',
+                                'name'  => $name,
+                                'value' => $this->_values[$key]
+                            ) + $idAttr) . ' />';
             }
         }
         return $html;
@@ -626,10 +626,10 @@ 
     // }}}
     // {{{ exportValue()
 
-   /**
-    * We check the options and return only the values that _could_ have been
-    * selected. We also return a scalar value if select is not "multiple"
-    */
+    /**
+     * We check the options and return only the values that _could_ have been
+     * selected. We also return a scalar value if select is not "multiple"
+     */
     function exportValue(&$submitValues, $assoc = false)
     {
         $value = $this->_findValue($submitValues);

Spacing +24 added lines, -24 removed lines

@@ -86,7 +86,7 @@ 
             if (!empty($attributes['class'])) {
                 $oldClass = $attributes['class'];
             }
-            $attributes['class'] = $oldClass . ' selectpicker show-tick form-control';
+            $attributes['class'] = $oldClass.' selectpicker show-tick form-control';
             $attributes['data-live-search'] = 'true';
         }
         $columnsSize = isset($attributes['cols-size']) ? $attributes['cols-size'] : null;
@@ -196,7 +196,7 @@ 
     function getPrivateName()
     {
         if ($this->getAttribute('multiple')) {
-            return $this->getName() . '[]';
+            return $this->getName().'[]';
         } else {
             return $this->getName();
         }
@@ -312,7 +312,7 @@ 
      */
     function getMultiple()
     {
-        return (bool)$this->getAttribute('multiple');
+        return (bool) $this->getAttribute('multiple');
     } //end func getMultiple
 
     // }}}
@@ -332,7 +332,7 @@ 
     function addOption($text, $value, $attributes = null, $return_array = false)
     {
         if (null === $attributes) {
-            $attributes = array('value' => (string)$value);
+            $attributes = array('value' => (string) $value);
         } else {
             $attributes = $this->_parseAttributes($attributes);
             if (isset($attributes['selected'])) {
@@ -344,7 +344,7 @@ 
                     $this->_values[] = $value;
                 }
             }
-            $this->_updateAttrArray($attributes, array('value' => (string)$value));
+            $this->_updateAttrArray($attributes, array('value' => (string) $value));
         }
         if ($return_array) {
             return array('text' => $text, 'attr' => $attributes);
@@ -383,7 +383,7 @@ 
      * @return    PEAR_Error on error or true
      * @throws    PEAR_Error
      */
-    function loadArray($arr, $values=null)
+    function loadArray($arr, $values = null)
     {
         if (!is_array($arr)) {
             return PEAR::raiseError('Argument 1 of HTML_Select::loadArray is not a valid array');
@@ -420,7 +420,7 @@ 
      * @return    PEAR_Error on error or true
      * @throws    PEAR_Error
      */
-    function loadDbResult(&$result, $textCol=null, $valueCol=null, $values=null)
+    function loadDbResult(&$result, $textCol = null, $valueCol = null, $values = null)
     {
         if (!is_object($result) || !is_a($result, 'db_result')) {
             return PEAR::raiseError('Argument 1 of HTML_Select::loadDbResult is not a valid DB_result');
@@ -429,7 +429,7 @@ 
             $this->setValue($values);
         }
         $fetchMode = ($textCol && $valueCol) ? DB_FETCHMODE_ASSOC : DB_FETCHMODE_ORDERED;
-        while (is_array($row = $result->fetchRow($fetchMode)) ) {
+        while (is_array($row = $result->fetchRow($fetchMode))) {
             if ($fetchMode == DB_FETCHMODE_ASSOC) {
                 $this->addOption($row[$textCol], $row[$valueCol]);
             } else {
@@ -455,7 +455,7 @@ 
      * @return    void
      * @throws    PEAR_Error
      */
-    function loadQuery(&$conn, $sql, $textCol=null, $valueCol=null, $values=null)
+    function loadQuery(&$conn, $sql, $textCol = null, $valueCol = null, $values = null)
     {
         if (is_string($conn)) {
             require_once('DB.php');
@@ -502,7 +502,7 @@ 
      * @return    PEAR_Error on error or true
      * @throws    PEAR_Error
      */
-    function load(&$options, $param1=null, $param2=null, $param3=null, $param4=null)
+    function load(&$options, $param1 = null, $param2 = null, $param3 = null, $param4 = null)
     {
         switch (true) {
             case is_array($options):
@@ -539,32 +539,32 @@ 
             $strHtml = '';
 
             if ($this->getComment() != '') {
-                $strHtml .= $tabs . '<!-- ' . $this->getComment() . " //-->\n";
+                $strHtml .= $tabs.'<!-- '.$this->getComment()." //-->\n";
             }
 
             if (!$this->getMultiple()) {
                 $attrString = $this->_getAttrString($this->_attributes);
             } else {
                 $myName = $this->getName();
-                $this->setName($myName . '[]');
+                $this->setName($myName.'[]');
                 $attrString = $this->_getAttrString($this->_attributes);
                 $this->setName($myName);
             }
 
-            $strHtml .= $tabs . '<select ' . $attrString . ">\n";
+            $strHtml .= $tabs.'<select '.$attrString.">\n";
 
-            $strValues = is_array($this->_values)? array_map('strval', $this->_values): array();
+            $strValues = is_array($this->_values) ? array_map('strval', $this->_values) : array();
 
             foreach ($this->_options as $option) {
 
                 if (!empty($strValues) && in_array($option['attr']['value'], $strValues, true)) {
                     $option['attr']['selected'] = 'selected';
                 }
-                $strHtml .= $tabs . "<option" . $this->_getAttrString($option['attr']) . '>' .
-                    $option['text'] . "</option>";
+                $strHtml .= $tabs."<option".$this->_getAttrString($option['attr']).'>'.
+                    $option['text']."</option>";
             }
             foreach ($this->_optgroups as $optgroup) {
-                $strHtml .= $tabs . '<optgroup label="' . $optgroup['label'] . '">';
+                $strHtml .= $tabs.'<optgroup label="'.$optgroup['label'].'">';
                 foreach ($optgroup['options'] as $option) {
                     $text = $option['text'];
                     unset($option['text']);
@@ -573,11 +573,11 @@ 
                         $option['selected'] = 'selected';
                     }
 
-                    $strHtml .= $tabs . " <option" . $this->_getAttrString($option) . '>' .$text . "</option>";
+                    $strHtml .= $tabs." <option".$this->_getAttrString($option).'>'.$text."</option>";
                 }
                 $strHtml .= "</optgroup>";
             }
-            return $strHtml . $tabs . '</select>';
+            return $strHtml.$tabs.'</select>';
         }
     }
 
@@ -602,22 +602,22 @@ 
                 }
             }
         }
-        $html = empty($value)? '&nbsp;': join('<br />', $value);
+        $html = empty($value) ? '&nbsp;' : join('<br />', $value);
         if ($this->_persistantFreeze) {
             $name = $this->getPrivateName();
             // Only use id attribute if doing single hidden input
             if (1 == count($value)) {
                 $id     = $this->getAttribute('id');
-                $idAttr = isset($id)? array('id' => $id): array();
+                $idAttr = isset($id) ? array('id' => $id) : array();
             } else {
                 $idAttr = array();
             }
             foreach ($value as $key => $item) {
-                $html .= '<input' . $this->_getAttrString(array(
+                $html .= '<input'.$this->_getAttrString(array(
                              'type'  => 'hidden',
                              'name'  => $name,
                              'value' => $this->_values[$key]
-                         ) + $idAttr) . ' />';
+                         ) + $idAttr).' />';
             }
         }
         return $html;
@@ -635,7 +635,7 @@ 
         $value = $this->_findValue($submitValues);
         if (is_null($value)) {
             $value = $this->getValue();
-        } elseif(!is_array($value)) {
+        } elseif (!is_array($value)) {
             $value = array($value);
         }
         if (is_array($value) && !empty($this->_options)) {

main/inc/lib/pear/HTML/QuickForm/submit.php

Doc Comments +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
      * Freeze the element so that only its value is returned
      *
      * @access    public
-     * @return    void
+     * @return    boolean
      */
     function freeze()
     {

Indentation +4 added lines, -4 removed lines

@@ -70,10 +70,10 @@
     // }}}
     // {{{ exportValue()
 
-   /**
-    * Only return the value if it is found within $submitValues (i.e. if
-    * this particular submit button was clicked)
-    */
+    /**
+     * Only return the value if it is found within $submitValues (i.e. if
+     * this particular submit button was clicked)
+     */
     function exportValue(&$submitValues, $assoc = false)
     {
         return $this->_prepareValue($this->_findValue($submitValues), $assoc);

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
      * @access    public
      * @return    void
      */
-    public function __construct($elementName=null, $value=null, $attributes=null)
+    public function __construct($elementName = null, $value = null, $attributes = null)
     {
         parent::__construct($elementName, null, $attributes);
         $this->setValue($value);

main/inc/lib/pear/HTML/QuickForm/textarea.php

Doc Comments +2 added lines

@@ -54,6 +54,8 @@
      * @param     string    Input field name attribute
      * @param     mixed     Label(s) for a field
      * @param     mixed     Either a typical HTML attribute string or an associative array
+     * @param string $elementName
+     * @param string $elementLabel
      * @since     1.0
      * @access    public
      * @return    void

Indentation +7 added lines, -7 removed lines

@@ -194,13 +194,13 @@
             return $this->getFrozenHtml();
         } else {
             return $this->_getTabs() .
-                   '<textarea' . $this->_getAttrString($this->_attributes) . '>' .
-                   // because we wrap the form later we don't want the text indented
-                   // Modified by Ivan Tcholakov, 16-MAR-2010.
-                   //preg_replace("/(\r\n|\n|\r)/", '&#010;', htmlspecialchars($this->_value)) .
-                   preg_replace("/(\r\n|\n|\r)/", '&#010;', @htmlspecialchars($this->_value, ENT_COMPAT, HTML_Common::charset())) .
-                   //
-                   '</textarea>';
+                    '<textarea' . $this->_getAttrString($this->_attributes) . '>' .
+                    // because we wrap the form later we don't want the text indented
+                    // Modified by Ivan Tcholakov, 16-MAR-2010.
+                    //preg_replace("/(\r\n|\n|\r)/", '&#010;', htmlspecialchars($this->_value)) .
+                    preg_replace("/(\r\n|\n|\r)/", '&#010;', @htmlspecialchars($this->_value, ENT_COMPAT, HTML_Common::charset())) .
+                    //
+                    '</textarea>';
         }
     }
 

Spacing +6 added lines, -6 removed lines

@@ -58,7 +58,7 @@ 
      * @access    public
      * @return    void
      */
-    public function __construct($elementName=null, $elementLabel=null, $attributes=null)
+    public function __construct($elementName = null, $elementLabel = null, $attributes = null)
     {
         $attributes['class'] = isset($attributes['class']) ? $attributes['class'] : 'form-control';
         $columnsSize = isset($attributes['cols-size']) ? $attributes['cols-size'] : null;
@@ -193,12 +193,12 @@ 
         if ($this->_flagFrozen) {
             return $this->getFrozenHtml();
         } else {
-            return $this->_getTabs() .
-                   '<textarea' . $this->_getAttrString($this->_attributes) . '>' .
+            return $this->_getTabs().
+                   '<textarea'.$this->_getAttrString($this->_attributes).'>'.
                    // because we wrap the form later we don't want the text indented
                    // Modified by Ivan Tcholakov, 16-MAR-2010.
                    //preg_replace("/(\r\n|\n|\r)/", '&#010;', htmlspecialchars($this->_value)) .
-                   preg_replace("/(\r\n|\n|\r)/", '&#010;', @htmlspecialchars($this->_value, ENT_COMPAT, HTML_Common::charset())) .
+                   preg_replace("/(\r\n|\n|\r)/", '&#010;', @htmlspecialchars($this->_value, ENT_COMPAT, HTML_Common::charset())).
                    //
                    '</textarea>';
         }
@@ -218,11 +218,11 @@ 
         $value = @htmlspecialchars($this->getValue(), ENT_COMPAT, HTML_Common::charset());
         //
         if ($this->getAttribute('wrap') == 'off') {
-            $html = $this->_getTabs() . '<pre>' . $value."</pre>\n";
+            $html = $this->_getTabs().'<pre>'.$value."</pre>\n";
         } else {
             $html = nl2br($value)."\n";
         }
-        return $html . $this->_getPersistantData();
+        return $html.$this->_getPersistantData();
     }
     
     /**

main/inc/lib/pear/HTML/Table.php

Doc Comments +2 added lines, -2 removed lines

@@ -665,7 +665,7 @@ 
      * Adds a table row and returns the row identifier
      * @param    array     $contents     (optional) Must be a indexed array of
      *                                   valid cell contents
-     * @param    mixed     $attributes   (optional) Associative array or string
+     * @param    string     $attributes   (optional) Associative array or string
      *                                   of table row attributes. This can also
      *                                   be an array of attributes, in which
      *                                   case the attributes will be repeated
@@ -719,7 +719,7 @@ 
     /**
      * Updates the row attributes for an existing row
      * @param    int      $row          Row index
-     * @param    mixed    $attributes   Associative array or string of table row
+     * @param    string    $attributes   Associative array or string of table row
      *                                  attributes
      * @param    bool     $inTR         false if attributes are to be applied in
      *                                  TD tags; true if attributes are to be

Spacing +26 added lines, -26 removed lines

@@ -164,8 +164,8 @@ 
      */
     function HTML_Table($attributes = null, $tabOffset = 0, $useTGroups = false)
     {
-        parent::__construct($attributes, (int)$tabOffset);
-        $this->_useTGroups = (boolean)$useTGroups;
+        parent::__construct($attributes, (int) $tabOffset);
+        $this->_useTGroups = (boolean) $useTGroups;
         $this->addBody();
         if ($this->_useTGroups) {
             $this->_thead = new HTML_Table_Storage($tabOffset, $this->_useTGroups);
@@ -272,12 +272,12 @@ 
     function _adjustTbodyCount($body, $method)
     {
         if ($this->_autoGrow) {
-            while ($this->_tbodyCount <= (int)$body) {
+            while ($this->_tbodyCount <= (int) $body) {
                 $this->addBody();
             }
         } else {
-            return PEAR::raiseError('Invalid body reference[' .
-                $body . '] in HTML_Table::' . $method);
+            return PEAR::raiseError('Invalid body reference['.
+                $body.'] in HTML_Table::'.$method);
         }
     }
 
@@ -939,26 +939,26 @@ 
             $tBodyMaxColCount = max($tBodyColCounts);
         }
         if ($this->_comment) {
-            $strHtml .= $tabs . "<!-- $this->_comment -->" . $lnEnd;
+            $strHtml .= $tabs."<!-- $this->_comment -->".$lnEnd;
         }
         if ($this->getRowCount() > 0 && $tBodyMaxColCount > 0) {
             $strHtml .=
-                $tabs . '<table' . $this->_getAttrString($this->_attributes) . '>' . $lnEnd;
+                $tabs.'<table'.$this->_getAttrString($this->_attributes).'>'.$lnEnd;
             if (!empty($this->_caption)) {
                 $attr = $this->_caption['attr'];
                 $contents = $this->_caption['contents'];
-                $strHtml .= $tabs . $tab . '<caption' . $this->_getAttrString($attr) . '>';
+                $strHtml .= $tabs.$tab.'<caption'.$this->_getAttrString($attr).'>';
                 if (is_array($contents)) {
                     $contents = implode(', ', $contents);
                 }
                 $strHtml .= $contents;
-                $strHtml .= '</caption>' . $lnEnd;
+                $strHtml .= '</caption>'.$lnEnd;
             }
             if (!empty($this->_colgroup)) {
                 foreach ($this->_colgroup as $g => $col) {
                     $attr = $this->_colgroup[$g]['attr'];
                     $contents = $this->_colgroup[$g]['contents'];
-                    $strHtml .= $tabs . $tab . '<colgroup' . $this->_getAttrString($attr) . '>';
+                    $strHtml .= $tabs.$tab.'<colgroup'.$this->_getAttrString($attr).'>';
                     if (!empty($contents)) {
                         $strHtml .= $lnEnd;
                         if (!is_array($contents)) {
@@ -966,11 +966,11 @@ 
                         }
                         foreach ($contents as $a => $colAttr) {
                             $attr = $this->_parseAttributes($colAttr);
-                            $strHtml .= $tabs . $tab . $tab . '<col' . $this->_getAttrString($attr) . ' />' . $lnEnd;
+                            $strHtml .= $tabs.$tab.$tab.'<col'.$this->_getAttrString($attr).' />'.$lnEnd;
                         }
-                        $strHtml .= $tabs . $tab;
+                        $strHtml .= $tabs.$tab;
                     }
-                    $strHtml .= '</colgroup>' . $lnEnd;
+                    $strHtml .= '</colgroup>'.$lnEnd;
                 }
             }
             if ($this->_useTGroups) {
@@ -986,31 +986,31 @@ 
                 if ($this->_thead !== null) {
                     $this->_thead->setColCount($maxColCount);
                     if ($this->_thead->getRowCount() > 0) {
-                        $strHtml .= $tabs . $tab . '<thead' .
-                                    $this->_getAttrString($this->_thead->_attributes) .
-                                    '>' . $lnEnd;
+                        $strHtml .= $tabs.$tab.'<thead'.
+                                    $this->_getAttrString($this->_thead->_attributes).
+                                    '>'.$lnEnd;
                         $strHtml .= $this->_thead->toHtml($tabs, $tab);
-                        $strHtml .= $tabs . $tab . '</thead>' . $lnEnd;
+                        $strHtml .= $tabs.$tab.'</thead>'.$lnEnd;
                     }
                 }
                 if ($this->_tfoot !== null) {
                     $this->_tfoot->setColCount($maxColCount);
                     if ($this->_tfoot->getRowCount() > 0) {
-                        $strHtml .= $tabs . $tab . '<tfoot' .
-                                    $this->_getAttrString($this->_tfoot->_attributes) .
-                                    '>' . $lnEnd;
+                        $strHtml .= $tabs.$tab.'<tfoot'.
+                                    $this->_getAttrString($this->_tfoot->_attributes).
+                                    '>'.$lnEnd;
                         $strHtml .= $this->_tfoot->toHtml($tabs, $tab);
-                        $strHtml .= $tabs . $tab . '</tfoot>' . $lnEnd;
+                        $strHtml .= $tabs.$tab.'</tfoot>'.$lnEnd;
                     }
                 }
                 for ($i = 0; $i < $this->_tbodyCount; $i++) {
                     $this->_tbodies[$i]->setColCount($maxColCount);
                     if ($this->_tbodies[$i]->getRowCount() > 0) {
-                        $strHtml .= $tabs . $tab . '<tbody' .
-                                    $this->_getAttrString($this->_tbodies[$i]->_attributes) .
-                                    '>' . $lnEnd;
+                        $strHtml .= $tabs.$tab.'<tbody'.
+                                    $this->_getAttrString($this->_tbodies[$i]->_attributes).
+                                    '>'.$lnEnd;
                         $strHtml .= $this->_tbodies[$i]->toHtml($tabs, $tab);
-                        $strHtml .= $tabs . $tab . '</tbody>' . $lnEnd;
+                        $strHtml .= $tabs.$tab.'</tbody>'.$lnEnd;
                     }
                 }
             } else {
@@ -1019,7 +1019,7 @@ 
                     $strHtml .= $this->_tbodies[$i]->toHtml($tabs, $tab);
                 }
             }
-            $strHtml .= $tabs . '</table>' . $lnEnd;
+            $strHtml .= $tabs.'</table>'.$lnEnd;
         }
         return $strHtml;
     }

Indentation +2 added lines, -3 removed lines

@@ -48,7 +48,6 @@ 
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
  *
  * @category   HTML
  * @package    HTML_Table
@@ -256,7 +255,7 @@ 
 
         $body = $this->_tbodyCount++;
         $this->_tbodies[$body] = new HTML_Table_Storage($this->_tabOffset,
-                                                         $this->_useTGroups);
+                                                            $this->_useTGroups);
         $this->_tbodies[$body]->setAutoFill($this->_autoFill);
         $this->_tbodies[$body]->setAttributes($attributes);
         return $body;
@@ -308,7 +307,7 @@ 
         if (isset($colgroup)) {
             $attributes = $this->_parseAttributes($attributes);
             $this->_colgroup[] = array('attr' => $attributes,
-                                       'contents' => $colgroup);
+                                        'contents' => $colgroup);
         } else {
             $this->_colgroup = array();
         }

main/inc/lib/pear/HTML/Table/Storage.php

Doc Comments +2 added lines, -3 removed lines

@@ -165,7 +165,7 @@ 
     /**
      * Returns the autoFill value
      * @access   public
-     * @return   mixed
+     * @return   string
      */
     function getAutoFill()
     {
@@ -174,7 +174,6 @@ 
 
     /**
      * Sets the autoGrow value
-     * @param    bool   $fill
      * @access   public
      */
     function setAutoGrow($grow)
@@ -185,7 +184,7 @@ 
     /**
      * Returns the autoGrow value
      * @access   public
-     * @return   mixed
+     * @return   boolean
      */
     function getAutoGrow()
     {

Spacing +20 added lines, -20 removed lines

@@ -128,8 +128,8 @@ 
      */
     function HTML_Table_Storage($tabOffset = 0, $useTGroups = false)
     {
-        parent::__construct(null, (int)$tabOffset);
-        $this->_useTGroups = (boolean)$useTGroups;
+        parent::__construct(null, (int) $tabOffset);
+        $this->_useTGroups = (boolean) $useTGroups;
     }
 
     /**
@@ -288,7 +288,7 @@ 
      */
     function setCellAttributes($row, $col, $attributes)
     {
-        if (   isset($this->_structure[$row][$col])
+        if (isset($this->_structure[$row][$col])
             && $this->_structure[$row][$col] == '__SPANNED__'
         ) {
             return;
@@ -314,7 +314,7 @@ 
      */
     function updateCellAttributes($row, $col, $attributes)
     {
-        if (   isset($this->_structure[$row][$col])
+        if (isset($this->_structure[$row][$col])
             && $this->_structure[$row][$col] == '__SPANNED__'
         ) {
             return;
@@ -337,13 +337,13 @@ 
      */
     function getCellAttributes($row, $col)
     {
-        if (   isset($this->_structure[$row][$col])
+        if (isset($this->_structure[$row][$col])
             && $this->_structure[$row][$col] != '__SPANNED__'
         ) {
             return $this->_structure[$row][$col]['attr'];
         } elseif (!isset($this->_structure[$row][$col])) {
-            return PEAR::raiseError('Invalid table cell reference[' .
-                $row . '][' . $col . '] in HTML_Table::getCellAttributes');
+            return PEAR::raiseError('Invalid table cell reference['.
+                $row.']['.$col.'] in HTML_Table::getCellAttributes');
         }
         return;
     }
@@ -405,7 +405,7 @@ 
      */
     function _setSingleCellContents($row, $col, $contents, $type = 'TD')
     {
-        if (   isset($this->_structure[$row][$col])
+        if (isset($this->_structure[$row][$col])
             && $this->_structure[$row][$col] == '__SPANNED__'
         ) {
             return;
@@ -427,14 +427,14 @@ 
      */
     function getCellContents($row, $col)
     {
-        if (   isset($this->_structure[$row][$col])
+        if (isset($this->_structure[$row][$col])
             && $this->_structure[$row][$col] == '__SPANNED__'
         ) {
             return;
         }
         if (!isset($this->_structure[$row][$col])) {
-            return PEAR::raiseError('Invalid table cell reference[' .
-                $row . '][' . $col . '] in HTML_Table::getCellContents');
+            return PEAR::raiseError('Invalid table cell reference['.
+                $row.']['.$col.'] in HTML_Table::getCellContents');
         }
         return $this->_structure[$row][$col]['contents'];
     }
@@ -477,7 +477,7 @@ 
         $inTR = false)
     {
         if (isset($contents) && !is_array($contents)) {
-            return PEAR::raiseError('First parameter to HTML_Table::addRow ' .
+            return PEAR::raiseError('First parameter to HTML_Table::addRow '.
                 'must be an array');
         }
         if (is_null($contents)) {
@@ -620,7 +620,7 @@ 
     function addCol($contents = null, $attributes = null, $type = 'td')
     {
         if (isset($contents) && !is_array($contents)) {
-            return PEAR::raiseError('First parameter to HTML_Table::addCol ' .
+            return PEAR::raiseError('First parameter to HTML_Table::addCol '.
                 'must be an array');
         }
         if (is_null($contents)) {
@@ -727,13 +727,13 @@ 
             $extraTab = '';
         }
         if ($this->_cols > 0) {
-            for ($i = 0 ; $i < $this->_rows ; $i++) {
+            for ($i = 0; $i < $this->_rows; $i++) {
                 $attr = '';
                 if (isset($this->_structure[$i]['attr'])) {
                     $attr = $this->_getAttrString($this->_structure[$i]['attr']);
                 }
-                $strHtml .= $tabs .$tab . $extraTab . '<tr'.$attr.'>' . $lnEnd;
-                for ($j = 0 ; $j < $this->_cols ; $j++) {
+                $strHtml .= $tabs.$tab.$extraTab.'<tr'.$attr.'>'.$lnEnd;
+                for ($j = 0; $j < $this->_cols; $j++) {
                     $attr     = '';
                     $contents = '';
                     $type     = 'td';
@@ -753,7 +753,7 @@ 
                     if (is_object($contents)) {
                         // changes indent and line end settings on nested tables
                         if (is_subclass_of($contents, 'html_common')) {
-                            $contents->setTab($tab . $extraTab);
+                            $contents->setTab($tab.$extraTab);
                             $contents->setTabOffset($this->_tabOffset + 3);
                             $contents->_nestLevel = $this->_nestLevel + 1;
                             $contents->setLineEnd($this->_getLineEnd());
@@ -768,7 +768,7 @@ 
                         $contents = implode(', ', $contents);
                     }
 
-                    $typeContent = $tabs . $tab . $tab . $extraTab . "<$type" . $this->_getAttrString($attr) . '>';
+                    $typeContent = $tabs.$tab.$tab.$extraTab."<$type".$this->_getAttrString($attr).'>';
 
                     if (empty($contents)) {
                         if (isset($this->_autoFill) && $this->_autoFill) {
@@ -777,14 +777,14 @@ 
                     } else {
                         $typeContent .= $contents;
                     }
-                    $typeContent .= "</$type>" . $lnEnd;
+                    $typeContent .= "</$type>".$lnEnd;
 
                     if (!empty($contents)) {
                         $strHtml .= $typeContent;
                     }
 
                 }
-                $strHtml .= $tabs . $tab . $extraTab . '</tr>' . $lnEnd;
+                $strHtml .= $tabs.$tab.$extraTab.'</tr>'.$lnEnd;
             }
         }
         return $strHtml;