Completed
Push — master ( f99fed...57dceb )
by Jean-Christophe
03:29
created
Ajax/semantic/widgets/dataform/FormInstanceViewer.php 1 patch
Braces   +6 added lines, -4 removed lines patch added patch discarded remove patch
@@ -47,15 +47,17 @@
 block discarded – undo
47 47
 
48 48
 
49 49
 	public function addSeparatorAfter($fieldNum){
50
-		if(\array_search($fieldNum, $this->separators)===false)
51
-			$this->separators[]=$fieldNum;
50
+		if(\array_search($fieldNum, $this->separators)===false) {
51
+					$this->separators[]=$fieldNum;
52
+		}
52 53
 		return $this;
53 54
 	}
54 55
 
55 56
 	public function addHeaderDividerBefore($fieldNum,$header){
56 57
 		$this->headers[$fieldNum]=$header;
57
-		if($fieldNum>0)
58
-			$this->addSeparatorAfter($fieldNum-1);
58
+		if($fieldNum>0) {
59
+					$this->addSeparatorAfter($fieldNum-1);
60
+		}
59 61
 		return $this;
60 62
 	}
61 63
 
Please login to merge, or discard this patch.
Ajax/semantic/html/collections/form/HtmlFormField.php 1 patch
Braces   +6 added lines, -4 removed lines patch added patch discarded remove patch
@@ -18,8 +18,9 @@  discard block
 block discarded – undo
18 18
 		parent::__construct($identifier, "div","field");
19 19
 		$this->content=array();
20 20
 		$this->_states=[State::ERROR,State::DISABLED];
21
-		if(isset($label) && $label!=="")
22
-			$this->setLabel($label);
21
+		if(isset($label) && $label!=="") {
22
+					$this->setLabel($label);
23
+		}
23 24
 		$this->setField($field);
24 25
 		$this->_validation=NULL;
25 26
 	}
@@ -50,8 +51,9 @@  discard block
 block discarded – undo
50 51
 	 * @return mixed
51 52
 	 */
52 53
 	public function getLabel(){
53
-		if(\array_key_exists("label", $this->content))
54
-			return $this->content["label"];
54
+		if(\array_key_exists("label", $this->content)) {
55
+					return $this->content["label"];
56
+		}
55 57
 	}
56 58
 
