chamilo / chamilo-lms

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

Doc Comments +1 added lines

@@ -331,6 +331,7 @@
     * So we use the smarty eval plugin function	to do this.
     *
     * @param    string      The template source
+    * @param string $tplSource
     * @access   private
     * @return   void
     */

Indentation +145 added lines, -145 removed lines

@@ -87,63 +87,63 @@ 
  */
 class HTML_QuickForm_Renderer_ArraySmarty extends HTML_QuickForm_Renderer_Array
 {
-   /**#@+
+    /**#@+
     * @access private
     */
-   /**
-    * The Smarty template engine instance
-    * @var object
-    */
+    /**
+     * The Smarty template engine instance
+     * @var object
+     */
     var $_tpl = null;
 
-   /**
-    * Current element index
-    * @var integer
-    */
+    /**
+     * Current element index
+     * @var integer
+     */
     var $_elementIdx = 0;
 
     /**
-    * The current element index inside a group
-    * @var integer
-    */
+     * The current element index inside a group
+     * @var integer
+     */
     var $_groupElementIdx = 0;
 
-   /**
-    * How to handle the required tag for required fields
-    * @var string
-    * @see      setRequiredTemplate()
-    */
+    /**
+     * How to handle the required tag for required fields
+     * @var string
+     * @see      setRequiredTemplate()
+     */
     var $_required = '';
 
-   /**
-    * How to handle error messages in form validation
-    * @var string
-    * @see      setErrorTemplate()
-    */
+    /**
+     * How to handle error messages in form validation
+     * @var string
+     * @see      setErrorTemplate()
+     */
     var $_error = '';
-   /**#@-*/
+    /**#@-*/
 
-   /**
-    * Constructor
-    *
-    * @param  Smarty  reference to the Smarty template engine instance
-    * @param  bool    true: render an array of labels to many labels, $key 0 to 'label' and the oterh to "label_$key"
-    * @param  bool    true: collect all hidden elements into string; false: process them as usual form elements
-    * @access public
-    */
+    /**
+     * Constructor
+     *
+     * @param  Smarty  reference to the Smarty template engine instance
+     * @param  bool    true: render an array of labels to many labels, $key 0 to 'label' and the oterh to "label_$key"
+     * @param  bool    true: collect all hidden elements into string; false: process them as usual form elements
+     * @access public
+     */
     function HTML_QuickForm_Renderer_ArraySmarty(&$tpl, $staticLabels = false, $collectHidden = true)
     {
         $this->HTML_QuickForm_Renderer_Array($collectHidden, $staticLabels);
         $this->_tpl =& $tpl;
     } // end constructor
 
-   /**
-    * Called when visiting a header element
-    *
-    * @param    HTML_QuickForm_header   header element being visited
-    * @access   public
-    * @return   void
-    */
+    /**
+     * Called when visiting a header element
+     *
+     * @param    HTML_QuickForm_header   header element being visited
+     * @access   public
+     * @return   void
+     */
     function renderHeader(&$header)
     {
         if ($name = $header->getName()) {
@@ -154,31 +154,31 @@ 
         $this->_currentSection = $this->_sectionCount++;
     } // end func renderHeader
 
-   /**
-    * Called when visiting a group, before processing any group elements
-    *
-    * @param    HTML_QuickForm_group    group being visited
-    * @param    bool                    Whether a group is required
-    * @param    string                  An error message associated with a group
-    * @access   public
-    * @return   void
-    */
+    /**
+     * Called when visiting a group, before processing any group elements
+     *
+     * @param    HTML_QuickForm_group    group being visited
+     * @param    bool                    Whether a group is required
+     * @param    string                  An error message associated with a group
+     * @access   public
+     * @return   void
+     */
     function startGroup(&$group, $required, $error)
     {
         parent::startGroup($group, $required, $error);
         $this->_groupElementIdx = 1;
     } // end func startGroup
 
-   /**
-    * Creates an array representing an element containing
-    * the key for storing this
-    *
-    * @access private
-    * @param  HTML_QuickForm_element    form element being visited
-    * @param  bool                      Whether an element is required
-    * @param  string                    Error associated with the element
-    * @return array
-    */
+    /**
+     * Creates an array representing an element containing
+     * the key for storing this
+     *
+     * @access private
+     * @param  HTML_QuickForm_element    form element being visited
+     * @param  bool                      Whether an element is required
+     * @param  string                    Error associated with the element
+     * @return array
+     */
     function _elementToArray(&$element, $required, $error)
     {
         $ret = parent::_elementToArray($element, $required, $error);
@@ -242,13 +242,13 @@ 
         return $ret;
     } // end func _elementToArray
 
-   /**
-    * Stores an array representation of an element in the form array
-    *
-    * @access private
-    * @param array  Array representation of an element
-    * @return void
-    */
+    /**
+     * Stores an array representation of an element in the form array
+     *
+     * @access private
+     * @param array  Array representation of an element
+     * @return void
+     */
     function _storeArray($elAry)
     {
         if ($elAry) {
@@ -265,20 +265,20 @@ 
         return;
     }
 
-   /**
-    * Called when an element is required
-    *
-    * This method will add the required tag to the element label and/or the element html
-    * such as defined with the method setRequiredTemplate.
-    *
-    * @param    string      The element label
-    * @param    string      The element html rendering
-    * @param    boolean     The element required
-    * @param    string      The element error
-    * @see      setRequiredTemplate()
-    * @access   private
-    * @return   void
-    */
+    /**
+     * Called when an element is required
+     *
+     * This method will add the required tag to the element label and/or the element html
+     * such as defined with the method setRequiredTemplate.
+     *
+     * @param    string      The element label
+     * @param    string      The element html rendering
+     * @param    boolean     The element required
+     * @param    string      The element error
+     * @see      setRequiredTemplate()
+     * @access   private
+     * @return   void
+     */
     function _renderRequired(&$label, &$html, &$required, &$error)
     {
         $this->_tpl->assign(array(
@@ -296,20 +296,20 @@ 
         $this->_tpl->clear_assign(array('label', 'html', 'required'));
     } // end func _renderRequired
 
-   /**
-    * Called when an element has a validation error
-    *
-    * This method will add the error message to the element label or the element html
-    * such as defined with the method setErrorTemplate. If the error placeholder is not found
-    * in the template, the error will be displayed in the form error block.
-    *
-    * @param    string      The element label
-    * @param    string      The element html rendering
-    * @param    string      The element error
-    * @see      setErrorTemplate()
-    * @access   private
-    * @return   void
-    */
+    /**
+     * Called when an element has a validation error
+     *
+     * This method will add the error message to the element label or the element html
+     * such as defined with the method setErrorTemplate. If the error placeholder is not found
+     * in the template, the error will be displayed in the form error block.
+     *
+     * @param    string      The element label
+     * @param    string      The element html rendering
+     * @param    string      The element error
+     * @see      setErrorTemplate()
+     * @access   private
+     * @return   void
+     */
     function _renderError(&$label, &$html, &$error)
     {
         $this->_tpl->assign(array('label' => '', 'html' => '', 'error' => $error));
@@ -324,16 +324,16 @@ 
         $this->_tpl->clear_assign(array('label', 'html', 'error'));
     } // end func _renderError
 
-   /**
-    * Process an template sourced in a string with Smarty
-    *
-    * Smarty has no core function to render	a template given as a string.
-    * So we use the smarty eval plugin function	to do this.
-    *
-    * @param    string      The template source
-    * @access   private
-    * @return   void
-    */
+    /**
+     * Process an template sourced in a string with Smarty
+     *
+     * Smarty has no core function to render	a template given as a string.
+     * So we use the smarty eval plugin function	to do this.
+     *
+     * @param    string      The template source
+     * @access   private
+     * @return   void
+     */
     function _tplFetch($tplSource)
     {
         if (!function_exists('smarty_function_eval')) {
@@ -342,54 +342,54 @@ 
         return smarty_function_eval(array('var' => $tplSource), $this->_tpl);
     }// end func _tplFetch
 
-   /**
-    * Sets the way required elements are rendered
-    *
-    * You can use {$label} or {$html} placeholders to let the renderer know where
-    * where the element label or the element html are positionned according to the
-    * required tag. They will be replaced accordingly with the right value.	You
-    * can use the full smarty syntax here, especially a custom modifier for I18N.
-    * For example:
-    * {if $required}<span style="color: red;">*</span>{/if}{$label|translate}
-    * will put a red star in front of the label if the element is required and
-    * translate the label.
-    *
-    *
-    * @param    string      The required element template
-    * @access   public
-    * @return   void
-    */
+    /**
+     * Sets the way required elements are rendered
+     *
+     * You can use {$label} or {$html} placeholders to let the renderer know where
+     * where the element label or the element html are positionned according to the
+     * required tag. They will be replaced accordingly with the right value.	You
+     * can use the full smarty syntax here, especially a custom modifier for I18N.
+     * For example:
+     * {if $required}<span style="color: red;">*</span>{/if}{$label|translate}
+     * will put a red star in front of the label if the element is required and
+     * translate the label.
+     *
+     *
+     * @param    string      The required element template
+     * @access   public
+     * @return   void
+     */
     function setRequiredTemplate($template)
     {
         $this->_required = $template;
     } // end func setRequiredTemplate
 
-   /**
-    * Sets the way elements with validation errors are rendered
-    *
-    * You can use {$label} or {$html} placeholders to let the renderer know where
-    * where the element label or the element html are positionned according to the
-    * error message. They will be replaced accordingly with the right value.
-    * The error message will replace the {$error} placeholder.
-    * For example:
-    * {if $error}<span style="color: red;">{$error}</span>{/if}<br />{$html}
-    * will put the error message in red on top of the element html.
-    *
-    * If you want all error messages to be output in the main error block, use
-    * the {$form.errors} part of the rendered array that collects all raw error
-    * messages.
-    *
-    * If you want to place all error messages manually, do not specify {$html}
-    * nor {$label}.
-    *
-    * Groups can have special layouts. With this kind of groups, you have to
-    * place the formated error message manually. In this case, use {$form.group.error}
-    * where you want the formated error message to appear in the form.
-    *
-    * @param    string      The element error template
-    * @access   public
-    * @return   void
-    */
+    /**
+     * Sets the way elements with validation errors are rendered
+     *
+     * You can use {$label} or {$html} placeholders to let the renderer know where
+     * where the element label or the element html are positionned according to the
+     * error message. They will be replaced accordingly with the right value.
+     * The error message will replace the {$error} placeholder.
+     * For example:
+     * {if $error}<span style="color: red;">{$error}</span>{/if}<br />{$html}
+     * will put the error message in red on top of the element html.
+     *
+     * If you want all error messages to be output in the main error block, use
+     * the {$form.errors} part of the rendered array that collects all raw error
+     * messages.
+     *
+     * If you want to place all error messages manually, do not specify {$html}
+     * nor {$label}.
+     *
+     * Groups can have special layouts. With this kind of groups, you have to
+     * place the formated error message manually. In this case, use {$form.group.error}
+     * where you want the formated error message to appear in the form.
+     *
+     * @param    string      The element error template
+     * @access   public
+     * @return   void
+     */
     function setErrorTemplate($template)
     {
         $this->_error = $template;

Spacing +16 added lines, -16 removed lines

@@ -134,7 +134,7 @@ 
     function HTML_QuickForm_Renderer_ArraySmarty(&$tpl, $staticLabels = false, $collectHidden = true)
     {
         $this->HTML_QuickForm_Renderer_Array($collectHidden, $staticLabels);
-        $this->_tpl =& $tpl;
+        $this->_tpl = & $tpl;
     } // end constructor
 
    /**
@@ -188,7 +188,7 @@ 
             // we don't need the elements, see the array structure
             unset($ret['elements']);
         }
-        if (($required || $error) && !empty($this->_required)){
+        if (($required || $error) && !empty($this->_required)) {
             $this->_renderRequired($ret['label'], $ret['html'], $required, $error);
         }
         if ($error && !empty($this->_error)) {
@@ -206,13 +206,13 @@ 
             if (isset($matches[1])) {
                 $sKeysSub = substr_replace($ret['name'], '', 0, strlen($matches[1]));
                 $sKeysSub = str_replace(
-                    array('\\',   '\'',   '['  ,   ']', '[\'\']'),
-                    array('\\\\', '\\\'', '[\'', '\']', '[]'    ),
+                    array('\\', '\'', '[', ']', '[\'\']'),
+                    array('\\\\', '\\\'', '[\'', '\']', '[]'),
                     $sKeysSub
                 );
-                $sKeys = '[\'' . str_replace(array('\\', '\''), array('\\\\', '\\\''), $matches[1]) . '\']' . $sKeysSub;
+                $sKeys = '[\''.str_replace(array('\\', '\''), array('\\\\', '\\\''), $matches[1]).'\']'.$sKeysSub;
             } else {
-                $sKeys = '[\'' . str_replace(array('\\', '\''), array('\\\\', '\\\''), $ret['name']) . '\']';
+                $sKeys = '[\''.str_replace(array('\\', '\''), array('\\\\', '\\\''), $ret['name']).'\']';
             }
             // special handling for elements in native groups
             if ($this->_currentGroup) {
@@ -228,14 +228,14 @@ 
             }
         // element without a name
         } elseif ($ret['name'] == '') {
-            $sKeys = '[\'element_' . $this->_elementIdx . '\']';
+            $sKeys = '[\'element_'.$this->_elementIdx.'\']';
         // other elements
         } else {
-            $sKeys = '[\'' . str_replace(array('\\', '\''), array('\\\\', '\\\''), $ret['name']) . '\']';
+            $sKeys = '[\''.str_replace(array('\\', '\''), array('\\\\', '\\\''), $ret['name']).'\']';
         }
         // for radios: add extra key from value
         if ('radio' == $ret['type'] and substr($sKeys, -2) != '[]') {
-            $sKeys .= '[\'' . str_replace(array('\\', '\''), array('\\\\', '\\\''), $ret['value']) . '\']';
+            $sKeys .= '[\''.str_replace(array('\\', '\''), array('\\\\', '\\\''), $ret['value']).'\']';
         }
         $this->_elementIdx++;
         $ret['keys'] = $sKeys;
@@ -256,9 +256,9 @@ 
             unset($elAry['keys']);
             // where should we put this element...
             if (is_array($this->_currentGroup) && ('group' != $elAry['type'])) {
-                $toEval = '$this->_currentGroup' . $sKeys . ' = $elAry;';
+                $toEval = '$this->_currentGroup'.$sKeys.' = $elAry;';
             } else {
-                $toEval = '$this->_ary' . $sKeys . ' = $elAry;';
+                $toEval = '$this->_ary'.$sKeys.' = $elAry;';
             }
             eval($toEval);
         }
@@ -287,10 +287,10 @@ 
             'required' => $required,
             'error'    => $error
         ));
-        if (!empty($label) && strpos($this->_required, $this->_tpl->left_delimiter . '$label') !== false) {
+        if (!empty($label) && strpos($this->_required, $this->_tpl->left_delimiter.'$label') !== false) {
             $label = $this->_tplFetch($this->_required);
         }
-        if (!empty($html) && strpos($this->_required, $this->_tpl->left_delimiter . '$html') !== false) {
+        if (!empty($html) && strpos($this->_required, $this->_tpl->left_delimiter.'$html') !== false) {
             $html = $this->_tplFetch($this->_required);
         }
         $this->_tpl->clear_assign(array('label', 'html', 'required'));
@@ -316,9 +316,9 @@ 
         $error = $this->_tplFetch($this->_error);
         $this->_tpl->assign(array('label' => $label, 'html'  => $html));
 
-        if (!empty($label) && strpos($this->_error, $this->_tpl->left_delimiter . '$label') !== false) {
+        if (!empty($label) && strpos($this->_error, $this->_tpl->left_delimiter.'$label') !== false) {
             $label = $this->_tplFetch($this->_error);
-        } elseif (!empty($html) && strpos($this->_error, $this->_tpl->left_delimiter . '$html') !== false) {
+        } elseif (!empty($html) && strpos($this->_error, $this->_tpl->left_delimiter.'$html') !== false) {
             $html = $this->_tplFetch($this->_error);
         }
         $this->_tpl->clear_assign(array('label', 'html', 'error'));
@@ -337,7 +337,7 @@ 
     function _tplFetch($tplSource)
     {
         if (!function_exists('smarty_function_eval')) {
-            require SMARTY_DIR . '/plugins/function.eval.php';
+            require SMARTY_DIR.'/plugins/function.eval.php';
         }
         return smarty_function_eval(array('var' => $tplSource), $this->_tpl);
     }// end func _tplFetch

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

Doc Comments +5 added lines, -1 removed lines

@@ -40,7 +40,7 @@ 
     private $customElementTemplate;
 
     /**
-     * @return mixed
+     * @return string
      */
     public function getCustomElementTemplate()
     {
@@ -457,6 +457,7 @@ 
      *
      * @param       string      The HTML surrounding an element
      * @param       string      (optional) Name of the element to apply template for
+     * @param string $html
      * @access      public
      * @return      void
      */
@@ -504,6 +505,7 @@ 
      * Sets header template
      *
      * @param       string      The HTML surrounding the header
+     * @param string $html
      * @access      public
      * @return      void
      */
@@ -516,6 +518,7 @@ 
      * Sets form template
      *
      * @param     string    The HTML surrounding the form tags
+     * @param string $html
      * @access    public
      * @return    void
      */
@@ -527,6 +530,7 @@ 
      * Sets the note indicating required fields template
      *
      * @param       string      The HTML surrounding the required note
+     * @param string $html
      * @access      public
      * @return      void
      */

Indentation +159 added lines, -159 removed lines

@@ -56,128 +56,128 @@ 
         $this->customElementTemplate = $customElementTemplate;
     }
 
-   /**
-    * The HTML of the form
-    * @var      string
-    * @access   private
-    */
+    /**
+     * The HTML of the form
+     * @var      string
+     * @access   private
+     */
     var $_html;
 
-   /**
-    * Header Template string
-    * @var      string
-    * @access   private
-    */
+    /**
+     * Header Template string
+     * @var      string
+     * @access   private
+     */
     var $_headerTemplate =
         "\n\t<tr>\n\t\t<td style=\"white-space: nowrap; background-color: #CCCCCC;\" align=\"left\" valign=\"top\" colspan=\"2\"><b>{header}</b></td>\n\t</tr>";
 
-   /**
-    * Element template string
-    * @var      string
-    * @access   private
-    */
+    /**
+     * Element template string
+     * @var      string
+     * @access   private
+     */
     var $_elementTemplate =
         "\n\t<tr>\n\t\t<td align=\"right\" valign=\"top\"><!-- BEGIN required --><span style=\"color: #ff0000\">*</span><!-- END required --><b>{label}</b></td>\n\t\t<td valign=\"top\" align=\"left\"><!-- BEGIN error --><span style=\"color: #ff0000\">{error}</span><br /><!-- END error -->\t{element}</td>\n\t</tr>";
 
-   /**
-    * Form template string
-    * @var      string
-    * @access   private
-    */
+    /**
+     * Form template string
+     * @var      string
+     * @access   private
+     */
     var $_formTemplate =
         "\n<form{attributes}>\n<div>\n{hidden}<table border=\"0\">\n{content}\n</table>\n</div>\n</form>";
 
-   /**
-    * Required Note template string
-    * @var      string
-    * @access   private
-    */
+    /**
+     * Required Note template string
+     * @var      string
+     * @access   private
+     */
     var $_requiredNoteTemplate =
         "\n\t<tr>\n\t\t<td></td>\n\t<td align=\"left\" valign=\"top\">{requiredNote}</td>\n\t</tr>";
 
-   /**
-    * Array containing the templates for customised elements
-    * @var      array
-    * @access   private
-    */
+    /**
+     * Array containing the templates for customised elements
+     * @var      array
+     * @access   private
+     */
     var $_templates = array();
 
-   /**
-    * Array containing the templates for group wraps.
-    *
-    * These templates are wrapped around group elements and groups' own
-    * templates wrap around them. This is set by setGroupTemplate().
-    *
-    * @var      array
-    * @access   private
-    */
+    /**
+     * Array containing the templates for group wraps.
+     *
+     * These templates are wrapped around group elements and groups' own
+     * templates wrap around them. This is set by setGroupTemplate().
+     *
+     * @var      array
+     * @access   private
+     */
     var $_groupWraps = array();
 
-   /**
-    * Array containing the templates for elements within groups
-    * @var      array
-    * @access   private
-    */
+    /**
+     * Array containing the templates for elements within groups
+     * @var      array
+     * @access   private
+     */
     var $_groupTemplates = array();
 
-   /**
-    * True if we are inside a group
-    * @var      bool
-    * @access   private
-    */
+    /**
+     * True if we are inside a group
+     * @var      bool
+     * @access   private
+     */
     var $_inGroup = false;
 
-   /**
-    * Array with HTML generated for group elements
-    * @var      array
-    * @access   private
-    */
+    /**
+     * Array with HTML generated for group elements
+     * @var      array
+     * @access   private
+     */
     var $_groupElements = array();
 
-   /**
-    * Template for an element inside a group
-    * @var      string
-    * @access   private
-    */
+    /**
+     * Template for an element inside a group
+     * @var      string
+     * @access   private
+     */
     var $_groupElementTemplate = '';
 
-   /**
-    * HTML that wraps around the group elements
-    * @var      string
-    * @access   private
-    */
+    /**
+     * HTML that wraps around the group elements
+     * @var      string
+     * @access   private
+     */
     var $_groupWrap = '';
 
-   /**
-    * HTML for the current group
-    * @var      string
-    * @access   private
-    */
+    /**
+     * HTML for the current group
+     * @var      string
+     * @access   private
+     */
     var $_groupTemplate = '';
 
-   /**
-    * Collected HTML of the hidden fields
-    * @var      string
-    * @access   private
-    */
+    /**
+     * Collected HTML of the hidden fields
+     * @var      string
+     * @access   private
+     */
     var $_hiddenHtml = '';
 
-   /**
-    * Constructor
-    *
-    * @access public
-    */
+    /**
+     * Constructor
+     *
+     * @access public
+     */
     public function HTML_QuickForm_Renderer_Default()
     {
         parent::__construct();
     } // end constructor
 
-   /**
-    * returns the HTML generated for the form
-    *
-    * @access public
-    * @return string
-    */
+    /**
+     * returns the HTML generated for the form
+     *
+     * @access public
+     * @return string
+     */
     public function toHtml()
     {
         // _hiddenHtml is cleared in finishForm(), so this only matters when
@@ -185,13 +185,13 @@ 
         return $this->_hiddenHtml . $this->_html;
     } // end func toHtml
 
-   /**
-    * Called when visiting a form, before processing any form elements
-    *
-    * @param    HTML_QuickForm  form object being visited
-    * @access   public
-    * @return   void
-    */
+    /**
+     * Called when visiting a form, before processing any form elements
+     *
+     * @param    HTML_QuickForm  form object being visited
+     * @access   public
+     * @return   void
+     */
     function startForm(&$form)
     {
         $this->setForm($form);
@@ -218,14 +218,14 @@ 
 
 
 
-   /**
-    * Called when visiting a form, after processing all form elements
-    * Adds required note, form attributes, validation javascript and form content.
-    *
-    * @param    HTML_QuickForm  form object being visited
-    * @access   public
-    * @return   void
-    */
+    /**
+     * Called when visiting a form, after processing all form elements
+     * Adds required note, form attributes, validation javascript and form content.
+     *
+     * @param    HTML_QuickForm  form object being visited
+     * @access   public
+     * @return   void
+     */
     public function finishForm(&$form)
     {
         // add a required note, if one is needed
@@ -248,13 +248,13 @@ 
         }
     } // end func finishForm
 
-   /**
-    * Called when visiting a header element
-    *
-    * @param    HTML_QuickForm_header   header element being visited
-    * @access   public
-    * @return   void
-    */
+    /**
+     * Called when visiting a header element
+     *
+     * @param    HTML_QuickForm_header   header element being visited
+     * @access   public
+     * @return   void
+     */
     function renderHeader(&$header)
     {
         $name = $header->getName();
@@ -265,17 +265,17 @@ 
         }
     } // end func renderHeader
 
-   /**
-    * Helper method for renderElement
-    *
-    * @param    HTML_QuickForm_element $element
-    * @param    bool        Whether an element is required
-    * @param    string      $required Error message associated with the element
-    * @param    string      $error Label for ID
-    * @access   private
-    * @see      renderElement()
-    * @return   string      Html for element
-    */
+    /**
+     * Helper method for renderElement
+     *
+     * @param    HTML_QuickForm_element $element
+     * @param    bool        Whether an element is required
+     * @param    string      $required Error message associated with the element
+     * @param    string      $error Label for ID
+     * @access   private
+     * @see      renderElement()
+     * @return   string      Html for element
+     */
     private function _prepareTemplate(HTML_QuickForm_element $element, $required, $error)
     {
         $name = $element->getName();
@@ -343,16 +343,16 @@ 
         return $html;
     } // end func _prepareTemplate
 
-   /**
-    * Renders an element Html
-    * Called when visiting an element
-    *
-    * @param HTML_QuickForm_element form element being visited
-    * @param bool                   Whether an element is required
-    * @param string                 An error message associated with an element
-    * @access public
-    * @return void
-    */
+    /**
+     * Renders an element Html
+     * Called when visiting an element
+     *
+     * @param HTML_QuickForm_element form element being visited
+     * @param bool                   Whether an element is required
+     * @param string                 An error message associated with an element
+     * @access public
+     * @return void
+     */
     public function renderElement(&$element, $required, $error)
     {
         if (!$this->_inGroup) {
@@ -379,40 +379,40 @@ 
         }
     } // end func renderElement
 
-   /**
-    * Renders an hidden element
-    * Called when visiting a hidden element
-    *
-    * @param HTML_QuickForm_element     form element being visited
-    * @access public
-    * @return void
-    */
+    /**
+     * Renders an hidden element
+     * Called when visiting a hidden element
+     *
+     * @param HTML_QuickForm_element     form element being visited
+     * @access public
+     * @return void
+     */
     function renderHidden(&$element)
     {
         $this->_hiddenHtml .= $element->toHtml() . "\n";
     } // end func renderHidden
 
-   /**
-    * Called when visiting a raw HTML/text pseudo-element
-    *
-    * @param  HTML_QuickForm_html   element being visited
-    * @access public
-    * @return void
-    */
+    /**
+     * Called when visiting a raw HTML/text pseudo-element
+     *
+     * @param  HTML_QuickForm_html   element being visited
+     * @access public
+     * @return void
+     */
     function renderHtml(&$data)
     {
         $this->_html .= $data->toHtml();
     } // end func renderHtml
 
-   /**
-    * Called when visiting a group, before processing any group elements
-    *
-    * @param HTML_QuickForm_group   group being visited
-    * @param bool       Whether a group is required
-    * @param string     An error message associated with a group
-    * @access public
-    * @return void
-    */
+    /**
+     * Called when visiting a group, before processing any group elements
+     *
+     * @param HTML_QuickForm_group   group being visited
+     * @param bool       Whether a group is required
+     * @param string     An error message associated with a group
+     * @access public
+     * @return void
+     */
     function startGroup(&$group, $required, $error)
     {
         $name = $group->getName();
@@ -423,13 +423,13 @@ 
         $this->_inGroup              = true;
     } // end func startGroup
 
-   /**
-    * Called when visiting a group, after processing all group elements
-    *
-    * @param    HTML_QuickForm_group    group being visited
-    * @access   public
-    * @return   void
-    */
+    /**
+     * Called when visiting a group, after processing all group elements
+     *
+     * @param    HTML_QuickForm_group    group being visited
+     * @access   public
+     * @return   void
+     */
     function finishGroup(&$group)
     {
         $separator = $group->_separator;

Spacing +9 added lines, -9 removed lines

@@ -182,7 +182,7 @@ 
     {
         // _hiddenHtml is cleared in finishForm(), so this only matters when
         // finishForm() was not called (e.g. group::toHtml(), bug #3511)
-        return $this->_hiddenHtml . $this->_html;
+        return $this->_hiddenHtml.$this->_html;
     } // end func toHtml
 
    /**
@@ -244,7 +244,7 @@ 
         $this->_html = str_replace('{content}', $this->_html, $html);
         // add a validation script
         if ('' != ($script = $form->getValidationScript())) {
-            $this->_html = $script . "\n" . $this->_html;
+            $this->_html = $script."\n".$this->_html;
         }
     } // end func finishForm
 
@@ -289,7 +289,7 @@ 
             $nameLabel = $label;
         }
 
-        $labelFor = !empty($labelForId) ? 'for="' . $labelForId . '"' : 'for="' . $element->getName() . '"';
+        $labelFor = !empty($labelForId) ? 'for="'.$labelForId.'"' : 'for="'.$element->getName().'"';
 
         if (isset($this->_templates[$name])) {
             // Custom template
@@ -330,7 +330,7 @@ 
         }
         if (is_array($label)) {
             foreach ($label as $key => $text) {
-                $key  = is_int($key)? $key + 2: $key;
+                $key  = is_int($key) ? $key + 2 : $key;
                 $html = str_replace("{label_{$key}}", $text, $html);
                 $html = str_replace("<!-- BEGIN label_{$key} -->", '', $html);
                 $html = str_replace("<!-- END label_{$key} -->", '', $html);
@@ -389,7 +389,7 @@ 
     */
     function renderHidden(&$element)
     {
-        $this->_hiddenHtml .= $element->toHtml() . "\n";
+        $this->_hiddenHtml .= $element->toHtml()."\n";
     } // end func renderHidden
 
    /**
@@ -417,8 +417,8 @@ 
     {
         $name = $group->getName();
         $this->_groupTemplate        = $this->_prepareTemplate($group, $required, $error);
-        $this->_groupElementTemplate = empty($this->_groupTemplates[$name])? '': $this->_groupTemplates[$name];
-        $this->_groupWrap            = empty($this->_groupWraps[$name])? '': $this->_groupWraps[$name];
+        $this->_groupElementTemplate = empty($this->_groupTemplates[$name]) ? '' : $this->_groupTemplates[$name];
+        $this->_groupWrap            = empty($this->_groupWraps[$name]) ? '' : $this->_groupWraps[$name];
         $this->_groupElements        = array();
         $this->_inGroup              = true;
     } // end func startGroup
@@ -437,13 +437,13 @@ 
             $count = count($separator);
             $html  = '';
             for ($i = 0; $i < count($this->_groupElements); $i++) {
-                $html .= (0 == $i? '': $separator[($i - 1) % $count]) . $this->_groupElements[$i];
+                $html .= (0 == $i ? '' : $separator[($i - 1) % $count]).$this->_groupElements[$i];
             }
         } else {
             if (is_null($separator)) {
                 $separator = '&nbsp;';
             }
-            $html = implode((string)$separator, $this->_groupElements);
+            $html = implode((string) $separator, $this->_groupElements);
         }
         if (!empty($this->_groupWrap)) {
             $html = str_replace('{content}', $html, $this->_groupWrap);

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

Doc Comments +1 added lines

@@ -480,6 +480,7 @@
     * the block contents on get() a bit differently
     *
     * @param    string  Block name
+    * @param string $block
     * @return   string  Block contents
     */
     function _getTplBlock($block)

Indentation +172 added lines, -172 removed lines

@@ -38,88 +38,88 @@ 
  */
 class HTML_QuickForm_Renderer_ITStatic extends HTML_QuickForm_Renderer
 {
-   /**#@+
+    /**#@+
     * @access private
     */
-   /**
-    * An HTML_Template_IT or some other API compatible Template instance
-    * @var object
-    */
+    /**
+     * An HTML_Template_IT or some other API compatible Template instance
+     * @var object
+     */
     var $_tpl = null;
 
-   /**
-    * Rendered form name
-    * @var string
-    */
+    /**
+     * Rendered form name
+     * @var string
+     */
     var $_formName = 'form';
 
-   /**
-    * The errors that were not shown near concrete fields go here
-    * @var array
-    */
+    /**
+     * The errors that were not shown near concrete fields go here
+     * @var array
+     */
     var $_errors = array();
 
-   /**
-    * Show the block with required note?
-    * @var bool
-    */
+    /**
+     * Show the block with required note?
+     * @var bool
+     */
     var $_showRequired = false;
 
-   /**
-    * Which group are we currently parsing ?
-    * @var string
-    */
+    /**
+     * Which group are we currently parsing ?
+     * @var string
+     */
     var $_inGroup;
 
-   /**
-    * Index of the element in its group
-    * @var int
-    */
+    /**
+     * Index of the element in its group
+     * @var int
+     */
     var $_elementIndex = 0;
 
-   /**
-    * If elements have been added with the same name
-    * @var array
-    */
+    /**
+     * If elements have been added with the same name
+     * @var array
+     */
     var $_duplicateElements = array();
 
-   /**
-    * How to handle the required tag for required fields
-    * @var string
-    */
+    /**
+     * How to handle the required tag for required fields
+     * @var string
+     */
     var $_required = '{label}<font size="1" color="red">*</font>';
 
-   /**
-    * How to handle error messages in form validation
-    * @var string
-    */
+    /**
+     * How to handle error messages in form validation
+     * @var string
+     */
     var $_error = '<font color="red">{error}</font><br />{html}';
 
-   /**
-    * Collected HTML for hidden elements, if needed
-    * @var string
-    */
+    /**
+     * Collected HTML for hidden elements, if needed
+     * @var string
+     */
     var $_hidden = '';
-   /**#@-*/
+    /**#@-*/
 
-   /**
-    * Constructor
-    *
-    * @param HTML_Template_IT|HTML_Template_Sigma   Template object to use
-    */
+    /**
+     * Constructor
+     *
+     * @param HTML_Template_IT|HTML_Template_Sigma   Template object to use
+     */
     function HTML_QuickForm_Renderer_ITStatic(&$tpl)
     {
         $this->HTML_QuickForm_Renderer();
         $this->_tpl =& $tpl;
     } // end constructor
 
-   /**
-    * Called when visiting a form, before processing any form elements
-    *
-    * @param    HTML_QuickForm  form object being visited
-    * @access   public
-    * @return   void
-    */
+    /**
+     * Called when visiting a form, before processing any form elements
+     *
+     * @param    HTML_QuickForm  form object being visited
+     * @access   public
+     * @return   void
+     */
     function startForm(&$form)
     {
         $this->_formName = $form->getAttribute('id');
@@ -132,13 +132,13 @@ 
         }
     } // end func startForm
 
-   /**
-    * Called when visiting a form, after processing all form elements
-    *
-    * @param    HTML_QuickForm  form object being visited
-    * @access   public
-    * @return   void
-    */
+    /**
+     * Called when visiting a form, after processing all form elements
+     *
+     * @param    HTML_QuickForm  form object being visited
+     * @access   public
+     * @return   void
+     */
     function finishForm(&$form)
     {
         // display errors above form
@@ -162,13 +162,13 @@ 
         $this->_tpl->setVariable($this->_formName.'_javascript', $form->getValidationScript());
     } // end func finishForm
 
-   /**
-    * Called when visiting a header element
-    *
-    * @param    HTML_QuickForm_header   header element being visited
-    * @access   public
-    * @return   void
-    */
+    /**
+     * Called when visiting a header element
+     *
+     * @param    HTML_QuickForm_header   header element being visited
+     * @access   public
+     * @return   void
+     */
     function renderHeader(&$header)
     {
         $name = $header->getName();
@@ -181,15 +181,15 @@ 
         $this->_tpl->setVariable($varName, $header->toHtml());
     } // end func renderHeader
 
-   /**
-    * Called when visiting an element
-    *
-    * @param    HTML_QuickForm_element  form element being visited
-    * @param    bool                    Whether an element is required
-    * @param    string                  An error message associated with an element
-    * @access   public
-    * @return   void
-    */
+    /**
+     * Called when visiting an element
+     *
+     * @param    HTML_QuickForm_element  form element being visited
+     * @param    bool                    Whether an element is required
+     * @param    string                  An error message associated with an element
+     * @access   public
+     * @return   void
+     */
     function renderElement(&$element, $required, $error)
     {
         $name = $element->getName();
@@ -257,13 +257,13 @@ 
         }
     } // end func renderElement
 
-   /**
-    * Called when visiting a hidden element
-    *
-    * @param    HTML_QuickForm_element  hidden element being visited
-    * @access   public
-    * @return   void
-    */
+    /**
+     * Called when visiting a hidden element
+     *
+     * @param    HTML_QuickForm_element  hidden element being visited
+     * @access   public
+     * @return   void
+     */
     function renderHidden(&$element)
     {
         if ($this->_tpl->placeholderExists($this->_formName . '_hidden')) {
@@ -275,15 +275,15 @@ 
         }
     } // end func renderHidden
 
-   /**
-    * Called when visiting a group, before processing any group elements
-    *
-    * @param    HTML_QuickForm_group    group being visited
-    * @param    bool                    Whether a group is required
-    * @param    string                  An error message associated with a group
-    * @access   public
-    * @return   void
-    */
+    /**
+     * Called when visiting a group, before processing any group elements
+     *
+     * @param    HTML_QuickForm_group    group being visited
+     * @param    bool                    Whether a group is required
+     * @param    string                  An error message associated with a group
+     * @access   public
+     * @return   void
+     */
     function startGroup(&$group, $required, $error)
     {
         $name = $group->getName();
@@ -328,77 +328,77 @@ 
         $this->_inGroup = $varName;
     } // end func startGroup
 
-   /**
-    * Called when visiting a group, after processing all group elements
-    *
-    * @param    HTML_QuickForm_group    group being visited
-    * @access   public
-    * @return   void
-    */
+    /**
+     * Called when visiting a group, after processing all group elements
+     *
+     * @param    HTML_QuickForm_group    group being visited
+     * @access   public
+     * @return   void
+     */
     function finishGroup(&$group)
     {
         $this->_inGroup = '';
     } // end func finishGroup
 
-   /**
-    * Sets the way required elements are rendered
-    *
-    * You can use {label} or {html} placeholders to let the renderer know where
-    * where the element label or the element html are positionned according to the
-    * required tag. They will be replaced accordingly with the right value.
-    * For example:
-    * <font color="red">*</font>{label}
-    * will put a red star in front of the label if the element is required.
-    *
-    * @param    string      The required element template
-    * @access   public
-    * @return   void
-    */
+    /**
+     * Sets the way required elements are rendered
+     *
+     * You can use {label} or {html} placeholders to let the renderer know where
+     * where the element label or the element html are positionned according to the
+     * required tag. They will be replaced accordingly with the right value.
+     * For example:
+     * <font color="red">*</font>{label}
+     * will put a red star in front of the label if the element is required.
+     *
+     * @param    string      The required element template
+     * @access   public
+     * @return   void
+     */
     function setRequiredTemplate($template)
     {
         $this->_required = $template;
     } // end func setRequiredTemplate
 
-   /**
-    * Sets the way elements with validation errors are rendered
-    *
-    * You can use {label} or {html} placeholders to let the renderer know where
-    * where the element label or the element html are positionned according to the
-    * error message. They will be replaced accordingly with the right value.
-    * The error message will replace the {error} place holder.
-    * For example:
-    * <font color="red">{error}</font><br />{html}
-    * will put the error message in red on top of the element html.
-    *
-    * If you want all error messages to be output in the main error block, do not specify
-    * {html} nor {label}.
-    *
-    * Groups can have special layouts. With this kind of groups, the renderer will need
-    * to know where to place the error message. In this case, use error blocks like:
-    * <!-- BEGIN form_group_error -->{form_group_error}<!-- END form_group_error -->
-    * where you want the error message to appear in the form.
-    *
-    * @param    string      The element error template
-    * @access   public
-    * @return   void
-    */
+    /**
+     * Sets the way elements with validation errors are rendered
+     *
+     * You can use {label} or {html} placeholders to let the renderer know where
+     * where the element label or the element html are positionned according to the
+     * error message. They will be replaced accordingly with the right value.
+     * The error message will replace the {error} place holder.
+     * For example:
+     * <font color="red">{error}</font><br />{html}
+     * will put the error message in red on top of the element html.
+     *
+     * If you want all error messages to be output in the main error block, do not specify
+     * {html} nor {label}.
+     *
+     * Groups can have special layouts. With this kind of groups, the renderer will need
+     * to know where to place the error message. In this case, use error blocks like:
+     * <!-- BEGIN form_group_error -->{form_group_error}<!-- END form_group_error -->
+     * where you want the error message to appear in the form.
+     *
+     * @param    string      The element error template
+     * @access   public
+     * @return   void
+     */
     function setErrorTemplate($template)
     {
         $this->_error = $template;
     } // end func setErrorTemplate
 
-   /**
-    * Called when an element is required
-    *
-    * This method will add the required tag to the element label and/or the element html
-    * such as defined with the method setRequiredTemplate
-    *
-    * @param    string      The element label
-    * @param    string      The element html rendering
-    * @see      setRequiredTemplate()
-    * @access   private
-    * @return   void
-    */
+    /**
+     * Called when an element is required
+     *
+     * This method will add the required tag to the element label and/or the element html
+     * such as defined with the method setRequiredTemplate
+     *
+     * @param    string      The element label
+     * @param    string      The element html rendering
+     * @see      setRequiredTemplate()
+     * @access   private
+     * @return   void
+     */
     function _renderRequired(&$label, &$html)
     {
         if ($this->_tpl->blockExists($tplBlock = $this->_formName . '_required_block')) {
@@ -428,20 +428,20 @@ 
         }
     } // end func _renderRequired
 
-   /**
-    * Called when an element has a validation error
-    *
-    * This method will add the error message to the element label or the element html
-    * such as defined with the method setErrorTemplate. If the error placeholder is not found
-    * in the template, the error will be displayed in the form error block.
-    *
-    * @param    string      The element label
-    * @param    string      The element html rendering
-    * @param    string      The element error
-    * @see      setErrorTemplate()
-    * @access   private
-    * @return   void
-    */
+    /**
+     * Called when an element has a validation error
+     *
+     * This method will add the error message to the element label or the element html
+     * such as defined with the method setErrorTemplate. If the error placeholder is not found
+     * in the template, the error will be displayed in the form error block.
+     *
+     * @param    string      The element label
+     * @param    string      The element html rendering
+     * @param    string      The element error
+     * @see      setErrorTemplate()
+     * @access   private
+     * @return   void
+     */
     function _renderError(&$label, &$html, $error)
     {
         if ($this->_tpl->blockExists($tplBlock = $this->_formName . '_error_block')) {
@@ -473,15 +473,15 @@ 
     }// end func _renderError
 
 
-   /**
-    * Returns the block's contents
-    *
-    * The method is needed because ITX and Sigma implement clearing
-    * the block contents on get() a bit differently
-    *
-    * @param    string  Block name
-    * @return   string  Block contents
-    */
+    /**
+     * Returns the block's contents
+     *
+     * The method is needed because ITX and Sigma implement clearing
+     * the block contents on get() a bit differently
+     *
+     * @param    string  Block name
+     * @return   string  Block contents
+     */
     function _getTplBlock($block)
     {
         $this->_tpl->parse($block);

Spacing +20 added lines, -20 removed lines

@@ -110,7 +110,7 @@ 
     function HTML_QuickForm_Renderer_ITStatic(&$tpl)
     {
         $this->HTML_QuickForm_Renderer();
-        $this->_tpl =& $tpl;
+        $this->_tpl = & $tpl;
     } // end constructor
 
    /**
@@ -154,7 +154,7 @@ 
         }
         // add hidden elements, if collected
         if (!empty($this->_hidden)) {
-            $this->_tpl->setVariable($this->_formName . '_hidden', $this->_hidden);
+            $this->_tpl->setVariable($this->_formName.'_hidden', $this->_hidden);
         }
         // assign form attributes
         $this->_tpl->setVariable($this->_formName.'_attributes', $form->getAttributes(true));
@@ -203,7 +203,7 @@ 
                 $this->_elementIndex++;
             }
             if ($varName != $this->_inGroup) {
-                $varName .= '_' == substr($varName, -1)? '': '_';
+                $varName .= '_' == substr($varName, -1) ? '' : '_';
                 // element name is of type : group[name]
                 $label = $element->getLabel();
                 $html = $element->toHtml();
@@ -266,7 +266,7 @@ 
     */
     function renderHidden(&$element)
     {
-        if ($this->_tpl->placeholderExists($this->_formName . '_hidden')) {
+        if ($this->_tpl->placeholderExists($this->_formName.'_hidden')) {
             $this->_hidden .= $element->toHtml();
         } else {
             $name = $element->getName();
@@ -307,14 +307,14 @@ 
             // <!-- BEGIN form_group_error -->{form_group_error}<!-- END form_group_error -->
             if (!empty($error)) {
                 if ($this->_tpl->placeholderExists($varName.'_error')) {
-                    if ($this->_tpl->blockExists($this->_formName . '_error_block')) {
-                        $this->_tpl->setVariable($this->_formName . '_error', $error);
-                        $error = $this->_getTplBlock($this->_formName . '_error_block');
+                    if ($this->_tpl->blockExists($this->_formName.'_error_block')) {
+                        $this->_tpl->setVariable($this->_formName.'_error', $error);
+                        $error = $this->_getTplBlock($this->_formName.'_error_block');
                     } elseif (strpos($this->_error, '{html}') !== false || strpos($this->_error, '{label}') !== false) {
                         $error = str_replace('{error}', $error, $this->_error);
                     }
                 }
-                $this->_tpl->setVariable($varName . '_error', $error);
+                $this->_tpl->setVariable($varName.'_error', $error);
                 array_pop($this->_errors);
             }
         }
@@ -401,17 +401,17 @@ 
     */
     function _renderRequired(&$label, &$html)
     {
-        if ($this->_tpl->blockExists($tplBlock = $this->_formName . '_required_block')) {
-            if (!empty($label) && $this->_tpl->placeholderExists($this->_formName . '_label', $tplBlock)) {
-                $this->_tpl->setVariable($this->_formName . '_label', is_array($label)? $label[0]: $label);
+        if ($this->_tpl->blockExists($tplBlock = $this->_formName.'_required_block')) {
+            if (!empty($label) && $this->_tpl->placeholderExists($this->_formName.'_label', $tplBlock)) {
+                $this->_tpl->setVariable($this->_formName.'_label', is_array($label) ? $label[0] : $label);
                 if (is_array($label)) {
                     $label[0] = $this->_getTplBlock($tplBlock);
                 } else {
                     $label    = $this->_getTplBlock($tplBlock);
                 }
             }
-            if (!empty($html) && $this->_tpl->placeholderExists($this->_formName . '_html', $tplBlock)) {
-                $this->_tpl->setVariable($this->_formName . '_html', $html);
+            if (!empty($html) && $this->_tpl->placeholderExists($this->_formName.'_html', $tplBlock)) {
+                $this->_tpl->setVariable($this->_formName.'_html', $html);
                 $html = $this->_getTplBlock($tplBlock);
             }
         } else {
@@ -444,21 +444,21 @@ 
     */
     function _renderError(&$label, &$html, $error)
     {
-        if ($this->_tpl->blockExists($tplBlock = $this->_formName . '_error_block')) {
-            $this->_tpl->setVariable($this->_formName . '_error', $error);
-            if (!empty($label) && $this->_tpl->placeholderExists($this->_formName . '_label', $tplBlock)) {
-                $this->_tpl->setVariable($this->_formName . '_label', is_array($label)? $label[0]: $label);
+        if ($this->_tpl->blockExists($tplBlock = $this->_formName.'_error_block')) {
+            $this->_tpl->setVariable($this->_formName.'_error', $error);
+            if (!empty($label) && $this->_tpl->placeholderExists($this->_formName.'_label', $tplBlock)) {
+                $this->_tpl->setVariable($this->_formName.'_label', is_array($label) ? $label[0] : $label);
                 if (is_array($label)) {
                     $label[0] = $this->_getTplBlock($tplBlock);
                 } else {
                     $label    = $this->_getTplBlock($tplBlock);
                 }
-            } elseif (!empty($html) && $this->_tpl->placeholderExists($this->_formName . '_html', $tplBlock)) {
-                $this->_tpl->setVariable($this->_formName . '_html', $html);
+            } elseif (!empty($html) && $this->_tpl->placeholderExists($this->_formName.'_html', $tplBlock)) {
+                $this->_tpl->setVariable($this->_formName.'_html', $html);
                 $html = $this->_getTplBlock($tplBlock);
             }
             // clean up after ourselves
-            $this->_tpl->setVariable($this->_formName . '_error', null);
+            $this->_tpl->setVariable($this->_formName.'_error', null);
         } elseif (!empty($label) && strpos($this->_error, '{label}') !== false) {
             if (is_array($label)) {
                 $label[0] = str_replace(array('{label}', '{error}'), array($label[0], $error), $this->_error);

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

Doc Comments +3 added lines

@@ -137,6 +137,9 @@
         $this->_currentSection = $this->_sectionCount++;
     }
 
+    /**
+     * @param boolean $required
+     */
     function renderElement(&$element, $required, $error)
     {
         $elObj = $this->_elementToObject($element, $required, $error);

Indentation +63 added lines, -63 removed lines

@@ -34,7 +34,7 @@ 
  */
 class HTML_QuickForm_Renderer_Object extends HTML_QuickForm_Renderer
 {
-   /**#@+
+    /**#@+
     * @access private
     */
     /**
@@ -50,15 +50,15 @@ 
     var $_sectionCount;
 
     /**
-    * Current section number
-    * @var integer $_currentSection
-    */
+     * Current section number
+     * @var integer $_currentSection
+     */
     var $_currentSection;
 
     /**
-    * Object representing current group
-    * @var object $_currentGroup
-    */
+     * Object representing current group
+     * @var object $_currentGroup
+     */
     var $_currentGroup = null;
 
     /**
@@ -68,17 +68,17 @@ 
     var $_elementType = 'QuickFormElement';
 
     /**
-    * Additional style information for different elements
-    * @var array $_elementStyles
-    */
+     * Additional style information for different elements
+     * @var array $_elementStyles
+     */
     var $_elementStyles = array();
 
     /**
-    * true: collect all hidden elements into string; false: process them as usual form elements
-    * @var bool $_collectHidden
-    */
+     * true: collect all hidden elements into string; false: process them as usual form elements
+     * @var bool $_collectHidden
+     */
     var $_collectHidden = false;
-   /**#@-*/
+    /**#@-*/
 
 
     /**
@@ -270,73 +270,73 @@ 
  */
 class QuickformForm
 {
-   /**
-    * Whether the form has been frozen
-    * @var boolean $frozen
-    */
+    /**
+     * Whether the form has been frozen
+     * @var boolean $frozen
+     */
     var $frozen;
 
-   /**
-    * Javascript for client-side validation
-    * @var string $javascript
-    */
+    /**
+     * Javascript for client-side validation
+     * @var string $javascript
+     */
     var $javascript;
 
-   /**
-    * Attributes for form tag
-    * @var string $attributes
-    */
+    /**
+     * Attributes for form tag
+     * @var string $attributes
+     */
     var $attributes;
 
-   /**
-    * Note about required elements
-    * @var string $requirednote
-    */
+    /**
+     * Note about required elements
+     * @var string $requirednote
+     */
     var $requirednote;
 
-   /**
-    * Collected html of all hidden variables
-    * @var string $hidden
-    */
+    /**
+     * Collected html of all hidden variables
+     * @var string $hidden
+     */
     var $hidden;
 
-   /**
-    * Set if there were validation errors.
-    * StdClass object with element names for keys and their
-    * error messages as values
-    * @var object $errors
-    */
+    /**
+     * Set if there were validation errors.
+     * StdClass object with element names for keys and their
+     * error messages as values
+     * @var object $errors
+     */
     var $errors;
 
-   /**
-    * Array of QuickformElementObject elements.  If there are headers in the form
-    * this will be empty and the elements will be in the
-    * separate sections
-    * @var array $elements
-    */
+    /**
+     * Array of QuickformElementObject elements.  If there are headers in the form
+     * this will be empty and the elements will be in the
+     * separate sections
+     * @var array $elements
+     */
     var $elements;
 
-   /**
-    * Array of sections contained in the document
-    * @var array $sections
-    */
+    /**
+     * Array of sections contained in the document
+     * @var array $sections
+     */
     var $sections;
 
-   /**
-    * Output <form> header
-    * {form.outputHeader():h}
-    * @return string    <form attributes>
-    */
+    /**
+     * Output <form> header
+     * {form.outputHeader():h}
+     * @return string    <form attributes>
+     */
     function outputHeader()
     {
         return "<form " . $this->attributes . ">\n";
     }
 
-   /**
-    * Output form javascript
-    * {form.outputJavaScript():h}
-    * @return string    Javascript
-    */
+    /**
+     * Output form javascript
+     * {form.outputJavaScript():h}
+     * @return string    Javascript
+     */
     function outputJavaScript()
     {
         return $this->javascript;
@@ -441,9 +441,9 @@ 
     }
 
 
-   /**
-    * XXX: why does it use Flexy when all other stuff here does not depend on it?
-    */
+    /**
+     * XXX: why does it use Flexy when all other stuff here does not depend on it?
+     */
     function outputStyle()
     {
         ob_start();

Spacing +16 added lines, -16 removed lines

@@ -41,7 +41,7 @@ 
      * The object being generated
      * @var QuickformForm
      */
-    var $_obj= null;
+    var $_obj = null;
 
     /**
      * Number of sections in the form (i.e. number of headers in it)
@@ -121,7 +121,7 @@ 
         $this->_obj->requirednote = $form->getRequiredNote();
         $this->_obj->errors = new StdClass;
 
-        if($this->_collectHidden) {
+        if ($this->_collectHidden) {
             $this->_obj->hidden = '';
         }
         $this->_elementIdx = 1;
@@ -140,7 +140,7 @@ 
     function renderElement(&$element, $required, $error)
     {
         $elObj = $this->_elementToObject($element, $required, $error);
-        if(!empty($error)) {
+        if (!empty($error)) {
             $name = $elObj->name;
             $this->_obj->errors->$name = $error;
         }
@@ -149,8 +149,8 @@ 
 
     function renderHidden(&$element)
     {
-        if($this->_collectHidden) {
-            $this->_obj->hidden .= $element->toHtml() . "\n";
+        if ($this->_collectHidden) {
+            $this->_obj->hidden .= $element->toHtml()."\n";
         } else {
             $this->renderElement($element, false, null);
         }
@@ -159,7 +159,7 @@ 
     function startGroup(&$group, $required, $error)
     {
         $this->_currentGroup = $this->_elementToObject($group, $required, $error);
-        if(!empty($error)) {
+        if (!empty($error)) {
             $name = $this->_currentGroup->name;
             $this->_obj->errors->$name = $error;
         }
@@ -182,7 +182,7 @@ 
      */
     function _elementToObject(&$element, $required, $error)
     {
-        if($this->_elementType) {
+        if ($this->_elementType) {
             $ret = new $this->_elementType;
         }
         $ret->name = $element->getName();
@@ -193,8 +193,8 @@ 
         if (is_array($labels)) {
             $ret->label = array_shift($labels);
             foreach ($labels as $key => $label) {
-                $key = is_int($key)? $key + 2: $key;
-                $ret->{'label_' . $key} = $label;
+                $key = is_int($key) ? $key + 2 : $key;
+                $ret->{'label_'.$key} = $label;
             }
         } else {
             $ret->label = $labels;
@@ -202,11 +202,11 @@ 
         $ret->required = $required;
         $ret->error = $error;
 
-        if(isset($this->_elementStyles[$ret->name])) {
+        if (isset($this->_elementStyles[$ret->name])) {
             $ret->style = $this->_elementStyles[$ret->name];
-            $ret->styleTemplate = "styles/". $ret->style .".html";
+            $ret->styleTemplate = "styles/".$ret->style.".html";
         }
-        if($ret->type == 'group') {
+        if ($ret->type == 'group') {
             $ret->separator = $element->_separator;
             $ret->elements = array();
         } else {
@@ -225,7 +225,7 @@ 
     function _storeObject($elObj)
     {
         $name = $elObj->name;
-        if(is_object($this->_currentGroup) && $elObj->type != 'group') {
+        if (is_object($this->_currentGroup) && $elObj->type != 'group') {
             $this->_currentGroup->elements[] = $elObj;
         } elseif (isset($this->_currentSection)) {
             $this->_obj->sections[$this->_currentSection]->elements[] = $elObj;
@@ -236,7 +236,7 @@ 
 
     function setElementStyle($elementName, $styleName = null)
     {
-        if(is_array($elementName)) {
+        if (is_array($elementName)) {
             $this->_elementStyles = array_merge($this->_elementStyles, $elementName);
         } else {
             $this->_elementStyles[$elementName] = $styleName;
@@ -329,7 +329,7 @@ 
     */
     function outputHeader()
     {
-        return "<form " . $this->attributes . ">\n";
+        return "<form ".$this->attributes.">\n";
     }
 
    /**
@@ -447,7 +447,7 @@ 
     function outputStyle()
     {
         ob_start();
-        HTML_Template_Flexy::staticQuickTemplate('styles/' . $this->style . '.html', $this);
+        HTML_Template_Flexy::staticQuickTemplate('styles/'.$this->style.'.html', $this);
         $ret = ob_get_contents();
         ob_end_clean();
         return $ret;

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

Doc Comments +1 added lines, -1 removed lines

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

Indentation +21 added lines, -21 removed lines

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

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

Doc Comments +3 added lines

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

Indentation +12 added lines, -12 removed lines

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

Spacing +2 added lines, -2 removed lines

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

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

Doc Comments +1 added lines, -1 removed lines

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

Indentation +10 added lines, -10 removed lines

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

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

Doc Comments +2 added lines, -1 removed lines

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

Indentation +38 added lines, -38 removed lines

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

Spacing +94 added lines, -94 removed lines

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

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

Doc Comments +5 added lines, -8 removed lines

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

Indentation +18 added lines, -18 removed lines

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

Spacing +24 added lines, -24 removed lines

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