phpMv / phpMv-UI

Ajax/common/traits/JsUtilsAjaxTrait.php

Braces +29 added lines, -22 removed lines

@@ -32,7 +32,7 @@ 
 		$retour.="var self=this;\n";
 		if($hasLoader===true && JString::isNotNull($responseElement)){
 			$this->addLoading($retour, $responseElement,$ajaxLoader);
-		}elseif($hasLoader==="internal"){
+		} elseif($hasLoader==="internal"){
 			$retour.="\n$(this).addClass('loading');";
 		}
 		$ajaxParameters=["url"=>"url","method"=>"'".\strtoupper($method)."'"];
@@ -49,8 +49,9 @@ 
 		$retour.="$.ajax({".$this->implodeAjaxParameters($ajaxParameters)."}).done(function( data, textStatus, jqXHR ) {\n";
 		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone,$ajaxTransition,$jsCallback,$hasLoader,($historize?$originalSelector:null))."});\n";
 		$retour=$this->_addJsCondition($jsCondition,$retour);
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$retour;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$retour;
+		}
 		return $retour;
 	}
 
@@ -86,12 +87,13 @@ 
 		if(JString::isNotNull($attr)){
 			if ($attr==="value"){
 				$retour.="url=url+'".$slash."'+$(this).val();\n";
-			}elseif ($attr==="html"){
+			} elseif ($attr==="html"){
 				$retour.="url=url+'".$slash."'+$(this).html();\n";
-			}elseif(\substr($attr, 0,3)==="js:"){
+			} elseif(\substr($attr, 0,3)==="js:"){
 				$retour.="url=url+'".$slash."'+".\substr($attr, 3).";\n";
-			}elseif($attr!==null && $attr!=="")
-				$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
+			} elseif($attr!==null && $attr!=="") {
+							$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
+			}
 		}
 		return $retour;
 	}
@@ -111,13 +113,14 @@ 
 		if (JString::isNotNull($responseElement)) {
 			if(isset($ajaxTransition)){
 				$call=$this->setAjaxDataCall($ajaxTransition);
-			}elseif(isset($this->ajaxTransition)){
+			} elseif(isset($this->ajaxTransition)){
 				$call=$this->ajaxTransition;
 			}
-			if(\is_callable($call))
-				$retour="\t".$call($responseElement,$jqueryDone).";\n";
-			else
-				$retour="\t{$responseElement}.{$jqueryDone}( data );\n";
+			if(\is_callable($call)) {
+							$retour="\t".$call($responseElement,$jqueryDone).";\n";
+			} else {
+							$retour="\t{$responseElement}.{$jqueryDone}( data );\n";
+			}
 		}
 		if(isset($history)){
 			if($this->params["autoActiveLinks"]){
@@ -140,8 +143,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->getUrl($url);
 			}
@@ -161,8 +165,9 @@ 
 	public static function _implodeParams($parameters){
 		$allParameters=[];
 		foreach ($parameters as $params){
-			if(isset($params))
-				$allParameters[]=self::_correctParams($params);
+			if(isset($params)) {
+							$allParameters[]=self::_correctParams($params);
+			}
 		}
 		return \implode("+'&'+", $allParameters);
 	}
@@ -188,8 +193,9 @@ 
 
 	protected function setDefaultParameters(&$parameters,$default){
 		foreach ($default as $k=>$v){
-			if(!isset($parameters[$k]))
-				$parameters[$k]=$v;
+			if(!isset($parameters[$k])) {
+							$parameters[$k]=$v;
+			}
 		}
 	}
 
@@ -307,7 +313,7 @@ 
 		if($context===null){
 			$parent="$('".$maskSelector."').parent()";
 			$newElm = "$('#'+newId)";
-		}else{
+		} else{
 			$parent=$context;
 			$newElm = $context.".find('#'+newId)";
 		}
@@ -533,7 +539,7 @@ 
 		$retour.="var self=this;\n";
 		if($hasLoader===true){
 			$this->addLoading($retour, $responseElement,$ajaxLoader);
-		}elseif($hasLoader==="internal"){
+		} elseif($hasLoader==="internal"){
 			$retour.="\n$(this).addClass('loading');";
 		}
 		$ajaxParameters=["url"=>"url","method"=>"'POST'","data"=>"params","async"=>$async];
@@ -551,8 +557,9 @@ 
 			$retour.="$('#".$form."').submit();\n";
 		}
 		$retour=$this->_addJsCondition($jsCondition, $retour);
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$retour;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$retour;
+		}
 		return $retour;
 	}
 