57 59
 	/**
Please login to merge, or discard this patch.
Ajax/semantic/widgets/base/FieldAsTrait.php 1 patch
Braces   +12 added lines, -10 removed lines patch added patch discarded remove patch
@@ -62,8 +62,7 @@  discard block
 block discarded – undo
62 62
 			$rules=$attributes["rules"];
63 63
 			if(\is_array($rules)){
64 64
 				$element->addRules($rules);
65
-			}
66
-			else{
65
+			} else{
67 66
 				$element->addRule($rules);
68 67
 			}
69 68
 			unset($attributes["rules"]);
@@ -123,8 +122,9 @@  discard block
 block discarded – undo
123 122
 	public function fieldAsHeader($index,$niveau=1,$icon=NULL,$attributes=NULL){
124 123
 		return $this->_fieldAs(function($id,$name,$value) use($niveau,$icon){
125 124
 			$header=new HtmlHeader($id,$niveau,$value);
126
-			if(isset($icon))
127
-				$header->asIcon($icon, $value);
125
+			if(isset($icon)) {
126
+							$header->asIcon($icon, $value);
127
+			}
128 128
 			return $header;
129 129
 		}, $index,$attributes,"header");
130 130
 	}
@@ -132,7 +132,9 @@  discard block
 block discarded – undo
132 132
 
133 133
 	public function fieldAsImage($index,$size=Size::MINI,$circular=false){
134 134
 		$this->setValueFunction($index,function($img) use($size,$circular){
135
-			$image=new HtmlImage($this->_getFieldIdentifier("image"),$img);$image->setSize($size);if($circular)$image->setCircular();
135
+			$image=new HtmlImage($this->_getFieldIdentifier("image"),$img);$image->setSize($size);if($circular) {
136
+				$image->setCircular();
137
+			}
136 138
 			return $image;
137 139
 		});
138 140
 			return $this;
@@ -221,14 +223,14 @@  discard block
 block discarded – undo
221 223
 		$i=0;
222 224
 		if(JArray::isAssociative($types)){
223 225
 			foreach ($types as $type=>$attributes){
224
-				if(\is_int($type))
225
-					$this->fieldAs($i++,$attributes,[]);
226
-				else{
226
+				if(\is_int($type)) {
227
+									$this->fieldAs($i++,$attributes,[]);
228
+				} else{
227 229
 					$type=preg_replace('/\d/', '', $type );
228 230
 					$this->fieldAs($i++,$type,$attributes);
229 231
 				}
230 232
 			}
231
-		}else{
233
+		} else{
232 234
 			foreach ($types as $type){
233 235
 				$this->fieldAs($i++,$type);
234 236
 			}
@@ -240,7 +242,7 @@  discard block
 block discarded – undo
240 242
 		if(\method_exists($this, $method)){
241 243
 			if(!\is_array($attributes)){
242 244
 				$attributes=[$index];
243
-			}else{
245
+			} else{
244 246
 				\array_unshift($attributes, $index);
245 247
 			}
246 248
 			\call_user_func_array([$this,$method], $attributes);
Please login to merge, or discard this patch.
Ajax/semantic/widgets/dataform/DataForm.php 1 patch
Braces   +8 added lines, -6 removed lines patch added patch discarded remove patch
@@ -59,24 +59,26 @@
 block discarded – undo
59 59
 			foreach ($values as $v){
60 60
 				$form->addField($v);
61 61
 			}
62
-		}else{
62
+		} else{
63 63
 			$separators[]=$count;
64 64
 			for($i=0;$i<$size;$i++){
65 65
 				$wrapper=null;
66 66
 				$fields=\array_slice($values, $separators[$i]+1,$separators[$i+1]-$separators[$i]);
67
-				if(isset($headers[$separators[$i]+1]))
68
-					$form->addHeader($headers[$separators[$i]+1],4,true);
67
+				if(isset($headers[$separators[$i]+1])) {
68
+									$form->addHeader($headers[$separators[$i]+1],4,true);
69
+				}
69 70
 				if(isset($wrappers[$separators[$i]+1])){
70 71
 					$wrapper=$wrappers[$separators[$i]+1];
71 72
 				}
72 73
 				//TODO check why $fields is empty
73 74
 				if(\sizeof($fields)===1){
74 75
 					$added=$form->addField($fields[0]);
75
-				}elseif(\sizeof($fields)>1){
76
+				} elseif(\sizeof($fields)>1){
76 77
 					$added=$form->addFields($fields);
77 78
 				}
78
-				if(isset($wrapper))
79
-					$added->wrap($wrapper[0],$wrapper[1]);
79
+				if(isset($wrapper)) {
80
+									$added->wrap($wrapper[0],$wrapper[1]);
81
+				}
80 82
 			}
81 83
 		}
82 84
 	}
Please login to merge, or discard this patch.
Ajax/semantic/html/collections/form/HtmlFormInput.php 1 patch
Braces   +6 added lines, -4 removed lines patch added patch discarded remove patch
@@ -9,8 +9,9 @@  discard block
 block discarded – undo
9 9
 	use TextFieldsTrait;
10 10
 
11 11
 	public function __construct($identifier, $label=NULL,$type="text",$value=NULL,$placeholder=NULL) {
12
-		if(!isset($placeholder) && $type==="text")
13
-			$placeholder=$label;
12
+		if(!isset($placeholder) && $type==="text") {
13
+					$placeholder=$label;
14
+		}
14 15
 		parent::__construct("field-".$identifier, new HtmlInput($identifier,$type,$value,$placeholder), $label);
15 16
 		$this->_identifier=$identifier;
16 17
 	}
@@ -18,8 +19,9 @@  discard block
 block discarded – undo
18 19
 	public function getDataField(){
19 20
 		$field= $this->getField();
20 21
 		//TODO check getField
21
-		if($field instanceof HtmlInput)
22
-			$field=$field->getDataField();
22
+		if($field instanceof HtmlInput) {
23
+					$field=$field->getDataField();
24
+		}
23 25
 		return $field;
24 26
 	}
25 27
 }
26 28
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/semantic/html/collections/form/HtmlFormTextarea.php 1 patch
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -10,8 +10,9 @@
 block discarded – undo
10 10
 	use TextFieldsTrait;
11 11
 
12 12
 	public function __construct($identifier, $label=NULL,$value=NULL,$placeholder=NULL,$rows=NULL) {
13
-		if(!isset($placeholder))
14
-			$placeholder=$label;
13
+		if(!isset($placeholder)) {
14
+					$placeholder=$label;
15
+		}
15 16
 		parent::__construct("field-".$identifier, new HtmlTextarea($identifier,$value,$placeholder,$rows), $label);
16 17
 		$this->_identifier=$identifier;
17 18
 	}
Please login to merge, or discard this patch.
Ajax/semantic/html/base/traits/BaseTrait.php 1 patch
Braces   +27 added lines, -18 removed lines patch added patch discarded remove patch
@@ -47,8 +47,9 @@  discard block
 block discarded – undo
47 47
 
48 48
 	public function setVariations($variations) {
49 49
 		$this->setProperty("class", $this->_baseClass);
50
-		if (\is_string($variations))
51
-			$variations=\explode(" ", $variations);
50
+		if (\is_string($variations)) {
51
+					$variations=\explode(" ", $variations);
52
+		}
52 53
 		foreach ( $variations as $variation ) {
53 54
 			$this->addVariation($variation);
54 55
 		}
@@ -61,8 +62,9 @@  discard block
 block discarded – undo
61 62
 	}
62 63
 
63 64
 	public function addVariations($variations=array()) {
64
-		if (\is_string($variations))
65
-			$variations=\explode(" ", $variations);
65
+		if (\is_string($variations)) {
66
+					$variations=\explode(" ", $variations);
67
+		}
66 68
 		foreach ( $variations as $variation ) {
67 69
 			$this->addVariation($variation);
68 70
 		}
@@ -70,8 +72,9 @@  discard block
 block discarded – undo
70 72
 	}
71 73
 
72 74
 	public function addStates($states=array()) {
73
-		if (\is_string($states))
74
-			$states=\explode(" ", $states);
75
+		if (\is_string($states)) {
76
+					$states=\explode(" ", $states);
77
+		}
75 78
 		foreach ( $states as $state ) {
76 79
 			$this->addState($state);
77 80
 		}
@@ -80,8 +83,9 @@  discard block
 block discarded – undo
80 83
 
81 84
 	public function setStates($states) {
82 85
 		$this->setProperty("class", $this->_baseClass);
83
-		if (\is_string($states))
84
-			$states=\explode(" ", $states);
86
+		if (\is_string($states)) {
87
+					$states=\explode(" ", $states);
88
+		}
85 89
 		foreach ( $states as $state ) {
86 90
 			$this->addState($state);
87 91
 		}
@@ -113,8 +117,9 @@  discard block
 block discarded – undo
113 117
 	 * @return HtmlSemDoubleElement
114 118
 	 */
