chamilo / chamilo-lms

main/inc/lib/pear/Exception.php

Doc Comments +1 added lines

@@ -116,6 +116,7 @@
      * @param string exception message
      * @param int|Exception|PEAR_Error|array|null exception cause
      * @param int|null exception code or null
+     * @param string $message
      */
     public function __construct($message, $p2 = null, $p3 = null)
     {

Indentation +32 added lines, -32 removed lines

@@ -234,9 +234,9 @@ 
     {
         $trace = $this->getTraceSafe();
         $cause = array('class'   => get_class($this),
-                       'message' => $this->message,
-                       'file' => 'unknown',
-                       'line' => 'unknown');
+                        'message' => $this->message,
+                        'file' => 'unknown',
+                        'line' => 'unknown');
         if (isset($trace[0])) {
             if (isset($trace[0]['file'])) {
                 $cause['file'] = $trace[0]['file'];
@@ -248,28 +248,28 @@ 
             $this->cause->getCauseMessage($causes);
         } elseif ($this->cause instanceof Exception) {
             $causes[] = array('class'   => get_class($this->cause),
-                              'message' => $this->cause->getMessage(),
-                              'file' => $this->cause->getFile(),
-                              'line' => $this->cause->getLine());
+                                'message' => $this->cause->getMessage(),
+                                'file' => $this->cause->getFile(),
+                                'line' => $this->cause->getLine());
         } elseif (class_exists('PEAR_Error') && $this->cause instanceof PEAR_Error) {
             $causes[] = array('class' => get_class($this->cause),
-                              'message' => $this->cause->getMessage(),
-                              'file' => 'unknown',
-                              'line' => 'unknown');
+                                'message' => $this->cause->getMessage(),
+                                'file' => 'unknown',
+                                'line' => 'unknown');
         } elseif (is_array($this->cause)) {
             foreach ($this->cause as $cause) {
                 if ($cause instanceof PEAR_Exception) {
                     $cause->getCauseMessage($causes);
                 } elseif ($cause instanceof Exception) {
                     $causes[] = array('class'   => get_class($cause),
-                                   'message' => $cause->getMessage(),
-                                   'file' => $cause->getFile(),
-                                   'line' => $cause->getLine());
+                                    'message' => $cause->getMessage(),
+                                    'file' => $cause->getFile(),
+                                    'line' => $cause->getLine());
                 } elseif (class_exists('PEAR_Error') && $cause instanceof PEAR_Error) {
                     $causes[] = array('class' => get_class($cause),
-                                      'message' => $cause->getMessage(),
-                                      'file' => 'unknown',
-                                      'line' => 'unknown');
+                                        'message' => $cause->getMessage(),
+                                        'file' => 'unknown',
+                                        'line' => 'unknown');
                 } elseif (is_array($cause) && isset($cause['message'])) {
                     // PEAR_ErrorStack warning
                     $causes[] = array(
@@ -327,19 +327,19 @@ 
         $html =  '<table style="border: 1px" cellspacing="0">' . "\n";
         foreach ($causes as $i => $cause) {
             $html .= '<tr><td colspan="3" style="background: #ff9999">'
-               . str_repeat('-', $i) . ' <b>' . $cause['class'] . '</b>: '
-               . htmlspecialchars($cause['message']) . ' in <b>' . $cause['file'] . '</b> '
-               . 'on line <b>' . $cause['line'] . '</b>'
-               . "</td></tr>\n";
+                . str_repeat('-', $i) . ' <b>' . $cause['class'] . '</b>: '
+                . htmlspecialchars($cause['message']) . ' in <b>' . $cause['file'] . '</b> '
+                . 'on line <b>' . $cause['line'] . '</b>'
+                . "</td></tr>\n";
         }
         $html .= '<tr><td colspan="3" style="background-color: #aaaaaa; text-align: center; font-weight: bold;">Exception trace</td></tr>' . "\n"
-               . '<tr><td style="text-align: center; background: #cccccc; width:20px; font-weight: bold;">#</td>'
-               . '<td style="text-align: center; background: #cccccc; font-weight: bold;">Function</td>'
-               . '<td style="text-align: center; background: #cccccc; font-weight: bold;">Location</td></tr>' . "\n";
+                . '<tr><td style="text-align: center; background: #cccccc; width:20px; font-weight: bold;">#</td>'
+                . '<td style="text-align: center; background: #cccccc; font-weight: bold;">Function</td>'
+                . '<td style="text-align: center; background: #cccccc; font-weight: bold;">Location</td></tr>' . "\n";
 
         foreach ($trace as $k => $v) {
             $html .= '<tr><td style="text-align: center;">' . $k . '</td>'
-                   . '<td>';
+                    . '<td>';
             if (!empty($v['class'])) {
                 $html .= $v['class'] . $v['type'];
             }
@@ -361,15 +361,15 @@ 
                 }
             }
             $html .= '(' . implode(', ',$args) . ')'
-                   . '</td>'
-                   . '<td>' . (isset($v['file']) ? $v['file'] : 'unknown')
-                   . ':' . (isset($v['line']) ? $v['line'] : 'unknown')
-                   . '</td></tr>' . "\n";
+                    . '</td>'
+                    . '<td>' . (isset($v['file']) ? $v['file'] : 'unknown')
+                    . ':' . (isset($v['line']) ? $v['line'] : 'unknown')
+                    . '</td></tr>' . "\n";
         }
         $html .= '<tr><td style="text-align: center;">' . ($k+1) . '</td>'
-               . '<td>{main}</td>'
-               . '<td>&nbsp;</td></tr>' . "\n"
-               . '</table>';
+                . '<td>{main}</td>'
+                . '<td>&nbsp;</td></tr>' . "\n"
+                . '</table>';
         return $html;
     }
 
@@ -380,8 +380,8 @@ 
         $causeMsg = '';
         foreach ($causes as $i => $cause) {
             $causeMsg .= str_repeat(' ', $i) . $cause['class'] . ': '
-                   . $cause['message'] . ' in ' . $cause['file']
-                   . ' on line ' . $cause['line'] . "\n";
+                    . $cause['message'] . ' in ' . $cause['file']
+                    . ' on line ' . $cause['line'] . "\n";
         }
         return $causeMsg . $this->getTraceAsString();
     }

Spacing +24 added lines, -26 removed lines

@@ -126,7 +126,7 @@ 
             // using is_object allows both Exception and PEAR_Error
             if (is_object($p2) && !($p2 instanceof Exception)) {
                 if (!class_exists('PEAR_Error') || !($p2 instanceof PEAR_Error)) {
-                    throw new PEAR_Exception('exception cause must be Exception, ' .
+                    throw new PEAR_Exception('exception cause must be Exception, '.
                         'array, or PEAR_Error');
                 }
             }
@@ -276,11 +276,9 @@ 
                         'class' => $cause['package'],
                         'message' => $cause['message'],
                         'file' => isset($cause['context']['file']) ?
-                                            $cause['context']['file'] :
-                                            'unknown',
+                                            $cause['context']['file'] : 'unknown',
                         'line' => isset($cause['context']['line']) ?
-                                            $cause['context']['line'] :
-                                            'unknown',
+                                            $cause['context']['line'] : 'unknown',
                     );
                 }
             }
@@ -293,7 +291,7 @@ 
             $this->_trace = $this->getTrace();
             if (empty($this->_trace)) {
                 $backtrace = debug_backtrace();
-                $this->_trace = array($backtrace[count($backtrace)-1]);
+                $this->_trace = array($backtrace[count($backtrace) - 1]);
             }
         }
         return $this->_trace;
@@ -324,24 +322,24 @@ 
         $trace = $this->getTraceSafe();
         $causes = array();
         $this->getCauseMessage($causes);
-        $html =  '<table style="border: 1px" cellspacing="0">' . "\n";
+        $html = '<table style="border: 1px" cellspacing="0">'."\n";
         foreach ($causes as $i => $cause) {
             $html .= '<tr><td colspan="3" style="background: #ff9999">'
-               . str_repeat('-', $i) . ' <b>' . $cause['class'] . '</b>: '
-               . htmlspecialchars($cause['message']) . ' in <b>' . $cause['file'] . '</b> '
-               . 'on line <b>' . $cause['line'] . '</b>'
+               . str_repeat('-', $i).' <b>'.$cause['class'].'</b>: '
+               . htmlspecialchars($cause['message']).' in <b>'.$cause['file'].'</b> '
+               . 'on line <b>'.$cause['line'].'</b>'
                . "</td></tr>\n";
         }
-        $html .= '<tr><td colspan="3" style="background-color: #aaaaaa; text-align: center; font-weight: bold;">Exception trace</td></tr>' . "\n"
+        $html .= '<tr><td colspan="3" style="background-color: #aaaaaa; text-align: center; font-weight: bold;">Exception trace</td></tr>'."\n"
                . '<tr><td style="text-align: center; background: #cccccc; width:20px; font-weight: bold;">#</td>'
                . '<td style="text-align: center; background: #cccccc; font-weight: bold;">Function</td>'
-               . '<td style="text-align: center; background: #cccccc; font-weight: bold;">Location</td></tr>' . "\n";
+               . '<td style="text-align: center; background: #cccccc; font-weight: bold;">Location</td></tr>'."\n";
 
         foreach ($trace as $k => $v) {
-            $html .= '<tr><td style="text-align: center;">' . $k . '</td>'
+            $html .= '<tr><td style="text-align: center;">'.$k.'</td>'
                    . '<td>';
             if (!empty($v['class'])) {
-                $html .= $v['class'] . $v['type'];
+                $html .= $v['class'].$v['type'];
             }
             $html .= $v['function'];
             $args = array();
@@ -353,22 +351,22 @@ 
                     elseif (is_bool($arg)) $args[] = $arg ? 'true' : 'false';
                     elseif (is_int($arg) || is_double($arg)) $args[] = $arg;
                     else {
-                        $arg = (string)$arg;
+                        $arg = (string) $arg;
                         $str = htmlspecialchars(substr($arg, 0, 16));
                         if (strlen($arg) > 16) $str .= '&hellip;';
-                        $args[] = "'" . $str . "'";
+                        $args[] = "'".$str."'";
                     }
                 }
             }
-            $html .= '(' . implode(', ',$args) . ')'
+            $html .= '('.implode(', ', $args).')'
                    . '</td>'
-                   . '<td>' . (isset($v['file']) ? $v['file'] : 'unknown')
-                   . ':' . (isset($v['line']) ? $v['line'] : 'unknown')
-                   . '</td></tr>' . "\n";
+                   . '<td>'.(isset($v['file']) ? $v['file'] : 'unknown')
+                   . ':'.(isset($v['line']) ? $v['line'] : 'unknown')
+                   . '</td></tr>'."\n";
         }
-        $html .= '<tr><td style="text-align: center;">' . ($k+1) . '</td>'
+        $html .= '<tr><td style="text-align: center;">'.($k + 1).'</td>'
                . '<td>{main}</td>'
-               . '<td>&nbsp;</td></tr>' . "\n"
+               . '<td>&nbsp;</td></tr>'."\n"
                . '</table>';
         return $html;
     }
@@ -379,10 +377,10 @@ 
         $this->getCauseMessage($causes);
         $causeMsg = '';
         foreach ($causes as $i => $cause) {
-            $causeMsg .= str_repeat(' ', $i) . $cause['class'] . ': '
-                   . $cause['message'] . ' in ' . $cause['file']
-                   . ' on line ' . $cause['line'] . "\n";
+            $causeMsg .= str_repeat(' ', $i).$cause['class'].': '
+                   . $cause['message'].' in '.$cause['file']
+                   . ' on line '.$cause['line']."\n";
         }
