phpMv / phpMv-UI

Ajax/common/html/HtmlDoubleElement.php

Braces +10 added lines, -8 removed lines

@@ -29,15 +29,17 @@
 
 	public function addContent($content,$before=false) {
 		if (!\is_array($this->content)) {
-			if(isset($this->content))
-				$this->content=array ($this->content);
-			else
-				$this->content=array();
+			if(isset($this->content)) {
+							$this->content=array ($this->content);
+			} else {
+							$this->content=array();
+			}
+		}
+		if($before) {
+					array_unshift($this->content,$content);
+		} else {
+					$this->content []=$content;
 		}
-		if($before)
-			array_unshift($this->content,$content);
-		else
-			$this->content []=$content;
 		return $this;
 	}
 

Ajax/common/html/BaseHtml.php

Braces +38 added lines, -26 removed lines

@@ -50,8 +50,9 @@ 
 	}
 
 	public function getProperty($name) {
-		if (array_key_exists($name, $this->properties))
-			return $this->properties[$name];
+		if (array_key_exists($name, $this->properties)) {
+					return $this->properties[$name];
+		}
 	}
 
 	public function addToProperty($name, $value, $separator=" ") {
@@ -61,10 +62,11 @@ 
 			}
 		} else if ($value !== "" && $this->propertyContains($name, $value) === false) {
 			$v=@$this->properties[$name];
-			if (isset($v) && $v !== "")
-				$v=$v . $separator . $value;
-			else
-				$v=$value;
+			if (isset($v) && $v !== "") {
+							$v=$v . $separator . $value;
+			} else {
+							$v=$value;
+			}
 
 			return $this->setProperty($name, $v);
 		}
@@ -119,8 +121,9 @@ 
 	}
 
 	protected function setPropertyCtrl($name, $value, $typeCtrl) {
-		if ($this->ctrl($name, $value, $typeCtrl) === true)
-			return $this->setProperty($name, $value);
+		if ($this->ctrl($name, $value, $typeCtrl) === true) {
+					return $this->setProperty($name, $value);
+		}
 		return $this;
 	}
 
@@ -150,8 +153,9 @@ 
 	}
 
 	public function removeProperty($name) {
-		if (\array_key_exists($name, $this->properties))
-			unset($this->properties[$name]);
+		if (\array_key_exists($name, $this->properties)) {
+					unset($this->properties[$name]);
+		}
 		return $this;
 	}
 
@@ -171,8 +175,9 @@ 
 	}
 
 	protected function addToPropertyUnique($name, $value, $typeCtrl) {
-		if (@class_exists($typeCtrl, true))
-			$typeCtrl=$typeCtrl::getConstants();
+		if (@class_exists($typeCtrl, true)) {
+					$typeCtrl=$typeCtrl::getConstants();
+		}
 		if (\is_array($typeCtrl)) {
 			$this->removeOldValues($this->properties[$name], $typeCtrl);
 		}
@@ -213,8 +218,9 @@ 
 
 	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);
+			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){
@@ -265,15 +271,18 @@ 
 			$flag=false;
 			$index=0;
 			while ( !$flag && $index < sizeof($elements) ) {
-				if ($elements[$index] instanceof BaseHtml)
-					$flag=($elements[$index]->getIdentifier() === $identifier);
+				if ($elements[$index] instanceof BaseHtml) {
+									$flag=($elements[$index]->getIdentifier() === $identifier);
+				}
 				$index++;
 			}
-			if ($flag === true)
-				return $elements[$index - 1];
+			if ($flag === true) {
+							return $elements[$index - 1];
+			}
 		} elseif ($elements instanceof BaseHtml) {
-			if ($elements->getIdentifier() === $identifier)
-				return $elements;
+			if ($elements->getIdentifier() === $identifier) {
+							return $elements;
+			}
 		}
 		return null;
 	}
@@ -283,15 +292,18 @@ 
 			$flag=false;
 			$index=0;
 			while ( !$flag && $index < sizeof($elements) ) {
-				if ($elements[$index] instanceof BaseHtml)
-					$flag=($elements[$index]->propertyContains($propertyName, $value) === true);
+				if ($elements[$index] instanceof BaseHtml) {
+									$flag=($elements[$index]->propertyContains($propertyName, $value) === true);
+				}
 					$index++;
 			}
