phpMv / phpMv-UI

Ajax/common/traits/JsUtilsAjaxTrait.php

Braces +32 added lines, -24 removed lines

@@ -29,8 +29,9 @@ 
 		}
 		$retour.="$.".$method."(url,".$params.").done(function( data ) {\n";
 		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone,$ajaxTransition,$jsCallback)."});\n";
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$retour;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$retour;
+		}
 			return $retour;
 	}
 
@@ -40,15 +41,17 @@ 
 		$url=$this->_correctAjaxUrl($url);
 		$retour="url='".$url."';";
 		$slash="/";
-		if(JString::endswith($url, "/")===true)
-			$slash="";
+		if(JString::endswith($url, "/")===true) {
+					$slash="";
+		}
 			if(JString::isNotNull($attr)){
-				if ($attr==="value")
-					$retour.="url=url+'".$slash."'+$(this).val();\n";
-				elseif ($attr==="html")
-					$retour.="url=url+'".$slash."'+$(this).html();\n";
-				elseif($attr!==null && $attr!=="")
-					$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
+				if ($attr==="value") {
+									$retour.="url=url+'".$slash."'+$(this).val();\n";
+				} elseif ($attr==="html") {
+									$retour.="url=url+'".$slash."'+$(this).html();\n";
+				} elseif($attr!==null && $attr!=="") {
+									$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
+				}
 			}
 			return $retour;
 	}
@@ -58,13 +61,14 @@ 
 		if ($responseElement!=="") {
 			if(isset($ajaxTransition)){
 				$call=$this->setAjaxDataCall($ajaxTransition);
-			}elseif(isset($this->ajaxTransition)){
+			} elseif(isset($this->ajaxTransition)){
 				$call=$this->ajaxTransition;
 			}
-			if(\is_callable($call))
-				$retour="\t".$call($responseElement,$jqueryDone).";\n";
-				else
-					$retour="\t$({$responseElement}).{$jqueryDone}( data );\n";
+			if(\is_callable($call)) {
+							$retour="\t".$call($responseElement,$jqueryDone).";\n";
+			} else {
+									$retour="\t$({$responseElement}).{$jqueryDone}( data );\n";
+				}
 		}
 		$retour.="\t".$jsCallback."\n";
 		return $retour;
@@ -78,8 +82,9 @@ 
 	}
 
 	protected function _correctAjaxUrl($url) {
-		if ($url!=="/" && JString::endsWith($url, "/")===true)
-			$url=substr($url, 0, strlen($url)-1);
+		if ($url!=="/" && JString::endsWith($url, "/")===true) {
+					$url=substr($url, 0, strlen($url)-1);
+		}
 			if (strncmp($url, 'http://', 7)!=0&&strncmp($url, 'https://', 8)!=0) {
 				$url=$this->getUrl($url);
 			}
@@ -159,8 +164,9 @@ 
 				$retour.="\t".$jsCallback."\n".
 						"\t$(document).trigger('jsonReady',[data]);\n".
 						"});\n";
-				if ($immediatly)
-					$this->jquery_code_for_compile[]=$retour;
+				if ($immediatly) {
+									$this->jquery_code_for_compile[]=$retour;
+				}
 		return $retour;
 	}
 
@@ -225,7 +231,7 @@ 
 		if($context===null){
 			$parent="$('".$maskSelector."').parent()";
 			$newElm = "$('#'+newId)";
-		}else{
+		} else{
 			$parent=$context;
 			$newElm = $context.".find('#'+newId)";
 		}
@@ -238,8 +244,9 @@ 
 		$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";
 		$retour.="\t$(document).trigger('jsonReady',[data]);\n";
 		$retour.="\t".$jsCallback."\n"."});\n";
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$retour;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$retour;
+		}
 		return $retour;
 	}
 
@@ -430,8 +437,9 @@ 
 			}});\n";
 			$retour.="$('#".$form."').submit();\n";
 		}
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$retour;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$retour;
+		}
 		return $retour;
 	}
 

Ajax/common/traits/JsUtilsActionsTrait.php

Braces +36 added lines, -24 removed lines

