dwoo-project / dwoo

lib/Dwoo/Compiler.php

Switch Indentation +43 added lines, -43 removed lines

@@ -769,13 +769,13 @@ 
                         $search = array('{<\?.*?\?>}', '{<%.*?%>}');
                     }
                     switch ($this->securityPolicy->getPhpHandling()) {
-                        case SecurityPolicy::PHP_ALLOW:
-                            break;
-                        case SecurityPolicy::PHP_ENCODE:
-                            $tpl = preg_replace_callback($search, array($this, 'phpTagEncodingHelper'), $tpl);
-                            break;
-                        case SecurityPolicy::PHP_REMOVE:
-                            $tpl = preg_replace($search, '', $tpl);
+                    case SecurityPolicy::PHP_ALLOW:
+                        break;
+                    case SecurityPolicy::PHP_ENCODE:
+                        $tpl = preg_replace_callback($search, array($this, 'phpTagEncodingHelper'), $tpl);
+                        break;
+                    case SecurityPolicy::PHP_REMOVE:
+                        $tpl = preg_replace($search, '', $tpl);
                     }
                 }
             }
@@ -875,42 +875,42 @@ 
             }
 
             switch ($type) {
-                case Core::BLOCK_PLUGIN:
-                case Core::CLASS_PLUGIN:
-                    if (class_exists('Plugin' . $plugin) !== false) {
-                        $output .= "if (class_exists('" . "Plugin" . $plugin . "')===false)".
-                        "\n\t\$this->getLoader()->loadPlugin('Plugin$plugin');\n";
-                    } else {
-                        $output .= "if (class_exists('" . Core::NAMESPACE_PLUGINS_BLOCKS . "Plugin" . $plugin . "')===false)".
-                        "\n\t\$this->getLoader()->loadPlugin('Plugin$plugin');\n";
-                    }
-                    break;
-                case Core::FUNC_PLUGIN:
-                    if (function_exists('Plugin' . $plugin) !== false) {
-                        $output .= "if (function_exists('" . "Plugin" . $plugin . "')===false)".
-                        "\n\t\$this->getLoader()->loadPlugin('Plugin$plugin');\n";
-                    } else {
-                        $output .= "if (function_exists('" . Core::NAMESPACE_PLUGINS_FUNCTIONS . "Plugin" . $plugin . "')===false)".
-                        "\n\t\$this->getLoader()->loadPlugin('Plugin$plugin');\n";
-                    }
-                    break;
-                case Core::SMARTY_MODIFIER:
-                    $output .= "if (function_exists('smarty_modifier_$plugin')===false)".
-                    "\n\t\$this->getLoader()->loadPlugin('$plugin');\n";
-                    break;
-                case Core::SMARTY_FUNCTION:
-                    $output .= "if (function_exists('smarty_function_$plugin')===false)".
-                    "\n\t\$this->getLoader()->loadPlugin('$plugin');\n";
-                    break;
-                case Core::SMARTY_BLOCK:
-                    $output .= "if (function_exists('smarty_block_$plugin')===false)".
-                    "\n\t\$this->getLoader()->loadPlugin('$plugin');\n";
-                    break;
-                case Core::PROXY_PLUGIN:
-                    $output .= $this->getDwoo()->getPluginProxy()->getLoader($plugin);
-                    break;
-                default:
-                    throw new CompilationException($this, 'Type error for ' . $plugin . ' with type' . $type);
+            case Core::BLOCK_PLUGIN:
+            case Core::CLASS_PLUGIN:
+                if (class_exists('Plugin' . $plugin) !== false) {
+                    $output .= "if (class_exists('" . "Plugin" . $plugin . "')===false)".
+                    "\n\t\$this->getLoader()->loadPlugin('Plugin$plugin');\n";
+                } else {
+                    $output .= "if (class_exists('" . Core::NAMESPACE_PLUGINS_BLOCKS . "Plugin" . $plugin . "')===false)".
+                    "\n\t\$this->getLoader()->loadPlugin('Plugin$plugin');\n";
+                }
+                break;
+            case Core::FUNC_PLUGIN:
+                if (function_exists('Plugin' . $plugin) !== false) {
+                    $output .= "if (function_exists('" . "Plugin" . $plugin . "')===false)".
+                    "\n\t\$this->getLoader()->loadPlugin('Plugin$plugin');\n";
+                } else {
+                    $output .= "if (function_exists('" . Core::NAMESPACE_PLUGINS_FUNCTIONS . "Plugin" . $plugin . "')===false)".
+                    "\n\t\$this->getLoader()->loadPlugin('Plugin$plugin');\n";
+                }
+                break;
+            case Core::SMARTY_MODIFIER:
+                $output .= "if (function_exists('smarty_modifier_$plugin')===false)".
+                "\n\t\$this->getLoader()->loadPlugin('$plugin');\n";
+                break;
+            case Core::SMARTY_FUNCTION:
+                $output .= "if (function_exists('smarty_function_$plugin')===false)".
+                "\n\t\$this->getLoader()->loadPlugin('$plugin');\n";
+                break;
+            case Core::SMARTY_BLOCK:
+                $output .= "if (function_exists('smarty_block_$plugin')===false)".
+                "\n\t\$this->getLoader()->loadPlugin('$plugin');\n";
+                break;
+            case Core::PROXY_PLUGIN:
+                $output .= $this->getDwoo()->getPluginProxy()->getLoader($plugin);
+                break;
+            default:
+                throw new CompilationException($this, 'Type error for ' . $plugin . ' with type' . $type);
             }
         }
 

