Completed
Push — master ( ef9455...966ba4 )
by Jean-Christophe
02:39
created
Ajax/semantic/html/elements/HtmlList.php 1 patch
Braces   +10 added lines, -7 removed lines patch added patch discarded remove patch
@@ -50,8 +50,9 @@  discard block
 block discarded – undo
50 50
 
51 51
 	protected function getItemToAdd($item){
52 52
 		$itemO=parent::getItemToAdd($item);
53
-		if($itemO instanceof AbstractCheckbox)
54
-			$itemO->addClass("item");
53
+		if($itemO instanceof AbstractCheckbox) {
54
+					$itemO->addClass("item");
55
+		}
55 56
 		return $itemO;
56 57
 	}
57 58
 
@@ -106,14 +107,15 @@  discard block
 block discarded – undo
106 107
 		if (isset($masterItem)) {
107 108
 			if(\is_array($masterItem)){
108 109
 				$masterO=new HtmlFormCheckbox("master-" . $identifier, @$masterItem[0],@$masterItem[1]);
109
-				if(isset($name))
110
-					$masterO->setName($name);
110
+				if(isset($name)) {
111
+									$masterO->setName($name);
112
+				}
111 113
 				if(isset($masterItem[1])){
112 114
 					if(\array_search($masterItem[1], $values)!==false){
113 115
 						$masterO->getDataField()->setProperty("checked", "");
114 116
 					}
115 117
 				}
116
-			}else{
118
+			} else{
117 119
 				$masterO=new HtmlFormCheckbox("master-" . $identifier, $masterItem);
118 120
 			}
119 121
 			if($notAllChecked){
@@ -130,8 +132,9 @@  discard block
 block discarded – undo
130 132
 			if (\array_search($val, $values) !== false) {
131 133
 				$itemO->getDataField()->setProperty("checked", "");
132 134
 			}
133
-			if(isset($name))
134
-				$itemO->setName($name);
135
+			if(isset($name)) {
136
+							$itemO->setName($name);
137
+			}
135 138
 			$itemO->setClass("item");
136 139
 			$fields[]=$itemO;
137 140
 		}
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
 		$jsCallback=NULL;
21 22
 		$stopPropagation=true;
Please login to merge, or discard this patch.
Ajax/semantic/widgets/datatable/DataTableFieldAsTrait.php 1 patch
Braces   +12 added lines, -8 removed lines patch added patch discarded remove patch
@@ -62,15 +62,17 @@  discard block
 block discarded – undo
62 62
 	 */
63 63
 	private function getFieldButton($caption,$visibleHover=true){
64 64
 		$bt= new HtmlButton($this->cleanIdentifier($caption),$caption);
65
-		if($visibleHover)
66
-			$this->_visibleOver($bt);
65
+		if($visibleHover) {
66
+					$this->_visibleOver($bt);
67
+		}
67 68
 		return $bt;
68 69
 	}
69 70
 
70 71
 	private function getFieldButtons($buttons,$visibleHover=true){
71 72
 		$bts=new HtmlButtonGroups("",$buttons);
72
-		if($visibleHover)
73
-			$this->_visibleOver($bts);
73
+		if($visibleHover) {
74
+					$this->_visibleOver($bts);
75
+		}
74 76
 		return $bts;
75 77
 	}
76 78
 
@@ -87,8 +89,9 @@  discard block
 block discarded – undo
87 89
 		return $this->_fieldAs(function($id,$name,$value,$caption) use ($url,$responseElement,$cssStyle,$index,$attributes){
88 90
 			$button=new HtmlButton($id,$value,$cssStyle);
89 91
 			$button->postOnClick($url,"$(event.target).closest('tr').find(':input').serialize()",$responseElement,$attributes["ajax"]);
90
-			if(!isset($attributes["visibleHover"]) || $attributes["visibleHover"])
91
-				$this->_visibleOver($button);
92
+			if(!isset($attributes["visibleHover"]) || $attributes["visibleHover"]) {
93
+							$this->_visibleOver($button);
94
+			}
92 95
 				return $button;
93 96
 		}, $index,$attributes);
94 97
 	}
@@ -159,8 +162,9 @@  discard block
 block discarded – undo
159 162
 	private function getDefaultButton($icon,$class=null,$visibleHover=true){
160 163
 		$bt=$this->getFieldButton("",$visibleHover);
161 164
 		$bt->asIcon($icon);
162
-		if(isset($class))
163
-			$bt->addClass($class);
165
+		if(isset($class)) {
166
+					$bt->addClass($class);
167
+		}
164 168
 		return $bt;
165 169
 	}
