Completed
Push — master ( bf2930...494091 )
by David
07:08 queued 03:26
created
lib/Dwoo/Plugins/Functions/PluginReplaceCompile.php 2 patches
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -30,9 +30,9 @@
 block discarded – undo
30 30
  */
31 31
 function PluginReplaceCompile(Compiler $compiler, $value, $search, $replace, $case_sensitive = true)
32 32
 {
33
-    if ($case_sensitive == 'false' || (bool)$case_sensitive === false) {
34
-        return 'str_ireplace(' . $search . ', ' . $replace . ', ' . $value . ')';
35
-    } else {
36
-        return 'str_replace(' . $search . ', ' . $replace . ', ' . $value . ')';
37
-    }
33
+	if ($case_sensitive == 'false' || (bool)$case_sensitive === false) {
34
+		return 'str_ireplace(' . $search . ', ' . $replace . ', ' . $value . ')';
35
+	} else {
36
+		return 'str_replace(' . $search . ', ' . $replace . ', ' . $value . ')';
37
+	}
38 38
 }
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -30,9 +30,9 @@
 block discarded – undo
30 30
  */
31 31
 function PluginReplaceCompile(Compiler $compiler, $value, $search, $replace, $case_sensitive = true)
32 32
 {
33
-    if ($case_sensitive == 'false' || (bool)$case_sensitive === false) {
34
-        return 'str_ireplace(' . $search . ', ' . $replace . ', ' . $value . ')';
33
+    if ($case_sensitive == 'false' || (bool) $case_sensitive === false) {
34
+        return 'str_ireplace('.$search.', '.$replace.', '.$value.')';
35 35
     } else {
36
-        return 'str_replace(' . $search . ', ' . $replace . ', ' . $value . ')';
36
+        return 'str_replace('.$search.', '.$replace.', '.$value.')';
37 37
     }
38 38
 }
Please login to merge, or discard this patch.
lib/Dwoo/Plugins/Functions/PluginCountParagraphsCompile.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -28,5 +28,5 @@
 block discarded – undo
28 28
  */
29 29
 function PluginCountParagraphsCompile(Compiler $compiler, $value)
30 30
 {
31
-    return '(preg_match_all(\'#[\r\n]+#\', ' . $value . ', $tmp)+1)';
31
+	return '(preg_match_all(\'#[\r\n]+#\', ' . $value . ', $tmp)+1)';
32 32
 }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -28,5 +28,5 @@
 block discarded – undo
28 28
  */
29 29
 function PluginCountParagraphsCompile(Compiler $compiler, $value)
30 30
 {
31
-    return '(preg_match_all(\'#[\r\n]+#\', ' . $value . ', $tmp)+1)';
31
+    return '(preg_match_all(\'#[\r\n]+#\', '.$value.', $tmp)+1)';
32 32
 }
Please login to merge, or discard this patch.
lib/Dwoo/Plugins/Functions/PluginFetch.php 2 patches
Indentation   +32 added lines, -32 removed lines patch added patch discarded remove patch
@@ -30,40 +30,40 @@
 block discarded – undo
30 30
  */
31 31
 function PluginFetch(Core $dwoo, $file, $assign = null)
32 32
 {
33
-    if ($file === '') {
34
-        return '';
35
-    }
33
+	if ($file === '') {
34
+		return '';
35
+	}
36 36
 
37
-    if ($policy = $dwoo->getSecurityPolicy()) {
38
-        while (true) {
39
-            if (preg_match('{^([a-z]+?)://}i', $file)) {
40
-                $dwoo->triggerError('The security policy prevents you to read files from external sources.', E_USER_WARNING);
41
-            }
37
+	if ($policy = $dwoo->getSecurityPolicy()) {
38
+		while (true) {
39
+			if (preg_match('{^([a-z]+?)://}i', $file)) {
40
+				$dwoo->triggerError('The security policy prevents you to read files from external sources.', E_USER_WARNING);
41
+			}
42 42
 
43
-            $file = realpath($file);
44
-            $dirs = $policy->getAllowedDirectories();
45
-            foreach ($dirs as $dir => $dummy) {
46
-                if (strpos($file, $dir) === 0) {
47
-                    break 2;
48
-                }
49
-            }
50
-            $dwoo->triggerError('The security policy prevents you to read <em>' . $file . '</em>', E_USER_WARNING);
51
-        }
52
-    }
53
-    $file = str_replace(array(
54
-        "\t",
55
-        "\n",
56
-        "\r"
57
-    ), array(
58
-        '\\t',
59
-        '\\n',
60
-        '\\r'
61
-    ), $file);
43
+			$file = realpath($file);
44
+			$dirs = $policy->getAllowedDirectories();
45
+			foreach ($dirs as $dir => $dummy) {
46
+				if (strpos($file, $dir) === 0) {
47
+					break 2;
48
+				}
49
+			}
50
+			$dwoo->triggerError('The security policy prevents you to read <em>' . $file . '</em>', E_USER_WARNING);
51
+		}
52
+	}
53
+	$file = str_replace(array(
54
+		"\t",
55
+		"\n",
56
+		"\r"
57
+	), array(
58
+		'\\t',
59
+		'\\n',
60
+		'\\r'
61
+	), $file);
62 62
 
63
-    $out = file_get_contents($file);
63
+	$out = file_get_contents($file);
64 64
 
65
-    if ($assign === null) {
66
-        return $out;
67
-    }
68
-    $dwoo->assignInScope($out, $assign);
65
+	if ($assign === null) {
66
+		return $out;
67
+	}
68
+	$dwoo->assignInScope($out, $assign);
69 69
 }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -47,7 +47,7 @@
 block discarded – undo
47 47
                     break 2;
48 48
                 }
