mirror of https://github.com/BOINC/boinc.git
- web RPC: include rpc_time in XML host description
- client: if acct mgr sends us an account with no authenticator, show an error message instead of trying to attach svn path=/trunk/boinc/; revision=25608
This commit is contained in:
parent
7e3026abfa
commit
3b363f9a87
|
@ -3632,3 +3632,16 @@ Rom 27 Apr 2012
|
||||||
|
|
||||||
clientscr/
|
clientscr/
|
||||||
screensaver_win.cpp, .h
|
screensaver_win.cpp, .h
|
||||||
|
|
||||||
|
David 30 Apr 2012
|
||||||
|
- web RPC: include rpc_time in XML host description
|
||||||
|
- client: if acct mgr sends us an account with no authenticator,
|
||||||
|
show an error message instead of trying to attach
|
||||||
|
|
||||||
|
html/
|
||||||
|
inc/
|
||||||
|
xml.inc
|
||||||
|
user/
|
||||||
|
show_user.php
|
||||||
|
client/
|
||||||
|
acct_mgr.cpp
|
||||||
|
|
|
@ -589,6 +589,14 @@ void ACCT_MGR_OP::handle_reply(int http_op_retval) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
if (acct.authenticator.empty()) {
|
||||||
|
msg_printf(NULL, MSG_INFO,
|
||||||
|
"Account manager reply missing authenticator for %s",
|
||||||
|
acct.url.c_str()
|
||||||
|
);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
// here we don't already have the project.
|
// here we don't already have the project.
|
||||||
// Attach to it, unless the acct mgr is telling us to detach
|
// Attach to it, unless the acct mgr is telling us to detach
|
||||||
//
|
//
|
||||||
|
|
|
@ -35,11 +35,14 @@ function xml_header() {
|
||||||
$generating_xml = true;
|
$generating_xml = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// used only if host owner is the requesting user
|
||||||
|
//
|
||||||
function show_host_xml($host) {
|
function show_host_xml($host) {
|
||||||
echo " <host>
|
echo " <host>
|
||||||
<id>$host->id</id>
|
<id>$host->id</id>
|
||||||
<create_time>$host->create_time</create_time>
|
<create_time>$host->create_time</create_time>
|
||||||
<rpc_seqno>$host->rpc_seqno</rpc_seqno>
|
<rpc_seqno>$host->rpc_seqno</rpc_seqno>
|
||||||
|
<rpc_time>$host->rpc_time</rpc_time>
|
||||||
<host_cpid>$host->host_cpid</host_cpid>
|
<host_cpid>$host->host_cpid</host_cpid>
|
||||||
<total_credit>$host->total_credit</total_credit>
|
<total_credit>$host->total_credit</total_credit>
|
||||||
<expavg_credit>$host->expavg_credit</expavg_credit>
|
<expavg_credit>$host->expavg_credit</expavg_credit>
|
||||||
|
@ -60,6 +63,8 @@ function show_host_xml($host) {
|
||||||
";
|
";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// $show_hosts is true only if $user is the logged-in user
|
||||||
|
//
|
||||||
function show_user_xml($user, $show_hosts) {
|
function show_user_xml($user, $show_hosts) {
|
||||||
$cpid = md5($user->cross_project_id.$user->email_addr);
|
$cpid = md5($user->cross_project_id.$user->email_addr);
|
||||||
echo "<user>
|
echo "<user>
|
||||||
|
|
|
@ -33,8 +33,6 @@ require_once("../inc/user.inc");
|
||||||
require_once("../inc/forum.inc");
|
require_once("../inc/forum.inc");
|
||||||
require_once("../project/project.inc");
|
require_once("../project/project.inc");
|
||||||
|
|
||||||
//check_get_args(array("auth", "userid", "format"));
|
|
||||||
|
|
||||||
$auth = get_str("auth", true);
|
$auth = get_str("auth", true);
|
||||||
if (!$auth) {
|
if (!$auth) {
|
||||||
$id = get_int("userid");
|
$id = get_int("userid");
|
||||||
|
|
Loading…
Reference in New Issue