Completed
Push — master ( 24138a...0b3773 )
by Jean-Christophe
05:10
created
Ajax/semantic/html/elements/HtmlList.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -18,17 +18,17 @@  discard block
 block discarded – undo
18 18
 
19 19
 	protected function createItem($value) {
20 20
 		$count=$this->count();
21
-		$item=new HtmlListItem("item-" . $this->identifier . "-" . $count, $value);
21
+		$item=new HtmlListItem("item-".$this->identifier."-".$count, $value);
22 22
 		return $item;
23 23
 	}
24 24
 
25 25
 	public function addHeader($niveau, $content) {
26
-		$header=new HtmlHeader("header-" . $this->identifier, $niveau, $content, "page");
26
+		$header=new HtmlHeader("header-".$this->identifier, $niveau, $content, "page");
27 27
 		$this->wrap($header);
28 28
 		return $header;
29 29
 	}
30 30
 
31
-	public function getItemPart($index,$partName="header"){
31
+	public function getItemPart($index, $partName="header") {
32 32
 		return $this->getItem($index)->getPart($partName);
33 33
 	}
34 34
 
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
 	}
38 38
 
39 39
 	public function asLink() {
40
-		$this->addToPropertyCtrl("class", "link", array ("link" ));
40
+		$this->addToPropertyCtrl("class", "link", array("link"));
41 41
 		return $this->contentAs("a");
42 42
 	}
43 43
 
@@ -60,9 +60,9 @@  discard block
 block discarded – undo
60 60
 	}
61 61
 
