Merge branch 'master' into docker

This commit is contained in:
adolfintel 2018-09-17 21:07:28 +02:00
commit 7ce4e00c7a

View file

@ -70,7 +70,7 @@ if($db_type=="mysql"){
$dl=$row["dl"];
$ul=$row["ul"];
$ping=$row["ping"];
$jitter=$row["jitter"];
$jit=$row["jitter"];
$conn=null;
}else if($db_type=="postgresql"){
$conn_host = "host=$PostgreSql_hostname";
@ -85,7 +85,7 @@ if($db_type=="mysql"){
$dl=$row["dl"];
$ul=$row["ul"];
$ping=$row["ping"];
$jitter=$row["jitter"];
$jit=$row["jitter"];
$conn=null;
}else die();
@ -130,4 +130,4 @@ header('Content-Type: image/png');
imagepng($im);
imagedestroy($im);
?>
?>