- added 'exp' object support

alecpl

2008-09-19 8e1d4af2e5aa7d1b43ba3cf64f66c9bc23bd14cf

 program/include/rcube_template.php

@@ -464,26 +464,38 @@
     * @todo   Get rid off eval() once I understand what this does.
     * @todo   Extend this to allow real conditions, not just "set"
     * @param  string Condition statement
     * @return boolean True if condition is met, False is not
     * @return boolean True if condition is met, False if not
     */
    private function check_condition($condition)
    {
        $condition = preg_replace(
            return eval("return (".$this->parse_expression($condition).");");
    }


    /**
     * Parses expression and replaces variables
     *
     * @param  string Expression statement
     * @return string Expression statement
     */
    private function parse_expression($expression)
    {
        return preg_replace(
            array(
                '/session:([a-z0-9_]+)/i',
                '/config:([a-z0-9_]+)(:([a-z0-9_]+))?/i',
                '/env:([a-z0-9_]+)/i',
                '/request:([a-z0-9_]+)/ie'
                '/request:([a-z0-9_]+)/i',
                '/cookie:([a-z0-9_]+)/i'
            ),
            array(
                "\$_SESSION['\\1']",
                "\$this->app->config->get('\\1',get_boolean('\\3'))",
                "\$this->env['\\1']",
                "get_input_value('\\1', RCUVE_INPUT_GPC)"
                "get_input_value('\\1', RCUBE_INPUT_GPC)",
                "\$_COOKIE['\\1']"
            ),
            $condition);
            
            return eval("return (".$condition.");");
            $expression);
    }


@@ -616,6 +628,11 @@
                    return Q($title);
                }
                break;

            // return code for a specified eval expression
            case 'exp':
           $value = $this->parse_expression($attrib['expression']);
                return eval("return Q($value);");
            
            // return variable
            case 'var':
@@ -639,6 +656,9 @@
                    case 'session':
                        $value = $_SESSION[$name];
                        break;
                    case 'cookie':
                        $value = htmlspecialchars($_COOKIE[$name]);
                        break;
                }

                if (is_array($value)) {