-			if ($flag === true)
-				return $elements[$index - 1];
+			if ($flag === true) {
+							return $elements[$index - 1];
+			}
 		} elseif ($elements instanceof BaseHtml) {
-			if ($elements->propertyContains($propertyName, $value) === true)
-				return $elements;
+			if ($elements->propertyContains($propertyName, $value) === true) {
+							return $elements;
+			}
 		}
 		return null;
 	}

Ajax/common/traits/JqueryAjaxTrait.php

Braces +26 added lines, -19 removed lines

@@ -46,8 +46,9 @@ 
 		}
 		$retour.="$.".$method."(url,".$params.").done(function( data ) {\n";
 		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone,$jsCallback)."});\n";
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$retour;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$retour;
+		}
 			return $retour;
 	}
 
@@ -55,15 +56,17 @@ 
 		$url=$this->_correctAjaxUrl($url);
 		$retour="url='".$url."';\n";
 		$slash="/";
-		if(JString::endswith($url, "/")===true)
-			$slash="";
+		if(JString::endswith($url, "/")===true) {
+					$slash="";
+		}
 		if(JString::isNotNull($attr)){
-			if ($attr==="value")
-				$retour.="url=url+'".$slash."'+$(this).val();\n";
-			elseif ($attr==="html")
-			$retour.="url=url+'".$slash."'+$(this).html();\n";
-			elseif($attr!=null && $attr!=="")
-					$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
+			if ($attr==="value") {
+							$retour.="url=url+'".$slash."'+$(this).val();\n";
+			} elseif ($attr==="html") {
+						$retour.="url=url+'".$slash."'+$(this).html();\n";
+			} elseif($attr!=null && $attr!=="") {
+								$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
+			}
 		}
 		return $retour;
 	}
@@ -85,8 +88,9 @@ 
 	}
 
 	protected function _correctAjaxUrl($url) {
-		if ($url!=="/" && JString::endsWith($url, "/")===true)
-			$url=substr($url, 0, strlen($url)-1);
+		if ($url!=="/" && JString::endsWith($url, "/")===true) {
+					$url=substr($url, 0, strlen($url)-1);
+		}
 		if (strncmp($url, 'http://', 7)!=0&&strncmp($url, 'https://', 8)!=0) {
 			$url=$this->jsUtils->getUrl($url);
 		}
@@ -110,8 +114,9 @@ 
 				$retour.="\t".$jsCallback."\n".
 						"\t$(document).trigger('jsonReady',[data]);\n".
 						"});\n";
-				if ($immediatly)
-					$this->jquery_code_for_compile[]=$retour;
+				if ($immediatly) {
+									$this->jquery_code_for_compile[]=$retour;
+				}
 					return $retour;
 	}
 
@@ -150,7 +155,7 @@ 
 		if($context===null){
 			$appendTo="\t\tnewElm.appendTo($('".$maskSelector."').parent());\n";
 			$newElm = "$('#'+newId)";
-		}else{
+		} else{
 			$appendTo="\t\tnewElm.appendTo(".$context.");\n";
 			$newElm = $context.".find('#'+newId)";
 		}
