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

Fixed am_get_info RPC to use the correct uid for Drupal overrides 

(DBOINCP-184)
This commit is contained in:
Tristan Olive 2015-06-18 10:22:00 -04:00
parent b57b5aed14
commit 3f0db933e0
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drupal/sites/default/boinc/modules/boinccore/boinccore.module
View File

@ -462,17 +462,20 @@ function boinccore_am_get_info() {
$xml = ob_get_clean();
$xml = load_configuration($xml);
// See if the account has an approved profile in Drupal
$content_profile = content_profile_load('profile', $account->uid);
$profile_is_approved = ($content_profile->status AND !$content_profile->moderate);
$country = check_plain($content_profile->field_country[0]['value']);
$website = '';
if ($profile_is_approved) {
$website = check_plain($content_profile->field_url[0]['value']);
$uid = boincuser_lookup_uid($xml['am_get_info_reply']['id']);
if ($uid) {
$content_profile = content_profile_load('profile', $uid);
$profile_is_approved = ($content_profile->status AND !$content_profile->moderate);
$country = check_plain($content_profile->field_country[0]['value']);
$website = '';
if ($profile_is_approved) {
$website = check_plain($content_profile->field_url[0]['value']);
}
// Override BOINC values with Drupal values as needed
$xml['am_get_info_reply']['has_profile']['@value'] = ($profile_is_approved) ? 1 : 0;
$xml['am_get_info_reply']['country']['@value'] = $country;
$xml['am_get_info_reply']['url']['@value'] = $website;
}
// Override BOINC values with Drupal values as needed
$xml['am_get_info_reply']['has_profile']['@value'] = ($profile_is_approved) ? 1 : 0;
$xml['am_get_info_reply']['country']['@value'] = $country;
$xml['am_get_info_reply']['url']['@value'] = $website;
print save_configuration($xml);
}