62 62
 	public function run(JsUtils $js) {
63
-		if ($this->_hasCheckedList === true) {
64
-			$jsCode=include dirname(__FILE__) . '/../../components/jsTemplates/tplCheckedList.php';
65
-			$jsCode=\str_replace("%identifier%", "#" . $this->identifier, $jsCode);
63
+		if ($this->_hasCheckedList===true) {
64
+			$jsCode=include dirname(__FILE__).'/../../components/jsTemplates/tplCheckedList.php';
65
+			$jsCode=\str_replace("%identifier%", "#".$this->identifier, $jsCode);
66 66
 			$this->executeOnRun($jsCode);
67 67
 		}
68 68
 		return parent::run($js);
@@ -86,24 +86,24 @@  discard block
 block discarded – undo
86 86
 
87 87
 	public function addCheckedList($items=array(), $masterItem=NULL, $values=array()) {
88 88
 		$count=$this->count();
89
-		$identifier=$this->identifier . "-" . $count;
89
+		$identifier=$this->identifier."-".$count;
90 90
 		if (isset($masterItem)) {
91
-			$masterO=new HtmlFormCheckbox("master-" . $identifier, $masterItem);
91
+			$masterO=new HtmlFormCheckbox("master-".$identifier, $masterItem);
92 92
 			$masterO->getHtmlCk()->addToProperty("class", "master");
93 93
 			$masterO->setClass("item");
94 94
 			$this->addItem($masterO);
95 95
 		}
96
-		$fields=array ();
96
+		$fields=array();
97 97
 		$i=0;
98
-		foreach ( $items as $val => $caption ) {
99
-			$itemO=new HtmlFormCheckbox($identifier . "-" . $i++, $caption, $val, "child");
100
-			if (\array_search($val, $values) !== false) {
98
+		foreach ($items as $val => $caption) {
99
+			$itemO=new HtmlFormCheckbox($identifier."-".$i++, $caption, $val, "child");
100
+			if (\array_search($val, $values)!==false) {
101 101
 				$itemO->getField()->setProperty("checked", "");
102 102
 			}
103 103
 			$itemO->setClass("item");
104 104
 			$fields[]=$itemO;
105 105
 		}
106
-		if (isset($masterO) === true) {
106
+		if (isset($masterO)===true) {
107 107
 			$list=new HtmlList("", $fields);
108 108
 			$list->setClass("list");
109 109
 			$masterO->addContent($list);
Please login to merge, or discard this patch.
Ajax/Semantic.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -11,8 +11,8 @@  discard block
 block discarded – undo
11 11
 use Ajax\semantic\traits\SemanticWidgetsTrait;
12 12
 
13 13
 class Semantic extends BaseGui {
14
-	use SemanticComponentsTrait,SemanticHtmlElementsTrait,SemanticHtmlCollectionsTrait,
15
-	SemanticHtmlModulesTrait,SemanticHtmlViewsTrait,SemanticWidgetsTrait;
14
+	use SemanticComponentsTrait, SemanticHtmlElementsTrait, SemanticHtmlCollectionsTrait,
15
+	SemanticHtmlModulesTrait, SemanticHtmlViewsTrait, SemanticWidgetsTrait;
16 16
 
17 17
 	private $language;
18 18
 
@@ -21,12 +21,12 @@  discard block
 block discarded – undo
21 21
 	}
22 22
 
23 23
 
24
-	public function setLanguage($language){
25
-		if($language!==$this->language){
24
+	public function setLanguage($language) {
25
+		if ($language!==$this->language) {
26 26
 			$file=\realpath(dirname(__FILE__)."/semantic/components/validation/languages/".$language.".js");
27
-			if(\file_exists($file)){
27
+			if (\file_exists($file)) {
28 28
 				$script=\file_get_contents($file);
29
-				$this->js->exec($script,true);
29
+				$this->js->exec($script, true);
30 30
 				$this->language=$language;
31 31
 			}
32 32
 		}
Please login to merge, or discard this patch.
Ajax/service/JArray.php 1 patch
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -5,7 +5,7 @@  discard block
 block discarded – undo
5 5
 class JArray {
6 6
 
7 7
 	public static function isAssociative($array) {
8
-		return (array_values($array) !== $array);
8
+		return (array_values($array)!==$array);
9 9
 		// return (array_keys($array)!==range(0, count($array)-1));
10 10
 	}
11 11
 
@@ -14,7 +14,7 @@  discard block
 block discarded – undo
14 14
 			return $array[$key];
15 15
 		}
16 16
 		$values=array_values($array);
17
-		if ($pos < sizeof($values))
17
+		if ($pos<sizeof($values))
18 18
 			return $values[$pos];
19 19
 	}
20 20
 
@@ -22,12 +22,12 @@  discard block
 block discarded – undo
22 22
 		$result=NULL;
23 23
 		if (array_key_exists($key, $array)) {
24 24
 			$result=$array[$key];
25
-			if ($condition($result) === true)
25
+			if ($condition($result)===true)
26 26
 				return $result;
27 27
 		}
28 28
 		$values=array_values($array);
29
-		foreach ( $values as $val ) {
30
-			if ($condition($val) === true)
29
+		foreach ($values as $val) {
30
+			if ($condition($val)===true)
31 31
 				return $val;
32 32
 		}
33 33
 		return $result;
@@ -44,11 +44,11 @@  discard block
 block discarded – undo
44 44
 		$result="";
45 45
 		if (\is_array($glue)) {
46 46
 			$size=\sizeof($pieces);
47
-			if ($size > 0) {
48
-				for($i=0; $i < $size - 1; $i++) {
49
-					$result.=$pieces[$i] . @$glue[$i];
47
+			if ($size>0) {
48
+				for ($i=0; $i<$size-1; $i++) {
49
+					$result.=$pieces[$i].@$glue[$i];
50 50
 				}
51
-				$result.=$pieces[$size - 1];
51
+				$result.=$pieces[$size-1];
52 52
 			}
53 53
 		} else {
54 54
 			$result=\implode($glue, $pieces);
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
 
59 59
 	public static function dimension($array) {
60 60
 		if (\is_array(reset($array))) {
61
-			$return=self::dimension(reset($array)) + 1;
61
+			$return=self::dimension(reset($array))+1;
62 62
 		} else {
63 63
 			$return=1;
64 64
 		}
@@ -66,8 +66,8 @@  discard block
 block discarded – undo
66 66
 	}
67 67
 
68 68
 	public static function sortAssociative($array, $sortedKeys=array()) {
69
-		$newArray=array ();
70
-		foreach ( $sortedKeys as $key ) {
69
+		$newArray=array();
70
+		foreach ($sortedKeys as $key) {
71 71
 			if (\array_key_exists($key, $array)) {
72 72
 				$newArray[$key]=$array[$key];
73 73
 			}
@@ -75,27 +75,27 @@  discard block
 block discarded – undo
75 75
 		return $newArray;
76 76
 	}
77 77
 
78
-	public static function modelArray($objects,$identifierFunction=NULL,$modelFunction=NULL){
78
+	public static function modelArray($objects, $identifierFunction=NULL, $modelFunction=NULL) {
79 79
 		$result=[];
80
-		if(isset($modelFunction)===false){
80
+		if (isset($modelFunction)===false) {
81 81
 			$modelFunction="__toString";
82 82
 		}
83
-		if(isset($identifierFunction)===false){
84
-			foreach ($objects as $object){
83
+		if (isset($identifierFunction)===false) {
84
+			foreach ($objects as $object) {
85 85
 				$result[]=self::callFunction($object, $modelFunction);
86 86
 			}
87
-		}else{
88
-			foreach ($objects as $object){
87
+		} else {
88
+			foreach ($objects as $object) {
89 89
 				$result[self::callFunction($object, $identifierFunction)]=self::callFunction($object, $modelFunction);
90 90
 			}
91 91
 		}
92 92
 		return $result;
93 93
 	}
94 94
 
95
-	private static function callFunction($object,$callback){
96
-		if(\is_string($callback))
97
-			return \call_user_func(array($object, $callback),[]);
98
-		else if (\is_callable($callback)){
95
+	private static function callFunction($object, $callback) {
96
+		if (\is_string($callback))
97
+			return \call_user_func(array($object, $callback), []);
98
+		else if (\is_callable($callback)) {
99 99
 			return $callback($object);
100 100
 		}
101 101
 	}
Please login to merge, or discard this patch.
Ajax/common/traits/JqueryActionsTrait.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@  discard block
 block discarded – undo
10 10
  */
11 11
 
12 12
 trait JqueryActionsTrait {
13
-	abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true);
13
+	abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true);
14 14
 
15 15
 	/**
16 16
 	 * Get or set the value of an attribute for the first element in the set of matched elements or set one or more attributes for every matched element.
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
 	 * @param boolean $immediatly defers the execution if set to false
39 39
 	 * @return string
40 40
 	 */
41
-	public function after($element='this', $value='', $immediatly=false){
41
+	public function after($element='this', $value='', $immediatly=false) {
42 42
 		$element=Javascript::prep_element($element);
43 43
 		$value=Javascript::prep_value($value);
44 44
 		$str="$({$element}).after({$value});";
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
63 63
 
64 64
 		$animations="\t\t\t";
65 65
 		if (\is_array($params)) {
66
-			foreach ( $params as $param => $value ) {
66
+			foreach ($params as $param => $value) {
67 67
 				$animations.=$param.': \''.$value.'\', ';
68 68
 			}
69 69
 		}
@@ -356,8 +356,8 @@  discard block
 block discarded – undo
356 356
 	 * @param boolean $immediatly
357 357
 	 * @return string
358 358
 	 */
359
-	public function _doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param="", $preventDefault=false, $stopPropagation=false, $jsCallback="",$immediatly=true) {
360
-		return $this->_add_event($element, $this->_doJQuery($elementToModify, $jqueryCall, $param, $jsCallback), $event, $preventDefault, $stopPropagation,$immediatly);
359
+	public function _doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param="", $preventDefault=false, $stopPropagation=false, $jsCallback="", $immediatly=true) {
360
+		return $this->_add_event($element, $this->_doJQuery($elementToModify, $jqueryCall, $param, $jsCallback), $event, $preventDefault, $stopPropagation, $immediatly);
361 361
 	}
362 362
 
363 363
 	/**
@@ -383,8 +383,8 @@  discard block
 block discarded – undo
383 383
 	 * @param boolean $immediatly
384 384
 	 * @return String
385 385
 	 */
386
-	public function _execOn($element, $event, $js, $preventDefault=false, $stopPropagation=false,$immediatly=true) {
387
-		return $this->_add_event($element, $this->_exec($js), $event, $preventDefault, $stopPropagation,$immediatly);
386
+	public function _execOn($element, $event, $js, $preventDefault=false, $stopPropagation=false, $immediatly=true) {
387
+		return $this->_add_event($element, $this->_exec($js), $event, $preventDefault, $stopPropagation, $immediatly);
388 388
 	}
389 389
 
390 390
 	/**
@@ -393,8 +393,8 @@  discard block
 block discarded – undo
393 393
 	 * @return string
394 394
 	 */
395 395
 	private function _validate_speed($speed) {
396
-		if (in_array($speed, array (
397
-				'slow','normal','fast'
396
+		if (in_array($speed, array(
397
+				'slow', 'normal', 'fast'
398 398
 		))) {
399 399
 			$speed='"'.$speed.'"';
400 400
 		} elseif (preg_match("/[^0-9]/", $speed)) {
Please login to merge, or discard this patch.
Ajax/common/components/SimpleComponent.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -17,18 +17,18 @@  discard block
 block discarded – undo
17 17
 
18 18
 	public function __construct(JsUtils $js=NULL) {
19 19
 		parent::__construct($js);
20
-		$this->events=array ();
20
+		$this->events=array();
21 21
 	}
22 22
 
23 23
 	protected function compileEvents() {
24
-		foreach ( $this->events as $event => $jsCode ) {
25
-			if($event=="execute"){
24
+		foreach ($this->events as $event => $jsCode) {
25
+			if ($event=="execute") {
26 26
 				$this->jquery_code_for_compile []=$jsCode;
27
-			}else if($event=="beforeExecute"){
27
+			} else if ($event=="beforeExecute") {
28 28
 				\array_unshift($this->jquery_code_for_compile, $jsCode);
29
-			}else{
29
+			} else {
30 30
 				$selector=$this->attachTo;
31
-				if(isset($this->itemSelector)){
31
+				if (isset($this->itemSelector)) {
32 32
 					$selector.=" ".$this->itemSelector;
33 33
 				}
34 34
 				$this->jquery_code_for_compile []="$( \"".$selector."\" ).on(\"".$event."\" , function( event, data ) {".$jsCode."});";
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
 		$result=implode("\n", $this->jquery_code_for_compile);
41 41
 		$result=str_ireplace("\"%", "", $result);
42 42
 		$result=str_ireplace("%\"", "", $result);
43
-		$result=str_replace(array (
43
+		$result=str_replace(array(
44 44
 				"\\n",
45 45
 				"\\r",
46 46
 				"\\t"
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
 
51 51
 	public function getScript() {
52 52
 		$allParams=$this->params;
53
-		$this->jquery_code_for_compile=array ();
53
+		$this->jquery_code_for_compile=array();
54 54
 		$this->jquery_code_for_compile []="$( \"".$this->attachTo."\" ).{$this->uiName}(".$this->getParamsAsJSON($allParams).");";
55 55
 		$this->compileEvents();
56 56
 		return $this->compileJQueryCode();
Please login to merge, or discard this patch.
Ajax/common/html/HtmlCollection.php 1 patch
Spacing   +33 added lines, -33 removed lines patch added patch discarded remove patch
@@ -12,36 +12,36 @@  discard block
 block discarded – undo
12 12
  */
13 13
 abstract class HtmlCollection extends HtmlDoubleElement {
14 14
 
15
-	public function __construct($identifier,$tagName="div"){
16
-		parent::__construct($identifier,$tagName);
15
+	public function __construct($identifier, $tagName="div") {
16
+		parent::__construct($identifier, $tagName);
17 17
 		$this->content=array();
18 18
 	}
19 19
 
20
-	public function addItems($items){
21
-		if(JArray::isAssociative($items)){
22
-			foreach ($items as $k=>$v){
23
-				$this->addItem([$k,$v]);
20
+	public function addItems($items) {
21
+		if (JArray::isAssociative($items)) {
22
+			foreach ($items as $k=>$v) {
23
+				$this->addItem([$k, $v]);
24 24
 			}
25
-		}else{
26
-			foreach ($items as $item){
25
+		} else {
26
+			foreach ($items as $item) {
27 27
 				$this->addItem($item);
28 28
 			}
29 29
 		}
30 30
 		return $this;
31 31
 	}
32 32
 
33
-	public function setItems($items){
33
+	public function setItems($items) {
34 34
 		$this->content=$items;
35 35
 		return $this;
36 36
 	}
37 37
 
38
-	public function getItems(){
38
+	public function getItems() {
39 39
 		return $this->content;
40 40
 	}
41 41
 
42
-	protected function getItemToAdd($item){
42
+	protected function getItemToAdd($item) {
43 43
 		$itemO=$item;
44
-		if($this->createCondition($item)===true){
44
+		if ($this->createCondition($item)===true) {
45 45
 			$itemO=$this->createItem($item);
46 46
 		}
47 47
 		return $itemO;
@@ -52,15 +52,15 @@  discard block
 block discarded – undo
52 52
 	 * @param HtmlDoubleElement|string|array $item
53 53
 	 * @return \Ajax\common\html\HtmlDoubleElement
54 54
 	 */
55
-	public function addItem($item){
55
+	public function addItem($item) {
56 56
 		$itemO=$this->getItemToAdd($item);
57 57
 		$this->addContent($itemO);
58 58
 		return $itemO;
59 59
 	}
60 60
 
61
-	public function insertItem($item,$position=0){
61
+	public function insertItem($item, $position=0) {
62 62
 		$itemO=$this->getItemToAdd($item);
63
-		\array_splice( $this->content, $position, 0, array($itemO));
63
+		\array_splice($this->content, $position, 0, array($itemO));
64 64
 		return $itemO;
65 65
 	}
66 66
 
@@ -83,11 +83,11 @@  discard block
 block discarded – undo
83 83
 		return $this;
84 84
 	}
85 85
 
86
-	public function removeItem($index){
86
+	public function removeItem($index) {
87 87
 		return array_splice($this->content, $index, 1);
88 88
 	}
89 89
 
90
-	public function count(){
90
+	public function count() {
91 91
 		return \sizeof($this->content);
92 92
 	}
93 93
 
@@ -98,8 +98,8 @@  discard block
 block discarded – undo
98 98
 		return $this->addItem($function($object));
99 99
 	}
100 100
 
101
-	public function apply($callBack){
102
-		foreach ($this->content as $item){
101
+	public function apply($callBack) {
102
+		foreach ($this->content as $item) {
103 103
 			$callBack($item);
104 104
 		}
105 105
 		return $this;
@@ -119,40 +119,40 @@  discard block
 block discarded – undo
119 119
 	 */
120 120
 	abstract protected function createItem($value);
121 121
 
122
-	protected function createCondition($value){
122
+	protected function createCondition($value) {
123 123
 		return \is_object($value)===false;
124 124
 	}
125 125
 
126
-	protected function contentAs($tagName){
127
-		foreach ($this->content as $item){
126
+	protected function contentAs($tagName) {
127
+		foreach ($this->content as $item) {
128 128
 			$item->setTagName($tagName);
129 129
 		}
130 130
 		return $this;
131 131
 	}
132 132
 
133
-	public function setProperties($properties){
133
+	public function setProperties($properties) {
134 134
 		$i=0;
135
-		foreach ($properties as $k=>$v){
135
+		foreach ($properties as $k=>$v) {
136 136
 			$c=$this->content[$i++];
137
-			if(isset($c))
138
-				$c->setProperty($k,$v);
137
+			if (isset($c))
138
+				$c->setProperty($k, $v);
139 139
 			else
140 140
 				return $this;
141 141
 		}
142 142
 		return $this;
143 143
 	}
144 144
 
145
-	public function setPropertyValues($property,$values){
145
+	public function setPropertyValues($property, $values) {
146 146
 		$i=0;
147
-		if(\is_array($values)===false){
148
-			$values=\array_fill(0, $this->count(),$values);
147
+		if (\is_array($values)===false) {
148
+			$values=\array_fill(0, $this->count(), $values);
149 149
 		}
150
-		foreach ($values as $value){
150
+		foreach ($values as $value) {
151 151
 			$c=$this->content[$i++];
152
-			if(isset($c)){
153
-				$c->setProperty($property,$value);
152
+			if (isset($c)) {
153
+				$c->setProperty($property, $value);
154 154
 			}
155
-			else{
155
+			else {
156 156
 				return $this;
157 157
 			}
158 158
 		}
Please login to merge, or discard this patch.
Ajax/common/html/html5/HtmlTextarea.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -7,27 +7,27 @@
 block discarded – undo
7 7
 
8 8
 class HtmlTextarea extends HtmlDoubleElement {
9 9
 
10
-	public function __construct($identifier,$value=NULL,$placeholder=NULL,$rows=NULL) {
10
+	public function __construct($identifier, $value=NULL, $placeholder=NULL, $rows=NULL) {
11 11
 		parent::__construct($identifier, "textarea");
12 12
 		$this->setProperty("name", $identifier);
13 13
 		$this->setValue($value);
14 14
 		$this->setPlaceholder($placeholder);
15
-		if(isset($rows))
15
+		if (isset($rows))
16 16
 			$this->setRows($rows);
17 17
 	}
18 18
 	public function setValue($value) {
19
-		if(isset($value))
19
+		if (isset($value))
20 20
 			$this->setContent($value);
21 21
 		return $this;
22 22
 	}
23 23
 
24
-	public function setPlaceholder($value){
25
-		if(JString::isNotNull($value))
24
+	public function setPlaceholder($value) {
25
+		if (JString::isNotNull($value))
26 26
 			$this->setProperty("placeholder", $value);
27 27
 		return $this;
28 28
 	}
29 29
 
30
-	public function setRows($count){
30
+	public function setRows($count) {
31 31
 		$this->setProperty("rows", $count);
32 32
 	}
33 33
 }
34 34
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/common/html/BaseHtml.php 1 patch
Spacing   +42 added lines, -42 removed lines patch added patch discarded remove patch
@@ -17,9 +17,9 @@  discard block
 block discarded – undo
17 17
 	use BaseHtmlEventsTrait;
18 18
 	protected $_template;
19 19
 	protected $tagName;
20
-	protected $properties=array ();
21
-	protected $_wrapBefore=array ();
22
-	protected $_wrapAfter=array ();
20
+	protected $properties=array();
21
+	protected $_wrapBefore=array();
22
+	protected $_wrapAfter=array();
23 23
 	protected $_bsComponent;
24 24
 
25 25
 	public function getBsComponent() {
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
 	}
33 33
 
34 34
 	protected function getTemplate(JsUtils $js=NULL) {
35
-		return PropertyWrapper::wrap($this->_wrapBefore, $js) . $this->_template . PropertyWrapper::wrap($this->_wrapAfter, $js);
35
+		return PropertyWrapper::wrap($this->_wrapBefore, $js).$this->_template.PropertyWrapper::wrap($this->_wrapAfter, $js);
36 36
 	}
37 37
 
38 38
 	public function getProperties() {
@@ -56,13 +56,13 @@  discard block
 block discarded – undo
56 56
 
57 57
 	public function addToProperty($name, $value, $separator=" ") {
58 58
 		if (\is_array($value)) {
59
-			foreach ( $value as $v ) {
59
+			foreach ($value as $v) {
60 60
 				$this->addToProperty($name, $v, $separator);
61 61
 			}
62
-		} else if ($value !== "" && $this->propertyContains($name, $value) === false) {
62
+		} else if ($value!=="" && $this->propertyContains($name, $value)===false) {
63 63
 			$v=@$this->properties[$name];
64
-			if (isset($v) && $v !== "")
65
-				$v=$v . $separator . $value;
64
+			if (isset($v) && $v!=="")
65
+				$v=$v.$separator.$value;
66 66
 			else
67 67
 				$v=$value;
68 68
 
@@ -78,19 +78,19 @@  discard block
 block discarded – undo
78 78
 
79 79
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
80 80
 		$result=$this->getTemplate($js);
81
-		foreach ( $this as $key => $value ) {
82
-			if (JString::startswith($key, "_") === false && $key !== "events") {
81
+		foreach ($this as $key => $value) {
82
+			if (JString::startswith($key, "_")===false && $key!=="events") {
83 83
 				if (\is_array($value)) {
84 84
 					$v=PropertyWrapper::wrap($value, $js);
85 85
 				} else {
86 86
 					$v=$value;
87 87
 				}
88
-				$result=str_ireplace("%" . $key . "%", $v, $result);
88
+				$result=str_ireplace("%".$key."%", $v, $result);
89 89
 			}
90 90
 		}
91 91
 		if (isset($js)===true) {
92 92
 			$this->run($js);
93
-			if (isset($view) === true) {
93
+			if (isset($view)===true) {
94 94
 				$js->addViewElement($this->identifier, $result, $view);
95 95
 			}
96 96
 		}
@@ -99,12 +99,12 @@  discard block
 block discarded – undo
99 99
 
100 100
 	protected function ctrl($name, $value, $typeCtrl) {
101 101
 		if (\is_array($typeCtrl)) {
102
-			if (array_search($value, $typeCtrl) === false) {
103
-				throw new \Exception("La valeur passée `" . $value . "` à la propriété `" . $name . "` ne fait pas partie des valeurs possibles : {" . implode(",", $typeCtrl) . "}");
102
+			if (array_search($value, $typeCtrl)===false) {
103
+				throw new \Exception("La valeur passée `".$value."` à la propriété `".$name."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}");
104 104
 			}
105 105
 		} else {
106 106
 			if (!$typeCtrl($value)) {
107
-				throw new \Exception("La fonction " . $typeCtrl . " a retourné faux pour l'affectation de la propriété " . $name);
107
+				throw new \Exception("La fonction ".$typeCtrl." a retourné faux pour l'affectation de la propriété ".$name);
108 108
 			}
109 109
 		}
110 110
 		return true;
@@ -119,13 +119,13 @@  discard block
 block discarded – undo
119 119
 	}
120 120
 
121 121
 	protected function setPropertyCtrl($name, $value, $typeCtrl) {
122
-		if ($this->ctrl($name, $value, $typeCtrl) === true)
122
+		if ($this->ctrl($name, $value, $typeCtrl)===true)
123 123
 			return $this->setProperty($name, $value);
124 124
 		return $this;
125 125
 	}
126 126
 
127 127
 	protected function setMemberCtrl(&$name, $value, $typeCtrl) {
128
-		if ($this->ctrl($name, $value, $typeCtrl) === true) {
128
+		if ($this->ctrl($name, $value, $typeCtrl)===true) {
129 129
 			return $name=$value;
130 130
 		}
131 131
 		return $this;
@@ -134,7 +134,7 @@  discard block
 block discarded – undo
134 134
 	protected function addToMemberUnique(&$name, $value, $typeCtrl, $separator=" ") {
135 135
 		if (\is_array($typeCtrl)) {
136 136
 			$this->removeOldValues($name, $typeCtrl);
137
-			$name.=$separator . $value;
137
+			$name.=$separator.$value;
138 138
 		}
139 139
 		return $this;
140 140
 	}
@@ -156,17 +156,17 @@  discard block
 block discarded – undo
156 156
 	}
157 157
 
158 158
 	protected function addToMemberCtrl(&$name, $value, $typeCtrl, $separator=" ") {
159
-		if ($this->ctrl($name, $value, $typeCtrl) === true) {
159
+		if ($this->ctrl($name, $value, $typeCtrl)===true) {
160 160
 			if (\is_array($typeCtrl)) {
161 161
 				$this->removeOldValues($name, $typeCtrl);
162 162
 			}
163
-			$name.=$separator . $value;
163
+			$name.=$separator.$value;
164 164
 		}
165 165
 		return $this;
166 166
 	}
167 167
 
168 168
 	protected function addToMember(&$name, $value, $separator=" ") {
169
-		$name=str_ireplace($value, "", $name) . $separator . $value;
169
+		$name=str_ireplace($value, "", $name).$separator.$value;
170 170
 		return $this;
171 171
 	}
172 172
 
@@ -184,7 +184,7 @@  discard block
 block discarded – undo
184 184
 	}
185 185
 
186 186
 	public function addToPropertyCtrlCheck($name, $value, $typeCtrl) {
187
-		if ($this->ctrl($name, $value, $typeCtrl) === true) {
187
+		if ($this->ctrl($name, $value, $typeCtrl)===true) {
188 188
 			return $this->addToProperty($name, $value);
189 189
 		}
190 190
 		return $this;
@@ -212,26 +212,26 @@  discard block
 block discarded – undo
212 212
 	}
213 213
 
214 214
 	public function fromArray($array) {
215
-		foreach ( $this as $key => $value ) {
216
-			if(array_key_exists($key, $array)===true)
217
-				$this->_callSetter("set" . ucfirst($key), $key, $array[$key], $array);
215
+		foreach ($this as $key => $value) {
216
+			if (array_key_exists($key, $array)===true)
217
+				$this->_callSetter("set".ucfirst($key), $key, $array[$key], $array);
218 218
 		}
219
-		foreach ( $array as $key => $value ) {
220
-			if($this->_callSetter($key, $key, $value, $array)===false){
221
-				$this->_callSetter("set" . ucfirst($key), $key, $value, $array);
219
+		foreach ($array as $key => $value) {
220
+			if ($this->_callSetter($key, $key, $value, $array)===false) {
221
+				$this->_callSetter("set".ucfirst($key), $key, $value, $array);
222 222
 			}
223 223
 		}
224 224
 		return $array;
225 225
 	}
226 226
 
227
-	private function _callSetter($setter,$key,$value,&$array){
227
+	private function _callSetter($setter, $key, $value, &$array) {
228 228
 		$result=false;
229 229
 		if (method_exists($this, $setter) && !JString::startswith($key, "_")) {
230 230
 			try {
231 231
 				$this->$setter($value);
232 232
 				unset($array[$key]);
233 233
 				$result=true;
234
-			} catch ( \Exception $e ) {
234
+			}catch (\Exception $e) {
235 235
 				$result=false;
236 236
 			}
237 237
 		}
@@ -240,7 +240,7 @@  discard block
 block discarded – undo
240 240
 
241 241
 	public function fromDatabaseObjects($objects, $function) {
242 242
 		if (isset($objects)) {
243
-			foreach ( $objects as $object ) {
243
+			foreach ($objects as $object) {
244 244
 				$this->fromDatabaseObject($object, $function);
245 245
 			}
246 246
 		}
@@ -264,33 +264,33 @@  discard block
 block discarded – undo
264 264
 		if (\is_array($elements)) {
265 265
 			$flag=false;
266 266
 			$index=0;
267
-			while ( !$flag && $index < sizeof($elements) ) {
267
+			while (!$flag && $index<sizeof($elements)) {
268 268
 				if ($elements[$index] instanceof BaseHtml)
269
-					$flag=($elements[$index]->getIdentifier() === $identifier);
269
+					$flag=($elements[$index]->getIdentifier()===$identifier);
270 270
 				$index++;
271 271
 			}
272
-			if ($flag === true)
273
-				return $elements[$index - 1];
272
+			if ($flag===true)
273
+				return $elements[$index-1];
274 274
 		} elseif ($elements instanceof BaseHtml) {
275
-			if ($elements->getIdentifier() === $identifier)
275
+			if ($elements->getIdentifier()===$identifier)
276 276
 				return $elements;
277 277
 		}
278 278
 		return null;
279 279
 	}
280 280
 
281
-	protected function getElementByPropertyValue($propertyName,$value, $elements) {
281
+	protected function getElementByPropertyValue($propertyName, $value, $elements) {
282 282
 		if (\is_array($elements)) {
283 283
 			$flag=false;
284 284
 			$index=0;
285
-			while ( !$flag && $index < sizeof($elements) ) {
285
+			while (!$flag && $index<sizeof($elements)) {
286 286
 				if ($elements[$index] instanceof BaseHtml)
287
-					$flag=($elements[$index]->propertyContains($propertyName, $value) === true);
287
+					$flag=($elements[$index]->propertyContains($propertyName, $value)===true);
288 288
 					$index++;
289 289
 			}
290
-			if ($flag === true)
291
-				return $elements[$index - 1];
290
+			if ($flag===true)
291
+				return $elements[$index-1];
292 292
 		} elseif ($elements instanceof BaseHtml) {
293
-			if ($elements->propertyContains($propertyName, $value) === true)
293
+			if ($elements->propertyContains($propertyName, $value)===true)
294 294
 				return $elements;
295 295
 		}
296 296
 		return null;
Please login to merge, or discard this patch.
Ajax/semantic/html/elements/HtmlHeader.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -10,14 +10,14 @@  discard block
 block discarded – undo
10 10
 use Ajax\semantic\html\base\traits\AttachedTrait;
11 11
 
12 12
 class HtmlHeader extends HtmlSemDoubleElement {
13
-	use TextAlignmentTrait,AttachedTrait;
13
+	use TextAlignmentTrait, AttachedTrait;
14 14
 	protected $image;
15 15
 
16 16
 	public function __construct($identifier, $niveau=1, $content=NULL, $type="page") {
17 17
 		parent::__construct($identifier, "div", "ui header");
18 18
 		$this->_template="<%tagName% %properties%>%image%%wrapContentBefore%%content%%wrapContentAfter%</%tagName%>";
19 19
 		if (isset($type)) {
20
-			if ($type == "page") {
20
+			if ($type=="page") {
21 21
 				$this->asPageHeader($niveau);
22 22
 			} else
23 23
 				$this->asContentHeader($niveau);
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
 	}
27 27
 
28 28
 	public function asPageHeader($niveau) {
29
-		$this->tagName="h" . $niveau;
29
+		$this->tagName="h".$niveau;
30 30
 	}
31 31
 
32 32
 	public function asContentHeader($niveau) {
@@ -39,25 +39,25 @@  discard block
 block discarded – undo
39 39
 
40 40
 	public function asIcon($icon, $title, $subHeader=NULL) {
41 41
 		$this->addToProperty("class", "icon");
42
-		$this->image=new HtmlIcon("icon-" . $this->identifier, $icon);
42
+		$this->image=new HtmlIcon("icon-".$this->identifier, $icon);
43 43
 		return $this->asTitle($title, $subHeader);
44 44
 	}
45 45
 
46 46
 	public function asImage($src, $title, $subHeader=NULL) {
47
-		$this->image=new HtmlImg("img-" . $this->identifier, $src, $title);
47
+		$this->image=new HtmlImg("img-".$this->identifier, $src, $title);
48 48
 		return $this->asTitle($title, $subHeader);
49 49
 	}
50 50
 
51 51
 	public function asTitle($title, $subHeader=NULL) {
52 52
 		if (!\is_object($title)) {
53
-			$this->content=new HtmlDoubleElement("content-" . $this->identifier, "div");
53
+			$this->content=new HtmlDoubleElement("content-".$this->identifier, "div");
54 54
 			$this->content->setContent($title);
55 55
 		} else {
56 56
 			$this->content=$title;
57 57
 		}
58 58
 		$this->content->setClass("content");
59 59
 		if (isset($subHeader)) {
60
-			$sub=new HtmlDoubleElement("subheader-" . $this->identifier, "div");
60
+			$sub=new HtmlDoubleElement("subheader-".$this->identifier, "div");
61 61
 			$sub->setClass("sub header");
62 62
 			$sub->setContent($subHeader);
63 63
 			$this->content->addContent($sub);
Please login to merge, or discard this patch.