Completed
Branch master (90089b)
by Jean-Christophe
07:19
created
Ajax/common/html/HtmlDoubleElement.php 1 patch
Braces   +10 added lines, -8 removed lines patch added patch discarded remove patch
@@ -29,15 +29,17 @@
 block discarded – undo
29 29
 
30 30
 	public function addContent($content,$before=false) {
31 31
 		if (is_array($this->content)===false) {
32
-			if(isset($this->content))
33
-				$this->content=array ($this->content);
34
-			else
35
-				$this->content=array();
32
+			if(isset($this->content)) {
33
+							$this->content=array ($this->content);
34
+			} else {
35
+							$this->content=array();
36
+			}
37
+		}
38
+		if($before) {
39
+					array_unshift($this->content,$content);
40
+		} else {
41
+					$this->content []=$content;
36 42
 		}
37
-		if($before)
38
-			array_unshift($this->content,$content);
39
-		else
40
-			$this->content []=$content;
41 43
 		return $this;
42 44
 	}
43 45
 
Please login to merge, or discard this patch.
Ajax/JsUtils.php 1 patch
Braces   +11 added lines, -8 removed lines patch added patch discarded remove patch
@@ -51,8 +51,9 @@  discard block
 block discarded – undo
51 51
 	protected $config;
52 52
 
53 53
 	protected function _setDi($di) {
54
-		if ($this->js!=null&&$di!=null)
55
-			$this->js->setDi($di);
54
+		if ($this->js!=null&&$di!=null) {
55
+					$this->js->setDi($di);
56
+		}
56 57
 	}
57 58
 
58 59
 	public abstract function getUrl($url);
@@ -403,12 +404,14 @@  discard block
 block discarded – undo
403 404
 					$result[1]=$cdn;
404 405
 					break;
405 406
 				case "Ajax\lib\CDNCoreCss":
406
-					if($cdn->getFramework()==="Bootstrap")
407
-						$hasBootstrap=true;
408
-					elseif($cdn->getFramework()==="Semantic")
409
-						$hasSemantic=true;
410
-					if($hasSemantic || $hasBootstrap)
411
-						$result[2]=$cdn;
407
+					if($cdn->getFramework()==="Bootstrap") {
408
+											$hasBootstrap=true;
409
+					} elseif($cdn->getFramework()==="Semantic") {
410
+											$hasSemantic=true;
411
+					}
412
+					if($hasSemantic || $hasBootstrap) {
413
+											$result[2]=$cdn;
414
+					}
412 415
 					break;
413 416
 			}
414 417
 		}
Please login to merge, or discard this patch.
Ajax/service/JArray.php 1 patch
Braces   +12 added lines, -8 removed lines patch added patch discarded remove patch
@@ -14,21 +14,24 @@  discard block
 block discarded – undo
14 14
 			return $array[$key];
15 15
 		}
16 16
 		$values=array_values($array);
17
-		if ($pos < sizeof($values))
18
-			return $values[$pos];
17
+		if ($pos < sizeof($values)) {
18
+					return $values[$pos];
19
+		}
19 20
 	}
20 21
 
21 22
 	public static function getConditionalValue($array, $key, $condition) {
22 23
 		$result=NULL;
23 24
 		if (array_key_exists($key, $array)) {
24 25
 			$result=$array[$key];
25
-			if ($condition($result) === true)
26
-				return $result;
26
+			if ($condition($result) === true) {
27
+							return $result;
28
+			}
27 29
 		}
28 30
 		$values=array_values($array);
29 31
 		foreach ( $values as $val ) {
30
-			if ($condition($val) === true)
31
-				return $val;
32
+			if ($condition($val) === true) {
33
+							return $val;
34
+			}
32 35
 		}
33 36
 		return $result;
34 37
 	}
@@ -36,8 +39,9 @@  discard block
 block discarded – undo
36 39
 	public static function getDefaultValue($array, $key, $default=NULL) {
37 40
 		if (array_key_exists($key, $array)) {
38 41
 			return $array[$key];
39
-		} else
40
-			return $default;
42
+		} else {
43
+					return $default;
44
+		}
41 45
 	}
42 46
 
43 47
 	public static function implode($glue, $pieces) {
Please login to merge, or discard this patch.
Ajax/service/AjaxCall.php 1 patch
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -14,8 +14,9 @@
 block discarded – undo
14 14
 	}
15 15
 