49 49
             }
50
-            $dwoo->triggerError('The security policy prevents you to read <em>' . $file . '</em>', E_USER_WARNING);
50
+            $dwoo->triggerError('The security policy prevents you to read <em>'.$file.'</em>', E_USER_WARNING);
51 51
         }
52 52
     }
53 53
     $file = str_replace(array(
Please login to merge, or discard this patch.
lib/Dwoo/Plugins/Functions/PluginSpacifyCompile.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -29,5 +29,5 @@
 block discarded – undo
29 29
  */
30 30
 function PluginSpacifyCompile(Compiler $compiler, $value, $space_char = ' ')
31 31
 {
32
-    return 'implode(' . $space_char . ', str_split(' . $value . ', 1))';
32
+	return 'implode(' . $space_char . ', str_split(' . $value . ', 1))';
33 33
 }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -29,5 +29,5 @@
 block discarded – undo
29 29
  */
30 30
 function PluginSpacifyCompile(Compiler $compiler, $value, $space_char = ' ')
31 31
 {
32
-    return 'implode(' . $space_char . ', str_split(' . $value . ', 1))';
32
+    return 'implode('.$space_char.', str_split('.$value.', 1))';
33 33
 }
Please login to merge, or discard this patch.
lib/Dwoo/Plugins/Functions/PluginLowerCompile.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -28,5 +28,5 @@
 block discarded – undo
28 28
  */
29 29
 function PluginLowerCompile(Compiler $compiler, $value)
30 30
 {
31
-    return 'mb_strtolower((string) ' . $value . ', $this->charset)';
31
+	return 'mb_strtolower((string) ' . $value . ', $this->charset)';
32 32
 }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -28,5 +28,5 @@
 block discarded – undo
28 28
  */
29 29
 function PluginLowerCompile(Compiler $compiler, $value)
30 30
 {
31
-    return 'mb_strtolower((string) ' . $value . ', $this->charset)';
31
+    return 'mb_strtolower((string) '.$value.', $this->charset)';
32 32
 }
Please login to merge, or discard this patch.
lib/Dwoo/Plugins/Functions/PluginEscape.php 3 patches
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -39,33 +39,33 @@  discard block
 block discarded – undo
39 39
     switch ($format) {
40 40
 
41 41
         case 'html':
42
-            return htmlspecialchars((string)$value, ENT_QUOTES, $charset);
42
+            return htmlspecialchars((string) $value, ENT_QUOTES, $charset);
43 43
         case 'htmlall':
44
-            return htmlentities((string)$value, ENT_QUOTES, $charset);
44
+            return htmlentities((string) $value, ENT_QUOTES, $charset);
45 45
         case 'url':
46
-            return rawurlencode((string)$value);
46
+            return rawurlencode((string) $value);
47 47
         case 'urlpathinfo':
48
-            return str_replace('%2F', '/', rawurlencode((string)$value));
48
+            return str_replace('%2F', '/', rawurlencode((string) $value));
49 49
         case 'quotes':
50
-            return preg_replace("#(?<!\\\\)'#", "\\'", (string)$value);
50
+            return preg_replace("#(?<!\\\\)'#", "\\'", (string) $value);
51 51
         case 'hex':
52 52
             $out = '';
53
-            $cnt = strlen((string)$value);
53
+            $cnt = strlen((string) $value);
54 54
             for ($i = 0; $i < $cnt; ++ $i) {
55
-                $out .= '%' . bin2hex((string)$value[$i]);
55
+                $out .= '%'.bin2hex((string) $value[$i]);
56 56
             }
57 57
 
58 58
             return $out;
59 59
         case 'hexentity':
60 60
             $out = '';
61
-            $cnt = strlen((string)$value);
61
+            $cnt = strlen((string) $value);
62 62
             for ($i = 0; $i < $cnt; ++ $i) {
63
-                $out .= '&#x' . bin2hex((string)$value[$i]) . ';';
63
+                $out .= '&#x'.bin2hex((string) $value[$i]).';';
64 64
             }
65 65
 
66 66
             return $out;
67 67
         case 'javascript':
68
-            return strtr((string)$value, array(
68
+            return strtr((string) $value, array(
69 69
                 '\\' => '\\\\',
70 70
                 "'"  => "\\'",
71 71
                 '"'  => '\\"',
@@ -80,8 +80,8 @@  discard block
 block discarded – undo
80 80
             ), array(
81 81
                 '&nbsp;(AT)&nbsp;',
82 82
                 '&nbsp;(DOT)&nbsp;'
83
-            ), (string)$value);
83
+            ), (string) $value);
84 84
         default:
85
-            $dwoo->triggerError('Escape\'s format argument must be one of : html, htmlall, url, urlpathinfo, hex, hexentity, javascript or mail, "' . $format . '" given.', E_USER_WARNING);
85
+            $dwoo->triggerError('Escape\'s format argument must be one of : html, htmlall, url, urlpathinfo, hex, hexentity, javascript or mail, "'.$format.'" given.', E_USER_WARNING);
86 86
     }
87 87
 }
Please login to merge, or discard this patch.
Indentation   +49 added lines, -49 removed lines patch added patch discarded remove patch
@@ -39,56 +39,56 @@
 block discarded – undo
39 39
  */
40 40
 function PluginEscape(Core $dwoo, $value = '', $format = 'html', $charset = null)
41 41
 {
42
-    if ($charset === null) {
43
-        $charset = $dwoo->getCharset();
44
-    }
42
+	if ($charset === null) {
43
+		$charset = $dwoo->getCharset();
44
+	}
45 45
 
46
-    switch ($format) {
47
-        case 'html':
48
-            return htmlspecialchars((string)$value, ENT_QUOTES, $charset);
49
-        case 'htmlall':
50
-            return htmlentities((string)$value, ENT_QUOTES, $charset);
51
-        case 'url':
52
-            return rawurlencode((string)$value);
53
-        case 'urlpathinfo':
54
-            return str_replace('%2F', '/', rawurlencode((string)$value));
55
-        case 'quotes':
56
-            return preg_replace("#(?<!\\\\)'#", "\\'", (string)$value);
57
-        case 'hex':
58
-            $out = '';
59
-            $cnt = strlen((string)$value);
60
-            for ($i = 0; $i < $cnt; ++ $i) {
61
-                $out .= '%' . bin2hex((string)$value[$i]);
62
-            }
46
+	switch ($format) {
47
+		case 'html':
48
+			return htmlspecialchars((string)$value, ENT_QUOTES, $charset);
49
+		case 'htmlall':
50
+			return htmlentities((string)$value, ENT_QUOTES, $charset);
51
+		case 'url':
52
+			return rawurlencode((string)$value);
53
+		case 'urlpathinfo':
54
+			return str_replace('%2F', '/', rawurlencode((string)$value));
55
+		case 'quotes':
56
+			return preg_replace("#(?<!\\\\)'#", "\\'", (string)$value);
57
+		case 'hex':
58
+			$out = '';
59
+			$cnt = strlen((string)$value);
60
+			for ($i = 0; $i < $cnt; ++ $i) {
61
+				$out .= '%' . bin2hex((string)$value[$i]);
62
+			}
63 63
 
64
-            return $out;
65
-        case 'hexentity':
66
-            $out = '';
67
-            $cnt = strlen((string)$value);
68
-            for ($i = 0; $i < $cnt; ++ $i) {
69
-                $out .= '&#x' . bin2hex((string)$value[$i]) . ';';
70
-            }
64
+			return $out;
65
+		case 'hexentity':
66
+			$out = '';
67
+			$cnt = strlen((string)$value);
68
+			for ($i = 0; $i < $cnt; ++ $i) {
69
+				$out .= '&#x' . bin2hex((string)$value[$i]) . ';';
70
+			}
71 71
 
72
-            return $out;
73
-        case 'javascript':
74
-        case 'js':
75
-            return strtr((string)$value, array(
76
-                '\\' => '\\\\',
77
-                "'"  => "\\'",
78
-                '"'  => '\\"',
79
-                "\r" => '\\r',
80
-                "\n" => '\\n',
81
-                '</' => '<\/'
82
-            ));
83
-        case 'mail':
84
-            return str_replace(array(
85
-                '@',
86
-                '.'
87
-            ), array(
88
-                '&nbsp;(AT)&nbsp;',
89
-                '&nbsp;(DOT)&nbsp;'
90
-            ), (string)$value);
91
-        default:
92
-            $dwoo->triggerError('Escape\'s format argument must be one of : html, htmlall, url, urlpathinfo, hex, hexentity, javascript or mail, "' . $format . '" given.', E_USER_WARNING);
93
-    }
72
+			return $out;
73
+		case 'javascript':
74
+		case 'js':
75
+			return strtr((string)$value, array(
76
+				'\\' => '\\\\',
77
+				"'"  => "\\'",
78
+				'"'  => '\\"',
79
+				"\r" => '\\r',
80
+				"\n" => '\\n',
81
+				'</' => '<\/'
82
+			));
83
+		case 'mail':
84
+			return str_replace(array(
85
+				'@',
86
+				'.'
87
+			), array(
88
+				'&nbsp;(AT)&nbsp;',
89
+				'&nbsp;(DOT)&nbsp;'
90
+			), (string)$value);
91
+		default:
92
+			$dwoo->triggerError('Escape\'s format argument must be one of : html, htmlall, url, urlpathinfo, hex, hexentity, javascript or mail, "' . $format . '" given.', E_USER_WARNING);
93
+	}
94 94
 }
Please login to merge, or discard this patch.
Switch Indentation   +44 added lines, -44 removed lines patch added patch discarded remove patch
@@ -44,51 +44,51 @@
 block discarded – undo
44 44
     }
