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

admin web: fix PHP warning

This commit is contained in:
David Anderson 2013-08-16 12:20:40 -07:00
parent 84a6f89840
commit cca4b96152
4 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
html/inc/db_ops.inc
View File

@ -1000,7 +1000,7 @@ function show_result_ops($result) {
row("Server state", result_server_state_string($result)." [$result->server_state]");
row("Outcome", result_outcome_string($result)." [$result->outcome]");
row("Client state", result_client_state_string($result)." [$result->client_state]");
row("Exit status", exit_status_string($result));
row("Exit status", exit_status_string($result->exit_status));
row("Host ID", "<a href=\"db_action.php?table=host&id=$result->hostid\">" . host_name_by_id($result->hostid) . "</a> [$result->hostid]");
row("User ID", "<a href=\"db_action.php?table=user&id=$result->userid\">" . user_name_by_id($result->userid) . "</a> [$result->userid]");
row("CPU time", $result->cpu_time);
@ -1102,7 +1102,7 @@ function show_result_short($result) {
<td>$cs2</td>
<td bgcolor=$validate_color>$vs</td>
<td>$delete_state</td>
<td>", exit_status_string($result), "</td>
<td>", exit_status_string($result->exit_status), "</td>
<td>$host_user</td>
<td>$version</td>
<td>$received</td>

11
html/inc/result.inc
View File

@ -619,14 +619,7 @@ function result_error_mask_str($x){
}
}
function exit_status_string($result) {
$x = $result->exit_status;
if ($x == 0) {
$y = parse_element($result->stderr_out, "<exit_status>");
if ($y) {
$x = (int)$y;
}
}
function exit_status_string($x) {
return sprintf("%d (0x%x)", $x, $x). " ".result_error_mask_str($x);
}
@ -640,7 +633,7 @@ function show_result($result, $show_outfile_links=false) {
row2(tra("Server state"), result_server_state_string($result));
row2(tra("Outcome"), result_outcome_string($result));
row2(tra("Client state"), result_client_state_string($result));
row2(tra("Exit status"), exit_status_string($result));
row2(tra("Exit status"), exit_status_string($result->exit_status));
row2(tra("Computer ID"), host_link($result->hostid));
row2(tra("Report deadline"), time_str($result->report_deadline));
row2(tra("Run time"), number_format($result->elapsed_time, 2));

2
html/inc/util_ops.inc
View File

@ -281,7 +281,7 @@ function cancel_wus_if_unsent($id1, $id2) {
return 0;
}
function app_version_name($avid) {
function app_version_desc($avid) {
switch ($avid) {
case ANON_PLATFORM_UNKNOWN:
return "Anonymous platform: unknown type";

5
html/ops/failure_result_summary_by_platform.php
View File

@ -69,7 +69,10 @@ while ($res = mysql_fetch_object($result)) {
table_row(
app_version_desc($res->app_version_id),
link_results(
exit_status_string($res), $urlquery, "$exit_status_condition", ""
exit_status_string($res->exit_status),
$urlquery,
"$exit_status_condition",
""
),
$res->error_count
);