phpMv / phpMv-UI

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

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

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

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/common/traits/JsUtilsActionsTrait.php

Spacing +47 added lines, -47 removed lines

@@ -11,7 +11,7 @@ 
  */
 trait JsUtilsActionsTrait {
 
-	abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true);
+	abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true);
 	/**
 	 * show or hide with effect
 	 *
@@ -22,7 +22,7 @@ 
 	 * @param boolean $immediatly defers the execution if set to false
 	 * @return string
 	 */
-	protected function _showHideWithEffect($action,$element='this', $speed='', $callback='', $immediatly=false) {
+	protected function _showHideWithEffect($action, $element='this', $speed='', $callback='', $immediatly=false) {
 		$element=Javascript::prep_element($element);
 		$speed=$this->_validate_speed($speed);
 		if ($callback!='') {
@@ -39,8 +39,8 @@ 
 	 * @return string
 	 */
 	private function _validate_speed($speed) {
-		if (in_array($speed, array (
-				'slow','normal','fast'
+		if (in_array($speed, array(
+				'slow', 'normal', 'fast'
 		))) {
 			$speed='"'.$speed.'"';
 		} elseif (preg_match("/[^0-9]/", $speed)) {
@@ -57,7 +57,7 @@ 
 	 * @param string $param
 	 * @param boolean $immediatly delayed if false
 	 */
-	public function _genericCallValue($jQueryCall,$element='this', $param="", $immediatly=false) {
+	public function _genericCallValue($jQueryCall, $element='this', $param="", $immediatly=false) {
 		$element=Javascript::prep_element($element);
 		if (isset($param)) {
 			$param=Javascript::prep_value($param);
@@ -77,7 +77,7 @@ 
 	 * @param boolean $immediatly delayed if false
 	 * @return string
 	 */
-	public function _genericCallElement($jQueryCall,$to='this', $element, $immediatly=false) {
+	public function _genericCallElement($jQueryCall, $to='this', $element, $immediatly=false) {
 		$to=Javascript::prep_element($to);
 		$element=Javascript::prep_element($element);
 		$str="$({$to}).{$jQueryCall}({$element});";
@@ -94,7 +94,7 @@ 
 	 * @return string
 	 */
 	public function addClass($element='this', $class='', $immediatly=false) {
-		return $this->_genericCallValue('addClass',$element, $class, $immediatly);
+		return $this->_genericCallValue('addClass', $element, $class, $immediatly);
 	}
 
 	/**
@@ -104,8 +104,8 @@ 
 	 * @param boolean $immediatly defers the execution if set to false
 	 * @return string
 	 */
-	public function after($to, $element, $immediatly=false){
-		return $this->_genericCallElement('after',$to, $element, $immediatly);
+	public function after($to, $element, $immediatly=false) {
+		return $this->_genericCallElement('after', $to, $element, $immediatly);
 	}
 
 	/**
@@ -115,8 +115,8 @@ 
 	 * @param boolean $immediatly defers the execution if set to false
 	 * @return string
 	 */
-	public function before($to, $element, $immediatly=false){
-		return $this->_genericCallElement('before',$to, $element, $immediatly);
+	public function before($to, $element, $immediatly=false) {
+		return $this->_genericCallElement('before', $to, $element, $immediatly);
 	}
 
 	/**
@@ -144,8 +144,8 @@ 
 	 * @param string $value
 	 * @param boolean $immediatly defers the execution if set to false
 	 */
-	public function val($element='this',$value='',$immediatly=false){
-		return $this->_genericCallValue('val',$element,$value,$immediatly);
+	public function val($element='this', $value='', $immediatly=false) {
+		return $this->_genericCallValue('val', $element, $value, $immediatly);
 	}
 
 	/**
@@ -155,7 +155,7 @@ 
 	 * @param boolean $immediatly defers the execution if set to false
 	 */
 	public function html($element='this', $value='', $immediatly=false) {
-		return $this->_genericCallValue('html',$element, $value, $immediatly);
+		return $this->_genericCallValue('html', $element, $value, $immediatly);
 	}
 
 	/**
@@ -174,7 +174,7 @@ 
 
 		$animations="\t\t\t";
 		if (\is_array($params)) {
-			foreach ( $params as $param => $value ) {
+			foreach ($params as $param => $value) {
 				$animations.=$param.': \''.$value.'\', ';
 			}
 		}
@@ -203,7 +203,7 @@ 
 	 * @return string
 	 */
 	public function append($to, $element, $immediatly=false) {
-		return $this->_genericCallElement('append',$to, $element, $immediatly);
+		return $this->_genericCallElement('append', $to, $element, $immediatly);
 	}
 
 	/**
@@ -214,7 +214,7 @@ 
 	 * @return string
 	 */
 	public function prepend($to, $element, $immediatly=false) {
-		return $this->_genericCallElement('prepend',$to, $element, $immediatly);
+		return $this->_genericCallElement('prepend', $to, $element, $immediatly);
 	}
 
 	/**
@@ -227,7 +227,7 @@ 
 	 * @return string
 	 */
 	public function fadeIn($element='this', $speed='', $callback='', $immediatly=false) {
-		return $this->_showHideWithEffect("fadeIn",$element,$speed,$callback,$immediatly);
+		return $this->_showHideWithEffect("fadeIn", $element, $speed, $callback, $immediatly);
 	}
 
 	/**
@@ -240,7 +240,7 @@ 
 	 * @return string
 	 */
 	public function fadeOut($element='this', $speed='', $callback='', $immediatly=false) {
-		return $this->_showHideWithEffect("fadeOut",$element,$speed,$callback,$immediatly);
+		return $this->_showHideWithEffect("fadeOut", $element, $speed, $callback, $immediatly);
 	}
 
 	/**
@@ -253,7 +253,7 @@ 
 	 * @return string
 	 */
 	public function slideUp($element='this', $speed='', $callback='', $immediatly=false) {
-		return $this->_showHideWithEffect("slideUp",$element,$speed,$callback,$immediatly);
+		return $this->_showHideWithEffect("slideUp", $element, $speed, $callback, $immediatly);
 	}
 
 	/**
@@ -265,7 +265,7 @@ 
 	 * @return string
 	 */
 	public function removeClass($element='this', $class='', $immediatly=false) {
-		return $this->_genericCallValue('removeClass',$element, $class, $immediatly);
+		return $this->_genericCallValue('removeClass', $element, $class, $immediatly);
 	}
 
 	/**
@@ -278,7 +278,7 @@ 
 	 * @return string
 	 */
 	public function slideDown($element='this', $speed='', $callback='', $immediatly=false) {
-		return $this->_showHideWithEffect("slideDown",$element,$speed,$callback,$immediatly);
+		return $this->_showHideWithEffect("slideDown", $element, $speed, $callback, $immediatly);
 	}
 
 	/**
@@ -291,7 +291,7 @@ 
 	 * @return string
 	 */
 	public function slideToggle($element='this', $speed='', $callback='', $immediatly=false) {
-		return $this->_showHideWithEffect("slideToggle",$element,$speed,$callback,$immediatly);
+		return $this->_showHideWithEffect("slideToggle", $element, $speed, $callback, $immediatly);
 	}
 
 	/**
@@ -304,7 +304,7 @@ 
 	 * @return string
 	 */
 	public function hide($element='this', $speed='', $callback='', $immediatly=false) {
-		return $this->_showHideWithEffect("hide",$element,$speed,$callback,$immediatly);
+		return $this->_showHideWithEffect("hide", $element, $speed, $callback, $immediatly);
 	}
 
 	/**
@@ -317,7 +317,7 @@ 
 	 * @return string
 	 */
 	public function toggle($element='this', $speed='', $callback='', $immediatly=false) {
-		return $this->_showHideWithEffect("toggle",$element,$speed,$callback,$immediatly);
+		return $this->_showHideWithEffect("toggle", $element, $speed, $callback, $immediatly);
 	}
 
 	/**
@@ -329,7 +329,7 @@ 
 	 * @return string
 	 */
 	public function toggleClass($element='this', $class='', $immediatly=false) {
-		return $this->_genericCallValue('toggleClass',$element, $class, $immediatly);
+		return $this->_genericCallValue('toggleClass', $element, $class, $immediatly);
 	}
 
 	/**
@@ -357,7 +357,7 @@ 
 	 * @return string
 	 */
 	public function show($element='this', $speed='', $callback='', $immediatly=false) {
-		return $this->_showHideWithEffect("show",$element,$speed,$callback,$immediatly);
+		return $this->_showHideWithEffect("show", $element, $speed, $callback, $immediatly);
 	}
 
 	/**
@@ -369,8 +369,8 @@ 
 	 */
 	public function sortable($element, $options=array()) {
 		if (count($options)>0) {
-			$sort_options=array ();
-			foreach ( $options as $k => $v ) {
+			$sort_options=array();
+			foreach ($options as $k => $v) {
 				$sort_options[]="\n\t\t".$k.': '.$v."";
 			}
 			$sort_options=implode(",", $sort_options);
@@ -467,8 +467,8 @@ 
 	 * @param boolean $immediatly
 	 * @return string
 	 */
-	private function _doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param="", $preventDefault=false, $stopPropagation=false, $jsCallback="",$immediatly=true) {
-		return $this->_add_event($element, $this->_doJQuery($elementToModify, $jqueryCall, $param, $jsCallback), $event, $preventDefault, $stopPropagation,$immediatly);
+	private function _doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param="", $preventDefault=false, $stopPropagation=false, $jsCallback="", $immediatly=true) {
+		return $this->_add_event($element, $this->_doJQuery($elementToModify, $jqueryCall, $param, $jsCallback), $event, $preventDefault, $stopPropagation, $immediatly);
 	}
 
 	/**
@@ -486,7 +486,7 @@ 
 		$preventDefault=false;
 		$immediatly=true;
 		extract($parameters);
-		return $this->_doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param, $preventDefault, $stopPropagation, $jsCallback,$immediatly);
+		return $this->_doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param, $preventDefault, $stopPropagation, $jsCallback, $immediatly);
 	}
 
 	/**
@@ -527,11 +527,11 @@ 
 		$preventDefault=false;
 		$immediatly=true;
 		extract($parameters);
-		$script=$this->_add_event($element, $this->exec($js), $event, $preventDefault, $stopPropagation,$immediatly);
+		$script=$this->_add_event($element, $this->exec($js), $event, $preventDefault, $stopPropagation, $immediatly);
 		return $script;
 	}
 	
-	public function setJsonToElement($json,$elementClass="_element",$immediatly=true){
+	public function setJsonToElement($json, $elementClass="_element", $immediatly=true) {
 		$retour="var data={$json};"
 				."\n\tdata=($.isPlainObject(data))?data:JSON.parse(data);"
 				."\n\tvar pk=data['pk'];var object=data['object'];"
@@ -542,7 +542,7 @@ 
 				."\n\t});"
 				."\n}};\n";
 		$retour.="\t$(document).trigger('jsonReady',[data]);\n";
-		return $this->exec($retour,$immediatly);
+		return $this->exec($retour, $immediatly);
 	}
 	
 	/**
@@ -550,10 +550,10 @@ 
 	 * @param string $element The element selector
 	 * @param array $parameters default : array("attr"=>"id","preventDefault"=>false,"stopPropagation"=>false,"immediatly"=>true)
 	 */
-	public function setDraggable($element,$parameters=[]){
+	public function setDraggable($element, $parameters=[]) {
 		$attr="id";
 		extract($parameters);
-		$script=$this->_add_event($element, Javascript::draggable($attr), "dragstart",$parameters);
+		$script=$this->_add_event($element, Javascript::draggable($attr), "dragstart", $parameters);
 		return $script;
 	}
 	
@@ -563,29 +563,29 @@ 
 	 * @param array $parameters default : array("attr"=>"id","stopPropagation"=>false,"immediatly"=>true,"jqueryDone"=>"append")
 	 * @param string $jsCallback the js script to call when element is dropped
 	 */
-	public function asDropZone($element,$jsCallback="",$parameters=[]){
+	public function asDropZone($element, $jsCallback="", $parameters=[]) {
 		$stopPropagation=false;
 		$immediatly=true;
 		$jqueryDone="append";
-		$script=$this->_add_event($element, '', "dragover",true,$stopPropagation,$immediatly);
+		$script=$this->_add_event($element, '', "dragover", true, $stopPropagation, $immediatly);
 		extract($parameters);
-		$script.=$this->_add_event($element, Javascript::dropZone($jqueryDone,$jsCallback), "drop",true,$stopPropagation,$immediatly);
+		$script.=$this->_add_event($element, Javascript::dropZone($jqueryDone, $jsCallback), "drop", true, $stopPropagation, $immediatly);
 		return $script;
 	}
 	
-	public function interval($jsCode,$time,$globalName=null,$immediatly=true){
-		if(!Javascript::isFunction($jsCode)){
+	public function interval($jsCode, $time, $globalName=null, $immediatly=true) {
+		if (!Javascript::isFunction($jsCode)) {
 			$jsCode="function(){\n".$jsCode."\n}";
 		}
-		if(isset($globalName)){
+		if (isset($globalName)) {
 			$script="if(window.{$globalName}){clearInterval(window.{$globalName});}\nwindow.{$globalName}=setInterval({$jsCode},{$time});";
-		}else{
+		} else {
 			$script="setInterval({$jsCode},{$time});";
 		}
-		return $this->exec($script,$immediatly);
+		return $this->exec($script, $immediatly);
 	}
 	
-	public function clearInterval($globalName,$immediatly=true){
-		return $this->exec("if(window.{$globalName}){clearInterval(window.{$globalName});}",$immediatly);
+	public function clearInterval($globalName, $immediatly=true) {
+		return $this->exec("if(window.{$globalName}){clearInterval(window.{$globalName});}", $immediatly);
 	}
 }

Braces +37 added lines, -25 removed lines

@@ -29,8 +29,9 @@ 
 			$callback=", function(){\n{$callback}\n}";
 		}
 		$str="$({$element}).{$action}({$speed}{$callback});";
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 			return $str;
 	}
 	/**
@@ -62,10 +63,12 @@ 
 		if (isset($param)) {
 			$param=Javascript::prep_value($param);
 			$str="$({$element}).{$jQueryCall}({$param});";
-		} else
-			$str="$({$element}).{$jQueryCall}();";
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		} else {
+					$str="$({$element}).{$jQueryCall}();";
+		}
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 		return $str;
 	}
 
@@ -81,8 +84,9 @@ 
 		$to=Javascript::prep_element($to);
 		$element=Javascript::prep_element($element);
 		$str="$({$to}).{$jQueryCall}({$element});";
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 		return $str;
 	}
 	/**
@@ -131,10 +135,12 @@ 
 		if (isset($value)) {
 			$value=Javascript::prep_value($value);
 			$str="$({$element}).attr(\"$attributeName\",{$value});";
-		} else
-			$str="$({$element}).attr(\"$attributeName\");";
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		} else {
+					$str="$({$element}).attr(\"$attributeName\");";
+		}
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 		return $str;
 	}
 
@@ -190,8 +196,9 @@ 
 
 		$str="$({$element}).animate({\n$animations\n\t\t}".$speed.$extra.");";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 		return $str;
 	}
 
@@ -342,8 +349,9 @@ 
 		$element=Javascript::prep_element($element);
 		$str="$({$element}).trigger(\"$event\");";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 		return $str;
 	}
 
@@ -405,8 +413,9 @@ 
 			$str.="else{".$jsCodeIfFalse."}";
 		}
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 		return $str;
 	}
 
@@ -422,11 +431,13 @@ 
 	private function _doJQuery($element, $jqueryCall, $param="", $jsCallback="", $immediatly=false) {
 		$param=Javascript::prep_value($param);
 		$callback="";
-		if ($jsCallback!="")
-			$callback=", function(event){\n{$jsCallback}\n}";
+		if ($jsCallback!="") {
+					$callback=", function(event){\n{$jsCallback}\n}";
+		}
 			$script="$(".Javascript::prep_element($element).").".$jqueryCall."(".$param.$callback.");\n";
-			if ($immediatly)
-				$this->jquery_code_for_compile[]=$script;
+			if ($immediatly) {
+							$this->jquery_code_for_compile[]=$script;
+			}
 				return $script;
 	}
 
@@ -497,8 +508,9 @@ 
 	 */
 	public function exec($js, $immediatly=false) {
 		$script=$js."\n";
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$script;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$script;
+		}
 		return $script;
 	}
 
@@ -579,7 +591,7 @@ 
 		}
 		if(isset($globalName)){
 			$script="if(window.{$globalName}){clearInterval(window.{$globalName});}\nwindow.{$globalName}=setInterval({$jsCode},{$time});";
-		}else{
+		} else{
 			$script="setInterval({$jsCode},{$time});";
 		}
 		return $this->exec($script,$immediatly);

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

Spacing +46 added lines, -46 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;
@@ -60,7 +60,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;
@@ -86,10 +86,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;
@@ -98,7 +98,7 @@ 
 	/**
 	 * @return HtmlTR
 	 */
-	public function getItem($index){
+	public function getItem($index) {
 		return parent::getItem($index);
 	}
 
@@ -112,7 +112,7 @@ 
 		$row=$this->getItem($row);
 		if (isset($row) && $row instanceof HtmlCollection) {
 			$col=$row->getItem($col);
-		}else{
+		} else {
 			$col=$row;
 		}
 		return $col;
@@ -136,7 +136,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;
@@ -147,7 +147,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); });
 	}
 
 	/**
@@ -155,7 +155,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); });
 	}
 
 	/**
@@ -163,21 +163,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;
 	}
@@ -188,7 +188,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;
@@ -196,9 +196,9 @@ 
 
 	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;
@@ -215,9 +215,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;
@@ -225,11 +225,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();
 			}
 		}
@@ -274,7 +274,7 @@ 
 	 */
 	public function getColCount() {
 		$result=0;
-		if ($this->count() > 0)
+		if ($this->count()>0)
 			$result=$this->getItem(0)->count();
 		return $result;
 	}
@@ -288,7 +288,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 {
@@ -297,9 +297,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;
 	}
@@ -328,17 +328,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;
 	}
@@ -350,17 +350,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;
 	}
@@ -371,7 +371,7 @@ 
 	 */
 	public function applyCells($callback) {
 		$rows=$this->content;
-		foreach ( $rows as $row ) {
+		foreach ($rows as $row) {
 			$row->applyCells($callback);
 		}
 		return $this;
@@ -383,25 +383,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;
@@ -410,17 +410,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;
 	}

Braces +25 added lines, -17 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;
 	}
@@ -217,8 +220,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;
 	}
@@ -229,8 +233,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;
@@ -274,8 +279,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;
 	}
 
@@ -299,8 +305,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;
 	}
 
@@ -398,8 +405,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);

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/base/InstanceViewer.php

Spacing +117 added lines, -117 removed lines

@@ -20,50 +20,50 @@ 
 
 	public static $index=0;
 
-	public function __construct($identifier,$instance=NULL,$captions=NULL){
+	public function __construct($identifier, $instance=NULL, $captions=NULL) {
 		$this->widgetIdentifier=$identifier;
 		$this->values=[];
 		$this->afterCompile=[];
-		if(isset($instance))
+		if (isset($instance))
 			$this->setInstance($instance);
 		$this->setCaptions($captions);
 		$this->captionCallback=NULL;
-		$this->defaultValueFunction=function($name,$value){return $value;};
+		$this->defaultValueFunction=function($name, $value) {return $value; };
 	}
 
-	public function moveFieldTo($from,$to){
-		if(JArray::moveElementTo($this->visibleProperties, $from, $to)){
+	public function moveFieldTo($from, $to) {
+		if (JArray::moveElementTo($this->visibleProperties, $from, $to)) {
 			return JArray::moveElementTo($this->values, $from, $to);
 		}
 		return false;
 	}
 
-	public function swapFields($index1,$index2){
-		if(JArray::swapElements($this->visibleProperties, $index1, $index2)){
+	public function swapFields($index1, $index2) {
+		if (JArray::swapElements($this->visibleProperties, $index1, $index2)) {
 			return JArray::swapElements($this->values, $index1, $index2);
 		}
 		return false;
 	}
 
-	public function removeField($index){
-		\array_splice($this->visibleProperties,$index,1);
-		\array_splice($this->values,$index,1);
-		\array_splice($this->captions,$index,1);
+	public function removeField($index) {
+		\array_splice($this->visibleProperties, $index, 1);
+		\array_splice($this->values, $index, 1);
+		\array_splice($this->captions, $index, 1);
 		return $this;
 	}
 
-	public function getValues(){
+	public function getValues() {
 		$values=[];
 		$index=0;
 		$count=$this->count();
 		$hasGroupby=is_array($this->groupByFields);
-		if(!$hasGroupby){
-			while($index<$count){
+		if (!$hasGroupby) {
+			while ($index<$count) {
 					$values[]=$this->getValue($index++);
 			}
-		}else{
-			while($index<$count){
-				if(array_search($index, $this->groupByFields)===false){
+		} else {
+			while ($index<$count) {
+				if (array_search($index, $this->groupByFields)===false) {
 					$values[]=$this->getValue($index);
 				}
 				$index++;
@@ -72,203 +72,203 @@ 
 		return $values;
 	}
 
-	public function getIdentifier($index=NULL){
-		if(!isset($index))
+	public function getIdentifier($index=NULL) {
+		if (!isset($index))
 			$index=self::$index;
 		$value=$index;
-		if(isset($this->values["identifier"])){
-			if(\is_string($this->values["identifier"]))
+		if (isset($this->values["identifier"])) {
+			if (\is_string($this->values["identifier"]))
 				$value=JReflection::callMethod($this->instance, $this->values["identifier"], []);
 			else
-				$value=$this->values["identifier"]($index,$this->instance);
+				$value=$this->values["identifier"]($index, $this->instance);
 		}
 		return $value;
 	}
 
-	public function getValue($index){
+	public function getValue($index) {
 		$property=$this->properties[$index];
 		return $this->_getValue($property, $index);
 	}
 
-	protected function _beforeAddProperty($index,&$field){
+	protected function _beforeAddProperty($index, &$field) {
 
 	}
 
-	protected function _getDefaultValue($name,$value,$index){
+	protected function _getDefaultValue($name, $value, $index) {
 		$func=$this->defaultValueFunction;
-		return $func($name,$value,$index,$this->instance);
+		return $func($name, $value, $index, $this->instance);
 	}
 
-	protected function _getPropertyValue(\ReflectionProperty $property){
+	protected function _getPropertyValue(\ReflectionProperty $property) {
 		$property->setAccessible(true);
 		return $property->getValue($this->instance);
 	}
 
-	protected function _getValue($property,$index){
+	protected function _getValue($property, $index) {
 		$value=null;
 		$propertyName=$property;
-		if($property instanceof \ReflectionProperty){
+		if ($property instanceof \ReflectionProperty) {
 			$value=$this->_getPropertyValue($property);
 			$propertyName=$property->getName();
-		}elseif(\is_callable($property) && array_search($property, ["system"])===false)
+		}elseif (\is_callable($property) && array_search($property, ["system"])===false)
 			$value=$property($this->instance);
-		elseif(\is_array($property)){
-			$values=\array_map(function($v) use ($index){return $this->_getValue($v, $index);}, $property);
+		elseif (\is_array($property)) {
+			$values=\array_map(function($v) use ($index){return $this->_getValue($v, $index); }, $property);
 			$value=\implode("", $values);
-		}elseif(\is_string($property)){
+		}elseif (\is_string($property)) {
 			$value=$property;
-			if(isset($this->instance->{$property})){
+			if (isset($this->instance->{$property})) {
 				$value=$this->instance->{$property};
-			}elseif(\method_exists($this->instance, $getter=JReflection::getterName($property))){
+			}elseif (\method_exists($this->instance, $getter=JReflection::getterName($property))) {
 				$value=JReflection::callMethod($this->instance, $getter, []);
 			}
 		}
 		return $this->_postGetValue($index, $propertyName, $value);
 	}
 
-	protected function _postGetValue($index,$propertyName,$value){
-		if(isset($this->values[$index])){
-			$value= $this->values[$index]($value,$this->instance,$index,self::$index);
-		}else{
-			$value=$this->_getDefaultValue($propertyName,$value, $index);
+	protected function _postGetValue($index, $propertyName, $value) {
+		if (isset($this->values[$index])) {
+			$value=$this->values[$index]($value, $this->instance, $index, self::$index);
+		} else {
+			$value=$this->_getDefaultValue($propertyName, $value, $index);
 		}
-		if(isset($this->afterCompile[$index])){
-			if(\is_callable($this->afterCompile[$index])){
-				$this->afterCompile[$index]($value,$this->instance,self::$index);
+		if (isset($this->afterCompile[$index])) {
+			if (\is_callable($this->afterCompile[$index])) {
+				$this->afterCompile[$index]($value, $this->instance, self::$index);
 			}
 		}
 		return $value;
 	}
 
-	public function insertField($index,$field,$key=null){
-		if(isset($key)){
-			array_splice( $this->visibleProperties, $index, 0, [$key=>$field] );
-		}else{
-			array_splice( $this->visibleProperties, $index, 0, $field );
+	public function insertField($index, $field, $key=null) {
+		if (isset($key)) {
+			array_splice($this->visibleProperties, $index, 0, [$key=>$field]);
+		} else {
+			array_splice($this->visibleProperties, $index, 0, $field);
 		}
 		return $this;
 	}
 	
-	public function sortColumnContent($index,$array){
-		if(isset($this->visibleProperties[$index])){
-			if(is_array($this->visibleProperties[$index])){
-				$this->visibleProperties[$index]=JArray::sortAssociative($this->visibleProperties[$index],$array);
+	public function sortColumnContent($index, $array) {
+		if (isset($this->visibleProperties[$index])) {
+			if (is_array($this->visibleProperties[$index])) {
+				$this->visibleProperties[$index]=JArray::sortAssociative($this->visibleProperties[$index], $array);
 			}
 		}
 		return $this;
 	}
 
-	public function insertInField($index,$field,$key=null){
+	public function insertInField($index, $field, $key=null) {
 		$vb=$this->visibleProperties;
-		if(isset($vb[$index])){
-			if(isset($key)){
-				if(\is_array($vb[$index])){
+		if (isset($vb[$index])) {
+			if (isset($key)) {
+				if (\is_array($vb[$index])) {
 					$this->visibleProperties[$index][$key]=$field;
-				}else{
-					$this->visibleProperties[$index]=[$vb[$index],$key=>$field];
+				} else {
+					$this->visibleProperties[$index]=[$vb[$index], $key=>$field];
 				}
-			}else{
-				if(\is_array($vb[$index])){
+			} else {
+				if (\is_array($vb[$index])) {
 					$this->visibleProperties[$index][]=$field;
-				}else{
-					$this->visibleProperties[$index]=[$vb[$index],$field];
+				} else {
+					$this->visibleProperties[$index]=[$vb[$index], $field];
 				}
 			}
-		}else{
+		} else {
 			return $this->insertField($index, $field);
 		}
 		return $this;
 	}
 
-	public function addField($field,$key=null){
-		if(isset($key)){
+	public function addField($field, $key=null) {
+		if (isset($key)) {
 			$this->visibleProperties[]=[$key=>$field];
-		}else{
+		} else {
 			$this->visibleProperties[]=$field;
 		}
 		return $this;
 	}
 
-	public function addFields($fields){
-		$this->visibleProperties=\array_merge($this->visibleProperties,$fields);
+	public function addFields($fields) {
+		$this->visibleProperties=\array_merge($this->visibleProperties, $fields);
 		return $this;
 	}
 
-	public function count(){
+	public function count() {
 		return \sizeof($this->properties);
 	}
 
-	public function visiblePropertiesCount(){
+	public function visiblePropertiesCount() {
 		return \sizeof($this->visibleProperties);
 	}
 
-	public function getProperty($index){
+	public function getProperty($index) {
 		return $this->properties[$index];
 	}
 
-	public function getFieldName($index){
+	public function getFieldName($index) {
 		$property=$this->getProperty($index);
-		if($property instanceof \ReflectionProperty){
+		if ($property instanceof \ReflectionProperty) {
 			$result=$property->getName();
-		}elseif(\is_callable($property)){
+		}elseif (\is_callable($property)) {
 			$result=$this->visibleProperties[$index];
-		}else{
+		} else {
 			$result=$property;
 		}
 		return $result;
 	}
 
 
-	protected function showableProperty(\ReflectionProperty $rProperty){
-		return JString::startswith($rProperty->getName(),"_")===false;
+	protected function showableProperty(\ReflectionProperty $rProperty) {
+		return JString::startswith($rProperty->getName(), "_")===false;
 	}
 
 	public function setInstance($instance) {
-		if(\is_string($instance)){
+		if (\is_string($instance)) {
 			$instance=new $instance();
 		}
 		$this->instance=$instance;
 		$this->properties=[];
 		$this->reflect=new \ReflectionClass($instance);
-		if(JArray::count($this->visibleProperties)===0){
+		if (JArray::count($this->visibleProperties)===0) {
 			$this->properties=$this->getDefaultProperties();
-		}else{
-			foreach ($this->visibleProperties as $property){
+		} else {
+			foreach ($this->visibleProperties as $property) {
 				$this->setInstanceProperty($property);
 			}
 		}
 		return $this;
 	}
 
-	private function setInstanceProperty($property){
-		if(\is_callable($property)){
+	private function setInstanceProperty($property) {
+		if (\is_callable($property)) {
 			$this->properties[]=$property;
-		}elseif(\is_string($property)){
-			try{
+		}elseif (\is_string($property)) {
+			try {
 				$this->_beforeAddProperty(\sizeof($this->properties), $property);
 				$rProperty=$this->reflect->getProperty($property);
 				$this->properties[]=$rProperty;
-			}catch(\Exception $e){
+			}catch (\Exception $e) {
 				$this->_beforeAddProperty(\sizeof($this->properties), $property);
 				$this->properties[]=$property;
 			}
-		}elseif(\is_int($property)){
+		}elseif (\is_int($property)) {
 			$props=$this->getDefaultProperties();
-			if(isset($props[$property]))
+			if (isset($props[$property]))
 				$this->properties[]=$props[$property];
 				else
 					$this->properties[]=$property;
-		}else{
+		} else {
 			$this->properties[]=$property;
 		}
 	}
 
-	protected function getDefaultProperties(){
+	protected function getDefaultProperties() {
 		$result=[];
 		$properties=$this->reflect->getProperties();
-		foreach ($properties as $property){
+		foreach ($properties as $property) {
 			$showable=$this->showableProperty($property);
-			if($showable!==false){
+			if ($showable!==false) {
 				$result[]=$property;
 			}
 		}
@@ -280,12 +280,12 @@ 
 		return $this;
 	}
 
-	public function setValueFunction($index,$callback){
+	public function setValueFunction($index, $callback) {
 		$this->values[$index]=$callback;
 		return $this;
 	}
 
-	public function setIdentifierFunction($callback){
+	public function setIdentifierFunction($callback) {
 		$this->values["identifier"]=$callback;
 		return $this;
 	}
@@ -298,52 +298,52 @@ 
 		return $this->properties;
 	}
 
-	public function getCaption($index){
-		if(isset($this->captions[$index])){
+	public function getCaption($index) {
+		if (isset($this->captions[$index])) {
 			return $this->captions[$index];
 		}
-		if($this->properties[$index] instanceof \ReflectionProperty)
+		if ($this->properties[$index] instanceof \ReflectionProperty)
 			return $this->properties[$index]->getName();
-		elseif(\is_callable($this->properties[$index]))
+		elseif (\is_callable($this->properties[$index]))
 			return "";
 		else
 			return $this->properties[$index];
 	}
 
-	public function getCaptions(){
+	public function getCaptions() {
 		$hasGroupby=is_array($this->groupByFields);
 		$count=$this->count()-$this->getGroupByFieldsCount();
-		if(isset($this->captions)){
-			$captions= \array_values($this->captions);
+		if (isset($this->captions)) {
+			$captions=\array_values($this->captions);
 			$captionsSize=\sizeof($captions);
-			for($i=$captionsSize;$i<$count;$i++){
+			for ($i=$captionsSize; $i<$count; $i++) {
 				$captions[]="";
 			}
-		}else{
+		} else {
 			$captions=[];
 			$index=0;
-			if(!$hasGroupby){
-				while($index<$count){
+			if (!$hasGroupby) {
+				while ($index<$count) {
 						$captions[]=$this->getCaption($index++);
 				}
-			}else{
-				while($index<$count){
-					if($hasGroupby && array_search($index, $this->groupByFields)===false){
+			} else {
+				while ($index<$count) {
+					if ($hasGroupby && array_search($index, $this->groupByFields)===false) {
 						$captions[]=$this->getCaption($index);
 					}
 					$index++;
 				}
 			}
 		}
-		if(isset($this->captionCallback) && \is_callable($this->captionCallback)){
+		if (isset($this->captionCallback) && \is_callable($this->captionCallback)) {
 			$callback=$this->captionCallback;
-			$callback($captions,$this->instance);
+			$callback($captions, $this->instance);
 		}
 		return $captions;
 	}
 
-	public function setCaption($index,$caption){
-		if(isset($this->captions)===false)
+	public function setCaption($index, $caption) {
+		if (isset($this->captions)===false)
 			$this->captions=[];
 		$this->captions[$index]=$caption;
 		return $this;
@@ -361,7 +361,7 @@ 
 	 * @param callable $callback function called after the field compilation
 	 * @return InstanceViewer
 	 */
-	public function afterCompile($index,$callback){
+	public function afterCompile($index, $callback) {
 		$this->afterCompile[$index]=$callback;
 		return $this;
 	}
@@ -392,7 +392,7 @@ 
 	}
 	
 	public function getSimpleProperties() {
-		return array_filter($this->visibleProperties,function($item){
+		return array_filter($this->visibleProperties, function($item) {
 			return !(is_array($item) || is_object($item));
 		});
 	}
@@ -414,11 +414,11 @@ 
 	 * @param mixed $groupByFields
 	 */
 	public function setGroupByFields($groupByFields) {
-		$this->groupByFields = $groupByFields;
+		$this->groupByFields=$groupByFields;
 	}
 	
-	public function getGroupByFieldsCount(){
-		if(is_array($this->groupByFields)){
+	public function getGroupByFieldsCount() {
+		if (is_array($this->groupByFields)) {
 			return sizeof($this->groupByFields);
 		}
 		return 0;

Braces +48 added lines, -42 removed lines

@@ -24,8 +24,9 @@ 
 		$this->widgetIdentifier=$identifier;
 		$this->values=[];
 		$this->afterCompile=[];
-		if(isset($instance))
-			$this->setInstance($instance);
+		if(isset($instance)) {
+					$this->setInstance($instance);
+		}
 		$this->setCaptions($captions);
 		$this->captionCallback=NULL;
 		$this->defaultValueFunction=function($name,$value){return $value;};
@@ -61,7 +62,7 @@ 
 			while($index<$count){
 					$values[]=$this->getValue($index++);
 			}
-		}else{
+		} else{
 			while($index<$count){
 				if(array_search($index, $this->groupByFields)===false){
 					$values[]=$this->getValue($index);
@@ -73,14 +74,16 @@ 
 	}
 
 	public function getIdentifier($index=NULL){
-		if(!isset($index))
-			$index=self::$index;
+		if(!isset($index)) {
+					$index=self::$index;
+		}
 		$value=$index;
 		if(isset($this->values["identifier"])){
-			if(\is_string($this->values["identifier"]))
-				$value=JReflection::callMethod($this->instance, $this->values["identifier"], []);
-			else
-				$value=$this->values["identifier"]($index,$this->instance);
+			if(\is_string($this->values["identifier"])) {
+							$value=JReflection::callMethod($this->instance, $this->values["identifier"], []);
+			} else {
+							$value=$this->values["identifier"]($index,$this->instance);
+			}
 		}
 		return $value;
 	}
@@ -110,16 +113,16 @@ 
 		if($property instanceof \ReflectionProperty){
 			$value=$this->_getPropertyValue($property);
 			$propertyName=$property->getName();
-		}elseif(\is_callable($property) && array_search($property, ["system"])===false)
-			$value=$property($this->instance);
-		elseif(\is_array($property)){
+		} elseif(\is_callable($property) && array_search($property, ["system"])===false) {
+					$value=$property($this->instance);
+		} elseif(\is_array($property)){
 			$values=\array_map(function($v) use ($index){return $this->_getValue($v, $index);}, $property);
 			$value=\implode("", $values);
-		}elseif(\is_string($property)){
+		} elseif(\is_string($property)){
 			$value=$property;
 			if(isset($this->instance->{$property})){
 				$value=$this->instance->{$property};
-			}elseif(\method_exists($this->instance, $getter=JReflection::getterName($property))){
+			} elseif(\method_exists($this->instance, $getter=JReflection::getterName($property))){
 				$value=JReflection::callMethod($this->instance, $getter, []);
 			}
 		}
@@ -129,7 +132,7 @@ 
 	protected function _postGetValue($index,$propertyName,$value){
 		if(isset($this->values[$index])){
 			$value= $this->values[$index]($value,$this->instance,$index,self::$index);
-		}else{
+		} else{
 			$value=$this->_getDefaultValue($propertyName,$value, $index);
 		}
 		if(isset($this->afterCompile[$index])){
@@ -143,7 +146,7 @@ 
 	public function insertField($index,$field,$key=null){
 		if(isset($key)){
 			array_splice( $this->visibleProperties, $index, 0, [$key=>$field] );
-		}else{
+		} else{
 			array_splice( $this->visibleProperties, $index, 0, $field );
 		}
 		return $this;
@@ -164,17 +167,17 @@ 
 			if(isset($key)){
 				if(\is_array($vb[$index])){
 					$this->visibleProperties[$index][$key]=$field;
-				}else{
+				} else{
 					$this->visibleProperties[$index]=[$vb[$index],$key=>$field];
 				}
-			}else{
+			} else{
 				if(\is_array($vb[$index])){
 					$this->visibleProperties[$index][]=$field;
-				}else{
+				} else{
 					$this->visibleProperties[$index]=[$vb[$index],$field];
 				}
 			}
-		}else{
+		} else{
 			return $this->insertField($index, $field);
 		}
 		return $this;
@@ -183,7 +186,7 @@ 
 	public function addField($field,$key=null){
 		if(isset($key)){
 			$this->visibleProperties[]=[$key=>$field];
-		}else{
+		} else{
 			$this->visibleProperties[]=$field;
 		}
 		return $this;
@@ -210,9 +213,9 @@ 
 		$property=$this->getProperty($index);
 		if($property instanceof \ReflectionProperty){
 			$result=$property->getName();
-		}elseif(\is_callable($property)){
+		} elseif(\is_callable($property)){
 			$result=$this->visibleProperties[$index];
-		}else{
+		} else{
 			$result=$property;
 		}
 		return $result;
@@ -232,7 +235,7 @@ 
 		$this->reflect=new \ReflectionClass($instance);
 		if(JArray::count($this->visibleProperties)===0){
 			$this->properties=$this->getDefaultProperties();
-		}else{
+		} else{
 			foreach ($this->visibleProperties as $property){
 				$this->setInstanceProperty($property);
 			}
@@ -243,22 +246,23 @@ 
 	private function setInstanceProperty($property){
 		if(\is_callable($property)){
 			$this->properties[]=$property;
-		}elseif(\is_string($property)){
+		} elseif(\is_string($property)){
 			try{
 				$this->_beforeAddProperty(\sizeof($this->properties), $property);
 				$rProperty=$this->reflect->getProperty($property);
 				$this->properties[]=$rProperty;
-			}catch(\Exception $e){
+			} catch(\Exception $e){
 				$this->_beforeAddProperty(\sizeof($this->properties), $property);
 				$this->properties[]=$property;
 			}
-		}elseif(\is_int($property)){
+		} elseif(\is_int($property)){
 			$props=$this->getDefaultProperties();
-			if(isset($props[$property]))
-				$this->properties[]=$props[$property];
-				else
-					$this->properties[]=$property;
-		}else{
+			if(isset($props[$property])) {
+							$this->properties[]=$props[$property];
+			} else {
+									$this->properties[]=$property;
+				}
+		} else{
 			$this->properties[]=$property;
 		}
 	}
@@ -302,12 +306,13 @@ 
 		if(isset($this->captions[$index])){
 			return $this->captions[$index];
 		}
-		if($this->properties[$index] instanceof \ReflectionProperty)
-			return $this->properties[$index]->getName();
-		elseif(\is_callable($this->properties[$index]))
-			return "";
-		else
-			return $this->properties[$index];
+		if($this->properties[$index] instanceof \ReflectionProperty) {
+					return $this->properties[$index]->getName();
+		} elseif(\is_callable($this->properties[$index])) {
+					return "";
+		} else {
+					return $this->properties[$index];
+		}
 	}
 
 	public function getCaptions(){
@@ -319,14 +324,14 @@ 
 			for($i=$captionsSize;$i<$count;$i++){
 				$captions[]="";
 			}
-		}else{
+		} else{
 			$captions=[];
 			$index=0;
 			if(!$hasGroupby){
 				while($index<$count){
 						$captions[]=$this->getCaption($index++);
 				}
-			}else{
+			} else{
 				while($index<$count){
 					if($hasGroupby && array_search($index, $this->groupByFields)===false){
 						$captions[]=$this->getCaption($index);
@@ -343,8 +348,9 @@ 
 	}
 
 	public function setCaption($index,$caption){
-		if(isset($this->captions)===false)
-			$this->captions=[];
+		if(isset($this->captions)===false) {
+					$this->captions=[];
+		}
 		$this->captions[$index]=$caption;
 		return $this;
 	}