Ajax/common/html/BaseHtml.php

Braces +15 added lines, -11 removed lines

@@ -109,15 +109,18 @@ 
 			$flag=false;
 			$index=0;
 			while ( !$flag && $index < sizeof($elements) ) {
-				if ($elements[$index] instanceof BaseHtml)
-					$flag=($callback($elements[$index]));
+				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;
+			if ($callback($elements)) {
+							return $elements;
+			}
 		}
 		return null;
 	}
@@ -143,8 +146,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){
@@ -213,11 +217,11 @@ 
 				if(\strstr($result, "%{$key}%")!==false){
 					if (\is_array($value)) {
 						$v=PropertyWrapper::wrap($value, $js,$view);
-					}elseif($value instanceof \stdClass){
+					} elseif($value instanceof \stdClass){
 							$v=\print_r($value,true);
-					}elseif ($value instanceof BaseHtml){
+					} elseif ($value instanceof BaseHtml){
 						$v=$value->compile($js,$view);
-					}else{
+					} else{
 						$v=$value;
 					}
 					$result=str_replace("%{$key}%", $v, $result);

Ajax/semantic/html/collections/table/HtmlTable.php

Braces +9 added lines, -6 removed lines

@@ -345,8 +345,9 @@ 
 			$result= $this->getBody()->_addRow($result);
 		}
 		if(isset($this->_afterCompileEvents["onNewRow"])){
-			if(\is_callable($this->_afterCompileEvents["onNewRow"]))
-				$this->_afterCompileEvents["onNewRow"]($result,$object);
+			if(\is_callable($this->_afterCompileEvents["onNewRow"])) {
+							$this->_afterCompileEvents["onNewRow"]($result,$object);
+			}
 		}
 		return $result;
 	}
@@ -375,8 +376,9 @@ 
 			}
 		}
 		$result= parent::run($js);
-		if(isset($this->_footer))
-			$this->_footer->run($js);
+		if(isset($this->_footer)) {
+					$this->_footer->run($js);
+		}
 		$this->_runned=true;
 		return $result;
 	}
@@ -417,8 +419,9 @@ 
 
 	public function setColWidth($colIndex,$width){
 		$part=$this->_getFirstPart();
-		if($part!==null && $part->count()>0)
-			$part->getCell(0, $colIndex)->setWidth($width);
+		if($part!==null && $part->count()>0) {
+					$part->getCell(0, $colIndex)->setWidth($width);
+		}
 		return $this;
 	}
 

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

Braces +9 added lines, -6 removed lines

@@ -84,15 +84,17 @@ 
 
 	public function getColspan() {
 		$colspan=1;
-		if (\array_key_exists("colspan", $this->properties))
-			$colspan=$this->getProperty("colspan");
+		if (\array_key_exists("colspan", $this->properties)) {
+					$colspan=$this->getProperty("colspan");
+		}
 		return $colspan;
 	}
 
 	public function getRowspan() {
 		$rowspan=1;
-		if (\array_key_exists("rowspan", $this->properties))
-			$rowspan=$this->getProperty("rowspan");
+		if (\array_key_exists("rowspan", $this->properties)) {
+					$rowspan=$this->getProperty("rowspan");
+		}
 		return $rowspan;
 	}
 
@@ -129,7 +131,8 @@ 
 	}
 
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
-		if(!$this->_deleted)
-			return parent::compile($js,$view);
+		if(!$this->_deleted) {
+					return parent::compile($js,$view);
+		}
 	}
 }

Ajax/common/html/HtmlCollection.php

Braces +14 added lines, -14 removed lines

@@ -24,7 +24,7 @@ 
 			foreach ($items as $k=>$v){
 				$this->addItem([$k,$v]);
 			}
