Completed
Push — master ( 5e2c18...7ed867 )
by Jean-Christophe
02:42
created
Ajax/common/html/BaseHtml.php 1 patch
Braces   +17 added lines, -12 removed lines patch added patch discarded remove patch
@@ -110,15 +110,18 @@  discard block
 block discarded – undo
110 110
 			$flag=false;
111 111
 			$index=0;
112 112
 			while ( !$flag && $index < sizeof($elements) ) {
113
-				if ($elements[$index] instanceof BaseHtml)
114
-					$flag=($callback($elements[$index]));
113
+				if ($elements[$index] instanceof BaseHtml) {
114
+									$flag=($callback($elements[$index]));
115
+				}
115 116
 					$index++;
116 117
 			}
117
-			if ($flag === true)
118
-				return $elements[$index - 1];
118
+			if ($flag === true) {
119
+							return $elements[$index - 1];
120
+			}
119 121
 		} elseif ($elements instanceof BaseHtml) {
120
-			if ($callback($elements))
121
-				return $elements;
122
+			if ($callback($elements)) {
123
+							return $elements;
124
+			}
122 125
 		}
123 126
 		return null;
124 127
 	}
@@ -144,8 +147,9 @@  discard block
 block discarded – undo
144 147
 
145 148
 	public function fromArray($array) {
146 149
 		foreach ( $this as $key => $value ) {
147
-			if(array_key_exists($key, $array)===true)
148
-				$this->_callSetter("set" . ucfirst($key), $key, $array[$key], $array);
150
+			if(array_key_exists($key, $array)===true) {
151
+							$this->_callSetter("set" . ucfirst($key), $key, $array[$key], $array);
152
+			}
149 153
 		}
150 154
 		foreach ( $array as $key => $value ) {
151 155
 			if($this->_callSetter($key, $key, $value, $array)===false){
@@ -215,10 +219,11 @@  discard block
 block discarded – undo
215 219
 				if (\is_array($value)) {
216 220
 					$v=PropertyWrapper::wrap($value, $js);
217 221
 				} else {
218
-					if($value instanceof \stdClass)
219
-						$v=\print_r($value,true);
220
-					else
221
-						$v=$value;
222
+					if($value instanceof \stdClass) {
223
+											$v=\print_r($value,true);
224
+					} else {
225
+											$v=$value;
226
+					}
222 227
 				}
223 228
 				$result=str_ireplace("%" . $key . "%", $v, $result);
224 229
 			}
Please login to merge, or discard this patch.
Ajax/semantic/html/collections/HtmlMessage.php 1 patch
Braces   +9 added lines, -7 removed lines patch added patch discarded remove patch
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
51 51
 		$this->wrapContent("<div class='content'>","</div>");
52 52
 		if(\is_string($icon)){
53 53
 			$this->icon=new HtmlIcon("icon-".$this->identifier, $icon);
54
-		}else{
54
+		} else{
55 55
 			$this->icon=$icon;
56 56
 		}
57 57
 		return $this;
@@ -64,10 +64,11 @@  discard block
 block discarded – undo
64 64
 	}
65 65
 
66 66
 	public function setDismissable($dismiss=true){
67
-		if($dismiss===true)
68
-			$this->close=new HtmlIcon("close-".$this->identifier, "close");
69
-		else
70
-			$this->close=NULL;
67
+		if($dismiss===true) {
68
+					$this->close=new HtmlIcon("close-".$this->identifier, "close");
69
+		} else {
70
+					$this->close=NULL;
71
+		}
71 72
 		return $this;
72 73
 	}
73 74
 
@@ -111,8 +112,9 @@  discard block
 block discarded – undo
111 112
 	public function setMessage($message){
112 113
 		if(\is_array($this->content)){
113 114
 			$this->content[\sizeof($this->content)-1]=$message;
114
-		}else
115
-			$this->setContent($message);
115
+		} else {
116
+					$this->setContent($message);
117
+		}
116 118
 	}
117 119
 
118 120
 }
Please login to merge, or discard this patch.
Ajax/semantic/html/collections/form/HtmlForm.php 1 patch
Braces   +22 added lines, -15 removed lines patch added patch discarded remove patch
@@ -52,8 +52,9 @@  discard block
 block discarded – undo
52 52
 	 */
53 53
 	public function addHeader($title, $niveau=1, $dividing=true) {
54 54
 		$header=new HtmlHeader("", $niveau, $title);
55
-		if ($dividing)
56
-			$header->setDividing();
55
+		if ($dividing) {
56
+					$header->setDividing();
57
+		}
57 58
 		return $this->addItem($header);
58 59
 	}
59 60
 
@@ -81,8 +82,9 @@  discard block
 block discarded – undo
81 82
 					if (\is_string($end)) {
82 83
 						$label=$end;
83 84
 						\array_pop($fields);
84
-					} else
85
-						$label=NULL;
85
+					} else {
86
+											$label=NULL;
87
+					}
86 88
 				}
87 89
 				$this->_fields=\array_merge($this->_fields, $fields);
