chamilo / chamilo-lms

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

Spacing +1 added lines, -1 removed lines

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

Doc Comments +1 added lines, -1 removed lines

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

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

Spacing +5 added lines, -5 removed lines

@@ -116,10 +116,10 @@ 
     function toHtml()
     {
         // prevent problems with grouped elements
-        $arrayName = str_replace(array('[', ']'), array('__', ''), $this->getName()) . '_values';
+        $arrayName = str_replace(array('[', ']'), array('__', ''), $this->getName()).'_values';
 
         $this->updateAttributes(array(
-            'onkeypress' => 'return autocomplete(this, event, ' . $arrayName . ');'
+            'onkeypress' => 'return autocomplete(this, event, '.$arrayName.');'
         ));
         if ($this->_flagFrozen) {
             $js = '';
@@ -239,13 +239,13 @@ 
             );
 
             $js .= $this->_js;
-            $js .= 'var ' . $arrayName . " = new Array();\n";
+            $js .= 'var '.$arrayName." = new Array();\n";
             for ($i = 0; $i < count($this->_options); $i++) {
-                $js .= $arrayName . '[' . $i . "] = '" . strtr($this->_options[$i], $jsEscape) . "';\n";
+                $js .= $arrayName.'['.$i."] = '".strtr($this->_options[$i], $jsEscape)."';\n";
             }
             $js .= "//]]>\n</script>";
         }
-        return $js . parent::toHtml();
+        return $js.parent::toHtml();
     }// end func toHtml
 
     // }}}

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

Indentation +2 added lines, -2 removed lines

