@@ -99,10 +99,11 @@ |
||
| 99 | 99 | $objects = scandir($dir); |
| 100 | 100 | foreach ($objects as $object) { |
| 101 | 101 | if ($object != "." && $object != "..") { |
| 102 | - if (is_dir($dir."/".$object)) |
|
| 103 | - $this->rrmdir($dir."/".$object, $cache_dir); |
|
| 104 | - else |
|
| 105 | - unlink($dir."/".$object); |
|
| 102 | + if (is_dir($dir."/".$object)) { |
|
| 103 | + $this->rrmdir($dir."/".$object, $cache_dir); |
|
| 104 | + } else { |
|
| 105 | + unlink($dir."/".$object); |
|
| 106 | + } |
|
| 106 | 107 | } |
| 107 | 108 | } |
| 108 | 109 | |
@@ -154,7 +154,9 @@ discard block |
||
| 154 | 154 | } |
| 155 | 155 | |
| 156 | 156 | // if $http_accept_language was left out, read it from the HTTP-Header |
| 157 | - if ($http_accept_language == "auto") $http_accept_language = $_SERVER['HTTP_ACCEPT_LANGUAGE']; |
|
| 157 | + if ($http_accept_language == "auto") { |
|
| 158 | + $http_accept_language = $_SERVER['HTTP_ACCEPT_LANGUAGE']; |
|
| 159 | + } |
|
| 158 | 160 | |
| 159 | 161 | // standard for HTTP_ACCEPT_LANGUAGE is defined under |
| 160 | 162 | // http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.4 |
@@ -178,10 +180,13 @@ discard block |
||
| 178 | 180 | if (!empty($arr[3])) { |
| 179 | 181 | $langrange = strtolower ($arr[3]); |
| 180 | 182 | $language = $langprefix . "-" . $langrange; |
| 183 | + } else { |
|
| 184 | + $language = $langprefix; |
|
| 181 | 185 | } |
| 182 | - else $language = $langprefix; |
|
| 183 | 186 | $qvalue = 1.0; |
| 184 | - if (!empty($arr[5])) $qvalue = floatval($arr[5]); |
|
| 187 | + if (!empty($arr[5])) { |
|
| 188 | + $qvalue = floatval($arr[5]); |
|
| 189 | + } |
|
| 185 | 190 | |
| 186 | 191 | // find q-maximal language |
| 187 | 192 | if (in_array($language,$available_languages) && ($qvalue > $bestqval)) { |
@@ -253,17 +253,17 @@ |
||
| 253 | 253 | $phpTags = SMARTY_PHP_ALLOW; |
| 254 | 254 | } |
| 255 | 255 | switch ($phpTags) { |
| 256 | - case SMARTY_PHP_ALLOW: |
|
| 257 | - case SMARTY_PHP_PASSTHRU: |
|
| 258 | - $phpTags = SecurityPolicy::PHP_ALLOW; |
|
| 259 | - break; |
|
| 260 | - case SMARTY_PHP_QUOTE: |
|
| 261 | - $phpTags = SecurityPolicy::PHP_ENCODE; |
|
| 262 | - break; |
|
| 263 | - case SMARTY_PHP_REMOVE: |
|
| 264 | - default: |
|
| 265 | - $phpTags = SecurityPolicy::PHP_REMOVE; |
|
| 266 | - break; |
|
| 256 | + case SMARTY_PHP_ALLOW: |
|
| 257 | + case SMARTY_PHP_PASSTHRU: |
|
| 258 | + $phpTags = SecurityPolicy::PHP_ALLOW; |
|
| 259 | + break; |
|
| 260 | + case SMARTY_PHP_QUOTE: |
|
| 261 | + $phpTags = SecurityPolicy::PHP_ENCODE; |
|
| 262 | + break; |
|
| 263 | + case SMARTY_PHP_REMOVE: |
|
| 264 | + default: |
|
| 265 | + $phpTags = SecurityPolicy::PHP_REMOVE; |
|
| 266 | + break; |
|
| 267 | 267 | } |
| 268 | 268 | $policy->setPhpHandling($phpTags); |
| 269 | 269 | |
@@ -478,8 +478,7 @@ discard block |
||
| 478 | 478 | if (!class_exists($class) && !function_exists($class)) { |
| 479 | 479 | try { |
| 480 | 480 | $this->getCore()->getLoader()->loadPlugin($name); |
| 481 | - } |
|
| 482 | - catch (Exception $e) { |
|
| 481 | + } catch (Exception $e) { |
|
| 483 | 482 | throw new Exception('Processor ' . $name . ' could not be found in your plugin directories, please ensure it is in a file named ' . $name . '.php in the plugin directory'); |
| 484 | 483 | } |
| 485 | 484 | } |
@@ -1632,8 +1631,7 @@ discard block |
||
| 1632 | 1631 | // load if plugin |
| 1633 | 1632 | try { |
| 1634 | 1633 | $this->getPluginType('if'); |
| 1635 | - } |
|
| 1636 | - catch (Exception $e) { |
|
| 1634 | + } catch (Exception $e) { |
|
| 1637 | 1635 | throw new CompilationException($this, 'Assignments require the "if" plugin to be accessible'); |
| 1638 | 1636 | } |
| 1639 | 1637 | |
@@ -3454,8 +3452,7 @@ discard block |
||
| 3454 | 3452 | if ($pluginType === - 1) { |
| 3455 | 3453 | try { |
| 3456 | 3454 | $this->getCore()->getLoader()->loadPlugin('Plugin' . Core::toCamelCase($name)); |
| 3457 | - } |
|
| 3458 | - catch (Exception $e) { |
|
| 3455 | + } catch (Exception $e) { |
|
| 3459 | 3456 | if (isset($phpFunc)) { |
| 3460 | 3457 | $pluginType = Core::NATIVE_PLUGIN; |
| 3461 | 3458 | } elseif (is_object($this->getCore()->getPluginProxy()) && $this->getCore()->getPluginProxy()->handles($name)) { |
@@ -1523,35 +1523,35 @@ |
||
| 1523 | 1523 | array_shift($m[2]); |
| 1524 | 1524 | array_shift($m[1]); |
| 1525 | 1525 | switch ($m[2][0]) { |
| 1526 | - case 'get': |
|
| 1527 | - $cur = $_GET; |
|
| 1528 | - break; |
|
| 1529 | - case 'post': |
|
| 1530 | - $cur = $_POST; |
|
| 1531 | - break; |
|
| 1532 | - case 'session': |
|
| 1533 | - $cur = $_SESSION; |
|
| 1534 | - break; |
|
| 1535 | - case 'cookies': |
|
| 1536 | - case 'cookie': |
|
| 1537 | - $cur = $_COOKIE; |
|
| 1538 | - break; |
|
| 1539 | - case 'server': |
|
| 1540 | - $cur = $_SERVER; |
|
| 1541 | - break; |
|
| 1542 | - case 'env': |
|
| 1543 | - $cur = $_ENV; |
|
| 1544 | - break; |
|
| 1545 | - case 'request': |
|
| 1546 | - $cur = $_REQUEST; |
|
| 1547 | - break; |
|
| 1548 | - case 'const': |
|
| 1549 | - array_shift($m[2]); |
|
| 1550 | - if (defined($m[2][0])) { |
|
| 1551 | - return constant($m[2][0]); |
|
| 1552 | - } else { |
|
| 1553 | - return null; |
|
| 1554 | - } |
|
| 1526 | + case 'get': |
|
| 1527 | + $cur = $_GET; |
|
| 1528 | + break; |
|
| 1529 | + case 'post': |
|
| 1530 | + $cur = $_POST; |
|
| 1531 | + break; |
|
| 1532 | + case 'session': |
|
| 1533 | + $cur = $_SESSION; |
|
| 1534 | + break; |
|
| 1535 | + case 'cookies': |
|
| 1536 | + case 'cookie': |
|
| 1537 | + $cur = $_COOKIE; |
|
| 1538 | + break; |
|
| 1539 | + case 'server': |
|
| 1540 | + $cur = $_SERVER; |
|
| 1541 | + break; |
|
| 1542 | + case 'env': |
|
| 1543 | + $cur = $_ENV; |
|
| 1544 | + break; |
|
| 1545 | + case 'request': |
|
| 1546 | + $cur = $_REQUEST; |
|
| 1547 | + break; |
|
| 1548 | + case 'const': |
|
| 1549 | + array_shift($m[2]); |
|
| 1550 | + if (defined($m[2][0])) { |
|
| 1551 | + return constant($m[2][0]); |
|
| 1552 | + } else { |
|
| 1553 | + return null; |
|
| 1554 | + } |
|
| 1555 | 1555 | } |
| 1556 | 1556 | if ($cur !== $this->getGlobals()) { |
| 1557 | 1557 | array_shift($m[2]); |
@@ -592,8 +592,7 @@ |
||
| 592 | 592 | if (!class_exists($class) && !function_exists($class)) { |
| 593 | 593 | try { |
| 594 | 594 | $this->getLoader()->loadPlugin($callback); |
| 595 | - } |
|
| 596 | - catch (Exception $e) { |
|
| 595 | + } catch (Exception $e) { |
|
| 597 | 596 | if (strstr($callback, self::NAMESPACE_PLUGINS_FILTERS)) { |
| 598 | 597 | throw new Exception('Wrong filter name : ' . $callback . ', the "Filter" prefix should not be used, please only use "' . str_replace('Filter', '', $callback) . '"'); |
| 599 | 598 | } else { |
@@ -64,8 +64,7 @@ |
||
| 64 | 64 | $compiler->findBlock('dynamic'); |
| 65 | 65 | |
| 66 | 66 | return $content; |
| 67 | - } |
|
| 68 | - catch (CompilationException $e) { |
|
| 67 | + } catch (CompilationException $e) { |
|
| 69 | 68 | } |
| 70 | 69 | $output = Compiler::PHP_OPEN . 'if($doCache) {' . "\n\t" . 'echo \'<dwoo:dynamic_\'.$dynamicId.\'>' . str_replace('\'', '\\\'', $content) . '</dwoo:dynamic_\'.$dynamicId.\'>\';' . "\n} else {\n\t"; |
| 71 | 70 | if (substr($content, 0, strlen(Compiler::PHP_OPEN)) == Compiler::PHP_OPEN) { |
@@ -66,11 +66,9 @@ |
||
| 66 | 66 | |
| 67 | 67 | try { |
| 68 | 68 | $include = $this->core->templateFactory($resource, $identifier, $cache_time, $cache_id, $compile_id); |
| 69 | - } |
|
| 70 | - catch (SecurityException $e) { |
|
| 69 | + } catch (SecurityException $e) { |
|
| 71 | 70 | $this->core->triggerError('Include : Security restriction : ' . $e->getMessage(), E_USER_WARNING); |
| 72 | - } |
|
| 73 | - catch (Exception $e) { |
|
| 71 | + } catch (Exception $e) { |
|
| 74 | 72 | $this->core->triggerError('Include : ' . $e->getMessage(), E_USER_WARNING); |
| 75 | 73 | } |
| 76 | 74 | |
@@ -95,11 +95,9 @@ |
||
| 95 | 95 | |
| 96 | 96 | try { |
| 97 | 97 | $parent = $compiler->getCore()->templateFactory($resource, $identifier, null, null, null, $curTpl); |
| 98 | - } |
|
| 99 | - catch (SecurityException $e) { |
|
| 98 | + } catch (SecurityException $e) { |
|
| 100 | 99 | throw new CompilationException($compiler, 'Extends : Security restriction : ' . $e->getMessage()); |
| 101 | - } |
|
| 102 | - catch (Exception $e) { |
|
| 100 | + } catch (Exception $e) { |
|
| 103 | 101 | throw new CompilationException($compiler, 'Extends : ' . $e->getMessage()); |
| 104 | 102 | } |
| 105 | 103 | |
@@ -50,8 +50,7 @@ |
||
| 50 | 50 | if (!class_exists(Core::NAMESPACE_PLUGINS_BLOCKS . 'PluginIf')) { |
| 51 | 51 | try { |
| 52 | 52 | $compiler->getCore()->getLoader()->loadPlugin('if'); |
| 53 | - } |
|
| 54 | - catch (Exception $e) { |
|
| 53 | + } catch (Exception $e) { |
|
| 55 | 54 | throw new CompilationException($compiler, 'Tif: the if plugin is required to use Tif'); |
| 56 | 55 | } |
| 57 | 56 | } |