88 90
 				$fields=new HtmlFormFields("fields-" . $this->identifier . "-" . $this->count(), $fields);
@@ -146,27 +148,31 @@  discard block
 block discarded – undo
146 148
 	 */
147 149
 	public function addMessage($identifier, $content, $header=NULL, $icon=NULL, $type=NULL) {
148 150
 		$message=new HtmlMessage($identifier, $content);
149
-		if (isset($header))
150
-			$message->addHeader($header);
151
-		if (isset($icon))
152
-			$message->setIcon($icon);
153
-		if (isset($type))
154
-			$message->setStyle($type);
151
+		if (isset($header)) {
152
+					$message->addHeader($header);
153
+		}
154
+		if (isset($icon)) {
155
+					$message->setIcon($icon);
156
+		}
157
+		if (isset($type)) {
158
+					$message->setStyle($type);
159
+		}
155 160
 		return $this->addItem($message);
156 161
 	}
157 162
 
158 163
 
159 164
 
160 165
 	public function compile(JsUtils $js=NULL,&$view=NULL){
161
-		if(\sizeof($this->_validationParams)>0)
162
-			$this->setProperty("novalidate", "");
166
+		if(\sizeof($this->_validationParams)>0) {
167
+					$this->setProperty("novalidate", "");
168
+		}
163 169
 		return parent::compile($js,$view);
164 170
 	}
165 171
 
166 172
 	public function run(JsUtils $js) {
167 173
 		if(isset($js)){
168 174
 			$compo=$js->semantic()->form("#".$this->identifier);
169
-		}else{
175
+		} else{
170 176
 			$compo=new Form();
171 177
 			$compo->attach("#".$this->identifier);
172 178
 		}
@@ -179,8 +185,9 @@  discard block
 block discarded – undo
179 185
 			if($field instanceof HtmlFormFields){
180 186
 				$items=$field->getItems();
181 187
 				foreach ($items as $_field){
182
-					if($_field instanceof HtmlFormField)
183
-						$compo=$this->addCompoValidation($compo, $_field);
188
+					if($_field instanceof HtmlFormField) {
189
+											$compo=$this->addCompoValidation($compo, $_field);
190
+					}
184 191
 				}
185 192
 			}
186 193
 		}
Please login to merge, or discard this patch.
Ajax/semantic/components/validation/FieldValidation.php 1 patch
Braces   +6 added lines, -5 removed lines patch added patch discarded remove patch
@@ -49,15 +49,16 @@
 block discarded – undo
49 49
 	 * @return Rule
50 50
 	 */
51 51
 	public function addRule($type,$prompt=NULL,$value=NULL){
52
-		if($type instanceof  Rule)
53
-			$rule=$type;
54
-		else if(\is_array($type)){
52
+		if($type instanceof  Rule) {
53
+					$rule=$type;
54
+		} else if(\is_array($type)){
55 55
 			$value=JArray::getValue($type, "value", 2);
56 56
 			$prompt=JArray::getValue($type, "prompt", 1);
57 57
 			$type=JArray::getValue($type, "type", 0);
58 58
 			$rule=new Rule($type,$prompt,$value);
59
-		}else
60
-			$rule=new Rule($type,$prompt,$value);
59
+		} else {
60
+					$rule=new Rule($type,$prompt,$value);
61
+		}
61 62
 		$this->rules[]=$rule;
62 63
 		return $rule;
63 64
 	}
Please login to merge, or discard this patch.
Ajax/common/traits/JsUtilsAjaxTrait.php 1 patch
Braces   +27 added lines, -20 removed lines patch added patch discarded remove patch
@@ -52,8 +52,9 @@  discard block
 block discarded – undo
52 52
 		$retour.="$.ajax({".$this->implodeAjaxParameters($ajaxParameters)."}).done(function( data, textStatus, jqXHR ) {\n";
53 53
 		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone,$ajaxTransition,$jsCallback)."});\n";
54 54
 		$retour=$this->_addJsCondition($jsCondition,$retour);
55
-		if ($immediatly)
56
-			$this->jquery_code_for_compile[]=$retour;
55
+		if ($immediatly) {
56
+					$this->jquery_code_for_compile[]=$retour;
57
+		}
57 58
 		return $retour;
58 59
 	}
59 60
 
@@ -89,12 +90,13 @@  discard block
 block discarded – undo
89 90
 		if(JString::isNotNull($attr)){
90 91
 			if ($attr==="value"){
91 92
 				$retour.="url=url+'".$slash."'+$(this).val();\n";
92
-			}elseif ($attr==="html"){
93
+			} elseif ($attr==="html"){
93 94
 				$retour.="url=url+'".$slash."'+$(this).html();\n";
94
-			}elseif(\substr($attr, 0,3)==="js:"){
95
+			} elseif(\substr($attr, 0,3)==="js:"){
95 96
 				$retour.="url=url+'".$slash."'+".\substr($attr, 3).";\n";
96
-			}elseif($attr!==null && $attr!=="")
97
-				$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
97
+			} elseif($attr!==null && $attr!=="") {
98
+							$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
99
+			}
98 100
 		}
