@@ -31,15 +31,15 @@ |
||
31 | 31 | */ |
32 | 32 | class PluginStringFormat extends Plugin implements ICompilable |
33 | 33 | { |
34 | - /** |
|
35 | - * @param Compiler $compiler |
|
36 | - * @param string $value |
|
37 | - * @param string $format |
|
38 | - * |
|
39 | - * @return string |
|
40 | - */ |
|
41 | - public static function compile(Compiler $compiler, $value, $format) |
|
42 | - { |
|
43 | - return 'sprintf(' . $format . ',' . $value . ')'; |
|
44 | - } |
|
34 | + /** |
|
35 | + * @param Compiler $compiler |
|
36 | + * @param string $value |
|
37 | + * @param string $format |
|
38 | + * |
|
39 | + * @return string |
|
40 | + */ |
|
41 | + public static function compile(Compiler $compiler, $value, $format) |
|
42 | + { |
|
43 | + return 'sprintf(' . $format . ',' . $value . ')'; |
|
44 | + } |
|
45 | 45 | } |
46 | 46 | \ No newline at end of file |
@@ -27,13 +27,13 @@ |
||
27 | 27 | */ |
28 | 28 | class PluginEol extends Plugin implements ICompilable |
29 | 29 | { |
30 | - /** |
|
31 | - * @param Compiler $compiler |
|
32 | - * |
|
33 | - * @return string |
|
34 | - */ |
|
35 | - public static function compile(Compiler $compiler) |
|
36 | - { |
|
37 | - return 'PHP_EOL'; |
|
38 | - } |
|
30 | + /** |
|
31 | + * @param Compiler $compiler |
|
32 | + * |
|
33 | + * @return string |
|
34 | + */ |
|
35 | + public static function compile(Compiler $compiler) |
|
36 | + { |
|
37 | + return 'PHP_EOL'; |
|
38 | + } |
|
39 | 39 | } |
@@ -30,14 +30,14 @@ |
||
30 | 30 | */ |
31 | 31 | class PluginCountParagraphs 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(\'#[\r\n]+#\', ' . $value . ', $tmp)+1)'; |
|
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(\'#[\r\n]+#\', ' . $value . ', $tmp)+1)'; |
|
42 | + } |
|
43 | 43 | } |
44 | 44 | \ No newline at end of file |
@@ -34,70 +34,70 @@ |
||
34 | 34 | */ |
35 | 35 | class PluginEscape extends Plugin |
36 | 36 | { |
37 | - /** |
|
38 | - * @param string $value |
|
39 | - * @param string $format |
|
40 | - * @param null $charset |
|
41 | - * |
|
42 | - * @return mixed|string |
|
43 | - */ |
|
44 | - public function process($value = '', $format = 'html', $charset = null) |
|
45 | - { |
|
46 | - if ($charset === null) { |
|
47 | - $charset = $this->core->getCharset(); |
|
48 | - } |
|
37 | + /** |
|
38 | + * @param string $value |
|
39 | + * @param string $format |
|
40 | + * @param null $charset |
|
41 | + * |
|
42 | + * @return mixed|string |
|
43 | + */ |
|
44 | + public function process($value = '', $format = 'html', $charset = null) |
|
45 | + { |
|
46 | + if ($charset === null) { |
|
47 | + $charset = $this->core->getCharset(); |
|
48 | + } |
|
49 | 49 | |
50 | - switch ($format) { |
|
51 | - case 'html': |
|
52 | - return htmlspecialchars((string)$value, ENT_QUOTES, $charset); |
|
53 | - case 'htmlall': |
|
54 | - return htmlentities((string)$value, ENT_QUOTES, $charset); |
|
55 | - case 'url': |
|
56 | - return rawurlencode((string)$value); |
|
57 | - case 'urlpathinfo': |
|
58 | - return str_replace('%2F', '/', rawurlencode((string)$value)); |
|
59 | - case 'quotes': |
|
60 | - return preg_replace("#(?<!\\\\)'#", "\\'", (string)$value); |
|
61 | - case 'hex': |
|
62 | - $out = ''; |
|
63 | - $cnt = strlen((string)$value); |
|
64 | - for ($i = 0; $i < $cnt; ++ $i) { |
|
65 | - $out .= '%' . bin2hex((string)$value[$i]); |
|
66 | - } |
|
50 | + switch ($format) { |
|
51 | + case 'html': |
|
52 | + return htmlspecialchars((string)$value, ENT_QUOTES, $charset); |
|
53 | + case 'htmlall': |
|
54 | + return htmlentities((string)$value, ENT_QUOTES, $charset); |
|
55 | + case 'url': |
|
56 | + return rawurlencode((string)$value); |
|
57 | + case 'urlpathinfo': |
|
58 | + return str_replace('%2F', '/', rawurlencode((string)$value)); |
|
59 | + case 'quotes': |
|
60 | + return preg_replace("#(?<!\\\\)'#", "\\'", (string)$value); |
|
61 | + case 'hex': |
|
62 | + $out = ''; |
|
63 | + $cnt = strlen((string)$value); |
|
64 | + for ($i = 0; $i < $cnt; ++ $i) { |
|
65 | + $out .= '%' . bin2hex((string)$value[$i]); |
|
66 | + } |
|
67 | 67 | |
68 | - return $out; |
|
69 | - case 'hexentity': |
|
70 | - $out = ''; |
|
71 | - $cnt = strlen((string)$value); |
|
72 | - for ($i = 0; $i < $cnt; ++ $i) { |
|
73 | - $out .= '&#x' . bin2hex((string)$value[$i]) . ';'; |
|
74 | - } |
|
68 | + return $out; |
|
69 | + case 'hexentity': |
|
70 | + $out = ''; |
|
71 | + $cnt = strlen((string)$value); |
|
72 | + for ($i = 0; $i < $cnt; ++ $i) { |
|
73 | + $out .= '&#x' . bin2hex((string)$value[$i]) . ';'; |
|
74 | + } |
|
75 | 75 | |
76 | - return $out; |
|
77 | - case 'javascript': |
|
78 | - case 'js': |
|
79 | - return strtr((string)$value, |
|
80 | - array( |
|
81 | - '\\' => '\\\\', |
|
82 | - "'" => "\\'", |
|
83 | - '"' => '\\"', |
|
84 | - "\r" => '\\r', |
|
85 | - "\n" => '\\n', |
|
86 | - '</' => '<\/' |
|
87 | - )); |
|
88 | - case 'mail': |
|
89 | - return str_replace(array( |
|
90 | - '@', |
|
91 | - '.' |
|
92 | - ), |
|
93 | - array( |
|
94 | - ' (AT) ', |
|
95 | - ' (DOT) ' |
|
96 | - ), |
|
97 | - (string)$value); |
|
98 | - default: |
|
99 | - $this->core->triggerError('Escape\'s format argument must be one of : html, htmlall, url, urlpathinfo, hex, hexentity, javascript, js or mail, "' . $format . '" given.', |
|
100 | - E_USER_WARNING); |
|
101 | - } |
|
102 | - } |
|
76 | + return $out; |
|
77 | + case 'javascript': |
|
78 | + case 'js': |
|
79 | + return strtr((string)$value, |
|
80 | + array( |
|
81 | + '\\' => '\\\\', |
|
82 | + "'" => "\\'", |
|
83 | + '"' => '\\"', |
|
84 | + "\r" => '\\r', |
|
85 | + "\n" => '\\n', |
|
86 | + '</' => '<\/' |
|
87 | + )); |
|
88 | + case 'mail': |
|
89 | + return str_replace(array( |
|
90 | + '@', |
|
91 | + '.' |
|
92 | + ), |
|
93 | + array( |
|
94 | + ' (AT) ', |
|
95 | + ' (DOT) ' |
|
96 | + ), |
|
97 | + (string)$value); |
|
98 | + default: |
|
99 | + $this->core->triggerError('Escape\'s format argument must be one of : html, htmlall, url, urlpathinfo, hex, hexentity, javascript, js or mail, "' . $format . '" given.', |
|
100 | + E_USER_WARNING); |
|
101 | + } |
|
102 | + } |
|
103 | 103 | } |
104 | 104 | \ No newline at end of file |
@@ -31,16 +31,16 @@ |
||
31 | 31 | class PluginSafe extends Plugin implements ICompilable |
32 | 32 | { |
33 | 33 | |
34 | - /** |
|
35 | - * @param Compiler $compiler |
|
36 | - * @param mixed $var |
|
37 | - * |
|
38 | - * @return mixed |
|
39 | - */ |
|
40 | - public static function compile(Compiler $compiler, $var) |
|
41 | - { |
|
42 | - return preg_replace('#\(is_string\(\$tmp=(.+)\) \? htmlspecialchars\(\$tmp, ENT_QUOTES, \$this->charset\) : \$tmp\)#', |
|
43 | - '$1', |
|
44 | - $var); |
|
45 | - } |
|
34 | + /** |
|
35 | + * @param Compiler $compiler |
|
36 | + * @param mixed $var |
|
37 | + * |
|
38 | + * @return mixed |
|
39 | + */ |
|
40 | + public static function compile(Compiler $compiler, $var) |
|
41 | + { |
|
42 | + return preg_replace('#\(is_string\(\$tmp=(.+)\) \? htmlspecialchars\(\$tmp, ENT_QUOTES, \$this->charset\) : \$tmp\)#', |
|
43 | + '$1', |
|
44 | + $var); |
|
45 | + } |
|
46 | 46 | } |
47 | 47 | \ No newline at end of file |
@@ -36,109 +36,109 @@ |
||
36 | 36 | */ |
37 | 37 | class PluginMailto extends Plugin |
38 | 38 | { |
39 | - /** |
|
40 | - * @param $address |
|
41 | - * @param null $text |
|
42 | - * @param null $subject |
|
43 | - * @param null $encode |
|
44 | - * @param null $cc |
|
45 | - * @param null $bcc |
|
46 | - * @param null $newsgroups |
|
47 | - * @param null $followupto |
|
48 | - * @param null $extra |
|
49 | - * |
|
50 | - * @return string |
|
51 | - */ |
|
52 | - public function process($address, $text = null, $subject = null, $encode = null, $cc = null, $bcc = null, $newsgroups = null, $followupto = null, $extra = null) |
|
53 | - { |
|
54 | - if (empty($address)) { |
|
55 | - return ''; |
|
56 | - } |
|
57 | - if (empty($text)) { |
|
58 | - $text = $address; |
|
59 | - } |
|
60 | - |
|
61 | - // build address string |
|
62 | - $address .= '?'; |
|
63 | - |
|
64 | - if (!empty($subject)) { |
|
65 | - $address .= 'subject=' . rawurlencode($subject) . '&'; |
|
66 | - } |
|
67 | - if (!empty($cc)) { |
|
68 | - $address .= 'cc=' . rawurlencode($cc) . '&'; |
|
69 | - } |
|
70 | - if (!empty($bcc)) { |
|
71 | - $address .= 'bcc=' . rawurlencode($bcc) . '&'; |
|
72 | - } |
|
73 | - if (!empty($newsgroups)) { |
|
74 | - $address .= 'newsgroups=' . rawurlencode($newsgroups) . '&'; |
|
75 | - } |
|
76 | - if (!empty($followupto)) { |
|
77 | - $address .= 'followupto=' . rawurlencode($followupto) . '&'; |
|
78 | - } |
|
79 | - |
|
80 | - $address = rtrim($address, '?&'); |
|
81 | - |
|
82 | - // output |
|
83 | - switch ($encode) { |
|
84 | - |
|
85 | - case 'none': |
|
86 | - case null: |
|
87 | - return '<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>'; |
|
88 | - |
|
89 | - case 'js': |
|
90 | - case 'javascript': |
|
91 | - $str = 'document.write(\'<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>\');'; |
|
92 | - $len = strlen($str); |
|
93 | - |
|
94 | - $out = ''; |
|
95 | - for ($i = 0; $i < $len; ++ $i) { |
|
96 | - $out .= '%' . bin2hex($str[$i]); |
|
97 | - } |
|
98 | - |
|
99 | - return '<script type="text/javascript">eval(unescape(\'' . $out . '\'));</script>'; |
|
100 | - |
|
101 | - break; |
|
102 | - case 'javascript_charcode': |
|
103 | - case 'js_charcode': |
|
104 | - case 'jscharcode': |
|
105 | - case 'jschar': |
|
106 | - $str = '<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>'; |
|
107 | - $len = strlen($str); |
|
108 | - |
|
109 | - $out = '<script type="text/javascript">' . "\n<!--\ndocument.write(Str.fromCharCode("; |
|
110 | - for ($i = 0; $i < $len; ++ $i) { |
|
111 | - $out .= ord($str[$i]) . ','; |
|
112 | - } |
|
113 | - |
|
114 | - return rtrim($out, ',') . "));\n-->\n</script>\n"; |
|
115 | - |
|
116 | - break; |
|
117 | - |
|
118 | - case 'hex': |
|
119 | - if (strpos($address, '?') !== false) { |
|
120 | - $this->core->triggerError('Mailto: Hex encoding is not possible with extra attributes, use one of : <em>js, jscharcode or none</em>.', E_USER_WARNING); |
|
121 | - } |
|
122 | - |
|
123 | - $out = '<a href="mailto:'; |
|
124 | - $len = strlen($address); |
|
125 | - for ($i = 0; $i < $len; ++ $i) { |
|
126 | - if (preg_match('#\w#', $address[$i])) { |
|
127 | - $out .= '%' . bin2hex($address[$i]); |
|
128 | - } else { |
|
129 | - $out .= $address[$i]; |
|
130 | - } |
|
131 | - } |
|
132 | - $out .= '" ' . $extra . '>'; |
|
133 | - $len = strlen($text); |
|
134 | - for ($i = 0; $i < $len; ++ $i) { |
|
135 | - $out .= '&#x' . bin2hex($text[$i]); |
|
136 | - } |
|
137 | - |
|
138 | - return $out . '</a>'; |
|
139 | - |
|
140 | - default: |
|
141 | - $this->core->triggerError('Mailto: <em>encode</em> argument is invalid, it must be one of : <em>none (= no value), js, js_charcode or hex</em>', E_USER_WARNING); |
|
142 | - } |
|
143 | - } |
|
39 | + /** |
|
40 | + * @param $address |
|
41 | + * @param null $text |
|
42 | + * @param null $subject |
|
43 | + * @param null $encode |
|
44 | + * @param null $cc |
|
45 | + * @param null $bcc |
|
46 | + * @param null $newsgroups |
|
47 | + * @param null $followupto |
|
48 | + * @param null $extra |
|
49 | + * |
|
50 | + * @return string |
|
51 | + */ |
|
52 | + public function process($address, $text = null, $subject = null, $encode = null, $cc = null, $bcc = null, $newsgroups = null, $followupto = null, $extra = null) |
|
53 | + { |
|
54 | + if (empty($address)) { |
|
55 | + return ''; |
|
56 | + } |
|
57 | + if (empty($text)) { |
|
58 | + $text = $address; |
|
59 | + } |
|
60 | + |
|
61 | + // build address string |
|
62 | + $address .= '?'; |
|
63 | + |
|
64 | + if (!empty($subject)) { |
|
65 | + $address .= 'subject=' . rawurlencode($subject) . '&'; |
|
66 | + } |
|
67 | + if (!empty($cc)) { |
|
68 | + $address .= 'cc=' . rawurlencode($cc) . '&'; |
|
69 | + } |
|
70 | + if (!empty($bcc)) { |
|
71 | + $address .= 'bcc=' . rawurlencode($bcc) . '&'; |
|
72 | + } |
|
73 | + if (!empty($newsgroups)) { |
|
74 | + $address .= 'newsgroups=' . rawurlencode($newsgroups) . '&'; |
|
75 | + } |
|
76 | + if (!empty($followupto)) { |
|
77 | + $address .= 'followupto=' . rawurlencode($followupto) . '&'; |
|
78 | + } |
|
79 | + |
|
80 | + $address = rtrim($address, '?&'); |
|
81 | + |
|
82 | + // output |
|
83 | + switch ($encode) { |
|
84 | + |
|
85 | + case 'none': |
|
86 | + case null: |
|
87 | + return '<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>'; |
|
88 | + |
|
89 | + case 'js': |
|
90 | + case 'javascript': |
|
91 | + $str = 'document.write(\'<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>\');'; |
|
92 | + $len = strlen($str); |
|
93 | + |
|
94 | + $out = ''; |
|
95 | + for ($i = 0; $i < $len; ++ $i) { |
|
96 | + $out .= '%' . bin2hex($str[$i]); |
|
97 | + } |
|
98 | + |
|
99 | + return '<script type="text/javascript">eval(unescape(\'' . $out . '\'));</script>'; |
|
100 | + |
|
101 | + break; |
|
102 | + case 'javascript_charcode': |
|
103 | + case 'js_charcode': |
|
104 | + case 'jscharcode': |
|
105 | + case 'jschar': |
|
106 | + $str = '<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>'; |
|
107 | + $len = strlen($str); |
|
108 | + |
|
109 | + $out = '<script type="text/javascript">' . "\n<!--\ndocument.write(Str.fromCharCode("; |
|
110 | + for ($i = 0; $i < $len; ++ $i) { |
|
111 | + $out .= ord($str[$i]) . ','; |
|
112 | + } |
|
113 | + |
|
114 | + return rtrim($out, ',') . "));\n-->\n</script>\n"; |
|
115 | + |
|
116 | + break; |
|
117 | + |
|
118 | + case 'hex': |
|
119 | + if (strpos($address, '?') !== false) { |
|
120 | + $this->core->triggerError('Mailto: Hex encoding is not possible with extra attributes, use one of : <em>js, jscharcode or none</em>.', E_USER_WARNING); |
|
121 | + } |
|
122 | + |
|
123 | + $out = '<a href="mailto:'; |
|
124 | + $len = strlen($address); |
|
125 | + for ($i = 0; $i < $len; ++ $i) { |
|
126 | + if (preg_match('#\w#', $address[$i])) { |
|
127 | + $out .= '%' . bin2hex($address[$i]); |
|
128 | + } else { |
|
129 | + $out .= $address[$i]; |
|
130 | + } |
|
131 | + } |
|
132 | + $out .= '" ' . $extra . '>'; |
|
133 | + $len = strlen($text); |
|
134 | + for ($i = 0; $i < $len; ++ $i) { |
|
135 | + $out .= '&#x' . bin2hex($text[$i]); |
|
136 | + } |
|
137 | + |
|
138 | + return $out . '</a>'; |
|
139 | + |
|
140 | + default: |
|
141 | + $this->core->triggerError('Mailto: <em>encode</em> argument is invalid, it must be one of : <em>none (= no value), js, js_charcode or hex</em>', E_USER_WARNING); |
|
142 | + } |
|
143 | + } |
|
144 | 144 | } |
145 | 145 | \ No newline at end of file |
@@ -36,75 +36,75 @@ |
||
36 | 36 | */ |
37 | 37 | class PluginInclude extends Plugin |
38 | 38 | { |
39 | - /** |
|
40 | - * @param $file |
|
41 | - * @param null $cache_time |
|
42 | - * @param null $cache_id |
|
43 | - * @param null $compile_id |
|
44 | - * @param string $data |
|
45 | - * @param null $assign |
|
46 | - * @param array $rest |
|
47 | - * |
|
48 | - * @return string |
|
49 | - */ |
|
50 | - public function process($file, $cache_time = null, $cache_id = null, $compile_id = null, $data = '_root', $assign = null, array $rest = array()) |
|
51 | - { |
|
52 | - $include = null; |
|
53 | - if ($file === '') { |
|
54 | - return ''; |
|
55 | - } |
|
39 | + /** |
|
40 | + * @param $file |
|
41 | + * @param null $cache_time |
|
42 | + * @param null $cache_id |
|
43 | + * @param null $compile_id |
|
44 | + * @param string $data |
|
45 | + * @param null $assign |
|
46 | + * @param array $rest |
|
47 | + * |
|
48 | + * @return string |
|
49 | + */ |
|
50 | + public function process($file, $cache_time = null, $cache_id = null, $compile_id = null, $data = '_root', $assign = null, array $rest = array()) |
|
51 | + { |
|
52 | + $include = null; |
|
53 | + if ($file === '') { |
|
54 | + return ''; |
|
55 | + } |
|
56 | 56 | |
57 | - if (preg_match('#^([a-z]{2,}):(.*)$#i', $file, $m)) { |
|
58 | - // resource:identifier given, extract them |
|
59 | - $resource = $m[1]; |
|
60 | - $identifier = $m[2]; |
|
61 | - } else { |
|
62 | - // get the current template's resource |
|
63 | - $resource = $this->core->getTemplate()->getResourceName(); |
|
64 | - $identifier = $file; |
|
65 | - } |
|
57 | + if (preg_match('#^([a-z]{2,}):(.*)$#i', $file, $m)) { |
|
58 | + // resource:identifier given, extract them |
|
59 | + $resource = $m[1]; |
|
60 | + $identifier = $m[2]; |
|
61 | + } else { |
|
62 | + // get the current template's resource |
|
63 | + $resource = $this->core->getTemplate()->getResourceName(); |
|
64 | + $identifier = $file; |
|
65 | + } |
|
66 | 66 | |
67 | - try { |
|
68 | - $include = $this->core->templateFactory($resource, $identifier, $cache_time, $cache_id, $compile_id); |
|
69 | - } |
|
70 | - catch (SecurityException $e) { |
|
71 | - $this->core->triggerError('Include : Security restriction : ' . $e->getMessage(), E_USER_WARNING); |
|
72 | - } |
|
73 | - catch (Exception $e) { |
|
74 | - $this->core->triggerError('Include : ' . $e->getMessage(), E_USER_WARNING); |
|
75 | - } |
|
67 | + try { |
|
68 | + $include = $this->core->templateFactory($resource, $identifier, $cache_time, $cache_id, $compile_id); |
|
69 | + } |
|
70 | + catch (SecurityException $e) { |
|
71 | + $this->core->triggerError('Include : Security restriction : ' . $e->getMessage(), E_USER_WARNING); |
|
72 | + } |
|
73 | + catch (Exception $e) { |
|
74 | + $this->core->triggerError('Include : ' . $e->getMessage(), E_USER_WARNING); |
|
75 | + } |
|
76 | 76 | |
77 | - if ($include === null) { |
|
78 | - $this->core->triggerError('Include : Resource "' . $resource . ':' . $identifier . '" not found.', |
|
79 | - E_USER_WARNING); |
|
80 | - } elseif ($include === false) { |
|
81 | - $this->core->triggerError('Include : Resource "' . $resource . '" does not support includes.', |
|
82 | - E_USER_WARNING); |
|
83 | - } |
|
77 | + if ($include === null) { |
|
78 | + $this->core->triggerError('Include : Resource "' . $resource . ':' . $identifier . '" not found.', |
|
79 | + E_USER_WARNING); |
|
80 | + } elseif ($include === false) { |
|
81 | + $this->core->triggerError('Include : Resource "' . $resource . '" does not support includes.', |
|
82 | + E_USER_WARNING); |
|
83 | + } |
|
84 | 84 | |
85 | - if (is_string($data)) { |
|
86 | - $vars = $this->core->readVar($data); |
|
87 | - } else { |
|
88 | - $vars = $data; |
|
89 | - } |
|
85 | + if (is_string($data)) { |
|
86 | + $vars = $this->core->readVar($data); |
|
87 | + } else { |
|
88 | + $vars = $data; |
|
89 | + } |
|
90 | 90 | |
91 | - if (count($rest)) { |
|
92 | - $vars = $rest + $vars; |
|
93 | - } |
|
91 | + if (count($rest)) { |
|
92 | + $vars = $rest + $vars; |
|
93 | + } |
|
94 | 94 | |
95 | - $clone = clone $this->core; |
|
96 | - $out = $clone->get($include, $vars); |
|
95 | + $clone = clone $this->core; |
|
96 | + $out = $clone->get($include, $vars); |
|
97 | 97 | |
98 | - if ($assign !== null) { |
|
99 | - $this->core->assignInScope($out, $assign); |
|
100 | - } |
|
98 | + if ($assign !== null) { |
|
99 | + $this->core->assignInScope($out, $assign); |
|
100 | + } |
|
101 | 101 | |
102 | - foreach ($clone->getReturnValues() as $name => $value) { |
|
103 | - $this->core->assignInScope($value, $name); |
|
104 | - } |
|
102 | + foreach ($clone->getReturnValues() as $name => $value) { |
|
103 | + $this->core->assignInScope($value, $name); |
|
104 | + } |
|
105 | 105 | |
106 | - if ($assign === null) { |
|
107 | - return $out; |
|
108 | - } |
|
109 | - } |
|
106 | + if ($assign === null) { |
|
107 | + return $out; |
|
108 | + } |
|
109 | + } |
|
110 | 110 | } |
111 | 111 | \ No newline at end of file |
@@ -37,26 +37,26 @@ |
||
37 | 37 | */ |
38 | 38 | class PluginEval extends Plugin |
39 | 39 | { |
40 | - /** |
|
41 | - * @param string $var |
|
42 | - * @param null $assign |
|
43 | - * |
|
44 | - * @return string |
|
45 | - */ |
|
46 | - public function process($var, $assign = null) |
|
47 | - { |
|
48 | - if ($var == '') { |
|
49 | - return ''; |
|
50 | - } |
|
40 | + /** |
|
41 | + * @param string $var |
|
42 | + * @param null $assign |
|
43 | + * |
|
44 | + * @return string |
|
45 | + */ |
|
46 | + public function process($var, $assign = null) |
|
47 | + { |
|
48 | + if ($var == '') { |
|
49 | + return ''; |
|
50 | + } |
|
51 | 51 | |
52 | - $tpl = new TemplateString($var); |
|
53 | - $clone = clone $this->core; |
|
54 | - $out = $clone->get($tpl, $this->core->readVar('_parent')); |
|
52 | + $tpl = new TemplateString($var); |
|
53 | + $clone = clone $this->core; |
|
54 | + $out = $clone->get($tpl, $this->core->readVar('_parent')); |
|
55 | 55 | |
56 | - if ($assign !== null) { |
|
57 | - $this->core->assignInScope($out, $assign); |
|
58 | - } else { |
|
59 | - return $out; |
|
60 | - } |
|
61 | - } |
|
56 | + if ($assign !== null) { |
|
57 | + $this->core->assignInScope($out, $assign); |
|
58 | + } else { |
|
59 | + return $out; |
|
60 | + } |
|
61 | + } |
|
62 | 62 | } |
63 | 63 | \ No newline at end of file |
@@ -34,58 +34,58 @@ |
||
34 | 34 | */ |
35 | 35 | class PluginCycle extends Plugin |
36 | 36 | { |
37 | - protected $cycles = array(); |
|
37 | + protected $cycles = array(); |
|
38 | 38 | |
39 | - /** |
|
40 | - * @param string $name |
|
41 | - * @param null $values |
|
42 | - * @param bool $print |
|
43 | - * @param bool $advance |
|
44 | - * @param string $delimiter |
|
45 | - * @param null $assign |
|
46 | - * @param bool $reset |
|
47 | - * |
|
48 | - * @return string|null |
|
49 | - */ |
|
50 | - public function process($name = 'default', $values = null, $print = true, $advance = true, $delimiter = ',', $assign = null, $reset = false) |
|
51 | - { |
|
52 | - if ($values !== null) { |
|
53 | - if (is_string($values)) { |
|
54 | - $values = explode($delimiter, $values); |
|
55 | - } |
|
39 | + /** |
|
40 | + * @param string $name |
|
41 | + * @param null $values |
|
42 | + * @param bool $print |
|
43 | + * @param bool $advance |
|
44 | + * @param string $delimiter |
|
45 | + * @param null $assign |
|
46 | + * @param bool $reset |
|
47 | + * |
|
48 | + * @return string|null |
|
49 | + */ |
|
50 | + public function process($name = 'default', $values = null, $print = true, $advance = true, $delimiter = ',', $assign = null, $reset = false) |
|
51 | + { |
|
52 | + if ($values !== null) { |
|
53 | + if (is_string($values)) { |
|
54 | + $values = explode($delimiter, $values); |
|
55 | + } |
|
56 | 56 | |
57 | - if (!isset($this->cycles[$name]) || $this->cycles[$name]['values'] !== $values) { |
|
58 | - $this->cycles[$name]['index'] = 0; |
|
59 | - } |
|
57 | + if (!isset($this->cycles[$name]) || $this->cycles[$name]['values'] !== $values) { |
|
58 | + $this->cycles[$name]['index'] = 0; |
|
59 | + } |
|
60 | 60 | |
61 | - $this->cycles[$name]['values'] = array_values($values); |
|
62 | - } elseif (isset($this->cycles[$name])) { |
|
63 | - $values = $this->cycles[$name]['values']; |
|
64 | - } |
|
61 | + $this->cycles[$name]['values'] = array_values($values); |
|
62 | + } elseif (isset($this->cycles[$name])) { |
|
63 | + $values = $this->cycles[$name]['values']; |
|
64 | + } |
|
65 | 65 | |
66 | - if ($reset) { |
|
67 | - $this->cycles[$name]['index'] = 0; |
|
68 | - } |
|
66 | + if ($reset) { |
|
67 | + $this->cycles[$name]['index'] = 0; |
|
68 | + } |
|
69 | 69 | |
70 | - if ($print) { |
|
71 | - $out = $values[$this->cycles[$name]['index']]; |
|
72 | - } else { |
|
73 | - $out = null; |
|
74 | - } |
|
70 | + if ($print) { |
|
71 | + $out = $values[$this->cycles[$name]['index']]; |
|
72 | + } else { |
|
73 | + $out = null; |
|
74 | + } |
|
75 | 75 | |
76 | - if ($advance) { |
|
77 | - if ($this->cycles[$name]['index'] >= count($values) - 1) { |
|
78 | - $this->cycles[$name]['index'] = 0; |
|
79 | - } else { |
|
80 | - ++ $this->cycles[$name]['index']; |
|
81 | - } |
|
82 | - } |
|
76 | + if ($advance) { |
|
77 | + if ($this->cycles[$name]['index'] >= count($values) - 1) { |
|
78 | + $this->cycles[$name]['index'] = 0; |
|
79 | + } else { |
|
80 | + ++ $this->cycles[$name]['index']; |
|
81 | + } |
|
82 | + } |
|
83 | 83 | |
84 | - if ($assign === null) { |
|
85 | - return $out; |
|
86 | - } |
|
87 | - $this->core->assignInScope($out, $assign); |
|
84 | + if ($assign === null) { |
|
85 | + return $out; |
|
86 | + } |
|
87 | + $this->core->assignInScope($out, $assign); |
|
88 | 88 | |
89 | - return null; |
|
90 | - } |
|
89 | + return null; |
|
90 | + } |
|
91 | 91 | } |