Apply "Squiz" code style on old (pre-2014) files

This commit is contained in:
Job Snijders
2015-07-10 13:36:21 +02:00
parent e4f4eb44dc
commit ebd0f6fc35
539 changed files with 13591 additions and 13223 deletions
+40 -38
View File
@@ -1,43 +1,45 @@
<?php
if (is_numeric($vars['id']))
{
if (is_numeric($vars['id'])) {
$acc = dbFetchRow('SELECT * FROM `mac_accounting` AS M, `ports` AS I, `devices` AS D WHERE M.ma_id = ? AND I.port_id = M.port_id AND I.device_id = D.device_id', array($vars['id']));
$acc = dbFetchRow("SELECT * FROM `mac_accounting` AS M, `ports` AS I, `devices` AS D WHERE M.ma_id = ? AND I.port_id = M.port_id AND I.device_id = D.device_id", array($vars['id']));
if ($debug) {
echo("<pre>");
print_r($acc);
echo("</pre>");
}
if (is_array($acc))
{
if ($auth || port_permitted($acc['port_id']))
{
if ($debug) { echo($config['rrd_dir'] . "/" . $acc['hostname'] . "/" . safename("cip-" . $acc['ifIndex'] . "-" . $acc['mac'] . ".rrd")); }
if (is_file($config['rrd_dir'] . "/" . $acc['hostname'] . "/" . safename("cip-" . $acc['ifIndex'] . "-" . $acc['mac'] . ".rrd")))
{
if ($debug) { echo("exists"); }
$rrd_filename = $config['rrd_dir'] . "/" . $acc['hostname'] . "/" . safename("cip-" . $acc['ifIndex'] . "-" . $acc['mac'] . ".rrd");
$port = get_port_by_id($acc['port_id']);
$device = device_by_id_cache($port['device_id']);
$title = generate_device_link($device);
$title .= " :: Port ".generate_port_link($port);
$title .= " :: " . formatMac($acc['mac']);
$auth = TRUE;
} else {
graph_error("file not found");
}
} else {
graph_error("unauthenticated");
if ($debug) {
echo '<pre>';
print_r($acc);
echo '</pre>';
}
if (is_array($acc)) {
if ($auth || port_permitted($acc['port_id'])) {
if ($debug) {
echo $config['rrd_dir'].'/'.$acc['hostname'].'/'.safename('cip-'.$acc['ifIndex'].'-'.$acc['mac'].'.rrd');
}
if (is_file($config['rrd_dir'].'/'.$acc['hostname'].'/'.safename('cip-'.$acc['ifIndex'].'-'.$acc['mac'].'.rrd'))) {
if ($debug) {
echo 'exists';
}
$rrd_filename = $config['rrd_dir'].'/'.$acc['hostname'].'/'.safename('cip-'.$acc['ifIndex'].'-'.$acc['mac'].'.rrd');
$port = get_port_by_id($acc['port_id']);
$device = device_by_id_cache($port['device_id']);
$title = generate_device_link($device);
$title .= ' :: Port '.generate_port_link($port);
$title .= ' :: '.formatMac($acc['mac']);
$auth = true;
}
else {
graph_error('file not found');
}
}
else {
graph_error('unauthenticated');
}
}
else {
graph_error('entry not found');
}
} else {
graph_error("entry not found");
}
} else {
graph_error("invalid id");
}
?>
else {
graph_error('invalid id');
}
@@ -1,8 +1,6 @@
<?php
$ds_in = "IN";
$ds_out = "OUT";
$ds_in = 'IN';
$ds_out = 'OUT';
include("includes/graphs/generic_data.inc.php");
?>
require 'includes/graphs/generic_data.inc.php';
+10 -12
View File
@@ -1,19 +1,17 @@
<?php
$ds_in = "PIN";
$ds_out = "POUT";
$ds_in = 'PIN';
$ds_out = 'POUT';
$colour_area_in = "AA66AA";
$colour_line_in = "330033";
$colour_area_out = "FFDD88";
$colour_line_out = "FF6600";
$colour_area_in = 'AA66AA';
$colour_line_in = '330033';
$colour_area_out = 'FFDD88';
$colour_line_out = 'FF6600';
$colour_area_in_max = "CC88CC";
$colour_area_out_max = "FFEFAA";
$colour_area_in_max = 'CC88CC';
$colour_area_out_max = 'FFEFAA';
$graph_max = 1;
$unit_text = "Pkts\ \ \ ";
$unit_text = 'Pkts\ \ \ ';
include("includes/graphs/generic_duplex.inc.php");
?>
require 'includes/graphs/generic_duplex.inc.php';