@@ -39,8 +39,9 @@ discard block |
||
| 39 | 39 | $this->param1 = new Text($m[1],Text::TOKEN_HTML); |
| 40 | 40 | $this->param2 = new Text($m[3],Text::TOKEN_HTML); |
| 41 | 41 | $this->operator = $m[2]; |
| 42 | - } else |
|
| 43 | - $this->param1 = new Text($s,Text::TOKEN_HTML); |
|
| 42 | + } else { |
|
| 43 | + $this->param1 = new Text($s,Text::TOKEN_HTML); |
|
| 44 | + } |
|
| 44 | 45 | } |
| 45 | 46 | |
| 46 | 47 | // function __construct(String $p1, String $p2, $operator) { |
@@ -49,7 +50,9 @@ discard block |
||
| 49 | 50 | // $this->operator = $operator; |
| 50 | 51 | // } |
| 51 | 52 | function toPHP() { |
| 52 | - if(!$this->param2) return $this->param1->toPHP(); |
|
| 53 | + if(!$this->param2) { |
|
| 54 | + return $this->param1->toPHP(); |
|
| 55 | + } |
|
| 53 | 56 | $p1 = $this->param1->toPHP(); |
| 54 | 57 | $p2 = $this->param2->toPHP(); |
| 55 | 58 | switch($this->operator) { |
@@ -35,12 +35,12 @@ discard block |
||
| 35 | 35 | |
| 36 | 36 | function __construct($s, $mode = self::TOKEN_CONTROL) { |
| 37 | 37 | $m = array(); |
| 38 | - if(preg_match('/^(.*) '.self::REGEX_COMP_OPER.' (.*)$/', $s, $m)) { |
|
| 39 | - $this->param1 = new Text($m[1],Text::TOKEN_HTML); |
|
| 40 | - $this->param2 = new Text($m[3],Text::TOKEN_HTML); |
|
| 38 | + if (preg_match('/^(.*) '.self::REGEX_COMP_OPER.' (.*)$/', $s, $m)) { |
|
| 39 | + $this->param1 = new Text($m[1], Text::TOKEN_HTML); |
|
| 40 | + $this->param2 = new Text($m[3], Text::TOKEN_HTML); |
|
| 41 | 41 | $this->operator = $m[2]; |
| 42 | 42 | } else |
| 43 | - $this->param1 = new Text($s,Text::TOKEN_HTML); |
|
| 43 | + $this->param1 = new Text($s, Text::TOKEN_HTML); |
|
| 44 | 44 | } |
| 45 | 45 | |
| 46 | 46 | // function __construct(String $p1, String $p2, $operator) { |
@@ -49,10 +49,10 @@ discard block |
||
| 49 | 49 | // $this->operator = $operator; |
| 50 | 50 | // } |
| 51 | 51 | function toPHP() { |
| 52 | - if(!$this->param2) return $this->param1->toPHP(); |
|
| 52 | + if (!$this->param2) return $this->param1->toPHP(); |
|
| 53 | 53 | $p1 = $this->param1->toPHP(); |
| 54 | 54 | $p2 = $this->param2->toPHP(); |
| 55 | - switch($this->operator) { |
|
| 55 | + switch ($this->operator) { |
|
| 56 | 56 | case "equals": |
| 57 | 57 | case "equal": |
| 58 | 58 | return $p1." == ".$p2; |
@@ -31,7 +31,8 @@ |
||
| 31 | 31 | function __construct($s) { |
| 32 | 32 | $s = explode("->", $s, 2); |
| 33 | 33 | $this->key = $s[0]; |
| 34 | - if (count($s) > 1) |
|
| 35 | - $this->sel = $s[1]; |
|
| 34 | + if (count($s) > 1) { |
|
| 35 | + $this->sel = $s[1]; |
|
| 36 | + } |
|
| 36 | 37 | } |
| 37 | 38 | } |
| 38 | 39 | \ No newline at end of file |
@@ -36,14 +36,18 @@ |
||
| 36 | 36 | function getInputAttDynamic(&$atts, &$type, &$content) { |
| 37 | 37 | parent::getInputAttDynamic($atts, $type, $content); |
| 38 | 38 | $atts['value'] = "ON"; |
| 39 | - if ($this->getValue()) |
|
| 40 | - $atts['checked'] = "checked"; |
|
| 39 | + if ($this->getValue()) { |
|
| 40 | + $atts['checked'] = "checked"; |
|
| 41 | + } |
|
| 41 | 42 | } |
| 42 | 43 | |
| 43 | 44 | function getValue() { |
| 44 | - if (!is_null($this->setValue)) return $this->setValue; |
|
| 45 | - if (isset($_REQUEST[$this->form . "__submit"])) |
|
| 46 | - return isset($_REQUEST[$this->form . "_" . $this->name]); |
|
| 45 | + if (!is_null($this->setValue)) { |
|
| 46 | + return $this->setValue; |
|
| 47 | + } |
|
| 48 | + if (isset($_REQUEST[$this->form . "__submit"])) { |
|
| 49 | + return isset($_REQUEST[$this->form . "_" . $this->name]); |
|
| 50 | + } |
|
| 47 | 51 | return $this->opt['default']; |
| 48 | 52 | } |
| 49 | 53 | } |
| 50 | 54 | \ No newline at end of file |
@@ -42,8 +42,8 @@ |
||
| 42 | 42 | |
| 43 | 43 | function getValue() { |
| 44 | 44 | if (!is_null($this->setValue)) return $this->setValue; |
| 45 | - if (isset($_REQUEST[$this->form . "__submit"])) |
|
| 46 | - return isset($_REQUEST[$this->form . "_" . $this->name]); |
|
| 45 | + if (isset($_REQUEST[$this->form."__submit"])) |
|
| 46 | + return isset($_REQUEST[$this->form."_".$this->name]); |
|
| 47 | 47 | return $this->opt['default']; |
| 48 | 48 | } |
| 49 | 49 | } |
| 50 | 50 | \ No newline at end of file |
@@ -41,7 +41,9 @@ discard block |
||
| 41 | 41 | public function cachePath($f) {
|
| 42 | 42 | $s = DIRECTORY_SEPARATOR; |
| 43 | 43 | $dir = implode($s,[__DIR__,"..","..","cache",""]); |
| 44 | - if(!is_dir($dir)) mkdir($dir); |
|
| 44 | + if(!is_dir($dir)) { |
|
| 45 | + mkdir($dir); |
|
| 46 | + } |
|
| 45 | 47 | return $dir.$f; |
| 46 | 48 | } |
| 47 | 49 | |
@@ -67,8 +69,9 @@ discard block |
||
| 67 | 69 | * @throws Exception\RunTime |
| 68 | 70 | */ |
| 69 | 71 | public function getModelTypeID($typeId, $sort = [], $limit = 0, $offset = 0) {
|
| 70 | - if(count($typeId) > 1) |
|
| 71 | - throw new Exception\RunTime("Unable to open more than one ID at a time");
|
|
| 72 | + if(count($typeId) > 1) { |
|
| 73 | + throw new Exception\RunTime("Unable to open more than one ID at a time"); |
|
| 74 | + } |
|
| 72 | 75 | return new Model\Zero(); |
| 73 | 76 | } |
| 74 | 77 | |
@@ -40,8 +40,8 @@ discard block |
||
| 40 | 40 | */ |
| 41 | 41 | public function cachePath($f) {
|
| 42 | 42 | $s = DIRECTORY_SEPARATOR; |
| 43 | - $dir = implode($s,[__DIR__,"..","..","cache",""]); |
|
| 44 | - if(!is_dir($dir)) mkdir($dir); |
|
| 43 | + $dir = implode($s, [__DIR__, "..", "..", "cache", ""]); |
|
| 44 | + if (!is_dir($dir)) mkdir($dir); |
|
| 45 | 45 | return $dir.$f; |
| 46 | 46 | } |
| 47 | 47 | |
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | * @throws Exception\RunTime |
| 68 | 68 | */ |
| 69 | 69 | public function getModelTypeID($typeId, $sort = [], $limit = 0, $offset = 0) {
|
| 70 | - if(count($typeId) > 1) |
|
| 70 | + if (count($typeId) > 1) |
|
| 71 | 71 | throw new Exception\RunTime("Unable to open more than one ID at a time");
|
| 72 | 72 | return new Model\Zero(); |
| 73 | 73 | } |
@@ -35,8 +35,9 @@ |
||
| 35 | 35 | } |
| 36 | 36 | |
| 37 | 37 | function hamleGet($key) { |
| 38 | - if (!isset($this->data[$this->pos][$key])) |
|
| 39 | - return "Missing Key [$key]"; |
|
| 38 | + if (!isset($this->data[$this->pos][$key])) { |
|
| 39 | + return "Missing Key [$key]"; |
|
| 40 | + } |
|
| 40 | 41 | return $this->data[$this->pos][$key]; |
| 41 | 42 | } |
| 42 | 43 | |
@@ -32,7 +32,7 @@ |
||
| 32 | 32 | |
| 33 | 33 | function __construct($message = "", $code = 0, $previous = NULL) { |
| 34 | 34 | ///@todo Include Line number & file name within parse error exceptions |
| 35 | - $message .= ", on line " . Hamle\Hamle::getLineNo() . " in file ?.hamle"; |
|
| 35 | + $message .= ", on line ".Hamle\Hamle::getLineNo()." in file ?.hamle"; |
|
| 36 | 36 | parent::__construct($message, $code, $previous); |
| 37 | 37 | } |
| 38 | 38 | |
@@ -42,6 +42,6 @@ |
||
| 42 | 42 | } |
| 43 | 43 | |
| 44 | 44 | function isClicked() { |
| 45 | - return isset($_REQUEST[$this->form . "_" . $this->name]); |
|
| 45 | + return isset($_REQUEST[$this->form."_".$this->name]); |
|
| 46 | 46 | } |
| 47 | 47 | } |
| 48 | 48 | \ No newline at end of file |
@@ -39,8 +39,8 @@ |
||
| 39 | 39 | } |
| 40 | 40 | |
| 41 | 41 | static function filterText($s) { |
| 42 | - return "/*<![CDATA[*/\n" . |
|
| 42 | + return "/*<![CDATA[*/\n". |
|
| 43 | 43 | /*preg_replace(HamlParser::MATCH_INTERPOLATION, '<?php echo \1; ?>', $text)*/ |
| 44 | - $s . "/*]]>*/"; |
|
| 44 | + $s."/*]]>*/"; |
|
| 45 | 45 | } |
| 46 | 46 | } |
| 47 | 47 | \ No newline at end of file |
@@ -35,10 +35,10 @@ |
||
| 35 | 35 | } |
| 36 | 36 | |
| 37 | 37 | function toPHP() { |
| 38 | - return '$form->getField(' . Text::varToCode($this->var) . ')->getValue()'; |
|
| 38 | + return '$form->getField('.Text::varToCode($this->var).')->getValue()'; |
|
| 39 | 39 | } |
| 40 | 40 | |
| 41 | 41 | function toHTML($escape = false) { |
| 42 | - return '<?=' . $this->toPHP() . '?>'; |
|
| 42 | + return '<?='.$this->toPHP().'?>'; |
|
| 43 | 43 | } |
| 44 | 44 | } |
| 45 | 45 | \ No newline at end of file |