phpMv / phpMv-UI

Ajax/semantic/widgets/dataelement/DataElement.php

Spacing +15 added lines, -15 removed lines

@@ -18,49 +18,49 @@ 
 class DataElement extends Widget {
 
 	public function __construct($identifier, $modelInstance=NULL) {
-		parent::__construct($identifier, null,$modelInstance);
-		$this->_init(new DeInstanceViewer($identifier), "table", new HtmlTable($identifier, 0,2), false);
+		parent::__construct($identifier, null, $modelInstance);
+		$this->_init(new DeInstanceViewer($identifier), "table", new HtmlTable($identifier, 0, 2), false);
 		$this->content["table"]->setDefinition();
 	}
 
-	public function compile(JsUtils $js=NULL,&$view=NULL){
-		if(!$this->_generated){
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
+		if (!$this->_generated) {
 			$this->_instanceViewer->setInstance($this->_modelInstance);
 
 			$table=$this->content["table"];
 			$this->_generateContent($table);
 
-			if(isset($this->_toolbar)){
+			if (isset($this->_toolbar)) {
 				$this->_setToolbarPosition($table);
 			}
-			$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE,"table",PositionInTable::AFTERTABLE]);
+			$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE, "table", PositionInTable::AFTERTABLE]);
 			$this->_compileForm();
 			$this->_generated=true;
 		}
-		return parent::compile($js,$view);
+		return parent::compile($js, $view);
 	}
 
 	/**
 	 * @param HtmlTable $table
 	 */
