phpMv / phpMv-UI

Ajax/common/html/html5/HtmlInput.php

Spacing +6 added lines, -6 removed lines

@@ -7,7 +7,7 @@ 
 
 class HtmlInput extends HtmlSingleElement {
 
-	public function __construct($identifier,$type="text",$value=NULL,$placeholder=NULL) {
+	public function __construct($identifier, $type="text", $value=NULL, $placeholder=NULL) {
 		parent::__construct($identifier, "input");
 		$this->setProperty("name", $identifier);
 		$this->setValue($value);
@@ -16,7 +16,7 @@ 
 	}
 
 	public function setValue($value) {
-		if(isset($value))
+		if (isset($value))
 		$this->setProperty("value", $value);
 		return $this;
 	}
@@ -25,12 +25,12 @@ 
 		return $this->setProperty("type", $value);
 	}
 
-	public function setPlaceholder($value){
-		if(JString::isNull($value)){
-			if(JString::isNotNull($this->identifier))
+	public function setPlaceholder($value) {
+		if (JString::isNull($value)) {
+			if (JString::isNotNull($this->identifier))
 				$value=\ucfirst($this->identifier);
 		}
-		if(JString::isNotNull($value))
+		if (JString::isNotNull($value))
 			$this->setProperty("placeholder", $value);
 		return $this;
 	}

Braces +9 added lines, -6 removed lines

@@ -16,8 +16,9 @@ 
 	}
 
 	public function setValue($value) {
-		if(isset($value))
-		$this->setProperty("value", $value);
+		if(isset($value)) {
+				$this->setProperty("value", $value);
+		}
 		return $this;
 	}
 
@@ -27,11 +28,13 @@ 
 
 	public function setPlaceholder($value){
 		if(JString::isNull($value)){
-			if(JString::isNotNull($this->identifier))
-				$value=\ucfirst($this->identifier);
+			if(JString::isNotNull($this->identifier)) {
+							$value=\ucfirst($this->identifier);
+			}
+		}
+		if(JString::isNotNull($value)) {
+					$this->setProperty("placeholder", $value);
 		}
-		if(JString::isNotNull($value))
-			$this->setProperty("placeholder", $value);
 		return $this;
 	}
 }
\ No newline at end of file

Ajax/common/html/html5/HtmlOption.php

Spacing +3 added lines, -3 removed lines

@@ -10,7 +10,7 @@ 
 class HtmlOption extends HtmlDoubleElement {
 	protected $value;
 	protected $selected;
-	public function __construct($identifier,$caption,$value="") {
+	public function __construct($identifier, $caption, $value="") {
 		parent::__construct($identifier, "option");
 		$this->_template='<option id="%identifier%" value="%value%" %selected% %properties%>%content%</option>';
 		$this->content=$caption;
@@ -18,7 +18,7 @@ 
 		$this->selected="";
 	}
 
-	public function select(){
+	public function select() {
 		$this->selected="selected";
 		return $this;
 	}
@@ -27,7 +27,7 @@ 
 		return $this->value;
 	}
 	public function setValue($value) {
-		$this->value = $value;
+		$this->value=$value;
 		return $this;
 	}
 

Ajax/common/html/html5/HtmlImg.php

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
 
 class HtmlImg extends HtmlSingleElement {
 
-	public function __construct($identifier,$src="",$alt="") {
+	public function __construct($identifier, $src="", $alt="") {
 		parent::__construct($identifier, "img");
 		$this->setSrc($src);
 		$this->setAlt($alt);

Ajax/common/html/html5/HtmlTextarea.php

Spacing +6 added lines, -6 removed lines

@@ -7,26 +7,26 @@
 
 class HtmlTextarea extends HtmlDoubleElement {
 
-	public function __construct($identifier,$value=NULL,$placeholder=NULL,$rows=NULL) {
+	public function __construct($identifier, $value=NULL, $placeholder=NULL, $rows=NULL) {
 		parent::__construct($identifier, "textarea");
 		$this->setValue($value);
 		$this->setPlaceholder($placeholder);
-		if(isset($rows))
+		if (isset($rows))
 			$this->setRows($rows);
 	}
 	public function setValue($value) {
-		if(isset($value))
+		if (isset($value))
 			$this->setContent($value);
 		return $this;
 	}
 
-	public function setPlaceholder($value){
-		if(JString::isNotNull($value))
+	public function setPlaceholder($value) {
+		if (JString::isNotNull($value))
 			$this->setProperty("placeholder", $value);
 		return $this;
 	}
 
-	public function setRows($count){
+	public function setRows($count) {
 		$this->setProperty("rows", $count);
 	}
 }
\ No newline at end of file

Braces +9 added lines, -6 removed lines

@@ -11,18 +11,21 @@
 		parent::__construct($identifier, "textarea");
 		$this->setValue($value);
 		$this->setPlaceholder($placeholder);
-		if(isset($rows))
-			$this->setRows($rows);
+		if(isset($rows)) {
+					$this->setRows($rows);
+		}
 	}
 	public function setValue($value) {
-		if(isset($value))
-			$this->setContent($value);
+		if(isset($value)) {
+					$this->setContent($value);
+		}
 		return $this;
 	}
 
 	public function setPlaceholder($value){
-		if(JString::isNotNull($value))
-			$this->setProperty("placeholder", $value);
+		if(JString::isNotNull($value)) {
+					$this->setProperty("placeholder", $value);
+		}
 		return $this;
 	}
 

Ajax/common/html/html5/HtmlList.php

Spacing +2 added lines, -2 removed lines

@@ -14,8 +14,8 @@
 		parent::__construct($identifier, "ul");
 		$this->addItems($items);
 	}
-	public function setOrdered($ordered=true){
-		$this->tagName=($ordered===true)?"ol":"ul";
+	public function setOrdered($ordered=true) {
+		$this->tagName=($ordered===true) ? "ol" : "ul";
 	}
 
 	/**

Ajax/common/html/html5/HtmlSelect.php

Braces +2 added lines, -2 removed lines

@@ -25,7 +25,7 @@ 
 	public function addOption($element,$value="",$selected=false){
 		if($element instanceof HtmlOption){
 			$option=$element;
-		}else{
+		} else{
 			$option=new HtmlOption($this->identifier."-".count($this->options), $element,$value);
 		}
 		if($selected || $option->getValue()==$this->getProperty("value")){
@@ -64,7 +64,7 @@ 
 			foreach ($array as $k=>$v){
 				$this->addOption($v, $k);
 			}
-		}else{
+		} else{
 			foreach ($array as $v){
 				$this->addOption($v, $v);
 			}

Spacing +16 added lines, -16 removed lines

@@ -13,7 +13,7 @@ 
 	private $default;
 	private $options;
 
-	public function __construct($identifier, $caption="",$default=NULL) {
+	public function __construct($identifier, $caption="", $default=NULL) {
 		parent::__construct($identifier, "select");
 		$this->setProperty("name", $identifier);
 		$this->setProperty("class", "form-control");
@@ -22,21 +22,21 @@ 
 		$this->options=array();
 	}
 
-	public function addOption($element,$value="",$selected=false){
-		if($element instanceof HtmlOption){
+	public function addOption($element, $value="", $selected=false) {
+		if ($element instanceof HtmlOption) {
 			$option=$element;
-		}else{
-			$option=new HtmlOption($this->identifier."-".count($this->options), $element,$value);
+		} else {
+			$option=new HtmlOption($this->identifier."-".count($this->options), $element, $value);
 		}
-		if($selected || $option->getValue()==$this->getProperty("value")){
+		if ($selected || $option->getValue()==$this->getProperty("value")) {
 			$option->select();
 		}
 		$this->options[]=$option;
 	}
 
 	public function setValue($value) {
-		foreach ( $this->options as $option ) {
-			if (strcasecmp($option->getValue(),$value)===0) {
+		foreach ($this->options as $option) {
+			if (strcasecmp($option->getValue(), $value)===0) {
 				$option->setProperty("selected", "");
 			}
 		}
@@ -49,23 +49,23 @@ 
 	 */
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
 		$this->content=array();
-		if(isset($this->default)){
+		if (isset($this->default)) {
 			$default=new HtmlOption("", $this->default);
 			$this->content[]=$default;
 		}
-		foreach ($this->options as $option){
+		foreach ($this->options as $option) {
 			$this->content[]=$option;
 		}
 		return parent::compile($js, $view);
 	}
 
-	public function fromArray($array){
-		if(JArray::isAssociative($array)){
-			foreach ($array as $k=>$v){
+	public function fromArray($array) {
+		if (JArray::isAssociative($array)) {
+			foreach ($array as $k=>$v) {
 				$this->addOption($v, $k);
 			}
-		}else{
-			foreach ($array as $v){
+		} else {
+			foreach ($array as $v) {
 				$this->addOption($v, $v);
 			}
 		}
@@ -98,7 +98,7 @@ 
 		$this->addOption($function($object));
 	}
 
-	public function setSize($size){
+	public function setSize($size) {
 		return $this->setProperty("size", $size);
 	}
 }

Ajax/common/html/PropertyWrapper.php

Spacing +8 added lines, -8 removed lines

@@ -12,8 +12,8 @@ 
 			$output=$input;
 		}
 		if (is_array($input)) {
-			if (sizeof($input) > 0) {
-				if (self::containsElement($input) === false) {
+			if (sizeof($input)>0) {
+				if (self::containsElement($input)===false) {
 					$output=self::wrapStrings($input, $js, $separator=' ', $valueQuote='"');
 				} else {
 					$output=self::wrapObjects($input, $js, $separator, $valueQuote);
@@ -24,17 +24,17 @@ 
 	}
 
 	private static function containsElement($input) {
-		foreach ( $input as $v ) {
-			if (\is_object($v) === true || \is_array($v))
+		foreach ($input as $v) {
+			if (\is_object($v)===true || \is_array($v))
 				return true;
 		}
 		return false;
 	}
 
 	public static function wrapStrings($input, $js, $separator=' ', $valueQuote='"') {
-		if (JArray::isAssociative($input) === true) {
-			$result=implode($separator, array_map(function ($v, $k) use($valueQuote) {
-				return $k . '=' . $valueQuote . $v . $valueQuote;
+		if (JArray::isAssociative($input)===true) {
+			$result=implode($separator, array_map(function($v, $k) use($valueQuote) {
+				return $k.'='.$valueQuote.$v.$valueQuote;
 			}, $input, array_keys($input)));
 		} else {
 			$result=implode($separator, array_values($input));
@@ -43,7 +43,7 @@ 
 	}
 
 	public static function wrapObjects($input, $js=NULL, $separator=' ', $valueQuote='"') {
-		return implode($separator, array_map(function ($v) use($js, $separator, $valueQuote) {
+		return implode($separator, array_map(function($v) use($js, $separator, $valueQuote) {
 			if (is_object($v))
 				return $v->compile($js);
 			elseif (\is_array($v)) {

Braces +9 added lines, -7 removed lines

@@ -25,8 +25,9 @@ 
 
 	private static function containsElement($input) {
 		foreach ( $input as $v ) {
-			if (\is_object($v) === true || \is_array($v))
-				return true;
+			if (\is_object($v) === true || \is_array($v)) {
+							return true;
+			}
 		}
 		return false;
 	}
@@ -44,12 +45,13 @@ 
 
 	public static function wrapObjects($input, $js=NULL, $separator=' ', $valueQuote='"') {
 		return implode($separator, array_map(function ($v) use($js, $separator, $valueQuote) {
-			if (is_object($v))
-				return $v->compile($js);
-			elseif (\is_array($v)) {
+			if (is_object($v)) {
+							return $v->compile($js);
+			} elseif (\is_array($v)) {
 				return self::wrap($v, $js, $separator, $valueQuote);
-			} else
-				return $v;
+			} else {
+							return $v;
+			}
 		}, $input));
 	}
 }
\ No newline at end of file

Ajax/common/html/HtmlSingleElement.php

Spacing +2 added lines, -2 removed lines

@@ -13,7 +13,7 @@ 
 	}
 
 	public function setClass($classNames) {
-		if(is_array($classNames)){
+		if (is_array($classNames)) {
 			$classNames=implode(" ", $classNames);
 		}
 		$this->setProperty("class", $classNames);
@@ -44,7 +44,7 @@ 
 	 */
 	public function fromArray($array) {
 		$array=parent::fromArray($array);
-		foreach ( $array as $key => $value ) {
+		foreach ($array as $key => $value) {
 			$this->setProperty($key, $value);
 		}
 		return $array;

Ajax/common/html/HtmlDoubleElement.php

Spacing +6 added lines, -6 removed lines

@@ -27,15 +27,15 @@ 
 		return $this->content;
 	}
 
-	public function addContent($content,$before=false) {
+	public function addContent($content, $before=false) {
 		if (is_array($this->content)===false) {
-			if(isset($this->content))
-				$this->content=array ($this->content);
+			if (isset($this->content))
+				$this->content=array($this->content);
 			else
 				$this->content=array();
 		}
-		if($before)
-			array_unshift($this->content,$content);
+		if ($before)
+			array_unshift($this->content, $content);
 		else
 			$this->content []=$content;
 		return $this;
@@ -50,7 +50,7 @@ 
 		if ($this->content instanceof HtmlDoubleElement) {
 			$this->content->run($js);
 		} else if (is_array($this->content)) {
-			foreach ( $this->content as $itemContent ) {
+			foreach ($this->content as $itemContent) {
 				if ($itemContent instanceof HtmlDoubleElement) {
 					$itemContent->run($js);
 				}

Braces +10 added lines, -8 removed lines

@@ -29,15 +29,17 @@
 
 	public function addContent($content,$before=false) {
 		if (is_array($this->content)===false) {
-			if(isset($this->content))
-				$this->content=array ($this->content);
-			else
-				$this->content=array();
+			if(isset($this->content)) {
+							$this->content=array ($this->content);
+			} else {
+							$this->content=array();
+			}
+		}
+		if($before) {
+					array_unshift($this->content,$content);
+		} else {
+					$this->content []=$content;
 		}
-		if($before)
-			array_unshift($this->content,$content);
-		else
-			$this->content []=$content;
 		return $this;
 	}