@@ -32,42 +32,42 @@ |
||
32 | 32 | * existing BOINC web interface. |
33 | 33 | */ |
34 | 34 | function boincuser_admin_environment(&$form_state) { |
35 | - global $base_url; |
|
36 | - $form = array(); |
|
37 | - $default = array( |
|
38 | - 'boinc_root_dir' => variable_get('boinc_root_dir', ''), |
|
39 | - 'boinc_config_xml_dir' => variable_get('boinc_config_xml_dir', ''), |
|
40 | - 'boinc_html_inc_dir' => variable_get('boinc_html_inc_dir', ''), |
|
41 | - 'boinc_project_config_dir' => variable_get('boinc_project_config_dir', ''), |
|
42 | - 'boinc_user_image_dir' => variable_get('boinc_user_image_dir', ''), |
|
43 | - 'boinc_host_sched_logs_dir' => variable_get('boinc_host_sched_logs_dir', ''), |
|
44 | - 'boinc_server_status_url' => variable_get('boinc_server_status_url', ''), |
|
45 | - 'boinc_app_list_url' => variable_get('boinc_app_list_url', ''), |
|
46 | - 'boinc_admin_mailing_list' => variable_get('boinc_admin_mailing_list', ''), |
|
47 | - 'boinc_admin_mailing_list_subject_tag' => variable_get('boinc_admin_mailing_list_subject_tag', ''), |
|
48 | - 'boinc_debug_mode' => variable_get('boinc_debug_mode', 0), |
|
49 | - 'boinc_project_config_keywords' => variable_get('boinc_project_config_keywords', ''), |
|
50 | - ); |
|
51 | - //drupal_set_message(print_r($default, true)); |
|
52 | - //drupal_set_message(print_r($form_state, true)); |
|
53 | - // Show overrides if the root dir is set and others have not been detected |
|
54 | - $show_overrides = FALSE; |
|
55 | - if ($default['boinc_root_dir']) { |
|
56 | - foreach ($default as $key => $dir) { |
|
57 | - switch ($key) { |
|
58 | - case 'boinc_config_xml_dir': |
|
59 | - case 'boinc_html_inc_dir': |
|
60 | - case 'boinc_project_config_dir': |
|
61 | - case 'boinc_user_image_dir': |
|
62 | - // If any of these values are not set, show the overrides section |
|
63 | - if (!$dir) { |
|
64 | - $default[$key] = $form_state['values'][$key]; |
|
65 | - $show_overrides = TRUE; |
|
66 | - break; |
|
67 | - } |
|
68 | - break; |
|
69 | - default: |
|
70 | - } |
|
35 | +global $base_url; |
|
36 | +$form = array(); |
|
37 | +$default = array( |
|
38 | +'boinc_root_dir' => variable_get('boinc_root_dir', ''), |
|
39 | +'boinc_config_xml_dir' => variable_get('boinc_config_xml_dir', ''), |
|
40 | +'boinc_html_inc_dir' => variable_get('boinc_html_inc_dir', ''), |
|
41 | +'boinc_project_config_dir' => variable_get('boinc_project_config_dir', ''), |
|
42 | +'boinc_user_image_dir' => variable_get('boinc_user_image_dir', ''), |
|
43 | +'boinc_host_sched_logs_dir' => variable_get('boinc_host_sched_logs_dir', ''), |
|
44 | +'boinc_server_status_url' => variable_get('boinc_server_status_url', ''), |
|
45 | +'boinc_app_list_url' => variable_get('boinc_app_list_url', ''), |
|
46 | +'boinc_admin_mailing_list' => variable_get('boinc_admin_mailing_list', ''), |
|
47 | +'boinc_admin_mailing_list_subject_tag' => variable_get('boinc_admin_mailing_list_subject_tag', ''), |
|
48 | +'boinc_debug_mode' => variable_get('boinc_debug_mode', 0), |
|
49 | +'boinc_project_config_keywords' => variable_get('boinc_project_config_keywords', ''), |
|
50 | +); |
|
51 | +//drupal_set_message(print_r($default, true)); |
|
52 | +//drupal_set_message(print_r($form_state, true)); |
|
53 | +// Show overrides if the root dir is set and others have not been detected |
|
54 | +$show_overrides = FALSE; |
|
55 | +if ($default['boinc_root_dir']) { |
|
56 | +foreach ($default as $key => $dir) { |
|
57 | + switch ($key) { |
|
58 | + case 'boinc_config_xml_dir': |
|
59 | + case 'boinc_html_inc_dir': |
|
60 | + case 'boinc_project_config_dir': |
|
61 | + case 'boinc_user_image_dir': |
|
62 | + // If any of these values are not set, show the overrides section |
|
63 | + if (!$dir) { |
|
64 | + $default[$key] = $form_state['values'][$key]; |
|
65 | + $show_overrides = TRUE; |
|
66 | + break; |
|
67 | + } |
|
68 | + break; |
|
69 | + default: |
|
70 | + } |
|
71 | 71 | if ($show_overrides) { |
72 | 72 | break; |
73 | 73 | } |