phpMv / phpMv-UI

Ajax/semantic/widgets/datatable/JsonDataTable.php

Spacing +32 added lines, -32 removed lines

@@ -22,25 +22,25 @@ 
 		$this->_rowClass="_json _element";
 	}
 
-	protected function _generateContent($table){
+	protected function _generateContent($table) {
 		$this->_addRowModel($table);
 		parent::_generateContent($table);
 	}
 
-	protected function _addRowModel($table){
+	protected function _addRowModel($table) {
 		$fields=$this->_instanceViewer->getSimpleProperties();
-		$row=$this->_createRow($table, $this->_modelClass,$fields);
-		$row->setProperty("style","display:none;");
+		$row=$this->_createRow($table, $this->_modelClass, $fields);
+		$row->setProperty("style", "display:none;");
 		$table->getBody()->_addRow($row);
 	}
 
-	protected function _createRow($table,$rowClass,$fields){
+	protected function _createRow($table, $rowClass, $fields) {
 		$object=JReflection::jsonObject($this->_model);
-		if(isset($this->_rowModelCallback)){
+		if (isset($this->_rowModelCallback)) {
 			$callback=$this->_rowModelCallback;
 			$callback($object);
 		}
-		$row=$this->_generateRow($object, $fields,$table,"_jsonArrayChecked");
+		$row=$this->_generateRow($object, $fields, $table, "_jsonArrayChecked");
 		$row->setClass($rowClass." _element");
 		return $row;
 	}
@@ -49,24 +49,24 @@ 
 	 * {@inheritDoc}
 	 * @see DataTable::_associatePaginationBehavior()
 	 */
-	protected function _associatePaginationBehavior(JsUtils $js=NULL,$offset=null){
+	protected function _associatePaginationBehavior(JsUtils $js=NULL, $offset=null) {
 		$callback=null;
 		$menu=$this->_pagination->getMenu();
 		
-		if(isset($js)){
+		if (isset($js)) {
 			$id=$this->identifier;
 			$callback=$js->getScript($offset).$this->getHtmlComponent()->getInnerScript();
-			$callback.=$js->trigger("#".$id." [name='selection[]']","change",false)."$('#".$id." tbody .ui.checkbox').checkbox();".$js->execOn("change", "#".$id." [name='selection[]']", $this->_getCheckedChange($js));
+			$callback.=$js->trigger("#".$id." [name='selection[]']", "change", false)."$('#".$id." tbody .ui.checkbox').checkbox();".$js->execOn("change", "#".$id." [name='selection[]']", $this->_getCheckedChange($js));
 			$callback.=$this->_generatePaginationScript($id);
-			if(isset($this->_urls["refresh"])){
-				if(isset($menu))
-				$js->jsonArrayOn("click", "#".$menu->getIdentifier()." a","#".$this->_identifier." tr.".$this->_modelClass, $this->_urls["refresh"],"post",["params"=>"{'p':$(this).attr('data-page'),'_model':'".JString::doubleBackSlashes($this->_model)."'}","jsCallback"=>$callback]);
+			if (isset($this->_urls["refresh"])) {
+				if (isset($menu))
+				$js->jsonArrayOn("click", "#".$menu->getIdentifier()." a", "#".$this->_identifier." tr.".$this->_modelClass, $this->_urls["refresh"], "post", ["params"=>"{'p':$(this).attr('data-page'),'_model':'".JString::doubleBackSlashes($this->_model)."'}", "jsCallback"=>$callback]);
 			}
 		}
 
 	}
 	
-	protected function _generatePaginationScript($id){
+	protected function _generatePaginationScript($id) {
 		return ";var page=parseInt($(self).attr('data-page')) || 1;var pages_visibles=$('#pagination-{$id} .item').length-2;
 			var lastPage=$('#pagination-{$id} ._lastPage');
 			var middle= Math.ceil((pages_visibles-1)/ 2);
@@ -86,16 +86,16 @@ 
 			lastPage.attr('data-page',Math.min(lastPage.attr('data-max'),page+1));
 			$('#{$id}').trigger('pageChange');$('#{$id}').trigger('activeRowChange');$('#pagination-{$id}').show();";
 	}
-	protected function _compileSearchFieldBehavior(JsUtils $js=NULL){
+	protected function _compileSearchFieldBehavior(JsUtils $js=NULL) {
 		
 	}
-	protected function _associateSearchFieldBehavior(JsUtils $js=NULL,$offset=null){
-		if(isset($this->_searchField) && isset($js) && isset($this->_urls["refresh"])){
+	protected function _associateSearchFieldBehavior(JsUtils $js=NULL, $offset=null) {
+		if (isset($this->_searchField) && isset($js) && isset($this->_urls["refresh"])) {
 			$id=$this->identifier;
 			$callback=$js->getScript($offset).$this->getHtmlComponent()->getInnerScript();
-			$callback.=$js->trigger("#".$id." [name='selection[]']","change",false)."$('#".$id." tbody .ui.checkbox').checkbox();".$js->execOn("change", "#".$id." [name='selection[]']", $this->_getCheckedChange($js));
+			$callback.=$js->trigger("#".$id." [name='selection[]']", "change", false)."$('#".$id." tbody .ui.checkbox').checkbox();".$js->execOn("change", "#".$id." [name='selection[]']", $this->_getCheckedChange($js));
 			$callback.="$('#pagination-{$id}').hide();$('#".$this->identifier."').trigger('searchTerminate',[$(self).val()]);";
-			$js->jsonArrayOn("change", "#".$this->_searchField->getDataField()->getIdentifier(),"#".$this->_identifier." tr.".$this->_modelClass, $this->_urls["refresh"],"post",["params"=>"{'s':$(self).val(),'_model':'".JString::doubleBackSlashes($this->_model)."'}","jsCallback"=>$callback]);
+			$js->jsonArrayOn("change", "#".$this->_searchField->getDataField()->getIdentifier(), "#".$this->_identifier." tr.".$this->_modelClass, $this->_urls["refresh"], "post", ["params"=>"{'s':$(self).val(),'_model':'".JString::doubleBackSlashes($this->_model)."'}", "jsCallback"=>$callback]);
 		}
 	}
 	
@@ -109,29 +109,29 @@ 
 	 * @param string $jsCallback
 	 * @return AjaxCall
 	 */
-	public function jsJsonArray($url, $method="get", $params="{}", $jsCallback=NULL,$parameters=[]){
-		$parameters=\array_merge($parameters,["modelSelector"=>"#".$this->_identifier." tr.".$this->_modelClass,"url"=>$url,"method"=>$method,"params"=>$params,"jsCallback"=>$jsCallback]);
+	public function jsJsonArray($url, $method="get", $params="{}", $jsCallback=NULL, $parameters=[]) {
+		$parameters=\array_merge($parameters, ["modelSelector"=>"#".$this->_identifier." tr.".$this->_modelClass, "url"=>$url, "method"=>$method, "params"=>$params, "jsCallback"=>$jsCallback]);
 		return new AjaxCall("jsonArray", $parameters);
 	}
 
-	public function jsClear(){
+	public function jsClear() {
 		return "$('#{$this->identifier} tbody').find('._json').remove();";
 	}
 
-	public function clearOn(BaseHtml $element,$event, $stopPropagation=false, $preventDefault=false){
-		return $element->addEvent($event, $this->jsClear(),$stopPropagation,$preventDefault);
+	public function clearOn(BaseHtml $element, $event, $stopPropagation=false, $preventDefault=false) {
+		return $element->addEvent($event, $this->jsClear(), $stopPropagation, $preventDefault);
 	}
 
-	public function clearOnClick(BaseHtml $element,$stopPropagation=false, $preventDefault=false){
-		return $this->clearOn($element, "click",$stopPropagation,$preventDefault);
+	public function clearOnClick(BaseHtml $element, $stopPropagation=false, $preventDefault=false) {
+		return $this->clearOn($element, "click", $stopPropagation, $preventDefault);
 	}
 
-	public function jsonArrayOn(BaseHtml $element,$event,$url, $method="get", $params="{}", $jsCallback=NULL,$parameters=[]){
-		return $element->_addEvent($event, $this->jsJsonArray($url,$method,$params,$jsCallback,$parameters));
+	public function jsonArrayOn(BaseHtml $element, $event, $url, $method="get", $params="{}", $jsCallback=NULL, $parameters=[]) {
+		return $element->_addEvent($event, $this->jsJsonArray($url, $method, $params, $jsCallback, $parameters));
 	}
 
-	public function jsonArrayOnClick(BaseHtml $element,$url, $method="get", $params="{}", $jsCallback=NULL,$parameters=[]){
-		return $this->jsonArrayOn($element, "click", $url,$method,$params,$jsCallback,$parameters);
+	public function jsonArrayOnClick(BaseHtml $element, $url, $method="get", $params="{}", $jsCallback=NULL, $parameters=[]) {
+		return $this->jsonArrayOn($element, "click", $url, $method, $params, $jsCallback, $parameters);
 	}
 
 	/**
@@ -142,8 +142,8 @@ 
 	 * @param number $pages_visibles The number of visible pages in the Pagination component
 	 * @return DataTable
 	 */
-	public function paginate($page,$total_rowcount,$items_per_page=10,$pages_visibles=null){
-		return parent::paginate($page, $total_rowcount,$items_per_page,$pages_visibles);
+	public function paginate($page, $total_rowcount, $items_per_page=10, $pages_visibles=null) {
+		return parent::paginate($page, $total_rowcount, $items_per_page, $pages_visibles);
 	}
 
 	public function setRowModelCallback($_rowModelCallback) {

Braces +3 added lines, -2 removed lines

@@ -59,8 +59,9 @@
 			$callback.=$js->trigger("#".$id." [name='selection[]']","change",false)."$('#".$id." tbody .ui.checkbox').checkbox();".$js->execOn("change", "#".$id." [name='selection[]']", $this->_getCheckedChange($js));
 			$callback.=$this->_generatePaginationScript($id);
 			if(isset($this->_urls["refresh"])){
-				if(isset($menu))
-				$js->jsonArrayOn("click", "#".$menu->getIdentifier()." a","#".$this->_identifier." tr.".$this->_modelClass, $this->_urls["refresh"],"post",["params"=>"{'p':$(this).attr('data-page'),'_model':'".JString::doubleBackSlashes($this->_model)."'}","jsCallback"=>$callback]);
+				if(isset($menu)) {
+								$js->jsonArrayOn("click", "#".$menu->getIdentifier()." a","#".$this->_identifier." tr.".$this->_modelClass, $this->_urls["refresh"],"post",["params"=>"{'p':$(this).attr('data-page'),'_model':'".JString::doubleBackSlashes($this->_model)."'}","jsCallback"=>$callback]);
+				}
 			}
 		}
 

Ajax/semantic/html/content/table/HtmlTableContent.php

Braces +28 added lines, -19 removed lines

@@ -26,8 +26,9 @@ 
 	 */
 	public function __construct($identifier, $tagName="tbody", $rowCount=NULL, $colCount=NULL) {
 		parent::__construct($identifier, $tagName, "");
-		if (isset($rowCount) && isset($colCount))
-			$this->setRowCount($rowCount, $colCount);
+		if (isset($rowCount) && isset($colCount)) {
+					$this->setRowCount($rowCount, $colCount);
+		}
 	}
 
 	/**
@@ -112,7 +113,7 @@ 
 		$row=$this->getItem($row);
 		if (isset($row) && $row instanceof HtmlCollection) {
 			$col=$row->getItem($col);
-		}else{
+		} else{
 			$col=$row;
 		}
 		return $col;
@@ -170,8 +171,9 @@ 
 			$values=\array_fill(0, $count, $values);
 			$isArray=false;
 		}
-		if (JArray::dimension($values) == 1 && $isArray)
-			$values=[ $values ];
+		if (JArray::dimension($values) == 1 && $isArray) {
+					$values=[ $values ];
+		}
 
 		$count=\min(\sizeof($values), $count);
 
@@ -198,8 +200,9 @@ 
 		$count=$this->count();
 		for($i=0; $i < $count; $i++) {
 			$cell=$this->getCell($i, $colIndex);
-			if($cell instanceof BaseTrait)
-				$cell->addVariations($variations);
+			if($cell instanceof BaseTrait) {
+							$cell->addVariations($variations);
+			}
 		}
 		return $this;
 	}
@@ -208,8 +211,9 @@ 
 		$count=$this->count();
 		for($i=0; $i < $count; $i++) {
 			$cell=$this->getCell($i, $colIndex);
-			if(isset($cell))
-				$cell->addToProperty($name,$value);
+			if(isset($cell)) {
+							$cell->addToProperty($name,$value);
+			}
 		}
 		return $this;
 	}
@@ -227,8 +231,9 @@ 
 		$count=$this->count();
 		for($i=0; $i < $count; $i++) {
 			$index=$this->content[$i]->getColPosition($colIndex);
-			if ($index !== NULL)
-				$this->getCell($i, $index)->$function();
+			if ($index !== NULL) {
+							$this->getCell($i, $index)->$function();
+			}
 		}
 		return $this;
 	}
@@ -239,8 +244,9 @@ 
 			$maxRow=$this->content[$i]->count();
 			$index=$maxRow-$colIndex-1;
 			if (($cell=$this->getCell($i, $index))!== NULL){
-				if($cell->getColspan()==1)
-					$cell->$function();
+				if($cell->getColspan()==1) {
+									$cell->$function();
+				}
 			}
 		}
 		return $this;
@@ -284,8 +290,9 @@ 
 	 */
 	public function getColCount() {
 		$result=0;
-		if ($this->count() > 0)
-			$result=$this->getItem(0)->count();
+		if ($this->count() > 0) {
+					$result=$this->getItem(0)->count();
+		}
 		return $result;
 	}
 
@@ -309,8 +316,9 @@ 
 
 	public function toDelete($rowIndex, $colIndex){
 		$row=$this->getItem($rowIndex);
-		if (isset($row) === true)
-			$row->toDelete($colIndex);
+		if (isset($row) === true) {
+					$row->toDelete($colIndex);
+		}
 		return $this;
 	}
 
@@ -408,8 +416,9 @@ 
 		foreach ( $rows as $row ) {
 			$cell=$row->getItem($colIndex);
 			$value=$cell->getContent();
-			if($functionExists)
-				$value=\call_user_func($function,$value);
+			if($functionExists) {
+							$value=\call_user_func($function,$value);
+			}
 			if($value!==$identiqual){
 				if($counter>0 && isset($cellToMerge)){
 					$cellToMerge->setRowspan($counter);

Spacing +51 added lines, -51 removed lines

@@ -14,7 +14,7 @@ 
  *
  */
 class HtmlTableContent extends HtmlSemCollection {
-	protected $_tdTagNames=[ "thead" => "th","tbody" => "td","tfoot" => "th" ];
+	protected $_tdTagNames=["thead" => "th", "tbody" => "td", "tfoot" => "th"];
 	protected $_merged=false;
 
 	/**
@@ -38,7 +38,7 @@ 
 	 */
 	public function setRowCount($rowCount, $colCount) {
 		$count=$this->count();
-		for($i=$count; $i < $rowCount; $i++) {
+		for ($i=$count; $i<$rowCount; $i++) {
 			$this->addItem($colCount);
 		}
 		return $this;
@@ -48,7 +48,7 @@ 
 		return $this->_tdTagNames[$this->tagName];
 	}
 	
-	public function refreshTR(){
+	public function refreshTR() {
 		$this->_template="%wrapContentBefore%%content%%wrapContentAfter%";
 	}
 
@@ -64,7 +64,7 @@ 
 		$tr=new HtmlTR("");
 		$tr->setContainer($this, $count);
 		$tr->setTdTagName($this->_tdTagNames[$this->tagName]);
-		if (isset($value) === true) {
+		if (isset($value)===true) {
 			$tr->setColCount($value);
 		}
 		return $tr;
@@ -90,10 +90,10 @@ 
 		return $this->addItem($row);
 	}
 	
-	public function addMergeRow($colCount,$value=null){
+	public function addMergeRow($colCount, $value=null) {
 		$row=$this->addRow($colCount);
 		$row->mergeCol();
-		if(isset($value)){
+		if (isset($value)) {
 			$row->setValues([$value]);
 		}
 		return $row;
@@ -102,7 +102,7 @@ 
 	/**
 	 * @return HtmlTR
 	 */
-	public function getItem($index){
+	public function getItem($index) {
 		return parent::getItem($index);
 	}
 
@@ -116,7 +116,7 @@ 
 		$row=$this->getItem($row);
 		if (isset($row) && $row instanceof HtmlCollection) {
 			$col=$row->getItem($col);
-		}else{
+		} else {
 			$col=$row;
 		}
 		return $col;
@@ -140,7 +140,7 @@ 
 	 */
 	public function setCellValue($row, $col, $value="") {
 		$cell=$this->getCell($row, $col);
-		if (isset($cell) === true) {
+		if (isset($cell)===true) {
 			$cell->setValue($value);
 		}
 		return $this;
@@ -151,7 +151,7 @@ 
 	 * @param mixed $values
 	 */
 	public function setValues($values=array()) {
-		return $this->_addOrSetValues($values, function(HtmlTR $row,$_values){$row->setValues($_values);});
+		return $this->_addOrSetValues($values, function(HtmlTR $row, $_values) {$row->setValues($_values); });
 	}
 
 	/**
@@ -159,7 +159,7 @@ 
 	 * @param mixed $values
 	 */
 	public function addValues($values=array()) {
-		return $this->_addOrSetValues($values, function(HtmlTR $row,$_values){$row->addValues($_values);});
+		return $this->_addOrSetValues($values, function(HtmlTR $row, $_values) {$row->addValues($_values); });
 	}
 
 	/**
@@ -167,21 +167,21 @@ 
 	 * @param mixed $values
 	 * @param callable $callback
 	 */
-	protected function _addOrSetValues($values,$callback) {
+	protected function _addOrSetValues($values, $callback) {
 		$count=$this->count();
 		$isArray=true;
 		if (!\is_array($values)) {
 			$values=\array_fill(0, $count, $values);
 			$isArray=false;
 		}
-		if (JArray::dimension($values) == 1 && $isArray)
-			$values=[ $values ];
+		if (JArray::dimension($values)==1 && $isArray)
+			$values=[$values];
 
 		$count=\min(\sizeof($values), $count);
 
-		for($i=0; $i < $count; $i++) {
+		for ($i=0; $i<$count; $i++) {
 			$row=$this->content[$i];
-			$callback($row,$values[$i]);
+			$callback($row, $values[$i]);
 		}
 		return $this;
 	}
@@ -192,7 +192,7 @@ 
 			$values=\array_fill(0, $count, $values);
 		}
 		$count=\min(\sizeof($values), $count);
-		for($i=0; $i < $count; $i++) {
+		for ($i=0; $i<$count; $i++) {
 			$this->getCell($i, $colIndex)->setValue($values[$i]);
 		}
 		return $this;
@@ -200,20 +200,20 @@ 
 
 	public function addColVariations($colIndex, $variations=array()) {
 		$count=$this->count();
-		for($i=0; $i < $count; $i++) {
+		for ($i=0; $i<$count; $i++) {
 			$cell=$this->getCell($i, $colIndex);
-			if($cell instanceof BaseTrait)
+			if ($cell instanceof BaseTrait)
 				$cell->addVariations($variations);
 		}
 		return $this;
 	}
 	
-	public function addPropertyCol($colIndex, $name,$value) {
+	public function addPropertyCol($colIndex, $name, $value) {
 		$count=$this->count();
-		for($i=0; $i < $count; $i++) {
+		for ($i=0; $i<$count; $i++) {
 			$cell=$this->getCell($i, $colIndex);
-			if(isset($cell))
-				$cell->addToProperty($name,$value);
+			if (isset($cell))
+				$cell->addToProperty($name, $value);
 		}
 		return $this;
 	}
@@ -229,9 +229,9 @@ 
 
 	private function colAlign($colIndex, $function) {
 		$count=$this->count();
-		for($i=0; $i < $count; $i++) {
+		for ($i=0; $i<$count; $i++) {
 			$index=$this->content[$i]->getColPosition($colIndex);
-			if ($index !== NULL)
+			if ($index!==NULL)
 				$this->getCell($i, $index)->$function();
 		}
 		return $this;
@@ -239,11 +239,11 @@ 
 	
 	private function colAlignFromRight($colIndex, $function) {
 		$count=$this->count();
-		for($i=0; $i < $count; $i++) {
+		for ($i=0; $i<$count; $i++) {
 			$maxRow=$this->content[$i]->count();
 			$index=$maxRow-$colIndex-1;
-			if (($cell=$this->getCell($i, $index))!== NULL){
-				if($cell->getColspan()==1)
+			if (($cell=$this->getCell($i, $index))!==NULL) {
+				if ($cell->getColspan()==1)
 					$cell->$function();
 			}
 		}
@@ -288,7 +288,7 @@ 
 	 */
 	public function getColCount() {
 		$result=0;
-		if ($this->count() > 0)
+		if ($this->count()>0)
 			$result=$this->getItem(0)->count();
 		return $result;
 	}
@@ -302,7 +302,7 @@ 
 	public function delete($rowIndex, $colIndex=NULL) {
 		if (isset($colIndex)) {
 			$row=$this->getItem($rowIndex);
-			if (isset($row) === true) {
+			if (isset($row)===true) {
 				$row->delete($colIndex);
 			}
 		} else {
@@ -311,9 +311,9 @@ 
 		return $this;
 	}
 
-	public function toDelete($rowIndex, $colIndex){
+	public function toDelete($rowIndex, $colIndex) {
 		$row=$this->getItem($rowIndex);
-		if (isset($row) === true)
+		if (isset($row)===true)
 			$row->toDelete($colIndex);
 		return $this;
 	}
@@ -342,17 +342,17 @@ 
 	 */
 	public function conditionalCellFormat($callback, $format) {
 		$rows=$this->content;
-		foreach ( $rows as $row ) {
+		foreach ($rows as $row) {
 			$row->conditionalCellFormat($callback, $format);
 		}
 		return $this;
 	}
 
-	public function conditionalColFormat($colIndex,$callback,$format){
+	public function conditionalColFormat($colIndex, $callback, $format) {
 		$rows=$this->content;
-		foreach ( $rows as $row ) {
+		foreach ($rows as $row) {
 			$cell=$row->getItem($colIndex);
-			$cell->conditionnalCellFormat($callback,$format);
+			$cell->conditionnalCellFormat($callback, $format);
 		}
 		return $this;
 	}
@@ -364,17 +364,17 @@ 
 	 */
 	public function conditionalRowFormat($callback, $format) {
 		$rows=$this->content;
-		foreach ( $rows as $row ) {
+		foreach ($rows as $row) {
 			$row->conditionalRowFormat($callback, $format);
 		}
 		return $this;
 	}
 
-	public function hideColumn($colIndex){
+	public function hideColumn($colIndex) {
 		$rows=$this->content;
-		foreach ( $rows as $row ) {
+		foreach ($rows as $row) {
 			$cell=$row->getItem($colIndex);
-			$cell->addToProperty("style","display:none;");
+			$cell->addToProperty("style", "display:none;");
 		}
 		return $this;
 	}
@@ -385,7 +385,7 @@ 
 	 */
 	public function applyCells($callback) {
 		$rows=$this->content;
-		foreach ( $rows as $row ) {
+		foreach ($rows as $row) {
 			$row->applyCells($callback);
 		}
 		return $this;
@@ -397,25 +397,25 @@ 
 	 */
 	public function applyRows($callback) {
 		$rows=$this->content;
-		foreach ( $rows as $row ) {
+		foreach ($rows as $row) {
 			$row->apply($callback);
 		}
 		return $this;
 	}
 
-	public function mergeIdentiqualValues($colIndex,$function="strip_tags"){
+	public function mergeIdentiqualValues($colIndex, $function="strip_tags") {
 		$rows=$this->content;
 		$identiqual=null;
 		$counter=0;
 		$cellToMerge=null;
 		$functionExists=\function_exists($function);
-		foreach ( $rows as $row ) {
+		foreach ($rows as $row) {
 			$cell=$row->getItem($colIndex);
 			$value=$cell->getContent();
-			if($functionExists)
-				$value=\call_user_func($function,$value);
-			if($value!==$identiqual){
-				if($counter>0 && isset($cellToMerge)){
+			if ($functionExists)
+				$value=\call_user_func($function, $value);
+			if ($value!==$identiqual) {
+				if ($counter>0 && isset($cellToMerge)) {
 					$cellToMerge->setRowspan($counter);
 				}
 				$counter=0;
@@ -424,17 +424,17 @@ 
 			}
 			$counter++;
 		}
-		if($counter>0 && isset($cellToMerge)){
+		if ($counter>0 && isset($cellToMerge)) {
 			$cellToMerge->setRowspan($counter);
 		}
 		return $this;
 	}
 
-	public function _isMerged(){
+	public function _isMerged() {
 		return $this->_merged;
 	}
 
-	public function _setMerged($value){
+	public function _setMerged($value) {
 		$this->_merged=$value;
 		return $this;
 	}

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

Spacing +11 added lines, -11 removed lines

@@ -35,7 +35,7 @@ 
 		}
 		if (isset($label))
 			$this->setLabel($label);
-		foreach ( $fields as $field ) {
+		foreach ($fields as $field) {
 			$this->addItem($field);
 		}
 		return $this;
@@ -57,7 +57,7 @@ 
 
 	public function addItem($item) {
 		$item=parent::addItem($item);
-		if($item instanceof HtmlFormField)
+		if ($item instanceof HtmlFormField)
 			$item->setContainer($this);
 		return $item;
 	}
@@ -65,7 +65,7 @@ 
 	/**
 	 * @return HtmlFormField
 	 */
-	public function getItem($index){
+	public function getItem($index) {
 		return parent::getItem($index);
 	}
 
@@ -104,10 +104,10 @@ 
 	}
 
 
-	public static function radios($identifier,$name, $items=array(), $label=NULL, $value=null, $type=NULL) {
-		$fields=array ();
+	public static function radios($identifier, $name, $items=array(), $label=NULL, $value=null, $type=NULL) {
+		$fields=array();
 		$i=0;
-		foreach ( $items as $val => $caption ) {
+		foreach ($items as $val => $caption) {
 			$itemO=new HtmlFormRadio($name."-".$i++, $name, $caption, $val, $type);
 			if ($val===$value) {
 				$itemO->getDataField()->setProperty("checked", "");
@@ -120,10 +120,10 @@ 
 		return $radios;
 	}
 
-	public static function checkeds($identifier,$name, $items=array(), $label=NULL, $values=array(), $type=NULL) {
-		$fields=array ();
+	public static function checkeds($identifier, $name, $items=array(), $label=NULL, $values=array(), $type=NULL) {
+		$fields=array();
 		$i=0;
-		foreach ( $items as $val => $caption ) {
+		foreach ($items as $val => $caption) {
 			$itemO=new HtmlFormCheckbox($name."-".$i++, $caption, $val, $type);
 			$itemO->setName($name);
 			if (\array_search($val, $values)!==false) {
@@ -142,8 +142,8 @@ 
 		return $this;
 	}
 	
-	public function run(JsUtils $js){
-		$result= parent::run($js);
+	public function run(JsUtils $js) {
+		$result=parent::run($js);
 		//return $result->setItemSelector("[data-value]");
 	}
 }

Braces +18 added lines, -12 removed lines

@@ -29,12 +29,14 @@ 
 				if (\is_string($end)) {
 					$label=$end;
 					\array_pop($fields);
-				} else
-					$label=NULL;
+				} else {
+									$label=NULL;
+				}
 			}
 		}
-		if (isset($label))
-			$this->setLabel($label);
+		if (isset($label)) {
+					$this->setLabel($label);
+		}
 		foreach ( $fields as $field ) {
 			$this->addItem($field);
 		}
@@ -57,8 +59,9 @@ 
 
 	public function addItem($item) {
 		$item=parent::addItem($item);
-		if($item instanceof HtmlFormField)
-			$item->setContainer($this);
+		if($item instanceof HtmlFormField) {
+					$item->setContainer($this);
+		}
 		return $item;
 	}
 	
@@ -73,8 +76,9 @@ 
 		if ($this->_equalWidth) {
 			$count=$this->count();
 			$this->addToProperty("class", Wide::getConstants()["W".$count]." fields");
-		} else
-			$this->addToProperty("class", "fields");
+		} else {
+					$this->addToProperty("class", "fields");
+		}
 		return parent::compile($js, $view);
 	}
 
@@ -115,8 +119,9 @@ 
 			$fields[]=$itemO;
 		}
 		$radios=new HtmlFormFields($identifier, $fields);
-		if (isset($label))
-			$radios->setLabel($label)->setProperty("for", $name);
+		if (isset($label)) {
+					$radios->setLabel($label)->setProperty("for", $name);
+		}
 		return $radios;
 	}
 
@@ -132,8 +137,9 @@ 
 			$fields[]=$itemO;
 		}
 		$radios=new HtmlFormFields($identifier, $fields);
-		if (isset($label))
-			$radios->setLabel($label)->setProperty("for", $name);
+		if (isset($label)) {
+					$radios->setLabel($label)->setProperty("for", $name);
+		}
 		return $radios;
 	}
 

Ajax/semantic/traits/SemanticHtmlModulesTrait.php

Spacing +5 added lines, -5 removed lines

@@ -43,8 +43,8 @@ 
 	 * @param string $type
 	 * @return HtmlFormFields
 	 */
-	public function htmlRadios($identifier, $items=[], $label=NULL,$value=NULL, $type=NULL) {
-		return $this->addHtmlComponent(HtmlFormFields::radios($identifier,$items,$label,$value,$type));
+	public function htmlRadios($identifier, $items=[], $label=NULL, $value=NULL, $type=NULL) {
+		return $this->addHtmlComponent(HtmlFormFields::radios($identifier, $items, $label, $value, $type));
 	}
 
 	/**
@@ -100,7 +100,7 @@ 
 	 * @return HtmlModal
 	 */
 	public function htmlModal($identifier, $header="", $content="", $actions=array()) {
-		return $this->addHtmlComponent(new HtmlModal($identifier, $header,$content,$actions));
+		return $this->addHtmlComponent(new HtmlModal($identifier, $header, $content, $actions));
 	}
 
 	/**
@@ -131,8 +131,8 @@ 
 	 * @param boolean $associative
 	 * @return HtmlDropdown
 	 */
-	public function htmlDropdown($identifier, $value="", $items=array(),$associative=true) {
-		return $this->addHtmlComponent(new HtmlDropdown($identifier, $value, $items,$associative));
+	public function htmlDropdown($identifier, $value="", $items=array(), $associative=true) {
+		return $this->addHtmlComponent(new HtmlDropdown($identifier, $value, $items, $associative));
 	}
 
 	/**

Ajax/common/html/BaseWidget.php

Spacing +2 added lines, -2 removed lines

@@ -37,7 +37,7 @@ 
 	 * @return mixed
 	 */
 	public function getLibraryId() {
-		if( isset($this->_libraryId)){
+		if (isset($this->_libraryId)) {
 			return $this->_libraryId;
 		}
 		return $this->identifier;
@@ -47,7 +47,7 @@ 
 	 * @param mixed $_libraryId
 	 */
 	public function setLibraryId($_libraryId) {
-		$this->_libraryId = $_libraryId;
+		$this->_libraryId=$_libraryId;
 	}
 
 }

Ajax/common/html/HtmlDoubleElement.php

Spacing +28 added lines, -28 removed lines

@@ -30,15 +30,15 @@ 
 		return $this->content;
 	}
 
-	public function addContent($content,$before=false) {
+	public function addContent($content, $before=false) {
 		if (!\is_array($this->content)) {
-			if(isset($this->content))
-				$this->content=array ($this->content);
+			if (isset($this->content))
+				$this->content=array($this->content);
 			else
 				$this->content=array();
 		}
-		if($before)
-			array_unshift($this->content,$content);
+		if ($before)
+			array_unshift($this->content, $content);
 		else
 			$this->content []=$content;
 		return $this;
@@ -53,7 +53,7 @@ 
 		if ($this->content instanceof HtmlDoubleElement) {
 			$this->content->run($js);
 		} else if (\is_array($this->content)) {
-			foreach ( $this->content as $itemContent ) {
+			foreach ($this->content as $itemContent) {
 				if ($itemContent instanceof HtmlDoubleElement) {
 					$itemContent->run($js);
 				}
@@ -70,19 +70,19 @@ 
 		return $this;
 	}
 
-	public function getContentInstances($class){
-		return $this->_getContentInstances($class,$this->content);
+	public function getContentInstances($class) {
+		return $this->_getContentInstances($class, $this->content);
 	}
 
-	protected function _getContentInstances($class,$content){
+	protected function _getContentInstances($class, $content) {
 		$instances=[];
-		if($content instanceof $class){
+		if ($content instanceof $class) {
 			$instances[]=$content;
-		}elseif($content instanceof HtmlDoubleElement){
-			$instances=\array_merge($instances,$content->getContentInstances($class));
-		}elseif (\is_array($content)){
-			foreach ($content as $element){
-				$instances=\array_merge($instances,$this->_getContentInstances($class, $element));
+		}elseif ($content instanceof HtmlDoubleElement) {
+			$instances=\array_merge($instances, $content->getContentInstances($class));
+		}elseif (\is_array($content)) {
+			foreach ($content as $element) {
+				$instances=\array_merge($instances, $this->_getContentInstances($class, $element));
 			}
 		}
 		return $instances;
@@ -92,36 +92,36 @@ 
 	 * Transforms the element into a link
 	 * @return HtmlDoubleElement
 	 */
-	public function asLink($href=NULL,$target=NULL) {
+	public function asLink($href=NULL, $target=NULL) {
 		if (isset($href))
 			$this->setProperty("href", $href);
-		if(isset($target))
+		if (isset($target))
 			$this->setProperty("target", $target);
 		return $this->setTagName("a");
 	}
 	
-	public function getTextContent(){
-		if(is_array($this->content)){
+	public function getTextContent() {
+		if (is_array($this->content)) {
 			return strip_tags(implode("", $this->content));
 		}
 		return strip_tags($this->content);
 	}
 	
-	public function asEditable(HtmlFormField $field,$asForm=false,$setValueProperty="val()"){
+	public function asEditable(HtmlFormField $field, $asForm=false, $setValueProperty="val()") {
 		$idF=$field->getIdentifier();
 		$idE=$idF;
-		if($asForm){
+		if ($asForm) {
 			$frm=new HtmlForm("frm-".$field->getIdentifier());
 			$frm->setProperty("onsubmit", "return false;");
 			$fields=$frm->addFields();
 			$idE=$frm->getIdentifier();
 			$fields->addItem($field);
-			$fields->addButtonIcon("bt-okay", "check","green mini","\$('#".$idE."').trigger('validate',{value: $('#'+idF+' input').val()});");
-			$fields->addButtonIcon("bt-cancel", "close","mini","\$('#".$idE."').trigger('endEdit');");
+			$fields->addButtonIcon("bt-okay", "check", "green mini", "\$('#".$idE."').trigger('validate',{value: $('#'+idF+' input').val()});");
+			$fields->addButtonIcon("bt-cancel", "close", "mini", "\$('#".$idE."').trigger('endEdit');");
 			$this->_editableContent=$frm;
 			$keypress="";
 			$focusOut="";
-		}else{
+		} else {
 			$focusOut="if(e.relatedTarget==null)elm.trigger('endEdit');";
 			$this->_editableContent=$field;
 			$keypress="$('#".$idF."').keyup(function(e){if(e.which == 13) {\$('#".$idE."').trigger('validate',{value: $('#'+idF+' input').val()});}if(e.keyCode===27) {\$('#".$idE."').trigger('endEdit');}});";
@@ -134,11 +134,11 @@ 
 	 * {@inheritDoc}
 	 * @see \Ajax\common\html\BaseHtml::compile_once()
 	 */
-	protected function compile_once(\Ajax\JsUtils $js = NULL, &$view = NULL) {
-		if(!$this->_compiled && isset($this->_editableContent)){
-			$this->wrap("",$this->_editableContent);
+	protected function compile_once(\Ajax\JsUtils $js=NULL, &$view=NULL) {
+		if (!$this->_compiled && isset($this->_editableContent)) {
+			$this->wrap("", $this->_editableContent);
 		}
-		parent::compile_once($js,$view);
+		parent::compile_once($js, $view);
 		
 	}
 

Braces +19 added lines, -15 removed lines

@@ -32,15 +32,17 @@ 
 
 	public function addContent($content,$before=false) {
 		if (!\is_array($this->content)) {
-			if(isset($this->content))
-				$this->content=array ($this->content);
-			else
-				$this->content=array();
+			if(isset($this->content)) {
+							$this->content=array ($this->content);
+			} else {
+							$this->content=array();
+			}
+		}
+		if($before) {
+					array_unshift($this->content,$content);
+		} else {
+					$this->content []=$content;
 		}
-		if($before)
-			array_unshift($this->content,$content);
-		else
-			$this->content []=$content;
 		return $this;
 	}
 
@@ -78,9 +80,9 @@ 
 		$instances=[];
 		if($content instanceof $class){
 			$instances[]=$content;
-		}elseif($content instanceof HtmlDoubleElement){
+		} elseif($content instanceof HtmlDoubleElement){
 			$instances=\array_merge($instances,$content->getContentInstances($class));
-		}elseif (\is_array($content)){
+		} elseif (\is_array($content)){
 			foreach ($content as $element){
 				$instances=\array_merge($instances,$this->_getContentInstances($class, $element));
 			}
@@ -93,10 +95,12 @@ 
 	 * @return HtmlDoubleElement
 	 */
 	public function asLink($href=NULL,$target=NULL) {
-		if (isset($href))
-			$this->setProperty("href", $href);
-		if(isset($target))
-			$this->setProperty("target", $target);
+		if (isset($href)) {
+					$this->setProperty("href", $href);
+		}
+		if(isset($target)) {
+					$this->setProperty("target", $target);
+		}
 		return $this->setTagName("a");
 	}
 	
@@ -121,7 +125,7 @@ 
 			$this->_editableContent=$frm;
 			$keypress="";
 			$focusOut="";
-		}else{
+		} else{
 			$focusOut="if(e.relatedTarget==null)elm.trigger('endEdit');";
 			$this->_editableContent=$field;
 			$keypress="$('#".$idF."').keyup(function(e){if(e.which == 13) {\$('#".$idE."').trigger('validate',{value: $('#'+idF+' input').val()});}if(e.keyCode===27) {\$('#".$idE."').trigger('endEdit');}});";

Ajax/common/html/traits/BaseHooksTrait.php

Spacing +7 added lines, -7 removed lines

@@ -9,7 +9,7 @@ 
 	 * @param string $hookKey
 	 * @return boolean
 	 */
-	public function hookExists($hookKey){
+	public function hookExists($hookKey) {
 		return isset($this->_hooks[$hookKey]);
 	}
 	
@@ -17,8 +17,8 @@ 
 	 * @param string $hookKey
 	 * @return callable|NULL
 	 */
-	public function getHook($hookKey){
-		if(isset($this->_hooks[$hookKey])){
+	public function getHook($hookKey) {
+		if (isset($this->_hooks[$hookKey])) {
 			return $this->_hooks[$hookKey];
 		}
 		return null;
@@ -29,7 +29,7 @@ 
 	 * @param String $hookKey
 	 * @param callable $callable
 	 */
-	public function addHook($hookKey,$callable){
+	public function addHook($hookKey, $callable) {
 		$this->_hooks[$hookKey]=$callable;
 	}
 	
@@ -39,9 +39,9 @@ 
 	 * @param mixed|null $variable
 	 * @return void|mixed
 	 */
-	public function execHook($hookKey,...$variables){
-		if(($hook=$this->getHook($hookKey))!=null){
-			return call_user_func_array($hook,$variables);
+	public function execHook($hookKey, ...$variables) {
+		if (($hook=$this->getHook($hookKey))!=null) {
+			return call_user_func_array($hook, $variables);
 		}
 		return;
 	}

Ajax/common/html/HtmlContentOnly.php

Spacing +2 added lines, -2 removed lines

@@ -2,8 +2,8 @@
 
 namespace Ajax\common\html;
 
-class HtmlContentOnly extends HtmlDoubleElement{
-	public function __construct($content,$identifier=""){
+class HtmlContentOnly extends HtmlDoubleElement {
+	public function __construct($content, $identifier="") {
 		parent::__construct($identifier);
 		$this->_template='%wrapContentBefore%%content%%wrapContentAfter%';
 		$this->setContent($content);

Ajax/semantic/widgets/dataform/DataForm.php

Spacing +39 added lines, -39 removed lines

@@ -21,36 +21,36 @@ 
 	use BaseTrait;
 
 	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();
@@ -58,41 +58,41 @@ 
 		\sort($separators);
 		$size=\sizeof($separators);
 		$nb=0;
-		if($size===1){
+		if ($size===1) {
 			$i=-1;
-			foreach ($values as $v){
-				$this->_generateFields($form, [$v], $headers, $i, $wrappers,$nb++);
+			foreach ($values as $v) {
+				$this->_generateFields($form, [$v], $headers, $i, $wrappers, $nb++);
 				$i++;
 			}
-		}else{
+		} else {
 			$separators[]=$count;
-			for($i=0;$i<$size;$i++){
-				$fields=\array_slice($values, $separators[$i]+1,$separators[$i+1]-$separators[$i]);
-				$this->_generateFields($form, $fields, $headers, $separators[$i], $wrappers,$nb++);
+			for ($i=0; $i<$size; $i++) {
+				$fields=\array_slice($values, $separators[$i]+1, $separators[$i+1]-$separators[$i]);
+				$this->_generateFields($form, $fields, $headers, $separators[$i], $wrappers, $nb++);
 			}
 		}
-		if($this->_hasRules && !$this->getForm()->hasValidationParams()){
+		if ($this->_hasRules && !$this->getForm()->hasValidationParams()) {
 				$this->setValidationParams(["inline"=>true]);
 		}
 	}
 
-	protected function _generateFields($form,$values,$headers,$sepFirst,$wrappers,$nb){
+	protected function _generateFields($form, $values, $headers, $sepFirst, $wrappers, $nb) {
 		$wrapper=null;
-		if(isset($headers[$sepFirst+1]))
-			$form->addHeader($headers[$sepFirst+1],4,true);
-		if(isset($wrappers[$sepFirst+1])){
+		if (isset($headers[$sepFirst+1]))
+			$form->addHeader($headers[$sepFirst+1], 4, true);
+		if (isset($wrappers[$sepFirst+1])) {
 			$wrapper=$wrappers[$sepFirst+1];
 		}
-		if(\sizeof($values)===1){
+		if (\sizeof($values)===1) {
 			$added=$form->addField($values[0]);
-		}elseif(\sizeof($values)>1){
+		}elseif (\sizeof($values)>1) {
 			$added=$form->addFields($values);
-		}else
+		} else
 			return;
-		if(isset($wrapper)){
-			$added->wrap($wrapper[0],$wrapper[1]);
+		if (isset($wrapper)) {
+			$added->wrap($wrapper[0], $wrapper[1]);
 		}
-		$this->execHook("onGenerateFields",$added,$nb);
+		$this->execHook("onGenerateFields", $added, $nb);
 	}
 	
 	/**
@@ -100,18 +100,18 @@ 
 	 * the generated field is the first parameter
 	 * @param callable $callback the fonction to call when a field is generated
 	 */
-	public function onGenerateField($callback){
-		$this->addHook("onGenerateFields",$callback);
+	public function onGenerateField($callback) {
+		$this->addHook("onGenerateFields", $callback);
 	}
 
 	/**
 	 * @return HtmlForm
 	 */
-	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;
@@ -126,12 +126,12 @@ 
 		return $this;
 	}
 
-	public function fieldAsReset($index,$cssStyle=NULL,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value) use ($cssStyle){
-			$button=new HtmlButton($id,$value,$cssStyle);
+	public function fieldAsReset($index, $cssStyle=NULL, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value) use ($cssStyle){
+			$button=new HtmlButton($id, $value, $cssStyle);
 			$button->setProperty("type", "reset");
 			return $button;
-		}, $index,$attributes);
+		}, $index, $attributes);
 	}
 
 	/**
@@ -150,19 +150,19 @@ 
 		$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 addWrapper($index,$contentBefore,$contentAfter=null){
+	public function addWrapper($index, $contentBefore, $contentAfter=null) {
 		$index=$this->_getIndex($index);
-		$this->_instanceViewer->addWrapper($index, $contentBefore,$contentAfter);
+		$this->_instanceViewer->addWrapper($index, $contentBefore, $contentAfter);
 		return $this;
 	}
 
-	public function run(JsUtils $js){
+	public function run(JsUtils $js) {
 		parent::run($js);
 	}
 }

Braces +8 added lines, -6 removed lines

@@ -64,7 +64,7 @@ 
 				$this->_generateFields($form, [$v], $headers, $i, $wrappers,$nb++);
 				$i++;
 			}
-		}else{
+		} else{
 			$separators[]=$count;
 			for($i=0;$i<$size;$i++){
 				$fields=\array_slice($values, $separators[$i]+1,$separators[$i+1]-$separators[$i]);
@@ -78,17 +78,19 @@ 
 
 	protected function _generateFields($form,$values,$headers,$sepFirst,$wrappers,$nb){
 		$wrapper=null;
-		if(isset($headers[$sepFirst+1]))
-			$form->addHeader($headers[$sepFirst+1],4,true);
+		if(isset($headers[$sepFirst+1])) {
+					$form->addHeader($headers[$sepFirst+1],4,true);
+		}
 		if(isset($wrappers[$sepFirst+1])){
 			$wrapper=$wrappers[$sepFirst+1];
 		}
 		if(\sizeof($values)===1){
 			$added=$form->addField($values[0]);
-		}elseif(\sizeof($values)>1){
+		} elseif(\sizeof($values)>1){
 			$added=$form->addFields($values);
-		}else
-			return;
+		} else {
+					return;
+		}
 		if(isset($wrapper)){
 			$added->wrap($wrapper[0],$wrapper[1]);
 		}