BOINC / boinc

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

Braces +636 added lines, -1325 removed lines

@@ -100,11 +100,9 @@ 
  define("AUTO"		, 690000);
  define("OUT_OF_SIGHT"	, -10000000000000);
 
- class pDraw
-  {
+ class pDraw {
    /* Returns the number of drawable series */
-   function countDrawableSeries()
-    {
+   function countDrawableSeries() {
      $Results = 0;
      $Data = $this->DataSet->getData();
 
@@ -115,8 +113,7 @@ 
     }
 
    /* Fix box coordinates */
-   function fixBoxCoordinates($Xa,$Ya,$Xb,$Yb)
-    {
+   function fixBoxCoordinates($Xa,$Ya,$Xb,$Yb) {
      $X1 = min($Xa,$Xb); $Y1 = min($Ya,$Yb);
      $X2 = max($Xa,$Xb); $Y2 = max($Ya,$Yb);
 
@@ -124,8 +121,7 @@ 
     }
 
    /* Draw a polygon */
-   function drawPolygon($Points,$Format="")
-    {
+   function drawPolygon($Points,$Format="") {
      $R			= isset($Format["R"]) ? $Format["R"] : 0;
      $G			= isset($Format["G"]) ? $Format["G"] : 0;
      $B			= isset($Format["B"]) ? $Format["B"] : 0;
@@ -149,10 +145,8 @@ 
      if ( $SkipY != OUT_OF_SIGHT ) { $SkipY = floor($SkipY); }
 
      $RestoreShadow = $this->Shadow;
-     if ( !$NoFill )
-      {
-       if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 )
-        {
+     if ( !$NoFill ) {
+       if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 ) {
          $this->Shadow = FALSE;
          for($i=0;$i<=count($Points)-1;$i=$i+2)
           { $Shadow[] = $Points[$i] + $this->ShadowX; $Shadow[] = $Points[$i+1] + $this->ShadowY; }
@@ -165,8 +159,7 @@ 
         { ImageFilledPolygon($this->Picture,$Points,count($Points)/2,$FillColor); }
       }
 
-     if ( !$NoBorder )
-      {
+     if ( !$NoBorder ) {
        $Points = $Backup;
 
        if ( $NoFill )
@@ -174,15 +167,11 @@ 
        else
         $BorderSettings = array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha);
 
-       for($i=0;$i<=count($Points)-1;$i=$i+2)
-        {
-         if ( isset($Points[$i+2]) )
-          {
+       for($i=0;$i<=count($Points)-1;$i=$i+2) {
+         if ( isset($Points[$i+2]) ) {
            if ( !($Points[$i] == $Points[$i+2] && $Points[$i] == $SkipX ) && !($Points[$i+1] == $Points[$i+3] && $Points[$i+1] == $SkipY ) )
             $this->drawLine($Points[$i],$Points[$i+1],$Points[$i+2],$Points[$i+3],$BorderSettings);
-          }
-         else
-          {
+          } else {
            if ( !($Points[$i] == $Points[0] && $Points[$i] == $SkipX ) && !($Points[$i+1] == $Points[1] && $Points[$i+1] == $SkipY ) )
             $this->drawLine($Points[$i],$Points[$i+1],$Points[0],$Points[1],$BorderSettings);
           }
@@ -193,8 +182,7 @@ 
     }
 
    /* Apply AALias correction to the rounded box boundaries */
-   function offsetCorrection($Value,$Mode)
-    {
+   function offsetCorrection($Value,$Mode) {
      $Value = round($Value,1);
 
      if ( $Value == 0 && $Mode == 1 ) { return(.9); }
@@ -214,8 +202,7 @@ 
     }
 
    /* Draw a rectangle with rounded corners */
-   function drawRoundedRectangle($X1,$Y1,$X2,$Y2,$Radius,$Format="")
-    {
+   function drawRoundedRectangle($X1,$Y1,$X2,$Y2,$Radius,$Format="") {
      $R	    = isset($Format["R"]) ? $Format["R"] : 0;
      $G	    = isset($Format["G"]) ? $Format["G"] : 0;
      $B	    = isset($Format["B"]) ? $Format["B"] : 0;
@@ -230,15 +217,12 @@ 
 
      if ( $Radius <= 0 ) { $this->drawRectangle($X1,$Y1,$X2,$Y2,$Color); return(0); }
 
-     if ( $this->Antialias )
-      {
+     if ( $this->Antialias ) {
        $this->drawLine($X1+$Radius,$Y1,$X2-$Radius,$Y1,$Color);
        $this->drawLine($X2,$Y1+$Radius,$X2,$Y2-$Radius,$Color);
        $this->drawLine($X2-$Radius,$Y2,$X1+$Radius,$Y2,$Color);
        $this->drawLine($X1,$Y1+$Radius,$X1,$Y2-$Radius,$Color);
-      }
-     else
-      {
+      } else {
        $Color = $this->allocateColor($this->Picture,$R,$G,$B,$Alpha);
        imageline($this->Picture,$X1+$Radius,$Y1,$X2-$Radius,$Y1,$Color);
        imageline($this->Picture,$X2,$Y1+$Radius,$X2,$Y2-$Radius,$Color);
@@ -247,8 +231,7 @@ 
       }
 
      $Step = 360 / (2 * PI * $Radius);
-     for($i=0;$i<=90;$i=$i+$Step)
-      {
+     for($i=0;$i<=90;$i=$i+$Step) {
        $X = cos(($i+180)*PI/180) * $Radius + $X1 + $Radius;
        $Y = sin(($i+180)*PI/180) * $Radius + $Y1 + $Radius;
        $this->drawAntialiasPixel($X,$Y,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
@@ -268,8 +251,7 @@ 
     }
 
    /* Draw a rectangle with rounded corners */
-   function drawRoundedFilledRectangle($X1,$Y1,$X2,$Y2,$Radius,$Format="")
-    {
+   function drawRoundedFilledRectangle($X1,$Y1,$X2,$Y2,$Radius,$Format="") {
      $R			= isset($Format["R"]) ? $Format["R"] : 0;
      $G			= isset($Format["G"]) ? $Format["G"] : 0;
      $B			= isset($Format["B"]) ? $Format["B"] : 0;
@@ -291,8 +273,7 @@ 
      if ( $Y2 - $Y1 < $Radius*2 ) { $Radius = floor((($Y2-$Y1))/4); }
 
      $RestoreShadow = $this->Shadow;
-     if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 )
-      {
+     if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 ) {
        $this->Shadow = FALSE;
        $this->drawRoundedFilledRectangle($X1+$this->ShadowX,$Y1+$this->ShadowY,$X2+$this->ShadowX,$Y2+$this->ShadowY,$Radius,array("R"=>$this->ShadowR,"G"=>$this->ShadowG,"B"=>$this->ShadowB,"Alpha"=>$this->Shadowa));
       }
@@ -306,8 +287,7 @@ 
 
      $Step = 360 / (2 * PI * $Radius);
      $Positions = ""; $Radius--; $MinY = ""; $MaxY = "";
-     for($i=0;$i<=90;$i=$i+$Step)
-      {
+     for($i=0;$i<=90;$i=$i+$Step) {
        $Xp1 = cos(($i+180)*PI/180) * $Radius + $X1 + $Radius;
        $Xp2 = cos(((90-$i)+270)*PI/180) * $Radius + $X2 - $Radius;
        $Yp  = floor(sin(($i+180)*PI/180) * $Radius + $YTop);
@@ -318,8 +298,7 @@ 
        $Xp1++;
 
        if ( !isset($Positions[$Yp]) )
-        { $Positions[$Yp]["X1"] = $Xp1; $Positions[$Yp]["X2"] = $Xp2; }
-       else
+        { $Positions[$Yp]["X1"] = $Xp1; $Positions[$Yp]["X2"] = $Xp2; } else
         { $Positions[$Yp]["X1"] = ($Positions[$Yp]["X1"]+$Xp1)/2; $Positions[$Yp]["X2"] = ($Positions[$Yp]["X2"]+$Xp2)/2; }
 
        $Xp1 = cos(($i+90)*PI/180) * $Radius + $X1 + $Radius;
@@ -332,14 +311,12 @@ 
        $Xp1++;
 
        if ( !isset($Positions[$Yp]) )
-        { $Positions[$Yp]["X1"] = $Xp1; $Positions[$Yp]["X2"] = $Xp2; }
-       else
+        { $Positions[$Yp]["X1"] = $Xp1; $Positions[$Yp]["X2"] = $Xp2; } else
         { $Positions[$Yp]["X1"] = ($Positions[$Yp]["X1"]+$Xp1)/2; $Positions[$Yp]["X2"] = ($Positions[$Yp]["X2"]+$Xp2)/2; }
       }
 
      $ManualColor  = $this->allocateColor($this->Picture,$R,$G,$B,$Alpha);
-     foreach($Positions as $Yp => $Bounds)
-      {
+     foreach($Positions as $Yp => $Bounds) {
        $X1 = $Bounds["X1"]; $X1Dec = $this->getFirstDecimal($X1); if ( $X1Dec != 0 ) { $X1 = floor($X1)+1; }
        $X2 = $Bounds["X2"]; $X2Dec = $this->getFirstDecimal($X2); if ( $X2Dec != 0 ) { $X2 = floor($X2)-1; }
        imageline($this->Picture,$X1,$Yp,$X2,$Yp,$ManualColor);
@@ -353,8 +330,7 @@ 
     }
 
    /* Draw a rectangle with rounded corners */
-   function drawRoundedFilledRectangle_deprecated($X1,$Y1,$X2,$Y2,$Radius,$Format="")
-    {
+   function drawRoundedFilledRectangle_deprecated($X1,$Y1,$X2,$Y2,$Radius,$Format="") {
      $R			= isset($Format["R"]) ? $Format["R"] : 0;
      $G			= isset($Format["G"]) ? $Format["G"] : 0;
      $B			= isset($Format["B"]) ? $Format["B"] : 0;
@@ -373,8 +349,7 @@ 
      if ( $Y2 - $Y1 < $Radius ) { $Radius = floor((($Y2-$Y1)+2)/2); }
 
      $RestoreShadow = $this->Shadow;
-     if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 )
-      {
+     if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 ) {
        $this->Shadow = FALSE;
        $this->drawRoundedFilledRectangle($X1+$this->ShadowX,$Y1+$this->ShadowY,$X2+$this->ShadowX,$Y2+$this->ShadowY,$Radius,array("R"=>$this->ShadowR,"G"=>$this->ShadowG,"B"=>$this->ShadowB,"Alpha"=>$this->Shadowa));
       }
@@ -397,8 +372,7 @@ 
      if ( $Alpha < 100 )  { $Drawn[$YTop] = FALSE; }
      if ( $Alpha < 100 )  { $Drawn[$YBottom] = TRUE; }
      
-     for($i=0;$i<=90;$i=$i+$Step)
-      {
+     for($i=0;$i<=90;$i=$i+$Step) {
        $Xp1 = cos(($i+180)*PI/180) * $Radius + $X1 + $Radius;
        $Xp2 = cos(((90-$i)+270)*PI/180) * $Radius + $X2 - $Radius;
        $Yp  = sin(($i+180)*PI/180) * $Radius + $YTop;
@@ -432,8 +406,7 @@ 
     }
 
    /* Draw a rectangle */
-   function drawRectangle($X1,$Y1,$X2,$Y2,$Format="")
-    {
+   function drawRectangle($X1,$Y1,$X2,$Y2,$Format="") {
      $R		= isset($Format["R"]) ? $Format["R"] : 0;
      $G		= isset($Format["G"]) ? $Format["G"] : 0;
      $B		= isset($Format["B"]) ? $Format["B"] : 0;
@@ -444,33 +417,26 @@ 
      if ($X1 > $X2) { list($X1, $X2) = array($X2, $X1); }
      if ($Y1 > $Y2) { list($Y1, $Y2) = array($Y2, $Y1); }
 
-     if ( $this->Antialias )
-      {
-       if ( $NoAngle )
-        {
+     if ( $this->Antialias ) {
+       if ( $NoAngle ) {
          $this->drawLine($X1+1,$Y1,$X2-1,$Y1,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
          $this->drawLine($X2,$Y1+1,$X2,$Y2-1,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
          $this->drawLine($X2-1,$Y2,$X1+1,$Y2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
          $this->drawLine($X1,$Y1+1,$X1,$Y2-1,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
-        }
-       else
-        {
+        } else {
          $this->drawLine($X1+1,$Y1,$X2-1,$Y1,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
          $this->drawLine($X2,$Y1,$X2,$Y2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
          $this->drawLine($X2-1,$Y2,$X1+1,$Y2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
          $this->drawLine($X1,$Y1,$X1,$Y2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
         }
-      }
-     else
-      {
+      } else {
        $Color = $this->allocateColor($this->Picture,$R,$G,$B,$Alpha);
        imagerectangle($this->Picture,$X1,$Y1,$X2,$Y2,$Color);
       }
     }
 
    /* Draw a filled rectangle */
-   function drawFilledRectangle($X1,$Y1,$X2,$Y2,$Format="")
-    {
+   function drawFilledRectangle($X1,$Y1,$X2,$Y2,$Format="") {
      $R			= isset($Format["R"]) ? $Format["R"] : 0;
      $G			= isset($Format["G"]) ? $Format["G"] : 0;
      $B			= isset($Format["B"]) ? $Format["B"] : 0;
@@ -495,30 +461,25 @@ 
      if ($Y1 > $Y2) { list($Y1, $Y2) = array($Y2, $Y1); }
 
      $RestoreShadow = $this->Shadow;
-     if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 )
-      {
+     if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 ) {
        $this->Shadow = FALSE;
        $this->drawFilledRectangle($X1+$this->ShadowX,$Y1+$this->ShadowY,$X2+$this->ShadowX,$Y2+$this->ShadowY,array("R"=>$this->ShadowR,"G"=>$this->ShadowG,"B"=>$this->ShadowB,"Alpha"=>$this->Shadowa,"Ticks"=>$Ticks,"NoAngle"=>$NoAngle));
       }
 
      $Color = $this->allocateColor($this->Picture,$R,$G,$B,$Alpha);
-     if ( $NoAngle )
-      {
+     if ( $NoAngle ) {
        imagefilledrectangle($this->Picture,ceil($X1)+1,ceil($Y1),floor($X2)-1,floor($Y2),$Color);
        imageline($this->Picture,ceil($X1),ceil($Y1)+1,ceil($X1),floor($Y2)-1,$Color);
        imageline($this->Picture,floor($X2),ceil($Y1)+1,floor($X2),floor($Y2)-1,$Color);
-      }
-     else
+      } else
       imagefilledrectangle($this->Picture,ceil($X1),ceil($Y1),floor($X2),floor($Y2),$Color);
 
-     if ( $Dash )
-      {
+     if ( $Dash ) {
        if ( $BorderR != -1 ) { $iX1=$X1+1; $iY1=$Y1+1; $iX2=$X2-1; $iY2=$Y2-1; } else { $iX1=$X1; $iY1=$Y1; $iX2=$X2; $iY2=$Y2; }
 
        $Color = $this->allocateColor($this->Picture,$DashR,$DashG,$DashB,$Alpha);
        $Y=$iY1-$DashStep;
-       for($X=$iX1; $X<=$iX2+($iY2-$iY1); $X=$X+$DashStep)
-        {
+       for($X=$iX1; $X<=$iX2+($iY2-$iY1); $X=$X+$DashStep) {
          $Y=$Y+$DashStep;
          if ( $X > $iX2 ) { $Xa = $X-($X-$iX2); $Ya = $iY1+($X-$iX2); } else { $Xa = $X; $Ya = $iY1; }
          if ( $Y > $iY2 ) { $Xb = $iX1+($Y-$iY2); $Yb = $Y-($Y-$iY2); } else { $Xb = $iX1; $Yb = $Y; }
@@ -526,31 +487,26 @@ 
         }
       }
 
-     if ( $this->Antialias && !$NoBorder )
-      {
-       if ( $X1 < ceil($X1) )
-        {
+     if ( $this->Antialias && !$NoBorder ) {
+       if ( $X1 < ceil($X1) ) {
          $AlphaA = $Alpha * (ceil($X1) - $X1);
          $Color = $this->allocateColor($this->Picture,$R,$G,$B,$AlphaA);
          imageline($this->Picture,ceil($X1)-1,ceil($Y1),ceil($X1)-1,floor($Y2),$Color);
         }
 
-       if ( $Y1 < ceil($Y1) )
-        {
+       if ( $Y1 < ceil($Y1) ) {
          $AlphaA = $Alpha * (ceil($Y1) - $Y1);
          $Color = $this->allocateColor($this->Picture,$R,$G,$B,$AlphaA);
          imageline($this->Picture,ceil($X1),ceil($Y1)-1,floor($X2),ceil($Y1)-1,$Color);
         }
 
-       if ( $X2 > floor($X2) )
-        {
+       if ( $X2 > floor($X2) ) {
          $AlphaA = $Alpha * (.5-($X2 - floor($X2)));
          $Color = $this->allocateColor($this->Picture,$R,$G,$B,$AlphaA);
          imageline($this->Picture,floor($X2)+1,ceil($Y1),floor($X2)+1,floor($Y2),$Color);
         } 
 
-       if ( $Y2 > floor($Y2) )
-        {
+       if ( $Y2 > floor($Y2) ) {
          $AlphaA = $Alpha * (.5-($Y2 - floor($Y2)));
          $Color = $this->allocateColor($this->Picture,$R,$G,$B,$AlphaA);
          imageline($this->Picture,ceil($X1),floor($Y2)+1,floor($X2),floor($Y2)+1,$Color);
@@ -564,8 +520,7 @@ 
     }
 
    /* Draw a rectangular marker of the specified size */
-   function drawRectangleMarker($X,$Y,$Format="")
-    {
+   function drawRectangleMarker($X,$Y,$Format="") {
      $Size = isset($Format["Size"]) ? $Format["Size"] : 4;
 
      $HalfSize = floor($Size/2);
@@ -573,8 +528,7 @@ 
     }
 
    /* Drawn a spline based on the bezier function */
-   function drawSpline($Coordinates,$Format="")
-    {
+   function drawSpline($Coordinates,$Format="") {
      $R		= isset($Format["R"]) ? $Format["R"] : 0;
      $G		= isset($Format["G"]) ? $Format["G"] : 0;
      $B		= isset($Format["B"]) ? $Format["B"] : 0;
@@ -587,8 +541,7 @@ 
      $Weight	= isset($Format["Weight"]) ? $Format["Weight"] : NULL;
 
      $Cpt = NULL; $Mode = NULL; $Result = "";
-     for($i=1;$i<=count($Coordinates)-1;$i++)
-      {
+     for($i=1;$i<=count($Coordinates)-1;$i++) {
        $X1 = $Coordinates[$i-1][0]; $Y1 = $Coordinates[$i-1][1];
        $X2 = $Coordinates[$i][0];   $Y2 = $Coordinates[$i][1];
 
@@ -596,9 +549,7 @@ 
 
        /* First segment */
        if ( $i == 1 )
-        { $Xv1 = $X1; $Yv1 = $Y1; }
-       else
-        {
+        { $Xv1 = $X1; $Yv1 = $Y1; } else {
          $Angle1 = $this->getAngle($XLast,$YLast,$X1,$Y1);
          $Angle2 = $this->getAngle($X1,$Y1,$X2,$Y2);
          $XOff = cos($Angle2 * PI / 180) * $Force + $X1;
@@ -610,9 +561,7 @@ 
 
        /* Last segment */
        if ( $i == count($Coordinates)-1 )
-        { $Xv2 = $X2; $Yv2 = $Y2; }
-       else
-        {
+        { $Xv2 = $X2; $Yv2 = $Y2; } else {
          $Angle1 = $this->getAngle($X2,$Y2,$Coordinates[$i+1][0],$Coordinates[$i+1][1]);
          $Angle2 = $this->getAngle($X1,$Y1,$X2,$Y2);
          $XOff = cos(($Angle2+180) * PI / 180) * $Force + $X2;
@@ -632,8 +581,7 @@ 
     }
 
    /* Draw a bezier curve with two controls points */
-   function drawBezier($X1,$Y1,$X2,$Y2,$Xv1,$Yv1,$Xv2,$Yv2,$Format="")
-    {
+   function drawBezier($X1,$Y1,$X2,$Y2,$Xv1,$Yv1,$Xv2,$Yv2,$Format="") {
      $R		= isset($Format["R"]) ? $Format["R"] : 0;
      $G		= isset($Format["G"]) ? $Format["G"] : 0;
      $B		= isset($Format["B"]) ? $Format["B"] : 0;
@@ -649,12 +597,10 @@ 
      $ArrowRatio	= isset($Format["ArrowRatio"]) ? $Format["ArrowRatio"] : .5;
      $ArrowTwoHeads	= isset($Format["ArrowTwoHeads"]) ? $Format["ArrowTwoHeads"] : FALSE;
 
-     if ( $Segments == NULL )
-      {
+     if ( $Segments == NULL ) {
        $Length    = $this->getLength($X1,$Y1,$X2,$Y2);
        $Precision = ($Length*125)/1000;
-      }
-     else
+      } else
       $Precision = $Segments;
 
      $P[0]["X"] = $X1;  $P[0]["Y"] = $Y1;
@@ -664,8 +610,7 @@ 
 
      /* Compute the bezier points */
      $Q = ""; $ID = 0; $Path = "";
-     for($i=0;$i<=$Precision;$i=$i+1)
-      {
+     for($i=0;$i<=$Precision;$i=$i+1) {
        $u = $i / $Precision;
 
        $C    = "";
@@ -674,8 +619,7 @@ 
        $C[2] = 3 * $u * $u * (1 - $u);
        $C[3] = $u * $u * $u;
 
-       for($j=0;$j<=3;$j++)
-        {
+       for($j=0;$j<=3;$j++) {
          if ( !isset($Q[$ID]) ) { $Q[$ID] = ""; }
          if ( !isset($Q[$ID]["X"]) ) { $Q[$ID]["X"] = 0; }
          if ( !isset($Q[$ID]["Y"]) ) { $Q[$ID]["Y"] = 0; }
@@ -687,11 +631,9 @@ 
       }        
      $Q[$ID]["X"] = $X2; $Q[$ID]["Y"] = $Y2;
 
-     if ( !$NoDraw )
-      {
+     if ( !$NoDraw ) {
        /* Display the control points */
-       if ( $ShowC && !$PathOnly )
-        {
+       if ( $ShowC && !$PathOnly ) {
          $Xv1 = floor($Xv1); $Yv1 = floor($Yv1); $Xv2 = floor($Xv2); $Yv2 = floor($Yv2);
 
          $this->drawLine($X1,$Y1,$X2,$Y2,array("R"=>0,"G"=>0,"B"=>0,"Alpha"=>30));
@@ -706,8 +648,7 @@ 
 
        /* Draw the bezier */
        $LastX = NULL; $LastY = NULL; $Cpt = NULL; $Mode = NULL; $ArrowS = NULL;
-       foreach ($Q as $Key => $Point)
-        {
+       foreach ($Q as $Key => $Point) {
          $X = $Point["X"]; $Y = $Point["Y"];
 
          /* Get the first segment */
@@ -723,8 +664,7 @@ 
          $LastX = $X; $LastY = $Y;
         }
 
-       if ( $DrawArrow && !$PathOnly )
-        {
+       if ( $DrawArrow && !$PathOnly ) {
          $ArrowSettings = array("FillR"=>$R,"FillG"=>$G,"FillB"=>$B,"Alpha"=>$Alpha,"Size"=>$ArrowSize,"Ratio"=>$ArrowRatio);
          if ( $ArrowTwoHeads )
           $this->drawArrow($ArrowS["X1"],$ArrowS["Y1"],$ArrowS["X2"],$ArrowS["Y2"],$ArrowSettings);
@@ -736,8 +676,7 @@ 
     }
 
    /* Draw a line between two points */
-   function drawLine($X1,$Y1,$X2,$Y2,$Format="")
-    {
+   function drawLine($X1,$Y1,$X2,$Y2,$Format="") {
      $R		= isset($Format["R"]) ? $Format["R"] : 0;
      $G		= isset($Format["G"]) ? $Format["G"] : 0;
      $B		= isset($Format["B"]) ? $Format["B"] : 0;
@@ -748,10 +687,8 @@ 
      $Weight	= isset($Format["Weight"]) ? $Format["Weight"] : NULL;
      $Threshold	= isset($Format["Threshold"]) ? $Format["Threshold"] : NULL;
 
-     if ( $this->Antialias == FALSE && $Ticks == NULL )
-      {
-       if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 )
-        {
+     if ( $this->Antialias == FALSE && $Ticks == NULL ) {
+       if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 ) {
          $ShadowColor = $this->allocateColor($this->Picture,$this->ShadowR,$this->ShadowG,$this->ShadowB,$this->Shadowa);
          imageline($this->Picture,$X1+$this->ShadowX,$Y1+$this->ShadowY,$X2+$this->ShadowX,$Y2+$this->ShadowY,$ShadowColor);
         }
@@ -765,13 +702,11 @@ 
      if ( $Distance == 0 ) { return(-1); }
 
      /* Derivative algorithm for overweighted lines, re-route to polygons primitives */
-     if ( $Weight != NULL )
-      {
+     if ( $Weight != NULL ) {
        $Angle        = $this->getAngle($X1,$Y1,$X2,$Y2);
        $PolySettings = array ("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"BorderAlpha"=>$Alpha);
 
-       if ( $Ticks == NULL )
-        {
+       if ( $Ticks == NULL ) {
          $Points   = ""; 
          $Points[] = cos(deg2rad($Angle-90)) * $Weight + $X1; $Points[] = sin(deg2rad($Angle-90)) * $Weight + $Y1;
          $Points[] = cos(deg2rad($Angle+90)) * $Weight + $X1; $Points[] = sin(deg2rad($Angle+90)) * $Weight + $Y1;
@@ -779,11 +714,8 @@ 
          $Points[] = cos(deg2rad($Angle-90)) * $Weight + $X2; $Points[] = sin(deg2rad($Angle-90)) * $Weight + $Y2;
 
          $this->drawPolygon($Points,$PolySettings);
-        }
-       else
-        {
-         for($i=0;$i<=$Distance;$i=$i+$Ticks*2)
-          {
+        } else {
+         for($i=0;$i<=$Distance;$i=$i+$Ticks*2) {
            $Xa = (($X2-$X1)/$Distance) * $i + $X1; $Ya = (($Y2-$Y1)/$Distance) * $i + $Y1;
            $Xb = (($X2-$X1)/$Distance) * ($i+$Ticks) + $X1; $Yb = (($Y2-$Y1)/$Distance) * ($i+$Ticks) + $Y1;
 
@@ -803,19 +735,15 @@ 
      $XStep = ($X2-$X1) / $Distance;
      $YStep = ($Y2-$Y1) / $Distance;
 
-     for($i=0;$i<=$Distance;$i++)
-      {
+     for($i=0;$i<=$Distance;$i++) {
        $X = $i * $XStep + $X1;
        $Y = $i * $YStep + $Y1;
 
        $Color = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha);
 
-       if ( $Threshold != NULL )
-        {
-         foreach($Threshold as $Key => $Parameters)
-          {
-           if ( $Y <= $Parameters["MinX"] && $Y >= $Parameters["MaxX"])
-            {
+       if ( $Threshold != NULL ) {
+         foreach($Threshold as $Key => $Parameters) {
+           if ( $Y <= $Parameters["MinX"] && $Y >= $Parameters["MaxX"]) {
              if ( isset($Parameters["R"]) ) { $RT = $Parameters["R"]; } else { $RT = 0; }
              if ( isset($Parameters["G"]) ) { $GT = $Parameters["G"]; } else { $GT = 0; }
              if ( isset($Parameters["B"]) ) { $BT = $Parameters["B"]; } else { $BT = 0; }
@@ -825,8 +753,7 @@ 
           }
         }
 
-       if ( $Ticks != NULL )
-        {
+       if ( $Ticks != NULL ) {
          if ( $Cpt % $Ticks == 0 )
           { $Cpt = 0; if ( $Mode == 1 ) { $Mode = 0; } else { $Mode = 1; } }
 
@@ -834,8 +761,7 @@ 
           $this->drawAntialiasPixel($X,$Y,$Color);
 
          $Cpt++;
-        }
-       else
+        } else
         $this->drawAntialiasPixel($X,$Y,$Color);
       }
 
@@ -843,8 +769,7 @@ 
     }
 
    /* Draw a circle */
-   function drawCircle($Xc,$Yc,$Height,$Width,$Format="")
-    {
+   function drawCircle($Xc,$Yc,$Height,$Width,$Format="") {
      $R	    = isset($Format["R"]) ? $Format["R"] : 0;
      $G	    = isset($Format["G"]) ? $Format["G"] : 0;
      $B	    = isset($Format["B"]) ? $Format["B"] : 0;
@@ -859,8 +784,7 @@ 
      $Xc = floor($Xc); $Yc = floor($Yc);
 
      $RestoreShadow = $this->Shadow;
-     if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 )
-      {
+     if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 ) {
        $this->Shadow = FALSE;
        $this->drawCircle($Xc+$this->ShadowX,$Yc+$this->ShadowY,$Height,$Width,array("R"=>$this->ShadowR,"G"=>$this->ShadowG,"B"=>$this->ShadowB,"Alpha"=>$this->Shadowa,"Ticks"=>$Ticks));
       }
@@ -872,13 +796,11 @@ 
 
      $Step = 360 / (2 * PI * max($Width,$Height));
      $Mode = 1; $Cpt = 1;
-     for($i=0;$i<=360;$i=$i+$Step)
-      {
+     for($i=0;$i<=360;$i=$i+$Step) {
        $X = cos($i*PI/180) * $Height + $Xc;
        $Y = sin($i*PI/180) * $Width + $Yc;
 
-       if ( $Ticks != NULL )
-        {
+       if ( $Ticks != NULL ) {
          if ( $Cpt % $Ticks == 0 )
           { $Cpt = 0; if ( $Mode == 1 ) { $Mode = 0; } else { $Mode = 1; } }
 
@@ -886,8 +808,7 @@ 
           $this->drawAntialiasPixel($X,$Y,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
 
          $Cpt++;
-        }
-       else
+        } else
         $this->drawAntialiasPixel($X,$Y,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
 
       }
@@ -895,8 +816,7 @@ 
     }
 
    /* Draw a filled circle */
-   function drawFilledCircle($X,$Y,$Radius,$Format="")
-    {
+   function drawFilledCircle($X,$Y,$Radius,$Format="") {
      $R			= isset($Format["R"]) ? $Format["R"] : 0;
      $G			= isset($Format["G"]) ? $Format["G"] : 0;
      $B			= isset($Format["B"]) ? $Format["B"] : 0;
@@ -915,16 +835,14 @@ 
      $Radius = abs($Radius);
 
      $RestoreShadow = $this->Shadow;
-     if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 )
-      {
+     if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 ) {
        $this->Shadow = FALSE;
        $this->drawFilledCircle($X+$this->ShadowX,$Y+$this->ShadowY,$Radius,array("R"=>$this->ShadowR,"G"=>$this->ShadowG,"B"=>$this->ShadowB,"Alpha"=>$this->Shadowa,"Ticks"=>$Ticks));
       }
 
      $this->Mask  = "";
      $Color = $this->allocateColor($this->Picture,$R,$G,$B,$Alpha);
-     for ($i=0; $i<=$Radius*2; $i++)
-      {
+     for ($i=0; $i<=$Radius*2; $i++) {
        $Slice  = sqrt($Radius * $Radius - ($Radius - $i) * ($Radius - $i));
        $XPos   = floor($Slice);
        $YPos   = $Y + $i - $Radius;
@@ -946,8 +864,7 @@ 
     }
 
    /* Write text */
-   function drawText($X,$Y,$Text,$Format="")
-    {
+   function drawText($X,$Y,$Text,$Format="") {
      $R			= isset($Format["R"]) ? $Format["R"] : $this->FontColorR;
      $G			= isset($Format["G"]) ? $Format["G"] : $this->FontColorG;
      $B			= isset($Format["B"]) ? $Format["B"] : $this->FontColorB;
@@ -979,16 +896,14 @@ 
 
      if ( $BoxSurrounding != "" ) { $BoxBorderR = $BoxR - $BoxSurrounding; $BoxBorderG = $BoxG - $BoxSurrounding; $BoxBorderB = $BoxB - $BoxSurrounding; $BoxBorderAlpha = $BoxAlpha; }
 
-     if ( $ShowOrigine )
-      {
+     if ( $ShowOrigine ) {
        $MyMarkerSettings = array("R"=>255,"G"=>0,"B"=>0,"BorderR"=>255,"BorderB"=>255,"BorderG"=>255,"Size"=>4);
        $this->drawRectangleMarker($X,$Y,$MyMarkerSettings);
       }
 
      $TxtPos = $this->getTextBox($X,$Y,$FontName,$FontSize,$Angle,$Text);
 
-     if ( $DrawBox && ($Angle == 0 || $Angle == 90 || $Angle == 180 || $Angle == 270))
-      {
+     if ( $DrawBox && ($Angle == 0 || $Angle == 90 || $Angle == 180 || $Angle == 270)) {
        $T[0]["X"]=0;$T[0]["Y"]=0;$T[1]["X"]=0;$T[1]["Y"]=0;$T[2]["X"]=0;$T[2]["Y"]=0;$T[3]["X"]=0;$T[3]["Y"]=0;
        if ( $Angle == 0 ) { $T[0]["X"]=-$TOffset;$T[0]["Y"]=$TOffset;$T[1]["X"]=$TOffset;$T[1]["Y"]=$TOffset;$T[2]["X"]=$TOffset;$T[2]["Y"]=-$TOffset;$T[3]["X"]=-$TOffset;$T[3]["Y"]=-$TOffset; }
 
@@ -1005,16 +920,14 @@ 
        $Settings = array("R"=>$BoxR,"G"=>$BoxG,"B"=>$BoxB,"Alpha"=>$BoxAlpha,"BorderR"=>$BoxBorderR,"BorderG"=>$BoxBorderG,"BorderB"=>$BoxBorderB,"BorderAlpha"=>$BoxBorderAlpha);
 
        if ( $BoxRounded )
-        { $this->drawRoundedFilledRectangle($X1,$Y1,$X2,$Y2,$RoundedRadius,$Settings); }
-       else
+        { $this->drawRoundedFilledRectangle($X1,$Y1,$X2,$Y2,$RoundedRadius,$Settings); } else
         { $this->drawFilledRectangle($X1,$Y1,$X2,$Y2,$Settings); }
       }
 
      $X = $X - $TxtPos[$Align]["X"] + $X;
      $Y = $Y - $TxtPos[$Align]["Y"] + $Y;
 
-     if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 )
-      {
+     if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 ) {
        $C_ShadowColor = $this->allocateColor($this->Picture,$this->ShadowR,$this->ShadowG,$this->ShadowB,$this->Shadowa);
        imagettftext($this->Picture,$FontSize,$Angle,$X+$this->ShadowX,$Y+$this->ShadowY,$C_ShadowColor,$FontName,$Text);
       }
@@ -1028,8 +941,7 @@ 
     }
 
    /* Draw a gradient within a defined area */
-   function drawGradientArea($X1,$Y1,$X2,$Y2,$Direction,$Format="")
-    {
+   function drawGradientArea($X1,$Y1,$X2,$Y2,$Direction,$Format="") {
      $StartR	= isset($Format["StartR"]) ? $Format["StartR"] : 90;
      $StartG	= isset($Format["StartG"]) ? $Format["StartG"] : 90;
      $StartB	= isset($Format["StartB"]) ? $Format["StartB"] : 90;
@@ -1042,8 +954,7 @@ 
      $Shadow = $this->Shadow;
      $this->Shadow = FALSE;
 
-     if ( $StartR == $EndR && $StartG == $EndG && $StartB == $EndB )
-      {
+     if ( $StartR == $EndR && $StartG == $EndG && $StartB == $EndB ) {
        $this->drawFilledRectangle($X1,$Y1,$X2,$Y2,array("R"=>$StartR,"G"=>$StartG,"B"=>$StartB,"Alpha"=>$Alpha));
        return(0);
       }
@@ -1064,17 +975,14 @@ 
      $BStep    = ($EndB-$StartB)/$Step;
 
      $R=$StartR;$G=$StartG;$B=$StartB;
-     switch($Direction)
-      {
+     switch($Direction) {
        case DIRECTION_VERTICAL:
         $StartY = $Y1; $EndY = floor($Y2)+1; $LastY2 = $StartY;
-        for($i=0;$i<=$Step;$i++)
-         {
+        for($i=0;$i<=$Step;$i++) {
           $Y2 = floor($StartY + ($i * $StepSize));
 
           if ($Y2 > $EndY) { $Y2 = $EndY; }
-          if (($Y1 != $Y2 && $Y1 < $Y2) || $Y2 == $EndY)
-           {
+          if (($Y1 != $Y2 && $Y1 < $Y2) || $Y2 == $EndY) {
             $Color = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha);
             $this->drawFilledRectangle($X1,$Y1,$X2,$Y2,$Color);
             $LastY2 = max($LastY2,$Y2);
@@ -1087,13 +995,11 @@ 
 
        case DIRECTION_HORIZONTAL:
         $StartX = $X1; $EndX = $X2;
-        for($i=0;$i<=$Step;$i++)
-         {
+        for($i=0;$i<=$Step;$i++) {
           $X2 = floor($StartX + ($i * $StepSize));
 
           if ($X2 > $EndX) { $X2 = $EndX; }
-          if (($X1 != $X2 && $X1 < $X2) || $X2 == $EndX)
-           {
+          if (($X1 != $X2 && $X1 < $X2) || $X2 == $EndX) {
             $Color = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha);
             $this->drawFilledRectangle($X1,$Y1,$X2,$Y2,$Color);
             $X1 = $X2+1;
@@ -1109,8 +1015,7 @@ 
     }
 
    /* Draw an aliased pixel */
-   function drawAntialiasPixel($X,$Y,$Format="")
-    {
+   function drawAntialiasPixel($X,$Y,$Format="") {
      $R     = isset($Format["R"]) ? $Format["R"] : 0;
      $G     = isset($Format["G"]) ? $Format["G"] : 0;
      $B     = isset($Format["B"]) ? $Format["B"] : 0;
@@ -1123,10 +1028,8 @@ 
      if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; }
      if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; }
 
-     if ( !$this->Antialias )
-      {
-       if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 )
-        {
+     if ( !$this->Antialias ) {
+       if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 ) {
          $ShadowColor = $this->allocateColor($this->Picture,$this->ShadowR,$this->ShadowG,$this->ShadowB,$this->Shadowa);
          imagesetpixel($this->Picture,$X+$this->ShadowX,$Y+$this->ShadowY,$ShadowColor);
         }
@@ -1141,15 +1044,12 @@ 
      $Xi   = floor($X);
      $Yi   = floor($Y);
 
-     if ( $Xi == $X && $Yi == $Y)
-      {
+     if ( $Xi == $X && $Yi == $Y) {
        if ( $Alpha == 100 )
         $this->drawAlphaPixel($X,$Y,100,$R,$G,$B);
        else
         $this->drawAlphaPixel($X,$Y,$Alpha,$R,$G,$B);
-      }
-     else
-      {
+      } else {
        $Alpha1 = (((1 - ($X - floor($X))) * (1 - ($Y - floor($Y))) * 100) / 100) * $Alpha;
        if ( $Alpha1 > $this->AntialiasQuality ) { $this->drawAlphaPixel($Xi,$Yi,$Alpha1,$R,$G,$B); }
 
@@ -1165,8 +1065,7 @@ 
     }
 
    /* Draw a semi-transparent pixel */
-   function drawAlphaPixel($X,$Y,$Alpha,$R,$G,$B)
-    {
+   function drawAlphaPixel($X,$Y,$Alpha,$R,$G,$B) {
      if ( isset($this->Mask[$X])) { if ( isset($this->Mask[$X][$Y]) ) { return(0); } }
 
      if ( $X < 0 || $Y < 0 || $X >= $this->XSize || $Y >= $this->YSize )
@@ -1176,8 +1075,7 @@ 
      if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; }
      if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; }
 
-     if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 )
-      {
+     if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 ) {
        $AlphaFactor = floor(($Alpha / 100) * $this->Shadowa);
        $ShadowColor = $this->allocateColor($this->Picture,$this->ShadowR,$this->ShadowG,$this->ShadowB,$AlphaFactor);
        imagesetpixel($this->Picture,$X+$this->ShadowX,$Y+$this->ShadowY,$ShadowColor);
@@ -1192,8 +1090,7 @@ 
     { return((127/100)*(100-$AlphaValue)); }
 
    /* Allocate a color with transparency */
-   function allocateColor($Picture,$R,$G,$B,$Alpha=100)
-    {
+   function allocateColor($Picture,$R,$G,$B,$Alpha=100) {
      if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; }
      if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; }
      if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; }
@@ -1216,8 +1113,7 @@ 
    function drawFromJPG($X,$Y,$FileName)
     { $this->drawFromPicture(3,$FileName,$X,$Y); }
 
-   function getPicInfo($FileName)
-    {
+   function getPicInfo($FileName) {
      $Infos  = getimagesize($FileName);
      $Width  = $Infos[0];
      $Height = $Infos[1];
@@ -1231,39 +1127,29 @@ 
     }
 
    /* Generic loader function for external pictures */
-   function drawFromPicture($PicType,$FileName,$X,$Y)
-    {
-     if ( file_exists($FileName))
-      {
+   function drawFromPicture($PicType,$FileName,$X,$Y) {
+     if ( file_exists($FileName)) {
        list($Width,$Height) = $this->getPicInfo($FileName);
 
        if ( $PicType == 1 )
-        { $Raster = imagecreatefrompng($FileName); }
-       elseif ( $PicType == 2 )
-        { $Raster = imagecreatefromgif($FileName); }
-       elseif ( $PicType == 3 )
-        { $Raster = imagecreatefromjpeg($FileName); }
-       else
+        { $Raster = imagecreatefrompng($FileName); } elseif ( $PicType == 2 )
+        { $Raster = imagecreatefromgif($FileName); } elseif ( $PicType == 3 )
+        { $Raster = imagecreatefromjpeg($FileName); } else
         { return(0); }
 
 
        $RestoreShadow = $this->Shadow;
-       if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 )
-        {
+       if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 ) {
          $this->Shadow = FALSE;
          if ( $PicType == 3 )
           $this->drawFilledRectangle($X+$this->ShadowX,$Y+$this->ShadowY,$X+$Width+$this->ShadowX,$Y+$Height+$this->ShadowY,array("R"=>$this->ShadowR,"G"=>$this->ShadowG,"B"=>$this->ShadowB,"Alpha"=>$this->Shadowa));
-         else
-          {
+         else {
            $TranparentID = imagecolortransparent($Raster);
-           for ($Xc=0;$Xc<=$Width-1;$Xc++)
-            {
-             for ($Yc=0;$Yc<=$Height-1;$Yc++)
-              {
+           for ($Xc=0;$Xc<=$Width-1;$Xc++) {
+             for ($Yc=0;$Yc<=$Height-1;$Yc++) {
                $RGBa   = imagecolorat($Raster,$Xc,$Yc);
                $Values = imagecolorsforindex($Raster,$RGBa);
-               if ( $Values["alpha"] < 120 )
-                {
+               if ( $Values["alpha"] < 120 ) {
                  $AlphaFactor = floor(($this->Shadowa / 100) * ((100 / 127) * (127-$Values["alpha"])));
                  $this->drawAlphaPixel($X+$Xc+$this->ShadowX,$Y+$Yc+$this->ShadowY,$AlphaFactor,$this->ShadowR,$this->ShadowG,$this->ShadowB);
                 }
@@ -1279,8 +1165,7 @@ 
     }
 
    /* Draw an arrow */
-   function drawArrow($X1,$Y1,$X2,$Y2,$Format="")
-    {
+   function drawArrow($X1,$Y1,$X2,$Y2,$Format="") {
      $FillR	= isset($Format["FillR"]) ? $Format["FillR"] : 0;
      $FillG	= isset($Format["FillG"]) ? $Format["FillG"] : 0;
      $FillB	= isset($Format["FillB"]) ? $Format["FillB"] : 0;
@@ -1298,8 +1183,7 @@ 
 
      /* Override Shadow support, this will be managed internally */
      $RestoreShadow = $this->Shadow;
-     if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 )
-      {
+     if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 ) {
        $this->Shadow = FALSE;
        $this->drawArrow($X1+$this->ShadowX,$Y1+$this->ShadowY,$X2+$this->ShadowX,$Y2+$this->ShadowY,array("FillR"=>$this->ShadowR,"FillG"=>$this->ShadowG,"FillB"=>$this->ShadowB,"Alpha"=>$this->Shadowa,"Size"=>$Size,"Ratio"=>$Ratio,"TwoHeads"=>$TwoHeads,"Ticks"=>$Ticks));
       }
@@ -1326,8 +1210,7 @@ 
      $this->drawLine($Points[0],$Points[1],$Points[4],$Points[5],array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha));
 
      /* Draw the second head */
-     if ( $TwoHeads )
-      {
+     if ( $TwoHeads ) {
        $Angle = $this->getAngle($X2,$Y2,$X1,$Y1);
 
        $TailX2 = cos(($Angle-180)*PI/180)*$Size+$X1;
@@ -1351,8 +1234,7 @@ 
        $this->drawLine($Points[0],$Points[1],$Points[4],$Points[5],array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha));
 
        $this->drawLine($TailX,$TailY,$TailX2,$TailY2,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
-      }
-     else
+      } else
       $this->drawLine($X1,$Y1,$TailX,$TailY,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
 
      /* Re-enable shadows */
@@ -1360,8 +1242,7 @@ 
     }
 
    /* Draw a label with associated arrow */
-   function drawArrowLabel($X1,$Y1,$Text,$Format="")
-    {
+   function drawArrowLabel($X1,$Y1,$Text,$Format="") {
      $FillR    = isset($Format["FillR"]) ? $Format["FillR"] : 0;
      $FillG    = isset($Format["FillG"]) ? $Format["FillG"] : 0;
      $FillB    = isset($Format["FillB"]) ? $Format["FillB"] : 0;
@@ -1392,16 +1273,13 @@ 
      $TxtWidth	= max(abs($Size[2]-$Size[0]),abs($Size[0]-$Size[6]));
      $TxtHeight	= max(abs($Size[1]-$Size[7]),abs($Size[3]-$Size[1]));
 
-     if ( $Angle > 0 && $Angle < 180 )
-      {
+     if ( $Angle > 0 && $Angle < 180 ) {
        $this->drawLine($X2,$Y2,$X2-$TxtWidth,$Y2,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
        if ( $Position == POSITION_TOP )
         $this->drawText($X2,$Y2-2,$Text,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha,"Align"=>TEXT_ALIGN_BOTTOMRIGHT));
        else
         $this->drawText($X2,$Y2+4,$Text,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha,"Align"=>TEXT_ALIGN_TOPRIGHT));
-      }
-     else
-      {
+      } else {
        $this->drawLine($X2,$Y2,$X2+$TxtWidth,$Y2,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
        if ( $Position == POSITION_TOP )
         $this->drawText($X2,$Y2-2,$Text,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha));
@@ -1411,8 +1289,7 @@ 
     }
 
    /* Draw a progress bar filled with specified % */
-   function drawProgress($X,$Y,$Percent,$Format="")
-    {
+   function drawProgress($X,$Y,$Percent,$Format="") {
      if ( $Percent > 100 ) { $Percent = 100; }
      if ( $Percent < 0 ) { $Percent = 0; }
 
@@ -1442,8 +1319,7 @@ 
      $BoxSurrounding = isset($Format["BoxSurrounding"]) ? $Format["BoxSurrounding"] : NULL;
      $NoAngle	= isset($Format["NoAngle"]) ? $Format["NoAngle"] : FALSE;
 
-     if ( $RFade != -1 && $GFade != -1 && $BFade != -1 )
-      {
+     if ( $RFade != -1 && $GFade != -1 && $BFade != -1 ) {
        $RFade = (($RFade-$R)/100)*$Percent+$R;
        $GFade = (($GFade-$G)/100)*$Percent+$G;
        $BFade = (($BFade-$B)/100)*$Percent+$B;
@@ -1452,21 +1328,18 @@ 
      if ( $Surrounding != NULL ) { $BorderR = $R + $Surrounding; $BorderG = $G + $Surrounding; $BorderB = $B + $Surrounding; }
      if ( $BoxSurrounding != NULL ) { $BoxBorderR = $BoxBackR + $Surrounding; $BoxBorderG = $BoxBackG + $Surrounding; $BoxBorderB = $BoxBackB + $Surrounding; }
 
-     if ( $Orientation == ORIENTATION_VERTICAL )
-      {
+     if ( $Orientation == ORIENTATION_VERTICAL ) {
        $InnerHeight = (($Height-2)/100)*$Percent;
        $this->drawFilledRectangle($X,$Y,$X+$Width,$Y-$Height,array("R"=>$BoxBackR,"G"=>$BoxBackG,"B"=>$BoxBackB,"BorderR"=>$BoxBorderR,"BorderG"=>$BoxBorderG,"BorderB"=>$BoxBorderB,"NoAngle"=>$NoAngle));
 
        $RestoreShadow = $this->Shadow; $this->Shadow  = FALSE;
-       if ( $RFade != -1 && $GFade != -1 && $BFade != -1 )
-        {
+       if ( $RFade != -1 && $GFade != -1 && $BFade != -1 ) {
          $GradientOptions = array("StartR"=>$RFade,"StartG"=>$GFade,"StartB"=>$BFade,"EndR"=>$R,"EndG"=>$G,"EndB"=>$B);
          $this->drawGradientArea($X+1,$Y-1,$X+$Width-1,$Y-$InnerHeight,DIRECTION_VERTICAL,$GradientOptions);
 
          if ( $Surrounding )
           $this->drawRectangle($X+1,$Y-1,$X+$Width-1,$Y-$InnerHeight,array("R"=>255,"G"=>255,"B"=>255,"Alpha"=>$Surrounding));
-        }
-       else
+        } else
         $this->drawFilledRectangle($X+1,$Y-1,$X+$Width-1,$Y-$InnerHeight,array("R"=>$R,"G"=>$G,"B"=>$B,"BorderR"=>$BorderR,"BorderG"=>$BorderG,"BorderB"=>$BorderB));
 
        $this->Shadow = $RestoreShadow;
@@ -1475,9 +1348,7 @@ 
        if ( $ShowLabel && $LabelPos == LABEL_POS_TOP )		{ $this->drawText($X+($Width/2),$Y-$Height-$Margin,$Percent."%",array("Align"=>TEXT_ALIGN_BOTTOMMIDDLE)); }
        if ( $ShowLabel && $LabelPos == LABEL_POS_INSIDE )	{ $this->drawText($X+($Width/2),$Y-$InnerHeight-$Margin,$Percent."%",array("Align"=>TEXT_ALIGN_MIDDLELEFT,"Angle"=>90)); }
        if ( $ShowLabel && $LabelPos == LABEL_POS_CENTER )	{ $this->drawText($X+($Width/2),$Y-($Height/2),$Percent."%",array("Align"=>TEXT_ALIGN_MIDDLEMIDDLE,"Angle"=>90)); }
-      }
-     else
-      {
+      } else {
        if ( $Percent == 100 )
         $InnerWidth = $Width-1;
        else
@@ -1486,15 +1357,13 @@ 
        $this->drawFilledRectangle($X,$Y,$X+$Width,$Y+$Height,array("R"=>$BoxBackR,"G"=>$BoxBackG,"B"=>$BoxBackB,"BorderR"=>$BoxBorderR,"BorderG"=>$BoxBorderG,"BorderB"=>$BoxBorderB,"NoAngle"=>$NoAngle));
 
        $RestoreShadow = $this->Shadow; $this->Shadow  = FALSE;
-       if ( $RFade != -1 && $GFade != -1 && $BFade != -1 )
-        {
+       if ( $RFade != -1 && $GFade != -1 && $BFade != -1 ) {
          $GradientOptions = array("StartR"=>$R,"StartG"=>$G,"StartB"=>$B,"EndR"=>$RFade,"EndG"=>$GFade,"EndB"=>$BFade);
          $this->drawGradientArea($X+1,$Y+1,$X+$InnerWidth,$Y+$Height-1,DIRECTION_HORIZONTAL,$GradientOptions);
 
          if ( $Surrounding )
           $this->drawRectangle($X+1,$Y+1,$X+$InnerWidth,$Y+$Height-1,array("R"=>255,"G"=>255,"B"=>255,"Alpha"=>$Surrounding));
-        }
-       else
+        } else
         $this->drawFilledRectangle($X+1,$Y+1,$X+$InnerWidth,$Y+$Height-1,array("R"=>$R,"G"=>$G,"B"=>$B,"BorderR"=>$BorderR,"BorderG"=>$BorderG,"BorderB"=>$BorderB));
  
        $this->Shadow = $RestoreShadow;
@@ -1507,8 +1376,7 @@ 
     }
 
    /* Get the legend box size */
-   function getLegendSize($Format="")
-    {
+   function getLegendSize($Format="") {
      $FontName		= isset($Format["FontName"]) ? $Format["FontName"] : $this->FontName;
      $FontSize		= isset($Format["FontSize"]) ? $Format["FontSize"] : $this->FontSize;
      $BoxSize		= isset($Format["BoxSize"]) ? $Format["BoxSize"] : 5;
@@ -1523,10 +1391,8 @@ 
 
      $Data = $this->DataSet->getData();
 
-     foreach($Data["Series"] as $SerieName => $Serie)
-      {
-       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] && isset($Serie["Picture"]))
-        {
+     foreach($Data["Series"] as $SerieName => $Serie) {
+       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] && isset($Serie["Picture"])) {
          list($PicWidth,$PicHeight) = $this->getPicInfo($Serie["Picture"]);
          if ( $IconAreaWidth < $PicWidth ) { $IconAreaWidth = $PicWidth; }
          if ( $IconAreaHeight < $PicHeight ) { $IconAreaHeight = $PicHeight; }
@@ -1540,12 +1406,9 @@ 
      $X=100; $Y=100;
 
      $Boundaries = ""; $Boundaries["L"] = $X; $Boundaries["T"] = $Y; $Boundaries["R"] = 0; $Boundaries["B"] = 0; $vY = $Y; $vX = $X;
-     foreach($Data["Series"] as $SerieName => $Serie)
-      {
-       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
-        {
-         if ( $Mode == LEGEND_VERTICAL )
-          {
+     foreach($Data["Series"] as $SerieName => $Serie) {
+       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] ) {
+         if ( $Mode == LEGEND_VERTICAL ) {
            $BoxArray = $this->getTextBox($vX+$IconAreaWidth+4,$vY+$IconAreaHeight/2,$FontName,$FontSize,0,$Serie["Description"]);
 
            if ( $Boundaries["T"] > $BoxArray[2]["Y"]+$IconAreaHeight/2 ) { $Boundaries["T"] = $BoxArray[2]["Y"]+$IconAreaHeight/2; }
@@ -1554,13 +1417,10 @@ 
 
            $Lines = preg_split("/\n/",$Serie["Description"]);
            $vY = $vY + max($this->FontSize*count($Lines),$IconAreaHeight) + 5;
-          }
-         elseif ( $Mode == LEGEND_HORIZONTAL )
-          {
+          } elseif ( $Mode == LEGEND_HORIZONTAL ) {
            $Lines = preg_split("/\n/",$Serie["Description"]);
            $Width = "";
-           foreach($Lines as $Key => $Value)
-            {
+           foreach($Lines as $Key => $Value) {
              $BoxArray = $this->getTextBox($vX+$IconAreaWidth+6,$Y+$IconAreaHeight/2+(($this->FontSize+3)*$Key),$FontName,$FontSize,0,$Value);
 
              if ( $Boundaries["T"] > $BoxArray[2]["Y"]+$IconAreaHeight/2 ) { $Boundaries["T"] = $BoxArray[2]["Y"]+$IconAreaHeight/2; }
@@ -1586,8 +1446,7 @@ 
     }
 
    /* Draw the legend of the active series */
-   function drawLegend($X,$Y,$Format="")
-    {
+   function drawLegend($X,$Y,$Format="") {
      $Family	= isset($Format["Family"]) ? $Format["Family"] : LEGEND_FAMILY_BOX;
      $FontName	= isset($Format["FontName"]) ? $Format["FontName"] : $this->FontName;
      $FontSize	= isset($Format["FontSize"]) ? $Format["FontSize"] : $this->FontSize;
@@ -1615,10 +1474,8 @@ 
 
      $Data = $this->DataSet->getData();
 
-     foreach($Data["Series"] as $SerieName => $Serie)
-      {
-       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] && isset($Serie["Picture"]))
-        {
+     foreach($Data["Series"] as $SerieName => $Serie) {
+       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] && isset($Serie["Picture"])) {
          list($PicWidth,$PicHeight) = $this->getPicInfo($Serie["Picture"]);
          if ( $IconAreaWidth < $PicWidth ) { $IconAreaWidth = $PicWidth; }
          if ( $IconAreaHeight < $PicHeight ) { $IconAreaHeight = $PicHeight; }
@@ -1630,12 +1487,9 @@ 
      $XStep = $XSpacing;
 
      $Boundaries = ""; $Boundaries["L"] = $X; $Boundaries["T"] = $Y; $Boundaries["R"] = 0; $Boundaries["B"] = 0; $vY = $Y; $vX = $X;
-     foreach($Data["Series"] as $SerieName => $Serie)
-      {
-       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
-        {
-         if ( $Mode == LEGEND_VERTICAL )
-          {
+     foreach($Data["Series"] as $SerieName => $Serie) {
+       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] ) {
+         if ( $Mode == LEGEND_VERTICAL ) {
            $BoxArray = $this->getTextBox($vX+$IconAreaWidth+4,$vY+$IconAreaHeight/2,$FontName,$FontSize,0,$Serie["Description"]);
 
            if ( $Boundaries["T"] > $BoxArray[2]["Y"]+$IconAreaHeight/2 ) { $Boundaries["T"] = $BoxArray[2]["Y"]+$IconAreaHeight/2; }
@@ -1644,13 +1498,10 @@ 
 
            $Lines = preg_split("/\n/",$Serie["Description"]);
            $vY = $vY + max($this->FontSize*count($Lines),$IconAreaHeight) + 5;
-          }
-         elseif ( $Mode == LEGEND_HORIZONTAL )
-          {
+          } elseif ( $Mode == LEGEND_HORIZONTAL ) {
            $Lines = preg_split("/\n/",$Serie["Description"]);
            $Width = "";
-           foreach($Lines as $Key => $Value)
-            {
+           foreach($Lines as $Key => $Value) {
              $BoxArray = $this->getTextBox($vX+$IconAreaWidth+6,$Y+$IconAreaHeight/2+(($this->FontSize+3)*$Key),$FontName,$FontSize,0,$Value);
 
              if ( $Boundaries["T"] > $BoxArray[2]["Y"]+$IconAreaHeight/2 ) { $Boundaries["T"] = $BoxArray[2]["Y"]+$IconAreaHeight/2; }
@@ -1675,57 +1526,44 @@ 
       $this->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->Shadow; $this->Shadow = FALSE;
-     foreach($Data["Series"] as $SerieName => $Serie)
-      {
-       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
-        {
+     foreach($Data["Series"] as $SerieName => $Serie) {
+       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] ) {
          $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"];
          $Ticks = $Serie["Ticks"]; $Weight = $Serie["Weight"];
 
-         if ( isset($Serie["Picture"]) )
-          {
+         if ( isset($Serie["Picture"]) ) {
            $Picture = $Serie["Picture"];
            list($PicWidth,$PicHeight) = $this->getPicInfo($Picture);
            $PicX = $X+$IconAreaWidth/2; $PicY = $Y+$IconAreaHeight/2; 
 
            $this->drawFromPNG($PicX-$PicWidth/2,$PicY-$PicHeight/2,$Picture);
-          }
-         else
-          {
-           if ( $Family == LEGEND_FAMILY_BOX )
-            {
+          } else {
+           if ( $Family == LEGEND_FAMILY_BOX ) {
              if ( $BoxWidth != $IconAreaWidth ) { $XOffset = floor(($IconAreaWidth-$BoxWidth)/2); } else { $XOffset = 0; }
              if ( $BoxHeight != $IconAreaHeight ) { $YOffset = floor(($IconAreaHeight-$BoxHeight)/2); } else { $YOffset = 0; }
 
              $this->drawFilledRectangle($X+1+$XOffset,$Y+1+$YOffset,$X+$BoxWidth+$XOffset+1,$Y+$BoxHeight+1+$YOffset,array("R"=>0,"G"=>0,"B"=>0,"Alpha"=>20));
              $this->drawFilledRectangle($X+$XOffset,$Y+$YOffset,$X+$BoxWidth+$XOffset,$Y+$BoxHeight+$YOffset,array("R"=>$R,"G"=>$G,"B"=>$B,"Surrounding"=>20));
-            }
-           elseif ( $Family == LEGEND_FAMILY_CIRCLE )
-            {
+            } elseif ( $Family == LEGEND_FAMILY_CIRCLE ) {
              $this->drawFilledCircle($X+1+$IconAreaWidth/2,$Y+1+$IconAreaHeight/2,min($IconAreaHeight/2,$IconAreaWidth/2),array("R"=>0,"G"=>0,"B"=>0,"Alpha"=>20));
              $this->drawFilledCircle($X+$IconAreaWidth/2,$Y+$IconAreaHeight/2,min($IconAreaHeight/2,$IconAreaWidth/2),array("R"=>$R,"G"=>$G,"B"=>$B,"Surrounding"=>20));
-            }
-           elseif ( $Family == LEGEND_FAMILY_LINE )
-            {
+            } elseif ( $Family == LEGEND_FAMILY_LINE ) {
              $this->drawLine($X+1,$Y+1+$IconAreaHeight/2,$X+1+$IconAreaWidth,$Y+1+$IconAreaHeight/2,array("R"=>0,"G"=>0,"B"=>0,"Alpha"=>20,"Ticks"=>$Ticks,"Weight"=>$Weight));
              $this->drawLine($X,$Y+$IconAreaHeight/2,$X+$IconAreaWidth,$Y+$IconAreaHeight/2,array("R"=>$R,"G"=>$G,"B"=>$B,"Ticks"=>$Ticks,"Weight"=>$Weight));
             }
           }
 
-         if ( $Mode == LEGEND_VERTICAL )
-          {
+         if ( $Mode == LEGEND_VERTICAL ) {
            $Lines = preg_split("/\n/",$Serie["Description"]);
-           foreach($Lines as $Key => $Value)
-            $this->drawText($X+$IconAreaWidth+4,$Y+$IconAreaHeight/2+(($this->FontSize+3)*$Key),$Value,array("R"=>$FontR,"G"=>$FontG,"B"=>$FontB,"Align"=>TEXT_ALIGN_MIDDLELEFT,"FontSize"=>$FontSize,"FontName"=>$FontName));
+           foreach($Lines as $Key => $Value) {
+                       $this->drawText($X+$IconAreaWidth+4,$Y+$IconAreaHeight/2+(($this->FontSize+3)*$Key),$Value,array("R"=>$FontR,"G"=>$FontG,"B"=>$FontB,"Align"=>TEXT_ALIGN_MIDDLELEFT,"FontSize"=>$FontSize,"FontName"=>$FontName));
+           }
 
            $Y=$Y+max($this->FontSize*count($Lines),$IconAreaHeight) + 5;
-          }
-         elseif ( $Mode == LEGEND_HORIZONTAL )
-          {
+          } elseif ( $Mode == LEGEND_HORIZONTAL ) {
            $Lines = preg_split("/\n/",$Serie["Description"]);
            $Width = "";
-           foreach($Lines as $Key => $Value)
-            {
+           foreach($Lines as $Key => $Value) {
              $BoxArray = $this->drawText($X+$IconAreaWidth+4,$Y+$IconAreaHeight/2+(($this->FontSize+3)*$Key),$Value,array("R"=>$FontR,"G"=>$FontG,"B"=>$FontB,"Align"=>TEXT_ALIGN_MIDDLELEFT,"FontSize"=>$FontSize,"FontName"=>$FontName));
              $Width[] = $BoxArray[1]["X"];
             }
@@ -1738,8 +1576,7 @@ 
      $this->Shadow = $RestoreShadow;
     }
 
-   function drawScale($Format="")
-    {
+   function drawScale($Format="") {
      $Pos		= isset($Format["Pos"]) ? $Format["Pos"] : SCALE_POS_LEFTRIGHT;
      $Floating		= isset($Format["Floating"]) ? $Format["Floating"] : FALSE;
      $Mode		= isset($Format["Mode"]) ? $Format["Mode"] : SCALE_MODE_FLOATING;
@@ -1816,34 +1653,26 @@ 
      if ( isset($Data["Abscissa"]) ) { $Abscissa = $Data["Abscissa"]; } else { $Abscissa = NULL; }
 
      /* Unset the abscissa axis, needed if we display multiple charts on the same picture */
-     if ( $Abscissa != NULL )
-      {
+     if ( $Abscissa != NULL ) {
        foreach($Data["Axis"] as $AxisID => $Parameters)
         { if ($Parameters["Identity"] == AXIS_X) { unset($Data["Axis"][$AxisID]); } }
       }
 
      /* Build the scale settings */
      $GotXAxis = FALSE;
-     foreach($Data["Axis"] as $AxisID => $AxisParameter)
-      {
+     foreach($Data["Axis"] as $AxisID => $AxisParameter) {
        if ( $AxisParameter["Identity"] == AXIS_X ) { $GotXAxis = TRUE; }
 
        if ( $Pos == SCALE_POS_LEFTRIGHT && $AxisParameter["Identity"] == AXIS_Y)
-        { $Height = $this->GraphAreaY2-$this->GraphAreaY1 - $YMargin*2; }
-       elseif ( $Pos == SCALE_POS_LEFTRIGHT && $AxisParameter["Identity"] == AXIS_X)
-        { $Height = $this->GraphAreaX2-$this->GraphAreaX1; }
-       elseif ( $Pos == SCALE_POS_TOPBOTTOM && $AxisParameter["Identity"] == AXIS_Y)
-        { $Height = $this->GraphAreaX2-$this->GraphAreaX1 - $YMargin*2;; }
-       else
+        { $Height = $this->GraphAreaY2-$this->GraphAreaY1 - $YMargin*2; } elseif ( $Pos == SCALE_POS_LEFTRIGHT && $AxisParameter["Identity"] == AXIS_X)
+        { $Height = $this->GraphAreaX2-$this->GraphAreaX1; } elseif ( $Pos == SCALE_POS_TOPBOTTOM && $AxisParameter["Identity"] == AXIS_Y)
+        { $Height = $this->GraphAreaX2-$this->GraphAreaX1 - $YMargin*2;; } else
         { $Height = $this->GraphAreaY2-$this->GraphAreaY1; }
 
        $AxisMin = ABSOLUTE_MAX; $AxisMax = OUT_OF_SIGHT;
-       if ( $Mode == SCALE_MODE_FLOATING || $Mode == SCALE_MODE_START0 )
-        {
-         foreach($Data["Series"] as $SerieID => $SerieParameter)
-          {
-           if ( $SerieParameter["Axis"] == $AxisID && $Data["Series"][$SerieID]["isDrawable"] && $Data["Abscissa"] != $SerieID)
-            {
+       if ( $Mode == SCALE_MODE_FLOATING || $Mode == SCALE_MODE_START0 ) {
+         foreach($Data["Series"] as $SerieID => $SerieParameter) {
+           if ( $SerieParameter["Axis"] == $AxisID && $Data["Series"][$SerieID]["isDrawable"] && $Data["Abscissa"] != $SerieID) {
              $AxisMax = max($AxisMax,$Data["Series"][$SerieID]["Max"]);
              $AxisMin = min($AxisMin,$Data["Series"][$SerieID]["Min"]);
             }
@@ -1852,30 +1681,21 @@ 
 
          $Data["Axis"][$AxisID]["Min"] = $AxisMin-$AutoMargin; $Data["Axis"][$AxisID]["Max"] = $AxisMax+$AutoMargin;
          if ( $Mode == SCALE_MODE_START0 ) { $Data["Axis"][$AxisID]["Min"] = 0; }
-        }
-       elseif ( $Mode == SCALE_MODE_MANUAL )
-        {
-         if ( isset($ManualScale[$AxisID]["Min"]) && isset($ManualScale[$AxisID]["Max"]) )
-          {
+        } elseif ( $Mode == SCALE_MODE_MANUAL ) {
+         if ( isset($ManualScale[$AxisID]["Min"]) && isset($ManualScale[$AxisID]["Max"]) ) {
            $Data["Axis"][$AxisID]["Min"] = $ManualScale[$AxisID]["Min"];
            $Data["Axis"][$AxisID]["Max"] = $ManualScale[$AxisID]["Max"];
-          }
-         else
+          } else
           { echo "Manual scale boundaries not set."; exit(); }
-        }
-       elseif ( $Mode == SCALE_MODE_ADDALL || $Mode == SCALE_MODE_ADDALL_START0 )
-        {
+        } elseif ( $Mode == SCALE_MODE_ADDALL || $Mode == SCALE_MODE_ADDALL_START0 ) {
          $Series = "";
          foreach($Data["Series"] as $SerieID => $SerieParameter)
           { if ( $SerieParameter["Axis"] == $AxisID && $SerieParameter["isDrawable"] && $Data["Abscissa"] != $SerieID ) { $Series[$SerieID] = count($Data["Series"][$SerieID]["Data"]); } }
 
-         for ($ID=0;$ID<=max($Series)-1;$ID++)
-          {
+         for ($ID=0;$ID<=max($Series)-1;$ID++) {
            $PointMin = 0; $PointMax = 0;
-           foreach($Series as $SerieID => $ValuesCount )
-            {
-             if (isset($Data["Series"][$SerieID]["Data"][$ID]) && $Data["Series"][$SerieID]["Data"][$ID] != NULL )
-              {
+           foreach($Series as $SerieID => $ValuesCount ) {
+             if (isset($Data["Series"][$SerieID]["Data"][$ID]) && $Data["Series"][$SerieID]["Data"][$ID] != NULL ) {
                $Value = $Data["Series"][$SerieID]["Data"][$ID];
                if ( $Value > 0 ) { $PointMax = $PointMax + $Value; } else { $PointMin = $PointMin + $Value; }
               }
@@ -1906,18 +1726,14 @@ 
       }
 
      /* Still no X axis */
-     if ( $GotXAxis == FALSE )
-      {
-       if ( $Abscissa != NULL )
-        {
+     if ( $GotXAxis == FALSE ) {
+       if ( $Abscissa != NULL ) {
          $Points = count($Data["Series"][$Abscissa]["Data"]);
          if ( $AutoAxisLabels )
           $AxisName = isset($Data["Series"][$Abscissa]["Description"]) ? $Data["Series"][$Abscissa]["Description"] : NULL;
          else
           $AxisName = NULL;
-        }
-       else
-        {
+        } else {
          $Points = 0;
          $AxisName = isset($Data["XAxisName"]) ? $Data["XAxisName"] : NULL;
          foreach($Data["Series"] as $SerieID => $SerieParameter)
@@ -1928,19 +1744,16 @@ 
        $Data["Axis"][$AxisID]["Identity"] = AXIS_X;
        if ( $Pos == SCALE_POS_LEFTRIGHT ) { $Data["Axis"][$AxisID]["Position"] = AXIS_POSITION_BOTTOM; } else { $Data["Axis"][$AxisID]["Position"] = AXIS_POSITION_LEFT; }
        if ( isset($Data["AbscissaName"]) ) { $Data["Axis"][$AxisID]["Name"] = $Data["AbscissaName"]; }
-       if ( $XMargin == AUTO )
-        {
+       if ( $XMargin == AUTO ) {
          if ( $Pos == SCALE_POS_LEFTRIGHT )
-          { $Height = $this->GraphAreaX2-$this->GraphAreaX1; }
-         else
+          { $Height = $this->GraphAreaX2-$this->GraphAreaX1; } else
           { $Height = $this->GraphAreaY2-$this->GraphAreaY1; }
 
          if ( $Points == 1 )
           $Data["Axis"][$AxisID]["Margin"] = $Height / 2;
          else
           $Data["Axis"][$AxisID]["Margin"] = ($Height/$Points) / 2;
-        }
-       else
+        } else
         { $Data["Axis"][$AxisID]["Margin"] = $XMargin; }
        $Data["Axis"][$AxisID]["Rows"] = $Points-1;
        if ( !isset($Data["Axis"][$AxisID]["Display"]) ) { $Data["Axis"][$AxisID]["Display"] = NULL; }
@@ -1949,11 +1762,9 @@ 
       }
 
      /* Do we need to reverse the abscissa position? */
-     if ( $Pos != SCALE_POS_LEFTRIGHT )
-      {
+     if ( $Pos != SCALE_POS_LEFTRIGHT ) {
        if ( $Data["AbsicssaPosition"] == AXIS_POSITION_BOTTOM )
-        { $Data["AbsicssaPosition"] = AXIS_POSITION_LEFT; }
-       else
+        { $Data["AbsicssaPosition"] = AXIS_POSITION_LEFT; } else
         { $Data["AbsicssaPosition"] = AXIS_POSITION_RIGHT; }
       }
      $Data["Axis"][$AxisID]["Position"] = $Data["AbsicssaPosition"];
@@ -1965,38 +1776,29 @@ 
      $FontColorRo = $this->FontColorR; $FontColorGo = $this->FontColorG; $FontColorBo = $this->FontColorB;
 
      $AxisPos["L"] = $this->GraphAreaX1; $AxisPos["R"] = $this->GraphAreaX2; $AxisPos["T"] = $this->GraphAreaY1; $AxisPos["B"] = $this->GraphAreaY2;
-     foreach($Data["Axis"] as $AxisID => $Parameters)
-      {
-       if ( isset($Parameters["Color"]) )
-        {
+     foreach($Data["Axis"] as $AxisID => $Parameters) {
+       if ( isset($Parameters["Color"]) ) {
          $AxisR = $Parameters["Color"]["R"]; $AxisG = $Parameters["Color"]["G"]; $AxisB = $Parameters["Color"]["B"];
          $TickR = $Parameters["Color"]["R"]; $TickG = $Parameters["Color"]["G"]; $TickB = $Parameters["Color"]["B"];
          $this->setFontProperties(array("R"=>$Parameters["Color"]["R"],"G"=>$Parameters["Color"]["G"],"B"=>$Parameters["Color"]["B"]));
-        }
-       else
-        {
+        } else {
          $AxisR = $AxisRo; $AxisG = $AxisGo; $AxisB = $AxisBo;
          $TickR = $TickRo; $TickG = $TickGo; $TickB = $TickBo;
          $this->setFontProperties(array("R"=>$FontColorRo,"G"=>$FontColorGo,"B"=>$FontColorBo));
         }
 
        $LastValue = "w00t"; $ID = 1;
-       if ( $Parameters["Identity"] == AXIS_X )
-        {
-         if ( $Pos == SCALE_POS_LEFTRIGHT )
-          {
-           if ( $Parameters["Position"] == AXIS_POSITION_BOTTOM )
-            {
+       if ( $Parameters["Identity"] == AXIS_X ) {
+         if ( $Pos == SCALE_POS_LEFTRIGHT ) {
+           if ( $Parameters["Position"] == AXIS_POSITION_BOTTOM ) {
              if ( $LabelRotation == 0 )					{ $LabelAlign = TEXT_ALIGN_TOPMIDDLE; $YLabelOffset = 2; }
              if ( $LabelRotation > 0 && $LabelRotation < 190 )		{ $LabelAlign = TEXT_ALIGN_MIDDLERIGHT; $YLabelOffset = 5; }
              if ( $LabelRotation == 180 )				{ $LabelAlign = TEXT_ALIGN_BOTTOMMIDDLE; $YLabelOffset = 5; }
              if ( $LabelRotation > 180 && $LabelRotation < 360 )	{ $LabelAlign = TEXT_ALIGN_MIDDLELEFT; $YLabelOffset = 2; }
 
-             if ( !$RemoveXAxis )
-              {
+             if ( !$RemoveXAxis ) {
                if ( $Floating )
-                { $FloatingOffset = $YMargin; $this->drawLine($this->GraphAreaX1+$Parameters["Margin"],$AxisPos["B"],$this->GraphAreaX2-$Parameters["Margin"],$AxisPos["B"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
-               else
+                { $FloatingOffset = $YMargin; $this->drawLine($this->GraphAreaX1+$Parameters["Margin"],$AxisPos["B"],$this->GraphAreaX2-$Parameters["Margin"],$AxisPos["B"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); } else
                 { $FloatingOffset = 0; $this->drawLine($this->GraphAreaX1,$AxisPos["B"],$this->GraphAreaX2,$AxisPos["B"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
 
                if ( $DrawArrows ) { $this->drawArrow($this->GraphAreaX2-$Parameters["Margin"],$AxisPos["B"],$this->GraphAreaX2+($ArrowSize*2),$AxisPos["B"],array("FillR"=>$AxisR,"FillG"=>$AxisG,"FillB"=>$AxisB,"Size"=>$ArrowSize)); }
@@ -2007,15 +1809,12 @@ 
              if ($Parameters["Rows"] == 0 ) { $Step  = $Width; } else { $Step  = $Width / ($Parameters["Rows"]); }
              
              $MaxBottom = $AxisPos["B"];
-             for($i=0;$i<=$Parameters["Rows"];$i++)
-              {
+             for($i=0;$i<=$Parameters["Rows"];$i++) {
                $XPos  = $this->GraphAreaX1 + $Parameters["Margin"] + $Step*$i;
                $YPos  = $AxisPos["B"];
 
                if ( $Abscissa != NULL )
-                { if ( isset($Data["Series"][$Abscissa]["Data"][$i]) ) { $Value = $this->scaleFormat($Data["Series"][$Abscissa]["Data"][$i],$Data["XAxisDisplay"],$Data["XAxisFormat"],$Data["XAxisUnit"]); } else { $Value = ""; } }
-               else
-                {
+                { if ( isset($Data["Series"][$Abscissa]["Data"][$i]) ) { $Value = $this->scaleFormat($Data["Series"][$Abscissa]["Data"][$i],$Data["XAxisDisplay"],$Data["XAxisFormat"],$Data["XAxisUnit"]); } else { $Value = ""; } } else {
                  if ( isset($Parameters["ScaleMin"]) && isset ($Parameters["RowHeight"]) )
                   $Value = $this->scaleFormat($Parameters["ScaleMin"] + $Parameters["RowHeight"]*$i,$Data["XAxisDisplay"],$Data["XAxisFormat"],$Data["XAxisUnit"]);
                  else
@@ -2023,8 +1822,7 @@ 
                 }
 
                $ID++; $Skipped = TRUE;
-               if ( $this->isValidLabel($Value,$LastValue,$LabelingMethod,$ID,$LabelSkip) && !$RemoveXAxis)
-                {
+               if ( $this->isValidLabel($Value,$LastValue,$LabelingMethod,$ID,$LabelSkip) && !$RemoveXAxis) {
                  $Bounds    = $this->drawText($XPos,$YPos+$OuterTickWidth+$YLabelOffset,$Value,array("Angle"=>$LabelRotation,"Align"=>$LabelAlign));
                  $TxtBottom = $YPos+$OuterTickWidth+2+($Bounds[0]["Y"]-$Bounds[2]["Y"]);
                  $MaxBottom = max($MaxBottom,$TxtBottom);
@@ -2034,20 +1832,16 @@ 
 
                if ( $RemoveXAxis ) { $Skipped   = FALSE; }
 
-               if ( $Skipped )
-                {
+               if ( $Skipped ) {
                  if ( $DrawXLines ) { $this->drawLine($XPos,$this->GraphAreaY1+$FloatingOffset,$XPos,$this->GraphAreaY2-$FloatingOffset,$SkippedAxisColor); }
                  if ( ($SkippedInnerTickWidth !=0 || $SkippedOuterTickWidth != 0) && !$RemoveXAxis ) { $this->drawLine($XPos,$YPos-$SkippedInnerTickWidth,$XPos,$YPos+$SkippedOuterTickWidth,$SkippedTickColor); }
-                }
-               else
-                {
+                } else {
                  if ( $DrawXLines && ($XPos != $this->GraphAreaX1 && $XPos != $this->GraphAreaX2) ) { $this->drawLine($XPos,$this->GraphAreaY1+$FloatingOffset,$XPos,$this->GraphAreaY2-$FloatingOffset,array("R"=>$GridR,"G"=>$GridG,"B"=>$GridB,"Alpha"=>$GridAlpha,"Ticks"=>$GridTicks)); }
                  if ( ($InnerTickWidth !=0 || $OuterTickWidth != 0) && !$RemoveXAxis ) { $this->drawLine($XPos,$YPos-$InnerTickWidth,$XPos,$YPos+$OuterTickWidth,array("R"=>$TickR,"G"=>$TickG,"B"=>$TickB,"Alpha"=>$TickAlpha)); }
                 }
               }
 
-             if ( isset($Parameters["Name"]) && !$RemoveXAxis)
-              {
+             if ( isset($Parameters["Name"]) && !$RemoveXAxis) {
                $YPos   = $MaxBottom+2;
                $XPos   = $this->GraphAreaX1+($this->GraphAreaX2-$this->GraphAreaX1)/2;
                $Bounds = $this->drawText($XPos,$YPos,$Parameters["Name"],array("Align"=>TEXT_ALIGN_TOPMIDDLE));
@@ -2057,19 +1851,15 @@ 
               }
 
              $AxisPos["B"] = $MaxBottom + $ScaleSpacing;
-            }
-           elseif ( $Parameters["Position"] == AXIS_POSITION_TOP )
-            {
+            } elseif ( $Parameters["Position"] == AXIS_POSITION_TOP ) {
              if ( $LabelRotation == 0 )					{ $LabelAlign = TEXT_ALIGN_BOTTOMMIDDLE; $YLabelOffset = 2; }
              if ( $LabelRotation > 0 && $LabelRotation < 190 )		{ $LabelAlign = TEXT_ALIGN_MIDDLELEFT; $YLabelOffset = 2; }
              if ( $LabelRotation == 180 )				{ $LabelAlign = TEXT_ALIGN_TOPMIDDLE; $YLabelOffset = 5; }
              if ( $LabelRotation > 180 && $LabelRotation < 360 )	{ $LabelAlign = TEXT_ALIGN_MIDDLERIGHT; $YLabelOffset = 5; }
 
-             if ( !$RemoveXAxis )
-              {
+             if ( !$RemoveXAxis ) {
                if ( $Floating )
-                { $FloatingOffset = $YMargin; $this->drawLine($this->GraphAreaX1+$Parameters["Margin"],$AxisPos["T"],$this->GraphAreaX2-$Parameters["Margin"],$AxisPos["T"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
-               else
+                { $FloatingOffset = $YMargin; $this->drawLine($this->GraphAreaX1+$Parameters["Margin"],$AxisPos["T"],$this->GraphAreaX2-$Parameters["Margin"],$AxisPos["T"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); } else
                 { $FloatingOffset = 0; $this->drawLine($this->GraphAreaX1,$AxisPos["T"],$this->GraphAreaX2,$AxisPos["T"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
 
                if ( $DrawArrows ) { $this->drawArrow($this->GraphAreaX2-$Parameters["Margin"],$AxisPos["T"],$this->GraphAreaX2+($ArrowSize*2),$AxisPos["T"],array("FillR"=>$AxisR,"FillG"=>$AxisG,"FillB"=>$AxisB,"Size"=>$ArrowSize)); }
@@ -2080,15 +1870,12 @@ 
              if ($Parameters["Rows"] == 0 ) { $Step  = $Width; } else { $Step  = $Width / $Parameters["Rows"]; }
              
              $MinTop = $AxisPos["T"];
-             for($i=0;$i<=$Parameters["Rows"];$i++)
-              {
+             for($i=0;$i<=$Parameters["Rows"];$i++) {
                $XPos  = $this->GraphAreaX1 + $Parameters["Margin"] + $Step*$i;
                $YPos  = $AxisPos["T"];
 
                if ( $Abscissa != NULL )
-                { if ( isset($Data["Series"][$Abscissa]["Data"][$i]) ) { $Value = $this->scaleFormat($Data["Series"][$Abscissa]["Data"][$i],$Data["XAxisDisplay"],$Data["XAxisFormat"],$Data["XAxisUnit"]); } else { $Value = ""; } }
-               else
-                {
+                { if ( isset($Data["Series"][$Abscissa]["Data"][$i]) ) { $Value = $this->scaleFormat($Data["Series"][$Abscissa]["Data"][$i],$Data["XAxisDisplay"],$Data["XAxisFormat"],$Data["XAxisUnit"]); } else { $Value = ""; } } else {
                  if ( isset($Parameters["ScaleMin"]) && isset ($Parameters["RowHeight"]) )
                   $Value = $this->scaleFormat($Parameters["ScaleMin"] + $Parameters["RowHeight"]*$i,$Data["XAxisDisplay"],$Data["XAxisFormat"],$Data["XAxisUnit"]);
                  else
@@ -2096,8 +1883,7 @@ 
                 }
 
                $ID++; $Skipped = TRUE;
-               if ( $this->isValidLabel($Value,$LastValue,$LabelingMethod,$ID,$LabelSkip) && !$RemoveXAxis)
-                {
+               if ( $this->isValidLabel($Value,$LastValue,$LabelingMethod,$ID,$LabelSkip) && !$RemoveXAxis) {
                  $Bounds = $this->drawText($XPos,$YPos-$OuterTickWidth-$YLabelOffset,$Value,array("Angle"=>$LabelRotation,"Align"=>$LabelAlign));
                  $TxtBox = $YPos-$OuterTickWidth-2-($Bounds[0]["Y"]-$Bounds[2]["Y"]);
                  $MinTop = min($MinTop,$TxtBox);
@@ -2107,21 +1893,17 @@ 
 
                if ( $RemoveXAxis ) { $Skipped   = FALSE; }
 
-               if ( $Skipped )
-                {
+               if ( $Skipped ) {
                  if ( $DrawXLines ) { $this->drawLine($XPos,$this->GraphAreaY1+$FloatingOffset,$XPos,$this->GraphAreaY2-$FloatingOffset,$SkippedAxisColor); }
                  if ( ($SkippedInnerTickWidth !=0 || $SkippedOuterTickWidth != 0) && !$RemoveXAxis ) { $this->drawLine($XPos,$YPos+$SkippedInnerTickWidth,$XPos,$YPos-$SkippedOuterTickWidth,$SkippedTickColor); }
-                }
-               else
-                {
+                } else {
                  if ( $DrawXLines ) { $this->drawLine($XPos,$this->GraphAreaY1+$FloatingOffset,$XPos,$this->GraphAreaY2-$FloatingOffset,array("R"=>$GridR,"G"=>$GridG,"B"=>$GridB,"Alpha"=>$GridAlpha,"Ticks"=>$GridTicks)); }
                  if ( ($InnerTickWidth !=0 || $OuterTickWidth != 0) && !$RemoveXAxis ) { $this->drawLine($XPos,$YPos+$InnerTickWidth,$XPos,$YPos-$OuterTickWidth,array("R"=>$TickR,"G"=>$TickG,"B"=>$TickB,"Alpha"=>$TickAlpha)); }
                 }
 
               }
 
-             if ( isset($Parameters["Name"]) && !$RemoveXAxis )
-              {
+             if ( isset($Parameters["Name"]) && !$RemoveXAxis ) {
                $YPos   = $MinTop-2;
                $XPos   = $this->GraphAreaX1+($this->GraphAreaX2-$this->GraphAreaX1)/2;
                $Bounds = $this->drawText($XPos,$YPos,$Parameters["Name"],array("Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
@@ -2132,21 +1914,16 @@ 
 
              $AxisPos["T"] = $MinTop - $ScaleSpacing;
             }
-          }
-         elseif ( $Pos == SCALE_POS_TOPBOTTOM )
-          {
-           if ( $Parameters["Position"] == AXIS_POSITION_LEFT )
-            {
+          } elseif ( $Pos == SCALE_POS_TOPBOTTOM ) {
+           if ( $Parameters["Position"] == AXIS_POSITION_LEFT ) {
              if ( $LabelRotation == 0 )					{ $LabelAlign = TEXT_ALIGN_MIDDLERIGHT; $XLabelOffset = -2; }
              if ( $LabelRotation > 0 && $LabelRotation < 190 )		{ $LabelAlign = TEXT_ALIGN_MIDDLERIGHT; $XLabelOffset = -6; }
              if ( $LabelRotation == 180 )				{ $LabelAlign = TEXT_ALIGN_MIDDLELEFT; $XLabelOffset = -2; }
              if ( $LabelRotation > 180 && $LabelRotation < 360 )	{ $LabelAlign = TEXT_ALIGN_MIDDLELEFT; $XLabelOffset = -5; }
 
-             if ( !$RemoveXAxis )
-              {
+             if ( !$RemoveXAxis ) {
                if ( $Floating )
-                { $FloatingOffset = $YMargin; $this->drawLine($AxisPos["L"],$this->GraphAreaY1+$Parameters["Margin"],$AxisPos["L"],$this->GraphAreaY2-$Parameters["Margin"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
-               else
+                { $FloatingOffset = $YMargin; $this->drawLine($AxisPos["L"],$this->GraphAreaY1+$Parameters["Margin"],$AxisPos["L"],$this->GraphAreaY2-$Parameters["Margin"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); } else
                 { $FloatingOffset = 0; $this->drawLine($AxisPos["L"],$this->GraphAreaY1,$AxisPos["L"],$this->GraphAreaY2,array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
 
                if ( $DrawArrows ) { $this->drawArrow($AxisPos["L"],$this->GraphAreaY2-$Parameters["Margin"],$AxisPos["L"],$this->GraphAreaY2+($ArrowSize*2),array("FillR"=>$AxisR,"FillG"=>$AxisG,"FillB"=>$AxisB,"Size"=>$ArrowSize)); }
@@ -2157,15 +1934,12 @@ 
              if ($Parameters["Rows"] == 0 ) { $Step  = $Height; } else { $Step   = $Height / $Parameters["Rows"]; }
 
              $MinLeft = $AxisPos["L"];
-             for($i=0;$i<=$Parameters["Rows"];$i++)
-              {
+             for($i=0;$i<=$Parameters["Rows"];$i++) {
                $YPos  = $this->GraphAreaY1 + $Parameters["Margin"] + $Step*$i;
                $XPos  = $AxisPos["L"];
 
                if ( $Abscissa != NULL )
-                { if ( isset($Data["Series"][$Abscissa]["Data"][$i]) ) { $Value = $this->scaleFormat($Data["Series"][$Abscissa]["Data"][$i],$Data["XAxisDisplay"],$Data["XAxisFormat"],$Data["XAxisUnit"]); } else { $Value = ""; } }
-               else
-                {
+                { if ( isset($Data["Series"][$Abscissa]["Data"][$i]) ) { $Value = $this->scaleFormat($Data["Series"][$Abscissa]["Data"][$i],$Data["XAxisDisplay"],$Data["XAxisFormat"],$Data["XAxisUnit"]); } else { $Value = ""; } } else {
                  if ( isset($Parameters["ScaleMin"]) && isset ($Parameters["RowHeight"]) )
                   $Value = $this->scaleFormat($Parameters["ScaleMin"] + $Parameters["RowHeight"]*$i,$Data["XAxisDisplay"],$Data["XAxisFormat"],$Data["XAxisUnit"]);
                  else
@@ -2173,8 +1947,7 @@ 
                 }
 
                $ID++; $Skipped = TRUE;
-               if ( $this->isValidLabel($Value,$LastValue,$LabelingMethod,$ID,$LabelSkip) && !$RemoveXAxis)
-                {
+               if ( $this->isValidLabel($Value,$LastValue,$LabelingMethod,$ID,$LabelSkip) && !$RemoveXAxis) {
                  $Bounds  = $this->drawText($XPos-$OuterTickWidth+$XLabelOffset,$YPos,$Value,array("Angle"=>$LabelRotation,"Align"=>$LabelAlign));
                  $TxtBox  = $XPos-$OuterTickWidth-2-($Bounds[1]["X"]-$Bounds[0]["X"]);
                  $MinLeft = min($MinLeft,$TxtBox);
@@ -2184,20 +1957,16 @@ 
 
                if ( $RemoveXAxis ) { $Skipped   = FALSE; }
 
-               if ( $Skipped )
-                {
+               if ( $Skipped ) {
                  if ( $DrawXLines ) { $this->drawLine($this->GraphAreaX1+$FloatingOffset,$YPos,$this->GraphAreaX2-$FloatingOffset,$YPos,$SkippedAxisColor); }
                  if ( ($SkippedInnerTickWidth !=0 || $SkippedOuterTickWidth != 0) && !$RemoveXAxis ) { $this->drawLine($XPos-$SkippedOuterTickWidth,$YPos,$XPos+$SkippedInnerTickWidth,$YPos,$SkippedTickColor); }
-                }
-               else
-                {
+                } else {
                  if ( $DrawXLines && ($YPos != $this->GraphAreaY1 && $YPos != $this->GraphAreaY2) ) { $this->drawLine($this->GraphAreaX1+$FloatingOffset,$YPos,$this->GraphAreaX2-$FloatingOffset,$YPos,array("R"=>$GridR,"G"=>$GridG,"B"=>$GridB,"Alpha"=>$GridAlpha,"Ticks"=>$GridTicks)); }
                  if ( ($InnerTickWidth !=0 || $OuterTickWidth != 0) && !$RemoveXAxis ) { $this->drawLine($XPos-$OuterTickWidth,$YPos,$XPos+$InnerTickWidth,$YPos,array("R"=>$TickR,"G"=>$TickG,"B"=>$TickB,"Alpha"=>$TickAlpha)); }
                 }
 
               }
-             if ( isset($Parameters["Name"]) && !$RemoveXAxis )
-              {
+             if ( isset($Parameters["Name"]) && !$RemoveXAxis ) {
                $XPos   = $MinLeft-2;
                $YPos   = $this->GraphAreaY1+($this->GraphAreaY2-$this->GraphAreaY1)/2;
                $Bounds = $this->drawText($XPos,$YPos,$Parameters["Name"],array("Align"=>TEXT_ALIGN_BOTTOMMIDDLE,"Angle"=>90));
@@ -2207,19 +1976,15 @@ 
               }
 
              $AxisPos["L"] = $MinLeft - $ScaleSpacing;
-            }
-           elseif ( $Parameters["Position"] == AXIS_POSITION_RIGHT )
-            {
+            } elseif ( $Parameters["Position"] == AXIS_POSITION_RIGHT ) {
              if ( $LabelRotation == 0 )					{ $LabelAlign = TEXT_ALIGN_MIDDLELEFT; $XLabelOffset = 2; }
              if ( $LabelRotation > 0 && $LabelRotation < 190 )		{ $LabelAlign = TEXT_ALIGN_MIDDLELEFT; $XLabelOffset = 6; }
              if ( $LabelRotation == 180 )				{ $LabelAlign = TEXT_ALIGN_MIDDLERIGHT; $XLabelOffset = 5; }
              if ( $LabelRotation > 180 && $LabelRotation < 360 )	{ $LabelAlign = TEXT_ALIGN_MIDDLERIGHT; $XLabelOffset = 7; }
 
-             if ( !$RemoveXAxis )
-              {
+             if ( !$RemoveXAxis ) {
                if ( $Floating )
-                { $FloatingOffset = $YMargin; $this->drawLine($AxisPos["R"],$this->GraphAreaY1+$Parameters["Margin"],$AxisPos["R"],$this->GraphAreaY2-$Parameters["Margin"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
-               else
+                { $FloatingOffset = $YMargin; $this->drawLine($AxisPos["R"],$this->GraphAreaY1+$Parameters["Margin"],$AxisPos["R"],$this->GraphAreaY2-$Parameters["Margin"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); } else
                 { $FloatingOffset = 0; $this->drawLine($AxisPos["R"],$this->GraphAreaY1,$AxisPos["R"],$this->GraphAreaY2,array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
 
                if ( $DrawArrows ) { $this->drawArrow($AxisPos["R"],$this->GraphAreaY2-$Parameters["Margin"],$AxisPos["R"],$this->GraphAreaY2+($ArrowSize*2),array("FillR"=>$AxisR,"FillG"=>$AxisG,"FillB"=>$AxisB,"Size"=>$ArrowSize)); }
@@ -2230,15 +1995,12 @@ 
              if ($Parameters["Rows"] == 0 ) { $Step  = $Height; } else { $Step   = $Height / $Parameters["Rows"]; }
              
              $MaxRight = $AxisPos["R"];
-             for($i=0;$i<=$Parameters["Rows"];$i++)
-              {
+             for($i=0;$i<=$Parameters["Rows"];$i++) {
                $YPos  = $this->GraphAreaY1 + $Parameters["Margin"] + $Step*$i;
                $XPos  = $AxisPos["R"];
 
                if ( $Abscissa != NULL )
-                { if ( isset($Data["Series"][$Abscissa]["Data"][$i]) ) { $Value = $this->scaleFormat($Data["Series"][$Abscissa]["Data"][$i],$Data["XAxisDisplay"],$Data["XAxisFormat"],$Data["XAxisUnit"]); } else { $Value = ""; } }
-               else
-                {
+                { if ( isset($Data["Series"][$Abscissa]["Data"][$i]) ) { $Value = $this->scaleFormat($Data["Series"][$Abscissa]["Data"][$i],$Data["XAxisDisplay"],$Data["XAxisFormat"],$Data["XAxisUnit"]); } else { $Value = ""; } } else {
                  if ( isset($Parameters["ScaleMin"]) && isset ($Parameters["RowHeight"]) )
                   $Value = $this->scaleFormat($Parameters["ScaleMin"] + $Parameters["RowHeight"]*$i,$Data["XAxisDisplay"],$Data["XAxisFormat"],$Data["XAxisUnit"]);
                  else
@@ -2246,8 +2008,7 @@ 
                 }
 
                $ID++; $Skipped = TRUE;
-               if ( $this->isValidLabel($Value,$LastValue,$LabelingMethod,$ID,$LabelSkip) && !$RemoveXAxis)
-                {
+               if ( $this->isValidLabel($Value,$LastValue,$LabelingMethod,$ID,$LabelSkip) && !$RemoveXAxis) {
                  $Bounds   = $this->drawText($XPos+$OuterTickWidth+$XLabelOffset,$YPos,$Value,array("Angle"=>$LabelRotation,"Align"=>$LabelAlign));
                  $TxtBox   = $XPos+$OuterTickWidth+2+($Bounds[1]["X"]-$Bounds[0]["X"]);
                  $MaxRight = max($MaxRight,$TxtBox);
@@ -2257,21 +2018,17 @@ 
 
                if ( $RemoveXAxis ) { $Skipped   = FALSE; }
 
-               if ( $Skipped )
-                {
+               if ( $Skipped ) {
                  if ( $DrawXLines ) { $this->drawLine($this->GraphAreaX1+$FloatingOffset,$YPos,$this->GraphAreaX2-$FloatingOffset,$YPos,$SkippedAxisColor); }
                  if ( ($SkippedInnerTickWidth != 0 || $SkippedOuterTickWidth != 0) && !$RemoveXAxis ) { $this->drawLine($XPos+$SkippedOuterTickWidth,$YPos,$XPos-$SkippedInnerTickWidth,$YPos,$SkippedTickColor); }
-                }
-               else
-                {
+                } else {
                  if ( $DrawXLines ) { $this->drawLine($this->GraphAreaX1+$FloatingOffset,$YPos,$this->GraphAreaX2-$FloatingOffset,$YPos,array("R"=>$GridR,"G"=>$GridG,"B"=>$GridB,"Alpha"=>$GridAlpha,"Ticks"=>$GridTicks)); }
                  if ( ($InnerTickWidth != 0 || $OuterTickWidth != 0) && !$RemoveXAxis ) { $this->drawLine($XPos+$OuterTickWidth,$YPos,$XPos-$InnerTickWidth,$YPos,array("R"=>$TickR,"G"=>$TickG,"B"=>$TickB,"Alpha"=>$TickAlpha)); }
                 }
 
               }
 
-             if ( isset($Parameters["Name"]) && !$RemoveXAxis)
-              {
+             if ( isset($Parameters["Name"]) && !$RemoveXAxis) {
                $XPos   = $MaxRight+4;
                $YPos   = $this->GraphAreaY1+($this->GraphAreaY2-$this->GraphAreaY1)/2;
                $Bounds = $this->drawText($XPos,$YPos,$Parameters["Name"],array("Align"=>TEXT_ALIGN_BOTTOMMIDDLE,"Angle"=>270));
@@ -2287,16 +2044,12 @@ 
 
 
 
-       if ( $Parameters["Identity"] == AXIS_Y )
-        {
-         if ( $Pos == SCALE_POS_LEFTRIGHT )
-          {
-           if ( $Parameters["Position"] == AXIS_POSITION_LEFT )
-            {
+       if ( $Parameters["Identity"] == AXIS_Y ) {
+         if ( $Pos == SCALE_POS_LEFTRIGHT ) {
+           if ( $Parameters["Position"] == AXIS_POSITION_LEFT ) {
 
              if ( $Floating )
-              { $FloatingOffset = $XMargin; $this->drawLine($AxisPos["L"],$this->GraphAreaY1+$Parameters["Margin"],$AxisPos["L"],$this->GraphAreaY2-$Parameters["Margin"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
-             else
+              { $FloatingOffset = $XMargin; $this->drawLine($AxisPos["L"],$this->GraphAreaY1+$Parameters["Margin"],$AxisPos["L"],$this->GraphAreaY2-$Parameters["Margin"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); } else
               { $FloatingOffset = 0; $this->drawLine($AxisPos["L"],$this->GraphAreaY1,$AxisPos["L"],$this->GraphAreaY2,array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
 
              if ( $DrawArrows ) { $this->drawArrow($AxisPos["L"],$this->GraphAreaY1+$Parameters["Margin"],$AxisPos["L"],$this->GraphAreaY1-($ArrowSize*2),array("FillR"=>$AxisR,"FillG"=>$AxisG,"FillB"=>$AxisB,"Size"=>$ArrowSize)); }
@@ -2304,8 +2057,7 @@ 
              $Height = ($this->GraphAreaY2 - $this->GraphAreaY1) - $Parameters["Margin"]*2;
              $Step   = $Height / $Parameters["Rows"]; $SubTicksSize = $Step /2; $MinLeft = $AxisPos["L"];
              $LastY  = NULL;
-             for($i=0;$i<=$Parameters["Rows"];$i++)
-              {
+             for($i=0;$i<=$Parameters["Rows"];$i++) {
                $YPos  = $this->GraphAreaY2 - $Parameters["Margin"] - $Step*$i;
                $XPos  = $AxisPos["L"];
                $Value = $this->scaleFormat($Parameters["ScaleMin"] + $Parameters["RowHeight"]*$i,$Parameters["Display"],$Parameters["Format"],$Parameters["Unit"]);
@@ -2326,8 +2078,7 @@ 
                $LastY = $YPos;
               }
 
-             if ( isset($Parameters["Name"]) )
-              {
+             if ( isset($Parameters["Name"]) ) {
                $XPos    = $MinLeft-2;
                $YPos    = $this->GraphAreaY1+($this->GraphAreaY2-$this->GraphAreaY1)/2;
                $Bounds  = $this->drawText($XPos,$YPos,$Parameters["Name"],array("Align"=>TEXT_ALIGN_BOTTOMMIDDLE,"Angle"=>90));
@@ -2337,12 +2088,9 @@ 
               }
 
              $AxisPos["L"] = $MinLeft - $ScaleSpacing;
-            }
-           elseif ( $Parameters["Position"] == AXIS_POSITION_RIGHT )
-            {
+            } elseif ( $Parameters["Position"] == AXIS_POSITION_RIGHT ) {
              if ( $Floating )
-              { $FloatingOffset = $XMargin; $this->drawLine($AxisPos["R"],$this->GraphAreaY1+$Parameters["Margin"],$AxisPos["R"],$this->GraphAreaY2-$Parameters["Margin"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
-             else
+              { $FloatingOffset = $XMargin; $this->drawLine($AxisPos["R"],$this->GraphAreaY1+$Parameters["Margin"],$AxisPos["R"],$this->GraphAreaY2-$Parameters["Margin"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); } else
               { $FloatingOffset = 0; $this->drawLine($AxisPos["R"],$this->GraphAreaY1,$AxisPos["R"],$this->GraphAreaY2,array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
 
              if ( $DrawArrows ) { $this->drawArrow($AxisPos["R"],$this->GraphAreaY1+$Parameters["Margin"],$AxisPos["R"],$this->GraphAreaY1-($ArrowSize*2),array("FillR"=>$AxisR,"FillG"=>$AxisG,"FillB"=>$AxisB,"Size"=>$ArrowSize)); }
@@ -2350,8 +2098,7 @@ 
              $Height = ($this->GraphAreaY2 - $this->GraphAreaY1) - $Parameters["Margin"]*2;
              $Step   = $Height / $Parameters["Rows"]; $SubTicksSize = $Step /2; $MaxLeft = $AxisPos["R"];
              $LastY  = NULL;
-             for($i=0;$i<=$Parameters["Rows"];$i++)
-              {
+             for($i=0;$i<=$Parameters["Rows"];$i++) {
                $YPos  = $this->GraphAreaY2 - $Parameters["Margin"] - $Step*$i;
                $XPos  = $AxisPos["R"];
                $Value = $this->scaleFormat($Parameters["ScaleMin"] + $Parameters["RowHeight"]*$i,$Parameters["Display"],$Parameters["Format"],$Parameters["Unit"]);
@@ -2372,8 +2119,7 @@ 
                $LastY = $YPos;
               }
 
-             if ( isset($Parameters["Name"]) )
-              {
+             if ( isset($Parameters["Name"]) ) {
                $XPos    = $MaxLeft+6;
                $YPos    = $this->GraphAreaY1+($this->GraphAreaY2-$this->GraphAreaY1)/2;
                $Bounds  = $this->drawText($XPos,$YPos,$Parameters["Name"],array("Align"=>TEXT_ALIGN_BOTTOMMIDDLE,"Angle"=>270));
@@ -2383,14 +2129,10 @@ 
               }
              $AxisPos["R"] = $MaxLeft + $ScaleSpacing;
             }
-          }
-         elseif ( $Pos == SCALE_POS_TOPBOTTOM )
-          {
-           if ( $Parameters["Position"] == AXIS_POSITION_TOP )
-            {
+          } elseif ( $Pos == SCALE_POS_TOPBOTTOM ) {
+           if ( $Parameters["Position"] == AXIS_POSITION_TOP ) {
              if ( $Floating )
-              { $FloatingOffset = $XMargin; $this->drawLine($this->GraphAreaX1+$Parameters["Margin"],$AxisPos["T"],$this->GraphAreaX2-$Parameters["Margin"],$AxisPos["T"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
-             else
+              { $FloatingOffset = $XMargin; $this->drawLine($this->GraphAreaX1+$Parameters["Margin"],$AxisPos["T"],$this->GraphAreaX2-$Parameters["Margin"],$AxisPos["T"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); } else
               { $FloatingOffset = 0; $this->drawLine($this->GraphAreaX1,$AxisPos["T"],$this->GraphAreaX2,$AxisPos["T"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
 
              if ( $DrawArrows ) { $this->drawArrow($this->GraphAreaX2-$Parameters["Margin"],$AxisPos["T"],$this->GraphAreaX2+($ArrowSize*2),$AxisPos["T"],array("FillR"=>$AxisR,"FillG"=>$AxisG,"FillB"=>$AxisB,"Size"=>$ArrowSize)); }
@@ -2398,8 +2140,7 @@ 
              $Width = ($this->GraphAreaX2 - $this->GraphAreaX1) - $Parameters["Margin"]*2;
              $Step   = $Width / $Parameters["Rows"]; $SubTicksSize = $Step /2; $MinTop = $AxisPos["T"];
              $LastX  = NULL;
-             for($i=0;$i<=$Parameters["Rows"];$i++)
-              {
+             for($i=0;$i<=$Parameters["Rows"];$i++) {
                $XPos  = $this->GraphAreaX1 + $Parameters["Margin"] + $Step*$i;
                $YPos  = $AxisPos["T"];
                $Value = $this->scaleFormat($Parameters["ScaleMin"] + $Parameters["RowHeight"]*$i,$Parameters["Display"],$Parameters["Format"],$Parameters["Unit"]);
@@ -2420,8 +2161,7 @@ 
                $LastX = $XPos;
               }
 
-             if ( isset($Parameters["Name"]) )
-              {
+             if ( isset($Parameters["Name"]) ) {
                $YPos   = $MinTop-2;
                $XPos   = $this->GraphAreaX1+($this->GraphAreaX2-$this->GraphAreaX1)/2;
                $Bounds = $this->drawText($XPos,$YPos,$Parameters["Name"],array("Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
@@ -2431,12 +2171,9 @@ 
               }
 
              $AxisPos["T"] = $MinTop - $ScaleSpacing;
-            }
-           elseif ( $Parameters["Position"] == AXIS_POSITION_BOTTOM )
-            {
+            } elseif ( $Parameters["Position"] == AXIS_POSITION_BOTTOM ) {
              if ( $Floating )
-              { $FloatingOffset = $XMargin; $this->drawLine($this->GraphAreaX1+$Parameters["Margin"],$AxisPos["B"],$this->GraphAreaX2-$Parameters["Margin"],$AxisPos["B"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
-             else
+              { $FloatingOffset = $XMargin; $this->drawLine($this->GraphAreaX1+$Parameters["Margin"],$AxisPos["B"],$this->GraphAreaX2-$Parameters["Margin"],$AxisPos["B"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); } else
               { $FloatingOffset = 0; $this->drawLine($this->GraphAreaX1,$AxisPos["B"],$this->GraphAreaX2,$AxisPos["B"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
 
              if ( $DrawArrows ) { $this->drawArrow($this->GraphAreaX2-$Parameters["Margin"],$AxisPos["B"],$this->GraphAreaX2+($ArrowSize*2),$AxisPos["B"],array("FillR"=>$AxisR,"FillG"=>$AxisG,"FillB"=>$AxisB,"Size"=>$ArrowSize)); }
@@ -2444,8 +2181,7 @@ 
              $Width = ($this->GraphAreaX2 - $this->GraphAreaX1) - $Parameters["Margin"]*2;
              $Step   = $Width / $Parameters["Rows"]; $SubTicksSize = $Step /2; $MaxBottom = $AxisPos["B"];
              $LastX  = NULL;
-             for($i=0;$i<=$Parameters["Rows"];$i++)
-              {
+             for($i=0;$i<=$Parameters["Rows"];$i++) {
                $XPos  = $this->GraphAreaX1 + $Parameters["Margin"] + $Step*$i;
                $YPos  = $AxisPos["B"];
                $Value = $this->scaleFormat($Parameters["ScaleMin"] + $Parameters["RowHeight"]*$i,$Parameters["Display"],$Parameters["Format"],$Parameters["Unit"]);
@@ -2466,8 +2202,7 @@ 
                $LastX = $XPos;
               }
 
-             if ( isset($Parameters["Name"]) )
-              {
+             if ( isset($Parameters["Name"]) ) {
                $YPos   = $MaxBottom+2;
                $XPos   = $this->GraphAreaX1+($this->GraphAreaX2-$this->GraphAreaX1)/2;
                $Bounds = $this->drawText($XPos,$YPos,$Parameters["Name"],array("Align"=>TEXT_ALIGN_TOPMIDDLE));
@@ -2483,8 +2218,7 @@ 
       }
     }
 
-   function isValidLabel($Value,$LastValue,$LabelingMethod,$ID,$LabelSkip)
-    {
+   function isValidLabel($Value,$LastValue,$LabelingMethod,$ID,$LabelSkip) {
      if ( $LabelingMethod == LABELING_DIFFERENT && $Value != $LastValue ) { return(TRUE); }
      if ( $LabelingMethod == LABELING_DIFFERENT && $Value == $LastValue ) { return(FALSE); }
      if ( $LabelingMethod == LABELING_ALL && $LabelSkip == 0 ) { return(TRUE); }
@@ -2494,17 +2228,16 @@ 
     }
 
    /* Compute the scale, check for the best visual factors */
-   function computeScale($XMin,$XMax,$MaxDivs,$Factors,$AxisID=0)
-    {
+   function computeScale($XMin,$XMax,$MaxDivs,$Factors,$AxisID=0) {
      /* Compute each factors */
      $Results = "";
-     foreach ($Factors as $Key => $Factor)
-      $Results[$Factor] = $this->processScale($XMin,$XMax,$MaxDivs,array($Factor),$AxisID);
+     foreach ($Factors as $Key => $Factor) {
+           $Results[$Factor] = $this->processScale($XMin,$XMax,$MaxDivs,array($Factor),$AxisID);
+     }
 
      /* Remove scales that are creating to much decimals */
      $GoodScaleFactors = "";
-     foreach ($Results as $Key => $Result)
-      {
+     foreach ($Results as $Key => $Result) {
        $Decimals = preg_split("/\./",$Result["RowHeight"]);
        if ( (!isset($Decimals[1])) || (strlen($Decimals[1]) < 6) ) { $GoodScaleFactors[] = $Key; }
       }
@@ -2522,8 +2255,7 @@ 
     }
 
    /* Compute the best matching scale based on size & factors */
-   function processScale($XMin,$XMax,$MaxDivs,$Factors,$AxisID)
-    {
+   function processScale($XMin,$XMax,$MaxDivs,$Factors,$AxisID) {
      $ScaleHeight = abs(ceil($XMax)-floor($XMin));
 
      if ( isset($this->DataSet->Data["Axis"][$AxisID]["Format"]) )
@@ -2537,15 +2269,11 @@ 
       $Mode = AXIS_FORMAT_DEFAULT;
 
      $Scale = "";
-     if ( $XMin != $XMax )
-      {
+     if ( $XMin != $XMax ) {
        $Found = FALSE; $Rescaled = FALSE; $Scaled10Factor = .0001; $Result = 0;
-       while(!$Found)
-        {
-         foreach($Factors as $Key => $Factor)
-          {
-           if ( !$Found )
-            {
+       while(!$Found) {
+         foreach($Factors as $Key => $Factor) {
+           if ( !$Found ) {
              if ( !($this->modulo($XMin,$Factor*$Scaled10Factor) == 0) || ($XMin != floor($XMin))) { $XMinRescaled = floor($XMin/($Factor*$Scaled10Factor))*$Factor*$Scaled10Factor; } else { $XMinRescaled = $XMin; }
              if ( !($this->modulo($XMax,$Factor*$Scaled10Factor) == 0) || ($XMax != floor($XMax))) { $XMaxRescaled = floor($XMax/($Factor*$Scaled10Factor))*$Factor*$Scaled10Factor+($Factor*$Scaled10Factor); } else { $XMaxRescaled = $XMax; }
              $ScaleHeightRescaled = abs($XMaxRescaled-$XMinRescaled);
@@ -2567,16 +2295,12 @@ 
        $Scale["Rows"] = $Rows; $Scale["RowHeight"] = $RowHeight; $Scale["XMin"] = $XMin;  $Scale["XMax"] = $XMax;
 
        /* Compute the needed decimals for the metric view to avoid repetition of the same X Axis labels */
-       if ( $Mode == AXIS_FORMAT_METRIC && $Format == NULL )
-        {
+       if ( $Mode == AXIS_FORMAT_METRIC && $Format == NULL ) {
          $Done = FALSE; $GoodDecimals = 0;
-         for($Decimals=0;$Decimals<=10;$Decimals++)
-          {
-           if ( !$Done )
-            {
+         for($Decimals=0;$Decimals<=10;$Decimals++) {
+           if ( !$Done ) {
              $LastLabel = "zob"; $ScaleOK = TRUE;
-             for($i=0;$i<=$Rows;$i++)
-              {
+             for($i=0;$i<=$Rows;$i++) {
                $Value = $XMin + $i*$RowHeight;
                $Label = $this->scaleFormat($Value,AXIS_FORMAT_METRIC,$Decimals);
 
@@ -2589,9 +2313,7 @@ 
 
          $Scale["Format"] = $GoodDecimals;
         }
-      }
-     else
-      {
+      } else {
        /* If all values are the same we keep a +1/-1 scale */
        $Rows = 2; $XMin = $XMax-1; $XMax = $XMax+1; $RowHeight = 1;
 
@@ -2602,8 +2324,7 @@ 
      return($Scale);
     }
 
-   function modulo($Value1,$Value2)
-    {
+   function modulo($Value1,$Value2) {
      if (floor($Value2) == 0) { return(0); }
      if (floor($Value2) != 0) { return($Value1 % $Value2); }
 
@@ -2615,8 +2336,7 @@ 
     }
 
    /* Draw an X threshold */
-   function drawXThreshold($Value,$Format="")
-    {
+   function drawXThreshold($Value,$Format="") {
      $R			= isset($Format["R"]) ? $Format["R"] : 255;
      $G			= isset($Format["G"]) ? $Format["G"] : 0;
      $B			= isset($Format["B"]) ? $Format["B"] : 0;
@@ -2655,8 +2375,7 @@ 
 
      if ( is_array($Value) ) { foreach ($Value as $Key => $ID) { $this->drawXThreshold($ID,$Format); } return(0); }
 
-     if ( $ValueIsLabel )
-      {
+     if ( $ValueIsLabel ) {
        $Format["ValueIsLabel"] = FALSE;
        foreach($Data["Series"][$Data["Abscissa"]]["Data"] as $Key => $SerieValue)
         { if ( $SerieValue == $Value ) { $this->drawXThreshold($Key,$Format); } }
@@ -2669,41 +2388,33 @@ 
                               "BoxBorderR"=>$BoxBorderR,"BoxBorderG"=>$BoxBorderG,"BoxBorderB"=>$BoxBorderB,"BoxBorderAlpha"=>$BoxBorderAlpha,
                               "R"=>$CaptionR,"G"=>$CaptionG,"B"=>$CaptionB,"Alpha"=>$CaptionAlpha);
 
-     if ( $Caption == NULL )
-      {
-       if ( isset($Data["Abscissa"]) )
-        {
+     if ( $Caption == NULL ) {
+       if ( isset($Data["Abscissa"]) ) {
          if ( isset($Data["Series"][$Data["Abscissa"]]["Data"][$Value]) )
           $Caption = $Data["Series"][$Data["Abscissa"]]["Data"][$Value];
          else
           $Caption = $Value;
-        }
-       else
+        } else
         $Caption = $Value;
       }
 
-     if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
-      {
+     if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT ) {
        $XStep = (($this->GraphAreaX2 - $this->GraphAreaX1) - $XScale[0] *2 ) / $XScale[1];
        $XPos  = $this->GraphAreaX1 + $XScale[0] + $XStep * $Value;
        $YPos1 = $this->GraphAreaY1 + $Data["YMargin"];
        $YPos2 = $this->GraphAreaY2 - $Data["YMargin"];
 
-       if ( $XPos >= $this->GraphAreaX1 + $AbscissaMargin && $XPos <= $this->GraphAreaX2 - $AbscissaMargin )
-        {
+       if ( $XPos >= $this->GraphAreaX1 + $AbscissaMargin && $XPos <= $this->GraphAreaX2 - $AbscissaMargin ) {
          $this->drawLine($XPos,$YPos1,$XPos,$YPos2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight));
 
-         if ( $Wide )
-          {
+         if ( $Wide ) {
            $this->drawLine($XPos-1,$YPos1,$XPos-1,$YPos2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/$WideFactor,"Ticks"=>$Ticks));
            $this->drawLine($XPos+1,$YPos1,$XPos+1,$YPos2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/$WideFactor,"Ticks"=>$Ticks));
           }
 
-         if ( $WriteCaption )
-          {
+         if ( $WriteCaption ) {
            if ( $CaptionAlign == CAPTION_LEFT_TOP )
-            { $Y = $YPos1 + $CaptionOffset; $CaptionSettings["Align"] = TEXT_ALIGN_TOPMIDDLE; }
-           else 
+            { $Y = $YPos1 + $CaptionOffset; $CaptionSettings["Align"] = TEXT_ALIGN_TOPMIDDLE; } else 
             { $Y = $YPos2 - $CaptionOffset; $CaptionSettings["Align"] = TEXT_ALIGN_BOTTOMMIDDLE; }
            
            $this->drawText($XPos,$Y,$Caption,$CaptionSettings);
@@ -2711,29 +2422,23 @@ 
 
          return(array("X"=>$XPos));
         }
-      }
-     elseif( $Data["Orientation"] == SCALE_POS_TOPBOTTOM )
-      {
+      } elseif( $Data["Orientation"] == SCALE_POS_TOPBOTTOM ) {
        $XStep = (($this->GraphAreaY2 - $this->GraphAreaY1) - $XScale[0] *2 ) / $XScale[1];
        $XPos  = $this->GraphAreaY1 + $XScale[0] + $XStep * $Value;
        $YPos1 = $this->GraphAreaX1 + $Data["YMargin"];
        $YPos2 = $this->GraphAreaX2 - $Data["YMargin"];
 
-       if ( $XPos >= $this->GraphAreaY1 + $AbscissaMargin && $XPos <= $this->GraphAreaY2 - $AbscissaMargin )
-        {
+       if ( $XPos >= $this->GraphAreaY1 + $AbscissaMargin && $XPos <= $this->GraphAreaY2 - $AbscissaMargin ) {
          $this->drawLine($YPos1,$XPos,$YPos2,$XPos,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight));
 
-         if ( $Wide )
-          {
+         if ( $Wide ) {
            $this->drawLine($YPos1,$XPos-1,$YPos2,$XPos-1,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/$WideFactor,"Ticks"=>$Ticks));
            $this->drawLine($YPos1,$XPos+1,$YPos2,$XPos+1,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/$WideFactor,"Ticks"=>$Ticks));
           }
 
-         if ( $WriteCaption )
-          {
+         if ( $WriteCaption ) {
            if ( $CaptionAlign == CAPTION_LEFT_TOP )
-            { $Y = $YPos1 + $CaptionOffset; $CaptionSettings["Align"] = TEXT_ALIGN_MIDDLELEFT; }
-           else 
+            { $Y = $YPos1 + $CaptionOffset; $CaptionSettings["Align"] = TEXT_ALIGN_MIDDLELEFT; } else 
             { $Y = $YPos2 - $CaptionOffset; $CaptionSettings["Align"] = TEXT_ALIGN_MIDDLERIGHT; }
            
            $this->drawText($Y,$XPos,$Caption,$CaptionSettings);
@@ -2745,8 +2450,7 @@ 
     }
 
    /* Draw an X threshold area */
-   function drawXThresholdArea($Value1,$Value2,$Format="")
-    {
+   function drawXThresholdArea($Value1,$Value2,$Format="") {
      $R		= isset($Format["R"]) ? $Format["R"] : 255;
      $G		= isset($Format["G"]) ? $Format["G"] : 0;
      $B		= isset($Format["B"]) ? $Format["B"] : 0;
@@ -2774,8 +2478,7 @@ 
      $XScale         = $this->scaleGetXSettings();
      $AbscissaMargin = $this->getAbscissaMargin($Data);
 
-     if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
-      {
+     if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT ) {
        $XStep = (($this->GraphAreaX2 - $this->GraphAreaX1) - $XScale[0] *2 ) / $XScale[1];
        $XPos1 = $this->GraphAreaX1 + $XScale[0] + $XStep * $Value1;
        $XPos2 = $this->GraphAreaX1 + $XScale[0] + $XStep * $Value2;
@@ -2789,19 +2492,16 @@ 
 
        $this->drawFilledRectangle($XPos1,$YPos1,$XPos2,$YPos2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
 
-       if ( $Border )
-        {
+       if ( $Border ) {
          $this->drawLine($XPos1,$YPos1,$XPos1,$YPos2,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Ticks"=>$BorderTicks));
          $this->drawLine($XPos2,$YPos1,$XPos2,$YPos2,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Ticks"=>$BorderTicks));
         }
 
-       if ( $AreaName != NULL )
-        {
+       if ( $AreaName != NULL ) {
          $XPos = ($XPos2-$XPos1)/2 + $XPos1;
          $YPos = ($YPos2-$YPos1)/2 + $YPos1;
 
-         if ( $NameAngle == ZONE_NAME_ANGLE_AUTO )
-          {
+         if ( $NameAngle == ZONE_NAME_ANGLE_AUTO ) {
            $TxtPos   = $this->getTextBox($XPos,$YPos,$this->FontName,$this->FontSize,0,$AreaName);
            $TxtWidth = $TxtPos[1]["X"] - $TxtPos[0]["X"];
            if ( abs($XPos2 - $XPos1) > $TxtWidth ) { $NameAngle = 0; } else { $NameAngle = 90; }
@@ -2813,9 +2513,7 @@ 
 
        $this->Shadow = $RestoreShadow;
        return(array("X1"=>$XPos1,"X2"=>$XPos2));
-      }
-     elseif ( $Data["Orientation"] == SCALE_POS_TOPBOTTOM )
-      {
+      } elseif ( $Data["Orientation"] == SCALE_POS_TOPBOTTOM ) {
        $XStep = (($this->GraphAreaY2 - $this->GraphAreaY1) - $XScale[0] *2 ) / $XScale[1];
        $XPos1 = $this->GraphAreaY1 + $XScale[0] + $XStep * $Value1;
        $XPos2 = $this->GraphAreaY1 + $XScale[0] + $XStep * $Value2;
@@ -2829,14 +2527,12 @@ 
 
        $this->drawFilledRectangle($YPos1,$XPos1,$YPos2,$XPos2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
 
-       if ( $Border )
-        {
+       if ( $Border ) {
          $this->drawLine($YPos1,$XPos1,$YPos2,$XPos1,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Ticks"=>$BorderTicks));
          $this->drawLine($YPos1,$XPos2,$YPos2,$XPos2,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Ticks"=>$BorderTicks));
         }
 
-       if ( $AreaName != NULL )
-        {
+       if ( $AreaName != NULL ) {
          $XPos = ($XPos2-$XPos1)/2 + $XPos1;
          $YPos = ($YPos2-$YPos1)/2 + $YPos1;
 
@@ -2851,8 +2547,7 @@ 
     }
 
    /* Draw an Y threshold with the computed scale */
-   function drawThreshold($Value,$Format="")
-    {
+   function drawThreshold($Value,$Format="") {
      $AxisID		= isset($Format["AxisID"]) ? $Format["AxisID"] : 0;
      $R			= isset($Format["R"]) ? $Format["R"] : 255;
      $G			= isset($Format["G"]) ? $Format["G"] : 0;
@@ -2900,27 +2595,22 @@ 
      if ( !isset($Data["Axis"][$AxisID]) ) { return(-1); }
      if ( $Caption == NULL ) { $Caption = $Value; }
 
-     if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
-      {
+     if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT ) {
        $YPos = $this->scaleComputeY($Value,array("AxisID"=>$AxisID));
-       if ( $YPos >= $this->GraphAreaY1+$Data["Axis"][$AxisID]["Margin"] && $YPos <= $this->GraphAreaY2-$Data["Axis"][$AxisID]["Margin"] )
-        {
+       if ( $YPos >= $this->GraphAreaY1+$Data["Axis"][$AxisID]["Margin"] && $YPos <= $this->GraphAreaY2-$Data["Axis"][$AxisID]["Margin"] ) {
          $X1 = $this->GraphAreaX1 + $AbscissaMargin;
          $X2 = $this->GraphAreaX2 - $AbscissaMargin;
 
          $this->drawLine($X1,$YPos,$X2,$YPos,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight));
 
-         if ( $Wide )
-          {
+         if ( $Wide ) {
            $this->drawLine($X1,$YPos-1,$X2,$YPos-1,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/$WideFactor,"Ticks"=>$Ticks));
            $this->drawLine($X1,$YPos+1,$X2,$YPos+1,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/$WideFactor,"Ticks"=>$Ticks));
           }
 
-         if ( $WriteCaption )
-          {
+         if ( $WriteCaption ) {
            if ( $CaptionAlign == CAPTION_LEFT_TOP )
-            { $X = $X1 + $CaptionOffset; $CaptionSettings["Align"] = TEXT_ALIGN_MIDDLELEFT; }
-           else 
+            { $X = $X1 + $CaptionOffset; $CaptionSettings["Align"] = TEXT_ALIGN_MIDDLELEFT; } else 
             { $X = $X2 - $CaptionOffset; $CaptionSettings["Align"] = TEXT_ALIGN_MIDDLERIGHT; }
            
            $this->drawText($X,$YPos,$Caption,$CaptionSettings);
@@ -2930,27 +2620,22 @@ 
        return(array("Y"=>$YPos));
       }
 
-     if ( $Data["Orientation"] == SCALE_POS_TOPBOTTOM )
-      {
+     if ( $Data["Orientation"] == SCALE_POS_TOPBOTTOM ) {
        $XPos = $this->scaleComputeY($Value,array("AxisID"=>$AxisID));
-       if ( $XPos >= $this->GraphAreaX1+$Data["Axis"][$AxisID]["Margin"] && $XPos <= $this->GraphAreaX2-$Data["Axis"][$AxisID]["Margin"] )
-        {
+       if ( $XPos >= $this->GraphAreaX1+$Data["Axis"][$AxisID]["Margin"] && $XPos <= $this->GraphAreaX2-$Data["Axis"][$AxisID]["Margin"] ) {
          $Y1 = $this->GraphAreaY1 + $AbscissaMargin;
          $Y2 = $this->GraphAreaY2 - $AbscissaMargin;
 
          $this->drawLine($XPos,$Y1,$XPos,$Y2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight));
 
-         if ( $Wide )
-          {
+         if ( $Wide ) {
            $this->drawLine($XPos-1,$Y1,$XPos-1,$Y2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/$WideFactor,"Ticks"=>$Ticks));
            $this->drawLine($XPos+1,$Y1,$XPos+1,$Y2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/$WideFactor,"Ticks"=>$Ticks));
           }
 
-         if ( $WriteCaption )
-          {
+         if ( $WriteCaption ) {
            if ( $CaptionAlign == CAPTION_LEFT_TOP )
-            { $Y = $Y1 + $CaptionOffset; $CaptionSettings["Align"] = TEXT_ALIGN_TOPMIDDLE; }
-           else 
+            { $Y = $Y1 + $CaptionOffset; $CaptionSettings["Align"] = TEXT_ALIGN_TOPMIDDLE; } else 
             { $Y = $Y2 - $CaptionOffset; $CaptionSettings["Align"] = TEXT_ALIGN_BOTTOMMIDDLE; }
 
            $CaptionSettings["Align"] = TEXT_ALIGN_TOPMIDDLE;
@@ -2963,8 +2648,7 @@ 
     }
 
    /* Draw a threshold with the computed scale */
-   function drawThresholdArea($Value1,$Value2,$Format="")
-    {
+   function drawThresholdArea($Value1,$Value2,$Format="") {
      $AxisID	= isset($Format["AxisID"]) ? $Format["AxisID"] : 0;
      $R		= isset($Format["R"]) ? $Format["R"] : 255;
      $G		= isset($Format["G"]) ? $Format["G"] : 0;
@@ -2998,8 +2682,7 @@ 
      if ( $NoMargin ) { $AbscissaMargin = 0; }
      if ( !isset($Data["Axis"][$AxisID]) ) { return(-1); }
 
-     if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
-      {
+     if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT ) {
        $XPos1 = $this->GraphAreaX1 + $AbscissaMargin;
        $XPos2 = $this->GraphAreaX2 - $AbscissaMargin;
        $YPos1 = $this->scaleComputeY($Value1,array("AxisID"=>$AxisID));
@@ -3011,14 +2694,12 @@ 
        if ( $YPos2 > $this->GraphAreaY2-$Data["Axis"][$AxisID]["Margin"] ) { $YPos2 = $this->GraphAreaY2-$Data["Axis"][$AxisID]["Margin"]; }
 
        $this->drawFilledRectangle($XPos1,$YPos1,$XPos2,$YPos2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
-       if ( $Border )
-        {
+       if ( $Border ) {
          $this->drawLine($XPos1,$YPos1,$XPos2,$YPos1,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Ticks"=>$BorderTicks));
          $this->drawLine($XPos1,$YPos2,$XPos2,$YPos2,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Ticks"=>$BorderTicks));
         }
 
-       if ( $AreaName != NULL )
-        {
+       if ( $AreaName != NULL ) {
          $XPos = ($XPos2-$XPos1)/2 + $XPos1;
          $YPos = ($YPos2-$YPos1)/2 + $YPos1;
          $this->Shadow = $RestoreShadow;
@@ -3028,9 +2709,7 @@ 
 
        $this->Shadow = $RestoreShadow;
        return(array("Y1"=>$YPos1,"Y2"=>$YPos2));
-      }
-     elseif ( $Data["Orientation"] == SCALE_POS_TOPBOTTOM )
-      {
+      } elseif ( $Data["Orientation"] == SCALE_POS_TOPBOTTOM ) {
        $YPos1 = $this->GraphAreaY1 + $AbscissaMargin;
        $YPos2 = $this->GraphAreaY2 - $AbscissaMargin;
        $XPos1 = $this->scaleComputeY($Value1,array("AxisID"=>$AxisID));
@@ -3042,19 +2721,16 @@ 
        if ( $XPos2 > $this->GraphAreaX2-$Data["Axis"][$AxisID]["Margin"] ) { $XPos2 = $this->GraphAreaX2-$Data["Axis"][$AxisID]["Margin"]; }
 
        $this->drawFilledRectangle($XPos1,$YPos1,$XPos2,$YPos2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
-       if ( $Border )
-        {
+       if ( $Border ) {
          $this->drawLine($XPos1,$YPos1,$XPos1,$YPos2,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Ticks"=>$BorderTicks));
          $this->drawLine($XPos2,$YPos1,$XPos2,$YPos2,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Ticks"=>$BorderTicks));
         }
 
-       if ( $AreaName != NULL )
-        {
+       if ( $AreaName != NULL ) {
          $XPos = ($YPos2-$YPos1)/2 + $YPos1;
          $YPos = ($XPos2-$XPos1)/2 + $XPos1;
 
-         if ( $NameAngle == ZONE_NAME_ANGLE_AUTO )
-          {
+         if ( $NameAngle == ZONE_NAME_ANGLE_AUTO ) {
            $TxtPos   = $this->getTextBox($XPos,$YPos,$this->FontName,$this->FontSize,0,$AreaName);
            $TxtWidth = $TxtPos[1]["X"] - $TxtPos[0]["X"];
            if ( abs($XPos2 - $XPos1) > $TxtWidth ) { $NameAngle = 0; } else { $NameAngle = 90; }
@@ -3069,13 +2745,10 @@ 
       }
     }
 
-   function scaleGetXSettings()
-    {
+   function scaleGetXSettings() {
      $Data = $this->DataSet->getData();
-     foreach($Data["Axis"] as $AxisID => $Settings)
-      {
-       if ( $Settings["Identity"] == AXIS_X )
-        {
+     foreach($Data["Axis"] as $AxisID => $Settings) {
+       if ( $Settings["Identity"] == AXIS_X ) {
          $Rows = $Settings["Rows"];
 
          return(array($Settings["Margin"],$Rows));
@@ -3083,8 +2756,7 @@ 
       }
     }
 
-   function scaleComputeY($Values,$Option="",$ReturnOnly0Height=FALSE)
-    {
+   function scaleComputeY($Values,$Option="",$ReturnOnly0Height=FALSE) {
      $AxisID	= isset($Option["AxisID"]) ? $Option["AxisID"] : 0;
      $SerieName	= isset($Option["SerieName"]) ? $Option["SerieName"] : NULL;
 
@@ -3095,26 +2767,21 @@ 
      if ( !is_array($Values) ) { $tmp = $Values; $Values = ""; $Values[0] = $tmp; }
 
      $Result = "";
-     if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
-      {
+     if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT ) {
        $Height      = ($this->GraphAreaY2 - $this->GraphAreaY1) - $Data["Axis"][$AxisID]["Margin"]*2;
        $ScaleHeight = $Data["Axis"][$AxisID]["ScaleMax"] - $Data["Axis"][$AxisID]["ScaleMin"];
        $Step        = $Height / $ScaleHeight;
 
        if ( $ReturnOnly0Height )
-        { foreach($Values as $Key => $Value) { if ( $Value == VOID ) { $Result[] = VOID; } else { $Result[] = $Step * $Value; } } }
-       else
+        { foreach($Values as $Key => $Value) { if ( $Value == VOID ) { $Result[] = VOID; } else { $Result[] = $Step * $Value; } } } else
         { foreach($Values as $Key => $Value) { if ( $Value == VOID ) { $Result[] = VOID; } else { $Result[] = $this->GraphAreaY2 - $Data["Axis"][$AxisID]["Margin"] - ($Step * ($Value-$Data["Axis"][$AxisID]["ScaleMin"])); } } }
-      }
-     else
-      {
+      } else {
        $Width      = ($this->GraphAreaX2 - $this->GraphAreaX1) - $Data["Axis"][$AxisID]["Margin"]*2;
        $ScaleWidth = $Data["Axis"][$AxisID]["ScaleMax"] - $Data["Axis"][$AxisID]["ScaleMin"];
        $Step       = $Width / $ScaleWidth;
 
        if ( $ReturnOnly0Height )
-        { foreach($Values as $Key => $Value) { if ( $Value == VOID ) { $Result[] = VOID; } else { $Result[] = $Step * $Value; } } }
-       else
+        { foreach($Values as $Key => $Value) { if ( $Value == VOID ) { $Result[] = VOID; } else { $Result[] = $Step * $Value; } } } else
         { foreach($Values as $Key => $Value) { if ( $Value == VOID ) { $Result[] = VOID; } else { $Result[] = $this->GraphAreaX1 + $Data["Axis"][$AxisID]["Margin"] + ($Step * ($Value-$Data["Axis"][$AxisID]["ScaleMin"])); } } }
       }
 
@@ -3125,8 +2792,7 @@ 
     }
 
    /* Format the axis values */
-   function scaleFormat($Value,$Mode=NULL,$Format=NULL,$Unit=NULL)
-    {
+   function scaleFormat($Value,$Mode=NULL,$Format=NULL,$Unit=NULL) {
      if ( $Value == VOID ) { return(""); }
 
      if ( $Mode == AXIS_FORMAT_CUSTOM )
@@ -3141,8 +2807,7 @@ 
      if ( $Mode == AXIS_FORMAT_CURRENCY )
       { return($Format.number_format($Value,2)); }
 
-     if ( $Mode == AXIS_FORMAT_METRIC )
-      {
+     if ( $Mode == AXIS_FORMAT_METRIC ) {
        if (abs($Value) > 1000000000)
         return(round($Value/1000000000,$Format)."g".$Unit);
        if (abs($Value) > 1000000)
@@ -3155,8 +2820,7 @@ 
     }
 
    /* Write Max value on a chart */
-   function writeBounds($Type=BOUND_BOTH,$Format=NULL)
-    {
+   function writeBounds($Type=BOUND_BOTH,$Format=NULL) {
      $MaxLabelTxt	= isset($Format["MaxLabelTxt"]) ? $Format["MaxLabelTxt"] : "max=";
      $MinLabelTxt	= isset($Format["MinLabelTxt"]) ? $Format["MinLabelTxt"] : "min=";
      $Decimals		= isset($Format["Decimals"]) ? $Format["Decimals"] : 1;
@@ -3193,10 +2857,8 @@ 
      list($XMargin,$XDivs) = $this->scaleGetXSettings();
 
      $Data = $this->DataSet->getData();
-     foreach($Data["Series"] as $SerieName => $Serie)
-      {
-       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] && !isset($ExcludedSeries[$SerieName]))
-        {
+     foreach($Data["Series"] as $SerieName => $Serie) {
+       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] && !isset($ExcludedSeries[$SerieName])) {
          $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; $Alpha = $Serie["Color"]["Alpha"]; $Ticks = $Serie["Ticks"];
          if ( $DisplayColor == DISPLAY_AUTO ) { $DisplayR = $R; $DisplayG = $G; $DisplayB = $B; }
 
@@ -3204,8 +2866,7 @@ 
          $MaxValue = $this->DataSet->getMax($SerieName);
 
          $MinPos = VOID; $MaxPos = VOID;
-         foreach($Serie["Data"] as $Key => $Value)
-          { 
+         foreach($Serie["Data"] as $Key => $Value) {
            if ( $Value == $MinValue && $MinPos == VOID ) { $MinPos = $Key; }
            if ( $Value == $MaxValue ) { $MaxPos = $Key; }
           }
@@ -3217,14 +2878,12 @@ 
 
          $PosArray = $this->scaleComputeY($Serie["Data"],array("AxisID"=>$Serie["Axis"]));
 
-         if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
-          {
+         if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT ) {
            $XStep       = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs;
            $X           = $this->GraphAreaX1 + $XMargin;
            $SerieOffset = isset($Serie["XOffset"]) ? $Serie["XOffset"] : 0;
 
-           if ( $Type == BOUND_MAX || $Type == BOUND_BOTH )
-            {
+           if ( $Type == BOUND_MAX || $Type == BOUND_BOTH ) {
              if ( $MaxLabelPos == BOUND_LABEL_POS_TOP    || ( $MaxLabelPos ==  BOUND_LABEL_POS_AUTO && $MaxValue >= 0) ) { $YPos  = $PosArray[$MaxPos] - $DisplayOffset + 2; $Align = TEXT_ALIGN_BOTTOMMIDDLE; }
              if ( $MaxLabelPos == BOUND_LABEL_POS_BOTTOM || ( $MaxLabelPos ==  BOUND_LABEL_POS_AUTO && $MaxValue < 0) ) { $YPos  = $PosArray[$MaxPos] + $DisplayOffset + 2; $Align = TEXT_ALIGN_TOPMIDDLE; }
 
@@ -3244,8 +2903,7 @@ 
              $this->drawText($XPos+$XOffset,$YPos+$YOffset,$Label,$CaptionSettings);
             }
 
-           if ( $Type == BOUND_MIN || $Type == BOUND_BOTH )
-            {
+           if ( $Type == BOUND_MIN || $Type == BOUND_BOTH ) {
              if ( $MinLabelPos == BOUND_LABEL_POS_TOP    || ( $MinLabelPos ==  BOUND_LABEL_POS_AUTO && $MinValue >= 0) ) { $YPos  = $PosArray[$MinPos] - $DisplayOffset + 2; $Align = TEXT_ALIGN_BOTTOMMIDDLE; }
              if ( $MinLabelPos == BOUND_LABEL_POS_BOTTOM || ( $MinLabelPos ==  BOUND_LABEL_POS_AUTO && $MinValue < 0) ) { $YPos  = $PosArray[$MinPos] + $DisplayOffset + 2; $Align = TEXT_ALIGN_TOPMIDDLE; }
 
@@ -3264,15 +2922,12 @@ 
 
              $this->drawText($XPos+$XOffset,$YPos-$DisplayOffset+$YOffset,$Label,$CaptionSettings);
             }
-          }
-         else
-          {
+          } else {
            $XStep       = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs;
            $X           = $this->GraphAreaY1 + $XMargin;
            $SerieOffset = isset($Serie["XOffset"]) ? $Serie["XOffset"] : 0;
 
-           if ( $Type == BOUND_MAX || $Type == BOUND_BOTH )
-            {
+           if ( $Type == BOUND_MAX || $Type == BOUND_BOTH ) {
              if ( $MaxLabelPos == BOUND_LABEL_POS_TOP    || ( $MaxLabelPos ==  BOUND_LABEL_POS_AUTO && $MaxValue >= 0) ) { $YPos  = $PosArray[$MaxPos] + $DisplayOffset + 2; $Align = TEXT_ALIGN_MIDDLELEFT; }
              if ( $MaxLabelPos == BOUND_LABEL_POS_BOTTOM || ( $MaxLabelPos ==  BOUND_LABEL_POS_AUTO && $MaxValue < 0) ) { $YPos  = $PosArray[$MaxPos] - $DisplayOffset + 2; $Align = TEXT_ALIGN_MIDDLERIGHT; }
 
@@ -3292,8 +2947,7 @@ 
              $this->drawText($YPos+$XOffset,$XPos+$YOffset,$Label,$CaptionSettings);
             }
 
-           if ( $Type == BOUND_MIN || $Type == BOUND_BOTH )
-            {
+           if ( $Type == BOUND_MIN || $Type == BOUND_BOTH ) {
              if ( $MinLabelPos == BOUND_LABEL_POS_TOP    || ( $MinLabelPos ==  BOUND_LABEL_POS_AUTO && $MinValue >= 0) ) { $YPos  = $PosArray[$MinPos] + $DisplayOffset + 2; $Align = TEXT_ALIGN_MIDDLELEFT; }
              if ( $MinLabelPos == BOUND_LABEL_POS_BOTTOM || ( $MinLabelPos ==  BOUND_LABEL_POS_AUTO && $MinValue < 0) ) { $YPos  = $PosArray[$MinPos] - $DisplayOffset + 2; $Align = TEXT_ALIGN_MIDDLERIGHT; }
 
@@ -3318,8 +2972,7 @@ 
     }
 
    /* Draw a plot chart */
-   function drawPlotChart($Format=NULL)
-    {
+   function drawPlotChart($Format=NULL) {
      $PlotSize		= isset($Format["PlotSize"]) ? $Format["PlotSize"] : NULL;
      $PlotBorder	= isset($Format["PlotBorder"]) ? $Format["PlotBorder"] : FALSE;
      $BorderR		= isset($Format["BorderR"]) ? $Format["BorderR"] : 50;
@@ -3341,18 +2994,15 @@ 
      $Data = $this->DataSet->getData();
      list($XMargin,$XDivs) = $this->scaleGetXSettings();
 
-     foreach($Data["Series"] as $SerieName => $Serie)
-      {
-       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
-        {
+     foreach($Data["Series"] as $SerieName => $Serie) {
+       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] ) {
          if ( isset($Serie["Weight"]) ) { $SerieWeight = $Serie["Weight"] + 2; } else { $SerieWeight = 2; }
          if ( $PlotSize != NULL ) { $SerieWeight = $PlotSize; }
 
          $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; $Alpha = $Serie["Color"]["Alpha"]; $Ticks = $Serie["Ticks"];
          if ( $Surrounding != NULL ) { $BorderR = $R + $Surrounding; $BorderG = $G + $Surrounding; $BorderB = $B + $Surrounding; }
          if ( isset($Serie["Picture"]) )
-          { $Picture = $Serie["Picture"]; list($PicWidth,$PicHeight,$PicType) = $this->getPicInfo($Picture); }
-         else { $Picture = NULL; $PicOffset = 0; }
+          { $Picture = $Serie["Picture"]; list($PicWidth,$PicHeight,$PicType) = $this->getPicInfo($Picture); } else { $Picture = NULL; $PicOffset = 0; }
 
          if ( $DisplayColor == DISPLAY_AUTO ) { $DisplayR = $R; $DisplayG = $G; $DisplayB = $B; }
 
@@ -3368,49 +3018,40 @@ 
 
          $this->DataSet->Data["Series"][$SerieName]["XOffset"] = 0;
 
-         if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
-          {
+         if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT ) {
            if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1)/4; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
            if ( $Picture != NULL ) { $PicOffset = $PicHeight / 2; $SerieWeight = 0; }
            $X = $this->GraphAreaX1 + $XMargin;
 
            if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
-           foreach($PosArray as $Key => $Y)
-            {
+           foreach($PosArray as $Key => $Y) {
              if ( $DisplayValues ) 
               $this->drawText($X,$Y-$DisplayOffset-$SerieWeight-$BorderSize-$PicOffset,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
 
-             if ( $Y != VOID )
-              {
+             if ( $Y != VOID ) {
                if ( $RecordImageMap ) { $this->addToImageMap("CIRCLE",floor($X).",".floor($Y).",".$SerieWeight,$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
 
                if ( $Picture != NULL )
-                { $this->drawFromPicture($PicType,$Picture,$X-$PicWidth/2,$Y-$PicHeight/2); }
-               else
+                { $this->drawFromPicture($PicType,$Picture,$X-$PicWidth/2,$Y-$PicHeight/2); } else
                 { $this->drawShape($X,$Y,$Shape,$SerieWeight,$PlotBorder,$BorderSize,$R,$G,$B,$Alpha,$BorderR,$BorderG,$BorderB,$BorderAlpha); }
               }
              $X = $X + $XStep;
             }
-          }
-         else
-          {
+          } else {
            if ( $XDivs == 0 ) { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
            if ( $Picture != NULL ) { $PicOffset = $PicWidth / 2; $SerieWeight = 0; }
            $Y = $this->GraphAreaY1 + $XMargin;
 
            if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
-           foreach($PosArray as $Key => $X)
-            {
+           foreach($PosArray as $Key => $X) {
              if ( $DisplayValues ) 
               $this->drawText($X+$DisplayOffset+$SerieWeight+$BorderSize+$PicOffset,$Y,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("Angle"=>270,"R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
 
-             if ( $X != VOID )
-              {
+             if ( $X != VOID ) {
                if ( $RecordImageMap ) { $this->addToImageMap("CIRCLE",floor($X).",".floor($Y).",".$SerieWeight,$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
 
                if ( $Picture != NULL )
-                { $this->drawFromPicture($PicType,$Picture,$X-$PicWidth/2,$Y-$PicHeight/2); }
-               else
+                { $this->drawFromPicture($PicType,$Picture,$X-$PicWidth/2,$Y-$PicHeight/2); } else
                 { $this->drawShape($X,$Y,$Shape,$SerieWeight,$PlotBorder,$BorderSize,$R,$G,$B,$Alpha,$BorderR,$BorderG,$BorderB,$BorderAlpha); }
               }
              $Y = $Y + $YStep;
@@ -3421,8 +3062,7 @@ 
     }
 
    /* Draw a spline chart */
-   function drawSplineChart($Format=NULL)
-    {
+   function drawSplineChart($Format=NULL) {
      $BreakVoid		= isset($Format["BreakVoid"]) ? $Format["BreakVoid"] : TRUE;
      $VoidTicks		= isset($Format["VoidTicks"]) ? $Format["VoidTicks"] : 4;
      $BreakR		= isset($Format["BreakR"]) ? $Format["BreakR"] : NULL; // 234
@@ -3441,10 +3081,8 @@ 
 
      $Data = $this->DataSet->getData();
      list($XMargin,$XDivs) = $this->scaleGetXSettings();
-     foreach($Data["Series"] as $SerieName => $Serie)
-      {
-       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
-        {
+     foreach($Data["Series"] as $SerieName => $Serie) {
+       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] ) {
          $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; $Alpha = $Serie["Color"]["Alpha"]; $Ticks = $Serie["Ticks"]; $Weight = $Serie["Weight"];
 
          if ( $BreakR == NULL )
@@ -3465,16 +3103,14 @@ 
 
          $this->DataSet->Data["Series"][$SerieName]["XOffset"] = 0;
 
-         if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
-          {
+         if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT ) {
            if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1)/4; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
            $X     = $this->GraphAreaX1 + $XMargin; $WayPoints = "";
            $Force = $XStep / 5;
 
            if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
            $LastGoodY = NULL; $LastGoodX = NULL; $LastX = 1; $LastY = 1;
-           foreach($PosArray as $Key => $Y)
-            {
+           foreach($PosArray as $Key => $Y) {
              if ( $DisplayValues ) 
               $this->drawText($X,$Y-$DisplayOffset,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
 	
@@ -3496,17 +3132,14 @@ 
              $X = $X + $XStep;
             }
            $this->drawSpline($WayPoints,array("Force"=>$Force,"R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight));
-          }
-         else
-          {
+          } else {
            if ( $XDivs == 0 ) { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
            $Y     = $this->GraphAreaY1 + $XMargin; $WayPoints = "";
            $Force = $YStep / 5;
 
            if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
            $LastGoodY = NULL; $LastGoodX = NULL; $LastX = 1; $LastY = 1;
-           foreach($PosArray as $Key => $X)
-            {
+           foreach($PosArray as $Key => $X) {
              if ( $DisplayValues ) 
               $this->drawText($X+$DisplayOffset,$Y,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("Angle"=>270,"R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
 
@@ -3534,8 +3167,7 @@ 
     }
 
    /* Draw a filled spline chart */
-   function drawFilledSplineChart($Format=NULL)
-    {
+   function drawFilledSplineChart($Format=NULL) {
      $DisplayValues	= isset($Format["DisplayValues"]) ? $Format["DisplayValues"] : FALSE;
      $DisplayOffset	= isset($Format["DisplayOffset"]) ? $Format["DisplayOffset"] : 2;
      $DisplayColor	= isset($Format["DisplayColor"]) ? $Format["DisplayColor"] : DISPLAY_MANUAL;
@@ -3549,10 +3181,8 @@ 
 
      $Data = $this->DataSet->getData();
      list($XMargin,$XDivs) = $this->scaleGetXSettings();
-     foreach($Data["Series"] as $SerieName => $Serie)
-      {
-       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
-        {
+     foreach($Data["Series"] as $SerieName => $Serie) {
+       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] ) {
          $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; $Alpha = $Serie["Color"]["Alpha"]; $Ticks = $Serie["Ticks"];
          if ( $DisplayColor == DISPLAY_AUTO ) { $DisplayR = $R; $DisplayG = $G; $DisplayB = $B; }
 
@@ -3564,10 +3194,8 @@ 
          $PosArray = $this->scaleComputeY($Serie["Data"],array("AxisID"=>$Serie["Axis"]));
          if ( $AroundZero ) { $YZero = $this->scaleComputeY(0,array("AxisID"=>$Serie["Axis"])); }
 
-         if ( $Threshold != NULL )
-          {
-           foreach($Threshold as $Key => $Params)
-            {
+         if ( $Threshold != NULL ) {
+           foreach($Threshold as $Key => $Params) {
              $Threshold[$Key]["MinX"] = $this->scaleComputeY($Params["Min"],array("AxisID"=>$Serie["Axis"]));
              $Threshold[$Key]["MaxX"] = $this->scaleComputeY($Params["Max"],array("AxisID"=>$Serie["Axis"]));
             }
@@ -3575,8 +3203,7 @@ 
 
          $this->DataSet->Data["Series"][$SerieName]["XOffset"] = 0;
 
-         if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
-          {
+         if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT ) {
            if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1)/4; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
            $X     = $this->GraphAreaX1 + $XMargin; $WayPoints = "";
            $Force = $XStep / 5;
@@ -3587,22 +3214,17 @@ 
 
            $LastX = ""; $LastY = "";
            if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
-           foreach($PosArray as $Key => $Y)
-            {
+           foreach($PosArray as $Key => $Y) {
              if ( $DisplayValues ) 
               $this->drawText($X,$Y-$DisplayOffset,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
 
-             if ( $Y == VOID )
-              {
+             if ( $Y == VOID ) {
                $Area = $this->drawSpline($WayPoints,array("Force"=>$Force,"PathOnly"=>TRUE));
 
-               if ( $Area != "" )
-                {
-                 foreach ($Area as $key => $Points)
-                  {
+               if ( $Area != "" ) {
+                 foreach ($Area as $key => $Points) {
                    $Corners = ""; $Corners[] = $Area[$key][0]["X"]; $Corners[] = $YZero;
-                   foreach($Points as $subKey => $Point)
-                    {
+                   foreach($Points as $subKey => $Point) {
                      if ( $subKey == count($Points)-1) { $Corners[] = $Point["X"]-1; } else { $Corners[] = $Point["X"]; }
                      $Corners[] = $Point["Y"]+1;
                     }
@@ -3614,21 +3236,17 @@ 
                 }
 
                $WayPoints = "";
-              }
-             else
+              } else
               $WayPoints[] = array($X,$Y-.5); /* -.5 for AA visual fix */
 
              $X = $X + $XStep;
             }
            $Area = $this->drawSpline($WayPoints,array("Force"=>$Force,"PathOnly"=>TRUE));
 
-           if ( $Area != "" )
-            {
-             foreach ($Area as $key => $Points)
-              {
+           if ( $Area != "" ) {
+             foreach ($Area as $key => $Points) {
                $Corners = ""; $Corners[] = $Area[$key][0]["X"]; $Corners[] = $YZero;
-               foreach($Points as $subKey => $Point)
-                {
+               foreach($Points as $subKey => $Point) {
                  if ( $subKey == count($Points)-1) { $Corners[] = $Point["X"]-1; } else { $Corners[] = $Point["X"]; }
                  $Corners[] = $Point["Y"]+1;
                 }
@@ -3638,9 +3256,7 @@ 
               }
              $this->drawSpline($WayPoints,array("Force"=>$Force,"R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
             }
-          }
-         else
-          {
+          } else {
            if ( $XDivs == 0 ) { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
            $Y     = $this->GraphAreaY1 + $XMargin; $WayPoints = "";
            $Force = $YStep / 5;
@@ -3650,22 +3266,17 @@ 
            if ( $YZero < $this->GraphAreaX1+1 ) { $YZero = $this->GraphAreaX1+1; }
 
            if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
-           foreach($PosArray as $Key => $X)
-            {
+           foreach($PosArray as $Key => $X) {
              if ( $DisplayValues ) 
               $this->drawText($X+$DisplayOffset,$Y,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("Angle"=>270,"R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
 
-             if ( $X == VOID )
-              {
+             if ( $X == VOID ) {
                $Area = $this->drawSpline($WayPoints,array("Force"=>$Force,"PathOnly"=>TRUE));
 
-               if ( $Area != "" )
-                {
-                 foreach ($Area as $key => $Points)
-                  {
+               if ( $Area != "" ) {
+                 foreach ($Area as $key => $Points) {
                    $Corners = ""; $Corners[] = $YZero; $Corners[] = $Area[$key][0]["Y"];
-                   foreach($Points as $subKey => $Point)
-                    {
+                   foreach($Points as $subKey => $Point) {
                      if ( $subKey == count($Points)-1) { $Corners[] = $Point["X"]-1; } else { $Corners[] = $Point["X"]; }
                      $Corners[] = $Point["Y"];
                     }
@@ -3677,21 +3288,17 @@ 
                 }
 
                $WayPoints = "";
-              }
-             else
+              } else
               $WayPoints[] = array($X,$Y);
 
              $Y = $Y + $YStep;
             }
            $Area = $this->drawSpline($WayPoints,array("Force"=>$Force,"PathOnly"=>TRUE));
 
-           if ( $Area != "" )
-            {
-             foreach ($Area as $key => $Points)
-              {
+           if ( $Area != "" ) {
+             foreach ($Area as $key => $Points) {
                $Corners = ""; $Corners[] = $YZero; $Corners[] = $Area[$key][0]["Y"];
-               foreach($Points as $subKey => $Point)
-                {
+               foreach($Points as $subKey => $Point) {
                  if ( $subKey == count($Points)-1) { $Corners[] = $Point["X"]-1; } else { $Corners[] = $Point["X"]; }
                  $Corners[] = $Point["Y"];
                 }
@@ -3708,8 +3315,7 @@ 
     }
 
    /* Draw a line chart */
-   function drawLineChart($Format=NULL)
-    {
+   function drawLineChart($Format=NULL) {
      $BreakVoid		= isset($Format["BreakVoid"]) ? $Format["BreakVoid"] : TRUE;
      $VoidTicks		= isset($Format["VoidTicks"]) ? $Format["VoidTicks"] : 4;
      $BreakR		= isset($Format["BreakR"]) ? $Format["BreakR"] : NULL;
@@ -3733,10 +3339,8 @@ 
 
      $Data = $this->DataSet->getData();
      list($XMargin,$XDivs) = $this->scaleGetXSettings();
-     foreach($Data["Series"] as $SerieName => $Serie)
-      {
-       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
-        {
+     foreach($Data["Series"] as $SerieName => $Serie) {
+       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] ) {
          $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; $Alpha = $Serie["Color"]["Alpha"]; $Ticks = $Serie["Ticks"]; $Weight = $Serie["Weight"];
 
          if ( $ForceColor )
@@ -3760,17 +3364,14 @@ 
 
          $this->DataSet->Data["Series"][$SerieName]["XOffset"] = 0;
 
-         if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
-          {
+         if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT ) {
            if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1)/4; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
            $X = $this->GraphAreaX1 + $XMargin; $LastX = NULL; $LastY = NULL;
 
            if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
            $LastGoodY = NULL; $LastGoodX = NULL;
-           foreach($PosArray as $Key => $Y)
-            {
-             if ( $DisplayValues && $Serie["Data"][$Key] != VOID ) 
-              {
+           foreach($PosArray as $Key => $Y) {
+             if ( $DisplayValues && $Serie["Data"][$Key] != VOID ) {
                if ( $Serie["Data"][$Key] > 0 ) { $Align = TEXT_ALIGN_BOTTOMMIDDLE; $Offset = $DisplayOffset; } else { $Align = TEXT_ALIGN_TOPMIDDLE; $Offset = -$DisplayOffset; }
                $this->drawText($X,$Y-$Offset-$Weight,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>$Align));
               }
@@ -3789,16 +3390,13 @@ 
              $LastX = $X; $LastY = $Y;
              $X = $X + $XStep;
             }
-          }
-         else
-          {
+          } else {
            if ( $XDivs == 0 ) { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
            $Y = $this->GraphAreaY1 + $XMargin; $LastX = NULL; $LastY = NULL;
 
            if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
            $LastGoodY = NULL; $LastGoodX = NULL;
-           foreach($PosArray as $Key => $X)
-            {
+           foreach($PosArray as $Key => $X) {
              if ( $DisplayValues && $Serie["Data"][$Key] != VOID ) 
               { $this->drawText($X+$DisplayOffset+$Weight,$Y,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("Angle"=>270,"R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_BOTTOMMIDDLE)); }
 
@@ -3822,8 +3420,7 @@ 
     }
 
    /* Draw a line chart */
-   function drawZoneChart($SerieA,$SerieB,$Format=NULL)
-    {
+   function drawZoneChart($SerieA,$SerieB,$Format=NULL) {
      $AxisID	= isset($Format["AxisID"]) ? $Format["AxisID"] : 0;
      $LineR	= isset($Format["LineR"]) ? $Format["LineR"] : 150;
      $LineG	= isset($Format["LineG"]) ? $Format["LineG"] : 150;
@@ -3852,15 +3449,13 @@ 
      $PosArrayB = $this->scaleComputeY($SerieBData,array("AxisID"=>$AxisID));
      if ( count($PosArrayA) != count($PosArrayB) ) { return(0); }
 
-     if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
-      {
+     if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT ) {
        if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1)/4; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
        $X = $this->GraphAreaX1 + $XMargin; $LastX = NULL; $LastY = NULL;
 
        $LastX = NULL; $LastY1 = NULL; $LastY2 = NULL;
        $BoundsA = ""; $BoundsB = "";
-       foreach($PosArrayA as $Key => $Y1)
-        {
+       foreach($PosArrayA as $Key => $Y1) {
          $Y2 = $PosArrayB[$Key];
 
          $BoundsA[] = $X; $BoundsA[] = $Y1;
@@ -3874,21 +3469,17 @@ 
        $Bounds = array_merge($BoundsA,$this->reversePlots($BoundsB));
        $this->drawPolygonChart($Bounds,array("R"=>$AreaR,"G"=>$AreaG,"B"=>$AreaB,"Alpha"=>$AreaAlpha));
 
-       for($i=0;$i<=count($BoundsA)-4;$i=$i+2)
-        {
+       for($i=0;$i<=count($BoundsA)-4;$i=$i+2) {
          $this->drawLine($BoundsA[$i],$BoundsA[$i+1],$BoundsA[$i+2],$BoundsA[$i+3],array("R"=>$LineR,"G"=>$LineG,"B"=>$LineB,"Alpha"=>$LineAlpha,"Ticks"=>$LineTicks));
          $this->drawLine($BoundsB[$i],$BoundsB[$i+1],$BoundsB[$i+2],$BoundsB[$i+3],array("R"=>$LineR,"G"=>$LineG,"B"=>$LineB,"Alpha"=>$LineAlpha,"Ticks"=>$LineTicks));
         }
-      }
-     else
-      {
+      } else {
        if ( $XDivs == 0 ) { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
        $Y = $this->GraphAreaY1 + $XMargin; $LastX = NULL; $LastY = NULL;
 
        $LastY = NULL; $LastX1 = NULL; $LastX2 = NULL;
        $BoundsA = ""; $BoundsB = "";
-       foreach($PosArrayA as $Key => $X1)
-        {
+       foreach($PosArrayA as $Key => $X1) {
          $X2 = $PosArrayB[$Key];
 
          $BoundsA[] = $X1; $BoundsA[] = $Y;
@@ -3902,8 +3493,7 @@ 
        $Bounds = array_merge($BoundsA,$this->reversePlots($BoundsB));
        $this->drawPolygonChart($Bounds,array("R"=>$AreaR,"G"=>$AreaG,"B"=>$AreaB,"Alpha"=>$AreaAlpha));
 
-       for($i=0;$i<=count($BoundsA)-4;$i=$i+2)
-        {
+       for($i=0;$i<=count($BoundsA)-4;$i=$i+2) {
          $this->drawLine($BoundsA[$i],$BoundsA[$i+1],$BoundsA[$i+2],$BoundsA[$i+3],array("R"=>$LineR,"G"=>$LineG,"B"=>$LineB,"Alpha"=>$LineAlpha,"Ticks"=>$LineTicks));
          $this->drawLine($BoundsB[$i],$BoundsB[$i+1],$BoundsB[$i+2],$BoundsB[$i+3],array("R"=>$LineR,"G"=>$LineG,"B"=>$LineB,"Alpha"=>$LineAlpha,"Ticks"=>$LineTicks));
         }
@@ -3911,8 +3501,7 @@ 
     }
 
    /* Draw a step chart */
-   function drawStepChart($Format=NULL)
-    {
+   function drawStepChart($Format=NULL) {
      $BreakVoid		= isset($Format["BreakVoid"]) ? $Format["BreakVoid"] : FALSE;
      $ReCenter		= isset($Format["ReCenter"]) ? $Format["ReCenter"] : TRUE;
      $VoidTicks		= isset($Format["VoidTicks"]) ? $Format["VoidTicks"] : 4;
@@ -3932,10 +3521,8 @@ 
 
      $Data = $this->DataSet->getData();
      list($XMargin,$XDivs) = $this->scaleGetXSettings();
-     foreach($Data["Series"] as $SerieName => $Serie)
-      {
-       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
-        {
+     foreach($Data["Series"] as $SerieName => $Serie) {
+       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] ) {
          $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; $Alpha = $Serie["Color"]["Alpha"]; $Ticks = $Serie["Ticks"]; $Weight = $Serie["Weight"];
 
          if (isset($Serie["Description"])) { $SerieDescription = $Serie["Description"]; } else { $SerieDescription = $SerieName; }
@@ -3957,52 +3544,40 @@ 
 
          $this->DataSet->Data["Series"][$SerieName]["XOffset"] = 0;
 
-         if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
-          {
+         if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT ) {
            if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1)/4; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
            $X = $this->GraphAreaX1 + $XMargin; $LastX = NULL; $LastY = NULL;
 
            if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
            $LastGoodY = NULL; $LastGoodX = NULL; $Init = FALSE;
-           foreach($PosArray as $Key => $Y)
-            {
-             if ( $DisplayValues && $Serie["Data"][$Key] != VOID ) 
-              {
+           foreach($PosArray as $Key => $Y) {
+             if ( $DisplayValues && $Serie["Data"][$Key] != VOID ) {
                if ( $Y <= $LastY ) { $Align = TEXT_ALIGN_BOTTOMMIDDLE; $Offset = $DisplayOffset; } else { $Align = TEXT_ALIGN_TOPMIDDLE; $Offset = -$DisplayOffset; }
                $this->drawText($X,$Y-$Offset-$Weight,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>$Align));
               }
 
-             if ( $Y != VOID && $LastX != NULL && $LastY != NULL )
-              {
+             if ( $Y != VOID && $LastX != NULL && $LastY != NULL ) {
                $this->drawLine($LastX,$LastY,$X,$LastY,$Color);
                $this->drawLine($X,$LastY,$X,$Y,$Color);
-               if ( $ReCenter && $X+$XStep < $this->GraphAreaX2 - $XMargin )
-                {
+               if ( $ReCenter && $X+$XStep < $this->GraphAreaX2 - $XMargin ) {
                  $this->drawLine($X,$Y,$X+$XStep,$Y,$Color);
                  if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($X-$ImageMapPlotSize).",".floor($Y-$ImageMapPlotSize).",".floor($X+$XStep+$ImageMapPlotSize).",".floor($Y+$ImageMapPlotSize),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
-                }
-               else
+                } else
                 { if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($LastX-$ImageMapPlotSize).",".floor($LastY-$ImageMapPlotSize).",".floor($X+$ImageMapPlotSize).",".floor($LastY+$ImageMapPlotSize),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); } }
               }
 
-             if ( $Y != VOID && $LastY == NULL && $LastGoodY != NULL && !$BreakVoid )
-              { 
-               if ( $ReCenter )
-                {
+             if ( $Y != VOID && $LastY == NULL && $LastGoodY != NULL && !$BreakVoid ) {
+               if ( $ReCenter ) {
                  $this->drawLine($LastGoodX+$XStep,$LastGoodY,$X,$LastGoodY,$BreakSettings);
                  if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($LastGoodX+$XStep-$ImageMapPlotSize).",".floor($LastGoodY-$ImageMapPlotSize).",".floor($X+$ImageMapPlotSize).",".floor($LastGoodY+$ImageMapPlotSize),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
-                }
-               else
-                {
+                } else {
                  $this->drawLine($LastGoodX,$LastGoodY,$X,$LastGoodY,$BreakSettings);
                  if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($LastGoodX-$ImageMapPlotSize).",".floor($LastGoodY-$ImageMapPlotSize).",".floor($X+$ImageMapPlotSize).",".floor($LastGoodY+$ImageMapPlotSize),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
                 }
 
                $this->drawLine($X,$LastGoodY,$X,$Y,$BreakSettings);
                $LastGoodY = NULL;
-              }
-             elseif( !$BreakVoid && $LastGoodY == NULL && $Y != VOID )
-              {
+              } elseif( !$BreakVoid && $LastGoodY == NULL && $Y != VOID ) {
               $this->drawLine($this->GraphAreaX1 + $XMargin,$Y,$X,$Y,$BreakSettings);
                if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($this->GraphAreaX1+$XMargin-$ImageMapPlotSize).",".floor($Y-$ImageMapPlotSize).",".floor($X+$ImageMapPlotSize).",".floor($Y+$ImageMapPlotSize),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
               }
@@ -4015,37 +3590,30 @@ 
              if ( $LastX < $this->GraphAreaX1 + $XMargin ) { $LastX = $this->GraphAreaX1 + $XMargin; }
              $X = $X + $XStep;
             }
-           if ( $ReCenter )
-            {
+           if ( $ReCenter ) {
              $this->drawLine($LastX,$LastY,$this->GraphAreaX2 - $XMargin,$LastY,$Color);
              if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($LastX-$ImageMapPlotSize).",".floor($LastY-$ImageMapPlotSize).",".floor($this->GraphAreaX2-$XMargin+$ImageMapPlotSize).",".floor($LastY+$ImageMapPlotSize),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
             }
-          }
-         else
-          {
+          } else {
            if ( $XDivs == 0 ) { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
            $Y = $this->GraphAreaY1 + $XMargin; $LastX = NULL; $LastY = NULL;
 
            if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
            $LastGoodY = NULL; $LastGoodX = NULL; $Init = FALSE;
-           foreach($PosArray as $Key => $X)
-            {
-             if ( $DisplayValues && $Serie["Data"][$Key] != VOID ) 
-              {
+           foreach($PosArray as $Key => $X) {
+             if ( $DisplayValues && $Serie["Data"][$Key] != VOID ) {
                if ( $X >= $LastX ) { $Align = TEXT_ALIGN_MIDDLELEFT; $Offset = $DisplayOffset; } else { $Align = TEXT_ALIGN_MIDDLERIGHT; $Offset = -$DisplayOffset; }
                $this->drawText($X+$Offset+$Weight,$Y,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>$Align));
               }
 
-             if ( $X != VOID && $LastX != NULL && $LastY != NULL )
-              {
+             if ( $X != VOID && $LastX != NULL && $LastY != NULL ) {
                $this->drawLine($LastX,$LastY,$LastX,$Y,$Color);
                $this->drawLine($LastX,$Y,$X,$Y,$Color);
 
                if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($LastX-$ImageMapPlotSize).",".floor($LastY-$ImageMapPlotSize).",".floor($LastX+$XStep+$ImageMapPlotSize).",".floor($Y+$ImageMapPlotSize),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
               }
 
-             if ( $X != VOID && $LastX == NULL && $LastGoodY != NULL && !$BreakVoid )
-              {
+             if ( $X != VOID && $LastX == NULL && $LastGoodY != NULL && !$BreakVoid ) {
                $this->drawLine($LastGoodX,$LastGoodY,$LastGoodX,$LastGoodY+$YStep,$Color);
                if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($LastGoodX-$ImageMapPlotSize).",".floor($LastGoodY-$ImageMapPlotSize).",".floor($LastGoodX+$ImageMapPlotSize).",".floor($LastGoodY+$YStep+$ImageMapPlotSize),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
 
@@ -4054,9 +3622,7 @@ 
 
                $this->drawLine($LastGoodX,$Y,$X,$Y,$BreakSettings);
                $LastGoodY = NULL;
-              }
-             elseif ( $X != VOID && $LastGoodY == NULL && !$BreakVoid )
-              {
+              } elseif ( $X != VOID && $LastGoodY == NULL && !$BreakVoid ) {
                $this->drawLine($X,$this->GraphAreaY1 + $XMargin,$X,$Y,$BreakSettings);
                if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($X-$ImageMapPlotSize).",".floor($this->GraphAreaY1+$XMargin-$ImageMapPlotSize).",".floor($X+$ImageMapPlotSize).",".floor($Y+$ImageMapPlotSize),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
               }
@@ -4069,8 +3635,7 @@ 
              if ( $LastY < $this->GraphAreaY1 + $XMargin ) { $LastY = $this->GraphAreaY1 + $XMargin; }
              $Y = $Y + $YStep;
             }
-           if ( $ReCenter )
-            {
+           if ( $ReCenter ) {
              $this->drawLine($LastX,$LastY,$LastX,$this->GraphAreaY2 - $XMargin,$Color);
              if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($LastX-$ImageMapPlotSize).",".floor($LastY-$ImageMapPlotSize).",".floor($LastX+$ImageMapPlotSize).",".floor($this->GraphAreaY2-$XMargin+$ImageMapPlotSize),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
             }
@@ -4080,8 +3645,7 @@ 
     }
 
    /* Draw a step chart */
-   function drawFilledStepChart($Format=NULL)
-    {
+   function drawFilledStepChart($Format=NULL) {
      $ReCenter		= isset($Format["ReCenter"]) ? $Format["ReCenter"] : TRUE;
      $DisplayValues	= isset($Format["DisplayValues"]) ? $Format["DisplayValues"] :FALSE;
      $DisplayOffset	= isset($Format["DisplayOffset"]) ? $Format["DisplayOffset"] : 2;
@@ -4096,10 +3660,8 @@ 
 
      $Data = $this->DataSet->getData();
      list($XMargin,$XDivs) = $this->scaleGetXSettings();
-     foreach($Data["Series"] as $SerieName => $Serie)
-      {
-       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
-        {
+     foreach($Data["Series"] as $SerieName => $Serie) {
+       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] ) {
          $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; $Alpha = $Serie["Color"]["Alpha"]; $Ticks = $Serie["Ticks"]; $Weight = $Serie["Weight"];
 
          if ( $DisplayColor == DISPLAY_AUTO ) { $DisplayR = $R; $DisplayG = $G; $DisplayB = $B; }
@@ -4117,8 +3679,7 @@ 
 
          $this->DataSet->Data["Series"][$SerieName]["XOffset"] = 0;
 
-         if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
-          {
+         if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT ) {
            if ( $YZero > $this->GraphAreaY2-1 ) { $YZero = $this->GraphAreaY2-1; }
            if ( $YZero < $this->GraphAreaY1+1 ) { $YZero = $this->GraphAreaY1+1; }
 
@@ -4129,10 +3690,8 @@ 
 
            if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
            $LastGoodY = NULL; $LastGoodX = NULL; $Points = ""; $Init = FALSE;
-           foreach($PosArray as $Key => $Y)
-            {
-             if ( $Y == VOID && $LastX != NULL && $LastY != NULL && $Points !="" )
-              {
+           foreach($PosArray as $Key => $Y) {
+             if ( $Y == VOID && $LastX != NULL && $LastY != NULL && $Points !="" ) {
                $Points[] = $LastX; $Points[] = $LastY;
                $Points[] = $X; $Points[] = $LastY;
                $Points[] = $X; $Points[] = $YZero;
@@ -4140,8 +3699,7 @@ 
                $Points = "";
               }
 
-             if ( $Y != VOID && $LastX != NULL && $LastY != NULL )
-              {
+             if ( $Y != VOID && $LastX != NULL && $LastY != NULL ) {
                if ( $Points == "") { $Points[] = $LastX; $Points[] = $YZero; }
                $Points[] = $LastX; $Points[] = $LastY;
                $Points[] = $X; $Points[] = $LastY;
@@ -4157,18 +3715,14 @@ 
              $X = $X + $XStep;
             }
 
-           if ( $ReCenter )
-            {
+           if ( $ReCenter ) {
              $Points[] = $LastX+$XStep/2; $Points[] = $LastY;
              $Points[] = $LastX+$XStep/2; $Points[] = $YZero;
-            }
-           else
+            } else
             { $Points[] = $LastX; $Points[] = $YZero; }
 
            $this->drawPolygon($Points,$Color);
-          }
-         else
-          {
+          } else {
            if ( $YZero < $this->GraphAreaX1+1 ) { $YZero = $this->GraphAreaX1+1; }
            if ( $YZero > $this->GraphAreaX2-1 ) { $YZero = $this->GraphAreaX2-1; }
 
@@ -4177,10 +3731,8 @@ 
 
            if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
            $LastGoodY = NULL; $LastGoodX = NULL; $Points = "";
-           foreach($PosArray as $Key => $X)
-            {
-             if ( $X == VOID && $LastX != NULL && $LastY != NULL && $Points !="" )
-              {
+           foreach($PosArray as $Key => $X) {
+             if ( $X == VOID && $LastX != NULL && $LastY != NULL && $Points !="" ) {
                $Points[] = $LastX; $Points[] = $LastY;
                $Points[] = $LastX; $Points[] = $Y;
                $Points[] = $YZero; $Points[] = $Y;
@@ -4188,8 +3740,7 @@ 
                $Points = "";
               }
 
-             if ( $X != VOID && $LastX != NULL && $LastY != NULL )
-              {
+             if ( $X != VOID && $LastX != NULL && $LastY != NULL ) {
                if ( $Points == "") { $Points[] = $YZero; $Points[] = $LastY; }
                $Points[] = $LastX; $Points[] = $LastY;
                $Points[] = $LastX; $Points[] = $Y;
@@ -4205,12 +3756,10 @@ 
              $Y = $Y + $YStep;
             }
 
-           if ( $ReCenter )
-            {
+           if ( $ReCenter ) {
              $Points[] = $LastX; $Points[] = $LastY+$YStep/2;
              $Points[] = $YZero; $Points[] = $LastY+$YStep/2;
-            }
-           else
+            } else
             { $Points[] = $YZero; $Points[] = $LastY; }
 
            $this->drawPolygon($Points,$Color);
@@ -4220,8 +3769,7 @@ 
     }
 
    /* Draw an area chart */
-   function drawAreaChart($Format=NULL)
-    {
+   function drawAreaChart($Format=NULL) {
      $DisplayValues	= isset($Format["DisplayValues"]) ? $Format["DisplayValues"] : FALSE;
      $DisplayOffset	= isset($Format["DisplayOffset"]) ? $Format["DisplayOffset"] : 2;
      $DisplayColor	= isset($Format["DisplayColor"]) ? $Format["DisplayColor"] : DISPLAY_MANUAL;
@@ -4237,10 +3785,8 @@ 
      $Data  = $this->DataSet->getData();
      list($XMargin,$XDivs) = $this->scaleGetXSettings();
 
-     foreach($Data["Series"] as $SerieName => $Serie)
-      {
-       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
-        {
+     foreach($Data["Series"] as $SerieName => $Serie) {
+       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] ) {
          $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; $Alpha = $Serie["Color"]["Alpha"]; $Ticks = $Serie["Ticks"];
          if ( $DisplayColor == DISPLAY_AUTO ) { $DisplayR = $R; $DisplayG = $G; $DisplayB = $B; }
 
@@ -4252,10 +3798,8 @@ 
          $PosArray = $this->scaleComputeY($Serie["Data"],array("AxisID"=>$Serie["Axis"]));
          $YZero    = $this->scaleComputeY(0,array("AxisID"=>$Serie["Axis"]));
 
-         if ( $Threshold != NULL )
-          {
-           foreach($Threshold as $Key => $Params)
-            {
+         if ( $Threshold != NULL ) {
+           foreach($Threshold as $Key => $Params) {
              $Threshold[$Key]["MinX"] = $this->scaleComputeY($Params["Min"],array("AxisID"=>$Serie["Axis"]));
              $Threshold[$Key]["MaxX"] = $this->scaleComputeY($Params["Max"],array("AxisID"=>$Serie["Axis"]));
             }
@@ -4263,8 +3807,7 @@ 
 
          $this->DataSet->Data["Series"][$SerieName]["XOffset"] = 0;
 
-         if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
-          {
+         if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT ) {
            if ( $YZero > $this->GraphAreaY2-1 ) { $YZero = $this->GraphAreaY2-1; }
 
            $Areas = ""; $AreaID = 0; 
@@ -4275,28 +3818,21 @@ 
            $X = $this->GraphAreaX1 + $XMargin; $LastX = NULL; $LastY = NULL;
 
            if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
-           foreach($PosArray as $Key => $Y)
-            {
-             if ( $DisplayValues && $Serie["Data"][$Key] != VOID )
-              {
+           foreach($PosArray as $Key => $Y) {
+             if ( $DisplayValues && $Serie["Data"][$Key] != VOID ) {
                if ( $Serie["Data"][$Key] > 0 ) { $Align = TEXT_ALIGN_BOTTOMMIDDLE; $Offset = $DisplayOffset; } else { $Align = TEXT_ALIGN_TOPMIDDLE; $Offset = -$DisplayOffset; }
                $this->drawText($X,$Y-$Offset,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>$Align));
               }
 
-             if ( $Y == VOID && isset($Areas[$AreaID]) )
-              {
+             if ( $Y == VOID && isset($Areas[$AreaID]) ) {
                if($LastX == NULL)
-                { $Areas[$AreaID][] = $X; }
-               else
+                { $Areas[$AreaID][] = $X; } else
                 { $Areas[$AreaID][] = $LastX; }
 
                if ( $AroundZero ) { $Areas[$AreaID][] = $YZero; } else { $Areas[$AreaID][] = $this->GraphAreaY2-1; }
                $AreaID++;
-              }
-             elseif ($Y != VOID)
-              {
-               if ( !isset($Areas[$AreaID]) )
-                {
+              } elseif ($Y != VOID) {
+               if ( !isset($Areas[$AreaID]) ) {
                  $Areas[$AreaID][] = $X;
                  if ( $AroundZero ) { $Areas[$AreaID][] = $YZero; } else { $Areas[$AreaID][] = $this->GraphAreaY2-1; }
                 }
@@ -4312,33 +3848,29 @@ 
            if ( $AroundZero ) { $Areas[$AreaID][] = $YZero; } else { $Areas[$AreaID][] = $this->GraphAreaY2-1; }
 
            /* Handle shadows in the areas */
-           if ( $this->Shadow )
-            {
+           if ( $this->Shadow ) {
              $ShadowArea = "";
-             foreach($Areas as $Key => $Points)
-              {
+             foreach($Areas as $Key => $Points) {
                $ShadowArea[$Key] = "";
-               foreach($Points as $Key2 => $Value)
-                {
+               foreach($Points as $Key2 => $Value) {
                  if ( $Key2 % 2 == 0 )
-                  { $ShadowArea[$Key][] = $Value + $this->ShadowX; }
-                 else
+                  { $ShadowArea[$Key][] = $Value + $this->ShadowX; } else
                   { $ShadowArea[$Key][] = $Value + $this->ShadowY; }
                 }
               }              
 
-             foreach($ShadowArea as $Key => $Points)
-              $this->drawPolygonChart($Points,array("R"=>$this->ShadowR,"G"=>$this->ShadowG,"B"=>$this->ShadowB,"Alpha"=>$this->Shadowa));
+             foreach($ShadowArea as $Key => $Points) {
+                           $this->drawPolygonChart($Points,array("R"=>$this->ShadowR,"G"=>$this->ShadowG,"B"=>$this->ShadowB,"Alpha"=>$this->Shadowa));
+             }
             }
 
            $Alpha = $ForceTransparency != NULL ? $ForceTransparency : $Alpha;
            $Color = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Threshold"=>$Threshold);
 
-           foreach($Areas as $Key => $Points)
-            $this->drawPolygonChart($Points,$Color);
-          }
-         else
-          {
+           foreach($Areas as $Key => $Points) {
+                       $this->drawPolygonChart($Points,$Color);
+           }
+          } else {
            if ( $YZero < $this->GraphAreaX1+1 ) { $YZero = $this->GraphAreaX1+1; }
            if ( $YZero > $this->GraphAreaX2-1 ) { $YZero = $this->GraphAreaX2-1; }
 
@@ -4350,29 +3882,22 @@ 
            $Y     = $this->GraphAreaY1 + $XMargin; $LastX = NULL; $LastY = NULL;
 
            if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
-           foreach($PosArray as $Key => $X)
-            {
-             if ( $DisplayValues && $Serie["Data"][$Key] != VOID )
-              {
+           foreach($PosArray as $Key => $X) {
+             if ( $DisplayValues && $Serie["Data"][$Key] != VOID ) {
                if ( $Serie["Data"][$Key] > 0 ) { $Align = TEXT_ALIGN_BOTTOMMIDDLE; $Offset = $DisplayOffset; } else { $Align = TEXT_ALIGN_TOPMIDDLE; $Offset = -$DisplayOffset; }
                $this->drawText($X+$Offset,$Y,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("Angle"=>270,"R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>$Align));
               }
 
-             if ( $X == VOID && isset($Areas[$AreaID]) )
-              {
+             if ( $X == VOID && isset($Areas[$AreaID]) ) {
                if ( $AroundZero ) { $Areas[$AreaID][] = $YZero; } else { $Areas[$AreaID][] = $this->GraphAreaX1+1; }
 
                if($LastY == NULL)
-                { $Areas[$AreaID][] = $Y; }
-               else
+                { $Areas[$AreaID][] = $Y; } else
                 { $Areas[$AreaID][] = $LastY; }
 
                $AreaID++;
-              }
-             elseif ($X != VOID)
-              {
-               if ( !isset($Areas[$AreaID]) )
-                {
+              } elseif ($X != VOID) {
+               if ( !isset($Areas[$AreaID]) ) {
                  if ( $AroundZero ) { $Areas[$AreaID][] = $YZero; } else { $Areas[$AreaID][] = $this->GraphAreaX1+1; }
                  $Areas[$AreaID][] = $Y;
                 }
@@ -4388,30 +3913,28 @@ 
            $Areas[$AreaID][] = $LastY;
 
            /* Handle shadows in the areas */
-           if ( $this->Shadow )
-            {
+           if ( $this->Shadow ) {
              $ShadowArea = "";
-             foreach($Areas as $Key => $Points)
-              {
+             foreach($Areas as $Key => $Points) {
                $ShadowArea[$Key] = "";
-               foreach($Points as $Key2 => $Value)
-                {
+               foreach($Points as $Key2 => $Value) {
                  if ( $Key2 % 2 == 0 )
-                  { $ShadowArea[$Key][] = $Value + $this->ShadowX; }
-                 else
+                  { $ShadowArea[$Key][] = $Value + $this->ShadowX; } else
                   { $ShadowArea[$Key][] = $Value + $this->ShadowY; }
                 }
               }              
 
-             foreach($ShadowArea as $Key => $Points)
-              $this->drawPolygonChart($Points,array("R"=>$this->ShadowR,"G"=>$this->ShadowG,"B"=>$this->ShadowB,"Alpha"=>$this->Shadowa));
+             foreach($ShadowArea as $Key => $Points) {
+                           $this->drawPolygonChart($Points,array("R"=>$this->ShadowR,"G"=>$this->ShadowG,"B"=>$this->ShadowB,"Alpha"=>$this->Shadowa));
+             }
             }
 
            $Alpha = $ForceTransparency != NULL ? $ForceTransparency : $Alpha;
            $Color = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Threshold"=>$Threshold);
 
-           foreach($Areas as $Key => $Points)
-            $this->drawPolygonChart($Points,$Color);
+           foreach($Areas as $Key => $Points) {
+                       $this->drawPolygonChart($Points,$Color);
+           }
           }
         }
       }
@@ -4419,8 +3942,7 @@ 
 
 
    /* Draw a bar chart */
-   function drawBarChart($Format=NULL)
-    {
+   function drawBarChart($Format=NULL) {
      $Floating0Serie	= isset($Format["Floating0Serie"]) ? $Format["Floating0Serie"] : NULL;
      $Floating0Value	= isset($Format["Floating0Value"]) ? $Format["Floating0Value"] : NULL;
      $Draw0Line		= isset($Format["Draw0Line"]) ? $Format["Draw0Line"] : FALSE;
@@ -4466,8 +3988,7 @@ 
      $Data = $this->DataSet->getData();
      list($XMargin,$XDivs) = $this->scaleGetXSettings();
 
-     if ( $OverrideColors != NULL )
-      {
+     if ( $OverrideColors != NULL ) {
        $OverrideColors = $this->validatePalette($OverrideColors,$OverrideSurrounding);
        $this->DataSet->saveExtendedData("Palette",$OverrideColors);
       }
@@ -4476,10 +3997,8 @@ 
 
      $SeriesCount  = $this->countDrawableSeries();
      $CurrentSerie = 0;
-     foreach($Data["Series"] as $SerieName => $Serie)
-      {
-       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
-        {
+     foreach($Data["Series"] as $SerieName => $Serie) {
+       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] ) {
          $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; $Alpha = $Serie["Color"]["Alpha"]; $Ticks = $Serie["Ticks"];
          if ( $DisplayColor == DISPLAY_AUTO ) { $DisplayR = $R; $DisplayG = $G; $DisplayB = $B; }
          if ( $Surrounding != NULL ) { $BorderR = $R+$Surrounding; $BorderG = $G+$Surrounding; $BorderB = $B+$Surrounding; }
@@ -4497,12 +4016,10 @@ 
          $PosArray = $this->scaleComputeY($Serie["Data"],array("AxisID"=>$Serie["Axis"]));
 
          if ( $Floating0Value != NULL )
-          { $YZero = $this->scaleComputeY($Floating0Value,array("AxisID"=>$Serie["Axis"])); }
-         else
+          { $YZero = $this->scaleComputeY($Floating0Value,array("AxisID"=>$Serie["Axis"])); } else
           { $YZero = $this->scaleComputeY(0,array("AxisID"=>$Serie["Axis"])); }
 
-         if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
-          {
+         if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT ) {
            if ( $YZero > $this->GraphAreaY2-1 ) { $YZero = $this->GraphAreaY2-1; }
            if ( $YZero < $this->GraphAreaY1+1 ) { $YZero = $this->GraphAreaY1+1; }
 
@@ -4522,13 +4039,10 @@ 
            if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
 
            $ID = 0;
-           foreach($PosArray as $Key => $Y2)
-            {
-             if ( $Floating0Serie != NULL )
-              {
+           foreach($PosArray as $Key => $Y2) {
+             if ( $Floating0Serie != NULL ) {
                if ( isset($Data["Series"][$Floating0Serie]["Data"][$Key]) )
-                { $Value = $Data["Series"][$Floating0Serie]["Data"][$Key]; }
-               else
+                { $Value = $Data["Series"][$Floating0Serie]["Data"][$Key]; } else
                 { $Value = 0; }
 
                $YZero = $this->scaleComputeY($Value,array("AxisID"=>$Serie["Axis"]));
@@ -4541,42 +4055,33 @@ 
              if ( $OverrideColors != NULL )
               { if ( isset($OverrideColors[$ID]) ) { $Color = array("R"=>$OverrideColors[$ID]["R"],"G"=>$OverrideColors[$ID]["G"],"B"=>$OverrideColors[$ID]["B"],"Alpha"=>$OverrideColors[$ID]["Alpha"],"BorderR"=>$OverrideColors[$ID]["BorderR"],"BorderG"=>$OverrideColors[$ID]["BorderG"],"BorderB"=>$OverrideColors[$ID]["BorderB"]); } else { $Color = $this->getRandomColor(); } }
 
-             if ( $Y2 != VOID )
-              {
+             if ( $Y2 != VOID ) {
                $BarHeight = $Y1 - $Y2;
 
-               if ( $Serie["Data"][$Key] == 0 )
-                {
+               if ( $Serie["Data"][$Key] == 0 ) {
                  $this->drawLine($X+$XOffset+$XSpace,$Y1,$X+$XOffset+$XSize-$XSpace,$Y1,$Color);
                  if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($X+$XOffset+$XSpace).",".floor($Y1-1).",".floor($X+$XOffset+$XSize-$XSpace).",".floor($Y1+1),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
-                }
-               else
-                {
+                } else {
                  if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($X+$XOffset+$XSpace).",".floor($Y1).",".floor($X+$XOffset+$XSize-$XSpace).",".floor($Y2),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
 
                  if ( $Rounded )
                   $this->drawRoundedFilledRectangle($X+$XOffset+$XSpace,$Y1,$X+$XOffset+$XSize-$XSpace,$Y2,$RoundRadius,$Color);
-                 else
-                  {
+                 else {
                    $this->drawFilledRectangle($X+$XOffset+$XSpace,$Y1,$X+$XOffset+$XSize-$XSpace,$Y2,$Color);
 
                    if ( $InnerColor != NULL ) { $this->drawRectangle($X+$XOffset+$XSpace+1,min($Y1,$Y2)+1,$X+$XOffset+$XSize-$XSpace-1,max($Y1,$Y2)-1,$InnerColor); }
 
-                   if ( $Gradient )
-                    {
+                   if ( $Gradient ) {
                      $this->Shadow  = FALSE;
 
-                     if ( $GradientMode == GRADIENT_SIMPLE )
-                      {
+                     if ( $GradientMode == GRADIENT_SIMPLE ) {
                        if ( $Serie["Data"][$Key] >= 0 )
                         $GradienColor = array("StartR"=>$GradientStartR,"StartG"=>$GradientStartG,"StartB"=>$GradientStartB,"EndR"=>$GradientEndR,"EndG"=>$GradientEndG,"EndB"=>$GradientEndB,"Alpha"=>$GradientAlpha);
                        else
                         $GradienColor = array("StartR"=>$GradientEndR,"StartG"=>$GradientEndG,"StartB"=>$GradientEndB,"EndR"=>$GradientStartR,"EndG"=>$GradientStartG,"EndB"=>$GradientStartB,"Alpha"=>$GradientAlpha);
 
                        $this->drawGradientArea($X+$XOffset+$XSpace,$Y1,$X+$XOffset+$XSize-$XSpace,$Y2,DIRECTION_VERTICAL,$GradienColor);
-                      }
-                     elseif ( $GradientMode == GRADIENT_EFFECT_CAN )
-                      {
+                      } elseif ( $GradientMode == GRADIENT_EFFECT_CAN ) {
                        $GradienColor1 = array("StartR"=>$GradientEndR,"StartG"=>$GradientEndG,"StartB"=>$GradientEndB,"EndR"=>$GradientStartR,"EndG"=>$GradientStartG,"EndB"=>$GradientStartB,"Alpha"=>$GradientAlpha);
                        $GradienColor2 = array("StartR"=>$GradientStartR,"StartG"=>$GradientStartG,"StartB"=>$GradientStartB,"EndR"=>$GradientEndR,"EndG"=>$GradientEndG,"EndB"=>$GradientEndB,"Alpha"=>$GradientAlpha);
                        $XSpan = floor($XSize / 3);
@@ -4588,8 +4093,7 @@ 
                     }
                   }
 
-                 if ( $Draw0Line )
-                  {
+                 if ( $Draw0Line ) {
                    $Line0Color = array("R"=>0,"G"=>0,"B"=>0,"Alpha"=>20);
 
                    if ( abs($Y1 - $Y2) > 3 ) { $Line0Width = 3; } else { $Line0Width = 1; }
@@ -4600,23 +4104,19 @@ 
                   }
                 }
 
-               if ( $DisplayValues && $Serie["Data"][$Key] != VOID )
-                {
+               if ( $DisplayValues && $Serie["Data"][$Key] != VOID ) {
                  if ( $DisplayShadow ) { $this->Shadow = TRUE; }
 
                  $Caption    = $this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit);
                  $TxtPos     = $this->getTextBox(0,0,$DisplayFont,$DisplaySize,90,$Caption);
                  $TxtHeight  = $TxtPos[0]["Y"] - $TxtPos[1]["Y"] + $TxtMargin;
 
-                 if ( $DisplayPos == LABEL_POS_INSIDE && abs($TxtHeight) < abs($BarHeight) )
-                  {
+                 if ( $DisplayPos == LABEL_POS_INSIDE && abs($TxtHeight) < abs($BarHeight) ) {
                    $CenterX = (($X+$XOffset+$XSize-$XSpace)-($X+$XOffset+$XSpace))/2 + $X+$XOffset+$XSpace;
                    $CenterY = ($Y2-$Y1)/2 + $Y1;
 
                    $this->drawText($CenterX,$CenterY,$Caption,array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_MIDDLEMIDDLE,"FontSize"=>$DisplaySize,"Angle"=>90));
-                  }
-                 else
-                  {
+                  } else {
                    if ( $Serie["Data"][$Key] >= 0 ) { $Align = TEXT_ALIGN_BOTTOMMIDDLE; $Offset = $DisplayOffset; } else { $Align = TEXT_ALIGN_TOPMIDDLE; $Offset = -$DisplayOffset; }
                    $this->drawText($X+$XOffset+$XSize/2,$Y2-$Offset,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>$Align,"FontSize"=>$DisplaySize));
                   }
@@ -4628,9 +4128,7 @@ 
              $X = $X + $XStep;
              $ID++;
             }
-          }
-         else
-          {
+          } else {
            if ( $YZero < $this->GraphAreaX1+1 ) { $YZero = $this->GraphAreaX1+1; }
            if ( $YZero > $this->GraphAreaX2-1 ) { $YZero = $this->GraphAreaX2-1; }
 
@@ -4651,10 +4149,8 @@ 
            if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
 
            $ID = 0 ;
-           foreach($PosArray as $Key => $X2)
-            {
-             if ( $Floating0Serie != NULL )
-              {
+           foreach($PosArray as $Key => $X2) {
+             if ( $Floating0Serie != NULL ) {
                if ( isset($Data["Series"][$Floating0Serie]["Data"][$Key]) )
                 $Value = $Data["Series"][$Floating0Serie]["Data"][$Key];
                else { $Value = 0; }
@@ -4668,42 +4164,33 @@ 
              if ( $OverrideColors != NULL )
               { if ( isset($OverrideColors[$ID]) ) { $Color = array("R"=>$OverrideColors[$ID]["R"],"G"=>$OverrideColors[$ID]["G"],"B"=>$OverrideColors[$ID]["B"],"Alpha"=>$OverrideColors[$ID]["Alpha"],"BorderR"=>$OverrideColors[$ID]["BorderR"],"BorderG"=>$OverrideColors[$ID]["BorderG"],"BorderB"=>$OverrideColors[$ID]["BorderB"]); } else { $Color = $this->getRandomColor(); } }
 
-             if ( $X2 != VOID )
-              {
+             if ( $X2 != VOID ) {
                $BarWidth = $X2 - $X1;
 
-               if ( $Serie["Data"][$Key] == 0 )
-                {
+               if ( $Serie["Data"][$Key] == 0 ) {
                  $this->drawLine($X1,$Y+$YOffset+$YSpace,$X1,$Y+$YOffset+$YSize-$YSpace,$Color);
                  if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($X1-1).",".floor($Y+$YOffset+$YSpace).",".floor($X1+1).",".floor($Y+$YOffset+$YSize-$YSpace),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
-                }
-               else
-                {
+                } else {
                  if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($X1).",".floor($Y+$YOffset+$YSpace).",".floor($X2).",".floor($Y+$YOffset+$YSize-$YSpace),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
 
                  if ( $Rounded )
                   $this->drawRoundedFilledRectangle($X1+1,$Y+$YOffset+$YSpace,$X2,$Y+$YOffset+$YSize-$YSpace,$RoundRadius,$Color);
-                 else
-                  {
+                 else {
                    $this->drawFilledRectangle($X1,$Y+$YOffset+$YSpace,$X2,$Y+$YOffset+$YSize-$YSpace,$Color);
 
                    if ( $InnerColor != NULL ) { $this->drawRectangle(min($X1,$X2)+1,$Y+$YOffset+$YSpace+1,max($X1,$X2)-1,$Y+$YOffset+$YSize-$YSpace-1,$InnerColor); }
 
-                   if ( $Gradient )
-                    {
+                   if ( $Gradient ) {
                      $this->Shadow  = FALSE;
 
-                     if ( $GradientMode == GRADIENT_SIMPLE )
-                      {
+                     if ( $GradientMode == GRADIENT_SIMPLE ) {
                        if ( $Serie["Data"][$Key] >= 0 )
                         $GradienColor = array("StartR"=>$GradientStartR,"StartG"=>$GradientStartG,"StartB"=>$GradientStartB,"EndR"=>$GradientEndR,"EndG"=>$GradientEndG,"EndB"=>$GradientEndB,"Alpha"=>$GradientAlpha);
                        else
                         $GradienColor = array("StartR"=>$GradientEndR,"StartG"=>$GradientEndG,"StartB"=>$GradientEndB,"EndR"=>$GradientStartR,"EndG"=>$GradientStartG,"EndB"=>$GradientStartB,"Alpha"=>$GradientAlpha);
 
                        $this->drawGradientArea($X1,$Y+$YOffset+$YSpace,$X2,$Y+$YOffset+$YSize-$YSpace,DIRECTION_HORIZONTAL,$GradienColor);
-                      }
-                     elseif ( $GradientMode == GRADIENT_EFFECT_CAN )
-                      {
+                      } elseif ( $GradientMode == GRADIENT_EFFECT_CAN ) {
                        $GradienColor1 = array("StartR"=>$GradientEndR,"StartG"=>$GradientEndG,"StartB"=>$GradientEndB,"EndR"=>$GradientStartR,"EndG"=>$GradientStartG,"EndB"=>$GradientStartB,"Alpha"=>$GradientAlpha);
                        $GradienColor2 = array("StartR"=>$GradientStartR,"StartG"=>$GradientStartG,"StartB"=>$GradientStartB,"EndR"=>$GradientEndR,"EndG"=>$GradientEndG,"EndB"=>$GradientEndB,"Alpha"=>$GradientAlpha);
                        $YSpan = floor($YSize / 3);
@@ -4715,8 +4202,7 @@ 
                     }
                   }
 
-                 if ( $Draw0Line )
-                  {
+                 if ( $Draw0Line ) {
                    $Line0Color = array("R"=>0,"G"=>0,"B"=>0,"Alpha"=>20);
 
                    if ( abs($X1 - $X2) > 3 ) { $Line0Width = 3; } else { $Line0Width = 1; }
@@ -4727,23 +4213,19 @@ 
                   }
                 }
 
-               if ( $DisplayValues && $Serie["Data"][$Key] != VOID ) 
-                {
+               if ( $DisplayValues && $Serie["Data"][$Key] != VOID ) {
                  if ( $DisplayShadow ) { $this->Shadow = TRUE; }
 
                  $Caption   = $this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit);
                  $TxtPos    = $this->getTextBox(0,0,$DisplayFont,$DisplaySize,0,$Caption);
                  $TxtWidth  = $TxtPos[1]["X"] - $TxtPos[0]["X"] + $TxtMargin;
 
-                 if ( $DisplayPos == LABEL_POS_INSIDE && abs($TxtWidth) < abs($BarWidth) )
-                  {
+                 if ( $DisplayPos == LABEL_POS_INSIDE && abs($TxtWidth) < abs($BarWidth) ) {
                    $CenterX = ($X2-$X1)/2 + $X1;
                    $CenterY = (($Y+$YOffset+$YSize-$YSpace)-($Y+$YOffset+$YSpace))/2 + ($Y+$YOffset+$YSpace);
 
                    $this->drawText($CenterX,$CenterY,$Caption,array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_MIDDLEMIDDLE,"FontSize"=>$DisplaySize));
-                  }
-                 else
-                  {
+                  } else {
                    if ( $Serie["Data"][$Key] >= 0 ) { $Align = TEXT_ALIGN_MIDDLELEFT; $Offset = $DisplayOffset; } else { $Align = TEXT_ALIGN_MIDDLERIGHT; $Offset = -$DisplayOffset; }
                    $this->drawText($X2+$Offset,$Y+$YOffset+$YSize/2,$Caption,array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>$Align,"FontSize"=>$DisplaySize));
                   }
@@ -4761,8 +4243,7 @@ 
     }
 
    /* Draw a bar chart */
-   function drawStackedBarChart($Format=NULL)
-    {
+   function drawStackedBarChart($Format=NULL) {
      $DisplayValues	= isset($Format["DisplayValues"]) ? $Format["DisplayValues"] : FALSE;
      $DisplayOrientation = isset($Format["DisplayOrientation"]) ? $Format["DisplayOrientation"] : ORIENTATION_AUTO;
      $DisplayRound      = isset($Format["DisplayRound"]) ? $Format["DisplayRound"] : 0;
@@ -4803,10 +4284,8 @@ 
      $RestoreShadow = $this->Shadow;
 
      $LastX = ""; $LastY = "";
-     foreach($Data["Series"] as $SerieName => $Serie)
-      {
-       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
-        {
+     foreach($Data["Series"] as $SerieName => $Serie) {
+       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] ) {
          $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; $Alpha = $Serie["Color"]["Alpha"]; $Ticks = $Serie["Ticks"];
          if ( $DisplayColor == DISPLAY_AUTO ) { $DisplayR = 255; $DisplayG = 255; $DisplayB = 255; }
          if ( $Surrounding != NULL ) { $BorderR = $R+$Surrounding; $BorderG = $G+$Surrounding; $BorderB = $B+$Surrounding; }
@@ -4827,8 +4306,7 @@ 
 
          $Color = array("TransCorner"=>TRUE,"R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"BorderR"=>$BorderR,"BorderG"=>$BorderG,"BorderB"=>$BorderB);
 
-         if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
-          {
+         if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT ) {
            if ( $YZero > $this->GraphAreaY2-1 ) { $YZero = $this->GraphAreaY2-1; }
            if ( $YZero > $this->GraphAreaY2-1 ) { $YZero = $this->GraphAreaY2-1; }
 
@@ -4839,10 +4317,8 @@ 
            $XOffset = -($XSize/2);
 
            if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
-           foreach($PosArray as $Key => $Height)
-            {
-             if ( $Height != VOID && $Serie["Data"][$Key] != 0 )
-              {
+           foreach($PosArray as $Key => $Height) {
+             if ( $Height != VOID && $Serie["Data"][$Key] != 0 ) {
                if ( $Serie["Data"][$Key] > 0 ) { $Pos = "+"; } else { $Pos = "-"; }
 
                if ( !isset($LastY[$Key] ) ) { $LastY[$Key] = ""; }
@@ -4858,23 +4334,18 @@ 
 
                if ( $Rounded )
                 $this->drawRoundedFilledRectangle($X+$XOffset,$Y1-$YSpaceUp+$YSpaceDown,$X+$XOffset+$XSize,$Y2,$RoundRadius,$Color);
-               else
-                {
+               else {
                  $this->drawFilledRectangle($X+$XOffset,$Y1-$YSpaceUp+$YSpaceDown,$X+$XOffset+$XSize,$Y2,$Color);
 
                  if ( $InnerColor != NULL ) { $RestoreShadow = $this->Shadow; $this->Shadow = FALSE; $this->drawRectangle(min($X+$XOffset+1,$X+$XOffset+$XSize),min($Y1-$YSpaceUp+$YSpaceDown,$Y2)+1,max($X+$XOffset+1,$X+$XOffset+$XSize)-1,max($Y1-$YSpaceUp+$YSpaceDown,$Y2)-1,$InnerColor); $this->Shadow = $RestoreShadow;}
 
-                 if ( $Gradient )
-                  {
+                 if ( $Gradient ) {
                    $this->Shadow  = FALSE;
 
-                   if ( $GradientMode == GRADIENT_SIMPLE )
-                    {
+                   if ( $GradientMode == GRADIENT_SIMPLE ) {
                      $GradientColor = array("StartR"=>$GradientStartR,"StartG"=>$GradientStartG,"StartB"=>$GradientStartB,"EndR"=>$GradientEndR,"EndG"=>$GradientEndG,"EndB"=>$GradientEndB,"Alpha"=>$GradientAlpha);
                      $this->drawGradientArea($X+$XOffset,$Y1-1-$YSpaceUp+$YSpaceDown,$X+$XOffset+$XSize,$Y2+1,DIRECTION_VERTICAL,$GradientColor);
-                    }
-                   elseif ( $GradientMode == GRADIENT_EFFECT_CAN )
-                    {
+                    } elseif ( $GradientMode == GRADIENT_EFFECT_CAN ) {
                      $GradientColor1 = array("StartR"=>$GradientEndR,"StartG"=>$GradientEndG,"StartB"=>$GradientEndB,"EndR"=>$GradientStartR,"EndG"=>$GradientStartG,"EndB"=>$GradientStartB,"Alpha"=>$GradientAlpha);
                      $GradientColor2 = array("StartR"=>$GradientStartR,"StartG"=>$GradientStartG,"StartB"=>$GradientStartB,"EndR"=>$GradientEndR,"EndG"=>$GradientEndG,"EndB"=>$GradientEndB,"Alpha"=>$GradientAlpha);
                      $XSpan = floor($XSize / 3);
@@ -4886,8 +4357,7 @@ 
                   }
                 }
 
-               if ( $DisplayValues )
-                {
+               if ( $DisplayValues ) {
                  $BarHeight = abs($Y2-$Y1)-2;
                  $BarWidth  = $XSize+($XOffset/2)-$FontFactor;
 
@@ -4900,17 +4370,14 @@ 
                  $YCenter = ( ($Y2) - ($Y1-$YSpaceUp+$YSpaceDown) ) / 2 + $Y1-$YSpaceUp+$YSpaceDown;
 
                  $Done = FALSE;
-                 if ( $DisplayOrientation == ORIENTATION_HORIZONTAL || $DisplayOrientation == ORIENTATION_AUTO )
-                  {
-                   if ( $TxtHeight < $BarHeight && $TxtWidth < $BarWidth  )
-                    {
+                 if ( $DisplayOrientation == ORIENTATION_HORIZONTAL || $DisplayOrientation == ORIENTATION_AUTO ) {
+                   if ( $TxtHeight < $BarHeight && $TxtWidth < $BarWidth  ) {
                      $this->drawText($XCenter,$YCenter,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_MIDDLEMIDDLE,"FontSize"=>$DisplaySize,"FontName"=>$DisplayFont));
                      $Done = TRUE;
                     }
                   }
 
-                 if ( $DisplayOrientation == ORIENTATION_VERTICAL || ( $DisplayOrientation == ORIENTATION_AUTO && !$Done) )
-                  {
+                 if ( $DisplayOrientation == ORIENTATION_VERTICAL || ( $DisplayOrientation == ORIENTATION_AUTO && !$Done) ) {
                    if ( $TxtHeight < $BarWidth && $TxtWidth < $BarHeight  )
                     $this->drawText($XCenter,$YCenter,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Angle"=>90,"Align"=>TEXT_ALIGN_MIDDLEMIDDLE,"FontSize"=>$DisplaySize,"FontName"=>$DisplayFont));
                   }
@@ -4921,9 +4388,7 @@ 
 
              $X = $X + $XStep;
             }
-          }
-         else
-          {
+          } else {
            if ( $YZero < $this->GraphAreaX1+1 ) { $YZero = $this->GraphAreaX1+1; }
            if ( $YZero > $this->GraphAreaX2-1 ) { $YZero = $this->GraphAreaX2-1; }
 
@@ -4934,10 +4399,8 @@ 
            $YOffset = -($YSize/2);
 
            if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
-           foreach($PosArray as $Key => $Width)
-            {
-             if ( $Width != VOID && $Serie["Data"][$Key] != 0 )
-              {
+           foreach($PosArray as $Key => $Width) {
+             if ( $Width != VOID && $Serie["Data"][$Key] != 0 ) {
                if ( $Serie["Data"][$Key] > 0 ) { $Pos = "+"; } else { $Pos = "-"; }
 
                if ( !isset($LastX[$Key] ) ) { $LastX[$Key] = ""; }
@@ -4953,23 +4416,18 @@ 
 
                if ( $Rounded )
                 $this->drawRoundedFilledRectangle($X1+$XSpaceLeft,$Y+$YOffset,$X2-$XSpaceRight,$Y+$YOffset+$YSize,$RoundRadius,$Color);
-               else
-                {
+               else {
                  $this->drawFilledRectangle($X1+$XSpaceLeft,$Y+$YOffset,$X2-$XSpaceRight,$Y+$YOffset+$YSize,$Color);
 
                  if ( $InnerColor != NULL ) { $RestoreShadow = $this->Shadow; $this->Shadow = FALSE; $this->drawRectangle(min($X1+$XSpaceLeft,$X2-$XSpaceRight)+1,min($Y+$YOffset,$Y+$YOffset+$YSize)+1,max($X1+$XSpaceLeft,$X2-$XSpaceRight)-1,max($Y+$YOffset,$Y+$YOffset+$YSize)-1,$InnerColor); $this->Shadow = $RestoreShadow;}
 
-                 if ( $Gradient )
-                  {
+                 if ( $Gradient ) {
                    $this->Shadow  = FALSE;
 
-                   if ( $GradientMode == GRADIENT_SIMPLE )
-                    {
+                   if ( $GradientMode == GRADIENT_SIMPLE ) {
                      $GradientColor = array("StartR"=>$GradientStartR,"StartG"=>$GradientStartG,"StartB"=>$GradientStartB,"EndR"=>$GradientEndR,"EndG"=>$GradientEndG,"EndB"=>$GradientEndB,"Alpha"=>$GradientAlpha);
                      $this->drawGradientArea($X1+$XSpaceLeft,$Y+$YOffset,$X2-$XSpaceRight,$Y+$YOffset+$YSize,DIRECTION_HORIZONTAL,$GradientColor);
-                    }
-                   elseif ( $GradientMode == GRADIENT_EFFECT_CAN )
-                    {
+                    } elseif ( $GradientMode == GRADIENT_EFFECT_CAN ) {
                      $GradientColor1 = array("StartR"=>$GradientEndR,"StartG"=>$GradientEndG,"StartB"=>$GradientEndB,"EndR"=>$GradientStartR,"EndG"=>$GradientStartG,"EndB"=>$GradientStartB,"Alpha"=>$GradientAlpha);
                      $GradientColor2 = array("StartR"=>$GradientStartR,"StartG"=>$GradientStartG,"StartB"=>$GradientStartB,"EndR"=>$GradientEndR,"EndG"=>$GradientEndG,"EndB"=>$GradientEndB,"Alpha"=>$GradientAlpha);
                      $YSpan = floor($YSize / 3);
@@ -4981,8 +4439,7 @@ 
                   }
                 }
 
-               if ( $DisplayValues )
-                {
+               if ( $DisplayValues ) {
                  $BarWidth = abs($X2-$X1)-$FontFactor;
                  $BarHeight = $YSize+($YOffset/2)-$FontFactor/2;
                  $Caption   = $this->scaleFormat(round($Serie["Data"][$Key],$DisplayRound),$Mode,$Format,$Unit);
@@ -4994,17 +4451,14 @@ 
                  $YCenter  = ( ($Y+$YOffset+$YSize) - ($Y+$YOffset) ) / 2 + $Y+$YOffset;
 
                  $Done = FALSE;
-                 if ( $DisplayOrientation == ORIENTATION_HORIZONTAL || $DisplayOrientation == ORIENTATION_AUTO )
-                  {
-                   if ( $TxtHeight < $BarHeight && $TxtWidth < $BarWidth  )
-                    {
+                 if ( $DisplayOrientation == ORIENTATION_HORIZONTAL || $DisplayOrientation == ORIENTATION_AUTO ) {
+                   if ( $TxtHeight < $BarHeight && $TxtWidth < $BarWidth  ) {
                      $this->drawText($XCenter,$YCenter,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_MIDDLEMIDDLE,"FontSize"=>$DisplaySize,"FontName"=>$DisplayFont));
                      $Done = TRUE;
                     }
                   }
 
-                 if ( $DisplayOrientation == ORIENTATION_VERTICAL || ( $DisplayOrientation == ORIENTATION_AUTO && !$Done) )
-                  {
+                 if ( $DisplayOrientation == ORIENTATION_VERTICAL || ( $DisplayOrientation == ORIENTATION_AUTO && !$Done) ) {
                    if ( $TxtHeight < $BarWidth && $TxtWidth < $BarHeight  )
                     $this->drawText($XCenter,$YCenter,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Angle"=>90,"Align"=>TEXT_ALIGN_MIDDLEMIDDLE,"FontSize"=>$DisplaySize,"FontName"=>$DisplayFont));
                   }
@@ -5021,8 +4475,7 @@ 
     }
 
    /* Draw a stacked area chart */
-   function drawStackedAreaChart($Format=NULL)
-    {
+   function drawStackedAreaChart($Format=NULL) {
      $DrawLine		= isset($Format["DrawLine"]) ? $Format["DrawLine"] : FALSE;
      $LineSurrounding	= isset($Format["LineSurrounding"]) ? $Format["LineSurrounding"] : NULL;
      $LineR		= isset($Format["LineR"]) ? $Format["LineR"] : VOID;
@@ -5051,21 +4504,17 @@ 
      $OffsetData    = "";
      $OverallOffset = "";
      $SerieOrder    = "";
-     foreach($Data["Series"] as $SerieName => $Serie)
-      {
-       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
-        {
+     foreach($Data["Series"] as $SerieName => $Serie) {
+       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] ) {
          $SerieOrder[] = $SerieName;
 
-         foreach($Serie["Data"] as $Key => $Value)
-          {
+         foreach($Serie["Data"] as $Key => $Value) {
            if ( $Value == VOID ) { $Value = 0; }
            if ($Value >= 0) { $Sign = "+"; } else { $Sign = "-"; }
            if ( !isset($OverallOffset[$Key]) || !isset($OverallOffset[$Key][$Sign]) ) { $OverallOffset[$Key][$Sign] = 0; }
 
            if ( $Sign == "+" )
-            { $Data["Series"][$SerieName]["Data"][$Key] = $Value + $OverallOffset[$Key][$Sign]; }
-           else
+            { $Data["Series"][$SerieName]["Data"][$Key] = $Value + $OverallOffset[$Key][$Sign]; } else
             { $Data["Series"][$SerieName]["Data"][$Key] = $Value - $OverallOffset[$Key][$Sign]; }
 
            $OverallOffset[$Key][$Sign] = $OverallOffset[$Key][$Sign] + abs($Value);
@@ -5075,11 +4524,9 @@ 
      $SerieOrder = array_reverse($SerieOrder);
 
      $LastX = ""; $LastY = "";
-     foreach($SerieOrder as $Key => $SerieName)
-      {
+     foreach($SerieOrder as $Key => $SerieName) {
        $Serie = $Data["Series"][$SerieName];
-       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
-        {
+       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] ) {
          $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; $Alpha = $Serie["Color"]["Alpha"]; $Ticks = $Serie["Ticks"];
          if ( $ForceTransparency != NULL ) { $Alpha = $ForceTransparency; }
 
@@ -5107,8 +4554,7 @@ 
 
          $this->DataSet->Data["Series"][$SerieName]["XOffset"] = 0;
 
-         if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
-          {
+         if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT ) {
            if ( $YZero < $this->GraphAreaY1+1 ) { $YZero = $this->GraphAreaY1+1; }
            if ( $YZero > $this->GraphAreaY2-1 ) { $YZero = $this->GraphAreaY2-1; }
 
@@ -5118,8 +4564,7 @@ 
            if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
 
            $Plots = ""; $Plots[] = $X; $Plots[] = $YZero;
-           foreach($PosArray as $Key => $Height)
-            {
+           foreach($PosArray as $Key => $Height) {
              if ( $Height != VOID ) { $Plots[] = $X; $Plots[] = $YZero-$Height; }
              $X = $X + $XStep;
             }
@@ -5129,10 +4574,8 @@ 
 
            $this->Shadow = $RestoreShadow;
            if ( $DrawLine ) { for($i=2; $i<=count($Plots)-6; $i=$i+2) { $this->drawLine($Plots[$i],$Plots[$i+1],$Plots[$i+2],$Plots[$i+3],$LineColor); } }
-           if ( $DrawPlot )
-            {
-             for($i=2; $i<=count($Plots)-4; $i=$i+2)
-              {
+           if ( $DrawPlot ) {
+             for($i=2; $i<=count($Plots)-4; $i=$i+2) {
                if ( $PlotBorder != 0 )
                 { $this->drawFilledCircle($Plots[$i],$Plots[$i+1],$PlotRadius+$PlotBorder,$PlotBorderColor); }
 
@@ -5140,9 +4583,7 @@ 
               }
             }
            $this->Shadow = FALSE;
-          }
-         elseif ( $Data["Orientation"] == SCALE_POS_TOPBOTTOM )
-          {
+          } elseif ( $Data["Orientation"] == SCALE_POS_TOPBOTTOM ) {
            if ( $YZero < $this->GraphAreaX1+1 ) { $YZero = $this->GraphAreaX1+1; }
            if ( $YZero > $this->GraphAreaX2-1 ) { $YZero = $this->GraphAreaX2-1; }
 
@@ -5152,8 +4593,7 @@ 
            if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
 
            $Plots = ""; $Plots[] = $YZero; $Plots[] = $Y;
-           foreach($PosArray as $Key => $Height)
-            {
+           foreach($PosArray as $Key => $Height) {
              if ( $Height != VOID ) { $Plots[] = $YZero+$Height; $Plots[] = $Y; }
              $Y = $Y + $YStep;
             }
@@ -5163,10 +4603,8 @@ 
 
            $this->Shadow = $RestoreShadow;
            if ( $DrawLine ) { for($i=2; $i<=count($Plots)-6; $i=$i+2) { $this->drawLine($Plots[$i],$Plots[$i+1],$Plots[$i+2],$Plots[$i+3],$LineColor); } }
-           if ( $DrawPlot )
-            {
-             for($i=2; $i<=count($Plots)-4; $i=$i+2)
-              {
+           if ( $DrawPlot ) {
+             for($i=2; $i<=count($Plots)-4; $i=$i+2) {
                if ( $PlotBorder != 0 )
                 { $this->drawFilledCircle($Plots[$i],$Plots[$i+1],$PlotRadius+$PlotBorder,$PlotBorderColor); }
 
@@ -5185,27 +4623,22 @@ 
     { return(array("R"=>rand(0,255),"G"=>rand(0,255),"B"=>rand(0,255),"Alpha"=>$Alpha)); }
  
    /* Validate a palette */
-   function validatePalette($Colors,$Surrounding=NULL)
-    {
+   function validatePalette($Colors,$Surrounding=NULL) {
      $Result = "";
 
      if ( !is_array($Colors) ) { return($this->getRandomColor()); }
 
-     foreach($Colors as $Key => $Values)
-      {
+     foreach($Colors as $Key => $Values) {
        if ( isset($Values["R"]) ) { $Result[$Key]["R"] = $Values["R"]; } else { $Result[$Key]["R"] = rand(0,255); }
        if ( isset($Values["G"]) ) { $Result[$Key]["G"] = $Values["G"]; } else { $Result[$Key]["G"] = rand(0,255); }
        if ( isset($Values["B"]) ) { $Result[$Key]["B"] = $Values["B"]; } else { $Result[$Key]["B"] = rand(0,255); }
        if ( isset($Values["Alpha"]) ) { $Result[$Key]["Alpha"] = $Values["Alpha"]; } else { $Result[$Key]["Alpha"] = 100; }
 
-       if ( $Surrounding != NULL )
-        {
+       if ( $Surrounding != NULL ) {
          $Result[$Key]["BorderR"] = $Result[$Key]["R"] + $Surrounding;
          $Result[$Key]["BorderG"] = $Result[$Key]["G"] + $Surrounding;
          $Result[$Key]["BorderB"] = $Result[$Key]["B"] + $Surrounding;
-        }
-       else
-        {
+        } else {
          if ( isset($Values["BorderR"]) )     { $Result[$Key]["BorderR"] = $Values["BorderR"]; } else { $Result[$Key]["BorderR"] = $Result[$Key]["R"]; }
          if ( isset($Values["BorderG"]) )     { $Result[$Key]["BorderG"] = $Values["BorderG"]; } else { $Result[$Key]["BorderG"] = $Result[$Key]["G"]; }
          if ( isset($Values["BorderB"]) )     { $Result[$Key]["BorderB"] = $Values["BorderB"]; } else { $Result[$Key]["BorderB"] = $Result[$Key]["B"]; }
@@ -5217,8 +4650,7 @@ 
     }
 
    /* Draw the derivative chart associated to the data series */
-   function drawDerivative($Format=NULL)
-    {
+   function drawDerivative($Format=NULL) {
      $Offset		= isset($Format["Offset"]) ? $Format["Offset"] : 10;
      $SerieSpacing	= isset($Format["SerieSpacing"]) ? $Format["SerieSpacing"] : 3;
      $DerivativeHeight	= isset($Format["DerivativeHeight"]) ? $Format["DerivativeHeight"] : 4;
@@ -5268,29 +4700,23 @@ 
      else
       $XPos = $this->DataSet->Data["GraphArea"]["X2"] + $Offset;
 
-     foreach($Data["Series"] as $SerieName => $Serie)
-      {
-       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
-        {
+     foreach($Data["Series"] as $SerieName => $Serie) {
+       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] ) {
          $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; $Alpha = $Serie["Color"]["Alpha"]; $Ticks = $Serie["Ticks"]; $Weight = $Serie["Weight"];
 
          $AxisID   = $Serie["Axis"];
          $PosArray = $this->scaleComputeY($Serie["Data"],array("AxisID"=>$Serie["Axis"]));
 
-         if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
-          {
-           if ( $Caption )
-            {
-             if ( $CaptionLine ) 
-              {
+         if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT ) {
+           if ( $Caption ) {
+             if ( $CaptionLine ) {
                $StartX = floor($this->GraphAreaX1-$CaptionWidth+$XMargin-$CaptionMargin);
                $EndX   = floor($this->GraphAreaX1-$CaptionMargin+$XMargin);
 
                $CaptionSettings = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight);
                if ( $CaptionBox ) { $this->drawFilledRectangle($StartX,$YPos,$EndX,$YPos+$CaptionHeight,array("R"=>$CaptionFillR,"G"=>$CaptionFillG,"B"=>$CaptionFillB,"BorderR"=>$CaptionBorderR,"BorderG"=>$CaptionBorderG,"BorderB"=>$CaptionBorderB,"Alpha"=>$CaptionFillAlpha)); }
                $this->drawLine($StartX+2,$YPos+($CaptionHeight/2),$EndX-2,$YPos+($CaptionHeight/2),$CaptionSettings);
-              }
-             else
+              } else
               $this->drawFilledRectangle($this->GraphAreaX1-$CaptionWidth+$XMargin-$CaptionMargin,$YPos,$this->GraphAreaX1-$CaptionMargin+$XMargin,$YPos+$CaptionHeight,array("R"=>$R,"G"=>$G,"B"=>$B,"BorderR"=>$CaptionBorderR,"BorderG"=>$CaptionBorderG,"BorderB"=>$CaptionBorderB));
             }
 
@@ -5313,33 +4739,26 @@ 
 
            /* Determine the Max slope index */
            $LastX = NULL; $LastY = NULL; $MinSlope = 0; $MaxSlope = 1;
-           foreach($PosArray as $Key => $Y)
-            {
+           foreach($PosArray as $Key => $Y) {
              if ( $Y != VOID && $LastX != NULL )
               { $Slope = ($LastY - $Y); if ( $Slope > $MaxSlope ) { $MaxSlope = $Slope; } if ( $Slope < $MinSlope ) { $MinSlope = $Slope; } }
 
              if ( $Y == VOID )
-              { $LastX = NULL; $LastY = NULL; }
-             else
+              { $LastX = NULL; $LastY = NULL; } else
               { $LastX = $X; $LastY = $Y; }
             }
 
            $LastX = NULL; $LastY = NULL; $LastColor = NULL;
-           foreach($PosArray as $Key => $Y)
-            {
-             if ( $Y != VOID && $LastY != NULL )
-              {
+           foreach($PosArray as $Key => $Y) {
+             if ( $Y != VOID && $LastY != NULL ) {
                $Slope = ($LastY - $Y);
 
-               if ( $Slope >= 0 )
-                {
+               if ( $Slope >= 0 ) {
                  $SlopeIndex = (100 / $MaxSlope) * $Slope;
                  $R = (($PositiveSlopeEndR - $PositiveSlopeStartR)/100)*$SlopeIndex+$PositiveSlopeStartR;
                  $G = (($PositiveSlopeEndG - $PositiveSlopeStartG)/100)*$SlopeIndex+$PositiveSlopeStartG;
                  $B = (($PositiveSlopeEndB - $PositiveSlopeStartB)/100)*$SlopeIndex+$PositiveSlopeStartB;
-                }
-               elseif ( $Slope < 0 )
-                {
+                } elseif ( $Slope < 0 ) {
                  $SlopeIndex = (100 / abs($MinSlope)) * abs($Slope);
                  $R = (($NegativeSlopeEndR - $NegativeSlopeStartR)/100)*$SlopeIndex+$NegativeSlopeStartR;
                  $G = (($NegativeSlopeEndG - $NegativeSlopeStartG)/100)*$SlopeIndex+$NegativeSlopeStartG;
@@ -5352,36 +4771,29 @@ 
                 {
                  $GradientSettings = array("StartR"=>$LastColor["R"],"StartG"=>$LastColor["G"],"StartB"=>$LastColor["B"],"EndR"=>$R,"EndG"=>$G,"EndB"=>$B);
                  $this->drawGradientArea($LastX,$TopY,$X,$BottomY,DIRECTION_HORIZONTAL,$GradientSettings);
-                }
-               elseif ( !$ShadedSlopeBox || $LastColor == NULL ) // || $Slope == 0
+                } elseif ( !$ShadedSlopeBox || $LastColor == NULL ) // || $Slope == 0
                 $this->drawFilledRectangle(floor($LastX),$TopY,floor($X),$BottomY,$Color);
 
                $LastColor = $Color;
               }
 
              if ( $Y == VOID )
-              { $LastY = NULL; }
-             else
+              { $LastY = NULL; } else
               { $LastX = $X; $LastY = $Y; }
 
              $X = $X + $XStep;
             }
 
            $YPos = $YPos + $CaptionHeight + $SerieSpacing;
-          }
-         else
-          {
-           if ( $Caption )
-            {
+          } else {
+           if ( $Caption ) {
              $StartY = floor($this->GraphAreaY1-$CaptionWidth+$XMargin-$CaptionMargin);
              $EndY   = floor($this->GraphAreaY1-$CaptionMargin+$XMargin);
-             if ( $CaptionLine ) 
-              {
+             if ( $CaptionLine ) {
                $CaptionSettings = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight);
                if ( $CaptionBox ) { $this->drawFilledRectangle($XPos,$StartY,$XPos+$CaptionHeight,$EndY,array("R"=>$CaptionFillR,"G"=>$CaptionFillG,"B"=>$CaptionFillB,"BorderR"=>$CaptionBorderR,"BorderG"=>$CaptionBorderG,"BorderB"=>$CaptionBorderB,"Alpha"=>$CaptionFillAlpha)); }
                $this->drawLine($XPos+($CaptionHeight/2),$StartY+2,$XPos+($CaptionHeight/2),$EndY-2,$CaptionSettings);
-              }
-             else
+              } else
               $this->drawFilledRectangle($XPos,$StartY,$XPos+$CaptionHeight,$EndY,array("R"=>$R,"G"=>$G,"B"=>$B,"BorderR"=>$CaptionBorderR,"BorderG"=>$CaptionBorderG,"BorderB"=>$CaptionBorderB));
             }
 
@@ -5405,33 +4817,26 @@ 
 
            /* Determine the Max slope index */
            $LastX = NULL; $LastY = NULL; $MinSlope = 0; $MaxSlope = 1;
-           foreach($PosArray as $Key => $X)
-            {
+           foreach($PosArray as $Key => $X) {
              if ( $X != VOID && $LastX != NULL )
               { $Slope = ($X - $LastX); if ( $Slope > $MaxSlope ) { $MaxSlope = $Slope; } if ( $Slope < $MinSlope ) { $MinSlope = $Slope; } }
 
              if ( $X == VOID )
-              { $LastX = NULL; }
-             else
+              { $LastX = NULL; } else
               { $LastX = $X; }
             }
 
            $LastX = NULL; $LastY = NULL; $LastColor = NULL;
-           foreach($PosArray as $Key => $X)
-            {
-             if ( $X != VOID && $LastX != NULL )
-              {
+           foreach($PosArray as $Key => $X) {
+             if ( $X != VOID && $LastX != NULL ) {
                $Slope = ($X - $LastX);
 
-               if ( $Slope >= 0 )
-                {
+               if ( $Slope >= 0 ) {
                  $SlopeIndex = (100 / $MaxSlope) * $Slope;
                  $R = (($PositiveSlopeEndR - $PositiveSlopeStartR)/100)*$SlopeIndex+$PositiveSlopeStartR;
                  $G = (($PositiveSlopeEndG - $PositiveSlopeStartG)/100)*$SlopeIndex+$PositiveSlopeStartG;
                  $B = (($PositiveSlopeEndB - $PositiveSlopeStartB)/100)*$SlopeIndex+$PositiveSlopeStartB;
-                }
-               elseif ( $Slope < 0 )
-                {
+                } elseif ( $Slope < 0 ) {
                  $SlopeIndex = (100 / abs($MinSlope)) * abs($Slope);
                  $R = (($NegativeSlopeEndR - $NegativeSlopeStartR)/100)*$SlopeIndex+$NegativeSlopeStartR;
                  $G = (($NegativeSlopeEndG - $NegativeSlopeStartG)/100)*$SlopeIndex+$NegativeSlopeStartG;
@@ -5440,21 +4845,18 @@ 
 
                $Color = array("R"=>$R,"G"=>$G,"B"=>$B);
 
-               if ( $ShadedSlopeBox && $LastColor != NULL )
-                {
+               if ( $ShadedSlopeBox && $LastColor != NULL ) {
                  $GradientSettings = array("StartR"=>$LastColor["R"],"StartG"=>$LastColor["G"],"StartB"=>$LastColor["B"],"EndR"=>$R,"EndG"=>$G,"EndB"=>$B);
 
                  $this->drawGradientArea($TopX,$LastY,$BottomX,$Y,DIRECTION_VERTICAL,$GradientSettings);
-                }
-               elseif ( !$ShadedSlopeBox || $LastColor == NULL ) 
+                } elseif ( !$ShadedSlopeBox || $LastColor == NULL ) 
                 $this->drawFilledRectangle($TopX,floor($LastY),$BottomX,floor($Y),$Color);
 
                $LastColor = $Color;
               }
 
              if ( $X == VOID )
-              { $LastX = NULL; }
-             else
+              { $LastX = NULL; } else
               { $LastX = $X; $LastY = $Y; }
 
              $Y = $Y + $XStep;
@@ -5469,8 +4871,7 @@ 
     }
 
    /* Draw the line of best fit */
-   function drawBestFit($Format="")
-    {
+   function drawBestFit($Format="") {
      $OverrideTicks	= isset($Format["Ticks"]) ? $Format["Ticks"] : NULL;
      $OverrideR		= isset($Format["R"]) ? $Format["R"] : VOID;
      $OverrideG		= isset($Format["G"]) ? $Format["G"] : VOID;
@@ -5480,10 +4881,8 @@ 
      $Data = $this->DataSet->getData();
      list($XMargin,$XDivs) = $this->scaleGetXSettings();
 
-     foreach($Data["Series"] as $SerieName => $Serie)
-      {
-       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
-        {
+     foreach($Data["Series"] as $SerieName => $Serie) {
+       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] ) {
          if ( $OverrideR != VOID && $OverrideG != VOID && $OverrideB != VOID ) { $R = $OverrideR; $G = $OverrideG; $B = $OverrideB; } else { $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; }
          if ( $OverrideTicks == NULL ) { $Ticks = $Serie["Ticks"]; } else { $Ticks = $OverrideTicks; }
          if ( $OverrideAlpha == VOID ) { $Alpha = $Serie["Color"]["Alpha"]; } else { $Alpha = $OverrideAlpha; }
@@ -5493,17 +4892,14 @@ 
          $AxisID   = $Serie["Axis"];
          $PosArray = $this->scaleComputeY($Serie["Data"],array("AxisID"=>$Serie["Axis"]));
 
-         if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
-          {
+         if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT ) {
            if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1)/4; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
            $X = $this->GraphAreaX1 + $XMargin;
 
            if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
            $Sxy = 0; $Sx = 0; $Sy = 0; $Sxx = 0;
-           foreach($PosArray as $Key => $Y)
-            {
-             if ( $Y != VOID )
-              {
+           foreach($PosArray as $Key => $Y) {
+             if ( $Y != VOID ) {
                $Sxy = $Sxy + $X*$Y;
                $Sx  = $Sx + $X;
                $Sy  = $Sy + $Y;
@@ -5527,18 +4923,14 @@ 
            if ( $Y2 > $this->GraphAreaY2 ) { $X2 = $X2 - ($Y2-$this->GraphAreaY2); $Y2 = $this->GraphAreaY2; }
 
            $this->drawLine($X1,$Y1,$X2,$Y2,$Color);
-          }
-         else
-          {
+          } else {
            if ( $XDivs == 0 ) { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
            $Y = $this->GraphAreaY1 + $XMargin;
 
            if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
            $Sxy = 0; $Sx = 0; $Sy = 0; $Sxx = 0;
-           foreach($PosArray as $Key => $X)
-            {
-             if ( $X != VOID )
-              {
+           foreach($PosArray as $Key => $X) {
+             if ( $X != VOID ) {
                $Sxy = $Sxy + $X*$Y;
                $Sx  = $Sx + $Y;
                $Sy  = $Sy + $X;
@@ -5568,8 +4960,7 @@ 
     }
 
    /* Write labels */
-   function writeLabel($SeriesName,$Indexes,$Format="")
-    {
+   function writeLabel($SeriesName,$Indexes,$Format="") {
      $OverrideTitle	= isset($Format["OverrideTitle"]) ? $Format["OverrideTitle"] : NULL;
      $ForceLabels	= isset($Format["ForceLabels"]) ? $Format["ForceLabels"] : NULL;
      $DrawPoint		= isset($Format["DrawPoint"]) ? $Format["DrawPoint"] : LABEL_POINT_BOX;
@@ -5587,34 +4978,28 @@ 
      if ( !is_array($SeriesName) ) { $SerieName = $SeriesName; $SeriesName = ""; $SeriesName[] = $SerieName; }
      if ( $ForceLabels != NULL && !is_array($ForceLabels) ) { $ForceLabel = $ForceLabels; $ForceLabels = ""; $ForceLabels[] = $ForceLabel; }
 
-     foreach ($Indexes as $Key => $Index)
-      {
+     foreach ($Indexes as $Key => $Index) {
        $Series = "";
 
-       if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
-        {
+       if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT ) {
          if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1)/4; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
          $X = $this->GraphAreaX1 + $XMargin + $Index * $XStep;
 
          if ( $DrawVerticalLine ) { $this->drawLine($X,$this->GraphAreaY1+$Data["YMargin"],$X,$this->GraphAreaY2-$Data["YMargin"],array("R"=>$VerticalLineR,"G"=>$VerticalLineG,"B"=>$VerticalLineB,"Alpha"=>$VerticalLineAlpha,"Ticks"=>$VerticalLineTicks)); }
 
          $MinY = $this->GraphAreaY2;
-         foreach ($SeriesName as $iKey => $SerieName)
-          {
-           if ( isset($Data["Series"][$SerieName]["Data"][$Index]) )
-            {
+         foreach ($SeriesName as $iKey => $SerieName) {
+           if ( isset($Data["Series"][$SerieName]["Data"][$Index]) ) {
              $AxisID      = $Data["Series"][$SerieName]["Axis"];
 
              if ( $OverrideTitle != NULL)
               $Description = $OverrideTitle;
-             elseif ( count($SeriesName) == 1 )
-              {
+             elseif ( count($SeriesName) == 1 ) {
                if ( isset($Data["Abscissa"]) && isset($Data["Series"][$Data["Abscissa"]]["Data"][$Index]) )
                 $Description = $Data["Series"][$SerieName]["Description"]." - ".$Data["Series"][$Data["Abscissa"]]["Data"][$Index];
                else
                 $Description = $Data["Series"][$SerieName]["Description"];
-              }
-             elseif ( isset($Data["Abscissa"]) && isset($Data["Series"][$Data["Abscissa"]]["Data"][$Index]) )
+              } elseif ( isset($Data["Abscissa"]) && isset($Data["Series"][$Data["Abscissa"]]["Data"][$Index]) )
               $Description = $Data["Series"][$Data["Abscissa"]]["Data"][$Index];
 
              $AxisMode     = $Data["Axis"][$AxisID]["Display"];
@@ -5640,17 +5025,13 @@ 
              else
               $Caption = $this->scaleFormat($Value,$AxisMode,$AxisFormat,$AxisUnit);
 
-             if ( $this->LastChartLayout == CHART_LAST_LAYOUT_STACKED )
-              {
+             if ( $this->LastChartLayout == CHART_LAST_LAYOUT_STACKED ) {
                if ( $Value >=0 ) { $LookFor = "+"; } else { $LookFor = "-"; }
 
                $Value = 0; $Done = FALSE;
-               foreach($Data["Series"] as $Name => $SerieLookup)
-                {
-                 if ( $SerieLookup["isDrawable"] == TRUE && $Name != $Data["Abscissa"] && !$Done )
-                  {
-                   if ( isset($Data["Series"][$Name]["Data"][$Index]) && $Data["Series"][$Name]["Data"][$Index] != VOID )
-                    {
+               foreach($Data["Series"] as $Name => $SerieLookup) {
+                 if ( $SerieLookup["isDrawable"] == TRUE && $Name != $Data["Abscissa"] && !$Done ) {
+                   if ( isset($Data["Series"][$Name]["Data"][$Index]) && $Data["Series"][$Name]["Data"][$Index] != VOID ) {
                      if ($Data["Series"][$Name]["Data"][$Index] >= 0 && $LookFor == "+" ) { $Value = $Value + $Data["Series"][$Name]["Data"][$Index]; }
                      if ($Data["Series"][$Name]["Data"][$Index] < 0 && $LookFor == "-" )  { $Value = $Value - $Data["Series"][$Name]["Data"][$Index]; }
                      if ($Name == $SerieName ) { $Done = TRUE; }
@@ -5674,31 +5055,25 @@ 
           }
          $this->drawLabelBox($X,$MinY-3,$Description,$Series,$Format);
 
-        }
-       else
-        {
+        } else {
          if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $XStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
          $Y = $this->GraphAreaY1 + $XMargin + $Index * $XStep;
 
          if ( $DrawVerticalLine ) { $this->drawLine($this->GraphAreaX1+$Data["YMargin"],$Y,$this->GraphAreaX2-$Data["YMargin"],$Y,array("R"=>$VerticalLineR,"G"=>$VerticalLineG,"B"=>$VerticalLineB,"Alpha"=>$VerticalLineAlpha,"Ticks"=>$VerticalLineTicks)); }
 
          $MinX = $this->GraphAreaX2;
-         foreach ($SeriesName as $Key => $SerieName)
-          {
-           if ( isset($Data["Series"][$SerieName]["Data"][$Index]) )
-            {
+         foreach ($SeriesName as $Key => $SerieName) {
+           if ( isset($Data["Series"][$SerieName]["Data"][$Index]) ) {
              $AxisID      = $Data["Series"][$SerieName]["Axis"];
 
              if ( $OverrideTitle != NULL)
               $Description = $OverrideTitle;
-             elseif ( count($SeriesName) == 1 )
-              {
+             elseif ( count($SeriesName) == 1 ) {
                if ( isset($Data["Abscissa"]) && isset($Data["Series"][$Data["Abscissa"]]["Data"][$Index]) )
                 $Description = $Data["Series"][$SerieName]["Description"]." - ".$Data["Series"][$Data["Abscissa"]]["Data"][$Index];
                else
                 $Description = $Data["Series"][$SerieName]["Description"];
-              }
-             elseif ( isset($Data["Abscissa"]) && isset($Data["Series"][$Data["Abscissa"]]["Data"][$Index]) )
+              } elseif ( isset($Data["Abscissa"]) && isset($Data["Series"][$Data["Abscissa"]]["Data"][$Index]) )
               $Description = $Data["Series"][$Data["Abscissa"]]["Data"][$Index];
 
              $AxisMode     = $Data["Axis"][$AxisID]["Display"];
@@ -5706,15 +5081,12 @@ 
              $AxisUnit     = $Data["Axis"][$AxisID]["Unit"];
 
              $Serie = "";
-             if ( isset($Data["Extended"]["Palette"][$Index] ) )
-              {
+             if ( isset($Data["Extended"]["Palette"][$Index] ) ) {
                $Serie["R"] = $Data["Extended"]["Palette"][$Index]["R"];
                $Serie["G"] = $Data["Extended"]["Palette"][$Index]["G"];
                $Serie["B"] = $Data["Extended"]["Palette"][$Index]["B"];
                $Serie["Alpha"] = $Data["Extended"]["Palette"][$Index]["Alpha"];
-              }
-             else
-              {
+              } else {
                $Serie["R"] = $Data["Series"][$SerieName]["Color"]["R"];
                $Serie["G"] = $Data["Series"][$SerieName]["Color"]["G"];
                $Serie["B"] = $Data["Series"][$SerieName]["Color"]["B"];
@@ -5733,17 +5105,13 @@ 
               $Caption = $this->scaleFormat($Value,$AxisMode,$AxisFormat,$AxisUnit);
              if ( $Value == VOID ) { $Value = "NaN"; }
 
-             if ( $this->LastChartLayout == CHART_LAST_LAYOUT_STACKED )
-              {
+             if ( $this->LastChartLayout == CHART_LAST_LAYOUT_STACKED ) {
                if ( $Value >=0 ) { $LookFor = "+"; } else { $LookFor = "-"; }
 
                $Value = 0; $Done = FALSE;
-               foreach($Data["Series"] as $Name => $SerieLookup)
-                {
-                 if ( $SerieLookup["isDrawable"] == TRUE && $Name != $Data["Abscissa"] && !$Done )
-                  {
-                   if ( isset($Data["Series"][$Name]["Data"][$Index]) && $Data["Series"][$Name]["Data"][$Index] != VOID )
-                    {
+               foreach($Data["Series"] as $Name => $SerieLookup) {
+                 if ( $SerieLookup["isDrawable"] == TRUE && $Name != $Data["Abscissa"] && !$Done ) {
+                   if ( isset($Data["Series"][$Name]["Data"][$Index]) && $Data["Series"][$Name]["Data"][$Index] != VOID ) {
                      if ($Data["Series"][$Name]["Data"][$Index] >= 0 && $LookFor == "+" ) { $Value = $Value + $Data["Series"][$Name]["Data"][$Index]; }
                      if ($Data["Series"][$Name]["Data"][$Index] < 0 && $LookFor == "-" )  { $Value = $Value - $Data["Series"][$Name]["Data"][$Index]; }
                      if ($Name == $SerieName ) { $Done = TRUE; }
@@ -5772,8 +5140,7 @@ 
     }
 
    /* Draw a label box */
-   function drawLabelBox($X,$Y,$Title,$Captions,$Format="")
-    {
+   function drawLabelBox($X,$Y,$Title,$Captions,$Format="") {
      $NoTitle		= isset($Format["NoTitle"]) ? $Format["NoTitle"] : NULL;
      $BoxWidth		= isset($Format["BoxWidth"]) ? $Format["BoxWidth"] : 50;
      $DrawSerieColor	= isset($Format["DrawSerieColor"]) ? $Format["DrawSerieColor"] : TRUE;
@@ -5814,8 +5181,7 @@ 
      if ( $NoTitle ) { $TitleWidth = 0; $TitleHeight = 0; }
 
      $CaptionWidth = 0; $CaptionHeight = -$HorizontalMargin;
-     foreach($Captions as $Key =>$Caption)
-      {
+     foreach($Captions as $Key =>$Caption) {
        $TxtPos        = $this->getTextBox($X,$Y,$FontName,$FontSize,0,$Caption["Caption"]);
        $CaptionWidth  = max($CaptionWidth,($TxtPos[1]["X"] - $TxtPos[0]["X"])+$VerticalMargin*2);
        $CaptionHeight = $CaptionHeight + max(($TxtPos[0]["Y"] - $TxtPos[2]["Y"]),($SerieBoxSize+2)) + $HorizontalMargin;
@@ -5831,8 +5197,7 @@ 
      $XMax = $X + 5 + floor(($BoxWidth-10) / 2);
 
      $RestoreShadow = $this->Shadow;
-     if ( $this->Shadow == TRUE )
-      {
+     if ( $this->Shadow == TRUE ) {
        $this->Shadow = FALSE;
 
        $Poly = "";
@@ -5840,13 +5205,10 @@ 
        $Poly[] = $X+5+$this->ShadowX; $Poly[] = $Y-5+$this->ShadowX;
        $Poly[] = $XMax+$this->ShadowX; $Poly[] = $Y-5+$this->ShadowX;
 
-       if ( $NoTitle )
-        {
+       if ( $NoTitle ) {
          $Poly[] = $XMax+$this->ShadowX; $Poly[] = $Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*2+$this->ShadowX;
          $Poly[] = $XMin+$this->ShadowX; $Poly[] = $Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*2+$this->ShadowX;
-        }
-       else
-        {
+        } else {
          $Poly[] = $XMax+$this->ShadowX; $Poly[] = $Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*3+$this->ShadowX;
          $Poly[] = $XMin+$this->ShadowX; $Poly[] = $Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*3+$this->ShadowX;
         }
@@ -5871,14 +5233,11 @@ 
      imageline($this->Picture,$X,$Y,$X-5,$Y-5,$OuterBorderColor);
      imageline($this->Picture,$X,$Y,$X+5,$Y-5,$OuterBorderColor);
      imageline($this->Picture,$X+5,$Y-5,$XMax,$Y-5,$OuterBorderColor);
-     if ( $NoTitle )
-      {
+     if ( $NoTitle ) {
        imageline($this->Picture,$XMin,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*2,$XMin,$Y-5,$OuterBorderColor);
        imageline($this->Picture,$XMax,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*2,$XMax,$Y-5,$OuterBorderColor);
        imageline($this->Picture,$XMin,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*2,$XMax,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*2,$OuterBorderColor);
-      }
-     else
-      {
+      } else {
        imageline($this->Picture,$XMin,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*3,$XMin,$Y-5,$OuterBorderColor);
        imageline($this->Picture,$XMax,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*3,$XMax,$Y-5,$OuterBorderColor);
        imageline($this->Picture,$XMin,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*3,$XMax,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*3,$OuterBorderColor);
@@ -5890,29 +5249,23 @@ 
      imageline($this->Picture,$X,$Y-1,$X-5,$Y-6,$InnerBorderColor);
      imageline($this->Picture,$X,$Y-1,$X+5,$Y-6,$InnerBorderColor);
      imageline($this->Picture,$X+5,$Y-6,$XMax-1,$Y-6,$InnerBorderColor);
-     if ( $NoTitle )
-      {
+     if ( $NoTitle ) {
        imageline($this->Picture,$XMin+1,$Y-4-$TitleHeight-$CaptionHeight-$HorizontalMargin*2,$XMin+1,$Y-6,$InnerBorderColor);
        imageline($this->Picture,$XMax-1,$Y-4-$TitleHeight-$CaptionHeight-$HorizontalMargin*2,$XMax-1,$Y-6,$InnerBorderColor);
        imageline($this->Picture,$XMin+1,$Y-4-$TitleHeight-$CaptionHeight-$HorizontalMargin*2,$XMax-1,$Y-4-$TitleHeight-$CaptionHeight-$HorizontalMargin*2,$InnerBorderColor);
-      }
-     else
-      {
+      } else {
        imageline($this->Picture,$XMin+1,$Y-4-$TitleHeight-$CaptionHeight-$HorizontalMargin*3,$XMin+1,$Y-6,$InnerBorderColor);
        imageline($this->Picture,$XMax-1,$Y-4-$TitleHeight-$CaptionHeight-$HorizontalMargin*3,$XMax-1,$Y-6,$InnerBorderColor);
        imageline($this->Picture,$XMin+1,$Y-4-$TitleHeight-$CaptionHeight-$HorizontalMargin*3,$XMax-1,$Y-4-$TitleHeight-$CaptionHeight-$HorizontalMargin*3,$InnerBorderColor);
       }
 
      /* Draw the separator line */
-     if ( $TitleMode == LABEL_TITLE_NOBACKGROUND && !$NoTitle )
-      {
+     if ( $TitleMode == LABEL_TITLE_NOBACKGROUND && !$NoTitle ) {
        $YPos    = $Y-7-$CaptionHeight-$HorizontalMargin-$HorizontalMargin/2;
        $XMargin = $VerticalMargin / 2;
        $this->drawLine($XMin+$XMargin,$YPos+1,$XMax-$XMargin,$YPos+1,array("R"=>$GradientEndR,"G"=>$GradientEndG,"B"=>$GradientEndB));
        $this->drawLine($XMin+$XMargin,$YPos,$XMax-$XMargin,$YPos,array("R"=>$GradientStartR,"G"=>$GradientStartG,"B"=>$GradientStartB));
-      }
-     elseif ( $TitleMode == LABEL_TITLE_BACKGROUND )
-      {
+      } elseif ( $TitleMode == LABEL_TITLE_BACKGROUND ) {
        $this->drawFilledRectangle($XMin,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*3,$XMax,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin+$HorizontalMargin/2,array("R"=>$TitleBackgroundR,"G"=>$TitleBackgroundG,"B"=>$TitleBackgroundB));
        imageline($this->Picture,$XMin+1,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin+$HorizontalMargin/2+1,$XMax-1,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin+$HorizontalMargin/2+1,$InnerBorderColor);
       }
@@ -5923,15 +5276,13 @@ 
 
      /* Write the value */
      $YPos = $Y-5-$HorizontalMargin; $XPos = $XMin+$VerticalMargin+$SerieBoxSize+$SerieBoxSpacing;
-     foreach($Captions as $Key => $Caption)
-      {
+     foreach($Captions as $Key => $Caption) {
        $CaptionTxt    = $Caption["Caption"];
        $TxtPos        = $this->getTextBox($XPos,$YPos,$FontName,$FontSize,0,$CaptionTxt);
        $CaptionHeight = ($TxtPos[0]["Y"] - $TxtPos[2]["Y"]);
 
        /* Write the serie color if needed */
-       if ( $DrawSerieColor )
-        {
+       if ( $DrawSerieColor ) {
          $BoxSettings = array("R"=>$Caption["Format"]["R"],"G"=>$Caption["Format"]["G"],"B"=>$Caption["Format"]["B"],"Alpha"=>$Caption["Format"]["Alpha"],"BorderR"=>0,"BorderG"=>0,"BorderB"=>0);
          $this->drawFilledRectangle($XMin+$VerticalMargin,$YPos-$SerieBoxSize,$XMin+$VerticalMargin+$SerieBoxSize,$YPos,$BoxSettings);
         }
@@ -5945,48 +5296,34 @@ 
     }
 
    /* Draw a basic shape */
-   function drawShape($X,$Y,$Shape,$PlotSize,$PlotBorder,$BorderSize,$R,$G,$B,$Alpha,$BorderR,$BorderG,$BorderB,$BorderAlpha)
-    {
-     if ( $Shape == SERIE_SHAPE_FILLEDCIRCLE )
-      {
+   function drawShape($X,$Y,$Shape,$PlotSize,$PlotBorder,$BorderSize,$R,$G,$B,$Alpha,$BorderR,$BorderG,$BorderB,$BorderAlpha) {
+     if ( $Shape == SERIE_SHAPE_FILLEDCIRCLE ) {
        if ( $PlotBorder ) { $this->drawFilledCircle($X,$Y,$PlotSize+$BorderSize,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha)); }
        $this->drawFilledCircle($X,$Y,$PlotSize,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
-      }
-     elseif ( $Shape == SERIE_SHAPE_FILLEDSQUARE )
-      {
+      } elseif ( $Shape == SERIE_SHAPE_FILLEDSQUARE ) {
        if ( $PlotBorder ) { $this->drawFilledRectangle($X-$PlotSize-$BorderSize,$Y-$PlotSize-$BorderSize,$X+$PlotSize+$BorderSize,$Y+$PlotSize+$BorderSize,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha)); }
        $this->drawFilledRectangle($X-$PlotSize,$Y-$PlotSize,$X+$PlotSize,$Y+$PlotSize,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
-      }
-     elseif ( $Shape == SERIE_SHAPE_FILLEDTRIANGLE )
-      {
-       if ( $PlotBorder )
-        {
+      } elseif ( $Shape == SERIE_SHAPE_FILLEDTRIANGLE ) {
+       if ( $PlotBorder ) {
          $Pos = ""; $Pos[]=$X; $Pos[]=$Y-$PlotSize-$BorderSize; $Pos[]=$X-$PlotSize-$BorderSize; $Pos[]=$Y+$PlotSize+$BorderSize; $Pos[]=$X+$PlotSize+$BorderSize; $Pos[]=$Y+$PlotSize+$BorderSize;
          $this->drawPolygon($Pos,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha));
         }
 
        $Pos = ""; $Pos[]=$X; $Pos[]=$Y-$PlotSize; $Pos[]=$X-$PlotSize; $Pos[]=$Y+$PlotSize; $Pos[]=$X+$PlotSize; $Pos[]=$Y+$PlotSize;
        $this->drawPolygon($Pos,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
-      }
-     elseif ( $Shape == SERIE_SHAPE_TRIANGLE )
-      {
+      } elseif ( $Shape == SERIE_SHAPE_TRIANGLE ) {
        $this->drawLine($X,$Y-$PlotSize,$X-$PlotSize,$Y+$PlotSize,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
        $this->drawLine($X-$PlotSize,$Y+$PlotSize,$X+$PlotSize,$Y+$PlotSize,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
        $this->drawLine($X+$PlotSize,$Y+$PlotSize,$X,$Y-$PlotSize,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
-      }
-     elseif ( $Shape == SERIE_SHAPE_SQUARE )
+      } elseif ( $Shape == SERIE_SHAPE_SQUARE )
       $this->drawRectangle($X-$PlotSize,$Y-$PlotSize,$X+$PlotSize,$Y+$PlotSize,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
      elseif ( $Shape == SERIE_SHAPE_CIRCLE )
       $this->drawCircle($X,$Y,$PlotSize,$PlotSize,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
-     elseif ( $Shape == SERIE_SHAPE_DIAMOND )
-      {
+     elseif ( $Shape == SERIE_SHAPE_DIAMOND ) {
        $Pos = ""; $Pos[]=$X-$PlotSize; $Pos[]=$Y; $Pos[]=$X; $Pos[]=$Y-$PlotSize; $Pos[]=$X+$PlotSize; $Pos[]=$Y; $Pos[]=$X; $Pos[]=$Y+$PlotSize;
        $this->drawPolygon($Pos,array("NoFill"=>TRUE,"BorderR"=>$R,"BorderG"=>$G,"BorderB"=>$B,"BorderAlpha"=>$Alpha));
-      }      
-     elseif ( $Shape == SERIE_SHAPE_FILLEDDIAMOND )
-      {
-       if ( $PlotBorder )
-        {
+      } elseif ( $Shape == SERIE_SHAPE_FILLEDDIAMOND ) {
+       if ( $PlotBorder ) {
          $Pos = ""; $Pos[]=$X-$PlotSize-$BorderSize; $Pos[]=$Y; $Pos[]=$X; $Pos[]=$Y-$PlotSize-$BorderSize; $Pos[]=$X+$PlotSize+$BorderSize; $Pos[]=$Y; $Pos[]=$X; $Pos[]=$Y+$PlotSize+$BorderSize;
          $this->drawPolygon($Pos,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha));
         }
@@ -5996,8 +5333,7 @@ 
       }      
     }
 
-   function drawPolygonChart($Points,$Format="")
-    {
+   function drawPolygonChart($Points,$Format="") {
      $R			= isset($Format["R"]) ? $Format["R"] : 0;
      $G			= isset($Format["G"]) ? $Format["G"] : 0;
      $B			= isset($Format["B"]) ? $Format["B"] : 0;
@@ -6028,15 +5364,12 @@ 
 
      /* Simplify straight lines */
      $Result = ""; $inHorizon = FALSE; $LastX = VOID;
-     foreach($Segments as $Key => $Pos)
-      {
-       if ( $Pos["Y1"] != $Pos["Y2"] )
-        {
+     foreach($Segments as $Key => $Pos) {
+       if ( $Pos["Y1"] != $Pos["Y2"] ) {
          if ( $inHorizon ) { $inHorizon = FALSE; $Result[] = array("X1"=>$LastX,"Y1"=>$Pos["Y1"],"X2"=>$Pos["X1"],"Y2"=>$Pos["Y1"]); }
 
          $Result[] = array("X1"=>$Pos["X1"],"Y1"=>$Pos["Y1"],"X2"=>$Pos["X2"],"Y2"=>$Pos["Y2"]);
-        }
-       else { if ( !$inHorizon ) { $inHorizon = TRUE; $LastX = $Pos["X1"];} }
+        } else { if ( !$inHorizon ) { $inHorizon = TRUE; $LastX = $Pos["X1"];} }
       }
      $Segments = $Result;
 
@@ -6049,8 +5382,7 @@ 
 
      /* Find out the min & max Y boundaries */
      $MinY = OUT_OF_SIGHT; $MaxY = OUT_OF_SIGHT;
-     foreach($Segments as $Key => $Coords)
-      {
+     foreach($Segments as $Key => $Coords) {
        if ( $MinY == OUT_OF_SIGHT || $MinY > min($Coords["Y1"],$Coords["Y2"]) ) { $MinY = min($Coords["Y1"],$Coords["Y2"]); }
        if ( $MaxY == OUT_OF_SIGHT || $MaxY < max($Coords["Y1"],$Coords["Y2"]) ) { $MaxY = max($Coords["Y1"],$Coords["Y2"]); }
       }
@@ -6065,44 +5397,32 @@ 
 
      $MinY = floor($MinY); $MaxY = floor($MaxY); $YStep = 1; 
 
-     if ( !$NoFill )
-      {
+     if ( !$NoFill ) {
        //if ( $DebugLine ) { $MinY = $DebugLine; $MaxY = $DebugLine; }
-       for($Y=$MinY;$Y<=$MaxY;$Y=$Y+$YStep)
-        {
+       for($Y=$MinY;$Y<=$MaxY;$Y=$Y+$YStep) {
          $Intersections = ""; $LastSlope = NULL; $RestoreLast = "-";
-         foreach($Segments as $Key => $Coords)
-          {
+         foreach($Segments as $Key => $Coords) {
            $X1 = $Coords["X1"]; $X2 = $Coords["X2"]; $Y1 = $Coords["Y1"]; $Y2 = $Coords["Y2"];
 
-           if ( min($Y1,$Y2) <= $Y && max($Y1,$Y2) >= $Y )
-            {
+           if ( min($Y1,$Y2) <= $Y && max($Y1,$Y2) >= $Y ) {
              if ( $Y1 == $Y2 )
-              { $X = $X1; }
-             else
+              { $X = $X1; } else
               { $X = $X1 + ( ($Y-$Y1)*$X2 - ($Y-$Y1)*$X1 ) / ($Y2-$Y1); }
 
              $X = floor($X);
 
              if ( $X2 == $X1 )
-              { $Slope = "!"; }
-             else
-              {
+              { $Slope = "!"; } else {
                $SlopeC = ($Y2 - $Y1) / ($X2 - $X1);
                if( $SlopeC == 0 )
-                { $Slope = "="; }
-               elseif( $SlopeC > 0 )
-                { $Slope = "+"; }
-               elseif ( $SlopeC < 0 )
+                { $Slope = "="; } elseif( $SlopeC > 0 )
+                { $Slope = "+"; } elseif ( $SlopeC < 0 )
                 { $Slope = "-"; }
               }
 
              if ( !is_array($Intersections) )
-              { $Intersections[] = $X; }
-             elseif( !in_array($X,$Intersections) )
-              { $Intersections[] = $X; }
-             elseif( in_array($X,$Intersections) )
-              {
+              { $Intersections[] = $X; } elseif( !in_array($X,$Intersections) )
+              { $Intersections[] = $X; } elseif( in_array($X,$Intersections) ) {
                if ($Y == $DebugLine) { echo $Slope."/".$LastSlope."(".$X.") "; }
 
                if ( $Slope == "=" && $LastSlope == "-"  )                             { $Intersections[] = $X; }
@@ -6117,40 +5437,32 @@ 
           }
          if ( $RestoreLast != "-" ) { $Intersections[] = $RestoreLast; echo "@".$Y."\r\n"; }
 
-         if ( is_array($Intersections) )
-          {
+         if ( is_array($Intersections) ) {
            sort($Intersections);
 
            if ($Y == $DebugLine) { print_r($Intersections); }
 
            /* Remove NULL plots */
            $Result = "";
-           for($i=0;$i<=count($Intersections)-1;$i=$i+2)
-            {
+           for($i=0;$i<=count($Intersections)-1;$i=$i+2) {
              if ( isset($Intersections[$i+1]) )
               { if ( $Intersections[$i] != $Intersections[$i+1] ) { $Result[] = $Intersections[$i]; $Result[] = $Intersections[$i+1]; } }
             }
 
-           if ( is_array($Result) )
-            {
+           if ( is_array($Result) ) {
              $Intersections = $Result;
 
              $LastX = OUT_OF_SIGHT;
-             foreach($Intersections as $Key => $X)
-              {
+             foreach($Intersections as $Key => $X) {
                if ( $LastX == OUT_OF_SIGHT )
                 $LastX = $X;
-               elseif ( $LastX != OUT_OF_SIGHT )
-                {
+               elseif ( $LastX != OUT_OF_SIGHT ) {
                  if ( $this->getFirstDecimal($LastX) > 1 ) { $LastX++; }
 
                  $Color = $DefaultColor;
-                 if ( $Threshold != NULL )
-                  {
-                   foreach($Threshold as $Key => $Parameters)
-                    {
-                     if ( $Y <= $Parameters["MinX"] && $Y >= $Parameters["MaxX"])
-                      {
+                 if ( $Threshold != NULL ) {
+                   foreach($Threshold as $Key => $Parameters) {
+                     if ( $Y <= $Parameters["MinX"] && $Y >= $Parameters["MaxX"]) {
                        if ( isset($Parameters["R"]) ) { $R = $Parameters["R"]; } else { $R = 0; }
                        if ( isset($Parameters["G"]) ) { $G = $Parameters["G"]; } else { $G = 0; }
                        if ( isset($Parameters["B"]) ) { $B = $Parameters["B"]; } else { $B = 0; }
@@ -6173,18 +5485,17 @@ 
       }
 
      /* Draw the polygon border, if required */
-     if ( !$NoBorder)
-      {
-       foreach($Segments as $Key => $Coords)
-        $this->drawLine($Coords["X1"],$Coords["Y1"],$Coords["X2"],$Coords["Y2"],array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Threshold"=>$Threshold));
+     if ( !$NoBorder) {
+       foreach($Segments as $Key => $Coords) {
+               $this->drawLine($Coords["X1"],$Coords["Y1"],$Coords["X2"],$Coords["Y2"],array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Threshold"=>$Threshold));
+       }
       }
 
      $this->Shadow = $RestoreShadow;
     }
 
    /* Return the abscissa margin */
-   function getAbscissaMargin($Data)
-    {
+   function getAbscissaMargin($Data) {
      foreach($Data["Axis"] as $AxisID => $Values) { if ( $Values["Identity"] == AXIS_X ) { return($Values["Margin"]); } }
      return(0);
     }

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

Braces +112 added lines, -223 removed lines

@@ -29,8 +29,7 @@ 
  define("LABEL_LIGHT"		, 690032);
 
  /* pSpring class definition */
- class pSpring
-  {
+ class pSpring {
    var $History;
    var $pChartObject;
    var $Data;
@@ -43,8 +42,7 @@ 
    var $Labels;
 
    /* Class creator */
-   function pSpring()
-    {
+   function pSpring() {
      /* Initialise data arrays */
      $this->Data = "";
      $this->Links = "";
@@ -83,8 +81,7 @@ 
     }
 
    /* Set default links options */
-   function setLinkDefaults($Settings="")
-    {
+   function setLinkDefaults($Settings="") {
      if ( isset($Settings["R"]) )     { $this->Default["LinkR"] = $Settings["R"]; }
      if ( isset($Settings["G"]) )     { $this->Default["LinkG"] = $Settings["G"]; }
      if ( isset($Settings["B"]) )     { $this->Default["LinkB"] = $Settings["B"]; }
@@ -92,8 +89,7 @@ 
     }
 
    /* Set default links options */
-   function setLabelsSettings($Settings="")
-    {
+   function setLabelsSettings($Settings="") {
      if ( isset($Settings["Type"]) )  { $this->Labels["Type"] = $Settings["Type"]; }
      if ( isset($Settings["R"]) )     { $this->Labels["R"] = $Settings["R"]; }
      if ( isset($Settings["G"]) )     { $this->Labels["G"] = $Settings["G"]; }
@@ -102,22 +98,18 @@ 
     }
 
    /* Auto compute the FreeZone size based on the number of connections */
-   function autoFreeZone()
-    {
+   function autoFreeZone() {
      /* Check connections reciprocity */
-     foreach($this->Data as $Key => $Settings)
-      {
+     foreach($this->Data as $Key => $Settings) {
        if ( isset($Settings["Connections"]) )
-        { $this->Data[$Key]["FreeZone"] = count($Settings["Connections"])*10 + 20; }
-       else
+        { $this->Data[$Key]["FreeZone"] = count($Settings["Connections"])*10 + 20; } else
         { $this->Data[$Key]["FreeZone"] = 20; }
       }
 
     }
 
    /* Set link properties */
-   function linkProperties($FromNode,$ToNode,$Settings)
-    {
+   function linkProperties($FromNode,$ToNode,$Settings) {
      if ( !isset($this->Data[$FromNode]) ) { return(0); }
      if ( !isset($this->Data[$ToNode]) )   { return(0); }
 
@@ -136,8 +128,7 @@ 
      $this->Links[$FromNode][$ToNode]["Ticks"] = $Ticks; $this->Links[$ToNode][$FromNode]["Ticks"] = $Ticks;
     }
 
-   function setNodeDefaults($Settings="")
-    {
+   function setNodeDefaults($Settings="") {
      if ( isset($Settings["R"]) ) { $this->Default["R"]					= $Settings["R"]; }
      if ( isset($Settings["G"]) ) { $this->Default["G"]					= $Settings["G"]; }
      if ( isset($Settings["B"]) ) { $this->Default["B"]					= $Settings["B"]; }
@@ -158,8 +149,7 @@ 
     }
 
    /* Add a node */
-   function addNode($NodeID,$Settings="")
-    {
+   function addNode($NodeID,$Settings="") {
      /* if the node already exists, ignore */
      if (isset($this->Data[$NodeID])) { return(0); }
 
@@ -196,27 +186,21 @@ 
      $this->Data[$NodeID]["Size"]		= $Size;
      $this->Data[$NodeID]["Shape"]		= $Shape;
      $this->Data[$NodeID]["FreeZone"]		= $FreeZone;
-     if ( $Connections != NULL )
-      {
-       if ( is_array($Connections ) )
-        {
-         foreach($Connections as $Key => $Value)
-          $this->Data[$NodeID]["Connections"][] = $Value;
-        }
-       else
+     if ( $Connections != NULL ) {
+       if ( is_array($Connections ) ) {
+         foreach($Connections as $Key => $Value) {
+                   $this->Data[$NodeID]["Connections"][] = $Value;
+         }
+        } else
         $this->Data[$NodeID]["Connections"][] = $Connections;
       }
     }
 
    /* Set color attribute for a list of nodes */
-   function setNodesColor($Nodes,$Settings="")
-    {
-     if ( is_array($Nodes) )
-      {
-       foreach ($Nodes as $Key => $NodeID)
-        {
-         if (isset($this->Data[$NodeID]) )
-          {
+   function setNodesColor($Nodes,$Settings="") {
+     if ( is_array($Nodes) ) {
+       foreach ($Nodes as $Key => $NodeID) {
+         if (isset($this->Data[$NodeID]) ) {
            if ( isset($Settings["R"]) ) { $this->Data[$NodeID]["R"] = $Settings["R"]; }
            if ( isset($Settings["G"]) ) { $this->Data[$NodeID]["G"] = $Settings["G"]; }
            if ( isset($Settings["B"]) ) { $this->Data[$NodeID]["B"] = $Settings["B"]; }
@@ -228,9 +212,7 @@ 
            if ( isset($Settings["Surrounding"]) ) { $this->Data[$NodeID]["BorderR"] = $this->Data[$NodeID]["R"] + $Settings["Surrounding"]; $this->Data[$NodeID]["BorderG"] = $this->Data[$NodeID]["G"] + $Settings["Surrounding"]; $this->Data[$NodeID]["BorderB"] = $this->Data[$NodeID]["B"] + $Settings["Surrounding"]; }
           }
         }
-      }
-     else
-      {
+      } else {
        if ( isset($Settings["R"]) ) { $this->Data[$Nodes]["R"] = $Settings["R"]; }
        if ( isset($Settings["G"]) ) { $this->Data[$Nodes]["G"] = $Settings["G"]; }
        if ( isset($Settings["B"]) ) { $this->Data[$Nodes]["B"] = $Settings["B"]; }
@@ -248,25 +230,19 @@ 
     { return($this->Data); }
 
    /* Check if a connection exists and create it if required */
-   function checkConnection($SourceID, $TargetID)
-    {
-     if ( isset($this->Data[$SourceID]["Connections"]) )
-      {
+   function checkConnection($SourceID, $TargetID) {
+     if ( isset($this->Data[$SourceID]["Connections"]) ) {
        foreach ($this->Data[$SourceID]["Connections"] as $Key => $ConnectionID)
         { if ( $TargetID == $ConnectionID ) { return(TRUE); } }
       }
      $this->Data[$SourceID]["Connections"][] = $TargetID;
     }
    /* Get the median linked nodes position */
-   function getMedianOffset($Key,$X,$Y)
-    {
+   function getMedianOffset($Key,$X,$Y) {
      $Cpt = 1;
-     if ( isset($this->Data[$Key]["Connections"]) )
-      {
-       foreach($this->Data[$Key]["Connections"] as $ID => $NodeID)
-        {
-         if ( isset($this->Data[$NodeID]["X"]) && isset($this->Data[$NodeID]["Y"]) )
-          {
+     if ( isset($this->Data[$Key]["Connections"]) ) {
+       foreach($this->Data[$Key]["Connections"] as $ID => $NodeID) {
+         if ( isset($this->Data[$NodeID]["X"]) && isset($this->Data[$NodeID]["Y"]) ) {
            $X = $X + $this->Data[$NodeID]["X"];
            $Y = $Y + $this->Data[$NodeID]["Y"];
            $Cpt++;
@@ -277,13 +253,11 @@ 
     }
 
    /* Return the ID of the attached partner with the biggest weight */
-   function getBiggestPartner($Key)
-    {
+   function getBiggestPartner($Key) {
      if ( !isset($this->Data[$Key]["Connections"]) ) { return(""); }
 
      $MaxWeight = 0; $Result = "";
-     foreach($this->Data[$Key]["Connections"] as $Key => $PeerID)
-      {
+     foreach($this->Data[$Key]["Connections"] as $Key => $PeerID) {
        if ( $this->Data[$PeerID]["Weight"] > $MaxWeight )
         { $MaxWeight = $this->Data[$PeerID]["Weight"]; $Result = $PeerID; }
       }
@@ -291,18 +265,16 @@ 
     }
 
    /* Do the initial node positions computing pass */
-   function firstPass($Algorithm)
-    {
+   function firstPass($Algorithm) {
      $CenterX = ($this->X2 - $this->X1) / 2 + $this->X1;
      $CenterY = ($this->Y2 - $this->Y1) / 2 + $this->Y1;
 
      /* Check connections reciprocity */
-     foreach($this->Data as $Key => $Settings)
-      {
-       if ( isset($Settings["Connections"]) )
-        {
-         foreach($Settings["Connections"] as $ID => $ConnectionID)
-          $this->checkConnection($ConnectionID,$Key);
+     foreach($this->Data as $Key => $Settings) {
+       if ( isset($Settings["Connections"]) ) {
+         foreach($Settings["Connections"] as $ID => $ConnectionID) {
+                   $this->checkConnection($ConnectionID,$Key);
+         }
         }
       }
 
@@ -313,16 +285,12 @@ 
      foreach($this->Data as $Key => $Settings)
       { if ( isset($Settings["Connections"]) ) { if ( $MaxConnections < count($Settings["Connections"] ) ) { $MaxConnections = count($Settings["Connections"]); } } }
 
-     if ( $Algorithm == ALGORITHM_WEIGHTED )
-      {
-       foreach($this->Data as $Key => $Settings)
-        {
+     if ( $Algorithm == ALGORITHM_WEIGHTED ) {
+       foreach($this->Data as $Key => $Settings) {
          if ( $Settings["Type"] == NODE_TYPE_CENTRAL ) { $this->Data[$Key]["X"] = $CenterX; $this->Data[$Key]["Y"] = $CenterY; }
-         if ( $Settings["Type"] == NODE_TYPE_FREE )
-          {
+         if ( $Settings["Type"] == NODE_TYPE_FREE ) {
            if ( isset($Settings["Connections"]) )
-            { $Connections = count($Settings["Connections"]); }
-           else
+            { $Connections = count($Settings["Connections"]); } else
             { $Connections = 0; }
 
            $Ring  = $MaxConnections - $Connections;
@@ -332,12 +300,9 @@ 
            $this->Data[$Key]["Y"] = sin(deg2rad($Angle)) * ($Ring*$this->RingSize) + $CenterY;
           }
         }
-      }
-     elseif ( $Algorithm == ALGORITHM_CENTRAL )
-      {
+      } elseif ( $Algorithm == ALGORITHM_CENTRAL ) {
        /* Put a weight on each nodes */
-       foreach($this->Data as $Key => $Settings)
-        {
+       foreach($this->Data as $Key => $Settings) {
          if ( isset($Settings["Connections"]) )
           $this->Data[$Key]["Weight"] = count($Settings["Connections"]);
          else
@@ -345,33 +310,25 @@ 
         }
 
        $MaxConnections = $MaxConnections + 1;
-       for($i=$MaxConnections;$i>=0;$i--)
-        {
-         foreach($this->Data as $Key => $Settings)
-          {
+       for($i=$MaxConnections;$i>=0;$i--) {
+         foreach($this->Data as $Key => $Settings) {
            if ( $Settings["Type"] == NODE_TYPE_CENTRAL ) { $this->Data[$Key]["X"] = $CenterX; $this->Data[$Key]["Y"] = $CenterY; }
-           if ( $Settings["Type"] == NODE_TYPE_FREE )
-            {
+           if ( $Settings["Type"] == NODE_TYPE_FREE ) {
              if ( isset($Settings["Connections"]) )
-              { $Connections = count($Settings["Connections"]); }
-             else
+              { $Connections = count($Settings["Connections"]); } else
               { $Connections = 0; }
 
-             if ( $Connections == $i )
-              {
+             if ( $Connections == $i ) {
                $BiggestPartner = $this->getBiggestPartner($Key);
-               if ( $BiggestPartner != "" )
-                {
+               if ( $BiggestPartner != "" ) {
                  $Ring          = $this->Data[$BiggestPartner]["FreeZone"];
                  $Weight        = $this->Data[$BiggestPartner]["Weight"];
                  $AngleDivision = 360 / $this->Data[$BiggestPartner]["Weight"];
                  $Done          = FALSE; $Tries = 0;
-                 while (!$Done && $Tries <= $Weight*2)
-                  {
+                 while (!$Done && $Tries <= $Weight*2) {
                    $Tries++;
                    $Angle = floor(rand(0,$Weight)*$AngleDivision);
-                   if ( !isset($this->Data[$BiggestPartner]["Angular"][$Angle]) || !isset($this->Data[$BiggestPartner]["Angular"]) )
-                    {
+                   if ( !isset($this->Data[$BiggestPartner]["Angular"][$Angle]) || !isset($this->Data[$BiggestPartner]["Angular"]) ) {
                      $this->Data[$BiggestPartner]["Angular"][$Angle] = $Angle;
                      $Done = TRUE; 
                     }
@@ -389,24 +346,17 @@ 
             }
           }
         }
-      }
-     elseif ( $Algorithm == ALGORITHM_CIRCULAR )
-      {
+      } elseif ( $Algorithm == ALGORITHM_CIRCULAR ) {
        $MaxConnections = $MaxConnections + 1;
-       for($i=$MaxConnections;$i>=0;$i--)
-        {
-         foreach($this->Data as $Key => $Settings)
-          {
+       for($i=$MaxConnections;$i>=0;$i--) {
+         foreach($this->Data as $Key => $Settings) {
            if ( $Settings["Type"] == NODE_TYPE_CENTRAL ) { $this->Data[$Key]["X"] = $CenterX; $this->Data[$Key]["Y"] = $CenterY; }
-           if ( $Settings["Type"] == NODE_TYPE_FREE )
-            {
+           if ( $Settings["Type"] == NODE_TYPE_FREE ) {
              if ( isset($Settings["Connections"]) )
-              { $Connections = count($Settings["Connections"]); }
-             else
+              { $Connections = count($Settings["Connections"]); } else
               { $Connections = 0; }
 
-             if ( $Connections == $i )
-              {
+             if ( $Connections == $i ) {
                $Ring  = $MaxConnections - $Connections;
                $Angle = rand(0,360);
 
@@ -421,13 +371,9 @@ 
             }
           }
         }
-      }
-     elseif ( $Algorithm == ALGORITHM_RANDOM )
-      {
-       foreach($this->Data as $Key => $Settings)
-        {
-         if ( $Settings["Type"] == NODE_TYPE_FREE )
-          {
+      } elseif ( $Algorithm == ALGORITHM_RANDOM ) {
+       foreach($this->Data as $Key => $Settings) {
+         if ( $Settings["Type"] == NODE_TYPE_FREE ) {
            $this->Data[$Key]["X"] = $CenterX + rand(-20,20);
            $this->Data[$Key]["Y"] = $CenterY + rand(-20,20);
           }
@@ -437,23 +383,18 @@ 
     }
 
    /* Compute one pass */
-   function doPass()
-    {
+   function doPass() {
      /* Compute vectors */
-     foreach($this->Data as $Key => $Settings)
-      {
-       if ( $Settings["Type"] != NODE_TYPE_CENTRAL )
-        {
+     foreach($this->Data as $Key => $Settings) {
+       if ( $Settings["Type"] != NODE_TYPE_CENTRAL ) {
          unset($this->Data[$Key]["Vectors"]);
 
          $X1 = $Settings["X"];
          $Y1 = $Settings["Y"];
 
          /* Repulsion vectors */
-         foreach($this->Data as $Key2 => $Settings2)
-          {
-           if ( $Key != $Key2 )
-            {
+         foreach($this->Data as $Key2 => $Settings2) {
+           if ( $Key != $Key2 ) {
              $X2 = $this->Data[$Key2]["X"];
              $Y2 = $this->Data[$Key2]["Y"];
              $FreeZone = $this->Data[$Key2]["FreeZone"];
@@ -462,8 +403,7 @@ 
              $Angle    = $this->getAngle($X1,$Y1,$X2,$Y2) + 180;
 
              /* Nodes too close, repulsion occurs */
-             if ( $Distance < $FreeZone )
-              {
+             if ( $Distance < $FreeZone ) {
                $Force = log(pow(2,$FreeZone-$Distance));
                if ( $Force > 1 )
                 { $this->Data[$Key]["Vectors"][] = array("Type"=>"R","Angle"=>$Angle % 360,"Force"=>$Force); }
@@ -472,12 +412,9 @@ 
           }
 
          /* Attraction vectors */
-         if ( isset($Settings["Connections"]) )
-          {
-           foreach($Settings["Connections"] as $ID => $NodeID)
-            {
-             if ( isset($this->Data[$NodeID]) )
-              {
+         if ( isset($Settings["Connections"]) ) {
+           foreach($Settings["Connections"] as $ID => $NodeID) {
+             if ( isset($this->Data[$NodeID]) ) {
                $X2 = $this->Data[$NodeID]["X"];
                $Y2 = $this->Data[$NodeID]["Y"];
                $FreeZone = $this->Data[$Key2]["FreeZone"];
@@ -499,15 +436,12 @@ 
       }
 
      /* Move the nodes accoding to the vectors */
-     foreach($this->Data as $Key => $Settings)
-      {
+     foreach($this->Data as $Key => $Settings) {
        $X = $Settings["X"];
        $Y = $Settings["Y"];
 
-       if ( isset($Settings["Vectors"]) && $Settings["Type"] != NODE_TYPE_CENTRAL )
-        {
-         foreach($Settings["Vectors"] as $ID => $Vector)
-          {
+       if ( isset($Settings["Vectors"]) && $Settings["Type"] != NODE_TYPE_CENTRAL ) {
+         foreach($Settings["Vectors"] as $ID => $Vector) {
            $Type  = $Vector["Type"];
            $Force = $Vector["Force"];
            $Angle = $Vector["Angle"];
@@ -523,11 +457,9 @@ 
       }
     }
 
-   function lastPass()
-    {
+   function lastPass() {
      /* Put everything inside the graph area */
-     foreach($this->Data as $Key => $Settings)
-      {
+     foreach($this->Data as $Key => $Settings) {
        $X = $Settings["X"];
        $Y = $Settings["Y"];
 
@@ -542,17 +474,13 @@ 
 
      /* Dump all links */
      $Links = "";
-     foreach($this->Data as $Key => $Settings)
-      {
+     foreach($this->Data as $Key => $Settings) {
        $X1 = $Settings["X"];
        $Y1 = $Settings["Y"];
 
-       if ( isset($Settings["Connections"]) )
-        {
-         foreach ($Settings["Connections"] as $ID => $NodeID)
-          {
-           if ( isset($this->Data[$NodeID]) )
-            {
+       if ( isset($Settings["Connections"]) ) {
+         foreach ($Settings["Connections"] as $ID => $NodeID) {
+           if ( isset($this->Data[$NodeID]) ) {
              $X2 = $this->Data[$NodeID]["X"];
              $Y2 = $this->Data[$NodeID]["Y"];
 
@@ -564,28 +492,21 @@ 
 
      /* Check collisions */
      $Conflicts = 0;
-     foreach($this->Data as $Key => $Settings)
-      {
+     foreach($this->Data as $Key => $Settings) {
        $X1 = $Settings["X"];
        $Y1 = $Settings["Y"];
 
-       if ( isset($Settings["Connections"]) )
-        {
-         foreach ($Settings["Connections"] as $ID => $NodeID)
-          {
-           if ( isset($this->Data[$NodeID]) )
-            {
+       if ( isset($Settings["Connections"]) ) {
+         foreach ($Settings["Connections"] as $ID => $NodeID) {
+           if ( isset($this->Data[$NodeID]) ) {
              $X2 = $this->Data[$NodeID]["X"];
              $Y2 = $this->Data[$NodeID]["Y"];
 
-             foreach($Links as $IDLinks => $Link)
-              {
+             foreach($Links as $IDLinks => $Link) {
                $X3 = $Link["X1"]; $Y3 = $Link["Y1"]; $X4 = $Link["X2"]; $Y4 = $Link["Y2"];
 
-               if ( !($X1 == $X3 && $X2 == $X4 && $Y1 == $Y3 && $Y2 == $Y4 ) )
-                {
-                 if ( $this->intersect($X1,$Y1,$X2,$Y2,$X3,$Y3,$X4,$Y4) )
-                  {
+               if ( !($X1 == $X3 && $X2 == $X4 && $Y1 == $Y3 && $Y2 == $Y4 ) ) {
+                 if ( $this->intersect($X1,$Y1,$X2,$Y2,$X3,$Y3,$X4,$Y4) ) {
                    if ( $Link["Source"] != $Settings["Name"] && $Link["Source"] != $this->Data[$NodeID]["Name"] && $Link["Destination"] != $Settings["Name"] && $Link["Destination"] != $this->Data[$NodeID]["Name"] )
                     { $Conflicts++; }
                   }
@@ -599,8 +520,7 @@ 
     }
 
    /* Center the graph */
-   function center()
-    {
+   function center() {
      /* Determine the real center */
      $TargetCenterX = ($this->X2 - $this->X1) / 2 + $this->X1;
      $TargetCenterY = ($this->Y2 - $this->Y1) / 2 + $this->Y1;
@@ -608,8 +528,7 @@ 
      /* Get current boundaries */
      $XMin = $this->X2; $XMax = $this->X1;
      $YMin = $this->Y2; $YMax = $this->Y1;
-     foreach($this->Data as $Key => $Settings)
-      {
+     foreach($this->Data as $Key => $Settings) {
        $X = $Settings["X"];
        $Y = $Settings["Y"];
 
@@ -626,16 +545,14 @@ 
      $YOffset = $TargetCenterY - $CurrentCenterY;
 
      /* Correct the points position */
-     foreach($this->Data as $Key => $Settings)
-      {
+     foreach($this->Data as $Key => $Settings) {
        $this->Data[$Key]["X"] = $Settings["X"] + $XOffset;
        $this->Data[$Key]["Y"] = $Settings["Y"] + $YOffset;
       }
     }
 
    /* Create the encoded string */
-   function drawSpring($Object,$Settings="")
-    {
+   function drawSpring($Object,$Settings="") {
      $this->pChartObject = $Object;
 
      $Pass			= isset($Settings["Pass"]) ? $Settings["Pass"] : 50;
@@ -656,16 +573,14 @@ 
      $this->Y2		= $Object->GraphAreaY2;
 
      $Conflicts = 1; $Jobs = 0; $this->History["MinimumConflicts"] = -1;
-     while ($Conflicts != 0 && $Jobs < $Retries )
-      {
+     while ($Conflicts != 0 && $Jobs < $Retries ) {
        $Jobs++;
 
        /* Compute the initial settings */
        $this->firstPass($Algorithm);
 
        /* Apply the vectors */
-       if ( $Pass > 0 ) 
-        {
+       if ( $Pass > 0 ) {
          for ($i=0; $i<=$Pass; $i++) { $this->doPass(); }
         }
 
@@ -681,24 +596,19 @@ 
 
      /* Draw the connections */
      $Drawn = "";
-     foreach($this->Data as $Key => $Settings)
-      {
+     foreach($this->Data as $Key => $Settings) {
        $X	= $Settings["X"];
        $Y	= $Settings["Y"];
 
-       if ( isset($Settings["Connections"]) )
-        {
-         foreach ($Settings["Connections"] as $ID => $NodeID)
-          {
+       if ( isset($Settings["Connections"]) ) {
+         foreach ($Settings["Connections"] as $ID => $NodeID) {
            if ( !isset($Drawn[$Key]) )    { $Drawn[$Key] = ""; }
            if ( !isset($Drawn[$NodeID]) ) { $Drawn[$NodeID] = ""; }
 
-           if ( isset($this->Data[$NodeID]) && !isset($Drawn[$Key][$NodeID]) && !isset($Drawn[$NodeID][$Key]) )
-            {
+           if ( isset($this->Data[$NodeID]) && !isset($Drawn[$Key][$NodeID]) && !isset($Drawn[$NodeID][$Key]) ) {
              $Color = array("R"=>$this->Default["LinkR"],"G"=>$this->Default["LinkG"],"B"=>$this->Default["LinkB"],"Alpha"=>$this->Default["Alpha"]);
 
-             if ( $this->Links != "" )
-              {
+             if ( $this->Links != "" ) {
                if ( isset($this->Links[$Key][$NodeID]["R"]) )
                 { $Color = array("R"=>$this->Links[$Key][$NodeID]["R"],"G"=>$this->Links[$Key][$NodeID]["G"],"B"=>$this->Links[$Key][$NodeID]["B"],"Alpha"=>$this->Links[$Key][$NodeID]["Alpha"]); }
 
@@ -711,10 +621,8 @@ 
              $this->pChartObject->drawLine($X,$Y,$X2,$Y2,$Color);
              $Drawn[$Key][$NodeID] = TRUE;
 
-             if ( isset($this->Links) && $this->Links != "" )
-              {
-               if ( isset($this->Links[$Key][$NodeID]["Name"]) || isset($this->Links[$NodeID][$Key]["Name"]) )
-                {
+             if ( isset($this->Links) && $this->Links != "" ) {
+               if ( isset($this->Links[$Key][$NodeID]["Name"]) || isset($this->Links[$NodeID][$Key]["Name"]) ) {
                  $Name  = isset($this->Links[$Key][$NodeID]["Name"]) ? $this->Links[$Key][$NodeID]["Name"] : $this->Links[$NodeID][$Key]["Name"];
                  $TxtX  = ($X2 - $X)/2 + $X;
                  $TxtY  = ($Y2 - $Y)/2 + $Y;
@@ -736,10 +644,8 @@ 
       }
 
      /* Draw the quiet zones */
-     if ( $DrawQuietZone )
-      {
-       foreach($this->Data as $Key => $Settings)
-        {
+     if ( $DrawQuietZone ) {
+       foreach($this->Data as $Key => $Settings) {
          $X	 = $Settings["X"];
          $Y	 = $Settings["Y"];
          $FreeZone = $Settings["FreeZone"];
@@ -750,8 +656,7 @@ 
 
 
      /* Draw the nodes */
-     foreach($this->Data as $Key => $Settings)
-      {
+     foreach($this->Data as $Key => $Settings) {
        $X	 = $Settings["X"];
        $Y	 = $Settings["Y"];
        $Name	 = $Settings["Name"];
@@ -761,35 +666,26 @@ 
 
        $Color	 = array("R"=>$Settings["R"],"G"=>$Settings["G"],"B"=>$Settings["B"],"Alpha"=>$Settings["Alpha"],"BorderR"=>$Settings["BorderR"],"BorderG"=>$Settings["BorderG"],"BorderB"=>$Settings["BorderB"],"BorderApha"=>$Settings["BorderAlpha"]);
 
-       if ( $Shape == NODE_SHAPE_CIRCLE )
-        {
+       if ( $Shape == NODE_SHAPE_CIRCLE ) {
          $this->pChartObject->drawFilledCircle($X,$Y,$Size,$Color);
-        }
-       elseif ( $Shape == NODE_SHAPE_TRIANGLE )
-        {
+        } elseif ( $Shape == NODE_SHAPE_TRIANGLE ) {
          $Points = "";
          $Points[] = cos(deg2rad(270)) * $Size + $X; $Points[] = sin(deg2rad(270)) * $Size + $Y;
          $Points[] = cos(deg2rad(45)) * $Size + $X;  $Points[] = sin(deg2rad(45)) * $Size + $Y;
          $Points[] = cos(deg2rad(135)) * $Size + $X; $Points[] = sin(deg2rad(135)) * $Size + $Y;
          $this->pChartObject->drawPolygon($Points,$Color);
-        }
-       elseif ( $Shape == NODE_SHAPE_SQUARE )
-        {
+        } elseif ( $Shape == NODE_SHAPE_SQUARE ) {
          $Offset = $Size/2; $Size = $Size / 2;
          $this->pChartObject->drawFilledRectangle($X-$Offset,$Y-$Offset,$X+$Offset,$Y+$Offset,$Color);
         }
 
-       if ( $Name != "" )
-        {
+       if ( $Name != "" ) {
          $LabelOptions = array("R"=>$this->Labels["R"],"G"=>$this->Labels["G"],"B"=>$this->Labels["B"],"Alpha"=>$this->Labels["Alpha"]);
 
-         if ( $this->Labels["Type"] == LABEL_LIGHT )
-          {
+         if ( $this->Labels["Type"] == LABEL_LIGHT ) {
            $LabelOptions["Align"] = TEXT_ALIGN_BOTTOMLEFT;
            $this->pChartObject->drawText($X,$Y,$Name,$LabelOptions);
-          }
-         elseif ( $this->Labels["Type"] == LABEL_CLASSIC )
-          {
+          } elseif ( $this->Labels["Type"] == LABEL_CLASSIC ) {
            $LabelOptions["Align"]         = TEXT_ALIGN_TOPMIDDLE;
            $LabelOptions["DrawBox"]       = TRUE;
            $LabelOptions["BoxAlpha"]      = 50;
@@ -804,17 +700,13 @@ 
       }
 
      /* Draw the vectors */
-     if ( $DrawVectors )
-      {
-       foreach($this->Data as $Key => $Settings)
-        {
+     if ( $DrawVectors ) {
+       foreach($this->Data as $Key => $Settings) {
          $X1 = $Settings["X"];
          $Y1 = $Settings["Y"];
 
-         if ( isset($Settings["Vectors"]) && $Settings["Type"] != NODE_TYPE_CENTRAL )
-          {
-           foreach($Settings["Vectors"] as $ID => $Vector)
-            {
+         if ( isset($Settings["Vectors"]) && $Settings["Type"] != NODE_TYPE_CENTRAL ) {
+           foreach($Settings["Vectors"] as $ID => $Vector) {
              $Type  = $Vector["Type"];
              $Force = $Vector["Force"];
              $Angle = $Vector["Angle"];
@@ -838,14 +730,12 @@ 
     { return (sqrt(($X2-$X1)*($X2-$X1)+($Y2-$Y1)*($Y2-$Y1))); }
 
    /* Return the angle made by a line and the X axis */
-   function getAngle($X1,$Y1,$X2,$Y2)
-    {
+   function getAngle($X1,$Y1,$X2,$Y2) {
      $Opposite = $Y2 - $Y1; $Adjacent = $X2 - $X1;$Angle = rad2deg(atan2($Opposite,$Adjacent));
      if ($Angle > 0) { return($Angle); } else { return(360-abs($Angle)); }
     }
 
-   function intersect($X1,$Y1,$X2,$Y2,$X3,$Y3,$X4,$Y4)
-    {
+   function intersect($X1,$Y1,$X2,$Y2,$X3,$Y3,$X4,$Y4) {
      $A = (($X3 * $Y4 - $X4 * $Y3) * ($X1 - $X2) - ($X1 * $Y2 - $X2 * $Y1) * ($X3 - $X4));
      $B = (($Y1 - $Y2) * ($X3 - $X4) - ($Y3 - $Y4) * ($X1 - $X2));
 
@@ -856,8 +746,7 @@ 
      if ( $C == 0 ) { return(FALSE); }
      $Yi = $Xi * (($Y1 - $Y2)/$C) + (($X1 * $Y2 - $X2 * $Y1)/$C);
 
-     if ( $Xi >= min($X1,$X2) && $Xi >= min($X3,$X4) && $Xi <= max($X1,$X2) && $Xi <= max($X3,$X4))
-      {
+     if ( $Xi >= min($X1,$X2) && $Xi >= min($X3,$X4) && $Xi <= max($X1,$X2) && $Xi <= max($X3,$X4)) {
        if ( $Yi >= min($Y1,$Y2) && $Yi >= min($Y3,$Y4) && $Yi <= max($Y1,$Y2) && $Yi <= max($Y3,$Y4))
         { return(TRUE); }
       }

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

Braces +124 added lines, -254 removed lines

@@ -29,15 +29,13 @@ 
  define("PIE_VALUE_OUTSIDE"     , 140031);
 
  /* pPie class definition */
- class pPie
-  {
+ class pPie {
    var $pChartObject;
    var $pDataObject;
    var $LabelPos = "" ;
 
    /* Class creator */
-   function pPie($Object,$pDataObject)
-    {
+   function pPie($Object,$pDataObject) {
      /* Cache the pChart object reference */
      $this->pChartObject = $Object;
 
@@ -46,8 +44,7 @@ 
     }
 
    /* Draw a pie chart */
-   function draw2DPie($X,$Y,$Format="")
-    {
+   function draw2DPie($X,$Y,$Format="") {
      $Radius		= isset($Format["Radius"]) ? $Format["Radius"] : 60;
      $Precision		= isset($Format["Precision"]) ? $Format["Precision"] : 0;
      $DataGapAngle	= isset($Format["DataGapAngle"]) ? $Format["DataGapAngle"] : 0;
@@ -111,8 +108,7 @@ 
      $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;
@@ -122,18 +118,15 @@ 
      /* Draw the polygon pie elements */
      $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);
-       else
-        {
+       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 ( !$SecondPass && !$Shadow )
-        {
+       if ( !$SecondPass && !$Shadow ) {
          if ( !$Border )
           $Settings["Surrounding"] = 10;
          else
@@ -145,9 +138,7 @@ 
 
        $Angle = ($EndAngle - $Offset)/2 + $Offset;
        if ($DataGapAngle == 0)
-        { $X0 = $X; $Y0 = $Y; }
-       else
-        {
+        { $X0 = $X; $Y0 = $Y; } else {
          $X0 = cos(($Angle-90)*PI/180) * $DataGapRadius + $X;
          $Y0 = sin(($Angle-90)*PI/180) * $DataGapRadius + $Y;
         }
@@ -155,8 +146,7 @@ 
        $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;
 
@@ -170,11 +160,9 @@ 
        $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"]);}
-         else
+          { $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); }
 
          $Angle = ($EndAngle - $Offset)/2 + $Offset;
@@ -193,17 +181,14 @@ 
       }
 
      /* Second pass to smooth the angles */
-     if ( $SecondPass )
-      {
+     if ( $SecondPass ) {
        $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);
-         else
-          {
+         else {
            if ( $Border )
             $Settings = array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB);
            else
@@ -213,17 +198,14 @@ 
          $EndAngle = $Offset+($Value*$ScaleFactor); if ( $EndAngle > 360 ) { $EndAngle = 360; }
 
          if ($DataGapAngle == 0)
-          { $X0 = $X; $Y0 = $Y; }
-         else
-          {
+          { $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;
           }
          $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;
 
@@ -233,11 +215,9 @@ 
           }
          $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"]);}
-           else
+            { $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); }
 
            $Angle = ($EndAngle - $Offset)/2 + $Offset;
@@ -256,23 +236,18 @@ 
         }
       }
 
-     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)
-        {
+       foreach($Values as $Key => $Value) {
          $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;
-          }
-         else
-          {
+          } else {
            $Xc = cos(($Angle-90)*PI/180) * ($Radius)/2 + $X;
            $Yc = sin(($Angle-90)*PI/180) * ($Radius)/2 + $Y;
           }
@@ -296,8 +271,7 @@ 
     }
 
    /* Draw a 3D pie chart */
-   function draw3DPie($X,$Y,$Format="")
-    {
+   function draw3DPie($X,$Y,$Format="") {
      /* Rendering layout */
      $Radius		= isset($Format["Radius"]) ? $Format["Radius"] : 80;
      $Precision		= isset($Format["Precision"]) ? $Format["Precision"] : 0;
@@ -371,8 +345,7 @@ 
      $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"]);
 
@@ -385,17 +358,14 @@ 
        if ( $EndAngle < 180 )   { $Visible[$Slice]["End"] = FALSE; } else { $Visible[$Slice]["End"] = TRUE; }
 
        if ($DataGapAngle == 0)
-        { $X0 = $X; $Y0 = $Y; }
-       else
-        {
+        { $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;
         }
        $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;
 
@@ -411,10 +381,8 @@ 
       }
 
      /* Draw the bottom shadow if needed */
-     if ( $RestoreShadow && ($this->pChartObject->ShadowX != 0 || $this->pChartObject->ShadowY !=0 ))
-      {
-       foreach($Slices as $SliceID => $Plots)
-        {
+     if ( $RestoreShadow && ($this->pChartObject->ShadowX != 0 || $this->pChartObject->ShadowY !=0 )) {
+       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; }
@@ -425,12 +393,10 @@ 
 
        $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; }
 
-         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;
 
@@ -442,13 +408,11 @@ 
       }
 
      /* 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);
 
-       if ( $SecondPass )
-        {
+       if ( $SecondPass ) {
          $Settings = $SliceColors[$SliceID];
          if ( $Border )
           { $Settings["R"]+= 30; $Settings["G"]+= 30; $Settings["B"]+= 30;; }
@@ -471,8 +435,7 @@ 
      /* 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;
 
@@ -488,12 +451,10 @@ 
 
      $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"] )
-        {
+       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"]));
 
          $Border = "";
@@ -504,16 +465,13 @@ 
       }
 
      /* 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;
 
-       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];
@@ -523,8 +481,7 @@ 
           }
         }
 
-       if ( $SecondPass )
-        {
+       if ( $SecondPass ) {
          $Settings = $SliceColors[$SliceID];
          if ( $Border )
           { $Settings["R"]+= 30; $Settings["G"]+= 30; $Settings["B"]+= 30; }
@@ -532,8 +489,7 @@ 
          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);
@@ -541,22 +497,19 @@ 
           }
 
          $Angle = $SliceAngle[$SliceID][count($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);
           }
 
-         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);
           }
 
-         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);
@@ -566,8 +519,7 @@ 
       }
 
      /* 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;
 
@@ -580,37 +532,30 @@ 
 
 
      /* 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)
-        {
+       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);
-         else
-          {
+         else {
            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"]+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"]);
           }
 
          $EndAngle = $Offset-($Value*$ScaleFactor); if ( $EndAngle < 0 ) { $EndAngle = 0; }
 
          if ($DataGapAngle == 0)
-          { $X0 = $X; $Y0 = $Y- $SliceHeight; }
-         else
-          {
+          { $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;
           }
          $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;
 
@@ -625,24 +570,19 @@ 
         }
       }
 
-     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)
-        {
+       foreach($Values as $Key => $Value) {
          $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;
-          }
-         else
-          {
+          } else {
            $Xc = cos(($Angle-90)*PI/180) * ($Radius)/2 + $X;
            $Yc = sin(($Angle-90)*PI/180) * ($Radius*$SkewFactor)/2 + $Y - $SliceHeight;
           }
@@ -658,15 +598,12 @@ 
         }
       }
 
-     if ( $DrawLabels )
-      {
+     if ( $DrawLabels ) {
        $Step = 360 / (2 * PI * $Radius);
        $Offset = 360; $ID = count($Values)-1;
-       foreach($Values as $Key => $Value)
-        {
+       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"]);}
-         else
+          { $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); }
 
          $EndAngle = $Offset-($Value*$ScaleFactor); if ( $EndAngle < 0 ) { $EndAngle = 0; }
@@ -675,8 +612,7 @@ 
          $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 )
@@ -697,8 +633,7 @@ 
     }
 
    /* 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;
@@ -730,19 +665,15 @@ 
      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);
 
-       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;
-        }
-       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; }
@@ -760,19 +691,15 @@ 
       $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 )
-        {
+       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;
-        }
-       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;
         }
@@ -782,8 +709,7 @@ 
     }
 
    /* 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;
@@ -796,22 +722,18 @@ 
     }
 
    /* 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;
      $FontName		= $this->pChartObject->FontName;
      $FontSize		= $this->pChartObject->FontSize;
 
-     if ( !$Stacked )
-      {
+     if ( !$Stacked ) {
        $Settings["Angle"]  = 360-$Angle;
        $Settings["Length"] = 25;
        $Settings["Size"]   = 8;
 
        $this->pChartObject->drawArrowLabel($X,$Y," ".$Label." ",$Settings);
-      }
-     else
-      {
+      } else {
        $X2 = cos(deg2rad($Angle-90))*20+$X;
        $Y2 = sin(deg2rad($Angle-90))*20+$Y;
 
@@ -820,13 +742,10 @@ 
        $YTop    = $Y2 - $Height/2 - 2;
        $YBottom = $Y2 + $Height/2 + 2;
 
-       if ( $this->LabelPos != "" )
-        {
+       if ( $this->LabelPos != "" ) {
          $Done = FALSE;
-         foreach($this->LabelPos as $Key => $Settings)
-          {
-           if ( !$Done )
-            {
+         foreach($this->LabelPos as $Key => $Settings) {
+           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"])))
@@ -847,21 +766,17 @@ 
     }
 
    /* 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)
-      {
+     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; }
       }
     }
 
    /* Internally used to write the re-computed labels */
-   function writeShiftedLabels()
-    {
+   function writeShiftedLabels() {
      if ( $this->LabelPos == "" ) { return(0); }
-     foreach($this->LabelPos as $Key => $Settings)
-      {
+     foreach($this->LabelPos as $Key => $Settings) {
        $X1 = $Settings["X1"]; $Y1 = $Settings["Y1"];
        $X2 = $Settings["X2"]; $Y2 = $Settings["Y2"];
        $X3 = $Settings["X3"];
@@ -869,13 +784,10 @@ 
        $Label = $Settings["Label"];
 
        $this->pChartObject->drawArrow($X2,$Y2,$X1,$Y1,array("Size"=>8));
-       if ( $Angle <= 180 )
-        {
+       if ( $Angle <= 180 ) {
          $this->pChartObject->drawLine($X2,$Y2,$X3,$Y2);
          $this->pChartObject->drawText($X3+2,$Y2,$Label,array("Align"=>TEXT_ALIGN_MIDDLELEFT));
-        }
-       else
-        {
+        } else {
          $this->pChartObject->drawLine($X2,$Y2,$X3,$Y2);
          $this->pChartObject->drawText($X3-2,$Y2,$Label,array("Align"=>TEXT_ALIGN_MIDDLERIGHT));
         }
@@ -883,8 +795,7 @@ 
     }
 
    /* 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;
      $InnerRadius	= isset($Format["Radius"]) ? $Format["Radius"] : 30;
@@ -947,8 +858,7 @@ 
      $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;
@@ -958,15 +868,11 @@ 
      /* Draw the polygon pie elements */
      $Step = 360 / (2 * PI * $OuterRadius);
      $Offset = 0; $ID = 0;
-     foreach($Values as $Key => $Value)
-      {
-       if ( $Shadow )
-        {
+     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);
          $BorderColor = $Settings;
-        }
-       else
-        {
+        } 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"]);
 
@@ -978,8 +884,7 @@ 
 
        $Plots = ""; $Boundaries = ""; $AAPixels = "";
        $EndAngle = $Offset+($Value*$ScaleFactor); if ( $EndAngle > 360 ) { $EndAngle = 360; }
-       for($i=$Offset;$i<=$EndAngle;$i=$i+$Step)
-        {
+       for($i=$Offset;$i<=$EndAngle;$i=$i+$Step) {
          $Xc = cos(($i-90)*PI/180) * $OuterRadius + $X;
          $Yc = sin(($i-90)*PI/180) * $OuterRadius + $Y;
 
@@ -995,8 +900,7 @@ 
        $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;
 
@@ -1023,11 +927,9 @@ 
        $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"]);}
-         else
+          { $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); }
 
          $Angle = ($EndAngle - $Offset)/2 + $Offset;
@@ -1047,27 +949,22 @@ 
 
      if ( $DrawLabels && $LabelStacked ) { $this->writeShiftedLabels(); }
 
-     if ( $WriteValues && !$Shadow )
-      {
+     if ( $WriteValues && !$Shadow ) {
        $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; }
 
          $Angle = $Offset+($Value*$ScaleFactor)/2;
-         if ( $ValuePosition == PIE_VALUE_OUTSIDE )
-          {
+         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; }
-          }
-         else
-          {
+          } else {
            $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;
@@ -1091,8 +988,7 @@ 
     }
 
    /* 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;
@@ -1165,8 +1061,7 @@ 
      $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"]);
 
@@ -1180,8 +1075,7 @@ 
 
        $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);
@@ -1212,8 +1106,7 @@ 
 
        $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);
@@ -1244,13 +1137,13 @@ 
       }
 
      /* 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);
 
-       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);
@@ -1260,8 +1153,7 @@ 
      $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;
 
@@ -1278,21 +1170,16 @@ 
       }
 
      /* 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;
 
        $Outer = TRUE; $Inner = FALSE;
        $InnerPlotsA = ""; $InnerPlotsB = "";
-       foreach($Plots["Angle"] as $ID => $Angle)
-        {
+       foreach($Plots["Angle"] as $ID => $Angle) {
          if ( $Angle == VOID )
-          { $Outer = FALSE; $Inner = TRUE; }
-         elseif( $Inner )
-          {
-           if (( $Angle < 90 || $Angle > 270 ) && isset($Plots["BottomPoly"][$ID*2]) )
-            {
+          { $Outer = FALSE; $Inner = TRUE; } elseif( $Inner ) {
+           if (( $Angle < 90 || $Angle > 270 ) && isset($Plots["BottomPoly"][$ID*2]) ) {
              $Xo = $Plots["BottomPoly"][$ID*2];
              $Yo = $Plots["BottomPoly"][$ID*2+1];
 
@@ -1307,16 +1194,14 @@ 
       }
 
      /* 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;
 
        $StartAngle = $Plots["Angle"][0];
        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"];
@@ -1330,8 +1215,7 @@ 
          $this->pChartObject->drawPolygon($Points,$Settings);
         }
 
-       if ( $EndAngle > 180 )
-        {
+       if ( $EndAngle > 180 ) {
          $Points = "";
          $Points[] = $Plots["InX1"];
          $Points[] = $Plots["InY1"];
@@ -1348,8 +1232,7 @@ 
 
 
      /* 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;
 
@@ -1364,21 +1247,16 @@ 
 
 
      /* 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;
 
        $Outer = TRUE; $Inner = FALSE;
        $OuterPlotsA = ""; $OuterPlotsB = ""; $InnerPlotsA = ""; $InnerPlotsB = "";
-       foreach($Plots["Angle"] as $ID => $Angle)
-        {
+       foreach($Plots["Angle"] as $ID => $Angle) {
          if ( $Angle == VOID )
-          { $Outer = FALSE; $Inner = TRUE; }
-         elseif( $Outer )
-          {
-           if ( ( $Angle > 90 && $Angle < 270 ) && isset($Plots["BottomPoly"][$ID*2]) )
-            {
+          { $Outer = FALSE; $Inner = TRUE; } elseif( $Outer ) {
+           if ( ( $Angle > 90 && $Angle < 270 ) && isset($Plots["BottomPoly"][$ID*2]) ) {
              $Xo = $Plots["BottomPoly"][$ID*2];
              $Yo = $Plots["BottomPoly"][$ID*2+1];
 
@@ -1396,8 +1274,7 @@ 
 
 
      /* 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;
  
@@ -1405,24 +1282,22 @@ 
 
        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);
       }
 
-     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; }
 
          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"=>$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); }
 
          $Angle = ($EndAngle - $Offset)/2 + $Offset;
@@ -1452,8 +1327,7 @@ 
     }
 
   /* Serialize an array */
-  function arraySerialize($Data)
-   {
+  function arraySerialize($Data) {
     $Result = "";
     foreach($Data as $Key => $Value)
      { if ($Result == "") { $Result = floor($Value); } else { $Result = $Result.",".floor($Value); } }
@@ -1462,8 +1336,7 @@ 
    }
 
   /* Reverse an array */
-  function arrayReverse($Plots)
-   {
+  function arrayReverse($Plots) {
     $Result = "";
 
     for($i=count($Plots)-1;$i>=0;$i=$i-2)
@@ -1473,8 +1346,7 @@ 
    }
 
   /* Remove unused series & values */
-  function clean0Values($Data,$Palette,$DataSerie,$AbscissaSerie)
-   {
+  function clean0Values($Data,$Palette,$DataSerie,$AbscissaSerie) {
     $NewPalette = ""; $NewData = ""; $NewAbscissa = "";
 
     /* Remove unused series */
@@ -1482,10 +1354,8 @@ 
      { if ( $SerieName != $DataSerie && $SerieName != $AbscissaSerie ) { unset($Data["Series"][$SerieName]); } }
 
     /* Remove NULL values */
-    foreach($Data["Series"][$DataSerie]["Data"] as $Key => $Value)
-     {
-      if ($Value != 0 )
-       {
+    foreach($Data["Series"][$DataSerie]["Data"] as $Key => $Value) {
+      if ($Value != 0 ) {
         $NewData[]     = $Value;
         $NewAbscissa[] = $Data["Series"][$AbscissaSerie]["Data"][$Key];
         if ( isset($Palette[$Key]) ) { $NewPalette[]  = $Palette[$Key]; }

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

Braces +40 added lines, -86 removed lines

@@ -17,54 +17,44 @@ 
  define("BUBBLE_SHAPE_SQUARE"		, 700002);
 
  /* pBubble class definition */
- class pBubble
-  {
+ class pBubble {
    var $pChartObject;
    var $pDataObject;
 
    /* Class creator */
-   function pBubble($pChartObject,$pDataObject)
-    {
+   function pBubble($pChartObject,$pDataObject) {
      $this->pChartObject = $pChartObject;
      $this->pDataObject  = $pDataObject;
     }
 
    /* Prepare the scale */
-   function bubbleScale($DataSeries,$WeightSeries)
-    {
+   function bubbleScale($DataSeries,$WeightSeries) {
      if ( !is_array($DataSeries) )	{ $DataSeries = array($DataSeries); }
      if ( !is_array($WeightSeries) )	{ $WeightSeries = array($WeightSeries); }
 
      /* Parse each data series to find the new min & max boundaries to scale */
      $NewPositiveSerie = ""; $NewNegativeSerie = ""; $MaxValues = 0; $LastPositive = 0; $LastNegative = 0;
-     foreach($DataSeries as $Key => $SerieName)
-      {
+     foreach($DataSeries as $Key => $SerieName) {
        $SerieWeightName = $WeightSeries[$Key];
 
        $this->pDataObject->setSerieDrawable($SerieWeightName,FALSE);
 
        if ( count($this->pDataObject->Data["Series"][$SerieName]["Data"]) > $MaxValues ) { $MaxValues = count($this->pDataObject->Data["Series"][$SerieName]["Data"]); }
 
-       foreach($this->pDataObject->Data["Series"][$SerieName]["Data"] as $Key => $Value)
-        {
-         if ( $Value >= 0 )
-          {
+       foreach($this->pDataObject->Data["Series"][$SerieName]["Data"] as $Key => $Value) {
+         if ( $Value >= 0 ) {
            $BubbleBounds = $Value + $this->pDataObject->Data["Series"][$SerieWeightName]["Data"][$Key];
 
            if ( !isset($NewPositiveSerie[$Key]) )
-            { $NewPositiveSerie[$Key] = $BubbleBounds; }
-           elseif ( $NewPositiveSerie[$Key] < $BubbleBounds )
+            { $NewPositiveSerie[$Key] = $BubbleBounds; } elseif ( $NewPositiveSerie[$Key] < $BubbleBounds )
             { $NewPositiveSerie[$Key] = $BubbleBounds; }
 
            $LastPositive = $BubbleBounds;
-          }
-         else
-          {
+          } else {
            $BubbleBounds = $Value - $this->pDataObject->Data["Series"][$SerieWeightName]["Data"][$Key];
 
            if ( !isset($NewNegativeSerie[$Key]) )
-            { $NewNegativeSerie[$Key] = $BubbleBounds; }
-           elseif ( $NewNegativeSerie[$Key] > $BubbleBounds )
+            { $NewNegativeSerie[$Key] = $BubbleBounds; } elseif ( $NewNegativeSerie[$Key] > $BubbleBounds )
             { $NewNegativeSerie[$Key] = $BubbleBounds; }
 
            $LastNegative = $BubbleBounds;
@@ -73,32 +63,27 @@ 
       }
 
      /* Check for missing values and all the fake positive serie */
-     if ( $NewPositiveSerie != "" )
-      {
+     if ( $NewPositiveSerie != "" ) {
        for ($i=0; $i<$MaxValues; $i++) { if (!isset($NewPositiveSerie[$i])) { $NewPositiveSerie[$i] = $LastPositive; } }
 
        $this->pDataObject->addPoints($NewPositiveSerie,"BubbleFakePositiveSerie");
       }
 
      /* Check for missing values and all the fake negative serie */
-     if ( $NewNegativeSerie != "" )
-      {
+     if ( $NewNegativeSerie != "" ) {
        for ($i=0; $i<$MaxValues; $i++) { if (!isset($NewNegativeSerie[$i])) { $NewNegativeSerie[$i] = $LastNegative; } }
 
        $this->pDataObject->addPoints($NewNegativeSerie,"BubbleFakeNegativeSerie");
       }
     }
 
-   function resetSeriesColors()
-    {
+   function resetSeriesColors() {
      $Data    = $this->pDataObject->getData();
      $Palette = $this->pDataObject->getPalette();
 
      $ID = 0;
-     foreach($Data["Series"] as $SerieName => $SeriesParameters)
-      {
-       if ( $SeriesParameters["isDrawable"] )
-        {
+     foreach($Data["Series"] as $SerieName => $SeriesParameters) {
+       if ( $SeriesParameters["isDrawable"] ) {
          $this->pDataObject->Data["Series"][$SerieName]["Color"]["R"]     = $Palette[$ID]["R"];
          $this->pDataObject->Data["Series"][$SerieName]["Color"]["G"]     = $Palette[$ID]["G"];
          $this->pDataObject->Data["Series"][$SerieName]["Color"]["B"]     = $Palette[$ID]["B"];
@@ -109,8 +94,7 @@ 
     }
 
    /* Prepare the scale */
-   function drawBubbleChart($DataSeries,$WeightSeries,$Format="")
-    {
+   function drawBubbleChart($DataSeries,$WeightSeries,$Format="") {
      $ForceAlpha	= isset($Format["ForceAlpha"]) ? $Format["ForceAlpha"] : VOID;
      $DrawBorder	= isset($Format["DrawBorder"]) ? $Format["DrawBorder"] : TRUE;
      $BorderWidth	= isset($Format["BorderWidth"]) ? $Format["BorderWidth"] : 1;
@@ -135,8 +119,7 @@ 
 
      list($XMargin,$XDivs) = $this->pChartObject->scaleGetXSettings();
 
-     foreach($DataSeries as $Key => $SerieName)
-      {
+     foreach($DataSeries as $Key => $SerieName) {
        $AxisID	= $Data["Series"][$SerieName]["Axis"];
        $Mode	= $Data["Axis"][$AxisID]["Display"];
        $Format	= $Data["Axis"][$AxisID]["Format"];
@@ -153,95 +136,71 @@ 
 
        if ( $ForceAlpha != VOID ) { $Color["Alpha"]=$ForceAlpha; }
 
-       if ( $DrawBorder )
-        {
-         if ( $BorderWidth != 1 )
-          {
+       if ( $DrawBorder ) {
+         if ( $BorderWidth != 1 ) {
            if ( $Surrounding != NULL )
-            { $BorderR = $Palette[$Key]["R"]+$Surrounding; $BorderG = $Palette[$Key]["G"]+$Surrounding; $BorderB = $Palette[$Key]["B"]+$Surrounding; }
-           else
+            { $BorderR = $Palette[$Key]["R"]+$Surrounding; $BorderG = $Palette[$Key]["G"]+$Surrounding; $BorderB = $Palette[$Key]["B"]+$Surrounding; } else
             { $BorderR = $BorderR; $BorderG = $BorderG; $BorderB = $BorderB; }
            if ( $ForceAlpha != VOID ) { $BorderAlpha = $ForceAlpha/2; }
            $BorderColor = array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha);
-          }
-         else
-          {
+          } else {
            $Color["BorderAlpha"] = $BorderAlpha;
 
            if ( $Surrounding != NULL )
-            { $Color["BorderR"] = $Palette[$Key]["R"]+$Surrounding; $Color["BorderG"] = $Palette[$Key]["G"]+$Surrounding; $Color["BorderB"] = $Palette[$Key]["B"]+$Surrounding; }
-           else
+            { $Color["BorderR"] = $Palette[$Key]["R"]+$Surrounding; $Color["BorderG"] = $Palette[$Key]["G"]+$Surrounding; $Color["BorderB"] = $Palette[$Key]["B"]+$Surrounding; } else
             { $Color["BorderR"] = $BorderR; $Color["BorderG"] = $BorderG; $Color["BorderB"] = $BorderB; }
            if ( $ForceAlpha != VOID ) { $Color["BorderAlpha"] = $ForceAlpha/2; }
           }
         }
 
-       foreach($Data["Series"][$SerieName]["Data"] as $iKey => $Point)
-        {
+       foreach($Data["Series"][$SerieName]["Data"] as $iKey => $Point) {
          $Weight = $Point + $Data["Series"][$WeightSeries[$Key]]["Data"][$iKey];
 
          $PosArray    = $this->pChartObject->scaleComputeY($Point,array("AxisID"=>$AxisID));
          $WeightArray = $this->pChartObject->scaleComputeY($Weight,array("AxisID"=>$AxisID));
 
-         if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
-          {
+         if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT ) {
            if ( $XDivs == 0 ) { $XStep = 0; } else { $XStep = ($this->pChartObject->GraphAreaX2-$this->pChartObject->GraphAreaX1-$XMargin*2)/$XDivs; }
            $Y = floor($PosArray); $CircleRadius = floor(abs($PosArray - $WeightArray)/2);
 
-           if ( $Shape == BUBBLE_SHAPE_SQUARE )
-            {
+           if ( $Shape == BUBBLE_SHAPE_SQUARE ) {
              if ( $RecordImageMap ) { $this->pChartObject->addToImageMap("RECT",floor($X-$CircleRadius).",".floor($Y-$CircleRadius).",".floor($X+$CircleRadius).",".floor($Y+$CircleRadius),$this->pChartObject->toHTMLColor($Palette[$Key]["R"],$Palette[$Key]["G"],$Palette[$Key]["B"]),$SerieDescription,$Data["Series"][$WeightSeries[$Key]]["Data"][$iKey]); }
 
-             if ( $BorderWidth != 1 )
-              {
+             if ( $BorderWidth != 1 ) {
                $this->pChartObject->drawFilledRectangle($X-$CircleRadius-$BorderWidth,$Y-$CircleRadius-$BorderWidth,$X+$CircleRadius+$BorderWidth,$Y+$CircleRadius+$BorderWidth,$BorderColor);
                $this->pChartObject->drawFilledRectangle($X-$CircleRadius,$Y-$CircleRadius,$X+$CircleRadius,$Y+$CircleRadius,$Color);
-              }
-             else
+              } else
               $this->pChartObject->drawFilledRectangle($X-$CircleRadius,$Y-$CircleRadius,$X+$CircleRadius,$Y+$CircleRadius,$Color);
-            }
-           elseif ( $Shape == BUBBLE_SHAPE_ROUND )
-            {
+            } elseif ( $Shape == BUBBLE_SHAPE_ROUND ) {
              if ( $RecordImageMap ) { $this->pChartObject->addToImageMap("CIRCLE",floor($X).",".floor($Y).",".floor($CircleRadius),$this->pChartObject->toHTMLColor($Palette[$Key]["R"],$Palette[$Key]["G"],$Palette[$Key]["B"]),$SerieDescription,$Data["Series"][$WeightSeries[$Key]]["Data"][$iKey]); }
 
-             if ( $BorderWidth != 1 )
-              {
+             if ( $BorderWidth != 1 ) {
                $this->pChartObject->drawFilledCircle($X,$Y,$CircleRadius+$BorderWidth,$BorderColor);
                $this->pChartObject->drawFilledCircle($X,$Y,$CircleRadius,$Color);
-              }
-             else
+              } else
               $this->pChartObject->drawFilledCircle($X,$Y,$CircleRadius,$Color);
             }
 
            $X = $X + $XStep;
-          }
-         elseif ( $Data["Orientation"] == SCALE_POS_TOPBOTTOM )
-          {
+          } elseif ( $Data["Orientation"] == SCALE_POS_TOPBOTTOM ) {
            if ( $XDivs == 0 ) { $XStep = 0; } else { $XStep = ($this->pChartObject->GraphAreaY2-$this->pChartObject->GraphAreaY1-$XMargin*2)/$XDivs; }
            $X = floor($PosArray); $CircleRadius = floor(abs($PosArray - $WeightArray)/2);
 
-           if ( $Shape == BUBBLE_SHAPE_SQUARE )
-            {
+           if ( $Shape == BUBBLE_SHAPE_SQUARE ) {
              if ( $RecordImageMap ) { $this->pChartObject->addToImageMap("RECT",floor($X-$CircleRadius).",".floor($Y-$CircleRadius).",".floor($X+$CircleRadius).",".floor($Y+$CircleRadius),$this->pChartObject->toHTMLColor($Palette[$Key]["R"],$Palette[$Key]["G"],$Palette[$Key]["B"]),$SerieDescription,$Data["Series"][$WeightSeries[$Key]]["Data"][$iKey]); }
 
-             if ( $BorderWidth != 1 )
-              {
+             if ( $BorderWidth != 1 ) {
                $this->pChartObject->drawFilledRectangle($X-$CircleRadius-$BorderWidth,$Y-$CircleRadius-$BorderWidth,$X+$CircleRadius+$BorderWidth,$Y+$CircleRadius+$BorderWidth,$BorderColor);
                $this->pChartObject->drawFilledRectangle($X-$CircleRadius,$Y-$CircleRadius,$X+$CircleRadius,$Y+$CircleRadius,$Color);
-              }
-             else
+              } else
               $this->pChartObject->drawFilledRectangle($X-$CircleRadius,$Y-$CircleRadius,$X+$CircleRadius,$Y+$CircleRadius,$Color);
-            }
-           elseif ( $Shape == BUBBLE_SHAPE_ROUND )
-            {
+            } elseif ( $Shape == BUBBLE_SHAPE_ROUND ) {
              if ( $RecordImageMap ) { $this->pChartObject->addToImageMap("CIRCLE",floor($X).",".floor($Y).",".floor($CircleRadius),$this->pChartObject->toHTMLColor($Palette[$Key]["R"],$Palette[$Key]["G"],$Palette[$Key]["B"]),$SerieDescription,$Data["Series"][$WeightSeries[$Key]]["Data"][$iKey]); }
 
-             if ( $BorderWidth != 1 )
-              {
+             if ( $BorderWidth != 1 ) {
                $this->pChartObject->drawFilledCircle($X,$Y,$CircleRadius+$BorderWidth,$BorderColor);
                $this->pChartObject->drawFilledCircle($X,$Y,$CircleRadius,$Color);
-              }
-             else
+              } else
               $this->pChartObject->drawFilledCircle($X,$Y,$CircleRadius,$Color);
             }
 
@@ -251,8 +210,7 @@ 
       }
     }
 
-   function writeBubbleLabel($SerieName,$SerieWeightName,$Points,$Format="")
-    {
+   function writeBubbleLabel($SerieName,$SerieWeightName,$Points,$Format="") {
      $OverrideTitle	= isset($Format["OverrideTitle"]) ? $Format["OverrideTitle"] : NULL;
      $DrawPoint		= isset($Format["DrawPoint"]) ? $Format["DrawPoint"] : LABEL_POINT_BOX;
 
@@ -277,8 +235,7 @@ 
 
      $Color = array("R"=>$Data["Series"][$SerieName]["Color"]["R"],"G"=>$Data["Series"][$SerieName]["Color"]["G"],"B"=>$Data["Series"][$SerieName]["Color"]["B"],"Alpha"=>$Data["Series"][$SerieName]["Color"]["Alpha"]);
 
-     foreach($Points as $Key => $Point)
-      {
+     foreach($Points as $Key => $Point) {
        $Value    = $Data["Series"][$SerieName]["Data"][$Point];
        $PosArray = $this->pChartObject->scaleComputeY($Value,array("AxisID"=>$AxisID));
 
@@ -299,15 +256,12 @@ 
        $Series = "";
        $Series[] = array("Format"=>$Color,"Caption"=>$Caption);
 
-       if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
-        {
+       if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT ) {
          if ( $XDivs == 0 ) { $XStep = 0; } else { $XStep = ($this->pChartObject->GraphAreaX2-$this->pChartObject->GraphAreaX1-$XMargin*2)/$XDivs; }
 
          $X = floor($X + $Point * $XStep);
          $Y = floor($PosArray);
-        }
-       else
-        {
+        } else {
          if ( $XDivs == 0 ) { $YStep = 0; } else { $YStep = ($this->pChartObject->GraphAreaY2-$this->pChartObject->GraphAreaY1-$XMargin*2)/$XDivs; }
 
          $X = floor($PosArray);

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

Braces +46 added lines, -98 removed lines

@@ -14,8 +14,7 @@ 
  */
 
  /* The GD extension is mandatory */
- if (!extension_loaded('gd') && !extension_loaded('gd2'))
-  {
+ if (!extension_loaded('gd') && !extension_loaded('gd2')) {
    echo "GD extension must be loaded. \r\n";
    exit();
   }
@@ -31,8 +30,7 @@ 
  /* ImageMap string delimiter */
  define("IMAGE_MAP_DELIMITER"		, chr(1));
 
- class pImage extends pDraw
-  {
+ class pImage extends pDraw {
    /* Image settings, size, quality, .. */
    var $XSize		= NULL;				// Width of the picture
    var $YSize		= NULL;				// Height of the picture
@@ -82,8 +80,7 @@ 
    var $LastChartLayout	= CHART_LAST_LAYOUT_REGULAR;	// Last layout : regular or stacked
 
    /* Class constructor */
-   function pImage($XSize,$YSize,$DataSet=NULL,$TransparentBackground=FALSE)
-    {
+   function pImage($XSize,$YSize,$DataSet=NULL,$TransparentBackground=FALSE) {
      $this->TransparentBackground = $TransparentBackground;
 
      if ( $DataSet != NULL ) { $this->DataSet = $DataSet; }
@@ -92,23 +89,19 @@ 
      $this->YSize   = $YSize;
      $this->Picture = imagecreatetruecolor($XSize,$YSize);
 
-     if ( $this->TransparentBackground )
-      {
+     if ( $this->TransparentBackground ) {
        imagealphablending($this->Picture,FALSE);
        imagefilledrectangle($this->Picture, 0,0,$XSize, $YSize, imagecolorallocatealpha($this->Picture, 255, 255, 255, 127));
        imagealphablending($this->Picture,TRUE);
        imagesavealpha($this->Picture,true); 
-      }
-     else
-      {
+      } else {
        $C_White = $this->AllocateColor($this->Picture,255,255,255);
        imagefilledrectangle($this->Picture,0,0,$XSize,$YSize,$C_White);
       }
     }
 
    /* Enable / Disable and set shadow properties */
-   function setShadow($Enabled=TRUE,$Format="")
-    {
+   function setShadow($Enabled=TRUE,$Format="") {
      $X	    = isset($Format["X"]) ? $Format["X"] : 2;
      $Y	    = isset($Format["Y"]) ? $Format["Y"] : 2;
      $R	    = isset($Format["R"]) ? $Format["R"] : 0;
@@ -126,8 +119,7 @@ 
     }
 
    /* Set the graph area position */
-   function setGraphArea($X1,$Y1,$X2,$Y2)
-    {
+   function setGraphArea($X1,$Y1,$X2,$Y2) {
      if ( $X2 < $X1 || $X1 == $X2 || $Y2 < $Y1 || $Y1 == $Y2 ) { return(-1); }
 
      $this->GraphAreaX1 = $X1; $this->DataSet->Data["GraphArea"]["X1"] = $X1;
@@ -145,19 +137,16 @@ 
     { return($this->YSize); }
 
    /* Render the picture to a file */
-   function render($FileName)
-    {
+   function render($FileName) {
      if ( $this->TransparentBackground ) { imagealphablending($this->Picture,false); imagesavealpha($this->Picture,true); }
      imagepng($this->Picture,$FileName);
     }
 
    /* Render the picture to a web browser stream */
-   function stroke($BrowserExpire=FALSE)
-    {
+   function stroke($BrowserExpire=FALSE) {
      if ( $this->TransparentBackground ) { imagealphablending($this->Picture,false); imagesavealpha($this->Picture,true); }
 
-     if ( $BrowserExpire )
-      {
+     if ( $BrowserExpire ) {
        header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
        header("Cache-Control: no-cache");
        header("Pragma: no-cache");
@@ -168,8 +157,7 @@ 
     }
 
    /* Automatic output method based on the calling interface */
-   function autoOutput($FileName="output.png")
-    {
+   function autoOutput($FileName="output.png") {
      if (php_sapi_name() == "cli")
       $this->Render($FileName);
      else
@@ -181,15 +169,13 @@ 
     { return(sqrt(pow(max($X1,$X2)-min($X1,$X2),2)+pow(max($Y1,$Y2)-min($Y1,$Y2),2))); }
 
    /* Return the orientation of a line */
-   function getAngle($X1,$Y1,$X2,$Y2)
-    {
+   function getAngle($X1,$Y1,$X2,$Y2) {
      $Opposite = $Y2 - $Y1; $Adjacent = $X2 - $X1;$Angle = rad2deg(atan2($Opposite,$Adjacent));
      if ($Angle > 0) { return($Angle); } else { return(360-abs($Angle)); }
     }
 
    /* Return the surrounding box of text area */
-   function getTextBox_deprecated($X,$Y,$FontName,$FontSize,$Angle,$Text)
-    {
+   function getTextBox_deprecated($X,$Y,$FontName,$FontSize,$Angle,$Text) {
      $Size    = imagettfbbox($FontSize,$Angle,$FontName,$Text);
      $Width   = $this->getLength($Size[0],$Size[1],$Size[2],$Size[3])+1;
      $Height  = $this->getLength($Size[2],$Size[3],$Size[4],$Size[5])+1;
@@ -206,13 +192,11 @@ 
     }
 
    /* Return the surrounding box of text area */
-   function getTextBox($X,$Y,$FontName,$FontSize,$Angle,$Text)
-    {
+   function getTextBox($X,$Y,$FontName,$FontSize,$Angle,$Text) {
      $coords = imagettfbbox($FontSize, 0, $FontName, $Text);
 
      $a = deg2rad($Angle); $ca = cos($a); $sa = sin($a); $RealPos = array();
-     for($i = 0; $i < 7; $i += 2)
-      {
+     for($i = 0; $i < 7; $i += 2) {
        $RealPos[$i/2]["X"] = $X + round($coords[$i] * $ca + $coords[$i+1] * $sa);
        $RealPos[$i/2]["Y"] = $Y + round($coords[$i+1] * $ca - $coords[$i] * $sa);
       }
@@ -231,8 +215,7 @@ 
     }
 
    /* Set current font properties */
-   function setFontProperties($Format="")
-    {
+   function setFontProperties($Format="") {
      $R		= isset($Format["R"]) ? $Format["R"] : -1;
      $G		= isset($Format["G"]) ? $Format["G"] : -1;
      $B		= isset($Format["B"]) ? $Format["B"] : -1;
@@ -253,8 +236,7 @@ 
     }
 
    /* Returns the 1st decimal values (used to correct AA bugs) */
-   function getFirstDecimal($Value)
-    {
+   function getFirstDecimal($Value) {
      $Values = preg_split("/\./",$Value);
      if ( isset($Values[1]) ) { return(substr($Values[1],0,1)); } else { return(0); }
     }
@@ -268,18 +250,14 @@ 
     { print_r($this->DataSet); }
 
    /* Initialise the image map methods */
-   function initialiseImageMap($Name="pChart",$StorageMode=IMAGE_MAP_STORAGE_SESSION,$UniqueID="imageMap",$StorageFolder="tmp")
-    {
+   function initialiseImageMap($Name="pChart",$StorageMode=IMAGE_MAP_STORAGE_SESSION,$UniqueID="imageMap",$StorageFolder="tmp") {
      $this->ImageMapIndex 		= $Name;
      $this->ImageMapStorageMode		= $StorageMode;
 
-     if ($StorageMode == IMAGE_MAP_STORAGE_SESSION)
-      {
+     if ($StorageMode == IMAGE_MAP_STORAGE_SESSION) {
        if(!isset($_SESSION)) { session_start(); }
        $_SESSION[$this->ImageMapIndex]    = NULL;
-      }
-     elseif($StorageMode == IMAGE_MAP_STORAGE_FILE)
-      {
+      } elseif($StorageMode == IMAGE_MAP_STORAGE_FILE) {
        $this->ImageMapFileName 		= $UniqueID;
        $this->ImageMapStorageFolder	= $StorageFolder;
 
@@ -288,27 +266,22 @@ 
     }
 
    /* Add a zone to the image map */
-   function addToImageMap($Type,$Plots,$Color=NULL,$Title=NULL,$Message=NULL,$HTMLEncode=FALSE)
-    {
+   function addToImageMap($Type,$Plots,$Color=NULL,$Title=NULL,$Message=NULL,$HTMLEncode=FALSE) {
      if ( $this->ImageMapStorageMode == NULL ) { $this->initialiseImageMap(); }
 
      /* Encode the characters in the imagemap in HTML standards */
      $Title   = str_replace("&#8364;","\u20AC",$Title);
      $Title   = htmlentities($Title,ENT_QUOTES,"ISO-8859-15");
-     if ( $HTMLEncode )
-      {
+     if ( $HTMLEncode ) {
        $Message = htmlentities($Message,ENT_QUOTES,"ISO-8859-15");
        $Message = str_replace("&lt;","<",$Message);
        $Message = str_replace("&gt;",">",$Message);
       }
 
-     if ( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_SESSION )
-      {
+     if ( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_SESSION ) {
        if(!isset($_SESSION)) { $this->initialiseImageMap(); }
        $_SESSION[$this->ImageMapIndex][] = array($Type,$Plots,$Color,$Title,$Message);
-      }
-     elseif($this->ImageMapStorageMode == IMAGE_MAP_STORAGE_FILE)
-      {
+      } elseif($this->ImageMapStorageMode == IMAGE_MAP_STORAGE_FILE) {
        $Handle = fopen($this->ImageMapStorageFolder."/".$this->ImageMapFileName.".map", 'a');
        fwrite($Handle, $Type.IMAGE_MAP_DELIMITER.$Plots.IMAGE_MAP_DELIMITER.$Color.IMAGE_MAP_DELIMITER.$Title.IMAGE_MAP_DELIMITER.$Message."\r\n");
        fclose($Handle);
@@ -316,8 +289,7 @@ 
     }
 
    /* Remove VOID values from an imagemap custom values array */
-   function removeVOIDFromArray($SerieName, $Values)
-    {
+   function removeVOIDFromArray($SerieName, $Values) {
      if ( !isset($this->DataSet->Data["Series"][$SerieName]) ) { return(-1); }
 
      $Result = "";
@@ -327,36 +299,28 @@ 
     }
 
    /* Replace the title of one image map serie */
-   function replaceImageMapTitle($OldTitle, $NewTitle)
-    {
+   function replaceImageMapTitle($OldTitle, $NewTitle) {
      if ( $this->ImageMapStorageMode == NULL ) { return(-1); }
 
      if ( is_array($NewTitle) ) { $NewTitle = $this->removeVOIDFromArray($OldTitle, $NewTitle); }
  
-     if ( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_SESSION )
-      {
+     if ( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_SESSION ) {
        if(!isset($_SESSION)) { return(-1); }
        if ( is_array($NewTitle) )
-        { $ID = 0; foreach($_SESSION[$this->ImageMapIndex] as $Key => $Settings) { if ( $Settings[3] == $OldTitle && isset($NewTitle[$ID])) { $_SESSION[$this->ImageMapIndex][$Key][3] = $NewTitle[$ID]; $ID++; } } }
-       else
+        { $ID = 0; foreach($_SESSION[$this->ImageMapIndex] as $Key => $Settings) { if ( $Settings[3] == $OldTitle && isset($NewTitle[$ID])) { $_SESSION[$this->ImageMapIndex][$Key][3] = $NewTitle[$ID]; $ID++; } } } else
         { foreach($_SESSION[$this->ImageMapIndex] as $Key => $Settings) { if ( $Settings[3] == $OldTitle ) { $_SESSION[$this->ImageMapIndex][$Key][3] = $NewTitle; } } }
-      }
-     elseif( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_FILE )
-      {
+      } elseif( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_FILE ) {
        $TempArray = "";
        $Handle    = @fopen($this->ImageMapStorageFolder."/".$this->ImageMapFileName.".map", "r");
-       if ($Handle)
-        {
-         while (($Buffer = fgets($Handle, 4096)) !== false)
-          {
+       if ($Handle) {
+         while (($Buffer = fgets($Handle, 4096)) !== false) {
            $Fields      = split(IMAGE_MAP_DELIMITER,str_replace(array(chr(10),chr(13)),"",$Buffer));
            $TempArray[] = array($Fields[0],$Fields[1],$Fields[2],$Fields[3],$Fields[4]);
           }
          fclose($Handle);
 
          if ( is_array($NewTitle) )
-          { $ID = 0; foreach($TempArray as $Key => $Settings) { if ( $Settings[3] == $OldTitle && isset($NewTitle[$ID]) ) { $TempArray[$Key][3] = $NewTitle[$ID]; $ID++; } } }
-         else
+          { $ID = 0; foreach($TempArray as $Key => $Settings) { if ( $Settings[3] == $OldTitle && isset($NewTitle[$ID]) ) { $TempArray[$Key][3] = $NewTitle[$ID]; $ID++; } } } else
           { foreach($TempArray as $Key => $Settings) { if ( $Settings[3] == $OldTitle ) { $TempArray[$Key][3] = $NewTitle; } } }
 
          $Handle = fopen($this->ImageMapStorageFolder."/".$this->ImageMapFileName.".map", 'w');
@@ -368,25 +332,19 @@ 
     }
 
    /* Replace the values of the image map contents */
-   function replaceImageMapValues($Title, $Values)
-    {
+   function replaceImageMapValues($Title, $Values) {
      if ( $this->ImageMapStorageMode == NULL ) { return(-1); }
 
      $Values = $this->removeVOIDFromArray($Title, $Values);
      $ID = 0; 
-     if ( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_SESSION )
-      {
+     if ( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_SESSION ) {
        if(!isset($_SESSION)) { return(-1); }
        foreach($_SESSION[$this->ImageMapIndex] as $Key => $Settings) { if ( $Settings[3] == $Title ) { if ( isset($Values[$ID]) ) { $_SESSION[$this->ImageMapIndex][$Key][4] = $Values[$ID]; } $ID++; } }
-      }
-     elseif( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_FILE )
-      {
+      } elseif( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_FILE ) {
        $TempArray = "";
        $Handle    = @fopen($this->ImageMapStorageFolder."/".$this->ImageMapFileName.".map", "r");
-       if ($Handle)
-        {
-         while (($Buffer = fgets($Handle, 4096)) !== false)
-          {
+       if ($Handle) {
+         while (($Buffer = fgets($Handle, 4096)) !== false) {
            $Fields      = split(IMAGE_MAP_DELIMITER,str_replace(array(chr(10),chr(13)),"",$Buffer));
            $TempArray[] = array($Fields[0],$Fields[1],$Fields[2],$Fields[3],$Fields[4]);
           }
@@ -403,24 +361,18 @@ 
     }
 
    /* Dump the image map */
-   function dumpImageMap($Name="pChart",$StorageMode=IMAGE_MAP_STORAGE_SESSION,$UniqueID="imageMap",$StorageFolder="tmp")
-    {
+   function dumpImageMap($Name="pChart",$StorageMode=IMAGE_MAP_STORAGE_SESSION,$UniqueID="imageMap",$StorageFolder="tmp") {
      $this->ImageMapIndex 		= $Name;
      $this->ImageMapStorageMode		= $StorageMode;
 
-     if ( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_SESSION )
-      {
+     if ( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_SESSION ) {
        if(!isset($_SESSION)) { session_start(); }
-       if ( $_SESSION[$Name] != NULL )
-        {
+       if ( $_SESSION[$Name] != NULL ) {
          foreach($_SESSION[$Name] as $Key => $Params)
           { echo $Params[0].IMAGE_MAP_DELIMITER.$Params[1].IMAGE_MAP_DELIMITER.$Params[2].IMAGE_MAP_DELIMITER.$Params[3].IMAGE_MAP_DELIMITER.$Params[4]."\r\n"; }
         }
-      }
-     elseif( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_FILE )
-      {
-       if (file_exists($StorageFolder."/".$UniqueID.".map"))
-        {
+      } elseif( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_FILE ) {
+       if (file_exists($StorageFolder."/".$UniqueID.".map")) {
          $Handle = @fopen($StorageFolder."/".$UniqueID.".map", "r");
          if ($Handle) { while (($Buffer = fgets($Handle, 4096)) !== false) { echo $Buffer; } }
          fclose($Handle);
@@ -434,8 +386,7 @@ 
     }
 
    /* Return the HTML converted color from the RGB composite values */
-   function toHTMLColor($R,$G,$B)
-    {
+   function toHTMLColor($R,$G,$B) {
      $R=intval($R); $G=intval($G); $B=intval($B);
      $R=dechex($R<0?0:($R>255?255:$R)); $G=dechex($G<0?0:($G>255?255:$G));$B=dechex($B<0?0:($B>255?255:$B));
      $Color="#".(strlen($R) < 2?'0':'').$R; $Color.=(strlen($G) < 2?'0':'').$G; $Color.= (strlen($B) < 2?'0':'').$B;
@@ -443,16 +394,14 @@ 
     }
 
    /* Reverse an array of points */
-   function reversePlots($Plots)
-    {
+   function reversePlots($Plots) {
      $Result = "";
      for($i=count($Plots)-2;$i>=0;$i=$i-2) { $Result[] = $Plots[$i]; $Result[] = $Plots[$i+1]; }
      return($Result);
     }
 
    /* Mirror Effect */
-   function drawAreaMirror($X,$Y,$Width,$Height,$Format="")
-    {
+   function drawAreaMirror($X,$Y,$Width,$Height,$Format="") {
      $StartAlpha	= isset($Format["StartAlpha"]) ? $Format["StartAlpha"] : 80;
      $EndAlpha		= isset($Format["EndAlpha"]) ? $Format["EndAlpha"] : 0;
 
@@ -461,8 +410,7 @@ 
      $Picture = imagecreatetruecolor($this->XSize,$this->YSize);
      imagecopy($Picture,$this->Picture,0,0,0,0,$this->XSize,$this->YSize);
      
-     for($i=1;$i<=$Height;$i++)
-      {
+     for($i=1;$i<=$Height;$i++) {
        if ( $Y+($i-1) < $this->YSize && $Y-$i > 0 ) { imagecopymerge($Picture,$this->Picture,$X,$Y+($i-1),$X,$Y-$i,$Width,1,$StartAlpha-$AlphaStep*$i); }
       }
 

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

Braces +19 added lines, -38 removed lines

@@ -14,15 +14,13 @@ 
  */
 
  /* pData class definition */
- class pCache
-  {
+ class pCache {
    var $CacheFolder;
    var $CacheIndex;
    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";
@@ -36,8 +34,7 @@ 
     }
 
    /* Flush the cache contents */
-   function flush()
-    {
+   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); }
     }
@@ -47,8 +44,7 @@ 
     { 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";
      $Database      = $this->CacheFolder."/".$this->CacheDB;
@@ -89,8 +85,7 @@ 
     { $this->dbRemoval(array("Name"=>$ID)); }
 
    /* Remove with specified criterias */
-   function dbRemoval($Settings)
-    {
+   function dbRemoval($Settings) {
      $ID     = isset($Settings["Name"]) ? $Settings["Name"] : NULL;
      $Expiry = isset($Settings["Expiry"]) ? $Settings["Expiry"] : -(24*60*60);
      $TS     = time()-$Expiry;
@@ -102,8 +97,7 @@ 
      $IndexTemp    = $this->CacheFolder."/".$this->CacheIndex.".tmp";
 
      /* Single file removal */
-     if ( $ID != NULL )
-      {
+     if ( $ID != NULL ) {
        /* Retrieve object informations */
        $Object = $this->isInCache($ID,TRUE);
 
@@ -122,23 +116,20 @@ 
      $DBTempHandle    = @fopen($DatabaseTemp, "w");
 
      /* Remove the selected ID from the database */
-     while (!feof($IndexHandle))
-      {
+     while (!feof($IndexHandle)) {
        $Entry    = fgets($IndexHandle, 4096);
        $Entry    = str_replace("\r","",$Entry);
        $Entry    = str_replace("\n","",$Entry);
        $Settings = preg_split("/,/",$Entry);
 
-       if ( $Entry != "" )
-        {
+       if ( $Entry != "" ) {
          $PicID       = $Settings[0];
          $DBPos       = $Settings[1];
          $PicSize     = $Settings[2];
          $GeneratedTS = $Settings[3];
          $Hits        = $Settings[4];
 
-         if ( $Settings[0] != $ID && $GeneratedTS > $TS)
-          {
+         if ( $Settings[0] != $ID && $GeneratedTS > $TS) {
            $CurrentPos  = ftell($DBTempHandle);
            fwrite($IndexTempHandle, $PicID.",".$CurrentPos.",".$PicSize.",".$GeneratedTS.",".$Hits."\r\n");
 
@@ -164,23 +155,19 @@ 
      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;
 
      /* Search the picture in the index file */
      $Handle = @fopen($Index, "r");
-     while (!feof($Handle))
-      {
+     while (!feof($Handle)) {
        $IndexPos = ftell($Handle);
        $Entry = fgets($Handle, 4096);
-       if ( $Entry != "" )
-        {
+       if ( $Entry != "" ) {
          $Settings = preg_split("/,/",$Entry);
          $PicID    = $Settings[0];
-         if ( $PicID == $ID )
-          {
+         if ( $PicID == $ID ) {
            fclose($Handle);
 
            $DBPos       = $Settings[1];
@@ -188,8 +175,7 @@ 
            $GeneratedTS = $Settings[3];
            $Hits        = intval($Settings[4]);
 
-           if ( $UpdateHitsCount )
-            {
+           if ( $UpdateHitsCount ) {
              $Hits++;
              if ( strlen($Hits) < 7 ) { $Hits = $Hits.str_repeat(" ",7-strlen($Hits)); }
 
@@ -200,8 +186,7 @@ 
             }
 
            if ($Verbose)
-            { return(array("DBPos"=>$DBPos,"PicSize"=>$PicSize,"GeneratedTS"=>$GeneratedTS,"Hits"=>$Hits)); }
-           else
+            { return(array("DBPos"=>$DBPos,"PicSize"=>$PicSize,"GeneratedTS"=>$GeneratedTS,"Hits"=>$Hits)); } else
             { return(TRUE); }
           }
         }
@@ -213,16 +198,14 @@ 
     }
 
    /* 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);
      else
       $this->strokeFromCache($ID);
     }
 
-   function strokeFromCache($ID)
-    {
+   function strokeFromCache($ID) {
      /* Get the raw picture from the cache */
      $Picture = $this->getFromCache($ID);
 
@@ -235,8 +218,7 @@ 
      return(TRUE);
     }
 
-   function saveFromCache($ID,$Destination)
-    {
+   function saveFromCache($ID,$Destination) {
      /* Get the raw picture from the cache */
      $Picture = $this->getFromCache($ID);
 
@@ -252,8 +234,7 @@ 
      return(TRUE);
     }
 
-   function getFromCache($ID)
-    {
+   function getFromCache($ID) {
      /* Compute the path */
      $Database = $this->CacheFolder."/".$this->CacheDB;
 

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

Braces +26 added lines, -55 removed lines

@@ -23,19 +23,16 @@ 
  define("INDICATOR_VALUE_LABEL"		, 700022);
 
  /* pIndicator class definition */
- class pIndicator
-  {
+ class pIndicator {
    var $pChartObject;
 
    /* Class creator */
-   function pIndicator($pChartObject)
-    {
+   function pIndicator($pChartObject) {
      $this->pChartObject = $pChartObject;
     }
 
    /* Draw an indicator */
-   function draw($X,$Y,$Width,$Height,$Format="")
-    {
+   function draw($X,$Y,$Width,$Height,$Format="") {
      $Values			= isset($Format["Values"]) ? $Format["Values"] : VOID;
      $IndicatorSections		= isset($Format["IndicatorSections"]) ? $Format["IndicatorSections"] : NULL;
      $ValueDisplay		= isset($Format["ValueDisplay"]) ? $Format["ValueDisplay"] : INDICATOR_VALUE_BUBBLE;
@@ -70,8 +67,7 @@ 
 
      /* Determine indicator visual configuration */
      $OverallMin = $IndicatorSections[0]["End"]; $OverallMax = $IndicatorSections[0]["Start"];
-     foreach ($IndicatorSections as $Key => $Settings)
-      {
+     foreach ($IndicatorSections as $Key => $Settings) {
        if ( $Settings["End"] > $OverallMax )   { $OverallMax = $Settings["End"]; }
        if ( $Settings["Start"] < $OverallMin ) { $OverallMin = $Settings["Start"]; }
       }
@@ -79,16 +75,14 @@ 
      $XScale    = $RealWidth / ($OverallMax-$OverallMin);
 
      $X1 = $X; $ValuesPos = "";
-     foreach ($IndicatorSections as $Key => $Settings)
-      {
+     foreach ($IndicatorSections as $Key => $Settings) {
        $Color      = array("R"=>$Settings["R"],"G"=>$Settings["G"],"B"=>$Settings["B"]);
        $Caption    = $Settings["Caption"];
        $SubCaption = $Settings["Start"]." - ".$Settings["End"];
 
        $X2 = $X1 + ($Settings["End"] - $Settings["Start"]) * $XScale;
 
-       if ( $Key == 0 && $DrawLeftHead )
-        {
+       if ( $Key == 0 && $DrawLeftHead ) {
          $Poly = ""; $Poly[] = $X1-1; $Poly[] = $Y; $Poly[] = $X1-1; $Poly[] = $Y+$Height; $Poly[] = $X1-1-$HeadSize; $Poly[] = $Y+($Height/2);
          $this->pChartObject->drawPolygon($Poly,$Color);
          $this->pChartObject->drawLine($X1-2,$Y,$X1-2-$HeadSize,$Y+($Height/2),$Color);
@@ -97,30 +91,23 @@ 
 
        /* Determine the position of the breaks */
        $Break = "";
-       foreach($Values as $iKey => $Value)
-        {
-         if ( $Value >= $Settings["Start"] && $Value <= $Settings["End"] )
-          {
+       foreach($Values as $iKey => $Value) {
+         if ( $Value >= $Settings["Start"] && $Value <= $Settings["End"] ) {
            $XBreak  = $X1 + ($Value - $Settings["Start"]) * $XScale;
            $ValuesPos[$Value] = $XBreak;
            $Break[] = floor($XBreak);
           }
         }
 
-       if ( $ValueDisplay == INDICATOR_VALUE_LABEL )
-        {
+       if ( $ValueDisplay == INDICATOR_VALUE_LABEL ) {
          if ( $Break == "" )
           $this->pChartObject->drawFilledRectangle($X1,$Y,$X2,$Y+$Height,$Color);
-         else
-          {
+         else {
            sort($Break);
            $Poly = ""; $Poly[] = $X1; $Poly[] = $Y; $LastPointWritten = FALSE;
-           foreach($Break as $iKey => $Value)
-            {
+           foreach($Break as $iKey => $Value) {
              if ( $Value-5 >= $X1 )
-              { $Poly[] = $Value-5; $Poly[] = $Y; }
-             elseif ($X1 - ($Value-5) > 0 )
-              {
+              { $Poly[] = $Value-5; $Poly[] = $Y; } elseif ($X1 - ($Value-5) > 0 ) {
                $Offset = $X1 - ($Value-5);
                $Poly = ""; $Poly[] = $X1; $Poly[] = $Y + $Offset;
               }
@@ -128,9 +115,7 @@ 
              $Poly[] = $Value;   $Poly[] = $Y+5;
 
              if ( $Value+5 <= $X2 )
-              { $Poly[] = $Value+5; $Poly[] = $Y; }
-             elseif (($Value+5) > $X2 )
-              {
+              { $Poly[] = $Value+5; $Poly[] = $Y; } elseif (($Value+5) > $X2 ) {
                $Offset = ($Value+5) - $X2;
                $Poly[] = $X2; $Poly[] = $Y + $Offset;
                $LastPointWritten = TRUE;
@@ -143,37 +128,31 @@ 
 
            $this->pChartObject->drawPolygon($Poly,$Color);
           }
-        }
-       else
+        } else
         $this->pChartObject->drawFilledRectangle($X1,$Y,$X2,$Y+$Height,$Color);
 
-       if ( $Key == count($IndicatorSections)-1 && $DrawRightHead )
-        {
+       if ( $Key == count($IndicatorSections)-1 && $DrawRightHead ) {
          $Poly = ""; $Poly[] = $X2+1; $Poly[] = $Y; $Poly[] = $X2+1; $Poly[] = $Y+$Height; $Poly[] = $X2+1+$HeadSize; $Poly[] = $Y+($Height/2);
          $this->pChartObject->drawPolygon($Poly,$Color);
          $this->pChartObject->drawLine($X2+1,$Y,$X2+1+$HeadSize,$Y+($Height/2),$Color);
          $this->pChartObject->drawLine($X2+1,$Y+$Height,$X2+1+$HeadSize,$Y+($Height/2),$Color);
         }
 
-       if ( $CaptionPosition == INDICATOR_CAPTION_INSIDE )
-        {
+       if ( $CaptionPosition == INDICATOR_CAPTION_INSIDE ) {
          $TxtPos  = $this->pChartObject->getTextBox($X1,$Y+$Height+$TextPadding,$CaptionFontName,$CaptionFontSize,0,$Caption);
          $YOffset = ($TxtPos[0]["Y"] - $TxtPos[2]["Y"]) + $TextPadding;
 
-         if ( $CaptionLayout == INDICATOR_CAPTION_EXTENDED )
-          {
+         if ( $CaptionLayout == INDICATOR_CAPTION_EXTENDED ) {
            $TxtPos  = $this->pChartObject->getTextBox($X1,$Y+$Height+$TextPadding,$CaptionFontName,$CaptionFontSize,0,$SubCaption);
            $YOffset = $YOffset + ($TxtPos[0]["Y"] - $TxtPos[2]["Y"]) + $TextPadding*2;
           }
 
          $XOffset = $TextPadding;
-        }
-       else
+        } else
         { $YOffset = 0; $XOffset = 0; }
 
        if ( $CaptionColorFactor == NULL )
-        { $CaptionColor    = array("Align"=>TEXT_ALIGN_TOPLEFT,"FontName"=>$CaptionFontName,"FontSize"=>$CaptionFontSize,"R"=>$CaptionR,"G"=>$CaptionG,"B"=>$CaptionB,"Alpha"=>$CaptionAlpha); }
-       else
+        { $CaptionColor    = array("Align"=>TEXT_ALIGN_TOPLEFT,"FontName"=>$CaptionFontName,"FontSize"=>$CaptionFontSize,"R"=>$CaptionR,"G"=>$CaptionG,"B"=>$CaptionB,"Alpha"=>$CaptionAlpha); } else
         { $CaptionColor    = array("Align"=>TEXT_ALIGN_TOPLEFT,"FontName"=>$CaptionFontName,"FontSize"=>$CaptionFontSize,"R"=>$Settings["R"]+$CaptionColorFactor,"G"=>$Settings["G"]+$CaptionColorFactor,"B"=>$Settings["B"]+$CaptionColorFactor); }
 
        if ( $SubCaptionColorFactor == NULL )
@@ -186,8 +165,7 @@ 
 
        if ( $CaptionLayout == INDICATOR_CAPTION_DEFAULT )
         $this->pChartObject->drawText($X1,$Y+$Height+$TextPadding,$Caption,$CaptionColor);
-       elseif ( $CaptionLayout == INDICATOR_CAPTION_EXTENDED )
-        {
+       elseif ( $CaptionLayout == INDICATOR_CAPTION_EXTENDED ) {
          $TxtPos        = $this->pChartObject->getTextBox($X1,$Y+$Height+$TextPadding,$CaptionFontName,$CaptionFontSize,0,$Caption);
          $CaptionHeight = $TxtPos[0]["Y"] - $TxtPos[2]["Y"];
 
@@ -203,18 +181,13 @@ 
      $RestoreShadow = $this->pChartObject->Shadow;
      $this->pChartObject->Shadow = FALSE;
 
-     foreach($Values as $Key => $Value)
-      {
-       if ( $Value >= $OverallMin && $Value <= $OverallMax )
-        {
-         foreach ($IndicatorSections as $Key => $Settings)
-          {
-           if ( $Value >= $Settings["Start"] && $Value <= $Settings["End"] )
-            {
+     foreach($Values as $Key => $Value) {
+       if ( $Value >= $OverallMin && $Value <= $OverallMax ) {
+         foreach ($IndicatorSections as $Key => $Settings) {
+           if ( $Value >= $Settings["Start"] && $Value <= $Settings["End"] ) {
              $X1 = $ValuesPos[$Value]; //$X + $Key*$SectionsMargin + ($Value - $OverallMin) * $XScale;
 
-             if ( $ValueDisplay == INDICATOR_VALUE_BUBBLE )
-              {
+             if ( $ValueDisplay == INDICATOR_VALUE_BUBBLE ) {
                $TxtPos = $this->pChartObject->getTextBox($X1,$Y,$ValueFontName,$ValueFontSize,0,$Value.$Unit);
                $Radius = floor(($TxtPos[1]["X"] - $TxtPos[0]["X"] + $TextPadding*4)/2);
 
@@ -223,9 +196,7 @@ 
 
                $TextSettings = array("Align"=>TEXT_ALIGN_MIDDLEMIDDLE,"FontName"=>$ValueFontName,"FontSize"=>$ValueFontSize);
                $this->pChartObject->drawText($X1-1,$Y-1,$Value.$Unit,$TextSettings);
-              }
-             elseif( $ValueDisplay == INDICATOR_VALUE_LABEL )
-              {
+              } elseif( $ValueDisplay == INDICATOR_VALUE_LABEL ) {
                $Caption = "";
                $Caption[] = array("Format"=>array("R"=>$Settings["R"],"G"=>$Settings["G"],"B"=>$Settings["B"],"Alpha"=>100),"Caption"=>$Value.$Unit);
                $this->pChartObject->drawLabelBox(floor($X1),floor($Y)+2,"Value - ".$Settings["Caption"],$Caption);

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

Braces +83 added lines, -163 removed lines

@@ -52,8 +52,7 @@ 
  define("EURO_SYMBOL"			, utf8_encode("€"));
 
  /* pData class definition */
- class pData
-  {
+ class pData {
    var $Data;
 
    var $Palette = array("0"=>array("R"=>188,"G"=>224,"B"=>46,"Alpha"=>100),
@@ -66,8 +65,7 @@ 
                         "7"=>array("R"=>224,"G"=>176,"B"=>46,"Alpha"=>100));
 
    /* Class creator */
-   function pData()
-    {
+   function pData() {
      $this->Data = "";
      $this->Data["XAxisDisplay"]	= AXIS_FORMAT_DEFAULT;
      $this->Data["XAxisFormat"]		= NULL;
@@ -82,21 +80,17 @@ 
     }
 
    /* Add a single point or an array to the given serie */
-   function addPoints($Values,$SerieName="Serie1")
-    {
+   function addPoints($Values,$SerieName="Serie1") {
      if (!isset($this->Data["Series"][$SerieName]))
       $this->initialise($SerieName);
 
-     if ( is_array($Values) )
-      {
+     if ( is_array($Values) ) {
        foreach($Values as $Key => $Value)
         { $this->Data["Series"][$SerieName]["Data"][] = $Value; }
-      }
-     else
+      } else
       $this->Data["Series"][$SerieName]["Data"][] = $Values;
 
-     if ( $Values != VOID )
-      {
+     if ( $Values != VOID ) {
        $StrippedData = $this->stripVOID($this->Data["Series"][$SerieName]["Data"]);
        if ( empty($StrippedData) ) { $this->Data["Series"][$SerieName]["Max"] = 0; $this->Data["Series"][$SerieName]["Min"] =0; return(0); }
        $this->Data["Series"][$SerieName]["Max"] = max($StrippedData);
@@ -113,8 +107,7 @@ 
     { if (isset($this->Data["Series"][$Serie]["Data"])) { return(sizeof($this->Data["Series"][$Serie]["Data"])); } else { return(0); } }
 
    /* Remove a serie from the pData object */
-   function removeSerie($Series)
-    {
+   function removeSerie($Series) {
      if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
      foreach($Series as $Key => $Serie) { if (isset($this->Data["Series"][$Serie])) { unset($this->Data["Series"][$Serie]); } }
     }
@@ -128,8 +121,7 @@ 
     { if (isset($this->Data["Series"][$Serie]["Data"])) { return($this->Data["Series"][$Serie]["Data"]); } else { return(NULL); } }
 
    /* Reverse the values in the given serie */
-   function reverseSerie($Series)
-    {
+   function reverseSerie($Series) {
      if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
      foreach($Series as $Key => $Serie) { if (isset($this->Data["Series"][$Serie]["Data"])) { $this->Data["Series"][$Serie]["Data"] = array_reverse($this->Data["Series"][$Serie]["Data"]); } }
     }
@@ -147,29 +139,25 @@ 
     { if (isset($this->Data["Series"][$Serie]["Min"])) { return($this->Data["Series"][$Serie]["Min"]); } else { return(NULL); } }
 
    /* Set the description of a given serie */
-   function setSerieShape($Series,$Shape=SERIE_SHAPE_FILLEDCIRCLE)
-    {
+   function setSerieShape($Series,$Shape=SERIE_SHAPE_FILLEDCIRCLE) {
      if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
      foreach($Series as $Key => $Serie) { if (isset($this->Data["Series"][$Serie]) ) { $this->Data["Series"][$Serie]["Shape"] = $Shape; } }
     }
 
    /* Set the description of a given serie */
-   function setSerieDescription($Series,$Description="My serie")
-    {
+   function setSerieDescription($Series,$Description="My serie") {
      if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
      foreach($Series as $Key => $Serie) { if (isset($this->Data["Series"][$Serie]) ) { $this->Data["Series"][$Serie]["Description"] = $Description; } }
     }
 
    /* Set a serie as "drawable" while calling a rendering function */
-   function setSerieDrawable($Series,$Drawable=TRUE)
-    {
+   function setSerieDrawable($Series,$Drawable=TRUE) {
      if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
      foreach($Series as $Key => $Serie) { if (isset($this->Data["Series"][$Serie]) ) { $this->Data["Series"][$Serie]["isDrawable"] = $Drawable; } }
     }
 
    /* Set the icon associated to a given serie */
-   function setSeriePicture($Series,$Picture=NULL)
-    {
+   function setSeriePicture($Series,$Picture=NULL) {
      if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
      foreach($Series as $Key => $Serie) { if (isset($this->Data["Series"][$Serie]) ) { $this->Data["Series"][$Serie]["Picture"] = $Picture; } }
     }
@@ -226,15 +214,13 @@ 
     { if ( isset($this->Data["ScatterSeries"][$ID]) ) { $this->Data["ScatterSeries"][$ID]["Weight"] = $Weight; } }
 
    /* Associate a color to a scatter serie */
-   function setScatterSerieColor($ID,$Format)
-    {
+   function setScatterSerieColor($ID,$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;
 
-     if ( isset($this->Data["ScatterSeries"][$ID]) )
-      {
+     if ( isset($this->Data["ScatterSeries"][$ID]) ) {
        $this->Data["ScatterSeries"][$ID]["Color"]["R"] = $R;
        $this->Data["ScatterSeries"][$ID]["Color"]["G"] = $G;
        $this->Data["ScatterSeries"][$ID]["Color"]["B"] = $B;
@@ -243,15 +229,12 @@ 
     }
 
    /* Compute the series limits for an individual and global point of view */
-   function limits()
-    {
+   function limits() {
      $GlobalMin = ABSOLUTE_MAX;
      $GlobalMax = ABSOLUTE_MIN;
 
-     foreach($this->Data["Series"] as $Key => $Value)
-      {
-       if ( $this->Data["Abscissa"] != $Key && $this->Data["Series"][$Key]["isDrawable"] == TRUE)
-        {
+     foreach($this->Data["Series"] as $Key => $Value) {
+       if ( $this->Data["Abscissa"] != $Key && $this->Data["Series"][$Key]["isDrawable"] == TRUE) {
          if ( $GlobalMin > $this->Data["Series"][$Key]["Min"] ) { $GlobalMin = $this->Data["Series"][$Key]["Min"]; }
          if ( $GlobalMax < $this->Data["Series"][$Key]["Max"] ) { $GlobalMax = $this->Data["Series"][$Key]["Max"]; }
         }
@@ -267,68 +250,55 @@ 
     { foreach($this->Data["Series"] as $Key => $Value) { if ( $this->Data["Abscissa"] != $Key ) { $this->Data["Series"][$Key]["isDrawable"]=TRUE; } } }    
 
    /* Return the average value of the given serie */
-   function getSerieAverage($Serie)
-    {
-     if ( isset($this->Data["Series"][$Serie]) )
-      {
+   function getSerieAverage($Serie) {
+     if ( isset($this->Data["Series"][$Serie]) ) {
        $SerieData = $this->stripVOID($this->Data["Series"][$Serie]["Data"]);
        return(array_sum($SerieData)/sizeof($SerieData));
-      }
-     else
+      } else
       return(NULL);
     }
 
    /* Return the geometric mean of the given serie */
-   function getGeometricMean($Serie)
-    {
-     if ( isset($this->Data["Series"][$Serie]) )
-      {
+   function getGeometricMean($Serie) {
+     if ( isset($this->Data["Series"][$Serie]) ) {
        $SerieData = $this->stripVOID($this->Data["Series"][$Serie]["Data"]);
        $Seriesum  = 1; foreach($SerieData as $Key => $Value) { $Seriesum = $Seriesum * $Value; }
        return(pow($Seriesum,1/sizeof($SerieData)));
-      }
-     else
+      } else
       return(NULL);
     }
 
    /* Return the harmonic mean of the given serie */
-   function getHarmonicMean($Serie)
-    {
-     if ( isset($this->Data["Series"][$Serie]) )
-      {
+   function getHarmonicMean($Serie) {
+     if ( isset($this->Data["Series"][$Serie]) ) {
        $SerieData = $this->stripVOID($this->Data["Series"][$Serie]["Data"]);
        $Seriesum  = 0; foreach($SerieData as $Key => $Value) { $Seriesum = $Seriesum + 1/$Value; }
        return(sizeof($SerieData)/$Seriesum);
-      }
-     else
+      } else
       return(NULL);
     }
 
    /* Return the standard deviation of the given serie */
-   function getStandardDeviation($Serie)
-    {
-     if ( isset($this->Data["Series"][$Serie]) )
-      {
+   function getStandardDeviation($Serie) {
+     if ( isset($this->Data["Series"][$Serie]) ) {
        $Average   = $this->getSerieAverage($Serie);
        $SerieData = $this->stripVOID($this->Data["Series"][$Serie]["Data"]);
 
        $DeviationSum = 0;
-       foreach($SerieData as $Key => $Value)
-        $DeviationSum = $DeviationSum + ($Value-$Average)*($Value-$Average);
+       foreach($SerieData as $Key => $Value) {
+               $DeviationSum = $DeviationSum + ($Value-$Average)*($Value-$Average);
+       }
 
        $Deviation = sqrt($DeviationSum/count($SerieData));
 
        return($Deviation);
-      }
-     else
+      } else
       return(NULL);
     }
 
    /* Return the Coefficient of variation of the given serie */
-   function getCoefficientOfVariation($Serie)
-    {
-     if ( isset($this->Data["Series"][$Serie]) )
-      {
+   function getCoefficientOfVariation($Serie) {
+     if ( isset($this->Data["Series"][$Serie]) ) {
        $Average           = $this->getSerieAverage($Serie);
        $StandardDeviation = $this->getStandardDeviation($Serie);
 
@@ -336,16 +306,13 @@ 
         return($StandardDeviation/$Average);
        else
         return(NULL);
-      }
-     else
+      } else
       return(NULL);
     }
 
    /* Return the median value of the given serie */
-   function getSerieMedian($Serie)
-    {
-     if ( isset($this->Data["Series"][$Serie]) )
-      {
+   function getSerieMedian($Serie) {
+     if ( isset($this->Data["Series"][$Serie]) ) {
        $SerieData = $this->stripVOID($this->Data["Series"][$Serie]["Data"]);
        sort($SerieData);
        $SerieCenter = floor(sizeof($SerieData)/2);
@@ -354,14 +321,12 @@ 
         return($SerieData[$SerieCenter]);
        else
         return(NULL);
-      }
-     else
+      } else
       return(NULL);
     }
 
    /* Return the x th percentil of the given serie */
-   function getSeriePercentile($Serie="Serie1",$Percentil=95)
-    {
+   function getSeriePercentile($Serie="Serie1",$Percentil=95) {
      if (!isset($this->Data["Series"][$Serie]["Data"])) { return(NULL); }
 
      $Values = count($this->Data["Series"][$Serie]["Data"])-1;
@@ -378,23 +343,20 @@ 
     }
 
    /* Add random values to a given serie */
-   function addRandomValues($SerieName="Serie1",$Options="")
-    {
+   function addRandomValues($SerieName="Serie1",$Options="") {
      $Values    = isset($Options["Values"]) ? $Options["Values"] : 20;
      $Min       = isset($Options["Min"]) ? $Options["Min"] : 0;
      $Max       = isset($Options["Max"]) ? $Options["Max"] : 100;
      $withFloat = isset($Options["withFloat"]) ? $Options["withFloat"] : FALSE;
 
-     for ($i=0;$i<=$Values;$i++)
-      {
+     for ($i=0;$i<=$Values;$i++) {
        if ( $withFloat ) { $Value = rand($Min*100,$Max*100)/100; } else { $Value = rand($Min,$Max); }
        $this->addPoints($Value,$SerieName);
       }
     }
 
    /* Test if we have valid data */
-   function containsData()
-    {
+   function containsData() {
      if (!isset($this->Data["Series"])) { return(FALSE); }
 
      $Result = FALSE;
@@ -404,10 +366,8 @@ 
     }
 
    /* Set the display mode of an Axis */
-   function setAxisDisplay($AxisID,$Mode=AXIS_FORMAT_DEFAULT,$Format=NULL)
-    {
-     if ( isset($this->Data["Axis"][$AxisID] ) )
-      {
+   function setAxisDisplay($AxisID,$Mode=AXIS_FORMAT_DEFAULT,$Format=NULL) {
+     if ( isset($this->Data["Axis"][$AxisID] ) ) {
        $this->Data["Axis"][$AxisID]["Display"] = $Mode;
        if ( $Format != NULL ) { $this->Data["Axis"][$AxisID]["Format"] = $Format; }
       }
@@ -426,15 +386,13 @@ 
     { if ( isset($this->Data["Axis"][$AxisID] ) ) { $this->Data["Axis"][$AxisID]["Name"] = $Name; } }
 
    /* Associate a color to an axis */
-   function setAxisColor($AxisID,$Format)
-    {
+   function setAxisColor($AxisID,$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;
 
-     if ( isset($this->Data["Axis"][$AxisID] ) )
-      {
+     if ( isset($this->Data["Axis"][$AxisID] ) ) {
        $this->Data["Axis"][$AxisID]["Color"]["R"] = $R;
        $this->Data["Axis"][$AxisID]["Color"]["G"] = $G;
        $this->Data["Axis"][$AxisID]["Color"]["B"] = $B;
@@ -448,11 +406,9 @@ 
     { if ( isset($this->Data["Axis"][$AxisID] ) ) { $this->Data["Axis"][$AxisID]["Identity"] = $Identity; } }
 
    /* Associate one data serie with one axis */
-   function setSerieOnAxis($Series,$AxisID)
-    {
+   function setSerieOnAxis($Series,$AxisID) {
      if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
-     foreach($Series as $Key => $Serie)
-      {
+     foreach($Series as $Key => $Serie) {
        $PreviousAxis = $this->Data["Series"][$Serie]["Axis"];
 
        /* Create missing axis */
@@ -469,22 +425,19 @@ 
     }
 
    /* Define if a serie should be draw with ticks */
-   function setSerieTicks($Series,$Width=0)
-    {
+   function setSerieTicks($Series,$Width=0) {
      if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
      foreach($Series as $Key => $Serie) { if ( isset($this->Data["Series"][$Serie]) ) { $this->Data["Series"][$Serie]["Ticks"] = $Width; } }
     }
 
    /* Define if a serie should be draw with a special weight */
-   function setSerieWeight($Series,$Weight=0)
-    {
+   function setSerieWeight($Series,$Weight=0) {
      if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
      foreach($Series as $Key => $Serie) { if ( isset($this->Data["Series"][$Serie]) ) { $this->Data["Series"][$Serie]["Weight"] = $Weight; } }
     }
 
    /* Returns the palette of the given serie */
-   function getSeriePalette($Serie)
-    {
+   function getSeriePalette($Serie) {
      if ( !isset($this->Data["Series"][$Serie]) ) { return(NULL); }
 
      $Result = "";
@@ -497,19 +450,16 @@ 
     }
 
    /* Set the color of one serie */
-   function setPalette($Series,$Format=NULL)
-    {
+   function setPalette($Series,$Format=NULL) {
      if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
 
-     foreach($Series as $Key => $Serie)
-      {
+     foreach($Series as $Key => $Serie) {
        $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;
 
-       if ( isset($this->Data["Series"][$Serie]) )
-        {
+       if ( isset($this->Data["Series"][$Serie]) ) {
          $OldR = $this->Data["Series"][$Serie]["Color"]["R"]; $OldG = $this->Data["Series"][$Serie]["Color"]["G"]; $OldB = $this->Data["Series"][$Serie]["Color"]["B"];
          $this->Data["Series"][$Serie]["Color"]["R"] = $R;
          $this->Data["Series"][$Serie]["Color"]["G"] = $G;
@@ -524,18 +474,15 @@ 
     }
 
    /* Load a palette file */
-   function loadPalette($FileName,$Overwrite=FALSE)
-    {
+   function loadPalette($FileName,$Overwrite=FALSE) {
      if ( !file_exists($FileName) ) { return(-1); }
      if ( $Overwrite ) { $this->Palette = ""; }
 
      $fileHandle = @fopen($FileName, "r");
      if (!$fileHandle) { return(-1); }
-     while (!feof($fileHandle))
-      {
+     while (!feof($fileHandle)) {
        $buffer = fgets($fileHandle, 4096);
-       if ( preg_match("/,/",$buffer) )
-        {
+       if ( preg_match("/,/",$buffer) ) {
          list($R,$G,$B,$Alpha) = preg_split("/,/",$buffer);
          if ( $this->Palette == "" ) { $ID = 0; } else { $ID = count($this->Palette); }
          $this->Palette[$ID] = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha);
@@ -545,10 +492,8 @@ 
 
      /* Apply changes to current series */
      $ID = 0;
-     if ( isset($this->Data["Series"]))
-      {
-       foreach($this->Data["Series"] as $Key => $Value)
-        {
+     if ( isset($this->Data["Series"])) {
+       foreach($this->Data["Series"] as $Key => $Value) {
          if ( !isset($this->Palette[$ID]) )
           $this->Data["Series"][$Key]["Color"] = array("R"=>0,"G"=>0,"B"=>0,"Alpha"=>0);
          else
@@ -559,8 +504,7 @@ 
     }
 
    /* Initialise a given scatter serie */
-   function initScatterSerie($ID)
-    {
+   function initScatterSerie($ID) {
      if ( isset($this->Data["ScatterSeries"][$ID]) ) { return(0); }
 
      $this->Data["ScatterSeries"][$ID]["Description"]	= "Scatter ".$ID;
@@ -571,8 +515,7 @@ 
 
      if ( isset($this->Palette[$ID]) )
       $this->Data["ScatterSeries"][$ID]["Color"] = $this->Palette[$ID];
-     else
-      {
+     else {
        $this->Data["ScatterSeries"][$ID]["Color"]["R"] = rand(0,255);
        $this->Data["ScatterSeries"][$ID]["Color"]["G"] = rand(0,255);
        $this->Data["ScatterSeries"][$ID]["Color"]["B"] = rand(0,255);
@@ -581,8 +524,7 @@ 
     }
 
    /* Initialise a given serie */
-   function initialise($Serie)
-    {
+   function initialise($Serie) {
      if ( isset($this->Data["Series"]) ) { $ID = count($this->Data["Series"]); } else { $ID = 0; }
 
      $this->Data["Series"][$Serie]["Description"]	= $Serie;
@@ -597,8 +539,7 @@ 
 
      if ( isset($this->Palette[$ID]) )
       $this->Data["Series"][$Serie]["Color"] = $this->Palette[$ID];
-     else
-      {
+     else {
        $this->Data["Series"][$Serie]["Color"]["R"] = rand(0,255);
        $this->Data["Series"][$Serie]["Color"]["G"] = rand(0,255);
        $this->Data["Series"][$Serie]["Color"]["B"] = rand(0,255);
@@ -606,20 +547,16 @@ 
       }
     }
      
-   function normalize($NormalizationFactor=100,$UnitChange=NULL,$Round=1)
-    {
+   function normalize($NormalizationFactor=100,$UnitChange=NULL,$Round=1) {
      $Abscissa = $this->Data["Abscissa"];
 
      $SelectedSeries = "";
      $MaxVal         = 0;
-     foreach($this->Data["Axis"] as $AxisID => $Axis)
-      {
+     foreach($this->Data["Axis"] as $AxisID => $Axis) {
        if ( $UnitChange != NULL ) { $this->Data["Axis"][$AxisID]["Unit"] = $UnitChange; }
 
-       foreach($this->Data["Series"] as $SerieName => $Serie)
-        {
-         if ($Serie["Axis"] == $AxisID && $Serie["isDrawable"] == TRUE && $SerieName != $Abscissa)
-          {
+       foreach($this->Data["Series"] as $SerieName => $Serie) {
+         if ($Serie["Axis"] == $AxisID && $Serie["isDrawable"] == TRUE && $SerieName != $Abscissa) {
            $SelectedSeries[$SerieName] = $SerieName;
 
            if ( count($Serie["Data"] ) > $MaxVal ) { $MaxVal = count($Serie["Data"]); }
@@ -627,22 +564,18 @@ 
         }
       }
 
-     for($i=0;$i<=$MaxVal-1;$i++)
-      {
+     for($i=0;$i<=$MaxVal-1;$i++) {
        $Factor = 0;
-       foreach ($SelectedSeries as $Key => $SerieName )
-        {
+       foreach ($SelectedSeries as $Key => $SerieName ) {
          $Value = $this->Data["Series"][$SerieName]["Data"][$i];
          if ( $Value != VOID )
           $Factor = $Factor + abs($Value);
         }
 
-       if ( $Factor != 0 )
-        {
+       if ( $Factor != 0 ) {
          $Factor = $NormalizationFactor / $Factor;
 
-         foreach ($SelectedSeries as $Key => $SerieName )
-          {
+         foreach ($SelectedSeries as $Key => $SerieName ) {
            $Value = $this->Data["Series"][$SerieName]["Data"][$i];
 
            if ( $Value != VOID && $Factor != $NormalizationFactor )
@@ -655,41 +588,33 @@ 
         }
       }
 
-     foreach ($SelectedSeries as $Key => $SerieName )
-      {
+     foreach ($SelectedSeries as $Key => $SerieName ) {
        $this->Data["Series"][$SerieName]["Max"] = max($this->stripVOID($this->Data["Series"][$SerieName]["Data"]));
        $this->Data["Series"][$SerieName]["Min"] = min($this->stripVOID($this->Data["Series"][$SerieName]["Data"]));
       }
     }
 
    /* Load data from a CSV (or similar) data source */
-   function importFromCSV($FileName,$Options="")
-    {
+   function importFromCSV($FileName,$Options="") {
      $Delimiter		= isset($Options["Delimiter"]) ? $Options["Delimiter"] : ",";
      $GotHeader		= isset($Options["GotHeader"]) ? $Options["GotHeader"] : FALSE;
      $SkipColumns	= isset($Options["SkipColumns"]) ? $Options["SkipColumns"] : array(-1);
      $DefaultSerieName	= isset($Options["DefaultSerieName"]) ? $Options["DefaultSerieName"] : "Serie";
 
      $Handle = @fopen($FileName,"r");
-     if ($Handle)
-      {
+     if ($Handle) {
        $HeaderParsed = FALSE; $SerieNames = "";
-       while (!feof($Handle))
-        {
+       while (!feof($Handle)) {
          $Buffer = fgets($Handle, 4096);
          $Buffer = str_replace(chr(10),"",$Buffer);
          $Buffer = str_replace(chr(13),"",$Buffer);
          $Values = preg_split("/".$Delimiter."/",$Buffer);
 
-         if ( $Buffer != "" )
-          {
-           if ( $GotHeader && !$HeaderParsed )
-            {
+         if ( $Buffer != "" ) {
+           if ( $GotHeader && !$HeaderParsed ) {
              foreach($Values as $Key => $Name) { if ( !in_array($Key,$SkipColumns) ) { $SerieNames[$Key] = $Name; } }
              $HeaderParsed = TRUE;
-            }
-           else
-            {
+            } else {
              if ($SerieNames == "" ) { foreach($Values as $Key => $Name) {  if ( !in_array($Key,$SkipColumns) ) { $SerieNames[$Key] = $DefaultSerieName.$Key; } } }
              foreach($Values as $Key => $Value) {  if ( !in_array($Key,$SkipColumns) ) { $this->addPoints($Value,$SerieNames[$Key]); } }
             }
@@ -700,8 +625,7 @@ 
     }
 
    /* Create a dataset based on a formula */
-   function createFunctionSerie($SerieName,$Formula="",$Options="")
-    {
+   function createFunctionSerie($SerieName,$Formula="",$Options="") {
      $MinX		= isset($Options["MinX"]) ? $Options["MinX"] : -10;
      $MaxX		= isset($Options["MaxX"]) ? $Options["MaxX"] : 10;
      $XStep		= isset($Options["XStep"]) ? $Options["XStep"] : 1;
@@ -712,8 +636,7 @@ 
      if ( $Formula == "" ) { return(0); }
 
      $Result = ""; $Abscissa = "";
-     for($i=$MinX; $i<=$MaxX; $i=$i+$XStep)
-      {
+     for($i=$MinX; $i<=$MaxX; $i=$i+$XStep) {
        $Expression = "\$return = '!'.(".str_replace("z",$i,$Formula).");";
        if ( @eval($Expression) === FALSE ) { $return = VOID; }
        if ( $return == "!" ) { $return = VOID; } else { $return = $this->right($return,strlen($return)-1); }
@@ -730,13 +653,10 @@ 
      if ( $RecordAbscissa ) { $this->addPoints($Abscissa,$AbscissaSerie); }
     }
 
-   function negateValues($Series)
-    {
+   function negateValues($Series) {
      if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
-     foreach($Series as $Key => $SerieName)
-      {
-       if (isset($this->Data["Series"][$SerieName]))
-        {
+     foreach($Series as $Key => $SerieName) {
+       if (isset($this->Data["Series"][$SerieName])) {
          $Data = "";
          foreach($this->Data["Series"][$SerieName]["Data"] as $Key => $Value)
           { if ( $Value == VOID ) { $Data[] = VOID; } else { $Data[] = -$Value; } }

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

Braces +112 added lines, -236 removed lines

@@ -17,21 +17,18 @@ 
  define("SCATTER_MISSING_Y_SERIE"	, 190002);
 
  /* pScatter class definition */
- class pScatter
-  {
+ class pScatter {
    var $pChartObject;
    var $pDataObject;
 
    /* Class creator */
-   function pScatter($pChartObject,$pDataObject)
-    {
+   function pScatter($pChartObject,$pDataObject) {
      $this->pChartObject = $pChartObject;
      $this->pDataObject  = $pDataObject;
     }
 
    /* Prepare the scale */
-   function drawScatterScale($Format="")
-    {
+   function drawScatterScale($Format="") {
      $Mode		= isset($Format["Mode"]) ? $Format["Mode"] : SCALE_MODE_FLOATING;
      $Floating		= isset($Format["Floating"]) ? $Format["Floating"] : FALSE;
      $XLabelsRotation	= isset($Format["XLabelsRotation"]) ? $Format["XLabelsRotation"] : 90;
@@ -80,8 +77,7 @@ 
 
      /* Check if we have at least both one X and Y axis */
      $GotXAxis = FALSE; $GotYAxis = FALSE;
-     foreach($this->pDataObject->Data["Axis"] as $AxisID => $AxisSettings)
-      {
+     foreach($this->pDataObject->Data["Axis"] as $AxisID => $AxisSettings) {
        if ( $AxisSettings["Identity"] == AXIS_X ) { $GotXAxis = TRUE; }
        if ( $AxisSettings["Identity"] == AXIS_Y ) { $GotYAxis = TRUE; }
       }
@@ -93,20 +89,15 @@ 
 
      $Data = $this->pDataObject->getData();
 
-     foreach($Data["Axis"] as $AxisID => $AxisSettings)
-      {
+     foreach($Data["Axis"] as $AxisID => $AxisSettings) {
        if ( $AxisSettings["Identity"] == AXIS_X)
-        { $Width = $this->pChartObject->GraphAreaX2 - $this->pChartObject->GraphAreaX1 - $XMargin*2; }
-       else
+        { $Width = $this->pChartObject->GraphAreaX2 - $this->pChartObject->GraphAreaX1 - $XMargin*2; } else
         { $Width = $this->pChartObject->GraphAreaY2 - $this->pChartObject->GraphAreaY1 - $YMargin*2; }
 
        $AxisMin = ABSOLUTE_MAX; $AxisMax = OUT_OF_SIGHT;
-       if ( $Mode == SCALE_MODE_FLOATING )
-        {
-         foreach($Data["Series"] as $SerieID => $SerieParameter)
-          {
-           if ( $SerieParameter["Axis"] == $AxisID && $Data["Series"][$SerieID]["isDrawable"] )
-            {
+       if ( $Mode == SCALE_MODE_FLOATING ) {
+         foreach($Data["Series"] as $SerieID => $SerieParameter) {
+           if ( $SerieParameter["Axis"] == $AxisID && $Data["Series"][$SerieID]["isDrawable"] ) {
              $AxisMax = max($AxisMax,$Data["Series"][$SerieID]["Max"]);
              $AxisMin = min($AxisMin,$Data["Series"][$SerieID]["Min"]);
             }
@@ -114,23 +105,18 @@ 
          $AutoMargin = (($AxisMax-$AxisMin)/100)*$XReleasePercent;
 
          $Data["Axis"][$AxisID]["Min"] = $AxisMin-$AutoMargin; $Data["Axis"][$AxisID]["Max"] = $AxisMax+$AutoMargin;
-        }
-       elseif ( $Mode == SCALE_MODE_MANUAL )
-        {
-         if ( isset($ManualScale[$AxisID]["Min"]) && isset($ManualScale[$AxisID]["Max"]) )
-          {
+        } elseif ( $Mode == SCALE_MODE_MANUAL ) {
+         if ( isset($ManualScale[$AxisID]["Min"]) && isset($ManualScale[$AxisID]["Max"]) ) {
            $Data["Axis"][$AxisID]["Min"] = $ManualScale[$AxisID]["Min"];
            $Data["Axis"][$AxisID]["Max"] = $ManualScale[$AxisID]["Max"];
-          }
-         else
+          } else
           { echo "Manual scale boundaries not set."; exit(); }
         }
 
        /* Full manual scale */
        if ( isset($ManualScale[$AxisID]["Rows"]) && isset($ManualScale[$AxisID]["RowHeight"]) )
         $Scale = array("Rows"=>$ManualScale[$AxisID]["Rows"],"RowHeight"=>$ManualScale[$AxisID]["RowHeight"],"XMin"=>$ManualScale[$AxisID]["Min"],"XMax"=>$ManualScale[$AxisID]["Max"]);
-       else
-        {
+       else {
          $MaxDivs = floor($Width/$MinDivHeight);
          $Scale   = $this->pChartObject->computeScale($Data["Axis"][$AxisID]["Min"],$Data["Axis"][$AxisID]["Max"],$MaxDivs,$Factors,$AxisID);
         }
@@ -154,34 +140,27 @@ 
      /* Set the original boundaries */
      $AxisPos["L"] = $this->pChartObject->GraphAreaX1; $AxisPos["R"] = $this->pChartObject->GraphAreaX2; $AxisPos["T"] = $this->pChartObject->GraphAreaY1; $AxisPos["B"] = $this->pChartObject->GraphAreaY2;
 
-     foreach($Data["Axis"] as $AxisID => $AxisSettings)
-      {
-       if ( isset($AxisSettings["Color"]) )
-        {
+     foreach($Data["Axis"] as $AxisID => $AxisSettings) {
+       if ( isset($AxisSettings["Color"]) ) {
          $AxisR = $AxisSettings["Color"]["R"]; $AxisG = $AxisSettings["Color"]["G"]; $AxisB = $AxisSettings["Color"]["B"];
          $TickR = $AxisSettings["Color"]["R"]; $TickG = $AxisSettings["Color"]["G"]; $TickB = $AxisSettings["Color"]["B"];
          $this->pChartObject->setFontProperties(array("R"=>$AxisSettings["Color"]["R"],"G"=>$AxisSettings["Color"]["G"],"B"=>$AxisSettings["Color"]["B"]));
-        }
-       else
-        {
+        } else {
          $AxisR = $AxisRo; $AxisG = $AxisGo; $AxisB = $AxisBo;
          $TickR = $TickRo; $TickG = $TickGo; $TickB = $TickBo;
          $this->pChartObject->setFontProperties(array("R"=>$FontColorRo,"G"=>$FontColorGo,"B"=>$FontColorBo));
         }
 
        $LastValue = "w00t"; $ID = 1;
-       if ( $AxisSettings["Identity"] == AXIS_X )
-        {
-         if ( $AxisSettings["Position"] == AXIS_POSITION_BOTTOM )
-          {
+       if ( $AxisSettings["Identity"] == AXIS_X ) {
+         if ( $AxisSettings["Position"] == AXIS_POSITION_BOTTOM ) {
            if ( $XLabelsRotation == 0 )				   { $LabelAlign = TEXT_ALIGN_TOPMIDDLE; $LabelOffset = 2; }
            if ( $XLabelsRotation > 0 && $XLabelsRotation < 190 )   { $LabelAlign = TEXT_ALIGN_MIDDLERIGHT; $LabelOffset = 5; }
            if ( $XLabelsRotation == 180 )			   { $LabelAlign = TEXT_ALIGN_BOTTOMMIDDLE; $LabelOffset = 5; }
            if ( $XLabelsRotation > 180 && $XLabelsRotation < 360 ) { $LabelAlign = TEXT_ALIGN_MIDDLELEFT; $LabelOffset = 2; }
 
            if ( $Floating )
-            { $FloatingOffset = $YMargin; $this->pChartObject->drawLine($this->pChartObject->GraphAreaX1+$AxisSettings["Margin"],$AxisPos["B"],$this->pChartObject->GraphAreaX2-$AxisSettings["Margin"],$AxisPos["B"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
-           else
+            { $FloatingOffset = $YMargin; $this->pChartObject->drawLine($this->pChartObject->GraphAreaX1+$AxisSettings["Margin"],$AxisPos["B"],$this->pChartObject->GraphAreaX2-$AxisSettings["Margin"],$AxisPos["B"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); } else
             { $FloatingOffset = 0; $this->pChartObject->drawLine($this->pChartObject->GraphAreaX1,$AxisPos["B"],$this->pChartObject->GraphAreaX2,$AxisPos["B"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
 
            if ( $DrawArrows ) { $this->pChartObject->drawArrow($this->pChartObject->GraphAreaX2-$AxisSettings["Margin"],$AxisPos["B"],$this->pChartObject->GraphAreaX2+($ArrowSize*2),$AxisPos["B"],array("FillR"=>$AxisR,"FillG"=>$AxisG,"FillB"=>$AxisB,"Size"=>$ArrowSize)); }
@@ -189,8 +168,7 @@ 
            $Width = ($this->pChartObject->GraphAreaX2 - $this->pChartObject->GraphAreaX1) - $AxisSettings["Margin"]*2;
            $Step   = $Width / $AxisSettings["Rows"]; $SubTicksSize = $Step /2; $MaxBottom = $AxisPos["B"];
            $LastX  = NULL;
-           for($i=0;$i<=$AxisSettings["Rows"];$i++)
-            {
+           for($i=0;$i<=$AxisSettings["Rows"];$i++) {
              $XPos  = $this->pChartObject->GraphAreaX1 + $AxisSettings["Margin"] + $Step*$i;
              $YPos  = $AxisPos["B"];
              $Value = $this->pChartObject->scaleFormat($AxisSettings["ScaleMin"] + $AxisSettings["RowHeight"]*$i,$AxisSettings["Display"],$AxisSettings["Format"],$AxisSettings["Unit"]);
@@ -210,8 +188,7 @@ 
              $LastX = $XPos;
             }
 
-           if ( isset($AxisSettings["Name"]) )
-            {
+           if ( isset($AxisSettings["Name"]) ) {
              $YPos   = $MaxBottom+2;
              $XPos   = $this->pChartObject->GraphAreaX1+($this->pChartObject->GraphAreaX2-$this->pChartObject->GraphAreaX1)/2;
              $Bounds = $this->pChartObject->drawText($XPos,$YPos,$AxisSettings["Name"],array("Align"=>TEXT_ALIGN_TOPMIDDLE));
@@ -221,17 +198,14 @@ 
             }
 
            $AxisPos["B"] = $MaxBottom + $ScaleSpacing;
-          }
-         elseif ( $AxisSettings["Position"] == AXIS_POSITION_TOP )
-          {
+          } elseif ( $AxisSettings["Position"] == AXIS_POSITION_TOP ) {
            if ( $XLabelsRotation == 0 )					{ $LabelAlign = TEXT_ALIGN_BOTTOMMIDDLE; $LabelOffset = 2; }
            if ( $XLabelsRotation > 0 && $XLabelsRotation < 190 )	{ $LabelAlign = TEXT_ALIGN_MIDDLELEFT; $LabelOffset = 2; }
            if ( $XLabelsRotation == 180 )				{ $LabelAlign = TEXT_ALIGN_TOPMIDDLE; $LabelOffset = 5; }
            if ( $XLabelsRotation > 180 && $SLabelxRotation < 360 )	{ $LabelAlign = TEXT_ALIGN_MIDDLERIGHT; $LabelOffset = 5; }
 
            if ( $Floating )
-            { $FloatingOffset = $YMargin; $this->pChartObject->drawLine($this->pChartObject->GraphAreaX1+$AxisSettings["Margin"],$AxisPos["T"],$this->pChartObject->GraphAreaX2-$AxisSettings["Margin"],$AxisPos["T"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
-           else
+            { $FloatingOffset = $YMargin; $this->pChartObject->drawLine($this->pChartObject->GraphAreaX1+$AxisSettings["Margin"],$AxisPos["T"],$this->pChartObject->GraphAreaX2-$AxisSettings["Margin"],$AxisPos["T"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); } else
             { $FloatingOffset = 0; $this->pChartObject->drawLine($this->pChartObject->GraphAreaX1,$AxisPos["T"],$this->pChartObject->GraphAreaX2,$AxisPos["T"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
 
            if ( $DrawArrows ) { $this->pChartObject->drawArrow($this->pChartObject->GraphAreaX2-$AxisSettings["Margin"],$AxisPos["T"],$this->pChartObject->GraphAreaX2+($ArrowSize*2),$AxisPos["T"],array("FillR"=>$AxisR,"FillG"=>$AxisG,"FillB"=>$AxisB,"Size"=>$ArrowSize)); }
@@ -239,8 +213,7 @@ 
            $Width = ($this->pChartObject->GraphAreaX2 - $this->pChartObject->GraphAreaX1) - $AxisSettings["Margin"]*2;
            $Step   = $Width / $AxisSettings["Rows"]; $SubTicksSize = $Step /2; $MinTop = $AxisPos["T"];
            $LastX  = NULL;
-           for($i=0;$i<=$AxisSettings["Rows"];$i++)
-            {
+           for($i=0;$i<=$AxisSettings["Rows"];$i++) {
              $XPos  = $this->pChartObject->GraphAreaX1 + $AxisSettings["Margin"] + $Step*$i;
              $YPos  = $AxisPos["T"];
              $Value = $this->pChartObject->scaleFormat($AxisSettings["ScaleMin"] + $AxisSettings["RowHeight"]*$i,$AxisSettings["Display"],$AxisSettings["Format"],$AxisSettings["Unit"]);
@@ -261,8 +234,7 @@ 
              $LastX = $XPos;
             }
 
-           if ( isset($AxisSettings["Name"]) )
-            {
+           if ( isset($AxisSettings["Name"]) ) {
              $YPos   = $MinTop-2;
              $XPos   = $this->pChartObject->GraphAreaX1+($this->pChartObject->GraphAreaX2-$this->pChartObject->GraphAreaX1)/2;
              $Bounds = $this->pChartObject->drawText($XPos,$YPos,$AxisSettings["Name"],array("Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
@@ -273,15 +245,11 @@ 
 
            $AxisPos["T"] = $MinTop - $ScaleSpacing;
           }
-        }
-       elseif ( $AxisSettings["Identity"] == AXIS_Y )
-        {
-         if ( $AxisSettings["Position"] == AXIS_POSITION_LEFT )
-          {
+        } elseif ( $AxisSettings["Identity"] == AXIS_Y ) {
+         if ( $AxisSettings["Position"] == AXIS_POSITION_LEFT ) {
 
            if ( $Floating )
-            { $FloatingOffset = $XMargin; $this->pChartObject->drawLine($AxisPos["L"],$this->pChartObject->GraphAreaY1+$AxisSettings["Margin"],$AxisPos["L"],$this->pChartObject->GraphAreaY2-$AxisSettings["Margin"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
-           else
+            { $FloatingOffset = $XMargin; $this->pChartObject->drawLine($AxisPos["L"],$this->pChartObject->GraphAreaY1+$AxisSettings["Margin"],$AxisPos["L"],$this->pChartObject->GraphAreaY2-$AxisSettings["Margin"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); } else
             { $FloatingOffset = 0; $this->pChartObject->drawLine($AxisPos["L"],$this->pChartObject->GraphAreaY1,$AxisPos["L"],$this->pChartObject->GraphAreaY2,array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
 
            if ( $DrawArrows ) { $this->pChartObject->drawArrow($AxisPos["L"],$this->pChartObject->GraphAreaY1+$AxisSettings["Margin"],$AxisPos["L"],$this->pChartObject->GraphAreaY1-($ArrowSize*2),array("FillR"=>$AxisR,"FillG"=>$AxisG,"FillB"=>$AxisB,"Size"=>$ArrowSize)); }
@@ -289,8 +257,7 @@ 
            $Height = ($this->pChartObject->GraphAreaY2 - $this->pChartObject->GraphAreaY1) - $AxisSettings["Margin"]*2;
            $Step   = $Height / $AxisSettings["Rows"]; $SubTicksSize = $Step /2; $MinLeft = $AxisPos["L"];
            $LastY  = NULL;
-           for($i=0;$i<=$AxisSettings["Rows"];$i++)
-            {
+           for($i=0;$i<=$AxisSettings["Rows"];$i++) {
              $YPos  = $this->pChartObject->GraphAreaY2 - $AxisSettings["Margin"] - $Step*$i;
              $XPos  = $AxisPos["L"];
              $Value = $this->pChartObject->scaleFormat($AxisSettings["ScaleMin"] + $AxisSettings["RowHeight"]*$i,$AxisSettings["Display"],$AxisSettings["Format"],$AxisSettings["Unit"]);
@@ -311,8 +278,7 @@ 
              $LastY = $YPos;
             }
 
-           if ( isset($AxisSettings["Name"]) )
-            {
+           if ( isset($AxisSettings["Name"]) ) {
              $XPos    = $MinLeft-2;
              $YPos    = $this->pChartObject->GraphAreaY1+($this->pChartObject->GraphAreaY2-$this->pChartObject->GraphAreaY1)/2;
              $Bounds  = $this->pChartObject->drawText($XPos,$YPos,$AxisSettings["Name"],array("Align"=>TEXT_ALIGN_BOTTOMMIDDLE,"Angle"=>90));
@@ -322,13 +288,10 @@ 
             }
 
            $AxisPos["L"] = $MinLeft - $ScaleSpacing;
-          }
-         elseif ( $AxisSettings["Position"] == AXIS_POSITION_RIGHT )
-          {
+          } elseif ( $AxisSettings["Position"] == AXIS_POSITION_RIGHT ) {
 
            if ( $Floating )
-            { $FloatingOffset = $XMargin; $this->pChartObject->drawLine($AxisPos["R"],$this->pChartObject->GraphAreaY1+$AxisSettings["Margin"],$AxisPos["R"],$this->pChartObject->GraphAreaY2-$AxisSettings["Margin"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
-           else
+            { $FloatingOffset = $XMargin; $this->pChartObject->drawLine($AxisPos["R"],$this->pChartObject->GraphAreaY1+$AxisSettings["Margin"],$AxisPos["R"],$this->pChartObject->GraphAreaY2-$AxisSettings["Margin"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); } else
             { $FloatingOffset = 0; $this->pChartObject->drawLine($AxisPos["R"],$this->pChartObject->GraphAreaY1,$AxisPos["R"],$this->pChartObject->GraphAreaY2,array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
 
            if ( $DrawArrows ) { $this->pChartObject->drawArrow($AxisPos["R"],$this->pChartObject->GraphAreaY1+$AxisSettings["Margin"],$AxisPos["R"],$this->pChartObject->GraphAreaY1-($ArrowSize*2),array("FillR"=>$AxisR,"FillG"=>$AxisG,"FillB"=>$AxisB,"Size"=>$ArrowSize)); }
@@ -336,8 +299,7 @@ 
            $Height = ($this->pChartObject->GraphAreaY2 - $this->pChartObject->GraphAreaY1) - $AxisSettings["Margin"]*2;
            $Step   = $Height / $AxisSettings["Rows"]; $SubTicksSize = $Step /2; $MaxLeft = $AxisPos["R"];
            $LastY  = NULL;
-           for($i=0;$i<=$AxisSettings["Rows"];$i++)
-            {
+           for($i=0;$i<=$AxisSettings["Rows"];$i++) {
              $YPos  = $this->pChartObject->GraphAreaY2 - $AxisSettings["Margin"] - $Step*$i;
              $XPos  = $AxisPos["R"];
              $Value = $this->pChartObject->scaleFormat($AxisSettings["ScaleMin"] + $AxisSettings["RowHeight"]*$i,$AxisSettings["Display"],$AxisSettings["Format"],$AxisSettings["Unit"]);
@@ -358,8 +320,7 @@ 
              $LastY = $YPos;
             }
 
-           if ( isset($AxisSettings["Name"]) )
-            {
+           if ( isset($AxisSettings["Name"]) ) {
              $XPos    = $MaxLeft+6;
              $YPos    = $this->pChartObject->GraphAreaY1+($this->pChartObject->GraphAreaY2-$this->pChartObject->GraphAreaY1)/2;
              $Bounds  = $this->pChartObject->drawText($XPos,$YPos,$AxisSettings["Name"],array("Align"=>TEXT_ALIGN_BOTTOMMIDDLE,"Angle"=>270));
@@ -377,8 +338,7 @@ 
     }
 
    /* Draw a scatter plot chart */
-   function drawScatterPlotChart($Format=NULL)
-    {
+   function drawScatterPlotChart($Format=NULL) {
      $PlotSize		= isset($Format["PlotSize"]) ? $Format["PlotSize"] : 3;
      $PlotBorder	= isset($Format["PlotBorder"]) ? $Format["PlotBorder"] : FALSE;
      $BorderR		= isset($Format["BorderR"]) ? $Format["BorderR"] : 250;
@@ -396,18 +356,15 @@ 
 
      $BorderColor = array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha);
 
-     foreach($Data["ScatterSeries"] as $Key => $Series)
-      {
-       if ( $Series["isDrawable"] == TRUE )
-        {
+     foreach($Data["ScatterSeries"] as $Key => $Series) {
+       if ( $Series["isDrawable"] == TRUE ) {
          $SerieX = $Series["X"]; $SerieValuesX = $Data["Series"][$SerieX]["Data"]; $SerieXAxis = $Data["Series"][$SerieX]["Axis"];
          $SerieY = $Series["Y"]; $SerieValuesY = $Data["Series"][$SerieY]["Data"]; $SerieYAxis = $Data["Series"][$SerieY]["Axis"];
 
          if ( $ImageMapTitle == NULL ) { $Description = $Data["Series"][$Series["X"]]["Description"]." / ".$Data["Series"][$Series["Y"]]["Description"]; } else { $Description = $ImageMapTitle; }
          
          if ( isset($Series["Picture"]) && $Series["Picture"] != "" )
-          { $Picture = $Series["Picture"]; list($PicWidth,$PicHeight,$PicType) = $this->pChartObject->getPicInfo($Picture); }
-         else
+          { $Picture = $Series["Picture"]; list($PicWidth,$PicHeight,$PicType) = $this->pChartObject->getPicInfo($Picture); } else
           { $Picture = NULL; }
 
          $PosArrayX = $this->getPosArray($SerieValuesX,$SerieXAxis);
@@ -417,23 +374,18 @@ 
 
          $Color = array("R"=>$Series["Color"]["R"],"G"=>$Series["Color"]["G"],"B"=>$Series["Color"]["B"],"Alpha"=>$Series["Color"]["Alpha"]);
 
-         foreach($PosArrayX as $Key => $Value)
-          {
+         foreach($PosArrayX as $Key => $Value) {
            $X = $Value; $Y = $PosArrayY[$Key];
 
-           if ( $X != VOID && $Y != VOID )
-            {
+           if ( $X != VOID && $Y != VOID ) {
              $RealValue = round($Data["Series"][$Series["X"]]["Data"][$Key],2)." / ".round($Data["Series"][$Series["Y"]]["Data"][$Key],2);
              if ( $RecordImageMap ) { $this->pChartObject->addToImageMap("CIRCLE",floor($X).",".floor($Y).",".floor($PlotSize+$BorderSize),$this->pChartObject->toHTMLColor($Series["Color"]["R"],$Series["Color"]["G"],$Series["Color"]["B"]),$Description,$RealValue); }
 
              if( isset($Series["Shape"]) )
-              { $this->pChartObject->drawShape($X,$Y,$Series["Shape"],$PlotSize,$PlotBorder,$BorderSize,$Series["Color"]["R"],$Series["Color"]["G"],$Series["Color"]["B"],$Series["Color"]["Alpha"],$BorderR,$BorderG,$BorderB,$BorderAlpha); }
-             elseif ( $Picture == NULL )
-              {
+              { $this->pChartObject->drawShape($X,$Y,$Series["Shape"],$PlotSize,$PlotBorder,$BorderSize,$Series["Color"]["R"],$Series["Color"]["G"],$Series["Color"]["B"],$Series["Color"]["Alpha"],$BorderR,$BorderG,$BorderB,$BorderAlpha); } elseif ( $Picture == NULL ) {
                if ( $PlotBorder ) { $this->pChartObject->drawFilledCircle($X,$Y,$PlotSize+$BorderSize,$BorderColor); }
                $this->pChartObject->drawFilledCircle($X,$Y,$PlotSize,$Color);
-              }
-             else
+              } else
               { $this->pChartObject->drawFromPicture($PicType,$Picture,$X-$PicWidth/2,$Y-$PicHeight/2); }
             }
           }
@@ -442,8 +394,7 @@ 
     }
 
    /* Draw a scatter line chart */
-   function drawScatterLineChart($Format=NULL)
-    {
+   function drawScatterLineChart($Format=NULL) {
      $Data		= $this->pDataObject->getData();
      $Palette		= $this->pDataObject->getPalette();
      $RecordImageMap	= isset($Format["RecordImageMap"]) ? $Format["RecordImageMap"] : FALSE;
@@ -452,10 +403,8 @@ 
      $ImageMapPrecision = isset($Format["ImageMapPrecision"]) ? $Format["ImageMapPrecision"] : 2;
 
      /* Parse all the series to draw */
-     foreach($Data["ScatterSeries"] as $Key => $Series)
-      {
-       if ( $Series["isDrawable"] == TRUE )
-        {
+     foreach($Data["ScatterSeries"] as $Key => $Series) {
+       if ( $Series["isDrawable"] == TRUE ) {
          $SerieX = $Series["X"]; $SerieValuesX = $Data["Series"][$SerieX]["Data"]; $SerieXAxis = $Data["Series"][$SerieX]["Axis"];
          $SerieY = $Series["Y"]; $SerieValuesY = $Data["Series"][$SerieY]["Data"]; $SerieYAxis = $Data["Series"][$SerieY]["Axis"];
          $Ticks  = $Series["Ticks"];
@@ -473,12 +422,10 @@ 
          if ( $Weight != 0 ) { $Color["Weight"] = $Weight; }
 
          $LastX = VOID; $LastY = VOID;
-         foreach($PosArrayX as $Key => $Value)
-          {
+         foreach($PosArrayX as $Key => $Value) {
            $X = $Value; $Y = $PosArrayY[$Key];
 
-           if ( $X != VOID && $Y != VOID )
-            {
+           if ( $X != VOID && $Y != VOID ) {
              $RealValue = round($Data["Series"][$Series["X"]]["Data"][$Key],2)." / ".round($Data["Series"][$Series["Y"]]["Data"][$Key],2);
              if ( $RecordImageMap ) { $this->pChartObject->addToImageMap("CIRCLE",floor($X).",".floor($Y).",".$ImageMapPlotSize,$this->pChartObject->toHTMLColor($Series["Color"]["R"],$Series["Color"]["G"],$Series["Color"]["B"]),$Description,$RealValue); }
             }
@@ -493,8 +440,7 @@ 
     }
 
    /* Draw a scatter spline chart */
-   function drawScatterSplineChart($Format=NULL)
-    {
+   function drawScatterSplineChart($Format=NULL) {
      $Data		= $this->pDataObject->getData();
      $Palette		= $this->pDataObject->getPalette();
      $RecordImageMap	= isset($Format["RecordImageMap"]) ? $Format["RecordImageMap"] : FALSE;
@@ -502,10 +448,8 @@ 
      $ImageMapPlotSize	= isset($Format["ImageMapPlotSize"]) ? $Format["ImageMapPlotSize"] : 10;
      $ImageMapPrecision = isset($Format["ImageMapPrecision"]) ? $Format["ImageMapPrecision"] : 2;
 
-     foreach($Data["ScatterSeries"] as $Key => $Series)
-      {
-       if ( $Series["isDrawable"] == TRUE )
-        {
+     foreach($Data["ScatterSeries"] as $Key => $Series) {
+       if ( $Series["isDrawable"] == TRUE ) {
          $SerieX = $Series["X"]; $SerieValuesX = $Data["Series"][$SerieX]["Data"]; $SerieXAxis = $Data["Series"][$SerieX]["Axis"];
          $SerieY = $Series["Y"]; $SerieValuesY = $Data["Series"][$SerieY]["Data"]; $SerieYAxis = $Data["Series"][$SerieY]["Axis"];
          $Ticks  = $Series["Ticks"];
@@ -523,13 +467,11 @@ 
          if ( $Weight != 0 ) { $SplineSettings["Weight"] = $Weight; }
 
          $LastX = VOID; $LastY = VOID; $WayPoints = ""; $Forces = "";
-         foreach($PosArrayX as $Key => $Value)
-          {
+         foreach($PosArrayX as $Key => $Value) {
            $X = $Value; $Y = $PosArrayY[$Key];
            $Force = $this->pChartObject->getLength($LastX,$LastY,$X,$Y)/5;
 
-           if ( $X != VOID && $Y != VOID )
-            {
+           if ( $X != VOID && $Y != VOID ) {
              $RealValue = round($Data["Series"][$Series["X"]]["Data"][$Key],2)." / ".round($Data["Series"][$Series["Y"]]["Data"][$Key],2);
              if ( $RecordImageMap ) { $this->pChartObject->addToImageMap("CIRCLE",floor($X).",".floor($Y).",".$ImageMapPlotSize,$this->pChartObject->toHTMLColor($Series["Color"]["R"],$Series["Color"]["G"],$Series["Color"]["B"]),$Description,$RealValue); }
             }
@@ -549,21 +491,18 @@ 
     }
 
    /* Return the scaled plot position */
-   function getPosArray($Values,$AxisID)
-    {
+   function getPosArray($Values,$AxisID) {
      $Data = $this->pDataObject->getData();
 
      if ( !is_array($Values) ) { $Values = array($Values); }
 
-     if ( $Data["Axis"][$AxisID]["Identity"] == AXIS_X )
-      {
+     if ( $Data["Axis"][$AxisID]["Identity"] == AXIS_X ) {
        $Height      = ($this->pChartObject->GraphAreaX2 - $this->pChartObject->GraphAreaX1) - $Data["Axis"][$AxisID]["Margin"]*2;
        $ScaleHeight = $Data["Axis"][$AxisID]["ScaleMax"] - $Data["Axis"][$AxisID]["ScaleMin"];
        $Step        = $Height / $ScaleHeight;
 
        $Result = "";
-       foreach($Values as $Key => $Value)
-        {
+       foreach($Values as $Key => $Value) {
          if ( $Value == VOID ) 
           $Result[] = VOID;
          else
@@ -571,16 +510,13 @@ 
         }
 
        if ( count($Result) == 1 ) { return($Result[0]); } else { return($Result); }
-      }
-     else
-      {
+      } else {
        $Height      = ($this->pChartObject->GraphAreaY2 - $this->pChartObject->GraphAreaY1) - $Data["Axis"][$AxisID]["Margin"]*2;
        $ScaleHeight = $Data["Axis"][$AxisID]["ScaleMax"] - $Data["Axis"][$AxisID]["ScaleMin"];
        $Step        = $Height / $ScaleHeight;
 
        $Result = "";
-       foreach($Values as $Key => $Value)
-        {
+       foreach($Values as $Key => $Value) {
          if ( $Value == VOID ) 
           $Result[] = VOID;
          else
@@ -592,8 +528,7 @@ 
     }
 
    /* Draw the legend of the active series */
-   function drawScatterLegend($X,$Y,$Format="")
-    {
+   function drawScatterLegend($X,$Y,$Format="") {
      $Family		= isset($Format["Family"]) ? $Format["Family"] : LEGEND_FAMILY_BOX;
      $FontName		= isset($Format["FontName"]) ? $Format["FontName"] : $this->pChartObject->FontName;
      $FontSize		= isset($Format["FontSize"]) ? $Format["FontSize"] : $this->pChartObject->FontSize;
@@ -621,10 +556,8 @@ 
 
      $Data = $this->pDataObject->getData();
 
-     foreach($Data["ScatterSeries"] as $Key => $Series)
-      {
-       if ( $Series["isDrawable"] == TRUE && isset($Series["Picture"]))
-        {
+     foreach($Data["ScatterSeries"] as $Key => $Series) {
+       if ( $Series["isDrawable"] == TRUE && isset($Series["Picture"])) {
          list($PicWidth,$PicHeight) = $this->pChartObject->getPicInfo($Series["Picture"]);
          if ( $IconAreaWidth < $PicWidth ) { $IconAreaWidth = $PicWidth; }
          if ( $IconAreaHeight < $PicHeight ) { $IconAreaHeight = $PicHeight; }
@@ -636,12 +569,9 @@ 
      $XStep = $XSpacing;
 
      $Boundaries = ""; $Boundaries["L"] = $X; $Boundaries["T"] = $Y; $Boundaries["R"] = 0; $Boundaries["B"] = 0; $vY = $Y; $vX = $X;
-     foreach($Data["ScatterSeries"] as $Key => $Series)
-      {
-       if ( $Series["isDrawable"] == TRUE )
-        {
-         if ( $Mode == LEGEND_VERTICAL )
-          {
+     foreach($Data["ScatterSeries"] as $Key => $Series) {
+       if ( $Series["isDrawable"] == TRUE ) {
+         if ( $Mode == LEGEND_VERTICAL ) {
            $BoxArray = $this->pChartObject->getTextBox($vX+$IconAreaWidth+4,$vY+$IconAreaHeight/2,$FontName,$FontSize,0,$Series["Description"]);
 
            if ( $Boundaries["T"] > $BoxArray[2]["Y"]+$IconAreaHeight/2 ) { $Boundaries["T"] = $BoxArray[2]["Y"]+$IconAreaHeight/2; }
@@ -650,13 +580,10 @@ 
 
            $Lines = preg_split("/\n/",$Series["Description"]);
            $vY = $vY + max($this->pChartObject->FontSize*count($Lines),$IconAreaHeight) + 5;
-          }
-         elseif ( $Mode == LEGEND_HORIZONTAL )
-          {
+          } elseif ( $Mode == LEGEND_HORIZONTAL ) {
            $Lines = preg_split("/\n/",$Series["Description"]);
            $Width = "";
-           foreach($Lines as $Key => $Value)
-            {
+           foreach($Lines as $Key => $Value) {
              $BoxArray = $this->pChartObject->getTextBox($vX+$IconAreaWidth+6,$Y+$IconAreaHeight/2+(($this->pChartObject->FontSize+3)*$Key),$FontName,$FontSize,0,$Value);
 
              if ( $Boundaries["T"] > $BoxArray[2]["Y"]+$IconAreaHeight/2 ) { $Boundaries["T"] = $BoxArray[2]["Y"]+$IconAreaHeight/2; }
@@ -681,57 +608,44 @@ 
       $this->pChartObject->drawFilledRectangle($Boundaries["L"]-$Margin,$Boundaries["T"]-$Margin,$Boundaries["R"]+$Margin,$Boundaries["B"]+$Margin,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"BorderR"=>$BorderR,"BorderG"=>$BorderG,"BorderB"=>$BorderB));
 
      $RestoreShadow = $this->pChartObject->Shadow; $this->Shadow = FALSE;
-     foreach($Data["ScatterSeries"] as $Key => $Series)
-      {
-       if ( $Series["isDrawable"] == TRUE )
-        {
+     foreach($Data["ScatterSeries"] as $Key => $Series) {
+       if ( $Series["isDrawable"] == TRUE ) {
          $R = $Series["Color"]["R"]; $G = $Series["Color"]["G"]; $B = $Series["Color"]["B"];
          $Ticks = $Series["Ticks"]; $Weight = $Series["Weight"];
 
-         if ( isset($Series["Picture"]) )
-          {
+         if ( isset($Series["Picture"]) ) {
            $Picture = $Series["Picture"];
            list($PicWidth,$PicHeight) = $this->pChartObject->getPicInfo($Picture);
            $PicX = $X+$IconAreaWidth/2; $PicY = $Y+$IconAreaHeight/2; 
 
            $this->pChartObject->drawFromPNG($PicX-$PicWidth/2,$PicY-$PicHeight/2,$Picture);
-          }
-         else
-          {
-           if ( $Family == LEGEND_FAMILY_BOX )
-            {
+          } else {
+           if ( $Family == LEGEND_FAMILY_BOX ) {
              if ( $BoxWidth != $IconAreaWidth ) { $XOffset = floor(($IconAreaWidth-$BoxWidth)/2); } else { $XOffset = 0; }
              if ( $BoxHeight != $IconAreaHeight ) { $YOffset = floor(($IconAreaHeight-$BoxHeight)/2); } else { $YOffset = 0; }
 
              $this->pChartObject->drawFilledRectangle($X+1+$XOffset,$Y+1+$YOffset,$X+$BoxWidth+$XOffset+1,$Y+$BoxHeight+1+$YOffset,array("R"=>0,"G"=>0,"B"=>0,"Alpha"=>20));
              $this->pChartObject->drawFilledRectangle($X+$XOffset,$Y+$YOffset,$X+$BoxWidth+$XOffset,$Y+$BoxHeight+$YOffset,array("R"=>$R,"G"=>$G,"B"=>$B,"Surrounding"=>20));
-            }
-           elseif ( $Family == LEGEND_FAMILY_CIRCLE )
-            {
+            } elseif ( $Family == LEGEND_FAMILY_CIRCLE ) {
              $this->pChartObject->drawFilledCircle($X+1+$IconAreaWidth/2,$Y+1+$IconAreaHeight/2,min($IconAreaHeight/2,$IconAreaWidth/2),array("R"=>0,"G"=>0,"B"=>0,"Alpha"=>20));
              $this->pChartObject->drawFilledCircle($X+$IconAreaWidth/2,$Y+$IconAreaHeight/2,min($IconAreaHeight/2,$IconAreaWidth/2),array("R"=>$R,"G"=>$G,"B"=>$B,"Surrounding"=>20));
-            }
-           elseif ( $Family == LEGEND_FAMILY_LINE )
-            {
+            } elseif ( $Family == LEGEND_FAMILY_LINE ) {
              $this->pChartObject->drawLine($X+1,$Y+1+$IconAreaHeight/2,$X+1+$IconAreaWidth,$Y+1+$IconAreaHeight/2,array("R"=>0,"G"=>0,"B"=>0,"Alpha"=>20,"Ticks"=>$Ticks,"Weight"=>$Weight));
              $this->pChartObject->drawLine($X,$Y+$IconAreaHeight/2,$X+$IconAreaWidth,$Y+$IconAreaHeight/2,array("R"=>$R,"G"=>$G,"B"=>$B,"Ticks"=>$Ticks,"Weight"=>$Weight));
             }
           }
 
-         if ( $Mode == LEGEND_VERTICAL )
-          {
+         if ( $Mode == LEGEND_VERTICAL ) {
            $Lines = preg_split("/\n/",$Series["Description"]);
-           foreach($Lines as $Key => $Value)
-            $this->pChartObject->drawText($X+$IconAreaWidth+4,$Y+$IconAreaHeight/2+(($this->pChartObject->FontSize+3)*$Key),$Value,array("R"=>$FontR,"G"=>$FontG,"B"=>$FontB,"Align"=>TEXT_ALIGN_MIDDLELEFT));
+           foreach($Lines as $Key => $Value) {
+                       $this->pChartObject->drawText($X+$IconAreaWidth+4,$Y+$IconAreaHeight/2+(($this->pChartObject->FontSize+3)*$Key),$Value,array("R"=>$FontR,"G"=>$FontG,"B"=>$FontB,"Align"=>TEXT_ALIGN_MIDDLELEFT));
+           }
 
            $Y=$Y+max($this->pChartObject->FontSize*count($Lines),$IconAreaHeight) + 5;
-          }
-         elseif ( $Mode == LEGEND_HORIZONTAL )
-          {
+          } elseif ( $Mode == LEGEND_HORIZONTAL ) {
            $Lines = preg_split("/\n/",$Series["Description"]);
            $Width = "";
-           foreach($Lines as $Key => $Value)
-            {
+           foreach($Lines as $Key => $Value) {
              $BoxArray = $this->pChartObject->drawText($X+$IconAreaWidth+4,$Y+$IconAreaHeight/2+(($this->pChartObject->FontSize+3)*$Key),$Value,array("R"=>$FontR,"G"=>$FontG,"B"=>$FontB,"Align"=>TEXT_ALIGN_MIDDLELEFT));
              $Width[] = $BoxArray[1]["X"];
             }
@@ -744,8 +658,7 @@ 
     }
 
    /* Get the legend box size */
-   function getScatterLegendSize($Format="")
-    {
+   function getScatterLegendSize($Format="") {
      $FontName	= isset($Format["FontName"]) ? $Format["FontName"] : $this->pChartObject->FontName;
      $FontSize	= isset($Format["FontSize"]) ? $Format["FontSize"] : $this->pChartObject->FontSize;
      $BoxSize	= isset($Format["BoxSize"]) ? $Format["BoxSize"] : 5;
@@ -760,10 +673,8 @@ 
 
      $Data = $this->pDataObject->getData();
 
-     foreach($Data["ScatterSeries"] as $Key => $Series)
-      {
-       if ( $Series["isDrawable"] == TRUE && isset($Series["Picture"]))
-        {
+     foreach($Data["ScatterSeries"] as $Key => $Series) {
+       if ( $Series["isDrawable"] == TRUE && isset($Series["Picture"])) {
          list($PicWidth,$PicHeight) = $this->pChartObject->getPicInfo($Series["Picture"]);
          if ( $IconAreaWidth < $PicWidth ) { $IconAreaWidth = $PicWidth; }
          if ( $IconAreaHeight < $PicHeight ) { $IconAreaHeight = $PicHeight; }
@@ -775,12 +686,9 @@ 
      $XStep = $XSpacing;
 
      $Boundaries = ""; $Boundaries["L"] = $X; $Boundaries["T"] = $Y; $Boundaries["R"] = 0; $Boundaries["B"] = 0; $vY = $Y; $vX = $X;
-     foreach($Data["ScatterSeries"] as $Key => $Series)
-      {
-       if ( $Series["isDrawable"] == TRUE )
-        {
-         if ( $Mode == LEGEND_VERTICAL )
-          {
+     foreach($Data["ScatterSeries"] as $Key => $Series) {
+       if ( $Series["isDrawable"] == TRUE ) {
+         if ( $Mode == LEGEND_VERTICAL ) {
            $BoxArray = $this->pChartObject->getTextBox($vX+$IconAreaWidth+4,$vY+$IconAreaHeight/2,$FontName,$FontSize,0,$Series["Description"]);
 
            if ( $Boundaries["T"] > $BoxArray[2]["Y"]+$IconAreaHeight/2 ) { $Boundaries["T"] = $BoxArray[2]["Y"]+$IconAreaHeight/2; }
@@ -789,13 +697,10 @@ 
 
            $Lines = preg_split("/\n/",$Series["Description"]);
            $vY = $vY + max($this->pChartObject->FontSize*count($Lines),$IconAreaHeight) + 5;
-          }
-         elseif ( $Mode == LEGEND_HORIZONTAL )
-          {
+          } elseif ( $Mode == LEGEND_HORIZONTAL ) {
            $Lines = preg_split("/\n/",$Series["Description"]);
            $Width = "";
-           foreach($Lines as $Key => $Value)
-            {
+           foreach($Lines as $Key => $Value) {
              $BoxArray = $this->pChartObject->getTextBox($vX+$IconAreaWidth+6,$Y+$IconAreaHeight/2+(($this->pChartObject->FontSize+3)*$Key),$FontName,$FontSize,0,$Value);
 
              if ( $Boundaries["T"] > $BoxArray[2]["Y"]+$IconAreaHeight/2 ) { $Boundaries["T"] = $BoxArray[2]["Y"]+$IconAreaHeight/2; }
@@ -821,16 +726,13 @@ 
     }
 
    /* Draw the line of best fit */
-   function drawScatterBestFit($Format="")
-    {
+   function drawScatterBestFit($Format="") {
      $Ticks	= isset($Format["Ticks"]) ? $Format["Ticks"] : 0;
 
      $Data    = $this->pDataObject->getData();
 
-     foreach($Data["ScatterSeries"] as $Key => $Series)
-      {
-       if ( $Series["isDrawable"] == TRUE )
-        {
+     foreach($Data["ScatterSeries"] as $Key => $Series) {
+       if ( $Series["isDrawable"] == TRUE ) {
          $SerieX = $Series["X"]; $SerieValuesX = $Data["Series"][$SerieX]["Data"]; $SerieXAxis = $Data["Series"][$SerieX]["Axis"];
          $SerieY = $Series["Y"]; $SerieValuesY = $Data["Series"][$SerieY]["Data"]; $SerieYAxis = $Data["Series"][$SerieY]["Axis"];
 
@@ -841,8 +743,7 @@ 
          $PosArrayY = $Data["Series"][$Series["Y"]]["Data"];
 
          $Sxy = 0; $Sx = 0; $Sy = 0; $Sxx = 0;
-         foreach($PosArrayX as $Key => $Value)
-          {
+         foreach($PosArrayX as $Key => $Value) {
            $X = $Value; $Y = $PosArrayY[$Key];
 
            $Sxy = $Sxy + $X*$Y;
@@ -853,15 +754,12 @@ 
 
          $n = count($PosArrayX);
 
-         if ((($n*$Sxx) == ($Sx*$Sx)))
-          {
+         if ((($n*$Sxx) == ($Sx*$Sx))) {
            $X1 = $this->getPosArray($Data["Axis"][$SerieXAxis]["ScaleMin"],$SerieXAxis);
            $X2 = $X1;
            $Y1 = $this->pChartObject->GraphAreaY1;
            $Y2 = $this->pChartObject->GraphAreaY2;
-          }
-         else
-          {
+          } else {
            $M = (($n*$Sxy)-($Sx*$Sy)) / (($n*$Sxx)-($Sx*$Sx));
            $B = (($Sy)-($M*$Sx))/($n);
 
@@ -883,8 +781,7 @@ 
       }
     }
 
-   function writeScatterLabel($ScatterSerieID,$Points,$Format="")
-    {
+   function writeScatterLabel($ScatterSerieID,$Points,$Format="") {
      $OverrideTitle	= isset($Format["OverrideTitle"]) ? $Format["OverrideTitle"] : NULL;
      $DrawPoint		= isset($Format["DrawPoint"]) ? $Format["DrawPoint"] : LABEL_POINT_BOX;
      $Decimals		= isset($Format["Decimals"]) ? $Format["Decimals"] : NULL;
@@ -906,10 +803,8 @@ 
      $PosArrayY = $this->getPosArray($SerieValuesY,$SerieYAxis);
      if ( !is_array($PosArrayY) ) { $Value = $PosArrayY; $PosArrayY = ""; $PosArrayY[0] = $Value; }
 
-     foreach($Points as $Key => $Point)
-      {
-       if ( isset($PosArrayX[$Point]) && isset($PosArrayY[$Point]) )
-        {
+     foreach($Points as $Key => $Point) {
+       if ( isset($PosArrayX[$Point]) && isset($PosArrayY[$Point]) ) {
          $X = floor($PosArrayX[$Point]);
          $Y = floor($PosArrayY[$Point]);
 
@@ -952,8 +847,7 @@ 
     }
 
    /* Draw a Scatter threshold */
-   function drawScatterThreshold($Value,$Format="")
-    {
+   function drawScatterThreshold($Value,$Format="") {
      $AxisID		= isset($Format["AxisID"]) ? $Format["AxisID"] : 0;
      $R			= isset($Format["R"]) ? $Format["R"] : 255;
      $G			= isset($Format["G"]) ? $Format["G"] : 0;
@@ -997,51 +891,42 @@ 
 
      if ( !isset($Data["Axis"][$AxisID]) ) { return(-1); }
  
-     if ( $Data["Axis"][$AxisID]["Identity"] == AXIS_Y )
-      {
+     if ( $Data["Axis"][$AxisID]["Identity"] == AXIS_Y ) {
        $X1 = $this->pChartObject->GraphAreaX1 + $Data["Axis"][$AxisID]["Margin"];
        $X2 = $this->pChartObject->GraphAreaX2 - $Data["Axis"][$AxisID]["Margin"];
        $Y  = $this->getPosArray($Value,$AxisID);
 
        $this->pChartObject->drawLine($X1,$Y,$X2,$Y,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight));
 
-       if ( $Wide )
-        {
+       if ( $Wide ) {
          $this->pChartObject->drawLine($X1,$Y-1,$X2,$Y-1,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/$WideFactor,"Ticks"=>$Ticks));
          $this->pChartObject->drawLine($X1,$Y+1,$X2,$Y+1,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/$WideFactor,"Ticks"=>$Ticks));
         }
 
-       if ( $WriteCaption )
-        {
+       if ( $WriteCaption ) {
          if ( $CaptionAlign == CAPTION_LEFT_TOP )
-          { $X = $this->pChartObject->GraphAreaX1 + $Data["Axis"][$AxisID]["Margin"] + $CaptionOffset; $CaptionSettings["Align"] = TEXT_ALIGN_MIDDLELEFT; }
-         else 
+          { $X = $this->pChartObject->GraphAreaX1 + $Data["Axis"][$AxisID]["Margin"] + $CaptionOffset; $CaptionSettings["Align"] = TEXT_ALIGN_MIDDLELEFT; } else 
           { $X = $this->pChartObject->GraphAreaX2 - $Data["Axis"][$AxisID]["Margin"] - $CaptionOffset; $CaptionSettings["Align"] = TEXT_ALIGN_MIDDLERIGHT; }
 
          $this->pChartObject->drawText($X,$Y,$Caption,$CaptionSettings);
         }
 
        return(array("Y"=>$Y));
-      }
-     elseif ( $Data["Axis"][$AxisID]["Identity"] == AXIS_X )
-      {
+      } elseif ( $Data["Axis"][$AxisID]["Identity"] == AXIS_X ) {
        $X  = $this->getPosArray($Value,$AxisID);
        $Y1 = $this->pChartObject->GraphAreaY1 + $Data["Axis"][$AxisID]["Margin"];
        $Y2 = $this->pChartObject->GraphAreaY2 - $Data["Axis"][$AxisID]["Margin"];
 
        $this->pChartObject->drawLine($X,$Y1,$X,$Y2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight));
 
-       if ( $Wide )
-        {
+       if ( $Wide ) {
          $this->pChartObject->drawLine($X-1,$Y1,$X-1,$Y2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/$WideFactor,"Ticks"=>$Ticks));
          $this->pChartObject->drawLine($X+1,$Y1,$X+1,$Y2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/$WideFactor,"Ticks"=>$Ticks));
         }
 
-       if ( $WriteCaption )
-        {
+       if ( $WriteCaption ) {
          if ( $CaptionAlign == CAPTION_LEFT_TOP )
-          { $Y = $this->pChartObject->GraphAreaY1 + $Data["Axis"][$AxisID]["Margin"] + $CaptionOffset; $CaptionSettings["Align"] = TEXT_ALIGN_TOPMIDDLE; }
-         else 
+          { $Y = $this->pChartObject->GraphAreaY1 + $Data["Axis"][$AxisID]["Margin"] + $CaptionOffset; $CaptionSettings["Align"] = TEXT_ALIGN_TOPMIDDLE; } else 
           { $Y = $this->pChartObject->GraphAreaY2 - $Data["Axis"][$AxisID]["Margin"] - $CaptionOffset; $CaptionSettings["Align"] = TEXT_ALIGN_BOTTOMMIDDLE; }
 
          $CaptionSettings["Align"] = TEXT_ALIGN_TOPMIDDLE;
@@ -1053,8 +938,7 @@ 
     }
 
    /* Draw a Scatter threshold area */
-   function drawScatterThresholdArea($Value1,$Value2,$Format="")
-    {
+   function drawScatterThresholdArea($Value1,$Value2,$Format="") {
      $AxisID	= isset($Format["AxisID"]) ? $Format["AxisID"] : 0;
      $R		= isset($Format["R"]) ? $Format["R"] : 255;
      $G		= isset($Format["G"]) ? $Format["G"] : 0;
@@ -1085,8 +969,7 @@ 
 
      if ( !isset($Data["Axis"][$AxisID]) ) { return(-1); }
  
-     if ( $Data["Axis"][$AxisID]["Identity"] == AXIS_X )
-      {
+     if ( $Data["Axis"][$AxisID]["Identity"] == AXIS_X ) {
        $Y1 = $this->pChartObject->GraphAreaY1 + $Data["Axis"][$AxisID]["Margin"];
        $Y2 = $this->pChartObject->GraphAreaY2 - $Data["Axis"][$AxisID]["Margin"];
        $X1  = $this->getPosArray($Value1,$AxisID);
@@ -1097,19 +980,16 @@ 
 
        $this->pChartObject->drawFilledRectangle($X1,$Y1,$X2,$Y2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
 
-       if ( $Border )
-        {
+       if ( $Border ) {
          $this->pChartObject->drawLine($X1,$Y1,$X1,$Y2,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Ticks"=>$BorderTicks));
          $this->pChartObject->drawLine($X2,$Y1,$X2,$Y2,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Ticks"=>$BorderTicks));
         }
 
-       if ( $AreaName != NULL )
-        {
+       if ( $AreaName != NULL ) {
          $XPos = ($X2-$X1)/2 + $X1;
          $YPos = ($Y2-$Y1)/2 + $Y1;
 
-         if ( $NameAngle == ZONE_NAME_ANGLE_AUTO )
-          {
+         if ( $NameAngle == ZONE_NAME_ANGLE_AUTO ) {
            $TxtPos   = $this->pChartObject->getTextBox($XPos,$YPos,$this->pChartObject->FontName,$this->pChartObject->FontSize,0,$AreaName);
            $TxtWidth = $TxtPos[1]["X"] - $TxtPos[0]["X"];
            if ( abs($X2 - $X1) > $TxtWidth ) { $NameAngle = 0; } else { $NameAngle = 90; }
@@ -1121,9 +1001,7 @@ 
 
        $this->pChartObject->Shadow = $RestoreShadow;
        return(array("X1"=>$X1,"X2"=>$X2));
-      }
-     elseif ( $Data["Axis"][$AxisID]["Identity"] == AXIS_Y )
-      {
+      } elseif ( $Data["Axis"][$AxisID]["Identity"] == AXIS_Y ) {
        $X1 = $this->pChartObject->GraphAreaX1 + $Data["Axis"][$AxisID]["Margin"];
        $X2 = $this->pChartObject->GraphAreaX2 - $Data["Axis"][$AxisID]["Margin"];
        $Y1 = $this->getPosArray($Value1,$AxisID);
@@ -1134,14 +1012,12 @@ 
 
        $this->pChartObject->drawFilledRectangle($X1,$Y1,$X2,$Y2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
 
-       if ( $Border )
-        {
+       if ( $Border ) {
          $this->pChartObject->drawLine($X1,$Y1,$X2,$Y1,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Ticks"=>$BorderTicks));
          $this->pChartObject->drawLine($X1,$Y2,$X2,$Y2,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Ticks"=>$BorderTicks));
         }
 
-       if ( $AreaName != NULL )
-        {
+       if ( $AreaName != NULL ) {
          $XPos = ($X2-$X1)/2 + $X1;
          $YPos = ($Y2-$Y1)/2 + $Y1;