bachir/popsu-d7
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

security update core+modules

Browse Source
This commit is contained in:
Bachir Soussi Chiadmi
2015-04-26 18:38:56 +02:00
parent 2f45ea820a
commit 7c96373038
1022 changed files with 30319 additions and 11259 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
sites/all/modules/custom_search/custom_search.admin.inc
View File

@@ -11,7 +11,7 @@
function custom_search_admin() {
// Basic settings.
$form = _custom_search_default_admin_form();
// Custom search paths
// Custom search paths.
$form = array_merge($form, _custom_search_custom_paths_admin_form());
// Ordering.
$form = array_merge($form, _custom_search_ordering_admin_form());
@@ -49,6 +49,9 @@ function custom_search_content_admin() {
return system_settings_form(_custom_search_content_admin_form());
}
/**
* Results page settings.
*/
function custom_search_results_admin() {
$form['custom_search_target'] = array(
'#type' => 'select',
@@ -131,20 +134,26 @@ function custom_search_results_admin() {
);
}
if (module_exists('taxonomy')) {
$form['search_form']['advanced']['taxonomy'] = array(
// Languages.
$language_options = array();
foreach (language_list('language') as $key => $entity) {
if ($entity->enabled) {
$language_options[$key] = $entity->name;
}
}
if (count($language_options) > 1) {
$form['search_form']['advanced']['languages'] = array(
'#type' => 'fieldset',
'#title' => t('Taxonomy'),
'#description' => t('Select the vocabularies to display on the advanced search form.'),
'#title' => t('Languages'),
'#description' => t('Select the languages to display on the advanced search form.'),
'#collapsible' => TRUE,
'#collapsed' => TRUE,
);
$vocabularies = taxonomy_get_vocabularies();
foreach ($vocabularies as $voc) {
$form['search_form']['advanced']['taxonomy']['custom_search_advanced_voc' . $voc->vid . '_display'] = array(
foreach ($language_options as $key => $name) {
$form['search_form']['advanced']['languages']['custom_search_advanced_language_' . $key . '_display'] = array(
'#type' => 'checkbox',
'#title' => $voc->name,
'#default_value' => variable_get('custom_search_advanced_voc' . $voc->vid . '_display', TRUE),
'#title' => $name,
'#default_value' => variable_get('custom_search_advanced_language_' . $key . '_display', TRUE),
);
}
}
@@ -205,4 +214,4 @@ function custom_search_results_admin() {
);
return system_settings_form($form);
}
}