@@ -17,7 +17,7 @@ discard block |
||
| 17 | 17 | $icon=@$content[0]; |
| 18 | 18 | $title=@$content[1]; |
| 19 | 19 | $desc=@$content[2]; |
| 20 | - }else{ |
|
| 20 | + } else{ |
|
| 21 | 21 | $icon=@$content["icon"]; |
| 22 | 22 | $image=@$content["image"]; |
| 23 | 23 | $title=@$content["title"]; |
@@ -33,20 +33,21 @@ discard block |
||
| 33 | 33 | } |
| 34 | 34 | if(isset($title)){ |
| 35 | 35 | $this->setTitle($title,$desc); |
| 36 | - }elseif (isset($header)){ |
|
| 36 | + } elseif (isset($header)){ |
|
| 37 | 37 | $this->setTitle($header,$desc,"header"); |
| 38 | 38 | } |
| 39 | 39 | if(isset($items)){ |
| 40 | 40 | $this->addList($items); |
| 41 | 41 | } |
| 42 | - }else{ |
|
| 42 | + } else{ |
|
| 43 | 43 | $this->setContent($content); |
| 44 | 44 | } |
| 45 | 45 | } |
| 46 | 46 | public function addList($items=array(),$ordered=false) { |
| 47 | 47 | $list=new HtmlList("", $items); |
| 48 | - if($ordered) |
|
| 49 | - $list->setOrdered(); |
|
| 48 | + if($ordered) { |
|
| 49 | + $list->setOrdered(); |
|
| 50 | + } |
|
| 50 | 51 | $list->setClass("list"); |
| 51 | 52 | $this->content["list"]=$list; |
| 52 | 53 | return $list; |
@@ -50,8 +50,9 @@ discard block |
||
| 50 | 50 | |
| 51 | 51 | protected function getItemToAdd($item){ |
| 52 | 52 | $itemO=parent::getItemToAdd($item); |
| 53 | - if($itemO instanceof AbstractCheckbox) |
|
| 54 | - $itemO->addClass("item"); |
|
| 53 | + if($itemO instanceof AbstractCheckbox) { |
|
| 54 | + $itemO->addClass("item"); |
|
| 55 | + } |
|
| 55 | 56 | return $itemO; |
| 56 | 57 | } |
| 57 | 58 | |
@@ -106,14 +107,15 @@ discard block |
||
| 106 | 107 | if (isset($masterItem)) { |
| 107 | 108 | if(\is_array($masterItem)){ |
| 108 | 109 | $masterO=new HtmlFormCheckbox("master-" . $identifier, @$masterItem[0],@$masterItem[1]); |
| 109 | - if(isset($name)) |
|
| 110 | - $masterO->setName($name); |
|
| 110 | + if(isset($name)) { |
|
| 111 | + $masterO->setName($name); |
|
| 112 | + } |
|
| 111 | 113 | if(isset($masterItem[1])){ |
| 112 | 114 | if(\array_search($masterItem[1], $values)!==false){ |
| 113 | 115 | $masterO->getDataField()->setProperty("checked", ""); |
| 114 | 116 | } |
| 115 | 117 | } |
| 116 | - }else{ |
|
| 118 | + } else{ |
|
| 117 | 119 | $masterO=new HtmlFormCheckbox("master-" . $identifier, $masterItem); |
| 118 | 120 | } |
| 119 | 121 | if($notAllChecked){ |
@@ -130,8 +132,9 @@ discard block |
||
| 130 | 132 | if (\array_search($val, $values) !== false) { |
| 131 | 133 | $itemO->getDataField()->setProperty("checked", ""); |
| 132 | 134 | } |
| 133 | - if(isset($name)) |
|
| 134 | - $itemO->setName($name); |
|
| 135 | + if(isset($name)) { |
|
| 136 | + $itemO->setName($name); |
|
| 137 | + } |
|
| 135 | 138 | $itemO->setClass("item"); |
| 136 | 139 | $fields[]=$itemO; |
| 137 | 140 | } |
@@ -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 | } |