Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

BOINC environment configuration 

Fixed redirect loop problem when boinc_standard has not yet been reverted and is stuck on the garland theme. Set to boinc theme by default.
Removed configuration of site_name and site_mail, which are set during install. Also removed site_mission and site_slogan, which are not used in the theme and should not be controlled by the feature.
This commit is contained in:
Tristan Olive 2013-04-24 17:45:35 -04:00 committed by Oliver Bock
parent 6121d31124
commit f762a7fcb7
3 changed files with 20 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drupal/sites/all/features/boinc_standard/boinc_standard.info
View File

@ -166,11 +166,7 @@ features[variable][] = "pathauto_user_supportsfeeds"
features[variable][] = "pathauto_verbose"
features[variable][] = "site_footer"
features[variable][] = "site_frontpage"
features[variable][] = "site_mail"
features[variable][] = "site_mission"
features[variable][] = "site_name"
features[variable][] = "site_offline"
features[variable][] = "site_slogan"
features[variable][] = "tabtamer_tab_settings"
features[variable][] = "theme_boinc_settings"
features[variable][] = "theme_default"

20
drupal/sites/all/features/boinc_standard/boinc_standard.module
View File

@ -1,3 +1,23 @@
<?php
include_once('boinc_standard.features.inc');
/**
* Make some changes to configurations after the feature has been enabled
*/
function boinc_standard_enable() {
// Ensure that the default theme is enabled. A bit ridiculous, but it is
// possible for this not to be the case.
$default_theme = variable_get('theme_default', 'boinc');
// If default theme is garland, this is because the boinc_standard feature
// has not been reverted yet. Work around this by forcing it to default to
// the boinc theme
if ($default_theme == 'garland') {
$default_theme = 'boinc';
variable_set('theme_default', $default_theme);
}
drupal_set_message('default theme: ' . $default_theme);
$default_theme_enabled = db_query("UPDATE {system} SET status = 1
WHERE type = 'theme' and name = '%s'", $default_theme);
if ($default_theme_enabled) drupal_set_message('default theme enabled');
}

28
drupal/sites/all/features/boinc_standard/boinc_standard.strongarm.inc
View File

@ -372,27 +372,6 @@ function boinc_standard_strongarm() {
$strongarm->value = 'home';
$export['site_frontpage'] = $strongarm;
$strongarm = new stdClass;
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1;
$strongarm->name = 'site_mail';
$strongarm->value = 'drupal.han@aei.mpg.de';
$export['site_mail'] = $strongarm;
$strongarm = new stdClass;
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1;
$strongarm->name = 'site_mission';
$strongarm->value = '';
$export['site_mission'] = $strongarm;
$strongarm = new stdClass;
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1;
$strongarm->name = 'site_name';
$strongarm->value = 'Einstein@Home';
$export['site_name'] = $strongarm;
$strongarm = new stdClass;
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1;
@ -400,13 +379,6 @@ function boinc_standard_strongarm() {
$strongarm->value = 0;
$export['site_offline'] = $strongarm;
$strongarm = new stdClass;
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1;
$strongarm->name = 'site_slogan';
$strongarm->value = '';
$export['site_slogan'] = $strongarm;
$strongarm = new stdClass;
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1;