115 119
 	public function setDisabled($disable=true) {
116
-		if($disable)
117
-			$this->addToProperty("class", "disabled");
120
+		if($disable) {
121
+					$this->addToProperty("class", "disabled");
122
+		}
118 123
 		return $this;
119 124
 	}
120 125
 
@@ -148,14 +153,16 @@  discard block
 block discarded – undo
148 153
 	 * @return HtmlSemDoubleElement
149 154
 	 */
150 155
 	public function setActive($value=true){
151
-		if($value)
152
-			$this->addToProperty("class", "active");
156
+		if($value) {
157
+					$this->addToProperty("class", "active");
158
+		}
153 159
 		return $this;
154 160
 	}
155 161
 
156 162
 	public function setAttached($value=true){
157
-		if($value)
158
-			$this->addToPropertyCtrl("class", "attached", array ("attached" ));
163
+		if($value) {
164
+					$this->addToPropertyCtrl("class", "attached", array ("attached" ));
165
+		}
159 166
 		return $this;
160 167
 	}
161 168
 
@@ -191,10 +198,12 @@  discard block
 block discarded – undo
191 198
 			if(isset($array[$key])){
192 199
 				$p=JString::replaceAtFirstAndLast($array[$key], $before, "", $after, "");
193 200
 				$array[$key]=$before.$p.$value.$after;
194
-			}else
195
-				$array[$key]=$before.$value.$after;
196
-		}else
197
-			$array[$key]=$value;
201
+			} else {
202
+							$array[$key]=$before.$value.$after;
203
+			}
204
+		} else {
205
+					$array[$key]=$value;
206
+		}
198 207
 		return $this;
199 208
 	}
200 209
 }
201 210
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/common/traits/JqueryAjaxTrait.php 1 patch
Braces   +32 added lines, -24 removed lines patch added patch discarded remove patch
@@ -48,8 +48,9 @@  discard block
 block discarded – undo
48 48
 		}
49 49
 		$retour.="$.".$method."(url,".$params.").done(function( data ) {\n";
50 50
 		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone,$ajaxTransition,$jsCallback)."});\n";
51
-		if ($immediatly)
52
-			$this->jquery_code_for_compile[]=$retour;
51
+		if ($immediatly) {
52
+					$this->jquery_code_for_compile[]=$retour;
53
+		}
53 54
 		return $retour;
54 55
 	}
55 56
 
@@ -67,15 +68,17 @@  discard block
 block discarded – undo
67 68
 		$url=$this->_correctAjaxUrl($url);
68 69
 		$retour="url='".$url."';";
69 70
 		$slash="/";