166 170
 
Please login to merge, or discard this patch.
Ajax/semantic/widgets/datatable/DataTable.php 1 patch
Braces   +35 added lines, -24 removed lines patch added patch discarded remove patch
@@ -58,10 +58,12 @@  discard block
 block discarded – undo
58 58
 			$js->execOn("mouseover", "#".$this->identifier." tr", "$(event.target).closest('tr').find('.visibleover').css('visibility', 'visible');",["preventDefault"=>false,"stopPropagation"=>true]);
59 59
 			$js->execOn("mouseout", "#".$this->identifier." tr", "$(event.target).closest('tr').find('.visibleover').css('visibility', 'hidden');",["preventDefault"=>false,"stopPropagation"=>true]);
60 60
 		}
61
-		if(\is_array($this->_deleteBehavior))
62
-			$this->_generateBehavior("delete",$this->_deleteBehavior, $js);
63
-		if(\is_array($this->_editBehavior))
64
-			$this->_generateBehavior("edit",$this->_editBehavior,$js);
61
+		if(\is_array($this->_deleteBehavior)) {
62
+					$this->_generateBehavior("delete",$this->_deleteBehavior, $js);
63
+		}
64
+		if(\is_array($this->_editBehavior)) {
65
+					$this->_generateBehavior("edit",$this->_editBehavior,$js);
66
+		}
65 67
 		return parent::run($js);
66 68
 	}
67 69
 
@@ -94,8 +96,9 @@  discard block
 block discarded – undo
94 96
 			$table->setRowCount(0, \sizeof($captions));
95 97
 			$this->_generateHeader($table,$captions);
96 98
 
97
-			if(isset($this->_compileParts))
98
-				$table->setCompileParts($this->_compileParts);
99
+			if(isset($this->_compileParts)) {
100
+							$table->setCompileParts($this->_compileParts);
101
+			}
99 102
 
100 103
 			$this->_generateContent($table);
101 104
 
@@ -126,8 +129,9 @@  discard block
 block discarded – undo
126 129
 	}
127 130
 
128 131
 	protected function _applyStyleAttributes($table){
129
-		if(isset($this->_hiddenColumns))
130
-			$this->_hideColumns();
132
+		if(isset($this->_hiddenColumns)) {
133
+					$this->_hideColumns();
134
+		}
131 135
 			if(isset($this->_colWidths)){
132 136
 				foreach ($this->_colWidths as $colIndex=>$width){
133 137
 					$table->setColWidth($colIndex,$width);
@@ -180,8 +184,9 @@  discard block
 block discarded – undo
180 184
 			$field=$ck->getField();
181 185
 			$field->setProperty("value",$dataAjax);
182 186
 			$field->setProperty("name", "selection[]");
183
-			if(isset($checkedClass))
184
-				$field->setClass($checkedClass);
187
+			if(isset($checkedClass)) {
188
+							$field->setClass($checkedClass);
189
+			}
185 190
 			\array_unshift($values, $ck);
186 191
 		}
187 192
 		$result=$table->newRow();
@@ -194,8 +199,9 @@  discard block
 block discarded – undo
194 199
 
195 200
 	protected function _generatePagination($table,$js=NULL){
196 201
 		if(isset($this->_toolbar)){
197
-			if($this->_toolbarPosition==PositionInTable::FOOTER)
198
-				$this->_toolbar->setFloated("left");
202
+			if($this->_toolbarPosition==PositionInTable::FOOTER) {
203
+							$this->_toolbar->setFloated("left");
204
+			}
199 205
 		}
200 206
 		$footer=$table->getFooter();
201 207
 		$footer->mergeCol();
@@ -214,8 +220,9 @@  discard block
 block discarded – undo
214 220
 
215 221
 	protected function _getFieldName($index){
216 222
 		$fieldName=parent::_getFieldName($index);
217
-		if(\is_object($fieldName))
218
-			$fieldName="field-".$index;
223
+		if(\is_object($fieldName)) {
224
+					$fieldName="field-".$index;
225
+		}
219 226
 		return $fieldName."[]";
220 227
 	}
221 228
 
@@ -255,7 +262,7 @@  discard block
 block discarded – undo
255 262
 		$hasPart=$table->hasPart($part);
256 263
 		if($hasPart){
257 264
 			$row=$table->getPart($part)->addRow(\sizeof($captions));
258
-		}else{
265
+		} else{
259 266
 			$row=$table->getPart($part)->getRow(0);
260 267
 		}
261 268
 		$row->mergeCol();
@@ -286,7 +293,7 @@  discard block
 block discarded – undo
286 293
 			$this->_urls["refresh"]=JArray::getValue($urls, "refresh",0);
287 294
 			$this->_urls["edit"]=JArray::getValue($urls, "edit",1);
288 295
 			$this->_urls["delete"]=JArray::getValue($urls, "delete",2);
289
-		}else{
296
+		} else{
290 297
 			$this->_urls=["refresh"=>$urls,"edit"=>$urls,"delete"=>$urls];
291 298
 		}
292 299
 		return $this;
@@ -369,8 +376,9 @@  discard block
 block discarded – undo
369 376
 
370 377
 	protected function getTargetSelector($op) {
371 378
 		$result=$this->_targetSelector;
372
-		if(!isset($result[$op]))
373
-			$result="#".$this->identifier;
379
+		if(!isset($result[$op])) {
380
+					$result="#".$this->identifier;
381
+		}
374 382
 		return $result[$op];
375 383
 	}
376 384
 
@@ -388,8 +396,9 @@  discard block
 block discarded – undo
388 396
 	}
389 397
 
390 398
 	public function getRefreshSelector() {
391
-		if(isset($this->_refreshSelector))
392
-			return $this->_refreshSelector;
399
+		if(isset($this->_refreshSelector)) {
400
+					return $this->_refreshSelector;
401
+		}
393 402
 		return "#".$this->identifier." tbody";
394 403
 	}
395 404
 
@@ -408,8 +417,9 @@  discard block
 block discarded – undo
408 417
 	 */
409 418
 	public function show($modelInstance){
410 419
 		if(\is_array($modelInstance)){
411
-			if(isset($modelInstance[0]) && \is_array(array_values($modelInstance)[0]))
412
-				$modelInstance=\json_decode(\json_encode($modelInstance), FALSE);
420
+			if(isset($modelInstance[0]) && \is_array(array_values($modelInstance)[0])) {
421
+							$modelInstance=\json_decode(\json_encode($modelInstance), FALSE);
422
+			}
413 423
 		}
414 424
 		$this->_modelInstance=$modelInstance;
415 425
 	}
@@ -449,8 +459,9 @@  discard block
 block discarded – undo
449 459
 	}