45 45
 
46 46
     switch ($format) {
47
-        case 'html':
48
-            return htmlspecialchars((string)$value, ENT_QUOTES, $charset);
49
-        case 'htmlall':
50
-            return htmlentities((string)$value, ENT_QUOTES, $charset);
51
-        case 'url':
52
-            return rawurlencode((string)$value);
53
-        case 'urlpathinfo':
54
-            return str_replace('%2F', '/', rawurlencode((string)$value));
55
-        case 'quotes':
56
-            return preg_replace("#(?<!\\\\)'#", "\\'", (string)$value);
57
-        case 'hex':
58
-            $out = '';
59
-            $cnt = strlen((string)$value);
60
-            for ($i = 0; $i < $cnt; ++ $i) {
61
-                $out .= '%' . bin2hex((string)$value[$i]);
62
-            }
47
+    case 'html':
48
+        return htmlspecialchars((string)$value, ENT_QUOTES, $charset);
49
+    case 'htmlall':
50
+        return htmlentities((string)$value, ENT_QUOTES, $charset);
51
+    case 'url':
52
+        return rawurlencode((string)$value);
53
+    case 'urlpathinfo':
54
+        return str_replace('%2F', '/', rawurlencode((string)$value));
55
+    case 'quotes':
56
+        return preg_replace("#(?<!\\\\)'#", "\\'", (string)$value);
57
+    case 'hex':
58
+        $out = '';
59
+        $cnt = strlen((string)$value);
60
+        for ($i = 0; $i < $cnt; ++ $i) {
61
+            $out .= '%' . bin2hex((string)$value[$i]);
62
+        }
63 63
 
64
-            return $out;
65
-        case 'hexentity':
66
-            $out = '';
67
-            $cnt = strlen((string)$value);
68
-            for ($i = 0; $i < $cnt; ++ $i) {
69
-                $out .= '&#x' . bin2hex((string)$value[$i]) . ';';
70
-            }
64
+        return $out;
65
+    case 'hexentity':
66
+        $out = '';
67
+        $cnt = strlen((string)$value);
68
+        for ($i = 0; $i < $cnt; ++ $i) {
69
+            $out .= '&#x' . bin2hex((string)$value[$i]) . ';';
70
+        }
71 71
 
72
-            return $out;
73
-        case 'javascript':
74
-        case 'js':
75
-            return strtr((string)$value, array(
76
-                '\\' => '\\\\',
77
-                "'"  => "\\'",
78
-                '"'  => '\\"',
79
-                "\r" => '\\r',
80
-                "\n" => '\\n',
81
-                '</' => '<\/'
82
-            ));
83
-        case 'mail':
84
-            return str_replace(array(
85
-                '@',
86
-                '.'
87
-            ), array(
88
-                '&nbsp;(AT)&nbsp;',
89
-                '&nbsp;(DOT)&nbsp;'
90
-            ), (string)$value);
91
-        default:
92
-            $dwoo->triggerError('Escape\'s format argument must be one of : html, htmlall, url, urlpathinfo, hex, hexentity, javascript or mail, "' . $format . '" given.', E_USER_WARNING);
72
+        return $out;
73
+    case 'javascript':
74
+    case 'js':
75
+        return strtr((string)$value, array(
76
+            '\\' => '\\\\',
77
+            "'"  => "\\'",
78
+            '"'  => '\\"',
79
+            "\r" => '\\r',
80
+            "\n" => '\\n',
81
+            '</' => '<\/'
82
+        ));
83
+    case 'mail':
84
+        return str_replace(array(
85
+            '@',
86
+            '.'
87
+        ), array(
88
+            '&nbsp;(AT)&nbsp;',
89
+            '&nbsp;(DOT)&nbsp;'
90
+        ), (string)$value);
91
+    default:
92
+        $dwoo->triggerError('Escape\'s format argument must be one of : html, htmlall, url, urlpathinfo, hex, hexentity, javascript or mail, "' . $format . '" given.', E_USER_WARNING);
93 93
     }