lib/Dwoo/Plugins/Blocks/PluginIf.php

Switch Indentation +153 added lines, -153 removed lines

@@ -70,164 +70,164 @@
             }
             switch ($vmod) {
 
-                case 'and':
-                    if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) {
-                        $p[] = '&&';
-                    } else {
-                        $p[] = $v;
-                    }
-                    break;
-                case 'or':
-                    if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) {
-                        $p[] = '||';
-                    } else {
-                        $p[] = $v;
-                    }
-                    break;
-                case 'xor':
-                    if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) {
-                        $p[] = '^';
-                    } else {
-                        $p[] = $v;
-                    }
-                    break;
-                case 'eq':
-                    if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) {
-                        $p[] = '==';
-                    } else {
-                        $p[] = $v;
-                    }
-                    break;
-                case 'ne':
-                case 'neq':
-                    if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) {
-                        $p[] = '!=';
-                    } else {
-                        $p[] = $v;
-                    }
-                    break;
-                case 'gte':
-                case 'ge':
-                    if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) {
-                        $p[] = '>=';
-                    } else {
-                        $p[] = $v;
-                    }
-                    break;
-                case 'lte':
-                case 'le':
-                    if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) {
-                        $p[] = '<=';
-                    } else {
-                        $p[] = $v;
-                    }
-                    break;
-                case 'gt':
-                    if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) {
-                        $p[] = '>';
-                    } else {
-                        $p[] = $v;
-                    }
-                    break;
-                case 'lt':
-                    if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) {
-                        $p[] = '<';
-                    } else {
-                        $p[] = $v;
-                    }
-                    break;
-                case 'mod':
-                    if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) {
-                        $p[] = '%';
-                    } else {
-                        $p[] = $v;
-                    }
-                    break;
-                case 'not':
-                    if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) {
-                        $p[] = '!';
-                    } else {
-                        $p[] = $v;
-                    }
-                    break;
-                case '<>':
+            case 'and':
+                if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) {
+                    $p[] = '&&';
+                } else {
+                    $p[] = $v;
+                }
+                break;
+            case 'or':
+                if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) {
+                    $p[] = '||';
+                } else {
+                    $p[] = $v;
+                }
+                break;
+            case 'xor':
+                if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) {
+                    $p[] = '^';
+                } else {
+                    $p[] = $v;
+                }
+                break;
+            case 'eq':
+                if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) {
+                    $p[] = '==';
+                } else {
+                    $p[] = $v;
+                }
+                break;
+            case 'ne':
+            case 'neq':
+                if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) {
                     $p[] = '!=';
+                } else {
+                    $p[] = $v;
+                }
+                break;
+            case 'gte':
+            case 'ge':
+                if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) {
+                    $p[] = '>=';
+                } else {
+                    $p[] = $v;
+                }
+                break;
+            case 'lte':
+            case 'le':
+                if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) {
+                    $p[] = '<=';
+                } else {
+                    $p[] = $v;
+                }
+                break;
+            case 'gt':
+                if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) {
+                    $p[] = '>';
+                } else {
+                    $p[] = $v;
+                }
+                break;
+            case 'lt':
+                if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) {
+                    $p[] = '<';
+                } else {
+                    $p[] = $v;
+                }
+                break;
+            case 'mod':
+                if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) {
+                    $p[] = '%';
+                } else {
+                    $p[] = $v;
+                }
+                break;
+            case 'not':
+                if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) {
+                    $p[] = '!';
+                } else {
+                    $p[] = $v;
+                }
+                break;
+            case '<>':
+                $p[] = '!=';
+                break;
+            case '==':
+            case '!=':
+            case '>=':
+            case '<=':
+            case '>':
+            case '<':
+            case '===':
+            case '!==':
+            case '%':
+            case '!':
+            case '^':
+                $p[] = $vmod;
+                break;
+            case 'is':
+                if ($tokens[$k] !== Compiler::T_UNQUOTED_STRING) {
+                    $p[] = $v;
                     break;
-                case '==':
-                case '!=':
-                case '>=':
-                case '<=':
-                case '>':
-                case '<':
-                case '===':
-                case '!==':
-                case '%':
-                case '!':
-                case '^':
-                    $p[] = $vmod;
+                }
+                if (isset($params[$k + 1]) && strtolower(trim($params[$k + 1], '"\'')) === 'not' && $tokens[$k + 1] === Compiler::T_UNQUOTED_STRING) {
+                    $negate = true;
+                    next($params);
+                } else {
+                    $negate = false;
+                }
+                $ptr = 1 + (int)$negate;
+                if ($tokens[$k + $ptr] !== Compiler::T_UNQUOTED_STRING) {
                     break;
-                case 'is':
-                    if ($tokens[$k] !== Compiler::T_UNQUOTED_STRING) {
-                        $p[] = $v;
-                        break;
-                    }
-                    if (isset($params[$k + 1]) && strtolower(trim($params[$k + 1], '"\'')) === 'not' && $tokens[$k + 1] === Compiler::T_UNQUOTED_STRING) {
-                        $negate = true;
-                        next($params);
-                    } else {
-                        $negate = false;
-                    }
-                    $ptr = 1 + (int)$negate;
-                    if ($tokens[$k + $ptr] !== Compiler::T_UNQUOTED_STRING) {
-                        break;
-                    }
-                    if (!isset($params[$k + $ptr])) {
-                        $params[$k + $ptr] = '';
-                    } else {
-                        $params[$k + $ptr] = trim($params[$k + $ptr], '"\'');
-                    }
-                    switch ($params[$k + $ptr]) {
+                }
+                if (!isset($params[$k + $ptr])) {
+                    $params[$k + $ptr] = '';
+                } else {
+                    $params[$k + $ptr] = trim($params[$k + $ptr], '"\'');
+                }
+                switch ($params[$k + $ptr]) {
 
-                        case 'div':
-                            if (isset($params[$k + $ptr + 1]) && strtolower(trim($params[$k + $ptr + 1], '"\'')) === 'by') {
-                                $p[] = ' % ' . $params[$k + $ptr + 2] . ' ' . ($negate ? '!' : '=') . '== 0';
-                                next($params);
-                                next($params);
-                                next($params);
-                            } else {
-                                throw new CompilationException($compiler, 'If : Syntax error : syntax should be "if $a is [not] div by $b", found ' . $params[$k - 1] . ' is ' . ($negate ? 'not ' : '') . 'div ' . $params[$k + $ptr + 1] . ' ' . $params[$k + $ptr + 2]);
-                            }
-                            break;
-                        case 'even':
-                            $a = array_pop($p);
-                            if (isset($params[$k + $ptr + 1]) && strtolower(trim($params[$k + $ptr + 1], '"\'')) === 'by') {
-                                $b   = $params[$k + $ptr + 2];
-                                $p[] = '(' . $a . ' / ' . $b . ') % 2 ' . ($negate ? '!' : '=') . '== 0';
-                                next($params);
-                                next($params);
-                            } else {
-                                $p[] = $a . ' % 2 ' . ($negate ? '!' : '=') . '== 0';
-                            }
-                            next($params);
-                            break;
-                        case 'odd':
-                            $a = array_pop($p);
-                            if (isset($params[$k + $ptr + 1]) && strtolower(trim($params[$k + $ptr + 1], '"\'')) === 'by') {
-                                $b   = $params[$k + $ptr + 2];
-                                $p[] = '(' . $a . ' / ' . $b . ') % 2 ' . ($negate ? '=' : '!') . '== 0';
-                                next($params);
-                                next($params);
-                            } else {
-                                $p[] = $a . ' % 2 ' . ($negate ? '=' : '!') . '== 0';
-                            }
-                            next($params);
-                            break;
-                        default:
-                            throw new CompilationException($compiler, 'If : Syntax error : syntax should be "if $a is [not] (div|even|odd) [by $b]", found ' . $params[$k - 1] . ' is ' . $params[$k + $ptr + 1]);
-                    }
-                    break;
+                case 'div':
+                if (isset($params[$k + $ptr + 1]) && strtolower(trim($params[$k + $ptr + 1], '"\'')) === 'by') {
+                $p[] = ' % ' . $params[$k + $ptr + 2] . ' ' . ($negate ? '!' : '=') . '== 0';
+                next($params);
+                next($params);
+                next($params);
+                } else {
+                throw new CompilationException($compiler, 'If : Syntax error : syntax should be "if $a is [not] div by $b", found ' . $params[$k - 1] . ' is ' . ($negate ? 'not ' : '') . 'div ' . $params[$k + $ptr + 1] . ' ' . $params[$k + $ptr + 2]);
+                }
+                break;
+                case 'even':
+                $a = array_pop($p);
+                if (isset($params[$k + $ptr + 1]) && strtolower(trim($params[$k + $ptr + 1], '"\'')) === 'by') {
+                $b   = $params[$k + $ptr + 2];
+                $p[] = '(' . $a . ' / ' . $b . ') % 2 ' . ($negate ? '!' : '=') . '== 0';
+                next($params);
+                next($params);
+                } else {
+                $p[] = $a . ' % 2 ' . ($negate ? '!' : '=') . '== 0';
+                }
+                next($params);
+                break;
+                case 'odd':
+                $a = array_pop($p);
+                if (isset($params[$k + $ptr + 1]) && strtolower(trim($params[$k + $ptr + 1], '"\'')) === 'by') {
+                $b   = $params[$k + $ptr + 2];
+                $p[] = '(' . $a . ' / ' . $b . ') % 2 ' . ($negate ? '=' : '!') . '== 0';
+                next($params);
+                next($params);
+                } else {
+                $p[] = $a . ' % 2 ' . ($negate ? '=' : '!') . '== 0';
+                }
+                next($params);
+                break;
                 default:
-                    $p[] = $v;
+                throw new CompilationException($compiler, 'If : Syntax error : syntax should be "if $a is [not] (div|even|odd) [by $b]", found ' . $params[$k - 1] . ' is ' . $params[$k + $ptr + 1]);
+                }
+                    break;
+            default:
+                $p[] = $v;
             }
         }
 

