Completed
Push — master ( b1ec61...2db7b1 )
by Jean-Christophe
03:13
created
Ajax/semantic/html/modules/HtmlSearch.php 1 patch
Braces   +6 added lines, -4 removed lines patch added patch discarded remove patch
@@ -22,10 +22,12 @@
 block discarded – undo
22 22
 
23 23
 	private function createField($placeholder=NULL, $icon=NULL) {
24 24
 		$field=new HtmlInput($this->identifier);
25
-		if (isset($placeholder))
26
-			$field->setPlaceholder($placeholder);
27
-		if (isset($icon))
28
-			$field->addIcon($icon, Direction::RIGHT);
25
+		if (isset($placeholder)) {
26
+					$field->setPlaceholder($placeholder);
27
+		}
28
+		if (isset($icon)) {
29
+					$field->addIcon($icon, Direction::RIGHT);
30
+		}
29 31
 		$field->getDataField()->setClass("prompt");
30 32
 		$this->content["field"]=$field;
31 33
 		return $field;
Please login to merge, or discard this patch.
Ajax/semantic/html/base/traits/BaseTrait.php 1 patch
Braces   +28 added lines, -20 removed lines patch added patch discarded remove patch
@@ -48,8 +48,9 @@  discard block
 block discarded – undo
48 48
 
49 49
 	public function setVariations($variations) {
50 50
 		$this->_self->setProperty("class", $this->_self->getBaseClass());
51
-		if (\is_string($variations))
52
-			$variations=\explode(" ", $variations);
51
+		if (\is_string($variations)) {
52
+					$variations=\explode(" ", $variations);
53
+		}
53 54
 		foreach ( $variations as $variation ) {
54 55
 			$this->_self->addVariation($variation);
55 56
 		}
@@ -62,8 +63,9 @@  discard block
 block discarded – undo
62 63
 	}
63 64
 
64 65
 	public function addVariations($variations=array()) {
65
-		if (\is_string($variations))
66
-			$variations=\explode(" ", $variations);
66
+		if (\is_string($variations)) {
67
+					$variations=\explode(" ", $variations);
68
+		}
67 69
 		foreach ( $variations as $variation ) {
68 70
 			$this->_self->addVariation($variation);
69 71
 		}
@@ -71,8 +73,9 @@  discard block
 block discarded – undo
71 73
 	}
72 74
 
73 75
 	public function addStates($states=array()) {
74
-		if (\is_string($states))
75
-			$states=\explode(" ", $states);
76
+		if (\is_string($states)) {
77
+					$states=\explode(" ", $states);
78
+		}
76 79
 		foreach ( $states as $state ) {
77 80
 			$this->_self->addState($state);
78 81
 		}
@@ -81,8 +84,9 @@  discard block
 block discarded – undo
81 84
 
82 85
 	public function setStates($states) {
83 86
 		$this->_self->setProperty("class", $this->_self->getBaseClass());
84
-		if (\is_string($states))
85
-			$states=\explode(" ", $states);
87
+		if (\is_string($states)) {
88
+					$states=\explode(" ", $states);
89
+		}
86 90
 		foreach ( $states as $state ) {
87 91
 			$this->_self->addState($state);
88 92
 		}
@@ -114,8 +118,9 @@  discard block
 block discarded – undo
114 118
 	 * @return HtmlSemDoubleElement
115 119
 	 */
116 120
 	public function setDisabled($disable=true) {
117
-		if($disable)
118
-			$this->_self->addToProperty("class", "disabled");
121
+		if($disable) {
122
+					$this->_self->addToProperty("class", "disabled");
123
+		}
119 124
 		return $this;
120 125
 	}
121 126
 
@@ -149,14 +154,16 @@  discard block
 block discarded – undo
149 154
 	 * @return HtmlSemDoubleElement
150 155
 	 */
151 156
 	public function setActive($value=true){
152
-		if($value)
153
-			$this->_self->addToProperty("class", "active");
157
+		if($value) {
158
+					$this->_self->addToProperty("class", "active");
159
+		}
154 160
 		return $this;
155 161
 	}
156 162
 
157 163
 	public function setAttached($value=true){
158
-		if($value)
159
-			$this->_self->addToPropertyCtrl("class", "attached", array ("attached" ));
164
+		if($value) {
165
+					$this->_self->addToPropertyCtrl("class", "attached", array ("attached" ));
166
+		}
160 167
 		return $this;
161 168
 	}
162 169
 
@@ -166,9 +173,9 @@  discard block
 block discarded – undo
166 173
 	public function setInverted($recursive=true) {
167 174
 		if($recursive===true){
168 175
 			$content=$this->_self->getContent();
169
-			if($content instanceof HtmlSemDoubleElement)
170
-				$content->setInverted($recursive);
171
-			elseif(\is_array($content) || $content instanceof \Traversable){
176
+			if($content instanceof HtmlSemDoubleElement) {
177
+							$content->setInverted($recursive);
178
+			} elseif(\is_array($content) || $content instanceof \Traversable){
172 179
 				foreach ($content as $elm){
173 180
 					if($elm instanceof  HtmlSemDoubleElement){
174 181
 						$elm->setInverted($recursive);
@@ -204,9 +211,10 @@  discard block
 block discarded – undo
204 211
 			if(isset($array[$key])){
205 212
 				$p=JString::replaceAtFirstAndLast($array[$key], $before, "", $after, "");
206 213
 				$array[$key]=$before.$p.$value.$after;
207
-			}else
208
-				$array[$key]=$before.$value.$after;
209
-		}else{
214
+			} else {
215
+							$array[$key]=$before.$value.$after;
216
+			}
217
+		} else{
210 218
 			$array[$key]=$value;
211 219
 		}
212 220
 		return $this;
Please login to merge, or discard this patch.
Ajax/common/traits/JsUtilsInternalTrait.php 1 patch
Braces   +6 added lines, -3 removed lines patch added patch discarded remove patch
@@ -16,8 +16,9 @@  discard block
 block discarded – undo
16 16
 	 */
17 17
 	protected function _compileLibrary(BaseGui $library=NULL, &$view=NULL){
18 18
 		if ($library!=NULL) {
19
-			if(isset($view))
20
-				$library->compileHtml($this, $view);
19
+			if(isset($view)) {
20
+							$library->compileHtml($this, $view);
21
+			}
21 22
 			if ($library->isAutoCompile()) {
22 23
 				$library->compile(true);
23 24
 			}
@@ -37,7 +38,9 @@  discard block
 block discarded – undo
37 38
 	}
38 39
 
39 40
 	protected function minify($input) {
40
-		if(trim($input) === "") return $input;
41
+		if(trim($input) === "") {
42
+			return $input;
43
+		}
41 44
 		return preg_replace(
42 45
 				array(
43 46
 						// Remove comment(s)
Please login to merge, or discard this patch.
Ajax/semantic/html/elements/HtmlButton.php 1 patch
Braces   +14 added lines, -11 removed lines patch added patch discarded remove patch
@@ -56,9 +56,9 @@  discard block
 block discarded – undo
56 56
 	}
57 57
 
58 58
 	public function setFocusable($value=true) {
59
-		if ($value === true)
60
-			$this->setProperty("tabindex", "0");
61
-		else {
59
+		if ($value === true) {
60
+					$this->setProperty("tabindex", "0");
61
+		} else {
62 62
 			$this->removeProperty("tabindex");
63 63
 		}
64 64
 		return $this;
@@ -106,8 +106,9 @@  discard block
 block discarded – undo
106 106
 	 */
107 107
 	public function addLabel($label, $before=false, $icon=NULL) {
108 108
 		$this->tagName="div";$prefix="";
109
-		if($before)
110
-			$prefix="left ";
109
+		if($before) {
110
+					$prefix="left ";
111
+		}
111 112
 		$this->addToProperty("class", $prefix."labeled");
112 113
 		$isIcon=(isset($this->content[0]) && $this->content[0] instanceof HtmlIcon);
113 114
 		$this->content=new HtmlButton("button-" . $this->identifier, $this->content);
@@ -144,12 +145,13 @@  discard block
 block discarded – undo
144 145
 	public function setColor($color){
145 146
 		if(\is_array($this->content)){
146 147
 			foreach ($this->content as $content){
147
-				if($content instanceof HtmlButton)
148
-					$content->setColor($color);
148
+				if($content instanceof HtmlButton) {
149
+									$content->setColor($color);
150
+				}
149 151
 			}
152
+		} else {
153
+					parent::setColor($color);
150 154
 		}
151
-		else
152
-			parent::setColor($color);
153 155
 		return $this;
154 156
 	}
155 157
 
@@ -202,8 +204,9 @@  discard block
 block discarded – undo
202 204
 	 * @return HtmlButton
203 205
 	 */
204 206
 	public static function social($identifier, $social, $value=NULL) {
205
-		if ($value === NULL)
206
-			$value=\ucfirst($social);
207
+		if ($value === NULL) {
208
+					$value=\ucfirst($social);
209
+		}
207 210
 		$return=new HtmlButton($identifier, $value);
208 211
 		$return->addIcon($social);
209 212
 		return $return->addToPropertyCtrl("class", $social, Social::getConstants());
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);
@@ -178,8 +182,9 @@  discard block
 block discarded – undo
178 182
 			$field=$ck->getField();
179 183
 			$field->setProperty("value",$id);
180 184
 			$field->setProperty("name", "selection[]");
181
-			if(isset($checkedClass))
182
-				$field->setClass($checkedClass);
185
+			if(isset($checkedClass)) {
186
+							$field->setClass($checkedClass);
187
+			}
183 188
 			\array_unshift($values, $ck);
184 189
 		}
185 190
 		$result=$table->newRow();
@@ -192,8 +197,9 @@  discard block
 block discarded – undo
192 197
 
193 198
 	protected function _generatePagination($table,$js=NULL){
194 199
 		if(isset($this->_toolbar)){
195
-			if($this->_toolbarPosition==PositionInTable::FOOTER)
196
-				$this->_toolbar->setFloated("left");
200
+			if($this->_toolbarPosition==PositionInTable::FOOTER) {
201
+							$this->_toolbar->setFloated("left");
202
+			}
197 203
 		}
198 204
 		$footer=$table->getFooter();
199 205
 		$footer->mergeCol();
@@ -212,8 +218,9 @@  discard block
 block discarded – undo
212 218
 
213 219
 	protected function _getFieldName($index){
214 220
 		$fieldName=parent::_getFieldName($index);
215
-		if(\is_object($fieldName))
216
-			$fieldName="field-".$index;
221
+		if(\is_object($fieldName)) {
222
+					$fieldName="field-".$index;
223
+		}
217 224
 		return $fieldName."[]";
218 225
 	}
219 226
 
@@ -253,7 +260,7 @@  discard block
 block discarded – undo
253 260
 		$hasPart=$table->hasPart($part);
254 261
 		if($hasPart){
255 262
 			$row=$table->getPart($part)->addRow(\sizeof($captions));
256
-		}else{
263
+		} else{
257 264
 			$row=$table->getPart($part)->getRow(0);
258 265
 		}
259 266
 		$row->mergeCol();
@@ -283,7 +290,7 @@  discard block
 block discarded – undo
283 290
 			$this->_urls["refresh"]=JArray::getValue($urls, "refresh",0);
284 291
 			$this->_urls["edit"]=JArray::getValue($urls, "edit",1);
285 292
 			$this->_urls["delete"]=JArray::getValue($urls, "delete",2);
286
-		}else{
293
+		} else{
287 294
 			$this->_urls=["refresh"=>$urls,"edit"=>$urls,"delete"=>$urls];
288 295
 		}
289 296
 		return $this;
@@ -357,8 +364,9 @@  discard block
 block discarded – undo
357 364
 
358 365
 	protected function getTargetSelector($op) {
359 366
 		$result=$this->_targetSelector;
360
-		if(!isset($result[$op]))
361
-			$result="#".$this->identifier;
367
+		if(!isset($result[$op])) {
368
+					$result="#".$this->identifier;
369
+		}
362 370
 		return $result[$op];
363 371
 	}
364 372
 
@@ -376,8 +384,9 @@  discard block
 block discarded – undo
376 384
 	}
377 385
 
378 386
 	public function getRefreshSelector() {
379
-		if(isset($this->_refreshSelector))
380
-			return $this->_refreshSelector;
387
+		if(isset($this->_refreshSelector)) {
388
+					return $this->_refreshSelector;
389
+		}
381 390
 		return "#".$this->identifier." tbody";
382 391
 	}
383 392
 
@@ -396,8 +405,9 @@  discard block
 block discarded – undo
396 405
 	 */
397 406
 	public function show($modelInstance){
398 407
 		if(\is_array($modelInstance)){
399
-			if(isset($modelInstance[0]) && \is_array(array_values($modelInstance)[0]))
400
-				$modelInstance=\json_decode(\json_encode($modelInstance), FALSE);
408
+			if(isset($modelInstance[0]) && \is_array(array_values($modelInstance)[0])) {
409
+							$modelInstance=\json_decode(\json_encode($modelInstance), FALSE);
410
+			}
401 411
 		}
402 412
 		$this->_modelInstance=$modelInstance;
403 413
 	}
@@ -437,8 +447,9 @@  discard block
 block discarded – undo
437 447
 	}
438 448
 
439 449
 	public function hideColumn($colIndex){
440
-		if(!\is_array($this->_hiddenColumns))
441
-			$this->_hiddenColumns=[];
450
+		if(!\is_array($this->_hiddenColumns)) {
451
+					$this->_hiddenColumns=[];
452
+		}
442 453
 		$this->_hiddenColumns[]=$colIndex;
443 454
 		return $this;
444 455
 	}
Please login to merge, or discard this patch.
Ajax/semantic/html/modules/HtmlDropdown.php 1 patch
Braces   +23 added lines, -17 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
 		if(isset($value)){
35 35
 			if($value instanceof HtmlSemDoubleElement){
36 36
 				$text=$value;
37
-			}else{
37
+			} else{
38 38
 				$text=new HtmlSemDoubleElement("text-".$this->identifier,"div");
39 39
 				$text->setClass("text");
40 40
 				$this->setValue($value);
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
107 107
 		}
108 108
 		if(!$item instanceof HtmlDropdownItem){
109 109
 			$itemO=new HtmlDropdownItem("dd-item-".$this->identifier."-".\sizeof($this->items),$item,$value,$image,$description);
110
-		}elseif($itemO instanceof HtmlDropdownItem){
110
+		} elseif($itemO instanceof HtmlDropdownItem){
111 111
 			$this->addToProperty("class", "vertical");
112 112
 		}
113 113
 		return $itemO;
@@ -121,8 +121,9 @@  discard block
 block discarded – undo
121 121
 	}
122 122
 
123 123
 	public function addInput($name){
124
-		if(!isset($name))
125
-			$name="input-".$this->identifier;
124
+		if(!isset($name)) {
125
+					$name="input-".$this->identifier;
126
+		}
126 127
 		$this->setAction("activate");
127 128
 		$this->input=new HtmlInput($name,"hidden");
128 129
 	}
@@ -179,7 +180,7 @@  discard block
 block discarded – undo
179 180
 			foreach ($items as $k=>$v){
180 181
 				$this->addItem($v)->setData($k);
181 182
 			}
182
-		}else{
183
+		} else{
183 184
 			foreach ($items as $item){
184 185
 				$this->addItem($item);
185 186
 			}
@@ -203,7 +204,7 @@  discard block
 block discarded – undo
203 204
 		if($dropdown===false){
204 205
 			$this->_template=include dirname(__FILE__).'/../templates/tplDropdownMenu.php';
205 206
 			$dropdown="menu";
206
-		}else{
207
+		} else{
207 208
 			$dropdown="dropdown";
208 209
 			$this->mClass="menu";
209 210
 		}
@@ -224,22 +225,25 @@  discard block
 block discarded – undo
224 225
 
225 226
 	public function asButton($floating=false){
226 227
 		$this->removeArrow();
227
-		if($floating)
228
-			$this->addToProperty("class", "floating");
228
+		if($floating) {
229
+					$this->addToProperty("class", "floating");
230
+		}
229 231
 		$this->removePropertyValue("class", "selection");
230 232
 		return $this->addToProperty("class", "button");
231 233
 	}
232 234
 
233 235
 	public function asSelect($name=NULL,$multiple=false,$selection=true){
234 236
 		$this->_multiple=$multiple;
235
-		if(isset($name))
236
-			$this->addInput($name);
237
+		if(isset($name)) {
238
+					$this->addInput($name);
239
+		}
237 240
 		if($multiple){
238 241
 			$this->addToProperty("class", "multiple");
239 242
 		}
240 243
 		if ($selection){
241
-			if($this->propertyContains("class", "button")===false)
242
-				$this->addToPropertyCtrl("class", "selection",array("selection"));
244
+			if($this->propertyContains("class", "button")===false) {
245
+							$this->addToPropertyCtrl("class", "selection",array("selection"));
246
+			}
243 247
 		}
244 248
 		return $this;
245 249
 	}
@@ -250,8 +254,9 @@  discard block
 block discarded – undo
250 254
 	}
251 255
 
252 256
 	public function setSelect($name=NULL,$multiple=false){
253
-		if(!isset($name))
254
-			$name="select-".$this->identifier;
257
+		if(!isset($name)) {
258
+					$name="select-".$this->identifier;
259
+		}
255 260
 		$this->input=null;
256 261
 		if($multiple){
257 262
 			$this->setProperty("multiple", true);
@@ -287,12 +292,13 @@  discard block
 block discarded – undo
287 292
 		$value=$this->value;
288 293
 		if(isset($this->input) && isset($value)){
289 294
 			$this->input->setProperty("value", $value);
290
-		}else{
295
+		} else{
291 296
 			$this->setProperty("value", $value);
292 297
 		}
293 298
 			$textElement=$this->getElementById("text-".$this->identifier, $this->content);
294
-			if(isset($textElement) && !$this->_multiple)
295
-				$textElement->setContent($value);
299
+			if(isset($textElement) && !$this->_multiple) {
300
+							$textElement->setContent($value);
301
+			}
296 302
 		return $this;
297 303
 	}
298 304
 
Please login to merge, or discard this patch.