phpMv / phpMv-UI

Ajax/service/JReflection.php

Spacing +12 added lines, -12 removed lines

@@ -3,25 +3,25 @@ 
 namespace Ajax\service;
 
 class JReflection {
-	public static function shortClassName($object){
-		$classNameWithNamespace = get_class($object);
+	public static function shortClassName($object) {
+		$classNameWithNamespace=get_class($object);
 		return substr($classNameWithNamespace, strrpos($classNameWithNamespace, '\\')+1);
 	}
 
-	public static function jsonObject($classname){
+	public static function jsonObject($classname) {
 		$object=new $classname();
-		$class = new \ReflectionClass($classname);
+		$class=new \ReflectionClass($classname);
 		$methods=$class->getMethods(\ReflectionMethod::IS_PUBLIC);
-		foreach ($methods as $method){
+		foreach ($methods as $method) {
 			$name=$method->getName();
-			if(JString::startswith($name, "set")){
+			if (JString::startswith($name, "set")) {
 				$property=\lcfirst(JString::replaceAtFirst($name, "set", ""));
 				$value="__".$property."__";
-				try{
-					if($class->getProperty($property)!==null){
-						\call_user_func_array([$object,$name],[$value]);
+				try {
+					if ($class->getProperty($property)!==null) {
+						\call_user_func_array([$object, $name], [$value]);
 					}
-				}catch(\Exception $e){
+				}catch (\Exception $e) {
 					//Nothing to do
 				}
 			}
@@ -29,7 +29,7 @@ 
 		return $object;
 	}
 
-	public static function callMethod($object,$callback,array $values){
-		return \call_user_func_array([$object,$callback],$values);
+	public static function callMethod($object, $callback, array $values) {
+		return \call_user_func_array([$object, $callback], $values);
 	}
 }
\ No newline at end of file

Ajax/semantic/html/elements/HtmlIcon.php

Spacing +9 added lines, -9 removed lines

@@ -68,7 +68,7 @@ 
 	 * @return \Ajax\semantic\html\HtmlIcon
 	 */
 	public function setFlipped($sens="horizontally") {
-		return $this->addToProperty("class", "flipped " . $sens);
+		return $this->addToProperty("class", "flipped ".$sens);
 	}
 
 	/**
@@ -77,7 +77,7 @@ 
 	 * @return \Ajax\semantic\html\HtmlIcon
 	 */
 	public function setRotated($sens="clockwise") {
-		return $this->addToProperty("class", "rotated " . $sens);
+		return $this->addToProperty("class", "rotated ".$sens);
 	}
 
 	/**
@@ -86,12 +86,12 @@ 
 	 * @param string target
 	 * @return HtmlIcon
 	 */
-	public function asLink($href=NULL,$target=NULL) {
+	public function asLink($href=NULL, $target=NULL) {
 		if (isset($href)) {
 			$_target="";
-			if(isset($target))
+			if (isset($target))
 				$_target="target='{$target}'";
-			$this->wrap("<a href='" . $href . "' {$_target}>", "</a>");
+			$this->wrap("<a href='".$href."' {$_target}>", "</a>");
 		}
 		return $this->addToProperty("class", "link");
 	}
@@ -107,9 +107,9 @@ 
 	 */
 	public function setBordered($inverted=false) {
 		$invertedStr="";
-		if ($inverted !== false)
+		if ($inverted!==false)
 			$invertedStr=" inverted";
-		return $this->addToProperty("class", "bordered" . $invertedStr);
+		return $this->addToProperty("class", "bordered".$invertedStr);
 	}
 
 	/**
@@ -121,11 +121,11 @@ 
 	}
 
 	public function addLabel($label, $before=false, $icon=NULL) {
-		if($before)
+		if ($before)
 			$this->wrap($label);
 		else
 			$this->wrap("", $label);
-		if(isset($icon))
+		if (isset($icon))
 			$this->addToIcon($icon);
 		return $this;
 	}

Braces +14 added lines, -10 removed lines

@@ -89,8 +89,9 @@ 
 	public function asLink($href=NULL,$target=NULL) {
 		if (isset($href)) {
 			$_target="";
-			if(isset($target))
-				$_target="target='{$target}'";
+			if(isset($target)) {
+							$_target="target='{$target}'";
+			}
 			$this->wrap("<a href='" . $href . "' {$_target}>", "</a>");
 		}
 		return $this->addToProperty("class", "link");
@@ -107,8 +108,9 @@ 
 	 */
 	public function setBordered($inverted=false) {
 		$invertedStr="";
-		if ($inverted !== false)
-			$invertedStr=" inverted";
+		if ($inverted !== false) {
+					$invertedStr=" inverted";
+		}
 		return $this->addToProperty("class", "bordered" . $invertedStr);
 	}
 
@@ -121,12 +123,14 @@ 
 	}
 
 	public function addLabel($label, $before=false, $icon=NULL) {
-		if($before)
-			$this->wrap($label);
-		else
-			$this->wrap("", $label);
-		if(isset($icon))
-			$this->addToIcon($icon);
+		if($before) {
+					$this->wrap($label);
+		} else {
+					$this->wrap("", $label);
+		}
+		if(isset($icon)) {
+					$this->addToIcon($icon);
+		}
 		return $this;
 	}
 

Ajax/semantic/html/elements/HtmlButton.php

Spacing +12 added lines, -12 removed lines

@@ -56,7 +56,7 @@ 
 	}
 
 	public function setFocusable($value=true) {
-		if ($value === true)
+		if ($value===true)
 			$this->setProperty("tabindex", "0");
 		else {
 			$this->removeProperty("tabindex");
@@ -66,14 +66,14 @@ 
 
 	public function setAnimated($content, $animation="") {
 		$this->setTagName("div");
-		$this->addToProperty("class", "animated " . $animation);
-		$visible=new HtmlSemDoubleElement("visible-" . $this->identifier, "div");
+		$this->addToProperty("class", "animated ".$animation);
+		$visible=new HtmlSemDoubleElement("visible-".$this->identifier, "div");
 		$visible->setClass("visible content");
 		$visible->setContent($this->content);
-		$hidden=new HtmlSemDoubleElement("hidden-" . $this->identifier, "div");
+		$hidden=new HtmlSemDoubleElement("hidden-".$this->identifier, "div");
 		$hidden->setClass("hidden content");
 		$hidden->setContent($content);
-		$this->content=array ($visible,$hidden );
+		$this->content=array($visible, $hidden);
 		return $hidden;
 	}
 
@@ -85,7 +85,7 @@ 
 	public function asIcon($icon) {
 		$iconO=$icon;
 		if (\is_string($icon)) {
-			$iconO=new HtmlIcon("icon-" . $this->identifier, $icon);
+			$iconO=new HtmlIcon("icon-".$this->identifier, $icon);
 		}
 		$this->addToProperty("class", "icon");
 		$this->content=$iconO;
@@ -107,9 +107,9 @@ 
 	public function addLabel($label, $before=false, $icon=NULL) {
 		$this->tagName="div";
 		$this->addToProperty("class", "labeled");
-		$this->content=new HtmlButton("button-" . $this->identifier, $this->content);
+		$this->content=new HtmlButton("button-".$this->identifier, $this->content);
 		$this->content->setTagName("div");
-		$label=new HtmlLabel("label-" . $this->identifier, $label, $icon,"a");
+		$label=new HtmlLabel("label-".$this->identifier, $label, $icon, "a");
 		$label->setBasic();
 		$this->addContent($label, $before);
 		return $label;
@@ -121,7 +121,7 @@ 
 	 */
 	public function fromArray($array) {
 		$array=parent::fromArray($array);
-		foreach ( $array as $key => $value ) {
+		foreach ($array as $key => $value) {
 			$this->setProperty($key, $value);
 		}
 		return $array;
@@ -184,7 +184,7 @@ 
 	 * @return HtmlButton
 	 */
 	public static function social($identifier, $social, $value=NULL) {
-		if ($value === NULL)
+		if ($value===NULL)
 			$value=\ucfirst($social);
 		$return=new HtmlButton($identifier, $value);
 		$return->addIcon($social);
@@ -221,8 +221,8 @@ 
 	 * {@inheritDoc}
 	 * @see HtmlSemDoubleElement::asLink()
 	 */
-	public function asLink($href=NULL,$target=NULL) {
-		$lnk=new HtmlLink("lnk-".$this->identifier,$href,$this->content,$target);
+	public function asLink($href=NULL, $target=NULL) {
+		$lnk=new HtmlLink("lnk-".$this->identifier, $href, $this->content, $target);
 		$this->content=$lnk;
 		return $this;
 	}

Braces +6 added lines, -5 removed lines

@@ -56,9 +56,9 @@ 
 	}
 
 	public function setFocusable($value=true) {
-		if ($value === true)
-			$this->setProperty("tabindex", "0");
-		else {
+		if ($value === true) {
+					$this->setProperty("tabindex", "0");
+		} else {
 			$this->removeProperty("tabindex");
 		}
 		return $this;
@@ -184,8 +184,9 @@ 
 	 * @return HtmlButton
 	 */
 	public static function social($identifier, $social, $value=NULL) {
-		if ($value === NULL)
-			$value=\ucfirst($social);
+		if ($value === NULL) {
+					$value=\ucfirst($social);
+		}
 		$return=new HtmlButton($identifier, $value);
 		$return->addIcon($social);
 		return $return->addToPropertyCtrl("class", $social, Social::getConstants());

Ajax/semantic/html/base/HtmlSemDoubleElement.php

Spacing +13 added lines, -13 removed lines

@@ -22,7 +22,7 @@ 
 	use BaseTrait;
 	protected $_popup=NULL;
 	protected $_dimmer=NULL;
-	protected $_params=array ();
+	protected $_params=array();
 
 
 	public function __construct($identifier, $tagName="p", $baseClass="ui", $content=NULL) {
@@ -78,7 +78,7 @@ 
 	 * @return HtmlDimmer
 	 */
 	public function addDimmer($params=array(), $content=NULL) {
-		$dimmer=new HtmlDimmer("dimmer-" . $this->identifier, $content);
+		$dimmer=new HtmlDimmer("dimmer-".$this->identifier, $content);
 		$dimmer->setParams($params);
 		$dimmer->setContainer($this);
 		$this->addContent($dimmer);
@@ -94,12 +94,12 @@ 
 	 */
 	public function addLabel($label, $before=false, $icon=NULL) {
 		$labelO=$label;
-		if (\is_object($label) === false) {
-			$labelO=new HtmlLabel("label-" . $this->identifier, $label);
+		if (\is_object($label)===false) {
+			$labelO=new HtmlLabel("label-".$this->identifier, $label);
 			if (isset($icon))
 				$labelO->addIcon($icon);
 		} else {
-			$labelO->addToPropertyCtrl("class", "label", array ("label" ));
+			$labelO->addToPropertyCtrl("class", "label", array("label"));
 		}
 		$this->addContent($labelO, $before);
 		return $labelO;
@@ -113,9 +113,9 @@ 
 	 * @param string $icon
 	 * @return HtmlSemDoubleElement
 	 */
-	public function attachLabel($label,$side=Side::TOP,$direction=Direction::NONE,$icon=NULL){
-		$label=$this->addLabel($label,true,$icon);
-		$label->setAttached($side,$direction);
+	public function attachLabel($label, $side=Side::TOP, $direction=Direction::NONE, $icon=NULL) {
+		$label=$this->addLabel($label, true, $icon);
+		$label->setAttached($side, $direction);
 		return $this;
 	}
 
@@ -123,10 +123,10 @@ 
 	 * Transforms the element into a link
 	 * @return HtmlSemDoubleElement
 	 */
-	public function asLink($href=NULL,$target=NULL) {
+	public function asLink($href=NULL, $target=NULL) {
 		if (isset($href))
 			$this->setProperty("href", $href);
-		if(isset($target))
+		if (isset($target))
 			$this->setProperty("target", $target);
 		return $this->setTagName("a");
 	}
@@ -138,9 +138,9 @@ 
 	 */
 	public function jsShowDimmer($show=true) {
 		$status="hide";
-		if ($show === true)
+		if ($show===true)
 			$status="show";
-		return '$("#.' . $this->identifier . ').dimmer("' . $status . '");';
+		return '$("#.'.$this->identifier.').dimmer("'.$status.'");';
 	}
 
 	/**
@@ -158,7 +158,7 @@ 
 	 * @see HtmlDoubleElement::run()
 	 */
 	public function run(JsUtils $js) {
-		$this->_bsComponent=$js->semantic()->generic("#" . $this->identifier);
+		$this->_bsComponent=$js->semantic()->generic("#".$this->identifier);
 		parent::run($js);
 		$this->addEventsOnRun($js);
 		if (isset($this->_popup)) {

Braces +18 added lines, -12 removed lines

@@ -40,8 +40,9 @@ 
 	 * @param string $popupEvent
 	 */
 	public function setPopupAttributes($variation=NULL, $popupEvent=NULL) {
-		if (isset($this->_popup))
-			$this->_popup->setAttributes($variation, $popupEvent);
+		if (isset($this->_popup)) {
+					$this->_popup->setAttributes($variation, $popupEvent);
+		}
 	}
 
 	/**
@@ -96,8 +97,9 @@ 
 		$labelO=$label;
 		if (\is_object($label) === false) {
 			$labelO=new HtmlLabel("label-" . $this->identifier, $label);
-			if (isset($icon))
-				$labelO->addIcon($icon);
+			if (isset($icon)) {
+							$labelO->addIcon($icon);
+			}
 		} else {
 			$labelO->addToPropertyCtrl("class", "label", array ("label" ));
 		}
@@ -124,10 +126,12 @@ 
 	 * @return HtmlSemDoubleElement
 	 */
 	public function asLink($href=NULL,$target=NULL) {
-		if (isset($href))
-			$this->setProperty("href", $href);
-		if(isset($target))
-			$this->setProperty("target", $target);
+		if (isset($href)) {
+					$this->setProperty("href", $href);
+		}
+		if(isset($target)) {
+					$this->setProperty("target", $target);
+		}
 		return $this->setTagName("a");
 	}
 
@@ -138,8 +142,9 @@ 
 	 */
 	public function jsShowDimmer($show=true) {
 		$status="hide";
-		if ($show === true)
-			$status="show";
+		if ($show === true) {
+					$status="show";
+		}
 		return '$("#.' . $this->identifier . ').dimmer("' . $status . '");';
 	}
 
@@ -148,8 +153,9 @@ 
 	 * @see BaseHtml::compile()
 	 */
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
-	if (isset($this->_popup))
-			$this->_popup->compile($js);
+	if (isset($this->_popup)) {
+				$this->_popup->compile($js);
+	}
 		return parent::compile($js, $view);
 	}
 

Ajax/semantic/html/views/HtmlCard.php

Spacing +14 added lines, -14 removed lines

@@ -17,19 +17,19 @@ 
 class HtmlCard extends HtmlSemDoubleElement {
 
 	public function __construct($identifier) {
-		parent::__construct($identifier, "div", "ui card", array ());
+		parent::__construct($identifier, "div", "ui card", array());
 	}
 
 	private function createContent($content, $baseClass="content") {
 		$count=\sizeof($this->content);
-		$result=new HtmlCardContent("content-" . $count . "-" . $this->identifier, $content);
+		$result=new HtmlCardContent("content-".$count."-".$this->identifier, $content);
 		$result->setClass($baseClass);
 		return $result;
 	}
 
 	private function addElementInContent($key, $element) {
-		if (\array_key_exists($key, $this->content) === false) {
-			$this->content[$key]=array ();
+		if (\array_key_exists($key, $this->content)===false) {
+			$this->content[$key]=array();
 		}
 		$this->content[$key][]=$element;
 		return $element;
@@ -46,14 +46,14 @@ 
 
 	public function addHeader($header, $niveau=4, $type="page") {
 		if (!$header instanceof HtmlHeader) {
-			$header=new HtmlHeader("header-" . $this->identifier, $niveau, $header, $type);
+			$header=new HtmlHeader("header-".$this->identifier, $niveau, $header, $type);
 		}
 		$this->content["header"]=$this->createContent($header);
 	}
 
 	public function addImage($image, $title="") {
 		if (!$image instanceof HtmlImage) {
-			$image=new HtmlImage("image-" . $this->identifier, $image, $title);
+			$image=new HtmlImage("image-".$this->identifier, $image, $title);
 		}
 		$image->setClass("image");
 		return $this->addElementInContent("content", $image);
@@ -62,7 +62,7 @@ 
 	public function addReveal($visibleContent, $hiddenContent=NULL, $type=RevealType::FADE, $attributeType=NULL) {
 		$reveal=$visibleContent;
 		if (!$visibleContent instanceof HtmlReveal) {
-			$reveal=new HtmlReveal("reveral-" . $this->identifier, $visibleContent, $hiddenContent, $type, $attributeType);
+			$reveal=new HtmlReveal("reveral-".$this->identifier, $visibleContent, $hiddenContent, $type, $attributeType);
 		}
 		return $this->addElementInContent("content", $reveal);
 	}
@@ -91,8 +91,8 @@ 
 	 * @param boolean $asIcons
 	 * @return \Ajax\semantic\html\elements\HtmlButtonGroups
 	 */
-	public function addButtons($elements=array(), $asIcons=false){
-		$buttons=new HtmlButtonGroups("buttons-".$this->identifier,$elements,$asIcons);
+	public function addButtons($elements=array(), $asIcons=false) {
+		$buttons=new HtmlButtonGroups("buttons-".$this->identifier, $elements, $asIcons);
 		$this->addElementInContent("content", $buttons);
 		return $buttons;
 	}
@@ -101,12 +101,12 @@ 
 
 	public function addCardHeaderContent($header, $metas=array(), $description=NULL) {
 		$count=\sizeof($this->content);
-		return $this->addElementInContent("content", new HtmlCardHeaderContent("content-" . $count . "-" . $this->identifier, $header, $metas, $description));
+		return $this->addElementInContent("content", new HtmlCardHeaderContent("content-".$count."-".$this->identifier, $header, $metas, $description));
 	}
 
 	public function addCardContent($content=array()) {
 		$count=\sizeof($this->content);
-		return $this->addElementInContent("content", new HtmlCardContent("content-" . $count . "-" . $this->identifier, $content));
+		return $this->addElementInContent("content", new HtmlCardContent("content-".$count."-".$this->identifier, $content));
 	}
 
 	public function getCardContent($index=NULL) {
@@ -132,13 +132,13 @@ 
 	 * @see HtmlSemDoubleElement::compile()
 	 */
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
-		$this->content=JArray::sortAssociative($this->content, [ "header","image","content","extra-content" ]);
+		$this->content=JArray::sortAssociative($this->content, ["header", "image", "content", "extra-content"]);
 		return parent::compile($js, $view);
 	}
 
-	public function asLink($href="",$target=NULL) {
+	public function asLink($href="", $target=NULL) {
 		$this->addToProperty("class", "link");
-		if ($href !== "") {
+		if ($href!=="") {
 			$this->setProperty("href", $href);
 			if (isset($target))
 				$this->setProperty("target", $target);

Braces +6 added lines, -4 removed lines

@@ -37,8 +37,9 @@ 
 
 	private function getPart($part, $index=NULL) {
 		if (\array_key_exists($part, $this->content)) {
-			if (isset($index))
-				return $this->content[$part][$index];
+			if (isset($index)) {
+							return $this->content[$part][$index];
+			}
 			return $this->content[$part];
 		}
 		return NULL;
@@ -140,8 +141,9 @@ 
 		$this->addToProperty("class", "link");
 		if ($href !== "") {
 			$this->setProperty("href", $href);
-			if (isset($target))
-				$this->setProperty("target", $target);
+			if (isset($target)) {
+							$this->setProperty("target", $target);
+			}
 		}
 		return $this;
 	}

Ajax/semantic/widgets/base/FieldAsTrait.php

Spacing +107 added lines, -107 removed lines

@@ -26,23 +26,23 @@ 
  * @property boolean $_edition
  * @property mixed _modelInstance
  */
-trait FieldAsTrait{
+trait FieldAsTrait {
 
-	abstract protected function _getFieldIdentifier($prefix,$name="");
-	abstract public function setValueFunction($index,$callback);
+	abstract protected function _getFieldIdentifier($prefix, $name="");
+	abstract public function setValueFunction($index, $callback);
 	abstract protected function _getFieldName($index);
 	abstract protected function _getFieldCaption($index);
-	abstract protected function _buttonAsSubmit(HtmlButton &$button,$event,$url,$responseElement=NULL,$parameters=NULL);
+	abstract protected function _buttonAsSubmit(HtmlButton&$button, $event, $url, $responseElement=NULL, $parameters=NULL);
 
 	/**
 	 * @param HtmlFormField $element
 	 * @param array $attributes
 	 */
-	protected function _applyAttributes($element,&$attributes,$index){
-		if(isset($attributes["jsCallback"])){
+	protected function _applyAttributes($element, &$attributes, $index) {
+		if (isset($attributes["jsCallback"])) {
 			$callback=$attributes["jsCallback"];
-			if(\is_callable($callback)){
-				$callback($element,$this->_modelInstance,$index);
+			if (\is_callable($callback)) {
+				$callback($element, $this->_modelInstance, $index);
 				unset($attributes["jsCallback"]);
 			}
 		}
@@ -52,43 +52,43 @@ 
 		$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){
-		if(isset($attributes["rules"])){
+	protected function _addRules($element, &$attributes) {
+		if (isset($attributes["rules"])) {
 			$rules=$attributes["rules"];
-			if(\is_array($rules)){
+			if (\is_array($rules)) {
 				$element->addRules($rules);
 			}
-			else{
+			else {
 				$element->addRule($rules);
 			}
 			unset($attributes["rules"]);
 		}
 	}
 
-	protected function _prepareFormFields(&$field,$name,&$attributes){
+	protected function _prepareFormFields(&$field, $name, &$attributes) {
 		$field->setName($name);
 		$this->_addRules($field, $attributes);
 		return $field;
 	}
 
-	protected function _fieldAs($elementCallback,&$index,$attributes=NULL,$prefix=null){
-		$this->setValueFunction($index,function($value,$instance,$index) use (&$attributes,$elementCallback,$prefix){
+	protected function _fieldAs($elementCallback, &$index, $attributes=NULL, $prefix=null) {
+		$this->setValueFunction($index, function($value, $instance, $index) use (&$attributes, $elementCallback, $prefix){
 			$caption=$this->_getFieldCaption($index);
 			$name=$this->_getFieldName($index);
-			$id=$this->_getFieldIdentifier($prefix,$name);
-			if(isset($attributes["name"])){
+			$id=$this->_getFieldIdentifier($prefix, $name);
+			if (isset($attributes["name"])) {
 				$name=$attributes["name"];
 				unset($attributes["name"]);
 			}
-			$element=$elementCallback($id,$name,$value,$caption);
-			if(\is_array($attributes)){
-				$this->_applyAttributes($element, $attributes,$index);
+			$element=$elementCallback($id, $name, $value, $caption);
+			if (\is_array($attributes)) {
+				$this->_applyAttributes($element, $attributes, $index);
 			}
 			$element->setDisabled(!$this->_edition);
 			return $element;
@@ -97,177 +97,177 @@ 
 	}
 
 
-	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 fieldAsFlag($index){
-		$this->setValueFunction($index,function($flag){
-			$flag=new HtmlFlag($this->_getFieldIdentifier("flag"),$flag);
+	public function fieldAsFlag($index) {
+		$this->setValueFunction($index, function($flag) {
+			$flag=new HtmlFlag($this->_getFieldIdentifier("flag"), $flag);
 			return $flag;
 		});
 			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 fieldAsRadios($index,$elements=[],$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value,$caption) use ($elements){
-			return HtmlFormFields::radios($name,$elements,$caption,$value);
-		}, $index,$attributes,"radios");
+	public function fieldAsRadios($index, $elements=[], $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($elements){
+			return HtmlFormFields::radios($name, $elements, $caption, $value);
+		}, $index, $attributes, "radios");
 	}
 
-	public function fieldAsInput($index,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value,$caption) use ($attributes){
-			$input= new HtmlFormInput($id,$caption,"text",$value);
+	public function fieldAsInput($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($attributes){
+			$input=new HtmlFormInput($id, $caption, "text", $value);
 			return $this->_prepareFormFields($input, $name, $attributes);
-		}, $index,$attributes,"input");
+		}, $index, $attributes, "input");
 	}
 
-	public function fieldAsTextarea($index,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value,$caption){
-			$textarea=new HtmlFormTextarea($id,$caption,$value);
+	public function fieldAsTextarea($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) {
+			$textarea=new HtmlFormTextarea($id, $caption, $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,$caption){
-			$input=new HtmlFormCheckbox($id,$caption,$this->_instanceViewer->getIdentifier());
+	public function fieldAsCheckbox($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) {
+			$input=new HtmlFormCheckbox($id, $caption, $this->_instanceViewer->getIdentifier());
 			$input->setChecked(JString::isBooleanTrue($value));
 			$input->setName($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,$caption) use($elements,$multiple){
-			$dd=new HtmlFormDropdown($id,$elements,$caption,$value);
-			$dd->asSelect($name,$multiple);
+	public function fieldAsDropDown($index, $elements=[], $multiple=false, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use($elements, $multiple){
+			$dd=new HtmlFormDropdown($id, $elements, $caption, $value);
+			$dd->asSelect($name, $multiple);
 			return $dd;
-		}, $index,$attributes,"dd");
+		}, $index, $attributes, "dd");
 	}
 
-	public function fieldAsMessage($index,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value,$caption){
-			$mess= new HtmlMessage("message-".$id,$caption);
+	public function fieldAsMessage($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) {
+			$mess=new HtmlMessage("message-".$id, $caption);
 			$mess->addHeader($value);
 			return $mess;
-		}, $index,$attributes,"message");
+		}, $index, $attributes, "message");
 	}
 
-	public function fieldAsLink($index,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value,$caption){
-			$lnk= new HtmlLink("message-".$id,"#",$caption);
+	public function fieldAsLink($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) {
+			$lnk=new HtmlLink("message-".$id, "#", $caption);
 			return $lnk;
-		}, $index,$attributes,"link");
+		}, $index, $attributes, "link");
 	}
 
 	/**Change fields type
 	 * @param array $types an array or associative array $type=>$attributes
 	 */
-	public function fieldsAs(array $types){
+	public function fieldsAs(array $types) {
 		$i=0;
-		if(JArray::isAssociative($types)){
-			foreach ($types as $type=>$attributes){
-				if(\is_int($type))
-					$this->fieldAs($i++,$attributes,[]);
-				else{
-					$type=preg_replace('/\d/', '', $type );
-					$this->fieldAs($i++,$type,$attributes);
+		if (JArray::isAssociative($types)) {
+			foreach ($types as $type=>$attributes) {
+				if (\is_int($type))
+					$this->fieldAs($i++, $attributes, []);
+				else {
+					$type=preg_replace('/\d/', '', $type);
+					$this->fieldAs($i++, $type, $attributes);
 				}
 			}
-		}else{
-			foreach ($types as $type){
-				$this->fieldAs($i++,$type);
+		} else {
+			foreach ($types as $type) {
+				$this->fieldAs($i++, $type);
 			}
 		}
 	}
 
-	public function fieldAs($index,$type,$attributes=NULL){
+	public function fieldAs($index, $type, $attributes=NULL) {
 		$method="fieldAs".\ucfirst($type);
-		if(\method_exists($this, $method)){
-			if(!\is_array($attributes)){
+		if (\method_exists($this, $method)) {
+			if (!\is_array($attributes)) {
 				$attributes=[$index];
-			}else{
+			} else {
 				\array_unshift($attributes, $index);
 			}
-			\call_user_func_array([$this,$method], $attributes);
+			\call_user_func_array([$this, $method], $attributes);
 		}
 	}
 
-	public function fieldAsSubmit($index,$cssStyle=NULL,$url=NULL,$responseElement=NULL,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value,$caption) use ($url,$responseElement,$cssStyle,$attributes){
-			$button=new HtmlButton($id,$caption,$cssStyle);
-			$this->_buttonAsSubmit($button,"click",$url,$responseElement,@$attributes["ajax"]);
+	public function fieldAsSubmit($index, $cssStyle=NULL, $url=NULL, $responseElement=NULL, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($url, $responseElement, $cssStyle, $attributes){
+			$button=new HtmlButton($id, $caption, $cssStyle);
+			$this->_buttonAsSubmit($button, "click", $url, $responseElement, @$attributes["ajax"]);
 			return $button;
-		}, $index,$attributes,"submit");
+		}, $index, $attributes, "submit");
 	}
 
-	public function fieldAsButton($index,$cssStyle=NULL,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value,$caption) use ($cssStyle){
-			$button=new HtmlButton($id,$value,$cssStyle);
+	public function fieldAsButton($index, $cssStyle=NULL, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($cssStyle){
+			$button=new HtmlButton($id, $value, $cssStyle);
 			return $button;
-		}, $index,$attributes,"button");
+		}, $index, $attributes, "button");
 	}
 }
\ No newline at end of file

Ajax/semantic/widgets/dataform/DataForm.php

Spacing +32 added lines, -32 removed lines

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

Braces +8 added lines, -6 removed lines

@@ -59,7 +59,7 @@ 
 			foreach ($values as $v){
 				$form->addField($v);
 			}
-		}else{
+		} else{
 			$separators[]=$count;
 			for($i=0;$i<$size;$i++){
 				$this->_generateFields($form, $values, $headers, $separators[$i], $separators[$i+1], $wrappers);
@@ -70,18 +70,20 @@ 
 	protected function _generateFields($form,$values,$headers,$sepFirst,$sepLast,$wrappers){
 		$wrapper=null;
 		$fields=\array_slice($values, $sepFirst+1,$sepLast-$sepFirst);
-		if(isset($headers[$sepFirst+1]))
-			$form->addHeader($headers[$sepFirst+1],4,true);
+		if(isset($headers[$sepFirst+1])) {
+					$form->addHeader($headers[$sepFirst+1],4,true);
+		}
 			if(isset($wrappers[$sepFirst+1])){
 				$wrapper=$wrappers[$sepFirst+1];
 			}
 			if(\sizeof($fields)===1){
 				$added=$form->addField($fields[0]);
-			}elseif(\sizeof($fields)>1){
+			} elseif(\sizeof($fields)>1){
 				$added=$form->addFields($fields);
 			}
-			if(isset($wrapper))
-				$added->wrap($wrapper[0],$wrapper[1]);
+			if(isset($wrapper)) {
+							$added->wrap($wrapper[0],$wrapper[1]);
+			}
 	}
 
 	/**