94 94
 }
Please login to merge, or discard this patch.
lib/Dwoo/Plugins/Functions/PluginMathCompile.php 2 patches
Indentation   +129 added lines, -129 removed lines patch added patch discarded remove patch
@@ -39,143 +39,143 @@
 block discarded – undo
39 39
  */
40 40
 function PluginMathCompile(Compiler $compiler, $equation, $format = '', $assign = '', array $rest = array())
41 41
 {
42
-    /*
42
+	/*
43 43
      * Holds the allowed function, characters, operators and constants
44 44
      */
45
-    $allowed = array(
46
-        '0',
47
-        '1',
48
-        '2',
49
-        '3',
50
-        '4',
51
-        '5',
52
-        '6',
53
-        '7',
54
-        '8',
55
-        '9',
56
-        '+',
57
-        '-',
58
-        '/',
59
-        '*',
60
-        '.',
61
-        ' ',
62
-        '<<',
63
-        '>>',
64
-        '%',
65
-        '&',
66
-        '^',
67
-        '|',
68
-        '~',
69
-        'abs(',
70
-        'ceil(',
71
-        'floor(',
72
-        'exp(',
73
-        'log10(',
74
-        'cos(',
75
-        'sin(',
76
-        'sqrt(',
77
-        'tan(',
78
-        'M_PI',
79
-        'INF',
80
-        'M_E',
81
-    );
45
+	$allowed = array(
46
+		'0',
47
+		'1',
48
+		'2',
49
+		'3',
50
+		'4',
51
+		'5',
52
+		'6',
53
+		'7',
54
+		'8',
55
+		'9',
56
+		'+',
57
+		'-',
58
+		'/',
59
+		'*',
60
+		'.',
61
+		' ',
62
+		'<<',
63
+		'>>',
64
+		'%',
65
+		'&',
66
+		'^',
67
+		'|',
68
+		'~',
69
+		'abs(',
70
+		'ceil(',
71
+		'floor(',
72
+		'exp(',
73
+		'log10(',
74
+		'cos(',
75
+		'sin(',
76
+		'sqrt(',
77
+		'tan(',
78
+		'M_PI',
79
+		'INF',
80
+		'M_E',
81
+	);
82 82
 
83
-    /*
83
+	/*
84 84
      * Holds the functions that can accept multiple arguments
85 85
      */
86
-    $funcs = array(
87
-        'round(',
88
-        'log(',
89
-        'pow(',
90
-        'max(',
91
-        'min(',
92
-        'rand(',
93
-    );
86
+	$funcs = array(
87
+		'round(',
88
+		'log(',
89
+		'pow(',
90
+		'max(',
91
+		'min(',
92
+		'rand(',
93
+	);
94 94
 
95
-    $equation = $equationSrc = str_ireplace(array(
96
-        'pi',
97
-        'M_PI()',
98
-        'inf',
99
-        ' e '
100
-    ), array(
101
-        'M_PI',
102
-        'M_PI',
103
-        'INF',
104
-        ' M_E '
105
-    ), $equation);
95
+	$equation = $equationSrc = str_ireplace(array(
96
+		'pi',
97
+		'M_PI()',
98
+		'inf',
99
+		' e '
100
+	), array(
101
+		'M_PI',
102
+		'M_PI',
103
+		'INF',
104
+		' M_E '
105
+	), $equation);
106 106
 
107
-    $delim      = $equation[0];
108
-    $open       = $delim . '.';
109
-    $close      = '.' . $delim;
110
-    $equation   = substr($equation, 1, - 1);
111
-    $out        = '';
112
-    $ptr        = 1;
113
-    $allowcomma = 0;
114
-    while (strlen($equation) > 0) {
115
-        $substr = substr($equation, 0, $ptr);
116
-        if (array_search($substr, $allowed) !== false) {
117
-            // allowed string
118
-            $out .= $substr;
119
-            $equation = substr($equation, $ptr);
120
-            $ptr      = 0;
121
-        } elseif (array_search($substr, $funcs) !== false) {
122
-            // allowed func
123
-            $out .= $substr;
124
-            $equation = substr($equation, $ptr);
125
-            $ptr      = 0;
126
-            ++ $allowcomma;
127
-            if ($allowcomma === 1) {
128
-                $allowed[] = ',';
129
-            }
130
-        } elseif (isset($rest[$substr])) {
131
-            // variable
132
-            $out .= $rest[$substr];
133
-            $equation = substr($equation, $ptr);
134
-            $ptr      = 0;
135
-        } elseif ($substr === $open) {
136
-            // pre-replaced variable
137
-            preg_match('#.*\((?:[^()]*?|(?R))\)' . str_replace('.', '\\.', $close) . '#', substr($equation, 2), $m);
138
-            if (empty($m)) {
139
-                preg_match('#.*?' . str_replace('.', '\\.', $close) . '#', substr($equation, 2), $m);
140
-            }
141
-            $out .= substr($m[0], 0, - 2);
142
-            $equation = substr($equation, strlen($m[0]) + 2);
143
-            $ptr      = 0;
144
-        } elseif ($substr === '(') {
145
-            // opening parenthesis
146
-            if ($allowcomma > 0) {
147
-                ++ $allowcomma;
148
-            }
107
+	$delim      = $equation[0];
108
+	$open       = $delim . '.';
109
+	$close      = '.' . $delim;
110
+	$equation   = substr($equation, 1, - 1);
111
+	$out        = '';
112
+	$ptr        = 1;
113
+	$allowcomma = 0;
114
+	while (strlen($equation) > 0) {
115
+		$substr = substr($equation, 0, $ptr);
116
+		if (array_search($substr, $allowed) !== false) {
117
+			// allowed string
118
+			$out .= $substr;
119
+			$equation = substr($equation, $ptr);
120
+			$ptr      = 0;
121
+		} elseif (array_search($substr, $funcs) !== false) {
122
+			// allowed func
123
+			$out .= $substr;
124
+			$equation = substr($equation, $ptr);
125
+			$ptr      = 0;
126
+			++ $allowcomma;
127
+			if ($allowcomma === 1) {
128
+				$allowed[] = ',';
129
+			}
130
+		} elseif (isset($rest[$substr])) {
131
+			// variable
132
+			$out .= $rest[$substr];
133
+			$equation = substr($equation, $ptr);
134
+			$ptr      = 0;
135
+		} elseif ($substr === $open) {
136
+			// pre-replaced variable
137
+			preg_match('#.*\((?:[^()]*?|(?R))\)' . str_replace('.', '\\.', $close) . '#', substr($equation, 2), $m);
138
+			if (empty($m)) {
139
+				preg_match('#.*?' . str_replace('.', '\\.', $close) . '#', substr($equation, 2), $m);
140
+			}
141
+			$out .= substr($m[0], 0, - 2);
142
+			$equation = substr($equation, strlen($m[0]) + 2);
143
+			$ptr      = 0;
144
+		} elseif ($substr === '(') {
145
+			// opening parenthesis
146
+			if ($allowcomma > 0) {
147
+				++ $allowcomma;
148
+			}
149 149
 
150
-            $out .= $substr;
151
-            $equation = substr($equation, $ptr);
152
-            $ptr      = 0;
153
-        } elseif ($substr === ')') {
154
-            // closing parenthesis
155
-            if ($allowcomma > 0) {
156
-                -- $allowcomma;
157
-                if ($allowcomma === 0) {
158
-                    array_pop($allowed);
159
-                }
160
-            }
150
+			$out .= $substr;
151
+			$equation = substr($equation, $ptr);
152
+			$ptr      = 0;
153
+		} elseif ($substr === ')') {
154
+			// closing parenthesis
155
+			if ($allowcomma > 0) {
156
+				-- $allowcomma;
157
+				if ($allowcomma === 0) {
158
+					array_pop($allowed);
159
+				}
160
+			}
161 161
 
162
-            $out .= $substr;
163
-            $equation = substr($equation, $ptr);
164
-            $ptr      = 0;
165
-        } elseif ($ptr >= strlen($equation)) {
166
-            // parse error if we've consumed the entire equation without finding anything valid
167
-            throw new CompilationException($compiler, 'Math : Syntax error or variable undefined in equation ' . $equationSrc . ' at ' . $substr);
168
-        } else {
169
-            // nothing special, advance
170
-            ++ $ptr;
171
-        }
172
-    }
173
-    if ($format !== '\'\'') {
174
-        $out = 'sprintf(' . $format . ', ' . $out . ')';
175
-    }
176
-    if ($assign !== '\'\'') {
177
-        return '($this->assignInScope(' . $out . ', ' . $assign . '))';
178
-    }
162
+			$out .= $substr;
163
+			$equation = substr($equation, $ptr);
164
+			$ptr      = 0;
165
+		} elseif ($ptr >= strlen($equation)) {
166
+			// parse error if we've consumed the entire equation without finding anything valid
167
+			throw new CompilationException($compiler, 'Math : Syntax error or variable undefined in equation ' . $equationSrc . ' at ' . $substr);
168
+		} else {
169
+			// nothing special, advance
170
+			++ $ptr;
171
+		}
172
+	}
173
+	if ($format !== '\'\'') {
174
+		$out = 'sprintf(' . $format . ', ' . $out . ')';
175
+	}
176
+	if ($assign !== '\'\'') {
177
+		return '($this->assignInScope(' . $out . ', ' . $assign . '))';
178
+	}
179 179
 
180
-    return '(' . $out . ')';
180
+	return '(' . $out . ')';
181 181
 }
