Completed
Pull Request — master (#2)
by Antoine
03:05
created
Ajax/lib/CDNBase.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -60,10 +60,10 @@
 block discarded – undo
60 60
 
61 61
 	protected function replaceVersionAndTheme($url, $version, $theme) {
62 62
 		if (isset($theme))
63
-			return str_ireplace(array (
63
+			return str_ireplace(array(
64 64
 					"%theme%",
65 65
 					"%version%" 
66
-			), array (
66
+			), array(
67 67
 					$theme,
68 68
 					$version 
69 69
 			), $url);
Please login to merge, or discard this 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.
Ajax/service/AjaxCall.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@
 block discarded – undo
30 30
 		if ($stopPropagation===true) {
31 31
 			$result.="event.stopPropagation();\n";
32 32
 		}
33
-		switch($this->method) {
33
+		switch ($this->method) {
34 34
 			case "get":
35 35
 				$result.=$js->getDeferred($url, $responseElement, $params, $callback, $attr);
36 36
 				break;
Please login to merge, or discard this 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/service/JArray.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@
 block discarded – undo
20 20
 	public static function getDefaultValue($array, $key, $default) {
21 21
 		if (array_key_exists($key, $array)) {
22 22
 			return $array [$key];
23
-		} else
23
+		}else
24 24
 			return $default;
25 25
 	}
26 26
 }
27 27
\ No newline at end of file
Please login to merge, or discard this patch.
Braces   +6 added lines, -4 removed lines patch added patch discarded remove patch
@@ -13,14 +13,16 @@
 block discarded – undo
13 13
 			return $array [$key];
14 14
 		}
15 15
 		$values=array_values($array);
16
-		if ($pos<sizeof($values))
17
-			return $values [$pos];
16
+		if ($pos<sizeof($values)) {
17
+					return $values [$pos];
18
+		}
18 19
 	}
19 20
 
20 21
 	public static function getDefaultValue($array, $key, $default) {
21 22
 		if (array_key_exists($key, $array)) {
22 23
 			return $array [$key];
23
-		} else
24
-			return $default;
24
+		} else {
25
+					return $default;
26
+		}
25 27
 	}
26 28
 }
27 29
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/service/JString.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,10 +1,10 @@
 block discarded – undo
1 1
 <?php
2 2
 namespace Ajax\service;