450 460
 
451 461
 	public function hideColumn($colIndex){
452
-		if(!\is_array($this->_hiddenColumns))
453
-			$this->_hiddenColumns=[];
462
+		if(!\is_array($this->_hiddenColumns)) {
463
+					$this->_hiddenColumns=[];
464
+		}
454 465
 		$this->_hiddenColumns[]=$colIndex;
455 466
 		return $this;
456 467
 	}
Please login to merge, or discard this patch.
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/common/traits/JsUtilsAjaxTrait.php 1 patch
Braces   +33 added lines, -24 removed lines patch added patch discarded remove patch
@@ -49,8 +49,9 @@  discard block
 block discarded – undo
49 49
 		$retour.="$.ajax({".$this->implodeAjaxParameters($ajaxParameters)."}).done(function( data, textStatus, jqXHR ) {\n";
50 50
 		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone,$ajaxTransition,$jsCallback)."});\n";
51 51
 		$retour=$this->_addJsCondition($jsCondition,$retour);
52
-		if ($immediatly)
53
-			$this->jquery_code_for_compile[]=$retour;
52
+		if ($immediatly) {
53
+					$this->jquery_code_for_compile[]=$retour;
54
+		}
54 55
 		return $retour;
55 56
 	}
56 57
 
@@ -86,12 +87,13 @@  discard block
 block discarded – undo
86 87
 		if(JString::isNotNull($attr)){
87 88
 			if ($attr==="value"){
88 89
 				$retour.="url=url+'".$slash."'+$(this).val();\n";
89
-			}elseif ($attr==="html"){
90
+			} elseif ($attr==="html"){
90 91
 				$retour.="url=url+'".$slash."'+$(this).html();\n";
91
-			}elseif(\substr($attr, 0,3)==="js:"){
92
+			} elseif(\substr($attr, 0,3)==="js:"){
92 93
 				$retour.="url=url+'".$slash."'+".\substr($attr, 3).";\n";
93
-			}elseif($attr!==null && $attr!=="")
94
-				$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
94
+			} elseif($attr!==null && $attr!=="") {
95
+							$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
96
+			}
95 97
 		}
96 98
 		return $retour;
97 99
 	}
@@ -101,13 +103,14 @@  discard block
 block discarded – undo
