Completed
Push — master ( b8f75a...ada6c9 )
by Jean-Christophe
07:43 queued 01:22
created
Ajax/semantic/traits/SemanticHtmlCollectionsTrait.php 1 patch
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -31,8 +31,9 @@
 block discarded – undo
31 31
 	 */
32 32
 	public function htmlMessage($identifier, $content="",$styles=NULL) {
33 33
 		$msg= $this->addHtmlComponent(new HtmlMessage($identifier, $content));
34
-		if(isset($msg))
35
-			$msg->setStyle($styles);
34
+		if(isset($msg)) {
35
+					$msg->setStyle($styles);
36
+		}
36 37
 		return $msg;
37 38
 	}
38 39
 
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
@@ -43,15 +43,16 @@
 block discarded – undo
43 43
 	}
44 44
 
45 45
 	public function addRule($type,$prompt=NULL,$value=NULL){
46
-		if($type instanceof  Rule)
47
-			$this->rules[]=$type;
48
-		else if(\is_array($type)){
46
+		if($type instanceof  Rule) {
47
+					$this->rules[]=$type;
48
+		} else if(\is_array($type)){
49 49
 			$value=JArray::getValue($type, "value", 2);
50 50
 			$prompt=JArray::getValue($type, "prompt", 1);
51 51
 			$type=JArray::getValue($type, "type", 0);
52 52
 			$this->rules[]=new Rule($type,$prompt,$value);
53
-		}else
54
-			$this->rules[]=new Rule($type,$prompt,$value);
53
+		} else {
54
+					$this->rules[]=new Rule($type,$prompt,$value);
55
+		}
55 56
 	}
56 57
 
57 58
 	public function jsonSerialize(){
Please login to merge, or discard this patch.
Ajax/semantic/components/validation/Rule.php 1 patch
Braces   +9 added lines, -6 removed lines patch added patch discarded remove patch
@@ -55,10 +55,12 @@  discard block
 block discarded – undo
55 55
 
56 56
 	public function jsonSerialize() {
57 57
 		$result= ["type"=>$this->type];
58
-		if(isset($this->prompt))
59
-			$result["prompt"]=$this->prompt;
60
-		if(isset($this->value))
61
-			$result["value"]=$this->value;
58
+		if(isset($this->prompt)) {
59
+					$result["prompt"]=$this->prompt;
60
+		}
61
+		if(isset($this->value)) {
62
+					$result["value"]=$this->value;
63
+		}
62 64
 		return $result;
63 65
 	}
64 66
 
@@ -90,8 +92,9 @@  discard block
 block discarded – undo
90 92
 	 * @return \Ajax\semantic\components\validation\Rule
91 93
 	 */
92 94
 	public static function integer($min=NULL,$max=NULL,$prompt=NULL){
93
-		if(\is_int($min) && \is_int($max))
94
-			return new Rule("integer[{$min}..{$max}]",$prompt);
95
+		if(\is_int($min) && \is_int($max)) {
96
+					return new Rule("integer[{$min}..{$max}]",$prompt);
97
+		}
95 98
 		return new Rule("integer",$prompt);
96 99
 	}
97 100
 
Please login to merge, or discard this patch.
Ajax/semantic/html/collections/form/traits/FieldsTrait.php 1 patch
Braces   +4 added lines, -3 removed lines patch added patch discarded remove patch
@@ -18,11 +18,12 @@
 block discarded – undo
18 18
 		if(\is_array($value)){
19 19
 			$itemO=new HtmlFormInput(JArray::getDefaultValue($value, "id",""),JArray::getDefaultValue($value, "label",null),JArray::getDefaultValue($value, "type", "text"),JArray::getDefaultValue($value, "value",""),JArray::getDefaultValue($value, "placeholder",JArray::getDefaultValue($value, "label",null)));
20 20
 			return $itemO;
21
-		}elseif(\is_object($value)){
21
+		} elseif(\is_object($value)){
22 22
 			$itemO=new HtmlFormField("field-".$this->identifier, $value);
23 23
 			return $itemO;
24
-		}else
25
-			return new HtmlFormInput($value);
24
+		} else {
25
+					return new HtmlFormInput($value);
26
+		}
26 27
 	}
27 28
 
