phpMv / phpMv-UI

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

Spacing +16 added lines, -16 removed lines

@@ -12,7 +12,7 @@ 
 use Ajax\JsUtils;
 
 class HtmlTD extends HtmlSemDoubleElement {
-	use TextAlignmentTrait,TableElementTrait;
+	use TextAlignmentTrait, TableElementTrait;
 	private $_container;
 	private $_row;
 	private $_col;
@@ -28,8 +28,8 @@ 
 	 */
 	public function __construct($identifier, $content=NULL, $tagName="td") {
 		parent::__construct($identifier, $tagName, "", $content);
-		$this->_variations=[ Variation::COLLAPSING ];
-		$this->_states=[ State::ACTIVE,State::POSITIVE,State::NEGATIVE,State::WARNING,State::ERROR,State::DISABLED ];
+		$this->_variations=[Variation::COLLAPSING];
+		$this->_states=[State::ACTIVE, State::POSITIVE, State::NEGATIVE, State::WARNING, State::ERROR, State::DISABLED];
 	}
 
 	public function setContainer($container, $row, $col) {
@@ -49,8 +49,8 @@ 
 	}
 
 	public function setRowspan($rowspan) {
-		$to=min($this->_container->count(), $this->_row + $rowspan - 1);
-		for($i=$to; $i > $this->_row; $i--) {
+		$to=min($this->_container->count(), $this->_row+$rowspan-1);
+		for ($i=$to; $i>$this->_row; $i--) {
 			$this->_container->toDelete($i, $this->_col);
 		}
 		$this->setProperty("rowspan", $rowspan);
@@ -58,7 +58,7 @@ 
 	}
 
 	public function mergeRow() {
-		if(!$this->_rowMerged){
+		if (!$this->_rowMerged) {
 			$this->_rowMerged=true;
 			return $this->setRowspan($this->_container->count());
 		}
@@ -66,7 +66,7 @@ 
 	}
 
 	public function mergeCol() {
-		if(!$this->_colMerged){
+		if (!$this->_colMerged) {
 			$this->_colMerged=true;
 			return $this->setColspan($this->_container->getRow($this->_row)->count());
 		}
@@ -74,9 +74,9 @@ 
 	}
 
 	public function setColspan($colspan) {
-		$to=min($this->_container->getRow($this->_row)->count(), $this->_col + $colspan - 1);
-		for($i=$to; $i > $this->_col; $i--) {
-			$this->_container->delete($this->_row, $this->_col + 1);
+		$to=min($this->_container->getRow($this->_row)->count(), $this->_col+$colspan-1);
+		for ($i=$to; $i>$this->_col; $i--) {
+			$this->_container->delete($this->_row, $this->_col+1);
 		}
 		$this->setProperty("colspan", $colspan);
 		return $this->_container;
@@ -115,21 +115,21 @@ 
 		return $this->addToProperty("class", "selectable");
 	}
 
-	public function setWidth($width){
+	public function setWidth($width) {
 		if (\is_int($width)) {
-			$width=Wide::getConstants()["W" . $width];
+			$width=Wide::getConstants()["W".$width];
 		}
 		$this->addToPropertyCtrl("class", $width, Wide::getConstants());
-		return $this->addToPropertyCtrl("class", "wide", array ("wide" ));
+		return $this->addToPropertyCtrl("class", "wide", array("wide"));
 	}
 
-	public function toDelete(){
+	public function toDelete() {
 		$this->_deleted=true;
 		return $this;
 	}
 
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
-		if(!$this->_deleted)
-			return parent::compile($js,$view);
+		if (!$this->_deleted)
+			return parent::compile($js, $view);
 	}
 }

Braces +9 added lines, -6 removed lines

@@ -84,15 +84,17 @@ 
 
 	public function getColspan() {
 		$colspan=1;
-		if (\array_key_exists("colspan", $this->properties))
-			$colspan=$this->getProperty("colspan");
+		if (\array_key_exists("colspan", $this->properties)) {
+					$colspan=$this->getProperty("colspan");
+		}
 		return $colspan;
 	}
 
 	public function getRowspan() {
 		$rowspan=1;
-		if (\array_key_exists("rowspan", $this->properties))
-			$rowspan=$this->getProperty("rowspan");
+		if (\array_key_exists("rowspan", $this->properties)) {
+					$rowspan=$this->getProperty("rowspan");
+		}
 		return $rowspan;
 	}
 
@@ -129,7 +131,8 @@ 
 	}
 
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
-		if(!$this->_deleted)
-			return parent::compile($js,$view);
+		if(!$this->_deleted) {
+					return parent::compile($js,$view);
+		}
 	}
 }

Ajax/common/html/HtmlCollection.php

Spacing +55 added lines, -55 removed lines

@@ -14,44 +14,44 @@ 
  */
 abstract class HtmlCollection extends HtmlDoubleElement {
 
-	public function __construct($identifier,$tagName="div"){
-		parent::__construct($identifier,$tagName);
+	public function __construct($identifier, $tagName="div") {
+		parent::__construct($identifier, $tagName);
 		$this->content=array();
 	}
 
-	public function addItems($items){
-		if(JArray::isAssociative($items)){
-			foreach ($items as $k=>$v){
-				$this->addItem([$k,$v]);
+	public function addItems($items) {
+		if (JArray::isAssociative($items)) {
+			foreach ($items as $k=>$v) {
+				$this->addItem([$k, $v]);
 			}
-		}else{
-			foreach ($items as $item){
+		} else {
+			foreach ($items as $item) {
 				$this->addItem($item);
 			}
 		}
 		return $this;
 	}
 
-	public function setItems($items){
+	public function setItems($items) {
 		$this->content=$items;
 		return $this;
 	}
 
-	public function getItems(){
+	public function getItems() {
 		return $this->content;
 	}
 
-	protected function getItemToAdd($item){
+	protected function getItemToAdd($item) {
 		$itemO=$item;
-		if($this->createCondition($item)===true){
+		if ($this->createCondition($item)===true) {
 			$itemO=$this->createItem($item);
 		}
 		return $itemO;
 	}
 
-	protected function setItemIdentifier($item,$classname,$index){
-		if($item instanceof BaseWidget){
-			if(JString::isNull($item->getIdentifier())){
+	protected function setItemIdentifier($item, $classname, $index) {
+		if ($item instanceof BaseWidget) {
+			if (JString::isNull($item->getIdentifier())) {
 				$item->setIdentifier($classname."-".$this->identifier."-".$index);
 			}
 		}
@@ -62,15 +62,15 @@ 
 	 * @param HtmlDoubleElement|string|array $item
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addItem($item){
+	public function addItem($item) {
 		$itemO=$this->getItemToAdd($item);
 		$this->addContent($itemO);
 		return $itemO;
 	}
 
-	public function insertItem($item,$position=0){
+	public function insertItem($item, $position=0) {
 		$itemO=$this->getItemToAdd($item);
-		\array_splice( $this->content, $position, 0, array($itemO));
+		\array_splice($this->content, $position, 0, array($itemO));
 		return $itemO;
 	}
 
@@ -80,7 +80,7 @@ 
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
 	public function getItem($index) {
-		if (is_int($index)&& isset($this->content[$index]))
+		if (is_int($index) && isset($this->content[$index]))
 			return $this->content[$index];
 		else {
 			$elm=$this->getElementById($index, $this->content);
@@ -93,11 +93,11 @@ 
 		return $this;
 	}
 
-	public function removeItem($index){
+	public function removeItem($index) {
 		return array_splice($this->content, $index, 1);
 	}
 
-	public function count(){
+	public function count() {
 		return \sizeof($this->content);
 	}
 
@@ -108,8 +108,8 @@ 
 		return $this->addItem($function($object));
 	}
 
-	public function apply($callBack){
-		foreach ($this->content as $item){
+	public function apply($callBack) {
+		foreach ($this->content as $item) {
 			$callBack($item);
 		}
 		return $this;
@@ -129,23 +129,23 @@ 
 	 */
 	abstract protected function createItem($value);
 
-	protected function createCondition($value){
+	protected function createCondition($value) {
 		return \is_object($value)===false;
 	}
 
-	protected function contentAs($tagName){
-		foreach ($this->content as $item){
+	protected function contentAs($tagName) {
+		foreach ($this->content as $item) {
 			$item->setTagName($tagName);
 		}
 		return $this;
 	}
 
-	public function setProperties($properties){
+	public function setProperties($properties) {
 		$i=0;
-		foreach ($properties as $k=>$v){
+		foreach ($properties as $k=>$v) {
 			$c=$this->content[$i++];
-			if(isset($c))
-				$c->setProperty($k,$v);
+			if (isset($c))
+				$c->setProperty($k, $v);
 			else
 				return $this;
 		}
@@ -158,15 +158,15 @@ 
 	 * @param array|mixed $values
 	 * @return $this
 	 */
-	public function setPropertyValues($property,$values){
-		if(\is_array($values)===false){
-			$values=\array_fill(0, $this->count(),$values);
+	public function setPropertyValues($property, $values) {
+		if (\is_array($values)===false) {
+			$values=\array_fill(0, $this->count(), $values);
 		}
-		foreach ($values as $i=>$value){
-			if(isset($this->content[$i])){
-				$this->content[$i]->setProperty($property,$value);
+		foreach ($values as $i=>$value) {
+			if (isset($this->content[$i])) {
+				$this->content[$i]->setProperty($property, $value);
 			}
-			else{
+			else {
 				return $this;
 			}
 		}
@@ -179,15 +179,15 @@ 
 	 * @param array|mixed $values
 	 * @return $this
 	 */
-	public function addPropertyValues($property,$values){
-		if(\is_array($values)===false){
-			$values=\array_fill(0, $this->count(),$values);
+	public function addPropertyValues($property, $values) {
+		if (\is_array($values)===false) {
+			$values=\array_fill(0, $this->count(), $values);
 		}
-		foreach ($values as $i=>$value){
-			if(isset($this->content[$i])){
-				$this->content[$i++]->addToProperty($property,$value);
+		foreach ($values as $i=>$value) {
+			if (isset($this->content[$i])) {
+				$this->content[$i++]->addToProperty($property, $value);
 			}
-			else{
+			else {
 				return $this;
 			}
 		}
@@ -197,13 +197,13 @@ 
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
 		$index=0;
 		$classname=\strtolower(JReflection::shortClassName($this));
-		foreach ($this->content as $item){
-			$this->setItemIdentifier($item,$classname,$index++);
+		foreach ($this->content as $item) {
+			$this->setItemIdentifier($item, $classname, $index++);
 		}
-		return parent::compile($js,$view);
+		return parent::compile($js, $view);
 	}
 
-	public function getItemById($identifier){
+	public function getItemById($identifier) {
 		return $this->getElementById($identifier, $this->content);
 	}
 
@@ -212,13 +212,13 @@ 
 	 * @param string $target
 	 * @return HtmlCollection
 	 */
-	public function asLinks($hrefs=[],$target=NUll) {
-		foreach ( $this->content as $index=>$item ) {
-			if($item instanceof HtmlDoubleElement){
+	public function asLinks($hrefs=[], $target=NUll) {
+		foreach ($this->content as $index=>$item) {
+			if ($item instanceof HtmlDoubleElement) {
 				$href="";
-				if(isset($hrefs[$index]))
+				if (isset($hrefs[$index]))
 					$href=$hrefs[$index];
-				$item->asLink($href,$target);
+				$item->asLink($href, $target);
 			}
 		}
 		return $this;
@@ -230,8 +230,8 @@ 
 	 * @param int $length  If length is omitted, removes everything from offset to the end of the array. If length is specified and is positive, then that many elements will be removed. If length is specified and is negative then the end of the removed portion will be that many elements from the end of the array. If length is specified and is zero, no elements will be removed. Tip: to remove everything from offset to the end of the array when replacement is also specified, use count($input) for length. 
 	 * @return $this
 	 */
-	public function splice($offset,$length=null){
-		$this->content=array_slice($this->content, $offset,$length);
+	public function splice($offset, $length=null) {
+		$this->content=array_slice($this->content, $offset, $length);
 		return $this;
 	}
 }

Braces +14 added lines, -14 removed lines

@@ -24,7 +24,7 @@ 
 			foreach ($items as $k=>$v){
 				$this->addItem([$k,$v]);
 			}
-		}else{
+		} else{
 			foreach ($items as $item){
 				$this->addItem($item);
 			}
@@ -80,9 +80,9 @@ 
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
 	public function getItem($index) {
-		if (is_int($index)&& isset($this->content[$index]))
-			return $this->content[$index];
-		else {
+		if (is_int($index)&& isset($this->content[$index])) {
+					return $this->content[$index];
+		} else {
 			$elm=$this->getElementById($index, $this->content);
 			return $elm;
 		}
@@ -144,10 +144,11 @@ 
 		$i=0;
 		foreach ($properties as $k=>$v){
 			$c=$this->content[$i++];
-			if(isset($c))
-				$c->setProperty($k,$v);
-			else
-				return $this;
+			if(isset($c)) {
+							$c->setProperty($k,$v);
+			} else {
+							return $this;
+			}
 		}
 		return $this;
 	}
@@ -165,8 +166,7 @@ 
 		foreach ($values as $i=>$value){
 			if(isset($this->content[$i])){
 				$this->content[$i]->setProperty($property,$value);
-			}
-			else{
+			} else{
 				return $this;
 			}
 		}
@@ -186,8 +186,7 @@ 
 		foreach ($values as $i=>$value){
 			if(isset($this->content[$i])){
 				$this->content[$i++]->addToProperty($property,$value);
-			}
-			else{
+			} else{
 				return $this;
 			}
 		}
@@ -216,8 +215,9 @@ 
 		foreach ( $this->content as $index=>$item ) {
 			if($item instanceof HtmlDoubleElement){
 				$href="";
-				if(isset($hrefs[$index]))
-					$href=$hrefs[$index];
+				if(isset($hrefs[$index])) {
+									$href=$hrefs[$index];
+				}
 				$item->asLink($href,$target);
 			}
 		}

Ajax/common/html/traits/BaseHtmlPropertiesTrait.php

Spacing +12 added lines, -12 removed lines

@@ -8,12 +8,12 @@ 
  * @author jc
  * @property BaseWidget $_self
  */
-trait BaseHtmlPropertiesTrait{
+trait BaseHtmlPropertiesTrait {
 
-	protected $properties=array ();
+	protected $properties=array();
 	abstract protected function ctrl($name, $value, $typeCtrl);
 	abstract protected function removeOldValues(&$oldValue, $allValues);
-	abstract protected function _getElementBy($callback,$elements);
+	abstract protected function _getElementBy($callback, $elements);
 	public function getProperties() {
 		return $this->_self->properties;
 	}
@@ -45,14 +45,14 @@ 
 	 */
 	public function addToProperty($name, $value, $separator=" ") {
 		if (\is_array($value)) {
-			foreach ( $value as $v ) {
+			foreach ($value as $v) {
 				$this->_self->addToProperty($name, $v, $separator);
 			}
-		} else if ($value !== "" && $this->_self->propertyContains($name, $value) === false) {
-			if(isset($this->_self->properties[$name])){
+		} else if ($value!=="" && $this->_self->propertyContains($name, $value)===false) {
+			if (isset($this->_self->properties[$name])) {
 				$v=$this->_self->properties[$name];
-				if (isset($v) && $v !== ""){
-					$value=$v . $separator . $value;
+				if (isset($v) && $v!=="") {
+					$value=$v.$separator.$value;
 				}
 			}
 			return $this->_self->setProperty($name, $value);
@@ -89,7 +89,7 @@ 
 	}
 
 	public function addToPropertyCtrlCheck($name, $value, $typeCtrl) {
-		if ($this->_self->ctrl($name, $value, $typeCtrl) === true) {
+		if ($this->_self->ctrl($name, $value, $typeCtrl)===true) {
 			return $this->_self->addToProperty($name, $value);
 		}
 		return $this;
@@ -110,12 +110,12 @@ 
 	}
 
 	protected function setPropertyCtrl($name, $value, $typeCtrl) {
-		if ($this->_self->ctrl($name, $value, $typeCtrl) === true)
+		if ($this->_self->ctrl($name, $value, $typeCtrl)===true)
 			return $this->_self->setProperty($name, $value);
 			return $this;
 	}
 
-	protected function getElementByPropertyValue($propertyName,$value, $elements) {
-		return $this->_self->_getElementBy(function(BaseHtml $element) use ($propertyName,$value){return $element->propertyContains($propertyName, $value) === true;}, $elements);
+	protected function getElementByPropertyValue($propertyName, $value, $elements) {
+		return $this->_self->_getElementBy(function(BaseHtml $element) use ($propertyName, $value){return $element->propertyContains($propertyName, $value)===true; }, $elements);
 	}
 }

Braces +12 added lines, -8 removed lines

@@ -33,8 +33,9 @@ 
 	}
 
 	public function getProperty($name) {
-		if (array_key_exists($name, $this->_self->properties))
-			return $this->_self->properties[$name];
+		if (array_key_exists($name, $this->_self->properties)) {
+					return $this->_self->properties[$name];
+		}
 	}
 
 	/**
@@ -76,8 +77,9 @@ 
 	}
 
 	protected function addToPropertyUnique($name, $value, $typeCtrl) {
-		if (is_string($typeCtrl) && @class_exists($typeCtrl, true))
-			$typeCtrl=$typeCtrl::getConstants();
+		if (is_string($typeCtrl) && @class_exists($typeCtrl, true)) {
+					$typeCtrl=$typeCtrl::getConstants();
+		}
 			if (\is_array($typeCtrl)) {
 				$this->_self->removeOldValues($this->_self->properties[$name], $typeCtrl);
 			}
@@ -96,8 +98,9 @@ 
 	}
 
 	public function removeProperty($name) {
-		if (\array_key_exists($name, $this->_self->properties))
-			unset($this->_self->properties[$name]);
+		if (\array_key_exists($name, $this->_self->properties)) {
+					unset($this->_self->properties[$name]);
+		}
 			return $this;
 	}
 
@@ -110,8 +113,9 @@ 
 	}
 
 	protected function setPropertyCtrl($name, $value, $typeCtrl) {
-		if ($this->_self->ctrl($name, $value, $typeCtrl) === true)
-			return $this->_self->setProperty($name, $value);
+		if ($this->_self->ctrl($name, $value, $typeCtrl) === true) {
+					return $this->_self->setProperty($name, $value);
+		}
 			return $this;
 	}
 

Ajax/semantic/traits/SemanticWidgetsTrait.php

Spacing +16 added lines, -16 removed lines

@@ -19,8 +19,8 @@ 
 	 * @param array $instances
 	 * @return DataTable
 	 */
-	public function dataTable($identifier,$model, $instances=null){
-		return $this->addHtmlComponent(new DataTable($identifier,$model,$instances));
+	public function dataTable($identifier, $model, $instances=null) {
+		return $this->addHtmlComponent(new DataTable($identifier, $model, $instances));
 	}
 
 	/**
@@ -29,8 +29,8 @@ 
 	 * @param array $instances
 	 * @return JsonDataTable
 	 */
-	public function jsonDataTable($identifier,$model, $instances=null){
-		return $this->addHtmlComponent(new JsonDataTable($identifier,$model,$instances));
+	public function jsonDataTable($identifier, $model, $instances=null) {
+		return $this->addHtmlComponent(new JsonDataTable($identifier, $model, $instances));
 	}
 
 	/**
@@ -38,8 +38,8 @@ 
 	 * @param object $instance
 	 * @return DataElement
 	 */
-	public function dataElement($identifier, $instance=null){
-		return $this->addHtmlComponent(new DataElement($identifier,$instance));
+	public function dataElement($identifier, $instance=null) {
+		return $this->addHtmlComponent(new DataElement($identifier, $instance));
 	}
 
 	/**
@@ -47,8 +47,8 @@ 
 	 * @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));
 	}
 
 	/**
@@ -56,8 +56,8 @@ 
 	 * @param object $instance
 	 * @return FormLogin
 	 */
-	public function defaultLogin($identifier,$instance=null){
-		return $this->addHtmlComponent(FormLogin::regular($identifier,$instance));
+	public function defaultLogin($identifier, $instance=null) {
+		return $this->addHtmlComponent(FormLogin::regular($identifier, $instance));
 	}
 
 	/**
@@ -65,8 +65,8 @@ 
 	 * @param object $instance
 	 * @return FormLogin
 	 */
-	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));
 	}
 
 	/**
@@ -74,8 +74,8 @@ 
 	 * @param object $instance
 	 * @return FormLogin
 	 */
-	public function segmentedLogin($identifier,$instance=null){
-		return $this->addHtmlComponent(FormLogin::attachedSegment($identifier,$instance));
+	public function segmentedLogin($identifier, $instance=null) {
+		return $this->addHtmlComponent(FormLogin::attachedSegment($identifier, $instance));
 	}
 
 	/**
@@ -83,7 +83,7 @@ 
 	 * @param object $instance
 	 * @return FormAccount
 	 */
-	public function defaultAccount($identifier,$instance=null){
-		return $this->addHtmlComponent(FormAccount::regular($identifier,$instance));
+	public function defaultAccount($identifier, $instance=null) {
+		return $this->addHtmlComponent(FormAccount::regular($identifier, $instance));
 	}
 }

Ajax/service/JString.php

Braces +3 added lines, -2 removed lines

@@ -64,8 +64,9 @@
 	}
 	
 	public static function doubleBackSlashes($value){
-		if(is_string($value))
-			return str_replace("\\", "\\\\", $value);
+		if(is_string($value)) {
+					return str_replace("\\", "\\\\", $value);
+		}
 			return $value;
 	}
 

Spacing +20 added lines, -20 removed lines

@@ -2,69 +2,69 @@
 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);
 	}
 
-	public static function getValueBetween(&$str,$before="{{",$after="}}"){
+	public static function getValueBetween(&$str, $before="{{", $after="}}") {
 		$matches=[];
 		$result=null;
 		$_before=\preg_quote($before);
 		$_after=\preg_quote($after);
-		if(\preg_match('/'.$_before.'(.*?)'.$_after.'/s', $str, $matches)===1){
+		if (\preg_match('/'.$_before.'(.*?)'.$_after.'/s', $str, $matches)===1) {
 			$result=$matches[1];
-			$str=\str_replace($before.$result.$after,"", $str);
+			$str=\str_replace($before.$result.$after, "", $str);
 		}
 		return $result;
 	}
 	
-	public static function doubleBackSlashes($value){
-		if(is_string($value))
+	public static function doubleBackSlashes($value) {
+		if (is_string($value))
 			return str_replace("\\", "\\\\", $value);
 			return $value;
 	}

Ajax/service/Javascript.php

Spacing +9 added lines, -9 removed lines

@@ -6,19 +6,19 @@ 
 	public static $preventDefault="\nif(event && event.preventDefault) event.preventDefault();\n";
 	public static $stopPropagation="\nif(event && event.stopPropagation) event.stopPropagation();\n";
 
-	public static function draggable($attr="id"){
+	public static function draggable($attr="id") {
 		return 'var dt=event.dataTransfer || event.originalEvent.dataTransfer;dt.setData("text/plain",JSON.stringify({id:$(event.target).attr("id"),data:$(event.target).attr("'.$attr.'")}));';
 	}
 	
-	public static function dropZone($jqueryDone,$jsCallback=""){
+	public static function dropZone($jqueryDone, $jsCallback="") {
 		return 'var dt=event.dataTransfer || event.originalEvent.dataTransfer;var _data=JSON.parse(dt.getData("text/plain"));$(event.target).'.$jqueryDone.'($("#"+_data.id));var data=_data.data;'.$jsCallback;
 	}
 	
-	public static function containsCode($expression){
-		return strrpos($expression, 'this')!==false||strrpos($expression, 'event')!==false||strrpos($expression, 'self')!==false;
+	public static function containsCode($expression) {
+		return strrpos($expression, 'this')!==false || strrpos($expression, 'event')!==false || strrpos($expression, 'self')!==false;
 	}
 	
-	public static function isFunction($jsCode){
+	public static function isFunction($jsCode) {
 		return JString::startswith($jsCode, "function");
 	}
 
@@ -50,14 +50,14 @@ 
 			$value=implode(",", $value);
 		}
 		if (self::containsCode($value)===false) {
-			$value=\str_replace(["\\","\""], ["\\\\","\\\""], $value);
+			$value=\str_replace(["\\", "\""], ["\\\\", "\\\""], $value);
 			$value='"'.$value.'"';
 		}
-		return trim($value,"%");
+		return trim($value, "%");
 	}
 
-	public static function prep_jquery_selector($value){
-		if(JString::startswith($value, '$(')===false){
+	public static function prep_jquery_selector($value) {
+		if (JString::startswith($value, '$(')===false) {
 			return '$('.self::prep_value($value).')';
 		}
 		return $value;

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/widgets/datatable/DataTable.php

Braces +39 added lines, -27 removed lines

@@ -61,16 +61,19 @@ 
 			$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);
+		}
 		if(\is_array($this->_displayBehavior)){
 			$this->_generateBehavior("display",$this->_displayBehavior,$js);
 		}
 		parent::run($js);
-		if(isset($this->_pagination))
-			$this->_associatePaginationBehavior($js,$offset);
+		if(isset($this->_pagination)) {
+					$this->_associatePaginationBehavior($js,$offset);
+		}
 		$this->_associateSearchFieldBehavior($js,$offset);
 			
 	}
@@ -105,8 +108,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);
 
@@ -136,8 +140,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);
@@ -173,7 +178,7 @@ 
 				$table->fromDatabaseObjects($objects, function($instance) use($table,$fields){
 					return $this->_generateRow($instance, $fields,$table);
 				});
-			}else{
+			} else{
 				$activeValues=array_combine($groupByFields, array_fill(0, sizeof($groupByFields), null));
 				$uuids=[];
 				$table->fromDatabaseObjects($objects, function($instance) use($table,$fields,&$activeValues,$groupByFields,&$uuids){
@@ -235,8 +240,9 @@ 
 			$field=$ck->getField();
 			$field->setProperty("value",$dataAjax);
 			$field->setProperty("name", "selection[]");
-			if(isset($checkedClass))
-				$field->setClass($checkedClass);
+			if(isset($checkedClass)) {
+							$field->setClass($checkedClass);
+			}
 			\array_unshift($values, $ck);
 		}
 		$result=$table->newRow();
@@ -253,8 +259,9 @@ 
 
 	protected function _generatePagination($table){
 		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();
@@ -286,8 +293,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."[]";
 	}
 
@@ -327,7 +335,7 @@ 
 		$hasPart=$table->hasPart($part);
 		if($hasPart){
 			$row=$table->getPart($part)->addRow(\sizeof($captions));
-		}else{
+		} else{
 			$row=$table->getPart($part)->getRow(0);
 		}
 		$row->mergeCol();
@@ -359,7 +367,7 @@ 
 			$this->_urls["edit"]=JArray::getValue($urls, "edit",1);
 			$this->_urls["delete"]=JArray::getValue($urls, "delete",2);
 			$this->_urls["display"]=JArray::getValue($urls, "display",3);
-		}else{
+		} else{
 			$this->_urls=["refresh"=>$urls,"edit"=>$urls,"delete"=>$urls,"display"=>$urls];
 		}
 		return $this;
@@ -442,8 +450,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];
 	}
 
@@ -461,8 +470,9 @@ 
 	}
 
 	public function getRefreshSelector() {
-		if(isset($this->_refreshSelector))
-			return $this->_refreshSelector;
+		if(isset($this->_refreshSelector)) {
+					return $this->_refreshSelector;
+		}
 		return "#".$this->identifier." tbody";
 	}
 
@@ -481,8 +491,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;
 	}
@@ -522,8 +533,9 @@ 
 	}
 
 	public function hideColumn($colIndex){
-		if(!\is_array($this->_hiddenColumns))
-			$this->_hiddenColumns=[];
+		if(!\is_array($this->_hiddenColumns)) {
+					$this->_hiddenColumns=[];
+		}
 		$this->_hiddenColumns[]=$colIndex;
 		return $this;
 	}

Spacing +145 added lines, -145 removed lines

@@ -25,7 +25,7 @@ 
  *
  */
 class DataTable extends Widget {
-	use TableTrait,DataTableFieldAsTrait,HasCheckboxesTrait,BaseTrait;
+	use TableTrait, DataTableFieldAsTrait, HasCheckboxesTrait, BaseTrait;
 	protected $_searchField;
 	protected $_urls;
 	protected $_pagination;
@@ -44,41 +44,41 @@ 
 	protected $_colWidths;
 
 
-	public function __construct($identifier,$model,$modelInstance=NULL) {
-		parent::__construct($identifier, $model,$modelInstance);
-		$this->_init(new InstanceViewer($identifier), "table", new HtmlTable($identifier, 0,0), false);
+	public function __construct($identifier, $model, $modelInstance=NULL) {
+		parent::__construct($identifier, $model, $modelInstance);
+		$this->_init(new InstanceViewer($identifier), "table", new HtmlTable($identifier, 0, 0), false);
 		$this->_urls=[];
-		$this->_emptyMessage=new HtmlMessage("","nothing to display");
+		$this->_emptyMessage=new HtmlMessage("", "nothing to display");
 		$this->_emptyMessage->setIcon("info circle");
 	}
 
-	public function run(JsUtils $js){
+	public function run(JsUtils $js) {
 		$offset=$js->scriptCount();
-		if($this->_hasCheckboxes && isset($js)){
+		if ($this->_hasCheckboxes && isset($js)) {
 			$this->_runCheckboxes($js);
 		}
-		if($this->_visibleHover){
-			$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 ($this->_visibleHover) {
+			$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->_displayBehavior)){
-			$this->_generateBehavior("display",$this->_displayBehavior,$js);
+		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->_displayBehavior)) {
+			$this->_generateBehavior("display", $this->_displayBehavior, $js);
 		}
 		parent::run($js);
-		if(isset($this->_pagination))
-			$this->_associatePaginationBehavior($js,$offset);
-		$this->_associateSearchFieldBehavior($js,$offset);
+		if (isset($this->_pagination))
+			$this->_associatePaginationBehavior($js, $offset);
+		$this->_associateSearchFieldBehavior($js, $offset);
 			
 	}
 
-	protected function _generateBehavior($op,$params,JsUtils $js){
-		if(isset($this->_urls[$op])){
-			$params=\array_merge($params,["attr"=>"data-ajax"]);
-			$js->ajaxOnClick("#".$this->identifier." ._".$op, $this->_urls[$op],$this->getTargetSelector($op),$params);
+	protected function _generateBehavior($op, $params, JsUtils $js) {
+		if (isset($this->_urls[$op])) {
+			$params=\array_merge($params, ["attr"=>"data-ajax"]);
+			$js->ajaxOnClick("#".$this->identifier." ._".$op, $this->_urls[$op], $this->getTargetSelector($op), $params);
 		}
 	}
 
@@ -90,34 +90,34 @@ 
 		return $this->content["table"];
 	}
 	
-	public function refreshTR(){
+	public function refreshTR() {
 		$this->getTable()->refreshTR();
 		return $this;
 	}
 	
-	public function refreshTD($fieldName,$jquery,$view){
+	public function refreshTD($fieldName, $jquery, $view) {
 		$index=$this->_getIndex($fieldName);
-		$this->compile($jquery,$view);
-		return $this->refreshTR()->getTable()->getCell(0,$index);
+		$this->compile($jquery, $view);
+		return $this->refreshTR()->getTable()->getCell(0, $index);
 	}
 	
 
 
-	public function compile(JsUtils $js=NULL,&$view=NULL){
-		if(!$this->_generated){
-			if(isset($this->_buttonsColumn)){
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
+		if (!$this->_generated) {
+			if (isset($this->_buttonsColumn)) {
 				$this->_instanceViewer->sortColumnContent($this->_buttonsColumn, $this->_buttons);
 			}
 			$this->_instanceViewer->setInstance($this->_model);
 			$captions=$this->_instanceViewer->getCaptions();
 			$table=$this->content["table"];
-			if($this->_hasCheckboxes){
+			if ($this->_hasCheckboxes) {
 				$this->_generateMainCheckbox($captions);
 			}
 			$table->setRowCount(0, \sizeof($captions));
-			$this->_generateHeader($table,$captions);
+			$this->_generateHeader($table, $captions);
 
-			if(isset($this->_compileParts))
+			if (isset($this->_compileParts))
 				$table->setCompileParts($this->_compileParts);
 
 			$this->_generateContent($table);
@@ -125,158 +125,158 @@ 
 			$this->compileExtraElements($table, $captions);
 			$this->_compileSearchFieldBehavior($js);
 
-			$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->_applyStyleAttributes($table);
 			$this->_generated=true;
 		}
-		return parent::compile($js,$view);
+		return parent::compile($js, $view);
 	}
 
-	protected function compileExtraElements($table,$captions){
+	protected function compileExtraElements($table, $captions) {
 
-		if($this->_hasCheckboxes && $table->hasPart("thead")){
+		if ($this->_hasCheckboxes && $table->hasPart("thead")) {
 			$table->getHeader()->getCell(0, 0)->addClass("no-sort");
 		}
 
-		if(isset($this->_toolbar)){
+		if (isset($this->_toolbar)) {
 			$this->_setToolbarPosition($table, $captions);
 		}
-		if(isset($this->_pagination) && $this->_pagination->getVisible()){
+		if (isset($this->_pagination) && $this->_pagination->getVisible()) {
 			$this->_generatePagination($table);
 		}
 	}
 
-	protected function _applyStyleAttributes($table){
-		if(isset($this->_hiddenColumns))
+	protected function _applyStyleAttributes($table) {
+		if (isset($this->_hiddenColumns))
 			$this->_hideColumns();
-			if(isset($this->_colWidths)){
-				foreach ($this->_colWidths as $colIndex=>$width){
-					$table->setColWidth($colIndex,$width);
+			if (isset($this->_colWidths)) {
+				foreach ($this->_colWidths as $colIndex=>$width) {
+					$table->setColWidth($colIndex, $width);
 				}
 			}
 	}
 
-	protected function _hideColumns(){
-		foreach ($this->_hiddenColumns as $colIndex){
+	protected function _hideColumns() {
+		foreach ($this->_hiddenColumns as $colIndex) {
 			$this->_self->hideColumn($colIndex);
 		}
 		return $this;
 	}
 
-	protected function _generateHeader(HtmlTable $table,$captions){
+	protected function _generateHeader(HtmlTable $table, $captions) {
 		$table->setHeaderValues($captions);
-		if(isset($this->_sortable)){
+		if (isset($this->_sortable)) {
 			$table->setSortable($this->_sortable);
 		}
 	}
 
 
 
-	protected function _generateContent($table){
+	protected function _generateContent($table) {
 		$objects=$this->_modelInstance;
-		if(isset($this->_pagination)){
+		if (isset($this->_pagination)) {
 			$objects=$this->_pagination->getObjects($this->_modelInstance);
 		}
 			InstanceViewer::setIndex(0);
 			$fields=$this->_instanceViewer->getSimpleProperties();
 			$groupByFields=$this->_instanceViewer->getGroupByFields();
-			if(!is_array($groupByFields)){
-				$table->fromDatabaseObjects($objects, function($instance) use($table,$fields){
-					return $this->_generateRow($instance, $fields,$table);
+			if (!is_array($groupByFields)) {
+				$table->fromDatabaseObjects($objects, function($instance) use($table, $fields){
+					return $this->_generateRow($instance, $fields, $table);
 				});
-			}else{
+			} else {
 				$activeValues=array_combine($groupByFields, array_fill(0, sizeof($groupByFields), null));
 				$uuids=[];
-				$table->fromDatabaseObjects($objects, function($instance) use($table,$fields,&$activeValues,$groupByFields,&$uuids){
+				$table->fromDatabaseObjects($objects, function($instance) use($table, $fields, &$activeValues, $groupByFields, &$uuids){
 					$this->_instanceViewer->setInstance($instance);
-					foreach ($groupByFields as $index=>$gbField){
-						$this->_generateGroupByRow($index, $gbField, $table,$fields,$activeValues, $uuids);
+					foreach ($groupByFields as $index=>$gbField) {
+						$this->_generateGroupByRow($index, $gbField, $table, $fields, $activeValues, $uuids);
 					}
-					return $this->_generateRow($instance, $fields,$table,null,$uuids);
+					return $this->_generateRow($instance, $fields, $table, null, $uuids);
 				});
 			}
-		if($table->getRowCount()==0){
+		if ($table->getRowCount()==0) {
 			$result=$table->addRow();
 			$result->mergeRow();
 			$result->setValues([$this->_emptyMessage]);
 		}
 	}
 	
-	protected function _generateGroupByRow($index,$gbField,$table,$fields,&$activeValues,&$uuids){
+	protected function _generateGroupByRow($index, $gbField, $table, $fields, &$activeValues, &$uuids) {
 		$newValue=$this->_instanceViewer->getValue($gbField);
-		if($this->getElementContent($activeValues[$gbField])!==$this->getElementContent($newValue)){
-			if($index==0){
+		if ($this->getElementContent($activeValues[$gbField])!==$this->getElementContent($newValue)) {
+			if ($index==0) {
 				$uuids=[];
 			}
 			$uuid=uniqid("grp");
 			$uuids[$gbField]=$uuid;
 			$id=$this->_instanceViewer->getIdentifier();
-			$result=$table->addMergeRow(sizeof($fields)+1,$newValue);
+			$result=$table->addMergeRow(sizeof($fields)+1, $newValue);
 			$result->setIdentifier($this->identifier."-tr-gb-".$id);
-			$result->setProperty("data-ajax",$id);
-			$result->setProperty("data-group",$uuid);
-			$result->addToProperty("class",$this->_rowClass);
+			$result->setProperty("data-ajax", $id);
+			$result->setProperty("data-group", $uuid);
+			$result->addToProperty("class", $this->_rowClass);
 			$activeValues[$gbField]=$newValue;
 		}
 	}
 	
-	private function getElementContent($elm){
-		if($elm instanceof HtmlDoubleElement){
+	private function getElementContent($elm) {
+		if ($elm instanceof HtmlDoubleElement) {
 			return $elm->getTextContent();
 		}
 		return $elm;
 	}
 	
-	public function getFieldValue($index){
+	public function getFieldValue($index) {
 		$index=$this->_getIndex($index);
-		if(is_numeric($index)){
-			$values= $this->_instanceViewer->getValues();
-			if(isset($values[$index])){
+		if (is_numeric($index)) {
+			$values=$this->_instanceViewer->getValues();
+			if (isset($values[$index])) {
 				return $values[$index];
 			}
 		}
 		return null;
 	}
 
-	protected function _generateRow($instance,$fields,&$table,$checkedClass=null,$uuids=null){
+	protected function _generateRow($instance, $fields, &$table, $checkedClass=null, $uuids=null) {
 		$this->_instanceViewer->setInstance($instance);
 		InstanceViewer::$index++;
-		$values= $this->_instanceViewer->getValues();
+		$values=$this->_instanceViewer->getValues();
 		$id=$this->_instanceViewer->getIdentifier();
 		$dataAjax=$id;
 		$id=$this->cleanIdentifier($id);
-		if($this->_hasCheckboxes){
-			$ck=new HtmlCheckbox("ck-".$this->identifier."-".$id,"");
+		if ($this->_hasCheckboxes) {
+			$ck=new HtmlCheckbox("ck-".$this->identifier."-".$id, "");
 			$checked=false;
-			if(isset($this->_checkedCallback)){
+			if (isset($this->_checkedCallback)) {
 				$func=$this->_checkedCallback;
 				$checked=$func($instance);
 			}
 			$ck->setChecked($checked);
 			$ck->setOnChange("event.stopPropagation();");
 			$field=$ck->getField();
-			$field->setProperty("value",$dataAjax);
+			$field->setProperty("value", $dataAjax);
 			$field->setProperty("name", "selection[]");
-			if(isset($checkedClass))
+			if (isset($checkedClass))
 				$field->setClass($checkedClass);
 			\array_unshift($values, $ck);
 		}
 		$result=$table->newRow();
 		$result->setIdentifier($this->identifier."-tr-".$id);
-		$result->setProperty("data-ajax",$dataAjax);
+		$result->setProperty("data-ajax", $dataAjax);
 		$result->setValues($values);
-		$result->addToProperty("class",$this->_rowClass);
+		$result->addToProperty("class", $this->_rowClass);
 		$result->setPropertyValues("data-field", $fields);
-		if(isset($uuids)){
-			$result->setProperty("data-child",implode(" ", $uuids));
+		if (isset($uuids)) {
+			$result->setProperty("data-child", implode(" ", $uuids));
 		}
 		return $result;
 	}
 
-	protected function _generatePagination($table){
-		if(isset($this->_toolbar)){
-			if($this->_toolbarPosition==PositionInTable::FOOTER)
+	protected function _generatePagination($table) {
+		if (isset($this->_toolbar)) {
+			if ($this->_toolbarPosition==PositionInTable::FOOTER)
 				$this->_toolbar->setFloated("left");
 		}
 		$footer=$table->getFooter();
@@ -284,51 +284,51 @@ 
 		$footer->addValues($this->_pagination->generateMenu($this->identifier));
 	}
 
-	protected function _associatePaginationBehavior(JsUtils $js=NULL,$offset=null){
-		if(isset($this->_urls["refresh"])){
+	protected function _associatePaginationBehavior(JsUtils $js=NULL, $offset=null) {
+		if (isset($this->_urls["refresh"])) {
 			$menu=$this->_pagination->getMenu();
-			if(isset($menu) && isset($js)){
-				$js->postOnClick("#".$menu->getIdentifier()." .item",$this->_urls["refresh"],"{'p':$(this).attr('data-page'),'_model':'".JString::doubleBackSlashes($this->_model)."'}",$this->getRefreshSelector(),["preventDefault"=>false,"jqueryDone"=>"replaceWith","hasLoader"=>false,"jsCallback"=>'$("#'.$this->identifier.'").trigger("pageChange");$("#'.$this->identifier.'").trigger("activeRowChange");']);
+			if (isset($menu) && isset($js)) {
+				$js->postOnClick("#".$menu->getIdentifier()." .item", $this->_urls["refresh"], "{'p':$(this).attr('data-page'),'_model':'".JString::doubleBackSlashes($this->_model)."'}", $this->getRefreshSelector(), ["preventDefault"=>false, "jqueryDone"=>"replaceWith", "hasLoader"=>false, "jsCallback"=>'$("#'.$this->identifier.'").trigger("pageChange");$("#'.$this->identifier.'").trigger("activeRowChange");']);
 				$page=URequest::post("p");
-				if(isset($page)){
+				if (isset($page)) {
 					$js->execAtLast('$("#'.$this->getIdentifier().' .pagination").children("a.item").removeClass("active");$("#'.$this->getIdentifier().' .pagination").children("a.item[data-page='.$page.']:not(.no-active)").addClass("active");');
 				}				
 			}
 		}
 	}
 	
-	protected function _compileSearchFieldBehavior(JsUtils $js=NULL){
-		if(isset($this->_searchField) && isset($js) && isset($this->_urls["refresh"])){
-			$this->_searchField->postOn("change", $this->_urls["refresh"],"{'s':$(self).val(),'_model':'".JString::doubleBackSlashes($this->_model)."'}","#".$this->identifier." tbody",["preventDefault"=>false,"jqueryDone"=>"replaceWith","hasLoader"=>"internal","jsCallback"=>'$("#'.$this->identifier.'").trigger("searchTerminate",[$(self).val()]);']);
+	protected function _compileSearchFieldBehavior(JsUtils $js=NULL) {
+		if (isset($this->_searchField) && isset($js) && isset($this->_urls["refresh"])) {
+			$this->_searchField->postOn("change", $this->_urls["refresh"], "{'s':$(self).val(),'_model':'".JString::doubleBackSlashes($this->_model)."'}", "#".$this->identifier." tbody", ["preventDefault"=>false, "jqueryDone"=>"replaceWith", "hasLoader"=>"internal", "jsCallback"=>'$("#'.$this->identifier.'").trigger("searchTerminate",[$(self).val()]);']);
 		}
 	}
-	protected function _associateSearchFieldBehavior(JsUtils $js=NULL,$offset=null){
+	protected function _associateSearchFieldBehavior(JsUtils $js=NULL, $offset=null) {
 		
 	}
 
-	protected function _getFieldName($index){
+	protected function _getFieldName($index) {
 		$fieldName=parent::_getFieldName($index);
-		if(\is_object($fieldName))
+		if (\is_object($fieldName))
 			$fieldName="field-".$index;
 		return $fieldName."[]";
 	}
 
-	protected function _getFieldCaption($index){
+	protected function _getFieldCaption($index) {
 		return null;
 	}
 
-	protected function _setToolbarPosition($table,$captions=NULL){
-		switch ($this->_toolbarPosition){
+	protected function _setToolbarPosition($table, $captions=NULL) {
+		switch ($this->_toolbarPosition) {
 			case PositionInTable::BEFORETABLE:
 			case PositionInTable::AFTERTABLE:
-				if(isset($this->_compileParts)===false){
+				if (isset($this->_compileParts)===false) {
 					$this->content[$this->_toolbarPosition]=$this->_toolbar;
 				}
 				break;
 			case PositionInTable::HEADER:
 			case PositionInTable::FOOTER:
 			case PositionInTable::BODY:
-				$this->addToolbarRow($this->_toolbarPosition,$table, $captions);
+				$this->addToolbarRow($this->_toolbarPosition, $table, $captions);
 				break;
 		}
 	}
@@ -340,16 +340,16 @@ 
 	 * @param callable $callback function called after the field compilation
 	 * @return DataTable
 	 */
-	public function afterCompile($index,$callback){
-		$this->_instanceViewer->afterCompile($index,$callback);
+	public function afterCompile($index, $callback) {
+		$this->_instanceViewer->afterCompile($index, $callback);
 		return $this;
 	}
 
-	private function addToolbarRow($part,$table,$captions){
+	private function addToolbarRow($part, $table, $captions) {
 		$hasPart=$table->hasPart($part);
-		if($hasPart){
+		if ($hasPart) {
 			$row=$table->getPart($part)->addRow(\sizeof($captions));
-		}else{
+		} else {
 			$row=$table->getPart($part)->getRow(0);
 		}
 		$row->mergeCol();
@@ -361,7 +361,7 @@ 
 	 * @see Widget::getHtmlComponent()
 	 * @return HtmlTable
 	 */
-	public function getHtmlComponent(){
+	public function getHtmlComponent() {
 		return $this->content["table"];
 	}
 
@@ -376,13 +376,13 @@ 
 	 * @return DataTable
 	 */
 	public function setUrls($urls) {
-		if(\is_array($urls)){
-			$this->_urls["refresh"]=JArray::getValue($urls, "refresh",0);
-			$this->_urls["edit"]=JArray::getValue($urls, "edit",1);
-			$this->_urls["delete"]=JArray::getValue($urls, "delete",2);
-			$this->_urls["display"]=JArray::getValue($urls, "display",3);
-		}else{
-			$this->_urls=["refresh"=>$urls,"edit"=>$urls,"delete"=>$urls,"display"=>$urls];
+		if (\is_array($urls)) {
+			$this->_urls["refresh"]=JArray::getValue($urls, "refresh", 0);
+			$this->_urls["edit"]=JArray::getValue($urls, "edit", 1);
+			$this->_urls["delete"]=JArray::getValue($urls, "delete", 2);
+			$this->_urls["display"]=JArray::getValue($urls, "display", 3);
+		} else {
+			$this->_urls=["refresh"=>$urls, "edit"=>$urls, "delete"=>$urls, "display"=>$urls];
 		}
 		return $this;
 	}
@@ -395,8 +395,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){
-		$this->_pagination=new Pagination($items_per_page,$pages_visibles,$page,$total_rowcount);
+	public function paginate($page, $total_rowcount, $items_per_page=10, $pages_visibles=null) {
+		$this->_pagination=new Pagination($items_per_page, $pages_visibles, $page, $total_rowcount);
 		return $this;
 	}
 
@@ -407,8 +407,8 @@ 
 	 * @param number $pages_visibles The number of visible pages in the Pagination component
 	 * @return DataTable
 	 */
-	public function autoPaginate($page=1,$items_per_page=10,$pages_visibles=4){
-		$this->_pagination=new Pagination($items_per_page,$pages_visibles,$page);
+	public function autoPaginate($page=1, $items_per_page=10, $pages_visibles=4) {
+		$this->_pagination=new Pagination($items_per_page, $pages_visibles, $page);
 		return $this;
 	}
 
@@ -418,7 +418,7 @@ 
 	 * @param array $compileParts
 	 * @return DataTable
 	 */
-	public function refresh($compileParts=["tbody"]){
+	public function refresh($compileParts=["tbody"]) {
 		$this->_compileParts=$compileParts;
 		return $this;
 	}
@@ -429,14 +429,14 @@ 
 	 * @param string $position
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addSearchInToolbar($position=Direction::RIGHT){
+	public function addSearchInToolbar($position=Direction::RIGHT) {
 		return $this->addInToolbar($this->getSearchField())->setPosition($position);
 	}
 
-	public function getSearchField(){
-		if(isset($this->_searchField)===false){
-			$this->_searchField=new HtmlInput("search-".$this->identifier,"search","","Search...");
-			$this->_searchField->addIcon("search",Direction::RIGHT);
+	public function getSearchField() {
+		if (isset($this->_searchField)===false) {
+			$this->_searchField=new HtmlInput("search-".$this->identifier, "search", "", "Search...");
+			$this->_searchField->addIcon("search", Direction::RIGHT);
 		}
 		return $this->_searchField;
 	}
@@ -456,7 +456,7 @@ 
 	 * Returns a form corresponding to the Datatable
 	 * @return \Ajax\semantic\html\collections\form\HtmlForm
 	 */
-	public function asForm(){
+	public function asForm() {
 		return $this->getForm();
 	}
 
@@ -464,7 +464,7 @@ 
 
 	protected function getTargetSelector($op) {
 		$result=$this->_targetSelector;
-		if(!isset($result[$op]))
+		if (!isset($result[$op]))
 			$result="#".$this->identifier;
 		return $result[$op];
 	}
@@ -475,15 +475,15 @@ 
 	 * @return DataTable
 	 */
 	public function setTargetSelector($_targetSelector) {
-		if(!\is_array($_targetSelector)){
-			$_targetSelector=["edit"=>$_targetSelector,"delete"=>$_targetSelector];
+		if (!\is_array($_targetSelector)) {
+			$_targetSelector=["edit"=>$_targetSelector, "delete"=>$_targetSelector];
 		}
 		$this->_targetSelector=$_targetSelector;
 		return $this;
 	}
 
 	public function getRefreshSelector() {
-		if(isset($this->_refreshSelector))
+		if (isset($this->_refreshSelector))
 			return $this->_refreshSelector;
 		return "#".$this->identifier." tbody";
 	}
@@ -501,9 +501,9 @@ 
 	 * {@inheritDoc}
 	 * @see \Ajax\common\Widget::show()
 	 */
-	public function show($modelInstance){
-		if(\is_array($modelInstance)){
-			if(isset($modelInstance[0]) && \is_array(array_values($modelInstance)[0]))
+	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);
 		}
 		$this->_modelInstance=$modelInstance;
@@ -538,37 +538,37 @@ 
 		return $this;
 	}
 
-	public function setActiveRowSelector($class="active",$event="click",$multiple=false){
-		$this->_self->setActiveRowSelector($class,$event,$multiple);
+	public function setActiveRowSelector($class="active", $event="click", $multiple=false) {
+		$this->_self->setActiveRowSelector($class, $event, $multiple);
 		return $this;
 	}
 
-	public function hideColumn($colIndex){
-		if(!\is_array($this->_hiddenColumns))
+	public function hideColumn($colIndex) {
+		if (!\is_array($this->_hiddenColumns))
 			$this->_hiddenColumns=[];
 		$this->_hiddenColumns[]=$colIndex;
 		return $this;
 	}
 
-	public function setColWidth($colIndex,$width){
+	public function setColWidth($colIndex, $width) {
 		$this->_colWidths[$colIndex]=$width;
 		return $this;
 	}
 	public function setColWidths($_colWidths) {
-		$this->_colWidths = $_colWidths;
+		$this->_colWidths=$_colWidths;
 		return $this;
 	}
 
-	public function setColAlignment($colIndex,$alignment){
-		$this->content["table"]->setColAlignment($colIndex,$alignment);
+	public function setColAlignment($colIndex, $alignment) {
+		$this->content["table"]->setColAlignment($colIndex, $alignment);
 		return $this;
 	}
 	
-	public function trigger($event,$params="[]"){
-		return $this->getHtmlComponent()->trigger($event,$params);
+	public function trigger($event, $params="[]") {
+		return $this->getHtmlComponent()->trigger($event, $params);
 	}
 	
-	public function onActiveRowChange($jsCode){
+	public function onActiveRowChange($jsCode) {
 		$this->getHtmlComponent()->onActiveRowChange($jsCode);
 		return $this;
 	}
@@ -596,7 +596,7 @@ 
 	 * @param mixed $_displayBehavior
 	 */
 	public function setDisplayBehavior($_displayBehavior) {
-		$this->_displayBehavior = $_displayBehavior;
+		$this->_displayBehavior=$_displayBehavior;
 	}
 	/**
 	 * @return mixed

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;
 	}