Please login to merge, or discard this patch.
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -105,8 +105,8 @@  discard block
 block discarded – undo
105 105
     ), $equation);
106 106
 
107 107
     $delim      = $equation[0];
108
-    $open       = $delim . '.';
109
-    $close      = '.' . $delim;
108
+    $open       = $delim.'.';
109
+    $close      = '.'.$delim;
110 110
     $equation   = substr($equation, 1, - 1);
111 111
     $out        = '';
112 112
     $ptr        = 1;
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
123 123
             $out .= $substr;
124 124
             $equation = substr($equation, $ptr);
125 125
             $ptr      = 0;
126
-            ++ $allowcomma;
126
+            ++$allowcomma;
127 127
             if ($allowcomma === 1) {
128 128
                 $allowed[] = ',';
129 129
             }
@@ -134,17 +134,17 @@  discard block
 block discarded – undo
134 134
             $ptr      = 0;
135 135
         } elseif ($substr === $open) {
136 136
             // pre-replaced variable
137
-            preg_match('#.*\((?:[^()]*?|(?R))\)' . str_replace('.', '\\.', $close) . '#', substr($equation, 2), $m);
137
+            preg_match('#.*\((?:[^()]*?|(?R))\)'.str_replace('.', '\\.', $close).'#', substr($equation, 2), $m);
138 138
             if (empty($m)) {
139
-                preg_match('#.*?' . str_replace('.', '\\.', $close) . '#', substr($equation, 2), $m);
139
+                preg_match('#.*?'.str_replace('.', '\\.', $close).'#', substr($equation, 2), $m);
140 140
             }
141 141
             $out .= substr($m[0], 0, - 2);
142
-            $equation = substr($equation, strlen($m[0]) + 2);
142
+            $equation = substr($equation, strlen($m[0])+2);
143 143
             $ptr      = 0;
144 144
         } elseif ($substr === '(') {
145 145
             // opening parenthesis
146 146
             if ($allowcomma > 0) {
147
-                ++ $allowcomma;
147
+                ++$allowcomma;
148 148
             }
149 149
 
150 150
             $out .= $substr;
@@ -153,7 +153,7 @@  discard block
 block discarded – undo
153 153
         } elseif ($substr === ')') {
154 154
             // closing parenthesis
155 155
             if ($allowcomma > 0) {
156
-                -- $allowcomma;
156
+                --$allowcomma;
157 157
                 if ($allowcomma === 0) {
158 158
                     array_pop($allowed);
159 159
                 }
@@ -164,18 +164,18 @@  discard block
 block discarded – undo
164 164
             $ptr      = 0;
165 165
         } elseif ($ptr >= strlen($equation)) {
166 166
             // parse error if we've consumed the entire equation without finding anything valid
167
-            throw new CompilationException($compiler, 'Math : Syntax error or variable undefined in equation ' . $equationSrc . ' at ' . $substr);
167
+            throw new CompilationException($compiler, 'Math : Syntax error or variable undefined in equation '.$equationSrc.' at '.$substr);
168 168
         } else {
169 169
             // nothing special, advance
170
-            ++ $ptr;
170
+            ++$ptr;
171 171
         }
172 172
     }