-	protected function _generateContent($table){
-		$values= $this->_instanceViewer->getValues();
+	protected function _generateContent($table) {
+		$values=$this->_instanceViewer->getValues();
 		$captions=$this->_instanceViewer->getCaptions();
 		$count=$this->_instanceViewer->count();
-		for($i=0;$i<$count;$i++){
-			$table->addRow([$captions[$i],$values[$i]]);
+		for ($i=0; $i<$count; $i++) {
+			$table->addRow([$captions[$i], $values[$i]]);
 		}
 	}
 
-	protected function _getFieldName($index){
+	protected function _getFieldName($index) {
 		return $this->_instanceViewer->getFieldName($index);
 	}
 
-	protected function _getFieldCaption($index){
+	protected function _getFieldCaption($index) {
 		return null;
 	}
 
-	protected function _getFieldIdentifier($prefix,$name=""){
+	protected function _getFieldIdentifier($prefix, $name="") {
 		return $this->identifier."-{$prefix}-".$name;
 	}
 
@@ -92,7 +92,7 @@ 
 		return $this;
 	}
 
-	public function asForm(){
+	public function asForm() {
 		return $this->getForm();
 	}
 }
\ No newline at end of file

Ajax/semantic/widgets/business/BusinessForm.php

Doc Comments +1 added lines

@@ -15,6 +15,7 @@
 	 * {@inheritdoc}
 	 *
 	 * @see \Ajax\semantic\widgets\dataform\DataForm::__construct()
+	 * @param string $identifier
 	 */
 	public function __construct($identifier,$modelInstance=null,$fieldsOrder,$fieldsDefinition,$fields=[],$captions=[],$separators=[]) {
 		if(!isset($modelInstance)){

Spacing +13 added lines, -13 removed lines

@@ -16,17 +16,17 @@ 
 	 *
 	 * @see \Ajax\semantic\widgets\dataform\DataForm::__construct()
 	 */
-	public function __construct($identifier,$modelInstance=null,$fieldsOrder,$fieldsDefinition,$fields=[],$captions=[],$separators=[]) {
-		if(!isset($modelInstance)){
+	public function __construct($identifier, $modelInstance=null, $fieldsOrder, $fieldsDefinition, $fields=[], $captions=[], $separators=[]) {
+		if (!isset($modelInstance)) {
 			$modelInstance=$this->getDefaultModelInstance();
 		}
-		parent::__construct($identifier,$modelInstance);
-		$this->_initForm($fieldsOrder, $fieldsDefinition,$fields,$captions,$separators);
+		parent::__construct($identifier, $modelInstance);
+		$this->_initForm($fieldsOrder, $fieldsDefinition, $fields, $captions, $separators);
 	}
 
 	abstract protected function getDefaultModelInstance();
 
-	protected function _initForm($fieldsOrder,$fieldsDefinition,$fields=[],$captions=[],$separators=[]){
+	protected function _initForm($fieldsOrder, $fieldsDefinition, $fields=[], $captions=[], $separators=[]) {
 		$this->_fieldsOrder=$fieldsOrder;
 		$this->setFields($fields);
 		$this->setSeparators($separators);
@@ -34,26 +34,26 @@ 
 		$this->setCaptions($captions);
 	}
 
-	protected function _getIndex($fieldName){
+	protected function _getIndex($fieldName) {
 		$index=$fieldName;
-		if(\is_string($fieldName)){
+		if (\is_string($fieldName)) {
 			$index=\array_search($fieldName, $this->_fieldsOrder);
 		}
 		return $index;
 	}
-	protected function _fieldAs($elementCallback,&$index,$attributes=NULL,$prefix=null){
+	protected function _fieldAs($elementCallback, &$index, $attributes=NULL, $prefix=null) {
 		$index=$this->_getIndex($index);
-		return parent::_fieldAs($elementCallback, $index,$attributes,$prefix);
+		return parent::_fieldAs($elementCallback, $index, $attributes, $prefix);
 	}
 
 
-	public function removeField($fieldName){
+	public function removeField($fieldName) {
 		parent::removeField($fieldName);
-		\array_splice($this->_fieldsOrder,$this->_getIndex($fieldName),1);
+		\array_splice($this->_fieldsOrder, $this->_getIndex($fieldName), 1);
 		return $this;
 	}
 
-	public function compile(JsUtils $js=NULL,&$view=NULL){
-		return parent::compile($js,$view);
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
+		return parent::compile($js, $view);
 	}
 }
\ No newline at end of file

Ajax/semantic/widgets/dataform/DataForm.php

Doc Comments +4 added lines

@@ -121,6 +121,10 @@
 		$this->content[$this->_toolbarPosition]=$this->_toolbar;
 	}
 
+	/**
+	 * @param integer $index
+	 * @param string $title
+	 */
 	public function addDividerBefore($index,$title){
 		$index=$this->_getIndex($index);
 		$this->_instanceViewer->addHeaderDividerBefore($index, $title);

Spacing +26 added lines, -26 removed lines

@@ -19,55 +19,55 @@ 
 class DataForm extends Widget {
 
 	public function __construct($identifier, $modelInstance=NULL) {
-		parent::__construct($identifier, null,$modelInstance);
+		parent::__construct($identifier, null, $modelInstance);
 		$this->_form=new HtmlForm($identifier);
 		$this->_init(new FormInstanceViewer($identifier), "form", $this->_form, true);
 	}
 
-	protected function _getFieldIdentifier($prefix,$name=""){
+	protected function _getFieldIdentifier($prefix, $name="") {
 		return $this->identifier."-{$name}-".$this->_instanceViewer->getIdentifier();
 	}
 
-	public function compile(JsUtils $js=NULL,&$view=NULL){
-		if(!$this->_generated){
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
+		if (!$this->_generated) {
 			$this->_instanceViewer->setInstance($this->_modelInstance);
 
 			$form=$this->content["form"];
 			$this->_generateContent($form);
 
-			if(isset($this->_toolbar)){
+			if (isset($this->_toolbar)) {
 				$this->_setToolbarPosition($form);
 			}
-			$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE,"form",PositionInTable::AFTERTABLE]);
+			$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE, "form", PositionInTable::AFTERTABLE]);
 			$this->_generated=true;
 		}
-		return parent::compile($js,$view);
+		return parent::compile($js, $view);
 	}
 
 	/**
 	 * @param HtmlForm $form
 	 */
-	protected function _generateContent($form){
-		$values= $this->_instanceViewer->getValues();
+	protected function _generateContent($form) {
+		$values=$this->_instanceViewer->getValues();
 		$count=$this->_instanceViewer->count();
 		$separators=$this->_instanceViewer->getSeparators();
 		$headers=$this->_instanceViewer->getHeaders();
 		\sort($separators);
 		$size=\sizeof($separators);
-		if($size===1){
-			foreach ($values as $v){
+		if ($size===1) {
+			foreach ($values as $v) {
 				$form->addField($v);
 			}
-		}else{
+		} else {
 			$separators[]=$count;
-			for($i=0;$i<$size;$i++){
-				$fields=\array_slice($values, $separators[$i]+1,$separators[$i+1]-$separators[$i]);
-				if(isset($headers[$separators[$i]+1]))
-					$form->addHeader($headers[$separators[$i]+1],4,true);
+			for ($i=0; $i<$size; $i++) {
+				$fields=\array_slice($values, $separators[$i]+1, $separators[$i+1]-$separators[$i]);
+				if (isset($headers[$separators[$i]+1]))
+					$form->addHeader($headers[$separators[$i]+1], 4, true);
 				//TODO check why $fields is empty
-				if(\sizeof($fields)===1){
+				if (\sizeof($fields)===1) {
 					$form->addField($fields[0]);
-				}elseif(\sizeof($fields)>1){
+				}elseif (\sizeof($fields)>1) {
 					$form->addFields($fields);
 				}
 			}
@@ -78,11 +78,11 @@ 
 	 * {@inheritDoc}
 	 * @see \Ajax\common\Widget::getForm()
 	 */
-	public function getForm(){
+	public function getForm() {
 		return $this->content["form"];
 	}
 
-	public function addSeparatorAfter($fieldNum){
+	public function addSeparatorAfter($fieldNum) {
 		$fieldNum=$this->_getIndex($fieldNum);
 		$this->_instanceViewer->addSeparatorAfter($fieldNum);
 		return $this;
@@ -97,12 +97,12 @@ 
 		return $this;
 	}
 
-	public function fieldAsReset($index,$cssStyle=NULL,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value,$caption) use ($cssStyle){
-			$button=new HtmlButton($id,$value,$cssStyle);
+	public function fieldAsReset($index, $cssStyle=NULL, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($cssStyle){
+			$button=new HtmlButton($id, $value, $cssStyle);
 			$button->setProperty("type", "reset");
 			return $button;
-		}, $index,$attributes);
+		}, $index, $attributes);
 	}
 
 	/**
@@ -121,13 +121,13 @@ 
 		$this->content[$this->_toolbarPosition]=$this->_toolbar;
 	}
 
-	public function addDividerBefore($index,$title){
+	public function addDividerBefore($index, $title) {
 		$index=$this->_getIndex($index);
 		$this->_instanceViewer->addHeaderDividerBefore($index, $title);
 		return $this;
 	}
 
-	public function run(JsUtils $js){
+	public function run(JsUtils $js) {
 		return parent::run($js);
 	}
 }
\ No newline at end of file

Braces +5 added lines, -4 removed lines

@@ -58,16 +58,17 @@
 			foreach ($values as $v){
 				$form->addField($v);
 			}
-		}else{
+		} else{
 			$separators[]=$count;
 			for($i=0;$i<$size;$i++){
 				$fields=\array_slice($values, $separators[$i]+1,$separators[$i+1]-$separators[$i]);
-				if(isset($headers[$separators[$i]+1]))
-					$form->addHeader($headers[$separators[$i]+1],4,true);
+				if(isset($headers[$separators[$i]+1])) {
+									$form->addHeader($headers[$separators[$i]+1],4,true);
+				}
 				//TODO check why $fields is empty
 				if(\sizeof($fields)===1){
 					$form->addField($fields[0]);
-				}elseif(\sizeof($fields)>1){
+				} elseif(\sizeof($fields)>1){
 					$form->addFields($fields);
 				}
 			}

Ajax/common/traits/JqueryAjaxTrait.php

Spacing +46 added lines, -46 removed lines

@@ -17,7 +17,7 @@ 
 	protected $ajaxTransition;
 	protected $ajaxLoader='<span></span><span></span><span></span><span></span><span></span>';
 
-	abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true);
+	abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true);
 	protected function addLoading(&$retour, $responseElement) {
 		$loading_notifier='<div class="ajax-loader">';
 		if ($this->ajaxLoader=='') {
@@ -30,66 +30,66 @@ 
 		$retour.="\t\t$({$responseElement}).prepend('{$loading_notifier}');\n";
 	}
 
-	public function _get($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$jqueryDone="html",$ajaxTransition=null,$immediatly=false) {
-		return $this->_ajax("get", $url,$params,$responseElement,$jsCallback,$attr,$hasLoader,$jqueryDone,$ajaxTransition,$immediatly);
+	public function _get($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true, $jqueryDone="html", $ajaxTransition=null, $immediatly=false) {
+		return $this->_ajax("get", $url, $params, $responseElement, $jsCallback, $attr, $hasLoader, $jqueryDone, $ajaxTransition, $immediatly);
 	}
-	public function _post($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$jqueryDone="html",$ajaxTransition=null,$immediatly=false) {
-		return $this->_ajax("post", $url,$params,$responseElement,$jsCallback,$attr,$hasLoader,$jqueryDone,$ajaxTransition,$immediatly);
+	public function _post($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true, $jqueryDone="html", $ajaxTransition=null, $immediatly=false) {
+		return $this->_ajax("post", $url, $params, $responseElement, $jsCallback, $attr, $hasLoader, $jqueryDone, $ajaxTransition, $immediatly);
 	}
 
-	protected function _ajax($method,$url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$jqueryDone="html",$ajaxTransition=null,$immediatly=false) {
-		if(JString::isNull($params)){$params="{}";}
+	protected function _ajax($method, $url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true, $jqueryDone="html", $ajaxTransition=null, $immediatly=false) {
+		if (JString::isNull($params)) {$params="{}"; }
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
 		$retour=$this->_getAjaxUrl($url, $attr);
 		$responseElement=$this->_getResponseElement($responseElement);
 		$retour.="var self=this;\n";
-		if($hasLoader===true){
+		if ($hasLoader===true) {
 			$this->addLoading($retour, $responseElement);
 		}
 		$retour.="$.".$method."(url,".$params.").done(function( data ) {\n";
-		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone,$ajaxTransition,$jsCallback)."});\n";
+		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback)."});\n";
 		if ($immediatly)
 			$this->jquery_code_for_compile[]=$retour;
 		return $retour;
 	}
 
-	protected function setAjaxDataCall($params){
+	protected function setAjaxDataCall($params) {
 		$result=null;
-		if(!\is_callable($params)){
-			$result=function ($responseElement,$jqueryDone="html") use($params){
-				return AjaxTransition::{$params}($responseElement,$jqueryDone);
+		if (!\is_callable($params)) {
+			$result=function($responseElement, $jqueryDone="html") use($params){
+				return AjaxTransition::{$params}($responseElement, $jqueryDone);
 			};
 		}
 		return $result;
 	}
 
-	protected function _getAjaxUrl($url,$attr){
+	protected function _getAjaxUrl($url, $attr) {
 		$url=$this->_correctAjaxUrl($url);
 		$retour="url='".$url."';";
 		$slash="/";
-		if(JString::endswith($url, "/")===true)
+		if (JString::endswith($url, "/")===true)
 			$slash="";
-		if(JString::isNotNull($attr)){
+		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!=="")
+			elseif ($attr!=null && $attr!=="")
 					$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
 		}
 		return $retour;
 	}
 
-	protected function _getOnAjaxDone($responseElement,$jqueryDone,$ajaxTransition,$jsCallback){
-		$retour="";$call=null;
+	protected function _getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback) {
+		$retour=""; $call=null;
 		if ($responseElement!=="") {
-			if(isset($ajaxTransition)){
+			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";
+			if (\is_callable($call))
+				$retour="\t".$call($responseElement, $jqueryDone).";\n";
 			else
 				$retour="\t$({$responseElement}).{$jqueryDone}( data );\n";
 		}
@@ -97,7 +97,7 @@ 
 		return $retour;
 	}
 
-	protected function _getResponseElement($responseElement){
+	protected function _getResponseElement($responseElement) {
 		if ($responseElement!=="") {
 			$responseElement=Javascript::prep_value($responseElement);
 		}
@@ -107,7 +107,7 @@ 
 	protected function _correctAjaxUrl($url) {
 		if ($url!=="/" && JString::endsWith($url, "/")===true)
 			$url=substr($url, 0, strlen($url)-1);
-		if (strncmp($url, 'http://', 7)!=0&&strncmp($url, 'https://', 8)!=0) {
+		if (strncmp($url, 'http://', 7)!=0 && strncmp($url, 'https://', 8)!=0) {
 			$url=$this->jsUtils->getUrl($url);
 		}
 		return $url;
@@ -121,7 +121,7 @@ 
 	 * @param string $jsCallback javascript code to execute after the request
 	 * @param boolean $immediatly
 	 */
-	public function _json($url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context="document",$immediatly=false) {
+	public function _json($url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context="document", $immediatly=false) {
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
 		$retour=$this->_getAjaxUrl($url, $attr);
 		$retour.="$.{$method}(url,".$params.").done(function( data ) {\n";
@@ -142,7 +142,7 @@ 
 	 * @param string $url the request address
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","immediatly"=>true)
 	 */
-	public function _jsonOn($event,$element, $url,$parameters=array()) {
+	public function _jsonOn($event, $element, $url, $parameters=array()) {
 		$preventDefault=true;
 		$stopPropagation=true;
 		$jsCallback=null;
@@ -152,7 +152,7 @@ 
 		$params="{}";
 		$immediatly=true;
 		extract($parameters);
-		return $this->_add_event($element, $this->_json($url,$method, $params,$jsCallback, $attr,$context), $event, $preventDefault, $stopPropagation,$immediatly);
+		return $this->_add_event($element, $this->_json($url, $method, $params, $jsCallback, $attr, $context), $event, $preventDefault, $stopPropagation, $immediatly);
 	}
 
 	/**
@@ -164,19 +164,19 @@ 
 	 * @param string $context jquery DOM element, array container.
 	 * @param boolean $immediatly
 	 */
-	public function _jsonArray($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context=null,$immediatly=false) {
+	public function _jsonArray($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context=null, $immediatly=false) {
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
 		$retour=$this->_getAjaxUrl($url, $attr);
-		if($context===null){
+		if ($context===null) {
 			$appendTo="\t\tnewElm.appendTo($('".$maskSelector."').parent());\n";
-			$newElm = "$('#'+newId)";
-		}else{
+			$newElm="$('#'+newId)";
+		} else {
 			$appendTo="\t\tnewElm.appendTo(".$context.");\n";
-			$newElm = $context.".find('#'+newId)";
+			$newElm=$context.".find('#'+newId)";
 		}
 		$retour.="var self = $(this);\n$.{$method}(url,".$params.").done(function( data ) {\n";
 		$retour.="\tdata=$.parseJSON(data);$.each(data, function(index, value) {\n"."\tvar created=false;var maskElm=$('".$maskSelector."').first();maskElm.hide();"."\tvar newId=(maskElm.attr('id') || 'mask')+'-'+index;"."\tvar newElm=".$newElm.";\n"."\tif(!newElm.length){\n"."\t\tnewElm=maskElm.clone();newElm.attr('id',newId);\n";
-		$retour.= $appendTo;
+		$retour.=$appendTo;
 		$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";
@@ -191,30 +191,30 @@ 
 	 * @param string $url the request address
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get", "context"=>null)
 	 */
-	public function _jsonArrayOn($event,$element, $maskSelector,$url,$parameters=array()) {
+	public function _jsonArrayOn($event, $element, $maskSelector, $url, $parameters=array()) {
 		$preventDefault=true;
 		$stopPropagation=true;
 		$jsCallback=null;
 		$attr="id";
 		$method="get";
-		$context = null;
+		$context=null;
 		$params="{}";
 		$immediatly=true;
 		extract($parameters);
-		return $this->_add_event($element, $this->_jsonArray($maskSelector,$url,$method, $params,$jsCallback, $attr, $context), $event, $preventDefault, $stopPropagation,$immediatly);
+		return $this->_add_event($element, $this->_jsonArray($maskSelector, $url, $method, $params, $jsCallback, $attr, $context), $event, $preventDefault, $stopPropagation, $immediatly);
 	}
 
-	public function _postForm($url, $form, $responseElement, $validation=false, $jsCallback=NULL, $attr="id", $hasLoader=true,$jqueryDone="html",$ajaxTransition=null,$immediatly=false) {
+	public function _postForm($url, $form, $responseElement, $validation=false, $jsCallback=NULL, $attr="id", $hasLoader=true, $jqueryDone="html", $ajaxTransition=null, $immediatly=false) {
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
 		$retour=$this->_getAjaxUrl($url, $attr);
 		$retour.="\nvar params=$('#".$form."').serialize();\n";
 		$responseElement=$this->_getResponseElement($responseElement);
 		$retour.="var self=this;\n";
-		if($hasLoader===true){
+		if ($hasLoader===true) {
 			$this->addLoading($retour, $responseElement);
 		}
 		$retour.="$.post(url,params).done(function( data ) {\n";
-		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone,$ajaxTransition,$jsCallback)."});\n";
+		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback)."});\n";
 
 		if ($validation) {
 			$retour="$('#".$form."').validate({submitHandler: function(form) {
@@ -237,7 +237,7 @@ 
 	 * @param string $responseElement
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxTransition"=>null,"jqueryDone"=>"html")
 	 */
-	public function _getOn($event,$element, $url, $params="{}", $responseElement="", $parameters=array()) {
+	public function _getOn($event, $element, $url, $params="{}", $responseElement="", $parameters=array()) {
 		$preventDefault=true;
 		$stopPropagation=true;
 		$jsCallback=null;
@@ -247,7 +247,7 @@ 
 		$jqueryDone="html";
 		$ajaxTransition=null;
 		extract($parameters);
-		return $this->_add_event($element, $this->_get($url, $params, $responseElement, $jsCallback, $attr,$hasLoader,$jqueryDone,$ajaxTransition), $event, $preventDefault, $stopPropagation,$immediatly);
+		return $this->_add_event($element, $this->_get($url, $params, $responseElement, $jsCallback, $attr, $hasLoader, $jqueryDone, $ajaxTransition), $event, $preventDefault, $stopPropagation, $immediatly);
 	}
 
 	/**
@@ -260,7 +260,7 @@ 
 	 * @param string $responseElement
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxTransition"=>null)
 	 */
-	public function _postOn($event,$element, $url, $params="{}", $responseElement="", $parameters=array()) {
+	public function _postOn($event, $element, $url, $params="{}", $responseElement="", $parameters=array()) {
 		$preventDefault=true;
 		$stopPropagation=true;
 		$jsCallback=null;
@@ -270,7 +270,7 @@ 
 		$jqueryDone="html";
 		$ajaxTransition=null;
 		extract($parameters);
-		return $this->_add_event($element, $this->_post($url, $params, $responseElement, $jsCallback, $attr,$hasLoader,$jqueryDone,$ajaxTransition), $event, $preventDefault, $stopPropagation,$immediatly);
+		return $this->_add_event($element, $this->_post($url, $params, $responseElement, $jsCallback, $attr, $hasLoader, $jqueryDone, $ajaxTransition), $event, $preventDefault, $stopPropagation, $immediatly);
 	}
 
 	/**
@@ -283,7 +283,7 @@ 
 	 * @param string $responseElement
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"validation"=>false,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxTransition"=>null,"immediatly"=>true)
 	 */
-	public function _postFormOn($event,$element, $url, $form, $responseElement="", $parameters=array()) {
+	public function _postFormOn($event, $element, $url, $form, $responseElement="", $parameters=array()) {
 		$preventDefault=true;
 		$stopPropagation=true;
 		$validation=false;
@@ -294,6 +294,6 @@ 
 		$jqueryDone="html";
 		$ajaxTransition=null;
 		extract($parameters);
-		return $this->_add_event($element, $this->_postForm($url, $form, $responseElement, $validation, $jsCallback, $attr,$hasLoader,$jqueryDone,$ajaxTransition), $event, $preventDefault, $stopPropagation,$immediatly);
+		return $this->_add_event($element, $this->_postForm($url, $form, $responseElement, $validation, $jsCallback, $attr, $hasLoader, $jqueryDone, $ajaxTransition), $event, $preventDefault, $stopPropagation, $immediatly);
 	}
 }
\ No newline at end of file

Braces +32 added lines, -24 removed lines

@@ -48,8 +48,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;
 	}
 
@@ -67,15 +68,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;
 	}
@@ -85,13 +88,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;
@@ -105,8 +109,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->jsUtils->getUrl($url);
 		}
@@ -130,8 +135,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;
 	}
 
@@ -170,7 +176,7 @@ 
 		if($context===null){
 			$appendTo="\t\tnewElm.appendTo($('".$maskSelector."').parent());\n";
 			$newElm = "$('#'+newId)";
-		}else{
+		} else{
 			$appendTo="\t\tnewElm.appendTo(".$context.");\n";
 			$newElm = $context.".find('#'+newId)";
 		}
@@ -180,8 +186,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;
 	}
 	/**
@@ -222,8 +229,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/service/JString.php

Spacing +15 added lines, -15 removed lines

@@ -2,51 +2,51 @@
 namespace Ajax\service;
 class JString {
 
-	public static function contains($hay,$needle){
-		return strpos($hay, $needle) !== false;
+	public static function contains($hay, $needle) {
+		return strpos($hay, $needle)!==false;
 	}
 	public static function startswith($hay, $needle) {
-		return substr($hay, 0, strlen($needle)) === $needle;
+		return substr($hay, 0, strlen($needle))===$needle;
 	}
 
 	public static function endswith($hay, $needle) {
-		return substr($hay, -strlen($needle)) === $needle;
+		return substr($hay, -strlen($needle))===$needle;
 	}
 
-	public static function isNull($s){
+	public static function isNull($s) {
 		return (!isset($s) || NULL===$s || ""===$s);
 	}
-	public static function isNotNull($s){
+	public static function isNotNull($s) {
 		return (isset($s) && NULL!==$s && ""!==$s);
 	}
 
-	public static function isBoolean($value){
+	public static function isBoolean($value) {
 		return \is_bool($value) || $value==1 || $value==0;
 	}
 
-	public static function isBooleanTrue($value){
+	public static function isBooleanTrue($value) {
 		return $value==1 || $value;
 	}
 
-	public static function isBooleanFalse($value){
+	public static function isBooleanFalse($value) {
 		return $value==0 || !$value;
 	}
 
-	public static function camelCaseToSeparated($input,$separator=" "){
+	public static function camelCaseToSeparated($input, $separator=" ") {
 		return strtolower(preg_replace('/(?<!^)[A-Z]/', $separator.'$0', $input));
 	}
 
-	public static function replaceAtFirst($subject,$from, $to){
-		$from = '/\A'.preg_quote($from, '/').'/';
+	public static function replaceAtFirst($subject, $from, $to) {
+		$from='/\A'.preg_quote($from, '/').'/';
 		return \preg_replace($from, $to, $subject, 1);
 	}
 
-	public static function replaceAtLast($subject,$from, $to){
-		$from = '/'.preg_quote($from, '/').'\z/';
+	public static function replaceAtLast($subject, $from, $to) {
+		$from='/'.preg_quote($from, '/').'\z/';
 		return \preg_replace($from, $to, $subject, 1);
 	}
 
-	public static function replaceAtFirstAndLast($subject,$fromFirst,$toFirst,$fromLast,$toLast){
+	public static function replaceAtFirstAndLast($subject, $fromFirst, $toFirst, $fromLast, $toLast) {
 		$s=self::replaceAtFirst($subject, $fromFirst, $toFirst);
 		return self::replaceAtLast($s, $fromLast, $toLast);
 	}

Ajax/semantic/traits/SemanticWidgetsTrait.php

Spacing +10 added lines, -10 removed lines

@@ -16,8 +16,8 @@ 
 	 * @param array $instances
 	 * @return DataTable
 	 */
-	public function dataTable($identifier,$model, $instances){
-		return $this->addHtmlComponent(new DataTable($identifier,$model,$instances));
+	public function dataTable($identifier, $model, $instances) {
+		return $this->addHtmlComponent(new DataTable($identifier, $model, $instances));
 	}
 
 	/**
@@ -25,8 +25,8 @@ 
 	 * @param object $instance
 	 * @return DataElement
 	 */
-	public function dataElement($identifier, $instance){
-		return $this->addHtmlComponent(new DataElement($identifier,$instance));
+	public function dataElement($identifier, $instance) {
+		return $this->addHtmlComponent(new DataElement($identifier, $instance));
 	}
 
 	/**
@@ -34,15 +34,15 @@ 
 	 * @param object $instance
 	 * @return DataForm
 	 */
-	public function dataForm($identifier, $instance){
-		return $this->addHtmlComponent(new DataForm($identifier,$instance));
+	public function dataForm($identifier, $instance) {
+		return $this->addHtmlComponent(new DataForm($identifier, $instance));
 	}
 
-	public function defaultLogin($identifier,$instance=null){
-		return $this->addHtmlComponent(FormLogin::default($identifier,$instance));
+	public function defaultLogin($identifier, $instance=null) {
+		return $this->addHtmlComponent(FormLogin::default($identifier, $instance));
 	}
 
-	public function smallLogin($identifier,$instance=null){
-		return $this->addHtmlComponent(FormLogin::small($identifier,$instance));
+	public function smallLogin($identifier, $instance=null) {
+		return $this->addHtmlComponent(FormLogin::small($identifier, $instance));
 	}
 }
\ No newline at end of file

Ajax/semantic/widgets/business/user/FormLogin.php

Spacing +23 added lines, -23 removed lines

@@ -13,41 +13,41 @@
 	 * @param string $identifier
 	 * @param object $modelInstance
 	 */
-	public function __construct($identifier,$modelInstance=null,$fieldsOrder=[],$fieldsDefinition=[],$fields=[],$captions=[],$separators=[]) {
-		parent::__construct($identifier,$modelInstance,$fieldsOrder,$fieldsDefinition,$fields,$captions,$separators);
+	public function __construct($identifier, $modelInstance=null, $fieldsOrder=[], $fieldsDefinition=[], $fields=[], $captions=[], $separators=[]) {
+		parent::__construct($identifier, $modelInstance, $fieldsOrder, $fieldsDefinition, $fields, $captions, $separators);
 	}
 
-	protected function getDefaultModelInstance(){
+	protected function getDefaultModelInstance() {
 		return new UserModel();
 	}
 
-	public static function default($identifier,$modelInstance=null){
-		return new FormLogin($identifier,$modelInstance,
-				["message","login","password","remember","forget","submit"],
-				["message"=>["icon"=>"sign in"],"input0"=>["rules"=>"empty"],"input1"=>["inputType"=>"password","rules"=>"empty"],"checkbox","link","submit"=>"green fluid"],
-				["Connection","login","password","remember","forget","submit"],
-				["Please enter login and password to connect","Login","Password","Remember me.","Forgot your password?","Connection"],
-				[0,2,4,5]);
+	public static function default($identifier, $modelInstance=null){
+		return new FormLogin($identifier, $modelInstance,
+				["message", "login", "password", "remember", "forget", "submit"],
+				["message"=>["icon"=>"sign in"], "input0"=>["rules"=>"empty"], "input1"=>["inputType"=>"password", "rules"=>"empty"], "checkbox", "link", "submit"=>"green fluid"],
+				["Connection", "login", "password", "remember", "forget", "submit"],
+				["Please enter login and password to connect", "Login", "Password", "Remember me.", "Forgot your password?", "Connection"],
+				[0, 2, 4, 5]);
 	}
 
-	public static function smallInline($identifier,$modelInstance=null){
-		$result=new FormLogin($identifier,$modelInstance,
-				["login","password","submit"],
-				["input0"=>["rules"=>"empty"],"input1"=>["inputType"=>"password","rules"=>"empty"],"submit"=>"green basic"],
-				["login","password","submit"],
-				["","","Connection"],
+	public static function smallInline($identifier, $modelInstance=null) {
+		$result=new FormLogin($identifier, $modelInstance,
+				["login", "password", "submit"],
+				["input0"=>["rules"=>"empty"], "input1"=>["inputType"=>"password", "rules"=>"empty"], "submit"=>"green basic"],
+				["login", "password", "submit"],
+				["", "", "Connection"],
 				[2]);
 			$result->addDividerBefore(0, "Connection");
 		return $result;
 	}
 
-	public static function small($identifier,$modelInstance=null){
-		$result=new FormLogin($identifier,$modelInstance,
-				["login","password","submit"],
-				["input0"=>["rules"=>"empty"],"input1"=>["inputType"=>"password","rules"=>"empty"],"submit"=>"green basic"],
-				["login","password","submit"],
-				["Login","Password","Connection"],
-				[1,2]);
+	public static function small($identifier, $modelInstance=null) {
+		$result=new FormLogin($identifier, $modelInstance,
+				["login", "password", "submit"],
+				["input0"=>["rules"=>"empty"], "input1"=>["inputType"=>"password", "rules"=>"empty"], "submit"=>"green basic"],
+				["login", "password", "submit"],
+				["Login", "Password", "Connection"],
+				[1, 2]);
 		$result->addDividerBefore(0, "Connection");
 		return $result;
 	}

Ajax/semantic/widgets/dataform/FormInstanceViewer.php

Spacing +21 added lines, -21 removed lines

@@ -10,51 +10,51 @@ 
 	protected $separators;
 	protected $headers;
 
-	public function __construct($identifier,$instance=NULL, $captions=NULL) {
-		parent::__construct($identifier,$instance=NULL, $captions=NULL);
+	public function __construct($identifier, $instance=NULL, $captions=NULL) {
+		parent::__construct($identifier, $instance=NULL, $captions=NULL);
 		$this->separators=[-1];
 		$this->headers=[];
-		$this->defaultValueFunction=function($name,$value,$index){
+		$this->defaultValueFunction=function($name, $value, $index) {
 			$caption=$this->getCaption($index);
-			$input=new HtmlFormInput($this->widgetIdentifier."-".$name,$caption,"text",$value);
+			$input=new HtmlFormInput($this->widgetIdentifier."-".$name, $caption, "text", $value);
 			$input->setName($name);
 			return $input;
 		};
 	}
 
-	protected function _beforeAddProperty($index,&$field){
-		if(JString::endswith($field, "\n")===true){
+	protected function _beforeAddProperty($index, &$field) {
+		if (JString::endswith($field, "\n")===true) {
 			$this->addSeparatorAfter($index);
 		}
-		if($index>1 && JString::startswith($field, "\n")===true){
+		if ($index>1 && JString::startswith($field, "\n")===true) {
 			$this->addSeparatorAfter($index-1);
 		}
 		$field=\str_replace("\n", "", $field);
-		if(($header=$this->hasHeader($field))!==false){
+		if (($header=$this->hasHeader($field))!==false) {
 			$this->addHeaderDividerBefore($index, $header);
 		}
 	}
 
-	protected function hasHeader(&$field){
-		$matches=[];$result=false;
-		if(\preg_match('/\{(.*?)\}/s', $field, $matches)===1){
+	protected function hasHeader(&$field) {
+		$matches=[]; $result=false;
+		if (\preg_match('/\{(.*?)\}/s', $field, $matches)===1) {
 			$result=$matches[1];
-			$field=\str_replace("{".$result."}","", $field);
+			$field=\str_replace("{".$result."}", "", $field);
 		}
 		return $result;
 	}
 
 
 
-	public function addSeparatorAfter($fieldNum){
-		if(\array_search($fieldNum, $this->separators)===false)
+	public function addSeparatorAfter($fieldNum) {
+		if (\array_search($fieldNum, $this->separators)===false)
 			$this->separators[]=$fieldNum;
 		return $this;
 	}
 
-	public function addHeaderDividerBefore($fieldNum,$header){
+	public function addHeaderDividerBefore($fieldNum, $header) {
 		$this->headers[$fieldNum]=$header;
-		if($fieldNum>0)
+		if ($fieldNum>0)
 			$this->addSeparatorAfter($fieldNum-1);
 		return $this;
 	}
@@ -63,15 +63,15 @@ 
 		return $this->separators;
 	}
 
-	public function removeSeparator($index){
-		\array_splice($this->separators,$index,1);
+	public function removeSeparator($index) {
+		\array_splice($this->separators, $index, 1);
 	}
 
-	public function removeField($index){
+	public function removeField($index) {
 		parent::removeField($index);
 		$pos=\array_search($index, $this->separators);
-		if($pos!==false){
-			for($i=$pos+1;$i<\sizeof($this->separators);$i++){
+		if ($pos!==false) {
+			for ($i=$pos+1; $i<\sizeof($this->separators); $i++) {
 				$this->separators[$i]--;
 			}
 			\array_splice($this->separators, $pos, 1);

Braces +6 added lines, -4 removed lines

@@ -47,15 +47,17 @@
 
 
 	public function addSeparatorAfter($fieldNum){
-		if(\array_search($fieldNum, $this->separators)===false)
-			$this->separators[]=$fieldNum;
+		if(\array_search($fieldNum, $this->separators)===false) {
+					$this->separators[]=$fieldNum;
+		}
 		return $this;
 	}
 
 	public function addHeaderDividerBefore($fieldNum,$header){
 		$this->headers[$fieldNum]=$header;
-		if($fieldNum>0)
-			$this->addSeparatorAfter($fieldNum-1);
+		if($fieldNum>0) {
+					$this->addSeparatorAfter($fieldNum-1);
+		}
 		return $this;
 	}
 

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

Spacing +22 added lines, -22 removed lines

@@ -13,8 +13,8 @@ 
  * @property string $identifier
  */
 trait BaseTrait {
-	protected $_variations=[ ];
-	protected $_states=[ ];
+	protected $_variations=[];
+	protected $_states=[];
 	protected $_baseClass;
 
 	abstract protected function setPropertyCtrl($name, $value, $typeCtrl);
@@ -27,7 +27,7 @@ 
 
 	abstract public function setProperty($name, $value);
 
-	abstract public function addContent($content,$before=false);
+	abstract public function addContent($content, $before=false);
 
 	abstract public function onCreate($jsCode);
 
@@ -48,7 +48,7 @@ 
 		$this->setProperty("class", $this->_baseClass);
 		if (\is_string($variations))
 			$variations=\explode(" ", $variations);
-		foreach ( $variations as $variation ) {
+		foreach ($variations as $variation) {
 			$this->addVariation($variation);
 		}
 		return $this;
@@ -62,7 +62,7 @@ 
 	public function addVariations($variations=array()) {
 		if (\is_string($variations))
 			$variations=\explode(" ", $variations);
-		foreach ( $variations as $variation ) {
+		foreach ($variations as $variation) {
 			$this->addVariation($variation);
 		}
 		return $this;
@@ -71,7 +71,7 @@ 
 	public function addStates($states=array()) {
 		if (\is_string($states))
 			$states=\explode(" ", $states);
-		foreach ( $states as $state ) {
+		foreach ($states as $state) {
 			$this->addState($state);
 		}
 		return $this;
@@ -81,17 +81,17 @@ 
 		$this->setProperty("class", $this->_baseClass);
 		if (\is_string($states))
 			$states=\explode(" ", $states);
-		foreach ( $states as $state ) {
+		foreach ($states as $state) {
 			$this->addState($state);
 		}
 		return $this;
 	}
 
 	public function addIcon($icon, $before=true) {
-		return $this->addContent(new HtmlIcon("icon-" . $this->identifier, $icon), $before);
+		return $this->addContent(new HtmlIcon("icon-".$this->identifier, $icon), $before);
 	}
 
-	public function addSticky($context="body"){
+	public function addSticky($context="body") {
 		$this->onCreate("$('#".$this->identifier."').sticky({ context: '".$context."'});");
 		return $this;
 	}
@@ -112,7 +112,7 @@ 
 	 * @return \Ajax\semantic\html\elements\HtmlSemDoubleElement
 	 */
 	public function setDisabled($disable=true) {
-		if($disable)
+		if ($disable)
 			$this->addToProperty("class", "disabled");
 		return $this;
 	}
@@ -138,7 +138,7 @@ 
 	 *
 	 * @return \Ajax\semantic\html\base\HtmlSemDoubleElement
 	 */
-	public function asHeader(){
+	public function asHeader() {
 		return $this->addToProperty("class", "header");
 	}
 
@@ -146,15 +146,15 @@ 
 	 * show it is currently the active user selection
 	 * @return \Ajax\semantic\html\base\HtmlSemDoubleElement
 	 */
-	public function setActive($value=true){
-		if($value)
+	public function setActive($value=true) {
+		if ($value)
 			$this->addToProperty("class", "active");
 		return $this;
 	}
 
-	public function setAttached($value=true){
-		if($value)
-			$this->addToPropertyCtrl("class", "attached", array ("attached" ));
+	public function setAttached($value=true) {
+		if ($value)
+			$this->addToPropertyCtrl("class", "attached", array("attached"));
 		return $this;
 	}
 
@@ -170,7 +170,7 @@ 
 	}
 
 	public function setFloated($direction="right") {
-		return $this->addToPropertyCtrl("class", $direction . " floated", Direction::getConstantValues("floated"));
+		return $this->addToPropertyCtrl("class", $direction." floated", Direction::getConstantValues("floated"));
 	}
 
 	public function floatRight() {
@@ -185,14 +185,14 @@ 
 		return $this->_baseClass;
 	}
 
-	protected function addBehavior(&$array,$key,$value,$before="",$after=""){
-		if(\is_string($value)){
-			if(isset($array[$key])){
+	protected function addBehavior(&$array, $key, $value, $before="", $after="") {
+		if (\is_string($value)) {
+			if (isset($array[$key])) {
 				$p=JString::replaceAtFirstAndLast($array[$key], $before, "", $after, "");
 				$array[$key]=$before.$p.$value.$after;
-			}else
+			} else
 				$array[$key]=$before.$value.$after;
-		}else
+		} else
 			$array[$key]=$value;
 		return $this;
 	}

Braces +27 added lines, -18 removed lines

@@ -46,8 +46,9 @@ 
 
 	public function setVariations($variations) {
 		$this->setProperty("class", $this->_baseClass);
-		if (\is_string($variations))
-			$variations=\explode(" ", $variations);
+		if (\is_string($variations)) {
+					$variations=\explode(" ", $variations);
+		}
 		foreach ( $variations as $variation ) {
 			$this->addVariation($variation);
 		}
@@ -60,8 +61,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->addVariation($variation);
 		}
@@ -69,8 +71,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->addState($state);
 		}
@@ -79,8 +82,9 @@ 
 
 	public function setStates($states) {
 		$this->setProperty("class", $this->_baseClass);
-		if (\is_string($states))
-			$states=\explode(" ", $states);
+		if (\is_string($states)) {
+					$states=\explode(" ", $states);
+		}
 		foreach ( $states as $state ) {
 			$this->addState($state);
 		}
@@ -112,8 +116,9 @@ 
 	 * @return \Ajax\semantic\html\elements\HtmlSemDoubleElement
 	 */
 	public function setDisabled($disable=true) {
-		if($disable)
-			$this->addToProperty("class", "disabled");
+		if($disable) {
+					$this->addToProperty("class", "disabled");
+		}
 		return $this;
 	}
 
@@ -147,14 +152,16 @@ 
 	 * @return \Ajax\semantic\html\base\HtmlSemDoubleElement
 	 */
 	public function setActive($value=true){
-		if($value)
-			$this->addToProperty("class", "active");
+		if($value) {
+					$this->addToProperty("class", "active");
+		}
 		return $this;
 	}
 
 	public function setAttached($value=true){
-		if($value)
-			$this->addToPropertyCtrl("class", "attached", array ("attached" ));
+		if($value) {
+					$this->addToPropertyCtrl("class", "attached", array ("attached" ));
+		}
 		return $this;
 	}
 
@@ -190,10 +197,12 @@ 
 			if(isset($array[$key])){
 				$p=JString::replaceAtFirstAndLast($array[$key], $before, "", $after, "");
 				$array[$key]=$before.$p.$value.$after;
-			}else
-				$array[$key]=$before.$value.$after;
-		}else
-			$array[$key]=$value;
+			} else {
+							$array[$key]=$before.$value.$after;
+			}
+		} else {
+					$array[$key]=$value;
+		}
 		return $this;
 	}
 }
\ No newline at end of file