3 3
 class JString {
4
-	public static function isNull($s){
4
+	public static function isNull($s) {
5 5
 		return (!isset($s) || NULL===$s || ""===$s);
6 6
 	}
7
-	public static function isNotNull($s){
7
+	public static function isNotNull($s) {
8 8
 		return (isset($s) && NULL!==$s && ""!==$s);
9 9
 	}
10 10
 }
11 11
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/ui/components/Accordion.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@  discard block
 block discarded – undo
16 16
 
17 17
 	public function __construct(JsUtils $js) {
18 18
 		parent::__construct($js);
19
-		$this->params=array (
19
+		$this->params=array(
20 20
 				"active" => 0
21 21
 		);
22 22
 		$this->uiName="accordion";
@@ -112,7 +112,7 @@  discard block
 block discarded – undo
112 112
 	 * @return $this
113 113
 	 */
114 114
 	public function setHeightStyle($value) {
115
-		return $this->setParamCtrl("heightStyle", $value, array (
115
+		return $this->setParamCtrl("heightStyle", $value, array(
116 116
 				"auto",
117 117
 				"fill",
118 118
 				"content"
Please login to merge, or discard this patch.
Braces   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -49,9 +49,9 @@
 block discarded – undo
49 49
 	 * @return $this
50 50
 	 */
51 51
 	public function setAnimate($value) {
52
-		if ($value instanceof Animation)
53
-			$value=$value->getParams();
54
-		else if (is_string($value)) {
52
+		if ($value instanceof Animation) {
53
+					$value=$value->getParams();
54
+		} else if (is_string($value)) {
55 55
 			$animation=new Animation();
56 56
 			$animation->setEasing($value);
57 57
 		}
Please login to merge, or discard this patch.
Ajax/ui/components/Autocomplete.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -52,7 +52,7 @@
 block discarded – undo
52 52
 	 * @return $this
53 53
 	 */
54 54
 	public function setSource($source) {
55
-		$source=str_ireplace(array (
55
+		$source=str_ireplace(array(
56 56
 				"\"",
57 57
 				"'" 
58 58
 		), "%quote%", $source);
Please login to merge, or discard this patch.
Ajax/ui/components/Dialog.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -12,11 +12,11 @@  discard block
 block discarded – undo
12 12
  */
13 13
 class Dialog extends SimpleComponent {
14 14
 	protected $attachTo;
15
-	protected $buttons=array ();
15
+	protected $buttons=array();
16 16
 
17 17
 	public function __construct(JsUtils $js) {
18 18
 		parent::__construct($js);
19
-		$this->params=array (
19
+		$this->params=array(
20 20
 				"dialogClass" => "no-close" 
21 21
 		);
22 22
 		$this->addCancelBtn("Annuler");
@@ -24,12 +24,12 @@  discard block
 block discarded – undo
24 24
 
25 25
 	public function getScript() {
26 26
 		$allParams=$this->params;
27
-		$jsonButtons=array ();
28
-		foreach ( $this->buttons as $button ) {
27
+		$jsonButtons=array();
28
+		foreach ($this->buttons as $button) {
29 29
 			$jsonButtons []=$button->getParams();
30 30
 		}
31 31
 		$allParams ["buttons"]=$jsonButtons;
32
-		$this->jquery_code_for_compile []="$( '" . $this->attachTo . "' ).dialog(" . $this->getParamsAsJSON($allParams) . ");";
32
+		$this->jquery_code_for_compile []="$( '".$this->attachTo."' ).dialog(".$this->getParamsAsJSON($allParams).");";
33 33
 		$result=implode("", $this->jquery_code_for_compile);
34 34
 		$result=str_ireplace("\"%", "", $result);
35 35
 		$result=str_ireplace("%\"", "", $result);
@@ -59,9 +59,9 @@  discard block
 block discarded – undo
59 59
 	}
60 60
 
61 61
 	private function insertBtn($insert, $position=NULL) {
62
-		if ($position != NULL) {
62
+		if ($position!=NULL) {
63 63
 			$this->buttons=array_splice($this->buttons, $position, 0, $insert);
64
-		} else {
64
+		}else {
65 65
 			$this->buttons []=$insert;
66 66
 		}
67 67
 	}
Please login to merge, or discard this patch.
Ajax/ui/components/DialogButton.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@  discard block
 block discarded – undo
16 16
 
17 17
 	private function addFunction($jsCode) {
18 18
 		if (!Text::startsWith($jsCode, "function"))
19
-			$jsCode="%function(){" . $jsCode . "}%";
19
+			$jsCode="%function(){".$jsCode."}%";
20 20
 		return $jsCode;
21 21
 	}
22 22
 
@@ -43,6 +43,6 @@  discard block
 block discarded – undo
43 43
 	}
44 44
 
45 45
 	public static function submitButton(JsUtils $js, $url, $form, $responseElement, $caption="Okay") {
46
-		return new DialogButton($caption, $js->postForm($url, $form, $responseElement) . ";$( this ).dialog( 'close' );");
46
+		return new DialogButton($caption, $js->postForm($url, $form, $responseElement).";$( this ).dialog( 'close' );");
47 47
 	}
48 48
 }
49 49
\ No newline at end of file
Please login to merge, or discard this patch.
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -15,8 +15,9 @@
 block discarded – undo
15 15
 class DialogButton extends BaseComponent {
16 16
 
17 17
 	private function addFunction($jsCode) {
18
-		if (!Text::startsWith($jsCode, "function"))
19
-			$jsCode="%function(){" . $jsCode . "}%";
18
+		if (!Text::startsWith($jsCode, "function")) {
19
+					$jsCode="%function(){" . $jsCode . "}%";
20
+		}
20 21
 		return $jsCode;
21 22
 	}
22 23
 
Please login to merge, or discard this patch.