Merge branch '2.3.x' into 2.3.x-saas

This commit is contained in:
Martin Konecny 2013-03-22 14:24:12 -04:00
commit 00475275e5
7 changed files with 98 additions and 58 deletions

View file

@ -99,10 +99,13 @@ class AirtimeCheck {
{
$headerInfo = get_headers("http://$p_baseUrl:$p_basePort",1);
if (!isset($headerInfo['Server'][0]))
if (!isset($headerInfo['Server'][0])) {
return self::UNKNOWN;
else
} else if (is_array($headerInfo['Server'])) {
return $headerInfo['Server'][0];
} else {
return $headerInfo['Server'];
}
}
public static function GetStatus($p_baseUrl, $p_basePort, $p_baseDir, $p_apiKey){