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

Added support for am_set_info.php RPC; in addition to pass-through, capture changes to country, URL, and email address and update Drupal data accordingly 

(DBOINCP-184)
This commit is contained in:
Tristan Olive 2015-06-25 22:54:36 -04:00
parent 79c50f0fe4
commit 6a6c3a0515
1 changed files with 52 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -78,6 +78,13 @@ function boinccore_menu() {
'access callback' => TRUE, 'access callback' => TRUE,
'type' => MENU_CALLBACK 'type' => MENU_CALLBACK
); );
$items['am_set_info.php'] = array(
'title' => 'Account manager set info RPC',
'description' => 'RPC for updating assorted details of a user account.',
'page callback' => 'boinccore_am_set_info',
'access callback' => TRUE,
'type' => MENU_CALLBACK
);
return $items; return $items;
} }
@ -462,7 +469,7 @@ function boinccore_am_get_info() {
$xml = ob_get_clean(); $xml = ob_get_clean();
$xml = load_configuration($xml); $xml = load_configuration($xml);
// See if the account has an approved profile in Drupal // See if the account has an approved profile in Drupal
$uid = boincuser_lookup_uid($xml['am_get_info_reply']['id']); $uid = !empty($xml['am_get_info_reply']['id']) ? boincuser_lookup_uid($xml['am_get_info_reply']['id']) : 0;
if ($uid) { if ($uid) {
$content_profile = content_profile_load('profile', $uid); $content_profile = content_profile_load('profile', $uid);
$profile_is_approved = ($content_profile->status AND !$content_profile->moderate); $profile_is_approved = ($content_profile->status AND !$content_profile->moderate);
@ -479,6 +486,50 @@ function boinccore_am_get_info() {
print save_configuration($xml); print save_configuration($xml);
} }
/**
* Page callback for the account manager set info RPC (am_set_info.php).
* Update assorted details for a given account
*/
function boinccore_am_set_info() {
// Remove q from the GET request or BOINC will panic
unset($_GET['q']);
// Capture the XML output of the RPC so we can override things
ob_start();
include_boinc('user/am_set_info.php');
$xml = ob_get_clean();
$xml = load_configuration($xml);
if (isset($xml['am_set_info_reply']['success'])) {
// Find the account in Drupal
$boinc_auth = !empty($_POST['account_key']) ? $_POST['account_key'] : $_GET['account_key'];
db_set_active('boinc');
$boinc_id = db_result(db_query("
SELECT id
FROM {user}
WHERE authenticator = '%s'",
$boinc_auth
));
db_set_active('default');
$uid = boincuser_lookup_uid($boinc_id);
// Apply any relevant updates to the Drupal account, also
$country = !empty($_POST['country']) ? $_POST['country'] : (!empty($_GET['country']) ? $_GET['country'] : NULL);
$url = !empty($_POST['url']) ? $_POST['url'] : (!empty($_GET['url']) ? $_GET['url'] : NULL);
$email_addr = !empty($_POST['email_addr']) ? $_POST['email_addr'] : (!empty($_GET['email_addr']) ? $_GET['email_addr'] : NULL);
if ($email_addr) {
$account = user_load($uid);
user_save($account, array('mail' => $email_addr));
}
if ($country OR $url) {
$content_profile = content_profile_load('profile', $uid);
if ($country) $content_profile->field_country[0]['value'] = $country;
if ($url) $content_profile->field_url[0]['value'] = $url;
node_save($content_profile);
}
}
print save_configuration($xml);
}
/** /**
* Controller for handling direct linking to paginated content. * Controller for handling direct linking to paginated content.
* Because pagination settings are user configurable, it is impossible to know * Because pagination settings are user configurable, it is impossible to know