@@ -160,8 +165,9 @@ 
 		$retour.="\t}\n"."\tfor(var key in value){\n"."\t\t\tvar html = $('<div />').append($(newElm).clone()).html();\n"."\t\t\tif(html.indexOf('[['+key+']]')>-1){\n"."\t\t\t\tcontent=$(html.split('[['+key+']]').join(value[key]));\n"."\t\t\t\t$(newElm).replaceWith(content);newElm=content;\n"."\t\t\t}\n"."\t\tvar sel='[data-id=\"'+key+'\"]';if($(sel,newElm).length){\n"."\t\t\tvar selElm=$(sel,newElm);\n"."\t\t\t if(selElm.is('[value]')) { selElm.attr('value',value[key]);selElm.val(value[key]);} else { selElm.html(value[key]); }\n"."\t\t}\n"."}\n"."\t$(newElm).show(true);"."\n"."\t$(newElm).removeClass('hide');"."});\n";
 		$retour.="\t$(document).trigger('jsonReady',[data]);\n";
 		$retour.="\t".$jsCallback."\n"."});\n";
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$retour;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$retour;
+		}
 			return $retour;
 	}
 	/**
@@ -202,8 +208,9 @@ 
 			}});\n";
 			$retour.="$('#".$form."').submit();\n";
 		}
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$retour;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$retour;
+		}
 			return $retour;
 	}
 

Ajax/semantic/widgets/datatable/DataTable.php

Braces +7 added lines, -5 removed lines

@@ -66,8 +66,9 @@ 
 
 		$table->setRowCount(0, \sizeof($captions));
 		$table->setHeaderValues($captions);
-		if(isset($this->_compileParts))
-			$table->setCompileParts($this->_compileParts);
+		if(isset($this->_compileParts)) {
+					$table->setCompileParts($this->_compileParts);
+		}
 		if(isset($this->_searchField) && isset($js)){
 			$this->_searchField->postOn("change", $this->_urls,"{'s':$(this).val()}","#".$this->identifier." tbody",["preventDefault"=>false,"jqueryDone"=>"replaceWith"]);
 		}
@@ -158,7 +159,7 @@ 
 		$hasPart=$table->hasPart($part);
 		if($hasPart){
 			$row=$table->getPart($part)->addRow(\sizeof($captions));
-		}else{
+		} else{
 			$row=$table->getPart($part)->getRow(0);
 		}
 		$row->mergeCol();
@@ -282,8 +283,9 @@ 
 	private function getDefaultButton($icon,$class=null){
 		$bt=$this->getFieldButton("");
 		$bt->asIcon($icon);
-		if(isset($class))
-			$bt->addToProperty("class", $class);
+		if(isset($class)) {
+					$bt->addToProperty("class", $class);
+		}
 		return $bt;
 	}
 

Ajax/semantic/widgets/base/InstanceViewer.php

Braces +38 added lines, -33 removed lines

@@ -21,8 +21,9 @@ 
 		$this->widgetIdentifier=$identifier;
 		$this->values=[];
 		$this->afterCompile=[];
-		if(isset($instance))
-			$this->setInstance($instance);
+		if(isset($instance)) {
+					$this->setInstance($instance);
+		}
 		$this->setCaptions($captions);
 		$this->captionCallback=NULL;
 		$this->defaultValueFunction=function($name,$value){return $value;};
@@ -40,8 +41,9 @@ 
 
 	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;
 	}
 
@@ -65,19 +67,19 @@ 
 			$value=$property->getValue($this->instance);
 			if(isset($this->values[$index])){
 				$value= $this->values[$index]($value,$this->instance,$index);
-			}else{
+			} else{
 				$value=$this->_getDefaultValue($property->getName(),$value, $index);
 			}
-		}else{
-			if(\is_callable($property))
-				$value=$property($this->instance);
-			elseif(\is_array($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);
 				$value=\implode("", $values);
-			}else{
+			} else{
 				if(isset($this->values[$index])){
 					$value= $this->values[$index]($property,$this->instance,$index);
-				}else{
+				} else{
 					$value=$property;
 				}
 			}
@@ -100,10 +102,10 @@ 
 		if(isset($vb[$index])){
 			if(\is_array($vb[$index])){
 				$this->visibleProperties[$index][]=$field;
-			}else{
+			} else{
 				$this->visibleProperties[$index]=[$vb[$index],$field];
 			}
-		}else{
+		} else{
 			return $this->insertField($index, $field);
 		}
 		return $this;
@@ -130,9 +132,9 @@ 
 		$property=$this->getProperty($index);
 		if($property instanceof \ReflectionProperty){
 			$result=$property->getName();
-		}elseif(\is_callable($property)){
+		} elseif(\is_callable($property)){
 			$result=$this->visibleProperties[$index];
-		}else{
+		} else{
 			$result=$property;
 		}
 		return $result;
@@ -152,7 +154,7 @@ 
 		$this->reflect=new \ReflectionClass($instance);
 		if(\sizeof($this->visibleProperties)===0){
 			$this->properties=$this->getDefaultProperties();
-		}else{
+		} else{
 			foreach ($this->visibleProperties as $property){
 				$this->setInstanceProperty($property);
 			}
@@ -163,22 +165,23 @@ 
 	private function setInstanceProperty($property){
 		if(\is_callable($property)){
 			$this->properties[]=$property;
-		}elseif(\is_string($property)){
+		} elseif(\is_string($property)){
 			try{
 				$this->_beforeAddProperty(\sizeof($this->properties), $property);
 				$rProperty=$this->reflect->getProperty($property);
 				$this->properties[]=$rProperty;
-			}catch(\Exception $e){
+			} catch(\Exception $e){
 				$this->_beforeAddProperty(\sizeof($this->properties), $property);
 				$this->properties[]=$property;
 			}
-		}elseif(\is_int($property)){
+		} elseif(\is_int($property)){
 			$props=$this->getDefaultProperties();
-			if(isset($props[$property]))
-				$this->properties[]=$props[$property];
-				else
-					$this->properties[]=$property;
-		}else{
+			if(isset($props[$property])) {
+							$this->properties[]=$props[$property];
+			} else {
+									$this->properties[]=$property;
+				}
+		} else{
 			$this->properties[]=$property;
 		}
 	}
@@ -222,12 +225,13 @@ 
 		if(isset($this->captions[$index])){
 			return $this->captions[$index];
 		}
-		if($this->properties[$index] instanceof \ReflectionProperty)
-			return $this->properties[$index]->getName();
-		elseif(\is_callable($this->properties[$index]))
-			return "";
-		else
-			return $this->properties[$index];
+		if($this->properties[$index] instanceof \ReflectionProperty) {
+					return $this->properties[$index]->getName();
+		} elseif(\is_callable($this->properties[$index])) {
+					return "";
+		} else {
+					return $this->properties[$index];
+		}
 	}
 
 	public function getCaptions(){
@@ -236,7 +240,7 @@ 
 			for($i=\sizeof($captions);$i<$this->count();$i++){
 				$captions[]="";
 			}
-		}else{
+		} else{
 			$captions=[];
 			$index=0;
 			$count=$this->count();
@@ -252,8 +256,9 @@ 
 	}
 
 	public function setCaption($index,$caption){
-		if(isset($this->captions)===false)
-			$this->captions=[];
+		if(isset($this->captions)===false) {
+					$this->captions=[];
+		}
 		$this->captions[$index]=$caption;
 		return $this;
 	}

Ajax/semantic/widgets/dataform/FormInstanceViewer.php

Braces +3 added lines, -2 removed lines

@@ -33,8 +33,9 @@
 
 
 	public function addSeparatorAfter($fieldNum){
-		if(\array_search($fieldNum, $this->separators)===false)
-			$this->separators[]=$fieldNum;
+		if(\array_search($fieldNum, $this->separators)===false) {
+					$this->separators[]=$fieldNum;
+		}
 			return $this;
 	}
 

Ajax/semantic/html/content/HtmlAbsractItem.php

Braces +7 added lines, -5 removed lines

@@ -57,7 +57,7 @@ 
 			$this->setTagName("div");
 			$this->removeProperty("href");
 			$this->addToPropertyCtrl("class", "active", array("active"));
-		}else{
+		} else{
 			$this->removePropertyValue("class", "active");
 		}
 		return $this;
@@ -65,8 +65,9 @@ 
 
 	public function asLink($href=NULL,$part=NULL){
 		$this->setTagName("a");
-		if(isset($href))
-			$this->setProperty("href", $href);
+		if(isset($href)) {
+					$this->setProperty("href", $href);
+		}
 		return $this;
 	}
 
@@ -77,8 +78,9 @@ 
 	 * @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

Braces +24 added lines, -16 removed lines

@@ -32,8 +32,9 @@ 
 			// }
 			$this->setWide($numCols);
 		}
-		if($createCols)
-			$this->setRowsCount($numRows, $numCols);
+		if($createCols) {
+					$this->setRowsCount($numRows, $numCols);
+		}
 	}
 
 	public function asSegment() {
@@ -85,8 +86,9 @@ 
 	public function addCol($width=NULL) {
 		$colCount=$this->colCount() + 1;
 		$this->setColsCount($colCount, true, $width);
-		if ($this->hasOnlyCols($this->count()))
-			return $this->content[$colCount - 1];
+		if ($this->hasOnlyCols($this->count())) {
+					return $this->content[$colCount - 1];
+		}
 		return $this;
 	}
 
@@ -174,8 +176,9 @@ 
 	 */
 	public function rowCount() {
 		$count=$this->count();
-		if ($this->hasOnlyCols($count))
-			return 0;
+		if ($this->hasOnlyCols($count)) {
+					return 0;
+		}
 		return $count;
 	}
 