lib/Dwoo/Plugins/Blocks/PluginTextformat.php

Switch Indentation +8 added lines, -8 removed lines

@@ -62,14 +62,14 @@
 
         switch ($style) {
 
-            case 'email':
-                $wrap         = 72;
-                $indent_first = 0;
-                break;
-            case 'html':
-                $wrap_char   = '<br />';
-                $indent_char = $indent_char == "\t" ? '&nbsp;&nbsp;&nbsp;&nbsp;' : '&nbsp;';
-                break;
+        case 'email':
+            $wrap         = 72;
+            $indent_first = 0;
+            break;
+        case 'html':
+            $wrap_char   = '<br />';
+            $indent_char = $indent_char == "\t" ? '&nbsp;&nbsp;&nbsp;&nbsp;' : '&nbsp;';
+            break;
         }
 
         $this->wrap     = (int)$wrap;

lib/Dwoo/Plugins/Blocks/PluginStrip.php

Switch Indentation +5 added lines, -5 removed lines

@@ -67,12 +67,12 @@
 
         $mode = trim($params['mode'], '"\'');
         switch ($mode) {
-            case 'js':
-            case 'javascript':
-                $content = preg_replace('#(?<!:)//\s[^\r\n]*|/\*.*?\*/#s', '', $content);
+        case 'js':
+        case 'javascript':
+            $content = preg_replace('#(?<!:)//\s[^\r\n]*|/\*.*?\*/#s', '', $content);
 
-            case 'default':
-            default:
+        case 'default':
+        default:
         }
         $content = preg_replace(array(
             "/\n/",

lib/Dwoo/Plugins/Blocks/PluginAutoEscape.php

Switch Indentation +16 added lines, -16 removed lines

@@ -56,22 +56,22 @@
         $params = $compiler->getCompiledParams($params);
         switch (strtolower(trim((string)$params['enabled'], '"\''))) {
 
-            case 'on':
-            case 'true':
-            case 'enabled':
-            case 'enable':
-            case '1':
-                $enable = true;
-                break;
-            case 'off':
-            case 'false':
-            case 'disabled':
-            case 'disable':
-            case '0':
-                $enable = false;
-                break;
-            default:
-                throw new CompilationException($compiler, 'Auto_Escape : Invalid parameter (' . $params['enabled'] . '), valid parameters are "enable"/true or "disable"/false');
+        case 'on':
+        case 'true':
+        case 'enabled':
+        case 'enable':
+        case '1':
+            $enable = true;
+            break;
+        case 'off':
+        case 'false':
+        case 'disabled':
+        case 'disable':
+        case '0':
+            $enable = false;
+            break;
+        default:
+            throw new CompilationException($compiler, 'Auto_Escape : Invalid parameter (' . $params['enabled'] . '), valid parameters are "enable"/true or "disable"/false');
         }
 
         self::$stack[] = $compiler->getAutoEscape();

lib/Dwoo/Plugins/Functions/PluginMailto.php

Switch Indentation +54 added lines, -54 removed lines

@@ -67,62 +67,62 @@
     // output
     switch ($encode) {
 
-        case 'none':
-        case null:
-            return '<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>';
-
-        case 'js':
-        case 'javascript':
-            $str = 'document.write(\'<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>\');';
-            $len = strlen($str);
-
-            $out = '';
-            for ($i = 0; $i < $len; ++ $i) {
-                $out .= '%' . bin2hex($str[$i]);
+    case 'none':
+    case null:
+        return '<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>';
+
+    case 'js':
+    case 'javascript':
+        $str = 'document.write(\'<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>\');';
+        $len = strlen($str);
+
+        $out = '';
+        for ($i = 0; $i < $len; ++ $i) {
+            $out .= '%' . bin2hex($str[$i]);
+        }
+
+        return '<script type="text/javascript">eval(unescape(\'' . $out . '\'));</script>';
+
+        break;
+    case 'javascript_charcode':
+    case 'js_charcode':
+    case 'jscharcode':
+    case 'jschar':
+        $str = '<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>';
+        $len = strlen($str);
+
+        $out = '<script type="text/javascript">' . "\n<!--\ndocument.write(Str.fromCharCode(";
+        for ($i = 0; $i < $len; ++ $i) {
+            $out .= ord($str[$i]) . ',';
+        }
+
+        return rtrim($out, ',') . "));\n-->\n</script>\n";
+
+        break;
+
+    case 'hex':
+        if (strpos($address, '?') !== false) {
+            $dwoo->triggerError('Mailto: Hex encoding is not possible with extra attributes, use one of : <em>js, jscharcode or none</em>.', E_USER_WARNING);
+        }
+
+        $out = '<a href="&#109;&#97;&#105;&#108;&#116;&#111;&#58;';
+        $len = strlen($address);
+        for ($i = 0; $i < $len; ++ $i) {
+            if (preg_match('#\w#', $address[$i])) {
+                $out .= '%' . bin2hex($address[$i]);
+            } else {
+                $out .= $address[$i];
             }
+        }
+        $out .= '" ' . $extra . '>';
+        $len = strlen($text);
+        for ($i = 0; $i < $len; ++ $i) {
+            $out .= '&#x' . bin2hex($text[$i]);
+        }
 
-            return '<script type="text/javascript">eval(unescape(\'' . $out . '\'));</script>';
+        return $out . '</a>';
 
-            break;
-        case 'javascript_charcode':
-        case 'js_charcode':
-        case 'jscharcode':
-        case 'jschar':
-            $str = '<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>';
-            $len = strlen($str);
-
-            $out = '<script type="text/javascript">' . "\n<!--\ndocument.write(Str.fromCharCode(";
-            for ($i = 0; $i < $len; ++ $i) {
-                $out .= ord($str[$i]) . ',';
-            }
-
-            return rtrim($out, ',') . "));\n-->\n</script>\n";
-
-            break;
-
-        case 'hex':
-            if (strpos($address, '?') !== false) {
-                $dwoo->triggerError('Mailto: Hex encoding is not possible with extra attributes, use one of : <em>js, jscharcode or none</em>.', E_USER_WARNING);
-            }
-
-            $out = '<a href="&#109;&#97;&#105;&#108;&#116;&#111;&#58;';
-            $len = strlen($address);
-            for ($i = 0; $i < $len; ++ $i) {
-                if (preg_match('#\w#', $address[$i])) {
-                    $out .= '%' . bin2hex($address[$i]);
-                } else {
-                    $out .= $address[$i];
-                }
-            }
-            $out .= '" ' . $extra . '>';
-            $len = strlen($text);
-            for ($i = 0; $i < $len; ++ $i) {
-                $out .= '&#x' . bin2hex($text[$i]);
-            }
-
-            return $out . '</a>';
-
-        default:
-            $dwoo->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);
+    default:
+        $dwoo->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);
     }
 }

