Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

This commit is contained in:
James 2012-04-03 18:09:39 -04:00
commit e5843dc54e

View file

@ -11,15 +11,19 @@ class Application_Model_Systemstatus
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($ch, CURLOPT_URL, $url); curl_setopt($ch, CURLOPT_URL, $url);
curl_setopt($ch, CURLOPT_USERPWD, "guest:airtime"); curl_setopt($ch, CURLOPT_USERPWD, "guest:airtime");
//wait a max of 3 seconds before aborting connection attempt
curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 3);
$result = curl_exec($ch); $result = curl_exec($ch);
curl_close($ch); curl_close($ch);
$docRoot = null; $docRoot = null;
if ($result != FALSE){
if ($result != ""){ if ($result != ""){
$xmlDoc = new DOMDocument(); $xmlDoc = new DOMDocument();
$xmlDoc->loadXML($result); $xmlDoc->loadXML($result);
$docRoot = $xmlDoc->documentElement; $docRoot = $xmlDoc->documentElement;
} }
}
return $docRoot; return $docRoot;
} }