From 741df86e5a7fd031fe8e649eb4ae09cb086124e3 Mon Sep 17 00:00:00 2001 From: Nathan Haug Date: Sun, 29 Dec 2013 15:49:42 -0700 Subject: [PATCH] Issue #40: Moving EvalMath class from CTools to includes for use by Views. --- core/includes/evalmath.inc | 386 ++++++++++++++++++ .../handlers/views_handler_field_math.inc | 4 +- core/modules/views/modules/views.views.inc | 18 +- .../views_ui/config/views_ui.settings.json | 2 +- .../modules/views/views_ui/includes/admin.inc | 177 +++++--- 5 files changed, 510 insertions(+), 77 deletions(-) create mode 100644 core/includes/evalmath.inc diff --git a/core/includes/evalmath.inc b/core/includes/evalmath.inc new file mode 100644 index 00000000000..4cfd8ef9010 --- /dev/null +++ b/core/includes/evalmath.inc @@ -0,0 +1,386 @@ + + +================================================================================ + +NAME + EvalMath - safely evaluate math expressions + +SYNOPSIS + include('evalmath.class.php'); + $m = new EvalMath; + // basic evaluation: + $result = $m->evaluate('2+2'); + // supports: order of operation; parentheses; negation; built-in functions + $result = $m->evaluate('-8(5/2)^2*(1-sqrt(4))-8'); + // create your own variables + $m->evaluate('a = e^(ln(pi))'); + // or functions + $m->evaluate('f(x,y) = x^2 + y^2 - 2x*y + 1'); + // and then use them + $result = $m->evaluate('3*f(42,a)'); + +DESCRIPTION + Use the EvalMath class when you want to evaluate mathematical expressions + from untrusted sources. You can define your own variables and functions, + which are stored in the object. Try it, it's fun! + +METHODS + $m->evalute($expr) + Evaluates the expression and returns the result. If an error occurs, + prints a warning and returns false. If $expr is a function assignment, + returns true on success. + + $m->e($expr) + A synonym for $m->evaluate(). + + $m->vars() + Returns an associative array of all user-defined variables and values. + + $m->funcs() + Returns an array of all user-defined functions. + +PARAMETERS + $m->suppress_errors + Set to true to turn off warnings when evaluating expressions + + $m->last_error + If the last evaluation failed, contains a string describing the error. + (Useful when suppress_errors is on). + +AUTHOR INFORMATION + Copyright 2005, Miles Kaufmann. + +LICENSE + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + + 1 Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. The name of the author may not be used to endorse or promote + products derived from this software without specific prior written + permission. + + THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, + INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + +*/ + +class EvalMath { + var $suppress_errors = false; + var $last_error = null; + + var $v = array('e'=>2.71,'pi'=>3.14); // variables (and constants) + var $f = array(); // user-defined functions + var $vb = array('e', 'pi'); // constants + var $fb = array( // built-in functions + 'sin','sinh','arcsin','asin','arcsinh','asinh', + 'cos','cosh','arccos','acos','arccosh','acosh', + 'tan','tanh','arctan','atan','arctanh','atanh', + 'pow', 'exp', + 'sqrt','abs','ln','log', + 'time', 'ceil', 'floor', 'min', 'max', 'round'); + + function __construct() { + // make the variables a little more accurate + $this->v['pi'] = pi(); + $this->v['e'] = exp(1); + } + + function e($expr) { + return $this->evaluate($expr); + } + + function evaluate($expr) { + $this->last_error = null; + $expr = trim($expr); + if (substr($expr, -1, 1) == ';') $expr = substr($expr, 0, strlen($expr)-1); // strip semicolons at the end + //=============== + // is it a variable assignment? + if (preg_match('/^\s*([a-z]\w*)\s*=\s*(.+)$/', $expr, $matches)) { + if (in_array($matches[1], $this->vb)) { // make sure we're not assigning to a constant + return $this->trigger("cannot assign to constant '$matches[1]'"); + } + if (($tmp = $this->pfx($this->nfx($matches[2]))) === false) return false; // get the result and make sure it's good + $this->v[$matches[1]] = $tmp; // if so, stick it in the variable array + return $this->v[$matches[1]]; // and return the resulting value + //=============== + // is it a function assignment? + } elseif (preg_match('/^\s*([a-z]\w*)\s*\(\s*([a-z]\w*(?:\s*,\s*[a-z]\w*)*)\s*\)\s*=\s*(.+)$/', $expr, $matches)) { + $fnn = $matches[1]; // get the function name + if (in_array($matches[1], $this->fb)) { // make sure it isn't built in + return $this->trigger("cannot redefine built-in function '$matches[1]()'"); + } + $args = explode(",", preg_replace("/\s+/", "", $matches[2])); // get the arguments + if (($stack = $this->nfx($matches[3])) === false) return false; // see if it can be converted to postfix + for ($i = 0; $iv)) { + $stack[$i] = $this->v[$token]; + } else { + return $this->trigger("undefined variable '$token' in function definition"); + } + } + } + $this->f[$fnn] = array('args'=>$args, 'func'=>$stack); + return true; + //=============== + } else { + return $this->pfx($this->nfx($expr)); // straight up evaluation, woo + } + } + + function vars() { + $output = $this->v; + unset($output['pi']); + unset($output['e']); + return $output; + } + + function funcs() { + $output = array(); + foreach ($this->f as $fnn=>$dat) + $output[] = $fnn . '(' . implode(',', $dat['args']) . ')'; + return $output; + } + + //===================== HERE BE INTERNAL METHODS ====================\\ + + // Convert infix to postfix notation + function nfx($expr) { + + $index = 0; + $stack = new EvalMathStack; + $output = array(); // postfix form of expression, to be passed to pfx() + $expr = trim(strtolower($expr)); + + $ops = array('+', '-', '*', '/', '^', '_'); + $ops_r = array('+'=>0,'-'=>0,'*'=>0,'/'=>0,'^'=>1); // right-associative operator? + $ops_p = array('+'=>0,'-'=>0,'*'=>1,'/'=>1,'_'=>1,'^'=>2); // operator precedence + + $expecting_op = false; // we use this in syntax-checking the expression + // and determining when a - is a negation + + if (preg_match("/[^\w\s+*^\/()\.,-]/", $expr, $matches)) { // make sure the characters are all good + return $this->trigger("illegal character '{$matches[0]}'"); + } + + while(1) { // 1 Infinite Loop ;) + $op = substr($expr, $index, 1); // get the first character at the current index + // find out if we're currently at the beginning of a number/variable/function/parenthesis/operand + $ex = preg_match('/^([a-z]\w*\(?|\d+(?:\.\d*)?|\.\d+|\()/', substr($expr, $index), $match); + //=============== + if ($op == '-' and !$expecting_op) { // is it a negation instead of a minus? + $stack->push('_'); // put a negation on the stack + $index++; + } elseif ($op == '_') { // we have to explicitly deny this, because it's legal on the stack + return $this->trigger("illegal character '_'"); // but not in the input expression + //=============== + } elseif ((in_array($op, $ops) or $ex) and $expecting_op) { // are we putting an operator on the stack? + if ($ex) { // are we expecting an operator but have a number/variable/function/opening parethesis? + $op = '*'; $index--; // it's an implicit multiplication + } + // heart of the algorithm: + while($stack->count > 0 and ($o2 = $stack->last()) and in_array($o2, $ops) and ($ops_r[$op] ? $ops_p[$op] < $ops_p[$o2] : $ops_p[$op] <= $ops_p[$o2])) { + $output[] = $stack->pop(); // pop stuff off the stack into the output + } + // many thanks: http://en.wikipedia.org/wiki/Reverse_Polish_notation#The_algorithm_in_detail + $stack->push($op); // finally put OUR operator onto the stack + $index++; + $expecting_op = false; + //=============== + } elseif ($op == ')' and $expecting_op) { // ready to close a parenthesis? + while (($o2 = $stack->pop()) != '(') { // pop off the stack back to the last ( + if (is_null($o2)) return $this->trigger("unexpected ')'"); + else $output[] = $o2; + } + if (preg_match("/^([a-z]\w*)\($/", $stack->last(2), $matches)) { // did we just close a function? + $fnn = $matches[1]; // get the function name + $arg_count = $stack->pop(); // see how many arguments there were (cleverly stored on the stack, thank you) + $output[] = $stack->pop(); // pop the function and push onto the output + if (in_array($fnn, $this->fb)) { // check the argument count + if($arg_count > 1) + return $this->trigger("too many arguments ($arg_count given, 1 expected)"); + } elseif (array_key_exists($fnn, $this->f)) { + if ($arg_count != count($this->f[$fnn]['args'])) + return $this->trigger("wrong number of arguments ($arg_count given, " . count($this->f[$fnn]['args']) . " expected)"); + } else { // did we somehow push a non-function on the stack? this should never happen + return $this->trigger("internal error"); + } + } + $index++; + //=============== + } elseif ($op == ',' and $expecting_op) { // did we just finish a function argument? + while (($o2 = $stack->pop()) != '(') { + if (is_null($o2)) return $this->trigger("unexpected ','"); // oops, never had a ( + else $output[] = $o2; // pop the argument expression stuff and push onto the output + } + // make sure there was a function + if (!preg_match("/^([a-z]\w*)\($/", $stack->last(2), $matches)) + return $this->trigger("unexpected ','"); + $stack->push($stack->pop()+1); // increment the argument count + $stack->push('('); // put the ( back on, we'll need to pop back to it again + $index++; + $expecting_op = false; + //=============== + } elseif ($op == '(' and !$expecting_op) { + $stack->push('('); // that was easy + $index++; + $allow_neg = true; + //=============== + } elseif ($ex and !$expecting_op) { // do we now have a function/variable/number? + $expecting_op = true; + $val = $match[1]; + if (preg_match("/^([a-z]\w*)\($/", $val, $matches)) { // may be func, or variable w/ implicit multiplication against parentheses... + if (in_array($matches[1], $this->fb) or array_key_exists($matches[1], $this->f)) { // it's a func + $stack->push($val); + $stack->push(1); + $stack->push('('); + $expecting_op = false; + } else { // it's a var w/ implicit multiplication + $val = $matches[1]; + $output[] = $val; + } + } else { // it's a plain old var or num + $output[] = $val; + } + $index += strlen($val); + //=============== + } elseif ($op == ')') { // miscellaneous error checking + return $this->trigger("unexpected ')'"); + } elseif (in_array($op, $ops) and !$expecting_op) { + return $this->trigger("unexpected operator '$op'"); + } else { // I don't even want to know what you did to get here + return $this->trigger("an unexpected error occured"); + } + if ($index == strlen($expr)) { + if (in_array($op, $ops)) { // did we end with an operator? bad. + return $this->trigger("operator '$op' lacks operand"); + } else { + break; + } + } + while (substr($expr, $index, 1) == ' ') { // step the index past whitespace (pretty much turns whitespace + $index++; // into implicit multiplication if no operator is there) + } + + } + while (!is_null($op = $stack->pop())) { // pop everything off the stack and push onto output + if ($op == '(') return $this->trigger("expecting ')'"); // if there are (s on the stack, ()s were unbalanced + $output[] = $op; + } + return $output; + } + + // evaluate postfix notation + function pfx($tokens, $vars = array()) { + + if ($tokens == false) return false; + + $stack = new EvalMathStack; + + foreach ($tokens as $token) { // nice and easy + // if the token is a binary operator, pop two values off the stack, do the operation, and push the result back on + if (in_array($token, array('+', '-', '*', '/', '^'))) { + if (is_null($op2 = $stack->pop())) return $this->trigger("internal error"); + if (is_null($op1 = $stack->pop())) return $this->trigger("internal error"); + switch ($token) { + case '+': + $stack->push($op1+$op2); break; + case '-': + $stack->push($op1-$op2); break; + case '*': + $stack->push($op1*$op2); break; + case '/': + if ($op2 == 0) return $this->trigger("division by zero"); + $stack->push($op1/$op2); break; + case '^': + $stack->push(pow($op1, $op2)); break; + } + // if the token is a unary operator, pop one value off the stack, do the operation, and push it back on + } elseif ($token == "_") { + $stack->push(-1*$stack->pop()); + // if the token is a function, pop arguments off the stack, hand them to the function, and push the result back on + } elseif (preg_match("/^([a-z]\w*)\($/", $token, $matches)) { // it's a function! + $fnn = $matches[1]; + if (in_array($fnn, $this->fb)) { // built-in function: + if (is_null($op1 = $stack->pop())) return $this->trigger("internal error"); + $fnn = preg_replace("/^arc/", "a", $fnn); // for the 'arc' trig synonyms + if ($fnn == 'ln') $fnn = 'log'; + eval('$stack->push(' . $fnn . '($op1));'); // perfectly safe eval() + } elseif (array_key_exists($fnn, $this->f)) { // user function + // get args + $args = array(); + for ($i = count($this->f[$fnn]['args'])-1; $i >= 0; $i--) { + if (is_null($args[$this->f[$fnn]['args'][$i]] = $stack->pop())) return $this->trigger("internal error"); + } + $stack->push($this->pfx($this->f[$fnn]['func'], $args)); // yay... recursion!!!! + } + // if the token is a number or variable, push it on the stack + } else { + if (is_numeric($token)) { + $stack->push($token); + } elseif (array_key_exists($token, $this->v)) { + $stack->push($this->v[$token]); + } elseif (array_key_exists($token, $vars)) { + $stack->push($vars[$token]); + } else { + return $this->trigger("undefined variable '$token'"); + } + } + } + // when we're out of tokens, the stack should have a single element, the final result + if ($stack->count != 1) return $this->trigger("internal error"); + return $stack->pop(); + } + + // trigger an error, but nicely, if need be + function trigger($msg) { + $this->last_error = $msg; + if (!$this->suppress_errors) trigger_error($msg, E_USER_WARNING); + return false; + } +} + +// for internal use +class EvalMathStack { + + var $stack = array(); + var $count = 0; + + function push($val) { + $this->stack[$this->count] = $val; + $this->count++; + } + + function pop() { + if ($this->count > 0) { + $this->count--; + return $this->stack[$this->count]; + } + return null; + } + + function last($n=1) { + return !empty($this->stack[$this->count-$n]) ? $this->stack[$this->count-$n] : NULL; + } +} diff --git a/core/modules/views/handlers/views_handler_field_math.inc b/core/modules/views/handlers/views_handler_field_math.inc index 3172be9bc44..183d9ec8662 100644 --- a/core/modules/views/handlers/views_handler_field_math.inc +++ b/core/modules/views/handlers/views_handler_field_math.inc @@ -41,11 +41,11 @@ class views_handler_field_math extends views_handler_field_numeric { } function render($values) { - ctools_include('math-expr'); + include_once DRUPAL_ROOT . '/core/includes/evalmath.inc'; $tokens = array_map('floatval', $this->get_render_tokens(array())); $value = strtr($this->options['expression'], $tokens); $expressions = explode(';', $value); - $math = new ctools_math_expr; + $math = new EvalMath; foreach ($expressions as $expression) { if ($expression !== '') { $value = $math->evaluate($expression); diff --git a/core/modules/views/modules/views.views.inc b/core/modules/views/modules/views.views.inc index 3116d49b56f..1256fcfcf43 100644 --- a/core/modules/views/modules/views.views.inc +++ b/core/modules/views/modules/views.views.inc @@ -99,16 +99,14 @@ function views_views_data() { ), ); - if (module_invoke('ctools', 'api_version', '1.7.1')) { - $data['views']['expression'] = array( - 'title' => t('Math expression'), - 'help' => t('Evaluates a mathematical expression and displays it.'), - 'field' => array( - 'handler' => 'views_handler_field_math', - 'float' => TRUE, - ), - ); - } + $data['views']['expression'] = array( + 'title' => t('Math expression'), + 'help' => t('Evaluates a mathematical expression and displays it.'), + 'field' => array( + 'handler' => 'views_handler_field_math', + 'float' => TRUE, + ), + ); $data['views']['fields_compare'] = array( 'title' => t('Fields comparison'), diff --git a/core/modules/views/views_ui/config/views_ui.settings.json b/core/modules/views/views_ui/config/views_ui.settings.json index d01ed693937..afcb207433f 100644 --- a/core/modules/views/views_ui/config/views_ui.settings.json +++ b/core/modules/views/views_ui/config/views_ui.settings.json @@ -3,7 +3,7 @@ "show_master_display": false, "show_sql_query": false, "show_preview_information": false, - "show_sql_query_where": false, + "show_sql_query_where": "above", "show_performance_statistics": false, "always_live_preview": false, "display_embed": false, diff --git a/core/modules/views/views_ui/includes/admin.inc b/core/modules/views/views_ui/includes/admin.inc index c0a449e828a..089739d761f 100644 --- a/core/modules/views/views_ui/includes/admin.inc +++ b/core/modules/views/views_ui/includes/admin.inc @@ -72,13 +72,14 @@ function views_ui_preview($view, $display_id, $args = array()) { $q = $_GET['q']; // Determine where the query and performance statistics should be output. - $show_query = config_get('views_ui.settings', 'show_sql_query'); - $show_info = config_get('views_ui.settings', 'show_preview_information'); - $show_location = config_get('views_ui.settings', 'show_sql_query_where'); + $config = config('views_ui.settings'); + $show_query = $config->get('show_sql_query'); + $show_info = $config->get('show_preview_information'); + $show_location = $config->get('show_sql_query_where'); - $show_stats = config_get('views_ui.settings', 'show_performance_statistics'); + $show_stats = $config->get('show_performance_statistics'); if ($show_stats) { - $show_stats = config_get('views_ui.settings', 'show_sql_query_where'); + $show_stats = $config->get('show_sql_query_where'); } $combined = $show_query && $show_stats; @@ -4856,6 +4857,7 @@ function views_ui_get_roles() { function views_ui_admin_settings_basic() { $form = array(); $form['#attached']['css'] = views_ui_get_admin_css(); + $config = config('views_ui.settings'); $options = array(); foreach (list_themes() as $name => $theme) { @@ -4868,29 +4870,29 @@ function views_ui_admin_settings_basic() { // so this will make it easier to change if we do. $form['basic'] = array(); - $form['basic']['views_ui_show_master_display'] = array( + $form['basic']['show_master_display'] = array( '#type' => 'checkbox', '#title' => t('Always show the master display'), '#description' => t('Advanced users of views may choose to see the master (i.e. default) display.'), - '#default_value' => config_get('views_ui.settings', 'show_master_display'), + '#default_value' => $config->get('show_master_display'), ); - $form['basic']['views_ui_display_embed'] = array( + $form['basic']['display_embed'] = array( '#type' => 'checkbox', '#title' => t('Show the embed display in the ui.'), '#description' => t('Allow advanced user to use the embed view display. The plugin itself works if it\'s not visible in the ui'), - '#default_value' => config_get('views_ui.settings', 'display_embed'), + '#default_value' => $config->get('display_embed'), ); - $form['basic']['views_ui_custom_theme'] = array( + $form['basic']['custom_theme'] = array( '#type' => 'select', '#title' => t('Custom admin theme for the Views UI'), '#options' => array('_default' => t('- Use default -')) + $options, - '#default_value' => config_get('views_ui.settings', 'custom_theme'), + '#default_value' => $config->get('custom_theme'), '#description' => t('In some cases you might want to select a different admin theme for the Views UI.') ); - $form['basic']['views_exposed_filter_any_label'] = array( + $form['basic']['exposed_filter_any_label'] = array( '#type' => 'select', '#title' => t('Label for "Any" value on non-required single-select exposed filters'), '#options' => array('old_any' => '', 'new_any' => t('- Any -')), @@ -4902,68 +4904,87 @@ function views_ui_admin_settings_basic() { '#title' => t('Live preview settings'), ); - $form['live_preview']['views_ui_always_live_preview'] = array( + $form['live_preview']['always_live_preview'] = array( '#type' => 'checkbox', '#title' => t('Automatically update preview on changes'), - '#default_value' => config_get('views_ui.settings', 'always_live_preview'), + '#default_value' => $config->get('always_live_preview'), ); - $form['live_preview']['views_ui_show_preview_information'] = array( + $form['live_preview']['show_preview_information'] = array( '#type' => 'checkbox', '#title' => t('Show information and statistics about the view during live preview'), - '#default_value' => config_get('views_ui.settings', 'show_preview_information'), + '#default_value' => $config->get('show_preview_information'), + ); + + // Set a common variable used for #states on the following elements. + $preview_checked = array( + 'visible' => array( + ':input[name="show_preview_information"]' => array('checked' => TRUE), + ), ); - $form['live_preview']['views_ui_show_sql_query_where'] = array( + $form['live_preview']['show_sql_query_where'] = array( '#type' => 'radios', + '#title' => t('Statistics location'), '#options' => array( 'above' => t('Above the preview'), 'below' => t('Below the preview'), ), - '#default_value' => config_get('views_ui.settings', 'show_sql_query_where'), - '#states' => array( - 'visible' => array( - ':input[name="views_ui_show_preview_information"]' => array('checked' => TRUE), - ), - ), + '#default_value' => $config->get('show_sql_query_where'), + '#states' => $preview_checked, ); - $form['live_preview']['views_ui_show_sql_query'] = array( + $form['live_preview']['show_sql_query'] = array( '#type' => 'checkbox', '#title' => t('Show the SQL query'), - '#default_value' => config_get('views_ui.settings', 'show_sql_query'), - '#states' => array( - 'visible' => array( - ':input[name="views_ui_show_preview_information"]' => array('checked' => TRUE), - ), - ), + '#default_value' => $config->get('show_sql_query'), + '#states' => $preview_checked, ); - $form['live_preview']['views_ui_show_performance_statistics'] = array( + $form['live_preview']['show_performance_statistics'] = array( '#type' => 'checkbox', '#title' => t('Show performance statistics'), - '#default_value' => config_get('views_ui.settings', 'show_performance_statistics'), - '#states' => array( - 'visible' => array( - ':input[name="views_ui_show_preview_information"]' => array('checked' => TRUE), - ), - ), + '#default_value' => $config->get('show_performance_statistics'), + '#states' => $preview_checked, ); - $form['live_preview']['views_show_additional_queries'] = array( + $form['live_preview']['show_additional_queries'] = array( '#type' => 'checkbox', '#title' => t('Show other queries run during render during live preview'), '#description' => t("Drupal has the potential to run many queries while a view is being rendered. Checking this box will display every query run during view render as part of the live preview."), '#default_value' => config_get('views.settings', 'show_additional_queries'), '#states' => array( 'visible' => array( - ':input[name="views_ui_show_preview_information"]' => array('checked' => TRUE), + ':input[name="show_preview_information"]' => array('checked' => TRUE), ), ), ); -// $form['live_preview']['views_ui_show_performance_statistics_where'] = array( + $form['actions'] = array('#type' => 'actions'); + $form['actions']['submit'] = array( + '#type' => 'submit', + '#value' => t('Save settings'), + ); + + return $form; +} - return system_settings_form($form); +/** + * Submit handler for views_ui_admin_settings_basic(). + */ +function views_ui_admin_settings_basic_submit($form, $form_state) { + // Views UI saves some Views module settings. + $views_config = config('views.settings'); + $views_config->set('exposed_filter_any_label', $form_state['values']['exposed_filter_any_label']); + $views_config->set('show_additional_queries', $form_state['values']['show_additional_queries']); + $views_config->save(); + unset($form_state['values']['exposed_filter_any_label']); + unset($form_state['values']['show_additional_queries']); + + form_state_values_clean($form_state); + $config = config('views_ui.settings'); + $config->setData($form_state['values']); + $config->save(); + drupal_set_message(t('The configuration options have been saved.')); } /** @@ -4972,6 +4993,13 @@ function views_ui_admin_settings_basic() { function views_ui_admin_settings_advanced() { $form = array(); $form['#attached']['css'] = views_ui_get_admin_css(); + $config = config('views.settings'); + + // Set the "any" label as a value so it is included in the saved config. + $form['exposed_filter_any_label'] = array( + '#type' => 'value', + '#value' => $config->get('exposed_filter_any_label'), + ); $form['cache'] = array( '#type' => 'fieldset', @@ -4989,26 +5017,25 @@ function views_ui_admin_settings_advanced() { '#title' => t('Debugging'), ); - $form['debug']['views_sql_signature'] = array( + $form['debug']['sql_signature'] = array( '#type' => 'checkbox', '#title' => t('Add Views signature to all SQL queries'), '#description' => t("All Views-generated queries will include the name of the views and display 'view-name:display-name' as a string at the end of the SELECT clause. This makes identifying Views queries in database server logs simpler, but should only be used when troubleshooting."), - - '#default_value' => config_get('views.settings', 'sql_signature'), + '#default_value' => $config->get('sql_signature'), ); - $form['debug']['views_no_javascript'] = array( + $form['debug']['no_javascript'] = array( '#type' => 'checkbox', '#title' => t('Disable JavaScript with Views'), '#description' => t("If you are having problems with the JavaScript, you can disable it here. The Views UI should degrade and still be usable without javascript; it's just not as good."), - '#default_value' => config_get('views.settings', 'no_javascript'), + '#default_value' => $config->get('no_javascript'), ); - $form['debug']['views_devel_output'] = array( + $form['debug']['devel_output'] = array( '#type' => 'checkbox', '#title' => t('Enable views performance statistics/debug messages via the Devel module'), '#description' => t("Check this to enable some Views query and performance statistics/debug messages if Devel is installed."), - '#default_value' => config_get('views.settings', 'devel_output'), + '#default_value' => $config->get('devel_output'), ); $regions = array(); @@ -5018,10 +5045,10 @@ function views_ui_admin_settings_advanced() { $regions['drupal_debug'] = t('Devel logging (tmp://drupal_debug.txt)'); } - $form['debug']['views_devel_region'] = array( + $form['debug']['devel_region'] = array( '#type' => 'select', '#title' => t('Page region to output performance statistics/debug messages'), - '#default_value' => config_get('views.settings', 'devel_region'), + '#default_value' => $config->get('devel_region'), '#options' => $regions, '#states' => array( 'visible' => array( @@ -5031,21 +5058,43 @@ function views_ui_admin_settings_advanced() { ); $options = views_fetch_plugin_names('display_extender'); - if (!empty($options)) { - $form['extenders'] = array( - '#type' => 'fieldset', - ); - ; - $form['extenders']['views_display_extenders'] = array( - '#title' => t('Display extenders'), - '#default_value' => views_get_enabled_display_extenders(), - '#options' => $options, - '#type' => 'checkboxes', - '#description' => t('Select extensions of the views interface.') - ); - } + $form['extenders'] = array( + '#type' => 'fieldset', + '#access' => count($options) > 0, + ); + $form['extenders']['display_extenders'] = array( + '#title' => t('Display extenders'), + '#default_value' => views_get_enabled_display_extenders(), + '#options' => $options, + '#type' => 'checkboxes', + '#description' => t('Select extensions of the views interface.') + ); - return system_settings_form($form); + $form['field_rewrite_elements'] = array( + '#type' => 'value', + '#value' => $config->get('field_rewrite_elements'), + ); + + $form['actions'] = array('#type' => 'actions'); + $form['actions']['submit'] = array( + '#type' => 'submit', + '#value' => t('Save settings'), + ); + + return $form; +} + +/** + * Submit handler for views_ui_admin_settings_advanced(). + */ +function views_ui_admin_settings_advanced_submit($form, $form_state) { + form_state_values_clean($form_state); + + // Note that all settings on this page affect Views module, not Views UI. + $config = config('views.settings'); + $config->setData($form_state['values']); + $config->save(); + drupal_set_message(t('The configuration options have been saved.')); } /**