lib/Dwoo/Plugins/Functions/PluginEscape.php

Switch Indentation +44 added lines, -44 removed lines

@@ -44,51 +44,51 @@
     }
 
     switch ($format) {
-        case 'html':
-            return htmlspecialchars((string)$value, ENT_QUOTES, $charset);
-        case 'htmlall':
-            return htmlentities((string)$value, ENT_QUOTES, $charset);
-        case 'url':
-            return rawurlencode((string)$value);
-        case 'urlpathinfo':
-            return str_replace('%2F', '/', rawurlencode((string)$value));
-        case 'quotes':
-            return preg_replace("#(?<!\\\\)'#", "\\'", (string)$value);
-        case 'hex':
-            $out = '';
-            $cnt = strlen((string)$value);
-            for ($i = 0; $i < $cnt; ++ $i) {
-                $out .= '%' . bin2hex((string)$value[$i]);
-            }
+    case 'html':
+        return htmlspecialchars((string)$value, ENT_QUOTES, $charset);
+    case 'htmlall':
+        return htmlentities((string)$value, ENT_QUOTES, $charset);
+    case 'url':
+        return rawurlencode((string)$value);
+    case 'urlpathinfo':
+        return str_replace('%2F', '/', rawurlencode((string)$value));
+    case 'quotes':
+        return preg_replace("#(?<!\\\\)'#", "\\'", (string)$value);
+    case 'hex':
+        $out = '';
+        $cnt = strlen((string)$value);
+        for ($i = 0; $i < $cnt; ++ $i) {
+            $out .= '%' . bin2hex((string)$value[$i]);
+        }
 
-            return $out;
-        case 'hexentity':
-            $out = '';
-            $cnt = strlen((string)$value);
-            for ($i = 0; $i < $cnt; ++ $i) {
-                $out .= '&#x' . bin2hex((string)$value[$i]) . ';';
-            }
+        return $out;
+    case 'hexentity':
+        $out = '';
+        $cnt = strlen((string)$value);
+        for ($i = 0; $i < $cnt; ++ $i) {
+            $out .= '&#x' . bin2hex((string)$value[$i]) . ';';
+        }
 
-            return $out;
-        case 'javascript':
-        case 'js':
-            return strtr((string)$value, array(
-                '\\' => '\\\\',
-                "'"  => "\\'",
-                '"'  => '\\"',
-                "\r" => '\\r',
-                "\n" => '\\n',
-                '</' => '<\/'
-            ));
-        case 'mail':
-            return str_replace(array(
-                '@',
-                '.'
-            ), array(
-                '&nbsp;(AT)&nbsp;',
-                '&nbsp;(DOT)&nbsp;'
-            ), (string)$value);
-        default:
-            $dwoo->triggerError('Escape\'s format argument must be one of : html, htmlall, url, urlpathinfo, hex, hexentity, javascript or mail, "' . $format . '" given.', E_USER_WARNING);
+        return $out;
+    case 'javascript':
+    case 'js':
+        return strtr((string)$value, array(
+            '\\' => '\\\\',
+            "'"  => "\\'",
+            '"'  => '\\"',
+            "\r" => '\\r',
+            "\n" => '\\n',
+            '</' => '<\/'
+        ));
+    case 'mail':
+        return str_replace(array(
+            '@',
+            '.'
+        ), array(
+            '&nbsp;(AT)&nbsp;',
+            '&nbsp;(DOT)&nbsp;'
+        ), (string)$value);
+    default:
+        $dwoo->triggerError('Escape\'s format argument must be one of : html, htmlall, url, urlpathinfo, hex, hexentity, javascript or mail, "' . $format . '" given.', E_USER_WARNING);
     }
 }