70
-		if(JString::endswith($url, "/")===true)
71
-			$slash="";
71
+		if(JString::endswith($url, "/")===true) {
72
+					$slash="";
73
+		}
72 74
 		if(JString::isNotNull($attr)){
73
-			if ($attr==="value")
74
-				$retour.="url=url+'".$slash."'+$(this).val();\n";
75
-			elseif ($attr==="html")
76
-			$retour.="url=url+'".$slash."'+$(this).html();\n";
77
-			elseif($attr!=null && $attr!=="")
78
-					$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
75
+			if ($attr==="value") {
76
+							$retour.="url=url+'".$slash."'+$(this).val();\n";
77
+			} elseif ($attr==="html") {
78
+						$retour.="url=url+'".$slash."'+$(this).html();\n";
79
+			} elseif($attr!=null && $attr!=="") {
80
+								$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
81
+			}
79 82
 		}
80 83
 		return $retour;
81 84
 	}
@@ -85,13 +88,14 @@  discard block
 block discarded – undo
85 88
 		if ($responseElement!=="") {
86 89
 			if(isset($ajaxTransition)){
87 90
 				$call=$this->setAjaxDataCall($ajaxTransition);
88
-			}elseif(isset($this->ajaxTransition)){
91
+			} elseif(isset($this->ajaxTransition)){
89 92
 				$call=$this->ajaxTransition;
90 93
 			}
91
-			if(\is_callable($call))
92
-				$retour="\t".$call($responseElement,$jqueryDone).";\n";
93
-			else
94
-				$retour="\t$({$responseElement}).{$jqueryDone}( data );\n";
94
+			if(\is_callable($call)) {
95
+							$retour="\t".$call($responseElement,$jqueryDone).";\n";
96
+			} else {
97
+							$retour="\t$({$responseElement}).{$jqueryDone}( data );\n";
98
+			}
95 99
 		}
96 100
 		$retour.="\t".$jsCallback."\n";
97 101
 		return $retour;
@@ -105,8 +109,9 @@  discard block
 block discarded – undo
105 109
 	}
106 110
 
107 111
 	protected function _correctAjaxUrl($url) {
108
-		if ($url!=="/" && JString::endsWith($url, "/")===true)
109
-			$url=substr($url, 0, strlen($url)-1);
112
+		if ($url!=="/" && JString::endsWith($url, "/")===true) {
113
+					$url=substr($url, 0, strlen($url)-1);
114
+		}
110 115
 		if (strncmp($url, 'http://', 7)!=0&&strncmp($url, 'https://', 8)!=0) {
111 116
 			$url=$this->jsUtils->getUrl($url);
112 117
 		}
@@ -130,8 +135,9 @@  discard block
 block discarded – undo
130 135
 				$retour.="\t".$jsCallback."\n".
131 136
 						"\t$(document).trigger('jsonReady',[data]);\n".
132 137
 						"});\n";
133
-				if ($immediatly)
134
-					$this->jquery_code_for_compile[]=$retour;
138
+				if ($immediatly) {
139
+									$this->jquery_code_for_compile[]=$retour;
140
+				}
135 141
 					return $retour;
136 142
 	}
137 143
 
@@ -170,7 +176,7 @@  discard block
 block discarded – undo
170 176
 		if($context===null){
171 177
 			$parent="$('".$maskSelector."').parent()";
172 178
 			$newElm = "$('#'+newId)";
173
-		}else{
179
+		} else{
174 180
 			$parent=$context;
175 181
 			$newElm = $context.".find('#'+newId)";
176 182
 		}
@@ -183,8 +189,9 @@  discard block
 block discarded – undo
183 189
 		$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";
184 190
 		$retour.="\t$(document).trigger('jsonReady',[data]);\n";
185 191
 		$retour.="\t".$jsCallback."\n"."});\n";
186
-		if ($immediatly)
187
-			$this->jquery_code_for_compile[]=$retour;
192
+		if ($immediatly) {
193
+					$this->jquery_code_for_compile[]=$retour;
194
+		}
188 195
 			return $retour;
189 196
 	}
190 197
 	/**
@@ -225,8 +232,9 @@  discard block
 block discarded – undo
225 232
 			}});\n";
226 233
 			$retour.="$('#".$form."').submit();\n";
227 234
 		}
228
-		if ($immediatly)
229
-			$this->jquery_code_for_compile[]=$retour;
235
+		if ($immediatly) {
236
+					$this->jquery_code_for_compile[]=$retour;
237
+		}
230 238
 			return $retour;
231 239
 	}
232 240
 
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
 		$result="";
20 21
 		$params="{}";
21 22
 		$jsCallback=NULL;
Please login to merge, or discard this patch.