-		}else{
+		} else{
 			foreach ($items as $item){
 				$this->addItem($item);
 			}
@@ -80,9 +80,9 @@ 
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
 	public function getItem($index) {
-		if (is_int($index)&& isset($this->content[$index]))
-			return $this->content[$index];
-		else {
+		if (is_int($index)&& isset($this->content[$index])) {
+					return $this->content[$index];
+		} else {
 			$elm=$this->getElementById($index, $this->content);
 			return $elm;
 		}
@@ -144,10 +144,11 @@ 
 		$i=0;
 		foreach ($properties as $k=>$v){
 			$c=$this->content[$i++];
-			if(isset($c))
-				$c->setProperty($k,$v);
-			else
-				return $this;
+			if(isset($c)) {
+							$c->setProperty($k,$v);
+			} else {
+							return $this;
+			}
 		}
 		return $this;
 	}
@@ -165,8 +166,7 @@ 
 		foreach ($values as $i=>$value){
 			if(isset($this->content[$i])){
 				$this->content[$i]->setProperty($property,$value);
-			}
-			else{
+			} else{
 				return $this;
 			}
 		}
@@ -186,8 +186,7 @@ 
 		foreach ($values as $i=>$value){
 			if(isset($this->content[$i])){
 				$this->content[$i++]->addToProperty($property,$value);
-			}
-			else{
+			} else{
 				return $this;
 			}
 		}
@@ -216,8 +215,9 @@ 
 		foreach ( $this->content as $index=>$item ) {
 			if($item instanceof HtmlDoubleElement){
 				$href="";
-				if(isset($hrefs[$index]))
-					$href=$hrefs[$index];
+				if(isset($hrefs[$index])) {
+									$href=$hrefs[$index];
+				}
 				$item->asLink($href,$target);
 			}
 		}

Ajax/common/html/traits/BaseHtmlPropertiesTrait.php

Braces +12 added lines, -8 removed lines

@@ -33,8 +33,9 @@ 
 	}
 
 	public function getProperty($name) {
-		if (array_key_exists($name, $this->_self->properties))
-			return $this->_self->properties[$name];
+		if (array_key_exists($name, $this->_self->properties)) {
+					return $this->_self->properties[$name];
+		}
 	}
 
 	/**
@@ -76,8 +77,9 @@ 
 	}
 
 	protected function addToPropertyUnique($name, $value, $typeCtrl) {
-		if (is_string($typeCtrl) && @class_exists($typeCtrl, true))
-			$typeCtrl=$typeCtrl::getConstants();
+		if (is_string($typeCtrl) && @class_exists($typeCtrl, true)) {
+					$typeCtrl=$typeCtrl::getConstants();
+		}
 			if (\is_array($typeCtrl)) {
 				$this->_self->removeOldValues($this->_self->properties[$name], $typeCtrl);
 			}
@@ -96,8 +98,9 @@ 
 	}
 
 	public function removeProperty($name) {
-		if (\array_key_exists($name, $this->_self->properties))
-			unset($this->_self->properties[$name]);
+		if (\array_key_exists($name, $this->_self->properties)) {
+					unset($this->_self->properties[$name]);
+		}
 			return $this;
 	}
 
@@ -110,8 +113,9 @@ 
 	}
 
 	protected function setPropertyCtrl($name, $value, $typeCtrl) {
-		if ($this->_self->ctrl($name, $value, $typeCtrl) === true)
-			return $this->_self->setProperty($name, $value);
+		if ($this->_self->ctrl($name, $value, $typeCtrl) === true) {
+					return $this->_self->setProperty($name, $value);
+		}
 			return $this;
 	}
 

Ajax/service/JString.php

Braces +3 added lines, -2 removed lines

@@ -64,8 +64,9 @@
 	}
 	
 	public static function doubleBackSlashes($value){
-		if(is_string($value))
-			return str_replace("\\", "\\\\", $value);
+		if(is_string($value)) {
+					return str_replace("\\", "\\\\", $value);
+		}
 			return $value;
 	}
 

Ajax/common/traits/JsUtilsActionsTrait.php

Braces +37 added lines, -25 removed lines

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

Ajax/semantic/widgets/datatable/JsonDataTable.php

Braces +3 added lines, -2 removed lines

@@ -59,8 +59,9 @@
 			$callback.=$js->trigger("#".$id." [name='selection[]']","change",false)."$('#".$id." tbody .ui.checkbox').checkbox();".$js->execOn("change", "#".$id." [name='selection[]']", $this->_getCheckedChange($js));
 			$callback.=$this->_generatePaginationScript($id);
 			if(isset($this->_urls["refresh"])){
-				if(isset($menu))
-				$js->jsonArrayOn("click", "#".$menu->getIdentifier()." a","#".$this->_identifier." tr.".$this->_modelClass, $this->_urls["refresh"],"post",["params"=>"{'p':$(this).attr('data-page'),'_model':'".JString::doubleBackSlashes($this->_model)."'}","jsCallback"=>$callback]);
+				if(isset($menu)) {
+								$js->jsonArrayOn("click", "#".$menu->getIdentifier()." a","#".$this->_identifier." tr.".$this->_modelClass, $this->_urls["refresh"],"post",["params"=>"{'p':$(this).attr('data-page'),'_model':'".JString::doubleBackSlashes($this->_model)."'}","jsCallback"=>$callback]);
+				}
 			}
 		}