28 29
 	protected function createCondition($value){
Please login to merge, or discard this patch.
Ajax/semantic/html/modules/checkbox/AbstractCheckbox.php 1 patch
Braces   +7 added lines, -5 removed lines patch added patch discarded remove patch
@@ -13,14 +13,15 @@  discard block
 block discarded – undo
13 13
 		$field=new \Ajax\common\html\html5\HtmlInput($identifier, $inputType, $value);
14 14
 		$field->setProperty("name", $name);
15 15
 		$this->setField($field);
16
-		if (isset($label))
17
-			$this->setLabel($label);
16
+		if (isset($label)) {
17
+					$this->setLabel($label);
18
+		}
18 19
 	}
19 20
 
20 21
 	public function setChecked($value=true){
21 22
 		if($value===true){
22 23
 			$this->getField()->setProperty("checked", "checked");
23
-		}else{
24
+		} else{
24 25
 			$this->getField()->removeProperty("checked");
25 26
 		}
26 27
 		return $this;
@@ -49,8 +50,9 @@  discard block
 block discarded – undo
49 50
 	 * @return mixed
50 51
 	 */
51 52
 	public function getLabel() {
52
-		if (\array_key_exists("label", $this->content))
53
-			return $this->content["label"];
53
+		if (\array_key_exists("label", $this->content)) {
54
+					return $this->content["label"];
55
+		}
54 56
 	}
55 57
 
56 58
 	/**
Please login to merge, or discard this patch.
Ajax/semantic/html/elements/HtmlButton.php 1 patch
Braces   +6 added lines, -5 removed lines patch added patch discarded remove patch
@@ -55,9 +55,9 @@  discard block
 block discarded – undo
55 55
 	}
56 56
 
57 57
 	public function setFocusable($value=true) {
58
-		if ($value === true)
59
-			$this->setProperty("tabindex", "0");
60
-		else {
58
+		if ($value === true) {
59
+					$this->setProperty("tabindex", "0");
60
+		} else {
61 61
 			$this->removeProperty("tabindex");
62 62
 		}
63 63
 		return $this;
@@ -175,8 +175,9 @@  discard block
 block discarded – undo
175 175
 	}
176 176
 
177 177
 	public static function social($identifier, $social, $value=NULL) {
178
-		if ($value === NULL)
179
-			$value=\ucfirst($social);
178
+		if ($value === NULL) {
179
+					$value=\ucfirst($social);
180
+		}
180 181
 		$return=new HtmlButton($identifier, $value);
181 182
 		$return->addIcon($social);
182 183
 		return $return->addToPropertyCtrl("class", $social, Social::getConstants());
Please login to merge, or discard this patch.
Ajax/common/traits/JqueryAjaxTrait.php 1 patch
Braces   +27 added lines, -20 removed lines patch added patch discarded remove patch
@@ -46,8 +46,9 @@  discard block
 block discarded – undo
46 46
 		}
47 47
 		$retour.="$.".$method."(url,".$params.").done(function( data ) {\n";
48 48
 		$retour.=$this->_getOnAjaxDone($responseElement, $jsCallback)."});\n";
49
-		if ($immediatly)
50
-			$this->jquery_code_for_compile[]=$retour;
49
+		if ($immediatly) {
50
+					$this->jquery_code_for_compile[]=$retour;
51
+		}
51 52
 			return $retour;
52 53
 	}
53 54
 
@@ -55,15 +56,17 @@  discard block
 block discarded – undo
55 56
 		$url=$this->_correctAjaxUrl($url);
56 57
 		$retour="url='".$url."';\n";
57 58
 		$slash="/";
58
-		if(JString::endswith($url, "/")===true)
59
-			$slash="";
59
+		if(JString::endswith($url, "/")===true) {
60
+					$slash="";
61
+		}
60 62
 		if(JString::isNotNull($attr)){
61
-			if ($attr==="value")
62
-				$retour.="url=url+'".$slash."'+$(this).val();\n";
63
-			elseif ($attr==="html")
64
-			$retour.="url=url+'".$slash."'+$(this).html();\n";
65
-			elseif($attr!=null && $attr!=="")
66
-					$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
63
+			if ($attr==="value") {
64
+							$retour.="url=url+'".$slash."'+$(this).val();\n";
65
+			} elseif ($attr==="html") {
66
+						$retour.="url=url+'".$slash."'+$(this).html();\n";
67
+			} elseif($attr!=null && $attr!=="") {
68
+								$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
69
+			}
67 70
 		}
68 71
 		return $retour;
69 72
 	}
@@ -74,7 +77,7 @@  discard block
 block discarded – undo
74 77
 			if(JString::startswith($responseElement, "\"-")===true){
75 78
 				$responseElement=\str_replace("\"-", "\"", $responseElement);
76 79
 				$retour="\t$({$responseElement}).replaceWith( data );\n";
77
-			}else{
80
+			} else{
78 81
 				$retour="\t$({$responseElement}).html( data );\n";
79 82
 			}
80 83
 		}
@@ -90,8 +93,9 @@  discard block
 block discarded – undo
90 93
 	}
91 94
 
92 95
 	protected function _correctAjaxUrl($url) {
93
-		if ($url!=="/" && JString::endsWith($url, "/")===true)
94
-			$url=substr($url, 0, strlen($url)-1);
96
+		if ($url!=="/" && JString::endsWith($url, "/")===true) {
97
+					$url=substr($url, 0, strlen($url)-1);
98
+		}
95 99
 		if (strncmp($url, 'http://', 7)!=0&&strncmp($url, 'https://', 8)!=0) {
96 100
 			$url=$this->jsUtils->getUrl($url);
97 101
 		}
@@ -115,8 +119,9 @@  discard block
 block discarded – undo
115 119
 				$retour.="\t".$jsCallback."\n".
116 120
 						"\t$(document).trigger('jsonReady',[data]);\n".
117 121
 						"});\n";
118
-				if ($immediatly)
119
-					$this->jquery_code_for_compile[]=$retour;
122
+				if ($immediatly) {
123
+									$this->jquery_code_for_compile[]=$retour;
124
+				}
120 125
 					return $retour;
121 126
 	}
122 127
 
@@ -155,7 +160,7 @@  discard block
 block discarded – undo
155 160
 		if($context===null){
156 161
 			$appendTo="\t\tnewElm.appendTo($('".$maskSelector."').parent());\n";
157 162
 			$newElm = "$('#'+newId)";
158
-		}else{
163
+		} else{
159 164
 			$appendTo="\t\tnewElm.appendTo(".$context.");\n";
160 165
 			$newElm = $context.".find('#'+newId)";
161 166
 		}
@@ -165,8 +170,9 @@  discard block
 block discarded – undo
165 170
 		$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";
166 171
 		$retour.="\t$(document).trigger('jsonReady',[data]);\n";
167 172
 		$retour.="\t".$jsCallback."\n"."});\n";
168
-		if ($immediatly)
169
-			$this->jquery_code_for_compile[]=$retour;
173
+		if ($immediatly) {
174
+					$this->jquery_code_for_compile[]=$retour;
175
+		}
170 176
 			return $retour;
171 177
 	}
172 178
 	/**
@@ -207,8 +213,9 @@  discard block
 block discarded – undo
207 213
 			}});\n";
208 214
 			$retour.="$('#".$form."').submit();\n";
209 215
 		}
210
-		if ($immediatly)
211
-			$this->jquery_code_for_compile[]=$retour;
216
+		if ($immediatly) {
217
+					$this->jquery_code_for_compile[]=$retour;
218
+		}
212 219
 			return $retour;
213 220
 	}
214 221
 
Please login to merge, or discard this patch.
Ajax/semantic/html/collections/menus/HtmlMenu.php 1 patch
Braces   +19 added lines, -15 removed lines patch added patch discarded remove patch
@@ -58,9 +58,9 @@  discard block
 block discarded – undo
58 58
 	}
59 59
 
60 60
 	private function afterInsert($item) {
61
-		if (!$item instanceof HtmlMenu && $item->propertyContains("class", "header")===false)
62
-			$item->addToPropertyCtrl("class", "item", array ("item" ));
63
-		else {
61
+		if (!$item instanceof HtmlMenu && $item->propertyContains("class", "header")===false) {
62
+					$item->addToPropertyCtrl("class", "item", array ("item" ));
63
+		} else {
64 64
 			$this->setSecondary();
65 65
 		}
66 66
 		return $item;
@@ -75,8 +75,9 @@  discard block
 block discarded – undo
75 75
 	public function addItem($item) {
76 76
 		$number=$item;
77 77
 		$item=parent::addItem($this->getItemToInsert($item));
78
-		if(\is_int($number))
79
-			$item->setProperty("data-page", $number);
78
+		if(\is_int($number)) {
79
+					$item->setProperty("data-page", $number);
80
+		}
80 81
 		return $this->afterInsert($item);
81 82
 	}
82 83
 
@@ -149,10 +150,11 @@  discard block
 block discarded – undo
149 150
 	}
150 151
 
151 152
 	public function setSecondary($value=true) {
152
-		if($value)
153
-			$this->addToProperty("class", "secondary");
154
-		else
155
-			$this->removePropertyValue("class", "secondary");
153
+		if($value) {
154
+					$this->addToProperty("class", "secondary");
155
+		} else {
156
+					$this->removePropertyValue("class", "secondary");
157
+		}
156 158
 		return $this;
157 159
 	}
158 160
 
@@ -172,8 +174,9 @@  discard block
 block discarded – undo
172 174
 		$this->apply(function (HtmlDoubleElement &$item) {
173 175
 			$item->setTagName("a");
174 176
 		});
175
-		if ($vertical === true)
176
-			$this->setVertical();
177
+		if ($vertical === true) {
178
+					$this->setVertical();
179
+		}
177 180
 		return $this->addToProperty("class", "tabular");
178 181
 	}
179 182
 
@@ -202,10 +205,11 @@  discard block
 block discarded – undo
202 205
 	 */
203 206
 	public function fromDatabaseObject($object, $function) {
204 207
 		$return=$function($object);
205
-		if (\is_array($return))
206
-			$this->addItems($return);
207
-		else
208
-			$this->addItem($return);
208
+		if (\is_array($return)) {
209
+					$this->addItems($return);
210
+		} else {
211
+					$this->addItem($return);
212
+		}
209 213
 	}
210 214
 
211 215
 	/**
Please login to merge, or discard this patch.
Ajax/semantic/html/base/traits/MenuItemTrait.php 1 patch
Braces   +14 added lines, -10 removed lines patch added patch discarded remove patch
@@ -11,14 +11,15 @@  discard block
 block discarded – undo
11 11
 	public function setContent($content){
12 12
 		if($content==="-"){
13 13
 			$this->asDivider();
14
-		}elseif($content==="-search-"){
14
+		} elseif($content==="-search-"){
15 15
 			$values=\explode(",",$content,-1);
16 16
 			$this->asSearchInput(JArray::getDefaultValue($values, 0, "Search..."),JArray::getDefaultValue($values, 1, "search"));
17
-		}elseif(JString::startswith($content, "-")){
17
+		} elseif(JString::startswith($content, "-")){
18 18
 			$content=\ltrim($content,"-");
19 19
 			$this->asHeader($content);
20
-		}else
21
-			parent::setContent($content);
20
+		} else {
21
+					parent::setContent($content);
22
+		}
22 23
 		return $this;
23 24
 	}
24 25
 
@@ -30,11 +31,13 @@  discard block
 block discarded – undo
30 31
 	public function asSearchInput($placeholder=NULL,$icon=NULL){
31 32
 		$this->setClass("ui icon search input");
32 33
 		$input=new HtmlInput("search-".$this->identifier);
33
-		if(isset($placeholder))
34
-			$input->setProperty("placeholder", $placeholder);
34
+		if(isset($placeholder)) {
35
+					$input->setProperty("placeholder", $placeholder);
36
+		}
35 37
 			$this->content=$input;
36
-			if(isset($icon))
37
-				$this->addIcon($icon);
38
+			if(isset($icon)) {
39
+							$this->addIcon($icon);
40
+			}
38 41
 				return $this;
39 42
 	}
40 43
 
@@ -57,8 +60,9 @@  discard block
 block discarded – undo
57 60
 		$this->setClass("header");
58 61
 		$this->tagName="div";
59 62
 		$this->content=$caption;
60
-		if(isset($icon))
61
-			$this->addIcon($icon,Direction::LEFT);
63
+		if(isset($icon)) {
64
+					$this->addIcon($icon,Direction::LEFT);
65
+		}
62 66
 			return $this;
63 67
 	}
64 68
 
Please login to merge, or discard this patch.