Fix coding style part 2

This commit is contained in:
Job Snijders
2015-07-14 17:41:54 +02:00
parent ad9590df9b
commit 361653aa81
731 changed files with 37529 additions and 33991 deletions
+36 -40
View File
@@ -2,54 +2,50 @@
$storage_cache = array();
foreach (dbFetchRows("SELECT * FROM storage WHERE device_id = ?", array($device['device_id'])) as $storage)
{
echo("Storage ".$storage['storage_descr'] . ": ");
foreach (dbFetchRows('SELECT * FROM storage WHERE device_id = ?', array($device['device_id'])) as $storage) {
echo 'Storage '.$storage['storage_descr'].': ';
$storage_rrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/" . safename("storage-" . $storage['storage_mib'] . "-" . safename($storage['storage_descr']) . ".rrd");
$storage_rrd = $config['rrd_dir'].'/'.$device['hostname'].'/'.safename('storage-'.$storage['storage_mib'].'-'.safename($storage['storage_descr']).'.rrd');
if (!is_file($storage_rrd))
{
rrdtool_create($storage_rrd, "--step 300 DS:used:GAUGE:600:0:U DS:free:GAUGE:600:0:U ".$config['rrd_rra']);
}
if (!is_file($storage_rrd)) {
rrdtool_create($storage_rrd, '--step 300 DS:used:GAUGE:600:0:U DS:free:GAUGE:600:0:U '.$config['rrd_rra']);
}
$file = $config['install_dir']."/includes/polling/storage/".$storage['storage_mib'].".inc.php";
if (is_file($file))
{
include($file);
} else {
// Generic poller goes here if we ever have a discovery module which uses it.
}
$file = $config['install_dir'].'/includes/polling/storage/'.$storage['storage_mib'].'.inc.php';
if (is_file($file)) {
include $file;
}
else {
// FIXME Generic poller goes here if we ever have a discovery module which uses it.
}
if ($debug) {print_r($storage); }
if ($debug) {
print_r($storage);
}
if ($storage['size'])
{
$percent = round($storage['used'] / $storage['size'] * 100);
}
else
{
$percent = 0;
}
if ($storage['size']) {
$percent = round(($storage['used'] / $storage['size'] * 100));
}
else {
$percent = 0;
}
echo($percent."% ");
echo $percent.'% ';
rrdtool_update($storage_rrd,"N:".$storage['used'].":".$storage['free']);
rrdtool_update($storage_rrd, 'N:'.$storage['used'].':'.$storage['free']);
if ($config['memcached']['enable'] === TRUE)
{
$memcache->set('storage-'.$storage['storage_id'].'-used', $storage['used']);
$memcache->set('storage-'.$storage['storage_id'].'-free', $storage['free']);
$memcache->set('storage-'.$storage['storage_id'].'-size', $storage['size']);
$memcache->set('storage-'.$storage['storage_id'].'-units', $storage['units']);
$memcache->set('storage-'.$storage['storage_id'].'-perc', $percent);
} else {
$update = dbUpdate(array('storage_used' => $storage['used'], 'storage_free' => $storage['free'], 'storage_size' => $storage['size'], 'storage_units' => $storage['units'], 'storage_perc' => $percent), 'storage', '`storage_id` = ?', array($storage['storage_id']));
}
if ($config['memcached']['enable'] === true) {
$memcache->set('storage-'.$storage['storage_id'].'-used', $storage['used']);
$memcache->set('storage-'.$storage['storage_id'].'-free', $storage['free']);
$memcache->set('storage-'.$storage['storage_id'].'-size', $storage['size']);
$memcache->set('storage-'.$storage['storage_id'].'-units', $storage['units']);
$memcache->set('storage-'.$storage['storage_id'].'-perc', $percent);
}
else {
$update = dbUpdate(array('storage_used' => $storage['used'], 'storage_free' => $storage['free'], 'storage_size' => $storage['size'], 'storage_units' => $storage['units'], 'storage_perc' => $percent), 'storage', '`storage_id` = ?', array($storage['storage_id']));
}
echo("\n");
}
echo "\n";
}//end foreach
unset($storage);
?>