@@ -185,10 +188,12 @@ 
 	 */
 	public function colCount() {
 		$count=$this->count();
-		if ($this->hasOnlyCols($count))
-			return $count;
-		if ($count > 0)
-			return $this->getItem(0)->count();
+		if ($this->hasOnlyCols($count)) {
+					return $count;
+		}
+		if ($count > 0) {
+					return $this->getItem(0)->count();
+		}
 		return 0;
 	}
 
@@ -199,8 +204,9 @@ 
 	 * @return \Ajax\semantic\html\collections\HtmlGridCol
 	 */
 	public function getCell($row, $col) {
-		if ($row < 2 && $this->hasOnlyCols($this->count()))
-			return $this->getItem($col);
+		if ($row < 2 && $this->hasOnlyCols($this->count())) {
+					return $this->getItem($col);
+		}
 		$row=$this->getItem($row);
 		if (isset($row)) {
 			$col=$row->getItem($col);
@@ -249,8 +255,9 @@ 
 	 * @return \Ajax\semantic\html\collections\HtmlGrid
 	 */
 	public function setPadded($value=NULL) {
-		if (isset($value))
-			$this->addToPropertyCtrl("class", $value, array ("vertically","horizontally" ));
+		if (isset($value)) {
+					$this->addToPropertyCtrl("class", $value, array ("vertically","horizontally" ));
+		}
 		return $this->addToProperty("class", "padded");
 	}
 
@@ -275,8 +282,9 @@ 
 	 * @see \Ajax\common\html\HtmlCollection::createItem()
 	 */
 	protected function createItem($value) {
-		if ($this->_createCols === false)
-			$value=null;
+		if ($this->_createCols === false) {
+					$value=null;
+		}
 		$item=new HtmlGridRow($this->identifier . "-row-" . ($this->count() + 1), $value, $this->_colSizing, $this->_implicitRows);
 		return $item;
 	}

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

Braces +27 added lines, -18 removed lines

@@ -50,8 +50,9 @@ 
 	 */
 	public function addHeader($title, $niveau=1, $dividing=true) {
 		$header=new HtmlHeader("", $niveau, $title);
-		if ($dividing)
-			$header->setDividing();
+		if ($dividing) {
+					$header->setDividing();
+		}
 		return $this->addItem($header);
 	}
 
@@ -72,14 +73,16 @@ 
 					if (\is_string($end)) {
 						$label=$end;
 						\array_pop($fields);
-					} else
-						$label=NULL;
+					} else {
+											$label=NULL;
+					}
 				}
 				$this->_fields=\array_merge($this->_fields, $fields);
 				$fields=new HtmlFormFields("fields-" . $this->identifier . "-" . $this->count(), $fields);
 			}
