bachir/materio-base-legacy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more module updates

Browse Source
This commit is contained in:
Bachir Soussi Chiadmi
2015-04-20 18:21:45 +02:00
parent cde7b73a73
commit 322dd995bf
25 changed files with 747 additions and 308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
sites/all/modules/contrib/dev/variable/variable.module
View File

@@ -415,16 +415,35 @@ function variable_hook_info() {
* Form for variable list
*
* @param $list
* Variable name or list of variable names
* Variable name or list of variable names.
* @param $options
* Optional array with variable options.
*/
function variable_edit_form($form, $form_state, $list, $options = array()) {
// Pass on the values on the form for further reference.
$form['#variable_edit_form'] = $list;
form_load_include($form_state, 'form.inc', 'variable');
function variable_edit_form($form, &$form_state, $list, $options = array()) {
$list = is_array($list) ? $list : array($list);
$form = variable_base_form($form, $form_state, $list, $options);
$form += variable_edit_subform($list, $options);
return variable_settings_form($form, $options);
}
/**
* Build base form for variable list without fields.
*
* @param $list
* List of variable names.
* @param $options
* Optional array with variable options.
*/
function variable_base_form($form, &$form_state, $list, $options = array()) {
form_load_include($form_state, 'form.inc', 'variable');
// Pass on the values on the form for further reference.
$form['#variable_edit_form'] = $list;
$form['#variable_options'] = $options;
// Run submit callback for variables in form.
$form['#submit'][] = 'variable_form_submit_callback';
return $form;
}
/**
* Form elements for variable list.
*
@@ -682,7 +701,23 @@ function variable_form_alter(&$form, &$form_state, $form_id) {
}
}
/**
* Implement validate callback.
*
* This needs to be in the module as it may be needed by form ajax callbacks.
*/
function variable_form_element_validate($element, &$form_state, $form) {
$options = isset($form['#variable_options']) ? $form['#variable_options'] : array();
$variable = $element['#variable'];
variable_include($variable);
$variable['value'] = isset($element['#value']) ? $element['#value'] : NULL;
$error = $variable['validate callback']($variable, $options, $element, $form, $form_state);
if ($error) {
form_error($element, $error);
}
}
/**
* Implements hook_module_implements_alter().
@@ -765,6 +800,7 @@ function variable_settings_form_submit($form, &$form_state) {
form_state_values_clean($form_state);
// This may contain some realm options.
$options = isset($form['#variable_options']) ? $form['#variable_options'] : array();
// Now run regular settings submission but using variable_set_value()
foreach ($form_state['values'] as $key => $value) {
if (is_array($value) && isset($form_state['values']['array_filter'])) {