@@ -28,8 +28,9 @@ 
 			$callback=", function(){\n{$callback}\n}";
 		}
 		$str="$({$element}).{$action}({$speed}{$callback});";
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 			return $str;
 	}
 	/**
@@ -61,10 +62,12 @@ 
 		if (isset($param)) {
 			$param=Javascript::prep_value($param);
 			$str="$({$element}).{$jQueryCall}({$param});";
-		} else
-			$str="$({$element}).{$jQueryCall}();";
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		} else {
+					$str="$({$element}).{$jQueryCall}();";
+		}
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 		return $str;
 	}
 
@@ -80,8 +83,9 @@ 
 		$to=Javascript::prep_element($to);
 		$element=Javascript::prep_element($element);
 		$str="$({$to}).{$jQueryCall}({$element});";
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 		return $str;
 	}
 	/**
@@ -130,10 +134,12 @@ 
 		if (isset($value)) {
 			$value=Javascript::prep_value($value);
 			$str="$({$element}).attr(\"$attributeName\",{$value});";
-		} else
-			$str="$({$element}).attr(\"$attributeName\");";
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		} else {
+					$str="$({$element}).attr(\"$attributeName\");";
+		}
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 		return $str;
 	}
 
@@ -189,8 +195,9 @@ 
 
 		$str="$({$element}).animate({\n$animations\n\t\t}".$speed.$extra.");";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 		return $str;
 	}
 
@@ -340,8 +347,9 @@ 
 		$element=Javascript::prep_element($element);
 		$str="$({$element}).trigger(\"$event\");";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 		return $str;
 	}
 
@@ -403,8 +411,9 @@ 
 			$str.="else{".$jsCodeIfFalse."}";
 		}
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 		return $str;
 	}
 
@@ -420,11 +429,13 @@ 
 	private function _doJQuery($element, $jqueryCall, $param="", $jsCallback="", $immediatly=false) {
 		$param=Javascript::prep_value($param);
 		$callback="";
-		if ($jsCallback!="")
-			$callback=", function(event){\n{$jsCallback}\n}";
+		if ($jsCallback!="") {
+					$callback=", function(event){\n{$jsCallback}\n}";
+		}
 			$script="$(".Javascript::prep_element($element).").".$jqueryCall."(".$param.$callback.");\n";
-			if ($immediatly)
-				$this->jquery_code_for_compile[]=$script;
+			if ($immediatly) {
+							$this->jquery_code_for_compile[]=$script;
+			}
 				return $script;
 	}
 
@@ -495,8 +506,9 @@ 
 	 */
 	public function exec($js, $immediatly=false) {
 		$script=$js."\n";
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$script;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$script;
+		}
 		return $script;
 	}
 

Ajax/common/components/SimpleComponent.php

Braces +11 added lines, -8 removed lines

@@ -26,9 +26,9 @@ 
 			$itemSelector=JString::getValueBetween($event);
 			if($event=="execute"){
 				$this->jquery_code_for_compile []=$jsCode;
-			}else if($event=="beforeExecute"){
+			} else if($event=="beforeExecute"){
 				\array_unshift($this->jquery_code_for_compile, $jsCode);
-			}else{
+			} else{
 				$selector=$this->_createSelector($itemSelector, $this->attachTo);
 				$this->jquery_code_for_compile []="$( \"".$selector."\" ).on(\"".$event."\" , function( event, data ) {".$jsCode."});";
 			}
@@ -36,10 +36,12 @@ 
 	}
 
 	protected function _createSelector($itemSelector,$selector){
-		if(!isset($itemSelector))
-			$itemSelector=$this->itemSelector;
-		if(isset($itemSelector) && $itemSelector!=="")
-			$selector.=" ".$itemSelector;
+		if(!isset($itemSelector)) {
+					$itemSelector=$this->itemSelector;
+		}
+		if(isset($itemSelector) && $itemSelector!=="") {
+					$selector.=" ".$itemSelector;
+		}
 		return $selector;
 	}
 
