From 51c9c1763ea70c36e0d22cc865b48f5186da1fbc Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Thu, 26 Aug 2010 17:01:12 +0200 Subject: [PATCH] Code cleanup, mostly added extra spaces --- libraries/chart.lib.php | 6 +++--- libraries/chart/pma_pchart_multi_bar.php | 2 +- libraries/chart/pma_pchart_multi_line.php | 4 ++-- libraries/chart/pma_pchart_multi_radar.php | 5 +++-- libraries/chart/pma_pchart_pie.php | 8 ++++---- libraries/chart/pma_pchart_single_bar.php | 2 +- libraries/chart/pma_pchart_single_line.php | 4 ++-- libraries/chart/pma_pchart_single_radar.php | 5 +++-- libraries/chart/pma_pchart_stacked_bar.php | 2 +- 9 files changed, 20 insertions(+), 18 deletions(-) diff --git a/libraries/chart.lib.php b/libraries/chart.lib.php index 7ed5a7d37..045da9445 100644 --- a/libraries/chart.lib.php +++ b/libraries/chart.lib.php @@ -54,7 +54,7 @@ function PMA_chart_profiling($data) { $chartData = array(); foreach($data as $dataValue) { - $value = (int)($dataValue['Duration']*1000000); + $value = (int)($dataValue['Duration'] * 1000000); $key = ucwords($dataValue['Status']); $chartData[$key] = $value; } @@ -247,10 +247,10 @@ function PMA_chart_results($data, &$chartSettings) function PMA_handle_chart_err($errors) { if (in_array(ERR_NO_GD, $errors)) { - PMA_warnMissingExtension('GD', false, 'GD extension is needed for charts.'); + PMA_warnMissingExtension('GD', false, __('GD extension is needed for charts.')); } else if (in_array(ERR_NO_JSON, $errors)) { - PMA_warnMissingExtension('JSON', false, 'JSON encoder is needed for chart tooltips.'); + PMA_warnMissingExtension('JSON', false, __('JSON encoder is needed for chart tooltips.')); } } diff --git a/libraries/chart/pma_pchart_multi_bar.php b/libraries/chart/pma_pchart_multi_bar.php index 698db5c8c..6c3969b44 100644 --- a/libraries/chart/pma_pchart_multi_bar.php +++ b/libraries/chart/pma_pchart_multi_bar.php @@ -31,7 +31,7 @@ class PMA_pChart_multi_bar extends PMA_pChart_multi parent::drawChart(); // Draw the bar chart - $this->chart->drawBarGraph($this->dataSet->GetData(),$this->dataSet->GetDataDescription(),70); + $this->chart->drawBarGraph($this->dataSet->GetData(), $this->dataSet->GetDataDescription(), 70); } } diff --git a/libraries/chart/pma_pchart_multi_line.php b/libraries/chart/pma_pchart_multi_line.php index 866288ce2..892c01195 100644 --- a/libraries/chart/pma_pchart_multi_line.php +++ b/libraries/chart/pma_pchart_multi_line.php @@ -31,8 +31,8 @@ class PMA_pChart_multi_line extends PMA_pChart_multi parent::drawChart(); // Draw the bar chart - $this->chart->drawLineGraph($this->dataSet->GetData(),$this->dataSet->GetDataDescription()); - $this->chart->drawPlotGraph($this->dataSet->GetData(),$this->dataSet->GetDataDescription(),3,1,-1,-1,-1,TRUE); + $this->chart->drawLineGraph($this->dataSet->GetData(), $this->dataSet->GetDataDescription()); + $this->chart->drawPlotGraph($this->dataSet->GetData(), $this->dataSet->GetDataDescription(), 3, 1, -1, -1, -1, TRUE); } } diff --git a/libraries/chart/pma_pchart_multi_radar.php b/libraries/chart/pma_pchart_multi_radar.php index d88cdc06a..2224acc9f 100644 --- a/libraries/chart/pma_pchart_multi_radar.php +++ b/libraries/chart/pma_pchart_multi_radar.php @@ -91,8 +91,9 @@ class PMA_pChart_multi_radar extends PMA_pChart_multi $borderOffset += 40; // Draw the radar chart - $this->chart->drawRadarAxis($this->dataSet->GetData(),$this->dataSet->GetDataDescription(),TRUE,$borderOffset,120,120,120,230,230,230,-1,2); - $this->chart->drawFilledRadar($this->dataSet->GetData(),$this->dataSet->GetDataDescription(),50,$borderOffset); + $this->chart->drawRadarAxis($this->dataSet->GetData(), $this->dataSet->GetDataDescription(), TRUE, $borderOffset, + 120, 120, 120, 230, 230, 230, -1, 2); + $this->chart->drawFilledRadar($this->dataSet->GetData(), $this->dataSet->GetDataDescription(), 50, $borderOffset); } } diff --git a/libraries/chart/pma_pchart_pie.php b/libraries/chart/pma_pchart_pie.php index ce06604b1..5bf77fcf0 100644 --- a/libraries/chart/pma_pchart_pie.php +++ b/libraries/chart/pma_pchart_pie.php @@ -31,8 +31,8 @@ class PMA_pChart_Pie extends PMA_pChart_multi protected function prepareDataSet() { // Dataset definition - $this->dataSet->AddPoint(array_values($this->data),"Values"); - $this->dataSet->AddPoint(array_keys($this->data),"Keys"); + $this->dataSet->AddPoint(array_values($this->data), "Values"); + $this->dataSet->AddPoint(array_keys($this->data), "Keys"); $this->dataSet->AddAllSeries(); $this->dataSet->SetAbsciseLabelSerie("Keys"); } @@ -75,7 +75,7 @@ class PMA_pChart_Pie extends PMA_pChart_multi // lower part. This is why we set an offset to the // Y middle coordiantes. $middleY - 15, - 120,PIE_PERCENTAGE,FALSE,60,30,10,1); + 120, PIE_PERCENTAGE, FALSE, 60, 30, 10, 1); } /** @@ -88,7 +88,7 @@ class PMA_pChart_Pie extends PMA_pChart_multi $this->getLabelHeight() + $this->getLegendMargin(TOP), $this->dataSet->GetData(), $this->dataSet->GetDataDescription(), - 250,250,250); + 250, 250, 250); } protected function getLegendBoxWidth() diff --git a/libraries/chart/pma_pchart_single_bar.php b/libraries/chart/pma_pchart_single_bar.php index 257d8a9f2..821df636e 100644 --- a/libraries/chart/pma_pchart_single_bar.php +++ b/libraries/chart/pma_pchart_single_bar.php @@ -28,7 +28,7 @@ class PMA_pChart_single_bar extends PMA_pChart_single { // Draw the bar chart // use stacked bar graph function, because it gives bars with alpha - $this->chart->drawStackedBarGraph($this->dataSet->GetData(),$this->dataSet->GetDataDescription(),70); + $this->chart->drawStackedBarGraph($this->dataSet->GetData(), $this->dataSet->GetDataDescription(), 70); } } diff --git a/libraries/chart/pma_pchart_single_line.php b/libraries/chart/pma_pchart_single_line.php index 614e1d20e..a0ac7422a 100644 --- a/libraries/chart/pma_pchart_single_line.php +++ b/libraries/chart/pma_pchart_single_line.php @@ -27,8 +27,8 @@ class PMA_pChart_single_line extends PMA_pChart_single protected function drawChart() { // Draw the line chart - $this->chart->drawLineGraph($this->dataSet->GetData(),$this->dataSet->GetDataDescription()); - $this->chart->drawPlotGraph($this->dataSet->GetData(),$this->dataSet->GetDataDescription(),3,1,-1,-1,-1,TRUE); + $this->chart->drawLineGraph($this->dataSet->GetData(), $this->dataSet->GetDataDescription()); + $this->chart->drawPlotGraph($this->dataSet->GetData(), $this->dataSet->GetDataDescription(), 3, 1, -1, -1, -1, TRUE); } } diff --git a/libraries/chart/pma_pchart_single_radar.php b/libraries/chart/pma_pchart_single_radar.php index e8e968047..1b31cd057 100644 --- a/libraries/chart/pma_pchart_single_radar.php +++ b/libraries/chart/pma_pchart_single_radar.php @@ -79,8 +79,9 @@ class PMA_pChart_single_radar extends PMA_pChart_single // the least ammount that radar is away from the graph area side. $borderOffset += 40; - $this->chart->drawRadarAxis($this->dataSet->GetData(),$this->dataSet->GetDataDescription(),TRUE,$borderOffset,120,120,120,230,230,230,-1,2); - $this->chart->drawFilledRadar($this->dataSet->GetData(),$this->dataSet->GetDataDescription(),50,$borderOffset); + $this->chart->drawRadarAxis($this->dataSet->GetData(), $this->dataSet->GetDataDescription(), + TRUE, $borderOffset, 120, 120, 120, 230, 230, 230, -1, 2); + $this->chart->drawFilledRadar($this->dataSet->GetData(), $this->dataSet->GetDataDescription(), 50, $borderOffset); } } diff --git a/libraries/chart/pma_pchart_stacked_bar.php b/libraries/chart/pma_pchart_stacked_bar.php index c8423426a..4a633f005 100644 --- a/libraries/chart/pma_pchart_stacked_bar.php +++ b/libraries/chart/pma_pchart_stacked_bar.php @@ -29,7 +29,7 @@ class PMA_pChart_stacked_bar extends PMA_pChart_multi parent::drawChart(); // Draw the bar chart - $this->chart->drawStackedBarGraph($this->dataSet->GetData(),$this->dataSet->GetDataDescription(),70); + $this->chart->drawStackedBarGraph($this->dataSet->GetData(), $this->dataSet->GetDataDescription(), 70); } }