BOINC / boinc

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/includes/boincteam.helpers.inc

Spacing +3 added lines, -3 removed lines

@@ -87,15 +87,15 @@
       'teaser' => $teaser,
       'uid' => boincuser_lookup_uid($boincteam->userid),
       'path' => null,
-      'status' => 1,  // published or not - always publish
+      'status' => 1, // published or not - always publish
       'promote' => 0,
       'created' => $boincteam->create_time,
-      'comment' => 0,  // comments disabled
+      'comment' => 0, // comments disabled
       'moderate' => 0,
       'sticky' => 0,
       'format' => $input_format
     );
-    $node = (object) $node; // node_save requires an object form
+    $node = (object)$node; // node_save requires an object form
   }
   
   $node->taxonomy[] = taxonomy_get_term($team_type_tid);

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(

drupal/sites/default/boinc/modules/boincwork/boincwork.admin.inc

Spacing +30 added lines, -30 removed lines

@@ -65,15 +65,15 @@ 
   */
 function boincwork_admin_prefs_upload_form_validate($form, &$form_state) {
   
-  $xsd = './' . drupal_get_path('module', 'boincwork') . '/includes/projectprefs.xsd';
+  $xsd = './'.drupal_get_path('module', 'boincwork').'/includes/projectprefs.xsd';
   libxml_use_internal_errors(true);
   $xml = new DomDocument();
   $xml->loadXML($form_state['values']['prefs_xml'], LIBXML_NOBLANKS);
   if (!$xml->schemaValidate($xsd)) {
     $errors = libxml_get_errors();
     $lines = explode("\r", $form_state['values']['prefs_xml']);
-    drupal_set_message("{$errors[0]->message} at line {$errors[0]->line}" .
-      ': <br/>' . htmlentities($lines[$errors[0]->line - 1]), 'error');
+    drupal_set_message("{$errors[0]->message} at line {$errors[0]->line}".
+      ': <br/>'.htmlentities($lines[$errors[0]->line - 1]), 'error');
     form_set_error('upload', t('XML file failed validation'));
   }
 }
@@ -101,7 +101,7 @@ 
       "{$path}/minimum" => t('Minimum')
     );
     variable_set('jump_use_js_presets-Array', 1);
-    drupal_add_js(drupal_get_path('module', 'jump') . '/jump.js');
+    drupal_add_js(drupal_get_path('module', 'jump').'/jump.js');
     $output .= '<div class="simple-form-controls"><div class="form-item venue">';
     $output .= '<label>Preset:</label>';
     $output .= jump_quickly($preset_options, 'presets');
@@ -150,7 +150,7 @@ 
     '#type' => 'submit',
     '#value' => t('Save configuration')
   );