16 16
 	public function compile(JsUtils $js=null) {
17
-		if ($js==null)
18
-			return;
17
+		if ($js==null) {
18
+					return;
19
+		}
19 20
 		$result="";
20 21
 		$params="{}";
21 22
 		$callback=NULL;
Please login to merge, or discard this patch.
Ajax/php/symfony/JsUtils.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@
 block discarded – undo
13 13
 		if(isset($router)===true){
14 14
 			try {
15 15
 			$url=$router->generate($url);
16
-			}catch (\Exception $e){
16
+			} catch (\Exception $e){
17 17
 				return $router->getContext()->getBaseUrl();
18 18
 			}
19 19
 		}
Please login to merge, or discard this patch.
Ajax/php/phalcon/JsUtils.php 1 patch
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -61,8 +61,9 @@
 block discarded – undo
61 61
 		if(\sizeof($params)>0 || \strtolower($action)!="index" ){
62 62
 			$items[]=$action;
63 63
 			foreach ($params as $p){
64
-				if(\is_object($p)===false)
65
-					$items[]=$p;
64
+				if(\is_object($p)===false) {
65
+									$items[]=$p;
66
+				}
66 67
 			}
67 68
 		}
68 69
 		return $items;
Please login to merge, or discard this patch.
Ajax/php/yii/JsUtils.php 1 patch
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -6,8 +6,9 @@
 block discarded – undo
6 6
 
7 7
 class JsUtils extends \Ajax\JsUtils{
8 8
 	public function getUrl($url){
9
-		if($url==="")
10
-			$url="/";
9
+		if($url==="") {
10
+					$url="/";
11
+		}
11 12
 		return Url::toRoute($url);
12 13
 	}
13 14
 
Please login to merge, or discard this patch.
Ajax/lib/CDNBase.php 1 patch
Braces   +16 added lines, -12 removed lines patch added patch discarded remove patch
@@ -33,11 +33,13 @@  discard block
 block discarded – undo
33 33
 	}
34 34
 
35 35
 	protected function getUrlOrCss($element, $key) {
36
-		if (isset($element))
37
-			return $element;
36
+		if (isset($element)) {
37
+					return $element;
38
+		}
38 39
 		$version=$this->version;
39
-		if (array_search($version, $this->getVersions())===false)
40
-			$version=$this->getLastVersion();
40
+		if (array_search($version, $this->getVersions())===false) {
41
+					$version=$this->getLastVersion();
42
+		}
41 43
 		return $this->replaceVersion($this->data [$this->provider] [$key], $version);
42 44
 	}
43 45
 
@@ -59,16 +61,17 @@  discard block
 block discarded – undo
59 61
 	}
60 62
 
61 63
 	protected function replaceVersionAndTheme($url, $version, $theme) {
62
-		if (isset($theme))
63
-			return str_ireplace(array (
64
+		if (isset($theme)) {
65
+					return str_ireplace(array (
64 66
 					"%theme%",
65 67
 					"%version%" 
66 68
 			), array (
67 69
 					$theme,
68 70
 					$version 
69 71
 			), $url);
70
-		else
71
-			return $this->replaceVersion($url, $version);
72
+		} else {
73
+					return $this->replaceVersion($url, $version);
74
+		}
72 75
 	}
73 76
 
74 77
 	public function getProviders() {
@@ -76,10 +79,11 @@  discard block
 block discarded – undo
76 79
 	}
77 80
 
78 81
 	public function getVersions($provider=NULL) {
79
-		if (isset($provider))
80
-			return $this->data [$provider] ["versions"];
81
-		else
82
-			return $this->data [$this->provider] ["versions"];
82
+		if (isset($provider)) {
83
+					return $this->data [$provider] ["versions"];
84
+		} else {
85
+					return $this->data [$this->provider] ["versions"];
86
+		}
83 87
 	}
84 88
 
85 89
 	public function getLastVersion($provider=NULL) {
Please login to merge, or discard this patch.
Ajax/lib/CDNGuiGen.php 1 patch
Braces   +22 added lines, -16 removed lines patch added patch discarded remove patch
@@ -14,10 +14,11 @@  discard block
 block discarded – undo
14 14
 		$this->data=$this->data ["JQueryUI"];
15 15
 		if (is_int($theme)) {
16 16
 			$themes=$this->getThemes();
17
-			if (sizeof($themes)>$theme-1)
18
-				$this->theme=$themes [$theme-1];
19
-			else
20
-				throw new \Exception("CDNGuiGen : Le numéro de thème demandé n'existe pas");
17
+			if (sizeof($themes)>$theme-1) {
18
+							$this->theme=$themes [$theme-1];
19
+			} else {
20
+							throw new \Exception("CDNGuiGen : Le numéro de thème demandé n'existe pas");
21
+			}
21 22
 		}
22 23
 		$this->theme=$theme;
23 24
 		$this->cssUrl=null;
@@ -28,16 +29,18 @@  discard block
 block discarded – undo
28 29
 	}
29 30
 
30 31
 	public function getThemes($provider=NULL) {
31
-		if (isset($provider))
32
-			return $this->data [$provider] ["themes"];
33
-		else
34
-			return $this->data [$this->provider] ["themes"];
32
+		if (isset($provider)) {
33
+					return $this->data [$provider] ["themes"];
34
+		} else {
35
+					return $this->data [$this->provider] ["themes"];
36
+		}
35 37
 	}
36 38
 
37 39
 	public function getFirstTheme($provider=NULL) {
38 40
 		$themes=$this->getThemes($provider);
39
-		if (sizeof($themes)>0)
40
-			return $themes [0];
41
+		if (sizeof($themes)>0) {
42
+					return $themes [0];
43
+		}
41 44
 		return "";
42 45
 	}
43 46
 
@@ -46,14 +49,17 @@  discard block
 block discarded – undo
46 49
 	}
47 50
 
48 51
 	public function getCss() {
49
-		if (isset($this->cssUrl))
50
-			return $this->cssUrl;
52
+		if (isset($this->cssUrl)) {
53
+					return $this->cssUrl;
54
+		}
51 55
 		$version=$this->version;
52
-		if (array_search($version, $this->getVersions())===false)
53
-			$version=$this->getLastVersion();
56
+		if (array_search($version, $this->getVersions())===false) {
57
+					$version=$this->getLastVersion();
58
+		}
54 59
 		$theme=$this->theme;
55
-		if (array_search($theme, $this->getThemes())===false)
56
-			$theme=$this->getFirstTheme();
60
+		if (array_search($theme, $this->getThemes())===false) {
61
+					$theme=$this->getFirstTheme();
62
+		}
57 63
 		return $this->replaceVersionAndTheme($this->data [$this->provider] ["css"], $version, $theme);
58 64
 	}
59 65
 
Please login to merge, or discard this patch.