99 101
 		return $retour;
100 102
 	}
@@ -104,13 +106,14 @@  discard block
 block discarded – undo
104 106
 		if (JString::isNotNull($responseElement)) {
105 107
 			if(isset($ajaxTransition)){
106 108
 				$call=$this->setAjaxDataCall($ajaxTransition);
107
-			}elseif(isset($this->ajaxTransition)){
109
+			} elseif(isset($this->ajaxTransition)){
108 110
 				$call=$this->ajaxTransition;
109 111
 			}
110
-			if(\is_callable($call))
111
-				$retour="\t".$call($responseElement,$jqueryDone).";\n";
112
-			else
113
-				$retour="\t{$responseElement}.{$jqueryDone}( data );\n";
112
+			if(\is_callable($call)) {
113
+							$retour="\t".$call($responseElement,$jqueryDone).";\n";
114
+			} else {
115
+							$retour="\t{$responseElement}.{$jqueryDone}( data );\n";
116
+			}
114 117
 		}
115 118
 		$retour.="\t".$jsCallback."\n";
116 119
 		return $retour;
@@ -125,8 +128,9 @@  discard block
 block discarded – undo
125 128
 	}
126 129
 
127 130
 	protected function _correctAjaxUrl($url) {
128
-		if ($url!=="/" && JString::endsWith($url, "/")===true)
129
-			$url=substr($url, 0, strlen($url)-1);
131
+		if ($url!=="/" && JString::endsWith($url, "/")===true) {
132
+					$url=substr($url, 0, strlen($url)-1);
133
+		}
130 134
 			if (strncmp($url, 'http://', 7)!=0&&strncmp($url, 'https://', 8)!=0) {
131 135
 				$url=$this->getUrl($url);
132 136
 			}
@@ -146,8 +150,9 @@  discard block
 block discarded – undo
146 150
 	public static function _implodeParams($parameters){
147 151
 		$allParameters=[];
148 152
 		foreach ($parameters as $params){
149
-			if(isset($params))
150
-				$allParameters[]=self::_correctParams($params);
153
+			if(isset($params)) {
154
+							$allParameters[]=self::_correctParams($params);
155
+			}
151 156
 		}
152 157
 		return \implode("+'&'+", $allParameters);
153 158
 	}
@@ -176,8 +181,9 @@  discard block
 block discarded – undo
176 181
 
177 182
 	protected function setDefaultParameters(&$parameters,$default){
178 183
 		foreach ($default as $k=>$v){
179
-			if(!isset($parameters[$k]))
180
-				$parameters[$k]=$v;
184
+			if(!isset($parameters[$k])) {
185
+							$parameters[$k]=$v;
186
+			}
181 187
 		}
182 188
 	}
183 189
 
@@ -295,7 +301,7 @@  discard block
 block discarded – undo
295 301
 		if($context===null){
296 302
 			$parent="$('".$maskSelector."').parent()";
297 303
 			$newElm = "$('#'+newId)";
298
-		}else{
304
+		} else{
299 305
 			$parent=$context;
300 306
 			$newElm = $context.".find('#'+newId)";
301 307
 		}
@@ -497,8 +503,9 @@  discard block
 block discarded – undo
497 503
 			$retour.="$('#".$form."').submit();\n";
498 504
 		}
499 505
 		$retour=$this->_addJsCondition($jsCondition, $retour);
500
-		if ($immediatly)
501
-			$this->jquery_code_for_compile[]=$retour;
506
+		if ($immediatly) {
507
+					$this->jquery_code_for_compile[]=$retour;
508
+		}
502 509
 		return $retour;
503 510
 	}
504 511
 
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
 		$params="{}";
20 21
 		$stopPropagation=true;
21 22
 		$preventDefault=true;
Please login to merge, or discard this patch.
Ajax/php/symfony/JsUtils.php 1 patch
Braces   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
 		if(isset($router)){
14 14
 			try {
15 15
 				$url=$router->generate($url);
16
-			}catch (\Exception $e){
16
+			} catch (\Exception $e){
17 17
 				return $url;
18 18
 			}
19 19
 		}
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
 				$view["q"]=array();
26 26
 			}
27 27
 			$view["q"][$identifier]=$content;
28
-		}elseif($view instanceof \Twig_Environment){
28
+		} elseif($view instanceof \Twig_Environment){
29 29
 			$vars=$view->getGlobals();
30 30
 			if(\array_key_exists("q", $vars)===false){
31 31
 				$vars["q"]=array();
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
 	protected function addVariable($key,$value,&$view){
43 43
 		if(\is_array($view)){
44 44
 			$view[$key]=$value;
45
-		}elseif($view instanceof \Twig_Environment){
45
+		} elseif($view instanceof \Twig_Environment){
46 46
 			$view->addGlobal($key,$value);
47 47
 		}
48 48
 	}
Please login to merge, or discard this patch.