-  $form['saveuseconfigxml'] = array (
+  $form['saveuseconfigxml'] = array(
       '#type' => 'submit',
       '#value' => t('Save configuration with disk usage settings from config.xml'),
       '#validate' => array('boincwork_admin_prefs_preset_saveuseconfigxml'),
@@ -175,33 +175,33 @@ 
   // Verify all non-boolean user input values and notify form API of failures
   
   // Processing preferences
-  if (!verify_numeric($values['processor']['idle_time_to_run'], 1, 9999)) form_set_error('idle_time_to_run', t('Invalid setting for') . " \"{$form['processor']['idle_time_to_run']['#title']} [x] {$form['processor']['idle_time_to_run']['#field_suffix']}\"");
-  if (!verify_numeric($values['processor']['suspend_if_no_recent_input'], 0, 9999)) form_set_error('suspend_if_no_recent_input', t('Invalid setting for') . " \"{$form['processor']['suspend_if_no_recent_input']['#title']} [x] {$form['processor']['suspend_if_no_recent_input']['#field_suffix']}\"");
-  if (!verify_numeric($values['processor']['suspend_cpu_usage'], 0, 100)) form_set_error('suspend_cpu_usage', t('Invalid setting for') . " \"{$form['processor']['suspend_cpu_usage']['#title']} [x] {$form['processor']['suspend_cpu_usage']['#field_suffix']}\"");
-  if (!verify_numeric($values['processor']['start_hour'], 0, 23)) form_set_error('start_hour', t('Invalid setting for') . " \"{$form['processor']['start_hour']['#title']} [x] {$form['processor']['start_hour']['#field_suffix']}\"");
-  if (!verify_numeric($values['processor']['end_hour'], 0, 23)) form_set_error('end_hour', t('Invalid setting for') . " \"{$form['processor']['end_hour']['#title']} [x] {$form['processor']['end_hour']['#field_suffix']}\"");
-  if (!verify_numeric($values['processor']['cpu_scheduling_period_minutes'], 1, 9999)) form_set_error('cpu_scheduling_period_minutes', t('Invalid setting for') . " \"{$form['processor']['cpu_scheduling_period_minutes']['#title']} [x] {$form['processor']['cpu_scheduling_period_minutes']['#field_suffix']}\"");
-  if (!verify_numeric($values['processor']['max_ncpus_pct'], 0, 100)) form_set_error('max_ncpus_pct', t('Invalid setting for') . " \"{$form['processor']['max_ncpus_pct']['#title']} [x] {$form['processor']['max_ncpus_pct']['#field_suffix']}\"");
-  if (!verify_numeric($values['processor']['cpu_usage_limit'], 0, 100)) form_set_error('cpu_usage_limit', t('Invalid setting for') . " \"{$form['processor']['cpu_usage_limit']['#title']} [x] {$form['processor']['cpu_usage_limit']['#field_suffix']}\"");
+  if (!verify_numeric($values['processor']['idle_time_to_run'], 1, 9999)) form_set_error('idle_time_to_run', t('Invalid setting for')." \"{$form['processor']['idle_time_to_run']['#title']} [x] {$form['processor']['idle_time_to_run']['#field_suffix']}\"");
+  if (!verify_numeric($values['processor']['suspend_if_no_recent_input'], 0, 9999)) form_set_error('suspend_if_no_recent_input', t('Invalid setting for')." \"{$form['processor']['suspend_if_no_recent_input']['#title']} [x] {$form['processor']['suspend_if_no_recent_input']['#field_suffix']}\"");
+  if (!verify_numeric($values['processor']['suspend_cpu_usage'], 0, 100)) form_set_error('suspend_cpu_usage', t('Invalid setting for')." \"{$form['processor']['suspend_cpu_usage']['#title']} [x] {$form['processor']['suspend_cpu_usage']['#field_suffix']}\"");
+  if (!verify_numeric($values['processor']['start_hour'], 0, 23)) form_set_error('start_hour', t('Invalid setting for')." \"{$form['processor']['start_hour']['#title']} [x] {$form['processor']['start_hour']['#field_suffix']}\"");
+  if (!verify_numeric($values['processor']['end_hour'], 0, 23)) form_set_error('end_hour', t('Invalid setting for')." \"{$form['processor']['end_hour']['#title']} [x] {$form['processor']['end_hour']['#field_suffix']}\"");
+  if (!verify_numeric($values['processor']['cpu_scheduling_period_minutes'], 1, 9999)) form_set_error('cpu_scheduling_period_minutes', t('Invalid setting for')." \"{$form['processor']['cpu_scheduling_period_minutes']['#title']} [x] {$form['processor']['cpu_scheduling_period_minutes']['#field_suffix']}\"");
+  if (!verify_numeric($values['processor']['max_ncpus_pct'], 0, 100)) form_set_error('max_ncpus_pct', t('Invalid setting for')." \"{$form['processor']['max_ncpus_pct']['#title']} [x] {$form['processor']['max_ncpus_pct']['#field_suffix']}\"");
+  if (!verify_numeric($values['processor']['cpu_usage_limit'], 0, 100)) form_set_error('cpu_usage_limit', t('Invalid setting for')." \"{$form['processor']['cpu_usage_limit']['#title']} [x] {$form['processor']['cpu_usage_limit']['#field_suffix']}\"");
 
   // Storage preferences
-  if (!verify_numeric($values['storage']['disk_max_used_gb'], 0, 9999999)) form_set_error('disk_max_used_gb', t('Invalid setting for') . " \"{$form['storage']['disk_max_used_gb']['#title']} [x] {$form['storage']['disk_max_used_gb']['#field_suffix']}\"");
-  if (!verify_numeric($values['storage']['disk_min_free_gb'], 0.001, 9999999)) form_set_error('disk_min_free_gb', t('Invalid setting for') . " \"{$form['storage']['disk_min_free_gb']['#title']} [x] {$form['storage']['disk_min_free_gb']['#field_suffix']}\"");
-  if (!verify_numeric($values['storage']['disk_max_used_pct'], 0, 100)) form_set_error('disk_max_used_pct', t('Invalid setting for') . " \"{$form['storage']['disk_max_used_pct']['#title']} [x] {$form['storage']['disk_max_used_pct']['#field_suffix']}\"");
-  if (!verify_numeric($values['storage']['disk_interval'], 0, 9999999)) form_set_error('disk_interval', t('Invalid setting for') . " \"{$form['storage']['disk_interval']['#title']} [x] {$form['storage']['disk_interval']['#field_suffix']}\"");
-  if (!verify_numeric($values['storage']['vm_max_used_pct'], 0, 100)) form_set_error('vm_max_used_pct', t('Invalid setting for') . " \"{$form['storage']['vm_max_used_pct']['#title']} [x] {$form['storage']['vm_max_used_pct']['#field_suffix']}\"");
-  if (!verify_numeric($values['storage']['ram_max_used_busy_pct'], 0, 100)) form_set_error('ram_max_used_busy_pct', t('Invalid setting for') . " \"{$form['storage']['ram_max_used_busy_pct']['#title']} [x] {$form['storage']['ram_max_used_busy_pct']['#field_suffix']}\"");
-  if (!verify_numeric($values['storage']['ram_max_used_idle_pct'], 0, 100)) form_set_error('ram_max_used_idle_pct', t('Invalid setting for') . " \"{$form['storage']['ram_max_used_idle_pct']['#title']} [x] {$form['storage']['ram_max_used_idle_pct']['#field_suffix']}\"");
+  if (!verify_numeric($values['storage']['disk_max_used_gb'], 0, 9999999)) form_set_error('disk_max_used_gb', t('Invalid setting for')." \"{$form['storage']['disk_max_used_gb']['#title']} [x] {$form['storage']['disk_max_used_gb']['#field_suffix']}\"");
+  if (!verify_numeric($values['storage']['disk_min_free_gb'], 0.001, 9999999)) form_set_error('disk_min_free_gb', t('Invalid setting for')." \"{$form['storage']['disk_min_free_gb']['#title']} [x] {$form['storage']['disk_min_free_gb']['#field_suffix']}\"");
+  if (!verify_numeric($values['storage']['disk_max_used_pct'], 0, 100)) form_set_error('disk_max_used_pct', t('Invalid setting for')." \"{$form['storage']['disk_max_used_pct']['#title']} [x] {$form['storage']['disk_max_used_pct']['#field_suffix']}\"");
+  if (!verify_numeric($values['storage']['disk_interval'], 0, 9999999)) form_set_error('disk_interval', t('Invalid setting for')." \"{$form['storage']['disk_interval']['#title']} [x] {$form['storage']['disk_interval']['#field_suffix']}\"");
+  if (!verify_numeric($values['storage']['vm_max_used_pct'], 0, 100)) form_set_error('vm_max_used_pct', t('Invalid setting for')." \"{$form['storage']['vm_max_used_pct']['#title']} [x] {$form['storage']['vm_max_used_pct']['#field_suffix']}\"");
+  if (!verify_numeric($values['storage']['ram_max_used_busy_pct'], 0, 100)) form_set_error('ram_max_used_busy_pct', t('Invalid setting for')." \"{$form['storage']['ram_max_used_busy_pct']['#title']} [x] {$form['storage']['ram_max_used_busy_pct']['#field_suffix']}\"");
+  if (!verify_numeric($values['storage']['ram_max_used_idle_pct'], 0, 100)) form_set_error('ram_max_used_idle_pct', t('Invalid setting for')." \"{$form['storage']['ram_max_used_idle_pct']['#title']} [x] {$form['storage']['ram_max_used_idle_pct']['#field_suffix']}\"");
 
   // Network preferences
-  if (!verify_numeric($values['network']['work_buf_min_days'], 0, 10)) form_set_error('work_buf_min_days', t('Invalid setting for') . " \"{$form['network']['work_buf_min_days']['#title']} [x] {$form['network']['work_buf_min_days']['#field_suffix']}\"");
-  if (!verify_numeric($values['network']['work_buf_additional_days'], 0, 10)) form_set_error('work_buf_additional_days', t('Invalid setting for') . " \"{$form['network']['work_buf_additional_days']['#title']} [x] {$form['network']['work_buf_additional_days']['#field_suffix']}\"");
-  if (!verify_numeric($values['network']['max_bytes_sec_down'], 0, 9999.999)) form_set_error('max_bytes_sec_down', t('Invalid setting for') . " \"{$form['network']['max_bytes_sec_down']['#title']} [x] {$form['network']['max_bytes_sec_down']['#field_suffix']}\"");
-  if (!verify_numeric($values['network']['max_bytes_sec_up'], 0, 9999.999)) form_set_error('max_bytes_sec_up', t('Invalid setting for') . " \"{$form['network']['max_bytes_sec_up']['#title']} [x] {$form['network']['max_bytes_sec_up']['#field_suffix']}\"");
-  if (!verify_numeric($values['network']['net_start_hour'], 0, 23)) form_set_error('net_start_hour', t('Invalid setting for') . " \"{$form['network']['net_start_hour']['#title']} [x] {$form['network']['net_start_hour']['#field_suffix']}\"");
-  if (!verify_numeric($values['network']['net_end_hour'], 0, 23)) form_set_error('net_end_hour', t('Invalid setting for') . " \"{$form['network']['net_end_hour']['#title']} [x] {$form['network']['net_end_hour']['#field_suffix']}\"");
-  if (!verify_numeric($values['network']['daily_xfer_limit_mb'], 0, 9999999)) form_set_error('daily_xfer_limit_mb', t('Invalid setting for') . " \"{$form['network']['daily_xfer_limit_mb']['#title']} [x] {$form['network']['daily_xfer_limit_mb']['#field_suffix']}\"");
-  if (!verify_numeric($values['network']['daily_xfer_period_days'], 0, 9999999)) form_set_error('daily_xfer_period_days', t('Invalid setting for') . " \"{$form['network']['daily_xfer_limit_mb']['#title']} [x] {$form['network']['daily_xfer_limit_mb']['#field_suffix']}\"");
+  if (!verify_numeric($values['network']['work_buf_min_days'], 0, 10)) form_set_error('work_buf_min_days', t('Invalid setting for')." \"{$form['network']['work_buf_min_days']['#title']} [x] {$form['network']['work_buf_min_days']['#field_suffix']}\"");
+  if (!verify_numeric($values['network']['work_buf_additional_days'], 0, 10)) form_set_error('work_buf_additional_days', t('Invalid setting for')." \"{$form['network']['work_buf_additional_days']['#title']} [x] {$form['network']['work_buf_additional_days']['#field_suffix']}\"");
+  if (!verify_numeric($values['network']['max_bytes_sec_down'], 0, 9999.999)) form_set_error('max_bytes_sec_down', t('Invalid setting for')." \"{$form['network']['max_bytes_sec_down']['#title']} [x] {$form['network']['max_bytes_sec_down']['#field_suffix']}\"");
+  if (!verify_numeric($values['network']['max_bytes_sec_up'], 0, 9999.999)) form_set_error('max_bytes_sec_up', t('Invalid setting for')." \"{$form['network']['max_bytes_sec_up']['#title']} [x] {$form['network']['max_bytes_sec_up']['#field_suffix']}\"");
+  if (!verify_numeric($values['network']['net_start_hour'], 0, 23)) form_set_error('net_start_hour', t('Invalid setting for')." \"{$form['network']['net_start_hour']['#title']} [x] {$form['network']['net_start_hour']['#field_suffix']}\"");
+  if (!verify_numeric($values['network']['net_end_hour'], 0, 23)) form_set_error('net_end_hour', t('Invalid setting for')." \"{$form['network']['net_end_hour']['#title']} [x] {$form['network']['net_end_hour']['#field_suffix']}\"");
+  if (!verify_numeric($values['network']['daily_xfer_limit_mb'], 0, 9999999)) form_set_error('daily_xfer_limit_mb', t('Invalid setting for')." \"{$form['network']['daily_xfer_limit_mb']['#title']} [x] {$form['network']['daily_xfer_limit_mb']['#field_suffix']}\"");
+  if (!verify_numeric($values['network']['daily_xfer_period_days'], 0, 9999999)) form_set_error('daily_xfer_period_days', t('Invalid setting for')." \"{$form['network']['daily_xfer_limit_mb']['#title']} [x] {$form['network']['daily_xfer_limit_mb']['#field_suffix']}\"");
 }
 
 /**
@@ -217,7 +217,7 @@ 
   // Processing preferences
   $prefs['run_on_batteries'] = ($values['processor']['run_on_batteries']) ? 0 : 1;
   $prefs['run_if_user_active'] = ($values['processor']['run_if_user_active']) ? 0 : 1;
-  $prefs['run_gpu_if_user_active'] = ($values['processor']['run_gpu_if_user_active']) ? 0: 1;
+  $prefs['run_gpu_if_user_active'] = ($values['processor']['run_gpu_if_user_active']) ? 0 : 1;
   $prefs['idle_time_to_run'] = $values['processor']['idle_time_to_run'];
   $prefs['suspend_if_no_recent_input'] = $values['processor']['suspend_if_no_recent_input'];
   $prefs['suspend_cpu_usage'] = $values['processor']['suspend_cpu_usage'];
@@ -267,7 +267,7 @@ 
   
   // Get the full configuration
   $all_presets = boincwork_get_preset_prefs();
-  $all_presets = (array) $all_presets['general_preferences'];
+  $all_presets = (array)$all_presets['general_preferences'];
   
   // Check for sane config
   if (isset($all_presets['preset'])) {

drupal/sites/default/boinc/modules/boincwork/views/views_handler_field_boincwork_host_app_et_avg.inc

Spacing +2 added lines, -2 removed lines

@@ -13,8 +13,8 @@
   function render($values) {
     $gflops = 0;
     if ($values->host_app_version_et_avg) {
-      $gflops = 1e-9 / $values->host_app_version_et_avg;
+      $gflops = 1e-9/$values->host_app_version_et_avg;
     }
-    return round($gflops, 2) . ' GFLOPS';
+    return round($gflops, 2).' GFLOPS';
   }
 }

drupal/sites/default/boinc/modules/boincwork/views/views_handler_field_boincwork_host_app_turnaround_avg.inc

Spacing +2 added lines, -2 removed lines

@@ -11,7 +11,7 @@
   }
 
   function render($values) {
-    $time_in_days = $values->host_app_version_turnaround_avg / (24*60*60);
-    return round($time_in_days, 2) . ' ' . t('days');
+    $time_in_days = $values->host_app_version_turnaround_avg/(24*60*60);
+    return round($time_in_days, 2).' '.t('days');
   }
 }