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

web: bug fixes in server_status.php

This commit is contained in:
David Anderson 2015-03-13 12:42:50 -07:00
parent 0d4100f5a3
commit d84bee5063
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
html/user/server_status.php
View File

@ -264,8 +264,8 @@ function get_daemon_status() {
} }
$daemons = $c->daemons; $daemons = $c->daemons;
$config = $c->config; $config = $c->config;
$main_host = (string)$config->host; $main_host = trim((string)$config->host);
$master_url = (string)$config->master_url; $master_url = trim((string)$config->master_url);
$u = parse_url($master_url); $u = parse_url($master_url);
if (!array_key_exists("host", $u)) { if (!array_key_exists("host", $u)) {
print_r($u); print_r($u);
@ -273,7 +273,7 @@ function get_daemon_status() {
} }
$master_host = $u["host"]; $master_host = $u["host"];
if ($config->www_host) { if ($config->www_host) {
$web_host = (string) $config->www_host; $web_host = trim((string) $config->www_host);
} else { } else {
$web_host = $main_host; $web_host = $main_host;
} }
@ -283,7 +283,7 @@ function get_daemon_status() {
// the upload and download servers are sort of daemons too // the upload and download servers are sort of daemons too
// //
$url = (string) $config->download_url; $url = trim((string) $config->download_url);
$u = parse_url($url); $u = parse_url($url);
$h = $u["host"]; $h = $u["host"];
if ($h == $master_host) { if ($h == $master_host) {
@ -295,7 +295,7 @@ function get_daemon_status() {
} else { } else {
$have_remote = true; $have_remote = true;
} }
$url = (string) $config->upload_url; $url = trim((string) $config->upload_url);
$u = parse_url($url); $u = parse_url($url);
$h = $u["host"]; $h = $u["host"];
if ($h == $master_host) { if ($h == $master_host) {