@@ -82,8 +84,9 @@ 
 
 	protected function setParamCtrl($key, $value, $typeCtrl) {
 		if (\is_array($typeCtrl)) {
-			if (array_search($value, $typeCtrl)===false)
-				throw new \Exception("La valeur passée a propriété `".$key."` pour le composant `".$this->uiName."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}");
+			if (array_search($value, $typeCtrl)===false) {
+							throw new \Exception("La valeur passée a propriété `".$key."` pour le composant `".$this->uiName."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}");
+			}
 		} else {
 			if (!$typeCtrl($value)) {
 				throw new \Exception("La fonction ".$typeCtrl." a retourné faux pour l'affectation de la propriété ".$key." au composant ".$this->uiName);

Ajax/semantic/html/collections/form/HtmlFormInput.php

Braces +6 added lines, -4 removed lines

@@ -9,16 +9,18 @@
 	use TextFieldsTrait;
 
 	public function __construct($identifier, $label=NULL,$type="text",$value=NULL,$placeholder=NULL) {
-		if(!isset($placeholder) && $type==="text")
-			$placeholder=$label;
+		if(!isset($placeholder) && $type==="text") {
+					$placeholder=$label;
+		}
 		parent::__construct("field-".$identifier, new HtmlInput($identifier,$type,$value,$placeholder), $label);
 		$this->_identifier=$identifier;
 	}
 
 	public function getDataField(){
 		$field= $this->getField();
-		if($field instanceof HtmlInput)
-			$field=$field->getDataField();
+		if($field instanceof HtmlInput) {
+					$field=$field->getDataField();
+		}
 		return $field;
 	}
 }

Ajax/semantic/html/modules/HtmlSearch.php

Braces +6 added lines, -4 removed lines

@@ -22,10 +22,12 @@
 
 	private function createField($placeholder=NULL, $icon=NULL) {
 		$field=new HtmlInput($this->identifier);
-		if (isset($placeholder))
-			$field->setPlaceholder($placeholder);
-		if (isset($icon))
-			$field->addIcon($icon, Direction::RIGHT);
+		if (isset($placeholder)) {
+					$field->setPlaceholder($placeholder);
+		}
+		if (isset($icon)) {
+					$field->addIcon($icon, Direction::RIGHT);
+		}
 		$field->getDataField()->setClass("prompt");
 		$this->content["field"]=$field;
 		return $field;

Ajax/semantic/html/base/traits/BaseTrait.php

Braces +28 added lines, -20 removed lines

@@ -48,8 +48,9 @@ 
 
 	public function setVariations($variations) {
 		$this->_self->setProperty("class", $this->_self->getBaseClass());
-		if (\is_string($variations))
-			$variations=\explode(" ", $variations);
+		if (\is_string($variations)) {
+					$variations=\explode(" ", $variations);
+		}
 		foreach ( $variations as $variation ) {
 			$this->_self->addVariation($variation);
 		}
@@ -62,8 +63,9 @@ 
 	}
 
 	public function addVariations($variations=array()) {
-		if (\is_string($variations))
-			$variations=\explode(" ", $variations);
+		if (\is_string($variations)) {
+					$variations=\explode(" ", $variations);
+		}
 		foreach ( $variations as $variation ) {
 			$this->_self->addVariation($variation);
 		}
@@ -71,8 +73,9 @@ 
 	}
 
 	public function addStates($states=array()) {
-		if (\is_string($states))
-			$states=\explode(" ", $states);
+		if (\is_string($states)) {
+					$states=\explode(" ", $states);
+		}
 		foreach ( $states as $state ) {
 			$this->_self->addState($state);
 		}
@@ -81,8 +84,9 @@ 
 
 	public function setStates($states) {
 		$this->_self->setProperty("class", $this->_self->getBaseClass());
-		if (\is_string($states))
-			$states=\explode(" ", $states);
+		if (\is_string($states)) {
+					$states=\explode(" ", $states);
+		}
 		foreach ( $states as $state ) {
 			$this->_self->addState($state);
 		}
@@ -114,8 +118,9 @@ 
 	 * @return HtmlSemDoubleElement
 	 */
 	public function setDisabled($disable=true) {
-		if($disable)
-			$this->_self->addToProperty("class", "disabled");
+		if($disable) {
+					$this->_self->addToProperty("class", "disabled");
+		}
 		return $this;
 	}
 
@@ -149,14 +154,16 @@ 
 	 * @return HtmlSemDoubleElement
 	 */
 	public function setActive($value=true){
-		if($value)
-			$this->_self->addToProperty("class", "active");
+		if($value) {
+					$this->_self->addToProperty("class", "active");
+		}
 		return $this;
 	}
 
 	public function setAttached($value=true){
-		if($value)
-			$this->_self->addToPropertyCtrl("class", "attached", array ("attached" ));
+		if($value) {
+					$this->_self->addToPropertyCtrl("class", "attached", array ("attached" ));
+		}
 		return $this;
 	}
 
@@ -166,9 +173,9 @@ 
 	public function setInverted($recursive=true) {
 		if($recursive===true){
 			$content=$this->_self->getContent();
-			if($content instanceof HtmlSemDoubleElement)
-				$content->setInverted($recursive);
-			elseif(\is_array($content) || $content instanceof \Traversable){
+			if($content instanceof HtmlSemDoubleElement) {
+							$content->setInverted($recursive);
+			} elseif(\is_array($content) || $content instanceof \Traversable){
 				foreach ($content as $elm){
 					if($elm instanceof  HtmlSemDoubleElement){
 						$elm->setInverted($recursive);
@@ -204,9 +211,10 @@ 
 			if(isset($array[$key])){
 				$p=JString::replaceAtFirstAndLast($array[$key], $before, "", $after, "");
 				$array[$key]=$before.$p.$value.$after;
-			}else
-				$array[$key]=$before.$value.$after;
-		}else{
+			} else {
+							$array[$key]=$before.$value.$after;
+			}
+		} else{
 			$array[$key]=$value;
 		}
 		return $this;

Ajax/common/traits/JsUtilsInternalTrait.php

Braces +6 added lines, -3 removed lines

@@ -16,8 +16,9 @@ 
 	 */
 	protected function _compileLibrary(BaseGui $library=NULL, &$view=NULL){
 		if ($library!=NULL) {
-			if(isset($view))
-				$library->compileHtml($this, $view);
+			if(isset($view)) {
+							$library->compileHtml($this, $view);
+			}
 			if ($library->isAutoCompile()) {
 				$library->compile(true);
 			}
@@ -37,7 +38,9 @@ 
 	}
 
 	protected function minify($input) {
-		if(trim($input) === "") return $input;
+		if(trim($input) === "") {
+			return $input;
+		}
 		return preg_replace(
 				array(
 						// Remove comment(s)

Ajax/semantic/widgets/datatable/DataTable.php

Braces +35 added lines, -24 removed lines

@@ -58,10 +58,12 @@ 
 			$js->execOn("mouseover", "#".$this->identifier." tr", "$(event.target).closest('tr').find('.visibleover').css('visibility', 'visible');",["preventDefault"=>false,"stopPropagation"=>true]);
 			$js->execOn("mouseout", "#".$this->identifier." tr", "$(event.target).closest('tr').find('.visibleover').css('visibility', 'hidden');",["preventDefault"=>false,"stopPropagation"=>true]);
 		}
-		if(\is_array($this->_deleteBehavior))
-			$this->_generateBehavior("delete",$this->_deleteBehavior, $js);
-		if(\is_array($this->_editBehavior))
-			$this->_generateBehavior("edit",$this->_editBehavior,$js);
+		if(\is_array($this->_deleteBehavior)) {
+					$this->_generateBehavior("delete",$this->_deleteBehavior, $js);
+		}
+		if(\is_array($this->_editBehavior)) {
+					$this->_generateBehavior("edit",$this->_editBehavior,$js);
+		}
 		return parent::run($js);
 	}
 
@@ -94,8 +96,9 @@ 
 			$table->setRowCount(0, \sizeof($captions));
 			$this->_generateHeader($table,$captions);
 
-			if(isset($this->_compileParts))
-				$table->setCompileParts($this->_compileParts);
+			if(isset($this->_compileParts)) {
+							$table->setCompileParts($this->_compileParts);
+			}
 
 			$this->_generateContent($table);
 
@@ -126,8 +129,9 @@ 
 	}
 
 	protected function _applyStyleAttributes($table){
-		if(isset($this->_hiddenColumns))
-			$this->_hideColumns();
+		if(isset($this->_hiddenColumns)) {
+					$this->_hideColumns();
+		}
 			if(isset($this->_colWidths)){
 				foreach ($this->_colWidths as $colIndex=>$width){
 					$table->setColWidth($colIndex,$width);
@@ -178,8 +182,9 @@ 
 			$field=$ck->getField();
 			$field->setProperty("value",$id);
 			$field->setProperty("name", "selection[]");
-			if(isset($checkedClass))
-				$field->setClass($checkedClass);
+			if(isset($checkedClass)) {
+							$field->setClass($checkedClass);
+			}
 			\array_unshift($values, $ck);
 		}
 		$result=$table->newRow();
@@ -192,8 +197,9 @@ 
 
 	protected function _generatePagination($table,$js=NULL){
 		if(isset($this->_toolbar)){
-			if($this->_toolbarPosition==PositionInTable::FOOTER)
-				$this->_toolbar->setFloated("left");
+			if($this->_toolbarPosition==PositionInTable::FOOTER) {
+							$this->_toolbar->setFloated("left");
+			}
 		}
 		$footer=$table->getFooter();
 		$footer->mergeCol();
@@ -212,8 +218,9 @@ 
 
 	protected function _getFieldName($index){
 		$fieldName=parent::_getFieldName($index);
-		if(\is_object($fieldName))
-			$fieldName="field-".$index;
+		if(\is_object($fieldName)) {
+					$fieldName="field-".$index;
+		}
 		return $fieldName."[]";
 	}
 
@@ -253,7 +260,7 @@ 
 		$hasPart=$table->hasPart($part);
 		if($hasPart){
 			$row=$table->getPart($part)->addRow(\sizeof($captions));
-		}else{
+		} else{
 			$row=$table->getPart($part)->getRow(0);
 		}
 		$row->mergeCol();
@@ -283,7 +290,7 @@ 
 			$this->_urls["refresh"]=JArray::getValue($urls, "refresh",0);
 			$this->_urls["edit"]=JArray::getValue($urls, "edit",1);
 			$this->_urls["delete"]=JArray::getValue($urls, "delete",2);
-		}else{
+		} else{
 			$this->_urls=["refresh"=>$urls,"edit"=>$urls,"delete"=>$urls];
 		}
 		return $this;
@@ -357,8 +364,9 @@ 
 
 	protected function getTargetSelector($op) {
 		$result=$this->_targetSelector;
-		if(!isset($result[$op]))
-			$result="#".$this->identifier;
+		if(!isset($result[$op])) {
+					$result="#".$this->identifier;
+		}
 		return $result[$op];
 	}
 
@@ -376,8 +384,9 @@ 
 	}
 
 	public function getRefreshSelector() {
-		if(isset($this->_refreshSelector))
-			return $this->_refreshSelector;
+		if(isset($this->_refreshSelector)) {
+					return $this->_refreshSelector;
+		}
 		return "#".$this->identifier." tbody";
 	}
 
@@ -396,8 +405,9 @@ 
 	 */
 	public function show($modelInstance){
 		if(\is_array($modelInstance)){
-			if(isset($modelInstance[0]) && \is_array(array_values($modelInstance)[0]))
-				$modelInstance=\json_decode(\json_encode($modelInstance), FALSE);
+			if(isset($modelInstance[0]) && \is_array(array_values($modelInstance)[0])) {
+							$modelInstance=\json_decode(\json_encode($modelInstance), FALSE);
+			}
 		}
 		$this->_modelInstance=$modelInstance;
 	}
@@ -437,8 +447,9 @@ 
 	}
 
 	public function hideColumn($colIndex){
-		if(!\is_array($this->_hiddenColumns))
-			$this->_hiddenColumns=[];
+		if(!\is_array($this->_hiddenColumns)) {
+					$this->_hiddenColumns=[];
+		}
 		$this->_hiddenColumns[]=$colIndex;
 		return $this;
 	}

Ajax/semantic/widgets/base/InstanceViewer.php

Braces +41 added lines, -35 removed lines

@@ -23,8 +23,9 @@ 
 		$this->widgetIdentifier=$identifier;
 		$this->values=[];
 		$this->afterCompile=[];
-		if(isset($instance))
-			$this->setInstance($instance);
+		if(isset($instance)) {
+					$this->setInstance($instance);
+		}
 		$this->setCaptions($captions);
 		$this->captionCallback=NULL;
 		$this->defaultValueFunction=function($name,$value){return $value;};
@@ -62,14 +63,16 @@ 
 	}
 
 	public function getIdentifier($index=NULL){
-		if(!isset($index))
-			$index=self::$index;
+		if(!isset($index)) {
+					$index=self::$index;
+		}
 		$value=$index;
 		if(isset($this->values["identifier"])){
-			if(\is_string($this->values["identifier"]))
-				$value=JReflection::callMethod($this->instance, $this->values["identifier"], []);
-			else
-				$value=$this->values["identifier"]($index,$this->instance);
+			if(\is_string($this->values["identifier"])) {
+							$value=JReflection::callMethod($this->instance, $this->values["identifier"], []);
+			} else {
+							$value=$this->values["identifier"]($index,$this->instance);
+			}
 		}
 		return $value;
 	}
@@ -99,17 +102,17 @@ 
 		if($property instanceof \ReflectionProperty){
 			$value=$this->_getPropertyValue($property, $index);
 			$propertyName=$property->getName();
-		}elseif(\is_array($property)){
+		} elseif(\is_array($property)){
 			$values=\array_map(function($v) use ($index){return $this->_getValue($v, $index);}, $property);
 			$value=\implode("", $values);
-		}elseif(\is_string($property)){
+		} elseif(\is_string($property)){
 			$value=$property;
 			if(isset($this->instance->{$property})){
 				$value=$this->instance->{$property};
-			}elseif(\method_exists($this->instance, $getter=JReflection::getterName($property))){
+			} elseif(\method_exists($this->instance, $getter=JReflection::getterName($property))){
 				$value=JReflection::callMethod($this->instance, $getter, []);
 			}
-		}elseif(\is_callable($property)){
+		} elseif(\is_callable($property)){
 			$value=$property($this->instance);
 		}
 		return $this->_postGetValue($index, $propertyName, $value);
@@ -118,7 +121,7 @@ 
 	protected function _postGetValue($index,$propertyName,$value){
 		if(isset($this->values[$index])){
 			$value= $this->values[$index]($value,$this->instance,$index);
-		}else{
+		} else{
 			$value=$this->_getDefaultValue($propertyName,$value, $index);
 		}
 		if(isset($this->afterCompile[$index])){
@@ -139,10 +142,10 @@ 
 		if(isset($vb[$index])){
 			if(\is_array($vb[$index])){
 				$this->visibleProperties[$index][]=$field;
-			}else{
+			} else{
 				$this->visibleProperties[$index]=[$vb[$index],$field];
 			}
-		}else{
+		} else{
 			return $this->insertField($index, $field);
 		}
 		return $this;
@@ -174,9 +177,9 @@ 
 		$property=$this->getProperty($index);
 		if($property instanceof \ReflectionProperty){
 			$result=$property->getName();
-		}elseif(\is_callable($property)){
+		} elseif(\is_callable($property)){
 			$result=$this->visibleProperties[$index];
-		}else{
+		} else{
 			$result=$property;
 		}
 		return $result;
@@ -196,7 +199,7 @@ 
 		$this->reflect=new \ReflectionClass($instance);
 		if(\sizeof($this->visibleProperties)===0){
 			$this->properties=$this->getDefaultProperties();
-		}else{
+		} else{
 			foreach ($this->visibleProperties as $property){
 				$this->setInstanceProperty($property);
 			}
@@ -207,22 +210,23 @@ 
 	private function setInstanceProperty($property){
 		if(\is_callable($property)){
 			$this->properties[]=$property;
-		}elseif(\is_string($property)){
+		} elseif(\is_string($property)){
 			try{
 				$this->_beforeAddProperty(\sizeof($this->properties), $property);
 				$rProperty=$this->reflect->getProperty($property);
 				$this->properties[]=$rProperty;
-			}catch(\Exception $e){
+			} catch(\Exception $e){
 				$this->_beforeAddProperty(\sizeof($this->properties), $property);
 				$this->properties[]=$property;
 			}
-		}elseif(\is_int($property)){
+		} elseif(\is_int($property)){
 			$props=$this->getDefaultProperties();
-			if(isset($props[$property]))
-				$this->properties[]=$props[$property];
-				else
-					$this->properties[]=$property;
-		}else{
+			if(isset($props[$property])) {
+							$this->properties[]=$props[$property];
+			} else {
+									$this->properties[]=$property;
+				}
+		} else{
 			$this->properties[]=$property;
 		}
 	}
@@ -266,12 +270,13 @@ 
 		if(isset($this->captions[$index])){
 			return $this->captions[$index];
 		}
-		if($this->properties[$index] instanceof \ReflectionProperty)
-			return $this->properties[$index]->getName();
-		elseif(\is_callable($this->properties[$index]))
-			return "";
-		else
-			return $this->properties[$index];
+		if($this->properties[$index] instanceof \ReflectionProperty) {
+					return $this->properties[$index]->getName();
+		} elseif(\is_callable($this->properties[$index])) {
+					return "";
+		} else {
+					return $this->properties[$index];
+		}
 	}
 
 	public function getCaptions(){
@@ -282,7 +287,7 @@ 
 			for($i=$captionsSize;$i<$count;$i++){
 				$captions[]="";
 			}
-		}else{
+		} else{
 			$captions=[];
 			$index=0;
 			while($index<$count){
@@ -297,8 +302,9 @@ 
 	}
 
 	public function setCaption($index,$caption){
-		if(isset($this->captions)===false)
-			$this->captions=[];
+		if(isset($this->captions)===false) {
+					$this->captions=[];
+		}
 		$this->captions[$index]=$caption;
 		return $this;
 	}