101 103
 		if ($responseElement!=="") {
102 104
 			if(isset($ajaxTransition)){
103 105
 				$call=$this->setAjaxDataCall($ajaxTransition);
104
-			}elseif(isset($this->ajaxTransition)){
106
+			} elseif(isset($this->ajaxTransition)){
105 107
 				$call=$this->ajaxTransition;
106 108
 			}
107
-			if(\is_callable($call))
108
-				$retour="\t".$call($responseElement,$jqueryDone).";\n";
109
-			else
110
-				$retour="\t{$responseElement}.{$jqueryDone}( data );\n";
109
+			if(\is_callable($call)) {
110
+							$retour="\t".$call($responseElement,$jqueryDone).";\n";
111
+			} else {
112
+							$retour="\t{$responseElement}.{$jqueryDone}( data );\n";
113
+			}
111 114
 		}
112 115
 		$retour.="\t".$jsCallback."\n";
113 116
 		return $retour;
@@ -122,8 +125,9 @@  discard block
 block discarded – undo
122 125
 	}
123 126
 
124 127
 	protected function _correctAjaxUrl($url) {
125
-		if ($url!=="/" && JString::endsWith($url, "/")===true)
126
-			$url=substr($url, 0, strlen($url)-1);
128
+		if ($url!=="/" && JString::endsWith($url, "/")===true) {
129
+					$url=substr($url, 0, strlen($url)-1);
130
+		}
127 131
 			if (strncmp($url, 'http://', 7)!=0&&strncmp($url, 'https://', 8)!=0) {
128 132
 				$url=$this->getUrl($url);
129 133
 			}
@@ -143,8 +147,9 @@  discard block
 block discarded – undo
143 147
 	public static function _implodeParams($parameters){
144 148
 		$allParameters=[];
145 149
 		foreach ($parameters as $params){
146
-			if(isset($params))
147
-				$allParameters[]=self::_correctParams($params);
150
+			if(isset($params)) {
151
+							$allParameters[]=self::_correctParams($params);
152
+			}
148 153
 		}
149 154
 		return \implode("+'&'+", $allParameters);
150 155
 	}
@@ -173,8 +178,9 @@  discard block
 block discarded – undo
173 178
 
174 179
 	protected function setDefaultParameters(&$parameters,$default){
175 180
 		foreach ($default as $k=>$v){
176
-			if(!isset($parameters[$k]))
177
-				$parameters[$k]=$v;
181
+			if(!isset($parameters[$k])) {
182
+							$parameters[$k]=$v;
183
+			}
178 184
 		}
179 185
 	}
180 186
 
@@ -245,8 +251,9 @@  discard block
 block discarded – undo
245 251
 				$retour.="\t".$jsCallback."\n".
246 252
 						"\t$(document).trigger('jsonReady',[data]);\n".
247 253
 						"});\n";
248
-				if ($immediatly)
249
-					$this->jquery_code_for_compile[]=$retour;
254
+				if ($immediatly) {
255
+									$this->jquery_code_for_compile[]=$retour;
256
+				}
250 257
 		return $retour;
251 258
 	}
252 259
 
@@ -311,7 +318,7 @@  discard block
 block discarded – undo
311 318
 		if($context===null){
312 319
 			$parent="$('".$maskSelector."').parent()";
313 320
 			$newElm = "$('#'+newId)";
314
-		}else{
321
+		} else{
315 322
 			$parent=$context;
316 323
 			$newElm = $context.".find('#'+newId)";
317 324
 		}
@@ -324,8 +331,9 @@  discard block
 block discarded – undo
324 331
 		$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";
325 332
 		$retour.="\t$(document).trigger('jsonReady',[data]);\n";
326 333
 		$retour.="\t".$jsCallback."\n"."});\n";
327
-		if ($immediatly)
328
-			$this->jquery_code_for_compile[]=$retour;
334
+		if ($immediatly) {
335
+					$this->jquery_code_for_compile[]=$retour;
336
+		}
329 337
 		return $retour;
330 338
 	}
331 339
 
@@ -528,8 +536,9 @@  discard block
 block discarded – undo
528 536
 			$retour.="$('#".$form."').submit();\n";
529 537
 		}
530 538
 		$retour=$this->_addJsCondition($jsCondition, $retour);
531
-		if ($immediatly)
532
-			$this->jquery_code_for_compile[]=$retour;
539
+		if ($immediatly) {
540
+					$this->jquery_code_for_compile[]=$retour;
541
+		}
533 542
 		return $retour;
534 543
 	}
535 544
 
Please login to merge, or discard this patch.