BOINC / boinc

drupal/sites/default/boinc/modules/boincstats/includes/pchart/class/pBarcode128.class.php

Spacing +61 added lines, -61 removed lines

@@ -23,7 +23,7 @@ 
    var $CRC;
 
    /* Class creator */
-   function pBarcode128($BasePath="")
+   function pBarcode128($BasePath = "")
     {
      $this->Codes   = "";
      $this->Reverse = "";
@@ -34,10 +34,10 @@ 
 
      while (!feof($FileHandle))
       {
-       $Buffer = fgets($FileHandle,4096);
-       $Buffer = str_replace(chr(10),"",$Buffer);
-       $Buffer = str_replace(chr(13),"",$Buffer);
-       $Values = preg_split("/;/",$Buffer);
+       $Buffer = fgets($FileHandle, 4096);
+       $Buffer = str_replace(chr(10), "", $Buffer);
+       $Buffer = str_replace(chr(13), "", $Buffer);
+       $Values = preg_split("/;/", $Buffer);
 
        $this->Codes[$Values[1]]["ID"]     = $Values[0];
        $this->Codes[$Values[1]]["Code"]   = $Values[2];
@@ -48,44 +48,44 @@ 
     }
 
    /* Return the projected size of a barcode */
-   function getSize($TextString,$Format="")
+   function getSize($TextString, $Format = "")
     {
-     $Angle		= isset($Format["Angle"]) ? $Format["Angle"] : 0;
-     $ShowLegend	= isset($Format["ShowLegend"]) ? $Format["ShowLegend"] : FALSE;
-     $LegendOffset	= isset($Format["LegendOffset"]) ? $Format["LegendOffset"] : 5;
+     $Angle = isset($Format["Angle"]) ? $Format["Angle"] : 0;
+     $ShowLegend = isset($Format["ShowLegend"]) ? $Format["ShowLegend"] : FALSE;
+     $LegendOffset = isset($Format["LegendOffset"]) ? $Format["LegendOffset"] : 5;
      $DrawArea		= isset($Format["DrawArea"]) ? $Format["DrawArea"] : FALSE;
      $FontSize		= isset($Format["FontSize"]) ? $Format["FontSize"] : 12;
-     $Height		= isset($Format["Height"]) ? $Format["Height"] : 30;
+     $Height = isset($Format["Height"]) ? $Format["Height"] : 30;
 
      $TextString    = $this->encode128($TextString);
      $BarcodeLength = strlen($this->Result);
 
-     if ( $DrawArea )   { $WOffset = 20; } else { $WOffset = 0; }
-     if ( $ShowLegend ) { $HOffset = $FontSize+$LegendOffset+$WOffset; } else { $HOffset = 0; }
+     if ($DrawArea) { $WOffset = 20; } else { $WOffset = 0; }
+     if ($ShowLegend) { $HOffset = $FontSize + $LegendOffset + $WOffset; } else { $HOffset = 0; }
 
-     $X1 = cos($Angle * PI / 180) * ($WOffset+$BarcodeLength);
-     $Y1 = sin($Angle * PI / 180) * ($WOffset+$BarcodeLength);
+     $X1 = cos($Angle*PI/180)*($WOffset + $BarcodeLength);
+     $Y1 = sin($Angle*PI/180)*($WOffset + $BarcodeLength);
 
-     $X2 = $X1 + cos(($Angle+90) * PI / 180) * ($HOffset+$Height);
-     $Y2 = $Y1 + sin(($Angle+90) * PI / 180) * ($HOffset+$Height);
+     $X2 = $X1 + cos(($Angle + 90)*PI/180)*($HOffset + $Height);
+     $Y2 = $Y1 + sin(($Angle + 90)*PI/180)*($HOffset + $Height);
 
 
-     $AreaWidth  = max(abs($X1),abs($X2));
-     $AreaHeight = max(abs($Y1),abs($Y2));
+     $AreaWidth  = max(abs($X1), abs($X2));
+     $AreaHeight = max(abs($Y1), abs($Y2));
 
-     return(array("Width"=>$AreaWidth,"Height"=>$AreaHeight));
+     return(array("Width"=>$AreaWidth, "Height"=>$AreaHeight));
     }
 
-   function encode128($Value,$Format="")
+   function encode128($Value, $Format = "")
     {
      $this->Result  = "11010010000";
      $this->CRC     = 104;
      $TextString    = "";
 
-     for($i=1;$i<=strlen($Value);$i++)
+     for ($i = 1; $i <= strlen($Value); $i++)
       {
-       $CharCode = ord($this->mid($Value,$i,1));
-       if ( isset($this->Codes[$CharCode]) )
+       $CharCode = ord($this->mid($Value, $i, 1));
+       if (isset($this->Codes[$CharCode]))
         {
          $this->Result = $this->Result.$this->Codes[$CharCode]["Code"];
          $this->CRC = $this->CRC + $i*$this->Codes[$CharCode]["ID"];
@@ -101,7 +101,7 @@ 
     }
 
    /* Create the encoded string */
-   function draw($Object,$Value,$X,$Y,$Format="")
+   function draw($Object, $Value, $X, $Y, $Format = "")
     {
      $this->pChartObject = $Object;
 
@@ -109,11 +109,11 @@ 
      $G			= isset($Format["G"]) ? $Format["G"] : 0;
      $B			= isset($Format["B"]) ? $Format["B"] : 0;
      $Alpha		= isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
-     $Height		= isset($Format["Height"]) ? $Format["Height"] : 30;
+     $Height = isset($Format["Height"]) ? $Format["Height"] : 30;
      $Angle		= isset($Format["Angle"]) ? $Format["Angle"] : 0;
-     $ShowLegend	= isset($Format["ShowLegend"]) ? $Format["ShowLegend"] : FALSE;
-     $LegendOffset	= isset($Format["LegendOffset"]) ? $Format["LegendOffset"] : 5;
-     $DrawArea		= isset($Format["DrawArea"]) ? $Format["DrawArea"] : FALSE;
+     $ShowLegend = isset($Format["ShowLegend"]) ? $Format["ShowLegend"] : FALSE;
+     $LegendOffset = isset($Format["LegendOffset"]) ? $Format["LegendOffset"] : 5;
+     $DrawArea = isset($Format["DrawArea"]) ? $Format["DrawArea"] : FALSE;
      $AreaR		= isset($Format["AreaR"]) ? $Format["AreaR"] : 255;
      $AreaG		= isset($Format["AreaG"]) ? $Format["AreaG"] : 255;
      $AreaB		= isset($Format["AreaB"]) ? $Format["AreaB"] : 255;
@@ -123,62 +123,62 @@ 
 
      $TextString = $this->encode128($Value);
 
-     if ( $DrawArea )
+     if ($DrawArea)
       {
-       $X1 = $X + cos(($Angle-135) * PI / 180) * 10;
-       $Y1 = $Y + sin(($Angle-135) * PI / 180) * 10;
+       $X1 = $X + cos(($Angle - 135)*PI/180)*10;
+       $Y1 = $Y + sin(($Angle - 135)*PI/180)*10;
 
-       $X2 = $X1 + cos($Angle * PI / 180) * (strlen($this->Result)+20);
-       $Y2 = $Y1 + sin($Angle * PI / 180) * (strlen($this->Result)+20);
+       $X2 = $X1 + cos($Angle*PI/180)*(strlen($this->Result) + 20);
+       $Y2 = $Y1 + sin($Angle*PI/180)*(strlen($this->Result) + 20);
 
-       if ( $ShowLegend )
+       if ($ShowLegend)
         {
-         $X3 = $X2 + cos(($Angle+90) * PI / 180) * ($Height+$LegendOffset+$this->pChartObject->FontSize+10);
-         $Y3 = $Y2 + sin(($Angle+90) * PI / 180) * ($Height+$LegendOffset+$this->pChartObject->FontSize+10);
+         $X3 = $X2 + cos(($Angle + 90)*PI/180)*($Height + $LegendOffset + $this->pChartObject->FontSize + 10);
+         $Y3 = $Y2 + sin(($Angle + 90)*PI/180)*($Height + $LegendOffset + $this->pChartObject->FontSize + 10);
         }
        else
         {
-         $X3 = $X2 + cos(($Angle+90) * PI / 180) * ($Height+20);
-         $Y3 = $Y2 + sin(($Angle+90) * PI / 180) * ($Height+20);
+         $X3 = $X2 + cos(($Angle + 90)*PI/180)*($Height + 20);
+         $Y3 = $Y2 + sin(($Angle + 90)*PI/180)*($Height + 20);
         }
 
-       $X4 = $X3 + cos(($Angle+180) * PI / 180) * (strlen($this->Result)+20);
-       $Y4 = $Y3 + sin(($Angle+180) * PI / 180) * (strlen($this->Result)+20);
+       $X4 = $X3 + cos(($Angle + 180)*PI/180)*(strlen($this->Result) + 20);
+       $Y4 = $Y3 + sin(($Angle + 180)*PI/180)*(strlen($this->Result) + 20);
 
-       $Polygon  = array($X1,$Y1,$X2,$Y2,$X3,$Y3,$X4,$Y4);
-       $Settings = array("R"=>$AreaR,"G"=>$AreaG,"B"=>$AreaB,"BorderR"=>$AreaBorderR,"BorderG"=>$AreaBorderG,"BorderB"=>$AreaBorderB);
-       $this->pChartObject->drawPolygon($Polygon,$Settings);
+       $Polygon  = array($X1, $Y1, $X2, $Y2, $X3, $Y3, $X4, $Y4);
+       $Settings = array("R"=>$AreaR, "G"=>$AreaG, "B"=>$AreaB, "BorderR"=>$AreaBorderR, "BorderG"=>$AreaBorderG, "BorderB"=>$AreaBorderB);
+       $this->pChartObject->drawPolygon($Polygon, $Settings);
       }
 
-     for($i=1;$i<=strlen($this->Result);$i++)
+     for ($i = 1; $i <= strlen($this->Result); $i++)
       {
-       if ( $this->mid($this->Result,$i,1) == 1 )
+       if ($this->mid($this->Result, $i, 1) == 1)
         {
-         $X1 = $X + cos($Angle * PI / 180) * $i;
-         $Y1 = $Y + sin($Angle * PI / 180) * $i;
-         $X2 = $X1 + cos(($Angle+90) * PI / 180) * $Height;
-         $Y2 = $Y1 + sin(($Angle+90) * PI / 180) * $Height;
+         $X1 = $X + cos($Angle*PI/180)*$i;
+         $Y1 = $Y + sin($Angle*PI/180)*$i;
+         $X2 = $X1 + cos(($Angle + 90)*PI/180)*$Height;
+         $Y2 = $Y1 + sin(($Angle + 90)*PI/180)*$Height;
 
-         $Settings = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha);
-         $this->pChartObject->drawLine($X1,$Y1,$X2,$Y2,$Settings);
+         $Settings = array("R"=>$R, "G"=>$G, "B"=>$B, "Alpha"=>$Alpha);
+         $this->pChartObject->drawLine($X1, $Y1, $X2, $Y2, $Settings);
         }
       }
 
-     if ( $ShowLegend )
+     if ($ShowLegend)
       {
-       $X1 = $X + cos($Angle * PI / 180) * (strlen($this->Result)/2);
-       $Y1 = $Y + sin($Angle * PI / 180) * (strlen($this->Result)/2);
+       $X1 = $X + cos($Angle*PI/180)*(strlen($this->Result)/2);
+       $Y1 = $Y + sin($Angle*PI/180)*(strlen($this->Result)/2);
 
-       $LegendX = $X1 + cos(($Angle+90) * PI / 180) * ($Height+$LegendOffset);
-       $LegendY = $Y1 + sin(($Angle+90) * PI / 180) * ($Height+$LegendOffset);
+       $LegendX = $X1 + cos(($Angle + 90)*PI/180)*($Height + $LegendOffset);
+       $LegendY = $Y1 + sin(($Angle + 90)*PI/180)*($Height + $LegendOffset);
 
-       $Settings = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Angle"=>-$Angle,"Align"=>TEXT_ALIGN_TOPMIDDLE);
-       $this->pChartObject->drawText($LegendX,$LegendY,$TextString,$Settings);
+       $Settings = array("R"=>$R, "G"=>$G, "B"=>$B, "Alpha"=>$Alpha, "Angle"=>-$Angle, "Align"=>TEXT_ALIGN_TOPMIDDLE);
+       $this->pChartObject->drawText($LegendX, $LegendY, $TextString, $Settings);
       }
     }
 
-   function left($value,$NbChar) { return substr($value,0,$NbChar); }  
-   function right($value,$NbChar) { return substr($value,strlen($value)-$NbChar,$NbChar); }  
-   function mid($value,$Depart,$NbChar) { return substr($value,$Depart-1,$NbChar); }  
+   function left($value, $NbChar) { return substr($value, 0, $NbChar); }  
+   function right($value, $NbChar) { return substr($value, strlen($value) - $NbChar, $NbChar); }  
+   function mid($value, $Depart, $NbChar) { return substr($value, $Depart - 1, $NbChar); }  
   }
 ?>
\ No newline at end of file

drupal/sites/default/boinc/modules/boincstats/includes/pchart/class/pScatter.class.php

Spacing +454 added lines, -454 removed lines

@@ -13,8 +13,8 @@ 
      You can find the whole class documentation on the pChart web site.
  */
 
- define("SCATTER_MISSING_X_SERIE"	, 190001);
- define("SCATTER_MISSING_Y_SERIE"	, 190002);
+ define("SCATTER_MISSING_X_SERIE", 190001);
+ define("SCATTER_MISSING_Y_SERIE", 190002);
 
  /* pScatter class definition */
  class pScatter
@@ -23,24 +23,24 @@ 
    var $pDataObject;
 
    /* Class creator */
-   function pScatter($pChartObject,$pDataObject)
+   function pScatter($pChartObject, $pDataObject)
     {
      $this->pChartObject = $pChartObject;
      $this->pDataObject  = $pDataObject;
     }
 
    /* Prepare the scale */
-   function drawScatterScale($Format="")
+   function drawScatterScale($Format = "")
     {
-     $Mode		= isset($Format["Mode"]) ? $Format["Mode"] : SCALE_MODE_FLOATING;
-     $Floating		= isset($Format["Floating"]) ? $Format["Floating"] : FALSE;
-     $XLabelsRotation	= isset($Format["XLabelsRotation"]) ? $Format["XLabelsRotation"] : 90;
-     $MinDivHeight	= isset($Format["MinDivHeight"]) ? $Format["MinDivHeight"] : 20;
-     $Factors		= isset($Format["Factors"]) ? $Format["Factors"] : array(1,2,5);
-     $ManualScale	= isset($Format["ManualScale"]) ? $Format["ManualScale"] : array("0"=>array("Min"=>-100,"Max"=>100));
+     $Mode = isset($Format["Mode"]) ? $Format["Mode"] : SCALE_MODE_FLOATING;
+     $Floating = isset($Format["Floating"]) ? $Format["Floating"] : FALSE;
+     $XLabelsRotation = isset($Format["XLabelsRotation"]) ? $Format["XLabelsRotation"] : 90;
+     $MinDivHeight = isset($Format["MinDivHeight"]) ? $Format["MinDivHeight"] : 20;
+     $Factors		= isset($Format["Factors"]) ? $Format["Factors"] : array(1, 2, 5);
+     $ManualScale = isset($Format["ManualScale"]) ? $Format["ManualScale"] : array("0"=>array("Min"=>-100, "Max"=>100));
      $XMargin		= isset($Format["XMargin"]) ? $Format["XMargin"] : 0;
      $YMargin		= isset($Format["YMargin"]) ? $Format["YMargin"] : 0;
-     $ScaleSpacing	= isset($Format["ScaleSpacing"]) ? $Format["ScaleSpacing"] : 15;
+     $ScaleSpacing = isset($Format["ScaleSpacing"]) ? $Format["ScaleSpacing"] : 15;
      $InnerTickWidth	= isset($Format["InnerTickWidth"]) ? $Format["InnerTickWidth"] : 2;
      $OuterTickWidth	= isset($Format["OuterTickWidth"]) ? $Format["OuterTickWidth"] : 2;
      $DrawXLines	= isset($Format["DrawXLines"]) ? $Format["DrawXLines"] : ALL;
@@ -49,75 +49,75 @@ 
      $GridR		= isset($Format["GridR"]) ? $Format["GridR"] : 255;
      $GridG		= isset($Format["GridG"]) ? $Format["GridG"] : 255;
      $GridB		= isset($Format["GridB"]) ? $Format["GridB"] : 255;
-     $GridAlpha		= isset($Format["GridAlpha"]) ? $Format["GridAlpha"] : 40;
+     $GridAlpha = isset($Format["GridAlpha"]) ? $Format["GridAlpha"] : 40;
      $AxisRo		= isset($Format["AxisR"]) ? $Format["AxisR"] : 0;
      $AxisGo		= isset($Format["AxisG"]) ? $Format["AxisG"] : 0;
      $AxisBo		= isset($Format["AxisB"]) ? $Format["AxisB"] : 0;
-     $AxisAlpha		= isset($Format["AxisAlpha"]) ? $Format["AxisAlpha"] : 100;
+     $AxisAlpha = isset($Format["AxisAlpha"]) ? $Format["AxisAlpha"] : 100;
      $TickRo		= isset($Format["TickR"]) ? $Format["TickR"] : 0;
      $TickGo		= isset($Format["TickG"]) ? $Format["TickG"] : 0;
      $TickBo		= isset($Format["TickB"]) ? $Format["TickB"] : 0;
-     $TickAlpha		= isset($Format["TickAlpha"]) ? $Format["TickAlpha"] : 100;
-     $DrawSubTicks	= isset($Format["DrawSubTicks"]) ? $Format["DrawSubTicks"] : FALSE;
+     $TickAlpha = isset($Format["TickAlpha"]) ? $Format["TickAlpha"] : 100;
+     $DrawSubTicks = isset($Format["DrawSubTicks"]) ? $Format["DrawSubTicks"] : FALSE;
      $InnerSubTickWidth	= isset($Format["InnerSubTickWidth"]) ? $Format["InnerSubTickWidth"] : 0;
      $OuterSubTickWidth	= isset($Format["OuterSubTickWidth"]) ? $Format["OuterSubTickWidth"] : 2;
      $SubTickR		= isset($Format["SubTickR"]) ? $Format["SubTickR"] : 255;
      $SubTickG		= isset($Format["SubTickG"]) ? $Format["SubTickG"] : 0;
      $SubTickB		= isset($Format["SubTickB"]) ? $Format["SubTickB"] : 0;
-     $SubTickAlpha	= isset($Format["SubTickAlpha"]) ? $Format["SubTickAlpha"] : 100;
+     $SubTickAlpha = isset($Format["SubTickAlpha"]) ? $Format["SubTickAlpha"] : 100;
      $XReleasePercent	= isset($Format["XReleasePercent"]) ? $Format["XReleasePercent"] : 1;
-     $DrawArrows	= isset($Format["DrawArrows"]) ? $Format["DrawArrows"] : FALSE;
-     $ArrowSize         = isset($Format["ArrowSize"]) ? $Format["ArrowSize"] : 8;
+     $DrawArrows = isset($Format["DrawArrows"]) ? $Format["DrawArrows"] : FALSE;
+     $ArrowSize = isset($Format["ArrowSize"]) ? $Format["ArrowSize"] : 8;
      $CycleBackground	= isset($Format["CycleBackground"]) ? $Format["CycleBackground"] : FALSE;
      $BackgroundR1	= isset($Format["BackgroundR1"]) ? $Format["BackgroundR1"] : 255;
      $BackgroundG1	= isset($Format["BackgroundG1"]) ? $Format["BackgroundG1"] : 255;
      $BackgroundB1	= isset($Format["BackgroundB1"]) ? $Format["BackgroundB1"] : 255;
-     $BackgroundAlpha1	= isset($Format["BackgroundAlpha1"]) ? $Format["BackgroundAlpha1"] : 10;
+     $BackgroundAlpha1 = isset($Format["BackgroundAlpha1"]) ? $Format["BackgroundAlpha1"] : 10;
      $BackgroundR2	= isset($Format["BackgroundR2"]) ? $Format["BackgroundR2"] : 230;
      $BackgroundG2	= isset($Format["BackgroundG2"]) ? $Format["BackgroundG2"] : 230;
      $BackgroundB2	= isset($Format["BackgroundB2"]) ? $Format["BackgroundB2"] : 230;
-     $BackgroundAlpha2	= isset($Format["BackgroundAlpha2"]) ? $Format["BackgroundAlpha2"] : 10;
+     $BackgroundAlpha2 = isset($Format["BackgroundAlpha2"]) ? $Format["BackgroundAlpha2"] : 10;
 
      /* Check if we have at least both one X and Y axis */
      $GotXAxis = FALSE; $GotYAxis = FALSE;
-     foreach($this->pDataObject->Data["Axis"] as $AxisID => $AxisSettings)
+     foreach ($this->pDataObject->Data["Axis"] as $AxisID => $AxisSettings)
       {
-       if ( $AxisSettings["Identity"] == AXIS_X ) { $GotXAxis = TRUE; }
-       if ( $AxisSettings["Identity"] == AXIS_Y ) { $GotYAxis = TRUE; }
+       if ($AxisSettings["Identity"] == AXIS_X) { $GotXAxis = TRUE; }
+       if ($AxisSettings["Identity"] == AXIS_Y) { $GotYAxis = TRUE; }
       }
-     if ( !$GotXAxis ) { return(SCATTER_MISSING_X_SERIE); }
-     if ( !$GotYAxis ) { return(SCATTER_MISSING_Y_SERIE); }
+     if (!$GotXAxis) { return(SCATTER_MISSING_X_SERIE); }
+     if (!$GotYAxis) { return(SCATTER_MISSING_Y_SERIE); }
 
      /* Skip a NOTICE event in case of an empty array */
-     if ( $DrawYLines == NONE ) { $DrawYLines = array("zarma"=>"31"); }
+     if ($DrawYLines == NONE) { $DrawYLines = array("zarma"=>"31"); }
 
      $Data = $this->pDataObject->getData();
 
-     foreach($Data["Axis"] as $AxisID => $AxisSettings)
+     foreach ($Data["Axis"] as $AxisID => $AxisSettings)
       {
-       if ( $AxisSettings["Identity"] == AXIS_X)
+       if ($AxisSettings["Identity"] == AXIS_X)
         { $Width = $this->pChartObject->GraphAreaX2 - $this->pChartObject->GraphAreaX1 - $XMargin*2; }
        else
         { $Width = $this->pChartObject->GraphAreaY2 - $this->pChartObject->GraphAreaY1 - $YMargin*2; }
 
        $AxisMin = ABSOLUTE_MAX; $AxisMax = OUT_OF_SIGHT;
-       if ( $Mode == SCALE_MODE_FLOATING )
+       if ($Mode == SCALE_MODE_FLOATING)
         {
-         foreach($Data["Series"] as $SerieID => $SerieParameter)
+         foreach ($Data["Series"] as $SerieID => $SerieParameter)
           {
-           if ( $SerieParameter["Axis"] == $AxisID && $Data["Series"][$SerieID]["isDrawable"] )
+           if ($SerieParameter["Axis"] == $AxisID && $Data["Series"][$SerieID]["isDrawable"])
             {
-             $AxisMax = max($AxisMax,$Data["Series"][$SerieID]["Max"]);
-             $AxisMin = min($AxisMin,$Data["Series"][$SerieID]["Min"]);
+             $AxisMax = max($AxisMax, $Data["Series"][$SerieID]["Max"]);
+             $AxisMin = min($AxisMin, $Data["Series"][$SerieID]["Min"]);
             }
           }
-         $AutoMargin = (($AxisMax-$AxisMin)/100)*$XReleasePercent;
+         $AutoMargin = (($AxisMax - $AxisMin)/100)*$XReleasePercent;
 
-         $Data["Axis"][$AxisID]["Min"] = $AxisMin-$AutoMargin; $Data["Axis"][$AxisID]["Max"] = $AxisMax+$AutoMargin;
+         $Data["Axis"][$AxisID]["Min"] = $AxisMin - $AutoMargin; $Data["Axis"][$AxisID]["Max"] = $AxisMax + $AutoMargin;
         }
-       elseif ( $Mode == SCALE_MODE_MANUAL )
+       elseif ($Mode == SCALE_MODE_MANUAL)
         {
-         if ( isset($ManualScale[$AxisID]["Min"]) && isset($ManualScale[$AxisID]["Max"]) )
+         if (isset($ManualScale[$AxisID]["Min"]) && isset($ManualScale[$AxisID]["Max"]))
           {
            $Data["Axis"][$AxisID]["Min"] = $ManualScale[$AxisID]["Min"];
            $Data["Axis"][$AxisID]["Max"] = $ManualScale[$AxisID]["Max"];
@@ -127,12 +127,12 @@ 
         }
 
        /* Full manual scale */
-       if ( isset($ManualScale[$AxisID]["Rows"]) && isset($ManualScale[$AxisID]["RowHeight"]) )
-        $Scale = array("Rows"=>$ManualScale[$AxisID]["Rows"],"RowHeight"=>$ManualScale[$AxisID]["RowHeight"],"XMin"=>$ManualScale[$AxisID]["Min"],"XMax"=>$ManualScale[$AxisID]["Max"]);
+       if (isset($ManualScale[$AxisID]["Rows"]) && isset($ManualScale[$AxisID]["RowHeight"]))
+        $Scale = array("Rows"=>$ManualScale[$AxisID]["Rows"], "RowHeight"=>$ManualScale[$AxisID]["RowHeight"], "XMin"=>$ManualScale[$AxisID]["Min"], "XMax"=>$ManualScale[$AxisID]["Max"]);
        else
         {
          $MaxDivs = floor($Width/$MinDivHeight);
-         $Scale   = $this->pChartObject->computeScale($Data["Axis"][$AxisID]["Min"],$Data["Axis"][$AxisID]["Max"],$MaxDivs,$Factors,$AxisID);
+         $Scale   = $this->pChartObject->computeScale($Data["Axis"][$AxisID]["Min"], $Data["Axis"][$AxisID]["Max"], $MaxDivs, $Factors, $AxisID);
         }
 
        $Data["Axis"][$AxisID]["Margin"]    = $AxisSettings["Identity"] == AXIS_X ? $XMargin : $YMargin;
@@ -141,11 +141,11 @@ 
        $Data["Axis"][$AxisID]["Rows"]      = $Scale["Rows"];
        $Data["Axis"][$AxisID]["RowHeight"] = $Scale["RowHeight"];
 
-       if ( isset($Scale["Format"]) ) { $Data["Axis"][$AxisID]["Format"] = $Scale["Format"]; }
+       if (isset($Scale["Format"])) { $Data["Axis"][$AxisID]["Format"] = $Scale["Format"]; }
 
-       if ( !isset($Data["Axis"][$AxisID]["Display"]) ) { $Data["Axis"][$AxisID]["Display"] = NULL; }
-       if ( !isset($Data["Axis"][$AxisID]["Format"]) )  { $Data["Axis"][$AxisID]["Format"] = NULL; }
-       if ( !isset($Data["Axis"][$AxisID]["Unit"]) )    { $Data["Axis"][$AxisID]["Unit"] = NULL; }
+       if (!isset($Data["Axis"][$AxisID]["Display"])) { $Data["Axis"][$AxisID]["Display"] = NULL; }
+       if (!isset($Data["Axis"][$AxisID]["Format"])) { $Data["Axis"][$AxisID]["Format"] = NULL; }
+       if (!isset($Data["Axis"][$AxisID]["Unit"])) { $Data["Axis"][$AxisID]["Unit"] = NULL; }
       }
 
      /* Get the default font color */
@@ -154,67 +154,67 @@ 
      /* Set the original boundaries */
      $AxisPos["L"] = $this->pChartObject->GraphAreaX1; $AxisPos["R"] = $this->pChartObject->GraphAreaX2; $AxisPos["T"] = $this->pChartObject->GraphAreaY1; $AxisPos["B"] = $this->pChartObject->GraphAreaY2;
 
-     foreach($Data["Axis"] as $AxisID => $AxisSettings)
+     foreach ($Data["Axis"] as $AxisID => $AxisSettings)
       {
-       if ( isset($AxisSettings["Color"]) )
+       if (isset($AxisSettings["Color"]))
         {
          $AxisR = $AxisSettings["Color"]["R"]; $AxisG = $AxisSettings["Color"]["G"]; $AxisB = $AxisSettings["Color"]["B"];
          $TickR = $AxisSettings["Color"]["R"]; $TickG = $AxisSettings["Color"]["G"]; $TickB = $AxisSettings["Color"]["B"];
-         $this->pChartObject->setFontProperties(array("R"=>$AxisSettings["Color"]["R"],"G"=>$AxisSettings["Color"]["G"],"B"=>$AxisSettings["Color"]["B"]));
+         $this->pChartObject->setFontProperties(array("R"=>$AxisSettings["Color"]["R"], "G"=>$AxisSettings["Color"]["G"], "B"=>$AxisSettings["Color"]["B"]));
         }
        else
         {
          $AxisR = $AxisRo; $AxisG = $AxisGo; $AxisB = $AxisBo;
          $TickR = $TickRo; $TickG = $TickGo; $TickB = $TickBo;
-         $this->pChartObject->setFontProperties(array("R"=>$FontColorRo,"G"=>$FontColorGo,"B"=>$FontColorBo));
+         $this->pChartObject->setFontProperties(array("R"=>$FontColorRo, "G"=>$FontColorGo, "B"=>$FontColorBo));
         }
 
        $LastValue = "w00t"; $ID = 1;
-       if ( $AxisSettings["Identity"] == AXIS_X )
+       if ($AxisSettings["Identity"] == AXIS_X)
         {
-         if ( $AxisSettings["Position"] == AXIS_POSITION_BOTTOM )
+         if ($AxisSettings["Position"] == AXIS_POSITION_BOTTOM)
           {
-           if ( $XLabelsRotation == 0 )				   { $LabelAlign = TEXT_ALIGN_TOPMIDDLE; $LabelOffset = 2; }
-           if ( $XLabelsRotation > 0 && $XLabelsRotation < 190 )   { $LabelAlign = TEXT_ALIGN_MIDDLERIGHT; $LabelOffset = 5; }
-           if ( $XLabelsRotation == 180 )			   { $LabelAlign = TEXT_ALIGN_BOTTOMMIDDLE; $LabelOffset = 5; }
-           if ( $XLabelsRotation > 180 && $XLabelsRotation < 360 ) { $LabelAlign = TEXT_ALIGN_MIDDLELEFT; $LabelOffset = 2; }
+           if ($XLabelsRotation == 0) { $LabelAlign = TEXT_ALIGN_TOPMIDDLE; $LabelOffset = 2; }
+           if ($XLabelsRotation > 0 && $XLabelsRotation < 190) { $LabelAlign = TEXT_ALIGN_MIDDLERIGHT; $LabelOffset = 5; }
+           if ($XLabelsRotation == 180) { $LabelAlign = TEXT_ALIGN_BOTTOMMIDDLE; $LabelOffset = 5; }
+           if ($XLabelsRotation > 180 && $XLabelsRotation < 360) { $LabelAlign = TEXT_ALIGN_MIDDLELEFT; $LabelOffset = 2; }
 
-           if ( $Floating )
-            { $FloatingOffset = $YMargin; $this->pChartObject->drawLine($this->pChartObject->GraphAreaX1+$AxisSettings["Margin"],$AxisPos["B"],$this->pChartObject->GraphAreaX2-$AxisSettings["Margin"],$AxisPos["B"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
+           if ($Floating)
+            { $FloatingOffset = $YMargin; $this->pChartObject->drawLine($this->pChartObject->GraphAreaX1 + $AxisSettings["Margin"], $AxisPos["B"], $this->pChartObject->GraphAreaX2 - $AxisSettings["Margin"], $AxisPos["B"], array("R"=>$AxisR, "G"=>$AxisG, "B"=>$AxisB, "Alpha"=>$AxisAlpha)); }
            else
-            { $FloatingOffset = 0; $this->pChartObject->drawLine($this->pChartObject->GraphAreaX1,$AxisPos["B"],$this->pChartObject->GraphAreaX2,$AxisPos["B"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
+            { $FloatingOffset = 0; $this->pChartObject->drawLine($this->pChartObject->GraphAreaX1, $AxisPos["B"], $this->pChartObject->GraphAreaX2, $AxisPos["B"], array("R"=>$AxisR, "G"=>$AxisG, "B"=>$AxisB, "Alpha"=>$AxisAlpha)); }
 
-           if ( $DrawArrows ) { $this->pChartObject->drawArrow($this->pChartObject->GraphAreaX2-$AxisSettings["Margin"],$AxisPos["B"],$this->pChartObject->GraphAreaX2+($ArrowSize*2),$AxisPos["B"],array("FillR"=>$AxisR,"FillG"=>$AxisG,"FillB"=>$AxisB,"Size"=>$ArrowSize)); }
+           if ($DrawArrows) { $this->pChartObject->drawArrow($this->pChartObject->GraphAreaX2 - $AxisSettings["Margin"], $AxisPos["B"], $this->pChartObject->GraphAreaX2 + ($ArrowSize*2), $AxisPos["B"], array("FillR"=>$AxisR, "FillG"=>$AxisG, "FillB"=>$AxisB, "Size"=>$ArrowSize)); }
 
            $Width = ($this->pChartObject->GraphAreaX2 - $this->pChartObject->GraphAreaX1) - $AxisSettings["Margin"]*2;
-           $Step   = $Width / $AxisSettings["Rows"]; $SubTicksSize = $Step /2; $MaxBottom = $AxisPos["B"];
+           $Step   = $Width/$AxisSettings["Rows"]; $SubTicksSize = $Step/2; $MaxBottom = $AxisPos["B"];
            $LastX  = NULL;
-           for($i=0;$i<=$AxisSettings["Rows"];$i++)
+           for ($i = 0; $i <= $AxisSettings["Rows"]; $i++)
             {
              $XPos  = $this->pChartObject->GraphAreaX1 + $AxisSettings["Margin"] + $Step*$i;
              $YPos  = $AxisPos["B"];
-             $Value = $this->pChartObject->scaleFormat($AxisSettings["ScaleMin"] + $AxisSettings["RowHeight"]*$i,$AxisSettings["Display"],$AxisSettings["Format"],$AxisSettings["Unit"]);
+             $Value = $this->pChartObject->scaleFormat($AxisSettings["ScaleMin"] + $AxisSettings["RowHeight"]*$i, $AxisSettings["Display"], $AxisSettings["Format"], $AxisSettings["Unit"]);
 
-             if ( $i%2 == 1 ) { $BGColor = array("R"=>$BackgroundR1,"G"=>$BackgroundG1,"B"=>$BackgroundB1,"Alpha"=>$BackgroundAlpha1); } else { $BGColor = array("R"=>$BackgroundR2,"G"=>$BackgroundG2,"B"=>$BackgroundB2,"Alpha"=>$BackgroundAlpha2); }
-             if ( $LastX != NULL && $CycleBackground  && ( $DrawXLines == ALL || in_array($AxisID,$DrawXLines) )) { $this->pChartObject->drawFilledRectangle($LastX,$this->pChartObject->GraphAreaY1+$FloatingOffset,$XPos,$this->pChartObject->GraphAreaY2-$FloatingOffset,$BGColor); }
+             if ($i%2 == 1) { $BGColor = array("R"=>$BackgroundR1, "G"=>$BackgroundG1, "B"=>$BackgroundB1, "Alpha"=>$BackgroundAlpha1); } else { $BGColor = array("R"=>$BackgroundR2, "G"=>$BackgroundG2, "B"=>$BackgroundB2, "Alpha"=>$BackgroundAlpha2); }
+             if ($LastX != NULL && $CycleBackground && ($DrawXLines == ALL || in_array($AxisID, $DrawXLines))) { $this->pChartObject->drawFilledRectangle($LastX, $this->pChartObject->GraphAreaY1 + $FloatingOffset, $XPos, $this->pChartObject->GraphAreaY2 - $FloatingOffset, $BGColor); }
 
-             if ( $DrawXLines == ALL || in_array($AxisID,$DrawXLines) ) { $this->pChartObject->drawLine($XPos,$this->pChartObject->GraphAreaY1+$FloatingOffset,$XPos,$this->pChartObject->GraphAreaY2-$FloatingOffset,array("R"=>$GridR,"G"=>$GridG,"B"=>$GridB,"Alpha"=>$GridAlpha,"Ticks"=>$GridTicks)); }
-             if ( $DrawSubTicks && $i != $AxisSettings["Rows"] )
-              $this->pChartObject->drawLine($XPos+$SubTicksSize,$YPos-$InnerSubTickWidth,$XPos+$SubTicksSize,$YPos+$OuterSubTickWidth,array("R"=>$SubTickR,"G"=>$SubTickG,"B"=>$SubTickB,"Alpha"=>$SubTickAlpha));
+             if ($DrawXLines == ALL || in_array($AxisID, $DrawXLines)) { $this->pChartObject->drawLine($XPos, $this->pChartObject->GraphAreaY1 + $FloatingOffset, $XPos, $this->pChartObject->GraphAreaY2 - $FloatingOffset, array("R"=>$GridR, "G"=>$GridG, "B"=>$GridB, "Alpha"=>$GridAlpha, "Ticks"=>$GridTicks)); }
+             if ($DrawSubTicks && $i != $AxisSettings["Rows"])
+              $this->pChartObject->drawLine($XPos + $SubTicksSize, $YPos - $InnerSubTickWidth, $XPos + $SubTicksSize, $YPos + $OuterSubTickWidth, array("R"=>$SubTickR, "G"=>$SubTickG, "B"=>$SubTickB, "Alpha"=>$SubTickAlpha));
 
-             $this->pChartObject->drawLine($XPos,$YPos-$InnerTickWidth,$XPos,$YPos+$OuterTickWidth,array("R"=>$TickR,"G"=>$TickG,"B"=>$TickB,"Alpha"=>$TickAlpha));
-             $Bounds    = $this->pChartObject->drawText($XPos,$YPos+$OuterTickWidth+$LabelOffset,$Value,array("Angle"=>$XLabelsRotation,"Align"=>$LabelAlign));
-             $TxtBottom = $YPos+2+$OuterTickWidth+2+($Bounds[0]["Y"]-$Bounds[2]["Y"]);
-             $MaxBottom = max($MaxBottom,$TxtBottom);
+             $this->pChartObject->drawLine($XPos, $YPos - $InnerTickWidth, $XPos, $YPos + $OuterTickWidth, array("R"=>$TickR, "G"=>$TickG, "B"=>$TickB, "Alpha"=>$TickAlpha));
+             $Bounds    = $this->pChartObject->drawText($XPos, $YPos + $OuterTickWidth + $LabelOffset, $Value, array("Angle"=>$XLabelsRotation, "Align"=>$LabelAlign));
+             $TxtBottom = $YPos + 2 + $OuterTickWidth + 2 + ($Bounds[0]["Y"] - $Bounds[2]["Y"]);
+             $MaxBottom = max($MaxBottom, $TxtBottom);
 
              $LastX = $XPos;
             }
 
-           if ( isset($AxisSettings["Name"]) )
+           if (isset($AxisSettings["Name"]))
             {
-             $YPos   = $MaxBottom+2;
-             $XPos   = $this->pChartObject->GraphAreaX1+($this->pChartObject->GraphAreaX2-$this->pChartObject->GraphAreaX1)/2;
-             $Bounds = $this->pChartObject->drawText($XPos,$YPos,$AxisSettings["Name"],array("Align"=>TEXT_ALIGN_TOPMIDDLE));
+             $YPos   = $MaxBottom + 2;
+             $XPos   = $this->pChartObject->GraphAreaX1 + ($this->pChartObject->GraphAreaX2 - $this->pChartObject->GraphAreaX1)/2;
+             $Bounds = $this->pChartObject->drawText($XPos, $YPos, $AxisSettings["Name"], array("Align"=>TEXT_ALIGN_TOPMIDDLE));
              $MaxBottom = $Bounds[0]["Y"];
 
              $this->pDataObject->Data["GraphArea"]["Y2"] = $MaxBottom + $this->pChartObject->FontSize;
@@ -222,50 +222,50 @@ 
 
            $AxisPos["B"] = $MaxBottom + $ScaleSpacing;
           }
-         elseif ( $AxisSettings["Position"] == AXIS_POSITION_TOP )
+         elseif ($AxisSettings["Position"] == AXIS_POSITION_TOP)
           {
-           if ( $XLabelsRotation == 0 )					{ $LabelAlign = TEXT_ALIGN_BOTTOMMIDDLE; $LabelOffset = 2; }
-           if ( $XLabelsRotation > 0 && $XLabelsRotation < 190 )	{ $LabelAlign = TEXT_ALIGN_MIDDLELEFT; $LabelOffset = 2; }
-           if ( $XLabelsRotation == 180 )				{ $LabelAlign = TEXT_ALIGN_TOPMIDDLE; $LabelOffset = 5; }
-           if ( $XLabelsRotation > 180 && $SLabelxRotation < 360 )	{ $LabelAlign = TEXT_ALIGN_MIDDLERIGHT; $LabelOffset = 5; }
+           if ($XLabelsRotation == 0) { $LabelAlign = TEXT_ALIGN_BOTTOMMIDDLE; $LabelOffset = 2; }
+           if ($XLabelsRotation > 0 && $XLabelsRotation < 190) { $LabelAlign = TEXT_ALIGN_MIDDLELEFT; $LabelOffset = 2; }
+           if ($XLabelsRotation == 180) { $LabelAlign = TEXT_ALIGN_TOPMIDDLE; $LabelOffset = 5; }
+           if ($XLabelsRotation > 180 && $SLabelxRotation < 360) { $LabelAlign = TEXT_ALIGN_MIDDLERIGHT; $LabelOffset = 5; }
 
-           if ( $Floating )
-            { $FloatingOffset = $YMargin; $this->pChartObject->drawLine($this->pChartObject->GraphAreaX1+$AxisSettings["Margin"],$AxisPos["T"],$this->pChartObject->GraphAreaX2-$AxisSettings["Margin"],$AxisPos["T"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
+           if ($Floating)
+            { $FloatingOffset = $YMargin; $this->pChartObject->drawLine($this->pChartObject->GraphAreaX1 + $AxisSettings["Margin"], $AxisPos["T"], $this->pChartObject->GraphAreaX2 - $AxisSettings["Margin"], $AxisPos["T"], array("R"=>$AxisR, "G"=>$AxisG, "B"=>$AxisB, "Alpha"=>$AxisAlpha)); }
            else
-            { $FloatingOffset = 0; $this->pChartObject->drawLine($this->pChartObject->GraphAreaX1,$AxisPos["T"],$this->pChartObject->GraphAreaX2,$AxisPos["T"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
+            { $FloatingOffset = 0; $this->pChartObject->drawLine($this->pChartObject->GraphAreaX1, $AxisPos["T"], $this->pChartObject->GraphAreaX2, $AxisPos["T"], array("R"=>$AxisR, "G"=>$AxisG, "B"=>$AxisB, "Alpha"=>$AxisAlpha)); }
 
-           if ( $DrawArrows ) { $this->pChartObject->drawArrow($this->pChartObject->GraphAreaX2-$AxisSettings["Margin"],$AxisPos["T"],$this->pChartObject->GraphAreaX2+($ArrowSize*2),$AxisPos["T"],array("FillR"=>$AxisR,"FillG"=>$AxisG,"FillB"=>$AxisB,"Size"=>$ArrowSize)); }
+           if ($DrawArrows) { $this->pChartObject->drawArrow($this->pChartObject->GraphAreaX2 - $AxisSettings["Margin"], $AxisPos["T"], $this->pChartObject->GraphAreaX2 + ($ArrowSize*2), $AxisPos["T"], array("FillR"=>$AxisR, "FillG"=>$AxisG, "FillB"=>$AxisB, "Size"=>$ArrowSize)); }
 
            $Width = ($this->pChartObject->GraphAreaX2 - $this->pChartObject->GraphAreaX1) - $AxisSettings["Margin"]*2;
-           $Step   = $Width / $AxisSettings["Rows"]; $SubTicksSize = $Step /2; $MinTop = $AxisPos["T"];
+           $Step   = $Width/$AxisSettings["Rows"]; $SubTicksSize = $Step/2; $MinTop = $AxisPos["T"];
            $LastX  = NULL;
-           for($i=0;$i<=$AxisSettings["Rows"];$i++)
+           for ($i = 0; $i <= $AxisSettings["Rows"]; $i++)
             {
              $XPos  = $this->pChartObject->GraphAreaX1 + $AxisSettings["Margin"] + $Step*$i;
              $YPos  = $AxisPos["T"];
-             $Value = $this->pChartObject->scaleFormat($AxisSettings["ScaleMin"] + $AxisSettings["RowHeight"]*$i,$AxisSettings["Display"],$AxisSettings["Format"],$AxisSettings["Unit"]);
+             $Value = $this->pChartObject->scaleFormat($AxisSettings["ScaleMin"] + $AxisSettings["RowHeight"]*$i, $AxisSettings["Display"], $AxisSettings["Format"], $AxisSettings["Unit"]);
 
-             if ( $i%2 == 1 ) { $BGColor = array("R"=>$BackgroundR1,"G"=>$BackgroundG1,"B"=>$BackgroundB1,"Alpha"=>$BackgroundAlpha1); } else { $BGColor = array("R"=>$BackgroundR2,"G"=>$BackgroundG2,"B"=>$BackgroundB2,"Alpha"=>$BackgroundAlpha2); }
-             if ( $LastX != NULL && $CycleBackground  && ( $DrawXLines == ALL || in_array($AxisID,$DrawXLines) )) { $this->pChartObject->drawFilledRectangle($LastX,$this->pChartObject->GraphAreaY1+$FloatingOffset,$XPos,$this->pChartObject->GraphAreaY2-$FloatingOffset,$BGColor); }
+             if ($i%2 == 1) { $BGColor = array("R"=>$BackgroundR1, "G"=>$BackgroundG1, "B"=>$BackgroundB1, "Alpha"=>$BackgroundAlpha1); } else { $BGColor = array("R"=>$BackgroundR2, "G"=>$BackgroundG2, "B"=>$BackgroundB2, "Alpha"=>$BackgroundAlpha2); }
+             if ($LastX != NULL && $CycleBackground && ($DrawXLines == ALL || in_array($AxisID, $DrawXLines))) { $this->pChartObject->drawFilledRectangle($LastX, $this->pChartObject->GraphAreaY1 + $FloatingOffset, $XPos, $this->pChartObject->GraphAreaY2 - $FloatingOffset, $BGColor); }
 
-             if ( $DrawXLines == ALL || in_array($AxisID,$DrawXLines) ) { $this->pChartObject->drawLine($XPos,$this->pChartObject->GraphAreaY1+$FloatingOffset,$XPos,$this->pChartObject->GraphAreaY2-$FloatingOffset,array("R"=>$GridR,"G"=>$GridG,"B"=>$GridB,"Alpha"=>$GridAlpha,"Ticks"=>$GridTicks)); }
+             if ($DrawXLines == ALL || in_array($AxisID, $DrawXLines)) { $this->pChartObject->drawLine($XPos, $this->pChartObject->GraphAreaY1 + $FloatingOffset, $XPos, $this->pChartObject->GraphAreaY2 - $FloatingOffset, array("R"=>$GridR, "G"=>$GridG, "B"=>$GridB, "Alpha"=>$GridAlpha, "Ticks"=>$GridTicks)); }
 
-             if ( $DrawSubTicks && $i != $AxisSettings["Rows"] )
-              $this->pChartObject->drawLine($XPos+$SubTicksSize,$YPos-$OuterSubTickWidth,$XPos+$SubTicksSize,$YPos+$InnerSubTickWidth,array("R"=>$SubTickR,"G"=>$SubTickG,"B"=>$SubTickB,"Alpha"=>$SubTickAlpha));
+             if ($DrawSubTicks && $i != $AxisSettings["Rows"])
+              $this->pChartObject->drawLine($XPos + $SubTicksSize, $YPos - $OuterSubTickWidth, $XPos + $SubTicksSize, $YPos + $InnerSubTickWidth, array("R"=>$SubTickR, "G"=>$SubTickG, "B"=>$SubTickB, "Alpha"=>$SubTickAlpha));
 
-             $this->pChartObject->drawLine($XPos,$YPos-$OuterTickWidth,$XPos,$YPos+$InnerTickWidth,array("R"=>$TickR,"G"=>$TickG,"B"=>$TickB,"Alpha"=>$TickAlpha));
-             $Bounds = $this->pChartObject->drawText($XPos,$YPos-$OuterTickWidth-$LabelOffset,$Value,array("Angle"=>$XLabelsRotation,"Align"=>$LabelAlign));
-             $TxtBox = $YPos-$OuterTickWidth-4-($Bounds[0]["Y"]-$Bounds[2]["Y"]);
-             $MinTop = min($MinTop,$TxtBox);
+             $this->pChartObject->drawLine($XPos, $YPos - $OuterTickWidth, $XPos, $YPos + $InnerTickWidth, array("R"=>$TickR, "G"=>$TickG, "B"=>$TickB, "Alpha"=>$TickAlpha));
+             $Bounds = $this->pChartObject->drawText($XPos, $YPos - $OuterTickWidth - $LabelOffset, $Value, array("Angle"=>$XLabelsRotation, "Align"=>$LabelAlign));
+             $TxtBox = $YPos - $OuterTickWidth - 4 - ($Bounds[0]["Y"] - $Bounds[2]["Y"]);
+             $MinTop = min($MinTop, $TxtBox);
 
              $LastX = $XPos;
             }
 
-           if ( isset($AxisSettings["Name"]) )
+           if (isset($AxisSettings["Name"]))
             {
-             $YPos   = $MinTop-2;
-             $XPos   = $this->pChartObject->GraphAreaX1+($this->pChartObject->GraphAreaX2-$this->pChartObject->GraphAreaX1)/2;
-             $Bounds = $this->pChartObject->drawText($XPos,$YPos,$AxisSettings["Name"],array("Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
+             $YPos   = $MinTop - 2;
+             $XPos   = $this->pChartObject->GraphAreaX1 + ($this->pChartObject->GraphAreaX2 - $this->pChartObject->GraphAreaX1)/2;
+             $Bounds = $this->pChartObject->drawText($XPos, $YPos, $AxisSettings["Name"], array("Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
              $MinTop = $Bounds[2]["Y"];
 
              $this->pDataObject->Data["GraphArea"]["Y1"] = $MinTop;
@@ -274,48 +274,48 @@ 
            $AxisPos["T"] = $MinTop - $ScaleSpacing;
           }
         }
-       elseif ( $AxisSettings["Identity"] == AXIS_Y )
+       elseif ($AxisSettings["Identity"] == AXIS_Y)
         {
-         if ( $AxisSettings["Position"] == AXIS_POSITION_LEFT )
+         if ($AxisSettings["Position"] == AXIS_POSITION_LEFT)
           {
 
-           if ( $Floating )
-            { $FloatingOffset = $XMargin; $this->pChartObject->drawLine($AxisPos["L"],$this->pChartObject->GraphAreaY1+$AxisSettings["Margin"],$AxisPos["L"],$this->pChartObject->GraphAreaY2-$AxisSettings["Margin"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
+           if ($Floating)
+            { $FloatingOffset = $XMargin; $this->pChartObject->drawLine($AxisPos["L"], $this->pChartObject->GraphAreaY1 + $AxisSettings["Margin"], $AxisPos["L"], $this->pChartObject->GraphAreaY2 - $AxisSettings["Margin"], array("R"=>$AxisR, "G"=>$AxisG, "B"=>$AxisB, "Alpha"=>$AxisAlpha)); }
            else
-            { $FloatingOffset = 0; $this->pChartObject->drawLine($AxisPos["L"],$this->pChartObject->GraphAreaY1,$AxisPos["L"],$this->pChartObject->GraphAreaY2,array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
+            { $FloatingOffset = 0; $this->pChartObject->drawLine($AxisPos["L"], $this->pChartObject->GraphAreaY1, $AxisPos["L"], $this->pChartObject->GraphAreaY2, array("R"=>$AxisR, "G"=>$AxisG, "B"=>$AxisB, "Alpha"=>$AxisAlpha)); }
 
-           if ( $DrawArrows ) { $this->pChartObject->drawArrow($AxisPos["L"],$this->pChartObject->GraphAreaY1+$AxisSettings["Margin"],$AxisPos["L"],$this->pChartObject->GraphAreaY1-($ArrowSize*2),array("FillR"=>$AxisR,"FillG"=>$AxisG,"FillB"=>$AxisB,"Size"=>$ArrowSize)); }
+           if ($DrawArrows) { $this->pChartObject->drawArrow($AxisPos["L"], $this->pChartObject->GraphAreaY1 + $AxisSettings["Margin"], $AxisPos["L"], $this->pChartObject->GraphAreaY1 - ($ArrowSize*2), array("FillR"=>$AxisR, "FillG"=>$AxisG, "FillB"=>$AxisB, "Size"=>$ArrowSize)); }
 
            $Height = ($this->pChartObject->GraphAreaY2 - $this->pChartObject->GraphAreaY1) - $AxisSettings["Margin"]*2;
-           $Step   = $Height / $AxisSettings["Rows"]; $SubTicksSize = $Step /2; $MinLeft = $AxisPos["L"];
+           $Step   = $Height/$AxisSettings["Rows"]; $SubTicksSize = $Step/2; $MinLeft = $AxisPos["L"];
            $LastY  = NULL;
-           for($i=0;$i<=$AxisSettings["Rows"];$i++)
+           for ($i = 0; $i <= $AxisSettings["Rows"]; $i++)
             {
              $YPos  = $this->pChartObject->GraphAreaY2 - $AxisSettings["Margin"] - $Step*$i;
              $XPos  = $AxisPos["L"];
-             $Value = $this->pChartObject->scaleFormat($AxisSettings["ScaleMin"] + $AxisSettings["RowHeight"]*$i,$AxisSettings["Display"],$AxisSettings["Format"],$AxisSettings["Unit"]);
+             $Value = $this->pChartObject->scaleFormat($AxisSettings["ScaleMin"] + $AxisSettings["RowHeight"]*$i, $AxisSettings["Display"], $AxisSettings["Format"], $AxisSettings["Unit"]);
 
-             if ( $i%2 == 1 ) { $BGColor = array("R"=>$BackgroundR1,"G"=>$BackgroundG1,"B"=>$BackgroundB1,"Alpha"=>$BackgroundAlpha1); } else { $BGColor = array("R"=>$BackgroundR2,"G"=>$BackgroundG2,"B"=>$BackgroundB2,"Alpha"=>$BackgroundAlpha2); }
-             if ( $LastY != NULL && $CycleBackground && ( $DrawYLines == ALL || in_array($AxisID,$DrawYLines) )) { $this->pChartObject->drawFilledRectangle($this->pChartObject->GraphAreaX1+$FloatingOffset,$LastY,$this->pChartObject->GraphAreaX2-$FloatingOffset,$YPos,$BGColor); }
+             if ($i%2 == 1) { $BGColor = array("R"=>$BackgroundR1, "G"=>$BackgroundG1, "B"=>$BackgroundB1, "Alpha"=>$BackgroundAlpha1); } else { $BGColor = array("R"=>$BackgroundR2, "G"=>$BackgroundG2, "B"=>$BackgroundB2, "Alpha"=>$BackgroundAlpha2); }
+             if ($LastY != NULL && $CycleBackground && ($DrawYLines == ALL || in_array($AxisID, $DrawYLines))) { $this->pChartObject->drawFilledRectangle($this->pChartObject->GraphAreaX1 + $FloatingOffset, $LastY, $this->pChartObject->GraphAreaX2 - $FloatingOffset, $YPos, $BGColor); }
 
-             if ( ($YPos != $this->pChartObject->GraphAreaY1 && $YPos != $this->pChartObject->GraphAreaY2) && ($DrawYLines == ALL || in_array($AxisID,$DrawYLines) )) { $this->pChartObject->drawLine($this->pChartObject->GraphAreaX1+$FloatingOffset,$YPos,$this->pChartObject->GraphAreaX2-$FloatingOffset,$YPos,array("R"=>$GridR,"G"=>$GridG,"B"=>$GridB,"Alpha"=>$GridAlpha,"Ticks"=>$GridTicks)); }
+             if (($YPos != $this->pChartObject->GraphAreaY1 && $YPos != $this->pChartObject->GraphAreaY2) && ($DrawYLines == ALL || in_array($AxisID, $DrawYLines))) { $this->pChartObject->drawLine($this->pChartObject->GraphAreaX1 + $FloatingOffset, $YPos, $this->pChartObject->GraphAreaX2 - $FloatingOffset, $YPos, array("R"=>$GridR, "G"=>$GridG, "B"=>$GridB, "Alpha"=>$GridAlpha, "Ticks"=>$GridTicks)); }
 
-             if ( $DrawSubTicks && $i != $AxisSettings["Rows"] )
-              $this->pChartObject->drawLine($XPos-$OuterSubTickWidth,$YPos-$SubTicksSize,$XPos+$InnerSubTickWidth,$YPos-$SubTicksSize,array("R"=>$SubTickR,"G"=>$SubTickG,"B"=>$SubTickB,"Alpha"=>$SubTickAlpha));
+             if ($DrawSubTicks && $i != $AxisSettings["Rows"])
+              $this->pChartObject->drawLine($XPos - $OuterSubTickWidth, $YPos - $SubTicksSize, $XPos + $InnerSubTickWidth, $YPos - $SubTicksSize, array("R"=>$SubTickR, "G"=>$SubTickG, "B"=>$SubTickB, "Alpha"=>$SubTickAlpha));
 
-             $this->pChartObject->drawLine($XPos-$OuterTickWidth,$YPos,$XPos+$InnerTickWidth,$YPos,array("R"=>$TickR,"G"=>$TickG,"B"=>$TickB,"Alpha"=>$TickAlpha));
-             $Bounds  = $this->pChartObject->drawText($XPos-$OuterTickWidth-2,$YPos,$Value,array("Align"=>TEXT_ALIGN_MIDDLERIGHT));
-             $TxtLeft = $XPos-$OuterTickWidth-2-($Bounds[1]["X"]-$Bounds[0]["X"]);
-             $MinLeft = min($MinLeft,$TxtLeft);
+             $this->pChartObject->drawLine($XPos - $OuterTickWidth, $YPos, $XPos + $InnerTickWidth, $YPos, array("R"=>$TickR, "G"=>$TickG, "B"=>$TickB, "Alpha"=>$TickAlpha));
+             $Bounds  = $this->pChartObject->drawText($XPos - $OuterTickWidth - 2, $YPos, $Value, array("Align"=>TEXT_ALIGN_MIDDLERIGHT));
+             $TxtLeft = $XPos - $OuterTickWidth - 2 - ($Bounds[1]["X"] - $Bounds[0]["X"]);
+             $MinLeft = min($MinLeft, $TxtLeft);
 
              $LastY = $YPos;
             }
 
-           if ( isset($AxisSettings["Name"]) )
+           if (isset($AxisSettings["Name"]))
             {
-             $XPos    = $MinLeft-2;
-             $YPos    = $this->pChartObject->GraphAreaY1+($this->pChartObject->GraphAreaY2-$this->pChartObject->GraphAreaY1)/2;
-             $Bounds  = $this->pChartObject->drawText($XPos,$YPos,$AxisSettings["Name"],array("Align"=>TEXT_ALIGN_BOTTOMMIDDLE,"Angle"=>90));
+             $XPos    = $MinLeft - 2;
+             $YPos    = $this->pChartObject->GraphAreaY1 + ($this->pChartObject->GraphAreaY2 - $this->pChartObject->GraphAreaY1)/2;
+             $Bounds  = $this->pChartObject->drawText($XPos, $YPos, $AxisSettings["Name"], array("Align"=>TEXT_ALIGN_BOTTOMMIDDLE, "Angle"=>90));
              $MinLeft = $Bounds[2]["X"];
 
              $this->pDataObject->Data["GraphArea"]["X1"] = $MinLeft;
@@ -323,46 +323,46 @@ 
 
            $AxisPos["L"] = $MinLeft - $ScaleSpacing;
           }
-         elseif ( $AxisSettings["Position"] == AXIS_POSITION_RIGHT )
+         elseif ($AxisSettings["Position"] == AXIS_POSITION_RIGHT)
           {
 
-           if ( $Floating )
-            { $FloatingOffset = $XMargin; $this->pChartObject->drawLine($AxisPos["R"],$this->pChartObject->GraphAreaY1+$AxisSettings["Margin"],$AxisPos["R"],$this->pChartObject->GraphAreaY2-$AxisSettings["Margin"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
+           if ($Floating)
+            { $FloatingOffset = $XMargin; $this->pChartObject->drawLine($AxisPos["R"], $this->pChartObject->GraphAreaY1 + $AxisSettings["Margin"], $AxisPos["R"], $this->pChartObject->GraphAreaY2 - $AxisSettings["Margin"], array("R"=>$AxisR, "G"=>$AxisG, "B"=>$AxisB, "Alpha"=>$AxisAlpha)); }
            else
-            { $FloatingOffset = 0; $this->pChartObject->drawLine($AxisPos["R"],$this->pChartObject->GraphAreaY1,$AxisPos["R"],$this->pChartObject->GraphAreaY2,array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
+            { $FloatingOffset = 0; $this->pChartObject->drawLine($AxisPos["R"], $this->pChartObject->GraphAreaY1, $AxisPos["R"], $this->pChartObject->GraphAreaY2, array("R"=>$AxisR, "G"=>$AxisG, "B"=>$AxisB, "Alpha"=>$AxisAlpha)); }
 
-           if ( $DrawArrows ) { $this->pChartObject->drawArrow($AxisPos["R"],$this->pChartObject->GraphAreaY1+$AxisSettings["Margin"],$AxisPos["R"],$this->pChartObject->GraphAreaY1-($ArrowSize*2),array("FillR"=>$AxisR,"FillG"=>$AxisG,"FillB"=>$AxisB,"Size"=>$ArrowSize)); }
+           if ($DrawArrows) { $this->pChartObject->drawArrow($AxisPos["R"], $this->pChartObject->GraphAreaY1 + $AxisSettings["Margin"], $AxisPos["R"], $this->pChartObject->GraphAreaY1 - ($ArrowSize*2), array("FillR"=>$AxisR, "FillG"=>$AxisG, "FillB"=>$AxisB, "Size"=>$ArrowSize)); }
 
            $Height = ($this->pChartObject->GraphAreaY2 - $this->pChartObject->GraphAreaY1) - $AxisSettings["Margin"]*2;
-           $Step   = $Height / $AxisSettings["Rows"]; $SubTicksSize = $Step /2; $MaxLeft = $AxisPos["R"];
+           $Step   = $Height/$AxisSettings["Rows"]; $SubTicksSize = $Step/2; $MaxLeft = $AxisPos["R"];
            $LastY  = NULL;
-           for($i=0;$i<=$AxisSettings["Rows"];$i++)
+           for ($i = 0; $i <= $AxisSettings["Rows"]; $i++)
             {
              $YPos  = $this->pChartObject->GraphAreaY2 - $AxisSettings["Margin"] - $Step*$i;
              $XPos  = $AxisPos["R"];
-             $Value = $this->pChartObject->scaleFormat($AxisSettings["ScaleMin"] + $AxisSettings["RowHeight"]*$i,$AxisSettings["Display"],$AxisSettings["Format"],$AxisSettings["Unit"]);
+             $Value = $this->pChartObject->scaleFormat($AxisSettings["ScaleMin"] + $AxisSettings["RowHeight"]*$i, $AxisSettings["Display"], $AxisSettings["Format"], $AxisSettings["Unit"]);
 
-             if ( $i%2 == 1 ) { $BGColor = array("R"=>$BackgroundR1,"G"=>$BackgroundG1,"B"=>$BackgroundB1,"Alpha"=>$BackgroundAlpha1); } else { $BGColor = array("R"=>$BackgroundR2,"G"=>$BackgroundG2,"B"=>$BackgroundB2,"Alpha"=>$BackgroundAlpha2); }
-             if ( $LastY != NULL && $CycleBackground  && ( $DrawYLines == ALL || in_array($AxisID,$DrawYLines) )) { $this->pChartObject->drawFilledRectangle($this->pChartObject->GraphAreaX1+$FloatingOffset,$LastY,$this->pChartObject->GraphAreaX2-$FloatingOffset,$YPos,$BGColor); }
+             if ($i%2 == 1) { $BGColor = array("R"=>$BackgroundR1, "G"=>$BackgroundG1, "B"=>$BackgroundB1, "Alpha"=>$BackgroundAlpha1); } else { $BGColor = array("R"=>$BackgroundR2, "G"=>$BackgroundG2, "B"=>$BackgroundB2, "Alpha"=>$BackgroundAlpha2); }
+             if ($LastY != NULL && $CycleBackground && ($DrawYLines == ALL || in_array($AxisID, $DrawYLines))) { $this->pChartObject->drawFilledRectangle($this->pChartObject->GraphAreaX1 + $FloatingOffset, $LastY, $this->pChartObject->GraphAreaX2 - $FloatingOffset, $YPos, $BGColor); }
 
-             if ( ($YPos != $this->pChartObject->GraphAreaY1 && $YPos != $this->pChartObject->GraphAreaY2) && ($DrawYLines == ALL || in_array($AxisID,$DrawYLines)) ) { $this->pChartObject->drawLine($this->pChartObject->GraphAreaX1+$FloatingOffset,$YPos,$this->pChartObject->GraphAreaX2-$FloatingOffset,$YPos,array("R"=>$GridR,"G"=>$GridG,"B"=>$GridB,"Alpha"=>$GridAlpha,"Ticks"=>$GridTicks)); }
+             if (($YPos != $this->pChartObject->GraphAreaY1 && $YPos != $this->pChartObject->GraphAreaY2) && ($DrawYLines == ALL || in_array($AxisID, $DrawYLines))) { $this->pChartObject->drawLine($this->pChartObject->GraphAreaX1 + $FloatingOffset, $YPos, $this->pChartObject->GraphAreaX2 - $FloatingOffset, $YPos, array("R"=>$GridR, "G"=>$GridG, "B"=>$GridB, "Alpha"=>$GridAlpha, "Ticks"=>$GridTicks)); }
 
-             if ( $DrawSubTicks && $i != $AxisSettings["Rows"] )
-              $this->pChartObject->drawLine($XPos-$InnerSubTickWidth,$YPos-$SubTicksSize,$XPos+$OuterSubTickWidth,$YPos-$SubTicksSize,array("R"=>$SubTickR,"G"=>$SubTickG,"B"=>$SubTickB,"Alpha"=>$SubTickAlpha));
+             if ($DrawSubTicks && $i != $AxisSettings["Rows"])
+              $this->pChartObject->drawLine($XPos - $InnerSubTickWidth, $YPos - $SubTicksSize, $XPos + $OuterSubTickWidth, $YPos - $SubTicksSize, array("R"=>$SubTickR, "G"=>$SubTickG, "B"=>$SubTickB, "Alpha"=>$SubTickAlpha));
 
-             $this->pChartObject->drawLine($XPos-$InnerTickWidth,$YPos,$XPos+$OuterTickWidth,$YPos,array("R"=>$TickR,"G"=>$TickG,"B"=>$TickB,"Alpha"=>$TickAlpha));
-             $Bounds  = $this->pChartObject->drawText($XPos+$OuterTickWidth+2,$YPos,$Value,array("Align"=>TEXT_ALIGN_MIDDLELEFT));
-             $TxtLeft = $XPos+$OuterTickWidth+2+($Bounds[1]["X"]-$Bounds[0]["X"]);
-             $MaxLeft = max($MaxLeft,$TxtLeft);
+             $this->pChartObject->drawLine($XPos - $InnerTickWidth, $YPos, $XPos + $OuterTickWidth, $YPos, array("R"=>$TickR, "G"=>$TickG, "B"=>$TickB, "Alpha"=>$TickAlpha));
+             $Bounds  = $this->pChartObject->drawText($XPos + $OuterTickWidth + 2, $YPos, $Value, array("Align"=>TEXT_ALIGN_MIDDLELEFT));
+             $TxtLeft = $XPos + $OuterTickWidth + 2 + ($Bounds[1]["X"] - $Bounds[0]["X"]);
+             $MaxLeft = max($MaxLeft, $TxtLeft);
 
              $LastY = $YPos;
             }
 
-           if ( isset($AxisSettings["Name"]) )
+           if (isset($AxisSettings["Name"]))
             {
-             $XPos    = $MaxLeft+6;
-             $YPos    = $this->pChartObject->GraphAreaY1+($this->pChartObject->GraphAreaY2-$this->pChartObject->GraphAreaY1)/2;
-             $Bounds  = $this->pChartObject->drawText($XPos,$YPos,$AxisSettings["Name"],array("Align"=>TEXT_ALIGN_BOTTOMMIDDLE,"Angle"=>270));
+             $XPos    = $MaxLeft + 6;
+             $YPos    = $this->pChartObject->GraphAreaY1 + ($this->pChartObject->GraphAreaY2 - $this->pChartObject->GraphAreaY1)/2;
+             $Bounds  = $this->pChartObject->drawText($XPos, $YPos, $AxisSettings["Name"], array("Align"=>TEXT_ALIGN_BOTTOMMIDDLE, "Angle"=>270));
              $MaxLeft = $Bounds[2]["X"];
 
              $this->pDataObject->Data["GraphArea"]["X2"] = $MaxLeft + $this->pChartObject->FontSize;
@@ -377,64 +377,64 @@ 
     }
 
    /* Draw a scatter plot chart */
-   function drawScatterPlotChart($Format=NULL)
+   function drawScatterPlotChart($Format = NULL)
     {
-     $PlotSize		= isset($Format["PlotSize"]) ? $Format["PlotSize"] : 3;
-     $PlotBorder	= isset($Format["PlotBorder"]) ? $Format["PlotBorder"] : FALSE;
+     $PlotSize = isset($Format["PlotSize"]) ? $Format["PlotSize"] : 3;
+     $PlotBorder = isset($Format["PlotBorder"]) ? $Format["PlotBorder"] : FALSE;
      $BorderR		= isset($Format["BorderR"]) ? $Format["BorderR"] : 250;
      $BorderG		= isset($Format["BorderG"]) ? $Format["BorderG"] : 250;
      $BorderB		= isset($Format["BorderB"]) ? $Format["BorderB"] : 250;
      $BorderAlpha	= isset($Format["BorderAlpha"]) ? $Format["BorderAlpha"] : 30;
-     $BorderSize	= isset($Format["BorderSize"]) ? $Format["BorderSize"] : 1;
+     $BorderSize = isset($Format["BorderSize"]) ? $Format["BorderSize"] : 1;
      $Surrounding	= isset($Format["Surrounding"]) ? $Format["Surrounding"] : NULL;
-     $RecordImageMap	= isset($Format["RecordImageMap"]) ? $Format["RecordImageMap"] : FALSE;
-     $ImageMapTitle	= isset($Format["ImageMapTitle"]) ? $Format["ImageMapTitle"] : NULL;
+     $RecordImageMap = isset($Format["RecordImageMap"]) ? $Format["RecordImageMap"] : FALSE;
+     $ImageMapTitle = isset($Format["ImageMapTitle"]) ? $Format["ImageMapTitle"] : NULL;
      $ImageMapPrecision = isset($Format["ImageMapPrecision"]) ? $Format["ImageMapPrecision"] : 2;
 
      $Data    = $this->pDataObject->getData();
      $Palette = $this->pDataObject->getPalette();
 
-     $BorderColor = array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha);
+     $BorderColor = array("R"=>$BorderR, "G"=>$BorderG, "B"=>$BorderB, "Alpha"=>$BorderAlpha);
 
-     foreach($Data["ScatterSeries"] as $Key => $Series)
+     foreach ($Data["ScatterSeries"] as $Key => $Series)
       {
-       if ( $Series["isDrawable"] == TRUE )
+       if ($Series["isDrawable"] == TRUE)
         {
          $SerieX = $Series["X"]; $SerieValuesX = $Data["Series"][$SerieX]["Data"]; $SerieXAxis = $Data["Series"][$SerieX]["Axis"];
          $SerieY = $Series["Y"]; $SerieValuesY = $Data["Series"][$SerieY]["Data"]; $SerieYAxis = $Data["Series"][$SerieY]["Axis"];
 
-         if ( $ImageMapTitle == NULL ) { $Description = $Data["Series"][$Series["X"]]["Description"]." / ".$Data["Series"][$Series["Y"]]["Description"]; } else { $Description = $ImageMapTitle; }
+         if ($ImageMapTitle == NULL) { $Description = $Data["Series"][$Series["X"]]["Description"]." / ".$Data["Series"][$Series["Y"]]["Description"]; } else { $Description = $ImageMapTitle; }
          
-         if ( isset($Series["Picture"]) && $Series["Picture"] != "" )
-          { $Picture = $Series["Picture"]; list($PicWidth,$PicHeight,$PicType) = $this->pChartObject->getPicInfo($Picture); }
+         if (isset($Series["Picture"]) && $Series["Picture"] != "")
+          { $Picture = $Series["Picture"]; list($PicWidth, $PicHeight, $PicType) = $this->pChartObject->getPicInfo($Picture); }
          else
           { $Picture = NULL; }
 
-         $PosArrayX = $this->getPosArray($SerieValuesX,$SerieXAxis);
-         if ( !is_array($PosArrayX) ) { $Value = $PosArrayX; $PosArrayX = ""; $PosArrayX[0] = $Value; }
-         $PosArrayY = $this->getPosArray($SerieValuesY,$SerieYAxis);
-         if ( !is_array($PosArrayY) ) { $Value = $PosArrayY; $PosArrayY = ""; $PosArrayY[0] = $Value; }
+         $PosArrayX = $this->getPosArray($SerieValuesX, $SerieXAxis);
+         if (!is_array($PosArrayX)) { $Value = $PosArrayX; $PosArrayX = ""; $PosArrayX[0] = $Value; }
+         $PosArrayY = $this->getPosArray($SerieValuesY, $SerieYAxis);
+         if (!is_array($PosArrayY)) { $Value = $PosArrayY; $PosArrayY = ""; $PosArrayY[0] = $Value; }
 
-         $Color = array("R"=>$Series["Color"]["R"],"G"=>$Series["Color"]["G"],"B"=>$Series["Color"]["B"],"Alpha"=>$Series["Color"]["Alpha"]);
+         $Color = array("R"=>$Series["Color"]["R"], "G"=>$Series["Color"]["G"], "B"=>$Series["Color"]["B"], "Alpha"=>$Series["Color"]["Alpha"]);
 
-         foreach($PosArrayX as $Key => $Value)
+         foreach ($PosArrayX as $Key => $Value)
           {
            $X = $Value; $Y = $PosArrayY[$Key];
 
-           if ( $X != VOID && $Y != VOID )
+           if ($X != VOID && $Y != VOID)
             {
-             $RealValue = round($Data["Series"][$Series["X"]]["Data"][$Key],2)." / ".round($Data["Series"][$Series["Y"]]["Data"][$Key],2);
-             if ( $RecordImageMap ) { $this->pChartObject->addToImageMap("CIRCLE",floor($X).",".floor($Y).",".floor($PlotSize+$BorderSize),$this->pChartObject->toHTMLColor($Series["Color"]["R"],$Series["Color"]["G"],$Series["Color"]["B"]),$Description,$RealValue); }
+             $RealValue = round($Data["Series"][$Series["X"]]["Data"][$Key], 2)." / ".round($Data["Series"][$Series["Y"]]["Data"][$Key], 2);
+             if ($RecordImageMap) { $this->pChartObject->addToImageMap("CIRCLE", floor($X).",".floor($Y).",".floor($PlotSize + $BorderSize), $this->pChartObject->toHTMLColor($Series["Color"]["R"], $Series["Color"]["G"], $Series["Color"]["B"]), $Description, $RealValue); }
 
-             if( isset($Series["Shape"]) )
-              { $this->pChartObject->drawShape($X,$Y,$Series["Shape"],$PlotSize,$PlotBorder,$BorderSize,$Series["Color"]["R"],$Series["Color"]["G"],$Series["Color"]["B"],$Series["Color"]["Alpha"],$BorderR,$BorderG,$BorderB,$BorderAlpha); }
-             elseif ( $Picture == NULL )
+             if (isset($Series["Shape"]))
+              { $this->pChartObject->drawShape($X, $Y, $Series["Shape"], $PlotSize, $PlotBorder, $BorderSize, $Series["Color"]["R"], $Series["Color"]["G"], $Series["Color"]["B"], $Series["Color"]["Alpha"], $BorderR, $BorderG, $BorderB, $BorderAlpha); }
+             elseif ($Picture == NULL)
               {
-               if ( $PlotBorder ) { $this->pChartObject->drawFilledCircle($X,$Y,$PlotSize+$BorderSize,$BorderColor); }
-               $this->pChartObject->drawFilledCircle($X,$Y,$PlotSize,$Color);
+               if ($PlotBorder) { $this->pChartObject->drawFilledCircle($X, $Y, $PlotSize + $BorderSize, $BorderColor); }
+               $this->pChartObject->drawFilledCircle($X, $Y, $PlotSize, $Color);
               }
              else
-              { $this->pChartObject->drawFromPicture($PicType,$Picture,$X-$PicWidth/2,$Y-$PicHeight/2); }
+              { $this->pChartObject->drawFromPicture($PicType, $Picture, $X - $PicWidth/2, $Y - $PicHeight/2); }
             }
           }
         }
@@ -442,49 +442,49 @@ 
     }
 
    /* Draw a scatter line chart */
-   function drawScatterLineChart($Format=NULL)
+   function drawScatterLineChart($Format = NULL)
     {
-     $Data		= $this->pDataObject->getData();
-     $Palette		= $this->pDataObject->getPalette();
-     $RecordImageMap	= isset($Format["RecordImageMap"]) ? $Format["RecordImageMap"] : FALSE;
-     $ImageMapTitle	= isset($Format["ImageMapTitle"]) ? $Format["ImageMapTitle"] : NULL;
-     $ImageMapPlotSize	= isset($Format["ImageMapPlotSize"]) ? $Format["ImageMapPlotSize"] : 10;
+     $Data = $this->pDataObject->getData();
+     $Palette = $this->pDataObject->getPalette();
+     $RecordImageMap = isset($Format["RecordImageMap"]) ? $Format["RecordImageMap"] : FALSE;
+     $ImageMapTitle = isset($Format["ImageMapTitle"]) ? $Format["ImageMapTitle"] : NULL;
+     $ImageMapPlotSize = isset($Format["ImageMapPlotSize"]) ? $Format["ImageMapPlotSize"] : 10;
      $ImageMapPrecision = isset($Format["ImageMapPrecision"]) ? $Format["ImageMapPrecision"] : 2;
 
      /* Parse all the series to draw */
-     foreach($Data["ScatterSeries"] as $Key => $Series)
+     foreach ($Data["ScatterSeries"] as $Key => $Series)
       {
-       if ( $Series["isDrawable"] == TRUE )
+       if ($Series["isDrawable"] == TRUE)
         {
          $SerieX = $Series["X"]; $SerieValuesX = $Data["Series"][$SerieX]["Data"]; $SerieXAxis = $Data["Series"][$SerieX]["Axis"];
          $SerieY = $Series["Y"]; $SerieValuesY = $Data["Series"][$SerieY]["Data"]; $SerieYAxis = $Data["Series"][$SerieY]["Axis"];
          $Ticks  = $Series["Ticks"];
          $Weight = $Series["Weight"];
 
-         if ( $ImageMapTitle == NULL ) { $Description = $Data["Series"][$Series["X"]]["Description"]." / ".$Data["Series"][$Series["Y"]]["Description"]; } else { $Description = $ImageMapTitle; }
+         if ($ImageMapTitle == NULL) { $Description = $Data["Series"][$Series["X"]]["Description"]." / ".$Data["Series"][$Series["Y"]]["Description"]; } else { $Description = $ImageMapTitle; }
 
-         $PosArrayX = $this->getPosArray($SerieValuesX,$SerieXAxis);
-         if ( !is_array($PosArrayX) ) { $Value = $PosArrayX; $PosArrayX = ""; $PosArrayX[0] = $Value; }
-         $PosArrayY = $this->getPosArray($SerieValuesY,$SerieYAxis);
-         if ( !is_array($PosArrayY) ) { $Value = $PosArrayY; $PosArrayY = ""; $PosArrayY[0] = $Value; }
+         $PosArrayX = $this->getPosArray($SerieValuesX, $SerieXAxis);
+         if (!is_array($PosArrayX)) { $Value = $PosArrayX; $PosArrayX = ""; $PosArrayX[0] = $Value; }
+         $PosArrayY = $this->getPosArray($SerieValuesY, $SerieYAxis);
+         if (!is_array($PosArrayY)) { $Value = $PosArrayY; $PosArrayY = ""; $PosArrayY[0] = $Value; }
 
-         $Color = array("R"=>$Series["Color"]["R"],"G"=>$Series["Color"]["G"],"B"=>$Series["Color"]["B"],"Alpha"=>$Series["Color"]["Alpha"]);
-         if ( $Ticks != 0 )  { $Color["Ticks"]  = $Ticks; }
-         if ( $Weight != 0 ) { $Color["Weight"] = $Weight; }
+         $Color = array("R"=>$Series["Color"]["R"], "G"=>$Series["Color"]["G"], "B"=>$Series["Color"]["B"], "Alpha"=>$Series["Color"]["Alpha"]);
+         if ($Ticks != 0) { $Color["Ticks"]  = $Ticks; }
+         if ($Weight != 0) { $Color["Weight"] = $Weight; }
 
          $LastX = VOID; $LastY = VOID;
-         foreach($PosArrayX as $Key => $Value)
+         foreach ($PosArrayX as $Key => $Value)
           {
            $X = $Value; $Y = $PosArrayY[$Key];
 
-           if ( $X != VOID && $Y != VOID )
+           if ($X != VOID && $Y != VOID)
             {
-             $RealValue = round($Data["Series"][$Series["X"]]["Data"][$Key],2)." / ".round($Data["Series"][$Series["Y"]]["Data"][$Key],2);
-             if ( $RecordImageMap ) { $this->pChartObject->addToImageMap("CIRCLE",floor($X).",".floor($Y).",".$ImageMapPlotSize,$this->pChartObject->toHTMLColor($Series["Color"]["R"],$Series["Color"]["G"],$Series["Color"]["B"]),$Description,$RealValue); }
+             $RealValue = round($Data["Series"][$Series["X"]]["Data"][$Key], 2)." / ".round($Data["Series"][$Series["Y"]]["Data"][$Key], 2);
+             if ($RecordImageMap) { $this->pChartObject->addToImageMap("CIRCLE", floor($X).",".floor($Y).",".$ImageMapPlotSize, $this->pChartObject->toHTMLColor($Series["Color"]["R"], $Series["Color"]["G"], $Series["Color"]["B"]), $Description, $RealValue); }
             }
 
-           if ( $X != VOID && $Y != VOID && $LastX != VOID && $LastY != VOID)
-            $this->pChartObject->drawLine($LastX,$LastY,$X,$Y,$Color);
+           if ($X != VOID && $Y != VOID && $LastX != VOID && $LastY != VOID)
+            $this->pChartObject->drawLine($LastX, $LastY, $X, $Y, $Color);
 
            $LastX = $X; $LastY = $Y;
           }
@@ -493,249 +493,249 @@ 
     }
 
    /* Draw a scatter spline chart */
-   function drawScatterSplineChart($Format=NULL)
+   function drawScatterSplineChart($Format = NULL)
     {
-     $Data		= $this->pDataObject->getData();
-     $Palette		= $this->pDataObject->getPalette();
-     $RecordImageMap	= isset($Format["RecordImageMap"]) ? $Format["RecordImageMap"] : FALSE;
-     $ImageMapTitle	= isset($Format["ImageMapTitle"]) ? $Format["ImageMapTitle"] : NULL;
-     $ImageMapPlotSize	= isset($Format["ImageMapPlotSize"]) ? $Format["ImageMapPlotSize"] : 10;
+     $Data = $this->pDataObject->getData();
+     $Palette = $this->pDataObject->getPalette();
+     $RecordImageMap = isset($Format["RecordImageMap"]) ? $Format["RecordImageMap"] : FALSE;
+     $ImageMapTitle = isset($Format["ImageMapTitle"]) ? $Format["ImageMapTitle"] : NULL;
+     $ImageMapPlotSize = isset($Format["ImageMapPlotSize"]) ? $Format["ImageMapPlotSize"] : 10;
      $ImageMapPrecision = isset($Format["ImageMapPrecision"]) ? $Format["ImageMapPrecision"] : 2;
 
-     foreach($Data["ScatterSeries"] as $Key => $Series)
+     foreach ($Data["ScatterSeries"] as $Key => $Series)
       {
-       if ( $Series["isDrawable"] == TRUE )
+       if ($Series["isDrawable"] == TRUE)
         {
          $SerieX = $Series["X"]; $SerieValuesX = $Data["Series"][$SerieX]["Data"]; $SerieXAxis = $Data["Series"][$SerieX]["Axis"];
          $SerieY = $Series["Y"]; $SerieValuesY = $Data["Series"][$SerieY]["Data"]; $SerieYAxis = $Data["Series"][$SerieY]["Axis"];
          $Ticks  = $Series["Ticks"];
          $Weight = $Series["Weight"];
 
-         if ( $ImageMapTitle == NULL ) { $Description = $Data["Series"][$Series["X"]]["Description"]." / ".$Data["Series"][$Series["Y"]]["Description"]; } else { $Description = $ImageMapTitle; }
+         if ($ImageMapTitle == NULL) { $Description = $Data["Series"][$Series["X"]]["Description"]." / ".$Data["Series"][$Series["Y"]]["Description"]; } else { $Description = $ImageMapTitle; }
 
-         $PosArrayX = $this->getPosArray($SerieValuesX,$SerieXAxis);
-         if ( !is_array($PosArrayX) ) { $Value = $PosArrayX; $PosArrayX = ""; $PosArrayX[0] = $Value; }
-         $PosArrayY = $this->getPosArray($SerieValuesY,$SerieYAxis);
-         if ( !is_array($PosArrayY) ) { $Value = $PosArrayY; $PosArrayY = ""; $PosArrayY[0] = $Value; }
+         $PosArrayX = $this->getPosArray($SerieValuesX, $SerieXAxis);
+         if (!is_array($PosArrayX)) { $Value = $PosArrayX; $PosArrayX = ""; $PosArrayX[0] = $Value; }
+         $PosArrayY = $this->getPosArray($SerieValuesY, $SerieYAxis);
+         if (!is_array($PosArrayY)) { $Value = $PosArrayY; $PosArrayY = ""; $PosArrayY[0] = $Value; }
 
-         $SplineSettings = array("R"=>$Series["Color"]["R"],"G"=>$Series["Color"]["G"],"B"=>$Series["Color"]["B"],"Alpha"=>$Series["Color"]["Alpha"]);
-         if ( $Ticks != 0 )  { $SplineSettings["Ticks"]  = $Ticks; }
-         if ( $Weight != 0 ) { $SplineSettings["Weight"] = $Weight; }
+         $SplineSettings = array("R"=>$Series["Color"]["R"], "G"=>$Series["Color"]["G"], "B"=>$Series["Color"]["B"], "Alpha"=>$Series["Color"]["Alpha"]);
+         if ($Ticks != 0) { $SplineSettings["Ticks"]  = $Ticks; }
+         if ($Weight != 0) { $SplineSettings["Weight"] = $Weight; }
 
          $LastX = VOID; $LastY = VOID; $WayPoints = ""; $Forces = "";
-         foreach($PosArrayX as $Key => $Value)
+         foreach ($PosArrayX as $Key => $Value)
           {
            $X = $Value; $Y = $PosArrayY[$Key];
-           $Force = $this->pChartObject->getLength($LastX,$LastY,$X,$Y)/5;
+           $Force = $this->pChartObject->getLength($LastX, $LastY, $X, $Y)/5;
 
-           if ( $X != VOID && $Y != VOID )
+           if ($X != VOID && $Y != VOID)
             {
-             $RealValue = round($Data["Series"][$Series["X"]]["Data"][$Key],2)." / ".round($Data["Series"][$Series["Y"]]["Data"][$Key],2);
-             if ( $RecordImageMap ) { $this->pChartObject->addToImageMap("CIRCLE",floor($X).",".floor($Y).",".$ImageMapPlotSize,$this->pChartObject->toHTMLColor($Series["Color"]["R"],$Series["Color"]["G"],$Series["Color"]["B"]),$Description,$RealValue); }
+             $RealValue = round($Data["Series"][$Series["X"]]["Data"][$Key], 2)." / ".round($Data["Series"][$Series["Y"]]["Data"][$Key], 2);
+             if ($RecordImageMap) { $this->pChartObject->addToImageMap("CIRCLE", floor($X).",".floor($Y).",".$ImageMapPlotSize, $this->pChartObject->toHTMLColor($Series["Color"]["R"], $Series["Color"]["G"], $Series["Color"]["B"]), $Description, $RealValue); }
             }
 
-           if ( $X != VOID && $Y != VOID )
-            { $WayPoints[] = array($X,$Y); $Forces[] = $Force; }
+           if ($X != VOID && $Y != VOID)
+            { $WayPoints[] = array($X, $Y); $Forces[] = $Force; }
 
-           if ( $Y == VOID || $X == VOID )
-            { $SplineSettings["Forces"] = $Forces; $this->pChartObject->drawSpline($WayPoints,$SplineSettings); $WayPoints = ""; $Forces = "";}
+           if ($Y == VOID || $X == VOID)
+            { $SplineSettings["Forces"] = $Forces; $this->pChartObject->drawSpline($WayPoints, $SplineSettings); $WayPoints = ""; $Forces = ""; }
 
            $LastX = $X; $LastY = $Y;
           }
          $SplineSettings["Forces"] = $Forces; 
-         $this->pChartObject->drawSpline($WayPoints,$SplineSettings);
+         $this->pChartObject->drawSpline($WayPoints, $SplineSettings);
         }
       }
     }
 
    /* Return the scaled plot position */
-   function getPosArray($Values,$AxisID)
+   function getPosArray($Values, $AxisID)
     {
      $Data = $this->pDataObject->getData();
 
-     if ( !is_array($Values) ) { $Values = array($Values); }
+     if (!is_array($Values)) { $Values = array($Values); }
 
-     if ( $Data["Axis"][$AxisID]["Identity"] == AXIS_X )
+     if ($Data["Axis"][$AxisID]["Identity"] == AXIS_X)
       {
        $Height      = ($this->pChartObject->GraphAreaX2 - $this->pChartObject->GraphAreaX1) - $Data["Axis"][$AxisID]["Margin"]*2;
        $ScaleHeight = $Data["Axis"][$AxisID]["ScaleMax"] - $Data["Axis"][$AxisID]["ScaleMin"];
-       $Step        = $Height / $ScaleHeight;
+       $Step        = $Height/$ScaleHeight;
 
        $Result = "";
-       foreach($Values as $Key => $Value)
+       foreach ($Values as $Key => $Value)
         {
-         if ( $Value == VOID ) 
+         if ($Value == VOID) 
           $Result[] = VOID;
          else
-          $Result[] = $this->pChartObject->GraphAreaX1 + $Data["Axis"][$AxisID]["Margin"] + ($Step * ($Value-$Data["Axis"][$AxisID]["ScaleMin"]));
+          $Result[] = $this->pChartObject->GraphAreaX1 + $Data["Axis"][$AxisID]["Margin"] + ($Step*($Value - $Data["Axis"][$AxisID]["ScaleMin"]));
         }
 
-       if ( count($Result) == 1 ) { return($Result[0]); } else { return($Result); }
+       if (count($Result) == 1) { return($Result[0]); } else { return($Result); }
       }
      else
       {
        $Height      = ($this->pChartObject->GraphAreaY2 - $this->pChartObject->GraphAreaY1) - $Data["Axis"][$AxisID]["Margin"]*2;
        $ScaleHeight = $Data["Axis"][$AxisID]["ScaleMax"] - $Data["Axis"][$AxisID]["ScaleMin"];
-       $Step        = $Height / $ScaleHeight;
+       $Step        = $Height/$ScaleHeight;
 
        $Result = "";
-       foreach($Values as $Key => $Value)
+       foreach ($Values as $Key => $Value)
         {
-         if ( $Value == VOID ) 
+         if ($Value == VOID) 
           $Result[] = VOID;
          else
-          $Result[] = $this->pChartObject->GraphAreaY2 - $Data["Axis"][$AxisID]["Margin"] - ($Step * ($Value-$Data["Axis"][$AxisID]["ScaleMin"]));
+          $Result[] = $this->pChartObject->GraphAreaY2 - $Data["Axis"][$AxisID]["Margin"] - ($Step*($Value - $Data["Axis"][$AxisID]["ScaleMin"]));
         }
 
-       if ( count($Result) == 1 ) { return($Result[0]); } else { return($Result); }
+       if (count($Result) == 1) { return($Result[0]); } else { return($Result); }
       }
     }
 
    /* Draw the legend of the active series */
-   function drawScatterLegend($X,$Y,$Format="")
+   function drawScatterLegend($X, $Y, $Format = "")
     {
-     $Family		= isset($Format["Family"]) ? $Format["Family"] : LEGEND_FAMILY_BOX;
+     $Family = isset($Format["Family"]) ? $Format["Family"] : LEGEND_FAMILY_BOX;
      $FontName		= isset($Format["FontName"]) ? $Format["FontName"] : $this->pChartObject->FontName;
      $FontSize		= isset($Format["FontSize"]) ? $Format["FontSize"] : $this->pChartObject->FontSize;
      $FontR		= isset($Format["FontR"]) ? $Format["FontR"] : $this->pChartObject->FontColorR;
      $FontG		= isset($Format["FontG"]) ? $Format["FontG"] : $this->pChartObject->FontColorG;
      $FontB		= isset($Format["FontB"]) ? $Format["FontB"] : $this->pChartObject->FontColorB;
-     $BoxWidth		= isset($Format["BoxWidth"]) ? $Format["BoxWidth"] : 5;
-     $BoxHeight		= isset($Format["BoxHeight"]) ? $Format["BoxHeight"] : 5;
-     $IconAreaWidth	= isset($Format["IconAreaWidth"]) ? $Format["IconAreaWidth"] : $BoxWidth;
-     $IconAreaHeight	= isset($Format["IconAreaHeight"]) ? $Format["IconAreaHeight"] : $BoxHeight;
-     $XSpacing		= isset($Format["XSpacing"]) ? $Format["XSpacing"] : 5;
-     $Margin		= isset($Format["Margin"]) ? $Format["Margin"] : 5;
+     $BoxWidth = isset($Format["BoxWidth"]) ? $Format["BoxWidth"] : 5;
+     $BoxHeight = isset($Format["BoxHeight"]) ? $Format["BoxHeight"] : 5;
+     $IconAreaWidth = isset($Format["IconAreaWidth"]) ? $Format["IconAreaWidth"] : $BoxWidth;
+     $IconAreaHeight = isset($Format["IconAreaHeight"]) ? $Format["IconAreaHeight"] : $BoxHeight;
+     $XSpacing = isset($Format["XSpacing"]) ? $Format["XSpacing"] : 5;
+     $Margin = isset($Format["Margin"]) ? $Format["Margin"] : 5;
      $R			= isset($Format["R"]) ? $Format["R"] : 200;
      $G			= isset($Format["G"]) ? $Format["G"] : 200;
      $B			= isset($Format["B"]) ? $Format["B"] : 200;
-     $Alpha		= isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
+     $Alpha = isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
      $BorderR		= isset($Format["BorderR"]) ? $Format["BorderR"] : 255;
      $BorderG		= isset($Format["BorderG"]) ? $Format["BorderG"] : 255;
      $BorderB		= isset($Format["BorderB"]) ? $Format["BorderB"] : 255;
-     $Surrounding	= isset($Format["Surrounding"]) ? $Format["Surrounding"] : NULL;
-     $Style		= isset($Format["Style"]) ? $Format["Style"] : LEGEND_ROUND;
-     $Mode		= isset($Format["Mode"]) ? $Format["Mode"] : LEGEND_VERTICAL;
+     $Surrounding = isset($Format["Surrounding"]) ? $Format["Surrounding"] : NULL;
+     $Style = isset($Format["Style"]) ? $Format["Style"] : LEGEND_ROUND;
+     $Mode = isset($Format["Mode"]) ? $Format["Mode"] : LEGEND_VERTICAL;
 
-     if ( $Surrounding != NULL ) { $BorderR = $R + $Surrounding; $BorderG = $G + $Surrounding; $BorderB = $B + $Surrounding; }
+     if ($Surrounding != NULL) { $BorderR = $R + $Surrounding; $BorderG = $G + $Surrounding; $BorderB = $B + $Surrounding; }
 
      $Data = $this->pDataObject->getData();
 
-     foreach($Data["ScatterSeries"] as $Key => $Series)
+     foreach ($Data["ScatterSeries"] as $Key => $Series)
       {
-       if ( $Series["isDrawable"] == TRUE && isset($Series["Picture"]))
+       if ($Series["isDrawable"] == TRUE && isset($Series["Picture"]))
         {
-         list($PicWidth,$PicHeight) = $this->pChartObject->getPicInfo($Series["Picture"]);
-         if ( $IconAreaWidth < $PicWidth ) { $IconAreaWidth = $PicWidth; }
-         if ( $IconAreaHeight < $PicHeight ) { $IconAreaHeight = $PicHeight; }
+         list($PicWidth, $PicHeight) = $this->pChartObject->getPicInfo($Series["Picture"]);
+         if ($IconAreaWidth < $PicWidth) { $IconAreaWidth = $PicWidth; }
+         if ($IconAreaHeight < $PicHeight) { $IconAreaHeight = $PicHeight; }
         }
       }
 
-     $YStep = max($this->pChartObject->FontSize,$IconAreaHeight) + 5;
+     $YStep = max($this->pChartObject->FontSize, $IconAreaHeight) + 5;
      $XStep = $IconAreaWidth + 5;
      $XStep = $XSpacing;
 
      $Boundaries = ""; $Boundaries["L"] = $X; $Boundaries["T"] = $Y; $Boundaries["R"] = 0; $Boundaries["B"] = 0; $vY = $Y; $vX = $X;
-     foreach($Data["ScatterSeries"] as $Key => $Series)
+     foreach ($Data["ScatterSeries"] as $Key => $Series)
       {
-       if ( $Series["isDrawable"] == TRUE )
+       if ($Series["isDrawable"] == TRUE)
         {
-         if ( $Mode == LEGEND_VERTICAL )
+         if ($Mode == LEGEND_VERTICAL)
           {
-           $BoxArray = $this->pChartObject->getTextBox($vX+$IconAreaWidth+4,$vY+$IconAreaHeight/2,$FontName,$FontSize,0,$Series["Description"]);
+           $BoxArray = $this->pChartObject->getTextBox($vX + $IconAreaWidth + 4, $vY + $IconAreaHeight/2, $FontName, $FontSize, 0, $Series["Description"]);
 
-           if ( $Boundaries["T"] > $BoxArray[2]["Y"]+$IconAreaHeight/2 ) { $Boundaries["T"] = $BoxArray[2]["Y"]+$IconAreaHeight/2; }
-           if ( $Boundaries["R"] < $BoxArray[1]["X"]+2 ) { $Boundaries["R"] = $BoxArray[1]["X"]+2; }
-           if ( $Boundaries["B"] < $BoxArray[1]["Y"]+2+$IconAreaHeight/2 ) { $Boundaries["B"] = $BoxArray[1]["Y"]+2+$IconAreaHeight/2; }
+           if ($Boundaries["T"] > $BoxArray[2]["Y"] + $IconAreaHeight/2) { $Boundaries["T"] = $BoxArray[2]["Y"] + $IconAreaHeight/2; }
+           if ($Boundaries["R"] < $BoxArray[1]["X"] + 2) { $Boundaries["R"] = $BoxArray[1]["X"] + 2; }
+           if ($Boundaries["B"] < $BoxArray[1]["Y"] + 2 + $IconAreaHeight/2) { $Boundaries["B"] = $BoxArray[1]["Y"] + 2 + $IconAreaHeight/2; }
 
-           $Lines = preg_split("/\n/",$Series["Description"]);
-           $vY = $vY + max($this->pChartObject->FontSize*count($Lines),$IconAreaHeight) + 5;
+           $Lines = preg_split("/\n/", $Series["Description"]);
+           $vY = $vY + max($this->pChartObject->FontSize*count($Lines), $IconAreaHeight) + 5;
           }
-         elseif ( $Mode == LEGEND_HORIZONTAL )
+         elseif ($Mode == LEGEND_HORIZONTAL)
           {
-           $Lines = preg_split("/\n/",$Series["Description"]);
+           $Lines = preg_split("/\n/", $Series["Description"]);
            $Width = "";
-           foreach($Lines as $Key => $Value)
+           foreach ($Lines as $Key => $Value)
             {
-             $BoxArray = $this->pChartObject->getTextBox($vX+$IconAreaWidth+6,$Y+$IconAreaHeight/2+(($this->pChartObject->FontSize+3)*$Key),$FontName,$FontSize,0,$Value);
+             $BoxArray = $this->pChartObject->getTextBox($vX + $IconAreaWidth + 6, $Y + $IconAreaHeight/2 + (($this->pChartObject->FontSize + 3)*$Key), $FontName, $FontSize, 0, $Value);
 
-             if ( $Boundaries["T"] > $BoxArray[2]["Y"]+$IconAreaHeight/2 ) { $Boundaries["T"] = $BoxArray[2]["Y"]+$IconAreaHeight/2; }
-             if ( $Boundaries["R"] < $BoxArray[1]["X"]+2 ) { $Boundaries["R"] = $BoxArray[1]["X"]+2; }
-             if ( $Boundaries["B"] < $BoxArray[1]["Y"]+2+$IconAreaHeight/2 ) { $Boundaries["B"] = $BoxArray[1]["Y"]+2+$IconAreaHeight/2; }
+             if ($Boundaries["T"] > $BoxArray[2]["Y"] + $IconAreaHeight/2) { $Boundaries["T"] = $BoxArray[2]["Y"] + $IconAreaHeight/2; }
+             if ($Boundaries["R"] < $BoxArray[1]["X"] + 2) { $Boundaries["R"] = $BoxArray[1]["X"] + 2; }
+             if ($Boundaries["B"] < $BoxArray[1]["Y"] + 2 + $IconAreaHeight/2) { $Boundaries["B"] = $BoxArray[1]["Y"] + 2 + $IconAreaHeight/2; }
 
              $Width[] = $BoxArray[1]["X"];
             }
 
-           $vX=max($Width)+$XStep;
+           $vX = max($Width) + $XStep;
           }
         }
       }
-     $vY=$vY-$YStep; $vX=$vX-$XStep;
+     $vY = $vY - $YStep; $vX = $vX - $XStep;
 
-     $TopOffset  = $Y - $Boundaries["T"];
-     if ( $Boundaries["B"]-($vY+$IconAreaHeight) < $TopOffset ) { $Boundaries["B"] = $vY+$IconAreaHeight+$TopOffset; }
+     $TopOffset = $Y - $Boundaries["T"];
+     if ($Boundaries["B"] - ($vY + $IconAreaHeight) < $TopOffset) { $Boundaries["B"] = $vY + $IconAreaHeight + $TopOffset; }
 
-     if ( $Style == LEGEND_ROUND )
-      $this->pChartObject->drawRoundedFilledRectangle($Boundaries["L"]-$Margin,$Boundaries["T"]-$Margin,$Boundaries["R"]+$Margin,$Boundaries["B"]+$Margin,$Margin,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"BorderR"=>$BorderR,"BorderG"=>$BorderG,"BorderB"=>$BorderB));
-     elseif ( $Style == LEGEND_BOX )
-      $this->pChartObject->drawFilledRectangle($Boundaries["L"]-$Margin,$Boundaries["T"]-$Margin,$Boundaries["R"]+$Margin,$Boundaries["B"]+$Margin,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"BorderR"=>$BorderR,"BorderG"=>$BorderG,"BorderB"=>$BorderB));
+     if ($Style == LEGEND_ROUND)
+      $this->pChartObject->drawRoundedFilledRectangle($Boundaries["L"] - $Margin, $Boundaries["T"] - $Margin, $Boundaries["R"] + $Margin, $Boundaries["B"] + $Margin, $Margin, array("R"=>$R, "G"=>$G, "B"=>$B, "Alpha"=>$Alpha, "BorderR"=>$BorderR, "BorderG"=>$BorderG, "BorderB"=>$BorderB));
+     elseif ($Style == LEGEND_BOX)
+      $this->pChartObject->drawFilledRectangle($Boundaries["L"] - $Margin, $Boundaries["T"] - $Margin, $Boundaries["R"] + $Margin, $Boundaries["B"] + $Margin, array("R"=>$R, "G"=>$G, "B"=>$B, "Alpha"=>$Alpha, "BorderR"=>$BorderR, "BorderG"=>$BorderG, "BorderB"=>$BorderB));
 
      $RestoreShadow = $this->pChartObject->Shadow; $this->Shadow = FALSE;
-     foreach($Data["ScatterSeries"] as $Key => $Series)
+     foreach ($Data["ScatterSeries"] as $Key => $Series)
       {
-       if ( $Series["isDrawable"] == TRUE )
+       if ($Series["isDrawable"] == TRUE)
         {
          $R = $Series["Color"]["R"]; $G = $Series["Color"]["G"]; $B = $Series["Color"]["B"];
          $Ticks = $Series["Ticks"]; $Weight = $Series["Weight"];
 
-         if ( isset($Series["Picture"]) )
+         if (isset($Series["Picture"]))
           {
            $Picture = $Series["Picture"];
-           list($PicWidth,$PicHeight) = $this->pChartObject->getPicInfo($Picture);
-           $PicX = $X+$IconAreaWidth/2; $PicY = $Y+$IconAreaHeight/2; 
+           list($PicWidth, $PicHeight) = $this->pChartObject->getPicInfo($Picture);
+           $PicX = $X + $IconAreaWidth/2; $PicY = $Y + $IconAreaHeight/2; 
 
-           $this->pChartObject->drawFromPNG($PicX-$PicWidth/2,$PicY-$PicHeight/2,$Picture);
+           $this->pChartObject->drawFromPNG($PicX - $PicWidth/2, $PicY - $PicHeight/2, $Picture);
           }
          else
           {
-           if ( $Family == LEGEND_FAMILY_BOX )
+           if ($Family == LEGEND_FAMILY_BOX)
             {
-             if ( $BoxWidth != $IconAreaWidth ) { $XOffset = floor(($IconAreaWidth-$BoxWidth)/2); } else { $XOffset = 0; }
-             if ( $BoxHeight != $IconAreaHeight ) { $YOffset = floor(($IconAreaHeight-$BoxHeight)/2); } else { $YOffset = 0; }
+             if ($BoxWidth != $IconAreaWidth) { $XOffset = floor(($IconAreaWidth - $BoxWidth)/2); } else { $XOffset = 0; }
+             if ($BoxHeight != $IconAreaHeight) { $YOffset = floor(($IconAreaHeight - $BoxHeight)/2); } else { $YOffset = 0; }
 
-             $this->pChartObject->drawFilledRectangle($X+1+$XOffset,$Y+1+$YOffset,$X+$BoxWidth+$XOffset+1,$Y+$BoxHeight+1+$YOffset,array("R"=>0,"G"=>0,"B"=>0,"Alpha"=>20));
-             $this->pChartObject->drawFilledRectangle($X+$XOffset,$Y+$YOffset,$X+$BoxWidth+$XOffset,$Y+$BoxHeight+$YOffset,array("R"=>$R,"G"=>$G,"B"=>$B,"Surrounding"=>20));
+             $this->pChartObject->drawFilledRectangle($X + 1 + $XOffset, $Y + 1 + $YOffset, $X + $BoxWidth + $XOffset + 1, $Y + $BoxHeight + 1 + $YOffset, array("R"=>0, "G"=>0, "B"=>0, "Alpha"=>20));
+             $this->pChartObject->drawFilledRectangle($X + $XOffset, $Y + $YOffset, $X + $BoxWidth + $XOffset, $Y + $BoxHeight + $YOffset, array("R"=>$R, "G"=>$G, "B"=>$B, "Surrounding"=>20));
             }
-           elseif ( $Family == LEGEND_FAMILY_CIRCLE )
+           elseif ($Family == LEGEND_FAMILY_CIRCLE)
             {
-             $this->pChartObject->drawFilledCircle($X+1+$IconAreaWidth/2,$Y+1+$IconAreaHeight/2,min($IconAreaHeight/2,$IconAreaWidth/2),array("R"=>0,"G"=>0,"B"=>0,"Alpha"=>20));
-             $this->pChartObject->drawFilledCircle($X+$IconAreaWidth/2,$Y+$IconAreaHeight/2,min($IconAreaHeight/2,$IconAreaWidth/2),array("R"=>$R,"G"=>$G,"B"=>$B,"Surrounding"=>20));
+             $this->pChartObject->drawFilledCircle($X + 1 + $IconAreaWidth/2, $Y + 1 + $IconAreaHeight/2, min($IconAreaHeight/2, $IconAreaWidth/2), array("R"=>0, "G"=>0, "B"=>0, "Alpha"=>20));
+             $this->pChartObject->drawFilledCircle($X + $IconAreaWidth/2, $Y + $IconAreaHeight/2, min($IconAreaHeight/2, $IconAreaWidth/2), array("R"=>$R, "G"=>$G, "B"=>$B, "Surrounding"=>20));
             }
-           elseif ( $Family == LEGEND_FAMILY_LINE )
+           elseif ($Family == LEGEND_FAMILY_LINE)
             {
-             $this->pChartObject->drawLine($X+1,$Y+1+$IconAreaHeight/2,$X+1+$IconAreaWidth,$Y+1+$IconAreaHeight/2,array("R"=>0,"G"=>0,"B"=>0,"Alpha"=>20,"Ticks"=>$Ticks,"Weight"=>$Weight));
-             $this->pChartObject->drawLine($X,$Y+$IconAreaHeight/2,$X+$IconAreaWidth,$Y+$IconAreaHeight/2,array("R"=>$R,"G"=>$G,"B"=>$B,"Ticks"=>$Ticks,"Weight"=>$Weight));
+             $this->pChartObject->drawLine($X + 1, $Y + 1 + $IconAreaHeight/2, $X + 1 + $IconAreaWidth, $Y + 1 + $IconAreaHeight/2, array("R"=>0, "G"=>0, "B"=>0, "Alpha"=>20, "Ticks"=>$Ticks, "Weight"=>$Weight));
+             $this->pChartObject->drawLine($X, $Y + $IconAreaHeight/2, $X + $IconAreaWidth, $Y + $IconAreaHeight/2, array("R"=>$R, "G"=>$G, "B"=>$B, "Ticks"=>$Ticks, "Weight"=>$Weight));
             }
           }
 
-         if ( $Mode == LEGEND_VERTICAL )
+         if ($Mode == LEGEND_VERTICAL)
           {
-           $Lines = preg_split("/\n/",$Series["Description"]);
-           foreach($Lines as $Key => $Value)
-            $this->pChartObject->drawText($X+$IconAreaWidth+4,$Y+$IconAreaHeight/2+(($this->pChartObject->FontSize+3)*$Key),$Value,array("R"=>$FontR,"G"=>$FontG,"B"=>$FontB,"Align"=>TEXT_ALIGN_MIDDLELEFT));
+           $Lines = preg_split("/\n/", $Series["Description"]);
+           foreach ($Lines as $Key => $Value)
+            $this->pChartObject->drawText($X + $IconAreaWidth + 4, $Y + $IconAreaHeight/2 + (($this->pChartObject->FontSize + 3)*$Key), $Value, array("R"=>$FontR, "G"=>$FontG, "B"=>$FontB, "Align"=>TEXT_ALIGN_MIDDLELEFT));
 
-           $Y=$Y+max($this->pChartObject->FontSize*count($Lines),$IconAreaHeight) + 5;
+           $Y = $Y + max($this->pChartObject->FontSize*count($Lines), $IconAreaHeight) + 5;
           }
-         elseif ( $Mode == LEGEND_HORIZONTAL )
+         elseif ($Mode == LEGEND_HORIZONTAL)
           {
-           $Lines = preg_split("/\n/",$Series["Description"]);
+           $Lines = preg_split("/\n/", $Series["Description"]);
            $Width = "";
-           foreach($Lines as $Key => $Value)
+           foreach ($Lines as $Key => $Value)
             {
-             $BoxArray = $this->pChartObject->drawText($X+$IconAreaWidth+4,$Y+$IconAreaHeight/2+(($this->pChartObject->FontSize+3)*$Key),$Value,array("R"=>$FontR,"G"=>$FontG,"B"=>$FontB,"Align"=>TEXT_ALIGN_MIDDLELEFT));
+             $BoxArray = $this->pChartObject->drawText($X + $IconAreaWidth + 4, $Y + $IconAreaHeight/2 + (($this->pChartObject->FontSize + 3)*$Key), $Value, array("R"=>$FontR, "G"=>$FontG, "B"=>$FontB, "Align"=>TEXT_ALIGN_MIDDLELEFT));
              $Width[] = $BoxArray[1]["X"];
             }
-           $X=max($Width)+2+$XStep;
+           $X = max($Width) + 2 + $XStep;
           }
         }
       }
@@ -744,104 +744,104 @@ 
     }
 
    /* Get the legend box size */
-   function getScatterLegendSize($Format="")
+   function getScatterLegendSize($Format = "")
     {
      $FontName	= isset($Format["FontName"]) ? $Format["FontName"] : $this->pChartObject->FontName;
      $FontSize	= isset($Format["FontSize"]) ? $Format["FontSize"] : $this->pChartObject->FontSize;
-     $BoxSize	= isset($Format["BoxSize"]) ? $Format["BoxSize"] : 5;
-     $Margin	= isset($Format["Margin"]) ? $Format["Margin"] : 5;
+     $BoxSize = isset($Format["BoxSize"]) ? $Format["BoxSize"] : 5;
+     $Margin = isset($Format["Margin"]) ? $Format["Margin"] : 5;
      $Style	= isset($Format["Style"]) ? $Format["Style"] : LEGEND_ROUND;
-     $Mode	= isset($Format["Mode"]) ? $Format["Mode"] : LEGEND_VERTICAL;
+     $Mode = isset($Format["Mode"]) ? $Format["Mode"] : LEGEND_VERTICAL;
 
-     $YStep = max($this->pChartObject->FontSize,$BoxSize) + 5;
+     $YStep = max($this->pChartObject->FontSize, $BoxSize) + 5;
      $XStep = $BoxSize + 5;
 
-     $X=100; $Y=100;
+     $X = 100; $Y = 100;
 
      $Data = $this->pDataObject->getData();
 
-     foreach($Data["ScatterSeries"] as $Key => $Series)
+     foreach ($Data["ScatterSeries"] as $Key => $Series)
       {
-       if ( $Series["isDrawable"] == TRUE && isset($Series["Picture"]))
+       if ($Series["isDrawable"] == TRUE && isset($Series["Picture"]))
         {
-         list($PicWidth,$PicHeight) = $this->pChartObject->getPicInfo($Series["Picture"]);
-         if ( $IconAreaWidth < $PicWidth ) { $IconAreaWidth = $PicWidth; }
-         if ( $IconAreaHeight < $PicHeight ) { $IconAreaHeight = $PicHeight; }
+         list($PicWidth, $PicHeight) = $this->pChartObject->getPicInfo($Series["Picture"]);
+         if ($IconAreaWidth < $PicWidth) { $IconAreaWidth = $PicWidth; }
+         if ($IconAreaHeight < $PicHeight) { $IconAreaHeight = $PicHeight; }
         }
       }
 
-     $YStep = max($this->pChartObject->FontSize,$IconAreaHeight) + 5;
+     $YStep = max($this->pChartObject->FontSize, $IconAreaHeight) + 5;
      $XStep = $IconAreaWidth + 5;
      $XStep = $XSpacing;
 
      $Boundaries = ""; $Boundaries["L"] = $X; $Boundaries["T"] = $Y; $Boundaries["R"] = 0; $Boundaries["B"] = 0; $vY = $Y; $vX = $X;
-     foreach($Data["ScatterSeries"] as $Key => $Series)
+     foreach ($Data["ScatterSeries"] as $Key => $Series)
       {
-       if ( $Series["isDrawable"] == TRUE )
+       if ($Series["isDrawable"] == TRUE)
         {
-         if ( $Mode == LEGEND_VERTICAL )
+         if ($Mode == LEGEND_VERTICAL)
           {
-           $BoxArray = $this->pChartObject->getTextBox($vX+$IconAreaWidth+4,$vY+$IconAreaHeight/2,$FontName,$FontSize,0,$Series["Description"]);
+           $BoxArray = $this->pChartObject->getTextBox($vX + $IconAreaWidth + 4, $vY + $IconAreaHeight/2, $FontName, $FontSize, 0, $Series["Description"]);
 
-           if ( $Boundaries["T"] > $BoxArray[2]["Y"]+$IconAreaHeight/2 ) { $Boundaries["T"] = $BoxArray[2]["Y"]+$IconAreaHeight/2; }
-           if ( $Boundaries["R"] < $BoxArray[1]["X"]+2 ) { $Boundaries["R"] = $BoxArray[1]["X"]+2; }
-           if ( $Boundaries["B"] < $BoxArray[1]["Y"]+2+$IconAreaHeight/2 ) { $Boundaries["B"] = $BoxArray[1]["Y"]+2+$IconAreaHeight/2; }
+           if ($Boundaries["T"] > $BoxArray[2]["Y"] + $IconAreaHeight/2) { $Boundaries["T"] = $BoxArray[2]["Y"] + $IconAreaHeight/2; }
+           if ($Boundaries["R"] < $BoxArray[1]["X"] + 2) { $Boundaries["R"] = $BoxArray[1]["X"] + 2; }
+           if ($Boundaries["B"] < $BoxArray[1]["Y"] + 2 + $IconAreaHeight/2) { $Boundaries["B"] = $BoxArray[1]["Y"] + 2 + $IconAreaHeight/2; }
 
-           $Lines = preg_split("/\n/",$Series["Description"]);
-           $vY = $vY + max($this->pChartObject->FontSize*count($Lines),$IconAreaHeight) + 5;
+           $Lines = preg_split("/\n/", $Series["Description"]);
+           $vY = $vY + max($this->pChartObject->FontSize*count($Lines), $IconAreaHeight) + 5;
           }
-         elseif ( $Mode == LEGEND_HORIZONTAL )
+         elseif ($Mode == LEGEND_HORIZONTAL)
           {
-           $Lines = preg_split("/\n/",$Series["Description"]);
+           $Lines = preg_split("/\n/", $Series["Description"]);
            $Width = "";
-           foreach($Lines as $Key => $Value)
+           foreach ($Lines as $Key => $Value)
             {
-             $BoxArray = $this->pChartObject->getTextBox($vX+$IconAreaWidth+6,$Y+$IconAreaHeight/2+(($this->pChartObject->FontSize+3)*$Key),$FontName,$FontSize,0,$Value);
+             $BoxArray = $this->pChartObject->getTextBox($vX + $IconAreaWidth + 6, $Y + $IconAreaHeight/2 + (($this->pChartObject->FontSize + 3)*$Key), $FontName, $FontSize, 0, $Value);
 
-             if ( $Boundaries["T"] > $BoxArray[2]["Y"]+$IconAreaHeight/2 ) { $Boundaries["T"] = $BoxArray[2]["Y"]+$IconAreaHeight/2; }
-             if ( $Boundaries["R"] < $BoxArray[1]["X"]+2 ) { $Boundaries["R"] = $BoxArray[1]["X"]+2; }
-             if ( $Boundaries["B"] < $BoxArray[1]["Y"]+2+$IconAreaHeight/2 ) { $Boundaries["B"] = $BoxArray[1]["Y"]+2+$IconAreaHeight/2; }
+             if ($Boundaries["T"] > $BoxArray[2]["Y"] + $IconAreaHeight/2) { $Boundaries["T"] = $BoxArray[2]["Y"] + $IconAreaHeight/2; }
+             if ($Boundaries["R"] < $BoxArray[1]["X"] + 2) { $Boundaries["R"] = $BoxArray[1]["X"] + 2; }
+             if ($Boundaries["B"] < $BoxArray[1]["Y"] + 2 + $IconAreaHeight/2) { $Boundaries["B"] = $BoxArray[1]["Y"] + 2 + $IconAreaHeight/2; }
 
              $Width[] = $BoxArray[1]["X"];
             }
 
-           $vX=max($Width)+$XStep;
+           $vX = max($Width) + $XStep;
           }
         }
       }
-     $vY=$vY-$YStep; $vX=$vX-$XStep;
+     $vY = $vY - $YStep; $vX = $vX - $XStep;
 
-     $TopOffset  = $Y - $Boundaries["T"];
-     if ( $Boundaries["B"]-($vY+$BoxSize) < $TopOffset ) { $Boundaries["B"] = $vY+$BoxSize+$TopOffset; }
+     $TopOffset = $Y - $Boundaries["T"];
+     if ($Boundaries["B"] - ($vY + $BoxSize) < $TopOffset) { $Boundaries["B"] = $vY + $BoxSize + $TopOffset; }
 
-     $Width  = ($Boundaries["R"]+$Margin) - ($Boundaries["L"]-$Margin);
-     $Height = ($Boundaries["B"]+$Margin) - ($Boundaries["T"]-$Margin);
+     $Width  = ($Boundaries["R"] + $Margin) - ($Boundaries["L"] - $Margin);
+     $Height = ($Boundaries["B"] + $Margin) - ($Boundaries["T"] - $Margin);
 
-     return(array("Width"=>$Width,"Height"=>$Height));
+     return(array("Width"=>$Width, "Height"=>$Height));
     }
 
    /* Draw the line of best fit */
-   function drawScatterBestFit($Format="")
+   function drawScatterBestFit($Format = "")
     {
-     $Ticks	= isset($Format["Ticks"]) ? $Format["Ticks"] : 0;
+     $Ticks = isset($Format["Ticks"]) ? $Format["Ticks"] : 0;
 
-     $Data    = $this->pDataObject->getData();
+     $Data = $this->pDataObject->getData();
 
-     foreach($Data["ScatterSeries"] as $Key => $Series)
+     foreach ($Data["ScatterSeries"] as $Key => $Series)
       {
-       if ( $Series["isDrawable"] == TRUE )
+       if ($Series["isDrawable"] == TRUE)
         {
          $SerieX = $Series["X"]; $SerieValuesX = $Data["Series"][$SerieX]["Data"]; $SerieXAxis = $Data["Series"][$SerieX]["Axis"];
          $SerieY = $Series["Y"]; $SerieValuesY = $Data["Series"][$SerieY]["Data"]; $SerieYAxis = $Data["Series"][$SerieY]["Axis"];
 
-         $Color = array("R"=>$Series["Color"]["R"],"G"=>$Series["Color"]["G"],"B"=>$Series["Color"]["B"],"Alpha"=>$Series["Color"]["Alpha"]);
+         $Color = array("R"=>$Series["Color"]["R"], "G"=>$Series["Color"]["G"], "B"=>$Series["Color"]["B"], "Alpha"=>$Series["Color"]["Alpha"]);
          $Color["Ticks"] = $Ticks;
 
          $PosArrayX = $Data["Series"][$Series["X"]]["Data"];
          $PosArrayY = $Data["Series"][$Series["Y"]]["Data"];
 
          $Sxy = 0; $Sx = 0; $Sy = 0; $Sxx = 0;
-         foreach($PosArrayX as $Key => $Value)
+         foreach ($PosArrayX as $Key => $Value)
           {
            $X = $Value; $Y = $PosArrayY[$Key];
 
@@ -855,68 +855,68 @@ 
 
          if ((($n*$Sxx) == ($Sx*$Sx)))
           {
-           $X1 = $this->getPosArray($Data["Axis"][$SerieXAxis]["ScaleMin"],$SerieXAxis);
+           $X1 = $this->getPosArray($Data["Axis"][$SerieXAxis]["ScaleMin"], $SerieXAxis);
            $X2 = $X1;
            $Y1 = $this->pChartObject->GraphAreaY1;
            $Y2 = $this->pChartObject->GraphAreaY2;
           }
          else
           {
-           $M = (($n*$Sxy)-($Sx*$Sy)) / (($n*$Sxx)-($Sx*$Sx));
-           $B = (($Sy)-($M*$Sx))/($n);
+           $M = (($n*$Sxy) - ($Sx*$Sy))/(($n*$Sxx) - ($Sx*$Sx));
+           $B = (($Sy) - ($M*$Sx))/($n);
 
-           $X1 = $this->getPosArray($Data["Axis"][$SerieXAxis]["ScaleMin"],$SerieXAxis);
-           $Y1 = $this->getPosArray($M * $Data["Axis"][$SerieXAxis]["ScaleMin"] + $B,$SerieYAxis);
-           $X2 = $this->getPosArray($Data["Axis"][$SerieXAxis]["ScaleMax"],$SerieXAxis);
-           $Y2 = $this->getPosArray($M * $Data["Axis"][$SerieXAxis]["ScaleMax"] + $B,$SerieYAxis);
+           $X1 = $this->getPosArray($Data["Axis"][$SerieXAxis]["ScaleMin"], $SerieXAxis);
+           $Y1 = $this->getPosArray($M*$Data["Axis"][$SerieXAxis]["ScaleMin"] + $B, $SerieYAxis);
+           $X2 = $this->getPosArray($Data["Axis"][$SerieXAxis]["ScaleMax"], $SerieXAxis);
+           $Y2 = $this->getPosArray($M*$Data["Axis"][$SerieXAxis]["ScaleMax"] + $B, $SerieYAxis);
 
-           $RealM = -($Y2-$Y1)/($X2-$X1);
+           $RealM = -($Y2 - $Y1)/($X2 - $X1);
 
-           if ( $Y1 < $this->pChartObject->GraphAreaY1 ) { $X1 = $X1 + ($this->pChartObject->GraphAreaY1-$Y1/$RealM); $Y1 = $this->pChartObject->GraphAreaY1; }
-           if ( $Y1 > $this->pChartObject->GraphAreaY2 ) { $X1 = $X1 + ($Y1-$this->pChartObject->GraphAreaY2)/$RealM; $Y1 = $this->pChartObject->GraphAreaY2; }
-           if ( $Y2 < $this->pChartObject->GraphAreaY1 ) { $X2 = $X2 - ($this->pChartObject->GraphAreaY1-$Y2)/$RealM; $Y2 = $this->pChartObject->GraphAreaY1; }
-           if ( $Y2 > $this->pChartObject->GraphAreaY2 ) { $X2 = $X2 - ($Y2-$this->pChartObject->GraphAreaY2)/$RealM; $Y2 = $this->pChartObject->GraphAreaY2; }
+           if ($Y1 < $this->pChartObject->GraphAreaY1) { $X1 = $X1 + ($this->pChartObject->GraphAreaY1 - $Y1/$RealM); $Y1 = $this->pChartObject->GraphAreaY1; }
+           if ($Y1 > $this->pChartObject->GraphAreaY2) { $X1 = $X1 + ($Y1 - $this->pChartObject->GraphAreaY2)/$RealM; $Y1 = $this->pChartObject->GraphAreaY2; }
+           if ($Y2 < $this->pChartObject->GraphAreaY1) { $X2 = $X2 - ($this->pChartObject->GraphAreaY1 - $Y2)/$RealM; $Y2 = $this->pChartObject->GraphAreaY1; }
+           if ($Y2 > $this->pChartObject->GraphAreaY2) { $X2 = $X2 - ($Y2 - $this->pChartObject->GraphAreaY2)/$RealM; $Y2 = $this->pChartObject->GraphAreaY2; }
           }
 
-         $this->pChartObject->drawLine($X1,$Y1,$X2,$Y2,$Color);
+         $this->pChartObject->drawLine($X1, $Y1, $X2, $Y2, $Color);
         }
       }
     }
 
-   function writeScatterLabel($ScatterSerieID,$Points,$Format="")
+   function writeScatterLabel($ScatterSerieID, $Points, $Format = "")
     {
-     $OverrideTitle	= isset($Format["OverrideTitle"]) ? $Format["OverrideTitle"] : NULL;
-     $DrawPoint		= isset($Format["DrawPoint"]) ? $Format["DrawPoint"] : LABEL_POINT_BOX;
-     $Decimals		= isset($Format["Decimals"]) ? $Format["Decimals"] : NULL;
+     $OverrideTitle = isset($Format["OverrideTitle"]) ? $Format["OverrideTitle"] : NULL;
+     $DrawPoint = isset($Format["DrawPoint"]) ? $Format["DrawPoint"] : LABEL_POINT_BOX;
+     $Decimals = isset($Format["Decimals"]) ? $Format["Decimals"] : NULL;
 
      $Data    = $this->pDataObject->getData();
      $Palette = $this->pDataObject->getPalette();
 
-     if ( !is_array($Points) ) { $Point = $Points; $Points = ""; $Points[0] = $Point; }
+     if (!is_array($Points)) { $Point = $Points; $Points = ""; $Points[0] = $Point; }
 
-     if ( !isset($Data["ScatterSeries"][$ScatterSerieID]) ) 
+     if (!isset($Data["ScatterSeries"][$ScatterSerieID])) 
       return(0);
 
      $Series = $Data["ScatterSeries"][$ScatterSerieID];
      $SerieX = $Series["X"]; $SerieValuesX = $Data["Series"][$SerieX]["Data"]; $SerieXAxis = $Data["Series"][$SerieX]["Axis"];
      $SerieY = $Series["Y"]; $SerieValuesY = $Data["Series"][$SerieY]["Data"]; $SerieYAxis = $Data["Series"][$SerieY]["Axis"];
 
-     $PosArrayX = $this->getPosArray($SerieValuesX,$SerieXAxis);
-     if ( !is_array($PosArrayX) ) { $Value = $PosArrayX; $PosArrayX = ""; $PosArrayX[0] = $Value; }
-     $PosArrayY = $this->getPosArray($SerieValuesY,$SerieYAxis);
-     if ( !is_array($PosArrayY) ) { $Value = $PosArrayY; $PosArrayY = ""; $PosArrayY[0] = $Value; }
+     $PosArrayX = $this->getPosArray($SerieValuesX, $SerieXAxis);
+     if (!is_array($PosArrayX)) { $Value = $PosArrayX; $PosArrayX = ""; $PosArrayX[0] = $Value; }
+     $PosArrayY = $this->getPosArray($SerieValuesY, $SerieYAxis);
+     if (!is_array($PosArrayY)) { $Value = $PosArrayY; $PosArrayY = ""; $PosArrayY[0] = $Value; }
 
-     foreach($Points as $Key => $Point)
+     foreach ($Points as $Key => $Point)
       {
-       if ( isset($PosArrayX[$Point]) && isset($PosArrayY[$Point]) )
+       if (isset($PosArrayX[$Point]) && isset($PosArrayY[$Point]))
         {
          $X = floor($PosArrayX[$Point]);
          $Y = floor($PosArrayY[$Point]);
 
-         if ( $DrawPoint == LABEL_POINT_CIRCLE )
-          $this->pChartObject->drawFilledCircle($X,$Y,3,array("R"=>255,"G"=>255,"B"=>255,"BorderR"=>0,"BorderG"=>0,"BorderB"=>0));
-         elseif ( $DrawPoint == LABEL_POINT_BOX )
-          $this->pChartObject->drawFilledRectangle($X-2,$Y-2,$X+2,$Y+2,array("R"=>255,"G"=>255,"B"=>255,"BorderR"=>0,"BorderG"=>0,"BorderB"=>0));
+         if ($DrawPoint == LABEL_POINT_CIRCLE)
+          $this->pChartObject->drawFilledCircle($X, $Y, 3, array("R"=>255, "G"=>255, "B"=>255, "BorderR"=>0, "BorderG"=>0, "BorderB"=>0));
+         elseif ($DrawPoint == LABEL_POINT_BOX)
+          $this->pChartObject->drawFilledRectangle($X - 2, $Y - 2, $X + 2, $Y + 2, array("R"=>255, "G"=>255, "B"=>255, "BorderR"=>0, "BorderG"=>0, "BorderB"=>0));
 
          $Serie = "";
          $Serie["R"] = $Series["Color"]["R"];
@@ -927,125 +927,125 @@ 
          $XAxisMode   = $Data["Axis"][$SerieXAxis]["Display"];
          $XAxisFormat = $Data["Axis"][$SerieXAxis]["Format"];
          $XAxisUnit   = $Data["Axis"][$SerieXAxis]["Unit"];
-         if ( $Decimals == NULL ) { $XValue = $SerieValuesX[$Point]; } else { $XValue = round($SerieValuesX[$Point],$Decimals); }
-         $XValue      = $this->pChartObject->scaleFormat($XValue,$XAxisMode,$XAxisFormat,$XAxisUnit);
+         if ($Decimals == NULL) { $XValue = $SerieValuesX[$Point]; } else { $XValue = round($SerieValuesX[$Point], $Decimals); }
+         $XValue      = $this->pChartObject->scaleFormat($XValue, $XAxisMode, $XAxisFormat, $XAxisUnit);
 
          $YAxisMode   = $Data["Axis"][$SerieYAxis]["Display"];
          $YAxisFormat = $Data["Axis"][$SerieYAxis]["Format"];
          $YAxisUnit   = $Data["Axis"][$SerieYAxis]["Unit"];
-         if ( $Decimals == NULL ) { $YValue = $SerieValuesY[$Point]; } else { $YValue = round($SerieValuesY[$Point],$Decimals); }
-         $YValue      = $this->pChartObject->scaleFormat($YValue,$YAxisMode,$YAxisFormat,$YAxisUnit);
+         if ($Decimals == NULL) { $YValue = $SerieValuesY[$Point]; } else { $YValue = round($SerieValuesY[$Point], $Decimals); }
+         $YValue      = $this->pChartObject->scaleFormat($YValue, $YAxisMode, $YAxisFormat, $YAxisUnit);
 
          $Caption = $XValue." / ".$YValue;
 
-         if ( isset($Series["Description"]) )
+         if (isset($Series["Description"]))
           $Description = $Series["Description"];
          else
           $Description = "No description";
 
          $Series = "";
-         $Series[] = array("Format"=>$Serie,"Caption"=>$Caption);
+         $Series[] = array("Format"=>$Serie, "Caption"=>$Caption);
 
-         $this->pChartObject->drawLabelBox($X,$Y-3,$Description,$Series,$Format);
+         $this->pChartObject->drawLabelBox($X, $Y - 3, $Description, $Series, $Format);
         }
       }
     }
 
    /* Draw a Scatter threshold */
-   function drawScatterThreshold($Value,$Format="")
+   function drawScatterThreshold($Value, $Format = "")
     {
-     $AxisID		= isset($Format["AxisID"]) ? $Format["AxisID"] : 0;
+     $AxisID = isset($Format["AxisID"]) ? $Format["AxisID"] : 0;
      $R			= isset($Format["R"]) ? $Format["R"] : 255;
      $G			= isset($Format["G"]) ? $Format["G"] : 0;
      $B			= isset($Format["B"]) ? $Format["B"] : 0;
      $Alpha		= isset($Format["Alpha"]) ? $Format["Alpha"] : 50;
-     $Weight		= isset($Format["Weight"]) ? $Format["Weight"] : NULL;
+     $Weight = isset($Format["Weight"]) ? $Format["Weight"] : NULL;
      $Ticks		= isset($Format["Ticks"]) ? $Format["Ticks"] : 3;
-     $Wide		= isset($Format["Wide"]) ? $Format["Wide"] : FALSE;
-     $WideFactor	= isset($Format["WideFactor"]) ? $Format["WideFactor"] : 5;
+     $Wide = isset($Format["Wide"]) ? $Format["Wide"] : FALSE;
+     $WideFactor = isset($Format["WideFactor"]) ? $Format["WideFactor"] : 5;
      $WriteCaption	= isset($Format["WriteCaption"]) ? $Format["WriteCaption"] : FALSE;
-     $Caption		= isset($Format["Caption"]) ? $Format["Caption"] : NULL;
+     $Caption = isset($Format["Caption"]) ? $Format["Caption"] : NULL;
      $CaptionAlign	= isset($Format["CaptionAlign"]) ? $Format["CaptionAlign"] : CAPTION_LEFT_TOP;
-     $CaptionOffset     = isset($Format["CaptionOffset"]) ? $Format["CaptionOffset"] : 10;
+     $CaptionOffset = isset($Format["CaptionOffset"]) ? $Format["CaptionOffset"] : 10;
      $CaptionR		= isset($Format["CaptionR"]) ? $Format["CaptionR"] : 255;
      $CaptionG		= isset($Format["CaptionG"]) ? $Format["CaptionG"] : 255;
      $CaptionB		= isset($Format["CaptionB"]) ? $Format["CaptionB"] : 255;
      $CaptionAlpha	= isset($Format["CaptionAlpha"]) ? $Format["CaptionAlpha"] : 100;
-     $DrawBox		= isset($Format["DrawBox"]) ? $Format["DrawBox"] : TRUE;
+     $DrawBox = isset($Format["DrawBox"]) ? $Format["DrawBox"] : TRUE;
      $DrawBoxBorder	= isset($Format["DrawBoxBorder"]) ? $Format["DrawBoxBorder"] : FALSE;
      $BorderOffset	= isset($Format["BorderOffset"]) ? $Format["BorderOffset"] : 5;
-     $BoxRounded	= isset($Format["BoxRounded"]) ? $Format["BoxRounded"] : TRUE;
+     $BoxRounded = isset($Format["BoxRounded"]) ? $Format["BoxRounded"] : TRUE;
      $RoundedRadius	= isset($Format["RoundedRadius"]) ? $Format["RoundedRadius"] : 3;
      $BoxR		= isset($Format["BoxR"]) ? $Format["BoxR"] : 0;
      $BoxG		= isset($Format["BoxG"]) ? $Format["BoxG"] : 0;
      $BoxB		= isset($Format["BoxB"]) ? $Format["BoxB"] : 0;
-     $BoxAlpha		= isset($Format["BoxAlpha"]) ? $Format["BoxAlpha"] : 20;
-     $BoxSurrounding	= isset($Format["BoxSurrounding"]) ? $Format["BoxSurrounding"] : "";
+     $BoxAlpha = isset($Format["BoxAlpha"]) ? $Format["BoxAlpha"] : 20;
+     $BoxSurrounding = isset($Format["BoxSurrounding"]) ? $Format["BoxSurrounding"] : "";
      $BoxBorderR	= isset($Format["BoxBorderR"]) ? $Format["BoxBorderR"] : 255;
      $BoxBorderG	= isset($Format["BoxBorderG"]) ? $Format["BoxBorderG"] : 255;
      $BoxBorderB	= isset($Format["BoxBorderB"]) ? $Format["BoxBorderB"] : 255;
-     $BoxBorderAlpha	= isset($Format["BoxBorderAlpha"]) ? $Format["BoxBorderAlpha"] : 100;
+     $BoxBorderAlpha = isset($Format["BoxBorderAlpha"]) ? $Format["BoxBorderAlpha"] : 100;
 
-     $CaptionSettings = array("DrawBox"=>$DrawBox,"DrawBoxBorder"=>$DrawBoxBorder,"BorderOffset"=>$BorderOffset,"BoxRounded"=>$BoxRounded,"RoundedRadius"=>$RoundedRadius,
-                              "BoxR"=>$BoxR,"BoxG"=>$BoxG,"BoxB"=>$BoxB,"BoxAlpha"=>$BoxAlpha,"BoxSurrounding"=>$BoxSurrounding,
-                              "BoxBorderR"=>$BoxBorderR,"BoxBorderG"=>$BoxBorderG,"BoxBorderB"=>$BoxBorderB,"BoxBorderAlpha"=>$BoxBorderAlpha,
-                              "R"=>$CaptionR,"G"=>$CaptionG,"B"=>$CaptionB,"Alpha"=>$CaptionAlpha);
+     $CaptionSettings = array("DrawBox"=>$DrawBox, "DrawBoxBorder"=>$DrawBoxBorder, "BorderOffset"=>$BorderOffset, "BoxRounded"=>$BoxRounded, "RoundedRadius"=>$RoundedRadius,
+                              "BoxR"=>$BoxR, "BoxG"=>$BoxG, "BoxB"=>$BoxB, "BoxAlpha"=>$BoxAlpha, "BoxSurrounding"=>$BoxSurrounding,
+                              "BoxBorderR"=>$BoxBorderR, "BoxBorderG"=>$BoxBorderG, "BoxBorderB"=>$BoxBorderB, "BoxBorderAlpha"=>$BoxBorderAlpha,
+                              "R"=>$CaptionR, "G"=>$CaptionG, "B"=>$CaptionB, "Alpha"=>$CaptionAlpha);
 
-     if ( $Caption == NULL ) { $Caption = $Value; }
+     if ($Caption == NULL) { $Caption = $Value; }
 
      $Data = $this->pDataObject->getData();
 
-     if ( !isset($Data["Axis"][$AxisID]) ) { return(-1); }
+     if (!isset($Data["Axis"][$AxisID])) { return(-1); }
  
-     if ( $Data["Axis"][$AxisID]["Identity"] == AXIS_Y )
+     if ($Data["Axis"][$AxisID]["Identity"] == AXIS_Y)
       {
        $X1 = $this->pChartObject->GraphAreaX1 + $Data["Axis"][$AxisID]["Margin"];
        $X2 = $this->pChartObject->GraphAreaX2 - $Data["Axis"][$AxisID]["Margin"];
-       $Y  = $this->getPosArray($Value,$AxisID);
+       $Y  = $this->getPosArray($Value, $AxisID);
 
-       $this->pChartObject->drawLine($X1,$Y,$X2,$Y,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight));
+       $this->pChartObject->drawLine($X1, $Y, $X2, $Y, array("R"=>$R, "G"=>$G, "B"=>$B, "Alpha"=>$Alpha, "Ticks"=>$Ticks, "Weight"=>$Weight));
 
-       if ( $Wide )
+       if ($Wide)
         {
-         $this->pChartObject->drawLine($X1,$Y-1,$X2,$Y-1,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/$WideFactor,"Ticks"=>$Ticks));
-         $this->pChartObject->drawLine($X1,$Y+1,$X2,$Y+1,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/$WideFactor,"Ticks"=>$Ticks));
+         $this->pChartObject->drawLine($X1, $Y - 1, $X2, $Y - 1, array("R"=>$R, "G"=>$G, "B"=>$B, "Alpha"=>$Alpha/$WideFactor, "Ticks"=>$Ticks));
+         $this->pChartObject->drawLine($X1, $Y + 1, $X2, $Y + 1, array("R"=>$R, "G"=>$G, "B"=>$B, "Alpha"=>$Alpha/$WideFactor, "Ticks"=>$Ticks));
         }
 
-       if ( $WriteCaption )
+       if ($WriteCaption)
         {
-         if ( $CaptionAlign == CAPTION_LEFT_TOP )
+         if ($CaptionAlign == CAPTION_LEFT_TOP)
           { $X = $this->pChartObject->GraphAreaX1 + $Data["Axis"][$AxisID]["Margin"] + $CaptionOffset; $CaptionSettings["Align"] = TEXT_ALIGN_MIDDLELEFT; }
          else 
           { $X = $this->pChartObject->GraphAreaX2 - $Data["Axis"][$AxisID]["Margin"] - $CaptionOffset; $CaptionSettings["Align"] = TEXT_ALIGN_MIDDLERIGHT; }
 
-         $this->pChartObject->drawText($X,$Y,$Caption,$CaptionSettings);
+         $this->pChartObject->drawText($X, $Y, $Caption, $CaptionSettings);
         }
 
        return(array("Y"=>$Y));
       }
-     elseif ( $Data["Axis"][$AxisID]["Identity"] == AXIS_X )
+     elseif ($Data["Axis"][$AxisID]["Identity"] == AXIS_X)
       {
-       $X  = $this->getPosArray($Value,$AxisID);
+       $X  = $this->getPosArray($Value, $AxisID);
        $Y1 = $this->pChartObject->GraphAreaY1 + $Data["Axis"][$AxisID]["Margin"];
        $Y2 = $this->pChartObject->GraphAreaY2 - $Data["Axis"][$AxisID]["Margin"];
 
-       $this->pChartObject->drawLine($X,$Y1,$X,$Y2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight));
+       $this->pChartObject->drawLine($X, $Y1, $X, $Y2, array("R"=>$R, "G"=>$G, "B"=>$B, "Alpha"=>$Alpha, "Ticks"=>$Ticks, "Weight"=>$Weight));
 
-       if ( $Wide )
+       if ($Wide)
         {
-         $this->pChartObject->drawLine($X-1,$Y1,$X-1,$Y2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/$WideFactor,"Ticks"=>$Ticks));
-         $this->pChartObject->drawLine($X+1,$Y1,$X+1,$Y2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/$WideFactor,"Ticks"=>$Ticks));
+         $this->pChartObject->drawLine($X - 1, $Y1, $X - 1, $Y2, array("R"=>$R, "G"=>$G, "B"=>$B, "Alpha"=>$Alpha/$WideFactor, "Ticks"=>$Ticks));
+         $this->pChartObject->drawLine($X + 1, $Y1, $X + 1, $Y2, array("R"=>$R, "G"=>$G, "B"=>$B, "Alpha"=>$Alpha/$WideFactor, "Ticks"=>$Ticks));
         }
 
-       if ( $WriteCaption )
+       if ($WriteCaption)
         {
-         if ( $CaptionAlign == CAPTION_LEFT_TOP )
+         if ($CaptionAlign == CAPTION_LEFT_TOP)
           { $Y = $this->pChartObject->GraphAreaY1 + $Data["Axis"][$AxisID]["Margin"] + $CaptionOffset; $CaptionSettings["Align"] = TEXT_ALIGN_TOPMIDDLE; }
          else 
           { $Y = $this->pChartObject->GraphAreaY2 - $Data["Axis"][$AxisID]["Margin"] - $CaptionOffset; $CaptionSettings["Align"] = TEXT_ALIGN_BOTTOMMIDDLE; }
 
          $CaptionSettings["Align"] = TEXT_ALIGN_TOPMIDDLE;
-         $this->pChartObject->drawText($X,$Y,$Caption,$CaptionSettings);
+         $this->pChartObject->drawText($X, $Y, $Caption, $CaptionSettings);
         }
 
        return(array("X"=>$X));
@@ -1053,13 +1053,13 @@ 
     }
 
    /* Draw a Scatter threshold area */
-   function drawScatterThresholdArea($Value1,$Value2,$Format="")
+   function drawScatterThresholdArea($Value1, $Value2, $Format = "")
     {
-     $AxisID	= isset($Format["AxisID"]) ? $Format["AxisID"] : 0;
+     $AxisID = isset($Format["AxisID"]) ? $Format["AxisID"] : 0;
      $R		= isset($Format["R"]) ? $Format["R"] : 255;
      $G		= isset($Format["G"]) ? $Format["G"] : 0;
      $B		= isset($Format["B"]) ? $Format["B"] : 0;
-     $Alpha	= isset($Format["Alpha"]) ? $Format["Alpha"] : 20;
+     $Alpha = isset($Format["Alpha"]) ? $Format["Alpha"] : 20;
      $Border    = isset($Format["Border"]) ? $Format["Border"] : TRUE;
      $BorderR   = isset($Format["BorderR"]) ? $Format["BorderR"] : $R;
      $BorderG   = isset($Format["BorderG"]) ? $Format["BorderG"] : $G;
@@ -1071,87 +1071,87 @@ 
      $NameR	= isset($Format["NameR"]) ? $Format["NameR"] : 255;
      $NameG	= isset($Format["NameG"]) ? $Format["NameG"] : 255;
      $NameB	= isset($Format["NameB"]) ? $Format["NameB"] : 255;
-     $NameAlpha	= isset($Format["NameAlpha"]) ? $Format["NameAlpha"] : 100;
+     $NameAlpha = isset($Format["NameAlpha"]) ? $Format["NameAlpha"] : 100;
      $DisableShadowOnArea = isset($Format["DisableShadowOnArea"]) ? $Format["DisableShadowOnArea"] : TRUE;
 
      if ($Value1 > $Value2) { list($Value1, $Value2) = array($Value2, $Value1); }
 
      $RestoreShadow = $this->pChartObject->Shadow;
-     if ( $DisableShadowOnArea && $this->pChartObject->Shadow ) { $this->pChartObject->Shadow = FALSE; }
+     if ($DisableShadowOnArea && $this->pChartObject->Shadow) { $this->pChartObject->Shadow = FALSE; }
 
-     if ($BorderAlpha >100) { $BorderAlpha = 100;}
+     if ($BorderAlpha > 100) { $BorderAlpha = 100; }
 
      $Data = $this->pDataObject->getData();
 
-     if ( !isset($Data["Axis"][$AxisID]) ) { return(-1); }
+     if (!isset($Data["Axis"][$AxisID])) { return(-1); }
  
-     if ( $Data["Axis"][$AxisID]["Identity"] == AXIS_X )
+     if ($Data["Axis"][$AxisID]["Identity"] == AXIS_X)
       {
        $Y1 = $this->pChartObject->GraphAreaY1 + $Data["Axis"][$AxisID]["Margin"];
        $Y2 = $this->pChartObject->GraphAreaY2 - $Data["Axis"][$AxisID]["Margin"];
-       $X1  = $this->getPosArray($Value1,$AxisID);
-       $X2  = $this->getPosArray($Value2,$AxisID);
+       $X1  = $this->getPosArray($Value1, $AxisID);
+       $X2  = $this->getPosArray($Value2, $AxisID);
 
-       if ( $X1 <= $this->pChartObject->GraphAreaX1 ) { $X1 = $this->pChartObject->GraphAreaX1+$Data["Axis"][$AxisID]["Margin"]; }
-       if ( $X2 >= $this->pChartObject->GraphAreaX2 ) { $X2 = $this->pChartObject->GraphAreaX2-$Data["Axis"][$AxisID]["Margin"]; }
+       if ($X1 <= $this->pChartObject->GraphAreaX1) { $X1 = $this->pChartObject->GraphAreaX1 + $Data["Axis"][$AxisID]["Margin"]; }
+       if ($X2 >= $this->pChartObject->GraphAreaX2) { $X2 = $this->pChartObject->GraphAreaX2 - $Data["Axis"][$AxisID]["Margin"]; }
 
-       $this->pChartObject->drawFilledRectangle($X1,$Y1,$X2,$Y2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
+       $this->pChartObject->drawFilledRectangle($X1, $Y1, $X2, $Y2, array("R"=>$R, "G"=>$G, "B"=>$B, "Alpha"=>$Alpha));
 
-       if ( $Border )
+       if ($Border)
         {
-         $this->pChartObject->drawLine($X1,$Y1,$X1,$Y2,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Ticks"=>$BorderTicks));
-         $this->pChartObject->drawLine($X2,$Y1,$X2,$Y2,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Ticks"=>$BorderTicks));
+         $this->pChartObject->drawLine($X1, $Y1, $X1, $Y2, array("R"=>$BorderR, "G"=>$BorderG, "B"=>$BorderB, "Alpha"=>$BorderAlpha, "Ticks"=>$BorderTicks));
+         $this->pChartObject->drawLine($X2, $Y1, $X2, $Y2, array("R"=>$BorderR, "G"=>$BorderG, "B"=>$BorderB, "Alpha"=>$BorderAlpha, "Ticks"=>$BorderTicks));
         }
 
-       if ( $AreaName != NULL )
+       if ($AreaName != NULL)
         {
-         $XPos = ($X2-$X1)/2 + $X1;
-         $YPos = ($Y2-$Y1)/2 + $Y1;
+         $XPos = ($X2 - $X1)/2 + $X1;
+         $YPos = ($Y2 - $Y1)/2 + $Y1;
 
-         if ( $NameAngle == ZONE_NAME_ANGLE_AUTO )
+         if ($NameAngle == ZONE_NAME_ANGLE_AUTO)
           {
-           $TxtPos   = $this->pChartObject->getTextBox($XPos,$YPos,$this->pChartObject->FontName,$this->pChartObject->FontSize,0,$AreaName);
+           $TxtPos   = $this->pChartObject->getTextBox($XPos, $YPos, $this->pChartObject->FontName, $this->pChartObject->FontSize, 0, $AreaName);
            $TxtWidth = $TxtPos[1]["X"] - $TxtPos[0]["X"];
-           if ( abs($X2 - $X1) > $TxtWidth ) { $NameAngle = 0; } else { $NameAngle = 90; }
+           if (abs($X2 - $X1) > $TxtWidth) { $NameAngle = 0; } else { $NameAngle = 90; }
           }
          $this->pChartObject->Shadow = $RestoreShadow;
-         $this->pChartObject->drawText($XPos,$YPos,$AreaName,array("R"=>$NameR,"G"=>$NameG,"B"=>$NameB,"Alpha"=>$NameAlpha,"Angle"=>$NameAngle,"Align"=>TEXT_ALIGN_MIDDLEMIDDLE));
-         if ( $DisableShadowOnArea ) { $this->pChartObject->Shadow = FALSE; }
+         $this->pChartObject->drawText($XPos, $YPos, $AreaName, array("R"=>$NameR, "G"=>$NameG, "B"=>$NameB, "Alpha"=>$NameAlpha, "Angle"=>$NameAngle, "Align"=>TEXT_ALIGN_MIDDLEMIDDLE));
+         if ($DisableShadowOnArea) { $this->pChartObject->Shadow = FALSE; }
         }
 
        $this->pChartObject->Shadow = $RestoreShadow;
-       return(array("X1"=>$X1,"X2"=>$X2));
+       return(array("X1"=>$X1, "X2"=>$X2));
       }
-     elseif ( $Data["Axis"][$AxisID]["Identity"] == AXIS_Y )
+     elseif ($Data["Axis"][$AxisID]["Identity"] == AXIS_Y)
       {
        $X1 = $this->pChartObject->GraphAreaX1 + $Data["Axis"][$AxisID]["Margin"];
        $X2 = $this->pChartObject->GraphAreaX2 - $Data["Axis"][$AxisID]["Margin"];
-       $Y1 = $this->getPosArray($Value1,$AxisID);
-       $Y2 = $this->getPosArray($Value2,$AxisID);
+       $Y1 = $this->getPosArray($Value1, $AxisID);
+       $Y2 = $this->getPosArray($Value2, $AxisID);
 
-       if ( $Y1 >= $this->pChartObject->GraphAreaY2 ) { $Y1 = $this->pChartObject->GraphAreaY2-$Data["Axis"][$AxisID]["Margin"]; }
-       if ( $Y2 <= $this->pChartObject->GraphAreaY1 ) { $Y2 = $this->pChartObject->GraphAreaY1+$Data["Axis"][$AxisID]["Margin"]; }
+       if ($Y1 >= $this->pChartObject->GraphAreaY2) { $Y1 = $this->pChartObject->GraphAreaY2 - $Data["Axis"][$AxisID]["Margin"]; }
+       if ($Y2 <= $this->pChartObject->GraphAreaY1) { $Y2 = $this->pChartObject->GraphAreaY1 + $Data["Axis"][$AxisID]["Margin"]; }
 
-       $this->pChartObject->drawFilledRectangle($X1,$Y1,$X2,$Y2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
+       $this->pChartObject->drawFilledRectangle($X1, $Y1, $X2, $Y2, array("R"=>$R, "G"=>$G, "B"=>$B, "Alpha"=>$Alpha));
 
-       if ( $Border )
+       if ($Border)
         {
-         $this->pChartObject->drawLine($X1,$Y1,$X2,$Y1,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Ticks"=>$BorderTicks));
-         $this->pChartObject->drawLine($X1,$Y2,$X2,$Y2,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Ticks"=>$BorderTicks));
+         $this->pChartObject->drawLine($X1, $Y1, $X2, $Y1, array("R"=>$BorderR, "G"=>$BorderG, "B"=>$BorderB, "Alpha"=>$BorderAlpha, "Ticks"=>$BorderTicks));
+         $this->pChartObject->drawLine($X1, $Y2, $X2, $Y2, array("R"=>$BorderR, "G"=>$BorderG, "B"=>$BorderB, "Alpha"=>$BorderAlpha, "Ticks"=>$BorderTicks));
         }
 
-       if ( $AreaName != NULL )
+       if ($AreaName != NULL)
         {
-         $XPos = ($X2-$X1)/2 + $X1;
-         $YPos = ($Y2-$Y1)/2 + $Y1;
+         $XPos = ($X2 - $X1)/2 + $X1;
+         $YPos = ($Y2 - $Y1)/2 + $Y1;
 
          $this->pChartObject->Shadow = $RestoreShadow;
-         $this->pChartObject->drawText($YPos,$XPos,$AreaName,array("R"=>$NameR,"G"=>$NameG,"B"=>$NameB,"Alpha"=>$NameAlpha,"Angle"=>0,"Align"=>TEXT_ALIGN_MIDDLEMIDDLE));
-         if ( $DisableShadowOnArea ) { $this->Shadow = FALSE; }
+         $this->pChartObject->drawText($YPos, $XPos, $AreaName, array("R"=>$NameR, "G"=>$NameG, "B"=>$NameB, "Alpha"=>$NameAlpha, "Angle"=>0, "Align"=>TEXT_ALIGN_MIDDLEMIDDLE));
+         if ($DisableShadowOnArea) { $this->Shadow = FALSE; }
         }
 
        $this->pChartObject->Shadow = $RestoreShadow;
-       return(array("Y1"=>$Y1,"Y2"=>$Y2));
+       return(array("Y1"=>$Y1, "Y2"=>$Y2));
       }
     }
   }

drupal/sites/default/boinc/modules/boincstats/includes/pchart/class/pSplit.class.php

Spacing +41 added lines, -41 removed lines

@@ -13,8 +13,8 @@ 
      You can find the whole class documentation on the pChart web site.
  */
 
- define("TEXT_POS_TOP"		, 690001);
- define("TEXT_POS_RIGHT"	, 690002);
+ define("TEXT_POS_TOP", 690001);
+ define("TEXT_POS_RIGHT", 690002);
 
  /* pSplit class definition */
  class pSplit
@@ -26,15 +26,15 @@ 
     { }
 
    /* Create the encoded string */
-   function drawSplitPath($Object,$Values,$Format="")
+   function drawSplitPath($Object, $Values, $Format = "")
     {
      $this->pChartObject = $Object;
 
      $Spacing		= isset($Format["Spacing"]) ? $Format["Spacing"] : 20;
-     $TextPadding	= isset($Format["TextPadding"]) ? $Format["TextPadding"] : 2;
+     $TextPadding = isset($Format["TextPadding"]) ? $Format["TextPadding"] : 2;
      $TextPos		= isset($Format["TextPos"]) ? $Format["TextPos"] : TEXT_POS_TOP;
-     $Surrounding       = isset($Format["Surrounding"]) ? $Format["Surrounding"] : NULL;
-     $Force		= isset($Format["Force"]) ? $Format["Force"] : 70;
+     $Surrounding = isset($Format["Surrounding"]) ? $Format["Surrounding"] : NULL;
+     $Force = isset($Format["Force"]) ? $Format["Force"] : 70;
      $Segments		= isset($Format["Segments"]) ? $Format["Segments"] : 15;
      $FontSize		= $Object->FontSize;
      $X1		= $Object->GraphAreaX1;
@@ -49,79 +49,79 @@ 
      $LabelSerie = $Data["Abscissa"];
      $DataSerie  = "";
 
-     foreach($Data["Series"] as $SerieName => $Value)
-      { if ( $SerieName != $LabelSerie && $DataSerie == "" ) { $DataSerie = $SerieName; } }
+     foreach ($Data["Series"] as $SerieName => $Value)
+      { if ($SerieName != $LabelSerie && $DataSerie == "") { $DataSerie = $SerieName; } }
 
      $DataSerieSum   = array_sum($Data["Series"][$DataSerie]["Data"]);
      $DataSerieCount = count($Data["Series"][$DataSerie]["Data"]);
 
      /* Scale Processing */
-     if ( $TextPos == TEXT_POS_RIGHT )
-      $YScale     = (($Y2-$Y1) - (($DataSerieCount+1)*$Spacing)) / $DataSerieSum;
+     if ($TextPos == TEXT_POS_RIGHT)
+      $YScale     = (($Y2 - $Y1) - (($DataSerieCount + 1)*$Spacing))/$DataSerieSum;
      else
-      $YScale     = (($Y2-$Y1) - ($DataSerieCount*$Spacing)) / $DataSerieSum;
-     $LeftHeight = $DataSerieSum * $YScale;
+      $YScale     = (($Y2 - $Y1) - ($DataSerieCount*$Spacing))/$DataSerieSum;
+     $LeftHeight = $DataSerieSum*$YScale;
 
      /* Re-compute graph width depending of the text mode choosen */
-     if ( $TextPos == TEXT_POS_RIGHT )
+     if ($TextPos == TEXT_POS_RIGHT)
       {
        $MaxWidth = 0;
-       foreach($Data["Series"][$LabelSerie]["Data"] as $Key => $Label)
+       foreach ($Data["Series"][$LabelSerie]["Data"] as $Key => $Label)
         {
-         $Boundardies = $Object->getTextBox(0,0,$Object->FontName,$Object->FontSize,0,$Label);
-         if ( $Boundardies[1]["X"] > $MaxWidth ) { $MaxWidth = $Boundardies[1]["X"] + $TextPadding*2; }
+         $Boundardies = $Object->getTextBox(0, 0, $Object->FontName, $Object->FontSize, 0, $Label);
+         if ($Boundardies[1]["X"] > $MaxWidth) { $MaxWidth = $Boundardies[1]["X"] + $TextPadding*2; }
         }
        $X2 = $X2 - $MaxWidth;
       }
 
      /* Drawing */
-     $LeftY    = ((($Y2-$Y1) / 2) + $Y1) - ($LeftHeight/2);
+     $LeftY    = ((($Y2 - $Y1)/2) + $Y1) - ($LeftHeight/2);
      $RightY   = $Y1;
-     $VectorX  = (($X2-$X1) / 2);
+     $VectorX  = (($X2 - $X1)/2);
 
-     foreach($Data["Series"][$DataSerie]["Data"] as $Key => $Value)
+     foreach ($Data["Series"][$DataSerie]["Data"] as $Key => $Value)
       {
-       if ( isset($Data["Series"][$LabelSerie]["Data"][$Key]) )
+       if (isset($Data["Series"][$LabelSerie]["Data"][$Key]))
         $Label = $Data["Series"][$LabelSerie]["Data"][$Key];
        else
         $Label = "-";
 
        $LeftY1 = $LeftY;
-       $LeftY2 = $LeftY + $Value * $YScale;
+       $LeftY2 = $LeftY + $Value*$YScale;
 
        $RightY1 = $RightY + $Spacing;
-       $RightY2 = $RightY + $Spacing + $Value * $YScale;;
+       $RightY2 = $RightY + $Spacing + $Value*$YScale; ;
 
-       $Settings = array("R"=>$Palette[$Key]["R"],"G"=>$Palette[$Key]["G"],"B"=>$Palette[$Key]["B"],"Alpha"=>$Palette[$Key]["Alpha"],"NoDraw"=>TRUE,"Segments"=>$Segments,"Surrounding"=>$Surrounding);
+       $Settings = array("R"=>$Palette[$Key]["R"], "G"=>$Palette[$Key]["G"], "B"=>$Palette[$Key]["B"], "Alpha"=>$Palette[$Key]["Alpha"], "NoDraw"=>TRUE, "Segments"=>$Segments, "Surrounding"=>$Surrounding);
 
        $PolyGon = "";
 
-       $Angle    = $Object->getAngle($X2,$RightY1,$X1,$LeftY1);
-       $VectorX1 = cos(deg2rad($Angle+90)) * $Force + ($X2-$X1)/2 + $X1;
-       $VectorY1 = sin(deg2rad($Angle+90)) * $Force + ($RightY1-$LeftY1)/2 + $LeftY1;
-       $VectorX2 = cos(deg2rad($Angle-90)) * $Force + ($X2-$X1)/2 + $X1;
-       $VectorY2 = sin(deg2rad($Angle-90)) * $Force + ($RightY1-$LeftY1)/2 + $LeftY1;
+       $Angle    = $Object->getAngle($X2, $RightY1, $X1, $LeftY1);
+       $VectorX1 = cos(deg2rad($Angle + 90))*$Force + ($X2 - $X1)/2 + $X1;
+       $VectorY1 = sin(deg2rad($Angle + 90))*$Force + ($RightY1 - $LeftY1)/2 + $LeftY1;
+       $VectorX2 = cos(deg2rad($Angle - 90))*$Force + ($X2 - $X1)/2 + $X1;
+       $VectorY2 = sin(deg2rad($Angle - 90))*$Force + ($RightY1 - $LeftY1)/2 + $LeftY1;
 
-       $Points = $Object->drawBezier($X1,$LeftY1,$X2,$RightY1,$VectorX1,$VectorY1,$VectorX2,$VectorY2,$Settings);
-       foreach($Points as $Key => $Pos) { $PolyGon[] = $Pos["X"]; $PolyGon[] = $Pos["Y"]; }
+       $Points = $Object->drawBezier($X1, $LeftY1, $X2, $RightY1, $VectorX1, $VectorY1, $VectorX2, $VectorY2, $Settings);
+       foreach ($Points as $Key => $Pos) { $PolyGon[] = $Pos["X"]; $PolyGon[] = $Pos["Y"]; }
 
 
-       $Angle    = $Object->getAngle($X2,$RightY2,$X1,$LeftY2);
-       $VectorX1 = cos(deg2rad($Angle+90)) * $Force + ($X2-$X1)/2 +$X1;
-       $VectorY1 = sin(deg2rad($Angle+90)) * $Force + ($RightY2-$LeftY2)/2 + $LeftY2;
-       $VectorX2 = cos(deg2rad($Angle-90)) * $Force + ($X2-$X1)/2 +$X1;
-       $VectorY2 = sin(deg2rad($Angle-90)) * $Force + ($RightY2-$LeftY2)/2 + $LeftY2;
+       $Angle    = $Object->getAngle($X2, $RightY2, $X1, $LeftY2);
+       $VectorX1 = cos(deg2rad($Angle + 90))*$Force + ($X2 - $X1)/2 + $X1;
+       $VectorY1 = sin(deg2rad($Angle + 90))*$Force + ($RightY2 - $LeftY2)/2 + $LeftY2;
+       $VectorX2 = cos(deg2rad($Angle - 90))*$Force + ($X2 - $X1)/2 + $X1;
+       $VectorY2 = sin(deg2rad($Angle - 90))*$Force + ($RightY2 - $LeftY2)/2 + $LeftY2;
 
-       $Points = $Object->drawBezier($X1,$LeftY2,$X2,$RightY2,$VectorX1,$VectorY1,$VectorX2,$VectorY2,$Settings);
+       $Points = $Object->drawBezier($X1, $LeftY2, $X2, $RightY2, $VectorX1, $VectorY1, $VectorX2, $VectorY2, $Settings);
        $Points = array_reverse($Points);
-       foreach($Points as $Key => $Pos) { $PolyGon[] = $Pos["X"]; $PolyGon[] = $Pos["Y"]; }
+       foreach ($Points as $Key => $Pos) { $PolyGon[] = $Pos["X"]; $PolyGon[] = $Pos["Y"]; }
 
-       $Object->drawPolygon($PolyGon,$Settings);
+       $Object->drawPolygon($PolyGon, $Settings);
 
-       if ( $TextPos == TEXT_POS_RIGHT )
-        $Object->drawText($X2+$TextPadding,($RightY2-$RightY1)/2+$RightY1,$Label,array("Align"=>TEXT_ALIGN_MIDDLELEFT));
+       if ($TextPos == TEXT_POS_RIGHT)
+        $Object->drawText($X2 + $TextPadding, ($RightY2 - $RightY1)/2 + $RightY1, $Label, array("Align"=>TEXT_ALIGN_MIDDLELEFT));
        else
-        $Object->drawText($X2,$RightY1-$TextPadding,$Label,array("Align"=>TEXT_ALIGN_BOTTOMRIGHT));
+        $Object->drawText($X2, $RightY1 - $TextPadding, $Label, array("Align"=>TEXT_ALIGN_BOTTOMRIGHT));
 
        $LeftY  = $LeftY2;
        $RightY = $RightY2;

drupal/sites/default/boinc/modules/boincstats/includes/pchart/class/pImage.class.php

Spacing +161 added lines, -161 removed lines

@@ -21,93 +21,93 @@ 
   }
 
  /* Image map handling */
- define("IMAGE_MAP_STORAGE_FILE"	, 680001);
- define("IMAGE_MAP_STORAGE_SESSION"	, 680002);
+ define("IMAGE_MAP_STORAGE_FILE", 680001);
+ define("IMAGE_MAP_STORAGE_SESSION", 680002);
 
  /* Last generated chart layout */
- define("CHART_LAST_LAYOUT_REGULAR"	, 680011);
- define("CHART_LAST_LAYOUT_STACKED"	, 680012);
+ define("CHART_LAST_LAYOUT_REGULAR", 680011);
+ define("CHART_LAST_LAYOUT_STACKED", 680012);
 
  /* ImageMap string delimiter */
- define("IMAGE_MAP_DELIMITER"		, chr(1));
+ define("IMAGE_MAP_DELIMITER", chr(1));
 
  class pImage extends pDraw
   {
    /* Image settings, size, quality, .. */
-   var $XSize		= NULL;				// Width of the picture
-   var $YSize		= NULL;				// Height of the picture
-   var $Picture		= NULL;				// GD picture object
-   var $Antialias	= TRUE;				// Turn antialias on or off
-   var $AntialiasQuality  = 0;				// Quality of the antialiasing implementation (0-1)
-   var $Mask		= "";				// Already drawn pixels mask (Filled circle implementation)
-   var $TransparentBackground = FALSE;			// Just to know if we need to flush the alpha channels when rendering
+   var $XSize		= NULL; // Width of the picture
+   var $YSize		= NULL; // Height of the picture
+   var $Picture = NULL; // GD picture object
+   var $Antialias = TRUE; // Turn antialias on or off
+   var $AntialiasQuality = 0; // Quality of the antialiasing implementation (0-1)
+   var $Mask = ""; // Already drawn pixels mask (Filled circle implementation)
+   var $TransparentBackground = FALSE; // Just to know if we need to flush the alpha channels when rendering
 
    /* Graph area settings */
-   var $GraphAreaX1	= NULL;				// Graph area X origin
-   var $GraphAreaY1	= NULL;				// Graph area Y origin
-   var $GraphAreaX2	= NULL;				// Graph area bottom right X position
-   var $GraphAreaY2	= NULL;				// Graph area bottom right Y position
+   var $GraphAreaX1	= NULL; // Graph area X origin
+   var $GraphAreaY1	= NULL; // Graph area Y origin
+   var $GraphAreaX2	= NULL; // Graph area bottom right X position
+   var $GraphAreaY2	= NULL; // Graph area bottom right Y position
 
    /* Scale settings */
-   var $ScaleMinDivHeight = 20;				// Minimum height for scame divs
+   var $ScaleMinDivHeight = 20; // Minimum height for scame divs
 
    /* Font properties */
-   var $FontName	= "sites/all/libraries/fonts/DejaVuSans.ttf";	// Default font file
-   var $FontSize	= 12;				// Default font size
-   var $FontBox		= NULL;				// Return the bounding box of the last written string
-   var $FontColorR	= 0;				// Default color settings
-   var $FontColorG	= 0;				// Default color settings
-   var $FontColorB	= 0;				// Default color settings
-   var $FontColorA	= 100;				// Default transparency
+   var $FontName	= "sites/all/libraries/fonts/DejaVuSans.ttf"; // Default font file
+   var $FontSize	= 12; // Default font size
+   var $FontBox		= NULL; // Return the bounding box of the last written string
+   var $FontColorR	= 0; // Default color settings
+   var $FontColorG	= 0; // Default color settings
+   var $FontColorB	= 0; // Default color settings
+   var $FontColorA	= 100; // Default transparency
 
    /* Shadow properties */
-   var $Shadow		= FALSE;			// Turn shadows on or off
-   var $ShadowX		= NULL;				// X Offset of the shadow
-   var $ShadowY		= NULL;				// Y Offset of the shadow
-   var $ShadowR		= NULL;				// R component of the shadow
-   var $ShadowG		= NULL;				// G component of the shadow
-   var $ShadowB		= NULL;				// B component of the shadow
-   var $Shadowa		= NULL;				// Alpha level of the shadow
+   var $Shadow = FALSE; // Turn shadows on or off
+   var $ShadowX		= NULL; // X Offset of the shadow
+   var $ShadowY		= NULL; // Y Offset of the shadow
+   var $ShadowR		= NULL; // R component of the shadow
+   var $ShadowG		= NULL; // G component of the shadow
+   var $ShadowB		= NULL; // B component of the shadow
+   var $Shadowa		= NULL; // Alpha level of the shadow
 
    /* Image map */
-   var $ImageMap	= NULL;				// Aray containing the image map
-   var $ImageMapIndex	= "pChart";			// Name of the session array
-   var $ImageMapStorageMode = NULL;			// Save the current imagemap storage mode
-   var $ImageMapAutoDelete  = TRUE;			// Automatic deletion of the image map temp files
+   var $ImageMap	= NULL; // Aray containing the image map
+   var $ImageMapIndex = "pChart"; // Name of the session array
+   var $ImageMapStorageMode = NULL; // Save the current imagemap storage mode
+   var $ImageMapAutoDelete  = TRUE; // Automatic deletion of the image map temp files
 
    /* Data Set */
-   var $DataSet		= NULL;				// Attached dataset
+   var $DataSet = NULL; // Attached dataset
 
    /* Last generated chart info */
-   var $LastChartLayout	= CHART_LAST_LAYOUT_REGULAR;	// Last layout : regular or stacked
+   var $LastChartLayout = CHART_LAST_LAYOUT_REGULAR; // Last layout : regular or stacked
 
    /* Class constructor */
-   function pImage($XSize,$YSize,$DataSet=NULL,$TransparentBackground=FALSE)
+   function pImage($XSize, $YSize, $DataSet = NULL, $TransparentBackground = FALSE)
     {
      $this->TransparentBackground = $TransparentBackground;
 
-     if ( $DataSet != NULL ) { $this->DataSet = $DataSet; }
+     if ($DataSet != NULL) { $this->DataSet = $DataSet; }
 
      $this->XSize   = $XSize;
      $this->YSize   = $YSize;
-     $this->Picture = imagecreatetruecolor($XSize,$YSize);
+     $this->Picture = imagecreatetruecolor($XSize, $YSize);
 
-     if ( $this->TransparentBackground )
+     if ($this->TransparentBackground)
       {
-       imagealphablending($this->Picture,FALSE);
-       imagefilledrectangle($this->Picture, 0,0,$XSize, $YSize, imagecolorallocatealpha($this->Picture, 255, 255, 255, 127));
-       imagealphablending($this->Picture,TRUE);
-       imagesavealpha($this->Picture,true); 
+       imagealphablending($this->Picture, FALSE);
+       imagefilledrectangle($this->Picture, 0, 0, $XSize, $YSize, imagecolorallocatealpha($this->Picture, 255, 255, 255, 127));
+       imagealphablending($this->Picture, TRUE);
+       imagesavealpha($this->Picture, true); 
       }
      else
       {
-       $C_White = $this->AllocateColor($this->Picture,255,255,255);
-       imagefilledrectangle($this->Picture,0,0,$XSize,$YSize,$C_White);
+       $C_White = $this->AllocateColor($this->Picture, 255, 255, 255);
+       imagefilledrectangle($this->Picture, 0, 0, $XSize, $YSize, $C_White);
       }
     }
 
    /* Enable / Disable and set shadow properties */
-   function setShadow($Enabled=TRUE,$Format="")
+   function setShadow($Enabled = TRUE, $Format = "")
     {
      $X	    = isset($Format["X"]) ? $Format["X"] : 2;
      $Y	    = isset($Format["Y"]) ? $Format["Y"] : 2;
@@ -126,9 +126,9 @@ 
     }
 
    /* Set the graph area position */
-   function setGraphArea($X1,$Y1,$X2,$Y2)
+   function setGraphArea($X1, $Y1, $X2, $Y2)
     {
-     if ( $X2 < $X1 || $X1 == $X2 || $Y2 < $Y1 || $Y1 == $Y2 ) { return(-1); }
+     if ($X2 < $X1 || $X1 == $X2 || $Y2 < $Y1 || $Y1 == $Y2) { return(-1); }
 
      $this->GraphAreaX1 = $X1; $this->DataSet->Data["GraphArea"]["X1"] = $X1;
      $this->GraphAreaY1 = $Y1; $this->DataSet->Data["GraphArea"]["Y1"] = $Y1;
@@ -147,16 +147,16 @@ 
    /* Render the picture to a file */
    function render($FileName)
     {
-     if ( $this->TransparentBackground ) { imagealphablending($this->Picture,false); imagesavealpha($this->Picture,true); }
-     imagepng($this->Picture,$FileName);
+     if ($this->TransparentBackground) { imagealphablending($this->Picture, false); imagesavealpha($this->Picture, true); }
+     imagepng($this->Picture, $FileName);
     }
 
    /* Render the picture to a web browser stream */
-   function stroke($BrowserExpire=FALSE)
+   function stroke($BrowserExpire = FALSE)
     {
-     if ( $this->TransparentBackground ) { imagealphablending($this->Picture,false); imagesavealpha($this->Picture,true); }
+     if ($this->TransparentBackground) { imagealphablending($this->Picture, false); imagesavealpha($this->Picture, true); }
 
-     if ( $BrowserExpire )
+     if ($BrowserExpire)
       {
        header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
        header("Cache-Control: no-cache");
@@ -168,7 +168,7 @@ 
     }
 
    /* Automatic output method based on the calling interface */
-   function autoOutput($FileName="output.png")
+   function autoOutput($FileName = "output.png")
     {
      if (php_sapi_name() == "cli")
       $this->Render($FileName);
@@ -177,86 +177,86 @@ 
     }
 
    /* Return the length between two points */
-   function getLength($X1,$Y1,$X2,$Y2)
-    { return(sqrt(pow(max($X1,$X2)-min($X1,$X2),2)+pow(max($Y1,$Y2)-min($Y1,$Y2),2))); }
+   function getLength($X1, $Y1, $X2, $Y2)
+    { return(sqrt(pow(max($X1, $X2) - min($X1, $X2), 2) + pow(max($Y1, $Y2) - min($Y1, $Y2), 2))); }
 
    /* Return the orientation of a line */
-   function getAngle($X1,$Y1,$X2,$Y2)
+   function getAngle($X1, $Y1, $X2, $Y2)
     {
-     $Opposite = $Y2 - $Y1; $Adjacent = $X2 - $X1;$Angle = rad2deg(atan2($Opposite,$Adjacent));
-     if ($Angle > 0) { return($Angle); } else { return(360-abs($Angle)); }
+     $Opposite = $Y2 - $Y1; $Adjacent = $X2 - $X1; $Angle = rad2deg(atan2($Opposite, $Adjacent));
+     if ($Angle > 0) { return($Angle); } else { return(360 - abs($Angle)); }
     }
 
    /* Return the surrounding box of text area */
-   function getTextBox_deprecated($X,$Y,$FontName,$FontSize,$Angle,$Text)
+   function getTextBox_deprecated($X, $Y, $FontName, $FontSize, $Angle, $Text)
     {
-     $Size    = imagettfbbox($FontSize,$Angle,$FontName,$Text);
-     $Width   = $this->getLength($Size[0],$Size[1],$Size[2],$Size[3])+1;
-     $Height  = $this->getLength($Size[2],$Size[3],$Size[4],$Size[5])+1;
+     $Size    = imagettfbbox($FontSize, $Angle, $FontName, $Text);
+     $Width   = $this->getLength($Size[0], $Size[1], $Size[2], $Size[3]) + 1;
+     $Height  = $this->getLength($Size[2], $Size[3], $Size[4], $Size[5]) + 1;
 
      $RealPos[0]["X"] = $X; $RealPos[0]["Y"] = $Y;
-     $RealPos[1]["X"] = cos((360-$Angle)*PI/180)*$Width + $RealPos[0]["X"]; $RealPos[1]["Y"] = sin((360-$Angle)*PI/180)*$Width + $RealPos[0]["Y"];
-     $RealPos[2]["X"] = cos((270-$Angle)*PI/180)*$Height + $RealPos[1]["X"]; $RealPos[2]["Y"] = sin((270-$Angle)*PI/180)*$Height + $RealPos[1]["Y"];
-     $RealPos[3]["X"] = cos((180-$Angle)*PI/180)*$Width + $RealPos[2]["X"]; $RealPos[3]["Y"] = sin((180-$Angle)*PI/180)*$Width + $RealPos[2]["Y"];
+     $RealPos[1]["X"] = cos((360 - $Angle)*PI/180)*$Width + $RealPos[0]["X"]; $RealPos[1]["Y"] = sin((360 - $Angle)*PI/180)*$Width + $RealPos[0]["Y"];
+     $RealPos[2]["X"] = cos((270 - $Angle)*PI/180)*$Height + $RealPos[1]["X"]; $RealPos[2]["Y"] = sin((270 - $Angle)*PI/180)*$Height + $RealPos[1]["Y"];
+     $RealPos[3]["X"] = cos((180 - $Angle)*PI/180)*$Width + $RealPos[2]["X"]; $RealPos[3]["Y"] = sin((180 - $Angle)*PI/180)*$Width + $RealPos[2]["Y"];
 
-     $RealPos[TEXT_ALIGN_BOTTOMLEFT]["X"] = $RealPos[0]["X"];	$RealPos[TEXT_ALIGN_BOTTOMLEFT]["Y"] = $RealPos[0]["Y"];
-     $RealPos[TEXT_ALIGN_BOTTOMRIGHT]["X"] = $RealPos[1]["X"];	$RealPos[TEXT_ALIGN_BOTTOMRIGHT]["Y"] = $RealPos[1]["Y"];
+     $RealPos[TEXT_ALIGN_BOTTOMLEFT]["X"] = $RealPos[0]["X"]; $RealPos[TEXT_ALIGN_BOTTOMLEFT]["Y"] = $RealPos[0]["Y"];
+     $RealPos[TEXT_ALIGN_BOTTOMRIGHT]["X"] = $RealPos[1]["X"]; $RealPos[TEXT_ALIGN_BOTTOMRIGHT]["Y"] = $RealPos[1]["Y"];
 
      return($RealPos);
     }
 
    /* Return the surrounding box of text area */
-   function getTextBox($X,$Y,$FontName,$FontSize,$Angle,$Text)
+   function getTextBox($X, $Y, $FontName, $FontSize, $Angle, $Text)
     {
      $coords = imagettfbbox($FontSize, 0, $FontName, $Text);
 
      $a = deg2rad($Angle); $ca = cos($a); $sa = sin($a); $RealPos = array();
-     for($i = 0; $i < 7; $i += 2)
+     for ($i = 0; $i < 7; $i += 2)
       {
-       $RealPos[$i/2]["X"] = $X + round($coords[$i] * $ca + $coords[$i+1] * $sa);
-       $RealPos[$i/2]["Y"] = $Y + round($coords[$i+1] * $ca - $coords[$i] * $sa);
+       $RealPos[$i/2]["X"] = $X + round($coords[$i]*$ca + $coords[$i + 1]*$sa);
+       $RealPos[$i/2]["Y"] = $Y + round($coords[$i + 1]*$ca - $coords[$i]*$sa);
       }
 
-     $RealPos[TEXT_ALIGN_BOTTOMLEFT]["X"]	= $RealPos[0]["X"];	$RealPos[TEXT_ALIGN_BOTTOMLEFT]["Y"]	= $RealPos[0]["Y"];
-     $RealPos[TEXT_ALIGN_BOTTOMRIGHT]["X"]	= $RealPos[1]["X"];	$RealPos[TEXT_ALIGN_BOTTOMRIGHT]["Y"]	= $RealPos[1]["Y"];
-     $RealPos[TEXT_ALIGN_TOPLEFT]["X"]		= $RealPos[3]["X"];	$RealPos[TEXT_ALIGN_TOPLEFT]["Y"]	= $RealPos[3]["Y"];
-     $RealPos[TEXT_ALIGN_TOPRIGHT]["X"]		= $RealPos[2]["X"];	$RealPos[TEXT_ALIGN_TOPRIGHT]["Y"]	= $RealPos[2]["Y"];
-     $RealPos[TEXT_ALIGN_BOTTOMMIDDLE]["X"]	= ($RealPos[1]["X"]-$RealPos[0]["X"])/2+$RealPos[0]["X"];	$RealPos[TEXT_ALIGN_BOTTOMMIDDLE]["Y"]	= ($RealPos[0]["Y"]-$RealPos[1]["Y"])/2+$RealPos[1]["Y"];
-     $RealPos[TEXT_ALIGN_TOPMIDDLE]["X"]	= ($RealPos[2]["X"]-$RealPos[3]["X"])/2+$RealPos[3]["X"];	$RealPos[TEXT_ALIGN_TOPMIDDLE]["Y"]	= ($RealPos[3]["Y"]-$RealPos[2]["Y"])/2+$RealPos[2]["Y"];
-     $RealPos[TEXT_ALIGN_MIDDLELEFT]["X"]	= ($RealPos[0]["X"]-$RealPos[3]["X"])/2+$RealPos[3]["X"];	$RealPos[TEXT_ALIGN_MIDDLELEFT]["Y"]	= ($RealPos[0]["Y"]-$RealPos[3]["Y"])/2+$RealPos[3]["Y"];
-     $RealPos[TEXT_ALIGN_MIDDLERIGHT]["X"]	= ($RealPos[1]["X"]-$RealPos[2]["X"])/2+$RealPos[2]["X"];	$RealPos[TEXT_ALIGN_MIDDLERIGHT]["Y"]	= ($RealPos[1]["Y"]-$RealPos[2]["Y"])/2+$RealPos[2]["Y"];
-     $RealPos[TEXT_ALIGN_MIDDLEMIDDLE]["X"]	= ($RealPos[1]["X"]-$RealPos[3]["X"])/2+$RealPos[3]["X"];	$RealPos[TEXT_ALIGN_MIDDLEMIDDLE]["Y"]	= ($RealPos[0]["Y"]-$RealPos[2]["Y"])/2+$RealPos[2]["Y"];
+     $RealPos[TEXT_ALIGN_BOTTOMLEFT]["X"] = $RealPos[0]["X"]; $RealPos[TEXT_ALIGN_BOTTOMLEFT]["Y"] = $RealPos[0]["Y"];
+     $RealPos[TEXT_ALIGN_BOTTOMRIGHT]["X"] = $RealPos[1]["X"]; $RealPos[TEXT_ALIGN_BOTTOMRIGHT]["Y"] = $RealPos[1]["Y"];
+     $RealPos[TEXT_ALIGN_TOPLEFT]["X"] = $RealPos[3]["X"]; $RealPos[TEXT_ALIGN_TOPLEFT]["Y"] = $RealPos[3]["Y"];
+     $RealPos[TEXT_ALIGN_TOPRIGHT]["X"]		= $RealPos[2]["X"]; $RealPos[TEXT_ALIGN_TOPRIGHT]["Y"] = $RealPos[2]["Y"];
+     $RealPos[TEXT_ALIGN_BOTTOMMIDDLE]["X"] = ($RealPos[1]["X"] - $RealPos[0]["X"])/2 + $RealPos[0]["X"]; $RealPos[TEXT_ALIGN_BOTTOMMIDDLE]["Y"] = ($RealPos[0]["Y"] - $RealPos[1]["Y"])/2 + $RealPos[1]["Y"];
+     $RealPos[TEXT_ALIGN_TOPMIDDLE]["X"]	= ($RealPos[2]["X"] - $RealPos[3]["X"])/2 + $RealPos[3]["X"]; $RealPos[TEXT_ALIGN_TOPMIDDLE]["Y"] = ($RealPos[3]["Y"] - $RealPos[2]["Y"])/2 + $RealPos[2]["Y"];
+     $RealPos[TEXT_ALIGN_MIDDLELEFT]["X"] = ($RealPos[0]["X"] - $RealPos[3]["X"])/2 + $RealPos[3]["X"]; $RealPos[TEXT_ALIGN_MIDDLELEFT]["Y"] = ($RealPos[0]["Y"] - $RealPos[3]["Y"])/2 + $RealPos[3]["Y"];
+     $RealPos[TEXT_ALIGN_MIDDLERIGHT]["X"] = ($RealPos[1]["X"] - $RealPos[2]["X"])/2 + $RealPos[2]["X"]; $RealPos[TEXT_ALIGN_MIDDLERIGHT]["Y"] = ($RealPos[1]["Y"] - $RealPos[2]["Y"])/2 + $RealPos[2]["Y"];
+     $RealPos[TEXT_ALIGN_MIDDLEMIDDLE]["X"] = ($RealPos[1]["X"] - $RealPos[3]["X"])/2 + $RealPos[3]["X"]; $RealPos[TEXT_ALIGN_MIDDLEMIDDLE]["Y"] = ($RealPos[0]["Y"] - $RealPos[2]["Y"])/2 + $RealPos[2]["Y"];
 
      return($RealPos);
     }
 
    /* Set current font properties */
-   function setFontProperties($Format="")
+   function setFontProperties($Format = "")
     {
      $R		= isset($Format["R"]) ? $Format["R"] : -1;
      $G		= isset($Format["G"]) ? $Format["G"] : -1;
      $B		= isset($Format["B"]) ? $Format["B"] : -1;
-     $Alpha	= isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
+     $Alpha = isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
      $FontName	= isset($Format["FontName"]) ? $Format["FontName"] : NULL;
      $FontSize	= isset($Format["FontSize"]) ? $Format["FontSize"] : NULL;
 
-     if ( $R != -1)       {  $this->FontColorR = $R; }
-     if ( $G != -1)       {  $this->FontColorG = $G; }
-     if ( $B != -1)       {  $this->FontColorB = $B; }
-     if ( $Alpha != NULL) {  $this->FontColorA = $Alpha; }
+     if ($R != -1) {  $this->FontColorR = $R; }
+     if ($G != -1) {  $this->FontColorG = $G; }
+     if ($B != -1) {  $this->FontColorB = $B; }
+     if ($Alpha != NULL) {  $this->FontColorA = $Alpha; }
 
-     if ( $FontName != NULL  )
+     if ($FontName != NULL)
       $this->FontName = $FontName;
  
-     if ( $FontSize != NULL  )
+     if ($FontSize != NULL)
       $this->FontSize = $FontSize;
     }
 
    /* Returns the 1st decimal values (used to correct AA bugs) */
    function getFirstDecimal($Value)
     {
-     $Values = preg_split("/\./",$Value);
-     if ( isset($Values[1]) ) { return(substr($Values[1],0,1)); } else { return(0); }
+     $Values = preg_split("/\./", $Value);
+     if (isset($Values[1])) { return(substr($Values[1], 0, 1)); } else { return(0); }
     }
 
    /* Attach a dataset to your pChart Object */
@@ -268,46 +268,46 @@ 
     { print_r($this->DataSet); }
 
    /* Initialise the image map methods */
-   function initialiseImageMap($Name="pChart",$StorageMode=IMAGE_MAP_STORAGE_SESSION,$UniqueID="imageMap",$StorageFolder="tmp")
+   function initialiseImageMap($Name = "pChart", $StorageMode = IMAGE_MAP_STORAGE_SESSION, $UniqueID = "imageMap", $StorageFolder = "tmp")
     {
-     $this->ImageMapIndex 		= $Name;
-     $this->ImageMapStorageMode		= $StorageMode;
+     $this->ImageMapIndex = $Name;
+     $this->ImageMapStorageMode = $StorageMode;
 
      if ($StorageMode == IMAGE_MAP_STORAGE_SESSION)
       {
-       if(!isset($_SESSION)) { session_start(); }
-       $_SESSION[$this->ImageMapIndex]    = NULL;
+       if (!isset($_SESSION)) { session_start(); }
+       $_SESSION[$this->ImageMapIndex] = NULL;
       }
-     elseif($StorageMode == IMAGE_MAP_STORAGE_FILE)
+     elseif ($StorageMode == IMAGE_MAP_STORAGE_FILE)
       {
-       $this->ImageMapFileName 		= $UniqueID;
-       $this->ImageMapStorageFolder	= $StorageFolder;
+       $this->ImageMapFileName = $UniqueID;
+       $this->ImageMapStorageFolder = $StorageFolder;
 
        if (file_exists($StorageFolder."/".$UniqueID.".map")) { unlink($StorageFolder."/".$UniqueID.".map"); }
       }
     }
 
    /* Add a zone to the image map */
-   function addToImageMap($Type,$Plots,$Color=NULL,$Title=NULL,$Message=NULL,$HTMLEncode=FALSE)
+   function addToImageMap($Type, $Plots, $Color = NULL, $Title = NULL, $Message = NULL, $HTMLEncode = FALSE)
     {
-     if ( $this->ImageMapStorageMode == NULL ) { $this->initialiseImageMap(); }
+     if ($this->ImageMapStorageMode == NULL) { $this->initialiseImageMap(); }
 
      /* Encode the characters in the imagemap in HTML standards */
-     $Title   = str_replace("&#8364;","\u20AC",$Title);
-     $Title   = htmlentities($Title,ENT_QUOTES,"ISO-8859-15");
-     if ( $HTMLEncode )
+     $Title   = str_replace("&#8364;", "\u20AC", $Title);
+     $Title   = htmlentities($Title, ENT_QUOTES, "ISO-8859-15");
+     if ($HTMLEncode)
       {
-       $Message = htmlentities($Message,ENT_QUOTES,"ISO-8859-15");
-       $Message = str_replace("&lt;","<",$Message);
-       $Message = str_replace("&gt;",">",$Message);
+       $Message = htmlentities($Message, ENT_QUOTES, "ISO-8859-15");
+       $Message = str_replace("&lt;", "<", $Message);
+       $Message = str_replace("&gt;", ">", $Message);
       }
 
-     if ( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_SESSION )
+     if ($this->ImageMapStorageMode == IMAGE_MAP_STORAGE_SESSION)
       {
-       if(!isset($_SESSION)) { $this->initialiseImageMap(); }
-       $_SESSION[$this->ImageMapIndex][] = array($Type,$Plots,$Color,$Title,$Message);
+       if (!isset($_SESSION)) { $this->initialiseImageMap(); }
+       $_SESSION[$this->ImageMapIndex][] = array($Type, $Plots, $Color, $Title, $Message);
       }
-     elseif($this->ImageMapStorageMode == IMAGE_MAP_STORAGE_FILE)
+     elseif ($this->ImageMapStorageMode == IMAGE_MAP_STORAGE_FILE)
       {
        $Handle = fopen($this->ImageMapStorageFolder."/".$this->ImageMapFileName.".map", 'a');
        fwrite($Handle, $Type.IMAGE_MAP_DELIMITER.$Plots.IMAGE_MAP_DELIMITER.$Color.IMAGE_MAP_DELIMITER.$Title.IMAGE_MAP_DELIMITER.$Message."\r\n");
@@ -318,30 +318,30 @@ 
    /* Remove VOID values from an imagemap custom values array */
    function removeVOIDFromArray($SerieName, $Values)
     {
-     if ( !isset($this->DataSet->Data["Series"][$SerieName]) ) { return(-1); }
+     if (!isset($this->DataSet->Data["Series"][$SerieName])) { return(-1); }
 
      $Result = "";
-     foreach($this->DataSet->Data["Series"][$SerieName]["Data"] as $Key => $Value)
-      { if ( $Value != VOID && isset($Values[$Key]) ) { $Result[] = $Values[$Key]; } }
+     foreach ($this->DataSet->Data["Series"][$SerieName]["Data"] as $Key => $Value)
+      { if ($Value != VOID && isset($Values[$Key])) { $Result[] = $Values[$Key]; } }
      return($Result);
     }
 
    /* Replace the title of one image map serie */
    function replaceImageMapTitle($OldTitle, $NewTitle)
     {
-     if ( $this->ImageMapStorageMode == NULL ) { return(-1); }
+     if ($this->ImageMapStorageMode == NULL) { return(-1); }
 
-     if ( is_array($NewTitle) ) { $NewTitle = $this->removeVOIDFromArray($OldTitle, $NewTitle); }
+     if (is_array($NewTitle)) { $NewTitle = $this->removeVOIDFromArray($OldTitle, $NewTitle); }
  
-     if ( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_SESSION )
+     if ($this->ImageMapStorageMode == IMAGE_MAP_STORAGE_SESSION)
       {
-       if(!isset($_SESSION)) { return(-1); }
-       if ( is_array($NewTitle) )
-        { $ID = 0; foreach($_SESSION[$this->ImageMapIndex] as $Key => $Settings) { if ( $Settings[3] == $OldTitle && isset($NewTitle[$ID])) { $_SESSION[$this->ImageMapIndex][$Key][3] = $NewTitle[$ID]; $ID++; } } }
+       if (!isset($_SESSION)) { return(-1); }
+       if (is_array($NewTitle))
+        { $ID = 0; foreach ($_SESSION[$this->ImageMapIndex] as $Key => $Settings) { if ($Settings[3] == $OldTitle && isset($NewTitle[$ID])) { $_SESSION[$this->ImageMapIndex][$Key][3] = $NewTitle[$ID]; $ID++; } } }
        else
-        { foreach($_SESSION[$this->ImageMapIndex] as $Key => $Settings) { if ( $Settings[3] == $OldTitle ) { $_SESSION[$this->ImageMapIndex][$Key][3] = $NewTitle; } } }
+        { foreach ($_SESSION[$this->ImageMapIndex] as $Key => $Settings) { if ($Settings[3] == $OldTitle) { $_SESSION[$this->ImageMapIndex][$Key][3] = $NewTitle; } } }
       }
-     elseif( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_FILE )
+     elseif ($this->ImageMapStorageMode == IMAGE_MAP_STORAGE_FILE)
       {
        $TempArray = "";
        $Handle    = @fopen($this->ImageMapStorageFolder."/".$this->ImageMapFileName.".map", "r");
@@ -349,18 +349,18 @@ 
         {
          while (($Buffer = fgets($Handle, 4096)) !== false)
           {
-           $Fields      = split(IMAGE_MAP_DELIMITER,str_replace(array(chr(10),chr(13)),"",$Buffer));
-           $TempArray[] = array($Fields[0],$Fields[1],$Fields[2],$Fields[3],$Fields[4]);
+           $Fields      = split(IMAGE_MAP_DELIMITER, str_replace(array(chr(10), chr(13)), "", $Buffer));
+           $TempArray[] = array($Fields[0], $Fields[1], $Fields[2], $Fields[3], $Fields[4]);
           }
          fclose($Handle);
 
-         if ( is_array($NewTitle) )
-          { $ID = 0; foreach($TempArray as $Key => $Settings) { if ( $Settings[3] == $OldTitle && isset($NewTitle[$ID]) ) { $TempArray[$Key][3] = $NewTitle[$ID]; $ID++; } } }
+         if (is_array($NewTitle))
+          { $ID = 0; foreach ($TempArray as $Key => $Settings) { if ($Settings[3] == $OldTitle && isset($NewTitle[$ID])) { $TempArray[$Key][3] = $NewTitle[$ID]; $ID++; } } }
          else
-          { foreach($TempArray as $Key => $Settings) { if ( $Settings[3] == $OldTitle ) { $TempArray[$Key][3] = $NewTitle; } } }
+          { foreach ($TempArray as $Key => $Settings) { if ($Settings[3] == $OldTitle) { $TempArray[$Key][3] = $NewTitle; } } }
 
          $Handle = fopen($this->ImageMapStorageFolder."/".$this->ImageMapFileName.".map", 'w');
-         foreach($TempArray as $Key => $Settings)
+         foreach ($TempArray as $Key => $Settings)
           { fwrite($Handle, $Settings[0].IMAGE_MAP_DELIMITER.$Settings[1].IMAGE_MAP_DELIMITER.$Settings[2].IMAGE_MAP_DELIMITER.$Settings[3].IMAGE_MAP_DELIMITER.$Settings[4]."\r\n"); }
          fclose($Handle);
         }
@@ -370,16 +370,16 @@ 
    /* Replace the values of the image map contents */
    function replaceImageMapValues($Title, $Values)
     {
-     if ( $this->ImageMapStorageMode == NULL ) { return(-1); }
+     if ($this->ImageMapStorageMode == NULL) { return(-1); }
 
      $Values = $this->removeVOIDFromArray($Title, $Values);
      $ID = 0; 
-     if ( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_SESSION )
+     if ($this->ImageMapStorageMode == IMAGE_MAP_STORAGE_SESSION)
       {
-       if(!isset($_SESSION)) { return(-1); }
-       foreach($_SESSION[$this->ImageMapIndex] as $Key => $Settings) { if ( $Settings[3] == $Title ) { if ( isset($Values[$ID]) ) { $_SESSION[$this->ImageMapIndex][$Key][4] = $Values[$ID]; } $ID++; } }
+       if (!isset($_SESSION)) { return(-1); }
+       foreach ($_SESSION[$this->ImageMapIndex] as $Key => $Settings) { if ($Settings[3] == $Title) { if (isset($Values[$ID])) { $_SESSION[$this->ImageMapIndex][$Key][4] = $Values[$ID]; } $ID++; } }
       }
-     elseif( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_FILE )
+     elseif ($this->ImageMapStorageMode == IMAGE_MAP_STORAGE_FILE)
       {
        $TempArray = "";
        $Handle    = @fopen($this->ImageMapStorageFolder."/".$this->ImageMapFileName.".map", "r");
@@ -387,15 +387,15 @@ 
         {
          while (($Buffer = fgets($Handle, 4096)) !== false)
           {
-           $Fields      = split(IMAGE_MAP_DELIMITER,str_replace(array(chr(10),chr(13)),"",$Buffer));
-           $TempArray[] = array($Fields[0],$Fields[1],$Fields[2],$Fields[3],$Fields[4]);
+           $Fields      = split(IMAGE_MAP_DELIMITER, str_replace(array(chr(10), chr(13)), "", $Buffer));
+           $TempArray[] = array($Fields[0], $Fields[1], $Fields[2], $Fields[3], $Fields[4]);
           }
          fclose($Handle);
 
-         foreach($TempArray as $Key => $Settings) { if ( $Settings[3] == $Title ) { if ( isset($Values[$ID]) ) { $TempArray[$Key][4] = $Values[$ID]; } $ID++; } }
+         foreach ($TempArray as $Key => $Settings) { if ($Settings[3] == $Title) { if (isset($Values[$ID])) { $TempArray[$Key][4] = $Values[$ID]; } $ID++; } }
 
          $Handle = fopen($this->ImageMapStorageFolder."/".$this->ImageMapFileName.".map", 'w');
-         foreach($TempArray as $Key => $Settings)
+         foreach ($TempArray as $Key => $Settings)
           { fwrite($Handle, $Settings[0].IMAGE_MAP_DELIMITER.$Settings[1].IMAGE_MAP_DELIMITER.$Settings[2].IMAGE_MAP_DELIMITER.$Settings[3].IMAGE_MAP_DELIMITER.$Settings[4]."\r\n"); }
          fclose($Handle);
         }
@@ -403,21 +403,21 @@ 
     }
 
    /* Dump the image map */
-   function dumpImageMap($Name="pChart",$StorageMode=IMAGE_MAP_STORAGE_SESSION,$UniqueID="imageMap",$StorageFolder="tmp")
+   function dumpImageMap($Name = "pChart", $StorageMode = IMAGE_MAP_STORAGE_SESSION, $UniqueID = "imageMap", $StorageFolder = "tmp")
     {
-     $this->ImageMapIndex 		= $Name;
-     $this->ImageMapStorageMode		= $StorageMode;
+     $this->ImageMapIndex = $Name;
+     $this->ImageMapStorageMode = $StorageMode;
 
-     if ( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_SESSION )
+     if ($this->ImageMapStorageMode == IMAGE_MAP_STORAGE_SESSION)
       {
-       if(!isset($_SESSION)) { session_start(); }
-       if ( $_SESSION[$Name] != NULL )
+       if (!isset($_SESSION)) { session_start(); }
+       if ($_SESSION[$Name] != NULL)
         {
-         foreach($_SESSION[$Name] as $Key => $Params)
+         foreach ($_SESSION[$Name] as $Key => $Params)
           { echo $Params[0].IMAGE_MAP_DELIMITER.$Params[1].IMAGE_MAP_DELIMITER.$Params[2].IMAGE_MAP_DELIMITER.$Params[3].IMAGE_MAP_DELIMITER.$Params[4]."\r\n"; }
         }
       }
-     elseif( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_FILE )
+     elseif ($this->ImageMapStorageMode == IMAGE_MAP_STORAGE_FILE)
       {
        if (file_exists($StorageFolder."/".$UniqueID.".map"))
         {
@@ -425,7 +425,7 @@ 
          if ($Handle) { while (($Buffer = fgets($Handle, 4096)) !== false) { echo $Buffer; } }
          fclose($Handle);
 
-         if ( $this->ImageMapAutoDelete ) { unlink($StorageFolder."/".$UniqueID.".map"); }
+         if ($this->ImageMapAutoDelete) { unlink($StorageFolder."/".$UniqueID.".map"); }
         }
       }
 
@@ -434,11 +434,11 @@ 
     }
 
    /* Return the HTML converted color from the RGB composite values */
-   function toHTMLColor($R,$G,$B)
+   function toHTMLColor($R, $G, $B)
     {
-     $R=intval($R); $G=intval($G); $B=intval($B);
-     $R=dechex($R<0?0:($R>255?255:$R)); $G=dechex($G<0?0:($G>255?255:$G));$B=dechex($B<0?0:($B>255?255:$B));
-     $Color="#".(strlen($R) < 2?'0':'').$R; $Color.=(strlen($G) < 2?'0':'').$G; $Color.= (strlen($B) < 2?'0':'').$B;
+     $R = intval($R); $G = intval($G); $B = intval($B);
+     $R = dechex($R < 0 ? 0 : ($R > 255 ? 255 : $R)); $G = dechex($G < 0 ? 0 : ($G > 255 ? 255 : $G)); $B = dechex($B < 0 ? 0 : ($B > 255 ? 255 : $B));
+     $Color = "#".(strlen($R) < 2 ? '0' : '').$R; $Color .= (strlen($G) < 2 ? '0' : '').$G; $Color .= (strlen($B) < 2 ? '0' : '').$B;
      return($Color);
     }
 
@@ -446,27 +446,27 @@ 
    function reversePlots($Plots)
     {
      $Result = "";
-     for($i=count($Plots)-2;$i>=0;$i=$i-2) { $Result[] = $Plots[$i]; $Result[] = $Plots[$i+1]; }
+     for ($i = count($Plots) - 2; $i >= 0; $i = $i - 2) { $Result[] = $Plots[$i]; $Result[] = $Plots[$i + 1]; }
      return($Result);
     }
 
    /* Mirror Effect */
-   function drawAreaMirror($X,$Y,$Width,$Height,$Format="")
+   function drawAreaMirror($X, $Y, $Width, $Height, $Format = "")
     {
-     $StartAlpha	= isset($Format["StartAlpha"]) ? $Format["StartAlpha"] : 80;
+     $StartAlpha = isset($Format["StartAlpha"]) ? $Format["StartAlpha"] : 80;
      $EndAlpha		= isset($Format["EndAlpha"]) ? $Format["EndAlpha"] : 0;
 
-     $AlphaStep = ($StartAlpha-$EndAlpha)/$Height;
+     $AlphaStep = ($StartAlpha - $EndAlpha)/$Height;
 
-     $Picture = imagecreatetruecolor($this->XSize,$this->YSize);
-     imagecopy($Picture,$this->Picture,0,0,0,0,$this->XSize,$this->YSize);
+     $Picture = imagecreatetruecolor($this->XSize, $this->YSize);
+     imagecopy($Picture, $this->Picture, 0, 0, 0, 0, $this->XSize, $this->YSize);
      
-     for($i=1;$i<=$Height;$i++)
+     for ($i = 1; $i <= $Height; $i++)
       {
-       if ( $Y+($i-1) < $this->YSize && $Y-$i > 0 ) { imagecopymerge($Picture,$this->Picture,$X,$Y+($i-1),$X,$Y-$i,$Width,1,$StartAlpha-$AlphaStep*$i); }
+       if ($Y + ($i - 1) < $this->YSize && $Y - $i > 0) { imagecopymerge($Picture, $this->Picture, $X, $Y + ($i - 1), $X, $Y - $i, $Width, 1, $StartAlpha - $AlphaStep*$i); }
       }
 
-     imagecopy($this->Picture,$Picture,0,0,0,0,$this->XSize,$this->YSize);
+     imagecopy($this->Picture, $Picture, 0, 0, 0, 0, $this->XSize, $this->YSize);
     }
   }
 ?>
\ No newline at end of file

drupal/sites/default/boinc/modules/boincstats/includes/pchart/class/pPie.class.php

Spacing +570 added lines, -570 removed lines

@@ -14,29 +14,29 @@ 
  */
 
  /* Class return codes */
- define("PIE_NO_ABSCISSA"	, 140001);
- define("PIE_NO_DATASERIE"	, 140002);
- define("PIE_SUMISNULL"		, 140003);
- define("PIE_RENDERED"		, 140000);
+ define("PIE_NO_ABSCISSA", 140001);
+ define("PIE_NO_DATASERIE", 140002);
+ define("PIE_SUMISNULL", 140003);
+ define("PIE_RENDERED", 140000);
 
- define("PIE_LABEL_COLOR_AUTO"	, 140010);
+ define("PIE_LABEL_COLOR_AUTO", 140010);
  define("PIE_LABEL_COLOR_MANUAL", 140011);
 
- define("PIE_VALUE_NATURAL"	, 140020);
- define("PIE_VALUE_PERCENTAGE"	, 140021);
+ define("PIE_VALUE_NATURAL", 140020);
+ define("PIE_VALUE_PERCENTAGE", 140021);
 
- define("PIE_VALUE_INSIDE"      , 140030);
- define("PIE_VALUE_OUTSIDE"     , 140031);
+ define("PIE_VALUE_INSIDE", 140030);
+ define("PIE_VALUE_OUTSIDE", 140031);
 
  /* pPie class definition */
  class pPie
   {
    var $pChartObject;
    var $pDataObject;
-   var $LabelPos = "" ;
+   var $LabelPos = "";
 
    /* Class creator */
-   function pPie($Object,$pDataObject)
+   function pPie($Object, $pDataObject)
     {
      /* Cache the pChart object reference */
      $this->pChartObject = $Object;
@@ -46,58 +46,58 @@ 
     }
 
    /* Draw a pie chart */
-   function draw2DPie($X,$Y,$Format="")
+   function draw2DPie($X, $Y, $Format = "")
     {
-     $Radius		= isset($Format["Radius"]) ? $Format["Radius"] : 60;
+     $Radius = isset($Format["Radius"]) ? $Format["Radius"] : 60;
      $Precision		= isset($Format["Precision"]) ? $Format["Precision"] : 0;
-     $DataGapAngle	= isset($Format["DataGapAngle"]) ? $Format["DataGapAngle"] : 0;
-     $DataGapRadius	= isset($Format["DataGapRadius"]) ? $Format["DataGapRadius"] : 0;
+     $DataGapAngle = isset($Format["DataGapAngle"]) ? $Format["DataGapAngle"] : 0;
+     $DataGapRadius = isset($Format["DataGapRadius"]) ? $Format["DataGapRadius"] : 0;
      $SecondPass	= isset($Format["SecondPass"]) ? $Format["SecondPass"] : TRUE;
-     $Border		= isset($Format["Border"]) ? $Format["Border"] : FALSE;
+     $Border = isset($Format["Border"]) ? $Format["Border"] : FALSE;
      $BorderR		= isset($Format["BorderR"]) ? $Format["BorderR"] : 255;
      $BorderG		= isset($Format["BorderG"]) ? $Format["BorderG"] : 255;
      $BorderB		= isset($Format["BorderB"]) ? $Format["BorderB"] : 255;
-     $Shadow		= isset($Format["Shadow"]) ? $Format["Shadow"] : FALSE;
+     $Shadow = isset($Format["Shadow"]) ? $Format["Shadow"] : FALSE;
      $DrawLabels	= isset($Format["DrawLabels"]) ? $Format["DrawLabels"] : FALSE;
-     $LabelStacked	= isset($Format["LabelStacked"]) ? $Format["LabelStacked"] : FALSE;
+     $LabelStacked = isset($Format["LabelStacked"]) ? $Format["LabelStacked"] : FALSE;
      $LabelColor	= isset($Format["LabelColor"]) ? $Format["LabelColor"] : PIE_LABEL_COLOR_MANUAL;
      $LabelR		= isset($Format["LabelR"]) ? $Format["LabelR"] : 0;
      $LabelG		= isset($Format["LabelG"]) ? $Format["LabelG"] : 0;
      $LabelB		= isset($Format["LabelB"]) ? $Format["LabelB"] : 0;
-     $LabelAlpha	= isset($Format["LabelAlpha"]) ? $Format["LabelAlpha"] : 100;
+     $LabelAlpha = isset($Format["LabelAlpha"]) ? $Format["LabelAlpha"] : 100;
      $WriteValues	= isset($Format["WriteValues"]) ? $Format["WriteValues"] : NULL;
-     $ValuePosition	= isset($Format["ValuePosition"]) ? $Format["ValuePosition"] : PIE_VALUE_OUTSIDE;
-     $ValuePadding	= isset($Format["ValuePadding"]) ? $Format["ValuePadding"] : 15;
+     $ValuePosition = isset($Format["ValuePosition"]) ? $Format["ValuePosition"] : PIE_VALUE_OUTSIDE;
+     $ValuePadding = isset($Format["ValuePadding"]) ? $Format["ValuePadding"] : 15;
      $ValueSuffix	= isset($Format["ValueSuffix"]) ? $Format["ValueSuffix"] : "";
      $ValueR		= isset($Format["ValueR"]) ? $Format["ValueR"] : 255;
      $ValueG		= isset($Format["ValueG"]) ? $Format["ValueG"] : 255;
      $ValueB		= isset($Format["ValueB"]) ? $Format["ValueB"] : 255;
-     $ValueAlpha	= isset($Format["ValueAlpha"]) ? $Format["ValueAlpha"] : 100;
-     $RecordImageMap	= isset($Format["RecordImageMap"]) ? $Format["RecordImageMap"] : FALSE;
+     $ValueAlpha = isset($Format["ValueAlpha"]) ? $Format["ValueAlpha"] : 100;
+     $RecordImageMap = isset($Format["RecordImageMap"]) ? $Format["RecordImageMap"] : FALSE;
 
      /* Data Processing */
      $Data    = $this->pDataObject->getData();
      $Palette = $this->pDataObject->getPalette();
 
      /* Do we have an abscissa serie defined? */
-     if ( $Data["Abscissa"] == "" ) { return(PIE_NO_ABSCISSA); }
+     if ($Data["Abscissa"] == "") { return(PIE_NO_ABSCISSA); }
 
      /* Try to find the data serie */
      $DataSerie = "";
      foreach ($Data["Series"] as $SerieName => $SerieData)
-      { if ( $SerieName != $Data["Abscissa"]) { $DataSerie = $SerieName; } }
+      { if ($SerieName != $Data["Abscissa"]) { $DataSerie = $SerieName; } }
 
      /* Do we have data to compute? */
-     if ( $DataSerie == "" ) { return(PIE_NO_DATASERIE); }
+     if ($DataSerie == "") { return(PIE_NO_DATASERIE); }
 
      /* Remove unused data */
-     list($Data,$Palette) = $this->clean0Values($Data,$Palette,$DataSerie,$Data["Abscissa"]);
+     list($Data, $Palette) = $this->clean0Values($Data, $Palette, $DataSerie, $Data["Abscissa"]);
 
      /* Compute the pie sum */
      $SerieSum = $this->pDataObject->getSum($DataSerie);
 
      /* Do we have data to draw? */
-     if ( $SerieSum == 0 ) { return(PIE_SUMISNULL); }
+     if ($SerieSum == 0) { return(PIE_SUMISNULL); }
 
      /* Dump the real number of data to draw */
      $Values = "";
@@ -105,190 +105,190 @@ 
       { if ($Value != 0) { $Values[] = $Value; } }
 
      /* Compute the wasted angular space between series */
-     if (count($Values)==1) { $WastedAngular = 0; } else { $WastedAngular = count($Values) * $DataGapAngle; }
+     if (count($Values) == 1) { $WastedAngular = 0; } else { $WastedAngular = count($Values)*$DataGapAngle; }
 
      /* Compute the scale */
-     $ScaleFactor = (360 - $WastedAngular) / $SerieSum;
+     $ScaleFactor = (360 - $WastedAngular)/$SerieSum;
 
      $RestoreShadow = $this->pChartObject->Shadow;
-     if ( $this->pChartObject->Shadow )
+     if ($this->pChartObject->Shadow)
       {
        $this->pChartObject->Shadow = FALSE;
 
        $ShadowFormat = $Format; $ShadowFormat["Shadow"] = TRUE;
-       $this->draw2DPie($X+$this->pChartObject->ShadowX,$Y+$this->pChartObject->ShadowY,$ShadowFormat);
+       $this->draw2DPie($X + $this->pChartObject->ShadowX, $Y + $this->pChartObject->ShadowY, $ShadowFormat);
       }
 
      /* Draw the polygon pie elements */
-     $Step = 360 / (2 * PI * $Radius);
+     $Step = 360/(2*PI*$Radius);
      $Offset = 0; $ID = 0;
-     foreach($Values as $Key => $Value)
+     foreach ($Values as $Key => $Value)
       {
-       if ( $Shadow )
-        $Settings = array("R"=>$this->pChartObject->ShadowR,"G"=>$this->pChartObject->ShadowG,"B"=>$this->pChartObject->ShadowB,"Alpha"=>$this->pChartObject->Shadowa);
+       if ($Shadow)
+        $Settings = array("R"=>$this->pChartObject->ShadowR, "G"=>$this->pChartObject->ShadowG, "B"=>$this->pChartObject->ShadowB, "Alpha"=>$this->pChartObject->Shadowa);
        else
         {
-         if ( !isset($Palette[$ID]["R"]) ) { $Color = $this->pChartObject->getRandomColor(); $Palette[$ID] = $Color; $this->pDataObject->savePalette($ID,$Color); }
-         $Settings = array("R"=>$Palette[$ID]["R"],"G"=>$Palette[$ID]["G"],"B"=>$Palette[$ID]["B"],"Alpha"=>$Palette[$ID]["Alpha"]);
+         if (!isset($Palette[$ID]["R"])) { $Color = $this->pChartObject->getRandomColor(); $Palette[$ID] = $Color; $this->pDataObject->savePalette($ID, $Color); }
+         $Settings = array("R"=>$Palette[$ID]["R"], "G"=>$Palette[$ID]["G"], "B"=>$Palette[$ID]["B"], "Alpha"=>$Palette[$ID]["Alpha"]);
         }
 
-       if ( !$SecondPass && !$Shadow )
+       if (!$SecondPass && !$Shadow)
         {
-         if ( !$Border )
+         if (!$Border)
           $Settings["Surrounding"] = 10;
          else
           { $Settings["BorderR"] = $BorderR; $Settings["BorderG"] = $BorderG; $Settings["BorderB"] = $BorderB; }
         }
 
        $Plots = "";
-       $EndAngle = $Offset+($Value*$ScaleFactor); if ( $EndAngle > 360 ) { $EndAngle = 360; }
+       $EndAngle = $Offset + ($Value*$ScaleFactor); if ($EndAngle > 360) { $EndAngle = 360; }
 
        $Angle = ($EndAngle - $Offset)/2 + $Offset;
        if ($DataGapAngle == 0)
         { $X0 = $X; $Y0 = $Y; }
        else
         {
-         $X0 = cos(($Angle-90)*PI/180) * $DataGapRadius + $X;
-         $Y0 = sin(($Angle-90)*PI/180) * $DataGapRadius + $Y;
+         $X0 = cos(($Angle - 90)*PI/180)*$DataGapRadius + $X;
+         $Y0 = sin(($Angle - 90)*PI/180)*$DataGapRadius + $Y;
         }
 
        $Plots[] = $X0; $Plots[] = $Y0;
 
 
-       for($i=$Offset;$i<=$EndAngle;$i=$i+$Step)
+       for ($i = $Offset; $i <= $EndAngle; $i = $i + $Step)
         {
-         $Xc = cos(($i-90)*PI/180) * $Radius + $X;
-         $Yc = sin(($i-90)*PI/180) * $Radius + $Y;
+         $Xc = cos(($i - 90)*PI/180)*$Radius + $X;
+         $Yc = sin(($i - 90)*PI/180)*$Radius + $Y;
 
-         if ( $SecondPass && ( $i<90 )) { $Yc++; }
-         if ( $SecondPass && ( $i>180 && $i<270 )) { $Xc++; }
-         if ( $SecondPass && ( $i>=270 )) { $Xc++; $Yc++; }
+         if ($SecondPass && ($i < 90)) { $Yc++; }
+         if ($SecondPass && ($i > 180 && $i < 270)) { $Xc++; }
+         if ($SecondPass && ($i >= 270)) { $Xc++; $Yc++; }
 
          $Plots[] = $Xc; $Plots[] = $Yc;
         }
 
-       $this->pChartObject->drawPolygon($Plots,$Settings);
-       if ( $RecordImageMap && !$Shadow ) { $this->pChartObject->addToImageMap("POLY",$this->arraySerialize($Plots),$this->pChartObject->toHTMLColor($Palette[$ID]["R"],$Palette[$ID]["G"],$Palette[$ID]["B"]),$Data["Series"][$Data["Abscissa"]]["Data"][$Key],$Value); }
+       $this->pChartObject->drawPolygon($Plots, $Settings);
+       if ($RecordImageMap && !$Shadow) { $this->pChartObject->addToImageMap("POLY", $this->arraySerialize($Plots), $this->pChartObject->toHTMLColor($Palette[$ID]["R"], $Palette[$ID]["G"], $Palette[$ID]["B"]), $Data["Series"][$Data["Abscissa"]]["Data"][$Key], $Value); }
 
-       if ( $DrawLabels && !$Shadow && !$SecondPass )
+       if ($DrawLabels && !$Shadow && !$SecondPass)
         {
-         if ( $LabelColor == PIE_LABEL_COLOR_AUTO )
-          { $Settings = array("FillR"=>$Palette[$ID]["R"],"FillG"=>$Palette[$ID]["G"],"FillB"=>$Palette[$ID]["B"],"Alpha"=>$Palette[$ID]["Alpha"]);}
+         if ($LabelColor == PIE_LABEL_COLOR_AUTO)
+          { $Settings = array("FillR"=>$Palette[$ID]["R"], "FillG"=>$Palette[$ID]["G"], "FillB"=>$Palette[$ID]["B"], "Alpha"=>$Palette[$ID]["Alpha"]); }
          else
-          { $Settings = array("FillR"=>$LabelR,"FillG"=>$LabelG,"FillB"=>$LabelB,"Alpha"=>$LabelAlpha); }
+          { $Settings = array("FillR"=>$LabelR, "FillG"=>$LabelG, "FillB"=>$LabelB, "Alpha"=>$LabelAlpha); }
 
          $Angle = ($EndAngle - $Offset)/2 + $Offset;
-         $Xc = cos(($Angle-90)*PI/180) * $Radius + $X;
-         $Yc = sin(($Angle-90)*PI/180) * $Radius + $Y;
+         $Xc = cos(($Angle - 90)*PI/180)*$Radius + $X;
+         $Yc = sin(($Angle - 90)*PI/180)*$Radius + $Y;
 
          $Label = $Data["Series"][$Data["Abscissa"]]["Data"][$Key];
 
-         if ( $LabelStacked )
-          $this->writePieLabel($Xc,$Yc,$Label,$Angle,$Settings,TRUE,$X,$Y,$Radius);
+         if ($LabelStacked)
+          $this->writePieLabel($Xc, $Yc, $Label, $Angle, $Settings, TRUE, $X, $Y, $Radius);
          else
-          $this->writePieLabel($Xc,$Yc,$Label,$Angle,$Settings,FALSE);
+          $this->writePieLabel($Xc, $Yc, $Label, $Angle, $Settings, FALSE);
         }
 
        $Offset = $i + $DataGapAngle; $ID++;
       }
 
      /* Second pass to smooth the angles */
-     if ( $SecondPass )
+     if ($SecondPass)
       {
-       $Step = 360 / (2 * PI * $Radius);
+       $Step = 360/(2*PI*$Radius);
        $Offset = 0; $ID = 0;
-       foreach($Values as $Key => $Value)
+       foreach ($Values as $Key => $Value)
         {
          $FirstPoint = TRUE;
-         if ( $Shadow )
-          $Settings = array("R"=>$this->pChartObject->ShadowR,"G"=>$this->pChartObject->ShadowG,"B"=>$this->pChartObject->ShadowB,"Alpha"=>$this->pChartObject->Shadowa);
+         if ($Shadow)
+          $Settings = array("R"=>$this->pChartObject->ShadowR, "G"=>$this->pChartObject->ShadowG, "B"=>$this->pChartObject->ShadowB, "Alpha"=>$this->pChartObject->Shadowa);
          else
           {
-           if ( $Border )
-            $Settings = array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB);
+           if ($Border)
+            $Settings = array("R"=>$BorderR, "G"=>$BorderG, "B"=>$BorderB);
            else
-            $Settings = array("R"=>$Palette[$ID]["R"],"G"=>$Palette[$ID]["G"],"B"=>$Palette[$ID]["B"],"Alpha"=>$Palette[$ID]["Alpha"]);
+            $Settings = array("R"=>$Palette[$ID]["R"], "G"=>$Palette[$ID]["G"], "B"=>$Palette[$ID]["B"], "Alpha"=>$Palette[$ID]["Alpha"]);
           }
 
-         $EndAngle = $Offset+($Value*$ScaleFactor); if ( $EndAngle > 360 ) { $EndAngle = 360; }
+         $EndAngle = $Offset + ($Value*$ScaleFactor); if ($EndAngle > 360) { $EndAngle = 360; }
 
          if ($DataGapAngle == 0)
           { $X0 = $X; $Y0 = $Y; }
          else
           {
            $Angle = ($EndAngle - $Offset)/2 + $Offset;
-           $X0 = cos(($Angle-90)*PI/180) * $DataGapRadius + $X;
-           $Y0 = sin(($Angle-90)*PI/180) * $DataGapRadius + $Y;
+           $X0 = cos(($Angle - 90)*PI/180)*$DataGapRadius + $X;
+           $Y0 = sin(($Angle - 90)*PI/180)*$DataGapRadius + $Y;
           }
          $Plots[] = $X0; $Plots[] = $Y0;
 
-         for($i=$Offset;$i<=$EndAngle;$i=$i+$Step)
+         for ($i = $Offset; $i <= $EndAngle; $i = $i + $Step)
           {
-           $Xc = cos(($i-90)*PI/180) * $Radius + $X;
-           $Yc = sin(($i-90)*PI/180) * $Radius + $Y;
+           $Xc = cos(($i - 90)*PI/180)*$Radius + $X;
+           $Yc = sin(($i - 90)*PI/180)*$Radius + $Y;
 
-           if ( $FirstPoint ) { $this->pChartObject->drawLine($Xc,$Yc,$X0,$Y0,$Settings); } { $FirstPoint = FALSE; }
+           if ($FirstPoint) { $this->pChartObject->drawLine($Xc, $Yc, $X0, $Y0, $Settings); } { $FirstPoint = FALSE; }
   
-           $this->pChartObject->drawAntialiasPixel($Xc,$Yc,$Settings);
+           $this->pChartObject->drawAntialiasPixel($Xc, $Yc, $Settings);
           }
-         $this->pChartObject->drawLine($Xc,$Yc,$X0,$Y0,$Settings);
+         $this->pChartObject->drawLine($Xc, $Yc, $X0, $Y0, $Settings);
 
-         if ( $DrawLabels && !$Shadow )
+         if ($DrawLabels && !$Shadow)
           {
-           if ( $LabelColor == PIE_LABEL_COLOR_AUTO )
-            { $Settings = array("FillR"=>$Palette[$ID]["R"],"FillG"=>$Palette[$ID]["G"],"FillB"=>$Palette[$ID]["B"],"Alpha"=>$Palette[$ID]["Alpha"]);}
+           if ($LabelColor == PIE_LABEL_COLOR_AUTO)
+            { $Settings = array("FillR"=>$Palette[$ID]["R"], "FillG"=>$Palette[$ID]["G"], "FillB"=>$Palette[$ID]["B"], "Alpha"=>$Palette[$ID]["Alpha"]); }
            else
-            { $Settings = array("FillR"=>$LabelR,"FillG"=>$LabelG,"FillB"=>$LabelB,"Alpha"=>$LabelAlpha); }
+            { $Settings = array("FillR"=>$LabelR, "FillG"=>$LabelG, "FillB"=>$LabelB, "Alpha"=>$LabelAlpha); }
 
            $Angle = ($EndAngle - $Offset)/2 + $Offset;
-           $Xc = cos(($Angle-90)*PI/180) * $Radius + $X;
-           $Yc = sin(($Angle-90)*PI/180) * $Radius + $Y;
+           $Xc = cos(($Angle - 90)*PI/180)*$Radius + $X;
+           $Yc = sin(($Angle - 90)*PI/180)*$Radius + $Y;
 
            $Label = $Data["Series"][$Data["Abscissa"]]["Data"][$Key];
 
-           if ( $LabelStacked )
-            $this->writePieLabel($Xc,$Yc,$Label,$Angle,$Settings,TRUE,$X,$Y,$Radius);
+           if ($LabelStacked)
+            $this->writePieLabel($Xc, $Yc, $Label, $Angle, $Settings, TRUE, $X, $Y, $Radius);
            else
-            $this->writePieLabel($Xc,$Yc,$Label,$Angle,$Settings,FALSE);
+            $this->writePieLabel($Xc, $Yc, $Label, $Angle, $Settings, FALSE);
           }
   
          $Offset = $i + $DataGapAngle; $ID++;
         }
       }
 
-     if ( $WriteValues != NULL && !$Shadow )
+     if ($WriteValues != NULL && !$Shadow)
       {
-       $Step = 360 / (2 * PI * $Radius);
-       $Offset = 0; $ID = count($Values)-1;
-       $Settings = array("Align"=>TEXT_ALIGN_MIDDLEMIDDLE,"R"=>$ValueR,"G"=>$ValueG,"B"=>$ValueB,"Alpha"=>$ValueAlpha);
-       foreach($Values as $Key => $Value)
+       $Step = 360/(2*PI*$Radius);
+       $Offset = 0; $ID = count($Values) - 1;
+       $Settings = array("Align"=>TEXT_ALIGN_MIDDLEMIDDLE, "R"=>$ValueR, "G"=>$ValueG, "B"=>$ValueB, "Alpha"=>$ValueAlpha);
+       foreach ($Values as $Key => $Value)
         {
-         $EndAngle = ($Value*$ScaleFactor) + $Offset; if ( $EndAngle > 360 ) { $EndAngle = 0; }
+         $EndAngle = ($Value*$ScaleFactor) + $Offset; if ($EndAngle > 360) { $EndAngle = 0; }
          $Angle    = ($EndAngle - $Offset)/2 + $Offset;
 
-         if ( $ValuePosition == PIE_VALUE_OUTSIDE )
+         if ($ValuePosition == PIE_VALUE_OUTSIDE)
           {
-           $Xc = cos(($Angle-90)*PI/180) * ($Radius+$ValuePadding) + $X;
-           $Yc = sin(($Angle-90)*PI/180) * ($Radius+$ValuePadding) + $Y;
+           $Xc = cos(($Angle - 90)*PI/180)*($Radius + $ValuePadding) + $X;
+           $Yc = sin(($Angle - 90)*PI/180)*($Radius + $ValuePadding) + $Y;
           }
          else
           {
-           $Xc = cos(($Angle-90)*PI/180) * ($Radius)/2 + $X;
-           $Yc = sin(($Angle-90)*PI/180) * ($Radius)/2 + $Y;
+           $Xc = cos(($Angle - 90)*PI/180)*($Radius)/2 + $X;
+           $Yc = sin(($Angle - 90)*PI/180)*($Radius)/2 + $Y;
           }
 
-         if ( $WriteValues == PIE_VALUE_PERCENTAGE )
-          $Display = round(( 100 / $SerieSum ) * $Value,$Precision)."%";
-         elseif ( $WriteValues == PIE_VALUE_NATURAL )
+         if ($WriteValues == PIE_VALUE_PERCENTAGE)
+          $Display = round((100/$SerieSum)*$Value, $Precision)."%";
+         elseif ($WriteValues == PIE_VALUE_NATURAL)
           $Display = $Value.$ValueSuffix;
 
-         $this->pChartObject->drawText($Xc,$Yc,$Display,$Settings);
+         $this->pChartObject->drawText($Xc, $Yc, $Display, $Settings);
 
          $Offset = $EndAngle + $DataGapAngle; $ID--;
         }
       }
 
-     if ( $DrawLabels && $LabelStacked ) { $this->writeShiftedLabels(); }
+     if ($DrawLabels && $LabelStacked) { $this->writeShiftedLabels(); }
 
      $this->pChartObject->Shadow = $RestoreShadow;
 
@@ -296,61 +296,61 @@ 
     }
 
    /* Draw a 3D pie chart */
-   function draw3DPie($X,$Y,$Format="")
+   function draw3DPie($X, $Y, $Format = "")
     {
      /* Rendering layout */
-     $Radius		= isset($Format["Radius"]) ? $Format["Radius"] : 80;
+     $Radius = isset($Format["Radius"]) ? $Format["Radius"] : 80;
      $Precision		= isset($Format["Precision"]) ? $Format["Precision"] : 0;
      $SkewFactor	= isset($Format["SkewFactor"]) ? $Format["SkewFactor"] : .5;
-     $SliceHeight	= isset($Format["SliceHeight"]) ? $Format["SliceHeight"] : 20;
-     $DataGapAngle	= isset($Format["DataGapAngle"]) ? $Format["DataGapAngle"] : 0;
-     $DataGapRadius	= isset($Format["DataGapRadius"]) ? $Format["DataGapRadius"] : 0;
+     $SliceHeight = isset($Format["SliceHeight"]) ? $Format["SliceHeight"] : 20;
+     $DataGapAngle = isset($Format["DataGapAngle"]) ? $Format["DataGapAngle"] : 0;
+     $DataGapRadius = isset($Format["DataGapRadius"]) ? $Format["DataGapRadius"] : 0;
      $SecondPass	= isset($Format["SecondPass"]) ? $Format["SecondPass"] : TRUE;
      $Border		= isset($Format["Border"]) ? $Format["Border"] : FALSE;
      $Shadow		= isset($Format["Shadow"]) ? $Format["Shadow"] : FALSE;
      $DrawLabels	= isset($Format["DrawLabels"]) ? $Format["DrawLabels"] : FALSE;
-     $LabelStacked	= isset($Format["LabelStacked"]) ? $Format["LabelStacked"] : FALSE;
+     $LabelStacked = isset($Format["LabelStacked"]) ? $Format["LabelStacked"] : FALSE;
      $LabelColor	= isset($Format["LabelColor"]) ? $Format["LabelColor"] : PIE_LABEL_COLOR_MANUAL;
      $LabelR		= isset($Format["LabelR"]) ? $Format["LabelR"] : 0;
      $LabelG		= isset($Format["LabelG"]) ? $Format["LabelG"] : 0;
      $LabelB		= isset($Format["LabelB"]) ? $Format["LabelB"] : 0;
-     $LabelAlpha	= isset($Format["LabelAlpha"]) ? $Format["LabelAlpha"] : 100;
+     $LabelAlpha = isset($Format["LabelAlpha"]) ? $Format["LabelAlpha"] : 100;
      $WriteValues	= isset($Format["WriteValues"]) ? $Format["WriteValues"] : NULL; //PIE_VALUE_PERCENTAGE
-     $ValuePosition	= isset($Format["ValuePosition"]) ? $Format["ValuePosition"] : PIE_VALUE_INSIDE;
-     $ValuePadding	= isset($Format["ValuePadding"]) ? $Format["ValuePadding"] : 15;
+     $ValuePosition = isset($Format["ValuePosition"]) ? $Format["ValuePosition"] : PIE_VALUE_INSIDE;
+     $ValuePadding = isset($Format["ValuePadding"]) ? $Format["ValuePadding"] : 15;
      $ValueSuffix	= isset($Format["ValueSuffix"]) ? $Format["ValueSuffix"] : "";
      $ValueR		= isset($Format["ValueR"]) ? $Format["ValueR"] : 255;
      $ValueG		= isset($Format["ValueG"]) ? $Format["ValueG"] : 255;
      $ValueB		= isset($Format["ValueB"]) ? $Format["ValueB"] : 255;
-     $ValueAlpha	= isset($Format["ValueAlpha"]) ? $Format["ValueAlpha"] : 100;
-     $RecordImageMap	= isset($Format["RecordImageMap"]) ? $Format["RecordImageMap"] : FALSE;
+     $ValueAlpha = isset($Format["ValueAlpha"]) ? $Format["ValueAlpha"] : 100;
+     $RecordImageMap = isset($Format["RecordImageMap"]) ? $Format["RecordImageMap"] : FALSE;
 
      /* Error correction for overlaying rounded corners */
-     if ( $SkewFactor < .5 ) { $SkewFactor = .5; }
+     if ($SkewFactor < .5) { $SkewFactor = .5; }
 
      /* Data Processing */
      $Data    = $this->pDataObject->getData();
      $Palette = $this->pDataObject->getPalette();
 
      /* Do we have an abscissa serie defined? */
-     if ( $Data["Abscissa"] == "" ) { return(PIE_NO_ABSCISSA); }
+     if ($Data["Abscissa"] == "") { return(PIE_NO_ABSCISSA); }
 
      /* Try to find the data serie */
      $DataSerie = "";
      foreach ($Data["Series"] as $SerieName => $SerieData)
-      { if ( $SerieName != $Data["Abscissa"]) { $DataSerie = $SerieName; } }
+      { if ($SerieName != $Data["Abscissa"]) { $DataSerie = $SerieName; } }
 
      /* Do we have data to compute? */
-     if ( $DataSerie == "" ) { return(PIE_NO_DATASERIE); }
+     if ($DataSerie == "") { return(PIE_NO_DATASERIE); }
 
      /* Remove unused data */
-     list($Data,$Palette) = $this->clean0Values($Data,$Palette,$DataSerie,$Data["Abscissa"]);
+     list($Data, $Palette) = $this->clean0Values($Data, $Palette, $DataSerie, $Data["Abscissa"]);
 
      /* Compute the pie sum */
      $SerieSum = $this->pDataObject->getSum($DataSerie);
 
      /* Do we have data to draw? */
-     if ( $SerieSum == 0 ) { return(PIE_SUMISNULL); }
+     if ($SerieSum == 0) { return(PIE_SUMISNULL); }
 
      /* Dump the real number of data to draw */
      $Values = "";
@@ -358,51 +358,51 @@ 
       { if ($Value != 0) { $Values[] = $Value; } }
 
      /* Compute the wasted angular space between series */
-     if (count($Values)==1) { $WastedAngular = 0; } else { $WastedAngular = count($Values) * $DataGapAngle; }
+     if (count($Values) == 1) { $WastedAngular = 0; } else { $WastedAngular = count($Values)*$DataGapAngle; }
 
      /* Compute the scale */
-     $ScaleFactor = (360 - $WastedAngular) / $SerieSum;
+     $ScaleFactor = (360 - $WastedAngular)/$SerieSum;
 
      $RestoreShadow = $this->pChartObject->Shadow;
-     if ( $this->pChartObject->Shadow ) { $this->pChartObject->Shadow = FALSE; }
+     if ($this->pChartObject->Shadow) { $this->pChartObject->Shadow = FALSE; }
 
      /* Draw the polygon pie elements */
-     $Step   = 360 / (2 * PI * $Radius);
-     $Offset = 360; $ID = count($Values)-1;
+     $Step   = 360/(2*PI*$Radius);
+     $Offset = 360; $ID = count($Values) - 1;
      $Values = array_reverse($Values);
      $Slice  = 0; $Slices = ""; $SliceColors = ""; $Visible = ""; $SliceAngle = "";
-     foreach($Values as $Key => $Value)
+     foreach ($Values as $Key => $Value)
       {
-       if ( !isset($Palette[$ID]["R"]) ) { $Color = $this->pChartObject->getRandomColor(); $Palette[$ID] = $Color; $this->pDataObject->savePalette($ID,$Color); }
-       $Settings = array("R"=>$Palette[$ID]["R"],"G"=>$Palette[$ID]["G"],"B"=>$Palette[$ID]["B"],"Alpha"=>$Palette[$ID]["Alpha"]);
+       if (!isset($Palette[$ID]["R"])) { $Color = $this->pChartObject->getRandomColor(); $Palette[$ID] = $Color; $this->pDataObject->savePalette($ID, $Color); }
+       $Settings = array("R"=>$Palette[$ID]["R"], "G"=>$Palette[$ID]["G"], "B"=>$Palette[$ID]["B"], "Alpha"=>$Palette[$ID]["Alpha"]);
 
        $SliceColors[$Slice] = $Settings;
 
        $StartAngle = $Offset;
-       $EndAngle   = $Offset-($Value*$ScaleFactor); if ( $EndAngle < 0 ) { $EndAngle = 0; }
+       $EndAngle   = $Offset - ($Value*$ScaleFactor); if ($EndAngle < 0) { $EndAngle = 0; }
 
-       if ( $StartAngle > 180 ) { $Visible[$Slice]["Start"] = TRUE; } else { $Visible[$Slice]["Start"] = TRUE; }
-       if ( $EndAngle < 180 )   { $Visible[$Slice]["End"] = FALSE; } else { $Visible[$Slice]["End"] = TRUE; }
+       if ($StartAngle > 180) { $Visible[$Slice]["Start"] = TRUE; } else { $Visible[$Slice]["Start"] = TRUE; }
+       if ($EndAngle < 180) { $Visible[$Slice]["End"] = FALSE; } else { $Visible[$Slice]["End"] = TRUE; }
 
        if ($DataGapAngle == 0)
         { $X0 = $X; $Y0 = $Y; }
        else
         {
          $Angle = ($EndAngle - $Offset)/2 + $Offset;
-         $X0 = cos(($Angle-90)*PI/180) * $DataGapRadius + $X;
-         $Y0 = sin(($Angle-90)*PI/180) * $DataGapRadius*$SkewFactor + $Y;
+         $X0 = cos(($Angle - 90)*PI/180)*$DataGapRadius + $X;
+         $Y0 = sin(($Angle - 90)*PI/180)*$DataGapRadius*$SkewFactor + $Y;
         }
        $Slices[$Slice][] = $X0; $Slices[$Slice][] = $Y0; $SliceAngle[$Slice][] = 0;
 
-       for($i=$Offset;$i>=$EndAngle;$i=$i-$Step)
+       for ($i = $Offset; $i >= $EndAngle; $i = $i - $Step)
         {
-         $Xc = cos(($i-90)*PI/180) * $Radius + $X;
-         $Yc = sin(($i-90)*PI/180) * $Radius*$SkewFactor + $Y;
+         $Xc = cos(($i - 90)*PI/180)*$Radius + $X;
+         $Yc = sin(($i - 90)*PI/180)*$Radius*$SkewFactor + $Y;
 
-         if ( ($SecondPass || $RestoreShadow ) && ( $i<90 )) { $Yc++; }
-         if ( ($SecondPass || $RestoreShadow ) && ( $i>90 && $i<180 )) { $Xc++; }
-         if ( ($SecondPass || $RestoreShadow ) && ( $i>180 && $i<270 )) { $Xc++; }
-         if ( ($SecondPass || $RestoreShadow ) && ( $i>=270 )) { $Xc++; $Yc++; }
+         if (($SecondPass || $RestoreShadow) && ($i < 90)) { $Yc++; }
+         if (($SecondPass || $RestoreShadow) && ($i > 90 && $i < 180)) { $Xc++; }
+         if (($SecondPass || $RestoreShadow) && ($i > 180 && $i < 270)) { $Xc++; }
+         if (($SecondPass || $RestoreShadow) && ($i >= 270)) { $Xc++; $Yc++; }
 
          $Slices[$Slice][] = $Xc; $Slices[$Slice][] = $Yc; $SliceAngle[$Slice][] = $i;
         }
@@ -411,30 +411,30 @@ 
       }
 
      /* Draw the bottom shadow if needed */
-     if ( $RestoreShadow && ($this->pChartObject->ShadowX != 0 || $this->pChartObject->ShadowY !=0 ))
+     if ($RestoreShadow && ($this->pChartObject->ShadowX != 0 || $this->pChartObject->ShadowY != 0))
       {
-       foreach($Slices as $SliceID => $Plots)
+       foreach ($Slices as $SliceID => $Plots)
         {
          $ShadowPie = "";
-         for($i=0;$i<count($Plots);$i=$i+2)
-          { $ShadowPie[] = $Plots[$i]+$this->pChartObject->ShadowX; $ShadowPie[] = $Plots[$i+1]+$this->pChartObject->ShadowY; }
+         for ($i = 0; $i < count($Plots); $i = $i + 2)
+          { $ShadowPie[] = $Plots[$i] + $this->pChartObject->ShadowX; $ShadowPie[] = $Plots[$i + 1] + $this->pChartObject->ShadowY; }
 
-         $Settings = array("R"=>$this->pChartObject->ShadowR,"G"=>$this->pChartObject->ShadowG,"B"=>$this->pChartObject->ShadowB,"Alpha"=>$this->pChartObject->Shadowa,"NoBorder"=>TRUE);
-         $this->pChartObject->drawPolygon($ShadowPie,$Settings);
+         $Settings = array("R"=>$this->pChartObject->ShadowR, "G"=>$this->pChartObject->ShadowG, "B"=>$this->pChartObject->ShadowB, "Alpha"=>$this->pChartObject->Shadowa, "NoBorder"=>TRUE);
+         $this->pChartObject->drawPolygon($ShadowPie, $Settings);
         }
 
-       $Step = 360 / (2 * PI * $Radius);
+       $Step = 360/(2*PI*$Radius);
        $Offset = 360;
-       foreach($Values as $Key => $Value)
+       foreach ($Values as $Key => $Value)
         {
-         $EndAngle = $Offset-($Value*$ScaleFactor); if ( $EndAngle < 0 ) { $EndAngle = 0; }
+         $EndAngle = $Offset - ($Value*$ScaleFactor); if ($EndAngle < 0) { $EndAngle = 0; }
 
-         for($i=$Offset;$i>=$EndAngle;$i=$i-$Step)
+         for ($i = $Offset; $i >= $EndAngle; $i = $i - $Step)
           {
-           $Xc = cos(($i-90)*PI/180) * $Radius + $X + $this->pChartObject->ShadowX;
-           $Yc = sin(($i-90)*PI/180) * $Radius*$SkewFactor + $Y + $this->pChartObject->ShadowY;
+           $Xc = cos(($i - 90)*PI/180)*$Radius + $X + $this->pChartObject->ShadowX;
+           $Yc = sin(($i - 90)*PI/180)*$Radius*$SkewFactor + $Y + $this->pChartObject->ShadowY;
 
-           $this->pChartObject->drawAntialiasPixel($Xc,$Yc,$Settings);
+           $this->pChartObject->drawAntialiasPixel($Xc, $Yc, $Settings);
           }
 
          $Offset = $i - $DataGapAngle; $ID--;
@@ -442,28 +442,28 @@ 
       }
 
      /* Draw the bottom pie splice */
-     foreach($Slices as $SliceID => $Plots)
+     foreach ($Slices as $SliceID => $Plots)
       {
-       $Settings = $SliceColors[$SliceID];  $Settings["NoBorder"] = TRUE;
-       $this->pChartObject->drawPolygon($Plots,$Settings);
+       $Settings = $SliceColors[$SliceID]; $Settings["NoBorder"] = TRUE;
+       $this->pChartObject->drawPolygon($Plots, $Settings);
 
-       if ( $SecondPass )
+       if ($SecondPass)
         {
          $Settings = $SliceColors[$SliceID];
-         if ( $Border )
-          { $Settings["R"]+= 30; $Settings["G"]+= 30; $Settings["B"]+= 30;; }
+         if ($Border)
+          { $Settings["R"] += 30; $Settings["G"] += 30; $Settings["B"] += 30; ; }
   
-         if ( isset($SliceAngle[$SliceID][1]) ) /* Empty error handling */
+         if (isset($SliceAngle[$SliceID][1])) /* Empty error handling */
           {
            $Angle = $SliceAngle[$SliceID][1];
-           $Xc = cos(($Angle-90)*PI/180) * $Radius + $X;
-           $Yc = sin(($Angle-90)*PI/180) * $Radius*$SkewFactor + $Y;
-           $this->pChartObject->drawLine($Plots[0],$Plots[1],$Xc,$Yc,$Settings);
-
-           $Angle = $SliceAngle[$SliceID][count($SliceAngle[$SliceID])-1];
-           $Xc = cos(($Angle-90)*PI/180) * $Radius + $X;
-           $Yc = sin(($Angle-90)*PI/180) * $Radius*$SkewFactor + $Y;
-           $this->pChartObject->drawLine($Plots[0],$Plots[1],$Xc,$Yc,$Settings);
+           $Xc = cos(($Angle - 90)*PI/180)*$Radius + $X;
+           $Yc = sin(($Angle - 90)*PI/180)*$Radius*$SkewFactor + $Y;
+           $this->pChartObject->drawLine($Plots[0], $Plots[1], $Xc, $Yc, $Settings);
+
+           $Angle = $SliceAngle[$SliceID][count($SliceAngle[$SliceID]) - 1];
+           $Xc = cos(($Angle - 90)*PI/180)*$Radius + $X;
+           $Yc = sin(($Angle - 90)*PI/180)*$Radius*$SkewFactor + $Y;
+           $this->pChartObject->drawLine($Plots[0], $Plots[1], $Xc, $Yc, $Settings);
           }
         }
       }
@@ -471,225 +471,225 @@ 
      /* Draw the two vertical edges */
      $Slices      = array_reverse($Slices);
      $SliceColors = array_reverse($SliceColors);
-     foreach($Slices as $SliceID => $Plots)
+     foreach ($Slices as $SliceID => $Plots)
       {
        $Settings = $SliceColors[$SliceID];
-       $Settings["R"]+= 10; $Settings["G"]+= 10; $Settings["B"]+= 10; $Settings["NoBorder"] = TRUE;
+       $Settings["R"] += 10; $Settings["G"] += 10; $Settings["B"] += 10; $Settings["NoBorder"] = TRUE;
 
-       if ( $Visible[$SliceID]["Start"] && isset($Plots[2])) /* Empty error handling */
+       if ($Visible[$SliceID]["Start"] && isset($Plots[2])) /* Empty error handling */
         {
-         $this->pChartObject->drawLine($Plots[2],$Plots[3],$Plots[2],$Plots[3]- $SliceHeight,array("R"=>$Settings["R"],"G"=>$Settings["G"],"B"=>$Settings["B"]));
+         $this->pChartObject->drawLine($Plots[2], $Plots[3], $Plots[2], $Plots[3] - $SliceHeight, array("R"=>$Settings["R"], "G"=>$Settings["G"], "B"=>$Settings["B"]));
          $Border = "";
          $Border[] = $Plots[0]; $Border[] = $Plots[1]; $Border[] = $Plots[0]; $Border[] = $Plots[1] - $SliceHeight;
          $Border[] = $Plots[2]; $Border[] = $Plots[3] - $SliceHeight; $Border[] = $Plots[2]; $Border[] = $Plots[3]; 
-         $this->pChartObject->drawPolygon($Border,$Settings);
+         $this->pChartObject->drawPolygon($Border, $Settings);
         }
       }
 
      $Slices      = array_reverse($Slices);
      $SliceColors = array_reverse($SliceColors);
-     foreach($Slices as $SliceID => $Plots)
+     foreach ($Slices as $SliceID => $Plots)
       {
        $Settings = $SliceColors[$SliceID];
-       $Settings["R"]+= 10; $Settings["G"]+= 10; $Settings["B"]+= 10; $Settings["NoBorder"] = TRUE;
-       if ( $Visible[$SliceID]["End"] )
+       $Settings["R"] += 10; $Settings["G"] += 10; $Settings["B"] += 10; $Settings["NoBorder"] = TRUE;
+       if ($Visible[$SliceID]["End"])
         {
-         $this->pChartObject->drawLine($Plots[count($Plots)-2],$Plots[count($Plots)-1],$Plots[count($Plots)-2],$Plots[count($Plots)-1]- $SliceHeight,array("R"=>$Settings["R"],"G"=>$Settings["G"],"B"=>$Settings["B"]));
+         $this->pChartObject->drawLine($Plots[count($Plots) - 2], $Plots[count($Plots) - 1], $Plots[count($Plots) - 2], $Plots[count($Plots) - 1] - $SliceHeight, array("R"=>$Settings["R"], "G"=>$Settings["G"], "B"=>$Settings["B"]));
 
          $Border = "";
          $Border[] = $Plots[0]; $Border[] = $Plots[1]; $Border[] = $Plots[0]; $Border[] = $Plots[1] - $SliceHeight;
-         $Border[] = $Plots[count($Plots)-2]; $Border[] = $Plots[count($Plots)-1] - $SliceHeight; $Border[] = $Plots[count($Plots)-2]; $Border[] = $Plots[count($Plots)-1]; 
-         $this->pChartObject->drawPolygon($Border,$Settings);
+         $Border[] = $Plots[count($Plots) - 2]; $Border[] = $Plots[count($Plots) - 1] - $SliceHeight; $Border[] = $Plots[count($Plots) - 2]; $Border[] = $Plots[count($Plots) - 1]; 
+         $this->pChartObject->drawPolygon($Border, $Settings);
         }
       }
 
      /* Draw the rounded edges */
-     foreach($Slices as $SliceID => $Plots)
+     foreach ($Slices as $SliceID => $Plots)
       {
        $Settings = $SliceColors[$SliceID];
-       $Settings["R"]+= 10; $Settings["G"]+= 10; $Settings["B"]+= 10; $Settings["NoBorder"] = TRUE;
+       $Settings["R"] += 10; $Settings["G"] += 10; $Settings["B"] += 10; $Settings["NoBorder"] = TRUE;
 
-       for ($j=2;$j<count($Plots)-2;$j=$j+2)
+       for ($j = 2; $j < count($Plots) - 2; $j = $j + 2)
         {
          $Angle = $SliceAngle[$SliceID][$j/2];
-         if ( $Angle < 270 && $Angle > 90 )
+         if ($Angle < 270 && $Angle > 90)
           {
            $Border = "";
-           $Border[] = $Plots[$j];   $Border[] = $Plots[$j+1];
-           $Border[] = $Plots[$j+2]; $Border[] = $Plots[$j+3];
-           $Border[] = $Plots[$j+2]; $Border[] = $Plots[$j+3] - $SliceHeight;
-           $Border[] = $Plots[$j];   $Border[] = $Plots[$j+1] - $SliceHeight;
-           $this->pChartObject->drawPolygon($Border,$Settings);
+           $Border[] = $Plots[$j]; $Border[] = $Plots[$j + 1];
+           $Border[] = $Plots[$j + 2]; $Border[] = $Plots[$j + 3];
+           $Border[] = $Plots[$j + 2]; $Border[] = $Plots[$j + 3] - $SliceHeight;
+           $Border[] = $Plots[$j]; $Border[] = $Plots[$j + 1] - $SliceHeight;
+           $this->pChartObject->drawPolygon($Border, $Settings);
           }
         }
 
-       if ( $SecondPass )
+       if ($SecondPass)
         {
          $Settings = $SliceColors[$SliceID];
-         if ( $Border )
-          { $Settings["R"]+= 30; $Settings["G"]+= 30; $Settings["B"]+= 30; }
+         if ($Border)
+          { $Settings["R"] += 30; $Settings["G"] += 30; $Settings["B"] += 30; }
   
-         if ( isset($SliceAngle[$SliceID][1]) ) /* Empty error handling */
+         if (isset($SliceAngle[$SliceID][1])) /* Empty error handling */
           {
            $Angle = $SliceAngle[$SliceID][1];
-           if ( $Angle < 270 && $Angle > 90 )
+           if ($Angle < 270 && $Angle > 90)
             {
-             $Xc = cos(($Angle-90)*PI/180) * $Radius + $X;
-             $Yc = sin(($Angle-90)*PI/180) * $Radius*$SkewFactor + $Y;
-             $this->pChartObject->drawLine($Xc,$Yc,$Xc,$Yc-$SliceHeight,$Settings);
+             $Xc = cos(($Angle - 90)*PI/180)*$Radius + $X;
+             $Yc = sin(($Angle - 90)*PI/180)*$Radius*$SkewFactor + $Y;
+             $this->pChartObject->drawLine($Xc, $Yc, $Xc, $Yc - $SliceHeight, $Settings);
             }
           }
 
-         $Angle = $SliceAngle[$SliceID][count($SliceAngle[$SliceID])-1];
-         if ( $Angle < 270 && $Angle > 90 )
+         $Angle = $SliceAngle[$SliceID][count($SliceAngle[$SliceID]) - 1];
+         if ($Angle < 270 && $Angle > 90)
           {
-           $Xc = cos(($Angle-90)*PI/180) * $Radius + $X;
-           $Yc = sin(($Angle-90)*PI/180) * $Radius*$SkewFactor + $Y;
-           $this->pChartObject->drawLine($Xc,$Yc,$Xc,$Yc-$SliceHeight,$Settings);
+           $Xc = cos(($Angle - 90)*PI/180)*$Radius + $X;
+           $Yc = sin(($Angle - 90)*PI/180)*$Radius*$SkewFactor + $Y;
+           $this->pChartObject->drawLine($Xc, $Yc, $Xc, $Yc - $SliceHeight, $Settings);
           }
 
-         if ( isset($SliceAngle[$SliceID][1]) && $SliceAngle[$SliceID][1] > 270 && $SliceAngle[$SliceID][count($SliceAngle[$SliceID])-1] < 270 )
+         if (isset($SliceAngle[$SliceID][1]) && $SliceAngle[$SliceID][1] > 270 && $SliceAngle[$SliceID][count($SliceAngle[$SliceID]) - 1] < 270)
           {
-           $Xc = cos((270-90)*PI/180) * $Radius + $X;
-           $Yc = sin((270-90)*PI/180) * $Radius*$SkewFactor + $Y;
-           $this->pChartObject->drawLine($Xc,$Yc,$Xc,$Yc-$SliceHeight,$Settings);
+           $Xc = cos((270 - 90)*PI/180)*$Radius + $X;
+           $Yc = sin((270 - 90)*PI/180)*$Radius*$SkewFactor + $Y;
+           $this->pChartObject->drawLine($Xc, $Yc, $Xc, $Yc - $SliceHeight, $Settings);
           }
 
-         if ( isset($SliceAngle[$SliceID][1]) && $SliceAngle[$SliceID][1] > 90 && $SliceAngle[$SliceID][count($SliceAngle[$SliceID])-1] < 90 )
+         if (isset($SliceAngle[$SliceID][1]) && $SliceAngle[$SliceID][1] > 90 && $SliceAngle[$SliceID][count($SliceAngle[$SliceID]) - 1] < 90)
           {
-           $Xc = cos((0)*PI/180) * $Radius + $X;
-           $Yc = sin((0)*PI/180) * $Radius*$SkewFactor + $Y;
-           $this->pChartObject->drawLine($Xc,$Yc,$Xc,$Yc-$SliceHeight,$Settings);
+           $Xc = cos((0)*PI/180)*$Radius + $X;
+           $Yc = sin((0)*PI/180)*$Radius*$SkewFactor + $Y;
+           $this->pChartObject->drawLine($Xc, $Yc, $Xc, $Yc - $SliceHeight, $Settings);
           }
 
         }
       }
 
      /* Draw the top splice */
-     foreach($Slices as $SliceID => $Plots)
+     foreach ($Slices as $SliceID => $Plots)
       {
        $Settings = $SliceColors[$SliceID];
-       $Settings["R"]+= 20; $Settings["G"]+= 20; $Settings["B"]+= 20;
+       $Settings["R"] += 20; $Settings["G"] += 20; $Settings["B"] += 20;
 
        $Top = "";
-       for($j=0;$j<count($Plots);$j=$j+2) { $Top[] = $Plots[$j]; $Top[] = $Plots[$j+1]- $SliceHeight; }
-       $this->pChartObject->drawPolygon($Top,$Settings);
+       for ($j = 0; $j < count($Plots); $j = $j + 2) { $Top[] = $Plots[$j]; $Top[] = $Plots[$j + 1] - $SliceHeight; }
+       $this->pChartObject->drawPolygon($Top, $Settings);
 
-       if ( $RecordImageMap && !$Shadow ) { $this->pChartObject->addToImageMap("POLY",$this->arraySerialize($Top),$this->pChartObject->toHTMLColor($Settings["R"],$Settings["G"],$Settings["B"]),$Data["Series"][$Data["Abscissa"]]["Data"][count($Slices)-$SliceID-1],$Values[$SliceID]); }
+       if ($RecordImageMap && !$Shadow) { $this->pChartObject->addToImageMap("POLY", $this->arraySerialize($Top), $this->pChartObject->toHTMLColor($Settings["R"], $Settings["G"], $Settings["B"]), $Data["Series"][$Data["Abscissa"]]["Data"][count($Slices) - $SliceID - 1], $Values[$SliceID]); }
       }
 
 
      /* Second pass to smooth the angles */
-     if ( $SecondPass )
+     if ($SecondPass)
       {
-       $Step = 360 / (2 * PI * $Radius);
-       $Offset = 360; $ID = count($Values)-1;
-       foreach($Values as $Key => $Value)
+       $Step = 360/(2*PI*$Radius);
+       $Offset = 360; $ID = count($Values) - 1;
+       foreach ($Values as $Key => $Value)
         {
          $FirstPoint = TRUE;
-         if ( $Shadow )
-          $Settings = array("R"=>$this->pChartObject->ShadowR,"G"=>$this->pChartObject->ShadowG,"B"=>$this->pChartObject->ShadowB,"Alpha"=>$this->pChartObject->Shadowa);
+         if ($Shadow)
+          $Settings = array("R"=>$this->pChartObject->ShadowR, "G"=>$this->pChartObject->ShadowG, "B"=>$this->pChartObject->ShadowB, "Alpha"=>$this->pChartObject->Shadowa);
          else
           {
-           if ( $Border )
-            { $Settings = array("R"=>$Palette[$ID]["R"]+30,"G"=>$Palette[$ID]["G"]+30,"B"=>$Palette[$ID]["B"]+30,"Alpha"=>$Palette[$ID]["Alpha"]); }
+           if ($Border)
+            { $Settings = array("R"=>$Palette[$ID]["R"] + 30, "G"=>$Palette[$ID]["G"] + 30, "B"=>$Palette[$ID]["B"] + 30, "Alpha"=>$Palette[$ID]["Alpha"]); }
            else
-            $Settings = array("R"=>$Palette[$ID]["R"],"G"=>$Palette[$ID]["G"],"B"=>$Palette[$ID]["B"],"Alpha"=>$Palette[$ID]["Alpha"]);
+            $Settings = array("R"=>$Palette[$ID]["R"], "G"=>$Palette[$ID]["G"], "B"=>$Palette[$ID]["B"], "Alpha"=>$Palette[$ID]["Alpha"]);
           }
 
-         $EndAngle = $Offset-($Value*$ScaleFactor); if ( $EndAngle < 0 ) { $EndAngle = 0; }
+         $EndAngle = $Offset - ($Value*$ScaleFactor); if ($EndAngle < 0) { $EndAngle = 0; }
 
          if ($DataGapAngle == 0)
-          { $X0 = $X; $Y0 = $Y- $SliceHeight; }
+          { $X0 = $X; $Y0 = $Y - $SliceHeight; }
          else
           {
            $Angle = ($EndAngle - $Offset)/2 + $Offset;
-           $X0 = cos(($Angle-90)*PI/180) * $DataGapRadius + $X;
-           $Y0 = sin(($Angle-90)*PI/180) * $DataGapRadius*$SkewFactor + $Y - $SliceHeight;
+           $X0 = cos(($Angle - 90)*PI/180)*$DataGapRadius + $X;
+           $Y0 = sin(($Angle - 90)*PI/180)*$DataGapRadius*$SkewFactor + $Y - $SliceHeight;
           }
          $Plots[] = $X0; $Plots[] = $Y0;
 
-         for($i=$Offset;$i>=$EndAngle;$i=$i-$Step)
+         for ($i = $Offset; $i >= $EndAngle; $i = $i - $Step)
           {
-           $Xc = cos(($i-90)*PI/180) * $Radius + $X;
-           $Yc = sin(($i-90)*PI/180) * $Radius*$SkewFactor + $Y - $SliceHeight;
+           $Xc = cos(($i - 90)*PI/180)*$Radius + $X;
+           $Yc = sin(($i - 90)*PI/180)*$Radius*$SkewFactor + $Y - $SliceHeight;
 
-           if ( $FirstPoint ) { $this->pChartObject->drawLine($Xc,$Yc,$X0,$Y0,$Settings); } { $FirstPoint = FALSE; }
+           if ($FirstPoint) { $this->pChartObject->drawLine($Xc, $Yc, $X0, $Y0, $Settings); } { $FirstPoint = FALSE; }
   
-           $this->pChartObject->drawAntialiasPixel($Xc,$Yc,$Settings);
-           if ($i < 270 && $i > 90 ) { $this->pChartObject->drawAntialiasPixel($Xc,$Yc+$SliceHeight,$Settings); }
+           $this->pChartObject->drawAntialiasPixel($Xc, $Yc, $Settings);
+           if ($i < 270 && $i > 90) { $this->pChartObject->drawAntialiasPixel($Xc, $Yc + $SliceHeight, $Settings); }
           }
-         $this->pChartObject->drawLine($Xc,$Yc,$X0,$Y0,$Settings);
+         $this->pChartObject->drawLine($Xc, $Yc, $X0, $Y0, $Settings);
 
          $Offset = $i - $DataGapAngle; $ID--;
         }
       }
 
-     if ( $WriteValues != NULL )
+     if ($WriteValues != NULL)
       {
-       $Step = 360 / (2 * PI * $Radius);
-       $Offset = 360; $ID = count($Values)-1;
-       $Settings = array("Align"=>TEXT_ALIGN_MIDDLEMIDDLE,"R"=>$ValueR,"G"=>$ValueG,"B"=>$ValueB,"Alpha"=>$ValueAlpha);
-       foreach($Values as $Key => $Value)
+       $Step = 360/(2*PI*$Radius);
+       $Offset = 360; $ID = count($Values) - 1;
+       $Settings = array("Align"=>TEXT_ALIGN_MIDDLEMIDDLE, "R"=>$ValueR, "G"=>$ValueG, "B"=>$ValueB, "Alpha"=>$ValueAlpha);
+       foreach ($Values as $Key => $Value)
         {
-         $EndAngle = $Offset-($Value*$ScaleFactor); if ( $EndAngle < 0 ) { $EndAngle = 0; }
+         $EndAngle = $Offset - ($Value*$ScaleFactor); if ($EndAngle < 0) { $EndAngle = 0; }
 
          $Angle = ($EndAngle - $Offset)/2 + $Offset;
 
-         if ( $ValuePosition == PIE_VALUE_OUTSIDE )
+         if ($ValuePosition == PIE_VALUE_OUTSIDE)
           {
-           $Xc = cos(($Angle-90)*PI/180) * ($Radius+$ValuePadding) + $X;
-           $Yc = sin(($Angle-90)*PI/180) * (($Radius*$SkewFactor)+$ValuePadding) + $Y - $SliceHeight;
+           $Xc = cos(($Angle - 90)*PI/180)*($Radius + $ValuePadding) + $X;
+           $Yc = sin(($Angle - 90)*PI/180)*(($Radius*$SkewFactor) + $ValuePadding) + $Y - $SliceHeight;
           }
          else
           {
-           $Xc = cos(($Angle-90)*PI/180) * ($Radius)/2 + $X;
-           $Yc = sin(($Angle-90)*PI/180) * ($Radius*$SkewFactor)/2 + $Y - $SliceHeight;
+           $Xc = cos(($Angle - 90)*PI/180)*($Radius)/2 + $X;
+           $Yc = sin(($Angle - 90)*PI/180)*($Radius*$SkewFactor)/2 + $Y - $SliceHeight;
           }
 
-         if ( $WriteValues == PIE_VALUE_PERCENTAGE )
-          $Display = round(( 100 / $SerieSum ) * $Value,$Precision)."%";
-         elseif ( $WriteValues == PIE_VALUE_NATURAL )
+         if ($WriteValues == PIE_VALUE_PERCENTAGE)
+          $Display = round((100/$SerieSum)*$Value, $Precision)."%";
+         elseif ($WriteValues == PIE_VALUE_NATURAL)
           $Display = $Value.$ValueSuffix;
 
-         $this->pChartObject->drawText($Xc,$Yc,$Display,$Settings);
+         $this->pChartObject->drawText($Xc, $Yc, $Display, $Settings);
 
          $Offset = $EndAngle - $DataGapAngle; $ID--;
         }
       }
 
-     if ( $DrawLabels )
+     if ($DrawLabels)
       {
-       $Step = 360 / (2 * PI * $Radius);
-       $Offset = 360; $ID = count($Values)-1;
-       foreach($Values as $Key => $Value)
+       $Step = 360/(2*PI*$Radius);
+       $Offset = 360; $ID = count($Values) - 1;
+       foreach ($Values as $Key => $Value)
         {
-         if ( $LabelColor == PIE_LABEL_COLOR_AUTO )
-          { $Settings = array("FillR"=>$Palette[$ID]["R"],"FillG"=>$Palette[$ID]["G"],"FillB"=>$Palette[$ID]["B"],"Alpha"=>$Palette[$ID]["Alpha"]);}
+         if ($LabelColor == PIE_LABEL_COLOR_AUTO)
+          { $Settings = array("FillR"=>$Palette[$ID]["R"], "FillG"=>$Palette[$ID]["G"], "FillB"=>$Palette[$ID]["B"], "Alpha"=>$Palette[$ID]["Alpha"]); }
          else
-          { $Settings = array("FillR"=>$LabelR,"FillG"=>$LabelG,"FillB"=>$LabelB,"Alpha"=>$LabelAlpha); }
+          { $Settings = array("FillR"=>$LabelR, "FillG"=>$LabelG, "FillB"=>$LabelB, "Alpha"=>$LabelAlpha); }
 
-         $EndAngle = $Offset-($Value*$ScaleFactor); if ( $EndAngle < 0 ) { $EndAngle = 0; }
+         $EndAngle = $Offset - ($Value*$ScaleFactor); if ($EndAngle < 0) { $EndAngle = 0; }
 
          $Angle = ($EndAngle - $Offset)/2 + $Offset;
-         $Xc = cos(($Angle-90)*PI/180) * $Radius + $X;
-         $Yc = sin(($Angle-90)*PI/180) * $Radius*$SkewFactor + $Y - $SliceHeight;
+         $Xc = cos(($Angle - 90)*PI/180)*$Radius + $X;
+         $Yc = sin(($Angle - 90)*PI/180)*$Radius*$SkewFactor + $Y - $SliceHeight;
 
-         if ( isset($Data["Series"][$Data["Abscissa"]]["Data"][$ID]) )
+         if (isset($Data["Series"][$Data["Abscissa"]]["Data"][$ID]))
           {
            $Label = $Data["Series"][$Data["Abscissa"]]["Data"][$ID];
 
-           if ( $LabelStacked )
-            $this->writePieLabel($Xc,$Yc,$Label,$Angle,$Settings,TRUE,$X,$Y,$Radius,TRUE);
+           if ($LabelStacked)
+            $this->writePieLabel($Xc, $Yc, $Label, $Angle, $Settings, TRUE, $X, $Y, $Radius, TRUE);
            else
-            $this->writePieLabel($Xc,$Yc,$Label,$Angle,$Settings,FALSE);
+            $this->writePieLabel($Xc, $Yc, $Label, $Angle, $Settings, FALSE);
           }
 
          $Offset = $EndAngle - $DataGapAngle; $ID--;
         }
       }
 
-     if ( $DrawLabels && $LabelStacked ) { $this->writeShiftedLabels(); }
+     if ($DrawLabels && $LabelStacked) { $this->writeShiftedLabels(); }
 
      $this->pChartObject->Shadow = $RestoreShadow;
 
@@ -697,29 +697,29 @@ 
     }
 
    /* Draw the legend of pie chart */
-   function drawPieLegend($X,$Y,$Format="")
+   function drawPieLegend($X, $Y, $Format = "")
     {
      $FontName		= isset($Format["FontName"]) ? $Format["FontName"] : $this->pChartObject->FontName;
      $FontSize		= isset($Format["FontSize"]) ? $Format["FontSize"] : $this->pChartObject->FontSize;
      $FontR		= isset($Format["FontR"]) ? $Format["FontR"] : $this->pChartObject->FontColorR;
      $FontG		= isset($Format["FontG"]) ? $Format["FontG"] : $this->pChartObject->FontColorG;
      $FontB		= isset($Format["FontB"]) ? $Format["FontB"] : $this->pChartObject->FontColorB;
-     $BoxSize		= isset($Format["BoxSize"]) ? $Format["BoxSize"] : 5;
-     $Margin		= isset($Format["Margin"]) ? $Format["Margin"] : 5;
+     $BoxSize = isset($Format["BoxSize"]) ? $Format["BoxSize"] : 5;
+     $Margin = isset($Format["Margin"]) ? $Format["Margin"] : 5;
      $R			= isset($Format["R"]) ? $Format["R"] : 200;
      $G			= isset($Format["G"]) ? $Format["G"] : 200;
      $B			= isset($Format["B"]) ? $Format["B"] : 200;
-     $Alpha		= isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
+     $Alpha = isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
      $BorderR		= isset($Format["BorderR"]) ? $Format["BorderR"] : 255;
      $BorderG		= isset($Format["BorderG"]) ? $Format["BorderG"] : 255;
      $BorderB		= isset($Format["BorderB"]) ? $Format["BorderB"] : 255;
-     $Surrounding	= isset($Format["Surrounding"]) ? $Format["Surrounding"] : NULL;
-     $Style		= isset($Format["Style"]) ? $Format["Style"] : LEGEND_ROUND;
-     $Mode		= isset($Format["Mode"]) ? $Format["Mode"] : LEGEND_VERTICAL;
+     $Surrounding = isset($Format["Surrounding"]) ? $Format["Surrounding"] : NULL;
+     $Style = isset($Format["Style"]) ? $Format["Style"] : LEGEND_ROUND;
+     $Mode = isset($Format["Mode"]) ? $Format["Mode"] : LEGEND_VERTICAL;
 
-     if ( $Surrounding != NULL ) { $BorderR = $R + $Surrounding; $BorderG = $G + $Surrounding; $BorderB = $B + $Surrounding; }
+     if ($Surrounding != NULL) { $BorderR = $R + $Surrounding; $BorderG = $G + $Surrounding; $BorderB = $B + $Surrounding; }
 
-     $YStep = max($this->pChartObject->FontSize,$BoxSize) + 5;
+     $YStep = max($this->pChartObject->FontSize, $BoxSize) + 5;
      $XStep = $BoxSize + 5;
 
      /* Data Processing */
@@ -727,54 +727,54 @@ 
      $Palette = $this->pDataObject->getPalette();
 
      /* Do we have an abscissa serie defined? */
-     if ( $Data["Abscissa"] == "" ) { return(PIE_NO_ABSCISSA); }
+     if ($Data["Abscissa"] == "") { return(PIE_NO_ABSCISSA); }
 
      $Boundaries = ""; $Boundaries["L"] = $X; $Boundaries["T"] = $Y; $Boundaries["R"] = 0; $Boundaries["B"] = 0; $vY = $Y; $vX = $X;
-     foreach($Data["Series"][$Data["Abscissa"]]["Data"] as $Key => $Value)
+     foreach ($Data["Series"][$Data["Abscissa"]]["Data"] as $Key => $Value)
       {
-       $BoxArray = $this->pChartObject->getTextBox($vX+$BoxSize+4,$vY+$BoxSize/2,$FontName,$FontSize,0,$Value);
+       $BoxArray = $this->pChartObject->getTextBox($vX + $BoxSize + 4, $vY + $BoxSize/2, $FontName, $FontSize, 0, $Value);
 
-       if ( $Mode == LEGEND_VERTICAL )
+       if ($Mode == LEGEND_VERTICAL)
         {
-         if ( $Boundaries["T"] > $BoxArray[2]["Y"]+$BoxSize/2 ) { $Boundaries["T"] = $BoxArray[2]["Y"]+$BoxSize/2; }
-         if ( $Boundaries["R"] < $BoxArray[1]["X"]+2 ) { $Boundaries["R"] = $BoxArray[1]["X"]+2; }
-         if ( $Boundaries["B"] < $BoxArray[1]["Y"]+2+$BoxSize/2 ) { $Boundaries["B"] = $BoxArray[1]["Y"]+2+$BoxSize/2; }
-         $vY=$vY+$YStep;
+         if ($Boundaries["T"] > $BoxArray[2]["Y"] + $BoxSize/2) { $Boundaries["T"] = $BoxArray[2]["Y"] + $BoxSize/2; }
+         if ($Boundaries["R"] < $BoxArray[1]["X"] + 2) { $Boundaries["R"] = $BoxArray[1]["X"] + 2; }
+         if ($Boundaries["B"] < $BoxArray[1]["Y"] + 2 + $BoxSize/2) { $Boundaries["B"] = $BoxArray[1]["Y"] + 2 + $BoxSize/2; }
+         $vY = $vY + $YStep;
         }
-       elseif ( $Mode == LEGEND_HORIZONTAL )
+       elseif ($Mode == LEGEND_HORIZONTAL)
         {
-         if ( $Boundaries["T"] > $BoxArray[2]["Y"]+$BoxSize/2 ) { $Boundaries["T"] = $BoxArray[2]["Y"]+$BoxSize/2; }
-         if ( $Boundaries["R"] < $BoxArray[1]["X"]+2 ) { $Boundaries["R"] = $BoxArray[1]["X"]+2; }
-         if ( $Boundaries["B"] < $BoxArray[1]["Y"]+2+$BoxSize/2 ) { $Boundaries["B"] = $BoxArray[1]["Y"]+2+$BoxSize/2; }
-         $vX=$Boundaries["R"]+$XStep;
+         if ($Boundaries["T"] > $BoxArray[2]["Y"] + $BoxSize/2) { $Boundaries["T"] = $BoxArray[2]["Y"] + $BoxSize/2; }
+         if ($Boundaries["R"] < $BoxArray[1]["X"] + 2) { $Boundaries["R"] = $BoxArray[1]["X"] + 2; }
+         if ($Boundaries["B"] < $BoxArray[1]["Y"] + 2 + $BoxSize/2) { $Boundaries["B"] = $BoxArray[1]["Y"] + 2 + $BoxSize/2; }
+         $vX = $Boundaries["R"] + $XStep;
         }
       }
-     $vY=$vY-$YStep; $vX=$vX-$XStep;
+     $vY = $vY - $YStep; $vX = $vX - $XStep;
 
-     $TopOffset  = $Y - $Boundaries["T"];
-     if ( $Boundaries["B"]-($vY+$BoxSize) < $TopOffset ) { $Boundaries["B"] = $vY+$BoxSize+$TopOffset; }
+     $TopOffset = $Y - $Boundaries["T"];
+     if ($Boundaries["B"] - ($vY + $BoxSize) < $TopOffset) { $Boundaries["B"] = $vY + $BoxSize + $TopOffset; }
 
-     if ( $Style == LEGEND_ROUND )
-      $this->pChartObject->drawRoundedFilledRectangle($Boundaries["L"]-$Margin,$Boundaries["T"]-$Margin,$Boundaries["R"]+$Margin,$Boundaries["B"]+$Margin,$Margin,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"BorderR"=>$BorderR,"BorderG"=>$BorderG,"BorderB"=>$BorderB));
-     elseif ( $Style == LEGEND_BOX )
-      $this->pChartObject->drawFilledRectangle($Boundaries["L"]-$Margin,$Boundaries["T"]-$Margin,$Boundaries["R"]+$Margin,$Boundaries["B"]+$Margin,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"BorderR"=>$BorderR,"BorderG"=>$BorderG,"BorderB"=>$BorderB));
+     if ($Style == LEGEND_ROUND)
+      $this->pChartObject->drawRoundedFilledRectangle($Boundaries["L"] - $Margin, $Boundaries["T"] - $Margin, $Boundaries["R"] + $Margin, $Boundaries["B"] + $Margin, $Margin, array("R"=>$R, "G"=>$G, "B"=>$B, "Alpha"=>$Alpha, "BorderR"=>$BorderR, "BorderG"=>$BorderG, "BorderB"=>$BorderB));
+     elseif ($Style == LEGEND_BOX)
+      $this->pChartObject->drawFilledRectangle($Boundaries["L"] - $Margin, $Boundaries["T"] - $Margin, $Boundaries["R"] + $Margin, $Boundaries["B"] + $Margin, array("R"=>$R, "G"=>$G, "B"=>$B, "Alpha"=>$Alpha, "BorderR"=>$BorderR, "BorderG"=>$BorderG, "BorderB"=>$BorderB));
 
      $RestoreShadow = $this->pChartObject->Shadow; $this->pChartObject->Shadow = FALSE;
-     foreach($Data["Series"][$Data["Abscissa"]]["Data"] as $Key => $Value)
+     foreach ($Data["Series"][$Data["Abscissa"]]["Data"] as $Key => $Value)
       {
        $R = $Palette[$Key]["R"]; $G = $Palette[$Key]["G"]; $B = $Palette[$Key]["B"];
 
-       $this->pChartObject->drawFilledRectangle($X+1,$Y+1,$X+$BoxSize+1,$Y+$BoxSize+1,array("R"=>0,"G"=>0,"B"=>0,"Alpha"=>20));
-       $this->pChartObject->drawFilledRectangle($X,$Y,$X+$BoxSize,$Y+$BoxSize,array("R"=>$R,"G"=>$G,"B"=>$B,"Surrounding"=>20));
-       if ( $Mode == LEGEND_VERTICAL )
+       $this->pChartObject->drawFilledRectangle($X + 1, $Y + 1, $X + $BoxSize + 1, $Y + $BoxSize + 1, array("R"=>0, "G"=>0, "B"=>0, "Alpha"=>20));
+       $this->pChartObject->drawFilledRectangle($X, $Y, $X + $BoxSize, $Y + $BoxSize, array("R"=>$R, "G"=>$G, "B"=>$B, "Surrounding"=>20));
+       if ($Mode == LEGEND_VERTICAL)
         {
-         $this->pChartObject->drawText($X+$BoxSize+4,$Y+$BoxSize/2,$Value,array("R"=>$FontR,"G"=>$FontG,"B"=>$FontB,"Align"=>TEXT_ALIGN_MIDDLELEFT,"FontName"=>$FontName,"FontSize"=>$FontSize));
-         $Y=$Y+$YStep;
+         $this->pChartObject->drawText($X + $BoxSize + 4, $Y + $BoxSize/2, $Value, array("R"=>$FontR, "G"=>$FontG, "B"=>$FontB, "Align"=>TEXT_ALIGN_MIDDLELEFT, "FontName"=>$FontName, "FontSize"=>$FontSize));
+         $Y = $Y + $YStep;
         }
-       elseif ( $Mode == LEGEND_HORIZONTAL )
+       elseif ($Mode == LEGEND_HORIZONTAL)
         {
-         $BoxArray = $this->pChartObject->drawText($X+$BoxSize+4,$Y+$BoxSize/2,$Value,array("R"=>$FontR,"G"=>$FontG,"B"=>$FontB,"Align"=>TEXT_ALIGN_MIDDLELEFT,"FontName"=>$FontName,"FontSize"=>$FontSize));
-         $X=$BoxArray[1]["X"]+2+$XStep;
+         $BoxArray = $this->pChartObject->drawText($X + $BoxSize + 4, $Y + $BoxSize/2, $Value, array("R"=>$FontR, "G"=>$FontG, "B"=>$FontB, "Align"=>TEXT_ALIGN_MIDDLELEFT, "FontName"=>$FontName, "FontSize"=>$FontSize));
+         $X = $BoxArray[1]["X"] + 2 + $XStep;
         }
       }
 
@@ -782,12 +782,12 @@ 
     }
 
    /* Set the color of the specified slice */
-   function setSliceColor($SliceID,$Format="")
+   function setSliceColor($SliceID, $Format = "")
     {
      $R		= isset($Format["R"]) ? $Format["R"] : 0;
      $G		= isset($Format["G"]) ? $Format["G"] : 0;
      $B		= isset($Format["B"]) ? $Format["B"] : 0;
-     $Alpha	= isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
+     $Alpha = isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
 
      $this->pDataObject->Palette[$SliceID]["R"]     = $R;
      $this->pDataObject->Palette[$SliceID]["G"]     = $G;
@@ -796,71 +796,71 @@ 
     }
 
    /* Internally used compute the label positions */
-   function writePieLabel($X,$Y,$Label,$Angle,$Settings,$Stacked,$Xc=0,$Yc=0,$Radius=0,$Reversed=FALSE)
+   function writePieLabel($X, $Y, $Label, $Angle, $Settings, $Stacked, $Xc = 0, $Yc = 0, $Radius = 0, $Reversed = FALSE)
     {
-     $LabelOffset	= 30;
+     $LabelOffset = 30;
      $FontName		= $this->pChartObject->FontName;
      $FontSize		= $this->pChartObject->FontSize;
 
-     if ( !$Stacked )
+     if (!$Stacked)
       {
-       $Settings["Angle"]  = 360-$Angle;
+       $Settings["Angle"]  = 360 - $Angle;
        $Settings["Length"] = 25;
        $Settings["Size"]   = 8;
 
-       $this->pChartObject->drawArrowLabel($X,$Y," ".$Label." ",$Settings);
+       $this->pChartObject->drawArrowLabel($X, $Y, " ".$Label." ", $Settings);
       }
      else
       {
-       $X2 = cos(deg2rad($Angle-90))*20+$X;
-       $Y2 = sin(deg2rad($Angle-90))*20+$Y;
+       $X2 = cos(deg2rad($Angle - 90))*20 + $X;
+       $Y2 = sin(deg2rad($Angle - 90))*20 + $Y;
 
-       $TxtPos = $this->pChartObject->getTextBox($X,$Y,$FontName,$FontSize,0,$Label);
+       $TxtPos = $this->pChartObject->getTextBox($X, $Y, $FontName, $FontSize, 0, $Label);
        $Height = $TxtPos[0]["Y"] - $TxtPos[2]["Y"];
        $YTop    = $Y2 - $Height/2 - 2;
        $YBottom = $Y2 + $Height/2 + 2;
 
-       if ( $this->LabelPos != "" )
+       if ($this->LabelPos != "")
         {
          $Done = FALSE;
-         foreach($this->LabelPos as $Key => $Settings)
+         foreach ($this->LabelPos as $Key => $Settings)
           {
-           if ( !$Done )
+           if (!$Done)
             {
-             if ( $Angle <= 90 && (($YTop >= $Settings["YTop"] && $YTop <= $Settings["YBottom"]) || ($YBottom >= $Settings["YTop"] && $YBottom <= $Settings["YBottom"])))
-              { $this->shift(0,180,-($Height+2),$Reversed); $Done = TRUE; }
-             if ( $Angle > 90 && $Angle <= 180 && (($YTop >= $Settings["YTop"] && $YTop <= $Settings["YBottom"]) || ($YBottom >= $Settings["YTop"] && $YBottom <= $Settings["YBottom"])))
-              { $this->shift(0,180,-($Height+2),$Reversed); $Done = TRUE; }
-             if ( $Angle > 180 && $Angle <= 270 && (($YTop >= $Settings["YTop"] && $YTop <= $Settings["YBottom"]) || ($YBottom >= $Settings["YTop"] && $YBottom <= $Settings["YBottom"])))
-              { $this->shift(180,360,($Height+2),$Reversed); $Done = TRUE; }
-             if ( $Angle > 270 && $Angle <= 360 && (($YTop >= $Settings["YTop"] && $YTop <= $Settings["YBottom"]) || ($YBottom >= $Settings["YTop"] && $YBottom <= $Settings["YBottom"])))
-              { $this->shift(180,360,($Height+2),$Reversed); $Done = TRUE; }
+             if ($Angle <= 90 && (($YTop >= $Settings["YTop"] && $YTop <= $Settings["YBottom"]) || ($YBottom >= $Settings["YTop"] && $YBottom <= $Settings["YBottom"])))
+              { $this->shift(0, 180, -($Height + 2), $Reversed); $Done = TRUE; }
+             if ($Angle > 90 && $Angle <= 180 && (($YTop >= $Settings["YTop"] && $YTop <= $Settings["YBottom"]) || ($YBottom >= $Settings["YTop"] && $YBottom <= $Settings["YBottom"])))
+              { $this->shift(0, 180, -($Height + 2), $Reversed); $Done = TRUE; }
+             if ($Angle > 180 && $Angle <= 270 && (($YTop >= $Settings["YTop"] && $YTop <= $Settings["YBottom"]) || ($YBottom >= $Settings["YTop"] && $YBottom <= $Settings["YBottom"])))
+              { $this->shift(180, 360, ($Height + 2), $Reversed); $Done = TRUE; }
+             if ($Angle > 270 && $Angle <= 360 && (($YTop >= $Settings["YTop"] && $YTop <= $Settings["YBottom"]) || ($YBottom >= $Settings["YTop"] && $YBottom <= $Settings["YBottom"])))
+              { $this->shift(180, 360, ($Height + 2), $Reversed); $Done = TRUE; }
             }
           }
         }
 
-       $LabelSettings = array("YTop"=>$YTop,"YBottom"=>$YBottom,"Label"=>$Label,"Angle"=>$Angle,"X1"=>$X,"Y1"=>$Y,"X2"=>$X2,"Y2"=>$Y2);
-       if ( $Angle <= 180 ) { $LabelSettings["X3"] = $Xc+$Radius+$LabelOffset; }
-       if ( $Angle > 180 )  { $LabelSettings["X3"] = $Xc-$Radius-$LabelOffset; }
+       $LabelSettings = array("YTop"=>$YTop, "YBottom"=>$YBottom, "Label"=>$Label, "Angle"=>$Angle, "X1"=>$X, "Y1"=>$Y, "X2"=>$X2, "Y2"=>$Y2);
+       if ($Angle <= 180) { $LabelSettings["X3"] = $Xc + $Radius + $LabelOffset; }
+       if ($Angle > 180) { $LabelSettings["X3"] = $Xc - $Radius - $LabelOffset; }
        $this->LabelPos[] = $LabelSettings;
       }
     }
 
    /* Internally used to shift label positions */
-   function shift($StartAngle,$EndAngle,$Offset,$Reversed)
+   function shift($StartAngle, $EndAngle, $Offset, $Reversed)
     {
-     if ( $Reversed ) { $Offset = -$Offset; }
-     foreach($this->LabelPos as $Key => $Settings)
+     if ($Reversed) { $Offset = -$Offset; }
+     foreach ($this->LabelPos as $Key => $Settings)
       {
-       if ( $Settings["Angle"] > $StartAngle && $Settings["Angle"] <= $EndAngle ) { $this->LabelPos[$Key]["YTop"] = $Settings["YTop"] + $Offset; $this->LabelPos[$Key]["YBottom"] = $Settings["YBottom"] + $Offset; $this->LabelPos[$Key]["Y2"] = $Settings["Y2"] + $Offset; }
+       if ($Settings["Angle"] > $StartAngle && $Settings["Angle"] <= $EndAngle) { $this->LabelPos[$Key]["YTop"] = $Settings["YTop"] + $Offset; $this->LabelPos[$Key]["YBottom"] = $Settings["YBottom"] + $Offset; $this->LabelPos[$Key]["Y2"] = $Settings["Y2"] + $Offset; }
       }
     }
 
    /* Internally used to write the re-computed labels */
    function writeShiftedLabels()
     {
-     if ( $this->LabelPos == "" ) { return(0); }
-     foreach($this->LabelPos as $Key => $Settings)
+     if ($this->LabelPos == "") { return(0); }
+     foreach ($this->LabelPos as $Key => $Settings)
       {
        $X1 = $Settings["X1"]; $Y1 = $Settings["Y1"];
        $X2 = $Settings["X2"]; $Y2 = $Settings["Y2"];
@@ -868,72 +868,72 @@ 
        $Angle = $Settings["Angle"];
        $Label = $Settings["Label"];
 
-       $this->pChartObject->drawArrow($X2,$Y2,$X1,$Y1,array("Size"=>8));
-       if ( $Angle <= 180 )
+       $this->pChartObject->drawArrow($X2, $Y2, $X1, $Y1, array("Size"=>8));
+       if ($Angle <= 180)
         {
-         $this->pChartObject->drawLine($X2,$Y2,$X3,$Y2);
-         $this->pChartObject->drawText($X3+2,$Y2,$Label,array("Align"=>TEXT_ALIGN_MIDDLELEFT));
+         $this->pChartObject->drawLine($X2, $Y2, $X3, $Y2);
+         $this->pChartObject->drawText($X3 + 2, $Y2, $Label, array("Align"=>TEXT_ALIGN_MIDDLELEFT));
         }
        else
         {
-         $this->pChartObject->drawLine($X2,$Y2,$X3,$Y2);
-         $this->pChartObject->drawText($X3-2,$Y2,$Label,array("Align"=>TEXT_ALIGN_MIDDLERIGHT));
+         $this->pChartObject->drawLine($X2, $Y2, $X3, $Y2);
+         $this->pChartObject->drawText($X3 - 2, $Y2, $Label, array("Align"=>TEXT_ALIGN_MIDDLERIGHT));
         }
       }
     }
 
    /* Draw a ring chart */
-   function draw2DRing($X,$Y,$Format="")
+   function draw2DRing($X, $Y, $Format = "")
     {
      $OuterRadius	= isset($Format["Radius"]) ? $Format["Radius"] : 60;
-     $Precision		= isset($Format["Precision"]) ? $Format["Precision"] : 0;
+     $Precision = isset($Format["Precision"]) ? $Format["Precision"] : 0;
      $InnerRadius	= isset($Format["Radius"]) ? $Format["Radius"] : 30;
-     $Border		= isset($Format["Border"]) ? $Format["Border"] : FALSE;
+     $Border = isset($Format["Border"]) ? $Format["Border"] : FALSE;
      $BorderR		= isset($Format["BorderR"]) ? $Format["BorderR"] : 255;
      $BorderG		= isset($Format["BorderG"]) ? $Format["BorderG"] : 255;
      $BorderB		= isset($Format["BorderB"]) ? $Format["BorderB"] : 255;
-     $BorderAlpha	= isset($Format["BorderAlpha"]) ? $Format["BorderAlpha"] : 100;
-     $Shadow		= isset($Format["Shadow"]) ? $Format["Shadow"] : FALSE;
+     $BorderAlpha = isset($Format["BorderAlpha"]) ? $Format["BorderAlpha"] : 100;
+     $Shadow = isset($Format["Shadow"]) ? $Format["Shadow"] : FALSE;
      $DrawLabels	= isset($Format["DrawLabels"]) ? $Format["DrawLabels"] : FALSE;
-     $LabelStacked	= isset($Format["LabelStacked"]) ? $Format["LabelStacked"] : FALSE;
+     $LabelStacked = isset($Format["LabelStacked"]) ? $Format["LabelStacked"] : FALSE;
      $LabelColor	= isset($Format["LabelColor"]) ? $Format["LabelColor"] : PIE_LABEL_COLOR_MANUAL;
      $LabelR		= isset($Format["LabelR"]) ? $Format["LabelR"] : 0;
      $LabelG		= isset($Format["LabelG"]) ? $Format["LabelG"] : 0;
      $LabelB		= isset($Format["LabelB"]) ? $Format["LabelB"] : 0;
-     $LabelAlpha	= isset($Format["LabelAlpha"]) ? $Format["LabelAlpha"] : 100;
+     $LabelAlpha = isset($Format["LabelAlpha"]) ? $Format["LabelAlpha"] : 100;
      $WriteValues	= isset($Format["WriteValues"]) ? $Format["WriteValues"] : NULL; //PIE_VALUE_PERCENTAGE
-     $ValuePadding	= isset($Format["ValuePadding"]) ? $Format["ValuePadding"] : 5;
-     $ValuePosition	= isset($Format["ValuePosition"]) ? $Format["ValuePosition"] : PIE_VALUE_OUTSIDE;
+     $ValuePadding = isset($Format["ValuePadding"]) ? $Format["ValuePadding"] : 5;
+     $ValuePosition = isset($Format["ValuePosition"]) ? $Format["ValuePosition"] : PIE_VALUE_OUTSIDE;
      $ValueSuffix	= isset($Format["ValueSuffix"]) ? $Format["ValueSuffix"] : "";
      $ValueR		= isset($Format["ValueR"]) ? $Format["ValueR"] : 255;
      $ValueG		= isset($Format["ValueG"]) ? $Format["ValueG"] : 255;
      $ValueB		= isset($Format["ValueB"]) ? $Format["ValueB"] : 255;
-     $ValueAlpha	= isset($Format["ValueAlpha"]) ? $Format["ValueAlpha"] : 100;
-     $RecordImageMap	= isset($Format["RecordImageMap"]) ? $Format["RecordImageMap"] : FALSE;
+     $ValueAlpha = isset($Format["ValueAlpha"]) ? $Format["ValueAlpha"] : 100;
+     $RecordImageMap = isset($Format["RecordImageMap"]) ? $Format["RecordImageMap"] : FALSE;
 
      /* Data Processing */
      $Data    = $this->pDataObject->getData();
      $Palette = $this->pDataObject->getPalette();
 
      /* Do we have an abscissa serie defined? */
-     if ( $Data["Abscissa"] == "" ) { return(PIE_NO_ABSCISSA); }
+     if ($Data["Abscissa"] == "") { return(PIE_NO_ABSCISSA); }
 
      /* Try to find the data serie */
      $DataSerie = "";
      foreach ($Data["Series"] as $SerieName => $SerieData)
-      { if ( $SerieName != $Data["Abscissa"]) { $DataSerie = $SerieName; } }
+      { if ($SerieName != $Data["Abscissa"]) { $DataSerie = $SerieName; } }
 
      /* Do we have data to compute? */
-     if ( $DataSerie == "" ) { return(PIE_NO_DATASERIE); }
+     if ($DataSerie == "") { return(PIE_NO_DATASERIE); }
 
      /* Remove unused data */
-     list($Data,$Palette) = $this->clean0Values($Data,$Palette,$DataSerie,$Data["Abscissa"]);
+     list($Data, $Palette) = $this->clean0Values($Data, $Palette, $DataSerie, $Data["Abscissa"]);
 
      /* Compute the pie sum */
      $SerieSum = $this->pDataObject->getSum($DataSerie);
 
      /* Do we have data to draw? */
-     if ( $SerieSum == 0 ) { return(PIE_SUMISNULL); }
+     if ($SerieSum == 0) { return(PIE_SUMISNULL); }
 
      /* Dump the real number of data to draw */
      $Values = "";
@@ -941,146 +941,146 @@ 
       { if ($Value != 0) { $Values[] = $Value; } }
 
      /* Compute the wasted angular space between series */
-     if (count($Values)==1) { $WastedAngular = 0; } else { $WastedAngular = 0; } // count($Values)
+     if (count($Values) == 1) { $WastedAngular = 0; } else { $WastedAngular = 0; } // count($Values)
 
      /* Compute the scale */
-     $ScaleFactor = (360 - $WastedAngular) / $SerieSum;
+     $ScaleFactor = (360 - $WastedAngular)/$SerieSum;
 
      $RestoreShadow = $this->pChartObject->Shadow;
-     if ( $this->pChartObject->Shadow )
+     if ($this->pChartObject->Shadow)
       {
        $this->pChartObject->Shadow = FALSE;
 
        $ShadowFormat = $Format; $ShadowFormat["Shadow"] = TRUE;
-       $this->draw2DRing($X+$this->pChartObject->ShadowX,$Y+$this->pChartObject->ShadowY,$ShadowFormat);
+       $this->draw2DRing($X + $this->pChartObject->ShadowX, $Y + $this->pChartObject->ShadowY, $ShadowFormat);
       }
 
      /* Draw the polygon pie elements */
-     $Step = 360 / (2 * PI * $OuterRadius);
+     $Step = 360/(2*PI*$OuterRadius);
      $Offset = 0; $ID = 0;
-     foreach($Values as $Key => $Value)
+     foreach ($Values as $Key => $Value)
       {
-       if ( $Shadow )
+       if ($Shadow)
         {
-         $Settings    = array("R"=>$this->pChartObject->ShadowR,"G"=>$this->pChartObject->ShadowG,"B"=>$this->pChartObject->ShadowB,"Alpha"=>$this->pChartObject->Shadowa);
+         $Settings    = array("R"=>$this->pChartObject->ShadowR, "G"=>$this->pChartObject->ShadowG, "B"=>$this->pChartObject->ShadowB, "Alpha"=>$this->pChartObject->Shadowa);
          $BorderColor = $Settings;
         }
        else
         {
-         if ( !isset($Palette[$ID]["R"]) ) { $Color = $this->pChartObject->getRandomColor(); $Palette[$ID] = $Color; $this->pDataObject->savePalette($ID,$Color); }
-         $Settings = array("R"=>$Palette[$ID]["R"],"G"=>$Palette[$ID]["G"],"B"=>$Palette[$ID]["B"],"Alpha"=>$Palette[$ID]["Alpha"]);
+         if (!isset($Palette[$ID]["R"])) { $Color = $this->pChartObject->getRandomColor(); $Palette[$ID] = $Color; $this->pDataObject->savePalette($ID, $Color); }
+         $Settings = array("R"=>$Palette[$ID]["R"], "G"=>$Palette[$ID]["G"], "B"=>$Palette[$ID]["B"], "Alpha"=>$Palette[$ID]["Alpha"]);
 
-         if ( $Border )
-          $BorderColor = array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha);
+         if ($Border)
+          $BorderColor = array("R"=>$BorderR, "G"=>$BorderG, "B"=>$BorderB, "Alpha"=>$BorderAlpha);
          else
           $BorderColor = $Settings;
         }
 
        $Plots = ""; $Boundaries = ""; $AAPixels = "";
-       $EndAngle = $Offset+($Value*$ScaleFactor); if ( $EndAngle > 360 ) { $EndAngle = 360; }
-       for($i=$Offset;$i<=$EndAngle;$i=$i+$Step)
+       $EndAngle = $Offset + ($Value*$ScaleFactor); if ($EndAngle > 360) { $EndAngle = 360; }
+       for ($i = $Offset; $i <= $EndAngle; $i = $i + $Step)
         {
-         $Xc = cos(($i-90)*PI/180) * $OuterRadius + $X;
-         $Yc = sin(($i-90)*PI/180) * $OuterRadius + $Y;
+         $Xc = cos(($i - 90)*PI/180)*$OuterRadius + $X;
+         $Yc = sin(($i - 90)*PI/180)*$OuterRadius + $Y;
 
-         if ( !isset($Boundaries[0]["X1"]) ) { $Boundaries[0]["X1"] = $Xc; $Boundaries[0]["Y1"] = $Yc; }
-         $AAPixels[] = array($Xc,$Yc);
+         if (!isset($Boundaries[0]["X1"])) { $Boundaries[0]["X1"] = $Xc; $Boundaries[0]["Y1"] = $Yc; }
+         $AAPixels[] = array($Xc, $Yc);
 
-         if ( $i<90 ) { $Yc++; }
-         if ( $i>180 && $i<270 ) { $Xc++; }
-         if ( $i>=270 ) { $Xc++; $Yc++; }
+         if ($i < 90) { $Yc++; }
+         if ($i > 180 && $i < 270) { $Xc++; }
+         if ($i >= 270) { $Xc++; $Yc++; }
 
          $Plots[] = $Xc; $Plots[] = $Yc;
         }
        $Boundaries[1]["X1"] = $Xc; $Boundaries[1]["Y1"] = $Yc;
        $Lasti = $EndAngle;
 
-       for($i=$EndAngle;$i>=$Offset;$i=$i-$Step)
+       for ($i = $EndAngle; $i >= $Offset; $i = $i - $Step)
         {
-         $Xc = cos(($i-90)*PI/180) * ($InnerRadius-1) + $X;
-         $Yc = sin(($i-90)*PI/180) * ($InnerRadius-1) + $Y;
+         $Xc = cos(($i - 90)*PI/180)*($InnerRadius - 1) + $X;
+         $Yc = sin(($i - 90)*PI/180)*($InnerRadius - 1) + $Y;
 
-         if ( !isset($Boundaries[1]["X2"]) ) { $Boundaries[1]["X2"] = $Xc; $Boundaries[1]["Y2"] = $Yc; }
-         $AAPixels[] = array($Xc,$Yc);
+         if (!isset($Boundaries[1]["X2"])) { $Boundaries[1]["X2"] = $Xc; $Boundaries[1]["Y2"] = $Yc; }
+         $AAPixels[] = array($Xc, $Yc);
 
-         $Xc = cos(($i-90)*PI/180) * $InnerRadius + $X;
-         $Yc = sin(($i-90)*PI/180) * $InnerRadius + $Y;
+         $Xc = cos(($i - 90)*PI/180)*$InnerRadius + $X;
+         $Yc = sin(($i - 90)*PI/180)*$InnerRadius + $Y;
 
-         if ( $i<90 ) { $Yc++; }
-         if ( $i>180 && $i<270 ) { $Xc++; }
-         if ( $i>=270 ) { $Xc++; $Yc++; }
+         if ($i < 90) { $Yc++; }
+         if ($i > 180 && $i < 270) { $Xc++; }
+         if ($i >= 270) { $Xc++; $Yc++; }
 
          $Plots[] = $Xc; $Plots[] = $Yc;
         }
        $Boundaries[0]["X2"] = $Xc; $Boundaries[0]["Y2"] = $Yc;
 
        /* Draw the polygon */
-       $this->pChartObject->drawPolygon($Plots,$Settings);
-       if ( $RecordImageMap && !$Shadow ) { $this->pChartObject->addToImageMap("POLY",$this->arraySerialize($Plots),$this->pChartObject->toHTMLColor($Palette[$ID]["R"],$Palette[$ID]["G"],$Palette[$ID]["B"]),$Data["Series"][$Data["Abscissa"]]["Data"][$Key],$Value); }
+       $this->pChartObject->drawPolygon($Plots, $Settings);
+       if ($RecordImageMap && !$Shadow) { $this->pChartObject->addToImageMap("POLY", $this->arraySerialize($Plots), $this->pChartObject->toHTMLColor($Palette[$ID]["R"], $Palette[$ID]["G"], $Palette[$ID]["B"]), $Data["Series"][$Data["Abscissa"]]["Data"][$Key], $Value); }
 
        /* Smooth the edges using AA */
-       foreach($AAPixels as $iKey => $Pos ) { $this->pChartObject->drawAntialiasPixel($Pos[0],$Pos[1],$BorderColor); }
-       $this->pChartObject->drawLine($Boundaries[0]["X1"],$Boundaries[0]["Y1"],$Boundaries[0]["X2"],$Boundaries[0]["Y2"],$BorderColor);
-       $this->pChartObject->drawLine($Boundaries[1]["X1"],$Boundaries[1]["Y1"],$Boundaries[1]["X2"],$Boundaries[1]["Y2"],$BorderColor);
+       foreach ($AAPixels as $iKey => $Pos) { $this->pChartObject->drawAntialiasPixel($Pos[0], $Pos[1], $BorderColor); }
+       $this->pChartObject->drawLine($Boundaries[0]["X1"], $Boundaries[0]["Y1"], $Boundaries[0]["X2"], $Boundaries[0]["Y2"], $BorderColor);
+       $this->pChartObject->drawLine($Boundaries[1]["X1"], $Boundaries[1]["Y1"], $Boundaries[1]["X2"], $Boundaries[1]["Y2"], $BorderColor);
 
-       if ( $DrawLabels && !$Shadow )
+       if ($DrawLabels && !$Shadow)
         {
-         if ( $LabelColor == PIE_LABEL_COLOR_AUTO )
-          { $Settings = array("FillR"=>$Palette[$ID]["R"],"FillG"=>$Palette[$ID]["G"],"FillB"=>$Palette[$ID]["B"],"Alpha"=>$Palette[$ID]["Alpha"]);}
+         if ($LabelColor == PIE_LABEL_COLOR_AUTO)
+          { $Settings = array("FillR"=>$Palette[$ID]["R"], "FillG"=>$Palette[$ID]["G"], "FillB"=>$Palette[$ID]["B"], "Alpha"=>$Palette[$ID]["Alpha"]); }
          else
-          { $Settings = array("FillR"=>$LabelR,"FillG"=>$LabelG,"FillB"=>$LabelB,"Alpha"=>$LabelAlpha); }
+          { $Settings = array("FillR"=>$LabelR, "FillG"=>$LabelG, "FillB"=>$LabelB, "Alpha"=>$LabelAlpha); }
 
          $Angle = ($EndAngle - $Offset)/2 + $Offset;
-         $Xc = cos(($Angle-90)*PI/180) * $OuterRadius + $X;
-         $Yc = sin(($Angle-90)*PI/180) * $OuterRadius + $Y;
+         $Xc = cos(($Angle - 90)*PI/180)*$OuterRadius + $X;
+         $Yc = sin(($Angle - 90)*PI/180)*$OuterRadius + $Y;
 
          $Label = $Data["Series"][$Data["Abscissa"]]["Data"][$Key];
 
-         if ( $LabelStacked )
-          $this->writePieLabel($Xc,$Yc,$Label,$Angle,$Settings,TRUE,$X,$Y,$OuterRadius);
+         if ($LabelStacked)
+          $this->writePieLabel($Xc, $Yc, $Label, $Angle, $Settings, TRUE, $X, $Y, $OuterRadius);
          else
-          $this->writePieLabel($Xc,$Yc,$Label,$Angle,$Settings,FALSE);
+          $this->writePieLabel($Xc, $Yc, $Label, $Angle, $Settings, FALSE);
         }
 
        $Offset = $Lasti; $ID++;
       }
 
-     if ( $DrawLabels && $LabelStacked ) { $this->writeShiftedLabels(); }
+     if ($DrawLabels && $LabelStacked) { $this->writeShiftedLabels(); }
 
-     if ( $WriteValues && !$Shadow )
+     if ($WriteValues && !$Shadow)
       {
-       $Step = 360 / (2 * PI * $OuterRadius);
+       $Step = 360/(2*PI*$OuterRadius);
        $Offset = 0;
-       foreach($Values as $Key => $Value)
+       foreach ($Values as $Key => $Value)
         {
-         $EndAngle = $Offset+($Value*$ScaleFactor);
-         if ( $EndAngle > 360 ) { $EndAngle = 360; }
+         $EndAngle = $Offset + ($Value*$ScaleFactor);
+         if ($EndAngle > 360) { $EndAngle = 360; }
 
-         $Angle = $Offset+($Value*$ScaleFactor)/2;
-         if ( $ValuePosition == PIE_VALUE_OUTSIDE )
+         $Angle = $Offset + ($Value*$ScaleFactor)/2;
+         if ($ValuePosition == PIE_VALUE_OUTSIDE)
           {
-           $Xc = cos(($Angle-90)*PI/180) * ($OuterRadius+$ValuePadding) + $X;
-           $Yc = sin(($Angle-90)*PI/180) * ($OuterRadius+$ValuePadding) + $Y;
-           if ( $Angle >=0 && $Angle <= 90 ) { $Align = TEXT_ALIGN_BOTTOMLEFT; }
-           if ( $Angle > 90 && $Angle <= 180 ) { $Align = TEXT_ALIGN_TOPLEFT; }
-           if ( $Angle > 180 && $Angle <= 270 ) { $Align = TEXT_ALIGN_TOPRIGHT; }
-           if ( $Angle > 270 ) { $Align = TEXT_ALIGN_BOTTOMRIGHT; }
+           $Xc = cos(($Angle - 90)*PI/180)*($OuterRadius + $ValuePadding) + $X;
+           $Yc = sin(($Angle - 90)*PI/180)*($OuterRadius + $ValuePadding) + $Y;
+           if ($Angle >= 0 && $Angle <= 90) { $Align = TEXT_ALIGN_BOTTOMLEFT; }
+           if ($Angle > 90 && $Angle <= 180) { $Align = TEXT_ALIGN_TOPLEFT; }
+           if ($Angle > 180 && $Angle <= 270) { $Align = TEXT_ALIGN_TOPRIGHT; }
+           if ($Angle > 270) { $Align = TEXT_ALIGN_BOTTOMRIGHT; }
           }
          else
           {
-           $Xc = cos(($Angle-90)*PI/180) * (($OuterRadius-$InnerRadius)/2+$InnerRadius) + $X;
-           $Yc = sin(($Angle-90)*PI/180) * (($OuterRadius-$InnerRadius)/2+$InnerRadius) + $Y;
+           $Xc = cos(($Angle - 90)*PI/180)*(($OuterRadius - $InnerRadius)/2 + $InnerRadius) + $X;
+           $Yc = sin(($Angle - 90)*PI/180)*(($OuterRadius - $InnerRadius)/2 + $InnerRadius) + $Y;
            $Align = TEXT_ALIGN_MIDDLEMIDDLE;
           }
 
-         if ( $WriteValues == PIE_VALUE_PERCENTAGE )
-          $Display = round(( 100 / $SerieSum ) * $Value,$Precision)."%";
-         elseif ( $WriteValues == PIE_VALUE_NATURAL )
+         if ($WriteValues == PIE_VALUE_PERCENTAGE)
+          $Display = round((100/$SerieSum)*$Value, $Precision)."%";
+         elseif ($WriteValues == PIE_VALUE_NATURAL)
           $Display = $Value.$ValueSuffix;
          else
           $Label = "";
 
-         $this->pChartObject->drawText($Xc,$Yc,$Display,array("Align"=>$Align,"R"=>$ValueR,"G"=>$ValueG,"B"=>$ValueB));
+         $this->pChartObject->drawText($Xc, $Yc, $Display, array("Align"=>$Align, "R"=>$ValueR, "G"=>$ValueG, "B"=>$ValueB));
          $Offset = $EndAngle;
         }
       }
@@ -1091,61 +1091,61 @@ 
     }
 
    /* Draw a 3D ring chart */
-   function draw3DRing($X,$Y,$Format="")
+   function draw3DRing($X, $Y, $Format = "")
     {
      $OuterRadius	= isset($Format["OuterRadius"]) ? $Format["OuterRadius"] : 100;
      $Precision		= isset($Format["Precision"]) ? $Format["Precision"] : 0;
      $InnerRadius	= isset($Format["InnerRadius"]) ? $Format["InnerRadius"] : 30;
      $SkewFactor	= isset($Format["SkewFactor"]) ? $Format["SkewFactor"] : .6;
      $SliceHeight	= isset($Format["SliceHeight"]) ? $Format["SliceHeight"] : 10;
-     $DataGapAngle	= isset($Format["DataGapAngle"]) ? $Format["DataGapAngle"] : 10;
-     $DataGapRadius	= isset($Format["DataGapRadius"]) ? $Format["DataGapRadius"] : 10;
+     $DataGapAngle = isset($Format["DataGapAngle"]) ? $Format["DataGapAngle"] : 10;
+     $DataGapRadius = isset($Format["DataGapRadius"]) ? $Format["DataGapRadius"] : 10;
      $Border		= isset($Format["Border"]) ? $Format["Border"] : FALSE;
      $Shadow		= isset($Format["Shadow"]) ? $Format["Shadow"] : FALSE;
      $DrawLabels	= isset($Format["DrawLabels"]) ? $Format["DrawLabels"] : FALSE;
-     $LabelStacked	= isset($Format["LabelStacked"]) ? $Format["LabelStacked"] : FALSE;
+     $LabelStacked = isset($Format["LabelStacked"]) ? $Format["LabelStacked"] : FALSE;
      $LabelColor	= isset($Format["LabelColor"]) ? $Format["LabelColor"] : PIE_LABEL_COLOR_MANUAL;
      $LabelR		= isset($Format["LabelR"]) ? $Format["LabelR"] : 0;
      $LabelG		= isset($Format["LabelG"]) ? $Format["LabelG"] : 0;
      $LabelB		= isset($Format["LabelB"]) ? $Format["LabelB"] : 0;
-     $LabelAlpha	= isset($Format["LabelAlpha"]) ? $Format["LabelAlpha"] : 100;
-     $Cf		= isset($Format["Cf"]) ? $Format["Cf"] : 20;
+     $LabelAlpha = isset($Format["LabelAlpha"]) ? $Format["LabelAlpha"] : 100;
+     $Cf = isset($Format["Cf"]) ? $Format["Cf"] : 20;
      $WriteValues	= isset($Format["WriteValues"]) ? $Format["WriteValues"] : PIE_VALUE_NATURAL;
-     $ValuePadding	= isset($Format["ValuePadding"]) ? $Format["ValuePadding"] : $SliceHeight + 15;
-     $ValuePosition	= isset($Format["ValuePosition"]) ? $Format["ValuePosition"] : PIE_VALUE_OUTSIDE;
+     $ValuePadding = isset($Format["ValuePadding"]) ? $Format["ValuePadding"] : $SliceHeight + 15;
+     $ValuePosition = isset($Format["ValuePosition"]) ? $Format["ValuePosition"] : PIE_VALUE_OUTSIDE;
      $ValueSuffix	= isset($Format["ValueSuffix"]) ? $Format["ValueSuffix"] : "";
      $ValueR		= isset($Format["ValueR"]) ? $Format["ValueR"] : 255;
      $ValueG		= isset($Format["ValueG"]) ? $Format["ValueG"] : 255;
      $ValueB		= isset($Format["ValueB"]) ? $Format["ValueB"] : 255;
-     $ValueAlpha	= isset($Format["ValueAlpha"]) ? $Format["ValueAlpha"] : 100;
-     $RecordImageMap	= isset($Format["RecordImageMap"]) ? $Format["RecordImageMap"] : FALSE;
+     $ValueAlpha = isset($Format["ValueAlpha"]) ? $Format["ValueAlpha"] : 100;
+     $RecordImageMap = isset($Format["RecordImageMap"]) ? $Format["RecordImageMap"] : FALSE;
 
      /* Error correction for overlaying rounded corners */
-     if ( $SkewFactor < .5 ) { $SkewFactor = .5; }
+     if ($SkewFactor < .5) { $SkewFactor = .5; }
 
      /* Data Processing */
      $Data    = $this->pDataObject->getData();
      $Palette = $this->pDataObject->getPalette();
 
      /* Do we have an abscissa serie defined? */
-     if ( $Data["Abscissa"] == "" ) { return(PIE_NO_ABSCISSA); }
+     if ($Data["Abscissa"] == "") { return(PIE_NO_ABSCISSA); }
 
      /* Try to find the data serie */
      $DataSerie = "";
      foreach ($Data["Series"] as $SerieName => $SerieData)
-      { if ( $SerieName != $Data["Abscissa"]) { $DataSerie = $SerieName; } }
+      { if ($SerieName != $Data["Abscissa"]) { $DataSerie = $SerieName; } }
 
      /* Do we have data to compute? */
-     if ( $DataSerie == "" ) { return(PIE_NO_DATASERIE); }
+     if ($DataSerie == "") { return(PIE_NO_DATASERIE); }
 
      /* Remove unused data */
-     list($Data,$Palette) = $this->clean0Values($Data,$Palette,$DataSerie,$Data["Abscissa"]);
+     list($Data, $Palette) = $this->clean0Values($Data, $Palette, $DataSerie, $Data["Abscissa"]);
 
      /* Compute the pie sum */
      $SerieSum = $this->pDataObject->getSum($DataSerie);
 
      /* Do we have data to draw? */
-     if ( $SerieSum == 0 ) { return(PIE_SUMISNULL); }
+     if ($SerieSum == 0) { return(PIE_SUMISNULL); }
 
      /* Dump the real number of data to draw */
      $Values = "";
@@ -1153,56 +1153,56 @@ 
       { if ($Value != 0) { $Values[] = $Value; } }
 
      /* Compute the wasted angular space between series */
-     if (count($Values)==1) { $WastedAngular = 0; } else { $WastedAngular = count($Values) * $DataGapAngle; }
+     if (count($Values) == 1) { $WastedAngular = 0; } else { $WastedAngular = count($Values)*$DataGapAngle; }
 
      /* Compute the scale */
-     $ScaleFactor = (360 - $WastedAngular) / $SerieSum;
+     $ScaleFactor = (360 - $WastedAngular)/$SerieSum;
 
      $RestoreShadow = $this->pChartObject->Shadow;
-     if ( $this->pChartObject->Shadow ) { $this->pChartObject->Shadow = FALSE; }
+     if ($this->pChartObject->Shadow) { $this->pChartObject->Shadow = FALSE; }
 
      /* Draw the polygon ring elements */
-     $Offset = 360; $ID = count($Values)-1;
+     $Offset = 360; $ID = count($Values) - 1;
      $Values = array_reverse($Values);
      $Slice  = 0; $Slices = ""; $SliceColors = ""; $Visible = ""; $SliceAngle = "";
-     foreach($Values as $Key => $Value)
+     foreach ($Values as $Key => $Value)
       {
-       if ( !isset($Palette[$ID]["R"]) ) { $Color = $this->pChartObject->getRandomColor(); $Palette[$ID] = $Color; $this->pDataObject->savePalette($ID,$Color); }
-       $Settings = array("R"=>$Palette[$ID]["R"],"G"=>$Palette[$ID]["G"],"B"=>$Palette[$ID]["B"],"Alpha"=>$Palette[$ID]["Alpha"]);
+       if (!isset($Palette[$ID]["R"])) { $Color = $this->pChartObject->getRandomColor(); $Palette[$ID] = $Color; $this->pDataObject->savePalette($ID, $Color); }
+       $Settings = array("R"=>$Palette[$ID]["R"], "G"=>$Palette[$ID]["G"], "B"=>$Palette[$ID]["B"], "Alpha"=>$Palette[$ID]["Alpha"]);
 
        $SliceColors[$Slice] = $Settings;
 
        $StartAngle = $Offset;
-       $EndAngle   = $Offset-($Value*$ScaleFactor); if ( $EndAngle < 0 ) { $EndAngle = 0; }
+       $EndAngle   = $Offset - ($Value*$ScaleFactor); if ($EndAngle < 0) { $EndAngle = 0; }
 
-       if ( $StartAngle > 180 ) { $Visible[$Slice]["Start"] = TRUE; } else { $Visible[$Slice]["Start"] = TRUE; }
-       if ( $EndAngle < 180 )   { $Visible[$Slice]["End"] = FALSE; } else { $Visible[$Slice]["End"] = TRUE; }
+       if ($StartAngle > 180) { $Visible[$Slice]["Start"] = TRUE; } else { $Visible[$Slice]["Start"] = TRUE; }
+       if ($EndAngle < 180) { $Visible[$Slice]["End"] = FALSE; } else { $Visible[$Slice]["End"] = TRUE; }
 
-       $Step   = (360 / (2 * PI * $OuterRadius))/2;
+       $Step = (360/(2*PI*$OuterRadius))/2;
        $OutX1 = VOID; $OutY1 = VOID;
-       for($i=$Offset;$i>=$EndAngle;$i=$i-$Step)
+       for ($i = $Offset; $i >= $EndAngle; $i = $i - $Step)
         {
-         $Xc = cos(($i-90)*PI/180) * ($OuterRadius+$DataGapRadius-2) + $X;
-         $Yc = sin(($i-90)*PI/180) * ($OuterRadius+$DataGapRadius-2)*$SkewFactor + $Y;
-         $Slices[$Slice]["AA"][] = array($Xc,$Yc);
+         $Xc = cos(($i - 90)*PI/180)*($OuterRadius + $DataGapRadius - 2) + $X;
+         $Yc = sin(($i - 90)*PI/180)*($OuterRadius + $DataGapRadius - 2)*$SkewFactor + $Y;
+         $Slices[$Slice]["AA"][] = array($Xc, $Yc);
 
-         $Xc = cos(($i-90)*PI/180) * ($OuterRadius+$DataGapRadius-1) + $X;
-         $Yc = sin(($i-90)*PI/180) * ($OuterRadius+$DataGapRadius-1)*$SkewFactor + $Y;
-         $Slices[$Slice]["AA"][] = array($Xc,$Yc);
+         $Xc = cos(($i - 90)*PI/180)*($OuterRadius + $DataGapRadius - 1) + $X;
+         $Yc = sin(($i - 90)*PI/180)*($OuterRadius + $DataGapRadius - 1)*$SkewFactor + $Y;
+         $Slices[$Slice]["AA"][] = array($Xc, $Yc);
 
-         $Xc = cos(($i-90)*PI/180) * ($OuterRadius+$DataGapRadius) + $X;
-         $Yc = sin(($i-90)*PI/180) * ($OuterRadius+$DataGapRadius)*$SkewFactor + $Y;
-         $this->pChartObject->drawAntialiasPixel($Xc,$Yc,$Settings);
+         $Xc = cos(($i - 90)*PI/180)*($OuterRadius + $DataGapRadius) + $X;
+         $Yc = sin(($i - 90)*PI/180)*($OuterRadius + $DataGapRadius)*$SkewFactor + $Y;
+         $this->pChartObject->drawAntialiasPixel($Xc, $Yc, $Settings);
 
-         if ( $OutX1 == VOID ) { $OutX1 = $Xc; $OutY1 = $Yc; }
+         if ($OutX1 == VOID) { $OutX1 = $Xc; $OutY1 = $Yc; }
 
-         if ( $i<90 ) { $Yc++; }
-         if ( $i>90 && $i<180 ) { $Xc++; }
-         if ( $i>180 && $i<270 ) { $Xc++; }
-         if ( $i>=270 ) { $Xc++; $Yc++; }
+         if ($i < 90) { $Yc++; }
+         if ($i > 90 && $i < 180) { $Xc++; }
+         if ($i > 180 && $i < 270) { $Xc++; }
+         if ($i >= 270) { $Xc++; $Yc++; }
 
          $Slices[$Slice]["BottomPoly"][] = floor($Xc); $Slices[$Slice]["BottomPoly"][] = floor($Yc);
-         $Slices[$Slice]["TopPoly"][] = floor($Xc); $Slices[$Slice]["TopPoly"][] = floor($Yc)-$SliceHeight;
+         $Slices[$Slice]["TopPoly"][] = floor($Xc); $Slices[$Slice]["TopPoly"][] = floor($Yc) - $SliceHeight;
          $Slices[$Slice]["Angle"][] = $i;
         }
        $OutX2 = $Xc; $OutY2 = $Yc;
@@ -1210,33 +1210,33 @@ 
        $Slices[$Slice]["Angle"][] = VOID;
        $Lasti = $i;
 
-       $Step   = (360 / (2 * PI * $InnerRadius))/2;
+       $Step = (360/(2*PI*$InnerRadius))/2;
        $InX1 = VOID; $InY1 = VOID;
-       for($i=$EndAngle;$i<=$Offset;$i=$i+$Step)
+       for ($i = $EndAngle; $i <= $Offset; $i = $i + $Step)
         {
-         $Xc = cos(($i-90)*PI/180) * ($InnerRadius+$DataGapRadius-1) + $X;
-         $Yc = sin(($i-90)*PI/180) * ($InnerRadius+$DataGapRadius-1)*$SkewFactor + $Y;
-         $Slices[$Slice]["AA"][] = array($Xc,$Yc);
+         $Xc = cos(($i - 90)*PI/180)*($InnerRadius + $DataGapRadius - 1) + $X;
+         $Yc = sin(($i - 90)*PI/180)*($InnerRadius + $DataGapRadius - 1)*$SkewFactor + $Y;
+         $Slices[$Slice]["AA"][] = array($Xc, $Yc);
 
-         $Xc = cos(($i-90)*PI/180) * ($InnerRadius+$DataGapRadius) + $X;
-         $Yc = sin(($i-90)*PI/180) * ($InnerRadius+$DataGapRadius)*$SkewFactor + $Y;
-         $Slices[$Slice]["AA"][] = array($Xc,$Yc);
+         $Xc = cos(($i - 90)*PI/180)*($InnerRadius + $DataGapRadius) + $X;
+         $Yc = sin(($i - 90)*PI/180)*($InnerRadius + $DataGapRadius)*$SkewFactor + $Y;
+         $Slices[$Slice]["AA"][] = array($Xc, $Yc);
 
-         if ( $InX1 == VOID ) { $InX1 = $Xc; $InY1 = $Yc; }
+         if ($InX1 == VOID) { $InX1 = $Xc; $InY1 = $Yc; }
 
-         if ( $i<90 ) { $Yc++; }
-         if ( $i>90 && $i<180 ) { $Xc++; }
-         if ( $i>180 && $i<270 ) { $Xc++; }
-         if ( $i>=270 ) { $Xc++; $Yc++; }
+         if ($i < 90) { $Yc++; }
+         if ($i > 90 && $i < 180) { $Xc++; }
+         if ($i > 180 && $i < 270) { $Xc++; }
+         if ($i >= 270) { $Xc++; $Yc++; }
 
          $Slices[$Slice]["BottomPoly"][] = floor($Xc); $Slices[$Slice]["BottomPoly"][] = floor($Yc);
-         $Slices[$Slice]["TopPoly"][] = floor($Xc); $Slices[$Slice]["TopPoly"][] = floor($Yc)-$SliceHeight;
+         $Slices[$Slice]["TopPoly"][] = floor($Xc); $Slices[$Slice]["TopPoly"][] = floor($Yc) - $SliceHeight;
          $Slices[$Slice]["Angle"][] = $i;
         }
        $InX2 = $Xc; $InY2 = $Yc;
 
-       $Slices[$Slice]["InX1"] = $InX1;   $Slices[$Slice]["InY1"] = $InY1;
-       $Slices[$Slice]["InX2"] = $InX2;   $Slices[$Slice]["InY2"] = $InY2;
+       $Slices[$Slice]["InX1"] = $InX1; $Slices[$Slice]["InY1"] = $InY1;
+       $Slices[$Slice]["InX2"] = $InX2; $Slices[$Slice]["InY2"] = $InY2;
        $Slices[$Slice]["OutX1"] = $OutX1; $Slices[$Slice]["OutY1"] = $OutY1;
        $Slices[$Slice]["OutX2"] = $OutX2; $Slices[$Slice]["OutY2"] = $OutY2;
 
@@ -1244,151 +1244,151 @@ 
       }
 
      /* Draw the bottom pie splice */
-     foreach($Slices as $SliceID => $Plots)
+     foreach ($Slices as $SliceID => $Plots)
       {
-       $Settings = $SliceColors[$SliceID];  $Settings["NoBorder"] = TRUE;
-       $this->pChartObject->drawPolygon($Plots["BottomPoly"],$Settings);
+       $Settings = $SliceColors[$SliceID]; $Settings["NoBorder"] = TRUE;
+       $this->pChartObject->drawPolygon($Plots["BottomPoly"], $Settings);
 
-       foreach($Plots["AA"] as $Key => $Pos)
-        $this->pChartObject->drawAntialiasPixel($Pos[0],$Pos[1],$Settings);
+       foreach ($Plots["AA"] as $Key => $Pos)
+        $this->pChartObject->drawAntialiasPixel($Pos[0], $Pos[1], $Settings);
 
-       $this->pChartObject->drawLine($Plots["InX1"],$Plots["InY1"],$Plots["OutX2"],$Plots["OutY2"],$Settings);
-       $this->pChartObject->drawLine($Plots["InX2"],$Plots["InY2"],$Plots["OutX1"],$Plots["OutY1"],$Settings);
+       $this->pChartObject->drawLine($Plots["InX1"], $Plots["InY1"], $Plots["OutX2"], $Plots["OutY2"], $Settings);
+       $this->pChartObject->drawLine($Plots["InX2"], $Plots["InY2"], $Plots["OutX1"], $Plots["OutY1"], $Settings);
       }
 
      $Slices      = array_reverse($Slices);
      $SliceColors = array_reverse($SliceColors);
 
      /* Draw the vertical edges (semi-visible) */
-     foreach($Slices as $SliceID => $Plots)
+     foreach ($Slices as $SliceID => $Plots)
       {
-       $Settings = $SliceColors[$SliceID];  $Settings["NoBorder"] = TRUE;
-       $Settings["R"] = $Settings["R"]+$Cf; $Settings["G"] = $Settings["G"]+$Cf; $Settings["B"] = $Settings["B"]+$Cf;
+       $Settings = $SliceColors[$SliceID]; $Settings["NoBorder"] = TRUE;
+       $Settings["R"] = $Settings["R"] + $Cf; $Settings["G"] = $Settings["G"] + $Cf; $Settings["B"] = $Settings["B"] + $Cf;
 
        $StartAngle = $Plots["Angle"][0];
-       foreach($Plots["Angle"] as $Key =>$Angle) { if ($Angle == VOID) { $EndAngle = $Plots["Angle"][$Key-1]; } }
+       foreach ($Plots["Angle"] as $Key =>$Angle) { if ($Angle == VOID) { $EndAngle = $Plots["Angle"][$Key - 1]; } }
 
-       if ( $StartAngle >= 270 || $StartAngle <= 90 )
-        $this->pChartObject->drawLine($Plots["OutX1"],$Plots["OutY1"],$Plots["OutX1"],$Plots["OutY1"]-$SliceHeight,$Settings);
-       if ( $StartAngle >= 270 || $StartAngle <= 90 )
-        $this->pChartObject->drawLine($Plots["OutX2"],$Plots["OutY2"],$Plots["OutX2"],$Plots["OutY2"]-$SliceHeight,$Settings);
+       if ($StartAngle >= 270 || $StartAngle <= 90)
+        $this->pChartObject->drawLine($Plots["OutX1"], $Plots["OutY1"], $Plots["OutX1"], $Plots["OutY1"] - $SliceHeight, $Settings);
+       if ($StartAngle >= 270 || $StartAngle <= 90)
+        $this->pChartObject->drawLine($Plots["OutX2"], $Plots["OutY2"], $Plots["OutX2"], $Plots["OutY2"] - $SliceHeight, $Settings);
 
-        $this->pChartObject->drawLine($Plots["InX1"],$Plots["InY1"],$Plots["InX1"],$Plots["InY1"]-$SliceHeight,$Settings);
-        $this->pChartObject->drawLine($Plots["InX2"],$Plots["InY2"],$Plots["InX2"],$Plots["InY2"]-$SliceHeight,$Settings);
+        $this->pChartObject->drawLine($Plots["InX1"], $Plots["InY1"], $Plots["InX1"], $Plots["InY1"] - $SliceHeight, $Settings);
+        $this->pChartObject->drawLine($Plots["InX2"], $Plots["InY2"], $Plots["InX2"], $Plots["InY2"] - $SliceHeight, $Settings);
       }
 
      /* Draw the inner vertical slices */
-     foreach($Slices as $SliceID => $Plots)
+     foreach ($Slices as $SliceID => $Plots)
       {
-       $Settings = $SliceColors[$SliceID];  $Settings["NoBorder"] = TRUE;
-       $Settings["R"] = $Settings["R"]+$Cf; $Settings["G"] = $Settings["G"]+$Cf; $Settings["B"] = $Settings["B"]+$Cf;
+       $Settings = $SliceColors[$SliceID]; $Settings["NoBorder"] = TRUE;
+       $Settings["R"] = $Settings["R"] + $Cf; $Settings["G"] = $Settings["G"] + $Cf; $Settings["B"] = $Settings["B"] + $Cf;
 
        $Outer = TRUE; $Inner = FALSE;
        $InnerPlotsA = ""; $InnerPlotsB = "";
-       foreach($Plots["Angle"] as $ID => $Angle)
+       foreach ($Plots["Angle"] as $ID => $Angle)
         {
-         if ( $Angle == VOID )
+         if ($Angle == VOID)
           { $Outer = FALSE; $Inner = TRUE; }
-         elseif( $Inner )
+         elseif ($Inner)
           {
-           if (( $Angle < 90 || $Angle > 270 ) && isset($Plots["BottomPoly"][$ID*2]) )
+           if (($Angle < 90 || $Angle > 270) && isset($Plots["BottomPoly"][$ID*2]))
             {
              $Xo = $Plots["BottomPoly"][$ID*2];
-             $Yo = $Plots["BottomPoly"][$ID*2+1];
+             $Yo = $Plots["BottomPoly"][$ID*2 + 1];
 
              $InnerPlotsA[] = $Xo; $InnerPlotsA[] = $Yo;
-             $InnerPlotsB[] = $Xo; $InnerPlotsB[] = $Yo-$SliceHeight;
+             $InnerPlotsB[] = $Xo; $InnerPlotsB[] = $Yo - $SliceHeight;
             }
           }
         }
 
-       if ( $InnerPlotsA != "" )
-        { $InnerPlots = array_merge($InnerPlotsA,$this->arrayReverse($InnerPlotsB)); $this->pChartObject->drawPolygon($InnerPlots,$Settings); }
+       if ($InnerPlotsA != "")
+        { $InnerPlots = array_merge($InnerPlotsA, $this->arrayReverse($InnerPlotsB)); $this->pChartObject->drawPolygon($InnerPlots, $Settings); }
       }
 
      /* Draw the splice top and left poly */
-     foreach($Slices as $SliceID => $Plots)
+     foreach ($Slices as $SliceID => $Plots)
       {
-       $Settings = $SliceColors[$SliceID];  $Settings["NoBorder"] = TRUE;
-       $Settings["R"] = $Settings["R"]+$Cf*1.5; $Settings["G"] = $Settings["G"]+$Cf*1.5; $Settings["B"] = $Settings["B"]+$Cf*1.5;
+       $Settings = $SliceColors[$SliceID]; $Settings["NoBorder"] = TRUE;
+       $Settings["R"] = $Settings["R"] + $Cf*1.5; $Settings["G"] = $Settings["G"] + $Cf*1.5; $Settings["B"] = $Settings["B"] + $Cf*1.5;
 
        $StartAngle = $Plots["Angle"][0];
-       foreach($Plots["Angle"] as $Key =>$Angle) { if ($Angle == VOID) { $EndAngle = $Plots["Angle"][$Key-1]; } }
+       foreach ($Plots["Angle"] as $Key =>$Angle) { if ($Angle == VOID) { $EndAngle = $Plots["Angle"][$Key - 1]; } }
 
-       if ( $StartAngle < 180 )
+       if ($StartAngle < 180)
         {
          $Points = "";
          $Points[] = $Plots["InX2"];
          $Points[] = $Plots["InY2"];
          $Points[] = $Plots["InX2"];
-         $Points[] = $Plots["InY2"]-$SliceHeight;
+         $Points[] = $Plots["InY2"] - $SliceHeight;
          $Points[] = $Plots["OutX1"];
-         $Points[] = $Plots["OutY1"]-$SliceHeight;
+         $Points[] = $Plots["OutY1"] - $SliceHeight;
          $Points[] = $Plots["OutX1"];
          $Points[] = $Plots["OutY1"];
 
-         $this->pChartObject->drawPolygon($Points,$Settings);
+         $this->pChartObject->drawPolygon($Points, $Settings);
         }
 
-       if ( $EndAngle > 180 )
+       if ($EndAngle > 180)
         {
          $Points = "";
          $Points[] = $Plots["InX1"];
          $Points[] = $Plots["InY1"];
          $Points[] = $Plots["InX1"];
-         $Points[] = $Plots["InY1"]-$SliceHeight;
+         $Points[] = $Plots["InY1"] - $SliceHeight;
          $Points[] = $Plots["OutX2"];
-         $Points[] = $Plots["OutY2"]-$SliceHeight;
+         $Points[] = $Plots["OutY2"] - $SliceHeight;
          $Points[] = $Plots["OutX2"];
          $Points[] = $Plots["OutY2"];
 
-         $this->pChartObject->drawPolygon($Points,$Settings);
+         $this->pChartObject->drawPolygon($Points, $Settings);
         }
       }
 
 
      /* Draw the vertical edges (visible) */
-     foreach($Slices as $SliceID => $Plots)
+     foreach ($Slices as $SliceID => $Plots)
       {
-       $Settings = $SliceColors[$SliceID];  $Settings["NoBorder"] = TRUE;
-       $Settings["R"] = $Settings["R"]+$Cf; $Settings["G"] = $Settings["G"]+$Cf; $Settings["B"] = $Settings["B"]+$Cf;
+       $Settings = $SliceColors[$SliceID]; $Settings["NoBorder"] = TRUE;
+       $Settings["R"] = $Settings["R"] + $Cf; $Settings["G"] = $Settings["G"] + $Cf; $Settings["B"] = $Settings["B"] + $Cf;
 
        $StartAngle = $Plots["Angle"][0];
-       foreach($Plots["Angle"] as $Key =>$Angle) { if ($Angle == VOID) { $EndAngle = $Plots["Angle"][$Key-1]; } }
+       foreach ($Plots["Angle"] as $Key =>$Angle) { if ($Angle == VOID) { $EndAngle = $Plots["Angle"][$Key - 1]; } }
 
-       if ( $StartAngle <= 270 && $StartAngle >= 90 )
-        $this->pChartObject->drawLine($Plots["OutX1"],$Plots["OutY1"],$Plots["OutX1"],$Plots["OutY1"]-$SliceHeight,$Settings);
-       if ( $EndAngle <= 270 && $EndAngle >= 90 )
-        $this->pChartObject->drawLine($Plots["OutX2"],$Plots["OutY2"],$Plots["OutX2"],$Plots["OutY2"]-$SliceHeight,$Settings);
+       if ($StartAngle <= 270 && $StartAngle >= 90)
+        $this->pChartObject->drawLine($Plots["OutX1"], $Plots["OutY1"], $Plots["OutX1"], $Plots["OutY1"] - $SliceHeight, $Settings);
+       if ($EndAngle <= 270 && $EndAngle >= 90)
+        $this->pChartObject->drawLine($Plots["OutX2"], $Plots["OutY2"], $Plots["OutX2"], $Plots["OutY2"] - $SliceHeight, $Settings);
       }
 
 
      /* Draw the outer vertical slices */
-     foreach($Slices as $SliceID => $Plots)
+     foreach ($Slices as $SliceID => $Plots)
       {
-       $Settings = $SliceColors[$SliceID];  $Settings["NoBorder"] = TRUE;
-       $Settings["R"] = $Settings["R"]+$Cf; $Settings["G"] = $Settings["G"]+$Cf; $Settings["B"] = $Settings["B"]+$Cf;
+       $Settings = $SliceColors[$SliceID]; $Settings["NoBorder"] = TRUE;
+       $Settings["R"] = $Settings["R"] + $Cf; $Settings["G"] = $Settings["G"] + $Cf; $Settings["B"] = $Settings["B"] + $Cf;
 
        $Outer = TRUE; $Inner = FALSE;
        $OuterPlotsA = ""; $OuterPlotsB = ""; $InnerPlotsA = ""; $InnerPlotsB = "";
-       foreach($Plots["Angle"] as $ID => $Angle)
+       foreach ($Plots["Angle"] as $ID => $Angle)
         {
-         if ( $Angle == VOID )
+         if ($Angle == VOID)
           { $Outer = FALSE; $Inner = TRUE; }
-         elseif( $Outer )
+         elseif ($Outer)
           {
-           if ( ( $Angle > 90 && $Angle < 270 ) && isset($Plots["BottomPoly"][$ID*2]) )
+           if (($Angle > 90 && $Angle < 270) && isset($Plots["BottomPoly"][$ID*2]))
             {
              $Xo = $Plots["BottomPoly"][$ID*2];
-             $Yo = $Plots["BottomPoly"][$ID*2+1];
+             $Yo = $Plots["BottomPoly"][$ID*2 + 1];
 
              $OuterPlotsA[] = $Xo; $OuterPlotsA[] = $Yo;
-             $OuterPlotsB[] = $Xo; $OuterPlotsB[] = $Yo-$SliceHeight;
+             $OuterPlotsB[] = $Xo; $OuterPlotsB[] = $Yo - $SliceHeight;
             }
           }
         }
-       if ( $OuterPlotsA != "" )
-        { $OuterPlots = array_merge($OuterPlotsA,$this->arrayReverse($OuterPlotsB)); $this->pChartObject->drawPolygon($OuterPlots,$Settings); }
+       if ($OuterPlotsA != "")
+        { $OuterPlots = array_merge($OuterPlotsA, $this->arrayReverse($OuterPlotsB)); $this->pChartObject->drawPolygon($OuterPlots, $Settings); }
       }
 
      $Slices      = array_reverse($Slices);
@@ -1396,55 +1396,55 @@ 
 
 
      /* Draw the top pie splice */
-     foreach($Slices as $SliceID => $Plots)
+     foreach ($Slices as $SliceID => $Plots)
       {
-       $Settings = $SliceColors[$SliceID];  $Settings["NoBorder"] = TRUE;
-       $Settings["R"] = $Settings["R"]+$Cf*2; $Settings["G"] = $Settings["G"]+$Cf*2; $Settings["B"] = $Settings["B"]+$Cf*2;
+       $Settings = $SliceColors[$SliceID]; $Settings["NoBorder"] = TRUE;
+       $Settings["R"] = $Settings["R"] + $Cf*2; $Settings["G"] = $Settings["G"] + $Cf*2; $Settings["B"] = $Settings["B"] + $Cf*2;
  
-       $this->pChartObject->drawPolygon($Plots["TopPoly"],$Settings);
+       $this->pChartObject->drawPolygon($Plots["TopPoly"], $Settings);
 
-       if ( $RecordImageMap ) { $this->pChartObject->addToImageMap("POLY",$this->arraySerialize($Plots["TopPoly"]),$this->pChartObject->toHTMLColor($Settings["R"],$Settings["G"],$Settings["B"]),$Data["Series"][$Data["Abscissa"]]["Data"][$SliceID],$Data["Series"][$DataSerie]["Data"][count($Slices)-$SliceID-1]); }
+       if ($RecordImageMap) { $this->pChartObject->addToImageMap("POLY", $this->arraySerialize($Plots["TopPoly"]), $this->pChartObject->toHTMLColor($Settings["R"], $Settings["G"], $Settings["B"]), $Data["Series"][$Data["Abscissa"]]["Data"][$SliceID], $Data["Series"][$DataSerie]["Data"][count($Slices) - $SliceID - 1]); }
 
-       foreach($Plots["AA"] as $Key => $Pos)
-        $this->pChartObject->drawAntialiasPixel($Pos[0],$Pos[1]-$SliceHeight,$Settings);
+       foreach ($Plots["AA"] as $Key => $Pos)
+        $this->pChartObject->drawAntialiasPixel($Pos[0], $Pos[1] - $SliceHeight, $Settings);
 
-       $this->pChartObject->drawLine($Plots["InX1"],$Plots["InY1"]-$SliceHeight,$Plots["OutX2"],$Plots["OutY2"]-$SliceHeight,$Settings);
-       $this->pChartObject->drawLine($Plots["InX2"],$Plots["InY2"]-$SliceHeight,$Plots["OutX1"],$Plots["OutY1"]-$SliceHeight,$Settings);
+       $this->pChartObject->drawLine($Plots["InX1"], $Plots["InY1"] - $SliceHeight, $Plots["OutX2"], $Plots["OutY2"] - $SliceHeight, $Settings);
+       $this->pChartObject->drawLine($Plots["InX2"], $Plots["InY2"] - $SliceHeight, $Plots["OutX1"], $Plots["OutY1"] - $SliceHeight, $Settings);
       }
 
-     if ( $DrawLabels )
+     if ($DrawLabels)
       {
        $Offset = 360;
-       foreach($Values as $Key => $Value)
+       foreach ($Values as $Key => $Value)
         {
          $StartAngle = $Offset;
-         $EndAngle   = $Offset-($Value*$ScaleFactor); if ( $EndAngle < 0 ) { $EndAngle = 0; }
+         $EndAngle   = $Offset - ($Value*$ScaleFactor); if ($EndAngle < 0) { $EndAngle = 0; }
 
-         if ( $LabelColor == PIE_LABEL_COLOR_AUTO )
-          { $Settings = array("FillR"=>$Palette[$ID]["R"],"FillG"=>$Palette[$ID]["G"],"FillB"=>$Palette[$ID]["B"],"Alpha"=>$Palette[$ID]["Alpha"]);}
+         if ($LabelColor == PIE_LABEL_COLOR_AUTO)
+          { $Settings = array("FillR"=>$Palette[$ID]["R"], "FillG"=>$Palette[$ID]["G"], "FillB"=>$Palette[$ID]["B"], "Alpha"=>$Palette[$ID]["Alpha"]); }
          else
-          { $Settings = array("FillR"=>$LabelR,"FillG"=>$LabelG,"FillB"=>$LabelB,"Alpha"=>$LabelAlpha); }
+          { $Settings = array("FillR"=>$LabelR, "FillG"=>$LabelG, "FillB"=>$LabelB, "Alpha"=>$LabelAlpha); }
 
          $Angle = ($EndAngle - $Offset)/2 + $Offset;
-         $Xc = cos(($Angle-90)*PI/180) * ($OuterRadius+$DataGapRadius) + $X;
-         $Yc = sin(($Angle-90)*PI/180) * ($OuterRadius+$DataGapRadius)*$SkewFactor + $Y;
+         $Xc = cos(($Angle - 90)*PI/180)*($OuterRadius + $DataGapRadius) + $X;
+         $Yc = sin(($Angle - 90)*PI/180)*($OuterRadius + $DataGapRadius)*$SkewFactor + $Y;
 
-         if ( $WriteValues == PIE_VALUE_PERCENTAGE )
-          $Label = $Display = round(( 100 / $SerieSum ) * $Value,$Precision)."%";
-         elseif ( $WriteValues == PIE_VALUE_NATURAL )
+         if ($WriteValues == PIE_VALUE_PERCENTAGE)
+          $Label = $Display = round((100/$SerieSum)*$Value, $Precision)."%";
+         elseif ($WriteValues == PIE_VALUE_NATURAL)
           $Label = $Data["Series"][$Data["Abscissa"]]["Data"][$Key];
          else
           $Label = "";
 
-         if ( $LabelStacked )
-          $this->writePieLabel($Xc,$Yc-$SliceHeight,$Label,$Angle,$Settings,TRUE,$X,$Y,$OuterRadius);
+         if ($LabelStacked)
+          $this->writePieLabel($Xc, $Yc - $SliceHeight, $Label, $Angle, $Settings, TRUE, $X, $Y, $OuterRadius);
          else
-          $this->writePieLabel($Xc,$Yc-$SliceHeight,$Label,$Angle,$Settings,FALSE);
+          $this->writePieLabel($Xc, $Yc - $SliceHeight, $Label, $Angle, $Settings, FALSE);
 
          $Offset = $EndAngle - $DataGapAngle; $ID--; $Slice++;
         }
       }
-     if ( $DrawLabels && $LabelStacked ) { $this->writeShiftedLabels(); }
+     if ($DrawLabels && $LabelStacked) { $this->writeShiftedLabels(); }
 
      $this->pChartObject->Shadow = $RestoreShadow;
 
@@ -1455,7 +1455,7 @@ 
   function arraySerialize($Data)
    {
     $Result = "";
-    foreach($Data as $Key => $Value)
+    foreach ($Data as $Key => $Value)
      { if ($Result == "") { $Result = floor($Value); } else { $Result = $Result.",".floor($Value); } }
 
     return($Result);
@@ -1466,35 +1466,35 @@ 
    {
     $Result = "";
 
-    for($i=count($Plots)-1;$i>=0;$i=$i-2)
-     { $Result[] = $Plots[$i-1]; $Result[] = $Plots[$i]; }
+    for ($i = count($Plots) - 1; $i >= 0; $i = $i - 2)
+     { $Result[] = $Plots[$i - 1]; $Result[] = $Plots[$i]; }
 
     return($Result);
    }
 
   /* Remove unused series & values */
-  function clean0Values($Data,$Palette,$DataSerie,$AbscissaSerie)
+  function clean0Values($Data, $Palette, $DataSerie, $AbscissaSerie)
    {
     $NewPalette = ""; $NewData = ""; $NewAbscissa = "";
 
     /* Remove unused series */
-    foreach($Data["Series"] as $SerieName => $SerieSettings)
-     { if ( $SerieName != $DataSerie && $SerieName != $AbscissaSerie ) { unset($Data["Series"][$SerieName]); } }
+    foreach ($Data["Series"] as $SerieName => $SerieSettings)
+     { if ($SerieName != $DataSerie && $SerieName != $AbscissaSerie) { unset($Data["Series"][$SerieName]); } }
 
     /* Remove NULL values */
-    foreach($Data["Series"][$DataSerie]["Data"] as $Key => $Value)
+    foreach ($Data["Series"][$DataSerie]["Data"] as $Key => $Value)
      {
-      if ($Value != 0 )
+      if ($Value != 0)
        {
         $NewData[]     = $Value;
         $NewAbscissa[] = $Data["Series"][$AbscissaSerie]["Data"][$Key];
-        if ( isset($Palette[$Key]) ) { $NewPalette[]  = $Palette[$Key]; }
+        if (isset($Palette[$Key])) { $NewPalette[] = $Palette[$Key]; }
        }
      }
     $Data["Series"][$DataSerie]["Data"]     = $NewData;
     $Data["Series"][$AbscissaSerie]["Data"] = $NewAbscissa;
 
-    return(array($Data,$NewPalette));
+    return(array($Data, $NewPalette));
    }
   }
 ?>
\ No newline at end of file

drupal/sites/default/boinc/modules/boincstats/includes/pchart/class/pStock.class.php

Spacing +87 added lines, -87 removed lines

@@ -13,7 +13,7 @@ 
      You can find the whole class documentation on the pChart web site.
  */
 
- define("STOCK_MISSING_SERIE"	, 180001);
+ define("STOCK_MISSING_SERIE", 180001);
 
  /* pStock class definition */
  class pStock
@@ -22,82 +22,82 @@ 
    var $pDataObject;
 
    /* Class creator */
-   function pStock($pChartObject,$pDataObject)
+   function pStock($pChartObject, $pDataObject)
     {
      $this->pChartObject = $pChartObject;
      $this->pDataObject  = $pDataObject;
     }
 
    /* Draw a stock chart */
-   function drawStockChart($Format="")
+   function drawStockChart($Format = "")
     {
      $SerieOpen		= isset($Format["SerieOpen"]) ? $Format["SerieOpen"] : "Open";
      $SerieClose	= isset($Format["SerieClose"]) ? $Format["SerieClose"] : "Close";
      $SerieMin		= isset($Format["SerieMin"]) ? $Format["SerieMin"] : "Min";
      $SerieMax		= isset($Format["SerieMax"]) ? $Format["SerieMax"] : "Max";
-     $SerieMedian	= isset($Format["SerieMedian"]) ? $Format["SerieMedian"] : NULL;
-     $LineWidth		= isset($Format["LineWidth"]) ? $Format["LineWidth"] : 1;
+     $SerieMedian = isset($Format["SerieMedian"]) ? $Format["SerieMedian"] : NULL;
+     $LineWidth = isset($Format["LineWidth"]) ? $Format["LineWidth"] : 1;
      $LineR		= isset($Format["LineR"]) ? $Format["LineR"] : 0;
      $LineG		= isset($Format["LineG"]) ? $Format["LineG"] : 0;
      $LineB		= isset($Format["LineB"]) ? $Format["LineB"] : 0;
      $LineAlpha		= isset($Format["LineAlpha"]) ? $Format["LineAlpha"] : 100;
-     $ExtremityWidth	= isset($Format["ExtremityWidth"]) ? $Format["ExtremityWidth"] : 1;
-     $ExtremityLength	= isset($Format["ExtremityLength"]) ? $Format["ExtremityLength"] : 3;
+     $ExtremityWidth = isset($Format["ExtremityWidth"]) ? $Format["ExtremityWidth"] : 1;
+     $ExtremityLength = isset($Format["ExtremityLength"]) ? $Format["ExtremityLength"] : 3;
      $ExtremityR	= isset($Format["ExtremityR"]) ? $Format["ExtremityR"] : 0;
      $ExtremityG	= isset($Format["ExtremityG"]) ? $Format["ExtremityG"] : 0;
      $ExtremityB	= isset($Format["ExtremityB"]) ? $Format["ExtremityB"] : 0;
-     $ExtremityAlpha	= isset($Format["ExtremityAlpha"]) ? $Format["ExtremityAlpha"] : 100;
-     $BoxWidth		= isset($Format["BoxWidth"]) ? $Format["BoxWidth"] : 8;
+     $ExtremityAlpha = isset($Format["ExtremityAlpha"]) ? $Format["ExtremityAlpha"] : 100;
+     $BoxWidth = isset($Format["BoxWidth"]) ? $Format["BoxWidth"] : 8;
      $BoxUpR		= isset($Format["BoxUpR"]) ? $Format["BoxUpR"] : 188;
      $BoxUpG		= isset($Format["BoxUpG"]) ? $Format["BoxUpG"] : 224;
      $BoxUpB		= isset($Format["BoxUpB"]) ? $Format["BoxUpB"] : 46;
-     $BoxUpAlpha	= isset($Format["BoxUpAlpha"]) ? $Format["BoxUpAlpha"] : 100;
-     $BoxUpSurrounding	= isset($Format["BoxUpSurrounding"]) ? $Format["BoxUpSurrounding"] : NULL;
-     $BoxUpBorderR	= isset($Format["BoxUpBorderR"]) ? $Format["BoxUpBorderR"] : $BoxUpR-20;
-     $BoxUpBorderG	= isset($Format["BoxUpBorderG"]) ? $Format["BoxUpBorderG"] : $BoxUpG-20;
-     $BoxUpBorderB	= isset($Format["BoxUpBorderB"]) ? $Format["BoxUpBorderB"] : $BoxUpB-20;
-     $BoxUpBorderAlpha	= isset($Format["BoxUpBorderAlpha"]) ? $Format["BoxUpBorderAlpha"] : 100;
+     $BoxUpAlpha = isset($Format["BoxUpAlpha"]) ? $Format["BoxUpAlpha"] : 100;
+     $BoxUpSurrounding = isset($Format["BoxUpSurrounding"]) ? $Format["BoxUpSurrounding"] : NULL;
+     $BoxUpBorderR	= isset($Format["BoxUpBorderR"]) ? $Format["BoxUpBorderR"] : $BoxUpR - 20;
+     $BoxUpBorderG	= isset($Format["BoxUpBorderG"]) ? $Format["BoxUpBorderG"] : $BoxUpG - 20;
+     $BoxUpBorderB	= isset($Format["BoxUpBorderB"]) ? $Format["BoxUpBorderB"] : $BoxUpB - 20;
+     $BoxUpBorderAlpha = isset($Format["BoxUpBorderAlpha"]) ? $Format["BoxUpBorderAlpha"] : 100;
      $BoxDownR		= isset($Format["BoxDownR"]) ? $Format["BoxDownR"] : 224;
      $BoxDownG		= isset($Format["BoxDownG"]) ? $Format["BoxDownG"] : 100;
      $BoxDownB		= isset($Format["BoxDownB"]) ? $Format["BoxDownB"] : 46;
-     $BoxDownAlpha	= isset($Format["BoxDownAlpha"]) ? $Format["BoxDownAlpha"] : 100;
-     $BoxDownSurrounding= isset($Format["BoxDownSurrounding"]) ? $Format["BoxDownSurrounding"] : NULL;
-     $BoxDownBorderR	= isset($Format["BoxDownBorderR"]) ? $Format["BoxDownBorderR"] : $BoxDownR-20;
-     $BoxDownBorderG	= isset($Format["BoxDownBorderG"]) ? $Format["BoxDownBorderG"] : $BoxDownG-20;
-     $BoxDownBorderB	= isset($Format["BoxDownBorderB"]) ? $Format["BoxDownBorderB"] : $BoxDownB-20;
-     $BoxDownBorderAlpha= isset($Format["BoxDownBorderAlpha"]) ? $Format["BoxDownBorderAlpha"] : 100;
+     $BoxDownAlpha = isset($Format["BoxDownAlpha"]) ? $Format["BoxDownAlpha"] : 100;
+     $BoxDownSurrounding = isset($Format["BoxDownSurrounding"]) ? $Format["BoxDownSurrounding"] : NULL;
+     $BoxDownBorderR	= isset($Format["BoxDownBorderR"]) ? $Format["BoxDownBorderR"] : $BoxDownR - 20;
+     $BoxDownBorderG	= isset($Format["BoxDownBorderG"]) ? $Format["BoxDownBorderG"] : $BoxDownG - 20;
+     $BoxDownBorderB	= isset($Format["BoxDownBorderB"]) ? $Format["BoxDownBorderB"] : $BoxDownB - 20;
+     $BoxDownBorderAlpha = isset($Format["BoxDownBorderAlpha"]) ? $Format["BoxDownBorderAlpha"] : 100;
      $ShadowOnBoxesOnly	= isset($Format["ShadowOnBoxesOnly"]) ? $Format["ShadowOnBoxesOnly"] : TRUE;
      $MedianR		= isset($Format["MedianR"]) ? $Format["MedianR"] : 255;
      $MedianG		= isset($Format["MedianG"]) ? $Format["MedianG"] : 0;
      $MedianB		= isset($Format["MedianB"]) ? $Format["MedianB"] : 0;
-     $MedianAlpha	= isset($Format["MedianAlpha"]) ? $Format["MedianAlpha"] : 100;
-     $RecordImageMap	= isset($Format["RecordImageMap"]) ? $Format["RecordImageMap"] : FALSE;
-     $ImageMapTitle	= isset($Format["ImageMapTitle"]) ? $Format["ImageMapTitle"] : "Stock Chart";
+     $MedianAlpha = isset($Format["MedianAlpha"]) ? $Format["MedianAlpha"] : 100;
+     $RecordImageMap = isset($Format["RecordImageMap"]) ? $Format["RecordImageMap"] : FALSE;
+     $ImageMapTitle = isset($Format["ImageMapTitle"]) ? $Format["ImageMapTitle"] : "Stock Chart";
 
 
      /* Data Processing */
      $Data    = $this->pDataObject->getData();
      $Palette = $this->pDataObject->getPalette();
 
-     if ( $BoxUpSurrounding != NULL )	{ $BoxUpBorderR = $BoxUpR + $BoxUpSurrounding; $BoxUpBorderG = $BoxUpG + $BoxUpSurrounding; $BoxUpBorderB = $BoxUpB + $BoxUpSurrounding; }
-     if ( $BoxDownSurrounding != NULL )	{ $BoxDownBorderR = $BoxDownR + $BoxDownSurrounding; $BoxDownBorderG = $BoxDownG + $BoxDownSurrounding; $BoxDownBorderB = $BoxDownB + $BoxDownSurrounding; }
+     if ($BoxUpSurrounding != NULL) { $BoxUpBorderR = $BoxUpR + $BoxUpSurrounding; $BoxUpBorderG = $BoxUpG + $BoxUpSurrounding; $BoxUpBorderB = $BoxUpB + $BoxUpSurrounding; }
+     if ($BoxDownSurrounding != NULL) { $BoxDownBorderR = $BoxDownR + $BoxDownSurrounding; $BoxDownBorderG = $BoxDownG + $BoxDownSurrounding; $BoxDownBorderB = $BoxDownB + $BoxDownSurrounding; }
 
-     if ( $LineWidth != 1 ) { $LineOffset = $LineWidth / 2; }
-     $BoxOffset = $BoxWidth / 2;
+     if ($LineWidth != 1) { $LineOffset = $LineWidth/2; }
+     $BoxOffset = $BoxWidth/2;
 
      $Data = $this->pChartObject->DataSet->getData();
-     list($XMargin,$XDivs) = $this->pChartObject->scaleGetXSettings();
+     list($XMargin, $XDivs) = $this->pChartObject->scaleGetXSettings();
 
-     if ( !isset($Data["Series"][$SerieOpen]) || !isset($Data["Series"][$SerieClose]) || !isset($Data["Series"][$SerieMin]) || !isset($Data["Series"][$SerieMax]) )
+     if (!isset($Data["Series"][$SerieOpen]) || !isset($Data["Series"][$SerieClose]) || !isset($Data["Series"][$SerieMin]) || !isset($Data["Series"][$SerieMax]))
       return(STOCK_MISSING_SERIE);
 
      $Plots = "";
-     foreach($Data["Series"][$SerieOpen]["Data"] as $Key => $Value)
+     foreach ($Data["Series"][$SerieOpen]["Data"] as $Key => $Value)
       {
        $Point = "";
-       if ( isset($Data["Series"][$SerieClose]["Data"][$Key]) || isset($Data["Series"][$SerieMin]["Data"][$Key]) || isset($Data["Series"][$SerieMax]["Data"][$Key]) )
-        $Point = array($Value,$Data["Series"][$SerieClose]["Data"][$Key],$Data["Series"][$SerieMin]["Data"][$Key],$Data["Series"][$SerieMax]["Data"][$Key]);
-       if ( $SerieMedian != NULL && isset($Data["Series"][$SerieMedian]["Data"][$Key]) )
+       if (isset($Data["Series"][$SerieClose]["Data"][$Key]) || isset($Data["Series"][$SerieMin]["Data"][$Key]) || isset($Data["Series"][$SerieMax]["Data"][$Key]))
+        $Point = array($Value, $Data["Series"][$SerieClose]["Data"][$Key], $Data["Series"][$SerieMin]["Data"][$Key], $Data["Series"][$SerieMax]["Data"][$Key]);
+       if ($SerieMedian != NULL && isset($Data["Series"][$SerieMedian]["Data"][$Key]))
         $Point[] = $Data["Series"][$SerieMedian]["Data"][$Key];
 
        $Plots[] = $Point;
@@ -108,105 +108,105 @@ 
      $Format	= $Data["Axis"][$AxisID]["Format"];
      $Unit	= $Data["Axis"][$AxisID]["Unit"];
 
-     $YZero	= $this->pChartObject->scaleComputeY(0,array("AxisID"=>$AxisID));
-     $XStep	= ($this->pChartObject->GraphAreaX2-$this->pChartObject->GraphAreaX1-$XMargin*2)/$XDivs;
+     $YZero	= $this->pChartObject->scaleComputeY(0, array("AxisID"=>$AxisID));
+     $XStep	= ($this->pChartObject->GraphAreaX2 - $this->pChartObject->GraphAreaX1 - $XMargin*2)/$XDivs;
 
      $X = $this->pChartObject->GraphAreaX1 + $XMargin;
      $Y = $this->pChartObject->GraphAreaY1 + $XMargin;
 
-     $LineSettings	= array("R"=>$LineR,"G"=>$LineG,"B"=>$LineB,"Alpha"=>$LineAlpha);
-     $ExtremitySettings	= array("R"=>$ExtremityR,"G"=>$ExtremityG,"B"=>$ExtremityB,"Alpha"=>$ExtremityAlpha);
-     $BoxUpSettings	= array("R"=>$BoxUpR,"G"=>$BoxUpG,"B"=>$BoxUpB,"Alpha"=>$BoxUpAlpha,"BorderR"=>$BoxUpBorderR,"BorderG"=>$BoxUpBorderG,"BorderB"=>$BoxUpBorderB,"BorderAlpha"=>$BoxUpBorderAlpha);
-     $BoxDownSettings	= array("R"=>$BoxDownR,"G"=>$BoxDownG,"B"=>$BoxDownB,"Alpha"=>$BoxDownAlpha,"BorderR"=>$BoxDownBorderR,"BorderG"=>$BoxDownBorderG,"BorderB"=>$BoxDownBorderB,"BorderAlpha"=>$BoxDownBorderAlpha);
-     $MedianSettings	= array("R"=>$MedianR,"G"=>$MedianG,"B"=>$MedianB,"Alpha"=>$MedianAlpha);
+     $LineSettings = array("R"=>$LineR, "G"=>$LineG, "B"=>$LineB, "Alpha"=>$LineAlpha);
+     $ExtremitySettings = array("R"=>$ExtremityR, "G"=>$ExtremityG, "B"=>$ExtremityB, "Alpha"=>$ExtremityAlpha);
+     $BoxUpSettings = array("R"=>$BoxUpR, "G"=>$BoxUpG, "B"=>$BoxUpB, "Alpha"=>$BoxUpAlpha, "BorderR"=>$BoxUpBorderR, "BorderG"=>$BoxUpBorderG, "BorderB"=>$BoxUpBorderB, "BorderAlpha"=>$BoxUpBorderAlpha);
+     $BoxDownSettings = array("R"=>$BoxDownR, "G"=>$BoxDownG, "B"=>$BoxDownB, "Alpha"=>$BoxDownAlpha, "BorderR"=>$BoxDownBorderR, "BorderG"=>$BoxDownBorderG, "BorderB"=>$BoxDownBorderB, "BorderAlpha"=>$BoxDownBorderAlpha);
+     $MedianSettings = array("R"=>$MedianR, "G"=>$MedianG, "B"=>$MedianB, "Alpha"=>$MedianAlpha);
 
-     foreach($Plots as $Key =>$Points)
+     foreach ($Plots as $Key =>$Points)
       {
-       $PosArray = $this->pChartObject->scaleComputeY($Points,array("AxisID"=>$AxisID));
+       $PosArray = $this->pChartObject->scaleComputeY($Points, array("AxisID"=>$AxisID));
 
        $Values = "Open :".$Data["Series"][$SerieOpen]["Data"][$Key]."<BR>Close : ".$Data["Series"][$SerieClose]["Data"][$Key]."<BR>Min : ".$Data["Series"][$SerieMin]["Data"][$Key]."<BR>Max : ".$Data["Series"][$SerieMax]["Data"][$Key]."<BR>";
-       if ( $SerieMedian != NULL ) { $Values = $Values."Median : ".$Data["Series"][$SerieMedian]["Data"][$Key]."<BR>"; }
-       if ( $PosArray[0] > $PosArray[1] ) { $ImageMapColor = $this->pChartObject->toHTMLColor($BoxUpR,$BoxUpG,$BoxUpB); } else { $ImageMapColor = $this->pChartObject->toHTMLColor($BoxDownR,$BoxDownG,$BoxDownB); } 
+       if ($SerieMedian != NULL) { $Values = $Values."Median : ".$Data["Series"][$SerieMedian]["Data"][$Key]."<BR>"; }
+       if ($PosArray[0] > $PosArray[1]) { $ImageMapColor = $this->pChartObject->toHTMLColor($BoxUpR, $BoxUpG, $BoxUpB); } else { $ImageMapColor = $this->pChartObject->toHTMLColor($BoxDownR, $BoxDownG, $BoxDownB); } 
 
-       if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
+       if ($Data["Orientation"] == SCALE_POS_LEFTRIGHT)
         {
-         if ( $YZero > $this->pChartObject->GraphAreaY2-1 ) { $YZero = $this->pChartObject->GraphAreaY2-1; }
-         if ( $YZero < $this->pChartObject->GraphAreaY1+1 ) { $YZero = $this->pChartObject->GraphAreaY1+1; }
+         if ($YZero > $this->pChartObject->GraphAreaY2 - 1) { $YZero = $this->pChartObject->GraphAreaY2 - 1; }
+         if ($YZero < $this->pChartObject->GraphAreaY1 + 1) { $YZero = $this->pChartObject->GraphAreaY1 + 1; }
 
-         if ( $XDivs == 0 ) { $XStep = 0; } else { $XStep = ($this->pChartObject->GraphAreaX2-$this->pChartObject->GraphAreaX1-$XMargin*2)/$XDivs; }
+         if ($XDivs == 0) { $XStep = 0; } else { $XStep = ($this->pChartObject->GraphAreaX2 - $this->pChartObject->GraphAreaX1 - $XMargin*2)/$XDivs; }
 
-         if ( $ShadowOnBoxesOnly ) { $RestoreShadow = $this->pChartObject->Shadow; $this->pChartObject->Shadow = FALSE; }
+         if ($ShadowOnBoxesOnly) { $RestoreShadow = $this->pChartObject->Shadow; $this->pChartObject->Shadow = FALSE; }
 
-         if ( $LineWidth == 1 )
-          $this->pChartObject->drawLine($X,$PosArray[2],$X,$PosArray[3],$LineSettings);
+         if ($LineWidth == 1)
+          $this->pChartObject->drawLine($X, $PosArray[2], $X, $PosArray[3], $LineSettings);
          else
-          $this->pChartObject->drawFilledRectangle($X-$LineOffset,$PosArray[2],$X+$LineOffset,$PosArray[3],$LineSettings);
+          $this->pChartObject->drawFilledRectangle($X - $LineOffset, $PosArray[2], $X + $LineOffset, $PosArray[3], $LineSettings);
 
-         if ( $ExtremityWidth == 1 )
+         if ($ExtremityWidth == 1)
           {
-           $this->pChartObject->drawLine($X-$ExtremityLength,$PosArray[2],$X+$ExtremityLength,$PosArray[2],$ExtremitySettings);
-           $this->pChartObject->drawLine($X-$ExtremityLength,$PosArray[3],$X+$ExtremityLength,$PosArray[3],$ExtremitySettings);
+           $this->pChartObject->drawLine($X - $ExtremityLength, $PosArray[2], $X + $ExtremityLength, $PosArray[2], $ExtremitySettings);
+           $this->pChartObject->drawLine($X - $ExtremityLength, $PosArray[3], $X + $ExtremityLength, $PosArray[3], $ExtremitySettings);
 
-           if ( $RecordImageMap ) { $this->pChartObject->addToImageMap("RECT",floor($X-$ExtremityLength).",".floor($PosArray[2]).",".floor($X+$ExtremityLength).",".floor($PosArray[3]),$ImageMapColor,$ImageMapTitle,$Values); }
+           if ($RecordImageMap) { $this->pChartObject->addToImageMap("RECT", floor($X - $ExtremityLength).",".floor($PosArray[2]).",".floor($X + $ExtremityLength).",".floor($PosArray[3]), $ImageMapColor, $ImageMapTitle, $Values); }
           }
          else
           {
-           $this->pChartObject->drawFilledRectangle($X-$ExtremityLength,$PosArray[2],$X+$ExtremityLength,$PosArray[2]-$ExtremityWidth,$ExtremitySettings);
-           $this->pChartObject->drawFilledRectangle($X-$ExtremityLength,$PosArray[3],$X+$ExtremityLength,$PosArray[3]+$ExtremityWidth,$ExtremitySettings);
+           $this->pChartObject->drawFilledRectangle($X - $ExtremityLength, $PosArray[2], $X + $ExtremityLength, $PosArray[2] - $ExtremityWidth, $ExtremitySettings);
+           $this->pChartObject->drawFilledRectangle($X - $ExtremityLength, $PosArray[3], $X + $ExtremityLength, $PosArray[3] + $ExtremityWidth, $ExtremitySettings);
 
-           if ( $RecordImageMap ) { $this->pChartObject->addToImageMap("RECT",floor($X-$ExtremityLength).",".floor($PosArray[2]-$ExtremityWidth).",".floor($X+$ExtremityLength).",".floor($PosArray[3]+$ExtremityWidth),$ImageMapColor,$ImageMapTitle,$Values); }
+           if ($RecordImageMap) { $this->pChartObject->addToImageMap("RECT", floor($X - $ExtremityLength).",".floor($PosArray[2] - $ExtremityWidth).",".floor($X + $ExtremityLength).",".floor($PosArray[3] + $ExtremityWidth), $ImageMapColor, $ImageMapTitle, $Values); }
           }
 
-         if ( $ShadowOnBoxesOnly ) { $this->pChartObject->Shadow = $RestoreShadow; }
+         if ($ShadowOnBoxesOnly) { $this->pChartObject->Shadow = $RestoreShadow; }
 
-         if ( $PosArray[0] > $PosArray[1] )
-          $this->pChartObject->drawFilledRectangle($X-$BoxOffset,$PosArray[0],$X+$BoxOffset,$PosArray[1],$BoxUpSettings);
+         if ($PosArray[0] > $PosArray[1])
+          $this->pChartObject->drawFilledRectangle($X - $BoxOffset, $PosArray[0], $X + $BoxOffset, $PosArray[1], $BoxUpSettings);
          else
-          $this->pChartObject->drawFilledRectangle($X-$BoxOffset,$PosArray[0],$X+$BoxOffset,$PosArray[1],$BoxDownSettings);
+          $this->pChartObject->drawFilledRectangle($X - $BoxOffset, $PosArray[0], $X + $BoxOffset, $PosArray[1], $BoxDownSettings);
 
-         if ( isset($PosArray[4]) )
-          $this->pChartObject->drawLine($X-$ExtremityLength,$PosArray[4],$X+$ExtremityLength,$PosArray[4],$MedianSettings);
+         if (isset($PosArray[4]))
+          $this->pChartObject->drawLine($X - $ExtremityLength, $PosArray[4], $X + $ExtremityLength, $PosArray[4], $MedianSettings);
 
          $X = $X + $XStep;
         }
-       elseif ( $Data["Orientation"] == SCALE_POS_TOPBOTTOM )
+       elseif ($Data["Orientation"] == SCALE_POS_TOPBOTTOM)
         {
-         if ( $YZero > $this->pChartObject->GraphAreaX2-1 ) { $YZero = $this->pChartObject->GraphAreaX2-1; }
-         if ( $YZero < $this->pChartObject->GraphAreaX1+1 ) { $YZero = $this->pChartObject->GraphAreaX1+1; }
+         if ($YZero > $this->pChartObject->GraphAreaX2 - 1) { $YZero = $this->pChartObject->GraphAreaX2 - 1; }
+         if ($YZero < $this->pChartObject->GraphAreaX1 + 1) { $YZero = $this->pChartObject->GraphAreaX1 + 1; }
 
-         if ( $XDivs == 0 ) { $XStep = 0; } else { $XStep = ($this->pChartObject->GraphAreaY2-$this->pChartObject->GraphAreaY1-$XMargin*2)/$XDivs; }
+         if ($XDivs == 0) { $XStep = 0; } else { $XStep = ($this->pChartObject->GraphAreaY2 - $this->pChartObject->GraphAreaY1 - $XMargin*2)/$XDivs; }
 
-         if ( $LineWidth == 1 )
-          $this->pChartObject->drawLine($PosArray[2],$Y,$PosArray[3],$Y,$LineSettings);
+         if ($LineWidth == 1)
+          $this->pChartObject->drawLine($PosArray[2], $Y, $PosArray[3], $Y, $LineSettings);
          else
-          $this->pChartObject->drawFilledRectangle($PosArray[2],$Y-$LineOffset,$PosArray[3],$Y+$LineOffset,$LineSettings);
+          $this->pChartObject->drawFilledRectangle($PosArray[2], $Y - $LineOffset, $PosArray[3], $Y + $LineOffset, $LineSettings);
 
-         if ( $ShadowOnBoxesOnly ) { $RestoreShadow = $this->pChartObject->Shadow; $this->pChartObject->Shadow = FALSE; }
+         if ($ShadowOnBoxesOnly) { $RestoreShadow = $this->pChartObject->Shadow; $this->pChartObject->Shadow = FALSE; }
 
-         if ( $ExtremityWidth == 1 )
+         if ($ExtremityWidth == 1)
           {
-           $this->pChartObject->drawLine($PosArray[2],$Y-$ExtremityLength,$PosArray[2],$Y+$ExtremityLength,$ExtremitySettings);
-           $this->pChartObject->drawLine($PosArray[3],$Y-$ExtremityLength,$PosArray[3],$Y+$ExtremityLength,$ExtremitySettings);
+           $this->pChartObject->drawLine($PosArray[2], $Y - $ExtremityLength, $PosArray[2], $Y + $ExtremityLength, $ExtremitySettings);
+           $this->pChartObject->drawLine($PosArray[3], $Y - $ExtremityLength, $PosArray[3], $Y + $ExtremityLength, $ExtremitySettings);
 
-           if ( $RecordImageMap ) { $this->pChartObject->addToImageMap("RECT",floor($PosArray[2]).",".floor($Y-$ExtremityLength).",".floor($PosArray[3]).",".floor($Y+$ExtremityLength),$ImageMapColor,$ImageMapTitle,$Values); }
+           if ($RecordImageMap) { $this->pChartObject->addToImageMap("RECT", floor($PosArray[2]).",".floor($Y - $ExtremityLength).",".floor($PosArray[3]).",".floor($Y + $ExtremityLength), $ImageMapColor, $ImageMapTitle, $Values); }
           }
          else
           {
-           $this->pChartObject->drawFilledRectangle($PosArray[2],$Y-$ExtremityLength,$PosArray[2]-$ExtremityWidth,$Y+$ExtremityLength,$ExtremitySettings);
-           $this->pChartObject->drawFilledRectangle($PosArray[3],$Y-$ExtremityLength,$PosArray[3]+$ExtremityWidth,$Y+$ExtremityLength,$ExtremitySettings);
+           $this->pChartObject->drawFilledRectangle($PosArray[2], $Y - $ExtremityLength, $PosArray[2] - $ExtremityWidth, $Y + $ExtremityLength, $ExtremitySettings);
+           $this->pChartObject->drawFilledRectangle($PosArray[3], $Y - $ExtremityLength, $PosArray[3] + $ExtremityWidth, $Y + $ExtremityLength, $ExtremitySettings);
 
-           if ( $RecordImageMap ) { $this->pChartObject->addToImageMap("RECT",floor($PosArray[2]-$ExtremityWidth).",".floor($Y-$ExtremityLength).",".floor($PosArray[3]+$ExtremityWidth).",".floor($Y+$ExtremityLength),$ImageMapColor,$ImageMapTitle,$Values); }
+           if ($RecordImageMap) { $this->pChartObject->addToImageMap("RECT", floor($PosArray[2] - $ExtremityWidth).",".floor($Y - $ExtremityLength).",".floor($PosArray[3] + $ExtremityWidth).",".floor($Y + $ExtremityLength), $ImageMapColor, $ImageMapTitle, $Values); }
           }
 
-         if ( $ShadowOnBoxesOnly ) { $this->pChartObject->Shadow = $RestoreShadow; }
+         if ($ShadowOnBoxesOnly) { $this->pChartObject->Shadow = $RestoreShadow; }
 
-         if ( $PosArray[0] < $PosArray[1] )
-          $this->pChartObject->drawFilledRectangle($PosArray[0],$Y-$BoxOffset,$PosArray[1],$Y+$BoxOffset,$BoxUpSettings);
+         if ($PosArray[0] < $PosArray[1])
+          $this->pChartObject->drawFilledRectangle($PosArray[0], $Y - $BoxOffset, $PosArray[1], $Y + $BoxOffset, $BoxUpSettings);
          else
-          $this->pChartObject->drawFilledRectangle($PosArray[0],$Y-$BoxOffset,$PosArray[1],$Y+$BoxOffset,$BoxDownSettings);
+          $this->pChartObject->drawFilledRectangle($PosArray[0], $Y - $BoxOffset, $PosArray[1], $Y + $BoxOffset, $BoxDownSettings);
 
-         if ( isset($PosArray[4]) )
-          $this->pChartObject->drawLine($PosArray[4],$Y-$ExtremityLength,$PosArray[4],$Y+$ExtremityLength,$MedianSettings);
+         if (isset($PosArray[4]))
+          $this->pChartObject->drawLine($PosArray[4], $Y - $ExtremityLength, $PosArray[4], $Y + $ExtremityLength, $MedianSettings);
 
          $Y = $Y + $XStep;
         }

drupal/sites/default/boinc/modules/boincstats/includes/pchart/class/pCache.class.php

Spacing +51 added lines, -51 removed lines

@@ -21,58 +21,58 @@ 
    var $CacheDB;
 
    /* Class creator */
-   function pCache($Settings="")
+   function pCache($Settings = "")
     {
-     $CacheFolder	= isset($Settings["CacheFolder"]) ? $Settings["CacheFolder"] : "cache";
-     $CacheIndex	= isset($Settings["CacheIndex"]) ? $Settings["CacheIndex"] : "index.db";
-     $CacheDB		= isset($Settings["CacheDB"]) ? $Settings["CacheDB"] : "cache.db";
+     $CacheFolder = isset($Settings["CacheFolder"]) ? $Settings["CacheFolder"] : "cache";
+     $CacheIndex = isset($Settings["CacheIndex"]) ? $Settings["CacheIndex"] : "index.db";
+     $CacheDB = isset($Settings["CacheDB"]) ? $Settings["CacheDB"] : "cache.db";
 
-     $this->CacheFolder	= $CacheFolder;
-     $this->CacheIndex	= $CacheIndex;
-     $this->CacheDB	= $CacheDB;
+     $this->CacheFolder = $CacheFolder;
+     $this->CacheIndex = $CacheIndex;
+     $this->CacheDB = $CacheDB;
 
      if (!file_exists($this->CacheFolder."/".$this->CacheIndex)) { touch($this->CacheFolder."/".$this->CacheIndex); }
-     if (!file_exists($this->CacheFolder."/".$this->CacheDB))    { touch($this->CacheFolder."/".$this->CacheDB); }
+     if (!file_exists($this->CacheFolder."/".$this->CacheDB)) { touch($this->CacheFolder."/".$this->CacheDB); }
     }
 
    /* Flush the cache contents */
    function flush()
     {
      if (file_exists($this->CacheFolder."/".$this->CacheIndex)) { unlink($this->CacheFolder."/".$this->CacheIndex); touch($this->CacheFolder."/".$this->CacheIndex); }
-     if (file_exists($this->CacheFolder."/".$this->CacheDB))    { unlink($this->CacheFolder."/".$this->CacheDB); touch($this->CacheFolder."/".$this->CacheDB); }
+     if (file_exists($this->CacheFolder."/".$this->CacheDB)) { unlink($this->CacheFolder."/".$this->CacheDB); touch($this->CacheFolder."/".$this->CacheDB); }
     }
 
    /* Return the MD5 of the data array to clearly identify the chart */
-   function getHash($Data,$Marker="")
+   function getHash($Data, $Marker = "")
     { return(md5($Marker.serialize($Data->Data))); }
 
    /* Write the generated picture to the cache */
-   function writeToCache($ID,$pChartObject)
+   function writeToCache($ID, $pChartObject)
     {
      /* Compute the paths */
-     $TemporaryFile = $this->CacheFolder."/tmp_".rand(0,1000).".png";
+     $TemporaryFile = $this->CacheFolder."/tmp_".rand(0, 1000).".png";
      $Database      = $this->CacheFolder."/".$this->CacheDB;
      $Index         = $this->CacheFolder."/".$this->CacheIndex;
 
      /* Flush the picture to a temporary file */
-     imagepng($pChartObject->Picture ,$TemporaryFile);
+     imagepng($pChartObject->Picture, $TemporaryFile);
 
      /* Retrieve the files size */
      $PictureSize = filesize($TemporaryFile);
      $DBSize      = filesize($Database);
 
      /* Save the index */
-     $Handle = fopen($Index,"a");
+     $Handle = fopen($Index, "a");
      fwrite($Handle, $ID.",".$DBSize.",".$PictureSize.",".time().",0      \r\n");
      fclose($Handle);
 
      /* Get the picture raw contents */
-     $Handle = fopen($TemporaryFile,"r");
-     $Raw    = fread($Handle,$PictureSize);
+     $Handle = fopen($TemporaryFile, "r");
+     $Raw    = fread($Handle, $PictureSize);
      fclose($Handle);
 
      /* Save the picture in the solid database file */
-     $Handle = fopen($Database,"a");
+     $Handle = fopen($Database, "a");
      fwrite($Handle, $Raw);
      fclose($Handle);
 
@@ -93,7 +93,7 @@ 
     {
      $ID     = isset($Settings["Name"]) ? $Settings["Name"] : NULL;
      $Expiry = isset($Settings["Expiry"]) ? $Settings["Expiry"] : -(24*60*60);
-     $TS     = time()-$Expiry;
+     $TS     = time() - $Expiry;
 
      /* Compute the paths */
      $Database     = $this->CacheFolder."/".$this->CacheDB;
@@ -102,18 +102,18 @@ 
      $IndexTemp    = $this->CacheFolder."/".$this->CacheIndex.".tmp";
 
      /* Single file removal */
-     if ( $ID != NULL )
+     if ($ID != NULL)
       {
        /* Retrieve object informations */
-       $Object = $this->isInCache($ID,TRUE);
+       $Object = $this->isInCache($ID, TRUE);
 
        /* If it's not in the cache DB, go away */
-       if ( !$Object ) { return(0); }
+       if (!$Object) { return(0); }
       }
 
      /* Create the temporary files */
      if (!file_exists($DatabaseTemp)) { touch($DatabaseTemp); }
-     if (!file_exists($IndexTemp))    { touch($IndexTemp); }
+     if (!file_exists($IndexTemp)) { touch($IndexTemp); }
 
      /* Open the file handles */
      $IndexHandle     = @fopen($Index, "r");
@@ -125,11 +125,11 @@ 
      while (!feof($IndexHandle))
       {
        $Entry    = fgets($IndexHandle, 4096);
-       $Entry    = str_replace("\r","",$Entry);
-       $Entry    = str_replace("\n","",$Entry);
-       $Settings = preg_split("/,/",$Entry);
+       $Entry    = str_replace("\r", "", $Entry);
+       $Entry    = str_replace("\n", "", $Entry);
+       $Settings = preg_split("/,/", $Entry);
 
-       if ( $Entry != "" )
+       if ($Entry != "")
         {
          $PicID       = $Settings[0];
          $DBPos       = $Settings[1];
@@ -137,14 +137,14 @@ 
          $GeneratedTS = $Settings[3];
          $Hits        = $Settings[4];
 
-         if ( $Settings[0] != $ID && $GeneratedTS > $TS)
+         if ($Settings[0] != $ID && $GeneratedTS > $TS)
           {
-           $CurrentPos  = ftell($DBTempHandle);
+           $CurrentPos = ftell($DBTempHandle);
            fwrite($IndexTempHandle, $PicID.",".$CurrentPos.",".$PicSize.",".$GeneratedTS.",".$Hits."\r\n");
 
-           fseek($DBHandle,$DBPos);
-           $Picture = fread($DBHandle,$PicSize);
-           fwrite($DBTempHandle,$Picture);
+           fseek($DBHandle, $DBPos);
+           $Picture = fread($DBHandle, $PicSize);
+           fwrite($DBTempHandle, $Picture);
           }
         }
       }
@@ -160,11 +160,11 @@ 
      unlink($Index);
 
      /* Swap the temp & prod DB */
-     rename($DatabaseTemp,$Database);
-     rename($IndexTemp,$Index);
+     rename($DatabaseTemp, $Database);
+     rename($IndexTemp, $Index);
     }
 
-   function isInCache($ID,$Verbose=FALSE,$UpdateHitsCount=FALSE)
+   function isInCache($ID, $Verbose = FALSE, $UpdateHitsCount = FALSE)
     {
      /* Compute the paths */
      $Index = $this->CacheFolder."/".$this->CacheIndex;
@@ -175,11 +175,11 @@ 
       {
        $IndexPos = ftell($Handle);
        $Entry = fgets($Handle, 4096);
-       if ( $Entry != "" )
+       if ($Entry != "")
         {
-         $Settings = preg_split("/,/",$Entry);
+         $Settings = preg_split("/,/", $Entry);
          $PicID    = $Settings[0];
-         if ( $PicID == $ID )
+         if ($PicID == $ID)
           {
            fclose($Handle);
 
@@ -188,19 +188,19 @@ 
            $GeneratedTS = $Settings[3];
            $Hits        = intval($Settings[4]);
 
-           if ( $UpdateHitsCount )
+           if ($UpdateHitsCount)
             {
              $Hits++;
-             if ( strlen($Hits) < 7 ) { $Hits = $Hits.str_repeat(" ",7-strlen($Hits)); }
+             if (strlen($Hits) < 7) { $Hits = $Hits.str_repeat(" ", 7 - strlen($Hits)); }
 
              $Handle = @fopen($Index, "r+");
-             fseek($Handle,$IndexPos);
+             fseek($Handle, $IndexPos);
              fwrite($Handle, $PicID.",".$DBPos.",".$PicSize.",".$GeneratedTS.",".$Hits."\r\n");
              fclose($Handle);
             }
 
            if ($Verbose)
-            { return(array("DBPos"=>$DBPos,"PicSize"=>$PicSize,"GeneratedTS"=>$GeneratedTS,"Hits"=>$Hits)); }
+            { return(array("DBPos"=>$DBPos, "PicSize"=>$PicSize, "GeneratedTS"=>$GeneratedTS, "Hits"=>$Hits)); }
            else
             { return(TRUE); }
           }
@@ -213,10 +213,10 @@ 
     }
 
    /* Automatic output method based on the calling interface */
-   function autoOutput($ID,$Destination="output.png")
+   function autoOutput($ID, $Destination = "output.png")
     {
      if (php_sapi_name() == "cli")
-      $this->saveFromCache($ID,$Destination);
+      $this->saveFromCache($ID, $Destination);
      else
       $this->strokeFromCache($ID);
     }
@@ -227,7 +227,7 @@ 
      $Picture = $this->getFromCache($ID);
 
      /* Do we have a hit? */
-     if ( $Picture == NULL ) { return(FALSE); }
+     if ($Picture == NULL) { return(FALSE); }
 
      header('Content-type: image/png');
      echo $Picture;
@@ -235,17 +235,17 @@ 
      return(TRUE);
     }
 
-   function saveFromCache($ID,$Destination)
+   function saveFromCache($ID, $Destination)
     {
      /* Get the raw picture from the cache */
      $Picture = $this->getFromCache($ID);
 
      /* Do we have a hit? */
-     if ( $Picture == NULL ) { return(FALSE); }
+     if ($Picture == NULL) { return(FALSE); }
 
      /* Flush the picture to a file */
-     $Handle = fopen($Destination,"w");
-     fwrite($Handle,$Picture);
+     $Handle = fopen($Destination, "w");
+     fwrite($Handle, $Picture);
      fclose($Handle);
 
      /* All went fine */
@@ -258,7 +258,7 @@ 
      $Database = $this->CacheFolder."/".$this->CacheDB;
 
      /* Lookup for the picture in the cache */
-     $CacheInfo = $this->isInCache($ID,TRUE,TRUE);
+     $CacheInfo = $this->isInCache($ID, TRUE, TRUE);
 
      /* Not in the cache */
      if (!$CacheInfo) { return(NULL); }
@@ -269,8 +269,8 @@ 
 
      /* Extract the picture from the solid cache file */
      $Handle = @fopen($Database, "r");
-     fseek($Handle,$DBPos);
-     $Picture = fread($Handle,$PicSize);
+     fseek($Handle, $DBPos);
+     $Picture = fread($Handle, $PicSize);
      fclose($Handle);
 
      /* Return back the raw picture data */

drupal/sites/default/boinc/modules/boincstats/includes/pchart/class/pSurface.class.php

Spacing +114 added lines, -114 removed lines

@@ -13,13 +13,13 @@ 
      You can find the whole class documentation on the pChart web site.
  */
 
- define("UNKNOWN"		, 0.123456789);
- define("IGNORED"		, -1);
+ define("UNKNOWN", 0.123456789);
+ define("IGNORED", -1);
 
- define("LABEL_POSITION_LEFT"	, 880001);
- define("LABEL_POSITION_RIGHT"	, 880002);
- define("LABEL_POSITION_TOP"	, 880003);
- define("LABEL_POSITION_BOTTOM"	, 880004);
+ define("LABEL_POSITION_LEFT", 880001);
+ define("LABEL_POSITION_RIGHT", 880002);
+ define("LABEL_POSITION_TOP", 880003);
+ define("LABEL_POSITION_BOTTOM", 880004);
 
  /* pStock class definition */
  class pSurface
@@ -38,159 +38,159 @@ 
     }
 
    /* Define the grid size and initialise the 2D matrix */
-   function setGrid($XSize=10,$YSize=10)
+   function setGrid($XSize = 10, $YSize = 10)
     {
-     for($X=0; $X<=$XSize; $X++) { for($Y=0; $Y<=$YSize; $Y++) { $this->Points[$X][$Y]=UNKNOWN; } } 
+     for ($X = 0; $X <= $XSize; $X++) { for ($Y = 0; $Y <= $YSize; $Y++) { $this->Points[$X][$Y] = UNKNOWN; } } 
 
      $this->GridSizeX = $XSize;
      $this->GridSizeY = $YSize;
     }
 
    /* Add a point on the grid */
-   function addPoint($X,$Y,$Value,$Force=TRUE)
+   function addPoint($X, $Y, $Value, $Force = TRUE)
     {
-     if ( $X < 0 || $X >$this->GridSizeX ) { return(0); }
-     if ( $Y < 0 || $Y >$this->GridSizeY ) { return(0); }
+     if ($X < 0 || $X > $this->GridSizeX) { return(0); }
+     if ($Y < 0 || $Y > $this->GridSizeY) { return(0); }
 
-     if ( $this->Points[$X][$Y] == UNKNOWN || $Force )
+     if ($this->Points[$X][$Y] == UNKNOWN || $Force)
       $this->Points[$X][$Y] = $Value;
-     elseif ( $this->Points[$X][$Y] == UNKNOWN )
+     elseif ($this->Points[$X][$Y] == UNKNOWN)
       $this->Points[$X][$Y] = $Value;
      else
       $this->Points[$X][$Y] = ($this->Points[$X][$Y] + $Value)/2;
     }
 
    /* Write the X labels */
-   function writeXLabels($Format="")
+   function writeXLabels($Format = "")
     {
      $R			= isset($Format["R"]) ? $Format["R"] : $this->pChartObject->FontColorR;
      $G			= isset($Format["G"]) ? $Format["G"] : $this->pChartObject->FontColorG;
      $B			= isset($Format["B"]) ? $Format["B"] : $this->pChartObject->FontColorB;
      $Alpha		= isset($Format["Alpha"]) ? $Format["Alpha"] : $this->pChartObject->FontColorA;
      $Angle		= isset($Format["Angle"]) ? $Format["Angle"] : 0;
-     $Padding		= isset($Format["Padding"]) ? $Format["Padding"] : 5;
-     $Position		= isset($Format["Position"]) ? $Format["Position"] : LABEL_POSITION_TOP;
-     $Labels		= isset($Format["Labels"]) ? $Format["Labels"] : NULL;
-     $CountOffset	= isset($Format["CountOffset"]) ? $Format["CountOffset"] : 0;
+     $Padding = isset($Format["Padding"]) ? $Format["Padding"] : 5;
+     $Position = isset($Format["Position"]) ? $Format["Position"] : LABEL_POSITION_TOP;
+     $Labels = isset($Format["Labels"]) ? $Format["Labels"] : NULL;
+     $CountOffset = isset($Format["CountOffset"]) ? $Format["CountOffset"] : 0;
 
-     if ( $Labels != NULL && !is_array($Labels) ) { $Label = $Labels; $Labels = ""; $Labels[] = $Label; }
+     if ($Labels != NULL && !is_array($Labels)) { $Label = $Labels; $Labels = ""; $Labels[] = $Label; }
 
      $X0    = $this->pChartObject->GraphAreaX1;
-     $XSize = ($this->pChartObject->GraphAreaX2 - $this->pChartObject->GraphAreaX1) / ($this->GridSizeX+1);
+     $XSize = ($this->pChartObject->GraphAreaX2 - $this->pChartObject->GraphAreaX1)/($this->GridSizeX + 1);
 
-     $Settings = array("Angle"=>$Angle,"R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha);
-     if ( $Position == LABEL_POSITION_TOP )
+     $Settings = array("Angle"=>$Angle, "R"=>$R, "G"=>$G, "B"=>$B, "Alpha"=>$Alpha);
+     if ($Position == LABEL_POSITION_TOP)
       {
-       $YPos  = $this->pChartObject->GraphAreaY1 - $Padding;
-       if ($Angle == 0 ) { $Settings["Align"] = TEXT_ALIGN_BOTTOMMIDDLE; }
-       if ($Angle != 0 ) { $Settings["Align"] = TEXT_ALIGN_MIDDLELEFT; }
+       $YPos = $this->pChartObject->GraphAreaY1 - $Padding;
+       if ($Angle == 0) { $Settings["Align"] = TEXT_ALIGN_BOTTOMMIDDLE; }
+       if ($Angle != 0) { $Settings["Align"] = TEXT_ALIGN_MIDDLELEFT; }
       }
-     elseif ( $Position == LABEL_POSITION_BOTTOM )
+     elseif ($Position == LABEL_POSITION_BOTTOM)
       {
-       $YPos  = $this->pChartObject->GraphAreaY2 + $Padding;
-       if ($Angle == 0 ) { $Settings["Align"] = TEXT_ALIGN_TOPMIDDLE; }
-       if ($Angle != 0 ) { $Settings["Align"] = TEXT_ALIGN_MIDDLERIGHT; }
+       $YPos = $this->pChartObject->GraphAreaY2 + $Padding;
+       if ($Angle == 0) { $Settings["Align"] = TEXT_ALIGN_TOPMIDDLE; }
+       if ($Angle != 0) { $Settings["Align"] = TEXT_ALIGN_MIDDLERIGHT; }
       }
      else
       return(-1);
 
-     for($X=0;$X<=$this->GridSizeX;$X++)
+     for ($X = 0; $X <= $this->GridSizeX; $X++)
       {
-       $XPos = floor($X0+$X*$XSize + $XSize/2);
+       $XPos = floor($X0 + $X*$XSize + $XSize/2);
 
-       if( $Labels == NULL || !isset($Labels[$X]) )
-        $Value = $X+$CountOffset;
+       if ($Labels == NULL || !isset($Labels[$X]))
+        $Value = $X + $CountOffset;
        else
         $Value = $Labels[$X];
 
-       $this->pChartObject->drawText($XPos,$YPos,$Value,$Settings);
+       $this->pChartObject->drawText($XPos, $YPos, $Value, $Settings);
       }
     }
 
    /* Write the Y labels */
-   function writeYLabels($Format="")
+   function writeYLabels($Format = "")
     {
      $R			= isset($Format["R"]) ? $Format["R"] : $this->pChartObject->FontColorR;
      $G			= isset($Format["G"]) ? $Format["G"] : $this->pChartObject->FontColorG;
      $B			= isset($Format["B"]) ? $Format["B"] : $this->pChartObject->FontColorB;
      $Alpha		= isset($Format["Alpha"]) ? $Format["Alpha"] : $this->pChartObject->FontColorA;
      $Angle		= isset($Format["Angle"]) ? $Format["Angle"] : 0;
-     $Padding		= isset($Format["Padding"]) ? $Format["Padding"] : 5;
-     $Position		= isset($Format["Position"]) ? $Format["Position"] : LABEL_POSITION_LEFT;
-     $Labels		= isset($Format["Labels"]) ? $Format["Labels"] : NULL;
-     $CountOffset	= isset($Format["CountOffset"]) ? $Format["CountOffset"] : 0;
+     $Padding = isset($Format["Padding"]) ? $Format["Padding"] : 5;
+     $Position = isset($Format["Position"]) ? $Format["Position"] : LABEL_POSITION_LEFT;
+     $Labels = isset($Format["Labels"]) ? $Format["Labels"] : NULL;
+     $CountOffset = isset($Format["CountOffset"]) ? $Format["CountOffset"] : 0;
 
-     if ( $Labels != NULL && !is_array($Labels) ) { $Label = $Labels; $Labels = ""; $Labels[] = $Label; }
+     if ($Labels != NULL && !is_array($Labels)) { $Label = $Labels; $Labels = ""; $Labels[] = $Label; }
 
      $Y0    = $this->pChartObject->GraphAreaY1;
-     $YSize = ($this->pChartObject->GraphAreaY2 - $this->pChartObject->GraphAreaY1) / ($this->GridSizeY+1);
+     $YSize = ($this->pChartObject->GraphAreaY2 - $this->pChartObject->GraphAreaY1)/($this->GridSizeY + 1);
 
-     $Settings = array("Angle"=>$Angle,"R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha);
-     if ( $Position == LABEL_POSITION_LEFT )
+     $Settings = array("Angle"=>$Angle, "R"=>$R, "G"=>$G, "B"=>$B, "Alpha"=>$Alpha);
+     if ($Position == LABEL_POSITION_LEFT)
       { $XPos  = $this->pChartObject->GraphAreaX1 - $Padding; $Settings["Align"] = TEXT_ALIGN_MIDDLERIGHT; }
-     elseif ( $Position == LABEL_POSITION_RIGHT )
+     elseif ($Position == LABEL_POSITION_RIGHT)
       { $XPos  = $this->pChartObject->GraphAreaX2 + $Padding; $Settings["Align"] = TEXT_ALIGN_MIDDLELEFT; }
      else
       return(-1);
 
-     for($Y=0;$Y<=$this->GridSizeY;$Y++)
+     for ($Y = 0; $Y <= $this->GridSizeY; $Y++)
       {
-       $YPos = floor($Y0+$Y*$YSize + $YSize/2);
+       $YPos = floor($Y0 + $Y*$YSize + $YSize/2);
 
-       if( $Labels == NULL || !isset($Labels[$Y]) )
-        $Value = $Y+$CountOffset;
+       if ($Labels == NULL || !isset($Labels[$Y]))
+        $Value = $Y + $CountOffset;
        else
         $Value = $Labels[$Y];
 
-       $this->pChartObject->drawText($XPos,$YPos,$Value,$Settings);
+       $this->pChartObject->drawText($XPos, $YPos, $Value, $Settings);
       }
     }
 
    /* Draw the area arround the specified Threshold */
-   function drawContour($Threshold,$Format="")
+   function drawContour($Threshold, $Format = "")
     {
      $R		= isset($Format["R"]) ? $Format["R"] : 0;
      $G		= isset($Format["G"]) ? $Format["G"] : 0;
      $B		= isset($Format["B"]) ? $Format["B"] : 0;
      $Alpha	= isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
      $Ticks	= isset($Format["Ticks"]) ? $Format["Ticks"] : 3;
-     $Padding	= isset($Format["Padding"]) ? $Format["Padding"] : 0;
+     $Padding = isset($Format["Padding"]) ? $Format["Padding"] : 0;
 
      $X0    = $this->pChartObject->GraphAreaX1;
      $Y0    = $this->pChartObject->GraphAreaY1;
-     $XSize = ($this->pChartObject->GraphAreaX2 - $this->pChartObject->GraphAreaX1) / ($this->GridSizeX+1);
-     $YSize = ($this->pChartObject->GraphAreaY2 - $this->pChartObject->GraphAreaY1) / ($this->GridSizeY+1);
+     $XSize = ($this->pChartObject->GraphAreaX2 - $this->pChartObject->GraphAreaX1)/($this->GridSizeX + 1);
+     $YSize = ($this->pChartObject->GraphAreaY2 - $this->pChartObject->GraphAreaY1)/($this->GridSizeY + 1);
 
-     $Color = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks);
+     $Color = array("R"=>$R, "G"=>$G, "B"=>$B, "Alpha"=>$Alpha, "Ticks"=>$Ticks);
 
-     for($X=0;$X<=$this->GridSizeX;$X++)
+     for ($X = 0; $X <= $this->GridSizeX; $X++)
       {
-       for($Y=0;$Y<=$this->GridSizeY;$Y++)
+       for ($Y = 0; $Y <= $this->GridSizeY; $Y++)
         {
          $Value = $this->Points[$X][$Y];
 
-         if ( $Value != UNKNOWN && $Value != IGNORED && $Value >= $Threshold)
+         if ($Value != UNKNOWN && $Value != IGNORED && $Value >= $Threshold)
           {
-           $X1 = floor($X0+$X*$XSize)+$Padding;
-           $Y1 = floor($Y0+$Y*$YSize)+$Padding;
-           $X2 = floor($X0+$X*$XSize+$XSize);
-           $Y2 = floor($Y0+$Y*$YSize+$YSize);
-
-           if ( $X > 0 && $this->Points[$X-1][$Y] != UNKNOWN && $this->Points[$X-1][$Y] != IGNORED && $this->Points[$X-1][$Y] < $Threshold)
-            $this->pChartObject->drawLine($X1,$Y1,$X1,$Y2,$Color);
-           if ( $Y > 0 && $this->Points[$X][$Y-1] != UNKNOWN && $this->Points[$X][$Y-1] != IGNORED && $this->Points[$X][$Y-1] < $Threshold)
-            $this->pChartObject->drawLine($X1,$Y1,$X2,$Y1,$Color);
-           if ( $X < $this->GridSizeX && $this->Points[$X+1][$Y] != UNKNOWN && $this->Points[$X+1][$Y] != IGNORED && $this->Points[$X+1][$Y] < $Threshold)
-            $this->pChartObject->drawLine($X2,$Y1,$X2,$Y2,$Color);
-           if ( $Y < $this->GridSizeY && $this->Points[$X][$Y+1] != UNKNOWN && $this->Points[$X][$Y+1] != IGNORED && $this->Points[$X][$Y+1] < $Threshold)
-            $this->pChartObject->drawLine($X1,$Y2,$X2,$Y2,$Color);
+           $X1 = floor($X0 + $X*$XSize) + $Padding;
+           $Y1 = floor($Y0 + $Y*$YSize) + $Padding;
+           $X2 = floor($X0 + $X*$XSize + $XSize);
+           $Y2 = floor($Y0 + $Y*$YSize + $YSize);
+
+           if ($X > 0 && $this->Points[$X - 1][$Y] != UNKNOWN && $this->Points[$X - 1][$Y] != IGNORED && $this->Points[$X - 1][$Y] < $Threshold)
+            $this->pChartObject->drawLine($X1, $Y1, $X1, $Y2, $Color);
+           if ($Y > 0 && $this->Points[$X][$Y - 1] != UNKNOWN && $this->Points[$X][$Y - 1] != IGNORED && $this->Points[$X][$Y - 1] < $Threshold)
+            $this->pChartObject->drawLine($X1, $Y1, $X2, $Y1, $Color);
+           if ($X < $this->GridSizeX && $this->Points[$X + 1][$Y] != UNKNOWN && $this->Points[$X + 1][$Y] != IGNORED && $this->Points[$X + 1][$Y] < $Threshold)
+            $this->pChartObject->drawLine($X2, $Y1, $X2, $Y2, $Color);
+           if ($Y < $this->GridSizeY && $this->Points[$X][$Y + 1] != UNKNOWN && $this->Points[$X][$Y + 1] != IGNORED && $this->Points[$X][$Y + 1] < $Threshold)
+            $this->pChartObject->drawLine($X1, $Y2, $X2, $Y2, $Color);
           }
         }
       }
     }
 
    /* Draw the surface chart */
-   function drawSurface($Format="")
+   function drawSurface($Format = "")
     {
      $Palette		= isset($Format["Palette"]) ? $Format["Palette"] : NULL;
      $ShadeR1		= isset($Format["ShadeR1"]) ? $Format["ShadeR1"] : 77;
@@ -201,51 +201,51 @@ 
      $ShadeG2		= isset($Format["ShadeG2"]) ? $Format["ShadeG2"] : 135;
      $ShadeB2		= isset($Format["ShadeB2"]) ? $Format["ShadeB2"] : 61;
      $ShadeA2		= isset($Format["ShadeA2"]) ? $Format["ShadeA2"] : 100;
-     $Border		= isset($Format["Border"]) ? $Format["Border"] : FALSE;
+     $Border = isset($Format["Border"]) ? $Format["Border"] : FALSE;
      $BorderR		= isset($Format["BorderR"]) ? $Format["BorderR"] : 0;
      $BorderG		= isset($Format["BorderG"]) ? $Format["BorderG"] : 0;
      $BorderB		= isset($Format["BorderB"]) ? $Format["BorderB"] : 0;
-     $Surrounding	= isset($Format["Surrounding"]) ? $Format["Surrounding"] : -1;
+     $Surrounding = isset($Format["Surrounding"]) ? $Format["Surrounding"] : -1;
      $Padding		= isset($Format["Padding"]) ? $Format["Padding"] : 1;
 
      $X0    = $this->pChartObject->GraphAreaX1;
      $Y0    = $this->pChartObject->GraphAreaY1;
-     $XSize = ($this->pChartObject->GraphAreaX2 - $this->pChartObject->GraphAreaX1) / ($this->GridSizeX+1);
-     $YSize = ($this->pChartObject->GraphAreaY2 - $this->pChartObject->GraphAreaY1) / ($this->GridSizeY+1);
+     $XSize = ($this->pChartObject->GraphAreaX2 - $this->pChartObject->GraphAreaX1)/($this->GridSizeX + 1);
+     $YSize = ($this->pChartObject->GraphAreaY2 - $this->pChartObject->GraphAreaY1)/($this->GridSizeY + 1);
 
-     for($X=0;$X<=$this->GridSizeX;$X++)
+     for ($X = 0; $X <= $this->GridSizeX; $X++)
       {
-       for($Y=0;$Y<=$this->GridSizeY;$Y++)
+       for ($Y = 0; $Y <= $this->GridSizeY; $Y++)
         {
          $Value = $this->Points[$X][$Y];
 
-         if ( $Value != UNKNOWN && $Value != IGNORED )
+         if ($Value != UNKNOWN && $Value != IGNORED)
           {
-           $X1 = floor($X0+$X*$XSize)+$Padding;
-           $Y1 = floor($Y0+$Y*$YSize)+$Padding;
-           $X2 = floor($X0+$X*$XSize+$XSize);
-           $Y2 = floor($Y0+$Y*$YSize+$YSize);
+           $X1 = floor($X0 + $X*$XSize) + $Padding;
+           $Y1 = floor($Y0 + $Y*$YSize) + $Padding;
+           $X2 = floor($X0 + $X*$XSize + $XSize);
+           $Y2 = floor($Y0 + $Y*$YSize + $YSize);
 
-           if ( $Palette != NULL )
+           if ($Palette != NULL)
             {
-             if ( isset($Palette[$Value]) && isset($Palette[$Value]["R"]) ) { $R = $Palette[$Value]["R"]; } else { $R = 0; }
-             if ( isset($Palette[$Value]) && isset($Palette[$Value]["G"]) ) { $G = $Palette[$Value]["G"]; } else { $G = 0; }
-             if ( isset($Palette[$Value]) && isset($Palette[$Value]["B"]) ) { $B = $Palette[$Value]["B"]; } else { $B = 0; }
-             if ( isset($Palette[$Value]) && isset($Palette[$Value]["Alpha"]) ) { $Alpha = $Palette[$Value]["Alpha"]; } else { $Alpha = 1000; }
+             if (isset($Palette[$Value]) && isset($Palette[$Value]["R"])) { $R = $Palette[$Value]["R"]; } else { $R = 0; }
+             if (isset($Palette[$Value]) && isset($Palette[$Value]["G"])) { $G = $Palette[$Value]["G"]; } else { $G = 0; }
+             if (isset($Palette[$Value]) && isset($Palette[$Value]["B"])) { $B = $Palette[$Value]["B"]; } else { $B = 0; }
+             if (isset($Palette[$Value]) && isset($Palette[$Value]["Alpha"])) { $Alpha = $Palette[$Value]["Alpha"]; } else { $Alpha = 1000; }
             }
            else
             {
-             $R = (($ShadeR2-$ShadeR1)/100)*$Value + $ShadeR1;
-             $G = (($ShadeG2-$ShadeG1)/100)*$Value + $ShadeG1;
-             $B = (($ShadeB2-$ShadeB1)/100)*$Value + $ShadeB1;
-             $Alpha = (($ShadeA2-$ShadeA1)/100)*$Value + $ShadeA1;
+             $R = (($ShadeR2 - $ShadeR1)/100)*$Value + $ShadeR1;
+             $G = (($ShadeG2 - $ShadeG1)/100)*$Value + $ShadeG1;
+             $B = (($ShadeB2 - $ShadeB1)/100)*$Value + $ShadeB1;
+             $Alpha = (($ShadeA2 - $ShadeA1)/100)*$Value + $ShadeA1;
             }
 
-           $Settings = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha);
-           if ( $Border ) { $Settings["BorderR"] = $BorderR; $Settings["BorderG"] = $BorderG; $Settings["BorderB"] = $BorderB; }
-           if ( $Surrounding != -1 ) { $Settings["BorderR"] = $R+$Surrounding; $Settings["BorderG"] = $G+$Surrounding; $Settings["BorderB"] = $B+$Surrounding; }
+           $Settings = array("R"=>$R, "G"=>$G, "B"=>$B, "Alpha"=>$Alpha);
+           if ($Border) { $Settings["BorderR"] = $BorderR; $Settings["BorderG"] = $BorderG; $Settings["BorderB"] = $BorderB; }
+           if ($Surrounding != -1) { $Settings["BorderR"] = $R + $Surrounding; $Settings["BorderG"] = $G + $Surrounding; $Settings["BorderB"] = $B + $Surrounding; }
 
-           $this->pChartObject->drawFilledRectangle($X1,$Y1,$X2-1,$Y2-1,$Settings);
+           $this->pChartObject->drawFilledRectangle($X1, $Y1, $X2 - 1, $Y2 - 1, $Settings);
           }
         }
       }
@@ -255,57 +255,57 @@ 
    function computeMissing()
     {
      $Missing = "";
-     for($X=0;$X<=$this->GridSizeX;$X++)
+     for ($X = 0; $X <= $this->GridSizeX; $X++)
       {
-       for($Y=0;$Y<=$this->GridSizeY;$Y++)
+       for ($Y = 0; $Y <= $this->GridSizeY; $Y++)
         {
-         if ( $this->Points[$X][$Y] == UNKNOWN )
+         if ($this->Points[$X][$Y] == UNKNOWN)
           $Missing[] = $X.",".$Y;
         }
       }
      shuffle($Missing);
      
-     foreach($Missing as $Key => $Pos)
+     foreach ($Missing as $Key => $Pos)
       {
-       $Pos = preg_split("/,/",$Pos);
+       $Pos = preg_split("/,/", $Pos);
        $X   = $Pos[0];
        $Y   = $Pos[1];
 
-       if ( $this->Points[$X][$Y] == UNKNOWN )
+       if ($this->Points[$X][$Y] == UNKNOWN)
         {
-         $NearestNeighbor = $this->getNearestNeighbor($X,$Y);
+         $NearestNeighbor = $this->getNearestNeighbor($X, $Y);
 
          $Value = 0; $Points = 0;
-         for($Xi=$X-$NearestNeighbor;$Xi<=$X+$NearestNeighbor;$Xi++)
+         for ($Xi = $X - $NearestNeighbor; $Xi <= $X + $NearestNeighbor; $Xi++)
           {
-           for($Yi=$Y-$NearestNeighbor;$Yi<=$Y+$NearestNeighbor;$Yi++)
+           for ($Yi = $Y - $NearestNeighbor; $Yi <= $Y + $NearestNeighbor; $Yi++)
             {
-             if ($Xi >=0 && $Yi >= 0 && $Xi <= $this->GridSizeX && $Yi <= $this->GridSizeY && $this->Points[$Xi][$Yi] != UNKNOWN && $this->Points[$Xi][$Yi] != IGNORED)
+             if ($Xi >= 0 && $Yi >= 0 && $Xi <= $this->GridSizeX && $Yi <= $this->GridSizeY && $this->Points[$Xi][$Yi] != UNKNOWN && $this->Points[$Xi][$Yi] != IGNORED)
               {
                $Value = $Value + $this->Points[$Xi][$Yi]; $Points++;
               }
             }
           }
 
-         if ( $Points != 0 ) { $this->Points[$X][$Y] = $Value / $Points; }
+         if ($Points != 0) { $this->Points[$X][$Y] = $Value/$Points; }
         }
       }
     }
 
    /* Return the nearest Neighbor distance of a point */
-   function getNearestNeighbor($Xp,$Yp)
+   function getNearestNeighbor($Xp, $Yp)
     {
      $Nearest = UNKNOWN;
-     for($X=0;$X<=$this->GridSizeX;$X++)
+     for ($X = 0; $X <= $this->GridSizeX; $X++)
       {
-       for($Y=0;$Y<=$this->GridSizeY;$Y++)
+       for ($Y = 0; $Y <= $this->GridSizeY; $Y++)
         {
-         if ( $this->Points[$X][$Y] != UNKNOWN && $this->Points[$X][$Y] != IGNORED )
+         if ($this->Points[$X][$Y] != UNKNOWN && $this->Points[$X][$Y] != IGNORED)
           {
-           $DistanceX = max($Xp,$X)-min($Xp,$X);
-           $DistanceY = max($Yp,$Y)-min($Yp,$Y);
-           $Distance  = max($DistanceX,$DistanceY);
-           if ( $Distance < $Nearest || $Nearest == UNKNOWN ) { $Nearest = $Distance; }
+           $DistanceX = max($Xp, $X) - min($Xp, $X);
+           $DistanceY = max($Yp, $Y) - min($Yp, $Y);
+           $Distance  = max($DistanceX, $DistanceY);
+           if ($Distance < $Nearest || $Nearest == UNKNOWN) { $Nearest = $Distance; }
           }
         }
       }

drupal/sites/default/boinc/modules/boincteam/boincteam.views.inc

Spacing +1 added lines, -1 removed lines

@@ -444,7 +444,7 @@
 function boincteam_views_handlers() {
   return array(
     'info' => array(
-      'path' => drupal_get_path('module', 'boincteam') . '/views',
+      'path' => drupal_get_path('module', 'boincteam').'/views',
     ),
     'handlers' => array(
       'views_handler_argument_boincteam_id' => array(