@@ -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 | |
@@ -66,8 +69,9 @@ discard block |
||
66 | 69 | if ($this->_equalWidth) { |
67 | 70 | $count=$this->count(); |
68 | 71 | $this->addToProperty("class", Wide::getConstants()["W".$count]." fields"); |
69 | - } else |
|
70 | - $this->addToProperty("class", "fields"); |
|
72 | + } else { |
|
73 | + $this->addToProperty("class", "fields"); |
|
74 | + } |
|
71 | 75 | return parent::compile($js, $view); |
72 | 76 | } |
73 | 77 | |
@@ -108,8 +112,9 @@ discard block |
||
108 | 112 | $fields[]=$itemO; |
109 | 113 | } |
110 | 114 | $radios=new HtmlFormFields("fields-".$name, $fields); |
111 | - if (isset($label)) |
|
112 | - $radios->setLabel($label)->setProperty("for", $name); |
|
115 | + if (isset($label)) { |
|
116 | + $radios->setLabel($label)->setProperty("for", $name); |
|
117 | + } |
|
113 | 118 | return $radios; |
114 | 119 | } |
115 | 120 | |
@@ -124,8 +129,9 @@ discard block |
||
124 | 129 | $fields[]=$itemO; |
125 | 130 | } |
126 | 131 | $radios=new HtmlFormFields("fields-".$name, $fields); |
127 | - if (isset($label)) |
|
128 | - $radios->setLabel($label)->setProperty("for", $name); |
|
132 | + if (isset($label)) { |
|
133 | + $radios->setLabel($label)->setProperty("for", $name); |
|
134 | + } |
|
129 | 135 | return $radios; |
130 | 136 | } |
131 | 137 |
@@ -23,8 +23,9 @@ discard block |
||
23 | 23 | $this->widgetIdentifier=$identifier; |
24 | 24 | $this->values=[]; |
25 | 25 | $this->afterCompile=[]; |
26 | - if(isset($instance)) |
|
27 | - $this->setInstance($instance); |
|
26 | + if(isset($instance)) { |
|
27 | + $this->setInstance($instance); |
|
28 | + } |
|
28 | 29 | $this->setCaptions($captions); |
29 | 30 | $this->captionCallback=NULL; |
30 | 31 | $this->defaultValueFunction=function($name,$value){return $value;}; |
@@ -62,14 +63,16 @@ discard block |
||
62 | 63 | } |
63 | 64 | |
64 | 65 | public function getIdentifier($index=NULL){ |
65 | - if(!isset($index)) |
|
66 | - $index=self::$index; |
|
66 | + if(!isset($index)) { |
|
67 | + $index=self::$index; |
|
68 | + } |
|
67 | 69 | $value=$index; |
68 | 70 | if(isset($this->values["identifier"])){ |
69 | - if(\is_string($this->values["identifier"])) |
|
70 | - $value=JReflection::callMethod($this->instance, $this->values["identifier"], []); |
|
71 | - else |
|
72 | - $value=$this->values["identifier"]($index,$this->instance); |
|
71 | + if(\is_string($this->values["identifier"])) { |
|
72 | + $value=JReflection::callMethod($this->instance, $this->values["identifier"], []); |
|
73 | + } else { |
|
74 | + $value=$this->values["identifier"]($index,$this->instance); |
|
75 | + } |
|
73 | 76 | } |
74 | 77 | return $value; |
75 | 78 | } |
@@ -99,16 +102,16 @@ discard block |
||
99 | 102 | if($property instanceof \ReflectionProperty){ |
100 | 103 | $value=$this->_getPropertyValue($property, $index); |
101 | 104 | $propertyName=$property->getName(); |
102 | - }elseif(\is_callable($property)) |
|
103 | - $value=$property($this->instance); |
|
104 | - elseif(\is_array($property)){ |
|
105 | + } elseif(\is_callable($property)) { |
|
106 | + $value=$property($this->instance); |
|
107 | + } elseif(\is_array($property)){ |
|
105 | 108 | $values=\array_map(function($v) use ($index){return $this->_getValue($v, $index);}, $property); |
106 | 109 | $value=\implode("", $values); |
107 | - }elseif(\is_string($property)){ |
|
110 | + } elseif(\is_string($property)){ |
|
108 | 111 | $value=$property; |
109 | 112 | if(isset($this->instance->{$property})){ |
110 | 113 | $value=$this->instance->{$property}; |
111 | - }elseif(\method_exists($this->instance, $getter=JReflection::getterName($property))){ |
|
114 | + } elseif(\method_exists($this->instance, $getter=JReflection::getterName($property))){ |
|
112 | 115 | $value=JReflection::callMethod($this->instance, $getter, []); |
113 | 116 | } |
114 | 117 | } |
@@ -118,7 +121,7 @@ discard block |
||
118 | 121 | protected function _postGetValue($index,$propertyName,$value){ |
119 | 122 | if(isset($this->values[$index])){ |
120 | 123 | $value= $this->values[$index]($value,$this->instance,$index); |
121 | - }else{ |
|
124 | + } else{ |
|
122 | 125 | $value=$this->_getDefaultValue($propertyName,$value, $index); |
123 | 126 | } |
124 | 127 | if(isset($this->afterCompile[$index])){ |
@@ -139,10 +142,10 @@ discard block |
||
139 | 142 | if(isset($vb[$index])){ |
140 | 143 | if(\is_array($vb[$index])){ |
141 | 144 | $this->visibleProperties[$index][]=$field; |
142 | - }else{ |
|
145 | + } else{ |
|
143 | 146 | $this->visibleProperties[$index]=[$vb[$index],$field]; |
144 | 147 | } |
145 | - }else{ |
|
148 | + } else{ |
|
146 | 149 | return $this->insertField($index, $field); |
147 | 150 | } |
148 | 151 | return $this; |
@@ -169,9 +172,9 @@ discard block |
||
169 | 172 | $property=$this->getProperty($index); |
170 | 173 | if($property instanceof \ReflectionProperty){ |
171 | 174 | $result=$property->getName(); |
172 | - }elseif(\is_callable($property)){ |
|
175 | + } elseif(\is_callable($property)){ |
|
173 | 176 | $result=$this->visibleProperties[$index]; |
174 | - }else{ |
|
177 | + } else{ |
|
175 | 178 | $result=$property; |
176 | 179 | } |
177 | 180 | return $result; |
@@ -191,7 +194,7 @@ discard block |
||
191 | 194 | $this->reflect=new \ReflectionClass($instance); |
192 | 195 | if(\sizeof($this->visibleProperties)===0){ |
193 | 196 | $this->properties=$this->getDefaultProperties(); |
194 | - }else{ |
|
197 | + } else{ |
|
195 | 198 | foreach ($this->visibleProperties as $property){ |
196 | 199 | $this->setInstanceProperty($property); |
197 | 200 | } |
@@ -202,22 +205,23 @@ discard block |
||
202 | 205 | private function setInstanceProperty($property){ |
203 | 206 | if(\is_callable($property)){ |
204 | 207 | $this->properties[]=$property; |
205 | - }elseif(\is_string($property)){ |
|
208 | + } elseif(\is_string($property)){ |
|
206 | 209 | try{ |
207 | 210 | $this->_beforeAddProperty(\sizeof($this->properties), $property); |
208 | 211 | $rProperty=$this->reflect->getProperty($property); |
209 | 212 | $this->properties[]=$rProperty; |
210 | - }catch(\Exception $e){ |
|
213 | + } catch(\Exception $e){ |
|
211 | 214 | $this->_beforeAddProperty(\sizeof($this->properties), $property); |
212 | 215 | $this->properties[]=$property; |
213 | 216 | } |
214 | - }elseif(\is_int($property)){ |
|
217 | + } elseif(\is_int($property)){ |
|
215 | 218 | $props=$this->getDefaultProperties(); |
216 | - if(isset($props[$property])) |
|
217 | - $this->properties[]=$props[$property]; |
|
218 | - else |
|
219 | - $this->properties[]=$property; |
|
220 | - }else{ |
|
219 | + if(isset($props[$property])) { |
|
220 | + $this->properties[]=$props[$property]; |
|
221 | + } else { |
|
222 | + $this->properties[]=$property; |
|
223 | + } |
|
224 | + } else{ |
|
221 | 225 | $this->properties[]=$property; |
222 | 226 | } |
223 | 227 | } |
@@ -261,12 +265,13 @@ discard block |
||
261 | 265 | if(isset($this->captions[$index])){ |
262 | 266 | return $this->captions[$index]; |
263 | 267 | } |
264 | - if($this->properties[$index] instanceof \ReflectionProperty) |
|
265 | - return $this->properties[$index]->getName(); |
|
266 | - elseif(\is_callable($this->properties[$index])) |
|
267 | - return ""; |
|
268 | - else |
|
269 | - return $this->properties[$index]; |
|
268 | + if($this->properties[$index] instanceof \ReflectionProperty) { |
|
269 | + return $this->properties[$index]->getName(); |
|
270 | + } elseif(\is_callable($this->properties[$index])) { |
|
271 | + return ""; |
|
272 | + } else { |
|
273 | + return $this->properties[$index]; |
|
274 | + } |
|
270 | 275 | } |
271 | 276 | |
272 | 277 | public function getCaptions(){ |
@@ -277,7 +282,7 @@ discard block |
||
277 | 282 | for($i=$captionsSize;$i<$count;$i++){ |
278 | 283 | $captions[]=""; |
279 | 284 | } |
280 | - }else{ |
|
285 | + } else{ |
|
281 | 286 | $captions=[]; |
282 | 287 | $index=0; |
283 | 288 | while($index<$count){ |
@@ -292,8 +297,9 @@ discard block |
||
292 | 297 | } |
293 | 298 | |
294 | 299 | public function setCaption($index,$caption){ |
295 | - if(isset($this->captions)===false) |
|
296 | - $this->captions=[]; |
|
300 | + if(isset($this->captions)===false) { |
|
301 | + $this->captions=[]; |
|
302 | + } |
|
297 | 303 | $this->captions[$index]=$caption; |
298 | 304 | return $this; |
299 | 305 | } |
@@ -14,8 +14,9 @@ |
||
14 | 14 | } |
15 | 15 | |
16 | 16 | public function compile(JsUtils $js=null) { |
17 | - if ($js===null) |
|
18 | - return; |
|
17 | + if ($js===null) { |
|
18 | + return; |
|
19 | + } |
|
19 | 20 | $params="{}"; |
20 | 21 | $jsCallback=NULL; |
21 | 22 | $stopPropagation=true; |
@@ -62,15 +62,17 @@ discard block |
||
62 | 62 | */ |
63 | 63 | private function getFieldButton($caption,$visibleHover=true){ |
64 | 64 | $bt= new HtmlButton($this->cleanIdentifier($caption),$caption); |
65 | - if($visibleHover) |
|
66 | - $this->_visibleOver($bt); |
|
65 | + if($visibleHover) { |
|
66 | + $this->_visibleOver($bt); |
|
67 | + } |
|
67 | 68 | return $bt; |
68 | 69 | } |
69 | 70 | |
70 | 71 | private function getFieldButtons($buttons,$visibleHover=true){ |
71 | 72 | $bts=new HtmlButtonGroups("",$buttons); |
72 | - if($visibleHover) |
|
73 | - $this->_visibleOver($bts); |
|
73 | + if($visibleHover) { |
|
74 | + $this->_visibleOver($bts); |
|
75 | + } |
|
74 | 76 | return $bts; |
75 | 77 | } |
76 | 78 | |
@@ -87,8 +89,9 @@ discard block |
||
87 | 89 | return $this->_fieldAs(function($id,$name,$value,$caption) use ($url,$responseElement,$cssStyle,$index,$attributes){ |
88 | 90 | $button=new HtmlButton($id,$value,$cssStyle); |
89 | 91 | $button->postOnClick($url,"$(event.target).closest('tr').find(':input').serialize()",$responseElement,$attributes["ajax"]); |
90 | - if(!isset($attributes["visibleHover"]) || $attributes["visibleHover"]) |
|
91 | - $this->_visibleOver($button); |
|
92 | + if(!isset($attributes["visibleHover"]) || $attributes["visibleHover"]) { |
|
93 | + $this->_visibleOver($button); |
|
94 | + } |
|
92 | 95 | return $button; |
93 | 96 | }, $index,$attributes); |
94 | 97 | } |
@@ -159,8 +162,9 @@ discard block |
||
159 | 162 | private function getDefaultButton($icon,$class=null,$visibleHover=true){ |
160 | 163 | $bt=$this->getFieldButton("",$visibleHover); |
161 | 164 | $bt->asIcon($icon); |
162 | - if(isset($class)) |
|
163 | - $bt->addClass($class); |
|
165 | + if(isset($class)) { |
|
166 | + $bt->addClass($class); |
|
167 | + } |
|
164 | 168 | return $bt; |
165 | 169 | } |
166 | 170 |
@@ -58,10 +58,12 @@ discard block |
||
58 | 58 | $js->execOn("mouseover", "#".$this->identifier." tr", "$(event.target).closest('tr').find('.visibleover').css('visibility', 'visible');",["preventDefault"=>false,"stopPropagation"=>true]); |
59 | 59 | $js->execOn("mouseout", "#".$this->identifier." tr", "$(event.target).closest('tr').find('.visibleover').css('visibility', 'hidden');",["preventDefault"=>false,"stopPropagation"=>true]); |
60 | 60 | } |
61 | - if(\is_array($this->_deleteBehavior)) |
|
62 | - $this->_generateBehavior("delete",$this->_deleteBehavior, $js); |
|
63 | - if(\is_array($this->_editBehavior)) |
|
64 | - $this->_generateBehavior("edit",$this->_editBehavior,$js); |
|
61 | + if(\is_array($this->_deleteBehavior)) { |
|
62 | + $this->_generateBehavior("delete",$this->_deleteBehavior, $js); |
|
63 | + } |
|
64 | + if(\is_array($this->_editBehavior)) { |
|
65 | + $this->_generateBehavior("edit",$this->_editBehavior,$js); |
|
66 | + } |
|
65 | 67 | return parent::run($js); |
66 | 68 | } |
67 | 69 | |
@@ -94,8 +96,9 @@ discard block |
||
94 | 96 | $table->setRowCount(0, \sizeof($captions)); |
95 | 97 | $this->_generateHeader($table,$captions); |
96 | 98 | |
97 | - if(isset($this->_compileParts)) |
|
98 | - $table->setCompileParts($this->_compileParts); |
|
99 | + if(isset($this->_compileParts)) { |
|
100 | + $table->setCompileParts($this->_compileParts); |
|
101 | + } |
|
99 | 102 | |
100 | 103 | $this->_generateContent($table); |
101 | 104 | |
@@ -126,8 +129,9 @@ discard block |
||
126 | 129 | } |
127 | 130 | |
128 | 131 | protected function _applyStyleAttributes($table){ |
129 | - if(isset($this->_hiddenColumns)) |
|
130 | - $this->_hideColumns(); |
|
132 | + if(isset($this->_hiddenColumns)) { |
|
133 | + $this->_hideColumns(); |
|
134 | + } |
|
131 | 135 | if(isset($this->_colWidths)){ |
132 | 136 | foreach ($this->_colWidths as $colIndex=>$width){ |
133 | 137 | $table->setColWidth($colIndex,$width); |
@@ -180,8 +184,9 @@ discard block |
||
180 | 184 | $field=$ck->getField(); |
181 | 185 | $field->setProperty("value",$dataAjax); |
182 | 186 | $field->setProperty("name", "selection[]"); |
183 | - if(isset($checkedClass)) |
|
184 | - $field->setClass($checkedClass); |
|
187 | + if(isset($checkedClass)) { |
|
188 | + $field->setClass($checkedClass); |
|
189 | + } |
|
185 | 190 | \array_unshift($values, $ck); |
186 | 191 | } |
187 | 192 | $result=$table->newRow(); |
@@ -194,8 +199,9 @@ discard block |
||
194 | 199 | |
195 | 200 | protected function _generatePagination($table,$js=NULL){ |
196 | 201 | if(isset($this->_toolbar)){ |
197 | - if($this->_toolbarPosition==PositionInTable::FOOTER) |
|
198 | - $this->_toolbar->setFloated("left"); |
|
202 | + if($this->_toolbarPosition==PositionInTable::FOOTER) { |
|
203 | + $this->_toolbar->setFloated("left"); |
|
204 | + } |
|
199 | 205 | } |
200 | 206 | $footer=$table->getFooter(); |
201 | 207 | $footer->mergeCol(); |
@@ -214,8 +220,9 @@ discard block |
||
214 | 220 | |
215 | 221 | protected function _getFieldName($index){ |
216 | 222 | $fieldName=parent::_getFieldName($index); |
217 | - if(\is_object($fieldName)) |
|
218 | - $fieldName="field-".$index; |
|
223 | + if(\is_object($fieldName)) { |
|
224 | + $fieldName="field-".$index; |
|
225 | + } |
|
219 | 226 | return $fieldName."[]"; |
220 | 227 | } |
221 | 228 | |
@@ -255,7 +262,7 @@ discard block |
||
255 | 262 | $hasPart=$table->hasPart($part); |
256 | 263 | if($hasPart){ |
257 | 264 | $row=$table->getPart($part)->addRow(\sizeof($captions)); |
258 | - }else{ |
|
265 | + } else{ |
|
259 | 266 | $row=$table->getPart($part)->getRow(0); |
260 | 267 | } |
261 | 268 | $row->mergeCol(); |
@@ -286,7 +293,7 @@ discard block |
||
286 | 293 | $this->_urls["refresh"]=JArray::getValue($urls, "refresh",0); |
287 | 294 | $this->_urls["edit"]=JArray::getValue($urls, "edit",1); |
288 | 295 | $this->_urls["delete"]=JArray::getValue($urls, "delete",2); |
289 | - }else{ |
|
296 | + } else{ |
|
290 | 297 | $this->_urls=["refresh"=>$urls,"edit"=>$urls,"delete"=>$urls]; |
291 | 298 | } |
292 | 299 | return $this; |
@@ -369,8 +376,9 @@ discard block |
||
369 | 376 | |
370 | 377 | protected function getTargetSelector($op) { |
371 | 378 | $result=$this->_targetSelector; |
372 | - if(!isset($result[$op])) |
|
373 | - $result="#".$this->identifier; |
|
379 | + if(!isset($result[$op])) { |
|
380 | + $result="#".$this->identifier; |
|
381 | + } |
|
374 | 382 | return $result[$op]; |
375 | 383 | } |
376 | 384 | |
@@ -388,8 +396,9 @@ discard block |
||
388 | 396 | } |
389 | 397 | |
390 | 398 | public function getRefreshSelector() { |
391 | - if(isset($this->_refreshSelector)) |
|
392 | - return $this->_refreshSelector; |
|
399 | + if(isset($this->_refreshSelector)) { |
|
400 | + return $this->_refreshSelector; |
|
401 | + } |
|
393 | 402 | return "#".$this->identifier." tbody"; |
394 | 403 | } |
395 | 404 | |
@@ -408,8 +417,9 @@ discard block |
||
408 | 417 | */ |
409 | 418 | public function show($modelInstance){ |
410 | 419 | if(\is_array($modelInstance)){ |
411 | - if(isset($modelInstance[0]) && \is_array(array_values($modelInstance)[0])) |
|
412 | - $modelInstance=\json_decode(\json_encode($modelInstance), FALSE); |
|
420 | + if(isset($modelInstance[0]) && \is_array(array_values($modelInstance)[0])) { |
|
421 | + $modelInstance=\json_decode(\json_encode($modelInstance), FALSE); |
|
422 | + } |
|
413 | 423 | } |
414 | 424 | $this->_modelInstance=$modelInstance; |
415 | 425 | } |
@@ -449,8 +459,9 @@ discard block |
||
449 | 459 | } |
450 | 460 | |
451 | 461 | public function hideColumn($colIndex){ |
452 | - if(!\is_array($this->_hiddenColumns)) |
|
453 | - $this->_hiddenColumns=[]; |
|
462 | + if(!\is_array($this->_hiddenColumns)) { |
|
463 | + $this->_hiddenColumns=[]; |
|
464 | + } |
|
454 | 465 | $this->_hiddenColumns[]=$colIndex; |
455 | 466 | return $this; |
456 | 467 | } |
@@ -49,8 +49,9 @@ discard block |
||
49 | 49 | $retour.="$.ajax({".$this->implodeAjaxParameters($ajaxParameters)."}).done(function( data, textStatus, jqXHR ) {\n"; |
50 | 50 | $retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone,$ajaxTransition,$jsCallback)."});\n"; |
51 | 51 | $retour=$this->_addJsCondition($jsCondition,$retour); |
52 | - if ($immediatly) |
|
53 | - $this->jquery_code_for_compile[]=$retour; |
|
52 | + if ($immediatly) { |
|
53 | + $this->jquery_code_for_compile[]=$retour; |
|
54 | + } |
|
54 | 55 | return $retour; |
55 | 56 | } |
56 | 57 | |
@@ -86,12 +87,13 @@ discard block |
||
86 | 87 | if(JString::isNotNull($attr)){ |
87 | 88 | if ($attr==="value"){ |
88 | 89 | $retour.="url=url+'".$slash."'+$(this).val();\n"; |
89 | - }elseif ($attr==="html"){ |
|
90 | + } elseif ($attr==="html"){ |
|
90 | 91 | $retour.="url=url+'".$slash."'+$(this).html();\n"; |
91 | - }elseif(\substr($attr, 0,3)==="js:"){ |
|
92 | + } elseif(\substr($attr, 0,3)==="js:"){ |
|
92 | 93 | $retour.="url=url+'".$slash."'+".\substr($attr, 3).";\n"; |
93 | - }elseif($attr!==null && $attr!=="") |
|
94 | - $retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n"; |
|
94 | + } elseif($attr!==null && $attr!=="") { |
|
95 | + $retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n"; |
|
96 | + } |
|
95 | 97 | } |
96 | 98 | return $retour; |
97 | 99 | } |
@@ -101,13 +103,14 @@ discard block |
||
101 | 103 | if ($responseElement!=="") { |
102 | 104 | if(isset($ajaxTransition)){ |
103 | 105 | $call=$this->setAjaxDataCall($ajaxTransition); |
104 | - }elseif(isset($this->ajaxTransition)){ |
|
106 | + } elseif(isset($this->ajaxTransition)){ |
|
105 | 107 | $call=$this->ajaxTransition; |
106 | 108 | } |
107 | - if(\is_callable($call)) |
|
108 | - $retour="\t".$call($responseElement,$jqueryDone).";\n"; |
|
109 | - else |
|
110 | - $retour="\t$({$responseElement}).{$jqueryDone}( data );\n"; |
|
109 | + if(\is_callable($call)) { |
|
110 | + $retour="\t".$call($responseElement,$jqueryDone).";\n"; |
|
111 | + } else { |
|
112 | + $retour="\t$({$responseElement}).{$jqueryDone}( data );\n"; |
|
113 | + } |
|
111 | 114 | } |
112 | 115 | $retour.="\t".$jsCallback."\n"; |
113 | 116 | return $retour; |
@@ -121,8 +124,9 @@ discard block |
||
121 | 124 | } |
122 | 125 | |
123 | 126 | protected function _correctAjaxUrl($url) { |
124 | - if ($url!=="/" && JString::endsWith($url, "/")===true) |
|
125 | - $url=substr($url, 0, strlen($url)-1); |
|
127 | + if ($url!=="/" && JString::endsWith($url, "/")===true) { |
|
128 | + $url=substr($url, 0, strlen($url)-1); |
|
129 | + } |
|
126 | 130 | if (strncmp($url, 'http://', 7)!=0&&strncmp($url, 'https://', 8)!=0) { |
127 | 131 | $url=$this->getUrl($url); |
128 | 132 | } |
@@ -142,8 +146,9 @@ discard block |
||
142 | 146 | public static function _implodeParams($parameters){ |
143 | 147 | $allParameters=[]; |
144 | 148 | foreach ($parameters as $params){ |
145 | - if(isset($params)) |
|
146 | - $allParameters[]=self::_correctParams($params); |
|
149 | + if(isset($params)) { |
|
150 | + $allParameters[]=self::_correctParams($params); |
|
151 | + } |
|
147 | 152 | } |
148 | 153 | return \implode("+'&'+", $allParameters); |
149 | 154 | } |
@@ -172,8 +177,9 @@ discard block |
||
172 | 177 | |
173 | 178 | protected function setDefaultParameters(&$parameters,$default){ |
174 | 179 | foreach ($default as $k=>$v){ |
175 | - if(!isset($parameters[$k])) |
|
176 | - $parameters[$k]=$v; |
|
180 | + if(!isset($parameters[$k])) { |
|
181 | + $parameters[$k]=$v; |
|
182 | + } |
|
177 | 183 | } |
178 | 184 | } |
179 | 185 | |
@@ -244,8 +250,9 @@ discard block |
||
244 | 250 | $retour.="\t".$jsCallback."\n". |
245 | 251 | "\t$(document).trigger('jsonReady',[data]);\n". |
246 | 252 | "});\n"; |
247 | - if ($immediatly) |
|
248 | - $this->jquery_code_for_compile[]=$retour; |
|
253 | + if ($immediatly) { |
|
254 | + $this->jquery_code_for_compile[]=$retour; |
|
255 | + } |
|
249 | 256 | return $retour; |
250 | 257 | } |
251 | 258 | |
@@ -310,7 +317,7 @@ discard block |
||
310 | 317 | if($context===null){ |
311 | 318 | $parent="$('".$maskSelector."').parent()"; |
312 | 319 | $newElm = "$('#'+newId)"; |
313 | - }else{ |
|
320 | + } else{ |
|
314 | 321 | $parent=$context; |
315 | 322 | $newElm = $context.".find('#'+newId)"; |
316 | 323 | } |
@@ -323,8 +330,9 @@ discard block |
||
323 | 330 | $retour.="\t}\n"."\tfor(var key in value){\n"."\t\t\tvar html = $('<div />').append($(newElm).clone()).html();\n"."\t\t\tif(html.indexOf('__'+key+'__')>-1){\n"."\t\t\t\tcontent=$(html.split('__'+key+'__').join(value[key]));\n"."\t\t\t\t$(newElm).replaceWith(content);newElm=content;\n"."\t\t\t}\n"."\t\tvar sel='[data-id=\"'+key+'\"]';if($(sel,newElm).length){\n"."\t\t\tvar selElm=$(sel,newElm);\n"."\t\t\t if(selElm.is('[value]')) { selElm.attr('value',value[key]);selElm.val(value[key]);} else { selElm.html(value[key]); }\n"."\t\t}\n"."}\n"."\t$(newElm).show(true);"."\n"."\t$(newElm).removeClass('hide');"."});\n"; |
324 | 331 | $retour.="\t$(document).trigger('jsonReady',[data]);\n"; |
325 | 332 | $retour.="\t".$jsCallback."\n"."});\n"; |
326 | - if ($immediatly) |
|
327 | - $this->jquery_code_for_compile[]=$retour; |
|
333 | + if ($immediatly) { |
|
334 | + $this->jquery_code_for_compile[]=$retour; |
|
335 | + } |
|
328 | 336 | return $retour; |
329 | 337 | } |
330 | 338 | |
@@ -513,8 +521,9 @@ discard block |
||
513 | 521 | $this->addLoading($retour, $responseElement); |
514 | 522 | } |
515 | 523 | $strHeaders=""; |
516 | - if(isset($headers)) |
|
517 | - $strHeaders=", 'headers: '".self::_correctParams($headers); |
|
524 | + if(isset($headers)) { |
|
525 | + $strHeaders=", 'headers: '".self::_correctParams($headers); |
|
526 | + } |
|
518 | 527 | $retour.="$.ajax({'url':url,'data':params,'method':'POST'".$strHeaders."}).done(function( data ) {\n"; |
519 | 528 | $retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone,$ajaxTransition,$jsCallback)."});\n"; |
520 | 529 | |
@@ -525,8 +534,9 @@ discard block |
||
525 | 534 | $retour.="$('#".$form."').submit();\n"; |
526 | 535 | } |
527 | 536 | $retour=$this->_addJsCondition($jsCondition, $retour); |
528 | - if ($immediatly) |
|
529 | - $this->jquery_code_for_compile[]=$retour; |
|
537 | + if ($immediatly) { |
|
538 | + $this->jquery_code_for_compile[]=$retour; |
|
539 | + } |
|
530 | 540 | return $retour; |
531 | 541 | } |
532 | 542 |
@@ -110,15 +110,18 @@ discard block |
||
110 | 110 | $flag=false; |
111 | 111 | $index=0; |
112 | 112 | while ( !$flag && $index < sizeof($elements) ) { |
113 | - if ($elements[$index] instanceof BaseHtml) |
|
114 | - $flag=($callback($elements[$index])); |
|
113 | + if ($elements[$index] instanceof BaseHtml) { |
|
114 | + $flag=($callback($elements[$index])); |
|
115 | + } |
|
115 | 116 | $index++; |
116 | 117 | } |
117 | - if ($flag === true) |
|
118 | - return $elements[$index - 1]; |
|
118 | + if ($flag === true) { |
|
119 | + return $elements[$index - 1]; |
|
120 | + } |
|
119 | 121 | } elseif ($elements instanceof BaseHtml) { |
120 | - if ($callback($elements)) |
|
121 | - return $elements; |
|
122 | + if ($callback($elements)) { |
|
123 | + return $elements; |
|
124 | + } |
|
122 | 125 | } |
123 | 126 | return null; |
124 | 127 | } |
@@ -144,8 +147,9 @@ discard block |
||
144 | 147 | |
145 | 148 | public function fromArray($array) { |
146 | 149 | foreach ( $this as $key => $value ) { |
147 | - if(array_key_exists($key, $array)===true) |
|
148 | - $this->_callSetter("set" . ucfirst($key), $key, $array[$key], $array); |
|
150 | + if(array_key_exists($key, $array)===true) { |
|
151 | + $this->_callSetter("set" . ucfirst($key), $key, $array[$key], $array); |
|
152 | + } |
|
149 | 153 | } |
150 | 154 | foreach ( $array as $key => $value ) { |
151 | 155 | if($this->_callSetter($key, $key, $value, $array)===false){ |
@@ -215,10 +219,11 @@ discard block |
||
215 | 219 | if (\is_array($value)) { |
216 | 220 | $v=PropertyWrapper::wrap($value, $js); |
217 | 221 | } else { |
218 | - if($value instanceof \stdClass) |
|
219 | - $v=\print_r($value,true); |
|
220 | - else |
|
221 | - $v=$value; |
|
222 | + if($value instanceof \stdClass) { |
|
223 | + $v=\print_r($value,true); |
|
224 | + } else { |
|
225 | + $v=$value; |
|
226 | + } |
|
222 | 227 | } |
223 | 228 | $result=str_ireplace("%" . $key . "%", $v, $result); |
224 | 229 | } |