@@ -30,14 +30,14 @@ |
||
30 | 30 | */ |
31 | 31 | class PluginCountSentences extends Plugin implements ICompilable |
32 | 32 | { |
33 | - /** |
|
34 | - * @param Compiler $compiler |
|
35 | - * @param string $value |
|
36 | - * |
|
37 | - * @return string |
|
38 | - */ |
|
39 | - public static function compile(Compiler $compiler, $value) |
|
40 | - { |
|
41 | - return "preg_match_all('#[\\w\\pL]\\.(?![\\w\\pL])#u', $value, \$tmp)"; |
|
42 | - } |
|
33 | + /** |
|
34 | + * @param Compiler $compiler |
|
35 | + * @param string $value |
|
36 | + * |
|
37 | + * @return string |
|
38 | + */ |
|
39 | + public static function compile(Compiler $compiler, $value) |
|
40 | + { |
|
41 | + return "preg_match_all('#[\\w\\pL]\\.(?![\\w\\pL])#u', $value, \$tmp)"; |
|
42 | + } |
|
43 | 43 | } |
44 | 44 | \ No newline at end of file |
@@ -32,16 +32,16 @@ |
||
32 | 32 | */ |
33 | 33 | class PluginIndent extends Plugin implements ICompilable |
34 | 34 | { |
35 | - /** |
|
36 | - * @param Compiler $compiler |
|
37 | - * @param string $value |
|
38 | - * @param int $by |
|
39 | - * @param string $char |
|
40 | - * |
|
41 | - * @return string |
|
42 | - */ |
|
43 | - public static function compile(Compiler $compiler, $value, $by = 4, $char = ' ') |
|
44 | - { |
|
45 | - return "preg_replace('#^#m', '" . str_repeat(substr($char, 1, - 1), trim($by, '"\'')) . "', $value)"; |
|
46 | - } |
|
35 | + /** |
|
36 | + * @param Compiler $compiler |
|
37 | + * @param string $value |
|
38 | + * @param int $by |
|
39 | + * @param string $char |
|
40 | + * |
|
41 | + * @return string |
|
42 | + */ |
|
43 | + public static function compile(Compiler $compiler, $value, $by = 4, $char = ' ') |
|
44 | + { |
|
45 | + return "preg_replace('#^#m', '" . str_repeat(substr($char, 1, - 1), trim($by, '"\'')) . "', $value)"; |
|
46 | + } |
|
47 | 47 | } |
48 | 48 | \ No newline at end of file |
@@ -42,6 +42,6 @@ |
||
42 | 42 | */ |
43 | 43 | public static function compile(Compiler $compiler, $value, $by = 4, $char = ' ') |
44 | 44 | { |
45 | - return "preg_replace('#^#m', '" . str_repeat(substr($char, 1, - 1), trim($by, '"\'')) . "', $value)"; |
|
45 | + return "preg_replace('#^#m', '".str_repeat(substr($char, 1, - 1), trim($by, '"\''))."', $value)"; |
|
46 | 46 | } |
47 | 47 | } |
48 | 48 | \ No newline at end of file |
@@ -33,37 +33,37 @@ |
||
33 | 33 | */ |
34 | 34 | class PluginTruncate extends Plugin |
35 | 35 | { |
36 | - /** |
|
37 | - * @param string $value |
|
38 | - * @param int $length |
|
39 | - * @param string $etc |
|
40 | - * @param bool $break |
|
41 | - * @param bool $middle |
|
42 | - * |
|
43 | - * @return mixed|string |
|
44 | - */ |
|
45 | - public function process($value, $length = 80, $etc = '...', $break = false, $middle = false) |
|
46 | - { |
|
47 | - if ($length == 0) { |
|
48 | - return ''; |
|
49 | - } |
|
36 | + /** |
|
37 | + * @param string $value |
|
38 | + * @param int $length |
|
39 | + * @param string $etc |
|
40 | + * @param bool $break |
|
41 | + * @param bool $middle |
|
42 | + * |
|
43 | + * @return mixed|string |
|
44 | + */ |
|
45 | + public function process($value, $length = 80, $etc = '...', $break = false, $middle = false) |
|
46 | + { |
|
47 | + if ($length == 0) { |
|
48 | + return ''; |
|
49 | + } |
|
50 | 50 | |
51 | - $value = (string)$value; |
|
52 | - $etc = (string)$etc; |
|
53 | - $length = (int)$length; |
|
51 | + $value = (string)$value; |
|
52 | + $etc = (string)$etc; |
|
53 | + $length = (int)$length; |
|
54 | 54 | |
55 | - if (strlen($value) < $length) { |
|
56 | - return $value; |
|
57 | - } |
|
55 | + if (strlen($value) < $length) { |
|
56 | + return $value; |
|
57 | + } |
|
58 | 58 | |
59 | - $length = max($length - strlen($etc), 0); |
|
60 | - if ($break === false && $middle === false) { |
|
61 | - $value = preg_replace('#\s+(\S*)?$#', '', substr($value, 0, $length + 1)); |
|
62 | - } |
|
63 | - if ($middle === false) { |
|
64 | - return substr($value, 0, $length) . $etc; |
|
65 | - } |
|
59 | + $length = max($length - strlen($etc), 0); |
|
60 | + if ($break === false && $middle === false) { |
|
61 | + $value = preg_replace('#\s+(\S*)?$#', '', substr($value, 0, $length + 1)); |
|
62 | + } |
|
63 | + if ($middle === false) { |
|
64 | + return substr($value, 0, $length) . $etc; |
|
65 | + } |
|
66 | 66 | |
67 | - return substr($value, 0, ceil($length / 2)) . $etc . substr($value, - floor($length / 2)); |
|
68 | - } |
|
67 | + return substr($value, 0, ceil($length / 2)) . $etc . substr($value, - floor($length / 2)); |
|
68 | + } |
|
69 | 69 | } |
70 | 70 | \ No newline at end of file |
@@ -48,22 +48,22 @@ |
||
48 | 48 | return ''; |
49 | 49 | } |
50 | 50 | |
51 | - $value = (string)$value; |
|
52 | - $etc = (string)$etc; |
|
53 | - $length = (int)$length; |
|
51 | + $value = (string) $value; |
|
52 | + $etc = (string) $etc; |
|
53 | + $length = (int) $length; |
|
54 | 54 | |
55 | 55 | if (strlen($value) < $length) { |
56 | 56 | return $value; |
57 | 57 | } |
58 | 58 | |
59 | - $length = max($length - strlen($etc), 0); |
|
59 | + $length = max($length-strlen($etc), 0); |
|
60 | 60 | if ($break === false && $middle === false) { |
61 | - $value = preg_replace('#\s+(\S*)?$#', '', substr($value, 0, $length + 1)); |
|
61 | + $value = preg_replace('#\s+(\S*)?$#', '', substr($value, 0, $length+1)); |
|
62 | 62 | } |
63 | 63 | if ($middle === false) { |
64 | - return substr($value, 0, $length) . $etc; |
|
64 | + return substr($value, 0, $length).$etc; |
|
65 | 65 | } |
66 | 66 | |
67 | - return substr($value, 0, ceil($length / 2)) . $etc . substr($value, - floor($length / 2)); |
|
67 | + return substr($value, 0, ceil($length/2)).$etc.substr($value, - floor($length/2)); |
|
68 | 68 | } |
69 | 69 | } |
70 | 70 | \ No newline at end of file |
@@ -31,15 +31,15 @@ |
||
31 | 31 | */ |
32 | 32 | class PluginDefault extends Plugin implements ICompilable |
33 | 33 | { |
34 | - /** |
|
35 | - * @param Compiler $compiler |
|
36 | - * @param mixed $value |
|
37 | - * @param string $default |
|
38 | - * |
|
39 | - * @return string |
|
40 | - */ |
|
41 | - public static function compile(Compiler $compiler, $value, $default = '') |
|
42 | - { |
|
43 | - return '(($tmp = ' . $value . ')===null||$tmp===\'\' ? ' . $default . ' : $tmp)'; |
|
44 | - } |
|
34 | + /** |
|
35 | + * @param Compiler $compiler |
|
36 | + * @param mixed $value |
|
37 | + * @param string $default |
|
38 | + * |
|
39 | + * @return string |
|
40 | + */ |
|
41 | + public static function compile(Compiler $compiler, $value, $default = '') |
|
42 | + { |
|
43 | + return '(($tmp = ' . $value . ')===null||$tmp===\'\' ? ' . $default . ' : $tmp)'; |
|
44 | + } |
|
45 | 45 | } |
46 | 46 | \ No newline at end of file |
@@ -40,6 +40,6 @@ |
||
40 | 40 | */ |
41 | 41 | public static function compile(Compiler $compiler, $value, $default = '') |
42 | 42 | { |
43 | - return '(($tmp = ' . $value . ')===null||$tmp===\'\' ? ' . $default . ' : $tmp)'; |
|
43 | + return '(($tmp = '.$value.')===null||$tmp===\'\' ? '.$default.' : $tmp)'; |
|
44 | 44 | } |
45 | 45 | } |
46 | 46 | \ No newline at end of file |
@@ -30,15 +30,15 @@ |
||
30 | 30 | */ |
31 | 31 | class PluginCat extends Plugin implements ICompilable |
32 | 32 | { |
33 | - /** |
|
34 | - * @param Compiler $compiler |
|
35 | - * @param string $value |
|
36 | - * @param array $rest |
|
37 | - * |
|
38 | - * @return string |
|
39 | - */ |
|
40 | - public static function compile(Compiler $compiler, $value, array $rest) |
|
41 | - { |
|
42 | - return '(' . $value . ').(' . implode(').(', $rest) . ')'; |
|
43 | - } |
|
33 | + /** |
|
34 | + * @param Compiler $compiler |
|
35 | + * @param string $value |
|
36 | + * @param array $rest |
|
37 | + * |
|
38 | + * @return string |
|
39 | + */ |
|
40 | + public static function compile(Compiler $compiler, $value, array $rest) |
|
41 | + { |
|
42 | + return '(' . $value . ').(' . implode(').(', $rest) . ')'; |
|
43 | + } |
|
44 | 44 | } |
@@ -39,6 +39,6 @@ |
||
39 | 39 | */ |
40 | 40 | public static function compile(Compiler $compiler, $value, array $rest) |
41 | 41 | { |
42 | - return '(' . $value . ').(' . implode(').(', $rest) . ')'; |
|
42 | + return '('.$value.').('.implode(').(', $rest).')'; |
|
43 | 43 | } |
44 | 44 | } |
@@ -31,19 +31,19 @@ |
||
31 | 31 | */ |
32 | 32 | class PluginCountCharacters extends Plugin implements ICompilable |
33 | 33 | { |
34 | - /** |
|
35 | - * @param Compiler $compiler |
|
36 | - * @param string $value |
|
37 | - * @param bool $count_spaces |
|
38 | - * |
|
39 | - * @return string |
|
40 | - */ |
|
41 | - public static function compile(Compiler $compiler, $value, $count_spaces = false) |
|
42 | - { |
|
43 | - if ($count_spaces === 'false') { |
|
44 | - return 'preg_match_all(\'#[^\s\pZ]#u\', ' . $value . ', $tmp)'; |
|
45 | - } |
|
34 | + /** |
|
35 | + * @param Compiler $compiler |
|
36 | + * @param string $value |
|
37 | + * @param bool $count_spaces |
|
38 | + * |
|
39 | + * @return string |
|
40 | + */ |
|
41 | + public static function compile(Compiler $compiler, $value, $count_spaces = false) |
|
42 | + { |
|
43 | + if ($count_spaces === 'false') { |
|
44 | + return 'preg_match_all(\'#[^\s\pZ]#u\', ' . $value . ', $tmp)'; |
|
45 | + } |
|
46 | 46 | |
47 | - return 'mb_strlen(' . $value . ', $this->charset)'; |
|
48 | - } |
|
47 | + return 'mb_strlen(' . $value . ', $this->charset)'; |
|
48 | + } |
|
49 | 49 | } |
50 | 50 | \ No newline at end of file |
@@ -41,9 +41,9 @@ |
||
41 | 41 | public static function compile(Compiler $compiler, $value, $count_spaces = false) |
42 | 42 | { |
43 | 43 | if ($count_spaces === 'false') { |
44 | - return 'preg_match_all(\'#[^\s\pZ]#u\', ' . $value . ', $tmp)'; |
|
44 | + return 'preg_match_all(\'#[^\s\pZ]#u\', '.$value.', $tmp)'; |
|
45 | 45 | } |
46 | 46 | |
47 | - return 'mb_strlen(' . $value . ', $this->charset)'; |
|
47 | + return 'mb_strlen('.$value.', $this->charset)'; |
|
48 | 48 | } |
49 | 49 | } |
50 | 50 | \ No newline at end of file |
@@ -28,37 +28,37 @@ discard block |
||
28 | 28 | */ |
29 | 29 | class PluginExtendsCheck extends Plugin implements ICompilable |
30 | 30 | { |
31 | - /** |
|
32 | - * @param Compiler $compiler |
|
33 | - * @param $file |
|
34 | - * |
|
35 | - * @return string |
|
36 | - * @throws CompilationException |
|
37 | - */ |
|
38 | - public static function compile(Compiler $compiler, $file) |
|
39 | - { |
|
40 | - preg_match('#^["\']([a-z]{2,}):(.*?)["\']$#i', $file, $m); |
|
41 | - $resource = $m[1]; |
|
42 | - $identifier = $m[2]; |
|
31 | + /** |
|
32 | + * @param Compiler $compiler |
|
33 | + * @param $file |
|
34 | + * |
|
35 | + * @return string |
|
36 | + * @throws CompilationException |
|
37 | + */ |
|
38 | + public static function compile(Compiler $compiler, $file) |
|
39 | + { |
|
40 | + preg_match('#^["\']([a-z]{2,}):(.*?)["\']$#i', $file, $m); |
|
41 | + $resource = $m[1]; |
|
42 | + $identifier = $m[2]; |
|
43 | 43 | |
44 | - $tpl = $compiler->getDwoo()->templateFactory($resource, $identifier); |
|
44 | + $tpl = $compiler->getDwoo()->templateFactory($resource, $identifier); |
|
45 | 45 | |
46 | - if ($tpl === null) { |
|
47 | - throw new CompilationException($compiler, |
|
48 | - 'Load Templates : Resource "' . $resource . ':' . $identifier . '" not found.'); |
|
49 | - } elseif ($tpl === false) { |
|
50 | - throw new CompilationException($compiler, |
|
51 | - 'Load Templates : Resource "' . $resource . '" does not support includes.'); |
|
52 | - } |
|
46 | + if ($tpl === null) { |
|
47 | + throw new CompilationException($compiler, |
|
48 | + 'Load Templates : Resource "' . $resource . ':' . $identifier . '" not found.'); |
|
49 | + } elseif ($tpl === false) { |
|
50 | + throw new CompilationException($compiler, |
|
51 | + 'Load Templates : Resource "' . $resource . '" does not support includes.'); |
|
52 | + } |
|
53 | 53 | |
54 | - $out = '\'\';// checking for modification in ' . $resource . ':' . $identifier . "\r\n"; |
|
54 | + $out = '\'\';// checking for modification in ' . $resource . ':' . $identifier . "\r\n"; |
|
55 | 55 | |
56 | - $modCheck = $tpl->getIsModifiedCode(); |
|
56 | + $modCheck = $tpl->getIsModifiedCode(); |
|
57 | 57 | |
58 | - if ($modCheck) { |
|
59 | - $out .= 'if (!(' . $modCheck . ')) { ob_end_clean(); return false; }'; |
|
60 | - } else { |
|
61 | - $out .= 'try { |
|
58 | + if ($modCheck) { |
|
59 | + $out .= 'if (!(' . $modCheck . ')) { ob_end_clean(); return false; }'; |
|
60 | + } else { |
|
61 | + $out .= 'try { |
|
62 | 62 | $tpl = $this->templateFactory("' . $resource . '", "' . $identifier . '"); |
63 | 63 | } catch (Dwoo\Exception $e) { |
64 | 64 | $this->triggerError(\'Load Templates : Resource <em>' . $resource . '</em> was not added to Dwoo, can not extend <em>' . $identifier . '</em>\', E_USER_WARNING); |
@@ -68,8 +68,8 @@ discard block |
||
68 | 68 | elseif ($tpl === false) |
69 | 69 | $this->triggerError(\'Load Templates : Resource "' . $resource . '" does not support extends.\', E_USER_WARNING); |
70 | 70 | if ($tpl->getUid() != "' . $tpl->getUid() . '") { ob_end_clean(); return false; }'; |
71 | - } |
|
71 | + } |
|
72 | 72 | |
73 | - return $out; |
|
74 | - } |
|
73 | + return $out; |
|
74 | + } |
|
75 | 75 | } |
76 | 76 | \ No newline at end of file |
@@ -45,29 +45,29 @@ |
||
45 | 45 | |
46 | 46 | if ($tpl === null) { |
47 | 47 | throw new CompilationException($compiler, |
48 | - 'Load Templates : Resource "' . $resource . ':' . $identifier . '" not found.'); |
|
48 | + 'Load Templates : Resource "'.$resource.':'.$identifier.'" not found.'); |
|
49 | 49 | } elseif ($tpl === false) { |
50 | 50 | throw new CompilationException($compiler, |
51 | - 'Load Templates : Resource "' . $resource . '" does not support includes.'); |
|
51 | + 'Load Templates : Resource "'.$resource.'" does not support includes.'); |
|
52 | 52 | } |
53 | 53 | |
54 | - $out = '\'\';// checking for modification in ' . $resource . ':' . $identifier . "\r\n"; |
|
54 | + $out = '\'\';// checking for modification in '.$resource.':'.$identifier."\r\n"; |
|
55 | 55 | |
56 | 56 | $modCheck = $tpl->getIsModifiedCode(); |
57 | 57 | |
58 | 58 | if ($modCheck) { |
59 | - $out .= 'if (!(' . $modCheck . ')) { ob_end_clean(); return false; }'; |
|
59 | + $out .= 'if (!('.$modCheck.')) { ob_end_clean(); return false; }'; |
|
60 | 60 | } else { |
61 | 61 | $out .= 'try { |
62 | - $tpl = $this->templateFactory("' . $resource . '", "' . $identifier . '"); |
|
62 | + $tpl = $this->templateFactory("' . $resource.'", "'.$identifier.'"); |
|
63 | 63 | } catch (Dwoo\Exception $e) { |
64 | - $this->triggerError(\'Load Templates : Resource <em>' . $resource . '</em> was not added to Dwoo, can not extend <em>' . $identifier . '</em>\', E_USER_WARNING); |
|
64 | + $this->triggerError(\'Load Templates : Resource <em>' . $resource.'</em> was not added to Dwoo, can not extend <em>'.$identifier.'</em>\', E_USER_WARNING); |
|
65 | 65 | } |
66 | 66 | if ($tpl === null) |
67 | - $this->triggerError(\'Load Templates : Resource "' . $resource . ':' . $identifier . '" was not found.\', E_USER_WARNING); |
|
67 | + $this->triggerError(\'Load Templates : Resource "' . $resource.':'.$identifier.'" was not found.\', E_USER_WARNING); |
|
68 | 68 | elseif ($tpl === false) |
69 | - $this->triggerError(\'Load Templates : Resource "' . $resource . '" does not support extends.\', E_USER_WARNING); |
|
70 | -if ($tpl->getUid() != "' . $tpl->getUid() . '") { ob_end_clean(); return false; }'; |
|
69 | + $this->triggerError(\'Load Templates : Resource "' . $resource.'" does not support extends.\', E_USER_WARNING); |
|
70 | +if ($tpl->getUid() != "' . $tpl->getUid().'") { ob_end_clean(); return false; }'; |
|
71 | 71 | } |
72 | 72 | |
73 | 73 | return $out; |
@@ -30,14 +30,14 @@ |
||
30 | 30 | */ |
31 | 31 | class PluginNl2br extends Plugin implements ICompilable |
32 | 32 | { |
33 | - /** |
|
34 | - * @param Compiler $compiler |
|
35 | - * @param string $value |
|
36 | - * |
|
37 | - * @return string |
|
38 | - */ |
|
39 | - public static function compile(Compiler $compiler, $value) |
|
40 | - { |
|
41 | - return 'nl2br((string) ' . $value . ')'; |
|
42 | - } |
|
33 | + /** |
|
34 | + * @param Compiler $compiler |
|
35 | + * @param string $value |
|
36 | + * |
|
37 | + * @return string |
|
38 | + */ |
|
39 | + public static function compile(Compiler $compiler, $value) |
|
40 | + { |
|
41 | + return 'nl2br((string) ' . $value . ')'; |
|
42 | + } |
|
43 | 43 | } |
44 | 44 | \ No newline at end of file |
@@ -38,6 +38,6 @@ |
||
38 | 38 | */ |
39 | 39 | public static function compile(Compiler $compiler, $value) |
40 | 40 | { |
41 | - return 'nl2br((string) ' . $value . ')'; |
|
41 | + return 'nl2br((string) '.$value.')'; |
|
42 | 42 | } |
43 | 43 | } |
44 | 44 | \ No newline at end of file |
@@ -41,159 +41,159 @@ |
||
41 | 41 | */ |
42 | 42 | class PluginMath extends Plugin implements ICompilable |
43 | 43 | { |
44 | - /** |
|
45 | - * @param Compiler $compiler |
|
46 | - * @param string $equation |
|
47 | - * @param string $format |
|
48 | - * @param string $assign |
|
49 | - * @param array $rest |
|
50 | - * |
|
51 | - * @return string |
|
52 | - * @throws CompilationException |
|
53 | - */ |
|
54 | - public static function compile(Compiler $compiler, $equation, $format = '', $assign = '', array $rest = array()) |
|
55 | - { |
|
56 | - /* |
|
44 | + /** |
|
45 | + * @param Compiler $compiler |
|
46 | + * @param string $equation |
|
47 | + * @param string $format |
|
48 | + * @param string $assign |
|
49 | + * @param array $rest |
|
50 | + * |
|
51 | + * @return string |
|
52 | + * @throws CompilationException |
|
53 | + */ |
|
54 | + public static function compile(Compiler $compiler, $equation, $format = '', $assign = '', array $rest = array()) |
|
55 | + { |
|
56 | + /* |
|
57 | 57 | * Holds the allowed function, characters, operators and constants |
58 | 58 | */ |
59 | - $allowed = array( |
|
60 | - '0', |
|
61 | - '1', |
|
62 | - '2', |
|
63 | - '3', |
|
64 | - '4', |
|
65 | - '5', |
|
66 | - '6', |
|
67 | - '7', |
|
68 | - '8', |
|
69 | - '9', |
|
70 | - '+', |
|
71 | - '-', |
|
72 | - '/', |
|
73 | - '*', |
|
74 | - '.', |
|
75 | - ' ', |
|
76 | - '<<', |
|
77 | - '>>', |
|
78 | - '%', |
|
79 | - '&', |
|
80 | - '^', |
|
81 | - '|', |
|
82 | - '~', |
|
83 | - 'abs(', |
|
84 | - 'ceil(', |
|
85 | - 'floor(', |
|
86 | - 'exp(', |
|
87 | - 'log10(', |
|
88 | - 'cos(', |
|
89 | - 'sin(', |
|
90 | - 'sqrt(', |
|
91 | - 'tan(', |
|
92 | - 'M_PI', |
|
93 | - 'INF', |
|
94 | - 'M_E', |
|
95 | - ); |
|
59 | + $allowed = array( |
|
60 | + '0', |
|
61 | + '1', |
|
62 | + '2', |
|
63 | + '3', |
|
64 | + '4', |
|
65 | + '5', |
|
66 | + '6', |
|
67 | + '7', |
|
68 | + '8', |
|
69 | + '9', |
|
70 | + '+', |
|
71 | + '-', |
|
72 | + '/', |
|
73 | + '*', |
|
74 | + '.', |
|
75 | + ' ', |
|
76 | + '<<', |
|
77 | + '>>', |
|
78 | + '%', |
|
79 | + '&', |
|
80 | + '^', |
|
81 | + '|', |
|
82 | + '~', |
|
83 | + 'abs(', |
|
84 | + 'ceil(', |
|
85 | + 'floor(', |
|
86 | + 'exp(', |
|
87 | + 'log10(', |
|
88 | + 'cos(', |
|
89 | + 'sin(', |
|
90 | + 'sqrt(', |
|
91 | + 'tan(', |
|
92 | + 'M_PI', |
|
93 | + 'INF', |
|
94 | + 'M_E', |
|
95 | + ); |
|
96 | 96 | |
97 | - /* |
|
97 | + /* |
|
98 | 98 | * Holds the functions that can accept multiple arguments |
99 | 99 | */ |
100 | - $funcs = array( |
|
101 | - 'round(', |
|
102 | - 'log(', |
|
103 | - 'pow(', |
|
104 | - 'max(', |
|
105 | - 'min(', |
|
106 | - 'rand(', |
|
107 | - ); |
|
100 | + $funcs = array( |
|
101 | + 'round(', |
|
102 | + 'log(', |
|
103 | + 'pow(', |
|
104 | + 'max(', |
|
105 | + 'min(', |
|
106 | + 'rand(', |
|
107 | + ); |
|
108 | 108 | |
109 | - $equation = $equationSrc = str_ireplace(array( |
|
110 | - 'pi', |
|
111 | - 'M_PI()', |
|
112 | - 'inf', |
|
113 | - ' e ' |
|
114 | - ), |
|
115 | - array( |
|
116 | - 'M_PI', |
|
117 | - 'M_PI', |
|
118 | - 'INF', |
|
119 | - ' M_E ' |
|
120 | - ), |
|
121 | - $equation); |
|
109 | + $equation = $equationSrc = str_ireplace(array( |
|
110 | + 'pi', |
|
111 | + 'M_PI()', |
|
112 | + 'inf', |
|
113 | + ' e ' |
|
114 | + ), |
|
115 | + array( |
|
116 | + 'M_PI', |
|
117 | + 'M_PI', |
|
118 | + 'INF', |
|
119 | + ' M_E ' |
|
120 | + ), |
|
121 | + $equation); |
|
122 | 122 | |
123 | - $delim = $equation[0]; |
|
124 | - $open = $delim . '.'; |
|
125 | - $close = '.' . $delim; |
|
126 | - $equation = substr($equation, 1, - 1); |
|
127 | - $out = ''; |
|
128 | - $ptr = 1; |
|
129 | - $allowcomma = 0; |
|
130 | - while (strlen($equation) > 0) { |
|
131 | - $substr = substr($equation, 0, $ptr); |
|
132 | - if (array_search($substr, $allowed) !== false) { |
|
133 | - // allowed string |
|
134 | - $out .= $substr; |
|
135 | - $equation = substr($equation, $ptr); |
|
136 | - $ptr = 0; |
|
137 | - } elseif (array_search($substr, $funcs) !== false) { |
|
138 | - // allowed func |
|
139 | - $out .= $substr; |
|
140 | - $equation = substr($equation, $ptr); |
|
141 | - $ptr = 0; |
|
142 | - ++ $allowcomma; |
|
143 | - if ($allowcomma === 1) { |
|
144 | - $allowed[] = ','; |
|
145 | - } |
|
146 | - } elseif (isset($rest[$substr])) { |
|
147 | - // variable |
|
148 | - $out .= $rest[$substr]; |
|
149 | - $equation = substr($equation, $ptr); |
|
150 | - $ptr = 0; |
|
151 | - } elseif ($substr === $open) { |
|
152 | - // pre-replaced variable |
|
153 | - preg_match('#.*\((?:[^()]*?|(?R))\)' . str_replace('.', '\\.', $close) . '#', substr($equation, 2), $m); |
|
154 | - if (empty($m)) { |
|
155 | - preg_match('#.*?' . str_replace('.', '\\.', $close) . '#', substr($equation, 2), $m); |
|
156 | - } |
|
157 | - $out .= substr($m[0], 0, - 2); |
|
158 | - $equation = substr($equation, strlen($m[0]) + 2); |
|
159 | - $ptr = 0; |
|
160 | - } elseif ($substr === '(') { |
|
161 | - // opening parenthesis |
|
162 | - if ($allowcomma > 0) { |
|
163 | - ++ $allowcomma; |
|
164 | - } |
|
123 | + $delim = $equation[0]; |
|
124 | + $open = $delim . '.'; |
|
125 | + $close = '.' . $delim; |
|
126 | + $equation = substr($equation, 1, - 1); |
|
127 | + $out = ''; |
|
128 | + $ptr = 1; |
|
129 | + $allowcomma = 0; |
|
130 | + while (strlen($equation) > 0) { |
|
131 | + $substr = substr($equation, 0, $ptr); |
|
132 | + if (array_search($substr, $allowed) !== false) { |
|
133 | + // allowed string |
|
134 | + $out .= $substr; |
|
135 | + $equation = substr($equation, $ptr); |
|
136 | + $ptr = 0; |
|
137 | + } elseif (array_search($substr, $funcs) !== false) { |
|
138 | + // allowed func |
|
139 | + $out .= $substr; |
|
140 | + $equation = substr($equation, $ptr); |
|
141 | + $ptr = 0; |
|
142 | + ++ $allowcomma; |
|
143 | + if ($allowcomma === 1) { |
|
144 | + $allowed[] = ','; |
|
145 | + } |
|
146 | + } elseif (isset($rest[$substr])) { |
|
147 | + // variable |
|
148 | + $out .= $rest[$substr]; |
|
149 | + $equation = substr($equation, $ptr); |
|
150 | + $ptr = 0; |
|
151 | + } elseif ($substr === $open) { |
|
152 | + // pre-replaced variable |
|
153 | + preg_match('#.*\((?:[^()]*?|(?R))\)' . str_replace('.', '\\.', $close) . '#', substr($equation, 2), $m); |
|
154 | + if (empty($m)) { |
|
155 | + preg_match('#.*?' . str_replace('.', '\\.', $close) . '#', substr($equation, 2), $m); |
|
156 | + } |
|
157 | + $out .= substr($m[0], 0, - 2); |
|
158 | + $equation = substr($equation, strlen($m[0]) + 2); |
|
159 | + $ptr = 0; |
|
160 | + } elseif ($substr === '(') { |
|
161 | + // opening parenthesis |
|
162 | + if ($allowcomma > 0) { |
|
163 | + ++ $allowcomma; |
|
164 | + } |
|
165 | 165 | |
166 | - $out .= $substr; |
|
167 | - $equation = substr($equation, $ptr); |
|
168 | - $ptr = 0; |
|
169 | - } elseif ($substr === ')') { |
|
170 | - // closing parenthesis |
|
171 | - if ($allowcomma > 0) { |
|
172 | - -- $allowcomma; |
|
173 | - if ($allowcomma === 0) { |
|
174 | - array_pop($allowed); |
|
175 | - } |
|
176 | - } |
|
166 | + $out .= $substr; |
|
167 | + $equation = substr($equation, $ptr); |
|
168 | + $ptr = 0; |
|
169 | + } elseif ($substr === ')') { |
|
170 | + // closing parenthesis |
|
171 | + if ($allowcomma > 0) { |
|
172 | + -- $allowcomma; |
|
173 | + if ($allowcomma === 0) { |
|
174 | + array_pop($allowed); |
|
175 | + } |
|
176 | + } |
|
177 | 177 | |
178 | - $out .= $substr; |
|
179 | - $equation = substr($equation, $ptr); |
|
180 | - $ptr = 0; |
|
181 | - } elseif ($ptr >= strlen($equation)) { |
|
182 | - // parse error if we've consumed the entire equation without finding anything valid |
|
183 | - throw new CompilationException($compiler, |
|
184 | - 'Math : Syntax error or variable undefined in equation ' . $equationSrc . ' at ' . $substr); |
|
185 | - } else { |
|
186 | - // nothing special, advance |
|
187 | - ++ $ptr; |
|
188 | - } |
|
189 | - } |
|
190 | - if ($format !== '\'\'') { |
|
191 | - $out = 'sprintf(' . $format . ', ' . $out . ')'; |
|
192 | - } |
|
193 | - if ($assign !== '\'\'') { |
|
194 | - return '($this->assignInScope(' . $out . ', ' . $assign . '))'; |
|
195 | - } |
|
178 | + $out .= $substr; |
|
179 | + $equation = substr($equation, $ptr); |
|
180 | + $ptr = 0; |
|
181 | + } elseif ($ptr >= strlen($equation)) { |
|
182 | + // parse error if we've consumed the entire equation without finding anything valid |
|
183 | + throw new CompilationException($compiler, |
|
184 | + 'Math : Syntax error or variable undefined in equation ' . $equationSrc . ' at ' . $substr); |
|
185 | + } else { |
|
186 | + // nothing special, advance |
|
187 | + ++ $ptr; |
|
188 | + } |
|
189 | + } |
|
190 | + if ($format !== '\'\'') { |
|
191 | + $out = 'sprintf(' . $format . ', ' . $out . ')'; |
|
192 | + } |
|
193 | + if ($assign !== '\'\'') { |
|
194 | + return '($this->assignInScope(' . $out . ', ' . $assign . '))'; |
|
195 | + } |
|
196 | 196 | |
197 | - return '(' . $out . ')'; |
|
198 | - } |
|
197 | + return '(' . $out . ')'; |
|
198 | + } |
|
199 | 199 | } |
200 | 200 | \ No newline at end of file |
@@ -121,8 +121,8 @@ discard block |
||
121 | 121 | $equation); |
122 | 122 | |
123 | 123 | $delim = $equation[0]; |
124 | - $open = $delim . '.'; |
|
125 | - $close = '.' . $delim; |
|
124 | + $open = $delim.'.'; |
|
125 | + $close = '.'.$delim; |
|
126 | 126 | $equation = substr($equation, 1, - 1); |
127 | 127 | $out = ''; |
128 | 128 | $ptr = 1; |
@@ -139,7 +139,7 @@ discard block |
||
139 | 139 | $out .= $substr; |
140 | 140 | $equation = substr($equation, $ptr); |
141 | 141 | $ptr = 0; |
142 | - ++ $allowcomma; |
|
142 | + ++$allowcomma; |
|
143 | 143 | if ($allowcomma === 1) { |
144 | 144 | $allowed[] = ','; |
145 | 145 | } |
@@ -150,17 +150,17 @@ discard block |
||
150 | 150 | $ptr = 0; |
151 | 151 | } elseif ($substr === $open) { |
152 | 152 | // pre-replaced variable |
153 | - preg_match('#.*\((?:[^()]*?|(?R))\)' . str_replace('.', '\\.', $close) . '#', substr($equation, 2), $m); |
|
153 | + preg_match('#.*\((?:[^()]*?|(?R))\)'.str_replace('.', '\\.', $close).'#', substr($equation, 2), $m); |
|
154 | 154 | if (empty($m)) { |
155 | - preg_match('#.*?' . str_replace('.', '\\.', $close) . '#', substr($equation, 2), $m); |
|
155 | + preg_match('#.*?'.str_replace('.', '\\.', $close).'#', substr($equation, 2), $m); |
|
156 | 156 | } |
157 | 157 | $out .= substr($m[0], 0, - 2); |
158 | - $equation = substr($equation, strlen($m[0]) + 2); |
|
158 | + $equation = substr($equation, strlen($m[0])+2); |
|
159 | 159 | $ptr = 0; |
160 | 160 | } elseif ($substr === '(') { |
161 | 161 | // opening parenthesis |
162 | 162 | if ($allowcomma > 0) { |
163 | - ++ $allowcomma; |
|
163 | + ++$allowcomma; |
|
164 | 164 | } |
165 | 165 | |
166 | 166 | $out .= $substr; |
@@ -169,7 +169,7 @@ discard block |
||
169 | 169 | } elseif ($substr === ')') { |
170 | 170 | // closing parenthesis |
171 | 171 | if ($allowcomma > 0) { |
172 | - -- $allowcomma; |
|
172 | + --$allowcomma; |
|
173 | 173 | if ($allowcomma === 0) { |
174 | 174 | array_pop($allowed); |
175 | 175 | } |
@@ -181,19 +181,19 @@ discard block |
||
181 | 181 | } elseif ($ptr >= strlen($equation)) { |
182 | 182 | // parse error if we've consumed the entire equation without finding anything valid |
183 | 183 | throw new CompilationException($compiler, |
184 | - 'Math : Syntax error or variable undefined in equation ' . $equationSrc . ' at ' . $substr); |
|
184 | + 'Math : Syntax error or variable undefined in equation '.$equationSrc.' at '.$substr); |
|
185 | 185 | } else { |
186 | 186 | // nothing special, advance |
187 | - ++ $ptr; |
|
187 | + ++$ptr; |
|
188 | 188 | } |
189 | 189 | } |
190 | 190 | if ($format !== '\'\'') { |
191 | - $out = 'sprintf(' . $format . ', ' . $out . ')'; |
|
191 | + $out = 'sprintf('.$format.', '.$out.')'; |
|
192 | 192 | } |
193 | 193 | if ($assign !== '\'\'') { |
194 | - return '($this->assignInScope(' . $out . ', ' . $assign . '))'; |
|
194 | + return '($this->assignInScope('.$out.', '.$assign.'))'; |
|
195 | 195 | } |
196 | 196 | |
197 | - return '(' . $out . ')'; |
|
197 | + return '('.$out.')'; |
|
198 | 198 | } |
199 | 199 | } |
200 | 200 | \ No newline at end of file |