@@ -7,7 +7,7 @@ |
||
| 7 | 7 | |
| 8 | 8 | class HtmlImg extends HtmlSingleElement { |
| 9 | 9 | |
| 10 | - public function __construct($identifier,$src="",$alt="") { |
|
| 10 | + public function __construct($identifier, $src="", $alt="") { |
|
| 11 | 11 | parent::__construct($identifier, "img"); |
| 12 | 12 | $this->setSrc($src); |
| 13 | 13 | $this->setAlt($alt); |
@@ -7,26 +7,26 @@ |
||
| 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->setValue($value); |
| 13 | 13 | $this->setPlaceholder($placeholder); |
| 14 | - if(isset($rows)) |
|
| 14 | + if (isset($rows)) |
|
| 15 | 15 | $this->setRows($rows); |
| 16 | 16 | } |
| 17 | 17 | public function setValue($value) { |
| 18 | - if(isset($value)) |
|
| 18 | + if (isset($value)) |
|
| 19 | 19 | $this->setContent($value); |
| 20 | 20 | return $this; |
| 21 | 21 | } |
| 22 | 22 | |
| 23 | - public function setPlaceholder($value){ |
|
| 24 | - if(JString::isNotNull($value)) |
|
| 23 | + public function setPlaceholder($value) { |
|
| 24 | + if (JString::isNotNull($value)) |
|
| 25 | 25 | $this->setProperty("placeholder", $value); |
| 26 | 26 | return $this; |
| 27 | 27 | } |
| 28 | 28 | |
| 29 | - public function setRows($count){ |
|
| 29 | + public function setRows($count) { |
|
| 30 | 30 | $this->setProperty("rows", $count); |
| 31 | 31 | } |
| 32 | 32 | } |
| 33 | 33 | \ No newline at end of file |
@@ -11,18 +11,21 @@ |
||
| 11 | 11 | parent::__construct($identifier, "textarea"); |
| 12 | 12 | $this->setValue($value); |
| 13 | 13 | $this->setPlaceholder($placeholder); |
| 14 | - if(isset($rows)) |
|
| 15 | - $this->setRows($rows); |
|
| 14 | + if(isset($rows)) { |
|
| 15 | + $this->setRows($rows); |
|
| 16 | + } |
|
| 16 | 17 | } |
| 17 | 18 | public function setValue($value) { |
| 18 | - if(isset($value)) |
|
| 19 | - $this->setContent($value); |
|
| 19 | + if(isset($value)) { |
|
| 20 | + $this->setContent($value); |
|
| 21 | + } |
|
| 20 | 22 | return $this; |
| 21 | 23 | } |
| 22 | 24 | |
| 23 | 25 | public function setPlaceholder($value){ |
| 24 | - if(JString::isNotNull($value)) |
|
| 25 | - $this->setProperty("placeholder", $value); |
|
| 26 | + if(JString::isNotNull($value)) { |
|
| 27 | + $this->setProperty("placeholder", $value); |
|
| 28 | + } |
|
| 26 | 29 | return $this; |
| 27 | 30 | } |
| 28 | 31 | |
@@ -14,8 +14,8 @@ |
||
| 14 | 14 | parent::__construct($identifier, "ul"); |
| 15 | 15 | $this->addItems($items); |
| 16 | 16 | } |
| 17 | - public function setOrdered($ordered=true){ |
|
| 18 | - $this->tagName=($ordered===true)?"ol":"ul"; |
|
| 17 | + public function setOrdered($ordered=true) { |
|
| 18 | + $this->tagName=($ordered===true) ? "ol" : "ul"; |
|
| 19 | 19 | } |
| 20 | 20 | |
| 21 | 21 | /** |
@@ -25,7 +25,7 @@ discard block |
||
| 25 | 25 | public function addOption($element,$value="",$selected=false){ |
| 26 | 26 | if($element instanceof HtmlOption){ |
| 27 | 27 | $option=$element; |
| 28 | - }else{ |
|
| 28 | + } else{ |
|
| 29 | 29 | $option=new HtmlOption($this->identifier."-".count($this->options), $element,$value); |
| 30 | 30 | } |
| 31 | 31 | if($selected || $option->getValue()==$this->getProperty("value")){ |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | foreach ($array as $k=>$v){ |
| 65 | 65 | $this->addOption($v, $k); |
| 66 | 66 | } |
| 67 | - }else{ |
|
| 67 | + } else{ |
|
| 68 | 68 | foreach ($array as $v){ |
| 69 | 69 | $this->addOption($v, $v); |
| 70 | 70 | } |
@@ -13,7 +13,7 @@ discard block |
||
| 13 | 13 | private $default; |
| 14 | 14 | private $options; |
| 15 | 15 | |
| 16 | - public function __construct($identifier, $caption="",$default=NULL) { |
|
| 16 | + public function __construct($identifier, $caption="", $default=NULL) { |
|
| 17 | 17 | parent::__construct($identifier, "select"); |
| 18 | 18 | $this->setProperty("name", $identifier); |
| 19 | 19 | $this->setProperty("class", "form-control"); |
@@ -22,21 +22,21 @@ discard block |
||
| 22 | 22 | $this->options=array(); |
| 23 | 23 | } |
| 24 | 24 | |
| 25 | - public function addOption($element,$value="",$selected=false){ |
|
| 26 | - if($element instanceof HtmlOption){ |
|
| 25 | + public function addOption($element, $value="", $selected=false) { |
|
| 26 | + if ($element instanceof HtmlOption) { |
|
| 27 | 27 | $option=$element; |
| 28 | - }else{ |
|
| 29 | - $option=new HtmlOption($this->identifier."-".count($this->options), $element,$value); |
|
| 28 | + } else { |
|
| 29 | + $option=new HtmlOption($this->identifier."-".count($this->options), $element, $value); |
|
| 30 | 30 | } |
| 31 | - if($selected || $option->getValue()==$this->getProperty("value")){ |
|
| 31 | + if ($selected || $option->getValue()==$this->getProperty("value")) { |
|
| 32 | 32 | $option->select(); |
| 33 | 33 | } |
| 34 | 34 | $this->options[]=$option; |
| 35 | 35 | } |
| 36 | 36 | |
| 37 | 37 | public function setValue($value) { |
| 38 | - foreach ( $this->options as $option ) { |
|
| 39 | - if (strcasecmp($option->getValue(),$value)===0) { |
|
| 38 | + foreach ($this->options as $option) { |
|
| 39 | + if (strcasecmp($option->getValue(), $value)===0) { |
|
| 40 | 40 | $option->setProperty("selected", ""); |
| 41 | 41 | } |
| 42 | 42 | } |
@@ -49,23 +49,23 @@ discard block |
||
| 49 | 49 | */ |
| 50 | 50 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
| 51 | 51 | $this->content=array(); |
| 52 | - if(isset($this->default)){ |
|
| 52 | + if (isset($this->default)) { |
|
| 53 | 53 | $default=new HtmlOption("", $this->default); |
| 54 | 54 | $this->content[]=$default; |
| 55 | 55 | } |
| 56 | - foreach ($this->options as $option){ |
|
| 56 | + foreach ($this->options as $option) { |
|
| 57 | 57 | $this->content[]=$option; |
| 58 | 58 | } |
| 59 | 59 | return parent::compile($js, $view); |
| 60 | 60 | } |
| 61 | 61 | |
| 62 | - public function fromArray($array){ |
|
| 63 | - if(JArray::isAssociative($array)){ |
|
| 64 | - foreach ($array as $k=>$v){ |
|
| 62 | + public function fromArray($array) { |
|
| 63 | + if (JArray::isAssociative($array)) { |
|
| 64 | + foreach ($array as $k=>$v) { |
|
| 65 | 65 | $this->addOption($v, $k); |
| 66 | 66 | } |
| 67 | - }else{ |
|
| 68 | - foreach ($array as $v){ |
|
| 67 | + } else { |
|
| 68 | + foreach ($array as $v) { |
|
| 69 | 69 | $this->addOption($v, $v); |
| 70 | 70 | } |
| 71 | 71 | } |
@@ -98,7 +98,7 @@ discard block |
||
| 98 | 98 | $this->addOption($function($object)); |
| 99 | 99 | } |
| 100 | 100 | |
| 101 | - public function setSize($size){ |
|
| 101 | + public function setSize($size) { |
|
| 102 | 102 | return $this->setProperty("size", $size); |
| 103 | 103 | } |
| 104 | 104 | } |
@@ -12,8 +12,8 @@ discard block |
||
| 12 | 12 | $output=$input; |
| 13 | 13 | } |
| 14 | 14 | if (is_array($input)) { |
| 15 | - if (sizeof($input) > 0) { |
|
| 16 | - if (self::containsElement($input) === false) { |
|
| 15 | + if (sizeof($input)>0) { |
|
| 16 | + if (self::containsElement($input)===false) { |
|
| 17 | 17 | $output=self::wrapStrings($input, $js, $separator=' ', $valueQuote='"'); |
| 18 | 18 | } else { |
| 19 | 19 | $output=self::wrapObjects($input, $js, $separator, $valueQuote); |
@@ -24,17 +24,17 @@ discard block |
||
| 24 | 24 | } |
| 25 | 25 | |
| 26 | 26 | private static function containsElement($input) { |
| 27 | - foreach ( $input as $v ) { |
|
| 28 | - if (\is_object($v) === true || \is_array($v)) |
|
| 27 | + foreach ($input as $v) { |
|
| 28 | + if (\is_object($v)===true || \is_array($v)) |
|
| 29 | 29 | return true; |
| 30 | 30 | } |
| 31 | 31 | return false; |
| 32 | 32 | } |
| 33 | 33 | |
| 34 | 34 | public static function wrapStrings($input, $js, $separator=' ', $valueQuote='"') { |
| 35 | - if (JArray::isAssociative($input) === true) { |
|
| 36 | - $result=implode($separator, array_map(function ($v, $k) use($valueQuote) { |
|
| 37 | - return $k . '=' . $valueQuote . $v . $valueQuote; |
|
| 35 | + if (JArray::isAssociative($input)===true) { |
|
| 36 | + $result=implode($separator, array_map(function($v, $k) use($valueQuote) { |
|
| 37 | + return $k.'='.$valueQuote.$v.$valueQuote; |
|
| 38 | 38 | }, $input, array_keys($input))); |
| 39 | 39 | } else { |
| 40 | 40 | $result=implode($separator, array_values($input)); |
@@ -43,7 +43,7 @@ discard block |
||
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 | public static function wrapObjects($input, $js=NULL, $separator=' ', $valueQuote='"') { |
| 46 | - return implode($separator, array_map(function ($v) use($js, $separator, $valueQuote) { |
|
| 46 | + return implode($separator, array_map(function($v) use($js, $separator, $valueQuote) { |
|
| 47 | 47 | if (is_object($v)) |
| 48 | 48 | return $v->compile($js); |
| 49 | 49 | elseif (\is_array($v)) { |
@@ -25,8 +25,9 @@ discard block |
||
| 25 | 25 | |
| 26 | 26 | private static function containsElement($input) { |
| 27 | 27 | foreach ( $input as $v ) { |
| 28 | - if (\is_object($v) === true || \is_array($v)) |
|
| 29 | - return true; |
|
| 28 | + if (\is_object($v) === true || \is_array($v)) { |
|
| 29 | + return true; |
|
| 30 | + } |
|
| 30 | 31 | } |
| 31 | 32 | return false; |
| 32 | 33 | } |
@@ -44,12 +45,13 @@ discard block |
||
| 44 | 45 | |
| 45 | 46 | public static function wrapObjects($input, $js=NULL, $separator=' ', $valueQuote='"') { |
| 46 | 47 | return implode($separator, array_map(function ($v) use($js, $separator, $valueQuote) { |
| 47 | - if (is_object($v)) |
|
| 48 | - return $v->compile($js); |
|
| 49 | - elseif (\is_array($v)) { |
|
| 48 | + if (is_object($v)) { |
|
| 49 | + return $v->compile($js); |
|
| 50 | + } elseif (\is_array($v)) { |
|
| 50 | 51 | return self::wrap($v, $js, $separator, $valueQuote); |
| 51 | - } else |
|
| 52 | - return $v; |
|
| 52 | + } else { |
|
| 53 | + return $v; |
|
| 54 | + } |
|
| 53 | 55 | }, $input)); |
| 54 | 56 | } |
| 55 | 57 | } |
| 56 | 58 | \ No newline at end of file |
@@ -13,7 +13,7 @@ discard block |
||
| 13 | 13 | } |
| 14 | 14 | |
| 15 | 15 | public function setClass($classNames) { |
| 16 | - if(is_array($classNames)){ |
|
| 16 | + if (is_array($classNames)) { |
|
| 17 | 17 | $classNames=implode(" ", $classNames); |
| 18 | 18 | } |
| 19 | 19 | $this->setProperty("class", $classNames); |
@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | */ |
| 45 | 45 | public function fromArray($array) { |
| 46 | 46 | $array=parent::fromArray($array); |
| 47 | - foreach ( $array as $key => $value ) { |
|
| 47 | + foreach ($array as $key => $value) { |
|
| 48 | 48 | $this->setProperty($key, $value); |
| 49 | 49 | } |
| 50 | 50 | return $array; |
@@ -27,15 +27,15 @@ discard block |
||
| 27 | 27 | return $this->content; |
| 28 | 28 | } |
| 29 | 29 | |
| 30 | - public function addContent($content,$before=false) { |
|
| 30 | + public function addContent($content, $before=false) { |
|
| 31 | 31 | if (is_array($this->content)===false) { |
| 32 | - if(isset($this->content)) |
|
| 33 | - $this->content=array ($this->content); |
|
| 32 | + if (isset($this->content)) |
|
| 33 | + $this->content=array($this->content); |
|
| 34 | 34 | else |
| 35 | 35 | $this->content=array(); |
| 36 | 36 | } |
| 37 | - if($before) |
|
| 38 | - array_unshift($this->content,$content); |
|
| 37 | + if ($before) |
|
| 38 | + array_unshift($this->content, $content); |
|
| 39 | 39 | else |
| 40 | 40 | $this->content []=$content; |
| 41 | 41 | return $this; |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | if ($this->content instanceof HtmlDoubleElement) { |
| 51 | 51 | $this->content->run($js); |
| 52 | 52 | } else if (is_array($this->content)) { |
| 53 | - foreach ( $this->content as $itemContent ) { |
|
| 53 | + foreach ($this->content as $itemContent) { |
|
| 54 | 54 | if ($itemContent instanceof HtmlDoubleElement) { |
| 55 | 55 | $itemContent->run($js); |
| 56 | 56 | } |
@@ -29,15 +29,17 @@ |
||
| 29 | 29 | |
| 30 | 30 | public function addContent($content,$before=false) { |
| 31 | 31 | if (is_array($this->content)===false) { |
| 32 | - if(isset($this->content)) |
|
| 33 | - $this->content=array ($this->content); |
|
| 34 | - else |
|
| 35 | - $this->content=array(); |
|
| 32 | + if(isset($this->content)) { |
|
| 33 | + $this->content=array ($this->content); |
|
| 34 | + } else { |
|
| 35 | + $this->content=array(); |
|
| 36 | + } |
|
| 37 | + } |
|
| 38 | + if($before) { |
|
| 39 | + array_unshift($this->content,$content); |
|
| 40 | + } else { |
|
| 41 | + $this->content []=$content; |
|
| 36 | 42 | } |
| 37 | - if($before) |
|
| 38 | - array_unshift($this->content,$content); |
|
| 39 | - else |
|
| 40 | - $this->content []=$content; |
|
| 41 | 43 | return $this; |
| 42 | 44 | } |
| 43 | 45 | |
@@ -5,7 +5,7 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 | } |
@@ -14,21 +14,24 @@ discard block |
||
| 14 | 14 | return $array[$key]; |
| 15 | 15 | } |
| 16 | 16 | $values=array_values($array); |
| 17 | - if ($pos < sizeof($values)) |
|
| 18 | - return $values[$pos]; |
|
| 17 | + if ($pos < sizeof($values)) { |
|
| 18 | + return $values[$pos]; |
|
| 19 | + } |
|
| 19 | 20 | } |
| 20 | 21 | |
| 21 | 22 | public static function getConditionalValue($array, $key, $condition) { |
| 22 | 23 | $result=NULL; |
| 23 | 24 | if (array_key_exists($key, $array)) { |
| 24 | 25 | $result=$array[$key]; |
| 25 | - if ($condition($result) === true) |
|
| 26 | - return $result; |
|
| 26 | + if ($condition($result) === true) { |
|
| 27 | + return $result; |
|
| 28 | + } |
|
| 27 | 29 | } |
| 28 | 30 | $values=array_values($array); |
| 29 | 31 | foreach ( $values as $val ) { |
| 30 | - if ($condition($val) === true) |
|
| 31 | - return $val; |
|
| 32 | + if ($condition($val) === true) { |
|
| 33 | + return $val; |
|
| 34 | + } |
|
| 32 | 35 | } |
| 33 | 36 | return $result; |
| 34 | 37 | } |
@@ -36,8 +39,9 @@ discard block |
||
| 36 | 39 | public static function getDefaultValue($array, $key, $default=NULL) { |
| 37 | 40 | if (array_key_exists($key, $array)) { |
| 38 | 41 | return $array[$key]; |
| 39 | - } else |
|
| 40 | - return $default; |
|
| 42 | + } else { |
|
| 43 | + return $default; |
|
| 44 | + } |
|
| 41 | 45 | } |
| 42 | 46 | |
| 43 | 47 | public static function implode($glue, $pieces) { |
@@ -30,7 +30,7 @@ |
||
| 30 | 30 | if ($stopPropagation===true) { |
| 31 | 31 | $result.="event.stopPropagation();\n"; |
| 32 | 32 | } |
| 33 | - switch($this->method) { |
|
| 33 | + switch ($this->method) { |
|
| 34 | 34 | case "get": |
| 35 | 35 | $result.=$js->getDeferred($url, $responseElement, $params, $callback, $attr); |
| 36 | 36 | break; |
@@ -14,8 +14,9 @@ |
||
| 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 | $callback=NULL; |