@@ -26,8 +26,9 @@ discard block |
||
26 | 26 | */ |
27 | 27 | public function __construct($identifier, $tagName="tbody", $rowCount=NULL, $colCount=NULL) { |
28 | 28 | parent::__construct($identifier, $tagName, ""); |
29 | - if (isset($rowCount) && isset($colCount)) |
|
30 | - $this->setRowCount($rowCount, $colCount); |
|
29 | + if (isset($rowCount) && isset($colCount)) { |
|
30 | + $this->setRowCount($rowCount, $colCount); |
|
31 | + } |
|
31 | 32 | } |
32 | 33 | |
33 | 34 | /** |
@@ -112,7 +113,7 @@ discard block |
||
112 | 113 | $row=$this->getItem($row); |
113 | 114 | if (isset($row) && $row instanceof HtmlCollection) { |
114 | 115 | $col=$row->getItem($col); |
115 | - }else{ |
|
116 | + } else{ |
|
116 | 117 | $col=$row; |
117 | 118 | } |
118 | 119 | return $col; |
@@ -170,8 +171,9 @@ discard block |
||
170 | 171 | $values=\array_fill(0, $count, $values); |
171 | 172 | $isArray=false; |
172 | 173 | } |
173 | - if (JArray::dimension($values) == 1 && $isArray) |
|
174 | - $values=[ $values ]; |
|
174 | + if (JArray::dimension($values) == 1 && $isArray) { |
|
175 | + $values=[ $values ]; |
|
176 | + } |
|
175 | 177 | |
176 | 178 | $count=\min(\sizeof($values), $count); |
177 | 179 | |
@@ -198,8 +200,9 @@ discard block |
||
198 | 200 | $count=$this->count(); |
199 | 201 | for($i=0; $i < $count; $i++) { |
200 | 202 | $cell=$this->getCell($i, $colIndex); |
201 | - if($cell instanceof BaseTrait) |
|
202 | - $cell->addVariations($variations); |
|
203 | + if($cell instanceof BaseTrait) { |
|
204 | + $cell->addVariations($variations); |
|
205 | + } |
|
203 | 206 | } |
204 | 207 | return $this; |
205 | 208 | } |
@@ -208,8 +211,9 @@ discard block |
||
208 | 211 | $count=$this->count(); |
209 | 212 | for($i=0; $i < $count; $i++) { |
210 | 213 | $cell=$this->getCell($i, $colIndex); |
211 | - if(isset($cell)) |
|
212 | - $cell->addToProperty($name,$value); |
|
214 | + if(isset($cell)) { |
|
215 | + $cell->addToProperty($name,$value); |
|
216 | + } |
|
213 | 217 | } |
214 | 218 | return $this; |
215 | 219 | } |
@@ -227,8 +231,9 @@ discard block |
||
227 | 231 | $count=$this->count(); |
228 | 232 | for($i=0; $i < $count; $i++) { |
229 | 233 | $index=$this->content[$i]->getColPosition($colIndex); |
230 | - if ($index !== NULL) |
|
231 | - $this->getCell($i, $index)->$function(); |
|
234 | + if ($index !== NULL) { |
|
235 | + $this->getCell($i, $index)->$function(); |
|
236 | + } |
|
232 | 237 | } |
233 | 238 | return $this; |
234 | 239 | } |
@@ -239,8 +244,9 @@ discard block |
||
239 | 244 | $maxRow=$this->content[$i]->count(); |
240 | 245 | $index=$maxRow-$colIndex-1; |
241 | 246 | if (($cell=$this->getCell($i, $index))!== NULL){ |
242 | - if($cell->getColspan()==1) |
|
243 | - $cell->$function(); |
|
247 | + if($cell->getColspan()==1) { |
|
248 | + $cell->$function(); |
|
249 | + } |
|
244 | 250 | } |
245 | 251 | } |
246 | 252 | return $this; |
@@ -284,8 +290,9 @@ discard block |
||
284 | 290 | */ |
285 | 291 | public function getColCount() { |
286 | 292 | $result=0; |
287 | - if ($this->count() > 0) |
|
288 | - $result=$this->getItem(0)->count(); |
|
293 | + if ($this->count() > 0) { |
|
294 | + $result=$this->getItem(0)->count(); |
|
295 | + } |
|
289 | 296 | return $result; |
290 | 297 | } |
291 | 298 | |
@@ -309,8 +316,9 @@ discard block |
||
309 | 316 | |
310 | 317 | public function toDelete($rowIndex, $colIndex){ |
311 | 318 | $row=$this->getItem($rowIndex); |
312 | - if (isset($row) === true) |
|
313 | - $row->toDelete($colIndex); |
|
319 | + if (isset($row) === true) { |
|
320 | + $row->toDelete($colIndex); |
|
321 | + } |
|
314 | 322 | return $this; |
315 | 323 | } |
316 | 324 | |
@@ -408,8 +416,9 @@ discard block |
||
408 | 416 | foreach ( $rows as $row ) { |
409 | 417 | $cell=$row->getItem($colIndex); |
410 | 418 | $value=$cell->getContent(); |
411 | - if($functionExists) |
|
412 | - $value=\call_user_func($function,$value); |
|
419 | + if($functionExists) { |
|
420 | + $value=\call_user_func($function,$value); |
|
421 | + } |
|
413 | 422 | if($value!==$identiqual){ |
414 | 423 | if($counter>0 && isset($cellToMerge)){ |
415 | 424 | $cellToMerge->setRowspan($counter); |
@@ -25,8 +25,9 @@ discard block |
||
25 | 25 | $this->widgetIdentifier=$identifier; |
26 | 26 | $this->values=[]; |
27 | 27 | $this->afterCompile=[]; |
28 | - if(isset($instance)) |
|
29 | - $this->setInstance($instance); |
|
28 | + if(isset($instance)) { |
|
29 | + $this->setInstance($instance); |
|
30 | + } |
|
30 | 31 | $this->setCaptions($captions); |
31 | 32 | $this->captionCallback=NULL; |
32 | 33 | $this->defaultValueFunction=function($name,$value){return $value;}; |
@@ -62,7 +63,7 @@ discard block |
||
62 | 63 | while($index<$count){ |
63 | 64 | $values[]=$this->getValue($index++); |
64 | 65 | } |
65 | - }else{ |
|
66 | + } else{ |
|
66 | 67 | while($index<$count){ |
67 | 68 | if(array_search($index, $this->groupByFields)===false){ |
68 | 69 | $values[]=$this->getValue($index); |
@@ -74,14 +75,16 @@ discard block |
||
74 | 75 | } |
75 | 76 | |
76 | 77 | public function getIdentifier($index=NULL){ |
77 | - if(!isset($index)) |
|
78 | - $index=self::$index; |
|
78 | + if(!isset($index)) { |
|
79 | + $index=self::$index; |
|
80 | + } |
|
79 | 81 | $value=$index; |
80 | 82 | if(isset($this->values["identifier"])){ |
81 | - if(\is_string($this->values["identifier"])) |
|
82 | - $value=JReflection::callMethod($this->instance, $this->values["identifier"], []); |
|
83 | - else |
|
84 | - $value=$this->values["identifier"]($index,$this->instance); |
|
83 | + if(\is_string($this->values["identifier"])) { |
|
84 | + $value=JReflection::callMethod($this->instance, $this->values["identifier"], []); |
|
85 | + } else { |
|
86 | + $value=$this->values["identifier"]($index,$this->instance); |
|
87 | + } |
|
85 | 88 | } |
86 | 89 | return $value; |
87 | 90 | } |
@@ -111,16 +114,16 @@ discard block |
||
111 | 114 | if($property instanceof \ReflectionProperty){ |
112 | 115 | $value=$this->_getPropertyValue($property); |
113 | 116 | $propertyName=$property->getName(); |
114 | - }elseif(\is_callable($property) && array_search($property, ["system"])===false) |
|
115 | - $value=$property($this->instance); |
|
116 | - elseif(\is_array($property)){ |
|
117 | + } elseif(\is_callable($property) && array_search($property, ["system"])===false) { |
|
118 | + $value=$property($this->instance); |
|
119 | + } elseif(\is_array($property)){ |
|
117 | 120 | $values=\array_map(function($v) use ($index){return $this->_getValue($v, $index);}, $property); |
118 | 121 | $value=\implode("", $values); |
119 | - }elseif(\is_string($property)){ |
|
122 | + } elseif(\is_string($property)){ |
|
120 | 123 | $value=$property; |
121 | 124 | if(isset($this->instance->{$property})){ |
122 | 125 | $value=$this->instance->{$property}; |
123 | - }elseif(\method_exists($this->instance, $getter=JReflection::getterName($property))){ |
|
126 | + } elseif(\method_exists($this->instance, $getter=JReflection::getterName($property))){ |
|
124 | 127 | $value=JReflection::callMethod($this->instance, $getter, []); |
125 | 128 | } |
126 | 129 | } |
@@ -130,7 +133,7 @@ discard block |
||
130 | 133 | protected function _postGetValue($index,$propertyName,$value){ |
131 | 134 | if(isset($this->values[$index])){ |
132 | 135 | $value= $this->values[$index]($value,$this->instance,$index,self::$index); |
133 | - }else{ |
|
136 | + } else{ |
|
134 | 137 | $value=$this->_getDefaultValue($propertyName,$value, $index); |
135 | 138 | } |
136 | 139 | if(isset($this->afterCompile[$index])){ |
@@ -144,7 +147,7 @@ discard block |
||
144 | 147 | public function insertField($index,$field,$key=null){ |
145 | 148 | if(isset($key)){ |
146 | 149 | array_splice( $this->visibleProperties, $index, 0, [$key=>$field] ); |
147 | - }else{ |
|
150 | + } else{ |
|
148 | 151 | array_splice( $this->visibleProperties, $index, 0, $field ); |
149 | 152 | } |
150 | 153 | return $this; |
@@ -165,17 +168,17 @@ discard block |
||
165 | 168 | if(isset($key)){ |
166 | 169 | if(\is_array($vb[$index])){ |
167 | 170 | $this->visibleProperties[$index][$key]=$field; |
168 | - }else{ |
|
171 | + } else{ |
|
169 | 172 | $this->visibleProperties[$index]=[$vb[$index],$key=>$field]; |
170 | 173 | } |
171 | - }else{ |
|
174 | + } else{ |
|
172 | 175 | if(\is_array($vb[$index])){ |
173 | 176 | $this->visibleProperties[$index][]=$field; |
174 | - }else{ |
|
177 | + } else{ |
|
175 | 178 | $this->visibleProperties[$index]=[$vb[$index],$field]; |
176 | 179 | } |
177 | 180 | } |
178 | - }else{ |
|
181 | + } else{ |
|
179 | 182 | return $this->insertField($index, $field); |
180 | 183 | } |
181 | 184 | return $this; |
@@ -184,7 +187,7 @@ discard block |
||
184 | 187 | public function addField($field,$key=null){ |
185 | 188 | if(isset($key)){ |
186 | 189 | $this->visibleProperties[]=[$key=>$field]; |
187 | - }else{ |
|
190 | + } else{ |
|
188 | 191 | $this->visibleProperties[]=$field; |
189 | 192 | } |
190 | 193 | return $this; |
@@ -211,9 +214,9 @@ discard block |
||
211 | 214 | $property=$this->getProperty($index); |
212 | 215 | if($property instanceof \ReflectionProperty){ |
213 | 216 | $result=$property->getName(); |
214 | - }elseif(\is_callable($property)){ |
|
217 | + } elseif(\is_callable($property)){ |
|
215 | 218 | $result=$this->visibleProperties[$index]; |
216 | - }else{ |
|
219 | + } else{ |
|
217 | 220 | $result=$property; |
218 | 221 | } |
219 | 222 | return $result; |
@@ -233,7 +236,7 @@ discard block |
||
233 | 236 | $this->reflect=new \ReflectionClass($instance); |
234 | 237 | if(JArray::count($this->visibleProperties)===0){ |
235 | 238 | $this->properties=$this->getDefaultProperties(); |
236 | - }else{ |
|
239 | + } else{ |
|
237 | 240 | foreach ($this->visibleProperties as $property){ |
238 | 241 | $this->setInstanceProperty($property); |
239 | 242 | } |
@@ -244,22 +247,23 @@ discard block |
||
244 | 247 | private function setInstanceProperty($property){ |
245 | 248 | if(\is_callable($property)){ |
246 | 249 | $this->properties[]=$property; |
247 | - }elseif(\is_string($property)){ |
|
250 | + } elseif(\is_string($property)){ |
|
248 | 251 | try{ |
249 | 252 | $this->_beforeAddProperty(\sizeof($this->properties), $property); |
250 | 253 | $rProperty=$this->reflect->getProperty($property); |
251 | 254 | $this->properties[]=$rProperty; |
252 | - }catch(\Exception $e){ |
|
255 | + } catch(\Exception $e){ |
|
253 | 256 | $this->_beforeAddProperty(\sizeof($this->properties), $property); |
254 | 257 | $this->properties[]=$property; |
255 | 258 | } |
256 | - }elseif(\is_int($property)){ |
|
259 | + } elseif(\is_int($property)){ |
|
257 | 260 | $props=$this->getDefaultProperties(); |
258 | - if(isset($props[$property])) |
|
259 | - $this->properties[]=$props[$property]; |
|
260 | - else |
|
261 | - $this->properties[]=$property; |
|
262 | - }else{ |
|
261 | + if(isset($props[$property])) { |
|
262 | + $this->properties[]=$props[$property]; |
|
263 | + } else { |
|
264 | + $this->properties[]=$property; |
|
265 | + } |
|
266 | + } else{ |
|
263 | 267 | $this->properties[]=$property; |
264 | 268 | } |
265 | 269 | } |
@@ -303,12 +307,13 @@ discard block |
||
303 | 307 | if(isset($this->captions[$index])){ |
304 | 308 | return $this->captions[$index]; |
305 | 309 | } |
306 | - if($this->properties[$index] instanceof \ReflectionProperty) |
|
307 | - return $this->properties[$index]->getName(); |
|
308 | - elseif(\is_callable($this->properties[$index])) |
|
309 | - return ""; |
|
310 | - else |
|
311 | - return $this->properties[$index]; |
|
310 | + if($this->properties[$index] instanceof \ReflectionProperty) { |
|
311 | + return $this->properties[$index]->getName(); |
|
312 | + } elseif(\is_callable($this->properties[$index])) { |
|
313 | + return ""; |
|
314 | + } else { |
|
315 | + return $this->properties[$index]; |
|
316 | + } |
|
312 | 317 | } |
313 | 318 | |
314 | 319 | public function getCaptions(){ |
@@ -323,7 +328,7 @@ discard block |
||
323 | 328 | $captions[]=""; |
324 | 329 | $moreAdded=true; |
325 | 330 | } |
326 | - }else{ |
|
331 | + } else{ |
|
327 | 332 | $captions=[]; |
328 | 333 | $index=0; |
329 | 334 | while($index<$count){ |
@@ -341,8 +346,9 @@ discard block |
||
341 | 346 | } |
342 | 347 | |
343 | 348 | public function setCaption($index,$caption){ |
344 | - if(isset($this->captions)===false) |
|
345 | - $this->captions=[]; |
|
349 | + if(isset($this->captions)===false) { |
|
350 | + $this->captions=[]; |
|
351 | + } |
|
346 | 352 | $this->captions[$index]=$caption; |
347 | 353 | return $this; |
348 | 354 | } |
@@ -62,9 +62,9 @@ discard block |
||
62 | 62 | } |
63 | 63 | |
64 | 64 | private function afterInsert($item) { |
65 | - if (!$item instanceof HtmlMenu && $item->propertyContains("class", "header")===false) |
|
66 | - $item->addToPropertyCtrl("class", "item", array ("item" )); |
|
67 | - else { |
|
65 | + if (!$item instanceof HtmlMenu && $item->propertyContains("class", "header")===false) { |
|
66 | + $item->addToPropertyCtrl("class", "item", array ("item" )); |
|
67 | + } else { |
|
68 | 68 | $this->setSecondary(); |
69 | 69 | } |
70 | 70 | return $item; |
@@ -79,8 +79,9 @@ discard block |
||
79 | 79 | public function addItem($item) { |
80 | 80 | $number=$item; |
81 | 81 | $item=parent::addItem($this->getItemToInsert($item)); |
82 | - if(\is_int($number)) |
|
83 | - $item->setProperty("data-page", $number); |
|
82 | + if(\is_int($number)) { |
|
83 | + $item->setProperty("data-page", $number); |
|
84 | + } |
|
84 | 85 | return $this->afterInsert($item); |
85 | 86 | } |
86 | 87 | |
@@ -149,10 +150,11 @@ discard block |
||
149 | 150 | } |
150 | 151 | |
151 | 152 | public function setSecondary($value=true) { |
152 | - if($value) |
|
153 | - $this->addToProperty("class", "secondary"); |
|
154 | - else |
|
155 | - $this->removePropertyValue("class", "secondary"); |
|
153 | + if($value) { |
|
154 | + $this->addToProperty("class", "secondary"); |
|
155 | + } else { |
|
156 | + $this->removePropertyValue("class", "secondary"); |
|
157 | + } |
|
156 | 158 | return $this; |
157 | 159 | } |
158 | 160 | |
@@ -172,8 +174,9 @@ discard block |
||
172 | 174 | $this->apply(function (HtmlDoubleElement &$item) { |
173 | 175 | $item->setTagName("a"); |
174 | 176 | }); |
175 | - if ($vertical === true) |
|
176 | - $this->setVertical(); |
|
177 | + if ($vertical === true) { |
|
178 | + $this->setVertical(); |
|
179 | + } |
|
177 | 180 | return $this->addToProperty("class", "tabular"); |
178 | 181 | } |
179 | 182 | |
@@ -202,10 +205,11 @@ discard block |
||
202 | 205 | */ |
203 | 206 | public function fromDatabaseObject($object, $function) { |
204 | 207 | $return=$function($object); |
205 | - if (\is_array($return)) |
|
206 | - $this->addItems($return); |
|
207 | - else |
|
208 | - $this->addItem($return); |
|
208 | + if (\is_array($return)) { |
|
209 | + $this->addItems($return); |
|
210 | + } else { |
|
211 | + $this->addItem($return); |
|
212 | + } |
|
209 | 213 | } |
210 | 214 | |
211 | 215 | /** |
@@ -238,8 +242,9 @@ discard block |
||
238 | 242 | } |
239 | 243 | |
240 | 244 | public function run(JsUtils $js){ |
241 | - if($this->identifier!=="" && !isset($this->_bsComponent)) |
|
242 | - $this->onClick('if(!$(this).hasClass("dropdown")&&!$(this).hasClass("no-active")){$(this).addClass("active").siblings().removeClass("active");}',false,false); |
|
245 | + if($this->identifier!=="" && !isset($this->_bsComponent)) { |
|
246 | + $this->onClick('if(!$(this).hasClass("dropdown")&&!$(this).hasClass("no-active")){$(this).addClass("active").siblings().removeClass("active");}',false,false); |
|
247 | + } |
|
243 | 248 | $result= parent::run($js); |
244 | 249 | return $result->setItemSelector(">.item"); |
245 | 250 | } |
@@ -29,12 +29,14 @@ discard block |
||
29 | 29 | if (\is_string($end)) { |
30 | 30 | $label=$end; |
31 | 31 | \array_pop($fields); |
32 | - } else |
|
33 | - $label=NULL; |
|
32 | + } else { |
|
33 | + $label=NULL; |
|
34 | + } |
|
34 | 35 | } |
35 | 36 | } |
36 | - if (isset($label)) |
|
37 | - $this->setLabel($label); |
|
37 | + if (isset($label)) { |
|
38 | + $this->setLabel($label); |
|
39 | + } |
|
38 | 40 | foreach ( $fields as $field ) { |
39 | 41 | $this->addItem($field); |
40 | 42 | } |
@@ -57,8 +59,9 @@ discard block |
||
57 | 59 | |
58 | 60 | public function addItem($item) { |
59 | 61 | $item=parent::addItem($item); |
60 | - if($item instanceof HtmlFormField) |
|
61 | - $item->setContainer($this); |
|
62 | + if($item instanceof HtmlFormField) { |
|
63 | + $item->setContainer($this); |
|
64 | + } |
|
62 | 65 | return $item; |
63 | 66 | } |
64 | 67 | |
@@ -73,8 +76,9 @@ discard block |
||
73 | 76 | if ($this->_equalWidth) { |
74 | 77 | $count=$this->count(); |
75 | 78 | $this->addToProperty("class", Wide::getConstants()["W".$count]." fields"); |
76 | - } else |
|
77 | - $this->addToProperty("class", "fields"); |
|
79 | + } else { |
|
80 | + $this->addToProperty("class", "fields"); |
|
81 | + } |
|
78 | 82 | return parent::compile($js, $view); |
79 | 83 | } |
80 | 84 | |
@@ -115,8 +119,9 @@ discard block |
||
115 | 119 | $fields[]=$itemO; |
116 | 120 | } |
117 | 121 | $radios=new HtmlFormFields($identifier, $fields); |
118 | - if (isset($label)) |
|
119 | - $radios->setLabel($label)->setProperty("for", $name); |
|
122 | + if (isset($label)) { |
|
123 | + $radios->setLabel($label)->setProperty("for", $name); |
|
124 | + } |
|
120 | 125 | return $radios; |
121 | 126 | } |
122 | 127 | |
@@ -132,8 +137,9 @@ discard block |
||
132 | 137 | $fields[]=$itemO; |
133 | 138 | } |
134 | 139 | $radios=new HtmlFormFields($identifier, $fields); |
135 | - if (isset($label)) |
|
136 | - $radios->setLabel($label)->setProperty("for", $name); |
|
140 | + if (isset($label)) { |
|
141 | + $radios->setLabel($label)->setProperty("for", $name); |
|
142 | + } |
|
137 | 143 | return $radios; |
138 | 144 | } |
139 | 145 |
@@ -32,15 +32,17 @@ discard block |
||
32 | 32 | |
33 | 33 | public function addContent($content,$before=false) { |
34 | 34 | if (!\is_array($this->content)) { |
35 | - if(isset($this->content)) |
|
36 | - $this->content=array ($this->content); |
|
37 | - else |
|
38 | - $this->content=array(); |
|
35 | + if(isset($this->content)) { |
|
36 | + $this->content=array ($this->content); |
|
37 | + } else { |
|
38 | + $this->content=array(); |
|
39 | + } |
|
40 | + } |
|
41 | + if($before) { |
|
42 | + array_unshift($this->content,$content); |
|
43 | + } else { |
|
44 | + $this->content []=$content; |
|
39 | 45 | } |
40 | - if($before) |
|
41 | - array_unshift($this->content,$content); |
|
42 | - else |
|
43 | - $this->content []=$content; |
|
44 | 46 | return $this; |
45 | 47 | } |
46 | 48 | |
@@ -78,9 +80,9 @@ discard block |
||
78 | 80 | $instances=[]; |
79 | 81 | if($content instanceof $class){ |
80 | 82 | $instances[]=$content; |
81 | - }elseif($content instanceof HtmlDoubleElement){ |
|
83 | + } elseif($content instanceof HtmlDoubleElement){ |
|
82 | 84 | $instances=\array_merge($instances,$content->getContentInstances($class)); |
83 | - }elseif (\is_array($content)){ |
|
85 | + } elseif (\is_array($content)){ |
|
84 | 86 | foreach ($content as $element){ |
85 | 87 | $instances=\array_merge($instances,$this->_getContentInstances($class, $element)); |
86 | 88 | } |
@@ -93,10 +95,12 @@ discard block |
||
93 | 95 | * @return HtmlDoubleElement |
94 | 96 | */ |
95 | 97 | public function asLink($href=NULL,$target=NULL) { |
96 | - if (isset($href)) |
|
97 | - $this->setProperty("href", $href); |
|
98 | - if(isset($target)) |
|
99 | - $this->setProperty("target", $target); |
|
98 | + if (isset($href)) { |
|
99 | + $this->setProperty("href", $href); |
|
100 | + } |
|
101 | + if(isset($target)) { |
|
102 | + $this->setProperty("target", $target); |
|
103 | + } |
|
100 | 104 | return $this->setTagName("a"); |
101 | 105 | } |
102 | 106 | |
@@ -121,7 +125,7 @@ discard block |
||
121 | 125 | $this->_editableContent=$frm; |
122 | 126 | $keypress=""; |
123 | 127 | $focusOut=""; |
124 | - }else{ |
|
128 | + } else{ |
|
125 | 129 | $focusOut="if(e.relatedTarget==null)elm.trigger('endEdit');"; |
126 | 130 | $this->_editableContent=$field; |
127 | 131 | $keypress="$('#".$idF."').keyup(function(e){if(e.which == 13) {\$('#".$idE."').trigger('validate',{value: $('#'+idF+' input').val()});}if(e.keyCode===27) {\$('#".$idE."').trigger('endEdit');}});"; |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | $this->_generateFields($form, [$v], $headers, $i, $wrappers,$nb++); |
65 | 65 | $i++; |
66 | 66 | } |
67 | - }else{ |
|
67 | + } else{ |
|
68 | 68 | $separators[]=$count; |
69 | 69 | for($i=0;$i<$size;$i++){ |
70 | 70 | $fields=\array_slice($values, $separators[$i]+1,$separators[$i+1]-$separators[$i]); |
@@ -78,17 +78,19 @@ discard block |
||
78 | 78 | |
79 | 79 | protected function _generateFields($form,$values,$headers,$sepFirst,$wrappers,$nb){ |
80 | 80 | $wrapper=null; |
81 | - if(isset($headers[$sepFirst+1])) |
|
82 | - $form->addHeader($headers[$sepFirst+1],4,true); |
|
81 | + if(isset($headers[$sepFirst+1])) { |
|
82 | + $form->addHeader($headers[$sepFirst+1],4,true); |
|
83 | + } |
|
83 | 84 | if(isset($wrappers[$sepFirst+1])){ |
84 | 85 | $wrapper=$wrappers[$sepFirst+1]; |
85 | 86 | } |
86 | 87 | if(\sizeof($values)===1){ |
87 | 88 | $added=$form->addField($values[0]); |
88 | - }elseif(\sizeof($values)>1){ |
|
89 | + } elseif(\sizeof($values)>1){ |
|
89 | 90 | $added=$form->addFields($values); |
90 | - }else |
|
91 | - return; |
|
91 | + } else { |
|
92 | + return; |
|
93 | + } |
|
92 | 94 | if(isset($wrapper)){ |
93 | 95 | $added->wrap($wrapper[0],$wrapper[1]); |
94 | 96 | } |
@@ -79,8 +79,9 @@ discard block |
||
79 | 79 | $actionO=$action; |
80 | 80 | if (\is_object($action) === false) { |
81 | 81 | $actionO=new HtmlButton("action-" . $this->identifier, $action); |
82 | - if (isset($icon)) |
|
83 | - $actionO->addIcon($icon, true, $labeled); |
|
82 | + if (isset($icon)) { |
|
83 | + $actionO->addIcon($icon, true, $labeled); |
|
84 | + } |
|
84 | 85 | } |
85 | 86 | $field->addToProperty("class", $direction . " action"); |
86 | 87 | $field->addContent($actionO, \strstr($direction, Direction::LEFT) !== false); |
@@ -120,8 +121,9 @@ discard block |
||
120 | 121 | |
121 | 122 | public function setDisabled($disable=true) { |
122 | 123 | $field=$this->getField(); |
123 | - if($disable) |
|
124 | - $field->addToProperty("class", "disabled"); |
|
124 | + if($disable) { |
|
125 | + $field->addToProperty("class", "disabled"); |
|
126 | + } |
|
125 | 127 | return $this; |
126 | 128 | } |
127 | 129 |
@@ -29,11 +29,12 @@ discard block |
||
29 | 29 | if(\is_array($value)){ |
30 | 30 | $itemO=new HtmlFormInput(JArray::getDefaultValue($value, "id",""),JArray::getDefaultValue($value, "label",null),JArray::getDefaultValue($value, "type", "text"),JArray::getDefaultValue($value, "value",""),JArray::getDefaultValue($value, "placeholder",JArray::getDefaultValue($value, "label",null))); |
31 | 31 | return $itemO; |
32 | - }elseif(\is_object($value)){ |
|
32 | + } elseif(\is_object($value)){ |
|
33 | 33 | $itemO=new HtmlFormField("field-".$this->identifier, $value); |
34 | 34 | return $itemO; |
35 | - }else |
|
36 | - return new HtmlFormInput($value); |
|
35 | + } else { |
|
36 | + return new HtmlFormInput($value); |
|
37 | + } |
|
37 | 38 | } |
38 | 39 | |
39 | 40 | protected function createCondition($value){ |
@@ -67,8 +68,7 @@ discard block |
||
67 | 68 | if(isset($c)){ |
68 | 69 | $df=$c->getDataField(); |
69 | 70 | $df->setProperty($property,$value); |
70 | - } |
|
71 | - else{ |
|
71 | + } else{ |
|
72 | 72 | return $this; |
73 | 73 | } |
74 | 74 | } |
@@ -163,10 +163,12 @@ discard block |
||
163 | 163 | public function addButtonIcon($identifier,$icon,$cssStyle=NULL,$onClick=NULL){ |
164 | 164 | $bt=new HtmlButton($identifier); |
165 | 165 | $bt->asIcon($icon); |
166 | - if(isset($onClick)) |
|
167 | - $bt->onClick($onClick); |
|
168 | - if (isset($cssStyle)) |
|
169 | - $bt->addClass($cssStyle); |
|
166 | + if(isset($onClick)) { |
|
167 | + $bt->onClick($onClick); |
|
168 | + } |
|
169 | + if (isset($cssStyle)) { |
|
170 | + $bt->addClass($cssStyle); |
|
171 | + } |
|
170 | 172 | return $this->addItem($bt); |
171 | 173 | } |
172 | 174 |
@@ -35,8 +35,9 @@ |
||
35 | 35 | */ |
36 | 36 | public function htmlMessage($identifier, $content="",$styles=NULL) { |
37 | 37 | $msg= $this->addHtmlComponent(new HtmlMessage($identifier, $content)); |
38 | - if(isset($msg) && $styles!==null) |
|
39 | - $msg->setStyle($styles); |
|
38 | + if(isset($msg) && $styles!==null) { |
|
39 | + $msg->setStyle($styles); |
|
40 | + } |
|
40 | 41 | return $msg; |
41 | 42 | } |
42 | 43 |