Completed
Push — master ( 966ba4...93b0d7 )
by Jean-Christophe
02:34
created
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/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   +33 added lines, -24 removed lines patch added patch discarded remove patch
@@ -50,8 +50,9 @@  discard block
 block discarded – undo
50 50
 		$retour.="$.ajax({".$this->implodeAjaxParameters($ajaxParameters)."}).done(function( data, textStatus, jqXHR ) {\n";
51 51
 		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone,$ajaxTransition,$jsCallback)."});\n";
52 52
 		$retour=$this->_addJsCondition($jsCondition,$retour);
53
-		if ($immediatly)
54
-			$this->jquery_code_for_compile[]=$retour;
53
+		if ($immediatly) {
54
+					$this->jquery_code_for_compile[]=$retour;
55
+		}
55 56
 		return $retour;
56 57
 	}
57 58
 
@@ -87,12 +88,13 @@  discard block
 block discarded – undo
87 88
 		if(JString::isNotNull($attr)){
88 89
 			if ($attr==="value"){
89 90
 				$retour.="url=url+'".$slash."'+$(this).val();\n";
90
-			}elseif ($attr==="html"){
91
+			} elseif ($attr==="html"){
91 92
 				$retour.="url=url+'".$slash."'+$(this).html();\n";
92
-			}elseif(\substr($attr, 0,3)==="js:"){
93
+			} elseif(\substr($attr, 0,3)==="js:"){
93 94
 				$retour.="url=url+'".$slash."'+".\substr($attr, 3).";\n";
94
-			}elseif($attr!==null && $attr!=="")
95
-				$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
95
+			} elseif($attr!==null && $attr!=="") {
96
+							$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
97
+			}
96 98
 		}
97 99
 		return $retour;
98 100
 	}
@@ -102,13 +104,14 @@  discard block
 block discarded – undo
102 104
 		if (JString::isNotNull($responseElement)) {
103 105
 			if(isset($ajaxTransition)){
104 106
 				$call=$this->setAjaxDataCall($ajaxTransition);
105
-			}elseif(isset($this->ajaxTransition)){
107
+			} elseif(isset($this->ajaxTransition)){
106 108
 				$call=$this->ajaxTransition;
107 109
 			}
108
-			if(\is_callable($call))
109
-				$retour="\t".$call($responseElement,$jqueryDone).";\n";
110
-			else
111
-				$retour="\t{$responseElement}.{$jqueryDone}( data );\n";
110
+			if(\is_callable($call)) {
111
+							$retour="\t".$call($responseElement,$jqueryDone).";\n";
112
+			} else {
113
+							$retour="\t{$responseElement}.{$jqueryDone}( data );\n";
114
+			}
112 115
 		}
113 116
 		$retour.="\t".$jsCallback."\n";
114 117
 		return $retour;
@@ -123,8 +126,9 @@  discard block
 block discarded – undo
123 126
 	}
124 127
 
125 128
 	protected function _correctAjaxUrl($url) {
126
-		if ($url!=="/" && JString::endsWith($url, "/")===true)
127
-			$url=substr($url, 0, strlen($url)-1);
129
+		if ($url!=="/" && JString::endsWith($url, "/")===true) {
130
+					$url=substr($url, 0, strlen($url)-1);
131
+		}
128 132
 			if (strncmp($url, 'http://', 7)!=0&&strncmp($url, 'https://', 8)!=0) {
129 133
 				$url=$this->getUrl($url);
130 134
 			}
@@ -144,8 +148,9 @@  discard block
 block discarded – undo
144 148
 	public static function _implodeParams($parameters){
145 149
 		$allParameters=[];
146 150
 		foreach ($parameters as $params){
147
-			if(isset($params))
148
-				$allParameters[]=self::_correctParams($params);
151
+			if(isset($params)) {
152
+							$allParameters[]=self::_correctParams($params);
153
+			}
149 154
 		}
150 155
 		return \implode("+'&'+", $allParameters);
151 156
 	}
@@ -174,8 +179,9 @@  discard block
 block discarded – undo
174 179
 
175 180
 	protected function setDefaultParameters(&$parameters,$default){
176 181
 		foreach ($default as $k=>$v){
177
-			if(!isset($parameters[$k]))
178
-				$parameters[$k]=$v;
182
+			if(!isset($parameters[$k])) {
183
+							$parameters[$k]=$v;
184
+			}
179 185
 		}
180 186
 	}
181 187
 
@@ -246,8 +252,9 @@  discard block
 block discarded – undo
246 252
 				$retour.="\t".$jsCallback."\n".
247 253
 						"\t$(document).trigger('jsonReady',[data]);\n".
248 254
 						"});\n";
249
-				if ($immediatly)
250
-					$this->jquery_code_for_compile[]=$retour;
255
+				if ($immediatly) {
256
+									$this->jquery_code_for_compile[]=$retour;
257
+				}
251 258
 		return $retour;
252 259
 	}
253 260
 
@@ -312,7 +319,7 @@  discard block
 block discarded – undo
312 319
 		if($context===null){
313 320
 			$parent="$('".$maskSelector."').parent()";
314 321
 			$newElm = "$('#'+newId)";
315
-		}else{
322
+		} else{
316 323
 			$parent=$context;
317 324
 			$newElm = $context.".find('#'+newId)";
318 325
 		}
@@ -325,8 +332,9 @@  discard block
 block discarded – undo
325 332
 		$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";
326 333
 		$retour.="\t$(document).trigger('jsonReady',[data]);\n";
327 334
 		$retour.="\t".$jsCallback."\n"."});\n";
328
-		if ($immediatly)
329
-			$this->jquery_code_for_compile[]=$retour;
335
+		if ($immediatly) {
336
+					$this->jquery_code_for_compile[]=$retour;
337
+		}
330 338
 		return $retour;
331 339
 	}
332 340
 
@@ -530,8 +538,9 @@  discard block
 block discarded – undo
530 538
 			$retour.="$('#".$form."').submit();\n";
531 539
 		}
532 540
 		$retour=$this->_addJsCondition($jsCondition, $retour);
533
-		if ($immediatly)
534
-			$this->jquery_code_for_compile[]=$retour;
541
+		if ($immediatly) {
542
+					$this->jquery_code_for_compile[]=$retour;
543
+		}
535 544
 		return $retour;
536 545
 	}
537 546
 
Please login to merge, or discard this patch.