-			if (isset($label))
-				$fields=new HtmlFormField("", $fields, $label);
+			if (isset($label)) {
+							$fields=new HtmlFormField("", $fields, $label);
+			}
 		} else {
 			$fields=new HtmlFormFields("fields-" . $this->identifier . "-" . $this->count());
 		}
@@ -132,35 +135,41 @@ 
 	 */
 	public function addMessage($identifier, $content, $header=NULL, $icon=NULL, $type=NULL) {
 		$message=new HtmlMessage($identifier, $content);
-		if (isset($header))
-			$message->addHeader($header);
-		if (isset($icon))
-			$message->setIcon($icon);
-		if (isset($type))
-			$message->setStyle($type);
+		if (isset($header)) {
+					$message->addHeader($header);
+		}
+		if (isset($icon)) {
+					$message->setIcon($icon);
+		}
+		if (isset($type)) {
+					$message->setStyle($type);
+		}
 		return $this->addItem($message);
 	}
 
 
 
 	public function compile(JsUtils $js=NULL,&$view=NULL){
-		if(\sizeof($this->_validationParams)>0)
-			$this->setProperty("novalidate", "");
+		if(\sizeof($this->_validationParams)>0) {
+					$this->setProperty("novalidate", "");
+		}
 		return parent::compile($js,$view);
 	}
 
 	public function run(JsUtils $js) {
 		$compo=NULL;
 		foreach ($this->_fields as $field){
-			if($field instanceof HtmlFormField)
-				$compo=$this->addCompoValidation($js, $compo, $field);
+			if($field instanceof HtmlFormField) {
+							$compo=$this->addCompoValidation($js, $compo, $field);
+			}
 		}
 		foreach ($this->content as $field){
 			if($field instanceof HtmlFormFields){
 				$items=$field->getItems();
 				foreach ($items as $_field){
-					if($_field instanceof HtmlFormField)
-						$compo=$this->addCompoValidation($js, $compo, $_field);
+					if($_field instanceof HtmlFormField) {
+											$compo=$this->addCompoValidation($js, $compo, $_field);
+					}
 				}
 			}
 		}