phpMv / phpMv-UI

Ajax/common/Widget.php

Spacing +46 added lines, -46 removed lines

@@ -37,28 +37,28 @@ 
 	protected $_edition;
 
 
-	public function __construct($identifier,$model,$modelInstance=NULL) {
+	public function __construct($identifier, $model, $modelInstance=NULL) {
 		parent::__construct($identifier);
 		$this->_template="%wrapContentBefore%%content%%wrapContentAfter%";
 		$this->setModel($model);
-		if(isset($modelInstance));
+		if (isset($modelInstance));
 			$this->show($modelInstance);
 	}
 
-	protected function _init($instanceViewer,$contentKey,$content,$edition){
+	protected function _init($instanceViewer, $contentKey, $content, $edition) {
 		$this->_instanceViewer=$instanceViewer;
 		$this->content=[$contentKey=>$content];
 		$this->_toolbarPosition=PositionInTable::BEFORETABLE;
 		$this->_edition=$edition;
 	}
 
-	protected function _getFieldIdentifier($prefix){
+	protected function _getFieldIdentifier($prefix) {
 		return $this->identifier."-{$prefix}-".$this->_instanceViewer->getIdentifier();
 	}
 
-	abstract protected  function _setToolbarPosition($table,$captions=NULL);
+	abstract protected  function _setToolbarPosition($table, $captions=NULL);
 
-	public function show($modelInstance){
+	public function show($modelInstance) {
 		$this->_modelInstance=$modelInstance;
 	}
 
@@ -82,42 +82,42 @@ 
 
 	abstract public function getHtmlComponent();
 
-	public function setColor($color){
+	public function setColor($color) {
 		return $this->getHtmlComponent()->setColor($color);
 	}
 
 
-	public function setCaptions($captions){
+	public function setCaptions($captions) {
 		$this->_instanceViewer->setCaptions($captions);
 		return $this;
 	}
 
-	public function setFields($fields){
+	public function setFields($fields) {
 		$this->_instanceViewer->setVisibleProperties($fields);
 		return $this;
 	}
 
-	public function addField($field){
+	public function addField($field) {
 		$this->_instanceViewer->addField($field);
 		return $this;
 	}
 
-	public function insertField($index,$field){
+	public function insertField($index, $field) {
 		$this->_instanceViewer->insertField($index, $field);
 		return $this;
 	}
 
-	public function insertInField($index,$field){
+	public function insertInField($index, $field) {
 		$this->_instanceViewer->insertInField($index, $field);
 		return $this;
 	}
 
-	public function setValueFunction($index,$callback){
+	public function setValueFunction($index, $callback) {
 		$this->_instanceViewer->setValueFunction($index, $callback);
 		return $this;
 	}
 
-	public function setIdentifierFunction($callback){
+	public function setIdentifierFunction($callback) {
 		$this->_instanceViewer->setIdentifierFunction($callback);
 		return $this;
 	}
@@ -125,8 +125,8 @@ 
 	/**
 	 * @return \Ajax\semantic\html\collections\menus\HtmlMenu
 	 */
-	public function getToolbar(){
-		if(isset($this->_toolbar)===false){
+	public function getToolbar() {
+		if (isset($this->_toolbar)===false) {
 			$this->_toolbar=new HtmlMenu("toolbar-".$this->identifier);
 		}
 		return $this->_toolbar;
@@ -138,10 +138,10 @@ 
 	 * @param callable $callback function to call on $element
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addInToolbar($element,$callback=NULL){
+	public function addInToolbar($element, $callback=NULL) {
 		$tb=$this->getToolbar();
-		if(isset($callback)){
-			if(\is_callable($callback)){
+		if (isset($callback)) {
+			if (\is_callable($callback)) {
 				$callback($element);
 			}
 		}
@@ -154,9 +154,9 @@ 
 	 * @param callable $callback function($element)
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addItemInToolbar($caption,$icon=NULL,$callback=NULL){
-		$result=$this->addInToolbar($caption,$callback);
-		if(isset($icon))
+	public function addItemInToolbar($caption, $icon=NULL, $callback=NULL) {
+		$result=$this->addInToolbar($caption, $callback);
+		if (isset($icon))
 			$result->addIcon($icon);
 		return $result;
 	}
@@ -166,14 +166,14 @@ 
 	 * @param callable $callback function($element)
 	 * @return \Ajax\common\Widget
 	 */
-	public function addItemsInToolbar(array $items,$callback=NULL){
-		if(JArray::isAssociative($items)){
-			foreach ($items as $icon=>$item){
-				$this->addItemInToolbar($item,$icon,$callback);
+	public function addItemsInToolbar(array $items, $callback=NULL) {
+		if (JArray::isAssociative($items)) {
+			foreach ($items as $icon=>$item) {
+				$this->addItemInToolbar($item, $icon, $callback);
 			}
-		}else{
-			foreach ($items as $item){
-				$this->addItemInToolbar($item,null,$callback);
+		} else {
+			foreach ($items as $item) {
+				$this->addItemInToolbar($item, null, $callback);
 			}
 		}
 		return $this;
@@ -185,12 +185,12 @@ 
 	 * @param callable $callback function($element)
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addDropdownInToolbar($value,$items,$callback=NULL){
+	public function addDropdownInToolbar($value, $items, $callback=NULL) {
 		$dd=$value;
 		if (\is_string($value)) {
-			$dd=new HtmlDropdown("dropdown-". $this->identifier."-".$value, $value, $items);
+			$dd=new HtmlDropdown("dropdown-".$this->identifier."-".$value, $value, $items);
 		}
-		return $this->addInToolbar($dd,$callback);
+		return $this->addInToolbar($dd, $callback);
 	}
 
 	/**
@@ -198,9 +198,9 @@ 
 	 * @param callable $callback function($element)
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addButtonInToolbar($caption,$callback=NULL){
-		$bt=new HtmlButton("",$caption);
-		return $this->addInToolbar($bt,$callback);
+	public function addButtonInToolbar($caption, $callback=NULL) {
+		$bt=new HtmlButton("", $caption);
+		return $this->addInToolbar($bt, $callback);
 	}
 
 	/**
@@ -209,9 +209,9 @@ 
 	 * @param callable $callback function($element)
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addButtonsInToolbar(array $captions,$asIcon=false,$callback=NULL){
-		$bts=new HtmlButtonGroups("",$captions,$asIcon);
-		return $this->addInToolbar($bts,$callback);
+	public function addButtonsInToolbar(array $captions, $asIcon=false, $callback=NULL) {
+		$bts=new HtmlButtonGroups("", $captions, $asIcon);
+		return $this->addInToolbar($bts, $callback);
 	}
 
 	/**
@@ -221,9 +221,9 @@ 
 	 * @param boolean $labeled
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addLabelledIconButtonInToolbar($caption,$icon,$before=true,$labeled=false){
-		$bt=new HtmlButton("",$caption);
-		$bt->addIcon($icon,$before,$labeled);
+	public function addLabelledIconButtonInToolbar($caption, $icon, $before=true, $labeled=false) {
+		$bt=new HtmlButton("", $caption);
+		$bt->addIcon($icon, $before, $labeled);
 		return $this->addInToolbar($bt);
 	}
 
@@ -253,7 +253,7 @@ 
 	 * @param callable $defaultValueFunction function parameters are : $name : the field name, $value : the field value ,$index : the field index, $instance : the active instance of model
 	 * @return \Ajax\common\Widget
 	 */
-	public function setDefaultValueFunction($defaultValueFunction){
+	public function setDefaultValueFunction($defaultValueFunction) {
 		$this->_instanceViewer->setDefaultValueFunction($defaultValueFunction);
 		return $this;
 	}
@@ -262,7 +262,7 @@ 
 	 * @param string|boolean $disable
 	 * @return string
 	 */
-	public function jsDisabled($disable=true){
+	public function jsDisabled($disable=true) {
 		return "$('#".$this->identifier." .ui.input,#".$this->identifier." .ui.dropdown,#".$this->identifier." .ui.checkbox').toggleClass('disabled',".$disable.");";
 	}
 
@@ -271,12 +271,12 @@ 
 	 * @param callable $callback function($element)
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addEditButtonInToolbar($caption,$callback=NULL){
-		$bt=new HtmlButton($this->identifier."-editBtn",$caption);
+	public function addEditButtonInToolbar($caption, $callback=NULL) {
+		$bt=new HtmlButton($this->identifier."-editBtn", $caption);
 		$bt->setToggle();
 		$bt->setActive($this->_edition);
 		$bt->onClick($this->jsDisabled(Javascript::prep_value("!$(event.target).hasClass('active')")));
-		return $this->addInToolbar($bt,$callback);
+		return $this->addInToolbar($bt, $callback);
 	}
 
 	public function setToolbar(HtmlMenu $_toolbar) {

Ajax/semantic/widgets/base/InstanceViewer.php

Spacing +79 added lines, -79 removed lines

@@ -17,178 +17,178 @@ 
 
 	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 getValues(){
+	public function getValues() {
 		$values=[];
 		$index=0;
 		$count=$this->count();
-		while($index<$count){
+		while ($index<$count) {
 			$values[]=$this->getValue($index++);
 		}
 		return $values;
 	}
 
-	public function getIdentifier(){
+	public function getIdentifier() {
 		$value=self::$index;
-		if(isset($this->values["identifier"]))
-			$value=$this->values["identifier"](self::$index,$this->instance);
+		if (isset($this->values["identifier"]))
+			$value=$this->values["identifier"](self::$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 _getValue($property,$index){
-		if($property instanceof \ReflectionProperty){
+	protected function _getValue($property, $index) {
+		if ($property instanceof \ReflectionProperty) {
 			$property->setAccessible(true);
 			$value=$property->getValue($this->instance);
-			if(isset($this->values[$index])){
-				$value= $this->values[$index]($value,$this->instance,$index);
-			}else{
-				$value=$this->_getDefaultValue($property->getName(),$value, $index);
+			if (isset($this->values[$index])) {
+				$value=$this->values[$index]($value, $this->instance, $index);
+			} else {
+				$value=$this->_getDefaultValue($property->getName(), $value, $index);
 			}
-		}else{
-			if(\is_callable($property))
+		} else {
+			if (\is_callable($property))
 				$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);
-			}else{
-				if(isset($this->values[$index])){
-					$value= $this->values[$index]($property,$this->instance,$index);
-				}else{
+			} else {
+				if (isset($this->values[$index])) {
+					$value=$this->values[$index]($property, $this->instance, $index);
+				} else {
 					$value=$property;
 				}
 			}
 		}
-		if(isset($this->afterCompile[$index])){
-			if(\is_callable($this->afterCompile[$index])){
-				$this->afterCompile[$index]($value,$this->instance,$index);
+		if (isset($this->afterCompile[$index])) {
+			if (\is_callable($this->afterCompile[$index])) {
+				$this->afterCompile[$index]($value, $this->instance, $index);
 			}
 		}
 		return $value;
 	}
 
-	public function insertField($index,$field){
-		array_splice( $this->visibleProperties, $index, 0, $field );
+	public function insertField($index, $field) {
+		array_splice($this->visibleProperties, $index, 0, $field);
 		return $this;
 	}
 
-	public function insertInField($index,$field){
+	public function insertInField($index, $field) {
 		$vb=$this->visibleProperties;
-		if(isset($vb[$index])){
-			if(\is_array($vb[$index])){
+		if (isset($vb[$index])) {
+			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){
+	public function addField($field) {
 		$this->visibleProperties[]=$field;
 		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(\sizeof($this->visibleProperties)===0){
+		if (\sizeof($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;
 			}
 		}
@@ -200,12 +200,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;
 	}
@@ -218,41 +218,41 @@ 
 		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(){
-		if(isset($this->captions)){
-			$captions= $this->captions;
-			for($i=\sizeof($captions);$i<$this->count();$i++){
+	public function getCaptions() {
+		if (isset($this->captions)) {
+			$captions=$this->captions;
+			for ($i=\sizeof($captions); $i<$this->count(); $i++) {
 				$captions[]="";
 			}
-		}else{
+		} else {
 			$captions=[];
 			$index=0;
 			$count=$this->count();
-			while($index<$count){
+			while ($index<$count) {
 				$captions[]=$this->getCaption($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;
@@ -270,7 +270,7 @@ 
 	 * @param callable $callback function called after the field compilation
 	 * @return \Ajax\semantic\widgets\datatable\InstanceViewer
 	 */
-	public function afterCompile($index,$callback){
+	public function afterCompile($index, $callback) {
 		$this->afterCompile[$index]=$callback;
 		return $this;
 	}

Ajax/semantic/widgets/base/FieldAsTrait.php

Spacing +60 added lines, -60 removed lines

@@ -19,43 +19,43 @@ 
  * @property boolean $_edition
  * @property mixed _modelInstance
  */
-trait FieldAsTrait{
+trait FieldAsTrait {
 
 	abstract protected function _getFieldIdentifier($prefix);
-	abstract public function setValueFunction($index,$callback);
+	abstract public function setValueFunction($index, $callback);
 
 	/**
 	 * @param HtmlFormField $element
 	 * @param array $attributes
 	 */
-	protected function _applyAttributes($element,&$attributes,$index){
+	protected function _applyAttributes($element, &$attributes, $index) {
 		$this->_addRules($element, $attributes);
-		if(isset($attributes["callback"])){
+		if (isset($attributes["callback"])) {
 			$callback=$attributes["callback"];
-			if(\is_callable($callback)){
-				$callback($element,$this->_modelInstance,$index);
+			if (\is_callable($callback)) {
+				$callback($element, $this->_modelInstance, $index);
 				unset($attributes["callback"]);
 			}
 		}
 		$element->fromArray($attributes);
 	}
 
-	private function _getLabelField($caption,$icon=NULL){
-		$label=new HtmlLabel($this->_getFieldIdentifier("lbl"),$caption,$icon);
+	private function _getLabelField($caption, $icon=NULL) {
+		$label=new HtmlLabel($this->_getFieldIdentifier("lbl"), $caption, $icon);
 		return $label;
 	}
 
-	protected function _addRules($element,&$attributes){}
+	protected function _addRules($element, &$attributes) {}
 
-	protected function _fieldAs($elementCallback,$index,$attributes=NULL,$prefix=null){
-		$this->setValueFunction($index,function($value) use ($index,&$attributes,$elementCallback,$prefix){
+	protected function _fieldAs($elementCallback, $index, $attributes=NULL, $prefix=null) {
+		$this->setValueFunction($index, function($value) use ($index, &$attributes, $elementCallback, $prefix){
 			$name=$this->_instanceViewer->getFieldName($index)."[]";
-			if(isset($attributes["name"])){
+			if (isset($attributes["name"])) {
 				$name=$attributes["name"];
 			}
-			$element=$elementCallback($this->_getFieldIdentifier($prefix),$name,$value,"");
-			if(\is_array($attributes))
-				$this->_applyAttributes($element, $attributes,$index);
+			$element=$elementCallback($this->_getFieldIdentifier($prefix), $name, $value, "");
+			if (\is_array($attributes))
+				$this->_applyAttributes($element, $attributes, $index);
 			$element->setDisabled(!$this->_edition);
 			return $element;
 		});
@@ -63,102 +63,102 @@ 
 	}
 
 
-	public function fieldAsProgress($index,$label=NULL, $attributes=array()){
-		$this->setValueFunction($index,function($value) use($label,$attributes){
-			$pb=new HtmlProgress($this->_getFieldIdentifier("pb"),$value,$label,$attributes);
+	public function fieldAsProgress($index, $label=NULL, $attributes=array()) {
+		$this->setValueFunction($index, function($value) use($label, $attributes){
+			$pb=new HtmlProgress($this->_getFieldIdentifier("pb"), $value, $label, $attributes);
 			return $pb;
 		});
 			return $this;
 	}
 
-	public function fieldAsRating($index,$max=5, $icon=""){
-		$this->setValueFunction($index,function($value) use($max,$icon){
-			$rating=new HtmlRating($this->_getFieldIdentifier("rat"),$value,$max,$icon);
+	public function fieldAsRating($index, $max=5, $icon="") {
+		$this->setValueFunction($index, function($value) use($max, $icon){
+			$rating=new HtmlRating($this->_getFieldIdentifier("rat"), $value, $max, $icon);
 			return $rating;
 		});
 			return $this;
 	}
 
-	public function fieldAsLabel($index,$icon=NULL){
-		$this->setValueFunction($index,function($caption) use($icon){
-			$lbl=$this->_getLabelField($caption,$icon);
+	public function fieldAsLabel($index, $icon=NULL) {
+		$this->setValueFunction($index, function($caption) use($icon){
+			$lbl=$this->_getLabelField($caption, $icon);
 			return $lbl;
 		});
 			return $this;
 	}
 
-	public function fieldAsHeader($index,$niveau=1,$icon=NULL,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value) use($niveau,$icon){
-			$header=new HtmlHeader($id,$niveau,$value);
-			if(isset($icon))
+	public function fieldAsHeader($index, $niveau=1, $icon=NULL, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value) use($niveau, $icon){
+			$header=new HtmlHeader($id, $niveau, $value);
+			if (isset($icon))
 				$header->asIcon($icon, $value);
 			return $header;
-		}, $index,$attributes,"header");
+		}, $index, $attributes, "header");
 	}
 
 
-	public function fieldAsImage($index,$size=Size::MINI,$circular=false){
-		$this->setValueFunction($index,function($img) use($size,$circular){
-			$image=new HtmlImage($this->_getFieldIdentifier("image"),$img);$image->setSize($size);if($circular)$image->setCircular();
+	public function fieldAsImage($index, $size=Size::MINI, $circular=false) {
+		$this->setValueFunction($index, function($img) use($size, $circular){
+			$image=new HtmlImage($this->_getFieldIdentifier("image"), $img); $image->setSize($size); if ($circular)$image->setCircular();
 			return $image;
 		});
 			return $this;
 	}
 
-	public function fieldAsAvatar($index,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value){
-			$img=new HtmlImage($id,$value);
+	public function fieldAsAvatar($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value) {
+			$img=new HtmlImage($id, $value);
 			$img->asAvatar();
 			return $img;
-		}, $index,$attributes,"avatar");
+		}, $index, $attributes, "avatar");
 	}
 
-	public function fieldAsRadio($index,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value){
-			$input= new HtmlRadio($id,$name,$value,$value);
+	public function fieldAsRadio($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value) {
+			$input=new HtmlRadio($id, $name, $value, $value);
 			return $input;
-		}, $index,$attributes,"radio");
+		}, $index, $attributes, "radio");
 	}
 
-	public function fieldAsInput($index,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value){
-			$input= new HtmlFormInput($id,"","text",$value);
+	public function fieldAsInput($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value) {
+			$input=new HtmlFormInput($id, "", "text", $value);
 			$input->setName($name);
 			return $input;
-		}, $index,$attributes,"input");
+		}, $index, $attributes, "input");
 	}
 
-	public function fieldAsTextarea($index,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value){
-			$textarea=new HtmlFormTextarea($id,null,$value);
+	public function fieldAsTextarea($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value) {
+			$textarea=new HtmlFormTextarea($id, null, $value);
 			$textarea->setName($name);
 			return $textarea;
-		}, $index,$attributes,"textarea");
+		}, $index, $attributes, "textarea");
 	}
 
-	public function fieldAsHidden($index,$attributes=NULL){
-		if(!\is_array($attributes)){
+	public function fieldAsHidden($index, $attributes=NULL) {
+		if (!\is_array($attributes)) {
 			$attributes=[];
 		}
 		$attributes["imputType"]="hidden";
-		return $this->fieldAsInput($index,$attributes);
+		return $this->fieldAsInput($index, $attributes);
 	}
 
-	public function fieldAsCheckbox($index,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value){
-			$input=new HtmlFormCheckbox($id,NULL,$this->_instanceViewer->getIdentifier());
+	public function fieldAsCheckbox($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value) {
+			$input=new HtmlFormCheckbox($id, NULL, $this->_instanceViewer->getIdentifier());
 			$input->setChecked(JString::isBooleanTrue($value));
 			$input->getField()->setProperty("name", $name);
 			return $input;
-		}, $index,$attributes,"ck");
+		}, $index, $attributes, "ck");
 	}
 
-	public function fieldAsDropDown($index,$elements=[],$multiple=false,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value) use($elements,$multiple){
+	public function fieldAsDropDown($index, $elements=[], $multiple=false, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value) use($elements, $multiple){
 			//$dd=new HtmlDropdown($id,$value,$elements);
-			$dd=new HtmlFormDropdown($id,$elements,NULL,$value);
-			$dd->asSelect($name,$multiple);
+			$dd=new HtmlFormDropdown($id, $elements, NULL, $value);
+			$dd->asSelect($name, $multiple);
 			return $dd;
-		}, $index,$attributes,"dd");
+		}, $index, $attributes, "dd");
 	}
 }
\ No newline at end of file

Ajax/semantic/widgets/dataform/FormInstanceViewer.php

Spacing +9 added lines, -9 removed lines

@@ -9,22 +9,22 @@ 
 class FormInstanceViewer extends InstanceViewer {
 	protected $separators;
 
-	public function __construct($identifier,$instance=NULL, $captions=NULL) {
-		parent::__construct($identifier,$instance=NULL, $captions=NULL);
+	public function __construct($identifier, $instance=NULL, $captions=NULL) {
+		parent::__construct($identifier, $instance=NULL, $captions=NULL);
 		$this->separators=[-1];
-		$this->defaultValueFunction=function($name,$value,$index){
+		$this->defaultValueFunction=function($name, $value, $index) {
 			$caption=$this->getCaption($index);
-			$input=new HtmlFormInput($this->widgetIdentifier."-".$name,$caption,"text",$value);
+			$input=new HtmlFormInput($this->widgetIdentifier."-".$name, $caption, "text", $value);
 			$input->setName($name);
 			return $input;
 		};
 	}
 
-	protected function _beforeAddProperty($index,&$field){
-		if(JString::endswith($field, "\n")===true){
+	protected function _beforeAddProperty($index, &$field) {
+		if (JString::endswith($field, "\n")===true) {
 			$this->addSeparatorAfter($index);
 		}
-		if($index>1 && JString::startswith($field, "\n")===true){
+		if ($index>1 && JString::startswith($field, "\n")===true) {
 			$this->addSeparatorAfter($index-1);
 		}
 		$field=\str_replace("\n", "", $field);
@@ -32,8 +32,8 @@ 
 
 
 
-	public function addSeparatorAfter($fieldNum){
-		if(\array_search($fieldNum, $this->separators)===false)
+	public function addSeparatorAfter($fieldNum) {
+		if (\array_search($fieldNum, $this->separators)===false)
 			$this->separators[]=$fieldNum;
 			return $this;
 	}

Ajax/semantic/html/content/HtmlAbsractItem.php

Spacing +19 added lines, -19 removed lines

@@ -11,7 +11,7 @@ 
 
 abstract class HtmlAbsractItem extends HtmlSemDoubleElement {
 
-	public function __construct($identifier, $baseClass,$content=NULL) {
+	public function __construct($identifier, $baseClass, $content=NULL) {
 		parent::__construct($identifier, "div", $baseClass);
 		$this->content=array();
 		$this->initContent($content);
@@ -19,53 +19,53 @@ 
 
 	abstract protected function initContent($content);
 
-	public function setIcon($icon){
+	public function setIcon($icon) {
 		$this->content["icon"]=new HtmlIcon("icon-".$this->identifier, $icon);
 	}
 
-	public function setImage($image){
+	public function setImage($image) {
 		$image=new HtmlImg("icon-".$this->identifier, $image);
 		$image->asAvatar();
 		$this->content["image"]=$image;
 	}
 
-	private function createContent(){
-		$this->content["content"]=new HtmlSemDoubleElement("content-".$this->identifier,"div","content");
+	private function createContent() {
+		$this->content["content"]=new HtmlSemDoubleElement("content-".$this->identifier, "div", "content");
 		return $this->content["content"];
 	}
 
-	public function setTitle($title,$description=NULL,$baseClass="title"){
-		$title=new HtmlSemDoubleElement("","div",$baseClass,$title);
-		if(\array_key_exists("content", $this->content)===false){
+	public function setTitle($title, $description=NULL, $baseClass="title") {
+		$title=new HtmlSemDoubleElement("", "div", $baseClass, $title);
+		if (\array_key_exists("content", $this->content)===false) {
 			$this->createContent();
 		}
 		$this->content["content"]->addContent($title);
-		if(isset($description)){
-			$description=new HtmlSemDoubleElement("","div","description",$description);
+		if (isset($description)) {
+			$description=new HtmlSemDoubleElement("", "div", "description", $description);
 			$this->content["content"]->addContent($description);
 		}
 		return $this;
 	}
 
-	public function getPart($partName="header"){
-		$content=\array_merge($this->content["content"]->getContent(),array(@$this->content["icon"],@$this->content["image"]));
+	public function getPart($partName="header") {
+		$content=\array_merge($this->content["content"]->getContent(), array(@$this->content["icon"], @$this->content["image"]));
 		return $this->getElementByPropertyValue("class", $partName, $content);
 	}
 
-	public function setActive($value=true){
-		if($value){
+	public function setActive($value=true) {
+		if ($value) {
 			$this->setTagName("div");
 			$this->removeProperty("href");
 			$this->addToPropertyCtrl("class", "active", array("active"));
-		}else{
+		} else {
 			$this->removePropertyValue("class", "active");
 		}
 		return $this;
 	}
 
-	public function asLink($href=NULL,$part=NULL){
+	public function asLink($href=NULL, $part=NULL) {
 		$this->setTagName("a");
-		if(isset($href))
+		if (isset($href))
 			$this->setProperty("href", $href);
 		return $this;
 	}
@@ -77,8 +77,8 @@ 
 	 * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::compile()
 	 */
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
-		if(\is_array($this->content) && JArray::isAssociative($this->content))
-			$this->content=JArray::sortAssociative($this->content, [ "icon","image","content" ]);
+		if (\is_array($this->content) && JArray::isAssociative($this->content))
+			$this->content=JArray::sortAssociative($this->content, ["icon", "image", "content"]);
 		return parent::compile($js, $view);
 	}
 }
\ No newline at end of file

Ajax/semantic/html/collections/HtmlGrid.php

Spacing +41 added lines, -41 removed lines

@@ -32,16 +32,16 @@ 
 			// }
 			$this->setWide($numCols);
 		}
-		if($createCols)
+		if ($createCols)
 			$this->setRowsCount($numRows, $numCols);
 	}
 
 	public function asSegment() {
-		return $this->addToPropertyCtrl("class", "segment", array ("segment" ));
+		return $this->addToPropertyCtrl("class", "segment", array("segment"));
 	}
 
 	public function asContainer() {
-		return $this->addToPropertyCtrl("class", "container", array ("container" ));
+		return $this->addToPropertyCtrl("class", "container", array("container"));
 	}
 
 	/**
@@ -49,10 +49,10 @@ 
 	 * @param int $wide
 	 */
 	public function setWide($wide) {
-		if(isset(Wide::getConstants()["W" . $wide])){
-			$wide=Wide::getConstants()["W" . $wide];
+		if (isset(Wide::getConstants()["W".$wide])) {
+			$wide=Wide::getConstants()["W".$wide];
 			$this->addToPropertyCtrl("class", $wide, Wide::getConstants());
-			return $this->addToPropertyCtrl("class", "column", array ("column" ));
+			return $this->addToPropertyCtrl("class", "column", array("column"));
 		}
 		return $this;
 	}
@@ -72,9 +72,9 @@ 
 	 * @return mixed
 	 */
 	public function addRow($colsCount=NULL) {
-		$rowCount=$this->rowCount() + 1;
+		$rowCount=$this->rowCount()+1;
 		$this->setRowsCount($rowCount, $colsCount, true);
-		return $this->content[$rowCount - 1];
+		return $this->content[$rowCount-1];
 	}
 
 	/**
@@ -83,10 +83,10 @@ 
 	 * @return mixed|\Ajax\semantic\html\collections\HtmlGrid
 	 */
 	public function addCol($width=NULL) {
-		$colCount=$this->colCount() + 1;
+		$colCount=$this->colCount()+1;
 		$this->setColsCount($colCount, true, $width);
 		if ($this->hasOnlyCols($this->count()))
-			return $this->content[$colCount - 1];
+			return $this->content[$colCount-1];
 		return $this;
 	}
 
@@ -96,7 +96,7 @@ 
 	 * @return \Ajax\semantic\html\collections\HtmlGrid
 	 */
 	public function addCols($sizes=array()) {
-		foreach ( $sizes as $size ) {
+		foreach ($sizes as $size) {
 			$this->addCol($size);
 		}
 		return $this;
@@ -110,19 +110,19 @@ 
 	 */
 	public function setRowsCount($rowsCount, $colsCount=NULL, $force=false) {
 		$count=$this->count();
-		if ($rowsCount < 2 && $force === false) {
-			for($i=$count; $i < $colsCount; $i++) {
-				$this->addItem(new HtmlGridCol("col-" . $this->identifier . "-" . $i));
+		if ($rowsCount<2 && $force===false) {
+			for ($i=$count; $i<$colsCount; $i++) {
+				$this->addItem(new HtmlGridCol("col-".$this->identifier."-".$i));
 			}
 		} else {
 			if ($this->hasOnlyCols($count)) {
 				$tmpContent=$this->content;
 				$item=$this->addItem($colsCount);
 				$item->setContent($tmpContent);
-				$this->content=array ();
+				$this->content=array();
 				$count=1;
 			}
-			for($i=$count; $i < $rowsCount; $i++) {
+			for ($i=$count; $i<$rowsCount; $i++) {
 				$this->addItem($colsCount);
 			}
 		}
@@ -130,7 +130,7 @@ 
 	}
 
 	protected function hasOnlyCols($count) {
-		return $count > 0 && $this->content[0] instanceof HtmlGridCol;
+		return $count>0 && $this->content[0] instanceof HtmlGridCol;
 	}
 
 	/**
@@ -144,14 +144,14 @@ 
 		if (isset($width)===false) {
 			$this->setWide($numCols);
 		}
-		if ($toCreate === true) {
+		if ($toCreate===true) {
 			$count=$this->count();
-			if ($count == 0 || $this->hasOnlyCols($count)) {
-				for($i=$count; $i < $numCols; $i++) {
-					$this->addItem(new HtmlGridCol("col-" . $this->identifier . "-" . $i, $width));
+			if ($count==0 || $this->hasOnlyCols($count)) {
+				for ($i=$count; $i<$numCols; $i++) {
+					$this->addItem(new HtmlGridCol("col-".$this->identifier."-".$i, $width));
 				}
 			} else {
-				for($i=0; $i < $count; $i++) {
+				for ($i=0; $i<$count; $i++) {
 					$this->getItem($i)->setColsCount($numCols);
 				}
 			}
@@ -187,7 +187,7 @@ 
 		$count=$this->count();
 		if ($this->hasOnlyCols($count))
 			return $count;
-		if ($count > 0)
+		if ($count>0)
 			return $this->getItem(0)->count();
 		return 0;
 	}
@@ -199,7 +199,7 @@ 
 	 * @return \Ajax\semantic\html\collections\HtmlGridCol
 	 */
 	public function getCell($row, $col) {
-		if ($row < 2 && $this->hasOnlyCols($this->count()))
+		if ($row<2 && $this->hasOnlyCols($this->count()))
 			return $this->getItem($col);
 		$row=$this->getItem($row);
 		if (isset($row)) {
@@ -214,8 +214,8 @@ 
 	 * @return \Ajax\semantic\html\collections\HtmlGrid
 	 */
 	public function setDivided($vertically=false) {
-		$value=($vertically === true) ? "vertically divided" : "divided";
-		return $this->addToPropertyCtrl("class", $value, array ("divided" ));
+		$value=($vertically===true) ? "vertically divided" : "divided";
+		return $this->addToPropertyCtrl("class", $value, array("divided"));
 	}
 
 	/**
@@ -224,15 +224,15 @@ 
 	 * @return \Ajax\semantic\html\collections\HtmlGrid
 	 */
 	public function setCelled($internally=false) {
-		$value=($internally === true) ? "internally celled" : "celled";
-		return $this->addToPropertyCtrl("class", $value, array ("celled","internally celled" ));
+		$value=($internally===true) ? "internally celled" : "celled";
+		return $this->addToPropertyCtrl("class", $value, array("celled", "internally celled"));
 	}
 
 	/**
 	 * A grid can have its columns centered
 	 */
 	public function setCentered() {
-		return $this->addToPropertyCtrl("class", "centered", array ("centered" ));
+		return $this->addToPropertyCtrl("class", "centered", array("centered"));
 	}
 
 	/**
@@ -250,7 +250,7 @@ 
 	 */
 	public function setPadded($value=NULL) {
 		if (isset($value))
-			$this->addToPropertyCtrl("class", $value, array ("vertically","horizontally" ));
+			$this->addToPropertyCtrl("class", $value, array("vertically", "horizontally"));
 		return $this->addToProperty("class", "padded");
 	}
 
@@ -260,12 +260,12 @@ 
 	 * @return \Ajax\semantic\html\collections\HtmlGrid
 	 */
 	public function setRelaxed($very=false) {
-		$value=($very === true) ? "very relaxed" : "relaxed";
-		return $this->addToPropertyCtrl("class", $value, array ("relaxed","very relaxed" ));
+		$value=($very===true) ? "very relaxed" : "relaxed";
+		return $this->addToPropertyCtrl("class", $value, array("relaxed", "very relaxed"));
 	}
 
 	public function setVerticalAlignment($value=VerticalAlignment::MIDDLE) {
-		return $this->addToPropertyCtrl("class", $value . " aligned", VerticalAlignment::getConstantValues("aligned"));
+		return $this->addToPropertyCtrl("class", $value." aligned", VerticalAlignment::getConstantValues("aligned"));
 	}
 
 	/**
@@ -275,9 +275,9 @@ 
 	 * @see \Ajax\common\html\HtmlCollection::createItem()
 	 */
 	protected function createItem($value) {
-		if ($this->_createCols === false)
+		if ($this->_createCols===false)
 			$value=null;
-		$item=new HtmlGridRow($this->identifier . "-row-" . ($this->count() + 1), $value, $this->_colSizing, $this->_implicitRows);
+		$item=new HtmlGridRow($this->identifier."-row-".($this->count()+1), $value, $this->_colSizing, $this->_implicitRows);
 		return $item;
 	}
 
@@ -288,15 +288,15 @@ 
 	public function setValues($values, $force=true) {
 		$count=$this->count();
 		$valuesSize=\sizeof($values);
-		if ($this->_createCols === false || $force === true) {
-			for($i=$count; $i < $valuesSize; $i++) {
+		if ($this->_createCols===false || $force===true) {
+			for ($i=$count; $i<$valuesSize; $i++) {
 				$colSize=\sizeof($values[$i]);
-				$this->addItem(new HtmlGridRow($this->identifier . "-row-" . ($this->count() + 1), $colSize, $this->_colSizing, $this->_implicitRows));
+				$this->addItem(new HtmlGridRow($this->identifier."-row-".($this->count()+1), $colSize, $this->_colSizing, $this->_implicitRows));
 			}
 		}
-		$count=\min(array ($this->count(),$valuesSize ));
-		for($i=0; $i < $count; $i++) {
-			$this->content[$i]->setValues($values[$i], $this->_createCols === false);
+		$count=\min(array($this->count(), $valuesSize));
+		for ($i=0; $i<$count; $i++) {
+			$this->content[$i]->setValues($values[$i], $this->_createCols===false);
 		}
 	}