-        return $causeMsg . $this->getTraceAsString();
+        return $causeMsg.$this->getTraceAsString();
     }
 }

Braces +14 added lines, -7 removed lines

@@ -347,15 +347,22 @@
             $args = array();
             if (!empty($v['args'])) {
                 foreach ($v['args'] as $arg) {
-                    if (is_null($arg)) $args[] = 'null';
-                    elseif (is_array($arg)) $args[] = 'Array';
-                    elseif (is_object($arg)) $args[] = 'Object('.get_class($arg).')';
-                    elseif (is_bool($arg)) $args[] = $arg ? 'true' : 'false';
-                    elseif (is_int($arg) || is_double($arg)) $args[] = $arg;
-                    else {
+                    if (is_null($arg)) {
+                        $args[] = 'null';
+                    } elseif (is_array($arg)) {
+                        $args[] = 'Array';
+                    } elseif (is_object($arg)) {
+                        $args[] = 'Object('.get_class($arg).')';
+                    } elseif (is_bool($arg)) {
+                        $args[] = $arg ? 'true' : 'false';
+                    } elseif (is_int($arg) || is_double($arg)) {
+                        $args[] = $arg;
+                    } else {
                         $arg = (string)$arg;
                         $str = htmlspecialchars(substr($arg, 0, 16));
-                        if (strlen($arg) > 16) $str .= '…';
+                        if (strlen($arg) > 16) {
+                            $str .= '…';
+                        }
                         $args[] = "'" . $str . "'";
                     }
                 }

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

Doc Comments +2 added lines, -1 removed lines

@@ -199,7 +199,7 @@ 
      * @param     array     $attributes   Array of attribute
      * @since     1.0
      * @access    private
-     * @return    bool
+     * @return    boolean|null
      */
     function _getAttrKey($attr, $attributes)
     {
@@ -265,6 +265,7 @@ 
      *
      * @param   string  Attribute name
      * @param   string  Attribute value (will be set to $name if omitted)
+     * @param string $name
      * @access  public
      */
     function setAttribute($name, $value = null)

Indentation +1 added lines, -1 removed lines

@@ -141,7 +141,7 @@
         if (is_array($attributes)) {
             $charset = HTML_Common::charset();
             foreach ($attributes as $key => $value) {
-            	// Modified by Ivan Tcholakov, 16-MAR-2010
+                // Modified by Ivan Tcholakov, 16-MAR-2010
                 $value = @htmlspecialchars($value, ENT_COMPAT, $charset);
                 $strAttr .= ' ' . $key . '= "' . $value. '"';
             }

Spacing +3 added lines, -3 removed lines

@@ -143,7 +143,7 @@ 
             foreach ($attributes as $key => $value) {
             	// Modified by Ivan Tcholakov, 16-MAR-2010
                 $value = @htmlspecialchars($value, ENT_COMPAT, $charset);
-                $strAttr .= ' ' . $key . '= "' . $value. '"';
+                $strAttr .= ' '.$key.'= "'.$value.'"';
             }
         }
         return $strAttr;
@@ -170,10 +170,10 @@ 
             return $ret;
 
         } elseif (is_string($attributes)) {
-            $preg = "/(([A-Za-z_:]|[^\\x00-\\x7F])([A-Za-z0-9_:.-]|[^\\x00-\\x7F])*)" .
+            $preg = "/(([A-Za-z_:]|[^\\x00-\\x7F])([A-Za-z0-9_:.-]|[^\\x00-\\x7F])*)".
                 "([ \\n\\t\\r]+)?(=([ \\n\\t\\r]+)?(\"[^\"]*\"|'[^']*'|[^ \\n\\t\\r]*))?/";
             if (preg_match_all($preg, $attributes, $regs)) {
-                for ($counter=0; $counter<count($regs[1]); $counter++) {
+                for ($counter = 0; $counter < count($regs[1]); $counter++) {
                     $name  = $regs[1][$counter];
                     $check = $regs[0][$counter];
                     $value = $regs[7][$counter];

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

Doc Comments +4 added lines, -1 removed lines

@@ -689,6 +689,8 @@ 
     * @param    HTML_QuickForm_element  Element to insert
     * @param    string                  Name of the element before which the new
     *                                   one is inserted
+    * @param HTML_QuickForm_element $element
+    * @param string $nameAfter
     * @return   HTML_QuickForm_element  reference to inserted element
     * @throws   HTML_QuickForm_Error
     */
@@ -1290,7 +1292,7 @@ 
      * Applies a data filter for the given field(s)
      *
      * @param    mixed     $element       Form element name or array of such names
-     * @param    mixed     $filter        Callback, either function name or array(&$object, 'method')
+     * @param    string     $filter        Callback, either function name or array(&$object, 'method')
      * @since    2.0
      * @access   public
      * @throws   HTML_QuickForm_Error
@@ -2042,6 +2044,7 @@ 
      *
      * @access  public
      * @param   int     error code
+     * @param integer $value
      * @return  string  error message
      * @static
      */

Spacing +86 added lines, -86 removed lines

@@ -42,16 +42,16 @@ 
  *
  * @see HTML_QuickForm::errorMessage()
  */
-define('QUICKFORM_OK',                      1);
-define('QUICKFORM_ERROR',                  -1);
-define('QUICKFORM_INVALID_RULE',           -2);
-define('QUICKFORM_NONEXIST_ELEMENT',       -3);
-define('QUICKFORM_INVALID_FILTER',         -4);
-define('QUICKFORM_UNREGISTERED_ELEMENT',   -5);
-define('QUICKFORM_INVALID_ELEMENT_NAME',   -6);
-define('QUICKFORM_INVALID_PROCESS',        -7);
-define('QUICKFORM_DEPRECATED',             -8);
-define('QUICKFORM_INVALID_DATASOURCE',     -9);
+define('QUICKFORM_OK', 1);
+define('QUICKFORM_ERROR', -1);
+define('QUICKFORM_INVALID_RULE', -2);
+define('QUICKFORM_NONEXIST_ELEMENT', -3);
+define('QUICKFORM_INVALID_FILTER', -4);
+define('QUICKFORM_UNREGISTERED_ELEMENT', -5);
+define('QUICKFORM_INVALID_ELEMENT_NAME', -6);
+define('QUICKFORM_INVALID_PROCESS', -7);
+define('QUICKFORM_DEPRECATED', -8);
+define('QUICKFORM_INVALID_DATASOURCE', -9);
 /**#@-*/
 
 // }}}
@@ -229,7 +229,7 @@ 
      * @param    bool        $trackSubmit       (optional)Whether to track if the form was submitted by adding a special hidden field
      * @access   public
      */
-    public function __construct($formName='', $method='post', $action='', $target='', $attributes=null, $trackSubmit = false)
+    public function __construct($formName = '', $method = 'post', $action = '', $target = '', $attributes = null, $trackSubmit = false)
     {
         parent::__construct($attributes);
         $method = (strtoupper($method) == 'GET') ? 'get' : 'post';
@@ -246,9 +246,9 @@ 
             'id' => $form_id
         ) + $target;
         $this->updateAttributes($attributes);
-        if (!$trackSubmit || isset($_REQUEST['_qf__' . $formName])) {
+        if (!$trackSubmit || isset($_REQUEST['_qf__'.$formName])) {
             if (1 == get_magic_quotes_gpc()) {
-                $this->_submitValues = $this->_recursiveFilter('stripslashes', 'get' == $method? $_GET: $_POST);
+                $this->_submitValues = $this->_recursiveFilter('stripslashes', 'get' == $method ? $_GET : $_POST);
                 foreach ($_FILES as $keyFirst => $valFirst) {
                     foreach ($valFirst as $keySecond => $valSecond) {
                         if ('name' == $keySecond) {
@@ -259,14 +259,14 @@ 
                     }
                 }
             } else {
-                $this->_submitValues = 'get' == $method? $_GET: $_POST;
+                $this->_submitValues = 'get' == $method ? $_GET : $_POST;
                 $this->_submitFiles  = $_FILES;
             }
             $this->_flagSubmitted = count($this->_submitValues) > 0 || count($this->_submitFiles) > 0;
         }
         if ($trackSubmit) {
-            unset($this->_submitValues['_qf__' . $formName]);
-            $this->addElement('hidden', '_qf__' . $formName, null);
+            unset($this->_submitValues['_qf__'.$formName]);
+            $this->addElement('hidden', '_qf__'.$formName, null);
         }
 
         if (preg_match('/^([0-9]+)([a-zA-Z]*)$/', ini_get('upload_max_filesize'), $matches)) {
@@ -345,7 +345,7 @@ 
      */
     public static function registerRule($ruleName, $type, $data1, $data2 = null)
     {
-        $registry =& HTML_QuickForm_RuleRegistry::singleton();
+        $registry = & HTML_QuickForm_RuleRegistry::singleton();
         $registry->registerRule($ruleName, $type, $data1, $data2);
     } // end func registerRule
 
@@ -360,7 +360,7 @@ 
      * @access    public
      * @return    boolean
      */
-    function elementExists($element=null)
+    function elementExists($element = null)
     {
         return isset($this->_elementIndex[$element]);
     } // end func elementExists
@@ -385,7 +385,7 @@ 
     function setDatasource(&$datasource, $defaultsFilter = null, $constantsFilter = null)
     {
         if (is_object($datasource)) {
-            $this->_datasource =& $datasource;
+            $this->_datasource = & $datasource;
             if (is_callable(array($datasource, 'defaultValues'))) {
                 $this->setDefaults($datasource->defaultValues($this), $defaultsFilter);
             }
@@ -496,7 +496,7 @@ 
         if (!$this->elementExists('MAX_FILE_SIZE')) {
             $this->addElement('hidden', 'MAX_FILE_SIZE', $this->_maxFileSize);
         } else {
-            $el =& $this->getElement('MAX_FILE_SIZE');
+            $el = & $this->getElement('MAX_FILE_SIZE');
             $el->updateAttributes(array('value' => $this->_maxFileSize));
         }
     } // end func setMaxFileSize
@@ -634,7 +634,7 @@ 
            $elementObject->onQuickFormEvent('updateValue', null, $this);
         } else {
             $args = func_get_args();
-            $elementObject =& $this->_loadElement('addElement', $element, array_slice($args, 1));
+            $elementObject = & $this->_loadElement('addElement', $element, array_slice($args, 1));
             if (PEAR::isError($elementObject)) {
                 return $elementObject;
             }
@@ -646,7 +646,7 @@ 
             isset($this->_elementIndex[$elementName])
         ) {
             if ($this->_elements[$this->_elementIndex[$elementName]]->getType() == $elementObject->getType()) {
-                $this->_elements[] =& $elementObject;
+                $this->_elements[] = & $elementObject;
                 $elKeys = array_keys($this->_elements);
                 $this->_duplicateIndex[$elementName][] = end($elKeys);
             } else {
@@ -661,7 +661,7 @@ 
                 return $error;
             }
         } else {
-            $this->_elements[] =& $elementObject;
+            $this->_elements[] = & $elementObject;
             $elKeys = array_keys($this->_elements);
             $this->_elementIndex[$elementName] = end($elKeys);
         }
@@ -695,7 +695,7 @@ 
     function &insertElementBefore(&$element, $nameAfter)
     {
         if (!empty($this->_duplicateIndex[$nameAfter])) {
-            $error = PEAR::raiseError(null, QUICKFORM_INVALID_ELEMENT_NAME, null, E_USER_WARNING, 'Several elements named "' . $nameAfter . '" exist in HTML_QuickForm::insertElementBefore().', 'HTML_QuickForm_Error', true);
+            $error = PEAR::raiseError(null, QUICKFORM_INVALID_ELEMENT_NAME, null, E_USER_WARNING, 'Several elements named "'.$nameAfter.'" exist in HTML_QuickForm::insertElementBefore().', 'HTML_QuickForm_Error', true);
             return $error;
         } elseif (!$this->elementExists($nameAfter)) {
             $error = PEAR::raiseError(null, QUICKFORM_NONEXIST_ELEMENT, null, E_USER_WARNING, "Element '$nameAfter' does not exist in HTML_QuickForm::insertElementBefore()", 'HTML_QuickForm_Error', true);
@@ -717,7 +717,7 @@ 
         for ($i = end($elKeys); $i >= $targetIdx; $i--) {
             if (isset($this->_elements[$i])) {
                 $currentName = $this->_elements[$i]->getName();
-                $this->_elements[$i + 1] =& $this->_elements[$i];
+                $this->_elements[$i + 1] = & $this->_elements[$i];
                 if ($this->_elementIndex[$currentName] == $i) {
                     $this->_elementIndex[$currentName] = $i + 1;
                 } else {
@@ -728,7 +728,7 @@ 
             }
         }
         // Put the element in place finally
-        $this->_elements[$targetIdx] =& $element;
+        $this->_elements[$targetIdx] = & $element;
         if (!$duplicate) {
             $this->_elementIndex[$elementName] = $targetIdx;
         } else {
@@ -759,12 +759,12 @@ 
      * @access   public
      * @throws   HTML_QuickForm_Error
      */
-    function &addGroup($elements, $name=null, $groupLabel='', $separator=null, $appendName = true)
+    function &addGroup($elements, $name = null, $groupLabel = '', $separator = null, $appendName = true)
     {
         static $anonGroups = 1;
 
         if (0 == strlen($name)) {
-            $name       = 'qf_group_' . $anonGroups++;
+            $name       = 'qf_group_'.$anonGroups++;
             $appendName = false;
         }
         $group = & $this->addElement('group', $name, $groupLabel, $elements, $separator, $appendName);
@@ -821,7 +821,7 @@ 
                     if (is_array($value)) {
                         $value[] = $v;
                     } else {
-                        $value = (null === $value)? $v: array($value, $v);
+                        $value = (null === $value) ? $v : array($value, $v);
                     }
                 }
             }
@@ -844,7 +844,7 @@ 
     {
         $value = null;
         if (isset($this->_submitValues[$elementName]) || isset($this->_submitFiles[$elementName])) {
-            $value = isset($this->_submitValues[$elementName])? $this->_submitValues[$elementName]: array();
+            $value = isset($this->_submitValues[$elementName]) ? $this->_submitValues[$elementName] : array();
             if (is_array($value) && isset($this->_submitFiles[$elementName])) {
                 foreach ($this->_submitFiles[$elementName] as $k => $v) {
                     $value = HTML_QuickForm::arrayMerge($value, $this->_reindexFiles($this->_submitFiles[$elementName][$k], $k));
@@ -859,34 +859,34 @@ 
                         array('\\', '\''), array('\\\\', '\\\''),
                         substr($elementName, 0, $pos)
                     );
-            $idx  = "['" . str_replace(
+            $idx = "['".str_replace(
                         array('\\', '\'', ']', '['), array('\\\\', '\\\'', '', "']['"),
                         substr($elementName, $pos + 1, -1)
-                    ) . "']";
+                    )."']";
             if (isset($this->_submitValues[$base])) {
                 $value = eval("return (isset(\$this->_submitValues['{$base}']{$idx})) ? \$this->_submitValues['{$base}']{$idx} : null;");
             }
 
             if ((is_array($value) || null === $value) && isset($this->_submitFiles[$base])) {
                 $props = array('name', 'type', 'size', 'tmp_name', 'error');
-                $code  = "if (!isset(\$this->_submitFiles['{$base}']['name']{$idx})) {\n" .
-                         "    return null;\n" .
-                         "} else {\n" .
+                $code  = "if (!isset(\$this->_submitFiles['{$base}']['name']{$idx})) {\n".
+                         "    return null;\n".
+                         "} else {\n".
                          "    \$v = array();\n";
                 foreach ($props as $prop) {
                     $code .= "    \$v = HTML_QuickForm::arrayMerge(\$v, \$this->_reindexFiles(\$this->_submitFiles['{$base}']['{$prop}']{$idx}, '{$prop}'));\n";
                 }
-                $fileValue = eval($code . "    return \$v;\n}\n");
+                $fileValue = eval($code."    return \$v;\n}\n");
                 if (null !== $fileValue) {
-                    $value = null === $value? $fileValue: HTML_QuickForm::arrayMerge($value, $fileValue);
+                    $value = null === $value ? $fileValue : HTML_QuickForm::arrayMerge($value, $fileValue);
                 }
             }
         }
 
         // This is only supposed to work for groups with appendName = false
         if (null === $value && 'group' == $this->getElementType($elementName)) {
-            $group    =& $this->getElement($elementName);
-            $elements =& $group->getElements();
+            $group    = & $this->getElement($elementName);
+            $elements = & $group->getElements();
             foreach (array_keys($elements) as $key) {
                 $name = $group->getElementName($key);
                 // prevent endless recursion in case of radios and such
@@ -1049,7 +1049,7 @@ 
             $error = PEAR::raiseError(null, QUICKFORM_NONEXIST_ELEMENT, null, E_USER_WARNING, "Element '$elementName' does not exist in HTML_QuickForm::removeElement()", 'HTML_QuickForm_Error', true);
             return $error;
         }
-        $el =& $this->_elements[$this->_elementIndex[$elementName]];
+        $el = & $this->_elements[$this->_elementIndex[$elementName]];
         unset($this->_elements[$this->_elementIndex[$elementName]]);
         if (empty($this->_duplicateIndex[$elementName])) {
             unset($this->_elementIndex[$elementName]);
@@ -1148,7 +1148,7 @@ 
             $this->_rules[$element] = array();
         }
         if ($validation == 'client') {
-            $this->updateAttributes(array('onsubmit' => 'try { var myValidator = validate_' . $this->_attributes['id'] . '; } catch(e) { return true; } return myValidator(this);'));
+            $this->updateAttributes(array('onsubmit' => 'try { var myValidator = validate_'.$this->_attributes['id'].'; } catch(e) { return true; } return myValidator(this);'));
         }
         $this->_rules[$element][] = array(
             'type'        => $type,
@@ -1181,20 +1181,20 @@ 
      * @access   public
      * @throws   HTML_QuickForm_Error
      */
-    function addGroupRule($group, $arg1, $type='', $format=null, $howmany=0, $validation = 'server', $reset = false)
+    function addGroupRule($group, $arg1, $type = '', $format = null, $howmany = 0, $validation = 'server', $reset = false)
     {
         if (!$this->elementExists($group)) {
             return PEAR::raiseError(null, QUICKFORM_NONEXIST_ELEMENT, null, E_USER_WARNING, "Group '$group' does not exist in HTML_QuickForm::addGroupRule()", 'HTML_QuickForm_Error', true);
         }
 
-        $groupObj =& $this->getElement($group);
+        $groupObj = & $this->getElement($group);
         if (is_array($arg1)) {
             $required = 0;
             foreach ($arg1 as $elementIndex => $rules) {
                 $elementName = $groupObj->getElementName($elementIndex);
                 foreach ($rules as $rule) {
                     $format = (isset($rule[2])) ? $rule[2] : null;
-                    $validation = (isset($rule[3]) && 'client' == $rule[3])? 'client': 'server';
+                    $validation = (isset($rule[3]) && 'client' == $rule[3]) ? 'client' : 'server';
                     $reset = isset($rule[4]) && $rule[4];
                     $type = $rule[1];
                     if (false === ($newName = $this->isRuleRegistered($type, true))) {
@@ -1218,7 +1218,7 @@ 
                         $required++;
                     }
                     if ('client' == $validation) {
-                        $this->updateAttributes(array('onsubmit' => 'try { var myValidator = validate_' . $this->_attributes['id'] . '; } catch(e) { return true; } return myValidator(this);'));
+                        $this->updateAttributes(array('onsubmit' => 'try { var myValidator = validate_'.$this->_attributes['id'].'; } catch(e) { return true; } return myValidator(this);'));
                     }
                 }
             }
@@ -1255,7 +1255,7 @@ 
                 $this->_required[] = $group;
             }
             if ($validation == 'client') {
-                $this->updateAttributes(array('onsubmit' => 'try { var myValidator = validate_' . $this->_attributes['id'] . '; } catch(e) { return true; } return myValidator(this);'));
+                $this->updateAttributes(array('onsubmit' => 'try { var myValidator = validate_'.$this->_attributes['id'].'; } catch(e) { return true; } return myValidator(this);'));
             }
         }
     } // end func addGroupRule
@@ -1312,10 +1312,10 @@ 
                     if (false === strpos($elName, '[')) {
                         $this->_submitValues[$elName] = $this->_recursiveFilter($filter, $value);
                     } else {
-                        $idx  = "['" . str_replace(
+                        $idx = "['".str_replace(
                                     array('\\', '\'', ']', '['), array('\\\\', '\\\'', '', "']['"),
                                     $elName
-                                ) . "']";
+                                )."']";
                         eval("\$this->_submitValues{$idx} = \$this->_recursiveFilter(\$filter, \$value);");
                     }
                 }
@@ -1435,7 +1435,7 @@ 
         }
         $ruleName = false;
         if (is_object($name) && is_a($name, 'html_quickform_rule')) {
-            $ruleName = !empty($name->name)? $name->name: strtolower(get_class($name));
+            $ruleName = !empty($name->name) ? $name->name : strtolower(get_class($name));
         } elseif (is_string($name) && class_exists($name)) {
             $parent = strtolower($name);
             do {
@@ -1446,7 +1446,7 @@ 
             } while ($parent = get_parent_class($parent));
         }
         if ($ruleName) {
-            $registry =& HTML_QuickForm_RuleRegistry::singleton();
+            $registry = & HTML_QuickForm_RuleRegistry::singleton();
             $registry->registerRule($ruleName, null, $name);
         }
         return $ruleName;
@@ -1570,7 +1570,7 @@ 
             return false;
         }
 
-        $registry =& HTML_QuickForm_RuleRegistry::singleton();
+        $registry = & HTML_QuickForm_RuleRegistry::singleton();
 
         foreach ($this->_rules as $target => $rules) {
             $submitValue = $this->getSubmitValue($target);
@@ -1601,10 +1601,10 @@ 
                                         array('\\', '\''), array('\\\\', '\\\''),
                                         substr($target, 0, $pos)
                                     );
-                            $idx  = "['" . str_replace(
+                            $idx = "['".str_replace(
                                         array('\\', '\'', ']', '['), array('\\\\', '\\\'', '', "']['"),
                                         substr($target, $pos + 1, -1)
-                                    ) . "']";
+                                    )."']";
                             eval("\$isUpload = isset(\$this->_submitFiles['{$base}']['name']{$idx});");
                         }
                         if ($isUpload && (!isset($submitValue['error']) || UPLOAD_ERR_NO_FILE == $submitValue['error'])) {
@@ -1624,7 +1624,7 @@ 
                     $result = $registry->validate($rule['type'], $submitValue, $rule['format'], false);
                 }
 
-                if (!$result || (!empty($rule['howmany']) && $rule['howmany'] > (int)$result)) {
+                if (!$result || (!empty($rule['howmany']) && $rule['howmany'] > (int) $result)) {
                     if (isset($rule['group'])) {
                         $this->_errors[$rule['group']] = $rule['message'];
                     } else {
@@ -1659,7 +1659,7 @@ 
      * @access   public
      * @throws   HTML_QuickForm_Error
      */
-    function freeze($elementList=null)
+    function freeze($elementList = null)
     {
         if (!isset($elementList)) {
             $this->_freezeAll = true;
@@ -1680,7 +1680,7 @@ 
         }
 
         if (!empty($elementList)) {
-            return PEAR::raiseError(null, QUICKFORM_NONEXIST_ELEMENT, null, E_USER_WARNING, "Nonexistant element(s): '" . implode("', '", array_keys($elementList)) . "' in HTML_QuickForm::freeze()", 'HTML_QuickForm_Error', true);
+            return PEAR::raiseError(null, QUICKFORM_NONEXIST_ELEMENT, null, E_USER_WARNING, "Nonexistant element(s): '".implode("', '", array_keys($elementList))."' in HTML_QuickForm::freeze()", 'HTML_QuickForm_Error', true);
         }
         return true;
     } // end func freeze
@@ -1736,7 +1736,7 @@ 
     function accept(&$renderer) {
         $renderer->startForm($this);
         foreach (array_keys($this->_elements) as $key) {
-            $element =& $this->_elements[$key];
+            $element = & $this->_elements[$key];
             $elementName = $element->getName();
             $required    = ($this->isElementRequired($elementName) && !$element->isFrozen());
             $error = $this->getElementError($elementName);
@@ -1782,7 +1782,7 @@ 
         if (!is_null($in_data)) {
             $this->addElement('html', $in_data);
         }
-        $renderer =& $this->defaultRenderer();
+        $renderer = & $this->defaultRenderer();
         $this->accept($renderer);
 
         return $renderer->toHtml();
@@ -1804,7 +1804,7 @@ 
             return '';
         }
 
-        $registry =& HTML_QuickForm_RuleRegistry::singleton();
+        $registry = & HTML_QuickForm_RuleRegistry::singleton();
         $test = array();
         $js_escape = array(
             "\r"    => '\r',
@@ -1820,30 +1820,30 @@ 
                 if ('client' == $rule['validation']) {
                     unset($element);
 
-                    $dependent  = isset($rule['dependent']) && is_array($rule['dependent']);
+                    $dependent = isset($rule['dependent']) && is_array($rule['dependent']);
                     $rule['message'] = strtr($rule['message'], $js_escape);
 
                     if (isset($rule['group'])) {
-                        $group    =& $this->getElement($rule['group']);
+                        $group = & $this->getElement($rule['group']);
                         // No JavaScript validation for frozen elements
                         if ($group->isFrozen()) {
                             continue 2;
                         }
-                        $elements =& $group->getElements();
+                        $elements = & $group->getElements();
                         foreach (array_keys($elements) as $key) {
                             if ($elementName == $group->getElementName($key)) {
-                                $element =& $elements[$key];
+                                $element = & $elements[$key];
                                 break;
                             }
                         }
                     } elseif ($dependent) {
-                        $element   =  array();
-                        $element[] =& $this->getElement($elementName);
+                        $element   = array();
+                        $element[] = & $this->getElement($elementName);
                         foreach ($rule['dependent'] as $elName) {
-                            $element[] =& $this->getElement($elName);
+                            $element[] = & $this->getElement($elName);
                         }
                     } else {
-                        $element =& $this->getElement($elementName);
+                        $element = & $this->getElement($elementName);
                     }
                     // No JavaScript validation for frozen elements
                     if (is_object($element) && $element->isFrozen()) {
@@ -1862,23 +1862,23 @@ 
         }
         if (count($test) > 0) {
             return
-                "\n<script type=\"text/javascript\">\n" .
-                "//<![CDATA[\n" .
-                "function validate_" . $this->_attributes['id'] . "(frm) {\n" .
-                "  var value = '';\n" .
-                "  var errFlag = new Array();\n" .
-                "  var _qfGroups = {};\n" .
-                "  _qfMsg = '';\n\n" .
-                join("\n", $test) .
-                "\n  if (_qfMsg != '') {\n" .
-                "    _qfMsg = '" . strtr($this->_jsPrefix, $js_escape) . "' + _qfMsg;\n" .
-                "    _qfMsg = _qfMsg + '\\n" . strtr($this->_jsPostfix, $js_escape) . "';\n" .
-                "    alert(_qfMsg);\n" .
-                "    return false;\n" .
-                "  }\n" .
-                "  return true;\n" .
-                "}\n" .
-                "//]]>\n" .
+                "\n<script type=\"text/javascript\">\n".
+                "//<![CDATA[\n".
+                "function validate_".$this->_attributes['id']."(frm) {\n".
+                "  var value = '';\n".
+                "  var errFlag = new Array();\n".
+                "  var _qfGroups = {};\n".
+                "  _qfMsg = '';\n\n".
+                join("\n", $test).
+                "\n  if (_qfMsg != '') {\n".
+                "    _qfMsg = '".strtr($this->_jsPrefix, $js_escape)."' + _qfMsg;\n".
+                "    _qfMsg = _qfMsg + '\\n".strtr($this->_jsPostfix, $js_escape)."';\n".
+                "    alert(_qfMsg);\n".
+                "    return false;\n".
+                "  }\n".
+                "  return true;\n".
+                "}\n".
+                "//]]>\n".
                 "</script>";
         }
         return '';
@@ -1897,7 +1897,7 @@ 
      */
     function getSubmitValues($mergeFiles = false)
     {
-        return $mergeFiles? HTML_QuickForm::arrayMerge($this->_submitValues, $this->_submitFiles): $this->_submitValues;
+        return $mergeFiles ? HTML_QuickForm::arrayMerge($this->_submitValues, $this->_submitFiles) : $this->_submitValues;
     } // end func getSubmitValues
 
     // }}}
@@ -1951,7 +1951,7 @@ 
                     if (is_array($value)) {
                         $value[] = $v;
                     } else {
-                        $value = (null === $value)? $v: array($value, $v);
+                        $value = (null === $value) ? $v : array($value, $v);
                     }
                 }
             }

Indentation +114 added lines, -114 removed lines

@@ -630,8 +630,8 @@ 
     public function &addElement($element)
     {
         if (is_object($element) && is_subclass_of($element, 'html_quickform_element')) {
-           $elementObject = &$element;
-           $elementObject->onQuickFormEvent('updateValue', null, $this);
+            $elementObject = &$element;
+            $elementObject->onQuickFormEvent('updateValue', null, $this);
         } else {
             $args = func_get_args();
             $elementObject =& $this->_loadElement('addElement', $element, array_slice($args, 1));
@@ -676,22 +676,22 @@ 
     // }}}
     // {{{ insertElementBefore()
 
-   /**
-    * Inserts a new element right before the other element
-    *
-    * Warning: it is not possible to check whether the $element is already
-    * added to the form, therefore if you want to move the existing form
-    * element to a new position, you'll have to use removeElement():
-    * $form->insertElementBefore($form->removeElement('foo', false), 'bar');
-    *
-    * @access   public
-    * @since    3.2.4
-    * @param    HTML_QuickForm_element  Element to insert
-    * @param    string                  Name of the element before which the new
-    *                                   one is inserted
-    * @return   HTML_QuickForm_element  reference to inserted element
-    * @throws   HTML_QuickForm_Error
-    */
+    /**
+     * Inserts a new element right before the other element
+     *
+     * Warning: it is not possible to check whether the $element is already
+     * added to the form, therefore if you want to move the existing form
+     * element to a new position, you'll have to use removeElement():
+     * $form->insertElementBefore($form->removeElement('foo', false), 'bar');
+     *
+     * @access   public
+     * @since    3.2.4
+     * @param    HTML_QuickForm_element  Element to insert
+     * @param    string                  Name of the element before which the new
+     *                                   one is inserted
+     * @return   HTML_QuickForm_element  reference to inserted element
+     * @throws   HTML_QuickForm_Error
+     */
     function &insertElementBefore(&$element, $nameAfter)
     {
         if (!empty($this->_duplicateIndex[$nameAfter])) {
@@ -870,9 +870,9 @@ 
             if ((is_array($value) || null === $value) && isset($this->_submitFiles[$base])) {
                 $props = array('name', 'type', 'size', 'tmp_name', 'error');
                 $code  = "if (!isset(\$this->_submitFiles['{$base}']['name']{$idx})) {\n" .
-                         "    return null;\n" .
-                         "} else {\n" .
-                         "    \$v = array();\n";
+                            "    return null;\n" .
+                            "} else {\n" .
+                            "    \$v = array();\n";
                 foreach ($props as $prop) {
                     $code .= "    \$v = HTML_QuickForm::arrayMerge(\$v, \$this->_reindexFiles(\$this->_submitFiles['{$base}']['{$prop}']{$idx}, '{$prop}'));\n";
                 }
@@ -917,13 +917,13 @@ 
         return $value;
     }
 
-   /**
-    * A helper function to change the indexes in $_FILES array
-    *
-    * @param  mixed   Some value from the $_FILES array
-    * @param  string  The key from the $_FILES array that should be appended
-    * @return array
-    */
+    /**
+     * A helper function to change the indexes in $_FILES array
+     *
+     * @param  mixed   Some value from the $_FILES array
+     * @param  string  The key from the $_FILES array that should be appended
+     * @return array
+     */
     function _reindexFiles($value, $key)
     {
         if (!is_array($value)) {
@@ -976,27 +976,27 @@ 
         }
     } // end func setElementError
 
-     // }}}
-     // {{{ getElementType()
-
-     /**
-      * Returns the type of the given element
-      *
-      * @param      string    $element    Name of form element
-      * @since      1.1
-      * @access     public
-      * @return     string    Type of the element, false if the element is not found
-      */
-     function getElementType($element)
-     {
-         if (isset($this->_elementIndex[$element])) {
-             return $this->_elements[$this->_elementIndex[$element]]->getType();
-         }
-         return false;
-     } // end func getElementType
-
-     // }}}
-     // {{{ updateElementAttr()
+        // }}}
+        // {{{ getElementType()
+
+        /**
+         * Returns the type of the given element
+         *
+         * @param      string    $element    Name of form element
+         * @since      1.1
+         * @access     public
+         * @return     string    Type of the element, false if the element is not found
+         */
+        function getElementType($element)
+        {
+            if (isset($this->_elementIndex[$element])) {
+                return $this->_elements[$this->_elementIndex[$element]]->getType();
+            }
+            return false;
+        } // end func getElementType
+
+        // }}}
+        // {{{ updateElementAttr()
 
     /**
      * Updates Attributes for one or more elements
@@ -1263,18 +1263,18 @@ 
     // }}}
     // {{{ addFormRule()
 
-   /**
-    * Adds a global validation rule
-    *
-    * This should be used when for a rule involving several fields or if
-    * you want to use some completely custom validation for your form.
-    * The rule function/method should return true in case of successful
-    * validation and array('element name' => 'error') when there were errors.
-    *
-    * @access   public
-    * @param    mixed   Callback, either function name or array(&$object, 'method')
-    * @throws   HTML_QuickForm_Error
-    */
+    /**
+     * Adds a global validation rule
+     *
+     * This should be used when for a rule involving several fields or if
+     * you want to use some completely custom validation for your form.
+     * The rule function/method should return true in case of successful
+     * validation and array('element name' => 'error') when there were errors.
+     *
+     * @access   public
+     * @param    mixed   Callback, either function name or array(&$object, 'method')
+     * @throws   HTML_QuickForm_Error
+     */
     function addFormRule($rule)
     {
         if (!is_callable($rule)) {
@@ -1351,18 +1351,18 @@ 
     // }}}
     // {{{ arrayMerge()
 
-   /**
-    * Merges two arrays
-    *
-    * Merges two array like the PHP function array_merge but recursively.
-    * The main difference is that existing keys will not be renumbered
-    * if they are integers.
-    *
-    * @access   public
-    * @param    array   $a  original array
-    * @param    array   $b  array which will be merged into first one
-    * @return   array   merged array
-    */
+    /**
+     * Merges two arrays
+     *
+     * Merges two array like the PHP function array_merge but recursively.
+     * The main difference is that existing keys will not be renumbered
+     * if they are integers.
+     *
+     * @access   public
+     * @param    array   $a  original array
+     * @param    array   $b  array which will be merged into first one
+     * @return   array   merged array
+     */
     static function arrayMerge($a, $b)
     {
         foreach ($b as $k => $v) {
@@ -1493,10 +1493,10 @@ 
      */
     function isElementFrozen($element)
     {
-         if (isset($this->_elementIndex[$element])) {
-             return $this->_elements[$this->_elementIndex[$element]]->isFrozen();
-         }
-         return false;
+            if (isset($this->_elementIndex[$element])) {
+                return $this->_elements[$this->_elementIndex[$element]]->isFrozen();
+            }
+            return false;
     } // end func isElementFrozen
 
     // }}}
@@ -1685,7 +1685,7 @@ 
      */
     function isFrozen()
     {
-         return $this->_freezeAll;
+            return $this->_freezeAll;
     }
 
     /**
@@ -1707,14 +1707,14 @@ 
         return call_user_func($callback, $values);
     }
 
-   /**
-    * Accepts a renderer
-    *
-    * @param object     An HTML_QuickForm_Renderer object
-    * @since 3.0
-    * @access public
-    * @return void
-    */
+    /**
+     * Accepts a renderer
+     *
+     * @param object     An HTML_QuickForm_Renderer object
+     * @since 3.0
+     * @access public
+     * @return void
+     */
     function accept(&$renderer) {
         $renderer->startForm($this);
         foreach (array_keys($this->_elements) as $key) {
@@ -1727,13 +1727,13 @@ 
         $renderer->finishForm($this);
     }
 
-   /**
-    * Returns a reference to default renderer object
-    *
-    * @access public
-    * @since 3.0
-    * @return HTML_QuickForm_Renderer_Default
-    */
+    /**
+     * Returns a reference to default renderer object
+     *
+     * @access public
+     * @since 3.0
+     * @return HTML_QuickForm_Renderer_Default
+     */
     function &defaultRenderer() {
         if (!isset($GLOBALS['_HTML_QuickForm_default_renderer'])) {
             // Modified by Ivan Tcholakov, 16-MAR-2010. Suppressing a deprecation warning on PHP 5.3
@@ -1889,7 +1889,7 @@ 
         //
         $this->accept($renderer);
         return $renderer->toArray();
-     }
+        }
 
     /**
      * Returns a 'safe' element's value
@@ -1961,15 +1961,15 @@ 
         return $values;
     }
 
-   /**
-    * Tells whether the form was already submitted
-    *
-    * This is useful since the _submitFiles and _submitValues arrays
-    * may be completely empty after the trackSubmit value is removed.
-    *
-    * @access public
-    * @return bool
-    */
+    /**
+     * Tells whether the form was already submitted
+     *
+     * This is useful since the _submitFiles and _submitValues arrays
+     * may be completely empty after the trackSubmit value is removed.
+     *
+     * @access public
+     * @return bool
+     */
     function isSubmitted()
     {
         return $this->_flagSubmitted;
@@ -2056,21 +2056,21 @@ 
 {
 
     /**
-    * Prefix for all error messages
-    * @var string
-    */
+     * Prefix for all error messages
+     * @var string
+     */
     var $error_message_prefix = 'QuickForm Error: ';
 
     /**
-    * Creates a quickform error object, extending the PEAR_Error class
-    *
-    * @param int   $code the error code
-    * @param int   $mode the reaction to the error, either return, die or trigger/callback
-    * @param int   $level intensity of the error (PHP error code)
-    * @param mixed $debuginfo any information that can inform user as to nature of the error
-    */
+     * Creates a quickform error object, extending the PEAR_Error class
+     *
+     * @param int   $code the error code
+     * @param int   $mode the reaction to the error, either return, die or trigger/callback
+     * @param int   $level intensity of the error (PHP error code)
+     * @param mixed $debuginfo any information that can inform user as to nature of the error
+     */
     function HTML_QuickForm_Error($code = QUICKFORM_ERROR, $mode = PEAR_ERROR_RETURN,
-                         $level = E_USER_NOTICE, $debuginfo = null)
+                            $level = E_USER_NOTICE, $debuginfo = null)
     {
         if (is_int($code)) {
             $this->PEAR_Error(HTML_QuickForm::errorMessage($code), $code, $mode, $level, $debuginfo);

main/inc/lib/pear/HTML/QuickForm/Action/Jump.php

Doc Comments +2 added lines, -1 removed lines

@@ -50,7 +50,8 @@
    /**

     * Removes the '..' and '.' segments from the path component

     *

-    * @param    string  Path component of the URL, possibly with '.' and '..' segments

+    * @param    string  Path component of the URL, possibly with '.' and '..' segments
+    * @param string $path

     * @return   string  Path component of the URL with '.' and '..' segments removed

     * @access   private

     */

Indentation +28 added lines, -28 removed lines

@@ -31,13 +31,13 @@ 
  */

 class HTML_QuickForm_Action_Jump extends HTML_QuickForm_Action

 {

-   /**

-    * Splits (part of) the URI into path and query components

-    *

-    * @param    string  String of the form 'foo?bar'

-    * @return   array   Array of the form array('foo', '?bar)

-    * @access   private

-    */

+    /**

+     * Splits (part of) the URI into path and query components

+     *

+     * @param    string  String of the form 'foo?bar'

+     * @return   array   Array of the form array('foo', '?bar)

+     * @access   private

+     */

     function _splitUri($uri)

     {

         if (false === ($qm = strpos($uri, '?'))) {

@@ -47,13 +47,13 @@ 
         }

     }

 

-   /**

-    * Removes the '..' and '.' segments from the path component

-    *

-    * @param    string  Path component of the URL, possibly with '.' and '..' segments

-    * @return   string  Path component of the URL with '.' and '..' segments removed

-    * @access   private

-    */

+    /**

+     * Removes the '..' and '.' segments from the path component

+     *

+     * @param    string  Path component of the URL, possibly with '.' and '..' segments

+     * @return   string  Path component of the URL with '.' and '..' segments removed

+     * @access   private

+     */

     function _normalizePath($path)

     {

         $pathAry = explode('/', $path);

@@ -84,17 +84,17 @@ 
         return implode('/', $pathAry);

     }

 

-   /**

-    * Resolves relative URL using current page's URL as base

-    *

-    * The method follows procedure described in section 4 of RFC 1808 and

-    * passes the examples provided in section 5 of said RFC. Values from

-    * $_SERVER array are used for calculation of "current URL"

-    *

-    * @param    string  Relative URL, probably from form's action attribute

-    * @return   string  Absolute URL

-    * @access   private

-    */

+    /**

+     * Resolves relative URL using current page's URL as base

+     *

+     * The method follows procedure described in section 4 of RFC 1808 and

+     * passes the examples provided in section 5 of said RFC. Values from

+     * $_SERVER array are used for calculation of "current URL"

+     *

+     * @param    string  Relative URL, probably from form's action attribute

+     * @return   string  Absolute URL

+     * @access   private

+     */

     function _resolveRelativeURL($url)

     {

         $https  = !empty($_SERVER['HTTPS']) && ('off' != strtolower($_SERVER['HTTPS']));

@@ -104,7 +104,7 @@ 
 

         } else {

             $host   = $scheme . '//' . $_SERVER['SERVER_NAME'] .

-                      (($https && 443 == $_SERVER['SERVER_PORT'] ||

+                        (($https && 443 == $_SERVER['SERVER_PORT'] ||

                         !$https && 80 == $_SERVER['SERVER_PORT'])? '': ':' . $_SERVER['SERVER_PORT']);

             if ('' == $url) {

                 return $host . $_SERVER['REQUEST_URI'];

@@ -148,8 +148,8 @@ 
             $action = $this->_resolveRelativeURL($action);

         }

         $url    = $action . (false === strpos($action, '?')? '?': '&') .

-                  $current->getButtonName('display') . '=true' .

-                  ((!defined('SID') || '' == SID || ini_get('session.use_only_cookies'))? '': '&' . SID);

+                    $current->getButtonName('display') . '=true' .

+                    ((!defined('SID') || '' == SID || ini_get('session.use_only_cookies'))? '': '&' . SID);

         header('Location: ' . $url);

         exit;

     }

Spacing +16 added lines, -16 removed lines

@@ -69,7 +69,7 @@ 
                 }

 

             } elseif ('..' == $pathAry[$i] && $i > 1 && '..' != $pathAry[$i - 1]) {

-                if ($i < count($pathAry) -1) {

+                if ($i < count($pathAry) - 1) {

                     array_splice($pathAry, $i - 1, 2);

                     $i--;

                 } else {

@@ -98,28 +98,28 @@ 
     function _resolveRelativeURL($url)

     {

         $https  = !empty($_SERVER['HTTPS']) && ('off' != strtolower($_SERVER['HTTPS']));

-        $scheme = ($https? 'https:': 'http:');

+        $scheme = ($https ? 'https:' : 'http:');

         if ('//' == substr($url, 0, 2)) {

-            return $scheme . $url;

+            return $scheme.$url;

 

         } else {

-            $host   = $scheme . '//' . $_SERVER['SERVER_NAME'] .

+            $host = $scheme.'//'.$_SERVER['SERVER_NAME'].

                       (($https && 443 == $_SERVER['SERVER_PORT'] ||

-                        !$https && 80 == $_SERVER['SERVER_PORT'])? '': ':' . $_SERVER['SERVER_PORT']);

+                        !$https && 80 == $_SERVER['SERVER_PORT']) ? '' : ':'.$_SERVER['SERVER_PORT']);

             if ('' == $url) {

-                return $host . $_SERVER['REQUEST_URI'];

+                return $host.$_SERVER['REQUEST_URI'];

 

             } elseif ('/' == $url[0]) {

-                return $host . $url;

+                return $host.$url;

 

             } else {

                 list($basePath, $baseQuery) = $this->_splitUri($_SERVER['REQUEST_URI']);

                 list($actPath, $actQuery)   = $this->_splitUri($url);

                 if ('' == $actPath) {

-                    return $host . $basePath . $actQuery;

+                    return $host.$basePath.$actQuery;

                 } else {

-                    $path = substr($basePath, 0, strrpos($basePath, '/') + 1) . $actPath;

-                    return $host . $this->_normalizePath($path) . $actQuery;

+                    $path = substr($basePath, 0, strrpos($basePath, '/') + 1).$actPath;

+                    return $host.$this->_normalizePath($path).$actQuery;

                 }

             }

         }

@@ -136,10 +136,10 @@ 
             if (!$page->controller->isValid($pageName)) {

                 $pageName = $page->controller->findInvalid();

             }

-            $current =& $page->controller->getPage($pageName);

+            $current = & $page->controller->getPage($pageName);

 

         } else {

-            $current =& $page;

+            $current = & $page;

         }

         // generate the URL for the page 'display' event and redirect to it

         $action = $current->getAttribute('action');

@@ -147,10 +147,10 @@ 
         if (!preg_match('!^https?://!i', $action)) {

             $action = $this->_resolveRelativeURL($action);

         }

-        $url    = $action . (false === strpos($action, '?')? '?': '&') .

-                  $current->getButtonName('display') . '=true' .

-                  ((!defined('SID') || '' == SID || ini_get('session.use_only_cookies'))? '': '&' . SID);

-        header('Location: ' . $url);

+        $url = $action.(false === strpos($action, '?') ? '?' : '&').

+                  $current->getButtonName('display').'=true'.

+                  ((!defined('SID') || '' == SID || ini_get('session.use_only_cookies')) ? '' : '&'.SID);

+        header('Location: '.$url);

         exit;

     }

 }

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

Doc Comments -1 removed lines

@@ -8,7 +8,6 @@
     /**
     * Class constructor
     *
-    * @param string $text   raw HTML to add
     * @access public
     * @return void
     */

Indentation +13 added lines, -13 removed lines

@@ -6,12 +6,12 @@ 
 class HTML_QuickForm_advanced_settings extends HTML_QuickForm_static
 {
     /**
-    * Class constructor
-    *
-    * @param string $text   raw HTML to add
-    * @access public
-    * @return void
-    */
+     * Class constructor
+     *
+     * @param string $text   raw HTML to add
+     * @access public
+     * @return void
+     */
     public function __construct($name = '', $label = '')
     {
         if (empty($label)) {
@@ -26,13 +26,13 @@ 
         $this->_type = 'html';
     }
 
-   /**
-    * Accepts a renderer
-    *
-    * @param HTML_QuickForm_Renderer    renderer object (only works with Default renderer!)
-    * @access public
-    * @return void
-    */
+    /**
+     * Accepts a renderer
+     *
+     * @param HTML_QuickForm_Renderer    renderer object (only works with Default renderer!)
+     * @access public
+     * @return void
+     */
     function accept(&$renderer, $required = false, $error = null)
     {
         $renderer->renderHtml($this);

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

Doc Comments +7 added lines, -7 removed lines

@@ -117,7 +117,7 @@ 
     }
 
     /**
-     * @param mixed $class
+     * @param string|null $class
      */
     public function setClass($class)
     {
@@ -125,7 +125,7 @@ 
     }
 
     /**
-     * @return mixed
+     * @return string|null
      */
     public function getIcon()
     {
@@ -133,7 +133,7 @@ 
     }
 
     /**
-     * @param mixed $icon
+     * @param string $icon
      */
     public function setIcon($icon)
     {
@@ -141,7 +141,7 @@ 
     }
 
     /**
-     * @return mixed
+     * @return string|null
      */
     public function getStyle()
     {
@@ -149,7 +149,7 @@ 
     }
 
     /**
-     * @param mixed $style
+     * @param string $style
      */
     public function setStyle($style)
     {
@@ -180,7 +180,7 @@ 
         $this->columnsSize = $columnsSize;
     }
     /**
-     * @param mixed $size
+     * @param string $size
      */
     public function setSize($size)
     {
@@ -207,7 +207,7 @@ 
      * Freeze the element so that only its value is returned
      *
      * @access    public
-     * @return    void
+     * @return    boolean
      */
     public function freeze()
     {

Spacing +3 added lines, -3 removed lines

@@ -94,14 +94,14 @@
             $icon = $this->getIcon();
 
             if (!empty($icon)) {
-                $icon = '<em class="' . $this->getIcon() . '"></em> ';
+                $icon = '<em class="'.$this->getIcon().'"></em> ';
             }
 
             $class = $this->getClass().' '.$this->getStyle().' '.$this->getSize();
 
             return
-                $this->_getTabs() . '
-                <button class="'.$class.'" ' . $this->_getAttrString($this->_attributes) . '>'.
+                $this->_getTabs().'
+                <button class="'.$class.'" '.$this->_getAttrString($this->_attributes).'>'.
                 $icon.
                 $value.
                 '</button>';

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

Doc Comments +1 added lines

@@ -191,6 +191,7 @@
     * @access public
     * @param  HTML_QuickForm_Page   The page that failed to handle the action
     * @param  string                Name of the action
+    * @param HTML_QuickForm_Page $page
     * @throws PEAR_Error
     */
     function handle(&$page, $actionName)

Indentation +181 added lines, -181 removed lines

@@ -40,48 +40,48 @@ 
  */
 class HTML_QuickForm_Controller
 {
-   /**
-    * Contains the pages (HTML_QuickForm_Page objects) of the miultipage form
-    * @var array
-    */
+    /**
+     * Contains the pages (HTML_QuickForm_Page objects) of the miultipage form
+     * @var array
+     */
     var $_pages = array();
 
-   /**
-    * Contains the mapping of actions to corresponding HTML_QuickForm_Action objects
-    * @var array
-    */
+    /**
+     * Contains the mapping of actions to corresponding HTML_QuickForm_Action objects
+     * @var array
+     */
     var $_actions = array();
 
-   /**
-    * Name of the form, used to store the values in session
-    * @var string
-    */
+    /**
+     * Name of the form, used to store the values in session
+     * @var string
+     */
     var $_name;
 
-   /**
-    * Whether the form is modal
-    * @var bool
-    */
+    /**
+     * Whether the form is modal
+     * @var bool
+     */
     var $_modal = true;
 
-   /**
-    * The action extracted from HTTP request: array('page', 'action')
-    * @var array
-    */
+    /**
+     * The action extracted from HTTP request: array('page', 'action')
+     * @var array
+     */
     var $_actionName = null;
 
-   /**
-    * Class constructor.
-    *
-    * Sets the form name and modal/non-modal behaviuor. Different multipage
-    * forms should have different names, as they are used to store form
-    * values in session. Modal forms allow passing to the next page only when
-    * all of the previous pages are valid.
-    *
-    * @access public
-    * @param  string  form name
-    * @param  bool    whether the form is modal
-    */
+    /**
+     * Class constructor.
+     *
+     * Sets the form name and modal/non-modal behaviuor. Different multipage
+     * forms should have different names, as they are used to store form
+     * values in session. Modal forms allow passing to the next page only when
+     * all of the previous pages are valid.
+     *
+     * @access public
+     * @param  string  form name
+     * @param  bool    whether the form is modal
+     */
     function HTML_QuickForm_Controller($name, $modal = true)
     {
         $this->_name  = $name;
@@ -89,17 +89,17 @@ 
     }
 
 
-   /**
-    * Returns a reference to a session variable containing the form-page
-    * values and pages' validation status.
-    *
-    * This is a "low-level" method, use exportValues() if you want just to
-    * get the form's values.
-    *
-    * @access public
-    * @param  bool      If true, then reset the container: clear all default, constant and submitted values
-    * @return array
-    */
+    /**
+     * Returns a reference to a session variable containing the form-page
+     * values and pages' validation status.
+     *
+     * This is a "low-level" method, use exportValues() if you want just to
+     * get the form's values.
+     *
+     * @access public
+     * @param  bool      If true, then reset the container: clear all default, constant and submitted values
+     * @return array
+     */
     function &container($reset = false)
     {
         $name = '_' . $this->_name . '_container';
@@ -121,15 +121,15 @@ 
     }
 
 
-   /**
-    * Processes the request.
-    *
-    * This finds the current page, the current action and passes the action
-    * to the page's handle() method.
-    *
-    * @access public
-    * @throws PEAR_Error
-    */
+    /**
+     * Processes the request.
+     *
+     * This finds the current page, the current action and passes the action
+     * to the page's handle() method.
+     *
+     * @access public
+     * @throws PEAR_Error
+     */
     function run()
     {
         // the names of the action and page should be saved
@@ -138,25 +138,25 @@ 
     }
 
 
-   /**
-    * Registers a handler for a specific action.
-    *
-    * @access public
-    * @param  string                name of the action
-    * @param  HTML_QuickForm_Action the handler for the action
-    */
+    /**
+     * Registers a handler for a specific action.
+     *
+     * @access public
+     * @param  string                name of the action
+     * @param  HTML_QuickForm_Action the handler for the action
+     */
     function addAction($actionName, &$action)
     {
         $this->_actions[$actionName] =& $action;
     }
 
 
-   /**
-    * Adds a new page to the form
-    *
-    * @access public
-    * @param  HTML_QuickForm_Page
-    */
+    /**
+     * Adds a new page to the form
+     *
+     * @access public
+     * @param  HTML_QuickForm_Page
+     */
     function addPage(&$page)
     {
         $page->controller =& $this;
@@ -164,14 +164,14 @@ 
     }
 
 
-   /**
-    * Returns a page
-    *
-    * @access public
-    * @param  string                Name of a page
-    * @return HTML_QuickForm_Page   A reference to the page
-    * @throws PEAR_Error
-    */
+    /**
+     * Returns a page
+     *
+     * @access public
+     * @param  string                Name of a page
+     * @return HTML_QuickForm_Page   A reference to the page
+     * @throws PEAR_Error
+     */
     function &getPage($pageName)
     {
         if (!isset($this->_pages[$pageName])) {
@@ -181,18 +181,18 @@ 
     }
 
 
-   /**
-    * Handles an action.
-    *
-    * This will be called if the page itself does not have a handler
-    * to a specific action. The method also loads and uses default handlers
-    * for common actions, if specific ones were not added.
-    *
-    * @access public
-    * @param  HTML_QuickForm_Page   The page that failed to handle the action
-    * @param  string                Name of the action
-    * @throws PEAR_Error
-    */
+    /**
+     * Handles an action.
+     *
+     * This will be called if the page itself does not have a handler
+     * to a specific action. The method also loads and uses default handlers
+     * for common actions, if specific ones were not added.
+     *
+     * @access public
+     * @param  HTML_QuickForm_Page   The page that failed to handle the action
+     * @param  string                Name of the action
+     * @throws PEAR_Error
+     */
     function handle(&$page, $actionName)
     {
         if (isset($this->_actions[$actionName])) {
@@ -215,26 +215,26 @@ 
     }
 
 
-   /**
-    * Checks whether the form is modal.
-    *
-    * @access public
-    * @return bool
-    */
+    /**
+     * Checks whether the form is modal.
+     *
+     * @access public
+     * @return bool
+     */
     function isModal()
     {
         return $this->_modal;
     }
 
 
-   /**
-    * Checks whether the pages of the controller are valid
-    *
-    * @access public
-    * @param  string    If set, check only the pages before (not including) that page
-    * @return bool
-    * @throws PEAR_Error
-    */
+    /**
+     * Checks whether the pages of the controller are valid
+     *
+     * @access public
+     * @param  string    If set, check only the pages before (not including) that page
+     * @return bool
+     * @throws PEAR_Error
+     */
     function isValid($pageName = null)
     {
         $data =& $this->container();
@@ -273,13 +273,13 @@ 
     }
 
 
-   /**
-    * Returns the name of the page before the given.
-    *
-    * @access public
-    * @param  string
-    * @return string
-    */
+    /**
+     * Returns the name of the page before the given.
+     *
+     * @access public
+     * @param  string
+     * @return string
+     */
     function getPrevName($pageName)
     {
         $prev = null;
@@ -292,13 +292,13 @@ 
     }
 
 
-   /**
-    * Returns the name of the page after the given.
-    *
-    * @access public
-    * @param  string
-    * @return string
-    */
+    /**
+     * Returns the name of the page after the given.
+     *
+     * @access public
+     * @param  string
+     * @return string
+     */
     function getNextName($pageName)
     {
         $prev = null;
@@ -312,12 +312,12 @@ 
     }
 
 
-   /**
-    * Finds the (first) invalid page
-    *
-    * @access public
-    * @return string  Name of an invalid page
-    */
+    /**
+     * Finds the (first) invalid page
+     *
+     * @access public
+     * @return string  Name of an invalid page
+     */
     function findInvalid()
     {
         $data =& $this->container();
@@ -330,13 +330,13 @@ 
     }
 
 
-   /**
-    * Extracts the names of the current page and the current action from
-    * HTTP request data.
-    *
-    * @access public
-    * @return array     first element is page name, second is action name
-    */
+    /**
+     * Extracts the names of the current page and the current action from
+     * HTTP request data.
+     *
+     * @access public
+     * @return array     first element is page name, second is action name
+     */
     function getActionName()
     {
         if (is_array($this->_actionName)) {
@@ -360,14 +360,14 @@ 
     }
 
 
-   /**
-    * Initializes default form values.
-    *
-    * @access public
-    * @param  array  default values
-    * @param  mixed  filter(s) to apply to default values
-    * @throws PEAR_Error
-    */
+    /**
+     * Initializes default form values.
+     *
+     * @access public
+     * @param  array  default values
+     * @param  mixed  filter(s) to apply to default values
+     * @throws PEAR_Error
+     */
     function setDefaults($defaultValues = null, $filter = null)
     {
         if (is_array($defaultValues)) {
@@ -377,15 +377,15 @@ 
     }
 
 
-   /**
-    * Initializes constant form values.
-    * These values won't get overridden by POST or GET vars
-    *
-    * @access public
-    * @param  array  constant values
-    * @param  mixed  filter(s) to apply to constant values
-    * @throws PEAR_Error
-    */
+    /**
+     * Initializes constant form values.
+     * These values won't get overridden by POST or GET vars
+     *
+     * @access public
+     * @param  array  constant values
+     * @param  mixed  filter(s) to apply to constant values
+     * @throws PEAR_Error
+     */
     function setConstants($constantValues = null, $filter = null)
     {
         if (is_array($constantValues)) {
@@ -395,15 +395,15 @@ 
     }
 
 
-   /**
-    * Adds new values to defaults or constants array
-    *
-    * @access   private
-    * @param    array   array to add values to (either defaults or constants)
-    * @param    array   values to add
-    * @param    mixed   filters to apply to new values
-    * @throws   PEAR_Error
-    */
+    /**
+     * Adds new values to defaults or constants array
+     *
+     * @access   private
+     * @param    array   array to add values to (either defaults or constants)
+     * @param    array   values to add
+     * @param    mixed   filters to apply to new values
+     * @throws   PEAR_Error
+     */
     function _setDefaultsOrConstants(&$values, $newValues, $filter = null)
     {
         if (isset($filter)) {
@@ -425,14 +425,14 @@ 
     }
 
 
-   /**
-    * Recursively applies the callback function to the value
-    *
-    * @param    mixed   Callback function
-    * @param    mixed   Value to process
-    * @access   private
-    * @return   mixed   Processed values
-    */
+    /**
+     * Recursively applies the callback function to the value
+     *
+     * @param    mixed   Callback function
+     * @param    mixed   Value to process
+     * @access   private
+     * @return   mixed   Processed values
+     */
     function _arrayMapRecursive($callback, $value)
     {
         if (!is_array($value)) {
@@ -447,12 +447,12 @@ 
     }
 
 
-   /**
-    * Sets the default values for the given page
-    *
-    * @access public
-    * @param  string  Name of a page
-    */
+    /**
+     * Sets the default values for the given page
+     *
+     * @access public
+     * @param  string  Name of a page
+     */
     function applyDefaults($pageName)
     {
         $data =& $this->container();
@@ -465,13 +465,13 @@ 
     }
 
 
-   /**
-    * Returns the form's values
-    *
-    * @access public
-    * @param  string    name of the page, if not set then returns values for all pages
-    * @return array
-    */
+    /**
+     * Returns the form's values
+     *
+     * @access public
+     * @param  string    name of the page, if not set then returns values for all pages
+     * @return array
+     */
     function exportValues($pageName = null)
     {
         $data   =& $this->container();
@@ -497,14 +497,14 @@ 
     }
 
 
-   /**
-    * Returns the element's value
-    *
-    * @access public
-    * @param  string    name of the page
-    * @param  string    name of the element in the page
-    * @return mixed     value for the element
-    */
+    /**
+     * Returns the element's value
+     *
+     * @access public
+     * @param  string    name of the page
+     * @param  string    name of the element in the page
+     * @return mixed     value for the element
+     */
     function exportValue($pageName, $elementName)
     {
         $data =& $this->container();

Spacing +20 added lines, -20 removed lines

@@ -102,7 +102,7 @@ 
     */
     function &container($reset = false)
     {
-        $name = '_' . $this->_name . '_container';
+        $name = '_'.$this->_name.'_container';
         if (!isset($_SESSION[$name]) || $reset) {
             $_SESSION[$name] = array(
                 'defaults'  => array(),
@@ -147,7 +147,7 @@ 
     */
     function addAction($actionName, &$action)
     {
-        $this->_actions[$actionName] =& $action;
+        $this->_actions[$actionName] = & $action;
     }
 
 
@@ -159,8 +159,8 @@ 
     */
     function addPage(&$page)
     {
-        $page->controller =& $this;
-        $this->_pages[$page->getAttribute('id')] =& $page;
+        $page->controller = & $this;
+        $this->_pages[$page->getAttribute('id')] = & $page;
     }
 
 
@@ -175,7 +175,7 @@ 
     function &getPage($pageName)
     {
         if (!isset($this->_pages[$pageName])) {
-            return PEAR::raiseError('HTML_QuickForm_Controller: Unknown page "' . $pageName . '"');
+            return PEAR::raiseError('HTML_QuickForm_Controller: Unknown page "'.$pageName.'"');
         }
         return $this->_pages[$pageName];
     }
@@ -204,13 +204,13 @@ 
             case 'submit':
             case 'display':
             case 'jump':
-                include_once 'HTML/QuickForm/Action/' . ucfirst($actionName) . '.php';
-                $className = 'HTML_QuickForm_Action_' . $actionName;
-                $this->_actions[$actionName] =& new $className();
+                include_once 'HTML/QuickForm/Action/'.ucfirst($actionName).'.php';
+                $className = 'HTML_QuickForm_Action_'.$actionName;
+                $this->_actions[$actionName] = & new $className();
                 return $this->_actions[$actionName]->perform($page, $actionName);
                 break;
             default:
-                return PEAR::raiseError('HTML_QuickForm_Controller: Unhandled action "' . $actionName . '" in page "' . $page->getAttribute('id') . '"');
+                return PEAR::raiseError('HTML_QuickForm_Controller: Unhandled action "'.$actionName.'" in page "'.$page->getAttribute('id').'"');
         } // switch
     }
 
@@ -237,7 +237,7 @@ 
     */
     function isValid($pageName = null)
     {
-        $data =& $this->container();
+        $data = & $this->container();
         foreach (array_keys($this->_pages) as $key) {
             if (isset($pageName) && $pageName == $key) {
                 return true;
@@ -245,7 +245,7 @@ 
                 // We should handle the possible situation when the user has never
                 // seen a page of a non-modal multipage form
                 if (!$this->isModal() && null === $data['valid'][$key]) {
-                    $page =& $this->_pages[$key];
+                    $page = & $this->_pages[$key];
                     // Fix for bug #8687: the unseen page was considered
                     // submitted, so defaults for checkboxes and multiselects
                     // were not used. Shouldn't break anything since this flag
@@ -320,7 +320,7 @@ 
     */
     function findInvalid()
     {
-        $data =& $this->container();
+        $data = & $this->container();
         foreach (array_keys($this->_pages) as $key) {
             if (!$data['valid'][$key]) {
                 return $key;
@@ -343,7 +343,7 @@ 
             return $this->_actionName;
         }
         $names = array_map('preg_quote', array_keys($this->_pages));
-        $regex = '/^_qf_(' . implode('|', $names) . ')_(.+?)(_x)?$/';
+        $regex = '/^_qf_('.implode('|', $names).')_(.+?)(_x)?$/';
         foreach (array_keys($_REQUEST) as $key) {
             if (preg_match($regex, $key, $matches)) {
                 return array($matches[1], $matches[2]);
@@ -371,7 +371,7 @@ 
     function setDefaults($defaultValues = null, $filter = null)
     {
         if (is_array($defaultValues)) {
-            $data =& $this->container();
+            $data = & $this->container();
             return $this->_setDefaultsOrConstants($data['defaults'], $defaultValues, $filter);
         }
     }
@@ -389,7 +389,7 @@ 
     function setConstants($constantValues = null, $filter = null)
     {
         if (is_array($constantValues)) {
-            $data =& $this->container();
+            $data = & $this->container();
             return $this->_setDefaultsOrConstants($data['constants'], $constantValues, $filter);
         }
     }
@@ -455,7 +455,7 @@ 
     */
     function applyDefaults($pageName)
     {
-        $data =& $this->container();
+        $data = & $this->container();
         if (!empty($data['defaults'])) {
             $this->_pages[$pageName]->setDefaults($data['defaults']);
         }
@@ -474,8 +474,8 @@ 
     */
     function exportValues($pageName = null)
     {
-        $data   =& $this->container();
-        $values =  array();
+        $data   = & $this->container();
+        $values = array();
         if (isset($pageName)) {
             $pages = array($pageName);
         } else {
@@ -507,8 +507,8 @@ 
     */
     function exportValue($pageName, $elementName)
     {
-        $data =& $this->container();
-        return isset($data['values'][$pageName][$elementName])? $data['values'][$pageName][$elementName]: null;
+        $data = & $this->container();
+        return isset($data['values'][$pageName][$elementName]) ? $data['values'][$pageName][$elementName] : null;
     }
 }
 ?>

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

Doc Comments +2 added lines, -2 removed lines

@@ -356,7 +356,7 @@ 
      * Sets display text for the element
      *
      * @param     string    $label  Display text for the element
-     * @param     string    $label_for Optionally add a "for" attribute
+     * @param     string    $labelFor Optionally add a "for" attribute
      * @since     1.3
      * @access    public
      * @return    void
@@ -435,7 +435,7 @@ 
      * @param     object    &$caller calling object
      * @since     1.0
      * @access    public
-     * @return    void
+     * @return    boolean
      */
     public function onQuickFormEvent($event, $arg, &$caller)
     {

Indentation +55 added lines, -55 removed lines

@@ -259,13 +259,13 @@ 
     // }}}
     // {{{ unfreeze()
 
-   /**
-    * Unfreezes the element so that it becomes editable
-    *
-    * @access public
-    * @return void
-    * @since  3.2.4
-    */
+    /**
+     * Unfreezes the element so that it becomes editable
+     *
+     * @access public
+     * @return void
+     * @since  3.2.4
+     */
     function unfreeze()
     {
         $this->_flagFrozen = false;
@@ -289,7 +289,7 @@ 
         //       $this->_getPersistantData();
 
         $value =  ('' != $value ? @htmlspecialchars($value, ENT_COMPAT, HTML_Common::charset()): ' ') .
-               $this->_getPersistantData();
+                $this->_getPersistantData();
         return '<span class="freeze">'.$value.'</span>';
         //
     } //end func getFrozenHtml
@@ -297,12 +297,12 @@ 
     // }}}
     // {{{ _getPersistantData()
 
-   /**
-    * Used by getFrozenHtml() to pass the element's value if _persistantFreeze is on
-    *
-    * @access private
-    * @return string
-    */
+    /**
+     * Used by getFrozenHtml() to pass the element's value if _persistantFreeze is on
+     *
+     * @access private
+     * @return string
+     */
     function _getPersistantData()
     {
         if (!$this->_persistantFreeze) {
@@ -310,10 +310,10 @@ 
         } else {
             $id = $this->getAttribute('id');
             return '<input' . $this->_getAttrString(array(
-                       'type'  => 'hidden',
-                       'name'  => $this->getName(),
-                       'value' => $this->getValue()
-                   ) + (isset($id)? array('id' => $id): array())) . ' />';
+                        'type'  => 'hidden',
+                        'name'  => $this->getName(),
+                        'value' => $this->getValue()
+                    ) + (isset($id)? array('id' => $id): array())) . ' />';
         }
     }
 
@@ -415,9 +415,9 @@ 
             return $values[$elementName];
         } elseif (strpos($elementName, '[')) {
             $myVar = "['" . str_replace(
-                         array('\\', '\'', ']', '['), array('\\\\', '\\\'', '', "']['"),
-                         $elementName
-                     ) . "']";
+                            array('\\', '\'', ']', '['), array('\\\\', '\\\'', '', "']['"),
+                            $elementName
+                        ) . "']";
             return eval("return (isset(\$values$myVar)) ? \$values$myVar : null;");
         } else {
             return null;
@@ -471,29 +471,29 @@ 
         return true;
     }
 
-   /**
-    * Accepts a renderer
-    *
-    * @param HTML_QuickForm_Renderer    renderer object
-    * @param bool                       Whether an element is required
-    * @param string                     An error message associated with an element
-    * @access public
-    * @return void
-    */
+    /**
+     * Accepts a renderer
+     *
+     * @param HTML_QuickForm_Renderer    renderer object
+     * @param bool                       Whether an element is required
+     * @param string                     An error message associated with an element
+     * @access public
+     * @return void
+     */
     function accept(&$renderer, $required=false, $error=null)
     {
         $renderer->renderElement($this, $required, $error);
     }
 
-   /**
-    * Automatically generates and assigns an 'id' attribute for the element.
-    *
-    * Currently used to ensure that labels work on radio buttons and
-    * checkboxes. Per idea of Alexander Radivanovich.
-    *
-    * @access private
-    * @return void
-    */
+    /**
+     * Automatically generates and assigns an 'id' attribute for the element.
+     *
+     * Currently used to ensure that labels work on radio buttons and
+     * checkboxes. Per idea of Alexander Radivanovich.
+     *
+     * @access private
+     * @return void
+     */
     function _generateId()
     {
         static $idx = 1;
@@ -503,14 +503,14 @@ 
         }
     }
 
-   /**
-    * Returns a 'safe' element's value
-    *
-    * @param  array   array of submitted values to search
-    * @param  bool    whether to return the value as associative array
-    * @access public
-    * @return mixed
-    */
+    /**
+     * Returns a 'safe' element's value
+     *
+     * @param  array   array of submitted values to search
+     * @param  bool    whether to return the value as associative array
+     * @access public
+     * @return mixed
+     */
     function exportValue(&$submitValues, $assoc = false)
     {
         $value = $this->_findValue($submitValues);
@@ -523,14 +523,14 @@ 
     // }}}
     // {{{ _prepareValue()
 
-   /**
-    * Used by exportValue() to prepare the value for returning
-    *
-    * @param  mixed   the value found in exportValue()
-    * @param  bool    whether to return the value as associative array
-    * @access private
-    * @return mixed
-    */
+    /**
+     * Used by exportValue() to prepare the value for returning
+     *
+     * @param  mixed   the value found in exportValue()
+     * @param  bool    whether to return the value as associative array
+     * @access private
+     * @return mixed
+     */
     function _prepareValue($value, $assoc)
     {
         if (null === $value) {

Spacing +10 added lines, -10 removed lines

@@ -288,7 +288,7 @@ 
         //return ('' != $value? htmlspecialchars($value): ' ') .
         //       $this->_getPersistantData();
 
-        $value =  ('' != $value ? @htmlspecialchars($value, ENT_COMPAT, HTML_Common::charset()): ' ') .
+        $value = ('' != $value ? @htmlspecialchars($value, ENT_COMPAT, HTML_Common::charset()) : ' ').
                $this->_getPersistantData();
         return '<span class="freeze">'.$value.'</span>';
         //
@@ -309,11 +309,11 @@ 
             return '';
         } else {
             $id = $this->getAttribute('id');
-            return '<input' . $this->_getAttrString(array(
+            return '<input'.$this->_getAttrString(array(
                        'type'  => 'hidden',
                        'name'  => $this->getName(),
                        'value' => $this->getValue()
-                   ) + (isset($id)? array('id' => $id): array())) . ' />';
+                   ) + (isset($id) ? array('id' => $id) : array())).' />';
         }
     }
 
@@ -344,7 +344,7 @@ 
      * @access    public
      * @return    void
      */
-    function setPersistantFreeze($persistant=false)
+    function setPersistantFreeze($persistant = false)
     {
         $this->_persistantFreeze = $persistant;
     } //end func setPersistantFreeze
@@ -414,10 +414,10 @@ 
         if (isset($values[$elementName])) {
             return $values[$elementName];
         } elseif (strpos($elementName, '[')) {
-            $myVar = "['" . str_replace(
+            $myVar = "['".str_replace(
                          array('\\', '\'', ']', '['), array('\\\\', '\\\'', '', "']['"),
                          $elementName
-                     ) . "']";
+                     )."']";
             return eval("return (isset(\$values$myVar)) ? \$values$myVar : null;");
         } else {
             return null;
@@ -480,7 +480,7 @@ 
     * @access public
     * @return void
     */
-    function accept(&$renderer, $required=false, $error=null)
+    function accept(&$renderer, $required = false, $error = null)
     {
         $renderer->renderElement($this, $required, $error);
     }
@@ -499,7 +499,7 @@ 
         static $idx = 1;
 
         if (!$this->getAttribute('id')) {
-            $this->updateAttributes(array('id' => 'qf_' . substr(md5(microtime() . $idx++), 0, 6)));
+            $this->updateAttributes(array('id' => 'qf_'.substr(md5(microtime().$idx++), 0, 6)));
         }
     }
 
@@ -543,10 +543,10 @@ 
                 return array($name => $value);
             } else {
                 $valueAry = array();
-                $myIndex  = "['" . str_replace(
+                $myIndex  = "['".str_replace(
                                 array('\\', '\'', ']', '['), array('\\\\', '\\\'', '', "']['"),
                                 $name
-                            ) . "']";
+                            )."']";
                 eval("\$valueAry$myIndex = \$value;");
                 return $valueAry;
             }

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

Doc Comments +1 added lines, -1 removed lines

@@ -86,7 +86,7 @@
      *
      * @since     1.0
      * @access    public
-     * @return    int
+     * @return    string|null
      */
     function getSize()
     {

Indentation +17 added lines, -17 removed lines

@@ -38,10 +38,10 @@ 
 {
     // {{{ properties
 
-   /**
-    * Uploaded file data, from $_FILES
-    * @var array
-    */
+    /**
+     * Uploaded file data, from $_FILES
+     * @var array
+     */
     var $_value = null;
 
     // }}}
@@ -237,15 +237,15 @@ 
     // }}}
     // {{{ _ruleCheckMaxFileSize()
 
-   /**
-    * Tries to find the element value from the values array
-    *
-    * Needs to be redefined here as $_FILES is populated differently from
-    * other arrays when element name is of the form foo[bar]
-    *
-    * @access    private
-    * @return    mixed
-    */
+    /**
+     * Tries to find the element value from the values array
+     *
+     * Needs to be redefined here as $_FILES is populated differently from
+     * other arrays when element name is of the form foo[bar]
+     *
+     * @access    private
+     * @return    mixed
+     */
     function _findValue(&$values = null)
     {
         if (empty($_FILES)) {
@@ -262,12 +262,12 @@ 
             $idx   = "['" . str_replace(
                         array('\\', '\'', ']', '['), array('\\\\', '\\\'', '', "']['"),
                         substr($elementName, $pos + 1, -1)
-                     ) . "']";
+                        ) . "']";
             $props = array('name', 'type', 'size', 'tmp_name', 'error');
             $code  = "if (!isset(\$_FILES['{$base}']['name']{$idx})) {\n" .
-                     "    return null;\n" .
-                     "} else {\n" .
-                     "    \$value = array();\n";
+                        "    return null;\n" .
+                        "} else {\n" .
+                        "    \$value = array();\n";
             foreach ($props as $prop) {
                 $code .= "    \$value['{$prop}'] = \$_FILES['{$base}']['{$prop}']{$idx};\n";
             }

Spacing +10 added lines, -10 removed lines

@@ -57,7 +57,7 @@ 
      * @since     1.0
      * @access    public
      */
-    public function __construct($elementName=null, $elementLabel=null, $attributes=null)
+    public function __construct($elementName = null, $elementLabel = null, $attributes = null)
     {
         parent::__construct($elementName, $elementLabel, $attributes);
         $this->setType('file');
@@ -191,11 +191,11 @@ 
      */
     public function moveUploadedFile($dest, $fileName = '')
     {
-        if ($dest != ''  && substr($dest, -1) != '/') {
+        if ($dest != '' && substr($dest, -1) != '/') {
             $dest .= '/';
         }
         $fileName = ($fileName != '') ? $fileName : basename($this->_value['name']);
-        return move_uploaded_file($this->_value['tmp_name'], $dest . $fileName);
+        return move_uploaded_file($this->_value['tmp_name'], $dest.$fileName);
     }
 
     /**
@@ -245,23 +245,23 @@ 
         if (isset($_FILES[$elementName])) {
             return $_FILES[$elementName];
         } elseif (false !== ($pos = strpos($elementName, '['))) {
-            $base  = str_replace(
+            $base = str_replace(
                         array('\\', '\''), array('\\\\', '\\\''),
                         substr($elementName, 0, $pos)
                     );
-            $idx   = "['" . str_replace(
+            $idx = "['".str_replace(
                         array('\\', '\'', ']', '['), array('\\\\', '\\\'', '', "']['"),
                         substr($elementName, $pos + 1, -1)
-                     ) . "']";
+                     )."']";
             $props = array('name', 'type', 'size', 'tmp_name', 'error');
-            $code  = "if (!isset(\$_FILES['{$base}']['name']{$idx})) {\n" .
-                     "    return null;\n" .
-                     "} else {\n" .
+            $code  = "if (!isset(\$_FILES['{$base}']['name']{$idx})) {\n".
+                     "    return null;\n".
+                     "} else {\n".
                      "    \$value = array();\n";
             foreach ($props as $prop) {
                 $code .= "    \$value['{$prop}'] = \$_FILES['{$base}']['{$prop}']{$idx};\n";
             }
-            return eval($code . "    return \$value;\n}\n");
+            return eval($code."    return \$value;\n}\n");
         } else {
             return null;
         }