phpMv / phpMv-UI

Ajax/semantic/html/collections/HtmlMessage.php

Spacing +25 added lines, -25 removed lines

@@ -30,42 +30,42 @@ 
 	 * @param string|HtmlSemDoubleElement $header
 	 * @return \Ajax\semantic\html\collections\HtmlMessage
 	 */
-	public function addHeader($header){
+	public function addHeader($header) {
 		$headerO=$header;
-		if(\is_string($header)){
-			$headerO=new HtmlSemDoubleElement("header-".$this->identifier,"div");
+		if (\is_string($header)) {
+			$headerO=new HtmlSemDoubleElement("header-".$this->identifier, "div");
 			$headerO->setClass("header");
 			$headerO->setContent($header);
 		}
-		return $this->addContent($headerO,true);
+		return $this->addContent($headerO, true);
 	}
 
-	public function setHeader($header){
+	public function setHeader($header) {
 		return $this->addHeader($header);
 	}
 
-	public function addList($elements,$ordered=false){
-		$list=new HtmlList("list-".$this->identifier,$elements);
+	public function addList($elements, $ordered=false) {
+		$list=new HtmlList("list-".$this->identifier, $elements);
 		$list->setOrdered($ordered);
 		$list->setClass("ui list");
 		$this->addContent($list);
 	}
 
-	public function setIcon($icon){
+	public function setIcon($icon) {
 		$this->addToProperty("class", "icon");
-		$this->wrapContent("<div class='content'>","</div>");
+		$this->wrapContent("<div class='content'>", "</div>");
 		$this->icon=new HtmlIcon("icon-".$this->identifier, $icon);
 		return $this;
 	}
 
-	public function addLoader($loaderIcon="notched circle"){
+	public function addLoader($loaderIcon="notched circle") {
 		$this->setIcon($loaderIcon);
 		$this->icon->addToIcon("loading");
 		return $this;
 	}
 
-	public function setDismissable($dismiss=true){
-		if($dismiss===true)
+	public function setDismissable($dismiss=true) {
+		if ($dismiss===true)
 			$this->close=new HtmlIcon("close-".$this->identifier, "close");
 		else
 			$this->close=NULL;
@@ -76,38 +76,38 @@ 
 	 * {@inheritDoc}
 	 * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::run()
 	 */
-	public function run(JsUtils $js){
+	public function run(JsUtils $js) {
 		parent::run($js);
-		if(isset($this->close)){
+		if (isset($this->close)) {
 			$js->execOn("click", "#".$this->identifier." .close", "$(this).closest('.message').transition('fade')");
 		}
 	}
 
-	public function setState($visible=true){
-		$visible=($visible===true)?"visible":"hidden";
-		return $this->addToPropertyCtrl("class", $visible, array("visible","hidden"));
+	public function setState($visible=true) {
+		$visible=($visible===true) ? "visible" : "hidden";
+		return $this->addToPropertyCtrl("class", $visible, array("visible", "hidden"));
 	}
 
-	public function setVariation($value="floating"){
-		return $this->addToPropertyCtrl("class", $value, array("floating","compact"));
+	public function setVariation($value="floating") {
+		return $this->addToPropertyCtrl("class", $value, array("floating", "compact"));
 	}
 
-	public function setStyle($style){
+	public function setStyle($style) {
 		return $this->addToPropertyCtrl("class", $style, Style::getConstants());
 	}
 
-	public function setError(){
+	public function setError() {
 		return $this->setStyle("error");
 	}
 
-	public function setWarning(){
+	public function setWarning() {
 		return $this->setStyle("warning");
 	}
 
-	public function setMessage($message){
-		if(\is_array($this->content)){
+	public function setMessage($message) {
+		if (\is_array($this->content)) {
 			$this->content[\sizeof($this->content)-1]=$message;
-		}else
+		} else
 			$this->setContent($message);
 	}
 }
\ No newline at end of file

Ajax/semantic/widgets/base/FieldAsTrait.php

Spacing +104 added lines, -104 removed lines

@@ -25,23 +25,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["callback"])){
+	protected function _applyAttributes($element, &$attributes, $index) {
+		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"]);
 			}
 		}
@@ -51,43 +51,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;
@@ -96,169 +96,169 @@ 
 	}
 
 
-	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 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/FormInstanceViewer.php

Spacing +23 added lines, -23 removed lines

@@ -11,58 +11,58 @@ 
 	protected $headers;
 	protected $wrappers;
 
-	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->headers=[];
 		$this->wrappers=[];
-		$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);
-		if(($header=$this->hasHeader($field))!==false){
+		if (($header=$this->hasHeader($field))!==false) {
 			$this->addHeaderDividerBefore($index, $header);
 		}
 	}
 
-	protected function hasHeader(&$field){
-		$matches=[];$result=false;
-		if(\preg_match('/\{(.*?)\}/s', $field, $matches)===1){
+	protected function hasHeader(&$field) {
+		$matches=[]; $result=false;
+		if (\preg_match('/\{(.*?)\}/s', $field, $matches)===1) {
 			$result=$matches[1];
-			$field=\str_replace("{".$result."}","", $field);
+			$field=\str_replace("{".$result."}", "", $field);
 		}
 		return $result;
 	}
 
 
 
-	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;
 	}
 
-	public function addHeaderDividerBefore($fieldNum,$header){
+	public function addHeaderDividerBefore($fieldNum, $header) {
 		$this->headers[$fieldNum]=$header;
-		if($fieldNum>0)
+		if ($fieldNum>0)
 			$this->addSeparatorAfter($fieldNum-1);
 		return $this;
 	}
 
-	public function addWrapper($fieldNum,$contentBefore,$contentAfter=null){
-		$this->wrappers[$fieldNum]=[$contentBefore,$contentAfter];
+	public function addWrapper($fieldNum, $contentBefore, $contentAfter=null) {
+		$this->wrappers[$fieldNum]=[$contentBefore, $contentAfter];
 			return $this;
 	}
 
@@ -70,15 +70,15 @@ 
 		return $this->separators;
 	}
 
-	public function removeSeparator($index){
-		\array_splice($this->separators,$index,1);
+	public function removeSeparator($index) {
+		\array_splice($this->separators, $index, 1);
 	}
 
-	public function removeField($index){
+	public function removeField($index) {
 		parent::removeField($index);
 		$pos=\array_search($index, $this->separators);
-		if($pos!==false){
-			for($i=$pos+1;$i<\sizeof($this->separators);$i++){
+		if ($pos!==false) {
+			for ($i=$pos+1; $i<\sizeof($this->separators); $i++) {
 				$this->separators[$i]--;
 			}
 			\array_splice($this->separators, $pos, 1);

Ajax/semantic/widgets/dataform/DataForm.php

Spacing +31 added lines, -31 removed lines

@@ -19,64 +19,64 @@ 
 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++) {
 				$wrapper=null;
-				$fields=\array_slice($values, $separators[$i]+1,$separators[$i+1]-$separators[$i]);
-				if(isset($headers[$separators[$i]+1]))
-					$form->addHeader($headers[$separators[$i]+1],4,true);
-				if(isset($wrappers[$separators[$i]+1])){
+				$fields=\array_slice($values, $separators[$i]+1, $separators[$i+1]-$separators[$i]);
+				if (isset($headers[$separators[$i]+1]))
+					$form->addHeader($headers[$separators[$i]+1], 4, true);
+				if (isset($wrappers[$separators[$i]+1])) {
 					$wrapper=$wrappers[$separators[$i]+1];
 				}
 				//TODO check why $fields is empty
-				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]);
 			}
 		}
 	}
@@ -85,11 +85,11 @@ 
 	 * {@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;
@@ -104,12 +104,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);
 	}
 
 	/**
@@ -128,19 +128,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

Ajax/semantic/widgets/business/user/FormLogin.php

Spacing +28 added lines, -28 removed lines

@@ -10,50 +10,50 @@
 	 * @param string $identifier
 	 * @param object $modelInstance
 	 */
-	public function __construct($identifier,$modelInstance=null,$fieldsOrder=[],$fieldsDefinition=[],$fields=[],$captions=[],$separators=[]) {
-		parent::__construct($identifier,$modelInstance,$fieldsOrder,$fieldsDefinition,$fields,$captions,$separators);
+	public function __construct($identifier, $modelInstance=null, $fieldsOrder=[], $fieldsDefinition=[], $fields=[], $captions=[], $separators=[]) {
+		parent::__construct($identifier, $modelInstance, $fieldsOrder, $fieldsDefinition, $fields, $captions, $separators);
 	}
 
-	protected function getDefaultModelInstance(){
+	protected function getDefaultModelInstance() {
 		return new UserModel();
 	}
 
-	public static function regular($identifier,$modelInstance=null){
-		return new FormLogin($identifier,$modelInstance,
-				["message","login","password","remember","forget","submit","error"],
-				["message"=>[["icon"=>"sign in"]],"input0"=>[["rules"=>"empty"]],"input1"=>[["inputType"=>"password","rules"=>"empty"]],"checkbox","link","submit"=>["green fluid"],"message2"=>[["error"=>true]]],
-				["Connection","login","password","remember","forget","submit","error"],
-				["Please enter login and password to connect","Login","Password","Remember me.","Forgot your password?","Connection"],
-				[0,2,4,5,6]);
+	public static function regular($identifier, $modelInstance=null) {
+		return new FormLogin($identifier, $modelInstance,
+				["message", "login", "password", "remember", "forget", "submit", "error"],
+				["message"=>[["icon"=>"sign in"]], "input0"=>[["rules"=>"empty"]], "input1"=>[["inputType"=>"password", "rules"=>"empty"]], "checkbox", "link", "submit"=>["green fluid"], "message2"=>[["error"=>true]]],
+				["Connection", "login", "password", "remember", "forget", "submit", "error"],
+				["Please enter login and password to connect", "Login", "Password", "Remember me.", "Forgot your password?", "Connection"],
+				[0, 2, 4, 5, 6]);
 	}
 
-	public static function smallInline($identifier,$modelInstance=null){
-		$result=new FormLogin($identifier,$modelInstance,
-				["login","password","submit"],
-				["input0"=>[["rules"=>"empty"]],"input1"=>[["inputType"=>"password","rules"=>"empty"]],"submit"=>["green basic"]],
-				["login","password","submit"],
-				["","","Connection"],
+	public static function smallInline($identifier, $modelInstance=null) {
+		$result=new FormLogin($identifier, $modelInstance,
+				["login", "password", "submit"],
+				["input0"=>[["rules"=>"empty"]], "input1"=>[["inputType"=>"password", "rules"=>"empty"]], "submit"=>["green basic"]],
+				["login", "password", "submit"],
+				["", "", "Connection"],
 				[2]);
 			$result->addDividerBefore(0, "Connection");
 		return $result;
 	}
 
-	public static function small($identifier,$modelInstance=null){
-		$result=new FormLogin($identifier,$modelInstance,
-				["login","password","submit"],
-				["input0"=>[["rules"=>"empty"]],"input1"=>[["inputType"=>"password","rules"=>"empty"]],"submit"=>["green basic"]],
-				["login","password","submit"],
-				["Login","Password","Connection"],
-				[1,2]);
+	public static function small($identifier, $modelInstance=null) {
+		$result=new FormLogin($identifier, $modelInstance,
+				["login", "password", "submit"],
+				["input0"=>[["rules"=>"empty"]], "input1"=>[["inputType"=>"password", "rules"=>"empty"]], "submit"=>["green basic"]],
+				["login", "password", "submit"],
+				["Login", "Password", "Connection"],
+				[1, 2]);
 		$result->addDividerBefore(0, "Connection");
 		return $result;
 	}
 
-	public static function attachedSegment($identifier,$modelInstance=null){
-		$result=self::regular($identifier,$modelInstance);
-		$result->fieldAsMessage("message",["icon"=>"sign in","attached"=>true]);
-		$result->addWrapper("message",null,"<div class='ui attached segment'>");
-		$result->addWrapper("error", null,"</div>");
+	public static function attachedSegment($identifier, $modelInstance=null) {
+		$result=self::regular($identifier, $modelInstance);
+		$result->fieldAsMessage("message", ["icon"=>"sign in", "attached"=>true]);
+		$result->addWrapper("message", null, "<div class='ui attached segment'>");
+		$result->addWrapper("error", null, "</div>");
 		return $result;
 	}
 }
\ No newline at end of file

Ajax/semantic/traits/SemanticWidgetsTrait.php

Spacing +12 added lines, -12 removed lines

@@ -16,8 +16,8 @@ 
 	 * @param array $instances
 	 * @return DataTable
 	 */
-	public function dataTable($identifier,$model, $instances){
-		return $this->addHtmlComponent(new DataTable($identifier,$model,$instances));
+	public function dataTable($identifier, $model, $instances) {
+		return $this->addHtmlComponent(new DataTable($identifier, $model, $instances));
 	}
 
 	/**
@@ -25,8 +25,8 @@ 
 	 * @param object $instance
 	 * @return DataElement
 	 */
-	public function dataElement($identifier, $instance){
-		return $this->addHtmlComponent(new DataElement($identifier,$instance));
+	public function dataElement($identifier, $instance) {
+		return $this->addHtmlComponent(new DataElement($identifier, $instance));
 	}
 
 	/**
@@ -34,19 +34,19 @@ 
 	 * @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));
 	}
 
-	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));
 	}
 
-	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));
 	}
 
-	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));
 	}
 }
\ No newline at end of file

Ajax/common/html/BaseHtml.php

Spacing +30 added lines, -30 removed lines

@@ -15,11 +15,11 @@ 
  * @version 1.3
  */
 abstract class BaseHtml extends BaseWidget {
-	use BaseHtmlEventsTrait,BaseHtmlPropertiesTrait;
+	use BaseHtmlEventsTrait, BaseHtmlPropertiesTrait;
 	protected $_template;
 	protected $tagName;
-	protected $_wrapBefore=array ();
-	protected $_wrapAfter=array ();
+	protected $_wrapBefore=array();
+	protected $_wrapAfter=array();
 	protected $_bsComponent;
 
 	/**
@@ -29,14 +29,14 @@ 
 	 */
 	abstract public function run(JsUtils $js);
 
-	private function _callSetter($setter,$key,$value,&$array){
+	private function _callSetter($setter, $key, $value, &$array) {
 		$result=false;
 		if (method_exists($this, $setter) && !JString::startswith($key, "_")) {
 			try {
 				$this->$setter($value);
 				unset($array[$key]);
 				$result=true;
-			} catch ( \Exception $e ) {
+			}catch (\Exception $e) {
 				$result=false;
 			}
 		}
@@ -44,17 +44,17 @@ 
 	}
 
 	protected function getTemplate(JsUtils $js=NULL) {
-		return PropertyWrapper::wrap($this->_wrapBefore, $js) . $this->_template . PropertyWrapper::wrap($this->_wrapAfter, $js);
+		return PropertyWrapper::wrap($this->_wrapBefore, $js).$this->_template.PropertyWrapper::wrap($this->_wrapAfter, $js);
 	}
 
 	protected function ctrl($name, $value, $typeCtrl) {
 		if (\is_array($typeCtrl)) {
-			if (array_search($value, $typeCtrl) === false) {
-				throw new \Exception("La valeur passée `" . $value . "` à la propriété `" . $name . "` ne fait pas partie des valeurs possibles : {" . implode(",", $typeCtrl) . "}");
+			if (array_search($value, $typeCtrl)===false) {
+				throw new \Exception("La valeur passée `".$value."` à la propriété `".$name."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}");
 			}
 		} else {
 			if (!$typeCtrl($value)) {
-				throw new \Exception("La fonction " . $typeCtrl . " a retourné faux pour l'affectation de la propriété " . $name);
+				throw new \Exception("La fonction ".$typeCtrl." a retourné faux pour l'affectation de la propriété ".$name);
 			}
 		}
 		return true;
@@ -63,7 +63,7 @@ 
 
 
 	protected function setMemberCtrl(&$name, $value, $typeCtrl) {
-		if ($this->ctrl($name, $value, $typeCtrl) === true) {
+		if ($this->ctrl($name, $value, $typeCtrl)===true) {
 			return $name=$value;
 		}
 		return $this;
@@ -72,7 +72,7 @@ 
 	protected function addToMemberUnique(&$name, $value, $typeCtrl, $separator=" ") {
 		if (\is_array($typeCtrl)) {
 			$this->removeOldValues($name, $typeCtrl);
-			$name.=$separator . $value;
+			$name.=$separator.$value;
 		}
 		return $this;
 	}
@@ -80,17 +80,17 @@ 
 
 
 	protected function addToMemberCtrl(&$name, $value, $typeCtrl, $separator=" ") {
-		if ($this->ctrl($name, $value, $typeCtrl) === true) {
+		if ($this->ctrl($name, $value, $typeCtrl)===true) {
 			if (\is_array($typeCtrl)) {
 				$this->removeOldValues($name, $typeCtrl);
 			}
-			$name.=$separator . $value;
+			$name.=$separator.$value;
 		}
 		return $this;
 	}
 
 	protected function addToMember(&$name, $value, $separator=" ") {
-		$name=str_ireplace($value, "", $name) . $separator . $value;
+		$name=str_ireplace($value, "", $name).$separator.$value;
 		return $this;
 	}
 
@@ -101,17 +101,17 @@ 
 		$oldValue=trim($oldValue);
 	}
 
-	protected function _getElementBy($callback,$elements){
+	protected function _getElementBy($callback, $elements) {
 		if (\is_array($elements)) {
 			$flag=false;
 			$index=0;
-			while ( !$flag && $index < sizeof($elements) ) {
+			while (!$flag && $index<sizeof($elements)) {
 				if ($elements[$index] instanceof BaseHtml)
 					$flag=($callback($elements[$index]));
 					$index++;
 			}
-			if ($flag === true)
-				return $elements[$index - 1];
+			if ($flag===true)
+				return $elements[$index-1];
 		} elseif ($elements instanceof BaseHtml) {
 			if ($callback($elements))
 				return $elements;
@@ -139,13 +139,13 @@ 
 	}
 
 	public function fromArray($array) {
-		foreach ( $this as $key => $value ) {
-			if(array_key_exists($key, $array)===true)
-				$this->_callSetter("set" . ucfirst($key), $key, $array[$key], $array);
+		foreach ($this as $key => $value) {
+			if (array_key_exists($key, $array)===true)
+				$this->_callSetter("set".ucfirst($key), $key, $array[$key], $array);
 		}
-		foreach ( $array as $key => $value ) {
-			if($this->_callSetter($key, $key, $value, $array)===false){
-				$this->_callSetter("set" . ucfirst($key), $key, $value, $array);
+		foreach ($array as $key => $value) {
+			if ($this->_callSetter($key, $key, $value, $array)===false) {
+				$this->_callSetter("set".ucfirst($key), $key, $value, $array);
 			}
 		}
 		return $array;
@@ -153,7 +153,7 @@ 
 
 	public function fromDatabaseObjects($objects, $function) {
 		if (isset($objects)) {
-			foreach ( $objects as $object ) {
+			foreach ($objects as $object) {
 				$this->fromDatabaseObject($object, $function);
 			}
 		}
@@ -174,7 +174,7 @@ 
 
 
 	public function getElementById($identifier, $elements) {
-		return $this->_getElementBy(function($element) use ($identifier){return $element->getIdentifier()===$identifier;}, $elements);
+		return $this->_getElementBy(function($element) use ($identifier){return $element->getIdentifier()===$identifier; }, $elements);
 	}
 
 	public function getBsComponent() {
@@ -188,19 +188,19 @@ 
 
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
 		$result=$this->getTemplate($js);
-		foreach ( $this as $key => $value ) {
-			if (JString::startswith($key, "_") === false && $key !== "events") {
+		foreach ($this as $key => $value) {
+			if (JString::startswith($key, "_")===false && $key!=="events") {
 				if (\is_array($value)) {
 					$v=PropertyWrapper::wrap($value, $js);
 				} else {
 					$v=$value;
 				}
-				$result=str_ireplace("%" . $key . "%", $v, $result);
+				$result=str_ireplace("%".$key."%", $v, $result);
 			}
 		}
 		if (isset($js)===true) {
 			$this->run($js);
-			if (isset($view) === true) {
+			if (isset($view)===true) {
 				$js->addViewElement($this->_identifier, $result, $view);
 			}
 		}

Ajax/semantic/html/modules/HtmlSearch.php

Spacing +11 added lines, -11 removed lines

@@ -8,12 +8,12 @@ 
 use Ajax\semantic\html\base\constants\Direction;
 
 class HtmlSearch extends HtmlSemDoubleElement {
-	private $_elements=array ();
-	private $_searchFields=array ("title" );
+	private $_elements=array();
+	private $_searchFields=array("title");
 	private $_local=false;
 
 	public function __construct($identifier, $placeholder=NULL, $icon=NULL) {
-		parent::__construct("search-" . $identifier, "div", "ui search", array ());
+		parent::__construct("search-".$identifier, "div", "ui search", array());
 		$this->_identifier=$identifier;
 		$this->createField($placeholder, $icon);
 		$this->createResult();
@@ -33,7 +33,7 @@ 
 	}
 
 	private function createResult() {
-		$this->content["result"]=new HtmlSemDoubleElement("results-" . $this->identifier, "div", "results");
+		$this->content["result"]=new HtmlSemDoubleElement("results-".$this->identifier, "div", "results");
 		return $this->content["result"];
 	}
 
@@ -50,7 +50,7 @@ 
 	}
 
 	public function setUrl($url) {
-		$this->_params["apiSettings"]="%{url: %quote%" . $url . "%quote%}%";
+		$this->_params["apiSettings"]="%{url: %quote%".$url."%quote%}%";
 		return $this;
 	}
 
@@ -73,16 +73,16 @@ 
 	}
 
 	public function run(JsUtils $js) {
-		$this->_params["onSelect"]='%function(result,response){$(%quote%#' . $this->identifier . '%quote%).trigger(%quote%onSelect%quote%, {%quote%result%quote%: result, %quote%response%quote%:response} );}%';
+		$this->_params["onSelect"]='%function(result,response){$(%quote%#'.$this->identifier.'%quote%).trigger(%quote%onSelect%quote%, {%quote%result%quote%: result, %quote%response%quote%:response} );}%';
 		$searchFields=\json_encode($this->_searchFields);
 		$searchFields=str_ireplace("\"", "%quote%", $searchFields);
-		$this->_params["searchFields"]="%" . $searchFields . "%";
-		if ($this->_local === true) {
+		$this->_params["searchFields"]="%".$searchFields."%";
+		if ($this->_local===true) {
 			$this->_params["source"]="%content%";
-			$this->addEvent("beforeExecute", "var content=" . $this->resultsToJson() . ";");
+			$this->addEvent("beforeExecute", "var content=".$this->resultsToJson().";");
 		}
-		if (isset($this->_bsComponent) === false) {
-			$this->_bsComponent=$js->semantic()->search("#" . $this->identifier, $this->_params);
+		if (isset($this->_bsComponent)===false) {
+			$this->_bsComponent=$js->semantic()->search("#".$this->identifier, $this->_params);
 		}
 		$this->addEventsOnRun($js);
 		return $this->_bsComponent;

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

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
 class HtmlFormCheckbox extends HtmlFormField {
 	use CheckboxTrait;
 	public function __construct($identifier, $label=NULL, $value=NULL, $type=NULL) {
-		parent::__construct("field-".$identifier, new HtmlCheckbox($identifier,$label,$value,$type));
+		parent::__construct("field-".$identifier, new HtmlCheckbox($identifier, $label, $value, $type));
 		$this->_identifier=$identifier;
 	}