Completed
Push — 1.10.x ( f2aaaf...ef00db )
by Yannick
241:15 queued 197:35
created
main/inc/lib/pear/HTML/QuickForm/Action/Next.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -35,8 +35,8 @@  discard block
 block discarded – undo
35 35
     {
36 36
         // save the form values and validation status to the session
37 37
         $page->isFormBuilt() or $page->buildForm();
38
-        $pageName =  $page->getAttribute('id');
39
-        $data     =& $page->controller->container();
38
+        $pageName = $page->getAttribute('id');
39
+        $data     = & $page->controller->container();
40 40
         $data['values'][$pageName] = $page->exportValues();
41 41
         if (PEAR::isError($valid = $page->validate())) {
42 42
             return $valid;
@@ -49,13 +49,13 @@  discard block
 block discarded – undo
49 49
         }
50 50
         // More pages?
51 51
         if (null !== ($nextName = $page->controller->getNextName($pageName))) {
52
-            $next =& $page->controller->getPage($nextName);
52
+            $next = & $page->controller->getPage($nextName);
53 53
             // Modified by Chamilo team, 16-MAR-2010.
54 54
             //$next->handle('jump');
55 55
             return $next->handle('jump');
56 56
             //
57 57
         // Consider this a 'finish' button, if there is no explicit one
58
-        } elseif($page->controller->isModal()) {
58
+        } elseif ($page->controller->isModal()) {
59 59
             if ($page->controller->isValid()) {
60 60
                 // Modified by Chamilo team, 16-MAR-2010.
61 61
                 //$page->handle('process');
Please login to merge, or discard this patch.
main/inc/lib/pear/HTML/QuickForm/Action/Direct.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -38,15 +38,15 @@
 block discarded – undo
38 38
     {
39 39
         // save the form values and validation status to the session
40 40
         $page->isFormBuilt() or $page->buildForm();
41
-        $pageName =  $page->getAttribute('id');
42
-        $data     =& $page->controller->container();
41
+        $pageName = $page->getAttribute('id');
42
+        $data     = & $page->controller->container();
43 43
         $data['values'][$pageName] = $page->exportValues();
44 44
         if (PEAR::isError($valid = $page->validate())) {
45 45
             return $valid;
46 46
         }
47 47
         $data['valid'][$pageName] = $valid;
48 48
 
49
-        $target =& $page->controller->getPage($actionName);
49
+        $target = & $page->controller->getPage($actionName);
50 50
         if (PEAR::isError($target)) {
51 51
             return $target;
52 52
         } else {
Please login to merge, or discard this patch.
main/inc/lib/pear/HTML/QuickForm/Action/Submit.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -35,8 +35,8 @@  discard block
 block discarded – undo
35 35
     {
36 36
         // save the form values and validation status to the session
37 37
         $page->isFormBuilt() or $page->buildForm();
38
-        $pageName =  $page->getAttribute('id');
39
-        $data     =& $page->controller->container();
38
+        $pageName = $page->getAttribute('id');
39
+        $data     = & $page->controller->container();
40 40
         $data['values'][$pageName] = $page->exportValues();
41 41
         if (PEAR::isError($valid = $page->validate())) {
42 42
             return $valid;
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
 
60 60
         // Some other page is invalid, redirect to it
61 61
         } else {
62
-            $target =& $page->controller->getPage($page->controller->findInvalid());
62
+            $target = & $page->controller->getPage($page->controller->findInvalid());
63 63
             // Modified by Chamilo team, 16-MAR-2010.
64 64
             //$target->handle('jump');
65 65
             return $target->handle('jump');
Please login to merge, or discard this patch.
main/inc/lib/pear/HTML/QuickForm/reset.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@
 block discarded – undo
15 15
      * @access    public
16 16
      * @return    void
17 17
      */
18
-    public function __construct($elementName=null, $value=null, $attributes=null)
18
+    public function __construct($elementName = null, $value = null, $attributes = null)
19 19
     {
20 20
         parent::__construct($elementName, null, $attributes);
21 21
         $this->setValue($value);
Please login to merge, or discard this patch.
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -60,7 +60,7 @@
 block discarded – undo
60 60
      * Freeze the element so that only its value is returned
61 61
      *
62 62
      * @access    public
63
-     * @return    void
63
+     * @return    boolean
64 64
      */
65 65
     function freeze()
66 66
     {
Please login to merge, or discard this patch.
main/inc/lib/pear/HTML/QuickForm/autocomplete.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -116,10 +116,10 @@  discard block
 block discarded – undo
116 116
     function toHtml()
117 117
     {
118 118
         // prevent problems with grouped elements
119
-        $arrayName = str_replace(array('[', ']'), array('__', ''), $this->getName()) . '_values';
119
+        $arrayName = str_replace(array('[', ']'), array('__', ''), $this->getName()).'_values';
120 120
 
121 121
         $this->updateAttributes(array(
122
-            'onkeypress' => 'return autocomplete(this, event, ' . $arrayName . ');'
122
+            'onkeypress' => 'return autocomplete(this, event, '.$arrayName.');'
123 123
         ));
124 124
         if ($this->_flagFrozen) {
125 125
             $js = '';
@@ -239,13 +239,13 @@  discard block
 block discarded – undo
239 239
             );
240 240
 
241 241
             $js .= $this->_js;
242
-            $js .= 'var ' . $arrayName . " = new Array();\n";
242
+            $js .= 'var '.$arrayName." = new Array();\n";
243 243
             for ($i = 0; $i < count($this->_options); $i++) {
244
-                $js .= $arrayName . '[' . $i . "] = '" . strtr($this->_options[$i], $jsEscape) . "';\n";
244
+                $js .= $arrayName.'['.$i."] = '".strtr($this->_options[$i], $jsEscape)."';\n";
245 245
             }
246 246
             $js .= "//]]>\n</script>";
247 247
         }
248
-        return $js . parent::toHtml();
248
+        return $js.parent::toHtml();
249 249
     }// end func toHtml
250 250
 
251 251
     // }}}
Please login to merge, or discard this patch.
main/inc/lib/pear/HTML/QuickForm/Renderer/ObjectFlexy.php 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
  */
51 51
 class HTML_QuickForm_Renderer_ObjectFlexy extends HTML_QuickForm_Renderer_Object
52 52
 {
53
-   /**#@+
53
+    /**#@+
54 54
     * @access private
55 55
     */
56 56
     /**
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
      * @var string $_elementType
92 92
      */
93 93
     var $_elementType = 'QuickformFlexyElement';
94
-   /**#@-*/
94
+    /**#@-*/
95 95
 
96 96
     /**
97 97
      * Constructor
Please login to merge, or discard this patch.
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -103,12 +103,12 @@  discard block
 block discarded – undo
103 103
     {
104 104
         $this->HTML_QuickForm_Renderer_Object(true);
105 105
         $this->_obj = new QuickformFlexyForm();
106
-        $this->_flexy =& $flexy;
106
+        $this->_flexy = & $flexy;
107 107
     } // end constructor
108 108
 
109 109
     function renderHeader(&$header)
110 110
     {
111
-        if($name = $header->getName()) {
111
+        if ($name = $header->getName()) {
112 112
             $this->_obj->header->$name = $header->toHtml();
113 113
         } else {
114 114
             $this->_obj->header[$this->_sectionCount] = $header->toHtml();
@@ -135,15 +135,15 @@  discard block
 block discarded – undo
135 135
     function _elementToObject(&$element, $required, $error)
136 136
     {
137 137
         $ret = parent::_elementToObject($element, $required, $error);
138
-        if($ret->type == 'group') {
138
+        if ($ret->type == 'group') {
139 139
             $ret->html = $element->toHtml();
140 140
             unset($ret->elements);
141 141
         }
142
-        if(!empty($this->_label)) {
142
+        if (!empty($this->_label)) {
143 143
             $this->_renderLabel($ret);
144 144
         }
145 145
 
146
-        if(!empty($this->_html)) {
146
+        if (!empty($this->_html)) {
147 147
             $this->_renderHtml($ret);
148 148
             $ret->error = $error;
149 149
         }
@@ -151,12 +151,12 @@  discard block
 block discarded – undo
151 151
         // Create an element key from the name
152 152
         if (false !== ($pos = strpos($ret->name, '[')) || is_object($this->_currentGroup)) {
153 153
             if (!$pos) {
154
-                $keys = '->{\'' . str_replace(array('\\', '\''), array('\\\\', '\\\''), $ret->name) . '\'}';
154
+                $keys = '->{\''.str_replace(array('\\', '\''), array('\\\\', '\\\''), $ret->name).'\'}';
155 155
             } else {
156
-                $keys = '->{\'' . str_replace(
156
+                $keys = '->{\''.str_replace(
157 157
                             array('\\', '\'', '[', ']'), array('\\\\', '\\\'', '\'}->{\'', ''),
158 158
                             $ret->name
159
-                        ) . '\'}';
159
+                        ).'\'}';
160 160
             }
161 161
             // special handling for elements in native groups
162 162
             if (is_object($this->_currentGroup)) {
@@ -171,13 +171,13 @@  discard block
 block discarded – undo
171 171
                 }
172 172
             }
173 173
         } elseif (0 == strlen($ret->name)) {
174
-            $keys = '->{\'element_' . $this->_elementIdx . '\'}';
174
+            $keys = '->{\'element_'.$this->_elementIdx.'\'}';
175 175
         } else {
176
-            $keys = '->{\'' . str_replace(array('\\', '\''), array('\\\\', '\\\''), $ret->name) . '\'}';
176
+            $keys = '->{\''.str_replace(array('\\', '\''), array('\\\\', '\\\''), $ret->name).'\'}';
177 177
         }
178 178
         // for radios: add extra key from value
179 179
         if ('radio' == $ret->type && '[]' != substr($keys, -2)) {
180
-            $keys .= '->{\'' . str_replace(array('\\', '\''), array('\\\\', '\\\''), $ret->value) . '\'}';
180
+            $keys .= '->{\''.str_replace(array('\\', '\''), array('\\\\', '\\\''), $ret->value).'\'}';
181 181
         }
182 182
         $ret->keys = $keys;
183 183
         $this->_elementIdx++;
@@ -197,10 +197,10 @@  discard block
 block discarded – undo
197 197
         if ($elObj) {
198 198
             $keys = $elObj->keys;
199 199
             unset($elObj->keys);
200
-            if(is_object($this->_currentGroup) && ('group' != $elObj->type)) {
201
-                $code = '$this->_currentGroup' . $keys . ' = $elObj;';
200
+            if (is_object($this->_currentGroup) && ('group' != $elObj->type)) {
201
+                $code = '$this->_currentGroup'.$keys.' = $elObj;';
202 202
             } else {
203
-                $code = '$this->_obj' . $keys . ' = $elObj;';
203
+                $code = '$this->_obj'.$keys.' = $elObj;';
204 204
             }
205 205
             eval($code);
206 206
         }
Please login to merge, or discard this patch.
main/inc/lib/pear/HTML/QuickForm/Renderer/QuickHtml.php 1 patch
Spacing   +4 added lines, -6 removed lines patch added patch discarded remove patch
@@ -78,12 +78,12 @@  discard block
 block discarded – undo
78 78
         foreach (array_keys($this->renderedElements) as $key) {
79 79
             if (!$this->renderedElements[$key]['rendered']) {
80 80
                 $this->renderedElements[$key]['rendered'] = true;
81
-                $data .= $this->renderedElements[$key]['html'] . "\n";
81
+                $data .= $this->renderedElements[$key]['html']."\n";
82 82
             }
83 83
         }
84 84
 
85 85
         // Insert the extra data and form elements at the end of the form
86
-        $this->_html = str_replace('</form>', $data . "\n</form>", $this->_html);
86
+        $this->_html = str_replace('</form>', $data."\n</form>", $this->_html);
87 87
         return $this->_html;
88 88
     } // end func toHtml
89 89
 
@@ -117,13 +117,11 @@  discard block
 block discarded – undo
117 117
         }
118 118
 
119 119
         if (is_null($elementKey)) {
120
-            $msg = is_null($elementValue) ? "Element $elementName does not exist." :
121
-                "Element $elementName with value of $elementValue does not exist.";
120
+            $msg = is_null($elementValue) ? "Element $elementName does not exist." : "Element $elementName with value of $elementValue does not exist.";
122 121
             return PEAR::raiseError(null, QUICKFORM_UNREGISTERED_ELEMENT, null, E_USER_WARNING, $msg, 'HTML_QuickForm_Error', true);
123 122
         } else {
124 123
             if ($this->renderedElements[$elementKey]['rendered']) {
125
-                $msg = is_null($elementValue) ? "Element $elementName has already been rendered." :
126
-                    "Element $elementName with value of $elementValue has already been rendered.";
124
+                $msg = is_null($elementValue) ? "Element $elementName has already been rendered." : "Element $elementName with value of $elementValue has already been rendered.";
127 125
                 return PEAR::raiseError(null, QUICKFORM_ERROR, null, E_USER_WARNING, $msg, 'HTML_QuickForm_Error', true);
128 126
             } else {
129 127
                 $this->renderedElements[$elementKey]['rendered'] = true;
Please login to merge, or discard this patch.
main/inc/lib/pear/HTML/QuickForm/Renderer/Array.php 3 patches
Indentation   +68 added lines, -68 removed lines patch added patch discarded remove patch
@@ -109,60 +109,60 @@  discard block
 block discarded – undo
109 109
  */
110 110
 class HTML_QuickForm_Renderer_Array extends HTML_QuickForm_Renderer
111 111
 {
112
-   /**#@+
112
+    /**#@+
113 113
     * @access private
114 114
     */
115
-   /**
116
-    * An array being generated
117
-    * @var array
118
-    */
115
+    /**
116
+     * An array being generated
117
+     * @var array
118
+     */
119 119
     var $_ary;
120 120
 
121
-   /**
122
-    * Number of sections in the form (i.e. number of headers in it)
123
-    * @var integer
124
-    */
121
+    /**
122
+     * Number of sections in the form (i.e. number of headers in it)
123
+     * @var integer
124
+     */
125 125
     var $_sectionCount;
126 126
 
127
-   /**
128
-    * Current section number
129
-    * @var integer
130
-    */
127
+    /**
128
+     * Current section number
129
+     * @var integer
130
+     */
131 131
     var $_currentSection;
132 132
 
133
-   /**
134
-    * Array representing current group
135
-    * @var array
136
-    */
133
+    /**
134
+     * Array representing current group
135
+     * @var array
136
+     */
137 137
     var $_currentGroup = null;
138 138
 
139
-   /**
140
-    * Additional style information for different elements
141
-    * @var array
142
-    */
139
+    /**
140
+     * Additional style information for different elements
141
+     * @var array
142
+     */
143 143
     var $_elementStyles = array();
144 144
 
145
-   /**
146
-    * true: collect all hidden elements into string; false: process them as usual form elements
147
-    * @var bool
148
-    */
145
+    /**
146
+     * true: collect all hidden elements into string; false: process them as usual form elements
147
+     * @var bool
148
+     */
149 149
     var $_collectHidden = false;
150 150
 
151
-   /**
152
-    * true:  render an array of labels to many labels, $key 0 named 'label', the rest "label_$key"
153
-    * false: leave labels as defined
154
-    * @var bool
155
-    */
151
+    /**
152
+     * true:  render an array of labels to many labels, $key 0 named 'label', the rest "label_$key"
153
+     * false: leave labels as defined
154
+     * @var bool
155
+     */
156 156
     var $_staticLabels = false;
157
-   /**#@-*/
157
+    /**#@-*/
158 158
 
159
-   /**
160
-    * Constructor
161
-    *
162
-    * @param  bool    true: collect all hidden elements into string; false: process them as usual form elements
163
-    * @param  bool    true: render an array of labels to many labels, $key 0 to 'label' and the oterh to "label_$key"
164
-    * @access public
165
-    */
159
+    /**
160
+     * Constructor
161
+     *
162
+     * @param  bool    true: collect all hidden elements into string; false: process them as usual form elements
163
+     * @param  bool    true: render an array of labels to many labels, $key 0 to 'label' and the oterh to "label_$key"
164
+     * @access public
165
+     */
166 166
     function HTML_QuickForm_Renderer_Array($collectHidden = false, $staticLabels = false)
167 167
     {
168 168
         $this->HTML_QuickForm_Renderer();
@@ -171,12 +171,12 @@  discard block
 block discarded – undo
171 171
     } // end constructor
172 172
 
173 173
 
174
-   /**
175
-    * Returns the resultant array
176
-    *
177
-    * @access public
178
-    * @return array
179
-    */
174
+    /**
175
+     * Returns the resultant array
176
+     *
177
+     * @access public
178
+     * @return array
179
+     */
180 180
     function toArray()
181 181
     {
182 182
         return $this->_ary;
@@ -247,15 +247,15 @@  discard block
 block discarded – undo
247 247
     } // end func finishGroup
248 248
 
249 249
 
250
-   /**
251
-    * Creates an array representing an element
252
-    *
253
-    * @access private
254
-    * @param  HTML_QuickForm_element    element being processed
255
-    * @param  bool                      Whether an element is required
256
-    * @param  string                    Error associated with the element
257
-    * @return array
258
-    */
250
+    /**
251
+     * Creates an array representing an element
252
+     *
253
+     * @access private
254
+     * @param  HTML_QuickForm_element    element being processed
255
+     * @param  bool                      Whether an element is required
256
+     * @param  string                    Error associated with the element
257
+     * @return array
258
+     */
259 259
     function _elementToArray(&$element, $required, $error)
260 260
     {
261 261
         $ret = array(
@@ -295,13 +295,13 @@  discard block
 block discarded – undo
295 295
     }
296 296
 
297 297
 
298
-   /**
299
-    * Stores an array representation of an element in the form array
300
-    *
301
-    * @access private
302
-    * @param array  Array representation of an element
303
-    * @return void
304
-    */
298
+    /**
299
+     * Stores an array representation of an element in the form array
300
+     *
301
+     * @access private
302
+     * @param array  Array representation of an element
303
+     * @return void
304
+     */
305 305
     function _storeArray($elAry)
306 306
     {
307 307
         // where should we put this element...
@@ -315,14 +315,14 @@  discard block
 block discarded – undo
315 315
     }
316 316
 
317 317
 
318
-   /**
319
-    * Sets a style to use for element rendering
320
-    *
321
-    * @param mixed      element name or array ('element name' => 'style name')
322
-    * @param string     style name if $elementName is not an array
323
-    * @access public
324
-    * @return void
325
-    */
318
+    /**
319
+     * Sets a style to use for element rendering
320
+     *
321
+     * @param mixed      element name or array ('element name' => 'style name')
322
+     * @param string     style name if $elementName is not an array
323
+     * @access public
324
+     * @return void
325
+     */
326 326
     function setElementStyle($elementName, $styleName = null)
327 327
     {
328 328
         if (is_array($elementName)) {
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -224,7 +224,7 @@  discard block
 block discarded – undo
224 224
     function renderHidden(&$element)
225 225
     {
226 226
         if ($this->_collectHidden) {
227
-            $this->_ary['hidden'] .= $element->toHtml() . "\n";
227
+            $this->_ary['hidden'] .= $element->toHtml()."\n";
228 228
         } else {
229 229
             $this->renderElement($element, false, null);
230 230
         }
@@ -269,12 +269,12 @@  discard block
 block discarded – undo
269 269
         // render label(s)
270 270
         $labels = $element->getLabel();
271 271
         if (is_array($labels) && $this->_staticLabels) {
272
-            foreach($labels as $key => $label) {
273
-                $key = is_int($key)? $key + 1: $key;
272
+            foreach ($labels as $key => $label) {
273
+                $key = is_int($key) ? $key + 1 : $key;
274 274
                 if (1 === $key) {
275 275
                     $ret['label'] = $label;
276 276
                 } else {
277
-                    $ret['label_' . $key] = $label;
277
+                    $ret['label_'.$key] = $label;
278 278
                 }
279 279
             }
280 280
         } else {
Please login to merge, or discard this patch.
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -137,6 +137,9 @@
 block discarded – undo
137 137
         $this->_currentSection = $this->_sectionCount++;
138 138
     }
139 139
 
140
+    /**
141
+     * @param boolean $required
142
+     */
140 143
     function renderElement(&$element, $required, $error)
141 144
     {
142 145
         $elObj = $this->_elementToObject($element, $required, $error);
Please login to merge, or discard this patch.
main/inc/lib/pear/HTML/QuickForm/Renderer/ITDynamic.php 2 patches
Indentation   +61 added lines, -61 removed lines patch added patch discarded remove patch
@@ -40,58 +40,58 @@  discard block
 block discarded – undo
40 40
  */
41 41
 class HTML_QuickForm_Renderer_ITDynamic extends HTML_QuickForm_Renderer
42 42
 {
43
-   /**#@+
43
+    /**#@+
44 44
     * @access private
45 45
     */
46
-   /**
47
-    * A template class (HTML_Template_ITX or HTML_Template_Sigma) instance
48
-    * @var HTML_Template_ITX|HTML_Template_Sigma
49
-    */
46
+    /**
47
+     * A template class (HTML_Template_ITX or HTML_Template_Sigma) instance
48
+     * @var HTML_Template_ITX|HTML_Template_Sigma
49
+     */
50 50
     var $_tpl = null;
51 51
 
52
-   /**
53
-    * The errors that were not shown near concrete fields go here
54
-    * @var array
55
-    */
52
+    /**
53
+     * The errors that were not shown near concrete fields go here
54
+     * @var array
55
+     */
56 56
     var $_errors = array();
57 57
 
58
-   /**
59
-    * Show the block with required note?
60
-    * @var bool
61
-    */
58
+    /**
59
+     * Show the block with required note?
60
+     * @var bool
61
+     */
62 62
     var $_showRequired = false;
63 63
 
64
-   /**
65
-    * A separator for group elements
66
-    * @var mixed
67
-    */
64
+    /**
65
+     * A separator for group elements
66
+     * @var mixed
67
+     */
68 68
     var $_groupSeparator = null;
69 69
 
70
-   /**
71
-    * The current element index inside a group
72
-    * @var integer
73
-    */
70
+    /**
71
+     * The current element index inside a group
72
+     * @var integer
73
+     */
74 74
     var $_groupElementIdx = 0;
75 75
 
76
-   /**
77
-    * Blocks to use for different elements
78
-    * @var array
79
-    */
76
+    /**
77
+     * Blocks to use for different elements
78
+     * @var array
79
+     */
80 80
     var $_elementBlocks = array();
81 81
 
82
-   /**
83
-    * Block to use for headers
84
-    * @var string
85
-    */
82
+    /**
83
+     * Block to use for headers
84
+     * @var string
85
+     */
86 86
     var $_headerBlock = null;
87
-   /**#@-*/
87
+    /**#@-*/
88 88
 
89 89
 
90
-   /**
91
-    * Constructor
92
-    *
93
-    * @param HTML_Template_ITX|HTML_Template_Sigma     Template object to use
94
-    */
90
+    /**
91
+     * Constructor
92
+     *
93
+     * @param HTML_Template_ITX|HTML_Template_Sigma     Template object to use
94
+     */
95 95
     function HTML_QuickForm_Renderer_ITDynamic(&$tpl)
96 96
     {
97 97
         $this->HTML_QuickForm_Renderer();
@@ -227,17 +227,17 @@  discard block
 block discarded – undo
227 227
     }
228 228
 
229 229
 
230
-   /**
231
-    * Returns the name of a block to use for element rendering
232
-    *
233
-    * If a name was not explicitly set via setElementBlock(), it tries
234
-    * the names '{prefix}_{element type}' and '{prefix}_{element}', where
235
-    * prefix is either 'qf' or the name of the current group's block
236
-    *
237
-    * @param HTML_QuickForm_element     form element being rendered
238
-    * @access private
239
-    * @return string    block name
240
-    */
230
+    /**
231
+     * Returns the name of a block to use for element rendering
232
+     *
233
+     * If a name was not explicitly set via setElementBlock(), it tries
234
+     * the names '{prefix}_{element type}' and '{prefix}_{element}', where
235
+     * prefix is either 'qf' or the name of the current group's block
236
+     *
237
+     * @param HTML_QuickForm_element     form element being rendered
238
+     * @access private
239
+     * @return string    block name
240
+     */
241 241
     function _matchBlock(&$element)
242 242
     {
243 243
         $name = $element->getName();
@@ -262,14 +262,14 @@  discard block
 block discarded – undo
262 262
     }
263 263
 
264 264
 
265
-   /**
266
-    * Sets the block to use for element rendering
267
-    *
268
-    * @param mixed      element name or array ('element name' => 'block name')
269
-    * @param string     block name if $elementName is not an array
270
-    * @access public
271
-    * @return void
272
-    */
265
+    /**
266
+     * Sets the block to use for element rendering
267
+     *
268
+     * @param mixed      element name or array ('element name' => 'block name')
269
+     * @param string     block name if $elementName is not an array
270
+     * @access public
271
+     * @return void
272
+     */
273 273
     function setElementBlock($elementName, $blockName = null)
274 274
     {
275 275
         if (is_array($elementName)) {
@@ -280,13 +280,13 @@  discard block
 block discarded – undo
280 280
     }
281 281
 
282 282
 
283
-   /**
284
-    * Sets the name of a block to use for header rendering
285
-    *
286
-    * @param string     block name
287
-    * @access public
288
-    * @return void
289
-    */
283
+    /**
284
+     * Sets the name of a block to use for header rendering
285
+     *
286
+     * @param string     block name
287
+     * @access public
288
+     * @return void
289
+     */
290 290
     function setHeaderBlock($blockName)
291 291
     {
292 292
         $this->_headerBlock = $blockName;
Please login to merge, or discard this patch.
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
95 95
     function HTML_QuickForm_Renderer_ITDynamic(&$tpl)
96 96
     {
97 97
         $this->HTML_QuickForm_Renderer();
98
-        $this->_tpl =& $tpl;
98
+        $this->_tpl = & $tpl;
99 99
         $this->_tpl->setCurrentBlock('qf_main_loop');
100 100
     }
101 101
 
@@ -141,14 +141,14 @@  discard block
 block discarded – undo
141 141
                 if (is_array($this->_groupSeparator)) {
142 142
                     $this->_tpl->setVariable('qf_separator', $this->_groupSeparator[($this->_groupElementIdx - 1) % count($this->_groupSeparator)]);
143 143
                 } else {
144
-                    $this->_tpl->setVariable('qf_separator', (string)$this->_groupSeparator);
144
+                    $this->_tpl->setVariable('qf_separator', (string) $this->_groupSeparator);
145 145
                 }
146 146
             }
147 147
             $this->_groupElementIdx++;
148 148
 
149
-        } elseif(!empty($error)) {
149
+        } elseif (!empty($error)) {
150 150
             // show the error message or keep it for later use
151
-            if ($this->_tpl->blockExists($blockName . '_error')) {
151
+            if ($this->_tpl->blockExists($blockName.'_error')) {
152 152
                 $this->_tpl->setVariable('qf_error', $error);
153 153
             } else {
154 154
                 $this->_errors[] = $error;
@@ -157,8 +157,8 @@  discard block
 block discarded – undo
157 157
         // show an '*' near the required element
158 158
         if ($required) {
159 159
             $this->_showRequired = true;
160
-            if ($this->_tpl->blockExists($blockName . '_required')) {
161
-                $this->_tpl->touchBlock($blockName . '_required');
160
+            if ($this->_tpl->blockExists($blockName.'_required')) {
161
+                $this->_tpl->touchBlock($blockName.'_required');
162 162
             }
163 163
         }
164 164
         // Prepare multiple labels
@@ -175,10 +175,10 @@  discard block
 block discarded – undo
175 175
         }
176 176
         // render extra labels, if any
177 177
         if (is_array($labels)) {
178
-            foreach($labels as $key => $label) {
179
-                $key = is_int($key)? $key + 2: $key;
180
-                if ($this->_tpl->blockExists($blockName . '_label_' . $key)) {
181
-                    $this->_tpl->setVariable('qf_label_' . $key, $label);
178
+            foreach ($labels as $key => $label) {
179
+                $key = is_int($key) ? $key + 2 : $key;
180
+                if ($this->_tpl->blockExists($blockName.'_label_'.$key)) {
181
+                    $this->_tpl->setVariable('qf_label_'.$key, $label);
182 182
                 }
183 183
             }
184 184
         }
@@ -197,19 +197,19 @@  discard block
 block discarded – undo
197 197
     function startGroup(&$group, $required, $error)
198 198
     {
199 199
         $blockName = $this->_matchBlock($group);
200
-        $this->_tpl->setCurrentBlock($blockName . '_loop');
200
+        $this->_tpl->setCurrentBlock($blockName.'_loop');
201 201
         $this->_groupElementIdx = 0;
202
-        $this->_groupSeparator  = is_null($group->_separator)? '&nbsp;': $group->_separator;
202
+        $this->_groupSeparator  = is_null($group->_separator) ? '&nbsp;' : $group->_separator;
203 203
         // show an '*' near the required element
204 204
         if ($required) {
205 205
             $this->_showRequired = true;
206
-            if ($this->_tpl->blockExists($blockName . '_required')) {
207
-                $this->_tpl->touchBlock($blockName . '_required');
206
+            if ($this->_tpl->blockExists($blockName.'_required')) {
207
+                $this->_tpl->touchBlock($blockName.'_required');
208 208
             }
209 209
         }
210 210
         // show the error message or keep it for later use
211 211
         if (!empty($error)) {
212
-            if ($this->_tpl->blockExists($blockName . '_error')) {
212
+            if ($this->_tpl->blockExists($blockName.'_error')) {
213 213
                 $this->_tpl->setVariable('qf_error', $error);
214 214
             } else {
215 215
                 $this->_errors[] = $error;
@@ -243,7 +243,7 @@  discard block
 block discarded – undo
243 243
         $name = $element->getName();
244 244
         $type = $element->getType();
245 245
         if (isset($this->_elementBlocks[$name]) && $this->_tpl->blockExists($this->_elementBlocks[$name])) {
246
-            if (('group' == $type) || ($this->_elementBlocks[$name] . '_loop' != $this->_tpl->currentBlock)) {
246
+            if (('group' == $type) || ($this->_elementBlocks[$name].'_loop' != $this->_tpl->currentBlock)) {
247 247
                 return $this->_elementBlocks[$name];
248 248
             }
249 249
         }
@@ -252,12 +252,12 @@  discard block
 block discarded – undo
252 252
         } else {
253 253
             $prefix = 'qf';
254 254
         }
255
-        if ($this->_tpl->blockExists($prefix . '_' . $type)) {
256
-            return $prefix . '_' . $type;
257
-        } elseif ($this->_tpl->blockExists($prefix . '_' . $name)) {
258
-            return $prefix . '_' . $name;
255
+        if ($this->_tpl->blockExists($prefix.'_'.$type)) {
256
+            return $prefix.'_'.$type;
257
+        } elseif ($this->_tpl->blockExists($prefix.'_'.$name)) {
258
+            return $prefix.'_'.$name;
259 259
         } else {
260
-            return $prefix . '_element';
260
+            return $prefix.'_element';
261 261
         }
262 262
     }
263 263
 
Please login to merge, or discard this patch.