manuelcillero/suitedesk
manuelcillero/suitedesk
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed obsolete $ in source files

Browse source
This commit is contained in:
Manuel Cillero 2017-08-29 14:13:02 +02:00
parent a39c010e06
commit e5f2b64d98
146 changed files with 836 additions and 1081 deletions
Download patch file Download diff file Expand all files Collapse all files

27
modules/content_taxonomy/content_taxonomy_tree.module
View file

@ -1,9 +1,4 @@
<?php
// $Id: content_taxonomy_tree.module,v 1.1.2.5 2009/05/14 16:58:22 mh86 Exp $
/**
* Implementation of hook_theme().
*/
@ -45,7 +40,7 @@ function content_taxonomy_tree_widget_settings($op, $widget) {
'#weight' => 10,
);
$form['settings']['expand_all'] = array(
'#type' => 'checkbox',
'#type' => 'checkbox',
'#title' => t('Expand whole tree by default'),
'#default_value' => isset($widget['expand_all']) ? $widget['expand_all'] : 0,
'#description' => t('Otherwise only branches, where a term is selected get expanded by default'),
@ -64,7 +59,7 @@ function content_taxonomy_tree_elements() {
return array(
'content_taxonomy_tree' => array(
'#input' => TRUE,
'#columns' => array('value'),
'#columns' => array('value'),
'#delta' => 0,
'#process' => array('content_taxonomy_tree_process'),
'#element_validate' => array('content_taxonomy_tree_validate'),
@ -106,12 +101,12 @@ function content_taxonomy_tree_process($element, $edit, &$form_state, $form) {
}
$element['#value'] = content_taxonomy_tree_data2form($element, $element['#value'], $field);
}
$element[$field_key] = array(
'#type' => 'taxonomy_manager_tree',
'#default_value' => isset($element['#value']) ? $element['#value'] : '',
'#vid' => $field['vid'],
'#parent' => content_taxonomy_field_get_parent($field),
'#parent' => content_taxonomy_field_get_parent($field),
'#default_value' => is_array($element['#value']) ? $element['#value'] : array(),
'#render_whole_tree' => TRUE,
'#pager' => FALSE,
@ -126,12 +121,12 @@ function content_taxonomy_tree_process($element, $edit, &$form_state, $form) {
'#title' => $element['#title'],
'#description' => $element['#description'],
);
// Make sure field info will be available to the validator which
// does not get the values in $form.
$form_state['#field_info'][$field['field_name']] = $field;
return $element;
}
@ -146,7 +141,7 @@ function content_taxonomy_tree_validate($element, &$form_state) {
$field_key = $element['#columns'][0];
$values = content_taxonomy_tree_form2data($element, $form_state, $field);
//check for required fields
//if $element['#value'] is empty, it's validated by form.inc
//otherwise we have to check this by our own
@ -156,9 +151,9 @@ function content_taxonomy_tree_validate($element, &$form_state) {
if (($field['multiple'] >= 2) && (count($element['#value']) > $field['multiple'])) {
form_error($element[$field_key], t('%name: this field cannot hold more than @count values.', array('%name' => t($field['widget']['label']), '@count' => $field['multiple'])));
}
form_set_value($element, $values, $form_state);
}
/**
@ -186,7 +181,7 @@ function content_taxonomy_tree_form2data($element, &$form_state, $field) {
if (!is_array($selected_terms) || !count($selected_terms)) {
$selected_terms[] = NULL;
}
$form_state['#field_info'][$field['field_name']] = $field;
return content_transpose_array_rows_cols(array($element['#columns'][0] => array_values($selected_terms)));
}