173 173
     if ($format !== '\'\'') {
174
-        $out = 'sprintf(' . $format . ', ' . $out . ')';
174
+        $out = 'sprintf('.$format.', '.$out.')';
175 175
     }
176 176
     if ($assign !== '\'\'') {
177
-        return '($this->assignInScope(' . $out . ', ' . $assign . '))';
177
+        return '($this->assignInScope('.$out.', '.$assign.'))';
178 178
     }
179 179
 
180
-    return '(' . $out . ')';
180
+    return '('.$out.')';
181 181
 }
Please login to merge, or discard this patch.
lib/Dwoo/Plugins/Functions/PluginIssetCompile.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -28,5 +28,5 @@
 block discarded – undo
28 28
  */
29 29
 function PluginIssetCompile(Compiler $compiler, $var)
30 30
 {
31
-    return '(' . $var . ' !== null)';
31
+	return '(' . $var . ' !== null)';
32 32
 }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -28,5 +28,5 @@
 block discarded – undo
28 28
  */
29 29
 function PluginIssetCompile(Compiler $compiler, $var)
30 30
 {
31
-    return '(' . $var . ' !== null)';
31
+    return '('.$var.' !== null)';
32 32
 }
Please login to merge, or discard this patch.
lib/Dwoo/Plugins/Functions/PluginEval.php 1 patch
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -36,17 +36,17 @@
 block discarded – undo
36 36
  */
37 37
 function PluginEval(Core $dwoo, $var, $assign = null)
38 38
 {
39
-    if ($var == '') {
40
-        return '';
41
-    }
39
+	if ($var == '') {
40
+		return '';
41
+	}
42 42
 
43
-    $tpl   = new TemplateString($var);
44
-    $clone = clone $dwoo;
45
-    $out   = $clone->get($tpl, $dwoo->readVar('_parent'));
43
+	$tpl   = new TemplateString($var);
44
+	$clone = clone $dwoo;
45
+	$out   = $clone->get($tpl, $dwoo->readVar('_parent'));
46 46
 
47
-    if ($assign !== null) {
48
-        $dwoo->assignInScope($out, $assign);
49
-    } else {
50
-        return $out;
51
-    }
47
+	if ($assign !== null) {
48
+		$dwoo->assignInScope($out, $assign);
49
+	} else {
50
+		return $out;
51
+	}
52 52
 }
Please login to merge, or discard this patch.