@@ -50,7 +50,7 @@ 
  */
 class HTML_QuickForm_Renderer_ObjectFlexy extends HTML_QuickForm_Renderer_Object
 {
-   /**#@+
+    /**#@+
     * @access private
     */
     /**
@@ -91,7 +91,7 @@ 
      * @var string $_elementType
      */
     var $_elementType = 'QuickformFlexyElement';
-   /**#@-*/
+    /**#@-*/
 
     /**
      * Constructor

Spacing +14 added lines, -14 removed lines

@@ -103,12 +103,12 @@ 
     {
         $this->HTML_QuickForm_Renderer_Object(true);
         $this->_obj = new QuickformFlexyForm();
-        $this->_flexy =& $flexy;
+        $this->_flexy = & $flexy;
     } // end constructor
 
     function renderHeader(&$header)
     {
-        if($name = $header->getName()) {
+        if ($name = $header->getName()) {
             $this->_obj->header->$name = $header->toHtml();
         } else {
             $this->_obj->header[$this->_sectionCount] = $header->toHtml();
@@ -135,15 +135,15 @@ 
     function _elementToObject(&$element, $required, $error)
     {
         $ret = parent::_elementToObject($element, $required, $error);
-        if($ret->type == 'group') {
+        if ($ret->type == 'group') {
             $ret->html = $element->toHtml();
             unset($ret->elements);
         }
-        if(!empty($this->_label)) {
+        if (!empty($this->_label)) {
             $this->_renderLabel($ret);
         }
 
-        if(!empty($this->_html)) {
+        if (!empty($this->_html)) {
             $this->_renderHtml($ret);
             $ret->error = $error;
         }
@@ -151,12 +151,12 @@ 
         // Create an element key from the name
         if (false !== ($pos = strpos($ret->name, '[')) || is_object($this->_currentGroup)) {
             if (!$pos) {
-                $keys = '->{\'' . str_replace(array('\\', '\''), array('\\\\', '\\\''), $ret->name) . '\'}';
+                $keys = '->{\''.str_replace(array('\\', '\''), array('\\\\', '\\\''), $ret->name).'\'}';
             } else {
-                $keys = '->{\'' . str_replace(
+                $keys = '->{\''.str_replace(
                             array('\\', '\'', '[', ']'), array('\\\\', '\\\'', '\'}->{\'', ''),
                             $ret->name
-                        ) . '\'}';
+                        ).'\'}';
             }
             // special handling for elements in native groups
             if (is_object($this->_currentGroup)) {
@@ -171,13 +171,13 @@ 
                 }
             }
         } elseif (0 == strlen($ret->name)) {
-            $keys = '->{\'element_' . $this->_elementIdx . '\'}';
+            $keys = '->{\'element_'.$this->_elementIdx.'\'}';
         } else {
-            $keys = '->{\'' . str_replace(array('\\', '\''), array('\\\\', '\\\''), $ret->name) . '\'}';
+            $keys = '->{\''.str_replace(array('\\', '\''), array('\\\\', '\\\''), $ret->name).'\'}';
         }
         // for radios: add extra key from value
         if ('radio' == $ret->type && '[]' != substr($keys, -2)) {
-            $keys .= '->{\'' . str_replace(array('\\', '\''), array('\\\\', '\\\''), $ret->value) . '\'}';
+            $keys .= '->{\''.str_replace(array('\\', '\''), array('\\\\', '\\\''), $ret->value).'\'}';
         }
         $ret->keys = $keys;
         $this->_elementIdx++;
@@ -197,10 +197,10 @@ 
         if ($elObj) {
             $keys = $elObj->keys;
             unset($elObj->keys);
-            if(is_object($this->_currentGroup) && ('group' != $elObj->type)) {
-                $code = '$this->_currentGroup' . $keys . ' = $elObj;';
+            if (is_object($this->_currentGroup) && ('group' != $elObj->type)) {
+                $code = '$this->_currentGroup'.$keys.' = $elObj;';
             } else {
-                $code = '$this->_obj' . $keys . ' = $elObj;';
+                $code = '$this->_obj'.$keys.' = $elObj;';
             }
             eval($code);
         }

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

Spacing +4 added lines, -6 removed lines

@@ -78,12 +78,12 @@ 
         foreach (array_keys($this->renderedElements) as $key) {
             if (!$this->renderedElements[$key]['rendered']) {
                 $this->renderedElements[$key]['rendered'] = true;
-                $data .= $this->renderedElements[$key]['html'] . "\n";
+                $data .= $this->renderedElements[$key]['html']."\n";
             }
         }
 
         // Insert the extra data and form elements at the end of the form
-        $this->_html = str_replace('</form>', $data . "\n</form>", $this->_html);
+        $this->_html = str_replace('</form>', $data."\n</form>", $this->_html);
         return $this->_html;
     } // end func toHtml
 
@@ -117,13 +117,11 @@ 
         }
 
         if (is_null($elementKey)) {
-            $msg = is_null($elementValue) ? "Element $elementName does not exist." :
-                "Element $elementName with value of $elementValue does not exist.";
+            $msg = is_null($elementValue) ? "Element $elementName does not exist." : "Element $elementName with value of $elementValue does not exist.";
             return PEAR::raiseError(null, QUICKFORM_UNREGISTERED_ELEMENT, null, E_USER_WARNING, $msg, 'HTML_QuickForm_Error', true);
         } else {
             if ($this->renderedElements[$elementKey]['rendered']) {
-                $msg = is_null($elementValue) ? "Element $elementName has already been rendered." :
-                    "Element $elementName with value of $elementValue has already been rendered.";
+                $msg = is_null($elementValue) ? "Element $elementName has already been rendered." : "Element $elementName with value of $elementValue has already been rendered.";
                 return PEAR::raiseError(null, QUICKFORM_ERROR, null, E_USER_WARNING, $msg, 'HTML_QuickForm_Error', true);
             } else {
                 $this->renderedElements[$elementKey]['rendered'] = true;

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

Indentation +68 added lines, -68 removed lines

@@ -109,60 +109,60 @@ 
  */
 class HTML_QuickForm_Renderer_Array extends HTML_QuickForm_Renderer
 {
-   /**#@+
+    /**#@+
     * @access private
     */
-   /**
-    * An array being generated
-    * @var array
-    */
+    /**
+     * An array being generated
+     * @var array
+     */
     var $_ary;
 
-   /**
-    * Number of sections in the form (i.e. number of headers in it)
-    * @var integer
-    */
+    /**
+     * Number of sections in the form (i.e. number of headers in it)
+     * @var integer
+     */
     var $_sectionCount;
 
-   /**
-    * Current section number
-    * @var integer
-    */
+    /**
+     * Current section number
+     * @var integer
+     */
     var $_currentSection;
 
-   /**
-    * Array representing current group
-    * @var array
-    */
+    /**
+     * Array representing current group
+     * @var array
+     */
     var $_currentGroup = null;
 
-   /**
-    * Additional style information for different elements
-    * @var array
-    */
+    /**
+     * Additional style information for different elements
+     * @var array
+     */
     var $_elementStyles = array();
 
-   /**
-    * true: collect all hidden elements into string; false: process them as usual form elements
-    * @var bool
-    */
+    /**
+     * true: collect all hidden elements into string; false: process them as usual form elements
+     * @var bool
+     */
     var $_collectHidden = false;
 
-   /**
-    * true:  render an array of labels to many labels, $key 0 named 'label', the rest "label_$key"
-    * false: leave labels as defined
-    * @var bool
-    */
+    /**
+     * true:  render an array of labels to many labels, $key 0 named 'label', the rest "label_$key"
+     * false: leave labels as defined
+     * @var bool
+     */
     var $_staticLabels = false;
-   /**#@-*/
+    /**#@-*/
 
-   /**
-    * Constructor
-    *
-    * @param  bool    true: collect all hidden elements into string; false: process them as usual form elements
-    * @param  bool    true: render an array of labels to many labels, $key 0 to 'label' and the oterh to "label_$key"
-    * @access public
-    */
+    /**
+     * Constructor
+     *
+     * @param  bool    true: collect all hidden elements into string; false: process them as usual form elements
+     * @param  bool    true: render an array of labels to many labels, $key 0 to 'label' and the oterh to "label_$key"
+     * @access public
+     */
     function HTML_QuickForm_Renderer_Array($collectHidden = false, $staticLabels = false)
     {
         $this->HTML_QuickForm_Renderer();
@@ -171,12 +171,12 @@ 
     } // end constructor
 
 
-   /**
-    * Returns the resultant array
-    *
-    * @access public
-    * @return array
-    */
+    /**
+     * Returns the resultant array
+     *
+     * @access public
+     * @return array
+     */
     function toArray()
     {
         return $this->_ary;
@@ -247,15 +247,15 @@ 
     } // end func finishGroup
 
 
-   /**
-    * Creates an array representing an element
-    *
-    * @access private
-    * @param  HTML_QuickForm_element    element being processed
-    * @param  bool                      Whether an element is required
-    * @param  string                    Error associated with the element
-    * @return array
-    */
+    /**
+     * Creates an array representing an element
+     *
+     * @access private
+     * @param  HTML_QuickForm_element    element being processed
+     * @param  bool                      Whether an element is required
+     * @param  string                    Error associated with the element
+     * @return array
+     */
     function _elementToArray(&$element, $required, $error)
     {
         $ret = array(
@@ -295,13 +295,13 @@ 
     }
 
 
-   /**
-    * 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)
     {
         // where should we put this element...
@@ -315,14 +315,14 @@ 
     }
 
 
-   /**
-    * Sets a style to use for element rendering
-    *
-    * @param mixed      element name or array ('element name' => 'style name')
-    * @param string     style name if $elementName is not an array
-    * @access public
-    * @return void
-    */
+    /**
+     * Sets a style to use for element rendering
+     *
+     * @param mixed      element name or array ('element name' => 'style name')
+     * @param string     style name if $elementName is not an array
+     * @access public
+     * @return void
+     */
     function setElementStyle($elementName, $styleName = null)
     {
         if (is_array($elementName)) {

Spacing +4 added lines, -4 removed lines

@@ -224,7 +224,7 @@ 
     function renderHidden(&$element)
     {
         if ($this->_collectHidden) {
-            $this->_ary['hidden'] .= $element->toHtml() . "\n";
+            $this->_ary['hidden'] .= $element->toHtml()."\n";
         } else {
             $this->renderElement($element, false, null);
         }
@@ -269,12 +269,12 @@ 
         // render label(s)
         $labels = $element->getLabel();
         if (is_array($labels) && $this->_staticLabels) {
-            foreach($labels as $key => $label) {
-                $key = is_int($key)? $key + 1: $key;
+            foreach ($labels as $key => $label) {
+                $key = is_int($key) ? $key + 1 : $key;
                 if (1 === $key) {
                     $ret['label'] = $label;
                 } else {
-                    $ret['label_' . $key] = $label;
+                    $ret['label_'.$key] = $label;
                 }
             }
         } else {

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);

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

Indentation +61 added lines, -61 removed lines

@@ -40,58 +40,58 @@ 
  */
 class HTML_QuickForm_Renderer_ITDynamic extends HTML_QuickForm_Renderer
 {
-   /**#@+
+    /**#@+
     * @access private
     */
-   /**
-    * A template class (HTML_Template_ITX or HTML_Template_Sigma) instance
-    * @var HTML_Template_ITX|HTML_Template_Sigma
-    */
+    /**
+     * A template class (HTML_Template_ITX or HTML_Template_Sigma) instance
+     * @var HTML_Template_ITX|HTML_Template_Sigma
+     */
     var $_tpl = null;
 
-   /**
-    * 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;
 
-   /**
-    * A separator for group elements
-    * @var mixed
-    */
+    /**
+     * A separator for group elements
+     * @var mixed
+     */
     var $_groupSeparator = null;
 
-   /**
-    * The current element index inside a group
-    * @var integer
-    */
+    /**
+     * The current element index inside a group
+     * @var integer
+     */
     var $_groupElementIdx = 0;
 
-   /**
-    * Blocks to use for different elements
-    * @var array
-    */
+    /**
+     * Blocks to use for different elements
+     * @var array
+     */
     var $_elementBlocks = array();
 
-   /**
-    * Block to use for headers
-    * @var string
-    */
+    /**
+     * Block to use for headers
+     * @var string
+     */
     var $_headerBlock = null;
-   /**#@-*/
+    /**#@-*/
 
 
-   /**
-    * Constructor
-    *
-    * @param HTML_Template_ITX|HTML_Template_Sigma     Template object to use
-    */
+    /**
+     * Constructor
+     *
+     * @param HTML_Template_ITX|HTML_Template_Sigma     Template object to use
+     */
     function HTML_QuickForm_Renderer_ITDynamic(&$tpl)
     {
         $this->HTML_QuickForm_Renderer();
@@ -227,17 +227,17 @@ 
     }
 
 
-   /**
-    * Returns the name of a block to use for element rendering
-    *
-    * If a name was not explicitly set via setElementBlock(), it tries
-    * the names '{prefix}_{element type}' and '{prefix}_{element}', where
-    * prefix is either 'qf' or the name of the current group's block
-    *
-    * @param HTML_QuickForm_element     form element being rendered
-    * @access private
-    * @return string    block name
-    */
+    /**
+     * Returns the name of a block to use for element rendering
+     *
+     * If a name was not explicitly set via setElementBlock(), it tries
+     * the names '{prefix}_{element type}' and '{prefix}_{element}', where
+     * prefix is either 'qf' or the name of the current group's block
+     *
+     * @param HTML_QuickForm_element     form element being rendered
+     * @access private
+     * @return string    block name
+     */
     function _matchBlock(&$element)
     {
         $name = $element->getName();
@@ -262,14 +262,14 @@ 
     }
 
 
-   /**
-    * Sets the block to use for element rendering
-    *
-    * @param mixed      element name or array ('element name' => 'block name')
-    * @param string     block name if $elementName is not an array
-    * @access public
-    * @return void
-    */
+    /**
+     * Sets the block to use for element rendering
+     *
+     * @param mixed      element name or array ('element name' => 'block name')
+     * @param string     block name if $elementName is not an array
+     * @access public
+     * @return void
+     */
     function setElementBlock($elementName, $blockName = null)
     {
         if (is_array($elementName)) {
@@ -280,13 +280,13 @@ 
     }
 
 
-   /**
-    * Sets the name of a block to use for header rendering
-    *
-    * @param string     block name
-    * @access public
-    * @return void
-    */
+    /**
+     * Sets the name of a block to use for header rendering
+     *
+     * @param string     block name
+     * @access public
+     * @return void
+     */
     function setHeaderBlock($blockName)
     {
         $this->_headerBlock = $blockName;

Spacing +21 added lines, -21 removed lines

@@ -95,7 +95,7 @@ 
     function HTML_QuickForm_Renderer_ITDynamic(&$tpl)
     {
         $this->HTML_QuickForm_Renderer();
-        $this->_tpl =& $tpl;
+        $this->_tpl = & $tpl;
         $this->_tpl->setCurrentBlock('qf_main_loop');
     }
 
@@ -141,14 +141,14 @@ 
                 if (is_array($this->_groupSeparator)) {
                     $this->_tpl->setVariable('qf_separator', $this->_groupSeparator[($this->_groupElementIdx - 1) % count($this->_groupSeparator)]);
                 } else {
-                    $this->_tpl->setVariable('qf_separator', (string)$this->_groupSeparator);
+                    $this->_tpl->setVariable('qf_separator', (string) $this->_groupSeparator);
                 }
             }
             $this->_groupElementIdx++;
 
-        } elseif(!empty($error)) {
+        } elseif (!empty($error)) {
             // show the error message or keep it for later use
-            if ($this->_tpl->blockExists($blockName . '_error')) {
+            if ($this->_tpl->blockExists($blockName.'_error')) {
                 $this->_tpl->setVariable('qf_error', $error);
             } else {
                 $this->_errors[] = $error;
@@ -157,8 +157,8 @@ 
         // show an '*' near the required element
         if ($required) {
             $this->_showRequired = true;
-            if ($this->_tpl->blockExists($blockName . '_required')) {
-                $this->_tpl->touchBlock($blockName . '_required');
+            if ($this->_tpl->blockExists($blockName.'_required')) {
+                $this->_tpl->touchBlock($blockName.'_required');
             }
         }
         // Prepare multiple labels
@@ -175,10 +175,10 @@ 
         }
         // render extra labels, if any
         if (is_array($labels)) {
-            foreach($labels as $key => $label) {
-                $key = is_int($key)? $key + 2: $key;
-                if ($this->_tpl->blockExists($blockName . '_label_' . $key)) {
-                    $this->_tpl->setVariable('qf_label_' . $key, $label);
+            foreach ($labels as $key => $label) {
+                $key = is_int($key) ? $key + 2 : $key;
+                if ($this->_tpl->blockExists($blockName.'_label_'.$key)) {
+                    $this->_tpl->setVariable('qf_label_'.$key, $label);
                 }
             }
         }
@@ -197,19 +197,19 @@ 
     function startGroup(&$group, $required, $error)
     {
         $blockName = $this->_matchBlock($group);
-        $this->_tpl->setCurrentBlock($blockName . '_loop');
+        $this->_tpl->setCurrentBlock($blockName.'_loop');
         $this->_groupElementIdx = 0;
-        $this->_groupSeparator  = is_null($group->_separator)? ' ': $group->_separator;
+        $this->_groupSeparator  = is_null($group->_separator) ? ' ' : $group->_separator;
         // show an '*' near the required element
         if ($required) {
             $this->_showRequired = true;
-            if ($this->_tpl->blockExists($blockName . '_required')) {
-                $this->_tpl->touchBlock($blockName . '_required');
+            if ($this->_tpl->blockExists($blockName.'_required')) {
+                $this->_tpl->touchBlock($blockName.'_required');
             }
         }
         // show the error message or keep it for later use
         if (!empty($error)) {
-            if ($this->_tpl->blockExists($blockName . '_error')) {
+            if ($this->_tpl->blockExists($blockName.'_error')) {
                 $this->_tpl->setVariable('qf_error', $error);
             } else {
                 $this->_errors[] = $error;
@@ -243,7 +243,7 @@ 
         $name = $element->getName();
         $type = $element->getType();
         if (isset($this->_elementBlocks[$name]) && $this->_tpl->blockExists($this->_elementBlocks[$name])) {
-            if (('group' == $type) || ($this->_elementBlocks[$name] . '_loop' != $this->_tpl->currentBlock)) {
+            if (('group' == $type) || ($this->_elementBlocks[$name].'_loop' != $this->_tpl->currentBlock)) {
                 return $this->_elementBlocks[$name];
             }
         }
@@ -252,12 +252,12 @@ 
         } else {
             $prefix = 'qf';
         }
-        if ($this->_tpl->blockExists($prefix . '_' . $type)) {
-            return $prefix . '_' . $type;
-        } elseif ($this->_tpl->blockExists($prefix . '_' . $name)) {
-            return $prefix . '_' . $name;
+        if ($this->_tpl->blockExists($prefix.'_'.$type)) {
+            return $prefix.'_'.$type;
+        } elseif ($this->_tpl->blockExists($prefix.'_'.$name)) {
+            return $prefix.'_'.$name;
         } else {
-            return $prefix . '_element';
+            return $prefix.'_element';
         }
     }
 

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

Spacing +1 added lines, -1 removed lines

@@ -101,7 +101,7 @@
         unset($attr['name']);
 
         $html = $this->_getTabs()
-                . '<div' . $this->_getAttrString($attr) . '>'
+                . '<div'.$this->_getAttrString($attr).'>'
                 . $_SESSION[$this->_options['sessionVar']]->getCAPTCHA()
                 . '</div>';
         return $html;

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

Indentation +10 added lines, -10 removed lines

@@ -174,15 +174,15 @@ 
         unset($attr['name']);
 
         $html = $tabs.'<a href="'.$this->_options['callback']
-               .'" target="_blank" '
-               .$this->_getAttrString($attr)
-               .' onclick="var cancelClick = false; '
-               .$this->getOnclickJs($imgName)
-               .' return !cancelClick;"><img src="'
-               .$this->_options['callback'].'" name="'.$imgName
-               .'" id="'.$imgName.'" width="'.$this->_options['width']
-               .'" height="'.$this->_options['height'].'" title="'
-               .htmlspecialchars($this->_options['alt']).'" /></a>';
+                .'" target="_blank" '
+                .$this->_getAttrString($attr)
+                .' onclick="var cancelClick = false; '
+                .$this->getOnclickJs($imgName)
+                .' return !cancelClick;"><img src="'
+                .$this->_options['callback'].'" name="'.$imgName
+                .'" id="'.$imgName.'" width="'.$this->_options['width']
+                .'" height="'.$this->_options['height'].'" title="'
+                .htmlspecialchars($this->_options['alt']).'" /></a>';
 
         return $html;
     }
@@ -203,7 +203,7 @@ 
             .'  var img = new Image();'
             .'  var d = new Date();'
             .'  img.src = this.href + ((this.href.indexOf(\'?\') == -1) '
-                                     .'? \'?\' : \'&\') + d.getTime();'
+                                        .'? \'?\' : \'&\') + d.getTime();'
             .'  document.images[\''.addslashes($imageName).'\'].src = img.src;'
             .'  cancelClick = true;'
             .'}';

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

Indentation +72 added lines, -72 removed lines

@@ -37,12 +37,12 @@ 
 {
     // {{{ properties
 
-   /**
-    * Various options to control the element's display.
-    *
-    * @access   private
-    * @var      array
-    */
+    /**
+     * Various options to control the element's display.
+     *
+     * @access   private
+     * @var      array
+     */
     var $_options = array(
         'language'         => 'en',
         'format'           => 'dMY',
@@ -54,22 +54,22 @@ 
         'optionIncrement'  => array('i' => 1, 's' => 1)
     );
 
-   /**
-    * These complement separators, they are appended to the resultant HTML
-    * @access   private
-    * @var      array
-    */
+    /**
+     * These complement separators, they are appended to the resultant HTML
+     * @access   private
+     * @var      array
+     */
     var $_wrap = array('', '');
 
-   /**
-    * Options in different languages
-    *
-    * Note to potential translators: to avoid encoding problems please send
-    * your translations with "weird" letters encoded as HTML Unicode entities
-    *
-    * @access   private
-    * @var      array
-    */
+    /**
+     * Options in different languages
+     *
+     * Note to potential translators: to avoid encoding problems please send
+     * your translations with "weird" letters encoded as HTML Unicode entities
+     *
+     * @access   private
+     * @var      array
+     */
     var $_locale = array(
         'en' => array (
             'weekdays_short'=> array ('Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'),
@@ -232,43 +232,43 @@ 
     // }}}
     // {{{ constructor
 
-   /**
-    * Class constructor
-    *
-    * The following keys may appear in $options array:
-    * - 'language': date language
-    * - 'format': Format of the date, based on PHP's date() function.
-    *   The following characters are currently recognised in format string:
-    *   <pre>
-    *       D => Short names of days
-    *       l => Long names of days
-    *       d => Day numbers
-    *       M => Short names of months
-    *       F => Long names of months
-    *       m => Month numbers
-    *       Y => Four digit year
-    *       y => Two digit year
-    *       h => 12 hour format
-    *       H => 23 hour  format
-    *       i => Minutes
-    *       s => Seconds
-    *       a => am/pm
-    *       A => AM/PM
-    *   </pre>
-    * - 'minYear': Minimum year in year select
-    * - 'maxYear': Maximum year in year select
-    * - 'addEmptyOption': Should an empty option be added to the top of
-    *    each select box?
-    * - 'emptyOptionValue': The value passed by the empty option.
-    * - 'emptyOptionText': The text displayed for the empty option.
-    * - 'optionIncrement': Step to increase the option values by (works for 'i' and 's')
-    *
-    * @access   public
-    * @param    string  Element's name
-    * @param    mixed   Label(s) for an element
-    * @param    array   Options to control the element's display
-    * @param    mixed   Either a typical HTML attribute string or an associative array
-    */
+    /**
+     * Class constructor
+     *
+     * The following keys may appear in $options array:
+     * - 'language': date language
+     * - 'format': Format of the date, based on PHP's date() function.
+     *   The following characters are currently recognised in format string:
+     *   <pre>
+     *       D => Short names of days
+     *       l => Long names of days
+     *       d => Day numbers
+     *       M => Short names of months
+     *       F => Long names of months
+     *       m => Month numbers
+     *       Y => Four digit year
+     *       y => Two digit year
+     *       h => 12 hour format
+     *       H => 23 hour  format
+     *       i => Minutes
+     *       s => Seconds
+     *       a => am/pm
+     *       A => AM/PM
+     *   </pre>
+     * - 'minYear': Minimum year in year select
+     * - 'maxYear': Maximum year in year select
+     * - 'addEmptyOption': Should an empty option be added to the top of
+     *    each select box?
+     * - 'emptyOptionValue': The value passed by the empty option.
+     * - 'emptyOptionText': The text displayed for the empty option.
+     * - 'optionIncrement': Step to increase the option values by (works for 'i' and 's')
+     *
+     * @access   public
+     * @param    string  Element's name
+     * @param    mixed   Label(s) for an element
+     * @param    array   Options to control the element's display
+     * @param    mixed   Either a typical HTML attribute string or an associative array
+     */
     function HTML_QuickForm_date($elementName = null, $elementLabel = null, $options = array(), $attributes = null)
     {
         $this->HTML_QuickForm_element($elementName, $elementLabel, $attributes);
@@ -412,15 +412,15 @@ 
     // }}}
     // {{{ _createOptionList()
 
-   /**
-    * Creates an option list containing the numbers from the start number to the end, inclusive
-    *
-    * @param    int     The start number
-    * @param    int     The end number
-    * @param    int     Increment by this value
-    * @access   private
-    * @return   array   An array of numeric options.
-    */
+    /**
+     * Creates an option list containing the numbers from the start number to the end, inclusive
+     *
+     * @param    int     The start number
+     * @param    int     The end number
+     * @param    int     Increment by this value
+     * @access   private
+     * @return   array   An array of numeric options.
+     */
     function _createOptionList($start, $end, $step = 1)
     {
         for ($i = $start, $options = array(); $start > $end? $i >= $end: $i <= $end; $i += $step) {
@@ -432,12 +432,12 @@ 
     // }}}
     // {{{ _trimLeadingZeros()
 
-   /**
-    * Trims leading zeros from the (numeric) string
-    *
-    * @param    string  A numeric string, possibly with leading zeros
-    * @return   string  String with leading zeros removed
-    */
+    /**
+     * Trims leading zeros from the (numeric) string
+     *
+     * @param    string  A numeric string, possibly with leading zeros
+     * @return   string  String with leading zeros removed
+     */
     function _trimLeadingZeros($str)
     {
         if (0 == strcmp($str, $this->_options['emptyOptionValue'])) {

Spacing +141 added lines, -141 removed lines

@@ -71,161 +71,161 @@ 
     * @var      array
     */
     var $_locale = array(
-        'en' => array (
-            'weekdays_short'=> array ('Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'),
-            'weekdays_long' => array ('Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'),
-            'months_short'  => array ('Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'),
-            'months_long'   => array ('January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December')
+        'en' => array(
+            'weekdays_short'=> array('Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'),
+            'weekdays_long' => array('Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'),
+            'months_short'  => array('Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'),
+            'months_long'   => array('January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December')
         ),
-        'de' => array (
-            'weekdays_short'=> array ('So', 'Mon', 'Di', 'Mi', 'Do', 'Fr', 'Sa'),
-            'weekdays_long' => array ('Sonntag', 'Montag', 'Dienstag', 'Mittwoch', 'Donnerstag', 'Freitag', 'Samstag'),
-            'months_short'  => array ('Jan', 'Feb', 'März', 'April', 'Mai', 'Juni', 'Juli', 'Aug', 'Sept', 'Okt', 'Nov', 'Dez'),
-            'months_long'   => array ('Januar', 'Februar', 'März', 'April', 'Mai', 'Juni', 'Juli', 'August', 'September', 'Oktober', 'November', 'Dezember')
+        'de' => array(
+            'weekdays_short'=> array('So', 'Mon', 'Di', 'Mi', 'Do', 'Fr', 'Sa'),
+            'weekdays_long' => array('Sonntag', 'Montag', 'Dienstag', 'Mittwoch', 'Donnerstag', 'Freitag', 'Samstag'),
+            'months_short'  => array('Jan', 'Feb', 'März', 'April', 'Mai', 'Juni', 'Juli', 'Aug', 'Sept', 'Okt', 'Nov', 'Dez'),
+            'months_long'   => array('Januar', 'Februar', 'März', 'April', 'Mai', 'Juni', 'Juli', 'August', 'September', 'Oktober', 'November', 'Dezember')
         ),
-        'fr' => array (
-            'weekdays_short'=> array ('Dim', 'Lun', 'Mar', 'Mer', 'Jeu', 'Ven', 'Sam'),
-            'weekdays_long' => array ('Dimanche', 'Lundi', 'Mardi', 'Mercredi', 'Jeudi', 'Vendredi', 'Samedi'),
-            'months_short'  => array ('Jan', 'Fév', 'Mar', 'Avr', 'Mai', 'Juin', 'Juil', 'Août', 'Sep', 'Oct', 'Nov', 'Déc'),
-            'months_long'   => array ('Janvier', 'Février', 'Mars', 'Avril', 'Mai', 'Juin', 'Juillet', 'Août', 'Septembre', 'Octobre', 'Novembre', 'Décembre')
+        'fr' => array(
+            'weekdays_short'=> array('Dim', 'Lun', 'Mar', 'Mer', 'Jeu', 'Ven', 'Sam'),
+            'weekdays_long' => array('Dimanche', 'Lundi', 'Mardi', 'Mercredi', 'Jeudi', 'Vendredi', 'Samedi'),
+            'months_short'  => array('Jan', 'Fév', 'Mar', 'Avr', 'Mai', 'Juin', 'Juil', 'Août', 'Sep', 'Oct', 'Nov', 'Déc'),
+            'months_long'   => array('Janvier', 'Février', 'Mars', 'Avril', 'Mai', 'Juin', 'Juillet', 'Août', 'Septembre', 'Octobre', 'Novembre', 'Décembre')
         ),
-        'hu'    => array (
-            'weekdays_short'=> array ('V', 'H', 'K', 'Sze', 'Cs', 'P', 'Szo'),
-            'weekdays_long' => array ('vasárnap', 'hétfő', 'kedd', 'szerda', 'csütörtök', 'péntek', 'szombat'),
-            'months_short'  => array ('jan', 'feb', 'márc', 'ápr', 'máj', 'jún', 'júl', 'aug', 'szept', 'okt', 'nov', 'dec'),
-            'months_long'   => array ('január', 'február', 'március', 'április', 'május', 'június', 'július', 'augusztus', 'szeptember', 'október', 'november', 'december')
+        'hu'    => array(
+            'weekdays_short'=> array('V', 'H', 'K', 'Sze', 'Cs', 'P', 'Szo'),
+            'weekdays_long' => array('vasárnap', 'hétfő', 'kedd', 'szerda', 'csütörtök', 'péntek', 'szombat'),
+            'months_short'  => array('jan', 'feb', 'márc', 'ápr', 'máj', 'jún', 'júl', 'aug', 'szept', 'okt', 'nov', 'dec'),
+            'months_long'   => array('január', 'február', 'március', 'április', 'május', 'június', 'július', 'augusztus', 'szeptember', 'október', 'november', 'december')
         ),
-        'pl'    => array (
-            'weekdays_short'=> array ('Nie', 'Pn', 'Wt', 'Śr', 'Czw', 'Pt', 'Sob'),
-            'weekdays_long' => array ('Niedziela', 'Poniedziałek', 'Wtorek', 'Środa', 'Czwartek', 'Piątek', 'Sobota'),
-            'months_short'  => array ('Sty', 'Lut', 'Mar', 'Kwi', 'Maj', 'Cze', 'Lip', 'Sie', 'Wrz', 'Paź', 'Lis', 'Gru'),
-            'months_long'   => array ('Styczeń', 'Luty', 'Marzec', 'Kwiecień', 'Maj', 'Czerwiec', 'Lipiec', 'Sierpień', 'Wrzesień', 'Październik', 'Listopad', 'Grudzień')
+        'pl'    => array(
+            'weekdays_short'=> array('Nie', 'Pn', 'Wt', 'Śr', 'Czw', 'Pt', 'Sob'),
+            'weekdays_long' => array('Niedziela', 'Poniedziałek', 'Wtorek', 'Środa', 'Czwartek', 'Piątek', 'Sobota'),
+            'months_short'  => array('Sty', 'Lut', 'Mar', 'Kwi', 'Maj', 'Cze', 'Lip', 'Sie', 'Wrz', 'Paź', 'Lis', 'Gru'),
+            'months_long'   => array('Styczeń', 'Luty', 'Marzec', 'Kwiecień', 'Maj', 'Czerwiec', 'Lipiec', 'Sierpień', 'Wrzesień', 'Październik', 'Listopad', 'Grudzień')
         ),
-        'sl'    => array (
-            'weekdays_short'=> array ('Ned', 'Pon', 'Tor', 'Sre', 'Cet', 'Pet', 'Sob'),
-            'weekdays_long' => array ('Nedelja', 'Ponedeljek', 'Torek', 'Sreda', 'Cetrtek', 'Petek', 'Sobota'),
-            'months_short'  => array ('Jan', 'Feb', 'Mar', 'Apr', 'Maj', 'Jun', 'Jul', 'Avg', 'Sep', 'Okt', 'Nov', 'Dec'),
-            'months_long'   => array ('Januar', 'Februar', 'Marec', 'April', 'Maj', 'Junij', 'Julij', 'Avgust', 'September', 'Oktober', 'November', 'December')
+        'sl'    => array(
+            'weekdays_short'=> array('Ned', 'Pon', 'Tor', 'Sre', 'Cet', 'Pet', 'Sob'),
+            'weekdays_long' => array('Nedelja', 'Ponedeljek', 'Torek', 'Sreda', 'Cetrtek', 'Petek', 'Sobota'),
+            'months_short'  => array('Jan', 'Feb', 'Mar', 'Apr', 'Maj', 'Jun', 'Jul', 'Avg', 'Sep', 'Okt', 'Nov', 'Dec'),
+            'months_long'   => array('Januar', 'Februar', 'Marec', 'April', 'Maj', 'Junij', 'Julij', 'Avgust', 'September', 'Oktober', 'November', 'December')
         ),
-        'ru'    => array (
-            'weekdays_short'=> array ('Вс', 'Пн', 'Вт', 'Ср', 'Чт', 'Пт', 'Сб'),
-            'weekdays_long' => array ('Воскресенье', 'Понедельник', 'Вторник', 'Среда', 'Четверг', 'Пятница', 'Суббота'),
-            'months_short'  => array ('Янв', 'Фев', 'Мар', 'Апр', 'Май', 'Июн', 'Июл', 'Авг', 'Сен', 'Окт', 'Ноя', 'Дек'),
-            'months_long'   => array ('Январь', 'Февраль', 'Март', 'Апрель', 'Май', 'Июнь', 'Июль', 'Август', 'Сентябрь', 'Октябрь', 'Ноябрь', 'Декабрь')
+        'ru'    => array(
+            'weekdays_short'=> array('Вс', 'Пн', 'Вт', 'Ср', 'Чт', 'Пт', 'Сб'),
+            'weekdays_long' => array('Воскресенье', 'Понедельник', 'Вторник', 'Среда', 'Четверг', 'Пятница', 'Суббота'),
+            'months_short'  => array('Янв', 'Фев', 'Мар', 'Апр', 'Май', 'Июн', 'Июл', 'Авг', 'Сен', 'Окт', 'Ноя', 'Дек'),
+            'months_long'   => array('Январь', 'Февраль', 'Март', 'Апрель', 'Май', 'Июнь', 'Июль', 'Август', 'Сентябрь', 'Октябрь', 'Ноябрь', 'Декабрь')
         ),
-        'es'    => array (
-            'weekdays_short'=> array ('Dom', 'Lun', 'Mar', 'Mié', 'Jue', 'Vie', 'Sáb'),
-            'weekdays_long' => array ('Domingo', 'Lunes', 'Martes', 'Miércoles', 'Jueves', 'Viernes', 'Sábado'),
-            'months_short'  => array ('Ene', 'Feb', 'Mar', 'Abr', 'May', 'Jun', 'Jul', 'Ago', 'Sep', 'Oct', 'Nov', 'Dic'),
-            'months_long'   => array ('Enero', 'Febrero', 'Marzo', 'Abril', 'Mayo', 'Junio', 'Julio', 'Agosto', 'Septiembre', 'Octubre', 'Noviembre', 'Diciembre')
+        'es'    => array(
+            'weekdays_short'=> array('Dom', 'Lun', 'Mar', 'Mié', 'Jue', 'Vie', 'Sáb'),
+            'weekdays_long' => array('Domingo', 'Lunes', 'Martes', 'Miércoles', 'Jueves', 'Viernes', 'Sábado'),
+            'months_short'  => array('Ene', 'Feb', 'Mar', 'Abr', 'May', 'Jun', 'Jul', 'Ago', 'Sep', 'Oct', 'Nov', 'Dic'),
+            'months_long'   => array('Enero', 'Febrero', 'Marzo', 'Abril', 'Mayo', 'Junio', 'Julio', 'Agosto', 'Septiembre', 'Octubre', 'Noviembre', 'Diciembre')
         ),
-        'da'    => array (
-            'weekdays_short'=> array ('Søn', 'Man', 'Tir', 'Ons', 'Tor', 'Fre', 'Lør'),
-            'weekdays_long' => array ('Søndag', 'Mandag', 'Tirsdag', 'Onsdag', 'Torsdag', 'Fredag', 'Lørdag'),
-            'months_short'  => array ('Jan', 'Feb', 'Mar', 'Apr', 'Maj', 'Jun', 'Jul', 'Aug', 'Sep', 'Okt', 'Nov', 'Dec'),
-            'months_long'   => array ('Januar', 'Februar', 'Marts', 'April', 'Maj', 'Juni', 'Juli', 'August', 'September', 'Oktober', 'November', 'December')
+        'da'    => array(
+            'weekdays_short'=> array('Søn', 'Man', 'Tir', 'Ons', 'Tor', 'Fre', 'Lør'),
+            'weekdays_long' => array('Søndag', 'Mandag', 'Tirsdag', 'Onsdag', 'Torsdag', 'Fredag', 'Lørdag'),
+            'months_short'  => array('Jan', 'Feb', 'Mar', 'Apr', 'Maj', 'Jun', 'Jul', 'Aug', 'Sep', 'Okt', 'Nov', 'Dec'),
+            'months_long'   => array('Januar', 'Februar', 'Marts', 'April', 'Maj', 'Juni', 'Juli', 'August', 'September', 'Oktober', 'November', 'December')
         ),
-        'is'    => array (
-            'weekdays_short'=> array ('Sun', 'Mán', 'Þri', 'Mið', 'Fim', 'Fös', 'Lau'),
-            'weekdays_long' => array ('Sunnudagur', 'Mánudagur', 'Þriðjudagur', 'Miðvikudagur', 'Fimmtudagur', 'Föstudagur', 'Laugardagur'),
-            'months_short'  => array ('Jan', 'Feb', 'Mar', 'Apr', 'Maí', 'Jún', 'Júl', 'Ágú', 'Sep', 'Okt', 'Nóv', 'Des'),
-            'months_long'   => array ('Janúar', 'Febrúar', 'Mars', 'Apríl', 'Maí', 'Júní', 'Júlí', 'Ágúst', 'September', 'Október', 'Nóvember', 'Desember')
+        'is'    => array(
+            'weekdays_short'=> array('Sun', 'Mán', 'Þri', 'Mið', 'Fim', 'Fös', 'Lau'),
+            'weekdays_long' => array('Sunnudagur', 'Mánudagur', 'Þriðjudagur', 'Miðvikudagur', 'Fimmtudagur', 'Föstudagur', 'Laugardagur'),
+            'months_short'  => array('Jan', 'Feb', 'Mar', 'Apr', 'Maí', 'Jún', 'Júl', 'Ágú', 'Sep', 'Okt', 'Nóv', 'Des'),
+            'months_long'   => array('Janúar', 'Febrúar', 'Mars', 'Apríl', 'Maí', 'Júní', 'Júlí', 'Ágúst', 'September', 'Október', 'Nóvember', 'Desember')
         ),
-        'it'    => array (
-            'weekdays_short'=> array ('Dom', 'Lun', 'Mar', 'Mer', 'Gio', 'Ven', 'Sab'),
-            'weekdays_long' => array ('Domenica', 'Lunedì', 'Martedì', 'Mercoledì', 'Giovedì', 'Venerdì', 'Sabato'),
-            'months_short'  => array ('Gen', 'Feb', 'Mar', 'Apr', 'Mag', 'Giu', 'Lug', 'Ago', 'Set', 'Ott', 'Nov', 'Dic'),
-            'months_long'   => array ('Gennaio', 'Febbraio', 'Marzo', 'Aprile', 'Maggio', 'Giugno', 'Luglio', 'Agosto', 'Settembre', 'Ottobre', 'Novembre', 'Dicembre')
+        'it'    => array(
+            'weekdays_short'=> array('Dom', 'Lun', 'Mar', 'Mer', 'Gio', 'Ven', 'Sab'),
+            'weekdays_long' => array('Domenica', 'Lunedì', 'Martedì', 'Mercoledì', 'Giovedì', 'Venerdì', 'Sabato'),
+            'months_short'  => array('Gen', 'Feb', 'Mar', 'Apr', 'Mag', 'Giu', 'Lug', 'Ago', 'Set', 'Ott', 'Nov', 'Dic'),
+            'months_long'   => array('Gennaio', 'Febbraio', 'Marzo', 'Aprile', 'Maggio', 'Giugno', 'Luglio', 'Agosto', 'Settembre', 'Ottobre', 'Novembre', 'Dicembre')
         ),
-        'sk'    => array (
-            'weekdays_short'=> array ('Ned', 'Pon', 'Uto', 'Str', 'Štv', 'Pia', 'Sob'),
-            'weekdays_long' => array ('Nedeža', 'Pondelok', 'Utorok', 'Streda', 'Štvrtok', 'Piatok', 'Sobota'),
-            'months_short'  => array ('Jan', 'Feb', 'Mar', 'Apr', 'Máj', 'Jún', 'Júl', 'Aug', 'Sep', 'Okt', 'Nov', 'Dec'),
-            'months_long'   => array ('Január', 'Február', 'Marec', 'Apríl', 'Máj', 'Jún', 'Júl', 'August', 'September', 'Október', 'November', 'December')
+        'sk'    => array(
+            'weekdays_short'=> array('Ned', 'Pon', 'Uto', 'Str', 'Štv', 'Pia', 'Sob'),
+            'weekdays_long' => array('Nedeža', 'Pondelok', 'Utorok', 'Streda', 'Štvrtok', 'Piatok', 'Sobota'),
+            'months_short'  => array('Jan', 'Feb', 'Mar', 'Apr', 'Máj', 'Jún', 'Júl', 'Aug', 'Sep', 'Okt', 'Nov', 'Dec'),
+            'months_long'   => array('Január', 'Február', 'Marec', 'Apríl', 'Máj', 'Jún', 'Júl', 'August', 'September', 'Október', 'November', 'December')
         ),
-        'cs'    => array (
-            'weekdays_short'=> array ('Ne', 'Po', 'Út', 'St', 'Čt', 'Pá', 'So'),
-            'weekdays_long' => array ('Neděle', 'Pondělí', 'Úterý', 'Středa', 'Čtvrtek', 'Pátek', 'Sobota'),
-            'months_short'  => array ('Led', 'Úno', 'Bře', 'Dub', 'Kvě', 'Čen', 'Čec', 'Srp', 'Zář', 'Říj', 'Lis', 'Pro'),
-            'months_long'   => array ('Leden', 'Únor', 'Březen', 'Duben', 'Květen', 'Červen', 'Červenec', 'Srpen', 'Září', 'Říjen', 'Listopad', 'Prosinec')
+        'cs'    => array(
+            'weekdays_short'=> array('Ne', 'Po', 'Út', 'St', 'Čt', 'Pá', 'So'),
+            'weekdays_long' => array('Neděle', 'Pondělí', 'Úterý', 'Středa', 'Čtvrtek', 'Pátek', 'Sobota'),
+            'months_short'  => array('Led', 'Úno', 'Bře', 'Dub', 'Kvě', 'Čen', 'Čec', 'Srp', 'Zář', 'Říj', 'Lis', 'Pro'),
+            'months_long'   => array('Leden', 'Únor', 'Březen', 'Duben', 'Květen', 'Červen', 'Červenec', 'Srpen', 'Září', 'Říjen', 'Listopad', 'Prosinec')
         ),
-        'hy'    => array (
-            'weekdays_short'=> array ('Կրկ', 'Երկ', 'Երք', 'Չրք', 'Հնգ', 'Ուր', 'Շբթ'),
-            'weekdays_long' => array ('Կիրակի', 'Երկուշաբթի', 'Երեքշաբթի', 'Չորեքշաբթի', 'Հինգշաբթի', 'Ուրբաթ', 'Շաբաթ'),
-            'months_short'  => array ('Հնվ', 'Փտր', 'Մրտ', 'Ապր', 'Մյս', 'Հնս', 'Հլս', 'Օգս', 'Սպտ', 'Հկտ', 'Նյմ', 'Դկտ'),
-            'months_long'   => array ('Հունվար', 'Փետրվար', 'Մարտ', 'Ապրիլ', 'Մայիս', 'Հունիս', 'Հուլիս', 'Օգոստոս', 'Սեպտեմբեր', 'Հոկտեմբեր', 'Նոյեմբեր', 'Դեկտեմբեր')
+        'hy'    => array(
+            'weekdays_short'=> array('Կրկ', 'Երկ', 'Երք', 'Չրք', 'Հնգ', 'Ուր', 'Շբթ'),
+            'weekdays_long' => array('Կիրակի', 'Երկուշաբթի', 'Երեքշաբթի', 'Չորեքշաբթի', 'Հինգշաբթի', 'Ուրբաթ', 'Շաբաթ'),
+            'months_short'  => array('Հնվ', 'Փտր', 'Մրտ', 'Ապր', 'Մյս', 'Հնս', 'Հլս', 'Օգս', 'Սպտ', 'Հկտ', 'Նյմ', 'Դկտ'),
+            'months_long'   => array('Հունվար', 'Փետրվար', 'Մարտ', 'Ապրիլ', 'Մայիս', 'Հունիս', 'Հուլիս', 'Օգոստոս', 'Սեպտեմբեր', 'Հոկտեմբեր', 'Նոյեմբեր', 'Դեկտեմբեր')
         ),
-        'nl'    => array (
-            'weekdays_short'=> array ('Zo', 'Ma', 'Di', 'Wo', 'Do', 'Vr', 'Za'),
-            'weekdays_long' => array ('Zondag', 'Maandag', 'Dinsdag', 'Woensdag', 'Donderdag', 'Vrijdag', 'Zaterdag'),
-            'months_short'  => array ('Jan', 'Feb', 'Mar', 'Apr', 'Mei', 'Jun', 'Jul', 'Aug', 'Sep', 'Okt', 'Nov', 'Dec'),
-            'months_long'   => array ('Januari', 'Februari', 'Maart', 'April', 'Mei', 'Juni', 'Juli', 'Augustus', 'September', 'Oktober', 'November', 'December')
+        'nl'    => array(
+            'weekdays_short'=> array('Zo', 'Ma', 'Di', 'Wo', 'Do', 'Vr', 'Za'),
+            'weekdays_long' => array('Zondag', 'Maandag', 'Dinsdag', 'Woensdag', 'Donderdag', 'Vrijdag', 'Zaterdag'),
+            'months_short'  => array('Jan', 'Feb', 'Mar', 'Apr', 'Mei', 'Jun', 'Jul', 'Aug', 'Sep', 'Okt', 'Nov', 'Dec'),
+            'months_long'   => array('Januari', 'Februari', 'Maart', 'April', 'Mei', 'Juni', 'Juli', 'Augustus', 'September', 'Oktober', 'November', 'December')
         ),
-        'et'    => array (
-            'weekdays_short'=> array ('P', 'E', 'T', 'K', 'N', 'R', 'L'),
-            'weekdays_long' => array ('Pühapäev', 'Esmaspäev', 'Teisipäev', 'Kolmapäev', 'Neljapäev', 'Reede', 'Laupäev'),
-            'months_short'  => array ('Jaan', 'Veebr', 'Märts', 'Aprill', 'Mai', 'Juuni', 'Juuli', 'Aug', 'Sept', 'Okt', 'Nov', 'Dets'),
-            'months_long'   => array ('Jaanuar', 'Veebruar', 'Märts', 'Aprill', 'Mai', 'Juuni', 'Juuli', 'August', 'September', 'Oktoober', 'November', 'Detsember')
+        'et'    => array(
+            'weekdays_short'=> array('P', 'E', 'T', 'K', 'N', 'R', 'L'),
+            'weekdays_long' => array('Pühapäev', 'Esmaspäev', 'Teisipäev', 'Kolmapäev', 'Neljapäev', 'Reede', 'Laupäev'),
+            'months_short'  => array('Jaan', 'Veebr', 'Märts', 'Aprill', 'Mai', 'Juuni', 'Juuli', 'Aug', 'Sept', 'Okt', 'Nov', 'Dets'),
+            'months_long'   => array('Jaanuar', 'Veebruar', 'Märts', 'Aprill', 'Mai', 'Juuni', 'Juuli', 'August', 'September', 'Oktoober', 'November', 'Detsember')
         ),
-        'tr'    => array (
-            'weekdays_short'=> array ('Paz', 'Pzt', 'Sal', 'Çar', 'Per', 'Cum', 'Cts'),
-            'weekdays_long' => array ('Pazar', 'Pazartesi', 'Salı', 'Çarşamba', 'Perşembe', 'Cuma', 'Cumartesi'),
-            'months_short'  => array ('Ock', 'Şbt', 'Mrt', 'Nsn', 'Mys', 'Hzrn', 'Tmmz', 'Ağst', 'Eyl', 'Ekm', 'Ksm', 'Arlk'),
-            'months_long'   => array ('Ocak', 'Şubat', 'Mart', 'Nisan', 'Mayıs', 'Haziran', 'Temmuz', 'Ağustos', 'Eylül', 'Ekim', 'Kasım', 'Aralık')
+        'tr'    => array(
+            'weekdays_short'=> array('Paz', 'Pzt', 'Sal', 'Çar', 'Per', 'Cum', 'Cts'),
+            'weekdays_long' => array('Pazar', 'Pazartesi', 'Salı', 'Çarşamba', 'Perşembe', 'Cuma', 'Cumartesi'),
+            'months_short'  => array('Ock', 'Şbt', 'Mrt', 'Nsn', 'Mys', 'Hzrn', 'Tmmz', 'Ağst', 'Eyl', 'Ekm', 'Ksm', 'Arlk'),
+            'months_long'   => array('Ocak', 'Şubat', 'Mart', 'Nisan', 'Mayıs', 'Haziran', 'Temmuz', 'Ağustos', 'Eylül', 'Ekim', 'Kasım', 'Aralık')
         ),
-        'no'    => array (
-            'weekdays_short'=> array ('Søn', 'Man', 'Tir', 'Ons', 'Tor', 'Fre', 'Lør'),
-            'weekdays_long' => array ('Søndag', 'Mandag', 'Tirsdag', 'Onsdag', 'Torsdag', 'Fredag', 'Lørdag'),
-            'months_short'  => array ('Jan', 'Feb', 'Mar', 'Apr', 'Mai', 'Jun', 'Jul', 'Aug', 'Sep', 'Okt', 'Nov', 'Des'),
-            'months_long'   => array ('Januar', 'Februar', 'Mars', 'April', 'Mai', 'Juni', 'Juli', 'August', 'September', 'Oktober', 'November', 'Desember')
+        'no'    => array(
+            'weekdays_short'=> array('Søn', 'Man', 'Tir', 'Ons', 'Tor', 'Fre', 'Lør'),
+            'weekdays_long' => array('Søndag', 'Mandag', 'Tirsdag', 'Onsdag', 'Torsdag', 'Fredag', 'Lørdag'),
+            'months_short'  => array('Jan', 'Feb', 'Mar', 'Apr', 'Mai', 'Jun', 'Jul', 'Aug', 'Sep', 'Okt', 'Nov', 'Des'),
+            'months_long'   => array('Januar', 'Februar', 'Mars', 'April', 'Mai', 'Juni', 'Juli', 'August', 'September', 'Oktober', 'November', 'Desember')
         ),
-        'eo'    => array (
-            'weekdays_short'=> array ('Dim', 'Lun', 'Mar', 'Mer', 'Ĵaŭ', 'Ven', 'Sab'),
-            'weekdays_long' => array ('Dimanĉo', 'Lundo', 'Mardo', 'Merkredo', 'Ĵaŭdo', 'Vendredo', 'Sabato'),
-            'months_short'  => array ('Jan', 'Feb', 'Mar', 'Apr', 'Maj', 'Jun', 'Jul', 'Aŭg', 'Sep', 'Okt', 'Nov', 'Dec'),
-            'months_long'   => array ('Januaro', 'Februaro', 'Marto', 'Aprilo', 'Majo', 'Junio', 'Julio', 'Aŭgusto', 'Septembro', 'Oktobro', 'Novembro', 'Decembro')
+        'eo'    => array(
+            'weekdays_short'=> array('Dim', 'Lun', 'Mar', 'Mer', 'Ĵaŭ', 'Ven', 'Sab'),
+            'weekdays_long' => array('Dimanĉo', 'Lundo', 'Mardo', 'Merkredo', 'Ĵaŭdo', 'Vendredo', 'Sabato'),
+            'months_short'  => array('Jan', 'Feb', 'Mar', 'Apr', 'Maj', 'Jun', 'Jul', 'Aŭg', 'Sep', 'Okt', 'Nov', 'Dec'),
+            'months_long'   => array('Januaro', 'Februaro', 'Marto', 'Aprilo', 'Majo', 'Junio', 'Julio', 'Aŭgusto', 'Septembro', 'Oktobro', 'Novembro', 'Decembro')
         ),
-        'ua'    => array (
+        'ua'    => array(
             'weekdays_short'=> array('Ндл', 'Пнд', 'Втр', 'Срд', 'Чтв', 'Птн', 'Сбт'),
             'weekdays_long' => array('Неділя', 'Понеділок', 'Вівторок', 'Середа', 'Четвер', 'П\'ятниця', 'Субота'),
             'months_short'  => array('Січ', 'Лют', 'Бер', 'Кві', 'Тра', 'Чер', 'Лип', 'Сер', 'Вер', 'Жов', 'Лис', 'Гру'),
             'months_long'   => array('Січень', 'Лютий', 'Березень', 'Квітень', 'Травень', 'Червень', 'Липень', 'Серпень', 'Вересень', 'Жовтень', 'Листопад', 'Грудень')
         ),
-        'ro'    => array (
-            'weekdays_short'=> array ('Dum', 'Lun', 'Mar', 'Mie', 'Joi', 'Vin', 'Sam'),
-            'weekdays_long' => array ('Duminica', 'Luni', 'Marti', 'Miercuri', 'Joi', 'Vineri', 'Sambata'),
-            'months_short'  => array ('Ian', 'Feb', 'Mar', 'Apr', 'Mai', 'Iun', 'Iul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'),
-            'months_long'   => array ('Ianuarie', 'Februarie', 'Martie', 'Aprilie', 'Mai', 'Iunie', 'Iulie', 'August', 'Septembrie', 'Octombrie', 'Noiembrie', 'Decembrie')
+        'ro'    => array(
+            'weekdays_short'=> array('Dum', 'Lun', 'Mar', 'Mie', 'Joi', 'Vin', 'Sam'),
+            'weekdays_long' => array('Duminica', 'Luni', 'Marti', 'Miercuri', 'Joi', 'Vineri', 'Sambata'),
+            'months_short'  => array('Ian', 'Feb', 'Mar', 'Apr', 'Mai', 'Iun', 'Iul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'),
+            'months_long'   => array('Ianuarie', 'Februarie', 'Martie', 'Aprilie', 'Mai', 'Iunie', 'Iulie', 'August', 'Septembrie', 'Octombrie', 'Noiembrie', 'Decembrie')
         ),
-        'he'    => array (
-            'weekdays_short'=> array ('ראשון', 'שני', 'שלישי', 'רביעי', 'חמישי', 'שישי', 'שבת'),
-            'weekdays_long' => array ('יום ראשון', 'יום שני', 'יום שלישי', 'יום רביעי', 'יום חמישי', 'יום שישי', 'שבת'),
-            'months_short'  => array ('ינואר', 'פברואר', 'מרץ', 'אפריל', 'מאי', 'יוני', 'יולי', 'אוגוסט', 'ספטמבר', 'אוקטובר', 'נובמבר', 'דצמבר'),
-            'months_long'   => array ('ינואר', 'פברואר', 'מרץ', 'אפריל', 'מאי', 'יוני', 'יולי', 'אוגוסט', 'ספטמבר', 'אוקטובר', 'נובמבר', 'דצמבר')
+        'he'    => array(
+            'weekdays_short'=> array('ראשון', 'שני', 'שלישי', 'רביעי', 'חמישי', 'שישי', 'שבת'),
+            'weekdays_long' => array('יום ראשון', 'יום שני', 'יום שלישי', 'יום רביעי', 'יום חמישי', 'יום שישי', 'שבת'),
+            'months_short'  => array('ינואר', 'פברואר', 'מרץ', 'אפריל', 'מאי', 'יוני', 'יולי', 'אוגוסט', 'ספטמבר', 'אוקטובר', 'נובמבר', 'דצמבר'),
+            'months_long'   => array('ינואר', 'פברואר', 'מרץ', 'אפריל', 'מאי', 'יוני', 'יולי', 'אוגוסט', 'ספטמבר', 'אוקטובר', 'נובמבר', 'דצמבר')
         ),
-        'sv'    => array (
-            'weekdays_short'=> array ('Sön', 'Mån', 'Tis', 'Ons', 'Tor', 'Fre', 'Lör'),
-            'weekdays_long' => array ('Söndag', 'Måndag', 'Tisdag', 'Onsdag', 'Torsdag', 'Fredag', 'Lördag'),
-            'months_short'  => array ('Jan', 'Feb', 'Mar', 'Apr', 'Maj', 'Jun', 'Jul', 'Aug', 'Sep', 'Okt', 'Nov', 'Dec'),
-            'months_long'   => array ('Januari', 'Februari', 'Mars', 'April', 'Maj', 'Juni', 'Juli', 'Augusti', 'September', 'Oktober', 'November', 'December')
+        'sv'    => array(
+            'weekdays_short'=> array('Sön', 'Mån', 'Tis', 'Ons', 'Tor', 'Fre', 'Lör'),
+            'weekdays_long' => array('Söndag', 'Måndag', 'Tisdag', 'Onsdag', 'Torsdag', 'Fredag', 'Lördag'),
+            'months_short'  => array('Jan', 'Feb', 'Mar', 'Apr', 'Maj', 'Jun', 'Jul', 'Aug', 'Sep', 'Okt', 'Nov', 'Dec'),
+            'months_long'   => array('Januari', 'Februari', 'Mars', 'April', 'Maj', 'Juni', 'Juli', 'Augusti', 'September', 'Oktober', 'November', 'December')
         ),
-        'pt'    => array (
-            'weekdays_short'=> array ('Dom', 'Seg', 'Ter', 'Qua', 'Qui', 'Sex', 'Sáb'),
-            'weekdays_long' => array ('Domingo', 'Segunda-feira', 'Terça-feira', 'Quarta-feira', 'Quinta-feira', 'Sexta-feira', 'Sábado'),
-            'months_short'  => array ('Jan', 'Fev', 'Mar', 'Abr', 'Mai', 'Jun', 'Jul', 'Ago', 'Set', 'Out', 'Nov', 'Dez'),
-            'months_long'   => array ('Janeiro', 'Fevereiro', 'Março', 'Abril', 'Maio', 'Junho', 'Julho', 'Agosto', 'Setembro', 'Outubro', 'Novembro', 'Dezembro')
+        'pt'    => array(
+            'weekdays_short'=> array('Dom', 'Seg', 'Ter', 'Qua', 'Qui', 'Sex', 'Sáb'),
+            'weekdays_long' => array('Domingo', 'Segunda-feira', 'Terça-feira', 'Quarta-feira', 'Quinta-feira', 'Sexta-feira', 'Sábado'),
+            'months_short'  => array('Jan', 'Fev', 'Mar', 'Abr', 'Mai', 'Jun', 'Jul', 'Ago', 'Set', 'Out', 'Nov', 'Dez'),
+            'months_long'   => array('Janeiro', 'Fevereiro', 'Março', 'Abril', 'Maio', 'Junho', 'Julho', 'Agosto', 'Setembro', 'Outubro', 'Novembro', 'Dezembro')
         ),
-        'tw'    => array (
-            'weekdays_short'=> array ('週日','週一', '週二','週三', '週四','週五', '週六'),
-            'weekdays_long' => array ('星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六'),
-            'months_short'  => array ('一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月'),
-            'months_long'   => array ('一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月')
+        'tw'    => array(
+            'weekdays_short'=> array('週日', '週一', '週二', '週三', '週四', '週五', '週六'),
+            'weekdays_long' => array('星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六'),
+            'months_short'  => array('一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月'),
+            'months_long'   => array('一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月')
         ),
-        'pt-br' => array (
-            'weekdays_short'=> array ('Dom', 'Seg', 'Ter', 'Qua', 'Qui', 'Sex', 'Sáb'),
-            'weekdays_long' => array ('Domingo', 'Segunda', 'Terça', 'Quarta', 'Quinta', 'Sexta', 'Sábado'),
-            'months_short'  => array ('Jan', 'Fev', 'Mar', 'Abr', 'Mai', 'Jun', 'Jul', 'Ago', 'Set', 'Out', 'Nov', 'Dez'),
-            'months_long'   => array ('Janeiro', 'Fevereiro', 'Março', 'Abril', 'Maio', 'Junho', 'Julho', 'Agosto', 'Setembro', 'Outubro', 'Novembro', 'Dezembro')
+        'pt-br' => array(
+            'weekdays_short'=> array('Dom', 'Seg', 'Ter', 'Qua', 'Qui', 'Sex', 'Sáb'),
+            'weekdays_long' => array('Domingo', 'Segunda', 'Terça', 'Quarta', 'Quinta', 'Sexta', 'Sábado'),
+            'months_short'  => array('Jan', 'Fev', 'Mar', 'Abr', 'Mai', 'Jun', 'Jul', 'Ago', 'Set', 'Out', 'Nov', 'Dez'),
+            'months_long'   => array('Janeiro', 'Fevereiro', 'Março', 'Abril', 'Maio', 'Junho', 'Julho', 'Agosto', 'Setembro', 'Outubro', 'Novembro', 'Dezembro')
         )
     );
 
@@ -284,7 +284,7 @@ 
         if (is_array($options)) {
             foreach ($options as $name => $value) {
                 if ('language' == $name) {
-                    $this->_options['language'] = isset($this->_locale[$value])? $value: 'en';
+                    $this->_options['language'] = isset($this->_locale[$value]) ? $value : 'en';
                 } elseif (isset($this->_options[$name])) {
                     if (is_array($value) && is_array($this->_options[$name])) {
                         $this->_options[$name] = @array_merge($this->_options[$name], $value);
@@ -299,9 +299,9 @@ 
     function _createElements()
     {
         $this->_separator = $this->_elements = array();
-        $separator =  '';
-        $locale    =& $this->_locale[$this->_options['language']];
-        $backslash =  false;
+        $separator = '';
+        $locale    = & $this->_locale[$this->_options['language']];
+        $backslash = false;
         // Modified by Ivan Tcholakov, 16-MAR-2010.
         for ($i = 0, $length = api_strlen($this->_options['format']); $i < $length; $i++) {
             $sign = api_substr($this->_options['format'], $i, 1);
@@ -324,7 +324,7 @@ 
                         break;
                     case 'M':
                         $options = $locale['months_short'];
-                        array_unshift($options , '');
+                        array_unshift($options, '');
                         unset($options[0]);
                         break;
                     case 'm':
@@ -332,23 +332,23 @@ 
                         break;
                     case 'F':
                         $options = $locale['months_long'];
-                        array_unshift($options , '');
+                        array_unshift($options, '');
                         unset($options[0]);
                         break;
                     case 'Y':
                         $options = $this->_createOptionList(
                             $this->_options['minYear'],
                             $this->_options['maxYear'],
-                            $this->_options['minYear'] > $this->_options['maxYear']? -1: 1
+                            $this->_options['minYear'] > $this->_options['maxYear'] ? -1 : 1
                         );
                         break;
                     case 'y':
                         $options = $this->_createOptionList(
                             $this->_options['minYear'],
                             $this->_options['maxYear'],
-                            $this->_options['minYear'] > $this->_options['maxYear']? -1: 1
+                            $this->_options['minYear'] > $this->_options['maxYear'] ? -1 : 1
                         );
-                        array_walk($options, create_function('&$v,$k','$v = substr($v,-2);'));
+                        array_walk($options, create_function('&$v,$k', '$v = substr($v,-2);'));
                         break;
                     case 'h':
                         $options = $this->_createOptionList(1, 12);
@@ -380,7 +380,7 @@ 
                         $loadSelect = false;
                         break;
                     default:
-                        $separator .= (' ' == $sign? '&nbsp;': $sign);
+                        $separator .= (' ' == $sign ? '&nbsp;' : $sign);
                         $loadSelect = false;
                 }
 
@@ -406,7 +406,7 @@ 
                 }
             }
         }
-        $this->_wrap[1] = $separator . ($backslash? '\\': '');
+        $this->_wrap[1] = $separator.($backslash ? '\\' : '');
     }
 
     // }}}
@@ -423,7 +423,7 @@ 
     */
     function _createOptionList($start, $end, $step = 1)
     {
-        for ($i = $start, $options = array(); $start > $end? $i >= $end: $i <= $end; $i += $step) {
+        for ($i = $start, $options = array(); $start > $end ? $i >= $end : $i <= $end; $i += $step) {
             $options[$i] = sprintf('%02d', $i);
         }
         return $options;
@@ -444,7 +444,7 @@ 
             return $str;
         }
         $trimmed = ltrim($str, '0');
-        return strlen($trimmed)? $trimmed: '0';
+        return strlen($trimmed) ? $trimmed : '0';
     }
 
     // }}}
@@ -459,7 +459,7 @@ 
                 $value = strtotime($value);
             }
             // might be a unix epoch, then we fill all possible values
-            $arr = explode('-', date('w-j-n-Y-g-G-i-s-a-A-W', (int)$value));
+            $arr = explode('-', date('w-j-n-Y-g-G-i-s-a-A-W', (int) $value));
             $value = array(
                 'D' => $arr[0],
                 'l' => $arr[0],
@@ -493,7 +493,7 @@ 
         $renderer = new HTML_QuickForm_Renderer_Default();
         $renderer->setElementTemplate('{element}');
         parent::accept($renderer);
-        return $this->_wrap[0] . $renderer->toHtml() . $this->_wrap[1];
+        return $this->_wrap[0].$renderer->toHtml().$this->_wrap[1];
     }
 
     // }}}